Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Clear Harmony module cache and recognize minified release versions

Danieldbfb307bb077
diff --git a/scripts/build-release.py b/scripts/build-release.py
index 467825412c..ef33284d30 100644
--- a/scripts/build-release.py
+++ b/scripts/build-release.py
@@ -575,10 +575,12 @@ class Builder:
env["PATH"] = str(self.args.deveco / "tools/node") + os.pathsep + env.get("PATH", "")
run([self.args.deveco / "tools/ohpm/bin/ohpm.bat", "install", "--all"], self.args.harmony_dir, env)
command = [self.args.deveco / "tools/node/node.exe", self.args.deveco / "tools/hvigor/bin/hvigorw.js",
- "--mode", "project", "-p", "product=default", "-p", "buildMode=release", "--no-daemon"]
- run(command + ["clean"], self.args.harmony_dir, env)
+ "-p", "product=default", "-p", "buildMode=release", "--no-daemon"]
+ # 模块级清理移除 CMake 中间库,项目级清理移除 APP 输出。
+ run(command + ["--mode", "module", "-p", "module=entry@default", "clean"], self.args.harmony_dir, env)
+ run(command + ["--mode", "project", "clean"], self.args.harmony_dir, env)
started = time.time()
- run(command + ["assembleApp"], self.args.harmony_dir, env)
+ run(command + ["--mode", "project", "assembleApp"], self.args.harmony_dir, env)
app = self.args.harmony_dir / "build/outputs/default/siyuan-harmony-default-signed.app"
self.collect([app], "鸿蒙", started)
diff --git a/scripts/test_build_release.py b/scripts/test_build_release.py
index bc934aa50f..e0cefc2186 100644
--- a/scripts/test_build_release.py
+++ b/scripts/test_build_release.py
@@ -218,6 +218,8 @@ class BuildTests(unittest.TestCase):
remote = self.root / "wsl"
self.builder.wsl_root = remote
assets = self.write(self.root / "app.zip", b"current assets")
+ stale_kernel = self.write(self.args.harmony_dir / "entry/build/default/intermediates/cmake/libkernel.so",
+ b"stale kernel")
def fake_wsl(command, directory=None, capture=False):
architecture = "arm64" if command[-1] == "build.sh" else "amd64"
@@ -226,7 +228,11 @@ class BuildTests(unittest.TestCase):
self.write(remote / "kernel/harmony/lan_sync_bridge.h", b"bridge")
def fake_run(command, cwd, env=None, capture=False):
+ if command[-1] == "clean" and "module=entry@default" in command:
+ self.assertEqual(command[command.index("--mode") + 1], "module")
+ stale_kernel.unlink()
if command[-1] == "assembleApp":
+ self.assertFalse(stale_kernel.exists())
self.assertIn("buildMode=release", command)
self.write(self.args.harmony_dir / "build/outputs/default/siyuan-harmony-default-unsigned.app")
self.write(self.args.harmony_dir / "build/outputs/default/siyuan-harmony-default-signed.app", b"signed app")
diff --git a/scripts/test_verify_release.py b/scripts/test_verify_release.py
index 3e91345567..633d249d00 100644
--- a/scripts/test_verify_release.py
+++ b/scripts/test_verify_release.py
@@ -394,6 +394,26 @@ class DirectReleaseTests(unittest.TestCase):
with self.assertRaisesRegex(release.VerificationError, "前端版本不匹配"):
release.verify_package(self.package(), version="3.8.4")
+ def test_minified_export_class_version(self):
+ self.resources["stage/build/export/protyle-method.js"] = (
+ b'const gn="3.8.4",bn="production",me=class{};let u=me;u.SIYUAN_VERSION=gn,u.NODE_ENV=bn;')
+ result = release.verify_package(self.package(), version="3.8.4")
+ self.assertEqual(result["frontend_versions"]["stage/build/export/protyle-method.js"], ["3.8.4"])
+ self.resources["stage/build/export/protyle-method.js"] = (
+ self.resources["stage/build/export/protyle-method.js"].replace(b"3.8.4", b"3.8.3"))
+ with self.assertRaisesRegex(release.VerificationError, "导出前端版本不匹配"):
+ release.verify_package(self.package(), version="3.8.4")
+
+ def test_minified_export_rejects_unrelated_or_conflicting_version_bindings(self):
+ for text in (
+ b'const gn="3.8.4",me=class{};let u=other;u.SIYUAN_VERSION=gn;',
+ b'const gn="3.8.4";function f(){const gn="3.8.3";}const me=class{};let u=me;u.SIYUAN_VERSION=gn;',
+ ):
+ with self.subTest(text=text):
+ self.resources["stage/build/export/protyle-method.js"] = text
+ with self.assertRaisesRegex(release.VerificationError, "导出前端版本不匹配"):
+ release.verify_package(self.package(), version="3.8.4")
+
def test_unreferenced_current_bundle_cannot_hide_old_frontend(self):
self.resources["stage/build/mobile/unused.js"] = self.resources["stage/build/mobile/main.js"]
self.resources["stage/build/mobile/main.js"] = self.resources["stage/build/mobile/main.js"].replace(b"3.8.4", b"3.8.3")
diff --git a/scripts/verify-release.py b/scripts/verify-release.py
index 78c38ff5fe..fe815eb8b8 100644
--- a/scripts/verify-release.py
+++ b/scripts/verify-release.py
@@ -346,14 +346,21 @@ def frontend_versions(text):
if match[1]:
versions.add(match[1])
continue
- # 仅解析 Constants 模块内紧邻赋值的常量,不执行安装包里的 JavaScript。
+ # 仅解析 Constants 模块或压缩后的类绑定附近的常量,不执行安装包里的 JavaScript。
prefix = text[max(0, match.start() - 3000):match.start()]
marker = prefix.rfind("Constants:")
if marker < 0:
marker = prefix.rfind("class Constants")
if marker < 0:
- continue
- prefix = prefix[marker:]
+ minified = re.search(
+ r"\b(?P<binding>[A-Za-z_$][\w$]*)\s*=\s*class\s*\{\s*\}\s*;\s*"
+ r"(?:let|const|var)\s+(?P<receiver>[A-Za-z_$][\w$]*)\s*=\s*(?P=binding)\s*;\s*"
+ r"(?P=receiver)\.\s*$", prefix)
+ if minified is None:
+ continue
+ prefix = prefix[:minified.start()]
+ else:
+ prefix = prefix[marker:]
binding = re.compile(r"(?:\bconst\s+|\blet\s+|\bvar\s+|,)" + re.escape(match[2])
+ r"\s*=\s*[\"'](" + VERSION + r")[\"']")
candidates = {item[1] for item in binding.finditer(prefix)}