@kamal0808/anytoany 0.2.0 → 0.3.0

package/cli.js

@@ -55,13 +55,17 @@ function resolve() {
   const cfg = loadConfig();
   const user = process.env.ANY_USER || cfg.user || hostnameUser();
   const relay = process.env.ANY_RELAY_URL || cfg.relay || DEFAULT_RELAY;
-  const token = process.env.ANY_TOKEN || cfg.token || null;
-  return { user: norm(user), relay: relay.replace(/\/$/, ''), token };
+  const key = process.env.ANY_KEY || cfg.key || null;
+  return { user: norm(user), relay: relay.replace(/\/$/, ''), key };
 }
 
 function norm(user) {
   if (!user) return null;
-  return user.startsWith('@') ? user : '@' + user;
+  return user.startsWith('@') ? user.toLowerCase() : '@' + user.toLowerCase();
+}
+
+function validSlug(h) {
+  return /^@[a-z0-9_-]{2,30}$/.test(h);
 }
 
 function die(msg) {
@@ -69,11 +73,28 @@ function die(msg) {
   process.exit(1);
 }
 
+// register (claim a handle, get your own key) — no auth needed
+async function registerWithRelay(relay, handle, displayName) {
+  let res;
+  try {
+    res = await fetch(relay + '/register', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ handle, displayName }),
+    });
+  } catch (e) {
+    die(`can't reach relay at ${relay} (${e.message})`);
+  }
+  const j = await res.json().catch(() => ({}));
+  if (!res.ok) die(j.error || `register failed (${res.status})`);
+  return j; // { handle, key, displayName }
+}
+
 async function api(relay, method, route, body) {
-  const { token } = resolve();
+  const { key } = resolve();
   const headers = {};
   if (body) headers['content-type'] = 'application/json';
-  if (token) headers['authorization'] = `Bearer ${token}`;
+  if (key) headers['authorization'] = `Bearer ${key}`;
   let res;
   try {
     res = await fetch(relay + route, {
@@ -122,12 +143,19 @@ function printMessage(m, { full = false } = {}) {
 // ---- commands ------------------------------------------------------------
 
 async function cmdRegister(args) {
-  const user = norm(args[0]);
-  if (!user) die('usage: any register @you');
+  let handle = norm(args[0]);
+  if (!handle) die('usage: any register @you [Display Name]');
+  if (!validSlug(handle)) die('handle must be 2-30 chars: a-z 0-9 _ - (e.g. @kamal)');
   const cfg = loadConfig();
-  cfg.user = user;
+  const relay = (process.env.ANY_RELAY_URL || cfg.relay || DEFAULT_RELAY).replace(/\/$/, '');
+  const name = args.slice(1).join(' ') || null;
+  const acct = await registerWithRelay(relay, handle, name);
+  cfg.user = acct.handle;
+  cfg.key = acct.key;
+  cfg.relay = relay;
+  if (acct.displayName) cfg.displayName = acct.displayName;
   saveConfig(cfg);
-  console.log(`registered as ${user}`);
+  console.log(`✓ registered as ${acct.handle}${acct.displayName ? ' (' + acct.displayName + ')' : ''}`);
 }
 
 async function cmdRelay(args) {
@@ -139,27 +167,20 @@ async function cmdRelay(args) {
   console.log(`relay set to ${cfg.relay}`);
 }
 
-async function cmdToken(args) {
-  const t = args[0];
-  if (!t) die('usage: any token <shared-secret>');
-  const cfg = loadConfig();
-  cfg.token = t;
-  saveConfig(cfg);
-  console.log('token saved');
-}
-
 async function cmdWhoami() {
-  const { user, relay, token } = resolve();
-  console.log(`user:  ${user || '(unset — run: any register @you)'}`);
-  console.log(`relay: ${relay}`);
-  console.log(`token: ${token ? 'set' : '(none)'}`);
-  const health = await api(relay, 'GET', '/health').catch(() => null);
-  if (health) console.log(`relay: online (${health.messages} messages stored)`);
+  const { user, relay, key } = resolve();
+  console.log(`handle: ${user || '(unregistered — run: any setup)'}`);
+  console.log(`relay:  ${relay}`);
+  console.log(`key:    ${key ? 'set' : '(none — run: any setup)'}`);
+  if (key) {
+    const me = await api(relay, 'GET', '/whoami').catch(() => null);
+    if (me) console.log(`status: online as ${me.handle}${me.displayName ? ' (' + me.displayName + ')' : ''}`);
+  }
 }
 
 async function cmdSend(args) {
-  const { user, relay } = resolve();
-  if (!user) die('you are not registered. Run: any register @you');
+  const { key, relay } = resolve();
+  if (!key) die('not registered. Run: any setup');
   const to = norm(args[0]);
   if (!to) die('usage: any send @who <text | file>');
   const rest = args.slice(1);
@@ -175,24 +196,20 @@ async function cmdSend(args) {
     body = rest.join(' ');
   }
 
-  const { id } = await api(relay, 'POST', '/send', { from: user, to, subject, body });
+  const { id } = await api(relay, 'POST', '/send', { to, subject, body });
   console.log(`sent → ${to}  (#${id})`);
 }
 
 async function cmdInbox(args) {
-  const { user, relay } = resolve();
-  if (!user) die('you are not registered. Run: any register @you');
+  const { key, relay } = resolve();
+  if (!key) die('not registered. Run: any setup');
   const all = args.includes('--all');
-  const { messages, count } = await api(
-    relay,
-    'GET',
-    `/inbox?user=${encodeURIComponent(user)}${all ? '&all=1' : ''}`,
-  );
+  const { messages, count } = await api(relay, 'GET', `/inbox${all ? '?all=1' : ''}`);
   if (count === 0) {
     console.log(all ? 'inbox empty' : 'no new messages');
     return;
   }
-  console.log(`${count} ${all ? 'message(s)' : 'new message(s)'} for ${user}:\n`);
+  console.log(`${count} ${all ? 'message(s)' : 'new message(s)'}:\n`);
   for (const m of messages) {
     printMessage(m);
     console.log('');
@@ -211,34 +228,30 @@ async function cmdRead(args) {
 }
 
 async function cmdReply(args) {
-  const { user, relay } = resolve();
-  if (!user) die('you are not registered. Run: any register @you');
+  const { key, relay } = resolve();
+  if (!key) die('not registered. Run: any setup');
   const id = Number(args[0]);
   if (!id) die('usage: any reply <id> <text>');
   const body = args.slice(1).join(' ');
   if (!body) die('nothing to reply with');
-  const { id: newId } = await api(relay, 'POST', '/reply', { id, from: user, body });
+  const { id: newId } = await api(relay, 'POST', '/reply', { id, body });
   console.log(`replied to #${id}  (#${newId})`);
 }
 
 async function cmdWatch(args) {
-  const { user, relay } = resolve();
-  if (!user) die('you are not registered. Run: any register @you');
+  const { key, relay } = resolve();
+  if (!key) die('not registered. Run: any setup');
   const i = args.indexOf('--interval');
   const interval = (i >= 0 ? Number(args[i + 1]) : 5) * 1000;
   const seen = new Set();
-  console.log(`watching inbox for ${user} (every ${interval / 1000}s). Ctrl-C to stop.\n`);
+  console.log(`watching inbox (every ${interval / 1000}s). Ctrl-C to stop.\n`);
   // Prime with existing unread so we only announce genuinely new arrivals.
-  const first = await api(relay, 'GET', `/inbox?user=${encodeURIComponent(user)}&all=1`);
+  const first = await api(relay, 'GET', `/inbox?all=1`);
   for (const m of first.messages) seen.add(m.id);
   if (first.messages.length) console.log(`(${first.messages.length} existing message(s), waiting for new ones)\n`);
 
   async function poll() {
-    const { messages } = await api(
-      relay,
-      'GET',
-      `/inbox?user=${encodeURIComponent(user)}&all=1`,
-    ).catch(() => ({ messages: [] }));
+    const { messages } = await api(relay, 'GET', `/inbox?all=1`).catch(() => ({ messages: [] }));
     for (const m of messages.sort((a, b) => a.ts - b.ts)) {
       if (seen.has(m.id)) continue;
       seen.add(m.id);
@@ -280,11 +293,11 @@ function fireBanner(m, link) {
 
 // one watch tick: alert on any new unread message. Run by launchd every ~15s.
 async function cmdPoke() {
-  const { user, relay } = resolve();
-  if (!user) die('not registered (run: any setup)');
-  const key = user.replace('@', '');
-  const seenPath = path.join(HOME, `poke-seen-${key}.txt`);
-  const lockPath = path.join(HOME, `poke-${key}.lock`);
+  const { user, relay, key: authKey } = resolve();
+  if (!authKey) die('not registered (run: any setup)');
+  const slug = user.replace('@', '');
+  const seenPath = path.join(HOME, `poke-seen-${slug}.txt`);
+  const lockPath = path.join(HOME, `poke-${slug}.lock`);
   fs.mkdirSync(HOME, { recursive: true });
   try {
     fs.mkdirSync(lockPath); // single-flight
@@ -292,7 +305,7 @@ async function cmdPoke() {
     return;
   }
   try {
-    const { messages } = await api(relay, 'GET', `/inbox?user=${encodeURIComponent(user)}`);
+    const { messages } = await api(relay, 'GET', `/inbox`);
     if (!messages || !messages.length) return;
     let seen = new Set();
     try {
@@ -331,29 +344,40 @@ function have(cmd) {
   }
 }
 
-// one-command onboarding: identity + token + background watcher
+// one-command onboarding: claim a handle (get your key) + install the watcher
 async function cmdSetup() {
   const cfg = loadConfig();
   const tty = process.stdin.isTTY;
-
-  let user = norm(process.env.ANY_USER || cfg.user);
-  if (!user) {
-    if (!tty) die('no identity — run interactively, or: any register @you first');
-    user = norm(await promptLine('Your handle (e.g. @yash): '));
-  }
-  let token = process.env.ANY_TOKEN || cfg.token;
-  if (!token) {
-    if (!tty) die('no token — run interactively, or: any token <secret> first');
-    token = await promptLine('Shared token: ');
+  const relay = (process.env.ANY_RELAY_URL || cfg.relay || DEFAULT_RELAY).replace(/\/$/, '');
+
+  if (!cfg.key) {
+    // claim a new account
+    let handle = norm(process.env.ANY_USER || cfg.user);
+    if (!handle) {
+      if (!tty) die('no handle — run interactively, or: any register @you first');
+      handle = norm(await promptLine('Pick a handle (e.g. @yash): '));
+    }
+    if (!validSlug(handle)) die('handle must be 2-30 chars: a-z 0-9 _ - (e.g. @kamal)');
+    let name = cfg.displayName || process.env.ANY_NAME || null;
+    if (tty && !name) name = (await promptLine('Display name (optional): ')) || null;
+    const acct = await registerWithRelay(relay, handle, name);
+    cfg.user = acct.handle;
+    cfg.key = acct.key;
+    cfg.relay = relay;
+    if (acct.displayName) cfg.displayName = acct.displayName;
+    saveConfig(cfg);
+    console.log(`✓ registered as ${acct.handle}${acct.displayName ? ' (' + acct.displayName + ')' : ''} → ${relay}`);
+  } else {
+    if (!cfg.relay) {
+      cfg.relay = relay;
+      saveConfig(cfg);
+    }
+    console.log(`✓ already registered as ${cfg.user} → ${cfg.relay}`);
   }
-  cfg.user = user;
-  cfg.token = token;
-  if (!cfg.relay) cfg.relay = DEFAULT_RELAY;
-  saveConfig(cfg);
-  console.log(`✓ configured as ${user} → ${cfg.relay}`);
+  const user = cfg.user;
 
-  const health = await api(cfg.relay, 'GET', '/health').catch(() => null);
-  console.log(health ? '✓ relay reachable' : '! could not reach relay — check the token/URL (continuing)');
+  const me = await api(cfg.relay, 'GET', '/whoami').catch(() => null);
+  console.log(me ? `✓ connected as ${me.handle}` : '! could not verify with relay (continuing)');
 
   if (process.platform !== 'darwin') {
     console.log('\nThe background banner watcher is macOS-only for now.');
@@ -415,7 +439,7 @@ async function cmdSetup() {
 
   // prime seen-file so existing messages don't all alert at once
   try {
-    const { messages } = await api(cfg.relay, 'GET', `/inbox?user=${encodeURIComponent(user)}&all=1`);
+    const { messages } = await api(cfg.relay, 'GET', `/inbox?all=1`);
     fs.writeFileSync(path.join(HOME, `poke-seen-${key}.txt`), (messages || []).map((m) => m.id).join('\n') + '\n');
   } catch {}
 
@@ -437,11 +461,10 @@ async function cmdSetup() {
 function cmdHelp() {
   console.log(`any — tiny message relay CLI
 
-  any setup                    one-command onboarding (identity + token + banner watcher)
-  any register @you            set your identity
+  any setup                    one-command onboarding (claim @handle + banner watcher)
+  any register @you [Name]     claim a handle (get your key)
   any relay <url>              point at the relay server
-  any token <secret>           set the shared secret (for a hosted relay)
-  any whoami                   show identity + relay status
+  any whoami                   show your handle + relay status
 
   any send @who <text|file>    send a message (a file becomes subject+body)
   any inbox [--all]            list messages for you (default: unread only)
@@ -463,7 +486,6 @@ const table = {
   poke: cmdPoke,
   register: cmdRegister,
   relay: cmdRelay,
-  token: cmdToken,
   whoami: cmdWhoami,
   send: cmdSend,
   inbox: cmdInbox,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamal0808/anytoany",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "description": "Tiny CLI to send/inbox/reply messages between Claude Code sessions via the anytoany relay",
   "bin": {