@lark-apaas/miaoda-cli 0.1.24-alpha.54e1135 → 0.1.24-alpha.7499e8d
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/dist/utils/npm-pack.js +33 -0
- package/dist/utils/sandbox-skills.js +27 -8
- package/package.json +1 -1
package/dist/utils/npm-pack.js
CHANGED
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.pickLaneVersion = pickLaneVersion;
|
|
6
7
|
exports.fetchNpmPackage = fetchNpmPackage;
|
|
7
8
|
const node_child_process_1 = require("node:child_process");
|
|
8
9
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
@@ -11,6 +12,38 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
11
12
|
const error_1 = require("./error");
|
|
12
13
|
const logger_1 = require("./logger");
|
|
13
14
|
const DEFAULT_REGISTRY = 'https://registry.npmmirror.com/';
|
|
15
|
+
/**
|
|
16
|
+
* 从 `npm view <pkg> versions --json` 里过滤出后缀 `-alpha.<X>` 的版本。
|
|
17
|
+
*
|
|
18
|
+
* 用于 sandbox-skills 新姿势(2026-08 迁离 lane-<X> dist-tag 之后):
|
|
19
|
+
* publish-sandbox-skills.sh 每次发的版本号 = `<base>-alpha.<LANE>-<YYYYMMDDHHMMSS>`,
|
|
20
|
+
* TCC 里的 X = `<LANE>-<TIMESTAMP>` 全局唯一。反推侧过滤 versions 数组即可精确命中。
|
|
21
|
+
*
|
|
22
|
+
* **不 throw 是硬要求**(消费方 fallback @latest 依赖返回 null 判定):
|
|
23
|
+
* - `npm view` 网络挂、包不存在、metadata 解析失败 → 返回 null
|
|
24
|
+
* - 无版本匹配 → 返回 null
|
|
25
|
+
* - 多版本匹配(理论上不该发生,因 timestamp 精度到秒)→ 字符串排序取最大(timestamp 最大)
|
|
26
|
+
*/
|
|
27
|
+
function pickLaneVersion(packageName, X, registry) {
|
|
28
|
+
const reg = registry ?? process.env.MIAODA_NPM_REGISTRY ?? DEFAULT_REGISTRY;
|
|
29
|
+
const suffix = `-alpha.${X}`;
|
|
30
|
+
try {
|
|
31
|
+
const stdout = (0, node_child_process_1.execFileSync)('npm', ['view', packageName, 'versions', '--json', '--registry', reg], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
|
|
32
|
+
const versions = JSON.parse(stdout);
|
|
33
|
+
if (!Array.isArray(versions))
|
|
34
|
+
return null;
|
|
35
|
+
const matched = versions.filter((v) => typeof v === 'string' && v.endsWith(suffix));
|
|
36
|
+
if (matched.length === 0)
|
|
37
|
+
return null;
|
|
38
|
+
// 通常唯一命中(X 含 timestamp 到秒);多命中时字符串排序取最大(timestamp 更晚)
|
|
39
|
+
matched.sort();
|
|
40
|
+
return matched[matched.length - 1] ?? null;
|
|
41
|
+
}
|
|
42
|
+
catch (err) {
|
|
43
|
+
(0, logger_1.debug)(`pickLaneVersion(${packageName}, X=${X}) failed: ${err.message}`);
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
14
47
|
/**
|
|
15
48
|
* `npm pack <pkg>@<ver> --registry <r>` + `tar -xzf`,解到临时目录。
|
|
16
49
|
* extractDir 是包内容根(含 package.json)。使用完必须 cleanup()。
|
|
@@ -58,9 +58,16 @@ const BUSINESS_LINE_BY_TYPE = {
|
|
|
58
58
|
};
|
|
59
59
|
/**
|
|
60
60
|
* 从 TCC skillsUpdateTgzKey 反推 lane 名。
|
|
61
|
-
* skills_versions/all_feat-xxx.tgz
|
|
62
|
-
* skills_versions/
|
|
63
|
-
*
|
|
61
|
+
* skills_versions/all_feat-xxx.tgz → feat-xxx
|
|
62
|
+
* skills_versions/all_feat_xxx.tgz → feat-xxx (_ sanitize → -)
|
|
63
|
+
* skills_versions/all_latest.tgz → null(走 @latest)
|
|
64
|
+
* 任何 all_<X>.tgz → <X> 里 _ 全部转 -
|
|
65
|
+
*
|
|
66
|
+
* **宽进严出**:正则允许 `_` 匹配(兼容老 miaoda-skills 时代 TOS key 含 `_` 的存量 TCC
|
|
67
|
+
* 命名),但返回时 sanitize 成 `-` —— 对齐 publish-sandbox-skills.sh 侧只发 `-` 版
|
|
68
|
+
* lane 的现实(npm SemVer pre-release 只允许 `[A-Za-z0-9-]`,不允许 `_`)。
|
|
69
|
+
* 存量 TCC 里如果有 `all_feat_xxx.tgz` 这种命名,反推出 `feat-xxx` 后能正确命中
|
|
70
|
+
* npm 上实际发出的 `@lane-feat-xxx` 包,而不是静默 fallback 到 @latest。
|
|
64
71
|
*
|
|
65
72
|
* 用 nullable 而不是空字符串 —— 让调用方能判断"没 lane 就走 latest"。
|
|
66
73
|
*/
|
|
@@ -72,7 +79,7 @@ function extractLaneFromTgzKey(tgzKey) {
|
|
|
72
79
|
if (match === null) {
|
|
73
80
|
return null;
|
|
74
81
|
}
|
|
75
|
-
const lane = match[1];
|
|
82
|
+
const lane = match[1].replace(/_/g, '-');
|
|
76
83
|
if (lane === 'latest') {
|
|
77
84
|
return null;
|
|
78
85
|
}
|
|
@@ -89,9 +96,21 @@ function syncSandboxSkills(opts) {
|
|
|
89
96
|
const packageName = PACKAGE_BY_TYPE[opts.type];
|
|
90
97
|
const businessLine = BUSINESS_LINE_BY_TYPE[opts.type];
|
|
91
98
|
const lane = extractLaneFromTgzKey(opts.tgzKey);
|
|
92
|
-
//
|
|
93
|
-
|
|
99
|
+
// ---- lane 拉包 ----
|
|
100
|
+
// 新姿势(2026-08 迁离 lane-<X> dist-tag 之后):
|
|
101
|
+
// TCC 里的 X(比如 `feat-migrate-skills-from-miaoda-skills-20260805143512`)
|
|
102
|
+
// 包含 branch + timestamp,`pickLaneVersion` 走 `npm view <pkg> versions --json`
|
|
103
|
+
// 过滤 `endsWith('-alpha.' + X)`(因 X 含 timestamp 全局唯一,唯一命中或 0 命中)。
|
|
104
|
+
// 0 命中 → fallback @latest(对齐旧 TCC 值找不到、灰度切换期间的兜底语义)。
|
|
105
|
+
// `pickLaneVersion` 内部对 `npm view` 报错 / 无匹配都返回 null,绝不 throw ——
|
|
106
|
+
// 目标就是"不挂掉"。
|
|
94
107
|
let fetched;
|
|
108
|
+
const laneVersion = lane === null ? null : (0, npm_pack_1.pickLaneVersion)(packageName, lane, opts.registry);
|
|
109
|
+
if (lane !== null && laneVersion === null) {
|
|
110
|
+
(0, logger_1.debug)(`sandbox-skills: no npm version matched -alpha.${lane}, fallback to @latest ` +
|
|
111
|
+
`(TCC 里的 X 可能是老 lane dist-tag 命名 / 已 unpublish / npm view 挂 / 网络断)`);
|
|
112
|
+
}
|
|
113
|
+
const primaryVersion = laneVersion ?? 'latest';
|
|
95
114
|
try {
|
|
96
115
|
(0, logger_1.debug)(`sandbox-skills: fetching ${packageName}@${primaryVersion}`);
|
|
97
116
|
fetched = (0, npm_pack_1.fetchNpmPackage)({
|
|
@@ -101,10 +120,10 @@ function syncSandboxSkills(opts) {
|
|
|
101
120
|
});
|
|
102
121
|
}
|
|
103
122
|
catch (err) {
|
|
104
|
-
if (
|
|
123
|
+
if (primaryVersion === 'latest') {
|
|
105
124
|
throw err;
|
|
106
125
|
}
|
|
107
|
-
(0, logger_1.debug)(`sandbox-skills:
|
|
126
|
+
(0, logger_1.debug)(`sandbox-skills: pack ${primaryVersion} failed, fallback to @latest (err: ${err.message})`);
|
|
108
127
|
fetched = (0, npm_pack_1.fetchNpmPackage)({
|
|
109
128
|
packageName,
|
|
110
129
|
version: 'latest',
|