@codejeet/oadm 0.0.3 → 0.0.4

package/dist/cli.js

@@ -3,8 +3,9 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import { readConfig, writeConfig } from './config.js';
 import { getJson, postJson } from './http.js';
+import pkg from '../package.json' with { type: 'json' };
 const program = new Command();
-program.name('oadm').description('OADM Inbox CLI').version('0.0.2');
+program.name('oadm').description('OADM Inbox CLI').version(pkg.version);
 program
     .option('--api <url>', 'API base URL (or set OADM_API_URL)', '')
     .hook('preAction', (thisCommand) => {
@@ -112,17 +113,19 @@ program
     await postJson(`${cfg.apiUrl}/v1/messages/ack/${msgId}`, {}, cfg.token);
     console.log(chalk.green('✓ acked'), msgId);
 });
+// Webhooks
 program
     .command('webhook:create')
     .requiredOption('--url <url>')
-    .option('--secret <secret>')
     .action(async (opts) => {
     const cfg = readConfig();
     if (!cfg.token)
         throw new Error('not_logged_in');
-    const data = await postJson(`${cfg.apiUrl}/v1/webhooks`, { url: opts.url, secret: opts.secret }, cfg.token);
+    // Server generates the secret. Do NOT send user secret.
+    const data = await postJson(`${cfg.apiUrl}/v1/webhooks`, { url: opts.url }, cfg.token);
     console.log(chalk.green('✓ webhook created'), data.webhook.id);
-    console.log('secret:', data.secret);
+    if (data.secret)
+        console.log('secret:', data.secret);
 });
 program
     .command('webhook:list')
@@ -149,7 +152,7 @@ program
     const cfg = readConfig();
     if (!cfg.token)
         throw new Error('not_logged_in');
-    await postJson(`${cfg.apiUrl}/v1/webhooks/${webhookId}`, {}, cfg.token, 'DELETE');
+    await postJson(`${cfg.apiUrl}/v1/webhooks/${webhookId}`, undefined, cfg.token, 'DELETE');
     console.log(chalk.green('✓ webhook deleted'), webhookId);
 });
 program.parseAsync(process.argv).catch((e) => {

package/dist/config.js

@@ -1,29 +1,28 @@
+import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import fs from 'node:fs';
-export function configDir() {
-    return path.join(os.homedir(), '.oadm');
-}
-export function configPath() {
-    return path.join(configDir(), 'config.json');
-}
+const CONFIG_DIR = path.join(os.homedir(), '.oadm');
+const CONFIG_PATH = path.join(CONFIG_DIR, 'config.json');
 export function readConfig() {
-    const p = configPath();
-    if (!fs.existsSync(p)) {
-        return { apiUrl: process.env.OADM_API_URL ?? 'http://localhost:3000' };
-    }
-    const raw = fs.readFileSync(p, 'utf8');
-    const cfg = JSON.parse(raw);
-    cfg.apiUrl = cfg.apiUrl ?? process.env.OADM_API_URL ?? 'http://localhost:3000';
-    return cfg;
-}
-export function writeConfig(cfg) {
-    fs.mkdirSync(configDir(), { recursive: true });
-    fs.writeFileSync(configPath(), JSON.stringify(cfg, null, 2));
     try {
-        fs.chmodSync(configPath(), 0o600);
+        const raw = fs.readFileSync(CONFIG_PATH, 'utf8');
+        const cfg = JSON.parse(raw);
+        const apiUrl = process.env.OADM_API_URL ??
+            (typeof cfg.apiUrl === 'string' ? cfg.apiUrl : '') ??
+            '';
+        return {
+            apiUrl: apiUrl || 'https://api-zeta-jet-48.vercel.app',
+            name: typeof cfg.name === 'string' ? cfg.name : undefined,
+            token: typeof cfg.token === 'string' ? cfg.token : undefined,
+        };
     }
     catch {
-        // ignore on platforms that don't support chmod
+        const apiUrl = process.env.OADM_API_URL ?? 'https://api-zeta-jet-48.vercel.app';
+        return { apiUrl };
     }
 }
+export function writeConfig(cfg) {
+    if (!fs.existsSync(CONFIG_DIR))
+        fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    fs.writeFileSync(CONFIG_PATH, JSON.stringify(cfg, null, 2));
+}

package/dist/http.js

@@ -1,31 +1,32 @@
-export async function postJson(url, body, token, method = 'POST') {
-    const r = await fetch(url, {
-        method,
+import fetch from 'node-fetch';
+export async function getJson(url, token) {
+    const res = await fetch(url, {
+        method: 'GET',
         headers: {
-            'content-type': 'application/json',
-            ...(token ? { authorization: `Bearer ${token}` } : {}),
+            ...(token ? { Authorization: `Bearer ${token}` } : {}),
         },
-        body: JSON.stringify(body),
     });
-    const text = await r.text();
-    const data = text ? JSON.parse(text) : null;
-    if (!r.ok) {
-        const msg = data?.error ? `${data.error}` : `http_${r.status}`;
-        throw new Error(msg);
+    if (!res.ok) {
+        const text = await res.text().catch(() => '');
+        throw new Error(`http_${res.status}${text ? `: ${text}` : ''}`);
     }
-    return data;
+    return (await res.json());
 }
-export async function getJson(url, token) {
-    const r = await fetch(url, {
+export async function postJson(url, body, token, method = 'POST') {
+    const res = await fetch(url, {
+        method,
         headers: {
-            ...(token ? { authorization: `Bearer ${token}` } : {}),
+            'Content-Type': 'application/json',
+            ...(token ? { Authorization: `Bearer ${token}` } : {}),
         },
+        body: body === undefined ? undefined : JSON.stringify(body),
     });
-    const text = await r.text();
-    const data = text ? JSON.parse(text) : null;
-    if (!r.ok) {
-        const msg = data?.error ? `${data.error}` : `http_${r.status}`;
-        throw new Error(msg);
+    if (!res.ok) {
+        const text = await res.text().catch(() => '');
+        throw new Error(`http_${res.status}${text ? `: ${text}` : ''}`);
     }
-    return data;
+    const ct = res.headers.get('content-type') || '';
+    if (!ct.includes('application/json'))
+        return {};
+    return (await res.json());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codejeet/oadm",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module",
   "bin": {
     "oadm": "dist/cli.js"