@piperace/cli 0.4.1 → 1.5.10

package/README.md

@@ -17,7 +17,7 @@ npm install -g @piperace/cli
 ```bash
 piperace http 3000 -d myapp     # expose localhost:3000 → https://myapp.piperace.fun
 piperace login                  # keep the same subdomain + a permanent token
-piperace-gui                    # launch the desktop app
+piperace ui                     # open the Piperace Control Center (web UI) in your browser
 piperace --version
 ```
 
@@ -27,7 +27,7 @@ Works out of the box — no account required. When a tunnel starts, a QR code is
 
 ## Supported platforms
 
-Both the CLI and the desktop GUI are available for:
+The CLI is available for:
 
 | OS      | Architecture           |
 |---------|------------------------|
@@ -36,15 +36,13 @@ Both the CLI and the desktop GUI are available for:
 | Linux   | arm64                  |
 | Linux   | x64                    |
 | Windows | x64                    |
-| Windows | ia32 (CLI only)        |
-
-The desktop app (`piperace-gui`) is set up automatically the first time you launch it.
+| Windows | ia32                   |
 
 ## Environment variables
 
 - `PIPERACE_ENV` — `development` or `production` (selects the API/tunnel endpoints).
 - `PIPERACE_BINARY_PATH` — use a specific Piperace executable instead of the managed one.
-- `PIPERACE_DOWNLOAD_URL` — override the base URL Piperace uses to fetch its components (default: `https://piperace.com/downloads`).
+- `PIPERACE_DOWNLOAD_URL` — override the base URL Piperace uses to fetch its components (default: `https://piperace-downloads.s3.us-east-1.amazonaws.com`).
 
 ## Programmatic API
 

package/lib/index.js

@@ -14,13 +14,6 @@ const BINARY_MAP = {
     'linux x64':    'piperace-linux-amd64',
     'win32 x64':    'piperace-client.exe',
     'win32 ia32':   'piperace-client-386.exe'
-  },
-  gui: {
-    'darwin arm64': 'piperace-gui-darwin-arm64',
-    'darwin x64':   'piperace-gui-darwin-amd64',
-    'linux arm64':  'piperace-gui-linux-arm64',
-    'linux x64':    'piperace-gui-linux-amd64',
-    'win32 x64':    'piperace-gui.exe'
   }
 };
 
