@lark-apaas/miaoda-cli 0.1.4-alpha.b2fdfff → 0.1.4-alpha.f78c7e5

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.
Files changed (52) hide show
  1. package/README.md +6 -5
  2. package/dist/api/deploy/index.js +1 -13
  3. package/dist/api/observability/api.js +10 -0
  4. package/dist/api/observability/index.js +2 -1
  5. package/dist/cli/commands/app/index.js +2 -83
  6. package/dist/cli/commands/index.js +5 -33
  7. package/dist/cli/commands/observability/index.js +62 -6
  8. package/dist/cli/commands/shared.js +5 -0
  9. package/dist/cli/handlers/app/index.js +1 -6
  10. package/dist/cli/handlers/observability/helpers.js +4 -0
  11. package/dist/cli/handlers/observability/index.js +3 -1
  12. package/dist/cli/handlers/observability/log.js +8 -2
  13. package/dist/cli/handlers/observability/source-stack.js +389 -0
  14. package/dist/cli/handlers/observability/trace.js +7 -1
  15. package/dist/utils/git.js +22 -0
  16. package/dist/utils/http.js +11 -21
  17. package/package.json +1 -1
  18. package/dist/api/deploy/modern-types.js +0 -23
  19. package/dist/api/deploy/modern.js +0 -78
  20. package/dist/api/deploy/plugin-instances-types.js +0 -6
  21. package/dist/api/deploy/plugin-instances.js +0 -22
  22. package/dist/cli/commands/deploy/modern.js +0 -48
  23. package/dist/cli/commands/skills/index.js +0 -63
  24. package/dist/cli/handlers/app/init.js +0 -84
  25. package/dist/cli/handlers/deploy/modern.js +0 -32
  26. package/dist/cli/handlers/skills/index.js +0 -7
  27. package/dist/cli/handlers/skills/status.js +0 -31
  28. package/dist/cli/handlers/skills/sync.js +0 -38
  29. package/dist/services/app/init/index.js +0 -12
  30. package/dist/services/app/init/install.js +0 -101
  31. package/dist/services/app/init/template.js +0 -87
  32. package/dist/services/deploy/modern/atoms/build.js +0 -59
  33. package/dist/services/deploy/modern/atoms/context.js +0 -30
  34. package/dist/services/deploy/modern/atoms/index.js +0 -17
  35. package/dist/services/deploy/modern/atoms/local-release.js +0 -27
  36. package/dist/services/deploy/modern/atoms/pre-release.js +0 -13
  37. package/dist/services/deploy/modern/atoms/save-plugin-instances.js +0 -72
  38. package/dist/services/deploy/modern/atoms/upload.js +0 -246
  39. package/dist/services/deploy/modern/check.js +0 -58
  40. package/dist/services/deploy/modern/constants.js +0 -13
  41. package/dist/services/deploy/modern/index.js +0 -16
  42. package/dist/services/deploy/modern/pipelines/index.js +0 -5
  43. package/dist/services/deploy/modern/pipelines/local.js +0 -75
  44. package/dist/services/deploy/modern/protocol.js +0 -122
  45. package/dist/services/deploy/modern/run-types.js +0 -4
  46. package/dist/services/deploy/modern/run.js +0 -13
  47. package/dist/services/deploy/modern/template-key-map.js +0 -22
  48. package/dist/services/skills/index.js +0 -5
  49. package/dist/services/skills/status.js +0 -37
  50. package/dist/utils/coding-steering.js +0 -85
  51. package/dist/utils/npm-pack.js +0 -55
  52. package/dist/utils/spark-meta.js +0 -42
