@codejeet/oadm 0.0.4 → 0.0.6

package/dist/cli.js

@@ -1,11 +1,16 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
+import { createRequire } from 'node:module';
 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 require = createRequire(import.meta.url);
+const pkg = require('../package.json');
 const program = new Command();
-program.name('oadm').description('OADM Inbox CLI').version(pkg.version);
+program
+    .name('oadm')
+    .description('OADM Inbox CLI')
+    .version(pkg.version ?? '0.0.0');
 program
     .option('--api <url>', 'API base URL (or set OADM_API_URL)', '')
     .hook('preAction', (thisCommand) => {
@@ -62,6 +67,7 @@ program
     .option('--sent', 'Show sent messages (outbox)', false)
     .option('--all', 'Show both received and sent', false)
     .option('--since <timestamp>', 'Only messages since timestamp (ISO 8601 or unix)', '')
+    .option('--limit <count>', 'Max messages to return (cap 200)', '')
     .option('--json', 'JSON output', false)
     .option('--ack', 'Ack returned messages', false)
     .action(async (opts) => {
@@ -79,6 +85,8 @@ program
         q.set('all', '1');
     if (opts.since)
         q.set('since', opts.since);
+    if (opts.limit)
+        q.set('limit', String(opts.limit));
     const data = await getJson(`${cfg.apiUrl}/v1/messages/inbox?${q.toString()}`, cfg.token);
     if (opts.json) {
         console.log(JSON.stringify(data, null, 2));
@@ -113,19 +121,17 @@ 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');
-    // Server generates the secret. Do NOT send user secret.
-    const data = await postJson(`${cfg.apiUrl}/v1/webhooks`, { url: opts.url }, cfg.token);
+    const data = await postJson(`${cfg.apiUrl}/v1/webhooks`, { url: opts.url, secret: opts.secret }, cfg.token);
     console.log(chalk.green('✓ webhook created'), data.webhook.id);
-    if (data.secret)
-        console.log('secret:', data.secret);
+    console.log('secret:', data.secret);
 });
 program
     .command('webhook:list')
@@ -152,7 +158,7 @@ program
     const cfg = readConfig();
     if (!cfg.token)
         throw new Error('not_logged_in');
-    await postJson(`${cfg.apiUrl}/v1/webhooks/${webhookId}`, undefined, cfg.token, 'DELETE');
+    await postJson(`${cfg.apiUrl}/v1/webhooks/${webhookId}`, {}, cfg.token, 'DELETE');
     console.log(chalk.green('✓ webhook deleted'), webhookId);
 });
 program.parseAsync(process.argv).catch((e) => {

package/dist/config.js

@@ -1,28 +1,29 @@
-import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-const CONFIG_DIR = path.join(os.homedir(), '.oadm');
-const CONFIG_PATH = path.join(CONFIG_DIR, 'config.json');
+import fs from 'node:fs';
+export function configDir() {
+    return path.join(os.homedir(), '.oadm');
+}
+export function configPath() {
+    return path.join(configDir(), '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 {
-        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,
-        };
+        fs.chmodSync(configPath(), 0o600);
     }
     catch {
-        const apiUrl = process.env.OADM_API_URL ?? 'https://api-zeta-jet-48.vercel.app';
-        return { apiUrl };
+        // ignore on platforms that don't support chmod
     }
 }
-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,32 +1,31 @@
-import fetch from 'node-fetch';
-export async function getJson(url, token) {
-    const res = await fetch(url, {
-        method: 'GET',
+export async function postJson(url, body, token, method = 'POST') {
+    const r = await fetch(url, {
+        method,
         headers: {
-            ...(token ? { Authorization: `Bearer ${token}` } : {}),
+            'content-type': 'application/json',
+            ...(token ? { authorization: `Bearer ${token}` } : {}),
         },
+        body: JSON.stringify(body),
     });
-    if (!res.ok) {
-        const text = await res.text().catch(() => '');
-        throw new Error(`http_${res.status}${text ? `: ${text}` : ''}`);
+    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);
     }
-    return (await res.json());
+    return data;
 }
-export async function postJson(url, body, token, method = 'POST') {
-    const res = await fetch(url, {
-        method,
+export async function getJson(url, token) {
+    const r = await fetch(url, {
         headers: {
-            'Content-Type': 'application/json',
-            ...(token ? { Authorization: `Bearer ${token}` } : {}),
+            ...(token ? { authorization: `Bearer ${token}` } : {}),
         },
-        body: body === undefined ? undefined : JSON.stringify(body),
     });
-    if (!res.ok) {
-        const text = await res.text().catch(() => '');
-        throw new Error(`http_${res.status}${text ? `: ${text}` : ''}`);
+    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);
     }
-    const ct = res.headers.get('content-type') || '';
-    if (!ct.includes('application/json'))
-        return {};
-    return (await res.json());
+    return data;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codejeet/oadm",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "type": "module",
   "bin": {
     "oadm": "dist/cli.js"
@@ -12,6 +12,7 @@
     "dev": "tsx src/cli.ts",
     "build": "tsc -p tsconfig.json",
     "prepack": "tsc -p tsconfig.json",
+    "smoke:version": "pnpm build && node ./scripts/smoke-version.mjs",
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {