@pmate/cli 0.37.2 → 0.38.0

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.2",
+  "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 }