@yalehwang/cloudpit 2.0.0 → 3.0.0

package/electron/main.js

@@ -3,23 +3,29 @@ import { spawn } from 'node:child_process';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { createProcessBrandEnvReader, readBrandEnvValue } from './brandEnv.js';
 import { CloudController } from './cloud.js';
 import { DesktopWindowManager } from './desktopWindow.js';
 import { DesktopNotificationsController } from './desktopNotifications.js';
 import { LocalServerController } from './localServer.js';
 import { TabsController } from './tabs.js';
-import { maybeMigrateDesktopUserData } from './userDataMigration.js';
+import { maybeMigrateDesktopAppId } from './appIdMigration.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const APP_NAME = 'Cloudpit';
-const APP_USER_MODEL_ID = 'ai.cloudcli.desktop';
+const APP_USER_MODEL_ID = 'ai.cloudpit.desktop';
 const CALLBACK_PROTOCOL = 'cloudcli';
 const CALLBACK_URL = `${CALLBACK_PROTOCOL}://auth/callback`;
-// Both schemes open the app (either build can open the desktop app); the
-// cloud login callback itself stays on the legacy `cloudcli://auth/callback`.
-const DEEP_LINK_SCHEMES = ['cloudcli', 'cloudpit'];
-const CLOUDCLI_CONTROL_PLANE_URL = process.env.CLOUDCLI_CONTROL_PLANE_URL || 'https://cloudcli.ai';
+// v3.0 registers only the Cloudpit deep-link scheme. The cloud login callback
+// itself stays on the third-party `cloudcli://auth/callback` contract, which the
+// packaged app still claims through `build.protocols` in package.json and the OS
+// routes into `handleDeepLink` below.
+const DEEP_LINK_SCHEMES = ['cloudpit'];
+const brandEnv = createProcessBrandEnvReader();
+// The control-plane address is read through the brand reader (`CLOUDPIT_CONTROL_PLANE_URL`
+// only since v3.0); the default stays the third-party `cloudcli.ai` contract this release keeps.
+const CONTROL_PLANE_URL = readBrandEnvValue(brandEnv, 'CONTROL_PLANE_URL', 'https://cloudcli.ai');
 const REMOTE_START_TIMEOUT_MS = 30000;
 const AUTH_CALLBACK_TTL_MS = 10 * 60 * 1000;
 
@@ -84,7 +90,7 @@ function getCloudState() {
   return {
     account: cloud.getAccount(),
     environments: cloud.getEnvironments(),
-    controlPlaneUrl: CLOUDCLI_CONTROL_PLANE_URL,
+    controlPlaneUrl: CONTROL_PLANE_URL,
   };
 }
 
@@ -210,7 +216,7 @@ function isCloudAuthRedirect(url) {
   if (!url) return false;
   try {
     const parsed = new URL(url);
-    const controlPlane = new URL(CLOUDCLI_CONTROL_PLANE_URL);
+    const controlPlane = new URL(CONTROL_PLANE_URL);
     return parsed.origin === controlPlane.origin
       && (parsed.pathname === '/login' || parsed.pathname.startsWith('/auth/'));
   } catch {
@@ -242,7 +248,7 @@ function getDiagnosticsText() {
     cloudRunningEnvironmentCount: getRunningEnvironmentUrls().length,
     cloudAuthState: cloud.getAuthState(),
     cloudAccountPath: getStorePath(),
-    controlPlaneUrl: CLOUDCLI_CONTROL_PLANE_URL,
+    controlPlaneUrl: CONTROL_PLANE_URL,
   }, null, 2);
 }
 
@@ -518,7 +524,7 @@ async function copyEnvironmentMobileUrl(environment) {
 }
 
 async function openCloudDashboard() {
-  await openExternalUrl(CLOUDCLI_CONTROL_PLANE_URL);
+  await openExternalUrl(CONTROL_PLANE_URL);
   return getDesktopState();
 }
 
