@pmate/cli 0.34.1 → 0.35.0

package/dist/index.js

@@ -17612,7 +17612,7 @@ async function buildDesktop(args) {
     files: ["**/*"],
     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 only when you record a voice message.` }, ...args.signed ? {} : { identity: "-", notarize: false } },
+    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 } },
     forceCodeSigning: args.signed
   };
   const configPath = import_node_path23.default.join(staging, "builder.json");

package/dist/templates/electron/main.cjs

@@ -1,6 +1,7 @@
-const { app, BrowserWindow, session, shell, Menu } = require('electron')
+const { app, BrowserWindow, session, shell, Menu, desktopCapturer } = require('electron')
 const path = require('node:path')
 const { createResourceHandler } = require('./resources.cjs')
+const { installMediaPermissions } = require('./media.cjs')
 const config = require('./desktop-config.json')
 const manifest = require('./resource-manifest.json')
 app.setName(config.productName)
@@ -44,12 +45,7 @@ else {
       }
       return resources(request) ?? desktopSession.fetch(request, { bypassCustomProtocolHandlers: true })
     })
-    desktopSession.setPermissionRequestHandler((contents, permission, callback, details) => {
-      let trusted = false
-      try { trusted = !!contents && new URL(contents.getURL()).origin === config.origin } catch {}
-      callback(Boolean(trusted && permission === 'media' && details.mediaTypes?.length && details.mediaTypes.every(type => type === 'audio')))
-    })
-    desktopSession.setPermissionCheckHandler((_contents, permission, origin, details) => origin === config.origin && permission === 'media' && details.mediaType === 'audio')
+    installMediaPermissions(desktopSession, { origin: config.origin, getWindow: () => mainWindow, desktopCapturer, Menu })
     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

@@ -0,0 +1,38 @@
+function installMediaPermissions(desktopSession, { origin, getWindow, desktopCapturer, Menu }) {
+  const sameOrigin = raw => { try { return new URL(raw).origin === origin } catch { return false } }
+  const trusted = contents => {
+    const window = getWindow()
+    return !!window && !window.isDestroyed() && contents === window.webContents && sameOrigin(contents.getURL())
+  }
+  desktopSession.setPermissionRequestHandler((contents, permission, callback, details) => {
+    const allowed = trusted(contents) && details.isMainFrame === true && sameOrigin(details.requestingUrl)
+    callback(Boolean(allowed && (permission === 'display-capture' || (permission === 'media' && details.mediaTypes?.length && details.mediaTypes.every(type => type === 'audio')))))
+  })
+  desktopSession.setPermissionCheckHandler((contents, permission, requestingOrigin, details) => {
+    return Boolean(trusted(contents) && sameOrigin(requestingOrigin) && details.isMainFrame === true && (permission === 'display-capture' || (permission === 'media' && details.mediaType === 'audio')))
+  })
+  desktopSession.setDisplayMediaRequestHandler(async (request, callback) => {
+    const window = getWindow()
+    const valid = () => window && !window.isDestroyed() && trusted(window.webContents) && request.frame && request.frame === window.webContents.mainFrame && sameOrigin(request.securityOrigin)
+    if (!valid() || !request.userGesture || !request.videoRequested || request.audioRequested) return callback(null)
+    let completed = false
+    const finish = source => {
+      if (completed) return
+      completed = true
+      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 } })
+      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) })
+    } catch { finish(null) }
+  }, { useSystemPicker: true })
+}
+module.exports = { installMediaPermissions }

package/package.json

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