@quadrokit/client 0.2.1 → 0.2.3

package/dist/cli.mjs

@@ -1,11 +1,15 @@
 #!/usr/bin/env node
 import { readFile } from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
+import { defaultLoginUrlFromCatalogUrl, fetch4DAdminSessionCookie, } from './generate/catalog-session.mjs';
 import { writeGenerated } from './generate/codegen.mjs';
+import { applyGenerateDotenv } from './generate/dotenv-cwd.mjs';
 function parseArgs(argv) {
     let command = '';
     let url;
     let token;
+    let accessKey;
+    let loginUrl;
     let out = '.quadrokit/generated';
     for (let i = 0; i < argv.length; i++) {
         const a = argv[i];
@@ -15,6 +19,12 @@ function parseArgs(argv) {
         else if (a === '--token' && argv[i + 1]) {
             token = argv[++i];
         }
+        else if (a === '--access-key' && argv[i + 1]) {
+            accessKey = argv[++i];
+        }
+        else if (a === '--login-url' && argv[i + 1]) {
+            loginUrl = argv[++i];
+        }
         else if (a === '--out' && argv[i + 1]) {
             out = argv[++i];
         }
@@ -22,9 +32,9 @@ function parseArgs(argv) {
             command = a;
         }
     }
-    return { command, url, token, out };
+    return { command, url, token, accessKey, loginUrl, out };
 }
-async function loadCatalog(url, token) {
+async function loadCatalog(url, auth) {
     if (url.startsWith('file:')) {
         const path = fileURLToPath(url);
         const text = await readFile(path, 'utf8');
@@ -33,8 +43,21 @@ async function loadCatalog(url, token) {
     const headers = {
         Accept: 'application/json',
     };
-    if (token) {
-        headers.Authorization = `Bearer ${token}`;
+    const key = auth?.accessKey?.trim();
+    if (key) {
+        let login = auth?.loginUrl?.trim();
+        if (!login) {
+            try {
+                login = defaultLoginUrlFromCatalogUrl(url);
+            }
+            catch {
+                throw new Error('quadrokit: --access-key requires an http(s) catalog --url, or pass --login-url');
+            }
+        }
+        headers.Cookie = await fetch4DAdminSessionCookie(login, key);
+    }
+    else if (auth?.token) {
+        headers.Authorization = `Bearer ${auth.token}`;
     }
     const res = await fetch(url, { headers });
     if (!res.ok) {
@@ -45,21 +68,44 @@ async function loadCatalog(url, token) {
 }
 async function main() {
     const argv = process.argv.slice(2);
-    const { command, url, token, out } = parseArgs(argv);
+    const parsed = parseArgs(argv);
+    const { command, token, accessKey: accessKeyArg, loginUrl: loginUrlArg, out } = parsed;
     if (command !== 'generate') {
-        console.error(`Usage: quadrokit-client generate --url <catalog_url> [--token <token>] [--out <dir>]
+        console.error(`Usage: quadrokit-client generate [--url <catalog_url>] [auth] [--out <dir>]
+
+  --url defaults to \${VITE_4D_ORIGIN}/rest/\\$catalog (from env or .env in cwd), else http://127.0.0.1:7080/rest/\\$catalog
+
+Auth (generator only; not used by the app runtime):
+  --access-key <key>   POST multipart accessKey to /api/login, then use 4DAdminSID for the catalog
+  --login-url <url>    Full login URL (default: {catalog origin}/api/login)
+  --token <secret>     Authorization: Bearer (when you do not use --access-key)
+
+Env / .env: VITE_4D_ORIGIN, QUADROKIT_ACCESS_KEY, QUADROKIT_LOGIN_URL, QUADROKIT_CATALOG_TOKEN
 
 Examples:
+  quadrokit-client generate
+  quadrokit-client generate --url https://localhost:7443/rest/\\$catalog --access-key MY_TOKEN
   quadrokit-client generate --url http://localhost:7080/rest/\\$catalog --token secret
   quadrokit-client generate --url file://./assets/catalog.json --out .quadrokit/generated
+
+  bunx -p @quadrokit/client quadrokit-client generate
 `);
         process.exit(1);
     }
+    applyGenerateDotenv();
+    let url = parsed.url;
     if (!url) {
-        console.error('Error: --url is required for generate.');
-        process.exit(1);
+        const origin = (process.env.VITE_4D_ORIGIN || 'http://127.0.0.1:7080').replace(/\/$/, '');
+        url = `${origin}/rest/$catalog`;
     }
-    const catalog = await loadCatalog(url, token);
+    const accessKey = accessKeyArg?.trim() || process.env.QUADROKIT_ACCESS_KEY?.trim() || undefined;
+    const loginUrl = loginUrlArg?.trim() || process.env.QUADROKIT_LOGIN_URL?.trim() || undefined;
+    const bearer = token?.trim() || process.env.QUADROKIT_CATALOG_TOKEN?.trim() || undefined;
+    const catalog = await loadCatalog(url, {
+        accessKey,
+        loginUrl,
+        token: accessKey ? undefined : bearer,
+    });
     await writeGenerated(out, catalog);
     console.error(`Wrote generated client to ${out}`);
 }

package/dist/generate/catalog-session.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Generator-only: obtain `4DAdminSID` via POST `/api/login` (multipart `accessKey`).
+ * Not used by the runtime REST client.
+ */
+export declare function defaultLoginUrlFromCatalogUrl(catalogUrl: string): string;
+export declare function fetch4DAdminSessionCookie(loginUrl: string, accessKey: string): Promise<string>;
+//# sourceMappingURL=catalog-session.d.ts.map

package/dist/generate/catalog-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-session.d.ts","sourceRoot":"","sources":["../../src/generate/catalog-session.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAGxE;AAED,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAcjB"}

package/dist/generate/catalog-session.mjs

@@ -0,0 +1,46 @@
+/**
+ * Generator-only: obtain `4DAdminSID` via POST `/api/login` (multipart `accessKey`).
+ * Not used by the runtime REST client.
+ */
+export function defaultLoginUrlFromCatalogUrl(catalogUrl) {
+    const u = new URL(catalogUrl);
+    return `${u.origin}/api/login`;
+}
+export async function fetch4DAdminSessionCookie(loginUrl, accessKey) {
+    const form = new FormData();
+    form.append('accessKey', accessKey);
+    const res = await fetch(loginUrl, { method: 'POST', body: form });
+    if (!res.ok) {
+        const t = await res.text();
+        throw new Error(`quadrokit login failed (${res.status}): ${t.slice(0, 500)}`);
+    }
+    const lines = readSetCookieLines(res.headers);
+    const value = parse4DAdminSidValue(lines);
+    if (!value) {
+        throw new Error('quadrokit login: response had no 4DAdminSID Set-Cookie');
+    }
+    return `4DAdminSID=${value}`;
+}
+function readSetCookieLines(headers) {
+    const ext = headers;
+    if (typeof ext.getSetCookie === 'function') {
+        return ext.getSetCookie();
+    }
+    const c = headers.get('set-cookie');
+    return c ? [c] : [];
+}
+function parse4DAdminSidValue(setCookieLines) {
+    for (const line of setCookieLines) {
+        const firstPart = line.split(';')[0]?.trim();
+        if (!firstPart)
+            continue;
+        const eq = firstPart.indexOf('=');
+        if (eq <= 0)
+            continue;
+        const name = firstPart.slice(0, eq);
+        const val = firstPart.slice(eq + 1);
+        if (name === '4DAdminSID' && val)
+            return val;
+    }
+    return null;
+}

package/dist/generate/dotenv-cwd.d.ts

@@ -0,0 +1,3 @@
+/** Merge project `.env` into `process.env` for keys that are not already set (generator CLI only). */
+export declare function applyGenerateDotenv(): void;
+//# sourceMappingURL=dotenv-cwd.d.ts.map

package/dist/generate/dotenv-cwd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dotenv-cwd.d.ts","sourceRoot":"","sources":["../../src/generate/dotenv-cwd.ts"],"names":[],"mappings":"AAUA,sGAAsG;AACtG,wBAAgB,mBAAmB,IAAI,IAAI,CAuB1C"}

package/dist/generate/dotenv-cwd.mjs

@@ -0,0 +1,37 @@
+import { existsSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+const KEYS = [
+    'VITE_4D_ORIGIN',
+    'QUADROKIT_ACCESS_KEY',
+    'QUADROKIT_LOGIN_URL',
+    'QUADROKIT_CATALOG_TOKEN',
+];
+/** Merge project `.env` into `process.env` for keys that are not already set (generator CLI only). */
+export function applyGenerateDotenv() {
+    const envPath = path.join(process.cwd(), '.env');
+    if (!existsSync(envPath))
+        return;
+    const wanted = new Set(KEYS.filter((k) => !process.env[k]));
+    if (wanted.size === 0)
+        return;
+    const raw = readFileSync(envPath, 'utf8');
+    for (const line of raw.split('\n')) {
+        const t = line.trim();
+        if (!t || t.startsWith('#'))
+            continue;
+        const eq = t.indexOf('=');
+        if (eq <= 0)
+            continue;
+        const key = t.slice(0, eq).trim();
+        if (!wanted.has(key))
+            continue;
+        let v = t.slice(eq + 1).trim();
+        if ((v.startsWith('"') && v.endsWith('"')) || (v.startsWith("'") && v.endsWith("'"))) {
+            v = v.slice(1, -1);
+        }
+        process.env[key] = v;
+        wanted.delete(key);
+        if (wanted.size === 0)
+            return;
+    }
+}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@quadrokit/client",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Typed 4D REST client and catalog code generator for QuadroKit",
   "type": "module",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "bin": {
-    "quadrokit-client": "./dist/cli.mjs"
+    "quadrokit-client": "./dist/cli.mjs",
+    "quadrokit": "./dist/cli.mjs"
   },
   "exports": {
     ".": {
@@ -28,7 +29,7 @@
     "generate:fixture": "bun run src/cli.ts generate --url file://../../assets/catalog.json --out ../../.quadrokit/generated-demo"
   },
   "dependencies": {
-    "@quadrokit/shared": "^0.2.0"
+    "@quadrokit/shared": "^0.2.3"
   },
   "peerDependencies": {
     "typescript": ">=5.4"