@nissyai/desktop 0.2.7 → 0.2.10

package/bin/nissy.mjs

@@ -30,11 +30,12 @@ import {
   resolvePayloadSpec,
   UnsupportedPlatformError,
 } from "../src/resolve.mjs";
+import { DISTRIBUTION } from "../src/distribution.mjs";
 
 const require = createRequire(import.meta.url);
 
 function fail(message) {
-  console.error(`[nissy] ${message}`);
+  console.error(`[${DISTRIBUTION.npmCommand}] ${message}`);
   process.exit(1);
 }
 
@@ -136,7 +137,7 @@ if (existsSync(join(payloadRoot, "app"))) {
   // launcher versions used (~140 MB each). Never block launch.
   try {
     for (const entry of readdirSync(cacheRoot)) {
-      if (entry.startsWith("nissy-app-darwin-")) {
+      if (entry.startsWith(`${DISTRIBUTION.cacheName}-app-darwin-`)) {
         rmSync(join(cacheRoot, entry), { recursive: true, force: true });
       }
     }
@@ -180,7 +181,7 @@ const { command, args, viaLaunchServices } = resolveLaunchCommand({
 // anyway), so the stamp is a harmless no-op there.
 const childEnv = {
   ...process.env,
-  ...npxChannelEnv(process.execPath, fileURLToPath(import.meta.url)),
+  ...npxChannelEnv(process.execPath, fileURLToPath(import.meta.url), DISTRIBUTION),
 };
 
 // Record the toolchain to a FILE as well as the env, because macOS `open`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nissyai/desktop",
-  "version": "0.2.7",
+  "version": "0.2.10",
   "type": "module",
   "description": "Launcher for the Nissy desktop app. Resolves the host's app payload and spawns it. Run via `npx @nissyai/desktop`; a global install (`npm i -g @nissyai/desktop`) exposes the `nissy` command.",
   "license": "SEE LICENSE IN LICENSE",
@@ -20,8 +20,8 @@
     "src/"
   ],
   "optionalDependencies": {
-    "@nissyai/app-win32-x64": "0.2.7",
-    "@nissyai/app-darwin-arm64": "0.2.7",
-    "@nissyai/app-darwin-x64": "0.2.7"
+    "@nissyai/app-win32-x64": "0.2.10",
+    "@nissyai/app-darwin-arm64": "0.2.10",
+    "@nissyai/app-darwin-x64": "0.2.10"
   }
 }

package/src/distribution.mjs

@@ -0,0 +1,17 @@
+export const DISTRIBUTION = Object.freeze({
+  "flavor": "production",
+  "appName": "Nissy",
+  "executableName": "nissy",
+  "bundleId": "software.cleverbit.nissy",
+  "appUserModelId": "Nissy",
+  "protocol": "nissy",
+  "loginItemName": "Nissy",
+  "userDataName": "Nissy",
+  "cacheName": "nissy",
+  "npmScope": "@nissyai",
+  "npmLauncherPackage": "@nissyai/desktop",
+  "npmCommand": "nissy",
+  "npmRegistry": null,
+  "environment": "production",
+  "ownsGlobalHooks": true
+});

package/src/resolve.mjs

@@ -7,6 +7,8 @@
 // Electron), so each payload exposes a single executable we spawn
 // directly — there is no dependency on the `electron` npm package.
 
+import { DISTRIBUTION } from "./distribution.mjs";
+
 /** Error thrown when the host platform/arch has no payload mapping. */
 export class UnsupportedPlatformError extends Error {
   /** @param {string} key host key, e.g. "linux-x64" */
@@ -24,20 +26,27 @@ export class UnsupportedPlatformError extends Error {
  *
  * @type {Record<string, { pkg: string, exe: readonly string[] }>}
  */
-export const PAYLOADS = {
-  "win32-x64": {
-    pkg: "@nissyai/app-win32-x64",
-    exe: ["app", "nissy.exe"],
-  },
-  "darwin-arm64": {
-    pkg: "@nissyai/app-darwin-arm64",
-    exe: ["app", "Nissy.app", "Contents", "MacOS", "nissy"],
-  },
-  "darwin-x64": {
-    pkg: "@nissyai/app-darwin-x64",
-    exe: ["app", "Nissy.app", "Contents", "MacOS", "nissy"],
-  },
-};
+export function payloadsForDistribution(distribution = DISTRIBUTION) {
+  const scope = distribution.npmScope;
+  const appName = distribution.appName;
+  const executableName = distribution.executableName;
+  return {
+    "win32-x64": {
+      pkg: `${scope}/app-win32-x64`,
+      exe: ["app", `${executableName}.exe`],
+    },
+    "darwin-arm64": {
+      pkg: `${scope}/app-darwin-arm64`,
+      exe: ["app", `${appName}.app`, "Contents", "MacOS", executableName],
+    },
+    "darwin-x64": {
+      pkg: `${scope}/app-darwin-x64`,
+      exe: ["app", `${appName}.app`, "Contents", "MacOS", executableName],
+    },
+  };
+}
+
+export const PAYLOADS = payloadsForDistribution();
 
 /**
  * Resolve the payload spec for a host platform/arch.
@@ -46,9 +55,9 @@ export const PAYLOADS = {
  * @returns {{ key: string, pkg: string, exe: readonly string[] }}
  * @throws {UnsupportedPlatformError} when no mapping exists
  */
-export function resolvePayloadSpec(platform, arch) {
+export function resolvePayloadSpec(platform, arch, payloads = PAYLOADS) {
   const key = `${platform}-${arch}`;
-  const spec = PAYLOADS[key];
+  const spec = payloads[key];
   if (spec === undefined) {
     throw new UnsupportedPlatformError(key);
   }
@@ -64,12 +73,19 @@ export function resolvePayloadSpec(platform, arch) {
  * @param {{ platform: NodeJS.Platform | string, home: string, env: Record<string, string | undefined> }} host
  * @returns {string[]} path segments of the cache root
  */
-export function cacheRootSegments({ platform, home, env }) {
-  if (platform === "darwin") return [home, "Library", "Caches", "nissy"];
+export function cacheRootSegments({
+  platform,
+  home,
+  env,
+  cacheName = DISTRIBUTION.cacheName,
+}) {
+  if (platform === "darwin") return [home, "Library", "Caches", cacheName];
   if (platform === "win32") {
-    return [env.LOCALAPPDATA || env.TEMP || home, "nissy", "Cache"];
+    return [env.LOCALAPPDATA || env.TEMP || home, cacheName, "Cache"];
   }
-  return env.XDG_CACHE_HOME ? [env.XDG_CACHE_HOME, "nissy"] : [home, ".cache", "nissy"];
+  return env.XDG_CACHE_HOME
+    ? [env.XDG_CACHE_HOME, cacheName]
+    : [home, ".cache", cacheName];
 }
 
 /**
@@ -130,9 +146,15 @@ export function stalePayloadCaches(entries, currentKey) {
  * @param {string} launcherScript absolute path to this launcher script
  * @returns {{ NISSY_CHANNEL: string, NISSY_LAUNCHER_NODE: string, NISSY_LAUNCHER_SCRIPT: string }}
  */
-export function npxChannelEnv(nodePath, launcherScript) {
+export function npxChannelEnv(
+  nodePath,
+  launcherScript,
+  distribution = DISTRIBUTION,
+) {
   return {
     NISSY_CHANNEL: "npx",
+    NISSY_DISTRIBUTION_FLAVOR: distribution.flavor,
+    NISSY_ENVIRONMENT: distribution.environment,
     NISSY_LAUNCHER_NODE: nodePath,
     NISSY_LAUNCHER_SCRIPT: launcherScript,
   };
@@ -167,14 +189,24 @@ export function npxChannelEnv(nodePath, launcherScript) {
  * }} input bundlePath is the installed `.app` (macOS only; null elsewhere).
  * @returns {{ command: string, args: string[], viaLaunchServices: boolean }}
  */
-export function resolveLaunchCommand({ platform, bundlePath, exePath, foreground, forwardedArgs }) {
+export function resolveLaunchCommand({
+  platform,
+  bundlePath,
+  exePath,
+  foreground,
+  forwardedArgs,
+}) {
   if (platform === "darwin" && !foreground && bundlePath !== null) {
     const args = [bundlePath];
     // `open` forwards extra argv to the app only after a `--args` separator.
     if (forwardedArgs.length > 0) args.push("--args", ...forwardedArgs);
     return { command: "/usr/bin/open", args, viaLaunchServices: true };
   }
-  return { command: exePath, args: [...forwardedArgs], viaLaunchServices: false };
+  return {
+    command: exePath,
+    args: [...forwardedArgs],
+    viaLaunchServices: false,
+  };
 }
 
 /**
@@ -186,6 +218,10 @@ export function resolveLaunchCommand({ platform, bundlePath, exePath, foreground
  * @param {{ markerVersion: string | null, payloadVersion: string, exeExists: boolean }} input
  * @returns {boolean}
  */
-export function needsMacReinstall({ markerVersion, payloadVersion, exeExists }) {
+export function needsMacReinstall({
+  markerVersion,
+  payloadVersion,
+  exeExists,
+}) {
   return !exeExists || markerVersion !== payloadVersion;
 }