@pmate/cli 0.37.1 → 0.38.0

package/README.md

@@ -270,31 +270,36 @@ Meili's Host may pass `--actor-profile-id` with `PMATE_LOG_DELEGATE_TOKEN` in th
 
 Packaged installers are automatically uploaded to Aliyun OSS (`parrot-static`), using the same credentials as Android APK releases. The completion output and build report include public download URLs, SHA-256 checksums, and a `release.json` URL. Configure `oss.public.region` and `aliyun.ak/sk` in your PMate configuration. Conflicting published versions require an app version bump. `--dir` produces local unpacked output only; `--dry-run` does not upload.
 
-`pmate app build <ns:app> --target electron --config <file>` builds the configured web app, embeds its static output in an Electron ASAR, and produces a macOS DMG and ZIP. Packaged releases require a CLI login with admin permission in the app namespace; `--dir` and `--dry-run` stay local. The first build downloads pinned Electron and electron-builder versions. Current targets: macOS and Windows, `arm64` and `x64`; macOS packages require a macOS build host.
+`pmate app build <ns:app> --target electron --config <file>` packages a native shell that loads its configured HTTPS origin directly, without building or embedding web resources, and produces macOS DMG/ZIP or Windows NSIS/ZIP artifacts. Packaged releases require a CLI login with admin permission in the app namespace; `--dir` and `--dry-run` stay local. The first build downloads pinned Electron and electron-builder versions. Current targets: macOS and Windows, `arm64` and `x64`; macOS packages require a macOS build host.
 
 ```sh
 pmate app build pmate:hello --target electron --config apps/hello/desktop.config.json --platform mac --arch arm64 --out-dir release/desktop
 ```
 
-Config (paths relative to the config file, `web.dist` relative to `web.cwd`):
+Config schema 2 (`icon` is relative to the config file; migrate schema 1 by removing `web` and changing `schemaVersion` to 2):
 
 ```json
 {
-  "schemaVersion": 1,
+  "schemaVersion": 2,
   "app": "pmate:hello",
   "productName": "Going Merry",
   "bundleId": "chat.pmate.goingmerry",
   "version": "0.1.0",
   "origin": "https://hello.pmate.chat",
   "authOrigins": ["https://auth.pmate.chat"],
-  "icon": "desktop/icon.png",
-  "web": { "cwd": ".", "build": ["pnpm", "run", "build"], "dist": "dist" }
+  "icon": "desktop/icon.png"
 }
 ```
 
 Use `--dry-run` to inspect the plan, `--dir` for an unpacked `.app`, or `--signed` to require a configured macOS signing identity. Default builds are ad-hoc signed for local use; they are not notarized distribution releases. Signed builds use electron-builder's standard signing/notarization environment variables; verify notarization separately before distributing.
 
-The shell serves the bundled renderer under its existing exact HTTPS origin, preserving authentication callbacks and API CORS. Other origins remain normal network requests. Static resources are hashed and checked at launch; missing assets return 404. The renderer is sandboxed with Node disabled and no privileged preload bridge. Sign-in, chat and inference still require internet. The native application menu includes **检查更新…**. It queries apps-api, compares stable versions, and opens the official installer download after confirmation. Installation remains manual. Each build prints its artifact directory and a resource/signing report; packaged releases upload installers and register the version; `--dir` stays local.
+The shell loads the deployed HTTPS website. Packaging requires only the desktop configuration, icon and native runtime dependencies: no frontend package manager, source tree or `dist` is needed. Web UI, business logic and compatible frontend bridge SDK changes ship through web deployment; the next open or user refresh receives them. Do not reload an active conversation or call automatically. Rebuild installers only when installed preload/main-process bridge code, native capabilities/permissions, or the Electron runtime must change. The first migration from an embedded renderer needs one new installer.
+
+`@pmate/bridge` provides `getDesktopBridge()`, runtime `appVersion`, `electronVersion`, `bridgeVersion`, `contentSource`, and callable capability detection. npm SDK versions are independent of the installed host protocol. Missing host capabilities must be shown as unsupported or requiring a shell upgrade; never infer them from the Electron engine version. Preload APIs are exposed only to the configured origin's main frame; auth windows do not receive native APIs. IPC validates the sender and frame, with Node disabled, sandbox and context isolation enabled. The local offline page offers retry without clearing the existing user-data partition. Website CSP and cache policy apply to remote pages.
+
+Verify changes with `pnpm exec vitest run src/tests/electron*.test.ts` and `pnpm typecheck`. With `PMATE_TEST_ELECTRON_PATH` pointing to an Electron executable, run `node scripts/test-electron-online-runtime.cjs` for real HTTPS loading, web revision changes without a rebuild, IPC isolation, offline retry and data persistence. Set `PMATE_TEST_LIVE_ORIGIN=https://merry.pmate.chat` to include production SPA loading. Run `node scripts/test-electron-calls-runtime.cjs` for the isolated incoming-call flow. Certificate bypass is restricted to the local test process; production code keeps certificate validation enabled.
+
+The native application menu includes **检查更新…**, which checks installed shell releases through apps-api and opens the verified installer after confirmation. Installation remains manual. Each build prints its artifact directory and signing report; packaged releases upload installers and register the version; `--dir` stays local.
 
 ### 日志统计默认口径
 
