@pmate/cli 0.35.13 → 0.36.1

package/dist/index.d.ts

@@ -971,6 +971,7 @@ type ServiceCommandArgs = {
 } | {
     type: Command.Service;
     action: "log";
+    category?: "app" | "web";
     topic?: string;
     fields?: Record<string, string | number | boolean>;
     app?: string;

package/dist/index.js

@@ -18934,7 +18934,7 @@ async function queryDeveloperLogs(input, fetcher = fetch) {
   if (!Number.isSafeInteger(input.page) || input.page < 0) throw new Error("Invalid log page");
   if (input.sinceMs !== void 0 && (!Number.isSafeInteger(input.sinceMs) || input.sinceMs < 0)) throw new Error("Invalid log time");
   if (input.keyword && input.keyword.length > 256) throw new Error("Log search must be at most 256 characters");
-  const params = new URLSearchParams({ service: input.service, page: String(input.page), topic: input.topic ?? "application" });
+  const params = new URLSearchParams({ service: input.service, page: String(input.page), category: input.category ?? "app", topic: input.topic ?? (input.category === "web" ? "pv" : "application") });
   if (input.environment) params.set("environment", input.environment);
   if (input.fields) params.set("fields", JSON.stringify(input.fields));
   if (input.keyword) params.set("keyword", input.keyword);
@@ -20014,6 +20014,7 @@ var ServiceRuntimeRunner = class {
       service: `${namespace}:${appName}`,
       page: options.page,
       keyword: options.search,
+      category: options.category,
       topic: options.topic,
       fields: options.fields,
       environment: options.envName,
@@ -20705,8 +20706,8 @@ var ServiceRuntimeRunner = class {
   }
 };
 function resolveLogChainId(env = process.env) {
-  if (env.APP_LOG_CHAIN_ID && env.APP_LOG_CHAIN_ID !== "log") throw new Error("Logs require log chain");
-  return "log";
+  if (env.APP_LOG_CHAIN_ID && env.APP_LOG_CHAIN_ID !== "app-logs") throw new Error("Logs require log chain");
+  return "app-logs";
 }
 function shellQuote2(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
@@ -20918,7 +20919,7 @@ var ServiceCommandHandler = class {
       }
       case "log": {
         if (args.app) {
-          const result = await queryDeveloperLogs({ app: args.app, service: `${args.namespace}:${args.name}`, page: args.page, keyword: args.search, sinceMs: args.sinceMs, topic: args.topic, fields: args.fields, environment: args.env });
+          const result = await queryDeveloperLogs({ app: args.app, service: `${args.namespace}:${args.name}`, page: args.page, keyword: args.search, sinceMs: args.sinceMs, category: args.category, topic: args.topic, fields: args.fields, environment: args.env });
           console.log(JSON.stringify(result, null, args.json ? void 0 : 2));
           return;
         }
@@ -20930,6 +20931,7 @@ var ServiceCommandHandler = class {
           search: args.search,
           follow: args.follow,
           envName: args.env,
+          category: args.category,
           topic: args.topic,
           fields: args.fields,
           sinceMs: args.sinceMs,
@@ -24212,6 +24214,13 @@ function parseServiceArgs(tokens) {
     while (rest.length > 0) {
       const token = rest.shift();
       switch (token) {
+        case "--category": {
+          if (action !== "log") throw new Error(`Unknown service ${action} option: ${token}`);
+          const value = rest.shift();
+          if (value !== "app" && value !== "web") throw new Error("Invalid --category");
+          logFilters.category = value;
+          break;
+        }
         case "--topic": {
           if (action !== "log") throw new Error(`Unknown service ${action} option: ${token}`);
           const value = requireValue4(rest, token);
@@ -24965,7 +24974,7 @@ function parseLogsArgs(input) {
   const params = {}, fields = {};
   let json = false, actorProfileId;
   if (rest[0] && !rest[0].startsWith("--")) params.service = parseNamespacedRef(rest.shift(), { entityLabel: "service" }).fullId;
-  const keys = { "--metric": "metric", "--topic": "topic", "--env": "environment", "--search": "keyword", "--group-by": "groupBy", "--interval": "interval", "--timezone": "timezone", "--request-id": "requestId", "--page": "page" };
+  const keys = { "--category": "category", "--metric": "metric", "--topic": "topic", "--env": "environment", "--search": "keyword", "--group-by": "groupBy", "--interval": "interval", "--timezone": "timezone", "--request-id": "requestId", "--page": "page" };
   const times = { "--from": "from", "--to": "to", "--compare-from": "compareFrom", "--compare-to": "compareTo" };
   while (rest.length) {
     const flag = rest.shift();
@@ -24997,6 +25006,7 @@ function parseLogsArgs(input) {
     } else if (keys[flag]) params[keys[flag]] = value;
     else throw Error(`Unknown log option: ${flag}`);
   }
+  if (params.category && !["app", "web"].includes(params.category)) throw Error("Invalid --category");
   if (tool !== "schema" && !params.service) throw Error("Service reference required");
   if (tool === "schema" && (Object.keys(params).length || Object.keys(fields).length)) throw Error("logs schema only accepts --json");
   if (tool === "aggregate" || tool === "compare") {

package/dist/templates/electron/main.cjs

@@ -1,4 +1,4 @@
-const { createUpdateChecker } = require('./updates.cjs')
+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')
@@ -72,6 +72,7 @@ else {
       mainWindow.show(); mainWindow.focus()
       return mainWindow
     } })
+    installUpdateHandlers({ ipcMain, app, shell, appId: config.app, trusted: event => desktopNotifications.trusted(event) })
     const instanceId = desktopInstanceId(app.getPath('userData'))
     const rendererReach = createRendererReach({ ipcMain, getWindow: () => mainWindow, trusted: event => desktopNotifications.trusted(event) })
     if (config.app === 'pmate:hello') desktopCalls = createDesktopCalls({ appId: config.app, instanceId, origin: config.origin, BrowserWindow, ipcMain, dialog })

package/dist/templates/electron/preload.cjs

@@ -1,6 +1,10 @@
 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 }),
+  updates: Object.freeze({
+    check: () => ipcRenderer.invoke('pmate:update:check'),
+    download: () => ipcRenderer.invoke('pmate:update:download'),
+  }),
   openScreenSettings: () => ipcRenderer.invoke('pmate:screen-settings'),
   reach: Object.freeze({
     onEvent: handler => {

package/dist/templates/electron/updates.cjs

@@ -48,4 +48,24 @@ function createUpdateChecker({ app, dialog, shell, appId, platform = process.pla
     } finally { checking = false }
   }
 }
-module.exports = { compareVersions, findUpdate, createUpdateChecker }
+function installUpdateHandlers({ ipcMain, app, shell, appId, trusted, platform = process.platform, arch = process.arch, fetchImpl = fetch }) {
+  let checking
+  let available
+  ipcMain.handle('pmate:update:check', async event => {
+    if (!trusted(event)) throw new Error('Untrusted update sender')
+    if (!checking) {
+      available = undefined
+      checking = findUpdate({ appId, currentVersion: app.getVersion(), platform, arch, fetchImpl })
+        .then(update => { available = update; return update ? { version: update.version } : null })
+        .finally(() => { checking = undefined })
+    }
+    return checking
+  })
+  ipcMain.handle('pmate:update:download', async event => {
+    if (!trusted(event)) throw new Error('Untrusted update sender')
+    if (!available) throw new Error('Check for updates first')
+    await shell.openExternal(available.downloadUrl)
+    return true
+  })
+}
+module.exports = { compareVersions, findUpdate, createUpdateChecker, installUpdateHandlers }

package/package.json

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