@uetuluk/create-cli 0.0.1 → 0.0.3

package/dist/cli.js

@@ -25,11 +25,27 @@ async function api(serverUrl2, path, init = {}) {
   } catch {
   }
   if (!r.ok) {
-    const msg = body && typeof body === "object" && (body.error || body.message) || `HTTP ${r.status}`;
+    const msg = formatErrorMessage(body, r.status);
     throw new ApiError(r.status, msg, body);
   }
   return body;
 }
+function formatErrorMessage(body, status) {
+  if (!body || typeof body !== "object") return `HTTP ${status}`;
+  const b = body;
+  const outer = typeof b.error === "string" && b.error || typeof b.message === "string" && b.message || "";
+  const inner = innerDetail(b.data);
+  if (outer && inner && inner !== outer) return `${outer}: ${inner}`;
+  return outer || inner || `HTTP ${status}`;
+}
+function innerDetail(data) {
+  if (!data || typeof data !== "object") return "";
+  const d = data;
+  for (const v of [d.error, d.detail, d.message]) {
+    if (typeof v === "string" && v) return v;
+  }
+  return "";
+}
 
 // src/store.ts
 import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
@@ -101,6 +117,33 @@ function requireAuth() {
   }
   return c;
 }
+async function apiAuth(path, init = {}) {
+  const creds = requireAuth();
+  const url = init.server ?? creds.serverUrl;
+  const { server, ...rest } = init;
+  try {
+    return await api(url, path, { ...rest, token: creds.token });
+  } catch (e) {
+    if (!(e instanceof ApiError) || e.status !== 401 || !creds.refreshToken) throw e;
+    let refreshed;
+    try {
+      refreshed = await api(url, "/auth/refresh-token", {
+        method: "POST",
+        body: JSON.stringify({ refresh_token: creds.refreshToken })
+      });
+    } catch {
+      throw e;
+    }
+    if (url === creds.serverUrl) {
+      saveCredentials({
+        ...creds,
+        token: refreshed.token,
+        refreshToken: refreshed.refresh_token
+      });
+    }
+    return await api(url, path, { ...rest, token: refreshed.token });
+  }
+}
 function wrap(fn) {
   return async (...args) => {
     try {
@@ -109,7 +152,15 @@ function wrap(fn) {
       if (e instanceof ApiError) {
         console.error(colors.red(`${e.status} ${e.message}`));
       } else {
-        console.error(colors.red(e.message));
+        const err = e;
+        let msg = err.message || String(e);
+        if (msg === "fetch failed" && err.cause) {
+          const cause = err.cause;
+          const code = cause.code ? ` [${cause.code}]` : "";
+          msg = `fetch failed: ${cause.message ?? cause}${code}`;
+        }
+        console.error(colors.red(msg));
+        if (process.env.TEENY_DEBUG) console.error(err.stack ?? err);
       }
       process.exit(1);
     }
@@ -168,19 +219,15 @@ cli.command("whoami", "show current user").action(wrap(async () => {
 cli.command("create", "provision a new instance").action(wrap(async (opts) => {
   const c = requireAuth();
   const url = opts.server ? serverUrl(opts) : c.serverUrl;
-  const r = await api(url, "/platform/instances", {
-    method: "POST",
-    token: c.token
-  });
+  const r = await apiAuth("/platform/instances", { method: "POST" });
   saveInstance({ name: r.name, url: r.url, adminToken: r.admin_token, serverUrl: url });
   console.log(colors.green(`created ${colors.bold(r.name)}`));
   console.log(`  url:   ${r.url}`);
   console.log(`  admin token saved to local store (only shown once)`);
 }));
 cli.command("list", "list your instances").action(wrap(async (opts) => {
-  const c = requireAuth();
-  const url = opts.server ? serverUrl(opts) : c.serverUrl;
-  const r = await api(url, "/platform/instances", { token: c.token });
+  const url = opts.server ? serverUrl(opts) : void 0;
+  const r = await apiAuth("/platform/instances", { server: url });
   if (!r.result.length) {
     console.log("no instances. run `teeny create`");
     return;
@@ -191,16 +238,14 @@ cli.command("list", "list your instances").action(wrap(async (opts) => {
   }
 }));
 cli.command("status <name>", "show instance details").action(wrap(async (name, opts) => {
-  const c = requireAuth();
-  const url = opts.server ? serverUrl(opts) : c.serverUrl;
-  const r = await api(url, `/platform/instances/${encodeURIComponent(name)}`, { token: c.token });
+  const url = opts.server ? serverUrl(opts) : void 0;
+  const r = await apiAuth(`/platform/instances/${encodeURIComponent(name)}`, { server: url });
   console.log(colors.bold(r.result.name));
   console.log(`  url:     ${r.result.url}`);
   console.log(`  created: ${r.result.created_at}`);
 }));
 cli.command("delete <name>", "tear down an instance").option("-y, --yes", "[boolean] skip confirmation").action(wrap(async (name, opts) => {
-  const c = requireAuth();
-  const url = opts.server ? serverUrl(opts) : c.serverUrl;
+  const url = opts.server ? serverUrl(opts) : void 0;
   if (!opts.yes) {
     const r = await prompts({ type: "confirm", name: "v", message: `delete ${name}? this is permanent`, initial: false });
     if (!r.v) {
@@ -208,7 +253,7 @@ cli.command("delete <name>", "tear down an instance").option("-y, --yes", "[bool
       return;
     }
   }
-  await api(url, `/platform/instances/${encodeURIComponent(name)}`, { method: "DELETE", token: c.token });
+  await apiAuth(`/platform/instances/${encodeURIComponent(name)}`, { method: "DELETE", server: url });
   deleteInstance(name);
   console.log(colors.green(`deleted ${name}`));
 }));
@@ -245,9 +290,22 @@ cli.command("logs <name>", "stream live logs from an instance").option("--tail <
   const c = requireAuth();
   const url = opts.server ? serverUrl(opts) : c.serverUrl;
   const tail = opts.tail || "200";
-  const res = await fetch(`${url}/platform/instances/${encodeURIComponent(name)}/logs?tail=${tail}`, {
-    headers: { authorization: `Bearer ${c.token}` }
-  });
+  const streamUrl = `${url}/platform/instances/${encodeURIComponent(name)}/logs?tail=${tail}`;
+  const open = (token) => fetch(streamUrl, { headers: { authorization: `Bearer ${token}` } });
+  let res = await open(c.token);
+  if (res.status === 401 && c.refreshToken) {
+    try {
+      const refreshed = await api(url, "/auth/refresh-token", {
+        method: "POST",
+        body: JSON.stringify({ refresh_token: c.refreshToken })
+      });
+      if (url === c.serverUrl) {
+        saveCredentials({ ...c, token: refreshed.token, refreshToken: refreshed.refresh_token });
+      }
+      res = await open(refreshed.token);
+    } catch {
+    }
+  }
   if (!res.ok || !res.body) {
     console.error(colors.red(`failed to stream: ${res.status}`));
     process.exit(1);

package/package.json

@@ -1,49 +1,54 @@
 {
-  "name": "@uetuluk/create-cli",
-  "version": "0.0.1",
-  "description": "CLI for the create.ritsdev.top platform — register, provision, and deploy teenybase instances.",
-  "type": "module",
-  "bin": {
-    "teeny": "./dist/cli.js"
-  },
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "engines": {
-    "node": ">=20"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": ["teenybase", "platform", "cli", "ritsdev"],
-  "author": "uetuluk",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/uetuluk/create-ritsdev-platform.git",
-    "directory": "cli"
-  },
-  "homepage": "https://github.com/uetuluk/create-ritsdev-platform/tree/main/cli#readme",
-  "bugs": {
-    "url": "https://github.com/uetuluk/create-ritsdev-platform/issues"
-  },
-  "scripts": {
-    "build": "esbuild src/cli.ts --bundle --outfile=dist/cli.js --platform=node --format=esm --packages=external --banner:js=\"#!/usr/bin/env node\" && chmod +x dist/cli.js",
-    "check": "tsc -p tsconfig.json --noEmit",
-    "dev": "tsx src/cli.ts",
-    "prepublishOnly": "npm run check && npm run build"
-  },
-  "dependencies": {
-    "cac": "^6.7.14",
-    "picocolors": "^1.1.1",
-    "prompts": "^2.4.2"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@types/prompts": "^2.4.9",
-    "esbuild": "^0.24.0",
-    "tsx": "^4.19.0",
-    "typescript": "^5.6.0"
-  }
+    "name": "@uetuluk/create-cli",
+    "version": "0.0.3",
+    "description": "CLI for the create.ritsdev.top platform — register, provision, and deploy teenybase instances.",
+    "type": "module",
+    "bin": {
+        "teeny": "./dist/cli.js"
+    },
+    "files": [
+        "dist",
+        "README.md"
+    ],
+    "engines": {
+        "node": ">=20"
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "keywords": [
+        "teenybase",
+        "platform",
+        "cli",
+        "ritsdev"
+    ],
+    "author": "uetuluk",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/uetuluk/create-ritsdev-platform.git",
+        "directory": "cli"
+    },
+    "homepage": "https://github.com/uetuluk/create-ritsdev-platform/tree/main/cli#readme",
+    "bugs": {
+        "url": "https://github.com/uetuluk/create-ritsdev-platform/issues"
+    },
+    "scripts": {
+        "build": "esbuild src/cli.ts --bundle --outfile=dist/cli.js --platform=node --format=esm --packages=external --banner:js=\"#!/usr/bin/env node\" && chmod +x dist/cli.js",
+        "check": "tsc -p tsconfig.json --noEmit",
+        "dev": "tsx src/cli.ts",
+        "prepublishOnly": "npm run check && npm run build"
+    },
+    "dependencies": {
+        "cac": "^6.7.14",
+        "picocolors": "^1.1.1",
+        "prompts": "^2.4.2"
+    },
+    "devDependencies": {
+        "@types/node": "^22.0.0",
+        "@types/prompts": "^2.4.9",
+        "esbuild": "^0.24.0",
+        "tsx": "^4.19.0",
+        "typescript": "^5.6.0"
+    }
 }