@@ -330,6 +335,6 @@ pmate service ios build td:time-duck-ios --scheme TimeDuck --team D9D59BE76S
 
 Register an `ios` service with `repository` and `dir`. `--cwd` overrides the repository root; `--project` / `--workspace` paths are relative to the app directory. Exactly one discovered project/workspace is required unless explicitly selected. Always provide `--scheme`; `--team` overrides the project's signing team. `--json` returns version, Build, archive and log paths after upload.
 
-The first invocation requires `--last-build <highest-used-build>` (0 only for a new app). The next Build is one greater than the maximum of the project value, imported value and locally reserved sequence. A previous date-based Build therefore continues as that integer plus one. Import the current Apple maximum again after uploads outside this CLI or on another machine; this command does not query Apple build history. Do not lower or delete the sequence to reuse a number.
+The first invocation for each marketing version requires `--last-build <highest-used-build-for-this-version>` (0 only for a new version). The next Build is one greater than the maximum of the project value, imported value and locally reserved sequence for that version. Reservations, including failed builds, are kept separately per version. To migrate published date-based numbers, first increase MARKETING_VERSION and set CURRENT_PROJECT_VERSION to 0, then import 0 for the new version to start at Build 1. Import the current Apple maximum again after uploads outside this CLI or on another machine; this command does not query Apple build history. Do not lower or delete the sequence to reuse a number. Burgess performs the Apple history check and version migration automatically.
 
 Sequences, retained archives, derived data and logs live in `~/.pmate/ios-builds/`. Project/source version files are not changed. A bundle-level exclusive lock prevents simultaneous builds on the same machine; it does not coordinate different machines. Build/upload failures keep the reserved number and logs; retry consumes the next number. After an interrupted process, remove a leftover `.lock` file only after confirming no build is still running. Builds require automatic signing; resolve Apple account/certificate/profile errors in Xcode. Extension or App targets with fixed plist versions must produce matching archive metadata or the upload is stopped.

package/dist/index.js

