delivered-cli 0.1.0 → 0.2.0

package/.turbo/turbo-build.log

@@ -0,0 +1,4 @@
+
+> delivered-cli@0.1.0 build /home/hyapadi/DeliveredConvexExpoJS/cli
+> tsc
+

package/dist/index.js

@@ -45,7 +45,9 @@ const readline = __importStar(require("readline"));
 const config = new conf_1.default({
     projectName: "delivered-cli",
 });
-const API_URL = config.get("apiUrl") || "https://delivered.md/api/v1";
+// Convex HTTP endpoint URL
+const DEFAULT_API_URL = "https://fabulous-chipmunk-797.convex.site/api";
+const API_URL = config.get("apiUrl") || DEFAULT_API_URL;
 const program = new commander_1.Command();
 program
     .name("delivered")
@@ -68,6 +70,7 @@ async function apiRequest(endpoint, options = {}) {
         ...options,
         headers: {
             Authorization: `Bearer ${apiKey}`,
+            "Content-Type": "application/json",
             ...options.headers,
         },
     });
@@ -77,38 +80,51 @@ async function apiRequest(endpoint, options = {}) {
 program
     .command("login")
     .description("Login with your API key")
-    .action(async () => {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    console.log("\nTo get your API key:");
-    console.log("1. Go to https://delivered.md/settings");
-    console.log("2. Create a new API key");
-    console.log("3. Copy and paste it below\n");
-    rl.question("API Key: ", async (apiKey) => {
-        rl.close();
+    .argument("[api-key]", "API key (or omit to enter interactively)")
+    .action(async (apiKeyArg) => {
+    const processLogin = async (apiKey) => {
         if (!apiKey || !apiKey.startsWith("dlv_")) {
             console.error("Error: Invalid API key format. Keys start with 'dlv_'");
             process.exit(1);
         }
-        // Test the key
+        // Test the key by calling whoami
         try {
-            const response = await fetch(`${API_URL}/page`, {
+            const response = await fetch(`${API_URL}/whoami`, {
                 headers: { Authorization: `Bearer ${apiKey}` },
             });
             if (response.status === 401) {
                 console.error("Error: Invalid API key");
                 process.exit(1);
             }
+            const data = await response.json();
             config.set("apiKey", apiKey);
-            console.log("\nLogged in successfully!");
+            console.log(`\nLogged in as ${data.username || data.email}!`);
+            if (data.pageUrl) {
+                console.log(`Your page: ${data.pageUrl}`);
+            }
         }
         catch (error) {
             console.error("Error: Failed to validate API key");
             process.exit(1);
         }
-    });
+    };
+    if (apiKeyArg) {
+        await processLogin(apiKeyArg);
+    }
+    else {
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+        });
+        console.log("\nTo get your API key:");
+        console.log("1. Go to https://app.delivered.md/settings");
+        console.log("2. Create a new API key");
+        console.log("3. Copy and paste it below\n");
+        rl.question("API Key: ", async (apiKey) => {
+            rl.close();
+            await processLogin(apiKey);
+        });
+    }
 });
 // Logout command
 program
@@ -118,6 +134,31 @@ program
     config.delete("apiKey");
     console.log("Logged out successfully.");
 });
+// Whoami command
+program
+    .command("whoami")
+    .description("Show current user info")
+    .action(async () => {
+    try {
+        const response = await apiRequest("/whoami");
+        if (!response.ok) {
+            const error = await response.json();
+            console.error(`Error: ${error.error || "Failed to get user info"}`);
+            process.exit(1);
+        }
+        const data = await response.json();
+        console.log(`\nUsername: ${data.username || "(not set)"}`);
+        console.log(`Name: ${data.name || "(not set)"}`);
+        console.log(`Email: ${data.email || "(not set)"}`);
+        if (data.pageUrl) {
+            console.log(`Page URL: ${data.pageUrl}`);
+        }
+    }
+    catch (error) {
+        console.error("Error: Failed to get user info");
+        process.exit(1);
+    }
+});
 // Pull command
 program
     .command("pull")
@@ -131,7 +172,8 @@ program
             console.error(`Error: ${error.error || "Failed to fetch page"}`);
             process.exit(1);
         }
