@insforge/cli 0.1.25 → 0.1.28

package/README.md

@@ -594,6 +594,38 @@ npm link        # makes `insforge` available globally
 npm run dev     # watch mode for development
 ```
 
+### Testing
+
+#### Unit tests
+
+```bash
+npm run test:unit
+```
+
+#### Real project integration tests
+
+Run locally:
+
+```bash
+INTEGRATION_TEST_ENABLED=true \
+INTEGRATION_LOG_SOURCE=insforge.logs \
+npm run test:integration:real
+```
+
+Prerequisites:
+- Logged in (`insforge login`) so `~/.insforge/credentials.json` exists
+- Linked project in this repo (`insforge link`) so `.insforge/project.json` exists
+
+Optional environment variables:
+- `INSFORGE_API_URL`: Platform API URL override (defaults to `https://api.insforge.dev`)
+- `INTEGRATION_LOG_SOURCE`: Log source for `logs` test (default `insforge.logs`)
+
+Current real-project checks:
+- `whoami --json`
+- `metadata --json`
+- `logs <source> --json`
+- `docs instructions --json`
+
 ## Releasing
 
 Bump the version, push the tag, and create a GitHub Release — the CI will publish to npm automatically.

package/dist/index.js

@@ -139,7 +139,7 @@ function getRootOpts(cmd) {
 // src/lib/auth.ts
 import { createServer } from "http";
 import { randomBytes, createHash } from "crypto";
-import { URL } from "url";
+import { URL as URL2 } from "url";
 import * as clack from "@clack/prompts";
 var DEFAULT_CLIENT_ID = "clf_NK8cMUs41gm8ZcfdtSguVw";
 var OAUTH_SCOPES = "user:read organizations:read projects:read projects:write";
@@ -152,7 +152,7 @@ function generateState() {
   return randomBytes(16).toString("base64url");
 }
 function buildAuthorizeUrl(params) {
-  const url = new URL(`${params.platformUrl}/api/oauth/v1/authorize`);
+  const url = new URL2(`${params.platformUrl}/api/oauth/v1/authorize`);
   url.searchParams.set("client_id", params.clientId);
   url.searchParams.set("redirect_uri", params.redirectUri);
   url.searchParams.set("response_type", "code");
@@ -205,7 +205,7 @@ function startCallbackServer() {
       rejectResult = reject;
     });
     const server = createServer((req, res) => {
-      const url = new URL(req.url ?? "/", "http://localhost");
+      const url = new URL2(req.url ?? "/", "http://localhost");
       if (url.pathname === "/callback") {
         const code = url.searchParams.get("code");
         const state = url.searchParams.get("state");
@@ -314,7 +314,21 @@ ${authUrl}`);
 
 // src/lib/credentials.ts
 import * as clack2 from "@clack/prompts";
-async function requireAuth(apiUrl) {
+async function requireAuth(apiUrl, allowOssBypass = true) {
+  const projConfig = getProjectConfig();
+  if (allowOssBypass && projConfig?.project_id === "oss-project") {
+    return {
+      access_token: "oss-token",
+      refresh_token: "oss-refresh",
+      user: {
+        id: "oss-user",
+        name: "OSS User",
+        email: "oss@insforge.local",
+        avatar_url: null,
+        email_verified: true
+      }
+    };
+  }
   const creds = getCredentials();
   if (creds && creds.access_token) return creds;
   clack2.log.info("You need to log in to continue.");
@@ -779,10 +793,45 @@ function buildOssHost(appkey, region) {
   return `https://${appkey}.${region}.insforge.app`;
 }
 function registerProjectLinkCommand(program2) {
-  program2.command("link").description("Link current directory to an InsForge project").option("--project-id <id>", "Project ID to link").option("--org-id <id>", "Organization ID").action(async (opts, cmd) => {
+  program2.command("link").description("Link current directory to an InsForge project").option("--project-id <id>", "Project ID to link").option("--org-id <id>", "Organization ID").option("--api-base-url <url>", "API Base URL for direct linking (OSS/Self-hosted)").option("--api-key <key>", "API Key for direct linking (OSS/Self-hosted)").action(async (opts, cmd) => {
     const { json, apiUrl } = getRootOpts(cmd);
     try {
-      await requireAuth(apiUrl);
+      if (opts.apiBaseUrl || opts.apiKey) {
+        try {
+          if (!opts.apiBaseUrl || !opts.apiKey) {
+            throw new CLIError("Both --api-base-url and --api-key must be provided together for direct linking.");
+          }
+          try {
+            new URL(opts.apiBaseUrl);
+          } catch {
+            throw new CLIError("Invalid --api-base-url. Please provide a valid URL.");
+          }
+          const projectConfig2 = {
+            project_id: "oss-project",
+            project_name: "oss-project",
+            org_id: "oss-org",
+            appkey: "oss",
+            region: "local",
+            api_key: opts.apiKey,
+            oss_host: opts.apiBaseUrl.replace(/\/$/, "")
+            // remove trailing slash if any
+          };
+          saveProjectConfig(projectConfig2);
+          if (json) {
+            outputJson({ success: true, project: { id: projectConfig2.project_id, name: projectConfig2.project_name, region: projectConfig2.region } });
+          } else {
+            outputSuccess(`Linked to direct project at ${projectConfig2.oss_host}`);
+          }
+          await installCliGlobally(json);
+          await installSkills(json);
+          await reportCliUsage("cli.link_direct", true, 6);
+          return;
+        } catch (err) {
+          await reportCliUsage("cli.link_direct", false);
+          handleError(err, json);
+        }
+      }
+      await requireAuth(apiUrl, false);
       let orgId = opts.orgId;
       let projectId = opts.projectId;
       if (!orgId && !projectId) {
@@ -861,6 +910,16 @@ function requireProjectConfig() {
   }
   return config;
 }
+async function runRawSql(sql, unrestricted = false) {
+  const endpoint = unrestricted ? "/api/database/advance/rawsql/unrestricted" : "/api/database/advance/rawsql";
+  const res = await ossFetch(endpoint, {
+    method: "POST",
+    body: JSON.stringify({ query: sql })
+  });
+  const raw = await res.json();
+  const rows = raw.rows ?? raw.data ?? [];
+  return { rows, raw };
+}
 async function getAnonKey() {
   const res = await ossFetch("/api/auth/tokens/anon", { method: "POST" });
   const data = await res.json();
@@ -887,17 +946,11 @@ function registerDbCommands(dbCmd2) {
     const { json } = getRootOpts(cmd);
     try {
       await requireAuth();
-      const endpoint = opts.unrestricted ? "/api/database/advance/rawsql/unrestricted" : "/api/database/advance/rawsql";
-      const res = await ossFetch(endpoint, {
-        method: "POST",
-        body: JSON.stringify({ query: sql })
-      });
-      const data = await res.json();
+      const { rows, raw } = await runRawSql(sql, !!opts.unrestricted);
       if (json) {
-        outputJson(data);
+        outputJson(raw);
       } else {
-        const rows = data.rows ?? data.data ?? null;
-        if (rows && rows.length > 0) {
+        if (rows.length > 0) {
           const headers = Object.keys(rows[0]);
           outputTable(
             headers,
@@ -906,7 +959,7 @@ function registerDbCommands(dbCmd2) {
           console.log(`${rows.length} row(s) returned.`);
         } else {
           console.log("Query executed successfully.");
-          if (rows && rows.length === 0) {
+          if (rows.length === 0) {
             console.log("No rows returned.");
           }
         }
@@ -1996,10 +2049,10 @@ async function copyDir(src, dest) {
   }
 }
 function registerCreateCommand(program2) {
-  program2.command("create").description("Create a new InsForge project").option("--name <name>", "Project name").option("--org-id <id>", "Organization ID").option("--region <region>", "Deployment region (us-east, us-west, eu-central, ap-southeast)").option("--template <template>", "Template to use: react, nextjs, chatbot, or empty").action(async (opts, cmd) => {
+  program2.command("create").description("Create a new InsForge project").option("--name <name>", "Project name").option("--org-id <id>", "Organization ID").option("--region <region>", "Deployment region (us-east, us-west, eu-central, ap-southeast)").option("--template <template>", "Template to use: react, nextjs, chatbot, crm, e-commerce, or empty").action(async (opts, cmd) => {
     const { json, apiUrl } = getRootOpts(cmd);
     try {
-      await requireAuth(apiUrl);
+      await requireAuth(apiUrl, false);
       if (!json) {
         clack10.intro("Create a new InsForge project");
       }
@@ -2035,7 +2088,7 @@ function registerCreateCommand(program2) {
         if (clack10.isCancel(name)) process.exit(0);
         projectName = name;
       }
-      const validTemplates = ["react", "nextjs", "chatbot", "empty"];
+      const validTemplates = ["react", "nextjs", "chatbot", "crm", "e-commerce", "empty"];
       let template = opts.template;
       if (template && !validTemplates.includes(template)) {
         throw new CLIError(`Invalid template "${template}". Valid options: ${validTemplates.join(", ")}`);
@@ -2050,6 +2103,8 @@ function registerCreateCommand(program2) {
               { value: "react", label: "Web app template with React" },
               { value: "nextjs", label: "Web app template with Next.js" },
               { value: "chatbot", label: "AI Chatbot with Next.js" },
+              { value: "crm", label: "CRM with Next.js" },
+              { value: "e-commerce", label: "E-Commerce store with Next.js" },
               { value: "empty", label: "Empty project" }
             ]
           });
@@ -2075,8 +2130,9 @@ function registerCreateCommand(program2) {
       saveProjectConfig(projectConfig);
       s?.stop(`Project "${project.name}" created and linked`);
       const hasTemplate = template !== "empty";
-      if (template === "chatbot") {
-        await downloadGitHubTemplate("chatbot", projectConfig, json);
+      const githubTemplates = ["chatbot", "crm", "e-commerce"];
+      if (githubTemplates.includes(template)) {
+        await downloadGitHubTemplate(template, projectConfig, json);
       } else if (hasTemplate) {
         await downloadTemplate(template, projectConfig, projectName, json, apiUrl);
       }
@@ -2168,8 +2224,8 @@ async function downloadTemplate(framework, projectConfig, projectName, json, _ap
     } catch {
     }
     const frame = framework === "nextjs" ? "nextjs" : "react";
-    const esc = (s2) => `'${s2.replace(/'/g, "'\\''")}'`;
-    const command = `npx create-insforge-app ${esc(targetDir)} --frame ${frame} --base-url ${esc(projectConfig.oss_host)} --anon-key ${esc(anonKey)} --skip-install`;
+    const esc = (s2) => process.platform === "win32" ? `"${s2.replace(/"/g, '\\"')}"` : `'${s2.replace(/'/g, "'\\''")}'`;
+    const command = `npx --yes create-insforge-app@latest ${esc(targetDir)} --frame ${frame} --base-url ${esc(projectConfig.oss_host)} --anon-key ${esc(anonKey)} --skip-install`;
     s?.message(`Running create-insforge-app (${frame})...`);
     await execAsync2(command, {
       maxBuffer: 10 * 1024 * 1024,
@@ -2218,6 +2274,7 @@ async function downloadGitHubTemplate(templateName, projectConfig, json) {
           const key = prefix.slice(0, -1);
           if (/INSFORGE.*(URL|BASE_URL)$/.test(key)) return `${prefix}${projectConfig.oss_host}`;
           if (/INSFORGE.*ANON_KEY$/.test(key)) return `${prefix}${anonKey}`;
+          if (key === "NEXT_PUBLIC_APP_URL") return `${prefix}https://${projectConfig.appkey}.insforge.site`;
           return `${prefix}${_value}`;
         }
       );
@@ -2227,20 +2284,28 @@ async function downloadGitHubTemplate(templateName, projectConfig, json) {
     const migrationPath = path3.join(cwd, "migrations", "db_int.sql");
     const migrationExists = await fs3.stat(migrationPath).catch(() => null);
     if (migrationExists) {
-      const dbSpinner = !json ? clack10.spinner() : null;
-      dbSpinner?.start("Running database migrations...");
-      try {
-        const sql = await fs3.readFile(migrationPath, "utf-8");
-        await ossFetch("/api/database/advance/rawsql/unrestricted", {
-          method: "POST",
-          body: JSON.stringify({ query: sql })
+      let shouldRun = json;
+      if (!json) {
+        const runMigration = await clack10.confirm({
+          message: "This template includes a database migration. Apply it now?"
         });
-        dbSpinner?.stop("Database migrations applied");
-      } catch (err) {
-        dbSpinner?.stop("Database migration failed");
-        if (!json) {
-          clack10.log.warn(`Migration failed: ${err.message}`);
-          clack10.log.info('You can run the migration manually: insforge db query --unrestricted "$(cat migrations/db_int.sql)"');
+        shouldRun = !clack10.isCancel(runMigration) && runMigration;
+      }
+      if (shouldRun) {
+        const dbSpinner = !json ? clack10.spinner() : null;
+        dbSpinner?.start("Running database migrations...");
+        try {
+          const sql = await fs3.readFile(migrationPath, "utf-8");
+          await runRawSql(sql, true);
+          dbSpinner?.stop("Database migrations applied");
+        } catch (err) {
+          dbSpinner?.stop("Database migration failed");
+          if (!json) {
+            clack10.log.warn(`Migration failed: ${err.message}`);
+            clack10.log.info('You can run the migration manually: insforge db query --unrestricted "$(cat migrations/db_int.sql)"');
+          } else {
+            throw err;
+          }
         }
       }
     }