smsforwarder 1.0.0 → 1.2.0

package/README.md

@@ -7,14 +7,14 @@ Install [SMS Forwarder](https://smsforwarder.app/download/) on the phone that re
 ```sh
 npm install -g smsforwarder
 smsforwarder login sk_your_key
-CODE=$(smsforwarder code --from GitHub --timeout 90)
+CODE=$(smsforwarder code --timeout 90)
 ```
 
-`code` waits until a matching code arrives and prints only the code. It exits with status 2 if nothing arrives in time.
+`code` waits for the newest text to arrive and prints its code. If no code was recognised in the text, it prints the whole text instead (and says so on stderr), so nothing is lost. It exits with status 2 if nothing arrives in time. If other texts arrived in the same window it says so on stderr; `smsforwarder messages` lists them in full so you can pick by the text.
 
 ```
-smsforwarder code [--from x] [--contains x] [--timeout sec] [--json]
-smsforwarder messages [--from x] [--limit n] [--codes] [--json]
+smsforwarder code [--timeout sec] [--since time] [--json]
+smsforwarder messages [--minutes n] [--limit n] [--json]
 smsforwarder devices
 smsforwarder webhook set <url> | rm | test
 smsforwarder mcp          # MCP config for Claude, Cursor and other AI tools

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smsforwarder",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Get SMS verification codes from your own phone in scripts and AI agents. CLI for SMS Forwarder (smsforwarder.app).",
   "type": "module",
   "bin": { "smsforwarder": "smsforwarder.mjs" },

package/smsforwarder.mjs

@@ -11,13 +11,12 @@ const HELP = `SMS Forwarder — verification codes from your phone, in your term
 
 Usage:
   smsforwarder login <api-key>          Save your API key (from the phone app)
-  smsforwarder code [options]           Wait for the next verification code and print it
-      --from <text>      Only codes from this service / sender (e.g. Google, 淘宝)
-      --contains <text>  Only messages containing this text
+  smsforwarder code [options]           Wait for the newest text and print its code, or the whole text if no code was recognised
       --timeout <sec>    How long to wait, max 120 (default 60)
       --since <time>     Only messages after this ISO time / unix ms (default: 2 minutes ago)
-      --json             Print the whole message as JSON
-  smsforwarder messages [--from x] [--contains x] [--limit n] [--codes] [--json]
+      --json             Print the whole result as JSON, including every other message from the same window
+  smsforwarder messages [--minutes n] [--limit n] [--json]
+                                        Messages from the last n minutes (default 10), newest first
   smsforwarder devices                  List connected phones
   smsforwarder webhook set <url>        Send every new message to your URL (prints the signing secret)
   smsforwarder webhook rm               Stop sending to the webhook
@@ -58,7 +57,7 @@ function apiKey() {
 async function call(method, path, body) {
   const res = await fetch(API + path, {
     method,
-    headers: { authorization: `Bearer ${apiKey()}`, "content-type": "application/json", "user-agent": "smsforwarder-cli/1.0.0" },
+    headers: { authorization: `Bearer ${apiKey()}`, "content-type": "application/json", "user-agent": "smsforwarder-cli/1.1.0" },
     body: body ? JSON.stringify(body) : undefined,
   });
   const data = await res.json().catch(() => ({}));
@@ -83,6 +82,10 @@ function ago(iso) {
 
 const { pos, opt } = parse(process.argv.slice(2));
 const cmd = pos[0];
+for (const gone of ["from", "contains"]) {
+  if (opt[gone] !== undefined) die(`--${gone} is gone: who sends a code can't be predicted. Take the newest code, or list recent messages and pick by text.`);
+}
+if (opt.codes !== undefined) die("--codes is gone: some codes can't be picked out of the text, so every message is listed in full.");
 
 switch (cmd) {
   case "login": {
@@ -98,14 +101,24 @@ switch (cmd) {
   case "code":
   case "wait": {
     const timeout = Math.min(Number(opt.timeout ?? 60) || 60, 120);
-    const { status, data } = await call("GET", "/v1/codes/wait" + qs({ from: opt.from, contains: opt.contains, since: opt.since, timeout }));
-    if (status === 404 || !data.code) die(`No code arrived within ${timeout}s.`, 2);
-    console.log(opt.json ? JSON.stringify(data.message, null, 2) : data.code);
+    const { status, data } = await call("GET", "/v1/codes/wait" + qs({ since: opt.since, timeout }));
+    if (status === 404 || !data.message) die(`No message arrived within ${timeout}s.`, 2);
+    if (opt.json) console.log(JSON.stringify(data, null, 2));
+    else {
+      if (data.code) console.log(data.code);
+      else {
+        console.log(data.message.body);
+        process.stderr.write("No code was recognised in this text, so the whole text is printed above.\n");
+      }
+      if (data.otherMessages?.length) {
+        process.stderr.write(`${data.otherMessages.length} other message(s) arrived in the same window; run \`smsforwarder messages\` to pick by text.\n`);
+      }
+    }
     break;
   }
   case "messages":
   case "ls": {
-    const { data } = await call("GET", "/v1/messages" + qs({ from: opt.from, contains: opt.contains, limit: opt.limit ?? 20, codes_only: opt.codes ? "true" : undefined }));
+    const { data } = await call("GET", "/v1/messages" + qs({ minutes: opt.minutes ?? 10, limit: opt.limit ?? 20 }));
     if (opt.json) {
       console.log(JSON.stringify(data.messages, null, 2));
       break;
@@ -113,7 +126,7 @@ switch (cmd) {
     if (!data.messages.length) console.log("No messages yet.");
     for (const m of data.messages) {
       const who = m.service || m.from || "?";
-      console.log(`${ago(m.receivedAt).padEnd(8)} ${who}${m.code ? `  [${m.code}]` : ""}\n         ${m.body.replace(/\s+/g, " ").slice(0, 160)}`);
+      console.log(`${ago(m.receivedAt).padEnd(8)} ${who}${m.code ? `  [${m.code}]` : ""}\n         ${m.body.replace(/\s+/g, " ")}`);
     }
     break;
   }