@pmate/cli 0.35.0 → 0.35.1

package/dist/templates/electron/main.cjs

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, session, shell, Menu, desktopCapturer } = require('electron')
+const { app, BrowserWindow, session, shell, Menu, desktopCapturer, ipcMain } = require('electron')
 const path = require('node:path')
 const { createResourceHandler } = require('./resources.cjs')
 const { installMediaPermissions } = require('./media.cjs')
@@ -24,7 +24,7 @@ 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: { 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: { preload: path.join(__dirname, 'preload.cjs'), partition: 'persist:desktop', nodeIntegration: false, contextIsolation: true, sandbox: true, webSecurity: true } })
   restrict(mainWindow)
   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`)
@@ -45,7 +45,12 @@ else {
       }
       return resources(request) ?? desktopSession.fetch(request, { bypassCustomProtocolHandlers: true })
     })
-    installMediaPermissions(desktopSession, { origin: config.origin, getWindow: () => mainWindow, desktopCapturer, Menu })
+    installMediaPermissions(desktopSession, { origin: config.origin, getWindow: () => mainWindow, desktopCapturer, BrowserWindow, ipcMain })
+    ipcMain.handle('pmate:screen-settings', event => {
+      if (!mainWindow || event.sender !== mainWindow.webContents || event.senderFrame !== mainWindow.webContents.mainFrame || new URL(mainWindow.webContents.getURL()).origin !== config.origin) return false
+      if (process.platform === 'darwin') { void shell.openExternal('x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture'); return true }
+      return false
+    })
     Menu.setApplicationMenu(Menu.buildFromTemplate([
       { role: 'appMenu' }, { role: 'editMenu' }, { role: 'viewMenu' }, { role: 'windowMenu' },
       { label: config.productName, submenu: [{ label: 'Back to app', click: () => { if (!mainWindow) createWindow(); else void mainWindow.loadURL(config.origin) } }] },

package/dist/templates/electron/media.cjs

@@ -1,4 +1,5 @@
-function installMediaPermissions(desktopSession, { origin, getWindow, desktopCapturer, Menu }) {
+const { chooseScreen } = require('./share-picker.cjs')
+function installMediaPermissions(desktopSession, { origin, getWindow, desktopCapturer, BrowserWindow, ipcMain }) {
   const sameOrigin = raw => { try { return new URL(raw).origin === origin } catch { return false } }
   const trusted = contents => {
     const window = getWindow()
@@ -22,17 +23,11 @@ function installMediaPermissions(desktopSession, { origin, getWindow, desktopCap
       try { callback(source && valid() ? { video: source } : null) } catch { /* Request frame was closed or navigated. */ }
     }
     try {
-      const sources = await desktopCapturer.getSources({ types: ['screen', 'window'], thumbnailSize: { width: 0, height: 0 } })
+      const sources = await desktopCapturer.getSources({ types: ['screen', 'window'], thumbnailSize: { width: 320, height: 200 } })
       if (!valid() || !sources.length) return finish(null)
-      // Older macOS versions have no system picker. Native menu selection remains explicit.
-      const menu = Menu.buildFromTemplate([
-        { label: 'Choose a screen or window to share', enabled: false },
-        { type: 'separator' },
-        ...sources.map(source => ({ label: source.name.replace(/&/g, '&&'), click: () => finish(source) })),
-        { type: 'separator' }, { label: 'Cancel', click: () => finish(null) },
-      ])
-      menu.popup({ window, callback: () => finish(null) })
+      const source = await chooseScreen({ BrowserWindow, ipcMain, parent: window, sources })
+      finish(source)
     } catch { finish(null) }
-  }, { useSystemPicker: true })
+  }, { useSystemPicker: false })
 }
 module.exports = { installMediaPermissions }

package/dist/templates/electron/preload.cjs

@@ -0,0 +1,2 @@
+const { contextBridge, ipcRenderer } = require('electron')
+contextBridge.exposeInMainWorld('pmateDesktop', { openScreenSettings: () => ipcRenderer.invoke('pmate:screen-settings') })

package/dist/templates/electron/share-picker-preload.cjs

@@ -0,0 +1,3 @@
+const { contextBridge, ipcRenderer } = require('electron')
+const nonce = process.argv.find(arg => arg.startsWith('--picker-id='))?.slice('--picker-id='.length)
+contextBridge.exposeInMainWorld('screenPicker', { sources: () => ipcRenderer.invoke(`screen-picker:data:${nonce}`), select: id => ipcRenderer.invoke(`screen-picker:select:${nonce}`, typeof id === 'string' ? id : null) })

package/dist/templates/electron/share-picker.cjs

@@ -0,0 +1,22 @@
+const { randomUUID } = require('node:crypto')
+const path = require('node:path')
+/** A separate sandboxed window owns the picker; only that exact frame can select. */
+function chooseScreen({ BrowserWindow, ipcMain, parent, sources }) {
+  return new Promise(resolve => {
+    const nonce = randomUUID()
+    const picker = new BrowserWindow({ parent, modal: true, width: 780, height: 550, minWidth: 540, minHeight: 420, title: '选择共享内容', backgroundColor: '#f6faf8', autoHideMenuBar: true,
+      webPreferences: { preload: path.join(__dirname, 'share-picker-preload.cjs'), additionalArguments: [`--picker-id=${nonce}`], partition: `screen-picker-${nonce}`, nodeIntegration: false, contextIsolation: true, sandbox: true, webSecurity: true } })
+    let complete = false
+    const dataChannel = `screen-picker:data:${nonce}`, selectChannel = `screen-picker:select:${nonce}`
+    const trusted = event => event.sender === picker.webContents && event.senderFrame === picker.webContents.mainFrame
+    const finish = source => { if (complete) return; complete = true; ipcMain.removeHandler(dataChannel); ipcMain.removeHandler(selectChannel); resolve(source); if (!picker.isDestroyed()) picker.close() }
+    ipcMain.handle(dataChannel, event => trusted(event) ? sources.map(s => ({ id: s.id, name: s.name, thumbnail: s.thumbnail?.toDataURL() ?? '', kind: s.id.startsWith('screen:') ? 'screen' : 'window' })) : [])
+    ipcMain.handle(selectChannel, (event, id) => { if (!trusted(event)) return; finish(sources.find(s => s.id === id)) })
+    picker.webContents.setWindowOpenHandler(() => ({ action: 'deny' }))
+    picker.webContents.on('will-navigate', event => event.preventDefault())
+    picker.once('closed', () => finish())
+    picker.webContents.on('render-process-gone', () => finish())
+    picker.loadFile(path.join(__dirname, 'share-picker.html')).catch(() => finish())
+  })
+}
+module.exports = { chooseScreen }

package/dist/templates/electron/share-picker.html

@@ -0,0 +1,3 @@
+<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self'; style-src 'unsafe-inline'; img-src data:"><title>选择共享内容</title><style>
+*{box-sizing:border-box}body{margin:0;font:14px -apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;background:#f6faf8;color:#172c27}main{height:100vh;display:flex;flex-direction:column;padding:24px}h1{font-size:19px;margin:0 0 20px}nav{display:flex;gap:8px;margin-bottom:20px}button{font:inherit;cursor:pointer;border:1px solid #dce6e1;background:white;color:#19372d;border-radius:9px;padding:10px 20px}button:focus-visible{outline:3px solid #2ec88a;outline-offset:3px}button[aria-selected=true]{background:#e1f6ed;color:#087d52;border-color:#9ddbbf}#sources{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:16px;overflow:auto;flex:1;align-content:start;padding:4px}.source{padding:5px;min-width:0;border:2px solid transparent;background:transparent}.source[aria-checked=true]{border-color:#149964;background:#e6f7ef}.source img{width:100%;height:105px;object-fit:contain;background:#e5ece8;border-radius:5px}.source span{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:8px 2px;font-size:12px}footer{padding-top:20px;display:flex;align-items:center;gap:10px}footer p{flex:1;color:#6a7c74;font-size:12px}#start{background:#11875c;color:#fff;border-color:#11875c}button:disabled{opacity:.45;cursor:default}#error{color:#687d73;line-height:1.7} @media(prefers-color-scheme:dark){body{background:#14231e;color:#edf6f1}button{background:#20372e;color:#edf6f1;border-color:#456353}.source img{background:#23362e}.source[aria-checked=true]{background:#234c3c}}
+</style></head><body><main><h1>选择共享内容</h1><nav role="tablist"><button role="tab" data-kind="screen" aria-selected="true">整个屏幕</button><button role="tab" data-kind="window" aria-selected="false">应用窗口</button></nav><div id="sources" role="radiogroup" aria-label="共享来源"></div><p id="error" hidden></p><footer><p>只有点击开始共享后，对方才能看到内容</p><button id="cancel">取消</button><button id="start" disabled>开始共享</button></footer></main><script src="share-picker.js"></script></body></html>

package/dist/templates/electron/share-picker.js

@@ -0,0 +1,20 @@
+let sources = [], kind = 'screen', selected
+const list = document.getElementById('sources'), start = document.getElementById('start')
+function render() {
+  list.replaceChildren()
+  const available = sources.filter(source => source.kind === kind)
+  for (const source of available) {
+    const button = document.createElement('button'); button.className = 'source'; button.setAttribute('role', 'radio'); button.setAttribute('aria-checked', String(selected === source.id))
+    const image = document.createElement('img'); image.src = source.thumbnail; image.alt = ''
+    const label = document.createElement('span'); label.textContent = source.name; button.title = source.name
+    button.append(image, label); button.onclick = () => { selected = source.id; render() }; list.append(button)
+  }
+  start.disabled = !available.some(source => source.id === selected)
+  document.getElementById('error').hidden = available.length > 0
+  document.getElementById('error').textContent = '没有可共享的内容。请在系统设置中允许屏幕录制，再重新打开应用。'
+}
+for (const tab of document.querySelectorAll('[data-kind]')) tab.onclick = () => { kind = tab.dataset.kind; selected = undefined; for (const other of document.querySelectorAll('[data-kind]')) other.setAttribute('aria-selected', String(other === tab)); render() }
+document.getElementById('cancel').onclick = () => window.screenPicker.select(null)
+start.onclick = () => { if (selected) { start.disabled = true; window.screenPicker.select(selected) } }
+document.addEventListener('keydown', e => { if (e.key === 'Escape') window.screenPicker.select(null) })
+window.screenPicker.sources().then(data => { sources = data; render() }).catch(() => render())

package/package.json

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