-        const markdown = await response.text();
+        const data = await response.json();
+        const markdown = data.content;
         if (options.output) {
             const outputPath = path.resolve(options.output);
             fs.writeFileSync(outputPath, markdown);
@@ -177,8 +219,7 @@ program
         }
         const response = await apiRequest("/page", {
             method: "PUT",
-            headers: { "Content-Type": "text/markdown" },
-            body: content,
+            body: JSON.stringify({ content }),
         });
         if (!response.ok) {
             const error = await response.json();
@@ -192,76 +233,28 @@ program
         process.exit(1);
     }
 });
-// Snapshots command
-program
-    .command("snapshots")
-    .description("List your page snapshots")
-    .action(async () => {
-    try {
-        const response = await apiRequest("/snapshots");
-        if (!response.ok) {
-            const error = await response.json();
-            console.error(`Error: ${error.error || "Failed to fetch snapshots"}`);
-            process.exit(1);
-        }
-        const data = await response.json();
-        const snapshots = data.snapshots;
-        if (snapshots.length === 0) {
-            console.log("No snapshots found.");
-            return;
-        }
-        console.log("\nSnapshots:\n");
-        snapshots.forEach((snapshot, index) => {
-            const date = new Date(snapshot.createdAt).toLocaleString();
-            const accessIcon = snapshot.accessible ? "  " : "[locked]";
-            console.log(`${index + 1}. ${date} ${accessIcon}`);
-            console.log(`   ID: ${snapshot.id}\n`);
-        });
-    }
-    catch (error) {
-        console.error("Error: Failed to fetch snapshots");
-        process.exit(1);
-    }
-});
-// Revert command
-program
-    .command("revert <snapshot-id>")
-    .description("Revert to a specific snapshot")
-    .action(async (snapshotId) => {
-    try {
-        const response = await apiRequest("/revert", {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ snapshotId }),
-        });
-        if (!response.ok) {
-            const error = await response.json();
-            console.error(`Error: ${error.error || "Failed to revert"}`);
-            process.exit(1);
-        }
-        const data = await response.json();
-        console.log(`Reverted successfully to snapshot from ${new Date(data.revertedTo).toLocaleString()}`);
-    }
-    catch (error) {
-        console.error("Error: Failed to revert");
-        process.exit(1);
-    }
-});
+// Note: snapshots and revert commands can be added later when HTTP endpoints are implemented
 // Config command
 program
     .command("config")
     .description("View or set configuration")
     .option("--api-url <url>", "Set custom API URL")
