@qmuse/qmuse-cli 1.0.12 → 1.0.13

package/dist/app/release.js

@@ -1,5 +1,5 @@
 /**
- * 发布域（C10）：POST /api/deploy/create + update（触发执行），GET /api/deploy/query | list | last。
+ * 发布域（C10）：POST /api/deploy/create，GET /api/deploy/query | list | last。
  * 部署单状态机：INIT → INITED（安全检查通过）→ DEPLOYING → DEPLOYED / DEPLOY_FAILED / CANCEL。
  * query 返回 content（infosec/mosec/域名发布状态/发布地址），供 release status 汇总。
  */
@@ -18,10 +18,6 @@ export function parseDeployTicketContent(ticket) {
 export function createDeployTicket(appId, versionId, cfg) {
     return apiCall('POST', '/api/deploy/create', { appId, versionId }, cfg);
 }
-/** 触发已就绪（INITED）部署单执行发布；服务端异步执行 DEPLOYING → 终态。 */
-export function triggerDeployTicket(deployId, cfg) {
-    return apiCall('POST', '/api/deploy/update', { id: deployId }, cfg);
-}
 /** C10.03 查询发布结果：同一查询返回任务详情、产物/安全检查、地址与失败原因。 */
 export function queryDeployTicket(deployId, cfg) {
     return apiCall('GET', `/api/deploy/query?id=${encodeURIComponent(deployId)}`, undefined, cfg);
@@ -38,7 +34,7 @@ export function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
 /**
- * 发布等待循环：CREATE 后轮询 query；INITED 时触发 update（复用现有发布流程）；
+ * 发布等待循环：CREATE 后轮询 query；服务端 query 将 INITED 推进为 DEPLOYING 并执行发布；
  * 终态、--no-wait 受理（DEPLOYING）或超时返回最近一次 ticket。
  * 温和退避（5s→15s 封顶）降低轮询请求量；连续网络错误快速失败。
  */
@@ -47,7 +43,6 @@ export async function waitDeployResult(deployId, cfg, options = {}) {
     const timeoutMs = options.timeoutMs ?? (noWait ? 5 * 60 * 1000 : 8 * 60 * 1000);
     const baseIntervalMs = options.intervalMs ?? 5000;
     const startedAt = Date.now();
-    let triggered = false;
     let lastError;
     let polls = 0;
     let netErrors = 0;
@@ -59,7 +54,7 @@ export async function waitDeployResult(deployId, cfg, options = {}) {
             netErrors += 1;
             if (netErrors >= 3) {
                 lastError = `连续 ${netErrors} 次网络错误：${r.errorMessage ?? 'network'}`;
-                return { ticket: undefined, triggered, timedOut: false, lastError };
+                return { ticket: undefined, timedOut: false, lastError };
             }
         }
         else {
@@ -67,37 +62,27 @@ export async function waitDeployResult(deployId, cfg, options = {}) {
         }
         const ticket = r.ok ? r.data : undefined;
         const status = typeof ticket?.['status'] === 'string' ? ticket['status'] : undefined;
-        if (!r.ok) {
+        if (r.ok) {
+            lastError = undefined;
+        }
+        else {
             lastError = r.errorMessage ?? r.errorCode ?? `HTTP ${r.status}`;
             // 快速失败：单据不存在/无权限时继续轮询没有意义（避免长达数分钟的空转）。
             const notFound = r.status === 404
                 || r.errorCode === 'NOT_FOUND'
                 || /not found|不存在|无权限|forbidden/iu.test(String(lastError));
             if (notFound) {
-                return { ticket: ticket ?? undefined, triggered, timedOut: false, lastError };
+                return { ticket: ticket ?? undefined, timedOut: false, lastError };
             }
         }
         if (status && APP_DEPLOY_TERMINAL_STATUSES.has(status)) {
-            return { ticket: ticket ?? undefined, triggered, timedOut: false, lastError };
-        }
-        if (status === 'INITED' && !triggered) {
-            // 安全门禁通过：触发现有发布流程（INITED → DEPLOYING，服务端异步执行）。
-            const up = await triggerDeployTicket(deployId, cfg);
-            triggered = true;
-            if (!up.ok)
-                lastError = up.errorMessage ?? up.errorCode ?? `HTTP ${up.status}`; // 触发失败语义保留（不重触发）
-            const updated = up.ok ? up.data : undefined;
-            const next = typeof updated?.['status'] === 'string' ? updated['status'] : undefined;
-            if (next && APP_DEPLOY_TERMINAL_STATUSES.has(next))
-                return { ticket: updated, triggered, timedOut: false };
-            if (updated && noWait)
-                return { ticket: updated, triggered, timedOut: false };
+            return { ticket: ticket ?? undefined, timedOut: false, lastError };
         }
-        if (noWait && (triggered || (status && status !== 'INIT'))) {
-            return { ticket: ticket ?? undefined, triggered, timedOut: false, lastError };
+        if (noWait && status === 'DEPLOYING') {
+            return { ticket: ticket ?? undefined, timedOut: false, lastError };
         }
         if (Date.now() - startedAt > timeoutMs)
-            return { ticket: ticket ?? undefined, triggered, timedOut: true, lastError };
+            return { ticket: ticket ?? undefined, timedOut: true, lastError };
         // 温和退避：每 4 轮 ×1.6，封顶 15s（8 分钟窗口轮询请求减半以上）。
         const intervalMs = Math.min(baseIntervalMs * Math.pow(1.6, Math.floor(polls / 4)), 15000);
         await sleep(Math.round(intervalMs));

package/dist/cli.js

@@ -876,6 +876,22 @@ function summarizeDeployTicket(ticket) {
         updatedAt: ticket.updatedAt ?? ticket.gmtModified ?? undefined,
     };
 }
+/** 同一应用的发布结果共用一次详情查询，补齐发布单未携带的正式访问地址。 */
+async function summarizeDeployTickets(tickets, cfg) {
+    const summaries = tickets.map(summarizeDeployTicket);
+    const published = summaries.find(item => item.status === 'DEPLOYED' && !item.publishUrl);
+    if (typeof published?.appId === 'string') {
+        const app = await queryAppInfo(published.appId, cfg);
+        if (app.ok && app.data) {
+            const publishUrl = app.data.domain ? `https://${app.data.domain}` : app.data.url;
+            for (const summary of summaries) {
+                if (summary.status === 'DEPLOYED' && !summary.publishUrl)
+                    summary.publishUrl = publishUrl;
+            }
+        }
+    }
+    return summaries;
+}
 async function cmdDeploy(command, flags) {
     const cfg = resolveCfg(flags);
     requireAuth(cfg);
@@ -900,6 +916,7 @@ async function cmdDeploy(command, flags) {
     const success = !wait.timedOut && !!wait.ticket
         && wait.ticket.status !== 'DEPLOY_FAILED' && wait.ticket.status !== 'CANCEL'
         && (!wait.lastError || wait.ticket.status === 'DEPLOYED');
+    const [summary] = await summarizeDeployTickets([wait.ticket ?? seed], cfg);
     const payload = {
         success,
         appId,
@@ -907,7 +924,7 @@ async function cmdDeploy(command, flags) {
         deployId: deployId || undefined,
         timedOut: wait.timedOut || undefined,
         error: wait.lastError,
-        ...summarizeDeployTicket(wait.ticket ?? seed),
+        ...summary,
     };
     if (flags['--json'] === true) {
         output(payload, flags);
@@ -939,7 +956,7 @@ async function cmdRelease(command, flags) {
         if (!releaseId)
             fail('用法: qmuse release status <releaseId> [--wait] 或 qmuse release status --last --app-id <appId>');
         const wait = await waitDeployResult(releaseId, cfg, { noWait: flags['--wait'] !== true });
-        const summary = summarizeDeployTicket(wait.ticket);
+        const [summary] = await summarizeDeployTickets([wait.ticket], cfg);
         const lookupFailed = !wait.ticket;
         const success = !wait.timedOut && !lookupFailed
             && summary.status !== 'DEPLOY_FAILED' && summary.status !== 'CANCEL'
@@ -962,7 +979,8 @@ async function cmdRelease(command, flags) {
             const r = await lastDeployTicket(appId, cfg);
             if (!r.ok)
                 failApi(r, `查询最近发布失败`);
-            output(summarizeDeployTicket(r.data), flags);
+            const [summary] = await summarizeDeployTickets([r.data], cfg);
+            output(summary, flags);
             return;
         }
         const r = await listDeployTickets(appId, cfg);
@@ -971,7 +989,7 @@ async function cmdRelease(command, flags) {
         // 防御性兼容：老网关可能返回包装对象而非数组，运行时仍做数组判定。
         const payload = r.data;
         const list = Array.isArray(payload)
-            ? payload.map(item => summarizeDeployTicket(item))
+            ? await summarizeDeployTickets(payload, cfg)
             : payload;
         output({ appId, releases: list }, flags);
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qmuse/qmuse-cli",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "QMuse 命令行客户端：在本地创建/导入 React 项目、与 QMuse 对话、拉取发布与云端调试",
   "type": "module",
   "bin": {