vibelet 1.0.12 → 1.0.13

package/package.json

@@ -1,20 +1,17 @@
 {
   "name": "vibelet",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "macOS CLI for installing and running the Vibelet daemon",
   "homepage": "https://vibelet.icu",
   "files": [
-    "bin/vibelet.cjs",
-    "bin/cloudflared-resolver.mjs",
-    "bin/cloudflared-quick-tunnel.mjs",
-    "bin/vibelet.mjs",
-    "bin/vibelet-runtime-policy.mjs",
+    "dist/vibelet.mjs",
     "dist/index.cjs",
+    "dist/runtime-version.cjs",
     "README.md",
     "package.json"
   ],
   "bin": {
-    "vibelet": "bin/vibelet.cjs"
+    "vibelet": "dist/vibelet.mjs"
   },
   "os": [
     "darwin",
@@ -26,9 +23,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "dependencies": {
-    "cloudflared": "0.7.1",
-    "qrcode": "^1.5.4"
   }
 }

package/bin/cloudflared-quick-tunnel.mjs

@@ -1,11 +0,0 @@
-const QUICK_TUNNEL_URL_PATTERN = /https:\/\/[a-z0-9-]+\.trycloudflare\.com(?=$|[\s"',)\]])/g;
-
-export function extractQuickTunnelUrl(logContent) {
-  if (typeof logContent !== 'string' || logContent.length === 0) {
-    return null;
-  }
-
-  const match = QUICK_TUNNEL_URL_PATTERN.exec(logContent);
-  QUICK_TUNNEL_URL_PATTERN.lastIndex = 0;
-  return match?.[0] ?? null;
-}

package/bin/cloudflared-resolver.mjs

@@ -1,171 +0,0 @@
-import { createRequire } from 'node:module';
-import { existsSync, readFileSync } from 'node:fs';
-import { delimiter, dirname, isAbsolute, join, resolve } from 'node:path';
-
-const npmFallbackCommand = process.platform === 'win32' ? 'npx.cmd' : 'npx';
-const npmFallbackArgs = ['--yes', '--package=cloudflared', 'cloudflared'];
-const npmFallbackDescription = `npx ${npmFallbackArgs.join(' ')}`;
-const require = createRequire(import.meta.url);
-
-function defaultResolveCloudflaredPackageJsonPath() {
-  if (process.env.VIBELET_CLOUDFLARED_PACKAGE_JSON) {
-    return process.env.VIBELET_CLOUDFLARED_PACKAGE_JSON;
-  }
-  return require.resolve('cloudflared/package.json');
-}
-
-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 resolveInstalledCloudflaredCliPath({
-  resolvePackageJsonPath = defaultResolveCloudflaredPackageJsonPath,
-} = {}) {
-  let packageJsonPath;
-  try {
-    packageJsonPath = resolvePackageJsonPath();
-  } catch {
-    return null;
-  }
-
-  let packageJson;
-  try {
-    packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
-  } catch {
-    return null;
-  }
-
-  const relativeBinPath = typeof packageJson.bin === 'string'
-    ? packageJson.bin
-    : packageJson.bin?.cloudflared;
-
-  if (typeof relativeBinPath !== 'string' || !relativeBinPath) {
-    return null;
-  }
-
-  const cliPath = isAbsolute(relativeBinPath)
-    ? relativeBinPath
-    : resolve(dirname(packageJsonPath), relativeBinPath);
-
-  return existsSync(cliPath) ? cliPath : null;
-}
-
-export function resolveCloudflaredLaunchSpec({
-  pathValue = process.env.PATH ?? '',
-  pathExtValue = process.env.PATHEXT ?? '',
-  resolvePackageJsonPath,
-} = {}) {
-  const directPath = findExecutableInPath('cloudflared', { pathValue, pathExtValue });
-  if (directPath) {
-    return {
-      command: directPath,
-      args: [],
-      source: 'path',
-      description: directPath,
-      urlTimeoutMs: 30_000,
-    };
-  }
-
-  const dependencyCliPath = resolveInstalledCloudflaredCliPath({ resolvePackageJsonPath });
-  if (dependencyCliPath) {
-    return {
-      command: process.execPath,
-      args: [dependencyCliPath],
-      source: 'dependency',
-      description: dependencyCliPath,
-      urlTimeoutMs: 90_000,
-    };
-  }
-
-  return {
-    command: npmFallbackCommand,
-    args: [...npmFallbackArgs],
-    source: 'npm',
-    description: npmFallbackDescription,
-    urlTimeoutMs: 90_000,
-  };
-}
-
-export function summarizeCloudflaredLog(logContent, {
-  maxLines = 8,
-  maxChars = 1200,
-} = {}) {
-  const lines = logContent
-    .split(/\r?\n/u)
-    .map((line) => line.trimEnd())
-    .filter(Boolean);
-
-  if (lines.length === 0) {
-    return '';
-  }
-
-  const tail = lines.slice(-maxLines).join('\n');
-  if (tail.length <= maxChars) {
-    return tail;
-  }
-
-  return tail.slice(tail.length - maxChars);
-}
-
-export function formatCloudflaredFailureMessage({
-  launchSpec,
-  logContent = '',
-  logPath,
-  err = null,
-  phase = 'exit',
-}) {
-  const launchSuffix = launchSpec?.source === 'npm'
-    ? ' via npm fallback (npx --yes --package=cloudflared cloudflared)'
-    : launchSpec?.source === 'dependency'
-      ? ' via bundled cloudflared dependency'
-      : '';
-
-  if (phase === 'spawn') {
-    return `Failed to start cloudflared${launchSuffix}: ${err?.message ?? 'unknown error'}`;
-  }
-
-  if (phase === 'timeout') {
-    const summary = summarizeCloudflaredLog(logContent);
-    if (summary) {
-      return `Timed out waiting for tunnel URL (${Math.round((launchSpec?.urlTimeoutMs ?? 30_000) / 1000)}s)${launchSuffix}.\nRecent stderr:\n${summary}`;
-    }
-    return `Timed out waiting for tunnel URL (${Math.round((launchSpec?.urlTimeoutMs ?? 30_000) / 1000)}s)${launchSuffix}. Check network/proxy settings and ${logPath}.`;
-  }
-
-  const summary = summarizeCloudflaredLog(logContent);
-  if (summary) {
-    return `cloudflared exited before producing a tunnel URL${launchSuffix}.\nRecent stderr:\n${summary}`;
-  }
-
-  return `cloudflared exited before producing a tunnel URL${launchSuffix}. Check ${logPath}.`;
-}

package/bin/vibelet-runtime-policy.mjs

@@ -1,36 +0,0 @@
-export function shouldReuseHealthyDaemon({
-  command,
-  daemonHealthy,
-  hasExplicitConfigOverrides,
-}) {
-  if (!daemonHealthy) return false;
-  if (command !== 'default' && command !== 'start') return false;
-  return !hasExplicitConfigOverrides;
-}
-
-export function doesHealthMatchRequestedConnectionConfig({
-  health,
-  relayUrl = '',
-  canonicalHost = '',
-  fallbackHosts = '',
-  localMode = false,
-}) {
-  if (!health) return false;
-
-  const currentRelayUrl = typeof health.relayUrl === 'string' ? health.relayUrl : '';
-  if (relayUrl) {
-    return currentRelayUrl === relayUrl;
-  }
-
-  if (localMode) {
-    return currentRelayUrl === '';
-  }
-
-  if (canonicalHost) {
-    if (fallbackHosts) return false;
-    return currentRelayUrl === '' && health.canonicalHost === canonicalHost;
-  }
-
-  if (fallbackHosts) return false;
-  return currentRelayUrl === '';
-}

package/bin/vibelet.cjs

@@ -1,12 +0,0 @@
-#!/usr/bin/env node
-
-const { realpathSync } = require('node:fs');
-const { dirname, join } = require('node:path');
-const { pathToFileURL } = require('node:url');
-
-const entryPath = join(dirname(realpathSync(__filename)), 'vibelet.mjs');
-
-import(pathToFileURL(entryPath).href).catch((error) => {
-  console.error(error);
-  process.exit(1);
-});