-    .option("--show", "Show current configuration")
+    .option("--reset", "Reset to default configuration")
     .action((options) => {
+    if (options.reset) {
+        config.delete("apiUrl");
+        console.log("Configuration reset to defaults.");
+    }
     if (options.apiUrl) {
         config.set("apiUrl", options.apiUrl);
         console.log(`API URL set to: ${options.apiUrl}`);
     }
-    if (options.show || (!options.apiUrl)) {
+    if (!options.apiUrl && !options.reset) {
+        const customUrl = config.get("apiUrl");
         console.log("\nConfiguration:");
-        console.log(`  API URL: ${config.get("apiUrl") || API_URL} (default)`);
+        console.log(`  API URL: ${customUrl || DEFAULT_API_URL}${customUrl ? "" : " (default)"}`);
         console.log(`  Logged in: ${config.get("apiKey") ? "Yes" : "No"}`);
+        console.log(`  Config file: ${config.path}`);
     }
 });
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "delivered-cli",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "CLI for delivered.md - Focus. Ship. Repeat.",
   "main": "dist/index.js",
   "bin": {
@@ -9,21 +9,27 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc -w",
-    "start": "node dist/index.js"
+    "start": "node dist/index.js",
+    "prepublishOnly": "npm run build"
   },
   "keywords": [
     "delivered",
     "markdown",
     "productivity",
     "goals",
-    "cli"
+    "cli",
+    "accountability"
   ],
-  "author": "",
+  "author": "hyapadi",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/anomalyco/delivered"
+  },
+  "homepage": "https://delivered.md",
   "dependencies": {
     "commander": "^12.1.0",
-    "conf": "^12.0.0",
-    "node-fetch": "^3.3.2"
+    "conf": "^12.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.10.0",

package/src/index.ts

@@ -10,7 +10,9 @@ const config = new Conf<{ apiKey?: string; apiUrl?: string }>({
   projectName: "delivered-cli",
 });
 
-const API_URL = config.get("apiUrl") || "https://delivered.md/api/v1";
+// Convex HTTP endpoint URL
+const DEFAULT_API_URL = "https://fabulous-chipmunk-797.convex.site/api";
+const API_URL = config.get("apiUrl") || DEFAULT_API_URL;
 
 const program = new Command();
 
@@ -32,7 +34,7 @@ function getApiKey(): string {
 // Helper for API requests
 async function apiRequest(
   endpoint: string,
-  options: RequestInit = {}
+  options: RequestInit = {},
 ): Promise<Response> {
   const apiKey = getApiKey();
   const url = `${API_URL}${endpoint}`;
@@ -41,6 +43,7 @@ async function apiRequest(
     ...options,
     headers: {
       Authorization: `Bearer ${apiKey}`,
+      "Content-Type": "application/json",
       ...options.headers,
     },
   });
@@ -52,28 +55,17 @@ async function apiRequest(
 program
   .command("login")
   .description("Login with your API key")
-  .action(async () => {
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout,
-    });
-
-    console.log("\nTo get your API key:");
-    console.log("1. Go to https://delivered.md/settings");
-    console.log("2. Create a new API key");
-    console.log("3. Copy and paste it below\n");
-
-    rl.question("API Key: ", async (apiKey) => {
-      rl.close();
-
+  .argument("[api-key]", "API key (or omit to enter interactively)")
+  .action(async (apiKeyArg?: string) => {
+    const processLogin = async (apiKey: string) => {
       if (!apiKey || !apiKey.startsWith("dlv_")) {
         console.error("Error: Invalid API key format. Keys start with 'dlv_'");
         process.exit(1);
       }
 
-      // Test the key
+      // Test the key by calling whoami
       try {
-        const response = await fetch(`${API_URL}/page`, {
+        const response = await fetch(`${API_URL}/whoami`, {
           headers: { Authorization: `Bearer ${apiKey}` },
         });
 
@@ -82,13 +74,36 @@ program
           process.exit(1);
         }
 
+        const data = await response.json();
         config.set("apiKey", apiKey);
-        console.log("\nLogged in successfully!");
+        console.log(`\nLogged in as ${data.username || data.email}!`);
+        if (data.pageUrl) {
+          console.log(`Your page: ${data.pageUrl}`);
+        }
       } catch (error) {
         console.error("Error: Failed to validate API key");
         process.exit(1);
       }
-    });
+    };
+
+    if (apiKeyArg) {
+      await processLogin(apiKeyArg);
+    } else {
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+      });
+
+      console.log("\nTo get your API key:");
+      console.log("1. Go to https://app.delivered.md/settings");
+      console.log("2. Create a new API key");
+      console.log("3. Copy and paste it below\n");
+
+      rl.question("API Key: ", async (apiKey) => {
+        rl.close();
+        await processLogin(apiKey);
+      });
+    }
   });
 
 // Logout command
@@ -100,6 +115,33 @@ program
     console.log("Logged out successfully.");
   });
 
+// Whoami command
+program
+  .command("whoami")
+  .description("Show current user info")
+  .action(async () => {
+    try {
+      const response = await apiRequest("/whoami");
+
+      if (!response.ok) {
+        const error = await response.json();
+        console.error(`Error: ${error.error || "Failed to get user info"}`);
+        process.exit(1);
+      }
+
+      const data = await response.json();
+      console.log(`\nUsername: ${data.username || "(not set)"}`);
+      console.log(`Name: ${data.name || "(not set)"}`);
+      console.log(`Email: ${data.email || "(not set)"}`);
+      if (data.pageUrl) {
+        console.log(`Page URL: ${data.pageUrl}`);
+      }
+    } catch (error) {
+      console.error("Error: Failed to get user info");
+      process.exit(1);
+    }
+  });
+
 // Pull command
 program
   .command("pull")
