@weapp-vite/mcp 1.4.6 → 1.4.7

package/dist/index.d.mts

@@ -115,7 +115,7 @@ interface MiniProgramLike {
     navigateBack: () => Promise<MiniProgramPage>;
     screenshot: (options?: {
         timeout?: number;
-    }) => Promise<string | Uint8Array>;
+    }) => Promise<string | Uint8Array | undefined>;
     callWxMethod: (method: string, ...args: unknown[]) => Promise<unknown>;
 }
 interface RuntimeConnectionInput {
@@ -146,8 +146,10 @@ declare class RuntimeSessionManager {
     resolveWorkspacePath(filePath: string): string;
     withMiniProgram<T>(input: RuntimeConnectionInput, runner: (miniProgram: MiniProgramLike) => Promise<T>): Promise<T>;
     withPage<T>(input: RuntimeConnectionInput, runner: (page: MiniProgramPage, miniProgram: MiniProgramLike) => Promise<T>): Promise<T>;
+    rememberPage(input: RuntimeConnectionInput, page: MiniProgramPage | null | undefined): void;
     private resolveSessionKey;
     private attach;
+    private resolveCurrentPage;
     private detach;
     private pushLog;
 }

package/dist/index.d.ts

@@ -115,7 +115,7 @@ interface MiniProgramLike {
     navigateBack: () => Promise<MiniProgramPage>;
     screenshot: (options?: {
         timeout?: number;
-    }) => Promise<string | Uint8Array>;
+    }) => Promise<string | Uint8Array | undefined>;
     callWxMethod: (method: string, ...args: unknown[]) => Promise<unknown>;
 }
 interface RuntimeConnectionInput {
@@ -146,8 +146,10 @@ declare class RuntimeSessionManager {
     resolveWorkspacePath(filePath: string): string;
     withMiniProgram<T>(input: RuntimeConnectionInput, runner: (miniProgram: MiniProgramLike) => Promise<T>): Promise<T>;
     withPage<T>(input: RuntimeConnectionInput, runner: (page: MiniProgramPage, miniProgram: MiniProgramLike) => Promise<T>): Promise<T>;
+    rememberPage(input: RuntimeConnectionInput, page: MiniProgramPage | null | undefined): void;
     private resolveSessionKey;
     private attach;
+    private resolveCurrentPage;
     private detach;
     private pushLog;
 }

package/dist/index.mjs

@@ -681,23 +681,29 @@ class RuntimeSessionManager {
     this.attach(sessionKey, miniProgram);
     try {
       return await runner(miniProgram);
-    } catch (error) {
-      this.detach(sessionKey);
-      await closeSharedMiniProgram(projectPath, input.sessionId || input.port);
-      throw error;
     } finally {
       releaseSharedMiniProgram(projectPath, input.sessionId || input.port);
     }
   }
   async withPage(input, runner) {
+    const projectPath = this.resolveProjectPath(input.projectPath);
+    const sessionKey = this.resolveSessionKey(projectPath, input);
     return await this.withMiniProgram(input, async (miniProgram) => {
-      const page = await miniProgram.currentPage();
+      const page = await this.resolveCurrentPage(sessionKey, miniProgram);
       if (!page) {
         throw new Error("\u5F53\u524D\u6CA1\u6709\u6D3B\u52A8\u9875\u9762\uFF0C\u8BF7\u5148\u8C03\u7528 weapp_devtools_connect \u786E\u8BA4 DevTools \u4F1A\u8BDD\u3002");
       }
       return await runner(page, miniProgram);
     });
   }
+  rememberPage(input, page) {
+    if (!page) {
+      return;
+    }
+    const projectPath = this.resolveProjectPath(input.projectPath);
+    const sessionKey = this.resolveSessionKey(projectPath, input);
+    this.attachedSessions.get(sessionKey).currentPage = page;
+  }
   resolveSessionKey(projectPath, input) {
     return resolveSharedMiniProgramSessionKey({
       port: input.port,
@@ -725,6 +731,19 @@ class RuntimeSessionManager {
       onException
     });
   }
+  async resolveCurrentPage(sessionKey, miniProgram) {
+    try {
+      const page = await miniProgram.currentPage();
+      this.attachedSessions.get(sessionKey).currentPage = page;
+      return page;
+    } catch (error) {
+      const cachedPage = this.attachedSessions.get(sessionKey)?.currentPage;
+      if (cachedPage && isCurrentPageRecoverableError(error)) {
+        return cachedPage;
+      }
+      throw error;
+    }
+  }
   detach(projectPath) {
     const attached = this.attachedSessions.get(projectPath);
     if (!attached) {
@@ -760,11 +779,23 @@ function sleep(ms) {
 function isCaptureScreenshotProtocolTimeout(error) {
   return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.captureScreenshot";
 }
+function isCurrentPageRecoverableError(error) {
+  if (!(error instanceof Error)) {
+    return false;
+  }
+  if ("code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error) {
+    return error.method === "App.getCurrentPage" || error.method === "App.getPageStack" || error.method === "App.callFunction";
+  }
+  return error.message.includes("page is not on top of page stack");
+}
 async function captureMiniProgramScreenshot(miniProgram, timeout = DEFAULT_SCREENSHOT_TIMEOUT) {
   let lastError;
   for (let attempt = 1; attempt <= 2; attempt += 1) {
     try {
       const screenshot = await miniProgram.screenshot({ timeout });
+      if (screenshot == null) {
+        throw new Error("DevTools screenshot returned no data.");
+      }
       return typeof screenshot === "string" ? Buffer.from(screenshot, "base64") : Buffer.from(screenshot);
     } catch (error) {
       lastError = error;
@@ -829,14 +860,14 @@ async function queryElements(page, selectorInput) {
   return [elements[index]];
 }
 async function summarizeElement(element, withWxml = false) {
-  const [text, value, size, offset, scrollWidth, scrollHeight, outerWxml] = await Promise.all([
+  const [text, value, size, offset, scrollWidth, scrollHeight, markup] = await Promise.all([
     callMaybe(element, "text"),
     callMaybe(element, "value"),
     callMaybe(element, "size"),
     callMaybe(element, "offset"),
     callMaybe(element, "scrollWidth"),
     callMaybe(element, "scrollHeight"),
-    withWxml ? callMaybe(element, "outerWxml") : Promise.resolve(void 0)
+    withWxml ? readElementMarkup(element).catch(() => null) : Promise.resolve(null)
   ]);
   return compactObject({
     tagName: readProperty(element, "tagName"),
@@ -846,9 +877,27 @@ async function summarizeElement(element, withWxml = false) {
     offset,
     scrollWidth,
     scrollHeight,
-    outerWxml
+    outerWxml: withWxml && markup?.type === "outerWxml" ? markup.wxml : null,
+    wxml: withWxml && markup?.type !== "outerWxml" ? markup?.wxml ?? null : void 0,
+    wxmlType: withWxml ? markup?.type ?? null : void 0
   });
 }
+async function readElementMarkup(element, outer = false) {
+  if (outer) {
+    const outerWxml = await callMaybe(element, "outerWxml");
+    if (typeof outerWxml === "string") {
+      return {
+        type: "outerWxml",
+        wxml: outerWxml
+      };
+    }
+  }
+  const wxml = await callRequiredMethod(element, "wxml");
+  return {
+    type: outer ? "wxml-fallback" : "wxml",
+    wxml: typeof wxml === "string" ? wxml : String(wxml ?? "")
+  };
+}
 function toSerializableValue(value) {
   return toDevtoolsSerializableValue(value);
 }
@@ -984,6 +1033,7 @@ function registerDevtoolsRuntimeTools(server, manager) {
       }
       const result = await manager.withMiniProgram(connection, async (miniProgram) => {
         const page = await miniProgram.currentPage().catch(() => null);
+        manager.rememberPage(connection, page);
         const systemInfo = await miniProgram.systemInfo().catch(() => null);
         return {
           connected: true,
@@ -1007,6 +1057,7 @@ function registerDevtoolsRuntimeTools(server, manager) {
       const result = await manager.withMiniProgram(connection, async (miniProgram) => {
         if (transition === "navigateBack") {
           const page2 = await miniProgram.navigateBack();
+          manager.rememberPage(connection, page2);
           if (waitMs && page2) {
             await page2.waitFor(waitMs);
           }
@@ -1024,6 +1075,7 @@ function registerDevtoolsRuntimeTools(server, manager) {
           transition,
           url
         );
+        manager.rememberPage(connection, page);
         if (waitMs && page) {
           await page.waitFor(waitMs);
         }
@@ -1354,12 +1406,12 @@ function registerRuntimeNodeTools(server, manager) {
     try {
       const result = await manager.withPage(connection, async (page) => {
         const element = await resolveElement(page, selector, innerSelector);
-        const method = outer ? "outerWxml" : "wxml";
+        const markup = await readElementMarkup(element, outer);
         return {
           selector,
           innerSelector: innerSelector ?? null,
-          type: method,
-          wxml: toSerializableValue(await callRequiredMethod(element, method))
+          type: markup.type,
+          wxml: toSerializableValue(markup.wxml)
         };
       });
       return toToolResult(result);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/mcp",
   "type": "module",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "mcp",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "ISC",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
     "zod": "^4.4.3",
-    "@weapp-vite/devtools-runtime": "0.4.6"
+    "@weapp-vite/devtools-runtime": "0.4.7"
   },
   "scripts": {
     "dev": "unbuild --stub",