vibelet 0.1.25 → 0.1.26

package/bin/cloudflared-resolver.mjs

@@ -0,0 +1,68 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { delimiter, join } from 'node:path';
+
+function getExecutableCandidates(name, pathExtValue = process.env.PATHEXT ?? '') {
+  if (process.platform !== 'win32') {
+    return [name];
+  }
+
+  const extensions = pathExtValue
+    .split(';')
+    .map((entry) => entry.trim())
+    .filter(Boolean)
+    .map((entry) => (entry.startsWith('.') ? entry : `.${entry}`))
+    .map((entry) => entry.toLowerCase());
+
+  return [name, ...extensions.map((entry) => `${name}${entry}`)];
+}
+
+export function findExecutableInPath(name, {
+  pathValue = process.env.PATH ?? '',
+  pathExtValue = process.env.PATHEXT ?? '',
+} = {}) {
+  if (!pathValue) return null;
+
+  for (const dir of pathValue.split(delimiter)) {
+    if (!dir) continue;
+    for (const candidate of getExecutableCandidates(name, pathExtValue)) {
+      const candidatePath = join(dir, candidate);
+      if (existsSync(candidatePath)) {
+        return candidatePath;
+      }
+    }
+  }
+
+  return null;
+}
+
+export function resolveCloudflaredBin({
+  pathValue = process.env.PATH ?? '',
+  pathExtValue = process.env.PATHEXT ?? '',
+  spawnSyncImpl = spawnSync,
+} = {}) {
+  const directPath = findExecutableInPath('cloudflared', { pathValue, pathExtValue });
+  if (directPath) {
+    return directPath;
+  }
+
+  const result = spawnSyncImpl('npx', [
+    '--yes',
+    '--package=cloudflared',
+    'node',
+    '-e',
+    "console.log(process.env.PATH ?? '')",
+  ], {
+    encoding: 'utf8',
+    timeout: 30_000,
+  });
+
+  if (result.status !== 0 || !result.stdout.trim()) {
+    return null;
+  }
+
+  return findExecutableInPath('cloudflared', {
+    pathValue: result.stdout.trim(),
+    pathExtValue,
+  });
+}

package/bin/vibelet.mjs

@@ -6,6 +6,7 @@ import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import QRCode from 'qrcode';
+import { resolveCloudflaredBin } from './cloudflared-resolver.mjs';
 import { shouldReuseHealthyDaemon } from './vibelet-runtime-policy.mjs';
 
 // ─── Paths & constants ─────────────────────────────────────────────────────────
@@ -711,25 +712,6 @@ function getAliveTunnel() {
   return null;
 }
 
-function resolveCloudflaredBin() {
-  // 1. Check if cloudflared is in PATH
-  const which = spawnSync('which', ['cloudflared'], { encoding: 'utf8' });
-  if (which.status === 0 && which.stdout.trim()) {
-    return which.stdout.trim();
-  }
-
-  // 2. Ensure npx has it installed (this downloads if needed, but is fast if cached)
-  const result = spawnSync('npx', ['--yes', '--package=cloudflared', 'node', '-e',
-    "console.log(require('path').join(require('path').dirname(require.resolve('cloudflared')), 'bin', 'cloudflared'))"],
-    { encoding: 'utf8', timeout: 30_000 });
-  if (result.status === 0 && result.stdout.trim()) {
-    const binPath = result.stdout.trim();
-    if (existsSync(binPath)) return binPath;
-  }
-
-  return null;
-}
-
 function startTunnel() {
   return new Promise((resolve, reject) => {
     const logPath = join(logDir, 'tunnel.stderr.log');

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "vibelet",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "macOS CLI for installing and running the Vibelet daemon",
   "homepage": "https://vibelet.icu",
+  "private": false,
   "files": [
+    "bin/cloudflared-resolver.mjs",
     "bin/vibelet.mjs",
     "bin/vibelet-runtime-policy.mjs",
     "dist/index.cjs",
@@ -24,7 +26,24 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "build": "NX_TUI=false nx run-many -t build",
+    "build:release": "pnpm -C apps/daemon build:release",
+    "build:publish": "pnpm build:release",
+    "dev": "nx run-many -t dev --parallel=10 --verbose",
+    "dev:app": "pnpm -C apps/app dev",
+    "dev:daemon": "pnpm -C apps/daemon dev",
+    "dev:site": "pnpm -C apps/site dev",
+    "build:site": "nx run site:build",
+    "test": "pnpm -C apps/app test && pnpm -C apps/daemon test && pnpm -C apps/site test && node --test bin/vibelet-cli.test.mjs scripts/publish-dual-npm.test.mjs",
+    "prepack": "pnpm build:publish",
+    "publish:dual": "node ./scripts/publish-dual-npm.mjs",
+    "publish:dual:dry-run": "node ./scripts/publish-dual-npm.mjs --dry-run"
+  },
   "dependencies": {
     "qrcode": "^1.5.4"
+  },
+  "devDependencies": {
+    "nx": "^22.1.3"
   }
 }