@@ -115,7 +157,8 @@ program
         process.exit(1);
       }
 
-      const markdown = await response.text();
+      const data = await response.json();
+      const markdown = data.content;
 
       if (options.output) {
         const outputPath = path.resolve(options.output);
@@ -163,8 +206,7 @@ program
 
       const response = await apiRequest("/page", {
         method: "PUT",
-        headers: { "Content-Type": "text/markdown" },
-        body: content,
+        body: JSON.stringify({ content }),
       });
 
       if (!response.ok) {
@@ -180,90 +222,33 @@ program
     }
   });
 
-// Snapshots command
-program
-  .command("snapshots")
-  .description("List your page snapshots")
-  .action(async () => {
-    try {
-      const response = await apiRequest("/snapshots");
-
-      if (!response.ok) {
-        const error = await response.json();
-        console.error(`Error: ${error.error || "Failed to fetch snapshots"}`);
-        process.exit(1);
-      }
-
-      const data = await response.json();
-      const snapshots = data.snapshots;
-
-      if (snapshots.length === 0) {
-        console.log("No snapshots found.");
-        return;
-      }
-
-      console.log("\nSnapshots:\n");
-      snapshots.forEach(
-        (
-          snapshot: { id: string; createdAt: number; accessible: boolean },
-          index: number
-        ) => {
-          const date = new Date(snapshot.createdAt).toLocaleString();
-          const accessIcon = snapshot.accessible ? "  " : "[locked]";
-          console.log(`${index + 1}. ${date} ${accessIcon}`);
-          console.log(`   ID: ${snapshot.id}\n`);
-        }
-      );
-    } catch (error) {
-      console.error("Error: Failed to fetch snapshots");
-      process.exit(1);
-    }
-  });
-
-// Revert command
-program
-  .command("revert <snapshot-id>")
-  .description("Revert to a specific snapshot")
-  .action(async (snapshotId) => {
-    try {
-      const response = await apiRequest("/revert", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ snapshotId }),
-      });
-
-      if (!response.ok) {
-        const error = await response.json();
-        console.error(`Error: ${error.error || "Failed to revert"}`);
-        process.exit(1);
-      }
-
-      const data = await response.json();
-      console.log(
-        `Reverted successfully to snapshot from ${new Date(data.revertedTo).toLocaleString()}`
-      );
-    } catch (error) {
-      console.error("Error: Failed to revert");
-      process.exit(1);
-    }
-  });
+// Note: snapshots and revert commands can be added later when HTTP endpoints are implemented
 
 // Config command
 program
   .command("config")
   .description("View or set configuration")
   .option("--api-url <url>", "Set custom API URL")
-  .option("--show", "Show current configuration")
+  .option("--reset", "Reset to default configuration")
   .action((options) => {
+    if (options.reset) {
+      config.delete("apiUrl");
+      console.log("Configuration reset to defaults.");
+    }
+
     if (options.apiUrl) {
       config.set("apiUrl", options.apiUrl);
       console.log(`API URL set to: ${options.apiUrl}`);
     }
 
-    if (options.show || (!options.apiUrl)) {
+    if (!options.apiUrl && !options.reset) {
+      const customUrl = config.get("apiUrl");
       console.log("\nConfiguration:");
-      console.log(`  API URL: ${config.get("apiUrl") || API_URL} (default)`);
+      console.log(
+        `  API URL: ${customUrl || DEFAULT_API_URL}${customUrl ? "" : " (default)"}`,
+      );
       console.log(`  Logged in: ${config.get("apiKey") ? "Yes" : "No"}`);
+      console.log(`  Config file: ${config.path}`);
     }
   });