@@ -17537,7 +17537,6 @@ var StoreCommandHandler = class {
 
 // src/electronBuild.ts
 var import_node_child_process9 = require("child_process");
-var import_node_crypto5 = require("crypto");
 var import_node_fs19 = require("fs");
 var import_node_os9 = require("os");
 var import_node_path24 = __toESM(require("path"));
@@ -17585,7 +17584,7 @@ var ELECTRON_VERSION = "44.5.1";
 var BUILDER_VERSION = "26.15.3";
 function readDesktopConfig(file, appId) {
   const c = JSON.parse((0, import_node_fs19.readFileSync)(file, "utf8"));
-  if (c.schemaVersion !== 1 || c.app !== appId) throw new Error("Desktop config schemaVersion/app mismatch");
+  if (c.schemaVersion !== 2 || c.app !== appId) throw new Error("Desktop config schemaVersion/app mismatch");
   for (const key of ["productName", "bundleId", "version", "icon"]) {
     if (typeof c[key] !== "string" || !c[key].trim()) throw new Error(`Missing desktop ${key}`);
   }
@@ -17598,26 +17597,9 @@ function readDesktopConfig(file, appId) {
   origin(c.origin);
   if (!Array.isArray(c.authOrigins)) throw new Error("authOrigins must be an array");
   c.authOrigins.forEach(origin);
-  if (!c.web || typeof c.web.cwd !== "string" || typeof c.web.dist !== "string" || !c.web.dist.trim() || !Array.isArray(c.web.build) || !c.web.build.length || !c.web.build.every((v) => typeof v === "string" && v.length > 0)) throw new Error("Invalid web build configuration");
+  if ("web" in c) throw new Error("Remote desktop builds do not accept web build configuration; remove web");
   return c;
 }
-function collectStaticFiles(root) {
-  const files = [];
-  const walk = (dir) => {
-    for (const entry of (0, import_node_fs19.readdirSync)(dir, { withFileTypes: true })) {
-      const full = import_node_path24.default.join(dir, entry.name);
-      if (entry.isSymbolicLink()) throw new Error(`Symlinks are not allowed in desktop resources: ${entry.name}`);
-      if (entry.name.startsWith(".") || /\.(?:pem|key|p12|pfx)$/i.test(entry.name) || /bot-key|session\.json/i.test(entry.name)) throw new Error(`Private or hidden file in desktop resources: ${entry.name}`);
-      if (entry.isDirectory()) walk(full);
-      else if (entry.isFile() && !entry.name.endsWith(".map")) files.push(import_node_path24.default.relative(root, full));
-      else if (!entry.isFile()) throw new Error(`Unsupported resource: ${entry.name}`);
-    }
-  };
-  if ((0, import_node_fs19.lstatSync)(root).isSymbolicLink()) throw new Error("Static resource root cannot be a symlink");
-  walk(root);
-  if (!files.includes("index.html")) throw new Error("Web build must produce index.html");
-  return files.sort();
-}
 async function runBuildCommand(command, cwd, env = process.env) {
   await new Promise((resolve, reject) => {
     const child = (0, import_node_child_process9.spawn)(command[0], command.slice(1), { cwd, env, stdio: "inherit", shell: false });
@@ -17629,40 +17611,21 @@ async function buildDesktop(args) {
   const file = import_node_path24.default.resolve(args.config);
   const c = readDesktopConfig(file, args.id);
   const base = import_node_path24.default.dirname(file);
-  const cwd = import_node_path24.default.resolve(base, c.web.cwd);
-  const dist = import_node_path24.default.resolve(cwd, c.web.dist);
   const icon = import_node_path24.default.resolve(base, c.icon);
   const output = import_node_path24.default.resolve(args.outDir);
   if (!(0, import_node_fs19.existsSync)(icon) || !(0, import_node_fs19.statSync)(icon).isFile()) throw new Error(`Desktop icon not found: ${icon}`);
   if (!["mac", "win"].includes(args.platform) || !["arm64", "x64"].includes(args.arch)) throw new Error("Supported target: mac|win --arch arm64|x64");
   if (args.platform === "mac" && process.platform !== "darwin") throw new Error("macOS desktop packaging requires a macOS build host");
-  const within = (parent, child) => {
-    const rel = import_node_path24.default.relative(parent, child);
-    return !rel || !rel.startsWith("..") && !import_node_path24.default.isAbsolute(rel);
-  };
-  if (within(dist, cwd) || within(dist, output) || within(output, cwd)) throw new Error("Build output, web source and static resource paths overlap");
-  const plan = { app: c.app, productName: c.productName, version: c.version, target: args.platform, arch: args.arch, command: c.web.build, cwd, dist, output, electron: ELECTRON_VERSION, builder: BUILDER_VERSION, signed: args.signed };
+  const plan = { app: c.app, productName: c.productName, version: c.version, target: args.platform, arch: args.arch, contentSource: "remote", origin: c.origin, output, electron: ELECTRON_VERSION, builder: BUILDER_VERSION, signed: args.signed };
   console.log(JSON.stringify({ phase: "plan", ...plan }, null, 2));
   if (args.dryRun) return;
-  const started = Date.now();
-  await runBuildCommand(c.web.build, cwd);
-  if (!(0, import_node_fs19.existsSync)(import_node_path24.default.join(dist, "index.html")) || (0, import_node_fs19.statSync)(import_node_path24.default.join(dist, "index.html")).mtimeMs < started - 1e3) throw new Error("Build did not produce a fresh index.html; refusing stale resources");
-  const files = collectStaticFiles(dist);
   (0, import_node_fs19.mkdirSync)(output, { recursive: true });
   const staging = (0, import_node_fs19.mkdtempSync)(import_node_path24.default.join(output, ".desktop-build-"));
   const appDir = import_node_path24.default.join(staging, "app");
-  (0, import_node_fs19.mkdirSync)(import_node_path24.default.join(appDir, "renderer"), { recursive: true });
-  const manifest = {};
-  for (const name of files) {
-    const source = import_node_path24.default.join(dist, name), target = import_node_path24.default.join(appDir, "renderer", name);
-    (0, import_node_fs19.mkdirSync)(import_node_path24.default.dirname(target), { recursive: true });
-    (0, import_node_fs19.cpSync)(source, target);
-    manifest[name] = (0, import_node_crypto5.createHash)("sha256").update((0, import_node_fs19.readFileSync)(source)).digest("hex");
-  }
+  (0, import_node_fs19.mkdirSync)(appDir);
   const templateDir = import_node_path24.default.join(__dirname, "templates", "electron");
   (0, import_node_fs19.cpSync)(templateDir, appDir, { recursive: true });
   (0, import_node_fs19.writeFileSync)(import_node_path24.default.join(appDir, "desktop-config.json"), JSON.stringify({ app: c.app, productName: c.productName, origin: c.origin, authOrigins: c.authOrigins, bundleId: c.bundleId }));
-  (0, import_node_fs19.writeFileSync)(import_node_path24.default.join(appDir, "resource-manifest.json"), JSON.stringify(manifest, null, 2));
   (0, import_node_fs19.writeFileSync)(import_node_path24.default.join(appDir, "package.json"), JSON.stringify({ name: c.bundleId.replace(/\./g, "-"), version: c.version, description: `${c.productName} desktop application`, author: "PMate", main: "main.cjs", dependencies: { "@pmate/chat-sdk": "0.11.7" } }));
   await runBuildCommand(["npm", "install", "--omit=dev", "--no-audit", "--no-fund"], appDir);
   const cache = import_node_path24.default.join((0, import_node_os9.homedir)(), ".cache", "pmate", "electron", `${ELECTRON_VERSION}-${BUILDER_VERSION}`);
@@ -17687,7 +17650,7 @@ async function buildDesktop(args) {
   const configPath = import_node_path24.default.join(staging, "builder.json");
   (0, import_node_fs19.writeFileSync)(configPath, JSON.stringify(builderConfig));
   await runBuildCommand([process.execPath, import_node_path24.default.join(cache, "node_modules", "electron-builder", "cli.js"), "--config", configPath, args.platform === "mac" ? "--mac" : "--win", `--${args.arch}`, "--publish", "never"], appDir, { ...process.env, ...args.signed ? {} : { CSC_IDENTITY_AUTO_DISCOVERY: "false" } });
-  const result = { ...plan, signature: args.signed ? args.platform === "mac" ? "configured-signing-required; verify notarization before distribution" : "configured-signing-required; verify Authenticode before distribution" : args.platform === "mac" ? "ad-hoc; local development" : "unsigned; local development", artifacts: import_node_path24.default.join(staging, "artifacts"), resources: manifest };
+  const result = { ...plan, signature: args.signed ? args.platform === "mac" ? "configured-signing-required; verify notarization before distribution" : "configured-signing-required; verify Authenticode before distribution" : args.platform === "mac" ? "ad-hoc; local development" : "unsigned; local development", artifacts: import_node_path24.default.join(staging, "artifacts") };
   (0, import_node_fs19.writeFileSync)(import_node_path24.default.join(staging, "build-report.json"), JSON.stringify(result, null, 2));
   const publication = args.dir ? void 0 : await uploadDesktopArtifacts(result.artifacts, c.app, c.version, args.platform, args.arch);
   (0, import_node_fs19.writeFileSync)(import_node_path24.default.join(staging, "build-report.json"), JSON.stringify({ ...result, publication }, null, 2));
@@ -18412,14 +18375,14 @@ var import_promises6 = require("readline/promises");
 
 // src/services/IosBuildService.ts
 var import_node_child_process11 = require("child_process");
-var import_node_crypto7 = require("crypto");
+var import_node_crypto6 = require("crypto");
 var import_node_fs23 = require("fs");
 var import_node_os12 = __toESM(require("os"));
 var import_node_path28 = __toESM(require("path"));
 
 // src/services/AndroidApkReleaseService.ts
 var import_node_child_process10 = require("child_process");
-var import_node_crypto6 = require("crypto");
+var import_node_crypto5 = require("crypto");
 var import_node_fs22 = require("fs");
 var import_node_os11 = __toESM(require("os"));
 var import_node_path27 = __toESM(require("path"));
@@ -18890,7 +18853,7 @@ function listVersionedToolCandidates(parentDir, relativeToolPath) {
 }
 function sha256File(filePath) {
   return new Promise((resolve, reject) => {
-    const hash = (0, import_node_crypto6.createHash)("sha256");
+    const hash = (0, import_node_crypto5.createHash)("sha256");
     const stream = (0, import_node_fs22.createReadStream)(filePath);
     stream.on("data", (chunk) => hash.update(chunk));
     stream.on("error", reject);
@@ -18967,7 +18930,7 @@ var IosBuildService = class {
     if (!bundleId || !/^\d+\.\d+(?:\.\d+)?$/.test(version ?? "") || !/^[A-Z0-9]{10}$/.test(team ?? "")) throw new Error("Missing or invalid bundle ID, MARKETING_VERSION or signing team; use --team if needed");
     if (service.mobile && "bundleId" in service.mobile && service.mobile.bundleId !== bundleId) throw new Error("Service bundle ID does not match application target");
     const currentBuild = iosBuildInteger(cfg.CURRENT_PROJECT_VERSION);
-    const key = (0, import_node_crypto7.createHash)("sha256").update(bundleId).digest("hex");
+    const key = (0, import_node_crypto6.createHash)("sha256").update(bundleId).digest("hex");
     const statePath = import_node_path28.default.join(root, `${key}.json`);
     const lockPath = import_node_path28.default.join(root, `${key}.lock`);
     let lock;
@@ -18981,14 +18944,18 @@ var IosBuildService = class {
       (0, import_node_fs23.writeFileSync)(lock, JSON.stringify({ pid: process.pid, bundleId }));
       const previous = (0, import_node_fs23.existsSync)(statePath) ? JSON.parse((0, import_node_fs23.readFileSync)(statePath, "utf8")) : void 0;
       if (previous && previous.bundleId !== bundleId) throw new Error("iOS build state bundle ID mismatch");
-      if (!previous && options.lastBuild === void 0) throw new Error("First build on this machine requires --last-build <highest Apple build>; use 0 only for a new app. Import again after external uploads or changing machines.");
-      const build = Math.max(currentBuild, previous ? iosBuildInteger(previous.build) : 0, options.lastBuild ?? 0) + 1;
+      const buildsByVersion = { ...previous?.buildsByVersion };
+      if (previous) buildsByVersion[previous.version] = Math.max(buildsByVersion[previous.version] ?? 0, iosBuildInteger(previous.build));
+      const priorBuild = buildsByVersion[version];
+      if (priorBuild === void 0 && options.lastBuild === void 0) throw new Error("First build for this marketing version requires --last-build <highest Apple build for this version>; use 0 only for a new version. Import again after external uploads or changing machines.");
+      const build = Math.max(currentBuild, priorBuild ?? 0, options.lastBuild ?? 0) + 1;
       iosBuildInteger(build);
       const buildDir = import_node_path28.default.join(root, key, `${version}-${build}`);
       (0, import_node_fs23.mkdirSync)(buildDir, { recursive: true, mode: 448 });
       const archivePath = import_node_path28.default.join(buildDir, "App.xcarchive");
       const logPath = import_node_path28.default.join(buildDir, "build.log");
-      const state = { bundleId, version, build, status: "reserved", archivePath, logPath };
+      buildsByVersion[version] = build;
+      const state = { bundleId, version, build, buildsByVersion, status: "reserved", archivePath, logPath };
       const persist = () => {
         const temp = `${statePath}.${process.pid}.tmp`;
         (0, import_node_fs23.writeFileSync)(temp, JSON.stringify(state, null, 2) + "\n", { mode: 384 });
@@ -22260,7 +22227,7 @@ var RoleCommandHandler = class {
 
 // src/commands/AccountCommandHandler.ts
 var import_node_fs26 = require("fs");
-var import_node_crypto8 = require("crypto");
+var import_node_crypto7 = require("crypto");
 var import_node_path31 = __toESM(require("path"));
 init_sessionStore();
 var AccountCommandHandler = class {
@@ -22860,7 +22827,7 @@ var AccountCommandHandler = class {
     return process.env.HOME || process.env.USERPROFILE || process.cwd();
   }
   generateBotKeyFile(app, name) {
-    const { publicKey, privateKey } = (0, import_node_crypto8.generateKeyPairSync)("ed25519");
+    const { publicKey, privateKey } = (0, import_node_crypto7.generateKeyPairSync)("ed25519");
     return {
       type: "pmate-bot-key",
       version: 1,
@@ -22982,12 +22949,12 @@ var AccountCommandHandler = class {
     });
   }
   signBotChallenge(challenge, privateKey) {
-    const key = (0, import_node_crypto8.createPrivateKey)({
+    const key = (0, import_node_crypto7.createPrivateKey)({
       key: Buffer.from(privateKey, "base64url"),
       format: "der",
       type: "pkcs8"
     });
-    return (0, import_node_crypto8.sign)(
+    return (0, import_node_crypto7.sign)(
       null,
       Buffer.from(JSON.stringify({
         id: challenge.id,

package/dist/templates/electron/call-preload.cjs

@@ -1,5 +1,6 @@
 const { contextBridge, ipcRenderer } = require('electron')
-contextBridge.exposeInMainWorld('pmateIncomingCall', Object.freeze({
+const origin = process.argv.find(value => value.startsWith('--pmate-origin='))?.slice('--pmate-origin='.length)
+if (process.isMainFrame && location.origin === origin && location.pathname === '/_desktop/call') contextBridge.exposeInMainWorld('pmateIncomingCall', Object.freeze({
   getSession: () => ipcRenderer.invoke('pmate:call:session'),
   updateState: state => ipcRenderer.invoke('pmate:call:state', state),
   onCloseRequested: handler => {

package/dist/templates/electron/calls.cjs

@@ -19,12 +19,12 @@ function createDesktopCalls({ appId, instanceId, origin, BrowserWindow, ipcMain,
     if (current?.callId === callId) return current.ready
     destroy()
     const window = new BrowserWindow({ width: 420, height: 680, minWidth: 380, minHeight: 540, title: '来电', show: false,
-      backgroundColor: '#ffffff', webPreferences: { preload: path.join(__dirname, 'call-preload.cjs'), partition: 'persist:desktop',
+      backgroundColor: '#ffffff', webPreferences: { preload: path.join(__dirname, 'call-preload.cjs'), additionalArguments: [`--pmate-origin=${origin}`], partition: 'persist:desktop',
         nodeIntegration: false, contextIsolation: true, sandbox: true, webSecurity: true, autoplayPolicy: 'no-user-gesture-required' } })
     let resolve, reject
     const ready = new Promise((yes, no) => { resolve = yes; reject = no })
     const entry = current = { callId, window, ready, resolve, reject, phase: 'incoming', confirming: false }
-    entry.timer = setTimeout(() => { if (current === entry) { reject(new Error('Incoming call window timeout')); destroy() } }, 1500)
+    entry.timer = setTimeout(() => { if (current === entry) { reject(new Error('Incoming call window timeout')); destroy() } }, 15000)
     window.webContents.setWindowOpenHandler(() => ({ action: 'deny' }))
     for (const event of ['will-navigate', 'will-redirect', 'will-attach-webview']) window.webContents.on(event, e => e.preventDefault())
     window.webContents.on('did-fail-load', (_event, code) => { if (code !== -3 && current === entry) { reject(new Error('Incoming call window failed')); destroy() } })

package/dist/templates/electron/main.cjs

@@ -2,14 +2,12 @@ const { createUpdateChecker, installUpdateHandlers } = require('./updates.cjs')
 const { app, BrowserWindow, session, shell, Menu, desktopCapturer, ipcMain, Notification, dialog } = require('electron')
 const path = require('node:path')
 const { installNotificationSettings } = require('./notification-settings.cjs')
-const { createResourceHandler } = require('./resources.cjs')
 const { installMediaPermissions } = require('./media.cjs')
 const { createDesktopNotifications } = require('./notifications.cjs')
 const { desktopInstanceId, createDesktopReach } = require('./reach.cjs')
 const { createRendererReach } = require('./reach-renderer.cjs')
 const { createDesktopCalls, supportsDesktopCalls } = require('./calls.cjs')
 const config = require('./desktop-config.json')
-const manifest = require('./resource-manifest.json')
 app.setName(config.productName)
 if (process.platform === 'win32') app.setAppUserModelId(config.bundleId)
 // Stable across installer versions; separate from every other packaged PMate app.
@@ -32,13 +30,13 @@ function restrict(window) {
   window.webContents.on('did-create-window', child => restrict(child))
 }
 function createWindow() {
-  mainWindow = new BrowserWindow({ width: 1180, height: 820, minWidth: 380, minHeight: 540, title: config.productName, backgroundColor: '#f6f8fb', webPreferences: { additionalArguments: [`--pmate-app-version=${app.getVersion()}`], preload: path.join(__dirname, 'preload.cjs'), partition: 'persist:desktop', nodeIntegration: false, contextIsolation: true, sandbox: true, webSecurity: true } })
+  mainWindow = new BrowserWindow({ width: 1180, height: 820, minWidth: 380, minHeight: 540, title: config.productName, backgroundColor: '#f6f8fb', webPreferences: { additionalArguments: [`--pmate-app-version=${app.getVersion()}`, `--pmate-origin=${config.origin}`, `--pmate-desktop-calls=${supportsDesktopCalls(config.app)}`], preload: path.join(__dirname, 'preload.cjs'), partition: 'persist:desktop', nodeIntegration: false, contextIsolation: true, sandbox: true, webSecurity: true } })
   restrict(mainWindow)
   mainWindow.webContents.on('did-start-navigation', (_event, _url, _inPlace, mainFrame) => { if (mainFrame) desktopNotifications?.clearContext() })
   mainWindow.webContents.on('did-fail-load', (_event, code, _description, url, mainFrame) => {
-    if (mainFrame && code !== -3 && url !== `${config.origin}/_desktop/offline`) void mainWindow.loadURL(`${config.origin}/_desktop/offline`)
+    if (mainFrame && code !== -3 && url !== `${config.origin}/_desktop/offline`) void mainWindow.loadURL(`${config.origin}/_desktop/offline`).catch(error => console.error("Offline page failed:", error.message))
   })
-  void mainWindow.loadURL(config.origin)
+  void mainWindow.loadURL(config.origin).catch(error => console.error("Page load failed:", error.message))
   mainWindow.on('closed', () => { mainWindow = null })
 }
 if (!app.requestSingleInstanceLock()) app.quit()
@@ -46,13 +44,12 @@ else {
   app.on('second-instance', () => { if (mainWindow) { if (mainWindow.isMinimized()) mainWindow.restore(); mainWindow.focus() } })
   app.whenReady().then(() => {
     const desktopSession = session.fromPartition('persist:desktop')
-    const resources = createResourceHandler(path.join(__dirname, 'renderer'), config.origin, manifest)
     desktopSession.protocol.handle('https', request => {
       if (request.url === `${config.origin}/_desktop/offline`) {
         const escape = text => text.replace(/[&<>"']/g, c => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' })[c])
-        return new Response(`<!doctype html><html><head><meta charset="utf-8"><title>${escape(config.productName)}</title></head><body style="font:18px system-ui;max-width:560px;margin:15vh auto;padding:24px"><h1>${escape(config.productName)}</h1><p>Connection unavailable. Your app is installed locally; sign-in and messages need an internet connection.</p><form action="/"><button style="padding:12px 24px">Try again</button></form></body></html>`, { headers: { 'content-type': 'text/html; charset=utf-8', 'content-security-policy': "default-src 'none'; style-src 'unsafe-inline'; form-action 'self'" } })
+        return new Response(`<!doctype html><html><head><meta charset="utf-8"><title>${escape(config.productName)}</title></head><body style="font:18px system-ui;max-width:560px;margin:15vh auto;padding:24px"><h1>${escape(config.productName)}</h1><p>Connection unavailable. Connect to the internet to load the app. Your account data has not been cleared.</p><form action="/"><button style="padding:12px 24px">Try again</button></form></body></html>`, { headers: { 'content-type': 'text/html; charset=utf-8', 'content-security-policy': "default-src 'none'; style-src 'unsafe-inline'; form-action 'self'" } })
       }
-      return resources(request) ?? desktopSession.fetch(request, { bypassCustomProtocolHandlers: true })
+      return desktopSession.fetch(request, { bypassCustomProtocolHandlers: true })
     })
     installMediaPermissions(desktopSession, { origin: config.origin, getWindow: () => mainWindow, getWindows: () => [mainWindow, desktopCalls?.getWindow()], desktopCapturer, BrowserWindow, ipcMain })
     ipcMain.handle('pmate:screen-settings', event => {
@@ -64,7 +61,7 @@ else {
     const checkForUpdates = createUpdateChecker({ app, dialog, shell, appId: config.app })
     Menu.setApplicationMenu(Menu.buildFromTemplate([
       { role: 'appMenu' }, { role: 'editMenu' }, { role: 'viewMenu' }, { role: 'windowMenu' },
-      { label: config.productName, submenu: [{ label: '检查更新…', click: checkForUpdates }, { type: 'separator' }, { label: 'Back to app', click: () => { if (!mainWindow) createWindow(); else void mainWindow.loadURL(config.origin) } }] },
+      { label: config.productName, submenu: [{ label: '检查更新…', click: checkForUpdates }, { type: 'separator' }, { label: 'Back to app', click: () => { if (!mainWindow) createWindow(); else void mainWindow.loadURL(config.origin).catch(error => console.error("Page load failed:", error.message)) } }] },
     ]))
     desktopNotifications = createDesktopNotifications({ ipcMain, Notification, origin: config.origin, appId: config.app, getWindow: () => mainWindow, showWindow: () => {
       if (!mainWindow) createWindow()

package/dist/templates/electron/preload.cjs

@@ -1,6 +1,7 @@
 const { contextBridge, ipcRenderer } = require('electron')
-contextBridge.exposeInMainWorld('pmateDesktop', Object.freeze({
-  runtime: Object.freeze({ platform: process.platform, appVersion: process.argv.find(value => value.startsWith('--pmate-app-version='))?.slice('--pmate-app-version='.length), electronVersion: process.versions.electron }),
+const origin = process.argv.find(value => value.startsWith('--pmate-origin='))?.slice('--pmate-origin='.length)
+if (process.isMainFrame && location.origin === origin) contextBridge.exposeInMainWorld('pmateDesktop', Object.freeze({
+  runtime: Object.freeze({ platform: process.platform, appVersion: process.argv.find(value => value.startsWith('--pmate-app-version='))?.slice('--pmate-app-version='.length), electronVersion: process.versions.electron, bridgeVersion: '1.0.0', contentSource: 'remote' }),
   updates: Object.freeze({
     check: () => ipcRenderer.invoke('pmate:update:check'),
     download: () => ipcRenderer.invoke('pmate:update:download'),
@@ -19,11 +20,11 @@ contextBridge.exposeInMainWorld('pmateDesktop', Object.freeze({
     configure: identity => ipcRenderer.invoke('pmate:reach:configure', identity),
     stop: () => ipcRenderer.invoke('pmate:reach:stop'),
   }),
-  calls: Object.freeze({
+  calls: process.argv.includes('--pmate-desktop-calls=true') ? Object.freeze({
     incoming: (callId, teamId) => ipcRenderer.invoke('pmate:call:incoming', callId, teamId),
     handleReach: event => ipcRenderer.invoke('pmate:call:reach', event),
     setPeople: people => ipcRenderer.invoke('pmate:call:people', people),
-  }),
+  }) : undefined,
   notifications: Object.freeze({
     openSettings: () => ipcRenderer.invoke('pmate:notification:settings'),
     present: input => ipcRenderer.invoke('pmate:notification:present', input),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {

package/dist/templates/electron/resources.cjs

@@ -1,32 +0,0 @@
-const fs = require('node:fs')
-const path = require('node:path')
-const crypto = require('node:crypto')
-const TYPES = { '.html': 'text/html; charset=utf-8', '.js': 'text/javascript', '.mjs': 'text/javascript', '.css': 'text/css', '.json': 'application/json', '.svg': 'image/svg+xml', '.png': 'image/png', '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.webp': 'image/webp', '.ico': 'image/x-icon', '.woff': 'font/woff', '.woff2': 'font/woff2', '.ttf': 'font/ttf', '.wasm': 'application/wasm', '.mp3': 'audio/mpeg', '.mp4': 'video/mp4' }
-function createResourceHandler(root, origin, manifest) {
-  // Reject a stale or altered renderer before displaying it.
-  for (const [file, digest] of Object.entries(manifest)) {
-    if (file.split(/[\\/]/).includes('..') || path.isAbsolute(file)) throw new Error('Invalid resource manifest')
-    if (crypto.createHash('sha256').update(fs.readFileSync(path.join(root, file))).digest('hex') !== digest) throw new Error(`Resource integrity check failed: ${file}`)
-  }
-  return (request) => {
-    const url = new URL(request.url)
-    if (url.origin !== origin) return null
-    if (!['GET', 'HEAD'].includes(request.method)) return new Response('Method not allowed', { status: 405 })
-    let name
-    try { name = decodeURIComponent(url.pathname).slice(1) } catch { return new Response('Invalid path', { status: 400 }) }
-    if (name.includes('\\') || name.includes('\0') || name.split('/').some(p => p === '..' || p === '.')) return new Response('Invalid path', { status: 400 })
-    // Exact files come from the build manifest. Only extensionless document routes get the SPA shell.
-    if (!Object.hasOwn(manifest, name)) {
-      if (name === '_desktop/call' || (!path.extname(name) && request.headers.get('sec-fetch-dest') === 'document')) name = 'index.html'
-      else if (!name) name = 'index.html'
-      else return new Response('Resource not found', { status: 404 })
-    }
-    const bytes = fs.readFileSync(path.join(root, name))
-    return new Response(request.method === 'HEAD' ? null : bytes, { headers: {
-      'content-type': TYPES[path.extname(name)] || 'application/octet-stream',
-      'content-length': String(bytes.length), 'x-content-type-options': 'nosniff',
-      'content-security-policy': "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data: blob: https:; font-src 'self' data:; connect-src https: wss:; media-src 'self' blob: https:; worker-src 'self' blob:; object-src 'none'; base-uri 'self'; frame-ancestors 'none'",
-    } })
-  }
-}
-module.exports = { createResourceHandler }