@dimina-kit/devtools 0.4.0-dev.20260630070008 → 0.4.0-dev.20260630123203

package/dist/main/index.bundle.js

@@ -4731,6 +4731,9 @@ function buildServiceHostSpawnUrl(opts) {
   if (opts.hostEnvSnapshot) {
     url.searchParams.set("hostEnv", encodeURIComponent(JSON.stringify(opts.hostEnvSnapshot)));
   }
+  if (opts.apiNamespaces && opts.apiNamespaces.length > 0) {
+    url.searchParams.set("apiNamespaces", opts.apiNamespaces.join(","));
+  }
   return url.toString();
 }
 function navigateServiceHost(win, url) {
@@ -5624,6 +5627,52 @@ function findSimulatorWebContents() {
   return null;
 }
 
+// src/main/ipc/page-scroll.ts
+function buildPageScrollScript(params) {
+  const rawTop = Number(params.scrollTop);
+  const top = Number.isFinite(rawTop) ? rawTop : 0;
+  const duration = params.duration === void 0 ? 300 : Number(params.duration);
+  const behavior = Number.isFinite(duration) && duration > 0 ? "smooth" : "auto";
+  return `window.scrollTo({ top: ${top}, left: 0, behavior: ${JSON.stringify(behavior)} })`;
+}
+
+// src/main/ipc/app-lifecycle.ts
+function createAppLifecycleController() {
+  const sessions = /* @__PURE__ */ new Map();
+  return {
+    register(appSessionId, event, callbackId) {
+      if (callbackId === void 0 || callbackId === null) return;
+      let events = sessions.get(appSessionId);
+      if (!events) {
+        events = /* @__PURE__ */ new Map();
+        sessions.set(appSessionId, events);
+      }
+      let ids = events.get(event);
+      if (!ids) {
+        ids = /* @__PURE__ */ new Set();
+        events.set(event, ids);
+      }
+      ids.add(callbackId);
+    },
+    unregister(appSessionId, event, callbackId) {
+      const events = sessions.get(appSessionId);
+      if (!events) return;
+      if (callbackId === void 0 || callbackId === null) {
+        events.delete(event);
+        return;
+      }
+      events.get(event)?.delete(callbackId);
+    },
+    listeners(appSessionId, event) {
+      const ids = sessions.get(appSessionId)?.get(event);
+      return ids ? Array.from(ids) : [];
+    },
+    dispose(appSessionId) {
+      sessions.delete(appSessionId);
+    }
+  };
+}
+
 // src/main/ipc/bridge-router.ts
 function rewriteSourceMappingUrl(source, scriptUrl) {
   if (typeof source !== "string" || !source) return source;
@@ -5703,6 +5752,7 @@ function installBridgeRouter(ctx) {
     },
     connections: ctx.connections,
     debugTap: createDebugTap({ enabled: resolveDebugTapEnabled() }),
+    appLifecycle: createAppLifecycleController(),
     evictAppDataBridges: (ap) => {
       if (!ctx.appData) return;
       for (const page of ap.pages.values()) ctx.appData.evictBridge(ap.appId, page.bridgeId);
@@ -5720,6 +5770,7 @@ function installBridgeRouter(ctx) {
     ctx.registry.add(() => clearTimeout(warmTimer));
     ctx.registry.add(() => state.pool?.dispose());
   }
+  installAppLifecycleDriver(ctx, state);
   installResourceProtocolHandlers(ctx, state);
   let currentDevice = null;
   const onNativeHostQuery = (event) => {
@@ -5984,6 +6035,7 @@ async function handleSpawn(state, ctx, event, opts) {
   const workspaceProjectPath = typeof ctx.workspace.getProjectPath === "function" ? ctx.workspace.getProjectPath() : "";
   const pkgRoot = path16.resolve(opts.pkgRoot || workspaceProjectPath || process.cwd());
   const root = opts.root || "main";
+  const apiNamespaces = ctx.apiNamespaces ?? [];
   let resourceServer = null;
   let resourceBaseUrl;
   if (opts.resourceBaseUrl) {
@@ -6025,7 +6077,8 @@ async function handleSpawn(state, ctx, event, opts) {
       pkgRoot,
       root,
       resourceBaseUrl,
-      hostEnvSnapshot: hostEnv
+      hostEnvSnapshot: hostEnv,
+      apiNamespaces
     });
   }
   const appSession = {
@@ -6038,6 +6091,7 @@ async function handleSpawn(state, ctx, event, opts) {
     serviceWc: serviceWindow.webContents,
     simulatorWc,
     serviceLoaded: false,
+    logicInjected: null,
     resourceBaseUrl,
     resourceServer,
     hostEnv,
@@ -6059,6 +6113,7 @@ async function handleSpawn(state, ctx, event, opts) {
     renderWc: null,
     renderLoaded: false,
     resourceLoadedSent: false,
+    renderLoadPending: false,
     windowConfig: rootWindowConfig
   };
   state.appSessions.set(appSessionId, appSession);
@@ -6093,7 +6148,7 @@ async function handleSpawn(state, ctx, event, opts) {
       }
       if (!serviceWindow.webContents.getURL().includes("service.html")) return;
       serviceWindow.webContents.removeListener("did-finish-load", bootOnServiceLoad);
-      void bootServiceHost(state, appSession);
+      void bootServiceHost(state, appSession, ctx);
     };
     appSession.onServiceBoot = bootOnServiceLoad;
     serviceWindow.webContents.on("did-finish-load", bootOnServiceLoad);
@@ -6106,12 +6161,13 @@ async function handleSpawn(state, ctx, event, opts) {
         pkgRoot,
         root,
         resourceBaseUrl,
-        hostEnvSnapshot: hostEnv
+        hostEnvSnapshot: hostEnv,
+        apiNamespaces
       })
     );
   } else {
     serviceWindow.webContents.once("did-finish-load", () => {
-      void bootServiceHost(state, appSession);
+      void bootServiceHost(state, appSession, ctx);
     });
   }
   return {
@@ -6145,6 +6201,7 @@ async function handlePageOpen(state, event, opts) {
     renderWc: null,
     renderLoaded: false,
     resourceLoadedSent: false,
+    renderLoadPending: false,
     windowConfig
   };
   state.pageSessions.set(bridgeId, page);
@@ -6191,23 +6248,49 @@ function handleNavCallback(state, sender, payload) {
   }
   sendCallback(ap, payload.callbacks.complete, result);
 }
-async function bootServiceHost(state, ap) {
+async function bootServiceHost(state, ap, ctx) {
   if (state.appSessions.get(ap.appSessionId) !== ap) return;
-  await injectLogicBundle(ap);
+  ap.logicInjected = await injectLogicBundle(ap);
+  if (!ap.logicInjected) {
+    reportLogicLoadFailure(ap, ctx);
+    return;
+  }
   forwardToService(ap, makeLoadResource(ap, ap.pages.get(ap.appSessionId), "service"));
+  for (const page of ap.pages.values()) {
+    if (page.renderLoadPending) {
+      page.renderLoadPending = false;
+      sendRenderLoadResource(ap, page);
+    }
+  }
+}
+function sendRenderLoadResource(ap, page) {
+  if (page.renderWc && !page.renderWc.isDestroyed()) {
+    page.renderWc.send(BRIDGE_CHANNELS.TO_RENDER, { msg: makeLoadResource(ap, page, "render") });
+  }
+}
+function logicBundleUrl(ap) {
+  return ap.resourceServer ? new URL("logic.js", ap.resourceBaseUrl).toString() : new URL(`${ap.appId}/${ap.root}/logic.js`, ap.resourceBaseUrl).toString();
 }
 async function injectLogicBundle(ap) {
-  const logicUrl = ap.resourceServer ? new URL("logic.js", ap.resourceBaseUrl).toString() : new URL(`${ap.appId}/${ap.root}/logic.js`, ap.resourceBaseUrl).toString();
+  const logicUrl = logicBundleUrl(ap);
   try {
     const res = await fetch(logicUrl);
     if (!res.ok) throw new Error(`logic.js fetch ${res.status} at ${logicUrl}`);
     const logicContent = rewriteSourceMappingUrl(await res.text(), logicUrl);
     await ap.serviceWc.executeJavaScript(`${logicContent}
 //# sourceURL=${logicUrl}`, true);
+    return true;
   } catch (error) {
     console.warn("[bridge-router] unable to inject service logic.js:", error);
+    return false;
   }
 }
+function reportLogicLoadFailure(ap, ctx) {
+  const hint = ap.appId === "unknown" ? ' appId could not be resolved (it fell back to "unknown") \u2014 the mini-program likely failed to compile or its project manifest/app config is missing.' : "";
+  const message = `[dimina-kit] Failed to load the mini-program logic bundle from ${logicBundleUrl(ap)}. The service runtime has no registered modules, so no page can mount.` + hint + ` Verify the project compiled successfully and that the resource server serves "${ap.appId}/${ap.root}/".`;
+  console.error(message);
+  ctx.guestConsole?.emit({ source: "service", level: "error", args: [message] });
+}
 function maybeSendResourceLoaded(ap, page) {
   if (page.resourceLoadedSent || !ap.serviceLoaded || !page.renderLoaded) return;
   page.resourceLoadedSent = true;
@@ -6242,9 +6325,12 @@ function routeFromService(state, ap, defaultPage, msg, ctx) {
 }
 function routeFromRender(state, ap, page, msg, ctx) {
   if (msg.type === "renderHostReady") {
-    if (page.renderWc && !page.renderWc.isDestroyed()) {
-      page.renderWc.send(BRIDGE_CHANNELS.TO_RENDER, { msg: makeLoadResource(ap, page, "render") });
+    if (ap.logicInjected === false) return;
+    if (ap.logicInjected === null) {
+      page.renderLoadPending = true;
+      return;
     }
+    sendRenderLoadResource(ap, page);
     return;
   }
   if (msg.type === "renderResourceLoaded") {
@@ -6281,9 +6367,15 @@ function handleContainerMsg(ap, page, msg, ctx, state) {
     case "invokeAPI":
       void handleSimulatorApi(state, ap, page, msg.body, ctx);
       break;
-    case "serviceHostError":
+    case "serviceHostError": {
       console.warn("[bridge-router] service host error:", msg.body);
+      const errBody = msg.body;
+      const errArg = errBody?.message ?? msg.body;
+      for (const id of state.appLifecycle.listeners(ap.appSessionId, "onError")) {
+        sendCallback(ap, id, errArg);
+      }
       break;
+    }
     case "consoleLog":
       ctx.guestConsole?.emit(msg.body);
       break;
@@ -6315,6 +6407,40 @@ var TAB_ACTION_NAMES = /* @__PURE__ */ new Set([
   "showTabBarRedDot",
   "hideTabBarRedDot"
 ]);
+function installAppLifecycleDriver(ctx, state) {
+  const win = ctx.windows?.mainWindow;
+  if (!win || typeof win.on !== "function") return;
+  const emit = (serviceEvent, listenerEvent) => {
+    for (const ap of state.appSessions.values()) {
+      forwardToService(ap, { type: serviceEvent, target: "service", body: {} });
+      for (const id of state.appLifecycle.listeners(ap.appSessionId, listenerEvent)) {
+        sendCallback(ap, id, {});
+      }
+    }
+  };
+  const onHide = () => emit("appHide", "onAppHide");
+  const onShow = () => emit("appShow", "onAppShow");
+  win.on("hide", onHide);
+  win.on("minimize", onHide);
+  win.on("show", onShow);
+  win.on("restore", onShow);
+  ctx.registry.add(() => {
+    win.off("hide", onHide);
+    win.off("minimize", onHide);
+    win.off("show", onShow);
+    win.off("restore", onShow);
+  });
+}
+var APP_LIFECYCLE_REGISTER = {
+  onAppShow: "onAppShow",
+  onAppHide: "onAppHide",
+  onError: "onError"
+};
+var APP_LIFECYCLE_UNREGISTER = {
+  offAppShow: "onAppShow",
+  offAppHide: "onAppHide",
+  offError: "onError"
+};
 async function handleSimulatorApi(state, ap, page, body, ctx) {
   const name = String(body.name ?? "");
   const params = normalizeParams(body.params);
@@ -6365,6 +6491,27 @@ async function handleSimulatorApi(state, ap, page, body, ctx) {
     }
     return;
   }
+  const lifecycleRegister = APP_LIFECYCLE_REGISTER[name];
+  if (lifecycleRegister) {
+    state.appLifecycle.register(ap.appSessionId, lifecycleRegister, params.success);
+    return;
+  }
+  const lifecycleUnregister = APP_LIFECYCLE_UNREGISTER[name];
+  if (lifecycleUnregister) {
+    state.appLifecycle.unregister(ap.appSessionId, lifecycleUnregister, params.success);
+    return;
+  }
+  if (name === "pageScrollTo") {
+    const renderWc = page.renderWc;
+    if (renderWc && !renderWc.isDestroyed()) {
+      void renderWc.executeJavaScript(buildPageScrollScript(params)).catch(() => {
+      });
+    }
+    const successResult = { errMsg: "pageScrollTo:ok" };
+    sendCallback(ap, params.success, successResult);
+    sendCallback(ap, params.complete, successResult);
+    return;
+  }
   if (ctx.storageApi && STORAGE_API_NAMES.has(name)) {
     try {
       const result = await ctx.storageApi.invoke(ap.appId, name, params);
@@ -6589,6 +6736,7 @@ async function disposeAppSession(state, appSessionId, opts = {}) {
   const ap = state.appSessions.get(appSessionId);
   if (!ap) return;
   state.appSessions.delete(appSessionId);
+  state.appLifecycle.dispose(appSessionId);
   state.evictAppDataBridges(ap);
   for (const [requestId, pending] of state.pendingApiCalls) {
     if (pending.appSessionId !== appSessionId) continue;

package/dist/main/ipc/app-lifecycle.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Per-app-session registry for the app-level lifecycle listeners registered
+ * from the mini-program service layer: `wx.onAppShow` / `onAppHide` / `onError`
+ * (and their `off*` removers).
+ *
+ * These arrive as keep subscriptions — `wx.onAppShow(cb)` encodes `cb` as a
+ * persistent callback id in `params.success` (service `callback.store(fn,
+ * keep=true)`), so the router stores the id here and re-fires it via
+ * `sendCallback` on every app foreground / background / error.
+ *
+ * `wx.offAppShow(cb)` re-encodes the SAME `cb`: with `keep=true`,
+ * `callback.store` dedups by function and returns the original evtId, so `off*`
+ * carries that id and removes exactly that listener. `wx.offAppShow()` with no
+ * argument carries no id and clears every listener of the event (WeChat
+ * contract).
+ */
+export type AppLifecycleEvent = 'onAppShow' | 'onAppHide' | 'onError';
+export interface AppLifecycleController {
+    /** Store a keep callback id for an event. Null/undefined ids are ignored. */
+    register(appSessionId: string, event: AppLifecycleEvent, callbackId: unknown): void;
+    /**
+     * Remove a listener. With `callbackId`, removes only that id; without one,
+     * clears every listener of the event for the session.
+     */
+    unregister(appSessionId: string, event: AppLifecycleEvent, callbackId?: unknown): void;
+    /** Snapshot of the registered callback ids (empty for unknown session/event). */
+    listeners(appSessionId: string, event: AppLifecycleEvent): unknown[];
+    /** Drop all listeners for a torn-down session. */
+    dispose(appSessionId: string): void;
+}
+export declare function createAppLifecycleController(): AppLifecycleController;
+//# sourceMappingURL=app-lifecycle.d.ts.map

package/dist/main/ipc/app-lifecycle.js

@@ -0,0 +1,54 @@
+/**
+ * Per-app-session registry for the app-level lifecycle listeners registered
+ * from the mini-program service layer: `wx.onAppShow` / `onAppHide` / `onError`
+ * (and their `off*` removers).
+ *
+ * These arrive as keep subscriptions — `wx.onAppShow(cb)` encodes `cb` as a
+ * persistent callback id in `params.success` (service `callback.store(fn,
+ * keep=true)`), so the router stores the id here and re-fires it via
+ * `sendCallback` on every app foreground / background / error.
+ *
+ * `wx.offAppShow(cb)` re-encodes the SAME `cb`: with `keep=true`,
+ * `callback.store` dedups by function and returns the original evtId, so `off*`
+ * carries that id and removes exactly that listener. `wx.offAppShow()` with no
+ * argument carries no id and clears every listener of the event (WeChat
+ * contract).
+ */
+export function createAppLifecycleController() {
+    const sessions = new Map();
+    return {
+        register(appSessionId, event, callbackId) {
+            if (callbackId === undefined || callbackId === null)
+                return;
+            let events = sessions.get(appSessionId);
+            if (!events) {
+                events = new Map();
+                sessions.set(appSessionId, events);
+            }
+            let ids = events.get(event);
+            if (!ids) {
+                ids = new Set();
+                events.set(event, ids);
+            }
+            ids.add(callbackId);
+        },
+        unregister(appSessionId, event, callbackId) {
+            const events = sessions.get(appSessionId);
+            if (!events)
+                return;
+            if (callbackId === undefined || callbackId === null) {
+                events.delete(event);
+                return;
+            }
+            events.get(event)?.delete(callbackId);
+        },
+        listeners(appSessionId, event) {
+            const ids = sessions.get(appSessionId)?.get(event);
+            return ids ? Array.from(ids) : [];
+        },
+        dispose(appSessionId) {
+            sessions.delete(appSessionId);
+        },
+    };
+}
+//# sourceMappingURL=app-lifecycle.js.map