@my-life-buddies/cli 0.17.7 → 0.18.0

package/dist/bin/preview.js

@@ -251,7 +251,9 @@ var PreviewController = class {
   simulatorSnapshot() {
     return Object.freeze({ ...this.#simulatorState, conversationRevision: this.#conversationRevision, stateRevision: this.#simulatorRevision });
   }
+  #closed = false;
   start() {
+    if (this.#closed) return Promise.reject(Object.assign(new Error("\u672C\u5730\u8FDE\u63A5\u5DF2\u7ED3\u675F\uFF0C\u8BF7\u91CD\u65B0\u6267\u884C\u8FDE\u63A5\u6307\u4EE4"), { code: "PREVIEW_CLOSED", status: 409 }));
     if (this.#startPromise) return this.#startPromise;
     if (this.#handle) return Promise.resolve(this.#state);
     if (this.#state.phase === "stopping") {
@@ -351,6 +353,7 @@ var PreviewController = class {
     }
   }
   async close() {
+    this.#closed = true;
     await this.stop();
     this.#listeners.clear();
     this.#simulatorListeners.clear();
@@ -1984,6 +1987,7 @@ async function connectPreviewBridge(options) {
   let lastContact = Date.now();
   let stopping;
   let interrupted = false;
+  let disconnecting = false;
   async function call(path, token, payload, requestSignal = signal) {
     const response = await fetch(new URL(path, options.webUrl), {
       method: "POST",
@@ -1999,6 +2003,7 @@ async function connectPreviewBridge(options) {
   const attach = async () => {
     const result = await call("api/preview/connect", await options.token(), {
       connectionId,
+      forceDisconnect: true,
       buddyId: options.buddyId,
       projectRoot: options.controller.projectRoot,
       machineName: hostname(),
@@ -2059,12 +2064,21 @@ async function connectPreviewBridge(options) {
   watchdog.unref();
   async function execute(command) {
     try {
+      if (command.path === "/api/connection/disconnect" && command.method === "POST") {
+        disconnecting = true;
+        await options.controller.close();
+        await options.stopLocalDev?.();
+        replies.set(command.id, { id: command.id, status: 200, contentType: "application/json", body: Buffer.from(JSON.stringify({ localStopped: Boolean(options.stopLocalDev) })).toString("base64") });
+        options.onStatus?.("\u540E\u53F0\u5DF2\u8BF7\u6C42\u5F3A\u5236\u65AD\u8FDE\uFF0C\u5F53\u524D\u5DE5\u7A0B DEV \u5DF2\u505C\u6B62\u3002\u9700\u8981\u8C03\u8BD5\u65F6\u91CD\u65B0\u6267\u884C\u8FDE\u63A5\u6307\u4EE4\u3002");
+        return;
+      }
+      if (disconnecting) throw new Error("\u6B63\u5728\u65AD\u5F00\u8FDE\u63A5");
       if (!command.path.startsWith("/api/") || command.path === "/api/events" || command.path.includes("..")) throw new Error("\u8C03\u8BD5\u8DEF\u5F84\u65E0\u6548");
       const target = new URL(command.path, options.localServer.origin);
       if (target.origin !== options.localServer.origin.origin) throw new Error("\u8C03\u8BD5\u8DEF\u5F84\u65E0\u6548");
       if ((await options.controller.project()).buddyId !== options.buddyId) throw new Error("\u5DE5\u7A0B buddyId \u5DF2\u6539\u53D8\uFF0C\u8BF7\u9000\u51FA CLI \u540E\u91CD\u65B0\u8FDE\u63A5\u5BF9\u5E94\u642D\u5B50");
       signal.throwIfAborted();
-      if (interrupted) throw new Error("\u672C\u5730\u8FDE\u63A5\u5DF2\u4E2D\u65AD");
+      if (interrupted || disconnecting) throw new Error("\u672C\u5730\u8FDE\u63A5\u5DF2\u4E2D\u65AD");
       const response = await fetch(target, {
         method: command.method,
         redirect: "error",
@@ -2121,8 +2135,8 @@ async function connectPreviewBridge(options) {
           const status = cause.status;
           if (status === 410) {
             await options.controller.stop();
-            if ((await attach()).reused) throw new Error("\u5F53\u524D\u5DE5\u7A0B\u5DF2\u6709\u5176\u4ED6 CLI \u8FDE\u63A5\uFF0C\u8BF7\u91CD\u65B0\u8FD0\u884C preview \u6253\u5F00\u540E\u53F0");
-            snapshotEvents();
+            options.onStatus?.("\u540E\u53F0\u8FDE\u63A5\u5DF2\u7ED3\u675F\uFF1B\u8BF7\u91CD\u65B0\u6267\u884C\u8FDE\u63A5\u6307\u4EE4\u3002\u672A\u81EA\u52A8\u91CD\u65B0\u8FDE\u63A5\u6216\u542F\u52A8 DEV\u3002");
+            break;
           } else if (status && status >= 400 && status < 500 && status !== 429) throw cause;
         }
         await delay(replies.size ? 20 : 500, void 0, { signal }).catch(() => void 0);