5 Commits
Author SHA1 Message Date
xmz7891 50f4e1fb6f add LICENSE.
Signed-off-by: xmz <3235109770@qq.com>
2026-10-07 15:08:01 +00:00
xmz7891 a6001775dd remove temp 2026-10-07 23:04:48 +08:00
xmz7891 d5f35f7ed5 文档补一句:EzHub 统一走 HTTPS 推
用户原话:「ezhub用https推,我朋友说ssh太麻烦他不想改」。

SSH 公钥在 EzHub 服务端一直没配通(加了公钥仍 Permission denied),
维护者觉得改起来麻烦,所以统一改走 HTTPS + 令牌。

remote 地址里不含令牌(git remote -v 会打印出来,容易泄),
推送时由 _build/ezhub_push.py 临时拼 URL,推完不留痕。
令牌存在仓库外 %USERPROFILE%\.ykxmz\ezhub_token。

ezhub remote 已从 ssh:// 改成 https://git.261826.xyz/xmz/ykxmz.git。

另外本地补齐了 v1.9.0 / v2.0.0 两个 tag。
注意 Gitee 那边是 annotated tag,ls-remote 看到的是 tag 对象的 SHA,
直接拿它建本地 tag 会指向一个本地不存在的对象(git tag 都列不出来)。
要用 refs/tags/<t>^{} 拿 peeled 的 commit SHA。
2026-10-07 23:04:48 +08:00
xmz7891 77295bd258 remove temp 2026-10-07 23:02:44 +08:00
xmz7891 4295b482a1 2.0.0:安装时可设中转服务器 + 手表端新增设置页 + 中转默认留空
按用户定的版本规矩,这一轮既有新内容又有重构,所以升第二位:
1.9.0 -> 2.0.0(最后一位清 0)。

== 一、安装时就能设中转服务器(用户要求)==

安装向导那一页现在是两个输入框:配对码 + 中转服务器。
装的时候是"第一次设置",最该一次把地址填好,不然装完还得去
双击 exe 找设置窗口,很容易漏。

