@jamiexiongr/panda 0.1.6 → 0.1.8

package/dist/cli.mjs

@@ -1,9 +1,108 @@
+// packages/provider-codex/src/tailscale.ts
+import { execFileSync } from "child_process";
+var ENABLED_ARGS = /* @__PURE__ */ new Set([
+  "tailscareserv",
+  "--tailscareserv",
+  "tailscale-serve",
+  "--tailscale-serve"
+]);
+var PUBLIC_ARGS = /* @__PURE__ */ new Set([
+  "tailscareserv-pub",
+  "--tailscareserv-pub",
+  "tailscale-serve-pub",
+  "--tailscale-serve-pub",
+  "tailscalefunnel",
+  "--tailscalefunnel",
+  "tailscale-funnel",
+  "--tailscale-funnel"
+]);
+var DISABLED_ARGS = /* @__PURE__ */ new Set([
+  "no-tailscareserv",
+  "--no-tailscareserv",
+  "no-tailscale-serve",
+  "--no-tailscale-serve",
+  "no-tailscareserv-pub",
+  "--no-tailscareserv-pub",
+  "no-tailscale-serve-pub",
+  "--no-tailscale-serve-pub",
+  "no-tailscalefunnel",
+  "--no-tailscalefunnel",
+  "no-tailscale-funnel",
+  "--no-tailscale-funnel"
+]);
+var trimToNull = (value) => {
+  const normalized = value?.trim() ?? "";
+  return normalized ? normalized : null;
+};
+var parseBooleanLike = (value) => {
+  const normalized = trimToNull(value)?.toLowerCase();
+  if (!normalized) {
+    return null;
+  }
+  if (["1", "true", "yes", "on"].includes(normalized)) {
+    return true;
+  }
+  if (["0", "false", "no", "off"].includes(normalized)) {
+    return false;
+  }
+  return null;
+};
+var parsePublicationModeLike = (value) => {
+  const normalized = trimToNull(value)?.toLowerCase();
+  if (!normalized) {
+    return null;
+  }
+  if (["serve", "private", "tailnet"].includes(normalized)) {
+    return "serve";
+  }
+  if (["funnel", "public", "pub"].includes(normalized)) {
+    return "funnel";
+  }
+  if (["disabled", "none", "off"].includes(normalized)) {
+    return "disabled";
+  }
+  return null;
+};
+var resolveTailscalePublicationMode = (options) => {
+  const argv = options?.argv ?? [];
+  for (const candidate of argv) {
+    const normalized = candidate.trim().toLowerCase();
+    if (PUBLIC_ARGS.has(normalized)) {
+      return "funnel";
+    }
+    if (ENABLED_ARGS.has(normalized)) {
+      return "serve";
+    }
+    if (DISABLED_ARGS.has(normalized)) {
+      return "disabled";
+    }
+  }
+  const env = options?.env ?? process.env;
+  const scopedMode = options?.envPrefix ? parsePublicationModeLike(env[`${options.envPrefix}_TAILSCALE_PUBLISH_MODE`]) : null;
+  if (scopedMode) {
+    return scopedMode;
+  }
+  const genericMode = parsePublicationModeLike(env.PANDA_TAILSCALE_PUBLISH_MODE);
+  if (genericMode) {
+    return genericMode;
+  }
+  const scopedEnabled = options?.envPrefix ? parseBooleanLike(env[`${options.envPrefix}_TAILSCALE_SERVE`]) : null;
+  if (scopedEnabled !== null) {
+    return scopedEnabled ? "serve" : "disabled";
+  }
+  const envEnabled = parseBooleanLike(env.PANDA_TAILSCALE_SERVE);
+  if (envEnabled !== null) {
+    return envEnabled ? "serve" : "disabled";
+  }
+  return "disabled";
+};
+
 // release/panda/src/cli.ts
 var printUsage = () => {
   console.log(`panda <command>
 
 Commands:
-  agent [tailscareserv] [--hub-url=<url>]    Start the Panda agent service
+  agent [tailscareserv|tailscareserv-pub] [--hub-url=<url>]    Start the Panda agent service
   hub [tailscareserv|tailscareserv-pub]      Start the Panda hub service with the bundled web UI
   help     Show this message`);
 };
