@pizzapi/pizza 0.1.33 → 0.1.34-dev.1

package/bin/pizza.mjs

@@ -9,13 +9,14 @@
  * Pattern borrowed from esbuild, turbo, swc, etc.
  */
 
-import { execFileSync } from "node:child_process";
-import { existsSync } from "node:fs";
-import { join, dirname } from "node:path";
+import { execFileSync, execSync } from "node:child_process";
+import { existsSync, readFileSync } from "node:fs";
+import { join, dirname, resolve } from "node:path";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 // Map of `${process.platform}-${process.arch}` to npm package name
 const PLATFORM_PACKAGES = {
@@ -38,13 +39,24 @@ if (!pkgName) {
     process.exit(1);
 }
 
-// Try to find the binary
+/** Read our own package.json version. */
+function getOwnVersion() {
+    try {
+        const pkg = JSON.parse(readFileSync(join(__dirname, "..", "package.json"), "utf-8"));
+        return pkg.version;
+    } catch {
+        return undefined;
+    }
+}
+
+/** Try to find the platform binary via multiple strategies. */
 function findBinary() {
-    const require = createRequire(join(__dirname, ".."));
     const binName = process.platform === "win32" ? "pizza.exe" : "pizza";
+    const parts = pkgName.split("/");
 
     // Strategy 1: require.resolve the platform package
     try {
+        const require = createRequire(join(__dirname, "..", "package.json"));
         const pkgJson = require.resolve(`${pkgName}/package.json`);
         const pkgDir = dirname(pkgJson);
         const binPath = join(pkgDir, "bin", binName);
@@ -53,12 +65,8 @@ function findBinary() {
         // not found via require
     }
 
-    const parts = pkgName.split("/");
-
     // Strategy 2: Sibling scoped package — both packages live under
     // node_modules/@pizzapi/, so the platform package is a sibling of ours.
-    // __dirname = .../node_modules/@pizzapi/pizza/bin
-    // sibling  = .../node_modules/@pizzapi/cli-win32-x64/bin/pizza.exe
     {
         const siblingPath = join(__dirname, "..", "..", parts[1], "bin", binName);
         if (existsSync(siblingPath)) return siblingPath;
@@ -76,21 +84,98 @@ function findBinary() {
         if (existsSync(binPath)) return binPath;
     }
 
+    // Strategy 4: Walk up from __dirname looking for node_modules containing
+    // the platform package (covers deeply nested or unusual layouts)
+    {
+        let dir = resolve(__dirname);
+        for (let i = 0; i < 10; i++) {
+            const candidate = join(dir, "node_modules", parts[0], parts[1], "bin", binName);
+            if (existsSync(candidate)) return candidate;
+            const parent = dirname(dir);
+            if (parent === dir) break;
+            dir = parent;
+        }
+    }
+
+    // Strategy 5: Use npm root -g to find global node_modules
+    try {
+        const globalRoot = execSync("npm root -g", { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+        if (globalRoot) {
+            const binPath = join(globalRoot, parts[0], parts[1], "bin", binName);
+            if (existsSync(binPath)) return binPath;
+        }
+    } catch {
+        // npm not available or failed
+    }
+
     return null;
 }
 
-const binaryPath = findBinary();
+/**
+ * Attempt to install the missing platform package alongside our package.
+ * Returns true if the install succeeded.
+ */
+function tryAutoInstall(version) {
+    const versionSpec = version ? `${pkgName}@${version}` : pkgName;
+
+    // Determine whether we're in a global install by checking if our path
+    // is inside a global-looking node_modules (not inside a project).
+    const isGlobal = __dirname.includes("node_modules");
+
+    const globalFlag = isGlobal ? " -g" : "";
+    console.error(
+        `\nThe platform package "${pkgName}" was not installed automatically.\n` +
+            `Attempting to install it now...\n`,
+    );
+
+    try {
+        execSync(`npm install${globalFlag} ${versionSpec}`, {
+            stdio: "inherit",
+            env: process.env,
+        });
+        return true;
+    } catch {
+        return false;
+    }
+}
+
+// --- Main ---
+
+let binaryPath = findBinary();
+
+// If not found, try to auto-install the platform package and retry
+if (!binaryPath) {
+    const version = getOwnVersion();
+    if (tryAutoInstall(version)) {
+        binaryPath = findBinary();
+    }
+}
 
 if (!binaryPath) {
+    // Collect diagnostic info for troubleshooting
+    const parts = pkgName.split("/");
+    const diag = [
+        `  launcher: ${__filename}`,
+        `  __dirname: ${__dirname}`,
+        `  platform: ${platformKey}`,
+    ];
+    const siblingDir = join(__dirname, "..", "..", parts[1]);
+    diag.push(`  sibling dir exists: ${existsSync(siblingDir)} (${siblingDir})`);
+    try {
+        const globalRoot = execSync("npm root -g", { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+        const globalPkg = join(globalRoot, parts[0], parts[1]);
+        diag.push(`  global root: ${globalRoot}`);
+        diag.push(`  global pkg exists: ${existsSync(globalPkg)} (${globalPkg})`);
+    } catch {}
+
     console.error(
         `Error: Could not find the PizzaPi binary for your platform (${platformKey}).\n\n` +
-            `The platform-specific package "${pkgName}" should have been installed\n` +
-            `automatically as an optional dependency.\n\n` +
-            `Try reinstalling:\n` +
-            `  npm install @pizzapi/pizza\n\n` +
-            `If the problem persists, install the platform package directly:\n` +
-            `  npm install ${pkgName}\n\n` +
-            `Or build from source: https://github.com/Pizzaface/PizzaPi`,
+            `The platform-specific package "${pkgName}" could not be installed\n` +
+            `automatically.\n\n` +
+            `Try installing it manually:\n` +
+            `  npm install -g ${pkgName}@${getOwnVersion() || "latest"}\n\n` +
+            `Or build from source: https://github.com/Pizzaface/PizzaPi\n\n` +
+            `Diagnostics:\n${diag.join("\n")}`,
     );
     process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pizzapi/pizza",
-  "version": "0.1.33",
+  "version": "0.1.34-dev.1",
   "description": "PizzaPi — a self-hosted web interface and relay server for the pi coding agent. Stream live AI coding sessions to any browser.",
   "license": "MIT",
   "bin": {
@@ -13,11 +13,11 @@
     "LICENSE"
   ],
   "optionalDependencies": {
-    "@pizzapi/cli-linux-x64": "0.1.33",
-    "@pizzapi/cli-linux-arm64": "0.1.33",
-    "@pizzapi/cli-darwin-x64": "0.1.33",
-    "@pizzapi/cli-darwin-arm64": "0.1.33",
-    "@pizzapi/cli-win32-x64": "0.1.33"
+    "@pizzapi/cli-linux-x64": "0.1.34-dev.1",
+    "@pizzapi/cli-linux-arm64": "0.1.34-dev.1",
+    "@pizzapi/cli-darwin-x64": "0.1.34-dev.1",
+    "@pizzapi/cli-darwin-arm64": "0.1.34-dev.1",
+    "@pizzapi/cli-win32-x64": "0.1.34-dev.1"
   },
   "engines": {
     "node": ">=18"