npm - calabasas - Versions diffs - 0.24.0 → 0.24.2 - Mend

calabasas 0.24.0 → 0.24.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/index.js +137 -51
package/package.json +1 -1

package/dist/index.js CHANGED Viewed

@@ -2085,59 +2085,53 @@ Run \`calabasas logout\` to clear credentials.`, "Already logged in");
   }
   const s = p.spinner();
   s.start("Opening browser for authentication...");
+  const webOrigin = new URL(getWebUrl()).origin;
+  function corsHeaders() {
+    return {
+      "Access-Control-Allow-Origin": webOrigin,
+      "Access-Control-Allow-Methods": "POST, OPTIONS",
+      "Access-Control-Allow-Headers": "Content-Type"
+    };
+  }
   const server = http.createServer((req, res) => {
     const url = new URL(req.url || "", `http://localhost:${CALLBACK_PORT}`);
-    if (url.pathname === "/callback") {
-      const apiKey = url.searchParams.get("key");
-      if (apiKey) {
-        saveConfig({ apiKey });
-        res.writeHead(200, { "Content-Type": "text/html" });
-        res.end(`
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <meta charset="utf-8">
-              <title>Calabasas CLI</title>
-              <style>
-                body { font-family: system-ui; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; background: #0a0a0a; color: white; }
-                .container { text-align: center; }
-                h1 { color: #22c55e; }
-              </style>
-            </head>
-            <body>
-              <div class="container">
-                <h1>Authenticated!</h1>
-                <p>You can close this window and return to the terminal.</p>
-              </div>
-            </body>
-          </html>
-        `);
-        s.stop("Authenticated!");
-        p.note(`calabasas bot add     - Add a Discord bot
+    if (req.method === "OPTIONS") {
+      res.writeHead(204, { ...corsHeaders(), "Access-Control-Max-Age": "600" });
+      res.end();
+      return;
+    }
+    if (url.pathname === "/callback" && req.method === "POST") {
+      const chunks = [];
+      req.on("data", (chunk) => chunks.push(chunk));
+      req.on("end", () => {
+        let apiKey;
+        try {
+          const parsed = JSON.parse(Buffer.concat(chunks).toString("utf8"));
+          if (typeof parsed.key === "string")
+            apiKey = parsed.key;
+        } catch {}
+        if (apiKey) {
+          saveConfig({ apiKey });
+          res.writeHead(204, corsHeaders());
+          res.end();
+          s.stop("Authenticated!");
+          p.note(`calabasas bot add     - Add a Discord bot
 calabasas bot list    - List your bots
 calabasas generate    - Generate event handlers`, "Available commands");
-        p.outro("Logged in successfully!");
-        setTimeout(() => {
-          server.close();
-          process.exit(0);
-        }, 500);
-      } else {
-        res.writeHead(400, { "Content-Type": "text/html" });
-        res.end(`
-          <!DOCTYPE html>
-          <html>
-            <head><meta charset="utf-8"><title>Error</title></head>
-            <body>
-              <h1>Authentication failed</h1>
-              <p>No API key received.</p>
-            </body>
-          </html>
-        `);
-      }
-    } else {
-      res.writeHead(404);
-      res.end("Not found");
+          p.outro("Logged in successfully!");
+          setTimeout(() => {
+            server.close();
+            process.exit(0);
+          }, 500);
+        } else {
+          res.writeHead(400, { ...corsHeaders(), "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "Missing or invalid key" }));
+        }
+      });
+      return;
     }
+    res.writeHead(404);
+    res.end("Not found");
   });
   server.listen(CALLBACK_PORT, async () => {
     const authUrl = `${getWebUrl()}/auth/cli?callback=http://localhost:${CALLBACK_PORT}/callback`;
@@ -2268,9 +2262,101 @@ import * as path2 from "path";
 async function parseConfigFile(configPath) {
   const absolutePath = path2.resolve(configPath);
   const source = fs2.readFileSync(absolutePath, "utf-8");
-  const stripped = source.replace(/import\s*\{[^}]*\}\s*from\s*["']calabasas["'];?/g, "").replace(/export\s+default\s+\(?defineCalabasas(?:\s+as\s+\w+)?\)?\s*\(/, "(").replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "").trim();
-  const config = new Function("return " + stripped)();
-  return config;
+  return parseConfigText(source);
+}
+function parseConfigText(source) {
+  const stripped = source.replace(/import\s*\{[^}]*\}\s*from\s*["'][^"']*["'];?/g, "").replace(/export\s+default\s+\(?defineCalabasas(?:\s+as\s+\w+)?\)?\s*\(/, "(").replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "").trim();
+  const start = stripped.indexOf("{");
+  const end = stripped.lastIndexOf("}");
+  if (start === -1 || end === -1 || end <= start) {
+    throw new Error("Could not find defineCalabasas({...}) in config file. Make sure your config uses export default defineCalabasas({...})");
+  }
+  const objectText = stripped.slice(start, end + 1);
+  const json = jsObjectToJson(objectText);
+  try {
+    return JSON.parse(json);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    throw new Error(`Failed to parse config object: ${message}. Check for syntax errors in your config.`);
+  }
+}
+function jsObjectToJson(input) {
+  let result = "";
+  let i = 0;
+  let inString = null;
+  while (i < input.length) {
+    const ch = input[i];
+    if (inString) {
+      if (ch === "\\") {
+        result += ch;
+        i++;
+        if (i < input.length) {
+          result += input[i];
+          i++;
+        }
+        continue;
+      }
+      if (ch === inString) {
+        result += '"';
+        inString = null;
+        i++;
+        continue;
+      }
+      if (inString === "'" && ch === '"') {
+        result += "\\\"";
+        i++;
+        continue;
+      }
+      result += ch;
+      i++;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      inString = ch;
+      result += '"';
+      i++;
+      continue;
+    }
+    if (/[a-zA-Z_$]/.test(ch)) {
+      let ident = "";
+      let j = i;
+      while (j < input.length && /[a-zA-Z_$0-9]/.test(input[j])) {
+        ident += input[j];
+        j++;
+      }
+      let k = j;
+      while (k < input.length && /\s/.test(input[k]))
+        k++;
+      if (k < input.length && input[k] === ":") {
+        result += '"' + ident + '"';
+        i = j;
+        continue;
+      }
+      if (ident === "true" || ident === "false" || ident === "null") {
+        result += ident;
+        i = j;
+        continue;
+      }
+      result += ident;
+      i = j;
+      continue;
+    }
+    if (ch === ",") {
+      let j = i + 1;
+      while (j < input.length && /\s/.test(input[j]))
+        j++;
+      if (j < input.length && (input[j] === "}" || input[j] === "]")) {
+        i++;
+        continue;
+      }
+      result += ch;
+      i++;
+      continue;
+    }
+    result += ch;
+    i++;
+  }
+  return result;
 }
 // src/lib/intents.ts

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "calabasas",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "description": "CLI for Calabasas - Discord Gateway as a Service for Convex",
   "type": "module",
   "bin": {