@instafy/cli 0.1.11 → 0.2.1

package/package.json

@@ -1,27 +1,29 @@
 {
   "name": "@instafy/cli",
-  "version": "0.1.11",
-  "description": "Run Instafy projects locally, link folders to Studio, and share previews/webhooks via tunnels.",
+  "version": "0.2.1",
+  "license": "AGPL-3.0-only",
+  "description": "Run Instafy spaces locally, link folders to Studio, and share previews/webhooks via tunnels.",
   "private": false,
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/instafy-dev/instafy.git",
+    "directory": "packages/instafy-cli"
+  },
   "publishConfig": {
     "access": "public"
   },
   "files": [
     "bin",
-    "dist",
+    "dist/cli.js",
+    "LICENSE",
     "README.md"
   ],
   "bin": {
     "instafy": "bin/instafy.js"
   },
   "type": "module",
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "prepack": "tsc -p tsconfig.json",
-    "dev": "ts-node src/index.ts",
-    "test": "pnpm test:unit",
-    "test:unit": "pnpm build && vitest run",
-    "test:live": "pnpm build && TUNNEL_E2E_LIVE=1 vitest run test/tunnel-live.e2e.spec.ts"
+  "engines": {
+    "node": ">=18"
   },
   "dependencies": {
     "@clack/prompts": "^0.11.0",
@@ -31,7 +33,16 @@
   "devDependencies": {
     "@types/node": "^22.8.1",
     "ts-node": "^10.9.2",
+    "tsup": "^7.3.0",
     "typescript": "^5.4.5",
     "vitest": "^1.6.0"
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json && tsup --config tsup.config.ts",
+    "dev": "ts-node src/index.ts",
+    "test": "pnpm test:unit",
+    "test:unit": "pnpm build && vitest run",
+    "test:package": "pnpm build && node --test test/package-artifact.test.mjs",
+    "test:live": "pnpm build && TUNNEL_E2E_LIVE=1 vitest run test/tunnel-live.e2e.spec.ts"
   }
-}
+}

package/dist/api.js

