@modusensus/dsh-mneme 0.7.31 → 0.7.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +24 -8
- package/lib/api.js +79 -6
- package/lib/client.js +217 -30
- package/lib/commands.js +6 -2
- package/lib/config.js +80 -14
- package/lib/dream/decisions.js +147 -14
- package/lib/dream/sleep.js +84 -34
- package/lib/dream.js +250 -60
- package/lib/embedding.js +22 -2
- package/lib/index.js +68 -37
- package/lib/inject.js +16 -9
- package/lib/lang.js +156 -0
- package/lib/local-embedder.js +23 -9
- package/lib/mirror.js +17 -14
- package/lib/reranker.js +23 -8
- package/lib/runtime/adopt.js +176 -0
- package/lib/runtime/closure.js +172 -0
- package/lib/runtime/download.js +247 -0
- package/lib/runtime/layout.js +235 -0
- package/lib/runtime/loader.js +249 -0
- package/lib/runtime/provision.js +237 -0
- package/lib/runtime/tarball.js +130 -0
- package/lib/runtime/verify.js +191 -0
- package/lib/service.js +102 -8
- package/lib/settings.js +36 -2
- package/lib/store.js +26 -8
- package/lib/summarize.js +108 -35
- package/lib/tools.js +119 -0
- package/package.json +7 -2
- package/runtime-manifest.json +596 -0
- package/scripts/build-runtime-manifest.mjs +217 -0
- package/scripts/mneme-runtime.mjs +277 -0
- package/src/api.js +79 -6
- package/src/commands.js +6 -2
- package/src/config.js +80 -14
- package/src/dream/decisions.js +147 -14
- package/src/dream/sleep.js +84 -34
- package/src/dream.js +250 -60
- package/src/embedding.js +22 -2
- package/src/index.js +68 -37
- package/src/inject.js +16 -9
- package/src/lang.js +156 -0
- package/src/local-embedder.js +23 -9
- package/src/mirror.js +17 -14
- package/src/reranker.js +23 -8
- package/src/runtime/adopt.js +176 -0
- package/src/runtime/closure.js +172 -0
- package/src/runtime/download.js +247 -0
- package/src/runtime/layout.js +235 -0
- package/src/runtime/loader.js +249 -0
- package/src/runtime/provision.js +237 -0
- package/src/runtime/tarball.js +130 -0
- package/src/runtime/verify.js +191 -0
- package/src/service.js +102 -8
- package/src/settings.js +36 -2
- package/src/store.js +26 -8
- package/src/summarize.js +108 -35
- package/src/tools.js +119 -0
- package/test/api.test.js +89 -9
- package/test/client.test.js +94 -10
- package/test/config.test.js +17 -1
- package/test/dream-candidate-hybrid.test.js +281 -0
- package/test/dream.test.js +172 -0
- package/test/embedding-ready.test.js +196 -0
- package/test/helpers/runtime-source.js +60 -0
- package/test/helpers/tar-builder.js +80 -0
- package/test/inject.test.js +37 -1
- package/test/lang.test.js +87 -0
- package/test/quality-filter.test.js +68 -0
- package/test/reasoning-effort.test.js +106 -15
- package/test/reindex-backfill.test.js +62 -0
- package/test/runtime-adopt.test.js +206 -0
- package/test/runtime-cli.test.js +89 -0
- package/test/runtime-closure.test.js +193 -0
- package/test/runtime-download.test.js +302 -0
- package/test/runtime-layout.test.js +163 -0
- package/test/runtime-loader.test.js +237 -0
- package/test/runtime-manifest.test.js +158 -0
- package/test/runtime-provision.test.js +101 -0
- package/test/runtime-tarball.test.js +82 -0
- package/test/runtime-verify.test.js +214 -0
- package/test/sleep-action-set.test.js +422 -0
- package/test/store.test.js +14 -0
- package/test/summarize.test.js +224 -0
- package/test/tools.test.js +30 -5
- package/test/webServer-optional.test.js +34 -1
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
import test from "node:test";
|
|
2
|
+
import assert from "node:assert/strict";
|
|
3
|
+
import { existsSync, mkdirSync, mkdtempSync, symlinkSync, writeFileSync } from "node:fs";
|
|
4
|
+
import { tmpdir } from "node:os";
|
|
5
|
+
import { join } from "node:path";
|
|
6
|
+
import { adoptRuntime, materializePackage, RUNTIME_MANIFEST_VERSION } from "../src/runtime/adopt.js";
|
|
7
|
+
import { describePayload, nodeModulesDir, payloadDir, payloadId, runtimeManifestPath } from "../src/runtime/layout.js";
|
|
8
|
+
import { readJsonSafe } from "../src/runtime/layout.js";
|
|
9
|
+
|
|
10
|
+
// 收编(issue #131 / PR-A):守住「老用户升级后本地嵌入不断」这条底线。
|
|
11
|
+
// 关键判据是——源布局被如实镜像(含嵌套层)、同卷走硬链接、符号链接不跟随、
|
|
12
|
+
// 产出的目录能通过结构检查。
|
|
13
|
+
|
|
14
|
+
/** 造一份「像真的」源 node_modules:入口 + 三平台单包 + 平台分片 + 嵌套版本冲突。 */
|
|
15
|
+
function makeSource({ withSymlink = false } = {}) {
|
|
16
|
+
const base = mkdtempSync(join(tmpdir(), "mneme-adopt-src-"));
|
|
17
|
+
const nm = join(base, "node_modules");
|
|
18
|
+
const write = (rel, body) => {
|
|
19
|
+
const full = join(nm, rel);
|
|
20
|
+
mkdirSync(join(full, ".."), { recursive: true });
|
|
21
|
+
writeFileSync(full, body);
|
|
22
|
+
};
|
|
23
|
+
const pkg = (rel, manifest) => write(join(rel, "package.json"), JSON.stringify(manifest));
|
|
24
|
+
|
|
25
|
+
pkg("@huggingface/transformers", {
|
|
26
|
+
name: "@huggingface/transformers",
|
|
27
|
+
version: "4.2.0",
|
|
28
|
+
dependencies: { "onnxruntime-node": "1.24.3", sharp: "^0.34.5" }
|
|
29
|
+
});
|
|
30
|
+
write("@huggingface/transformers/dist/transformers.node.mjs", "export const real = true;\n");
|
|
31
|
+
|
|
32
|
+
pkg("onnxruntime-node", { name: "onnxruntime-node", version: "1.24.3", dependencies: { "onnxruntime-common": "1.24.3" } });
|
|
33
|
+
write("onnxruntime-node/bin/napi-v6/win32/x64/onnxruntime.dll", "dll-bytes\n");
|
|
34
|
+
write("onnxruntime-node/bin/napi-v6/darwin/arm64/libonnxruntime.dylib", "dylib-bytes\n");
|
|
35
|
+
|
|
36
|
+
pkg("onnxruntime-common", { name: "onnxruntime-common", version: "1.24.3" });
|
|
37
|
+
write("onnxruntime-common/index.js", "export default 1;\n");
|
|
38
|
+
|
|
39
|
+
pkg("sharp", { name: "sharp", version: "0.34.5" });
|
|
40
|
+
write("sharp/index.js", "export default 2;\n");
|
|
41
|
+
|
|
42
|
+
if (withSymlink) write("sharp/linked.js", "export default 3;\n");
|
|
43
|
+
|
|
44
|
+
return { base, nm, write };
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
test("收编:镜像源布局(含嵌套层),并写出清单", () => {
|
|
48
|
+
const { nm } = makeSource();
|
|
49
|
+
const runtimeDir = mkdtempSync(join(tmpdir(), "mneme-adopt-dst-"));
|
|
50
|
+
const result = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64" });
|
|
51
|
+
|
|
52
|
+
assert.equal(result.ok, true, result.reason);
|
|
53
|
+
assert.equal(result.payloadId, "transformers-4.2.0-node-win32-x64");
|
|
54
|
+
assert.equal(result.payloadDir, payloadDir(runtimeDir, payloadId({ version: "4.2.0", platform: "win32", arch: "x64" })));
|
|
55
|
+
|
|
56
|
+
const manifest = readJsonSafe(runtimeManifestPath(result.payloadDir));
|
|
57
|
+
assert.equal(manifest.manifestVersion, RUNTIME_MANIFEST_VERSION);
|
|
58
|
+
assert.equal(manifest.procedure, "adopted");
|
|
59
|
+
assert.equal(manifest.version, "4.2.0");
|
|
60
|
+
assert.ok(manifest.packages.some((p) => p.rel === "onnxruntime-node"));
|
|
61
|
+
|
|
62
|
+
// 收编产物必须能通过结构检查——这是「adopt 与 layout 契约一致」的整合判据。
|
|
63
|
+
const report = describePayload(result.payloadDir, { platform: "win32", arch: "x64" });
|
|
64
|
+
assert.equal(report.ok, true, `missing=${report.missing} reasons=${report.reasons}`);
|
|
65
|
+
assert.equal(report.manifest?.procedure, "adopted");
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
test("收编:同卷走硬链接(不额外占盘),且文件内容一致", () => {
|
|
69
|
+
const { nm } = makeSource();
|
|
70
|
+
const runtimeDir = mkdtempSync(join(tmpdir(), "mneme-adopt-dst-"));
|
|
71
|
+
const result = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64" });
|
|
72
|
+
|
|
73
|
+
assert.equal(result.totals.files, result.totals.linked + result.totals.copied, "每个文件要么链接要么复制");
|
|
74
|
+
assert.ok(result.totals.linked > 0, `同卷应当走硬链接,实际 linked=${result.totals.linked} copied=${result.totals.copied}`);
|
|
75
|
+
assert.ok(result.totals.bytes > 0);
|
|
76
|
+
assert.equal(result.manifest.materialize.mode, "hardlink");
|
|
77
|
+
assert.equal(result.manifest.materialize.linkError, null, "没回退就不该有 linkError");
|
|
78
|
+
|
|
79
|
+
const copied = join(nodeModulesDir(result.payloadDir), "onnxruntime-node", "bin", "napi-v6", "win32", "x64", "onnxruntime.dll");
|
|
80
|
+
assert.equal(readJsonSafe(copied), undefined, "非 JSON 内容应当原样搬过来");
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
test("收编:硬链接不可用时回退复制,并把原因如实记进清单与 warnings", () => {
|
|
84
|
+
const { nm } = makeSource();
|
|
85
|
+
const runtimeDir = mkdtempSync(join(tmpdir(), "mneme-adopt-dst-"));
|
|
86
|
+
// 注入一个必定失败的 linkSync,覆盖「跨卷 / 权限不足」这类本机不可复现的环境差异。
|
|
87
|
+
const denyLink = () => {
|
|
88
|
+
const error = new Error("operation not permitted, link");
|
|
89
|
+
error.code = "EPERM";
|
|
90
|
+
throw error;
|
|
91
|
+
};
|
|
92
|
+
const result = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64", link: denyLink });
|
|
93
|
+
|
|
94
|
+
assert.equal(result.ok, true, result.reason);
|
|
95
|
+
assert.equal(result.totals.linked, 0);
|
|
96
|
+
assert.equal(result.totals.copied, result.totals.files);
|
|
97
|
+
assert.equal(result.manifest.materialize.mode, "copy");
|
|
98
|
+
assert.match(result.manifest.materialize.linkError, /EPERM/);
|
|
99
|
+
assert.equal(
|
|
100
|
+
result.manifest.warnings.filter((w) => w.includes("硬链接不可用")).length,
|
|
101
|
+
1,
|
|
102
|
+
"同一次收编只该记一条回退原因,不是每个文件记一条"
|
|
103
|
+
);
|
|
104
|
+
// 回退之后产物依然必须能通过结构检查——回退不能以正确性为代价。
|
|
105
|
+
assert.equal(describePayload(result.payloadDir, { platform: "win32", arch: "x64" }).ok, true);
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
test("收编:跳过嵌套 node_modules,避免把同一份包搬两遍", () => {
|
|
109
|
+
const { nm, write } = makeSource();
|
|
110
|
+
// 给入口包塞一个嵌套副本:闭包不会把它当作依赖,因此不该被搬进产物。
|
|
111
|
+
write("@huggingface/transformers/node_modules/orphan/index.js", "orphan\n");
|
|
112
|
+
write("@huggingface/transformers/node_modules/orphan/package.json", JSON.stringify({ name: "orphan", version: "1.0.0" }));
|
|
113
|
+
|
|
114
|
+
const runtimeDir = mkdtempSync(join(tmpdir(), "mneme-adopt-dst-"));
|
|
115
|
+
const result = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64" });
|
|
116
|
+
assert.equal(result.ok, true, result.reason);
|
|
117
|
+
|
|
118
|
+
const orphan = join(nodeModulesDir(result.payloadDir), "@huggingface", "transformers", "node_modules", "orphan");
|
|
119
|
+
assert.equal(describePayload(result.payloadDir, { platform: "win32", arch: "x64" }).ok, true);
|
|
120
|
+
assert.equal(readJsonSafe(join(orphan, "package.json")), undefined, "不可达的嵌套包不该被搬进来");
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
test("收编:符号链接不跟随,记进 warnings(isolated 布局的来源会被如实暴露)", (t) => {
|
|
124
|
+
const { nm, write } = makeSource();
|
|
125
|
+
const real = join(nm, "sharp", "index.js");
|
|
126
|
+
const link = join(nm, "sharp", "linked.js");
|
|
127
|
+
try {
|
|
128
|
+
symlinkSync(real, link, "file");
|
|
129
|
+
} catch {
|
|
130
|
+
t.skip("当前环境不允许创建符号链接(Windows 需要开发者模式),跳过该断言");
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
assert.ok(write);
|
|
134
|
+
|
|
135
|
+
const runtimeDir = mkdtempSync(join(tmpdir(), "mneme-adopt-dst-"));
|
|
136
|
+
const result = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64" });
|
|
137
|
+
assert.equal(result.totals.symlinks, 1);
|
|
138
|
+
assert.ok(result.manifest.warnings.some((w) => w.includes("符号链接")));
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
test("收编:目标已存在时默认拒绝,overwrite 才覆盖", () => {
|
|
142
|
+
const { nm } = makeSource();
|
|
143
|
+
const runtimeDir = mkdtempSync(join(tmpdir(), "mneme-adopt-dst-"));
|
|
144
|
+
const first = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64" });
|
|
145
|
+
assert.equal(first.ok, true);
|
|
146
|
+
|
|
147
|
+
const again = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64" });
|
|
148
|
+
assert.equal(again.ok, false);
|
|
149
|
+
assert.match(again.reason, /目标已存在/);
|
|
150
|
+
|
|
151
|
+
const forced = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64", overwrite: true });
|
|
152
|
+
assert.equal(forced.ok, true);
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
test("收编:源里没有入口包时给出可读原因,不抛异常", () => {
|
|
156
|
+
const empty = mkdtempSync(join(tmpdir(), "mneme-adopt-empty-"));
|
|
157
|
+
mkdirSync(join(empty, "node_modules"), { recursive: true });
|
|
158
|
+
const result = adoptRuntime({ fromModulesDir: join(empty, "node_modules") });
|
|
159
|
+
assert.equal(result.ok, false);
|
|
160
|
+
assert.match(result.reason, /入口包不存在|入口包未解析到/);
|
|
161
|
+
});
|
|
162
|
+
|
|
163
|
+
test("materializePackage:统计文件与字节数,返回自身可测", () => {
|
|
164
|
+
const { base } = makeSource();
|
|
165
|
+
const src = join(base, "node_modules", "onnxruntime-common");
|
|
166
|
+
const dest = mkdtempSync(join(tmpdir(), "mneme-materialize-"));
|
|
167
|
+
const stats = materializePackage({ srcDir: src, destDir: join(dest, "pkg") });
|
|
168
|
+
assert.equal(stats.files, 2, "package.json + index.js");
|
|
169
|
+
assert.ok(stats.bytes > 0);
|
|
170
|
+
assert.equal(stats.symlinks, 0);
|
|
171
|
+
});
|
|
172
|
+
|
|
173
|
+
test("覆盖收编:先清空目标目录,否则硬链接全部退化成复制、残留文件也清不掉", () => {
|
|
174
|
+
const { nm } = makeSource();
|
|
175
|
+
const runtimeDir = mkdtempSync(join(tmpdir(), "mneme-adopt-dst-"));
|
|
176
|
+
const first = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64" });
|
|
177
|
+
assert.equal(first.ok, true, first.reason);
|
|
178
|
+
assert.equal(first.manifest.materialize.mode, "hardlink");
|
|
179
|
+
|
|
180
|
+
// 只可能来自上一次收编的残留文件:覆盖时必须被清掉。
|
|
181
|
+
const stale = join(first.payloadDir, "stale-from-previous-run");
|
|
182
|
+
writeFileSync(stale, "stale\n");
|
|
183
|
+
|
|
184
|
+
const second = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64", overwrite: true });
|
|
185
|
+
assert.equal(second.ok, true, second.reason);
|
|
186
|
+
// 不清空目标目录的话,linkSync 对已存在的目标路径抛 EEXIST,每个文件都掉进复制分支:
|
|
187
|
+
// 物化方式会假报成 copy,warnings 会错说「硬链接不可用」,整份闭包真实占盘。
|
|
188
|
+
assert.equal(second.manifest.materialize.mode, "hardlink", "覆盖不该把硬链接降级成复制");
|
|
189
|
+
assert.equal(second.manifest.materialize.linkError, null);
|
|
190
|
+
assert.equal(existsSync(stale), false, "上一次收编的残留文件必须被清掉");
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
test("截断的闭包必须拒绝:宁可明确失败,也不要产出一份看起来可用的运行时", () => {
|
|
194
|
+
const { nm } = makeSource();
|
|
195
|
+
const runtimeDir = mkdtempSync(join(tmpdir(), "mneme-adopt-dst-"));
|
|
196
|
+
// 上限 1 个包,必然截断传递依赖。结构检查只看必需包/版本/入口,所以这种残缺 payload
|
|
197
|
+
// 本来会被判为可用、被 loader 选中,然后在 import 原生模块时才炸。
|
|
198
|
+
const result = adoptRuntime({ fromModulesDir: nm, runtimeDir, platform: "win32", arch: "x64", maxPackages: 1 });
|
|
199
|
+
assert.equal(result.ok, false);
|
|
200
|
+
assert.match(result.reason, /截断/);
|
|
201
|
+
assert.equal(
|
|
202
|
+
existsSync(payloadDir(runtimeDir, payloadId({ version: "4.2.0", platform: "win32", arch: "x64" }))),
|
|
203
|
+
false,
|
|
204
|
+
"拒绝时不该留下半份 payload"
|
|
205
|
+
);
|
|
206
|
+
});
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import test from "node:test";
|
|
2
|
+
import assert from "node:assert/strict";
|
|
3
|
+
import { makeEmptyModules, makeSourceModules } from "./helpers/runtime-source.js";
|
|
4
|
+
|
|
5
|
+
// 这个 CLI 脚本原先不在任何测试覆盖里:USAGE 模板字面量里多一个反引号就能让它整体语法错误,
|
|
6
|
+
// 而 CI 依然全绿 —— package.json 的 `test` 只跑 test/*.test.js,从不碰 scripts/。踩过一次。
|
|
7
|
+
//
|
|
8
|
+
// 这里动态 import 它:解析与求值都会真的发生,任何语法错都会让下面的测试直接炸。
|
|
9
|
+
// 脚本侧有 invokedDirectly 守卫,所以 import 不会顺带跑起 CLI。
|
|
10
|
+
const cli = await import("../scripts/mneme-runtime.mjs");
|
|
11
|
+
|
|
12
|
+
test("CLI 脚本能被解析并求值(语法错必须在这里现形,而不是发布出去)", () => {
|
|
13
|
+
assert.equal(typeof cli.main, "function");
|
|
14
|
+
assert.equal(typeof cli.parseArgs, "function");
|
|
15
|
+
assert.equal(typeof cli.UsageError, "function");
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
test("CLI:--key value 与 --flag 各自解析正确", () => {
|
|
19
|
+
assert.deepEqual(cli.parseArgs(["--runtime", "/rt", "--from", "/nm", "--json"]), {
|
|
20
|
+
runtime: "/rt",
|
|
21
|
+
from: "/nm",
|
|
22
|
+
json: true
|
|
23
|
+
});
|
|
24
|
+
assert.deepEqual(cli.parseArgs(["--overwrite"]), { overwrite: true });
|
|
25
|
+
assert.deepEqual(cli.parseArgs([]), {});
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
test("CLI:带值选项缺值必须是用法错误 —— 不能把 \"true\" 当路径用下去", () => {
|
|
29
|
+
for (const key of ["runtime", "from", "cache-dir"]) {
|
|
30
|
+
assert.throws(() => cli.parseArgs([`--${key}`]), cli.UsageError, `--${key} 缺值应当报用法错误`);
|
|
31
|
+
// 后面紧跟另一个选项同样算缺值:不能把这个选项吞成上一个选项的值。
|
|
32
|
+
assert.throws(() => cli.parseArgs([`--${key}`, "--json"]), cli.UsageError, `--${key} 后接选项也算缺值`);
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
test("CLI:未知选项立刻报错,而不是静默忽略(打错字要立刻可见)", () => {
|
|
37
|
+
assert.throws(() => cli.parseArgs(["--runtim", "/rt"]), cli.UsageError);
|
|
38
|
+
assert.throws(() => cli.parseArgs(["-h"]), cli.UsageError);
|
|
39
|
+
assert.throws(() => cli.parseArgs(["/rt"]), cli.UsageError);
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
/** 捕获 console.log,用来断言 CLI 打印给用户的那几行。 */
|
|
43
|
+
async function captureLog(fn) {
|
|
44
|
+
const original = console.log;
|
|
45
|
+
const lines = [];
|
|
46
|
+
console.log = (...args) => lines.push(args.join(" "));
|
|
47
|
+
try {
|
|
48
|
+
return { value: await fn(), text: lines.join("\n") };
|
|
49
|
+
} finally {
|
|
50
|
+
console.log = original;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* 可收编源的夹具有两处要用(这里与 test/runtime-adopt-service.test.js),
|
|
56
|
+
* 所以放在 test/helpers/runtime-source.js —— 两份漂移过一次就会有两种结论。
|
|
57
|
+
*/
|
|
58
|
+
|
|
59
|
+
test("CLI adopt:源里没有入口包时给出干净原因,不能抛 TypeError(评审阻塞项)", async () => {
|
|
60
|
+
const src = makeEmptyModules();
|
|
61
|
+
// 修之前这里会抛:adoptRuntime 失败时不带 payloadDir,却被当成路径喂给 describePayload。
|
|
62
|
+
const { value, text } = await captureLog(() =>
|
|
63
|
+
cli.runAdopt({ runtimeDir: src.runtimeDir, asJson: false, options: { from: src.nm } })
|
|
64
|
+
);
|
|
65
|
+
assert.equal(value, 1);
|
|
66
|
+
assert.match(text, /收编失败:/, `应当打印干净原因,实际输出:${text}`);
|
|
67
|
+
assert.match(text, /入口包/);
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
test("CLI adopt:必需传递依赖缺口必须让退出码变红(评审阻塞项)", async () => {
|
|
71
|
+
const src = makeSourceModules({ withMissingDep: true });
|
|
72
|
+
const { value, text } = await captureLog(() =>
|
|
73
|
+
cli.runAdopt({ runtimeDir: src.runtimeDir, asJson: false, options: { from: src.nm } })
|
|
74
|
+
);
|
|
75
|
+
// 结构检查会「通过」——它只看三个必需包;缺口只有闭包计划知道。
|
|
76
|
+
assert.match(text, /结构检查:通过/);
|
|
77
|
+
assert.match(text, /缺失依赖:definitely-not-installed-pkg/);
|
|
78
|
+
assert.match(text, /闭包完整性:未通过/);
|
|
79
|
+
assert.equal(value, 1, "闭包缺件时退出码必须是 1,否则脚本化 gate 会在最需要它的时候误报健康");
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
test("CLI adopt:闭包完整时仍然报 0(防止上面那条修复过度触发)", async () => {
|
|
83
|
+
const src = makeSourceModules();
|
|
84
|
+
const { value, text } = await captureLog(() =>
|
|
85
|
+
cli.runAdopt({ runtimeDir: src.runtimeDir, asJson: false, options: { from: src.nm } })
|
|
86
|
+
);
|
|
87
|
+
assert.match(text, /结构检查:通过/);
|
|
88
|
+
assert.equal(value, 0, text);
|
|
89
|
+
});
|
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
import test from "node:test";
|
|
2
|
+
import assert from "node:assert/strict";
|
|
3
|
+
import { mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
|
|
4
|
+
import { tmpdir } from "node:os";
|
|
5
|
+
import { dirname, join } from "node:path";
|
|
6
|
+
import { DEFAULT_MAX_PACKAGES, matchesPlatform, planClosure, resolvePackageDir } from "../src/runtime/closure.js";
|
|
7
|
+
|
|
8
|
+
// 依赖闭包遍历(issue #131 / PR-A):守住四条判据——按源布局镜像、平台过滤、
|
|
9
|
+
// 可选依赖缺失不算错、peer 不进闭包。它是 adopt / export 的共同地基,
|
|
10
|
+
// 走错一步就会把宿主整棵树拖进来(或漏带一个真需要的包)。
|
|
11
|
+
|
|
12
|
+
/** 从 rel 路径推导包名(处理 scope 与嵌套 node_modules)。 */
|
|
13
|
+
function nameFromRel(rel) {
|
|
14
|
+
const parts = rel.split("/");
|
|
15
|
+
const i = parts.lastIndexOf("node_modules");
|
|
16
|
+
return (i === -1 ? parts : parts.slice(i + 1)).join("/");
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/** 按紧凑的 spec 造一棵假的 node_modules 树。 */
|
|
20
|
+
function makeTree(spec) {
|
|
21
|
+
const base = mkdtempSync(join(tmpdir(), "mneme-closure-"));
|
|
22
|
+
// 刻意多套一层 proj/:这样「不允许解析越出源树」这条判据才测得出来
|
|
23
|
+
// (源树的上一级就是 base,base/node_modules 里的包必须解析不到)。
|
|
24
|
+
const nm = join(base, "proj", "node_modules");
|
|
25
|
+
mkdirSync(nm, { recursive: true });
|
|
26
|
+
for (const [rel, def = {}] of Object.entries(spec)) {
|
|
27
|
+
const dir = join(nm, rel);
|
|
28
|
+
mkdirSync(dir, { recursive: true });
|
|
29
|
+
writeFileSync(
|
|
30
|
+
join(dir, "package.json"),
|
|
31
|
+
JSON.stringify({
|
|
32
|
+
name: def.name ?? nameFromRel(rel),
|
|
33
|
+
version: def.version ?? "1.0.0",
|
|
34
|
+
...(def.deps ? { dependencies: def.deps } : {}),
|
|
35
|
+
...(def.optional ? { optionalDependencies: def.optional } : {}),
|
|
36
|
+
...(def.peers ? { peerDependencies: def.peers } : {}),
|
|
37
|
+
...(def.os ? { os: def.os } : {}),
|
|
38
|
+
...(def.cpu ? { cpu: def.cpu } : {})
|
|
39
|
+
})
|
|
40
|
+
);
|
|
41
|
+
}
|
|
42
|
+
return { base, nm };
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* 一份贴近真实的树:transformers 是入口,它同时带 onnxruntime-node(多平台单包)、
|
|
47
|
+
* onnxruntime-web(自带一份不同版本的 onnxruntime-common)、sharp(平台分片走
|
|
48
|
+
* optionalDependencies),外加 peer、环、缺件四种边界。
|
|
49
|
+
*/
|
|
50
|
+
function realisticTree() {
|
|
51
|
+
return makeTree({
|
|
52
|
+
"@huggingface/transformers": {
|
|
53
|
+
version: "4.2.0",
|
|
54
|
+
deps: {
|
|
55
|
+
"onnxruntime-node": "1.24.3",
|
|
56
|
+
"onnxruntime-web": "1.26.0-dev",
|
|
57
|
+
sharp: "^0.34.5",
|
|
58
|
+
"@huggingface/tokenizers": "^0.1.3",
|
|
59
|
+
"@huggingface/jinja": "^0.5.6",
|
|
60
|
+
"darwin-only-pkg": "1.0.0"
|
|
61
|
+
},
|
|
62
|
+
peers: { "@deepseek-ai/cordis": "^4.0.1" }
|
|
63
|
+
},
|
|
64
|
+
"onnxruntime-node": { version: "1.24.3", deps: { "onnxruntime-common": "1.24.3", "adm-zip": "^0.5.16" } },
|
|
65
|
+
"onnxruntime-web": {
|
|
66
|
+
version: "1.26.0-dev",
|
|
67
|
+
deps: { "onnxruntime-common": "1.24.0-dev" }
|
|
68
|
+
},
|
|
69
|
+
"onnxruntime-web/node_modules/onnxruntime-common": { version: "1.24.0-dev" },
|
|
70
|
+
"onnxruntime-common": { version: "1.24.3" },
|
|
71
|
+
"adm-zip": { deps: { "global-agent": "^3.0.0" } },
|
|
72
|
+
"global-agent": { deps: { "adm-zip": "^0.5.16" } },
|
|
73
|
+
sharp: { version: "0.34.5", optional: { "@img/sharp-win32-x64": "0.34.5", "@img/sharp-darwin-arm64": "0.34.5" } },
|
|
74
|
+
"@img/sharp-win32-x64": { version: "0.34.5", os: ["win32"], cpu: ["x64"] },
|
|
75
|
+
"@img/sharp-darwin-arm64": { version: "0.34.5", os: ["darwin"], cpu: ["arm64"] },
|
|
76
|
+
"@huggingface/tokenizers": { version: "0.1.3", optional: { "not-installed-optional": "^1.0.0" } },
|
|
77
|
+
"@huggingface/jinja": { version: "0.5.6", deps: { "missing-required-thing": "^1.0.0" } },
|
|
78
|
+
"darwin-only-pkg": { os: ["darwin"] },
|
|
79
|
+
// 只在 root 之外存在,用来验证解析不会越出源树
|
|
80
|
+
"@deepseek-ai/cordis": { version: "4.0.2" }
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
test("按源布局镜像:嵌套的那份依赖与原位版本都被保留", () => {
|
|
85
|
+
const { nm } = realisticTree();
|
|
86
|
+
const plan = planClosure({ rootModulesDir: nm, platform: "win32", arch: "x64" });
|
|
87
|
+
const byRel = new Map(plan.packages.map((p) => [p.rel, p]));
|
|
88
|
+
|
|
89
|
+
assert.equal(byRel.get("@huggingface/transformers")?.version, "4.2.0");
|
|
90
|
+
assert.equal(byRel.get("onnxruntime-common")?.version, "1.24.3", "顶层那份");
|
|
91
|
+
assert.equal(
|
|
92
|
+
byRel.get("onnxruntime-web/node_modules/onnxruntime-common")?.version,
|
|
93
|
+
"1.24.0-dev",
|
|
94
|
+
"嵌套那份必须按原层级保留,否则解析结果会被悄悄改掉"
|
|
95
|
+
);
|
|
96
|
+
assert.equal(plan.gaps.filter((g) => g.reason === "必需依赖未找到").length, 1);
|
|
97
|
+
assert.deepEqual(plan.gaps[0], { name: "missing-required-thing", from: "@huggingface/jinja", reason: "必需依赖未找到" });
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
test("平台分片包:只带当前平台的,另一个记进 skipped", () => {
|
|
101
|
+
const { nm } = realisticTree();
|
|
102
|
+
const plan = planClosure({ rootModulesDir: nm, platform: "win32", arch: "x64" });
|
|
103
|
+
const rels = plan.packages.map((p) => p.rel);
|
|
104
|
+
assert.ok(rels.includes("@img/sharp-win32-x64"));
|
|
105
|
+
assert.equal(rels.includes("@img/sharp-darwin-arm64"), false, "darwin 分片不该进闭包");
|
|
106
|
+
assert.deepEqual(
|
|
107
|
+
plan.skipped.map((s) => s.rel).sort(),
|
|
108
|
+
["@img/sharp-darwin-arm64", "darwin-only-pkg"].sort(),
|
|
109
|
+
"两个平台不匹配的包都该被记下来"
|
|
110
|
+
);
|
|
111
|
+
// 交叉验证:换成 darwin/arm64 时,该带的是另外那个。
|
|
112
|
+
const darwin = planClosure({ rootModulesDir: nm, platform: "darwin", arch: "arm64" });
|
|
113
|
+
const darwinRels = darwin.packages.map((p) => p.rel);
|
|
114
|
+
assert.ok(darwinRels.includes("@img/sharp-darwin-arm64"));
|
|
115
|
+
assert.equal(darwinRels.includes("@img/sharp-win32-x64"), false);
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
test("peerDependencies 不进闭包(宿主提供的东西不该被复制进来)", () => {
|
|
119
|
+
const { nm } = realisticTree();
|
|
120
|
+
const plan = planClosure({ rootModulesDir: nm, platform: "win32", arch: "x64" });
|
|
121
|
+
assert.equal(plan.packages.some((p) => p.rel === "@deepseek-ai/cordis"), false);
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
test("可选依赖缺失不算错,必需依赖缺失才记 gap", () => {
|
|
125
|
+
const { nm } = realisticTree();
|
|
126
|
+
const plan = planClosure({ rootModulesDir: nm, platform: "win32", arch: "x64" });
|
|
127
|
+
assert.equal(plan.gaps.some((g) => g.name === "not-installed-optional"), false);
|
|
128
|
+
assert.equal(plan.gaps.filter((g) => g.name === "missing-required-thing").length, 1);
|
|
129
|
+
// 平台分片包在别的平台上缺席,同样不算 gap
|
|
130
|
+
assert.equal(plan.gaps.some((g) => g.name === "@img/sharp-darwin-arm64"), false);
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
test("依赖成环也能终止,且每个包只出现一次", () => {
|
|
134
|
+
const { nm } = realisticTree();
|
|
135
|
+
const plan = planClosure({ rootModulesDir: nm, platform: "win32", arch: "x64" });
|
|
136
|
+
const rels = plan.packages.map((p) => p.rel);
|
|
137
|
+
assert.equal(rels.filter((r) => r === "adm-zip").length, 1);
|
|
138
|
+
assert.equal(rels.filter((r) => r === "global-agent").length, 1);
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
test("条目上限命中时截断并如实上报,不静默丢包", () => {
|
|
142
|
+
const { nm } = realisticTree();
|
|
143
|
+
const plan = planClosure({ rootModulesDir: nm, platform: "win32", arch: "x64", maxPackages: 3 });
|
|
144
|
+
assert.equal(plan.truncated, true);
|
|
145
|
+
assert.equal(plan.packages.length, 3);
|
|
146
|
+
assert.ok(DEFAULT_MAX_PACKAGES >= 100, "默认上限应当足够容纳真实闭包");
|
|
147
|
+
});
|
|
148
|
+
|
|
149
|
+
test("入口包不存在:只记一条 gap,不抛异常", () => {
|
|
150
|
+
const { nm } = makeTree({});
|
|
151
|
+
const plan = planClosure({ rootModulesDir: nm, entry: "@huggingface/transformers" });
|
|
152
|
+
assert.deepEqual(plan.packages, []);
|
|
153
|
+
assert.equal(plan.gaps.length, 1);
|
|
154
|
+
assert.match(plan.gaps[0].reason, /入口包不存在/);
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
test("resolvePackageDir:优先取最近的一层,且绝不越出源树", () => {
|
|
158
|
+
const { nm } = realisticTree();
|
|
159
|
+
const web = join(nm, "onnxruntime-web");
|
|
160
|
+
const nested = resolvePackageDir(web, "onnxruntime-common", nm);
|
|
161
|
+
assert.equal(nested, join(nm, "onnxruntime-web", "node_modules", "onnxruntime-common"), "就近优先");
|
|
162
|
+
assert.equal(resolvePackageDir(web, "adm-zip", nm), join(nm, "adm-zip"), "回退到顶层");
|
|
163
|
+
assert.equal(resolvePackageDir(nm, "definitely-not-there", nm), null);
|
|
164
|
+
|
|
165
|
+
// root 之外存在同名包时也不能解析到它——否则闭包就不是自包含的。
|
|
166
|
+
const outside = join(dirname(dirname(nm)), "node_modules", "outside-only-pkg");
|
|
167
|
+
mkdirSync(outside, { recursive: true });
|
|
168
|
+
writeFileSync(join(outside, "package.json"), JSON.stringify({ name: "outside-only-pkg", version: "1.0.0" }));
|
|
169
|
+
assert.equal(resolvePackageDir(nm, "outside-only-pkg", nm), null, "源树之外的包不该被解析进来");
|
|
170
|
+
});
|
|
171
|
+
|
|
172
|
+
test("matchesPlatform 支持正向与 `!` 反向两种写法,缺省表示不限", () => {
|
|
173
|
+
assert.equal(matchesPlatform({}, "win32", "x64"), true);
|
|
174
|
+
assert.equal(matchesPlatform({ os: ["win32"] }, "win32", "x64"), true);
|
|
175
|
+
assert.equal(matchesPlatform({ os: ["win32"] }, "darwin", "arm64"), false);
|
|
176
|
+
assert.equal(matchesPlatform({ os: ["!darwin"] }, "win32", "x64"), true);
|
|
177
|
+
assert.equal(matchesPlatform({ os: ["!darwin"] }, "darwin", "arm64"), false);
|
|
178
|
+
assert.equal(matchesPlatform({ cpu: ["x64"] }, "win32", "arm64"), false);
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
test("matchesPlatform:libc 只在确认本机 libc 时才参与判断(拿不到证据就全放行)", () => {
|
|
182
|
+
const musl = { os: ["linux"], cpu: ["x64"], libc: ["musl"] };
|
|
183
|
+
const glibc = { os: ["linux"], cpu: ["x64"], libc: ["glibc"] };
|
|
184
|
+
// 确认了(glibc / musl)就按 libc 排他。
|
|
185
|
+
assert.equal(matchesPlatform(glibc, "linux", "x64", "glibc"), true);
|
|
186
|
+
assert.equal(matchesPlatform(musl, "linux", "x64", "glibc"), false);
|
|
187
|
+
assert.equal(matchesPlatform(musl, "linux", "x64", "musl"), true);
|
|
188
|
+
// 没确认 = 不过滤:宁多下十几兆,也不赌错方向装出一份跑不起来的运行时。
|
|
189
|
+
assert.equal(matchesPlatform(musl, "linux", "x64", null), true);
|
|
190
|
+
assert.equal(matchesPlatform(musl, "linux", "x64"), true);
|
|
191
|
+
// 不带 libc 字段的包(绝大多数)任何情况下都不因此被排除。
|
|
192
|
+
assert.equal(matchesPlatform({ os: ["linux"] }, "linux", "x64", "glibc"), true);
|
|
193
|
+
});
|