npm - calabasas - Versions diffs - 0.1.7 → 0.1.9 - Mend

calabasas 0.1.7 → 0.1.9

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 +87 -43
package/package.json +1 -1

package/dist/index.js CHANGED Viewed

@@ -2623,39 +2623,47 @@ import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 var CONFIG_DIR = path.join(os.homedir(), ".calabasas");
-var CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
+function getConfigFile(env) {
+  if (env === "dev")
+    return path.join(CONFIG_DIR, "config.dev.json");
+  return path.join(CONFIG_DIR, "config.json");
+}
 var PROD_API_URL = "https://savory-llama-364.convex.site";
 var DEV_API_URL = "https://notable-monitor-41.convex.site";
-function getConfig() {
+var PROD_WEB_URL = "https://calabasas-web.vercel.app";
+var DEV_WEB_URL = "http://localhost:3000";
+function getConfig(env) {
   try {
-    if (!fs.existsSync(CONFIG_FILE)) {
+    const configFile = getConfigFile(env);
+    if (!fs.existsSync(configFile)) {
       return {};
     }
-    const content = fs.readFileSync(CONFIG_FILE, "utf-8");
+    const content = fs.readFileSync(configFile, "utf-8");
     return JSON.parse(content);
   } catch {
     return {};
   }
 }
-function saveConfig(config) {
-  const existing = getConfig();
+function saveConfig(config, env) {
+  const existing = getConfig(env);
   const merged = { ...existing, ...config };
   if (!fs.existsSync(CONFIG_DIR)) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true });
   }
-  fs.writeFileSync(CONFIG_FILE, JSON.stringify(merged, null, 2));
+  fs.writeFileSync(getConfigFile(env), JSON.stringify(merged, null, 2));
 }