@@ -1,166 +0,0 @@
-import fs from "node:fs";
-import { resolveActiveProfileName, resolveConfiguredAccessToken } from "./config.js";
-import { formatAuthRejectedError } from "./errors.js";
-import { fetchWithControllerAuth } from "./controller-fetch.js";
-function normalizeUrl(raw) {
-    const value = (raw ?? "").trim();
-    if (!value)
-        return "http://127.0.0.1:8788";
-    return value.replace(/\/$/, "");
-}
-function normalizeToken(raw) {
-    if (!raw)
-        return null;
-    const trimmed = raw.trim();
-    return trimmed.length ? trimmed : null;
-}
-function resolveBearerTokenWithSource(options) {
-    const cwd = process.cwd();
-    const profile = resolveActiveProfileName({ cwd });
-    const stored = resolveConfiguredAccessToken({ profile, cwd });
-    const explicit = normalizeToken(options.accessToken) ?? normalizeToken(options.serviceToken);
-    if (explicit) {
-        return { token: explicit, source: "explicit", profile };
-    }
-    const envKeys = [
-        "CONTROLLER_ACCESS_TOKEN",
-        "INSTAFY_ACCESS_TOKEN",
-        "INSTAFY_SERVICE_TOKEN",
-        "CONTROLLER_TOKEN",
-        "SUPABASE_ACCESS_TOKEN",
-    ];
-    for (const key of envKeys) {
-        const value = normalizeToken(process.env[key]);
-        if (value) {
-            return { token: value, source: "env", profile };
-        }
-    }
-    if (stored) {
-        return { token: stored, source: "config", profile };
-    }
-    return { token: null, source: "none", profile };
-}
-function parseKeyValue(raw) {
-    const trimmed = raw.trim();
-    if (!trimmed) {
-        throw new Error("Key/value pair cannot be empty");
-    }
-    const equals = trimmed.indexOf("=");
-    if (equals === -1) {
-        return { key: trimmed, value: "" };
-    }
-    const key = trimmed.slice(0, equals).trim();
-    const value = trimmed.slice(equals + 1).trim();
-    if (!key) {
-        throw new Error(`Invalid pair "${raw}" (missing key)`);
-    }
-    return { key, value };
-}
-function parseHeader(raw) {
-    const trimmed = raw.trim();
-    if (!trimmed) {
-        throw new Error("Header cannot be empty");
-    }
-    const colon = trimmed.indexOf(":");
-    if (colon !== -1) {
-        const key = trimmed.slice(0, colon).trim();
-        const value = trimmed.slice(colon + 1).trim();
-        if (!key) {
-            throw new Error(`Invalid header "${raw}" (missing name)`);
-        }
-        return { key, value };
-    }
-    return parseKeyValue(trimmed);
-}
-function parseJsonBody(options) {
-    if (options.jsonFile) {
-        const raw = fs.readFileSync(options.jsonFile, "utf8");
-        const parsed = JSON.parse(raw);
-        return JSON.stringify(parsed);
-    }
-    if (options.json) {
-        const parsed = JSON.parse(options.json);
-        return JSON.stringify(parsed);
-    }
-    return undefined;
-}
-function buildRequestUrl(options) {
-    const base = normalizeUrl(options.controllerUrl ??
-        process.env["INSTAFY_SERVER_URL"] ??
-        process.env["CONTROLLER_BASE_URL"] ??
-        "http://127.0.0.1:8788");
-    const rawPath = options.path.trim();
-    if (!rawPath) {
-        throw new Error("Path is required");
-    }
-    const url = rawPath.startsWith("http://") || rawPath.startsWith("https://")
-        ? new URL(rawPath)
-        : new URL(rawPath.startsWith("/") ? rawPath : `/${rawPath}`, `${base}/`);
-    for (const pair of options.query ?? []) {
-        const { key, value } = parseKeyValue(pair);
-        url.searchParams.set(key, value);
-    }
-    return url;
-}
-function maybePrettyPrintJson(text, pretty) {
-    if (!pretty)
-        return text;
-    if (!text.trim())
-        return text;
-    try {
-        return JSON.stringify(JSON.parse(text), null, 2);
-    }
-    catch {
-        return text;
-    }
-}
-export async function requestControllerApi(options) {
-    const url = buildRequestUrl(options);
-    const resolved = resolveBearerTokenWithSource(options);
-    const bearer = resolved.token;
-    const headers = new Headers();
-    headers.set("accept", "application/json");
-    for (const header of options.headers ?? []) {
-        const { key, value } = parseHeader(header);
-        headers.set(key, value);
-    }
-    const body = parseJsonBody(options);
-    if (body !== undefined && !headers.has("content-type")) {
-        headers.set("content-type", "application/json");
-    }
-    const init = {
-        method: options.method,
-        headers,
-        body,
-    };
-    const response = bearer
-        ? (await fetchWithControllerAuth({
-            url: url.toString(),
-            init,
-            accessToken: bearer,
-            tokenSource: resolved.source,
-            profile: resolved.profile,
-            cwd: process.cwd(),
-        })).response
-        : await fetch(url, init);
-    const responseText = await response.text().catch(() => "");
-    const contentType = response.headers.get("content-type") ?? "";
-    const isJson = contentType.includes("application/json") || contentType.includes("+json");
-    const pretty = options.pretty !== false;
-    const formattedBody = isJson ? maybePrettyPrintJson(responseText, pretty) : responseText;
-    if (!response.ok) {
-        if (response.status === 401 || response.status === 403) {
-            throw formatAuthRejectedError({
-                status: response.status,
-                responseBody: responseText,
-                retryCommand: "instafy login",
-                advancedHint: "pass --access-token / --service-token, or set INSTAFY_ACCESS_TOKEN / INSTAFY_SERVICE_TOKEN",
-            });
-        }
-        const prefix = `Request failed (${response.status} ${response.statusText})`;
-        const suffix = formattedBody.trim() ? `: ${formattedBody}` : "";
-        throw new Error(`${prefix}${suffix}`);
-    }
-    if (formattedBody)
-        console.log(formattedBody);
-}