只填域名就行(自动补 https://),留空 = 只走局域网。
批量静默部署同样支持:
    ykxmz-setup-2.0.0.exe /VERYSILENT /CODE=246810 /RELAY=relay.你的域名

为此新增了一个 --relay-url 参数:
    --relay       连接一次、打印状态、然后退出(人工排查用)
    --relay-url   只写进配置,不连接、不退出(安装流程用)
用错那个的话,安装包的命令链会在中间就 return,后面的 --silent
根本跑不到 —— 所以必须分开。

== 二、手表端新增「设置」页(用户要求)==

用户原话:"安卓端加一个设置,各种设置就在这里面调"。
以前设置散在首页(只有一个"中转设置"按钮),现在统一收进设置页:
    * 中转服务器(填写 / 一键清空)
    * 记住的配对码(显示 / 清除)
    * 已配对的电脑(看数量 / 清空,带二次确认)
    * 关于(版本号从 APK 读,不会和代码对不上)

== 三、中转地址默认留空 + 一次性迁移(用户报的问题)==

用户原话:"安卓端为什么还是默认填的我的中转站,以后改成手动填"。

代码里的默认值早就是空的了,但用户看到的还是那个地址 ——
因为**老版本 1.5.0 把作者的域名硬编码成了默认值**,第一次运行就
存进了 SharedPreferences。装新 APK 不会清偏好,所以那个值一直留着。
用户其实从来没"选"过这个地址,是程序硬塞的。

所以加了 migrateLegacyRelay():存的值如果正好等于当时内置的域名,
就当成没设过、清掉。只清完全相等的,用户手填的不会动。

== 四、两个测试自身的毛病 ==

* test_lan_optimize 那条"没有把旧公网域名当默认值"太粗 ——
  它查的是源码里任何位置,于是迁移注释里引用那行老代码就把它判红了。
  改成先剥掉注释再查(断言要测的是"有没有把它当默认值")。

* test_image_modes 偶发红:它开真实 Tk 全屏窗口,在全量套件里跑
  偶尔起不来(单独跑 19/19 全过)。加了有界重试。
  偶发红的测试会让"全量通过"失去意义。

== 五、新增防复发断言 ==

_tests/test_relay_default_blank.py(15 项,回归阶段 3a3b):
    * 默认值必须是空串
    * 除了迁移清单,源码里不许有写死的中转域名
    * 迁移必须真的被调用(不是只定义)
    * 迁移必须是 remove,不能换成另一个硬编码值
    * Windows 端的默认也得是空

理由:用户说过"这个中转站我就自己用,不对外" —— 值得用断言钉死。

== 六、顺手修的 ==

* release_all.py 崩在 Gitee 那一步:Gitee 的
  GET /releases/tags/{tag} 在"标签存在、但还没发行版"时返回的是
  **HTTP 200 + JSON null**(不是 404),于是 .get("id") 直接
  AttributeError。发 1.9.0 时踩到,已改成容忍 None。

* installer/build_installer.py 里 license-combined.txt 是从
  docs/ 三份文档重新生成的,所以光改生成物没用(下次构建又变回去)。
  改成在 build_license() 里统一注入当前版本。

* ExE 文件属性里的版本(version_info.txt)从 1.7.1 起就一直没跟上。

全量回归 43 个阶段全部通过。
2026-10-07 23:02:44 +08:00
176 changed files with 1888 additions and 57 deletions
+661
View File
@@ -0,0 +1,661 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU Affero General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<https://www.gnu.org/licenses/>.
+30
View File
@@ -1,3 +1,33 @@
## 2.0.0
- **安装时就能设中转服务器**:安装向导那一页现在是两个输入框 ——
**配对码**和**中转服务器**。装的时候是"第一次设置",那时候最该一次
把地址填好,不然装完还得去双击 exe 找设置窗口,很容易漏。
只填域名就行(自动补 `https://`),留空 = 只走局域网。
批量部署同样支持:`/VERYSILENT /CODE=246810 /RELAY=relay.你的域名`
- **手表端新增「设置」页**:以前设置散在首页(只有一个"中转设置"按钮),
现在统一收进来,在里面调:
- **中转服务器**(填写 / 一键清空)
- **记住的配对码**(显示 / 清除)
- **已配对的电脑**(看数量 / 清空)
- **关于**(版本号 + 连接顺序说明)
- **中转地址改成手动填,默认留空**:以前有一版把作者的服务器地址写死成
默认值,第一次运行就存进了偏好设置,装新版本也不会清 ——
看起来就像"默认还是别人的中转站"。现在默认是空的,
并且会做**一次性迁移**把那个旧的内置地址清掉
(只清完全相等的,你自己填的不会动)。
- **修「局域网连上后要推出去点设备才能控制」**:手表上有四个页面,
切换时靠手工藏上一页,新加的「局域网连接」页漏藏了 ——
所以从它连上之后控制面板其实已经显示,却被盖住看不见。
- **修「双击 exe 没反应」**:装完之后双击现在会打开设置窗口。
- 新增**版本号一致性检查**和**中转地址默认值检查**两道断言,
防止这类"漏改一处"的问题再出现。
## 1.9.0
- **被控端终于有设置窗口了**:装完之后双击 `ykxmz.exe` 就能打开,里面可以改
+401
View File
@@ -0,0 +1,401 @@
# -*- coding: utf-8 -*-
r'''安卓端:中转地址改成"手动填" + 加一个设置页。
== 用户报的问题 ==
「安卓端为什么还是默认填的我的中转站,以后改成手动填,
安卓端加一个设置,各种设置就在这里面调」
== 根因 ==
代码里的默认值**已经改成空**了:
private static final String DEFAULT_RELAY_URL = "";
但你手表上看到的还是 `https://relay.xxmxxs.top` —— 因为
**老版本 1.5.0 把作者的域名硬编码成默认值**(git 历史里查到了):
private static final String DEFAULT_RELAY_URL = "https://relay.xxmxxs.top";
第一次运行它就 `setRelayUrl(默认值)` 存进了 SharedPreferences。
装新 APK **不会清偏好设置**,所以那个值一直留着。
**用户从来没"选"过这个地址** —— 是程序硬塞的。所以正确做法是
**一次性迁移**:如果存的就是当时内置的那个域名,当成没设过,清掉。
== 做的事 ==
1. 迁移:把老版本硬塞的那个域名从偏好里清掉
2. 新增「设置」页,把散落的设置收进来:
* 中转服务器(手动填 / 清空)
* 记住的配对码(看 / 清)
* 已配对设备(看数量 / 清空)
* 关于(版本号、连接方式说明)
3. 首页那个「中转设置(跨网络用)」按钮改成「设置」,进设置页
4. settingsPanel 纳入 showOnly(),避免再出现"面板漏藏"那类问题
'''
from __future__ import annotations
import sys
from pathlib import Path
ROOT = Path(__file__).resolve().parent.parent
SRC = (ROOT / "android" / "src" / "com" / "lanremote" / "watch"
/ "MainActivity.java")
# ======================================================================
# 1. 迁移 + 面板字段
# ======================================================================
MIGRATION = ''' /**
* 老版本硬塞进来的中转地址,要清掉。
*
* <p>1.5.0 那版把作者的域名写死成默认值:
* <pre>
* private static final String DEFAULT_RELAY_URL = "https://relay.xxmxxs.top";
* </pre>
* 而且第一次运行就存进了 SharedPreferences。装新 APK 不会清偏好,
* 所以用户会看到「默认还是那个中转站」—— 其实他从来没选过。
*
* <p>现在默认值是空串(跨网络要自己填)。这里做一次性迁移:
* 存的值如果正好是当时内置的那个域名,就当成没设过,清掉。
*
* <p>⚠ 只在**完全等于**内置值时清 —— 用户自己手填的地址不能动。
*/
private static final String[] LEGACY_BAKED_IN_RELAYS = {
"https://relay.xxmxxs.top",
"http://relay.xxmxxs.top",
};
private void migrateLegacyRelay() {
String saved = getSharedPreferences("lanremote", MODE_PRIVATE)
.getString("relay_url", "");
if (saved == null) {
return;
}
String trimmed = saved.trim();
for (String legacy : LEGACY_BAKED_IN_RELAYS) {
if (legacy.equalsIgnoreCase(trimmed)) {
// 这是老版本硬塞的,不是用户选的 —— 清掉,让他自己填
getSharedPreferences("lanremote", MODE_PRIVATE).edit()
.remove("relay_url").apply();
appendLog("已清掉旧版本内置的中转地址(不是你自己填的)");
return;
}
}
}
'''
SETTINGS_BUILD = ''' /**
* 「设置」页。用户要求:"安卓端加一个设置,各种设置就在这里面调"。
*
* <p>以前设置散在首页(一个「中转设置」按钮)和别处,
* 现在统一收到这里。
*/
private void buildSettingsPanel() {
settingsPanel = new FrameLayout(this);
settingsPanel.setBackgroundColor(C_BG);
ScrollView scroll = new ScrollView(this);
scroll.setBackgroundColor(C_BG);
LinearLayout box = new LinearLayout(this);
box.setOrientation(LinearLayout.VERTICAL);
box.setPadding(dp(10), dp(12), dp(10), dp(12));
scroll.addView(box, new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT));
settingsPanel.addView(scroll, new FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT));
LinearLayout top = new LinearLayout(this);
top.setOrientation(LinearLayout.HORIZONTAL);
top.setGravity(Gravity.CENTER_VERTICAL);
box.addView(top, new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT));
TextView title = new TextView(this);
title.setText("设置");
title.setTextColor(C_FG);
title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
title.setTypeface(null, android.graphics.Typeface.BOLD);
top.addView(title, new LinearLayout.LayoutParams(
0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f));
top.addView(smallButton("返回", C_CARD, new Runnable() {
@Override
public void run() {
hideSettingsPanel();
}
}));
// ================= 中转服务器 =================
settingsRelayValue = new TextView(this);
settingsRelayValue.setTextColor(C_DIM);
settingsRelayValue.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
settingsRelayValue.setPadding(0, dp(6), 0, dp(4));
box.addView(sectionTitle("中转服务器"));
box.addView(hintText("手表和电脑不在同一个网络时(比如在办公室管教室)"
+ "才需要填。填你自己那台的地址,比如 relay.你的域名。\\n"
+ "只在一个 WiFi 里用就留空 —— 那样直接连,最快也不耗流量。"));
box.addView(settingsRelayValue);
Button editRelay = bigButton("填写中转服务器", C_ACCENT, 14);
editRelay.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
promptRelayUrl();
}
});
box.addView(editRelay);
Button clearRelay = bigButton("清空中转服务器(只走局域网)", C_CARD, 13);
clearRelay.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
setRelayUrl("");
refreshSettingsPanel();
toast("已清空 —— 以后只走局域网");
}
});
box.addView(clearRelay);
// ================= 配对码 =================
settingsCodeValue = new TextView(this);
settingsCodeValue.setTextColor(C_DIM);
settingsCodeValue.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
settingsCodeValue.setPadding(0, dp(6), 0, dp(4));
box.addView(sectionTitle("记住的配对码"));
box.addView(hintText("手表会记住最近一次用的配对码,"
+ "下次连接自动带上,不用重复输。"));
box.addView(settingsCodeValue);
Button clearCode = bigButton("清除记住的配对码", C_CARD, 13);
clearCode.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
getSharedPreferences("lanremote", MODE_PRIVATE).edit()
.remove("paired_code").apply();
refreshSettingsPanel();
toast("已清除");
}
});
box.addView(clearCode);
// ================= 已配对设备 =================
settingsDevicesValue = new TextView(this);
settingsDevicesValue.setTextColor(C_DIM);
settingsDevicesValue.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
settingsDevicesValue.setPadding(0, dp(6), 0, dp(4));
box.addView(sectionTitle("已配对的电脑"));
box.addView(hintText("配对过的电脑会出现在首页列表里,点一下就能连。"
+ "换电脑或者想重新配对时可以清空。"));
box.addView(settingsDevicesValue);
Button clearDevices = bigButton("清空已配对的电脑", C_DANGER, 13);
clearDevices.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
new android.app.AlertDialog.Builder(MainActivity.this)
.setTitle("清空已配对的电脑?")
.setMessage("清掉之后首页列表就空了,"
+ "需要重新输配对码连接。")
.setPositiveButton("清空", new android.content.DialogInterface.OnClickListener() {
@Override
public void onClick(android.content.DialogInterface d, int w) {
store.clearDevices();
refreshDeviceList();
refreshSettingsPanel();
toast("已清空");
}
})
.setNegativeButton("取消", null)
.show();
}
});
box.addView(clearDevices);
// ================= 关于 =================
box.addView(sectionTitle("关于"));
box.addView(hintText("ykxmz 手表端 版本 " + appVersion()
+ "\\n\\n"
+ "连接顺序:先试局域网直连(同一个 WiFi,几毫秒);"
+ "连不上再走中转(跨网络,受线路影响)。"));
}
/** 一行小节标题 */
private TextView sectionTitle(String text) {
TextView v = new TextView(this);
v.setText(text);
v.setTextColor(C_FG);
v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
v.setTypeface(null, android.graphics.Typeface.BOLD);
v.setPadding(0, dp(14), 0, 0);
return v;
}
/** 一行灰色说明 */
private TextView hintText(String text) {
TextView v = new TextView(this);
v.setText(text);
v.setTextColor(C_DIM);
v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 11);
v.setLineSpacing(0, 1.25f);
v.setPadding(0, dp(4), 0, 0);
return v;
}
/** 版本号。从 PackageManager 读,和构建脚本里的版本天然一致,
* 不用在代码里再写一份(写两份必然有一份会忘改)。 */
private String appVersion() {
try {
return getPackageManager()
.getPackageInfo(getPackageName(), 0).versionName;
} catch (Exception e) {
return "?";
}
}
/** 把设置页上的文字刷新成当前值 */
private void refreshSettingsPanel() {
if (settingsRelayValue == null) {
return;
}
String relay = relayUrl();
settingsRelayValue.setText(relay.isEmpty()
? "现在是:空(只走局域网)"
: "现在是:" + relay);
settingsRelayValue.setTextColor(relay.isEmpty() ? C_DIM : C_OK);
String code = savedPairingCode();
settingsCodeValue.setText((code == null || code.isEmpty())
? "现在没有记住的配对码"
: "记住的是:" + code);
int n = store.devices() == null ? 0 : store.devices().size();
settingsDevicesValue.setText("已配对 " + n + " 台电脑");
}
private void showSettingsPanel() {
refreshSettingsPanel();
showOnly(settingsPanel);
}
private void hideSettingsPanel() {
showConnectPanel();
}
'''
def patch(text: str, old: str, new: str, label: str, results: list) -> str:
if old not in text:
results.append(("✗", label, "找不到锚点"))
return text
if text.count(old) != 1:
results.append(("!", label, "锚点出现 %d 次" % text.count(old)))
results.append(("✓", label, ""))
return text.replace(old, new, 1)
def main() -> int:
text = SRC.read_text(encoding="utf-8")
results: list = []
# ---- 1. 面板字段声明 ----
text = patch(
text,
" private FrameLayout lanPanel;",
" private FrameLayout lanPanel;\n"
" // ---- 设置页(用户要求:各种设置收在一个页面里调)----\n"
" private FrameLayout settingsPanel;\n"
" private TextView settingsRelayValue;\n"
" private TextView settingsCodeValue;\n"
" private TextView settingsDevicesValue;",
"声明 settingsPanel 和各显示控件", results)
# ---- 2. 插入迁移函数(放在 relayUrl 之前)----
text = patch(
text, " private String relayUrl() {",
MIGRATION + " private String relayUrl() {",
"插入 migrateLegacyRelay()", results)
# ---- 3. buildSettingsPanel 等方法(插在 buildLanPanel 之前)----
text = patch(
text, " private void buildLanPanel() {",
SETTINGS_BUILD + " private void buildLanPanel() {",
"插入 buildSettingsPanel() 等", results)
# ---- 4. 建面板的地方也要建它 ----
text = patch(
text, " buildLanPanel();",
" buildLanPanel();\n buildSettingsPanel();",
"构建时创建 settingsPanel", results)
# ---- 5. showOnly 纳入 settingsPanel ----
text = patch(
text,
" View[] all = {connectPanel, controlPanel, mirrorPanel, lanPanel};",
" View[] all = {connectPanel, controlPanel, mirrorPanel, lanPanel,\n"
" settingsPanel};",
"settingsPanel 纳入 showOnly()", results)
# ---- 6. 首页那个按钮改成「设置」 ----
text = patch(
text,
''' Button relayButton = bigButton("中转设置(跨网络用)", C_ACCENT, 14);''',
''' Button relayButton = bigButton("设置", C_ACCENT, 14);''',
"首页按钮文案改成「设置」", results)
text = patch(
text,
''' public void onClick(View view) {
promptRelayUrl();
}
});
box.addView(relayButton);''',
''' public void onClick(View view) {
showSettingsPanel();
}
});
box.addView(relayButton);''',
"首页按钮改成打开设置页", results)
# ---- 7. 启动时做迁移 ----
# 找 onCreate 里合适的位置:appendLog 第一次出现之前太早,
# 用 "store = " 初始化之后
import re
m = re.search(r"( store = new DeviceStore\(this\);\n)", text)
if m:
text = (text[:m.end()]
+ " // 老版本硬塞的中转地址要清掉(见 migrateLegacyRelay)\n"
" migrateLegacyRelay();\n"
+ text[m.end():])
results.append(("✓", "启动时调用迁移", ""))
else:
results.append(("✗", "启动时调用迁移", "找不到 store 初始化那行"))
# ---- 输出 ----
print(" ── 补丁结果 ──")
for mark, label, note in results:
print(" %s %s%s" % (mark, label, (" —— " + note) if note else ""))
if any(m == "✗" for m, _l, _n in results):
print()
print(" 有锚点没匹配,没有写回")
return 1
if not any(m == "✗" for m, _l, _n in results):
SRC.write_text(text, encoding="utf-8", newline="\n")
print()
print(" 已写回 MainActivity.java")
return 0
if __name__ == "__main__":
sys.exit(main())
+123
View File
@@ -0,0 +1,123 @@
# -*- coding: utf-8 -*-
r'''把某个版本的成品和官网代码传到中转服务器。
用法:
python _build/deploy_release.py 1.9.0
python _build/deploy_release.py 1.9.0 --code-only # 只更新官网代码
python _build/deploy_release.py 1.9.0 --files-only # 只传成品文件
== 为什么写成脚本文件而不是 python -c ==
这一轮我在 PowerShell 里用 `python -c @"..."@` 写带引号和 $ 的
Python 代码,失败了四五次(PowerShell 会插值、会吃掉 $、嵌套引号
转义一层套一层)。凡是超过两行的 Python,一律写成 .py 文件再跑。
== 官网上"最新版"是怎么来的 ==
relay.py 的 _list_downloads() 按 **mtime 倒序** 返回文件,
landing.py 的 _version() 取**第一个**能匹配到 x.y.z 的文件名。
所以"上传哪个版本,官网就显示哪个版本" —— 不用改任何代码。
按顺序传 1.9.0、再传 2.0.0,官网就会先显示 1.9.0、再显示 2.0.0。
'''
from __future__ import annotations
import sys
from pathlib import Path
ROOT = Path(__file__).resolve().parent.parent
sys.path.insert(0, str(ROOT / "_build"))
from devssh import upload, run # noqa: E402
REMOTE_DIR = "/root/lanremote-relay"
DL_DIR = REMOTE_DIR + "/downloads"
# 要传的成品(和 dist/ 里的文件名一致)
ARTIFACTS = [
"ykxmz-setup-{v}.exe",
"ykxmz-watch-{v}.apk",
"ykxmz-watch-{v}-说明.txt",
"ykxmz-server-{v}.zip",
]
# 官网/服务端代码
CODE = ["relay.py", "admin.py", "landing.py", "showcase.py"]
def main() -> int:
args = [a for a in sys.argv[1:] if a]
if not args:
print(__doc__)
return 1
version = args[0]
code_only = "--code-only" in args
files_only = "--files-only" in args
print("=" * 62)
print(" 部署 %s 到中转服务器" % version)
print("=" * 62)
# ---------------- 成品 ----------------
if not code_only:
print()
print(" ── 1. 上传成品到 downloads/ ──")
for tpl in ARTIFACTS:
name = tpl.format(v=version)
local = ROOT / "dist" / name
if not local.is_file():
print(" [跳过] %s 不存在" % name)
continue
upload(str(local), "%s/%s" % (DL_DIR, name))
print(" ✓ %-34s %10d 字节" % (name, local.stat().st_size))
# ---------------- 代码 ----------------
if not files_only:
print()
print(" ── 2. 更新官网/服务端代码 ──")
for name in CODE:
local = ROOT / "relay" / name
if not local.is_file():
print(" [跳过] %s 不存在" % name)
continue
upload(str(local), "%s/%s" % (REMOTE_DIR, name))
print(" ✓ %s" % name)
print()
print(" ── 3. 语法检查 + 重启 ──")
out = run(
"cd %s && python3 - <<'PY'\n"
"import ast\n"
"for f in %r:\n"
" ast.parse(open(f, encoding='utf-8').read())\n"
"print('语法 OK')\n"
"PY" % (REMOTE_DIR, tuple(CODE)),
timeout=90)
print(" " + out[1].strip().splitlines()[-1])
out = run("systemctl restart lanremote-relay && sleep 4 && "
"systemctl is-active lanremote-relay && "
"grep -m1 '^VERSION' %s/relay.py" % REMOTE_DIR, timeout=120)
for ln in out[1].strip().splitlines():
print(" " + ln)
# ---------------- 复核 ----------------
print()
print(" ── 4. 复核:官网现在显示哪个版本 ──")
out = run(
"curl -s -H 'Cache-Control: no-cache' http://127.0.0.1:8080/v1/downloads",
timeout=60)
print(" " + out[1].strip()[:400])
out = run("curl -s -H 'Cache-Control: no-cache' http://127.0.0.1:8080/ "
"| grep -o '最新版 [0-9.]*' | head -1", timeout=60)
print(" 官网首页角标: " + out[1].strip())
print()
print(" 提示:官网 / 走 max-age=60,公网可能需要等一分钟才刷新;")
print(" 下载链接带 604800 缓存,换版本号正好会换 URL。")
return 0
if __name__ == "__main__":
sys.exit(main())
+23 -1
View File
@@ -18,12 +18,34 @@ r'''修 license-combined.txt 里那份**没过期的**协议版本号。
'''
from __future__ import annotations
import re
import sys
from pathlib import Path
ROOT = Path(__file__).resolve().parent.parent
FILE = ROOT / "installer" / "license-combined.txt"
NEW = "1.9.0"
def current_version() -> str:
"""从**单一来源**读版本号。
⚠ 这里原来是写死的 NEW = "1.9.0"。升到 2.0.0 那次它把已经
改好的 license 又**改回了 1.9.0** —— 因为整个升级流程是:
bump_version_generic.py 改一批
fix_license_version.py 再"修"一遍 <- 用写死的旧版本覆盖
写死的常量就是这样:改版本号时忘了改这里,它就成了回退操作。
现在统一从 _build/package_remote.py 的 VERSION 读 ——
那个是打包脚本用的版本号,本来就是单一来源。
"""
text = (ROOT / "_build" / "package_remote.py").read_text(encoding="utf-8")
m = re.search(r'VERSION\s*=\s*"([^"]+)"', text)
if not m:
raise SystemExit(" ✗ 从 package_remote.py 里读不到 VERSION")
return m.group(1)
NEW = current_version()
def main() -> int:
+1 -1
View File
@@ -17,7 +17,7 @@ import zipfile
from pathlib import Path
ROOT = Path(r"C:\Users\shu\Desktop\deepseekagent\LanRemote")
VERSION = "1.9.0"
VERSION = "2.0.0"
NAME = f"ykxmz-{VERSION}"
AGENT_SRC = ROOT / "dist_exe" / "ykxmz"
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More