@@ -22,77 +121,17 @@ var resolveCliOptionValue = (argv, aliases) => {
   }
   return null;
 };
-var resolveTailscaleServeArg = (argv) => {
-  for (const arg of argv) {
-    const normalized = arg.trim().toLowerCase();
-    if (["tailscareserv", "--tailscareserv", "tailscale-serve", "--tailscale-serve"].includes(
-      normalized
-    )) {
-      return true;
-    }
-    if (["no-tailscareserv", "--no-tailscareserv", "no-tailscale-serve", "--no-tailscale-serve"].includes(normalized)) {
-      return false;
-    }
-  }
-  const envValue = process.env.PANDA_TAILSCALE_SERVE?.trim().toLowerCase();
-  if (envValue && ["1", "true", "yes", "on"].includes(envValue)) {
-    return true;
-  }
-  if (envValue && ["0", "false", "no", "off"].includes(envValue)) {
-    return false;
-  }
-  return false;
-};
-var resolveHubPublicationMode = (argv) => {
-  for (const arg of argv) {
-    const normalized = arg.trim().toLowerCase();
-    if ([
-      "tailscareserv-pub",
-      "--tailscareserv-pub",
-      "tailscale-serve-pub",
-      "--tailscale-serve-pub",
-      "tailscalefunnel",
-      "--tailscalefunnel",
-      "tailscale-funnel",
-      "--tailscale-funnel"
-    ].includes(normalized)) {
-      return "funnel";
-    }
-    if (["tailscareserv", "--tailscareserv", "tailscale-serve", "--tailscale-serve"].includes(
-      normalized
-    )) {
-      return "serve";
-    }
-    if ([
-      "no-tailscareserv",
-      "--no-tailscareserv",
-      "no-tailscale-serve",
-      "--no-tailscale-serve",
-      "no-tailscareserv-pub",
-      "--no-tailscareserv-pub",
-      "no-tailscale-funnel",
-      "--no-tailscale-funnel"
-    ].includes(normalized)) {
-      return "disabled";
-    }
-  }
-  const envMode = process.env.PANDA_HUB_TAILSCALE_PUBLISH_MODE?.trim().toLowerCase();
-  if (envMode && ["funnel", "public", "pub"].includes(envMode)) {
-    return "funnel";
-  }
-  if (envMode && ["serve", "private", "tailnet"].includes(envMode)) {
-    return "serve";
-  }
-  if (envMode && ["disabled", "none", "off"].includes(envMode)) {
-    return "disabled";
-  }
-  return resolveTailscaleServeArg(argv) ? "serve" : "disabled";
-};
 var main = async () => {
   const command = process.argv[2]?.trim().toLowerCase() ?? "help";
   const commandArgs = process.argv.slice(3);
-  const tailscaleServe = resolveTailscaleServeArg(commandArgs);
-  const hubPublicationMode = resolveHubPublicationMode(commandArgs);
+  const agentPublicationMode = resolveTailscalePublicationMode({
+    argv: commandArgs,
+    envPrefix: "PANDA_AGENT"
+  });
+  const hubPublicationMode = resolveTailscalePublicationMode({
+    argv: commandArgs,
+    envPrefix: "PANDA_HUB"
+  });
   if (command === "help" || command === "--help" || command === "-h") {
     printUsage();
     return;
@@ -100,7 +139,7 @@ var main = async () => {
   if (command === "agent") {
     const { startJamiexiongrAgent } = await import("@jamiexiongr/panda-agent");
     await startJamiexiongrAgent({
-      tailscaleServe,
+      tailscalePublicationMode: agentPublicationMode,
       hubUrl: resolveCliOptionValue(commandArgs, [
         "hub",
         "--hub",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jamiexiongr/panda",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "private": false,
   "description": "Panda combined installer",
@@ -8,8 +8,8 @@
     "panda": "./bin/panda.cjs"
   },
   "dependencies": {
-    "@jamiexiongr/panda-agent": "0.1.6",
-    "@jamiexiongr/panda-hub": "0.1.6"
+    "@jamiexiongr/panda-agent": "0.1.8",
+    "@jamiexiongr/panda-hub": "0.1.8"
   },
   "files": [
     "bin",