@khal-os/cli 1.0.1 → 1.0.3

package/dist/index.js

@@ -15546,14 +15546,22 @@ __export(exports_kubernetes, {
   KubernetesRuntime: () => KubernetesRuntime
 });
 import { execFile } from "node:child_process";
+import { existsSync as existsSync6 } from "node:fs";
 import { promisify } from "node:util";
-var exec, DEFAULT_KUBECONFIG = "/etc/rancher/k3s/k3s.yaml", DEFAULT_NATS_URL = "nats://10.43.0.1:4222", DEFAULT_RESOURCES, SANDBOX_RUNTIME_CLASS = "sysbox-runc", SANDBOX_PVC_SIZE = "20Gi", SANDBOX_STORAGE_CLASS = "local-path", SANDBOX_SSH_PORT = 22, SANDBOX_HELM_CHART = "helm/khal-sandbox", SANDBOX_RESOURCES, KubernetesRuntime;
+function isInCluster() {
+  if (_inClusterCached !== undefined)
+    return _inClusterCached;
+  _inClusterCached = existsSync6(IN_CLUSTER_TOKEN_PATH) && !!process.env.KUBERNETES_SERVICE_HOST;
+  return _inClusterCached;
+}
+var exec, IN_CLUSTER_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token", _inClusterCached, DEFAULT_KUBECONFIG = "/etc/rancher/k3s/k3s.yaml", DEFAULT_NATS_URL = "nats://nats:4222", DEFAULT_RESOURCES, SANDBOX_RUNTIME_CLASS = "sysbox-runc", SANDBOX_PVC_SIZE = "20Gi", SANDBOX_STORAGE_CLASS = "local-path", SANDBOX_SSH_PORT = 22, SANDBOX_NAMESPACE = "khal-sandbox", SANDBOX_HELM_CHART, SANDBOX_RESOURCES, KubernetesRuntime;
 var init_kubernetes = __esm(() => {
   exec = promisify(execFile);
   DEFAULT_RESOURCES = {
     requests: { cpu: "100m", memory: "256Mi" },
     limits: { cpu: "1", memory: "1Gi" }
   };
+  SANDBOX_HELM_CHART = process.env.KHAL_SANDBOX_CHART_PATH ?? "helm/khal-sandbox";
   SANDBOX_RESOURCES = {
     requests: { cpu: "500m", memory: "1Gi" },
     limits: { cpu: "2", memory: "4Gi" }
@@ -15586,7 +15594,11 @@ var init_kubernetes = __esm(() => {
       const kc = config;
       const slug = kc.appSlug ?? "app";
       const id = kc.instanceId ?? slug;
-      this.kubeconfig = kc.kubeconfig ?? process.env.KUBECONFIG ?? DEFAULT_KUBECONFIG;
+      if (isInCluster()) {
+        this.kubeconfig = "";
+      } else {
+        this.kubeconfig = kc.kubeconfig ?? process.env.KUBECONFIG ?? DEFAULT_KUBECONFIG;
+      }
       this.natsUrl = kc.natsUrl ?? DEFAULT_NATS_URL;
       this.nodePort = kc.nodePort;
       this.sandboxMode = kc.sandboxMode ?? false;
@@ -15598,13 +15610,14 @@ var init_kubernetes = __esm(() => {
       this.domainSuffix = kc.domainSuffix;
       if (this.sandboxMode) {
         const user = kc.userId ?? id;
+        const safeUser = user.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/^-+|-+$/g, "").slice(0, 40);
         this.runtimeClassName = kc.runtimeClassName ?? SANDBOX_RUNTIME_CLASS;
-        this.namespace = `khal-${kc.instanceId ?? user}`.slice(0, 63).replace(/[^a-z0-9-]/g, "-");
-        this.podName = `sandbox-${user}-0`.slice(0, 63);
-        this.serviceName = `sandbox-${user}`.slice(0, 63);
-        this.helmRelease = `sandbox-${user}`.slice(0, 53);
+        this.namespace = SANDBOX_NAMESPACE;
+        this.podName = `sandbox-${safeUser}-0`.slice(0, 63);
+        this.serviceName = `sandbox-${safeUser}`.slice(0, 63);
+        this.helmRelease = `sandbox-${safeUser}`.slice(0, 53);
         this.image = kc.image ?? "khal-os/sandbox:latest";
-        this.instanceId = kc.instanceId ?? `sandbox-${user}`;
+        this.instanceId = kc.instanceId ?? `sandbox-${safeUser}`;
         this.resources = kc.resources ?? SANDBOX_RESOURCES;
       } else {
         this.runtimeClassName = kc.runtimeClassName;
@@ -15690,19 +15703,18 @@ var init_kubernetes = __esm(() => {
       this.assignedPort = await this.resolveNodePort();
     }
     async startSandbox() {
-      await this.applyManifest(this.namespaceManifest());
       const setArgs = this.buildHelmValues();
       const helmArgs = [
+        ...this.kubeconfigArgs(),
         "upgrade",
         "--install",
         this.helmRelease,
         this.helmChart,
         "--namespace",
         this.namespace,
-        "--create-namespace",
         "--wait",
         "--timeout",
-        "120s",
+        "180s",
         ...setArgs
       ];
       this.emit({
@@ -15712,12 +15724,12 @@ var init_kubernetes = __esm(() => {
         message: `helm ${helmArgs.join(" ")}`
       });
       try {
-        await exec("helm", helmArgs, { timeout: 150000 });
+        await exec("helm", helmArgs, { timeout: 240000 });
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
-        throw new Error(`Sandbox helm install failed: ${msg}`);
+        throw new Error(`helm upgrade --install ${this.helmRelease} failed: ${msg}`);
       }
-      await this.waitForPod(180000);
+      await this.waitForPod(240000);
     }
     buildHelmValues() {
       const sets = [];
@@ -15728,25 +15740,48 @@ var init_kubernetes = __esm(() => {
       set("image.tag", this.image.split(":")[1] ?? "latest");
       if (this.userId)
         set("user.id", this.userId);
-      set("nats.url", this.natsUrl);
+      const natsHost = this.parseNatsHost();
+      const natsPort = this.parseNatsPort();
+      set("nats.centralHost", natsHost);
+      set("nats.centralPort", natsPort);
       set("resources.requests.cpu", this.resources.requests?.cpu ?? SANDBOX_RESOURCES.requests.cpu);
       set("resources.requests.memory", this.resources.requests?.memory ?? SANDBOX_RESOURCES.requests.memory);
       set("resources.limits.cpu", this.resources.limits?.cpu ?? SANDBOX_RESOURCES.limits.cpu);
       set("resources.limits.memory", this.resources.limits?.memory ?? SANDBOX_RESOURCES.limits.memory);
-      set("persistence.size", this.pvcSize);
-      set("persistence.storageClass", this.storageClass);
+      set("storage.size", this.pvcSize);
+      if (this.storageClass)
+        set("storage.className", this.storageClass);
       set("ssh.port", this.sshPort);
       if (this.sysboxAvailable && this.runtimeClassName) {
-        set("runtimeClassName", this.runtimeClassName);
+        set("runtime.className", this.runtimeClassName);
       } else {
-        set("runtimeClassName", "");
+        set("runtime.className", "");
       }
       if (this.domainSuffix && this.userId) {
-        set("ingress.enabled", true);
-        set("ingress.domain", `${this.userId}.${this.domainSuffix}`);
+        set("domain.enabled", true);
+        set("domain.base", this.domainSuffix);
+      } else {
+        set("domain.enabled", false);
       }
       return sets;
     }
+    parseNatsHost() {
+      try {
+        const u = new URL(this.natsUrl);
+        return u.hostname || "nats";
+      } catch {
+        return this.natsUrl.replace(/^nats:\/\//, "").split(":")[0] || "nats";
+      }
+    }
+    parseNatsPort() {
+      try {
+        const u = new URL(this.natsUrl);
+        return u.port ? Number(u.port) : 4222;
+      } catch {
+        const match = this.natsUrl.match(/:(\d+)$/);
+        return match ? Number(match[1]) : 4222;
+      }
+    }
     async stop() {
       if (!this.running)
         return;
@@ -15765,7 +15800,7 @@ var init_kubernetes = __esm(() => {
     }
     async stopSandbox() {
       try {
-        await exec("helm", ["uninstall", this.helmRelease, "--namespace", this.namespace, "--wait"], { timeout: 60000 });
+        await exec("helm", [...this.kubeconfigArgs(), "uninstall", this.helmRelease, "--namespace", this.namespace, "--wait"], { timeout: 60000 });
         this.emit({
           type: "log",
           source: "kubernetes",
@@ -15923,15 +15958,19 @@ var init_kubernetes = __esm(() => {
         spec
       });
     }
+    kubeconfigArgs() {
+      return this.kubeconfig ? ["--kubeconfig", this.kubeconfig] : [];
+    }
     async kubectl(args) {
-      const { stdout } = await exec("kubectl", ["--kubeconfig", this.kubeconfig, ...args], {
+      const { stdout } = await exec("kubectl", [...this.kubeconfigArgs(), ...args], {
         timeout: 30000
       });
       return stdout;
     }
     applyManifest(json) {
+      const kubeArgs = this.kubeconfigArgs();
       return new Promise((resolve3, reject) => {
-        const child = execFile("kubectl", ["--kubeconfig", this.kubeconfig, "apply", "-f", "-"], { timeout: 30000 }, (err) => err ? reject(err) : resolve3());
+        const child = execFile("kubectl", [...kubeArgs, "apply", "-f", "-"], { timeout: 30000 }, (err) => err ? reject(err) : resolve3());
         child.stdin?.write(json);
         child.stdin?.end();
       });
@@ -24191,12 +24230,12 @@ async function watchHealth(nc, subject) {
 
 // src/commands/stop.ts
 init_source();
-import { existsSync as existsSync6, readFileSync as readFileSync7, unlinkSync } from "node:fs";
+import { existsSync as existsSync7, readFileSync as readFileSync7, unlinkSync } from "node:fs";
 import { homedir as homedir4 } from "node:os";
 import { join as join6 } from "node:path";
 var PID_FILE = join6(homedir4(), ".khal-os", "khal-os.pid");
 var stopCommand = new Command("stop").description("Stop running KhalOS instance").action(() => {
-  if (!existsSync6(PID_FILE)) {
+  if (!existsSync7(PID_FILE)) {
     console.log(`
   ${source_default.dim("Khal OS is not running.")}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khal-os/cli",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",