@@ -896,12 +902,24 @@ async function bootstrap() {
   app.setName(APP_NAME);
   process.title = APP_NAME;
 
-  // Copy the desktop userData JSON files before anything reads
-  // app.getPath('userData'), which already resolves under the Cloudpit folder.
-  maybeMigrateDesktopUserData({
-    appName: APP_NAME,
+  // One-time v3.0 app-id switch. This copies the three desktop userData JSON
+  // files out of the legacy CloudCLI folder and migrates the install-level
+  // identity (Windows registry/shortcuts, macOS keychain, Linux .desktop) before
+  // anything reads app.getPath('userData'), which already resolves under the
+  // Cloudpit folder. The legacy installation is never removed, so a failed
+  // migration falls back to it.
+  const appIdMigration = maybeMigrateDesktopAppId({
+    platform: process.platform,
     appDataDir: app.getPath('appData'),
+    homeDir: app.getPath('home'),
+    appVersion: app.getVersion(),
+    execPath:
+      process.platform === 'linux' ? process.env.APPIMAGE || process.execPath : process.execPath,
+    installLocation: app.isPackaged ? path.dirname(process.execPath) : getAppRoot(),
   });
+  if (appIdMigration.error) {
+    console.warn('[appIdMigration] fell back to the legacy installation:', appIdMigration.error);
+  }
 
   await app.whenReady();
   app.setName(APP_NAME);
@@ -920,7 +938,7 @@ async function bootstrap() {
   });
   cloud = new CloudController({
     storePath: getStorePath(),
-    controlPlaneUrl: CLOUDCLI_CONTROL_PLANE_URL,
+    controlPlaneUrl: CONTROL_PLANE_URL,
     callbackUrl: CALLBACK_URL,
     onChange: syncDesktopState,
   });

package/electron/scripts/generate-macos-icon.js

@@ -1,36 +1,39 @@
+// electron/scripts/generate-macos-icon.js — build the macOS window icon and .icns bundle from the
+// committed raster source `public/logo-source.png` (glossy blue airfoil canopy on navy).
+//
+// Run from the repo root:  node electron/scripts/generate-macos-icon.js
+
 import fs from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import sharp from 'sharp';
 
-const size = 1024;
-const assetsDir = 'electron/assets';
-const iconPath = 'electron/assets/logo-macos.png';
-const icnsPath = 'electron/assets/logo-macos.icns';
-
-function renderSvg(entrySize) {
-  const scale = entrySize / 32;
-  return `
-<svg xmlns="http://www.w3.org/2000/svg" width="${entrySize}" height="${entrySize}" viewBox="0 0 ${entrySize} ${entrySize}">
-  <rect width="${entrySize}" height="${entrySize}" fill="#2563eb"/>
-  <path
-    d="M${8 * scale} ${9 * scale}C${8 * scale} ${8.44772 * scale} ${8.44772 * scale} ${8 * scale} ${9 * scale} ${8 * scale}H${23 * scale}C${23.5523 * scale} ${8 * scale} ${24 * scale} ${8.44772 * scale} ${24 * scale} ${9 * scale}V${18 * scale}C${24 * scale} ${18.5523 * scale} ${23.5523 * scale} ${19 * scale} ${23 * scale} ${19 * scale}H${12 * scale}L${8 * scale} ${23 * scale}V${9 * scale}Z"
-    stroke="white"
-    stroke-width="${2 * scale}"
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    fill="none"
-  />
-</svg>`;
-}
+const here = path.dirname(fileURLToPath(import.meta.url));
+const assetsDir = path.join(here, '..', 'assets');
+const SOURCE = path.join(here, '..', '..', 'public', 'logo-source.png');
 
-async function renderPng(entrySize) {
-  return sharp(Buffer.from(renderSvg(entrySize)))
+const BG = { r: 2, g: 20, b: 44 };
+const CONTENT = { left: 36, top: 312, width: 1218, height: 583 };
+
+/** Full airfoil centered in an `size`×`size` navy square, no crop/zoom. */
+async function renderSquare(size) {
+  const stripHeight = Math.round((size * CONTENT.height) / CONTENT.width);
+  const strip = await sharp(SOURCE)
+    .extract(CONTENT)
+    .resize(size, stripHeight)
+    .png()
+    .toBuffer();
+  const top = Math.round((size - stripHeight) / 2);
+  return sharp({ create: { width: size, height: size, channels: 3, background: BG } })
+    .composite([{ input: strip, left: 0, top }])
     .png()
     .toBuffer();
 }
 
 await fs.mkdir(assetsDir, { recursive: true });
-await fs.writeFile(iconPath, await renderPng(size));
+await fs.writeFile(path.join(assetsDir, 'logo-macos.png'), await renderSquare(1024));
 
+// ICNS entries — same set the original script emitted (retina variants included).
 const icnsEntries = [
   ['icp4', 16],
   ['icp5', 32],
@@ -45,18 +48,21 @@ const icnsEntries = [
   ['ic14', 512],
 ];
 
-const blocks = await Promise.all(icnsEntries.map(async ([type, entrySize]) => {
-  const png = await renderPng(entrySize);
+const blocks = [];
+for (const [type, entrySize] of icnsEntries) {
+  const png = await renderSquare(entrySize);
   const block = Buffer.alloc(8 + png.length);
   block.write(type, 0, 4, 'ascii');
   block.writeUInt32BE(block.length, 4);
   png.copy(block, 8);
-  return block;
-}));
+  blocks.push(block);
+}
 
 const totalLength = 8 + blocks.reduce((sum, block) => sum + block.length, 0);
 const header = Buffer.alloc(8);
 header.write('icns', 0, 4, 'ascii');
 header.writeUInt32BE(totalLength, 4);
 
-await fs.writeFile(icnsPath, Buffer.concat([header, ...blocks], totalLength));
+await fs.writeFile(path.join(assetsDir, 'logo-macos.icns'), Buffer.concat([header, ...blocks]));
+
+console.log('electron/scripts/generate-macos-icon.js: regenerated logo-macos.png and logo-macos.icns');

package/electron/scripts/generate-windows-icon.js

@@ -0,0 +1,66 @@
+// electron/scripts/generate-windows-icon.js — build the Windows .ico (PNG-compressed entries) from
+// the committed raster source `public/logo-source.png` (glossy blue airfoil canopy on navy).
+//
+// Modern Windows (Vista+) accepts PNG-encoded ICO entries, so each size embeds a PNG directly.
+//
+// Run from the repo root:  node electron/scripts/generate-windows-icon.js
+
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import sharp from 'sharp';
+
+const here = path.dirname(fileURLToPath(import.meta.url));
+const assetsDir = path.join(here, '..', 'assets');
+const SOURCE = path.join(here, '..', '..', 'public', 'logo-source.png');
+
+const BG = { r: 2, g: 20, b: 44 };
+const CONTENT = { left: 36, top: 312, width: 1218, height: 583 };
+
+/** Full airfoil centered in an `size`×`size` navy square, no crop/zoom. */
+async function renderSquare(size) {
+  const stripHeight = Math.round((size * CONTENT.height) / CONTENT.width);
+  const strip = await sharp(SOURCE)
+    .extract(CONTENT)
+    .resize(size, stripHeight)
+    .png()
+    .toBuffer();
+  const top = Math.round((size - stripHeight) / 2);
+  return sharp({ create: { width: size, height: size, channels: 3, background: BG } })
+    .composite([{ input: strip, left: 0, top }])
+    .png()
+    .toBuffer();
+}
+
+await fs.mkdir(assetsDir, { recursive: true });
+
+const sizes = [16, 32, 48, 64, 128, 256];
+const images = [];
+for (const size of sizes) {
+  images.push({ size, png: await renderSquare(size) });
+}
+
+const header = Buffer.alloc(6);
+header.writeUInt16LE(0, 0); // reserved
+header.writeUInt16LE(1, 2); // type: icon
+header.writeUInt16LE(images.length, 4); // count
+
+const directory = Buffer.alloc(16 * images.length);
+let offset = 6 + directory.length;
+images.forEach(({ size, png }, i) => {
+  const entry = 16 * i;
+  directory.writeUInt8(size === 256 ? 0 : size, entry + 0); // width (0 = 256)
+  directory.writeUInt8(size === 256 ? 0 : size, entry + 1); // height (0 = 256)
+  directory.writeUInt8(0, entry + 2); // palette
+  directory.writeUInt8(0, entry + 3); // reserved
+  directory.writeUInt16LE(1, entry + 4); // color planes
+  directory.writeUInt16LE(32, entry + 6); // bits per pixel
+  directory.writeUInt32LE(png.length, entry + 8); // bytes in this entry
+  directory.writeUInt32LE(offset, entry + 12); // image offset
+  offset += png.length;
+});
+
+const body = Buffer.concat(images.map(({ png }) => png));
+await fs.writeFile(path.join(assetsDir, 'logo-windows.ico'), Buffer.concat([header, directory, body]));
+
+console.log('electron/scripts/generate-windows-icon.js: regenerated logo-windows.ico');

package/electron/serverInstaller.js

@@ -6,6 +6,8 @@ import https from 'node:https';
 import os from 'node:os';
 import path from 'node:path';
 
+import { createBrandEnvReader, readBrandEnvValue } from './brandEnv.js';
+
 /**
  * Installs the versioned local server runtime used by Cloudpit Desktop.
  *
@@ -85,25 +87,32 @@ export class ServerInstaller {
     platform = process.platform,
     arch = process.arch,
     installRoot,
-    bundleBaseUrl = process.env.CLOUDCLI_SERVER_BUNDLE_URL || DEFAULT_BUNDLE_BASE_URL,
-    bundleReleaseTag = process.env.CLOUDCLI_SERVER_BUNDLE_RELEASE_TAG || '',
+    bundleBaseUrl,
+    bundleReleaseTag,
+    env = process.env,
     onLog,
   } = {}) {
     if (!version) throw new Error('ServerInstaller requires the app version');
+    const brandEnv = createBrandEnvReader({ env });
     this.version = version;
     this.platform = mapPlatform(platform);
     this.arch = mapArch(arch);
-    this.installRoot = installRoot
-      || process.env.CLOUDPIT_SERVER_DIR
-      || process.env.CLOUDCLI_SERVER_DIR
-      || DEFAULT_INSTALL_ROOT;
+    const serverDir = readBrandEnvValue(brandEnv, 'SERVER_DIR', undefined);
+    this.installRoot = installRoot || serverDir || DEFAULT_INSTALL_ROOT;
     this.migrateLegacyInstall = Boolean(
-      this.installRoot === DEFAULT_INSTALL_ROOT
-      && !process.env.CLOUDPIT_SERVER_DIR
-      && !process.env.CLOUDCLI_SERVER_DIR,
+      this.installRoot === DEFAULT_INSTALL_ROOT && !serverDir,
     );
-    this.bundleBaseUrl = bundleBaseUrl.replace(/\/+$/, '');
-    this.bundleReleaseTag = bundleReleaseTag || `v${this.version}`;
+    // An explicit constructor argument wins; otherwise read the canonical
+    // `CLOUDPIT_SERVER_BUNDLE_*` names (the v3.0 retirement deleted the legacy
+    // `CLOUDCLI_SERVER_BUNDLE_*` fallback).
+    const resolvedBaseUrl = bundleBaseUrl === undefined
+      ? readBrandEnvValue(brandEnv, 'SERVER_BUNDLE_URL', DEFAULT_BUNDLE_BASE_URL)
+      : bundleBaseUrl;
+    const resolvedReleaseTag = bundleReleaseTag === undefined
+      ? readBrandEnvValue(brandEnv, 'SERVER_BUNDLE_RELEASE_TAG', '')
+      : bundleReleaseTag;
+    this.bundleBaseUrl = String(resolvedBaseUrl).replace(/\/+$/, '');
+    this.bundleReleaseTag = resolvedReleaseTag || `v${this.version}`;
     this.onLog = typeof onLog === 'function' ? onLog : () => {};
   }