@@ -0,0 +1,389 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
35
+ Object.defineProperty(exports, "__esModule", { value: true });
36
+ exports.handleObservabilitySourceStack = handleObservabilitySourceStack;
37
+ const api = __importStar(require("../../../api/index"));
38
+ const output_1 = require("../../../utils/output");
39
+ const args_1 = require("../../../utils/args");
40
+ const helpers_1 = require("./helpers");
41
+ const SOURCE_MAP_FILE_PREFIX = 'client/assets/';
42
+ /** miaoda observability source-stack */
43
+ async function handleObservabilitySourceStack(opts) {
44
+ const logIds = normalizeValues(opts.logId);
45
+ const traceIds = normalizeValues(opts.traceId);
46
+ if (logIds.length === 0 && traceIds.length === 0) {
47
+ (0, args_1.failArgs)('至少传入线上环境日志 ID 或 trace ID');
48
+ }
49
+ const logs = await collectCandidateLogs(opts, { logIds, traceIds });
50
+ const results = await resolveCandidateLogs(opts.appId, logs);
51
+ (0, output_1.emit)({ data: results, next_cursor: null, has_more: false });
52
+ }
53
+ async function collectCandidateLogs(opts, params) {
54
+ const limit = (0, helpers_1.validateLimit)(opts.limit ?? 50);
55
+ const searches = [];
56
+ if (params.logIds.length > 0) {
57
+ searches.push(searchLogs(opts, {
58
+ limit,
59
+ fieldFilters: (0, helpers_1.buildFieldFilters)([
60
+ { key: 'attributes.ob_data_id', value: stringIdFilter(params.logIds) },
61
+ ]),
62
+ }));
63
+ }
64
+ if (params.traceIds.length > 0) {
65
+ searches.push(searchLogs(opts, {
66
+ limit,
67
+ fieldFilters: (0, helpers_1.buildFieldFilters)([
68
+ { key: 'trace_id', value: stringIdFilter(params.traceIds) },
69
+ ]),
70
+ }));
71
+ }
72
+ const allLogs = (await Promise.all(searches)).flat();
73
+ const deduped = new Map();
74
+ for (const log of allLogs) {
75
+ deduped.set(log.id, log);
76
+ }
77
+ return Array.from(deduped.values());
78
+ }
79
+ async function searchLogs(opts, params) {
80
+ const req = {
81
+ appID: opts.appId,
82
+ appEnv: 'runtime',
83
+ startTimestampNs: (0, helpers_1.parseToNs)(opts.since),
84
+ endTimestampNs: (0, helpers_1.parseToNs)(opts.until),
85
+ limit: params.limit,
86
+ fieldFilters: params.fieldFilters,
87
+ };
88
+ const resp = await api.observability.searchLogs(req);
89
+ return resp.logItems ?? [];
90
+ }
91
+ async function resolveCandidateLogs(appID, logs) {
92
+ const results = [];
93
+ for (const log of logs) {
94
+ const attrs = log.attributes ?? {};
95
+ const rawStack = pickAttr(attrs, ['stack', 'error_stack', 'errorStack']) ??
96
+ pickBodyStack(log.body) ??
97
+ log.body;
98
+ const frames = parseGeneratedFrames(rawStack);
99
+ const commitID = pickAttr(attrs, [
100
+ 'release_commit_id',
101
+ 'releaseCommitID',
102
+ 'commit_id',
103
+ 'commitID',
104
+ ]);
105
+ const message = pickErrorMessage(log, rawStack);
106
+ const base = {
107
+ log_id: log.id,
108
+ trace_id: log.traceID ?? attrs.trace_id,
109
+ commit_id: commitID,
110
+ source_map_files: sourceMapFilesForFrames(frames),
111
+ };
112
+ const reason = missingReason({ frames, commitID });
113
+ if (reason) {
114
+ results.push({
115
+ ...base,
116
+ status: 'unresolved',
117
+ reason,
118
+ error_message_stack: formatStack(message, frames),
119
+ });
120
+ continue;
121
+ }
122
+ const resolvedCommitID = commitID;
123
+ if (!resolvedCommitID)
124
+ continue;
125
+ let resolvedFrames;
126
+ try {
127
+ resolvedFrames = await resolveFramesBySourceMap(appID, resolvedCommitID, frames);
128
+ }
129
+ catch (err) {
130
+ results.push({
131
+ ...base,
132
+ status: 'unresolved',
133
+ reason: `调用 resolve_stack_trace 失败:${errorMessage(err)}`,
134
+ error_message_stack: formatStack(message, frames),
135
+ });
136
+ continue;
137
+ }
138
+ results.push({
139
+ ...base,
140
+ status: 'resolved',
141
+ error_message_stack: formatStack(message, resolvedFrames),
142
+ });
143
+ }
144
+ return results;
145
+ }
146
+ function normalizeValues(value) {
147
+ if (Array.isArray(value)) {
148
+ return value.filter((item) => item.length > 0);
149
+ }
150
+ return value ? [value] : [];
151
+ }
152
+ function stringIdFilter(values) {
153
+ if (values.length === 0)
154
+ return undefined;
155
+ return values.length === 1 ? (0, helpers_1.eqFilter)(values[0]) : (0, helpers_1.inFilter)(values);
156
+ }
157
+ function pickAttr(attrs, keys) {
158
+ for (const key of keys) {
159
+ const value = attrs[key];
160
+ if (value)
161
+ return value;
162
+ }
163
+ return undefined;
164
+ }
165
+ async function resolveFramesBySourceMap(appID, commitID, frames) {
166
+ const resp = await api.observability.resolveStackTrace({
167
+ appID,
168
+ commitID,
169
+ sourceMapFilePrefix: SOURCE_MAP_FILE_PREFIX,
170
+ frames,
171
+ });
172
+ return resp.frames ?? frames;
173
+ }
174
+ function parseGeneratedFrames(stack) {
175
+ if (!stack)
176
+ return [];
177
+ const jsonFrames = parseJsonStackFrames(stack);
178
+ if (jsonFrames.length > 0)
179
+ return jsonFrames;
180
+ const frames = [];
181
+ const parenFramePattern = /\((.+):(\d+):(\d+)\)$/;
182
+ const plainFramePattern = /(?:at\s+)?(.+):(\d+):(\d+)$/;
183
+ for (const line of stack.split('\n')) {
184
+ const trimmed = line.trim();
185
+ const match = parenFramePattern.exec(trimmed) ?? plainFramePattern.exec(trimmed);
186
+ if (!match)
187
+ continue;
188
+ const [, fileName, lineNumber, columnNumber] = match;
189
+ if (!fileName || !lineNumber || !columnNumber)
190
+ continue;
191
+ frames.push({
192
+ fileName: normalizeFrameFileName(fileName),
193
+ line: Number(lineNumber),
194
+ column: Number(columnNumber),
195
+ });
196
+ }
197
+ return frames.slice(0, 2000);
198
+ }
199
+ function parseJsonStackFrames(stack) {
200
+ const trimmed = stack.trim();
201
+ if (!trimmed.startsWith('['))
202
+ return [];
203
+ let parsed;
204
+ try {
205
+ parsed = JSON.parse(trimmed);
206
+ }
207
+ catch {
208
+ return [];
209
+ }
210
+ if (!Array.isArray(parsed))
211
+ return [];
212
+ return parsed
213
+ .map((item) => normalizeJsonFrame(item))
214
+ .filter((frame) => Boolean(frame))
215
+ .slice(0, 2000);
216
+ }
217
+ function normalizeJsonFrame(item) {
218
+ if (!isRecord(item))
219
+ return undefined;
220
+ const fileName = item.fileName;
221
+ const line = item.line;
222
+ const column = item.column;
223
+ if (typeof fileName !== 'string')
224
+ return undefined;
225
+ const lineNumber = toFiniteNumber(line);
226
+ const columnNumber = toFiniteNumber(column);
227
+ if (lineNumber === undefined || columnNumber === undefined)
228
+ return undefined;
229
+ return {
230
+ fileName: normalizeFrameFileName(fileName),
231
+ line: lineNumber,
232
+ column: columnNumber,
233
+ };
234
+ }
235
+ function pickErrorMessage(log, rawStack) {
236
+ return (pickBodyErrorMessage(log.body) ??
237
+ firstTextStackLine(rawStack) ??
238
+ pickAttr(log.attributes ?? {}, ['error_message', 'errorMessage', 'message']));
239
+ }
240
+ function pickBodyStack(body) {
241
+ const parsed = parseBodyRecord(body);
242
+ if (!parsed)
243
+ return undefined;
244
+ return (stringProp(parsed, 'stack') ??
245
+ nestedStringProp(parsed, ['error', 'stack']) ??
246
+ nestedStringProp(parsed, ['response', 'error', 'stack']) ??
247
+ pickConsoleArgsStack(parsed));
248
+ }
249
+ function pickBodyErrorMessage(body) {
250
+ const parsed = parseBodyRecord(body);
251
+ if (!parsed)
252
+ return undefined;
253
+ return (stringProp(parsed, 'error_message') ??
254
+ stringProp(parsed, 'message') ??
255
+ nestedStringProp(parsed, ['error', 'message']) ??
256
+ nestedStringProp(parsed, ['response', 'error', 'message']) ??
257
+ pickConsoleArgsMessage(parsed));
258
+ }
259
+ function pickConsoleArgsMessage(record) {
260
+ const parts = Object.entries(record)
261
+ .filter(([key]) => /^\d+$/.test(key))
262
+ .sort(([left], [right]) => Number(left) - Number(right))
263
+ .map(([, value]) => consoleArgMessage(value))
264
+ .filter((message) => Boolean(message));
265
+ if (parts.length === 0)
266
+ return undefined;
267
+ return parts.join(' ').replace(/\s+/g, ' ').trim();
268
+ }
269
+ function pickConsoleArgsStack(record) {
270
+ return Object.entries(record)
271
+ .filter(([key]) => /^\d+$/.test(key))
272
+ .sort(([left], [right]) => Number(left) - Number(right))
273
+ .map(([, value]) => consoleArgStack(value))
274
+ .find((stack) => Boolean(stack));
275
+ }
276
+ function consoleArgStack(value) {
277
+ if (typeof value === 'string') {
278
+ const stack = value.trim();
279
+ return looksLikeTextStack(stack) ? stack : undefined;
280
+ }
281
+ if (!isRecord(value))
282
+ return undefined;
283
+ return (stringProp(value, 'stack') ??
284
+ nestedStringProp(value, ['error', 'stack']) ??
285
+ nestedStringProp(value, ['response', 'error', 'stack']));
286
+ }
287
+ function consoleArgMessage(value) {
288
+ if (typeof value === 'string') {
289
+ const message = value.trim();
290
+ return message.length > 0 ? message : undefined;
291
+ }
292
+ if (!isRecord(value))
293
+ return undefined;
294
+ return errorRecordMessage(value);
295
+ }
296
+ function errorRecordMessage(record) {
297
+ const stackTitle = firstTextStackLine(stringProp(record, 'stack'));
298
+ if (stackTitle)
299
+ return stackTitle;
300
+ const name = stringProp(record, 'name');
301
+ const message = stringProp(record, 'message') ??
302
+ nestedStringProp(record, ['error', 'message']) ??
303
+ nestedStringProp(record, ['response', 'error', 'message']);
304
+ if (name && message && !message.startsWith(`${name}:`)) {
305
+ return `${name}: ${message}`;
306
+ }
307
+ return message ?? name;
308
+ }
309
+ function parseBodyRecord(body) {
310
+ if (!body)
311
+ return undefined;
312
+ let parsed;
313
+ try {
314
+ parsed = JSON.parse(body);
315
+ }
316
+ catch {
317
+ return undefined;
318
+ }
319
+ return isRecord(parsed) ? parsed : undefined;
320
+ }
321
+ function firstTextStackLine(stack) {
322
+ const trimmed = stack?.trim();
323
+ if (!trimmed || trimmed.startsWith('['))
324
+ return undefined;
325
+ return trimmed
326
+ .split('\n')
327
+ .map((line) => line.trim())
328
+ .find((line) => line.length > 0 && !line.startsWith('at '));
329
+ }
330
+ function looksLikeTextStack(value) {
331
+ return value.length > 0 && /:\d+:\d+(?:\)|$)/.test(value);
332
+ }
333
+ function missingReason(params) {
334
+ if (!params.commitID)
335
+ return '日志缺少 release_commit_id / commit_id,无法定位构建产物';
336
+ if (params.frames.length === 0)
337
+ return '日志中没有可解析的 generated stack frame';
338
+ return undefined;
339
+ }
340
+ function normalizeFrameFileName(fileName) {
341
+ return fileName.split(/[/?#]/).filter(Boolean).pop() ?? fileName;
342
+ }
343
+ function formatStack(message, frames) {
344
+ const stack = frames
345
+ .map((frame) => {
346
+ if (frame.sourceFileName) {
347
+ return ` at ${frame.sourceFileName}:${String(frame.sourceLine)}:${String(frame.sourceColumn)}`;
348
+ }
349
+ return ` at ${frame.fileName}:${String(frame.line)}:${String(frame.column)}`;
350
+ })
351
+ .join('\n');
352
+ if (message && stack)
353
+ return `${message}\n${stack}`;
354
+ return message ?? stack;
355
+ }
356
+ function isRecord(value) {
357
+ return typeof value === 'object' && value !== null;
358
+ }
359
+ function toFiniteNumber(value) {
360
+ if (typeof value === 'number' && Number.isFinite(value))
361
+ return value;
362
+ if (typeof value === 'string' && value.trim()) {
363
+ const numberValue = Number(value);
364
+ return Number.isFinite(numberValue) ? numberValue : undefined;
365
+ }
366
+ return undefined;
367
+ }
368
+ function stringProp(record, key) {
369
+ const value = record[key];
370
+ return typeof value === 'string' && value.length > 0 ? value : undefined;
371
+ }
372
+ function nestedStringProp(record, path) {
373
+ let current = record;
374
+ for (const key of path) {
375
+ if (!isRecord(current))
376
+ return undefined;
377
+ current = current[key];
378
+ }
379
+ return typeof current === 'string' && current.length > 0 ? current : undefined;
380
+ }
381
+ function errorMessage(err) {
382
+ return err instanceof Error ? err.message : String(err);
383
+ }
384
+ function sourceMapFileForFrame(fileName) {
385
+ return `${SOURCE_MAP_FILE_PREFIX}${fileName}.map`;
386
+ }
387
+ function sourceMapFilesForFrames(frames) {
388
+ return Array.from(new Set(frames.map((frame) => sourceMapFileForFrame(frame.fileName))));
389
+ }
@@ -40,6 +40,12 @@ const output_1 = require("../../../utils/output");
40
40
  const args_1 = require("../../../utils/args");
41
41
  const index_1 = require("../../../api/observability/index");
42
42
  const helpers_1 = require("./helpers");
43
+ function stringIdFilter(value) {
44
+ if (Array.isArray(value)) {
45
+ return value.length > 0 ? (0, helpers_1.inFilter)(value) : undefined;
46
+ }
47
+ return value ? (0, helpers_1.eqFilter)(value) : undefined;
48
+ }
43
49
  /** miaoda observability trace list */
44
50
  async function handleObservabilityTraceList(opts) {
45
51
  const appID = opts.appId;
@@ -51,7 +57,7 @@ async function handleObservabilityTraceList(opts) {
51
57
  // - 入口 span:BAM 没有 entrySpanName fieldFilter,统一走 fuzzyFilter(trace endpoint
52
58
  // 默认作用于 span name),所以 --root-span 不进 fieldFilters
53
59
  const fieldFilters = (0, helpers_1.buildFieldFilters)([
54
- { key: 'trace_id', value: opts.traceId ? (0, helpers_1.eqFilter)(opts.traceId) : undefined },
60
+ { key: 'trace_id', value: stringIdFilter(opts.traceId) },
55
61
  { key: 'user_id', value: opts.userId ? (0, helpers_1.eqFilter)(opts.userId, 'i64') : undefined },
56
62
  ]);
57
63
  const req = {
package/dist/utils/git.js CHANGED
@@ -2,6 +2,27 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getCurrentGitBranch = getCurrentGitBranch;
4
4
  const node_child_process_1 = require("node:child_process");
5
+ const GIT_LOCAL_ENV_KEYS = new Set([
6
+ 'GIT_ALTERNATE_OBJECT_DIRECTORIES',
7
+ 'GIT_CONFIG',
8
+ 'GIT_CONFIG_PARAMETERS',
9
+ 'GIT_CONFIG_COUNT',
10
+ 'GIT_OBJECT_DIRECTORY',
11
+ 'GIT_DIR',
12
+ 'GIT_WORK_TREE',
13
+ 'GIT_IMPLICIT_WORK_TREE',
14
+ 'GIT_GRAFT_FILE',
15
+ 'GIT_INDEX_FILE',
16
+ 'GIT_NO_REPLACE_OBJECTS',
17
+ 'GIT_REPLACE_REF_BASE',
18
+ 'GIT_PREFIX',
19
+ 'GIT_INTERNAL_SUPER_PREFIX',
20
+ 'GIT_SHALLOW_FILE',
21
+ 'GIT_COMMON_DIR',
22
+ ]);
23
+ function withoutGitLocalEnv() {
24
+ return Object.fromEntries(Object.entries(process.env).filter(([key]) => !GIT_LOCAL_ENV_KEYS.has(key)));
25
+ }
5
26
  /**
6
27
  * 读取 cwd 所在仓库的当前分支名。
7
28
  *
@@ -13,6 +34,7 @@ function getCurrentGitBranch(cwd = process.cwd()) {
13
34
  try {
14
35
  result = (0, node_child_process_1.spawnSync)('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
15
36
  cwd,
37
+ env: withoutGitLocalEnv(),
16
38
  encoding: 'utf8',
17
39
  stdio: ['ignore', 'pipe', 'ignore'],
18
40
  });
@@ -60,27 +60,13 @@ function createClient(opts) {
60
60
  instance.interceptors.request.use(applyCanaryHeader);
61
61
  return instance;
62
62
  }
63
- /**
64
- * 默认灰度泳道。当前 miaoda CLI 接入的新接口(modern deploy 等)只在该泳道生效,
65
- * 缺省走这个。MIAODA_CANARY_HEADER 可显式覆盖;设为空字符串则去掉头。
66
- */
67
- const DEFAULT_CANARY_HEADER = 'boe_miaoda_doubao';
68
- /**
69
- * 注入 x-tt-env 小流量头:env 显式设值 > DEFAULT_CANARY_HEADER。
70
- *
71
- * 当泳道形如 `ppe_xxx`(PPE 预发环境)时,额外加 `x-use-ppe: 1`;
72
- * BOE 泳道(`boe_xxx`)只带 x-tt-env,不加该头。
73
- */
63
+ /** 若 MIAODA_CANARY_HEADER 已设置,注入 x-tt-env 小流量头 */
74
64
  function applyCanaryHeader(reqConfig) {
75
- // env 显式设为空字符串视为"去掉灰度头";未设置时用 DEFAULT_CANARY_HEADER
76
- const canary = process.env.MIAODA_CANARY_HEADER ?? DEFAULT_CANARY_HEADER;
65
+ const canary = process.env.MIAODA_CANARY_HEADER;
77
66
  if (!canary)
78
67
  return reqConfig;
79
68
  const headers = new Headers(reqConfig.headers);
80
69
  headers.set('x-tt-env', canary);
81
- if (canary.startsWith('ppe_')) {
82
- headers.set('x-use-ppe', '1');
83
- }
84
70
  reqConfig.headers = headers;
85
71
  return reqConfig;
86
72
  }
@@ -117,14 +103,14 @@ async function handleInnerEnvelope(response, url, opts) {
117
103
  throw new error_1.HttpError(response.status, url, `${opts.errPrefix}: ${String(response.status)} ${response.statusText}`);
118
104
  }
119
105
  const result = await response.json();
120
- // verbose: 把完整响应体打到 stderr,便于排查(业务错误 / 字段缺失等)
121
- if ((0, config_1.getConfig)().verbose) {
122
- (0, logger_1.debug)(` resp: ${truncateForLog(safeStringify(result), 2000)}`);
123
- }
124
106
  if (typeof result === 'object' && result !== null && 'status_code' in result) {
125
107
  const env = result;
126
108
  if (env.status_code !== undefined && env.status_code !== '0') {
127
109
  const msg = env.message ?? env.error_msg ?? 'unknown error';
110
+ // verbose: 把完整业务错误信封打到 stderr,便于追溯
111
+ if ((0, config_1.getConfig)().verbose) {
112
+ (0, logger_1.debug)(` envelope: ${truncateForLog(safeStringify(env), 1000)}`);
113
+ }
128
114
  const mapped = opts.mapErr?.(env.status_code, msg);
129
115
  if (mapped)
130
116
  throw mapped;
@@ -177,8 +163,12 @@ function logResponseFailure(method, url, err, startMs) {
177
163
  const msgPart = e.message ? ` (${e.message})` : '';
178
164
  (0, logger_1.debug)(`✗ ${method} ${url} ${statusPart} ${String(elapsedMs)}ms${logidPart}${msgPart}`);
179
165
  }
166
+ /** BAM gateway 在不同 PSM/版本上 logid 落在不同 header;按命中顺序取第一个非空。 */
180
167
  function pickLogid(headers) {
181
- return headers.get('x-tt-logid');
168
+ return (headers.get('x-tt-logid') ??
169
+ headers.get('x-logid') ??
170
+ headers.get('logid') ??
171
+ headers.get('x-tt-trace-tag'));
182
172
  }
183
173
  function safeStringify(v) {
184
174
  try {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lark-apaas/miaoda-cli",
3
- "version": "0.1.4-alpha.b2fdfff",
3
+ "version": "0.1.4-alpha.f78c7e5",
4
4
  "description": "Miaoda 平台命令行工具,面向 Agent 调用",
5
5
  "type": "commonjs",
6
6
  "bin": {
@@ -1,23 +0,0 @@
1
- "use strict";
2
- // modern deploy 接口的请求 / 响应类型(与服务端发布编排接口对齐)。
3
- // 第一期落地的链路:本地构建 + 本地部署。
4
- //
5
- // 接口分两类:
6
- // - preRelease:所有"本地构建"链路共用,签发动态配置(含 pre-signed TOS upload URL)
7
- // - localPublish:本地构建 + 本地部署专用(createReleaseLocalPublish + updateReleaseLocalPublish)
8
- //
9
- // 远端部署链路(B/C)所需的 release 接口先预留类型骨架,待 B/C 落地时启用。
10
- Object.defineProperty(exports, "__esModule", { value: true });
11
- exports.LocalReleaseStatus = void 0;
12
- /**
13
- * localPublish 状态枚举(数值,与服务端 IDL 对齐)。
14
- * CLI updateLocalRelease 只翻 Finished / Failed 两个终态;其它由后端流转。
15
- */
16
- exports.LocalReleaseStatus = {
17
- Unspecified: 0,
18
- Publishing: 1,
19
- Finished: 2,
20
- Failed: 3,
21
- Canceled: 4,
22
- Rollback: 5,
23
- };
@@ -1,78 +0,0 @@
1
- "use strict";
2
- // modern deploy 接口客户端。统一走管理端 innerapi(postInnerApi 信封解析)。
3
- //
4
- // 第一期落地(本地构建 + 本地部署):
5
- // - preRelease:拿 pre_release_id + version + 动态配置 data
6
- // - createLocalRelease / updateLocalRelease:完整本地部署生命周期
7
- //
8
- // 远端部署(本地构建+远端部署、远端构建+远端部署)需要 createRelease + getReleaseStatus,
9
- // 后续 commit 接入;本文件已预留 endpoint 骨架但暂不导出。
10
- //
11
- // 约定:所有接口的 appID 走 URL :appID 路径参数,body 不再冗余携带 appID。
12
- Object.defineProperty(exports, "__esModule", { value: true });
13
- exports.preRelease = preRelease;
14
- exports.createLocalRelease = createLocalRelease;
15
- exports.updateLocalRelease = updateLocalRelease;
16
- exports.callbackStatic = callbackStatic;
17
- exports.createRelease = createRelease;
18
- exports.getReleaseStatus = getReleaseStatus;
19
- exports.getLastPublishedVersion = getLastPublishedVersion;
20
- const http_1 = require("../../utils/http");
21
- const devops_error_1 = require("../../utils/devops-error");
22
- const DEFAULT_ERR_CODE = 'INTERNAL_DEVOPS_ERROR';
23
- function envelopeOpts(errPrefix) {
24
- // modern deploy 接口与 default deploy / app 走同一个 lark.apaas.devops PSM,
25
- // 业务错误码命名空间共享,直接复用 mapDevopsError 把 BAM 码翻为 AppError。
26
- return {
27
- errPrefix,
28
- defaultErrCode: DEFAULT_ERR_CODE,
29
- mapErr: devops_error_1.mapDevopsError,
30
- };
31
- }
32
- // ── preRelease ──
33
- /** POST /v1/devops/app/:appID/pre_release */
34
- async function preRelease(req) {
35
- const { appID, ...body } = req;
36
- const url = `/v1/devops/app/${encodeURIComponent(appID)}/pre_release`;
37
- return (0, http_1.postInnerApi)(url, body, envelopeOpts('Failed to pre-release'));
38
- }
39
- // ── localPublish ──
40
- /** POST /v1/devops/app/:appID/local_publish/release */
41
- async function createLocalRelease(req) {
42
- const { appID, ...body } = req;
43
- const url = `/v1/devops/app/${encodeURIComponent(appID)}/local_publish/release`;
44
- return (0, http_1.postInnerApi)(url, body, envelopeOpts('Failed to create local release'));
45
- }
46
- /** POST /v1/devops/app/:appID/local_publish/update_release */
47
- async function updateLocalRelease(req) {
48
- const { appID, ...body } = req;
49
- const url = `/v1/devops/app/${encodeURIComponent(appID)}/local_publish/update_release`;
50
- await (0, http_1.postInnerApi)(url, body, envelopeOpts('Failed to update local release'));
51
- }
52
- // ── callbackStatic(PaaS Storage 静态资源上传完成回调) ──
53
- /** POST /v1/storage/app/:appID/bucket/:bucketID/object/callbackStatic */
54
- async function callbackStatic(req) {
55
- const { appID, bucketID, uploadID } = req;
56
- const url = `/v1/storage/app/${encodeURIComponent(appID)}/bucket/${encodeURIComponent(bucketID)}/object/callbackStatic`;
57
- return (0, http_1.postInnerApi)(url, { uploadID }, envelopeOpts('Failed to callback static upload'));
58
- }
59
- // ── release(远端部署,B / C 链路;本期不导出,类型骨架已就绪) ──
60
- /** POST /v1/devops/app/:appID/remote_publish/release */
61
- async function createRelease(req) {
62
- const { appID, ...body } = req;
63
- const url = `/v1/devops/app/${encodeURIComponent(appID)}/remote_publish/release`;
64
- return (0, http_1.postInnerApi)(url, body, envelopeOpts('Failed to create release'));
65
- }
66
- /** POST /v1/devops/app/:appID/release/status */
67
- async function getReleaseStatus(req) {
68
- const { appID, ...body } = req;
69
- const url = `/v1/devops/app/${encodeURIComponent(appID)}/release/status`;
70
- return (0, http_1.postInnerApi)(url, body, envelopeOpts('Failed to query release status'));
71
- }
72
- // ── getLastPublishedVersion(URL path 待文档补充) ──
73
- /** POST /v1/devops/app/:appID/last_published_version(path 待后端确认) */
74
- async function getLastPublishedVersion(req) {
75
- const { appID } = req;
76
- const url = `/v1/devops/app/${encodeURIComponent(appID)}/last_published_version`;
77
- return (0, http_1.postInnerApi)(url, {}, envelopeOpts('Failed to get last published version'));
78
- }
@@ -1,6 +0,0 @@
1
- "use strict";
2
- // plugin_instances batch_save 接口的请求 / 响应类型。
3
- //
4
- // 后端已统一到 InnerEnvelope(`{data, status_code, message}`),与 modern deploy
5
- // 其它接口一致;旧的 BaseResp 形态已下线,类型也不再保留。
6
- Object.defineProperty(exports, "__esModule", { value: true });
@@ -1,22 +0,0 @@
1
- "use strict";
2
- // studio_server 的 plugin_instances 批量保存接口。
3
- //
4
- // 后端已统一到 InnerEnvelope(`{data, status_code, message}`)信封;不再手撸
5
- // 旧 BaseResp 解析,直接复用 utils/http.ts 的 postInnerApi,verbose 下也能拿到
6
- // `→ POST` / `body:` / `resp:` 的完整日志。
7
- Object.defineProperty(exports, "__esModule", { value: true });
8
- exports.batchSavePluginInstances = batchSavePluginInstances;
9
- const http_1 = require("../../utils/http");
10
- const URL_PATH = '/api/v1/studio/innerapi/plugin_instances/batch_save';
11
- /**
12
- * POST /api/v1/studio/innerapi/plugin_instances/batch_save
13
- *
14
- * 把发布版本的 capability 集合注册到 studio_server。
15
- * 失败时抛 AppError("DEPLOY_PLUGIN_BATCH_SAVE_FAILED"),错误信息来自 envelope.message。
16
- */
17
- async function batchSavePluginInstances(req) {
18
- await (0, http_1.postInnerApi)(URL_PATH, req, {
19
- errPrefix: 'Failed to save plugin instances',
20
- defaultErrCode: 'DEPLOY_PLUGIN_BATCH_SAVE_FAILED',
21
- });
22
- }