@pmate/cli 0.35.4 → 0.35.6

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);
@@ -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/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])

package/dist/templates/electron/notifications.cjs

@@ -25,10 +25,11 @@ function createDesktopNotifications({ ipcMain, Notification, origin, appId, getW
     if (pending.has(input.notificationId)) return pending.get(input.notificationId)
     const window = getWindow()
     if (input.digestThreads !== undefined) {
-      if (!Array.isArray(input.digestThreads) || !input.digestThreads.length || input.digestThreads.length > 1000 || input.digestThreads.some(item => !item || typeof item.threadId !== 'string' || !item.threadId || item.threadId.length > 512 || typeof item.title !== 'string' || item.title.length > 512 || !Number.isSafeInteger(item.count) || item.count < 1)) throw new Error('Invalid notification digest')
+      if (!Array.isArray(input.digestThreads) || !input.digestThreads.length || input.digestThreads.length > 1000 || input.digestThreads.some(item => !item || typeof item.threadId !== 'string' || !item.threadId || item.threadId.length > 512 || (item.teamId !== undefined && (typeof item.teamId !== 'string' || !item.teamId || item.teamId.length > 512)) || typeof item.title !== 'string' || item.title.length > 512 || !Number.isSafeInteger(item.count) || item.count < 1)) throw new Error('Invalid notification digest')
       const visible = input.digestThreads.filter(item => !(item.threadId === activeThreadId && window && window.isVisible() && window.isFocused() && !window.isMinimized()))
       if (!visible.length) return 'suppressed'
       input = { ...input, threadId: visible.length === 1 ? visible[0].threadId : undefined,
+        teamId: visible.length === 1 ? visible[0].teamId ?? input.teamId : input.teamId,
         body: visible.length === input.digestThreads.length ? input.body : `${visible.length} 个会话中有 ${visible.reduce((sum, item) => sum + item.count, 0)} 条新消息` }
     }
     if (input.threadId && input.threadId === activeThreadId && window && window.isVisible() && window.isFocused() && !window.isMinimized()) return 'suppressed'

package/package.json

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