@@ -29,8 +22,7 @@ function platformKey() {
 }
 
 function binaryPathFor(kind) {
-  const name = kind === 'gui' ? 'piperace-gui' : 'piperace';
-  return path.join(BIN_DIR, name + (os.platform() === 'win32' ? '.exe' : ''));
+  return path.join(BIN_DIR, 'piperace' + (os.platform() === 'win32' ? '.exe' : ''));
 }
 
 function binaryExists(binaryPath) {
@@ -59,18 +51,13 @@ function getBinaryPath(kind = 'cli') {
   return binaryPath;
 }
 
-// Ensure the binary is present, downloading it on demand. The GUI binary is not
-// fetched during `npm install`, so its first launch lazily downloads it here.
+// Ensure the binary is present, downloading it on demand.
 async function ensureBinaryPath(kind = 'cli') {
   const binaryPath = binaryPathFor(kind);
   if (binaryExists(binaryPath)) return binaryPath;
 
-  if (kind === 'gui') {
-    console.log('[piperace] First GUI launch — downloading the desktop binary (one-time)...');
-  }
-
   // Reuse the installer's download/retry logic. The require.main guard in
-  // install.js keeps this from re-running the CLI install as a side effect.
+  // install.js keeps this from re-running the install as a side effect.
   const { installBinary } = require('../scripts/install.js');
   await installBinary(kind);
 
@@ -81,8 +68,7 @@ async function ensureBinaryPath(kind = 'cli') {
 }
 
 async function run(args = [], options = {}) {
-  const kind = options.gui ? 'gui' : 'cli';
-  const binaryPath = await ensureBinaryPath(kind);
+  const binaryPath = await ensureBinaryPath('cli');
   const child = spawn(binaryPath, args, {
     stdio: options.stdio || 'inherit',
     // Mark the install channel so the binary can show an npm-specific update

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@piperace/cli",
-  "version": "0.4.1",
+  "version": "1.5.10",
   "description": "Piperace — expose your localhost to the internet in seconds. A self-hosted ngrok alternative.",
   "main": "lib/index.js",
   "bin": {
-    "piperace": "bin/piperace",
-    "piperace-gui": "bin/piperace-gui"
+    "piperace": "bin/piperace"
   },
   "scripts": {
     "postinstall": "node scripts/install.js",

package/scripts/install.js

@@ -11,6 +11,15 @@ const VERSION = require('../package.json').version;
 const ROOT = path.join(__dirname, '..');
 const BIN_DIR = path.join(ROOT, 'binaries');
 
+// Where published release artifacts live: <BASE_URL>/<version>/<file> and
+// <BASE_URL>/latest/<file>, uploaded by `mage deploy` (see magefile.go). This
+// is S3 directly rather than the backend — the binaries are ~110 MB a release
+// and have no business travelling through the app servers. Keep the default in
+// sync with config/environments/base.go (DownloadsURL), which is the same root
+// the Go CLI uses to fetch the menu-bar app.
+const BASE_URL = (process.env.PIPERACE_DOWNLOAD_URL ||
+  'https://piperace-downloads.s3.us-east-1.amazonaws.com').replace(/\/+$/, '');
+
 const DOWNLOAD_TIMEOUT_MS = 30000; // per-attempt socket timeout
 const DOWNLOAD_RETRIES = 2;        // extra attempts after the first
 
@@ -23,13 +32,6 @@ const BINARY_MAP = {
     'linux x64':    'piperace-linux-amd64',
     'win32 x64':    'piperace-client.exe',
     'win32 ia32':   'piperace-client-386.exe'
-  },
-  gui: {
-    'darwin arm64': 'piperace-gui-darwin-arm64',
-    'darwin x64':   'piperace-gui-darwin-amd64',
-    'linux arm64':  'piperace-gui-linux-arm64',
-    'linux x64':    'piperace-gui-linux-amd64',
-    'win32 x64':    'piperace-gui.exe'
   }
 };
 
@@ -44,7 +46,7 @@ function binaryName(kind = 'cli') {
 }
 
 function finalBinaryName(kind = 'cli') {
-  return kind === 'gui' ? 'piperace-gui' : 'piperace';
+  return 'piperace';
 }
 
 function finalBinaryPath(kind = 'cli') {
@@ -168,9 +170,8 @@ async function installBinary(kind = 'cli') {
     return;
   }
 
-  // 2. Fall back to downloading from the public CDN.
-  const baseUrl = process.env.PIPERACE_DOWNLOAD_URL || 'https://piperace.com/downloads';
-  const url = `${baseUrl}/${VERSION}/${sourceName}`;
+  // 2. Fall back to downloading the published release.
+  const url = `${BASE_URL}/${VERSION}/${sourceName}`;
   console.log(`[piperace] Downloading ${kind} binary from ${url}`);
 
   try {
@@ -181,7 +182,7 @@ async function installBinary(kind = 'cli') {
   } catch (err) {
     try { fs.unlinkSync(target); } catch {}
     console.error(`[piperace] Failed to download ${kind} binary: ${err.message}`);
-    console.error(`[piperace] You can manually download ${sourceName} from ${baseUrl} and place it at ${target}`);
+    console.error(`[piperace] You can manually download ${sourceName} from ${BASE_URL} and place it at ${target}`);
     // Do not fail npm install; the launcher will retry lazily and print a
     // helpful message if the binary is still missing at run time.
   }
@@ -196,20 +197,167 @@ function removeQuarantine(filePath) {
   }
 }
 
+// macOS-only: also install the packaged menu-bar app (Piperace.app, built by
+// `mage tray:mac*` — see magefile.go) into /Applications, so npm users get
+// the same double-clickable, Spotlight-launchable icon the CLI itself
+// installs lazily for raw-binary users (pkg/trayapp). Best-effort: never
+// throws, never fails the npm install.
+const TRAY_ARCH_MAP = { arm64: 'arm64', x64: 'amd64' };
+
+function trayAppDest() {
+  for (const dir of ['/Applications', path.join(os.homedir(), 'Applications')]) {
+    if (canWriteDir(dir)) return path.join(dir, 'Piperace.app');
+  }
+  return path.join(os.homedir(), 'Applications', 'Piperace.app');
+}
+
+function canWriteDir(dir) {
+  try {
+    if (!fs.existsSync(dir)) {
+      if (dir === '/Applications') return false; // never create the root Applications folder itself
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    const probe = path.join(dir, `.piperace-write-test-${process.pid}`);
+    fs.writeFileSync(probe, '');
+    fs.unlinkSync(probe);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// installedTrayVersion reads CFBundleShortVersionString from an installed
+// bundle ('' when it is absent or unreadable — a hand-made bundle we leave be).
+function installedTrayVersion(dest) {
+  try {
+    return execSync(`defaults read "${path.join(dest, 'Contents', 'Info')}" CFBundleShortVersionString`,
+      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+  } catch {
+    return '';
+  }
+}
+
+function trayAppRunning(dest) {
+  try {
+    execSync(`pgrep -f "${path.join(dest, 'Contents', 'MacOS')}/"`, { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// quitTrayApp stops a running menu-bar app so its bundle can be replaced.
+// Without this an upgrade leaves the old icon running beside the new one —
+// two icons, two dashboards, both fighting for port 443.
+function quitTrayApp(dest) {
+  const pattern = `${path.join(dest, 'Contents', 'MacOS')}/`;
+  try { execSync(`pkill -f "${pattern}"`, { stdio: 'ignore' }); } catch {}
+  for (let i = 0; i < 25 && trayAppRunning(dest); i++) {
+    try { execSync('sleep 0.2'); } catch {}
+  }
+  if (trayAppRunning(dest)) {
+    try { execSync(`pkill -9 -f "${pattern}"`, { stdio: 'ignore' }); } catch {}
+  }
+}
+
+async function installMacTrayApp() {
+  if (os.platform() !== 'darwin') return;
+
+  const dest = trayAppDest();
+  const installed = fs.existsSync(dest) ? installedTrayVersion(dest) : null;
+  // Present and already this version (or unreadable, i.e. not ours) — leave it.
+  if (installed !== null && (installed === VERSION || installed === '')) return;
+
+  const arch = TRAY_ARCH_MAP[os.arch()];
+  if (!arch) {
+    console.warn(`[piperace] No prebuilt menu-bar app for darwin/${os.arch()}; skipping.`);
+    return;
+  }
+  const zipName = `Piperace-darwin-${arch}.app.zip`;
+  const tmpZip = path.join(os.tmpdir(), `piperace-tray-${process.pid}.app.zip`);
+
+  let downloaded = false;
+  for (const dir of [VERSION, 'latest']) {
+    const url = `${BASE_URL}/${dir}/${zipName}`;
+    try {
+      console.log(`[piperace] Downloading menu-bar app from ${url}`);
+      await downloadWithRetry(url, tmpZip);
+      downloaded = true;
+      break;
+    } catch (err) {
+      console.warn(`[piperace] ${url} unavailable (${err.message})`);
+    }
+  }
+  if (!downloaded) {
+    console.warn('[piperace] Could not download the menu-bar app — the CLI still works fine; `piperace ui` retries this automatically later.');
+    return;
+  }
+
+  let tmpDir;
+  try {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'piperace-tray-'));
+    // ditto (not a JS zip lib) so the code signature ditto/codesign embedded
+    // at build time survives extraction intact.
+    execSync(`ditto -x -k "${tmpZip}" "${tmpDir}"`, { stdio: 'ignore' });
+    const extracted = path.join(tmpDir, 'Piperace.app');
+    fs.mkdirSync(path.dirname(dest), { recursive: true });
+
+    // Stop the old icon before swapping the bundle, and put it back after, so
+    // an upgrade hands over instead of running two copies side by side.
+    const wasRunning = fs.existsSync(dest) && trayAppRunning(dest);
+    if (wasRunning) quitTrayApp(dest);
+
+    // `cp -R` into an existing app directory copies INSIDE it (leaving a
+    // nested Piperace.app/Piperace.app that macOS ignores while it keeps
+    // launching the stale outer bundle), so move the old one aside first and
+    // only drop it once the new one is in place.
+    const aside = `${dest}.replaced`;
+    fs.rmSync(aside, { recursive: true, force: true });
+    if (fs.existsSync(dest)) fs.renameSync(dest, aside);
+    try {
+      execSync(`cp -R "${extracted}" "${dest}"`, { stdio: 'ignore' });
+    } catch (err) {
+      if (fs.existsSync(aside)) fs.renameSync(aside, dest); // put the working one back
+      throw err;
+    }
+    fs.rmSync(aside, { recursive: true, force: true });
+    removeQuarantine(dest);
+    registerWithLaunchServices(dest);
+    if (wasRunning) {
+      try { execSync(`open -g -a "${dest}"`, { stdio: 'ignore' }); } catch {}
+    }
+    console.log(`[piperace] Installed ${dest} — find it in Spotlight/Applications for a menu-bar icon.`);
+  } catch (err) {
+    console.warn(`[piperace] Failed to install the menu-bar app: ${err.message}`);
+  } finally {
+    try { fs.unlinkSync(tmpZip); } catch {}
+    if (tmpDir) { try { fs.rmSync(tmpDir, { recursive: true, force: true }); } catch {} }
+  }
+}
+
+// registerWithLaunchServices makes Finder, Spotlight and Launchpad pick the
+// bundle (and its icon) up now instead of whenever the system next rescans.
+function registerWithLaunchServices(dest) {
+  const lsregister = '/System/Library/Frameworks/CoreServices.framework/Frameworks/' +
+    'LaunchServices.framework/Support/lsregister';
+  try { execSync(`"${lsregister}" -f -R -trusted "${dest}"`, { stdio: 'ignore' }); } catch {}
+  try { fs.utimesSync(dest, new Date(), new Date()); } catch {}
+}
+
 module.exports = {
   installBinary,
+  installMacTrayApp,
   binaryName,
   finalBinaryPath,
   platformKey,
   BINARY_MAP
 };
 
-// Only the lightweight CLI binary is fetched at install time. The much larger
-// GUI binary is downloaded lazily on the first `piperace-gui` run (see
-// lib/index.js), so `npm install` stays fast for the common CLI-only case.
+// Fetch the CLI binary (and, on macOS, the menu-bar app) at install time.
 if (require.main === module) {
   // Never let a failure here break `npm install`; the launcher retries lazily.
   Promise.resolve()
     .then(() => installBinary('cli'))
+    .then(() => installMacTrayApp())
     .catch((err) => console.error(`[piperace] install skipped: ${err.message}`));
 }

package/bin/piperace-gui

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-const { run } = require('../lib/index.js');
-
-run(process.argv.slice(2), { gui: true }).catch((err) => {
-  console.error(err.message);
-  process.exit(1);
-});