@pmate/cli 0.35.3 → 0.35.5

package/dist/index.js

@@ -17567,8 +17567,8 @@ async function buildDesktop(args) {
   const icon = import_node_path23.default.resolve(base, c.icon);
   const output = import_node_path23.default.resolve(args.outDir);
   if (!(0, import_node_fs18.existsSync)(icon) || !(0, import_node_fs18.statSync)(icon).isFile()) throw new Error(`Desktop icon not found: ${icon}`);
-  if (args.platform !== "mac" || !["arm64", "x64"].includes(args.arch)) throw new Error("This release supports mac --arch arm64|x64; Windows/Linux are not yet supported");
-  if (process.platform !== "darwin") throw new Error("macOS desktop packaging requires a macOS build host");
+  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_path23.default.relative(parent, child);
     return !rel || !rel.startsWith("..") && !import_node_path23.default.isAbsolute(rel);
@@ -17596,7 +17596,7 @@ async function buildDesktop(args) {
   (0, import_node_fs18.cpSync)(templateDir, appDir, { recursive: true });
   (0, import_node_fs18.writeFileSync)(import_node_path23.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_fs18.writeFileSync)(import_node_path23.default.join(appDir, "resource-manifest.json"), JSON.stringify(manifest, null, 2));
-  (0, import_node_fs18.writeFileSync)(import_node_path23.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.9.11" } }));
+  (0, import_node_fs18.writeFileSync)(import_node_path23.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.1" } }));
   await runBuildCommand(["npm", "install", "--omit=dev", "--no-audit", "--no-fund"], appDir);
   const cache = import_node_path23.default.join((0, import_node_os9.homedir)(), ".cache", "pmate", "electron", `${ELECTRON_VERSION}-${BUILDER_VERSION}`);
   (0, import_node_fs18.mkdirSync)(cache, { recursive: true });
@@ -17614,12 +17614,13 @@ async function buildDesktop(args) {
     asar: true,
     artifactName: "${productName}-${version}-${arch}.${ext}",
     mac: { icon, target: args.dir ? ["dir"] : ["dmg", "zip"], category: "public.app-category.social-networking", hardenedRuntime: args.signed, extendInfo: { NSMicrophoneUsageDescription: `${c.productName} uses your microphone for voice calls and voice messages.` }, ...args.signed ? {} : { identity: "-", notarize: false } },
+    win: { icon, target: args.dir ? ["dir"] : ["nsis", "zip"], ...args.signed ? {} : { signExecutable: false } },
     forceCodeSigning: args.signed
   };
   const configPath = import_node_path23.default.join(staging, "builder.json");
   (0, import_node_fs18.writeFileSync)(configPath, JSON.stringify(builderConfig));
-  await runBuildCommand([process.execPath, import_node_path23.default.join(cache, "node_modules", "electron-builder", "cli.js"), "--config", configPath, "--mac", `--${args.arch}`, "--publish", "never"], appDir, { ...process.env, ...args.signed ? {} : { CSC_IDENTITY_AUTO_DISCOVERY: "false" } });
-  const result = { ...plan, signature: args.signed ? "configured-signing-required; verify notarization before distribution" : "ad-hoc; local development", artifacts: import_node_path23.default.join(staging, "artifacts"), resources: manifest };
+  await runBuildCommand([process.execPath, import_node_path23.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_path23.default.join(staging, "artifacts"), resources: manifest };
   (0, import_node_fs18.writeFileSync)(import_node_path23.default.join(staging, "build-report.json"), JSON.stringify(result, null, 2));
   console.log(JSON.stringify({ phase: "complete", report: import_node_path23.default.join(staging, "build-report.json"), artifacts: result.artifacts, signature: result.signature }, null, 2));
 }
@@ -23466,9 +23467,9 @@ function parseAppArgs(tokens) {
       } else throw new Error(`Unknown app build option: ${key}`);
     }
     if (options["--target"] !== "electron" || !options["--config"]) throw new Error("Use app build <ns:app> --target electron --config <file>");
-    const platform = options["--platform"] ?? (process.platform === "darwin" ? "mac" : process.platform);
+    const platform = options["--platform"] ?? (process.platform === "darwin" ? "mac" : process.platform === "win32" ? "win" : process.platform);
     const arch = options["--arch"] ?? process.arch;
-    if (platform !== "mac" || !["arm64", "x64"].includes(arch)) throw new Error("Supported target: --platform mac --arch arm64|x64");
+    if (!["mac", "win"].includes(platform) || !["arm64", "x64"].includes(arch)) throw new Error("Supported target: --platform mac|win --arch arm64|x64");
     return { type: "app" /* App */, action, id, target: "electron", config: options["--config"], platform, arch, outDir: options["--out-dir"] ?? "release/desktop", dryRun: switches.has("--dry-run"), signed: switches.has("--signed"), dir: switches.has("--dir"), json: switches.has("--json") };
   }
   let baseUrl;

package/dist/templates/electron/calls.cjs

@@ -47,7 +47,7 @@ function createDesktopCalls({ appId, instanceId, origin, BrowserWindow, ipcMain,
   ipcMain.handle('pmate:call:session', event => {
     if (!trusted(event) || !identity || !client) throw new Error('Untrusted call session request')
     const callerId = client.snapshot().peerId, caller = people.get(callerId) ?? { id: callerId, name: '联系人' }
-    return { callId: current.callId, profileId: identity.profileId, token: identity.token, clientInstanceId: instanceId, caller, url: 'wss://calls.pmate.chat/call' }
+    return { callId: current.callId, teamId: client.snapshot().teamId, profileId: identity.profileId, token: identity.token, clientInstanceId: instanceId, caller, url: 'wss://calls.pmate.chat/call' }
   })
   ipcMain.handle('pmate:call:state', (event, state) => {
     if (!trusted(event) || !state || state.callId !== current.callId || !['idle', 'requesting', 'ringing', 'incoming', 'connecting', 'connected', 'ended'].includes(state.phase)) throw new Error('Invalid call window state')
@@ -87,10 +87,11 @@ function createDesktopCalls({ appId, instanceId, origin, BrowserWindow, ipcMain,
       if (event.eventType === 'call.ended' && result === 'handled' && current?.callId === event.payload.callId) destroy()
       return result
     },
-    async incoming(callId) {
+    async incoming(callId, teamId) {
       if (!client || typeof callId !== 'string' || !callId || callId.length > 128) throw new Error('Invalid incoming call')
+      if (teamId !== undefined && current?.callId === callId && client.snapshot().teamId !== teamId) throw new Error('CALL_TEAM_MISMATCH')
       if (current?.callId === callId && ['incoming', 'connecting', 'connected'].includes(current.phase)) { current.window.show(); current.window.focus(); return current.ready }
-      const ownGeneration = generation, result = await client.attachAndWait(callId)
+      const ownGeneration = generation, result = await client.attachAndWait(callId, 4000, teamId)
       if (generation !== ownGeneration) throw new Error('Call identity changed')
       return result === 'handled' ? present(callId) : result
     },

package/dist/templates/electron/main.cjs

@@ -9,6 +9,7 @@ const { createDesktopCalls } = 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.
 app.setPath('userData', path.join(app.getPath('appData'), config.bundleId))
 const allowedNavigation = new Set([config.origin, ...config.authOrigins])
@@ -72,13 +73,13 @@ else {
     if (config.app === 'pmate:hello') desktopCalls = createDesktopCalls({ appId: config.app, instanceId, origin: config.origin, BrowserWindow, ipcMain, dialog })
     desktopReach = createDesktopReach({ appId: config.app, instanceId, present: input => desktopNotifications.display(input),
       configureCalls: identity => { rendererReach.reset(); return desktopCalls?.configure(identity) }, stopCalls: () => { rendererReach.reset(); desktopCalls?.stop() },
-      incomingCall: callId => { if (!desktopCalls) throw new Error('Call handler unavailable'); return desktopCalls.incoming(callId) },
+      incomingCall: (callId, teamId) => { if (!desktopCalls) throw new Error('Call handler unavailable'); return desktopCalls.incoming(callId, teamId) },
       isViewingThread: threadId => desktopNotifications.isViewingThread(threadId),
       onReach: event => ['call.incoming', 'call.ended'].includes(event.eventType) && desktopCalls ? desktopCalls.handleReach(event) : rendererReach.deliver(event),
     })
-    ipcMain.handle('pmate:call:incoming', (event, callId) => {
+    ipcMain.handle('pmate:call:incoming', (event, callId, teamId) => {
       if (!desktopNotifications.trusted(event) || !desktopCalls) throw new Error('Untrusted call sender')
-      return desktopCalls.incoming(callId)
+      return desktopCalls.incoming(callId, teamId)
     })
     ipcMain.handle('pmate:call:reach', (event, value) => {
       if (!desktopNotifications.trusted(event) || !desktopCalls) throw new Error('Untrusted call sender')

package/dist/templates/electron/notifications.cjs

@@ -18,7 +18,7 @@ function createDesktopNotifications({ ipcMain, Notification, origin, appId, getW
   const display = input => {
     if (!input || input.appId !== appId || typeof input.notificationId !== 'string' || !input.notificationId || input.notificationId.length > 512
       || typeof input.title !== 'string' || input.title.length > 256 || typeof input.body !== 'string' || input.body.length > 4096
-      || ['threadId', 'callId', 'meetingId'].some(key => input[key] !== undefined && (typeof input[key] !== 'string' || input[key].length > 512))) throw new Error('Invalid notification')
+      || ['threadId', 'callId', 'meetingId', 'teamId'].some(key => input[key] !== undefined && (typeof input[key] !== 'string' || input[key].length > 512))) throw new Error('Invalid notification')
     for (const [id, item] of shown) if (item.until <= now()) { item.notification.close(); shown.delete(id) }
     if (input.expiresAtMs !== undefined && (!Number.isFinite(input.expiresAtMs) || input.expiresAtMs <= now())) return 'suppressed'
     if (shown.has(input.notificationId)) return 'suppressed'
@@ -49,7 +49,7 @@ function createDesktopNotifications({ ipcMain, Notification, origin, appId, getW
       notification.once('failed', () => { if (!settled) { settled = true; clearTimeout(timeout); reject(new Error('Notification display failed')) } })
       notification.on('click', () => {
         const main = showWindow()
-        pendingOpen = { notificationId: input.notificationId, threadId: input.threadId, callId: input.callId, meetingId: input.meetingId }
+        pendingOpen = { teamId: input.teamId, notificationId: input.notificationId, threadId: input.threadId, callId: input.callId, meetingId: input.meetingId }
         main.webContents.send('pmate:notification:open', pendingOpen)
         notification.close()
       })

package/dist/templates/electron/preload.cjs

@@ -15,7 +15,7 @@ contextBridge.exposeInMainWorld('pmateDesktop', Object.freeze({
     stop: () => ipcRenderer.invoke('pmate:reach:stop'),
   }),
   calls: Object.freeze({
-    incoming: callId => ipcRenderer.invoke('pmate:call:incoming', callId),
+    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),
   }),

package/dist/templates/electron/reach.cjs

@@ -33,15 +33,15 @@ function createDesktopReach({ appId, instanceId, hubUrl = 'wss://hub.pmate.chat'
           if (data.type === 'call.incoming') {
             if (!incomingCall || typeof data.callId !== 'string' || typeof data.callerId !== 'string') throw new Error('Call handler unavailable')
             const { dmThreadId } = await import('@pmate/chat-sdk/runtime')
-            threadId = dmThreadId(appId, value.profileId, data.callerId)
+            threadId = dmThreadId(appId, value.profileId, data.callerId, data.teamId)
             const viewed = isViewingThread?.(threadId)
-            const result = await incomingCall(data.callId)
+            const result = await incomingCall(data.callId, data.teamId)
             if (generation !== ownGeneration) throw new Error('Reach account changed')
             if (result === 'suppressed' || viewed) return 'suppressed'
           }
           const digestThreads = data.type === 'social.messageDigest' ? JSON.parse(data.threads) : undefined
           return present({ appId, notificationId: notification.notificationId, title: notification.title ?? '', body: notification.body ?? '', digestThreads,
-            threadId, callId: data.callId, meetingId: data.meetingId, expiresAtMs: notification.expiresAtMs })
+            threadId, teamId: data.teamId, callId: data.callId, meetingId: data.meetingId, expiresAtMs: notification.expiresAtMs })
         },
         onReach: async event => {
           if (generation !== ownGeneration || !onReach) throw new Error('Reach handler unavailable')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.35.3",
+  "version": "0.35.5",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {
@@ -11,6 +11,16 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "build": "npm run clean && tsup --config tsup.config.ts && node scripts/copy-templates.js",
+    "clean": "rimraf dist",
+    "dev": "ts-node src/index.ts",
+    "release": "pnpm publish",
+    "start": "node dist/index.js",
+    "test": "vitest run src/tests",
+    "typecheck": "tsc --noEmit",
+    "prepare": "npm run build"
+  },
   "keywords": [
     "cli",
     "typescript",
@@ -57,13 +67,10 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.17"
   },
-  "scripts": {
-    "build": "npm run clean && tsup --config tsup.config.ts && node scripts/copy-templates.js",
-    "clean": "rimraf dist",
-    "dev": "ts-node src/index.ts",
-    "release": "pnpm publish",
-    "start": "node dist/index.js",
-    "test": "vitest run src/tests",
-    "typecheck": "tsc --noEmit"
+  "pnpm": {
+    "overrides": {
+      "@pmate/meta": "^1.3.1",
+      "@pmate/utils": "^1.1.4"
+    }
   }
-}
+}