-function clearConfig() {
-  if (fs.existsSync(CONFIG_FILE)) {
-    fs.unlinkSync(CONFIG_FILE);
+function clearConfig(env) {
+  const configFile = getConfigFile(env);
+  if (fs.existsSync(configFile)) {
+    fs.unlinkSync(configFile);
   }
 }
-function isAuthenticated() {
-  const config = getConfig();
+function isAuthenticated(env) {
+  const config = getConfig(env);
   return !!config.apiKey;
 }
-function getApiUrl() {
-  const config = getConfig();
+function getApiUrl(env) {
+  const config = getConfig(env);
   return config.apiUrl || PROD_API_URL;
 }
 function getApiUrlForEnv(env) {
@@ -2665,11 +2673,21 @@ function getApiUrlForEnv(env) {
     return PROD_API_URL;
   return getApiUrl();
 }
+function getWebUrlForEnv(env) {
+  if (env === "dev")
+    return DEV_WEB_URL;
+  return PROD_WEB_URL;
+}
 // src/commands/login.ts
 var CALLBACK_PORT = 9876;
-async function login() {
-  const existing = getConfig();
+async function login(options) {
+  if (options.dev && options.prod) {
+    console.error("Error: Cannot use both --dev and --prod flags.");
+    process.exit(1);
+  }
+  const env = options.dev ? "dev" : options.prod ? "prod" : undefined;
+  const existing = getConfig(env);
   if (existing.apiKey) {
     console.log("You are already logged in.");
     console.log(`API Key: ${existing.apiKey.slice(0, 8)}...`);
@@ -2684,7 +2702,7 @@ async function login() {
     if (url.pathname === "/callback") {
       const apiKey = url.searchParams.get("key");
       if (apiKey) {
-        saveConfig({ apiKey });
+        saveConfig({ apiKey }, env);
         res.writeHead(200, { "Content-Type": "text/html" });
         res.end(`
           <!DOCTYPE html>
@@ -2735,7 +2753,7 @@ async function login() {
     }
   });
   server.listen(CALLBACK_PORT, async () => {
-    const authUrl = `https://calabasas-web.vercel.app/auth/cli?callback=http://localhost:${CALLBACK_PORT}/callback`;
+    const authUrl = `${getWebUrlForEnv(env)}/auth/cli?callback=http://localhost:${CALLBACK_PORT}/callback`;
     console.log("If the browser doesn't open automatically, visit:");
     console.log(`  ${authUrl}
 `);
@@ -2757,9 +2775,15 @@ Authentication timed out. Please try again.`);
 }
 // src/commands/logout.ts
-async function logout() {
-  clearConfig();
-  console.log("✅ Logged out successfully. Credentials cleared.");
+async function logout(options) {
+  if (options.dev && options.prod) {
+    console.error("Error: Cannot use both --dev and --prod flags.");
+    process.exit(1);
+  }
+  const env = options.dev ? "dev" : options.prod ? "prod" : undefined;
+  clearConfig(env);
+  const label = env ?? "prod";
+  console.log(`✅ Logged out of ${label} successfully. Credentials cleared.`);
 }
 // src/commands/init.ts
@@ -2900,11 +2924,11 @@ async function push(options) {
     console.error("Run `calabasas init` to create a calabasas.config.ts file.");
     process.exit(1);
   }
-  if (!isAuthenticated()) {
+  if (!isAuthenticated(env)) {
     console.error("Error: Not authenticated. Run `calabasas login` first.");
     process.exit(1);
   }
-  const config = getConfig();
+  const config = getConfig(env);
   const apiKey = config.apiKey;
   let botId = options.bot;
   if (!botId) {
@@ -5286,9 +5310,9 @@ Selected intents value: ${total}`);
     process.stdin.on("data", onKeypress);
   });
 }
-async function apiRequest(method, path8, body) {
-  const config = getConfig();
-  const url = `${getApiUrl()}${path8}`;
+async function apiRequest(method, path8, body, env) {
+  const config = getConfig(env);
+  const url = `${getApiUrlForEnv(env)}${path8}`;
   const response = await fetch(url, {
     method,
     headers: {
@@ -5300,8 +5324,13 @@ async function apiRequest(method, path8, body) {
   const data = await response.json();
   return { ok: response.ok, data, status: response.status };
 }
-async function botAdd() {
-  if (!isAuthenticated()) {
+async function botAdd(options) {
+  if (options.dev && options.prod) {
+    console.error("Error: Cannot use both --dev and --prod flags.");
+    process.exit(1);
+  }
+  const env = options.dev ? "dev" : options.prod ? "prod" : undefined;
+  if (!isAuthenticated(env)) {
     console.log("Not logged in. Run `calabasas login` first.");
     return;
   }
@@ -5339,7 +5368,7 @@ async function botAdd() {
     intents,
     convexUrl: convexUrl.trim(),
     sharedSecret
-  });
+  }, env);
   if (!ok) {
     console.log(`
 Failed to create bot: ${data.error || `HTTP ${status}`}`);
@@ -5356,12 +5385,17 @@ Failed to create bot: ${data.error || `HTTP ${status}`}`);
   console.log("2. Create your handler in convex/discord.ts");
   console.log("3. Add CALABASAS_SECRET to your Convex environment variables");
 }
-async function botList() {
-  if (!isAuthenticated()) {
+async function botList(options) {
+  if (options.dev && options.prod) {
+    console.error("Error: Cannot use both --dev and --prod flags.");
+    process.exit(1);
+  }
+  const env = options.dev ? "dev" : options.prod ? "prod" : undefined;
+  if (!isAuthenticated(env)) {
     console.log("Not logged in. Run `calabasas login` first.");
     return;
   }
-  const { ok, data, status } = await apiRequest("GET", "/api/cli/bots");
+  const { ok, data, status } = await apiRequest("GET", "/api/cli/bots", undefined, env);
   if (!ok) {
     console.log(`Failed to list bots: ${data.error || `HTTP ${status}`}`);
     return;
@@ -5383,8 +5417,13 @@ async function botList() {
     console.log("");
   }
 }
-async function botRemove(botId) {
-  if (!isAuthenticated()) {
+async function botRemove(botId, options) {
+  if (options.dev && options.prod) {
+    console.error("Error: Cannot use both --dev and --prod flags.");
+    process.exit(1);
+  }
+  const env = options.dev ? "dev" : options.prod ? "prod" : undefined;
+  if (!isAuthenticated(env)) {
     console.log("Not logged in. Run `calabasas login` first.");
     return;
   }
@@ -5393,7 +5432,7 @@ async function botRemove(botId) {
     console.log("Cancelled.");
     return;
   }
-  const { ok, data, status } = await apiRequest("DELETE", `/api/cli/bots?id=${botId}`);
+  const { ok, data, status } = await apiRequest("DELETE", `/api/cli/bots?id=${botId}`, undefined, env);
   if (!ok) {
     console.log(`Failed to remove bot: ${data.error || `HTTP ${status}`}`);
     return;
@@ -5401,7 +5440,12 @@ async function botRemove(botId) {
   console.log("✅ Bot removed successfully!");
 }
 async function botEdit(botId, options) {
-  if (!isAuthenticated()) {
+  if (options.dev && options.prod) {
+    console.error("Error: Cannot use both --dev and --prod flags.");
+    process.exit(1);
+  }
+  const env = options.dev ? "dev" : options.prod ? "prod" : undefined;
+  if (!isAuthenticated(env)) {
     console.log("Not logged in. Run `calabasas login` first.");
     return;
   }
@@ -5430,7 +5474,7 @@ async function botEdit(botId, options) {
     return;
   }
   console.log("Updating bot...");
-  const { ok, data, status } = await apiRequest("PATCH", "/api/cli/bots", updates);
+  const { ok, data, status } = await apiRequest("PATCH", "/api/cli/bots", updates, env);
   if (!ok) {
     console.log(`Failed to update bot: ${data.error || `HTTP ${status}`}`);
     return;
@@ -5443,16 +5487,16 @@ async function botEdit(botId, options) {
 // src/index.ts
 var program2 = new Command;
 program2.name("calabasas").description("CLI for Calabasas - Discord Gateway as a Service for Convex").version("0.0.1");
-program2.command("login").description("Authenticate with Calabasas using your API key").action(login);
-program2.command("logout").description("Clear stored credentials").action(logout);
+program2.command("login").description("Authenticate with Calabasas using your API key").option("--dev", "Use development environment").option("--prod", "Use production environment").action(login);
+program2.command("logout").description("Clear stored credentials").option("--dev", "Use development environment").option("--prod", "Use production environment").action(logout);
 program2.command("init").description("Initialize Calabasas config in your Convex project").action(init);
 program2.command("push").description("Push your calabasas.config.ts to Calabasas").option("-c, --config <path>", "Path to config file", "convex/calabasas.config.ts").option("-b, --bot <botId>", "Bot ID to configure (prompts if not specified)").option("--dev", "Push to development environment").option("--prod", "Push to production environment").action(push);
 program2.command("generate").description("Generate discord.generated.ts with type-safe handlers").option("-o, --output <path>", "Output path", "convex/discord.generated.ts").action(generate);
 program2.command("skill").description("Generate Calabasas documentation for AI assistants").action(skill);
 program2.command("add [components...]").description("Add Discord UI components to your project").action(add);
 var bot = program2.command("bot").description("Manage Discord bots");
-bot.command("add").description("Add a new Discord bot").action(botAdd);
-bot.command("list").alias("ls").description("List your Discord bots").action(botList);
-bot.command("remove <botId>").alias("rm").description("Remove a Discord bot").action(botRemove);
-bot.command("edit <botId>").description("Edit a Discord bot").option("-n, --name <name>", "New bot name").option("-u, --url <url>", "New Convex URL").option("-t, --token <token>", "New bot token").option("-i, --intents <intents>", "New intents value").action(botEdit);
+bot.command("add").description("Add a new Discord bot").option("--dev", "Use development environment").option("--prod", "Use production environment").action(botAdd);
+bot.command("list").alias("ls").description("List your Discord bots").option("--dev", "Use development environment").option("--prod", "Use production environment").action(botList);
+bot.command("remove <botId>").alias("rm").description("Remove a Discord bot").option("--dev", "Use development environment").option("--prod", "Use production environment").action(botRemove);
+bot.command("edit <botId>").description("Edit a Discord bot").option("-n, --name <name>", "New bot name").option("-u, --url <url>", "New Convex URL").option("-t, --token <token>", "New bot token").option("-i, --intents <intents>", "New intents value").option("--dev", "Use development environment").option("--prod", "Use production environment").action(botEdit);
 program2.parse();

package/package.json CHANGED Viewed

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