chirpie 1.2.5 → 1.2.6

package/dist/index.js

@@ -967,6 +967,58 @@ postsCommand.command("unhide <id>").description("Put a hidden post back in your
 
 // src/commands/accounts.ts
 import { Command as Command6 } from "commander";
+
+// src/lib/connect-input.ts
+var BLUESKY_APP_PASSWORD_REQUIRED = "bluesky_app_password_required";
+var BLUESKY_APP_PASSWORD_MESSAGE = "Bluesky needs an app password, not your account password. Create one in Bluesky under Settings, Privacy and Security, App Passwords (https://bsky.app/settings/app-passwords). It looks like xxxx-xxxx-xxxx-xxxx.";
+var APP_PASSWORD = /^[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}$/;
+function normalizeBlueskyAppPassword(raw) {
+  return raw.trim();
+}
+function isBlueskyAppPassword(raw) {
+  return APP_PASSWORD.test(normalizeBlueskyAppPassword(raw));
+}
+var MASTODON_INSTANCE_INVALID = "mastodon_instance_invalid";
+var MASTODON_INSTANCE_MESSAGE = "Enter your Mastodon server (mastodon.social), your handle (@you@mastodon.social) or your profile URL (https://mastodon.social/@you).";
+var DOTTED_NAME = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)+$/i;
+var ADDRESS = /^[^@/\s]+@([^@/\s]+)$/;
+var REMOTE_PROFILE_PATH = /^\/@[^@/]+@([^@/]+)(?:\/|$)/;
+function toUrl(candidate) {
+  const withScheme = /^[a-z][a-z0-9+.-]*:\/\//i.test(candidate) ? candidate : `https://${candidate}`;
+  try {
+    return new URL(withScheme);
+  } catch {
+    return null;
+  }
+}
+function fromUrl(url) {
+  if (url.protocol !== "https:") return null;
+  if (!DOTTED_NAME.test(url.hostname)) return null;
+  return { origin: url.origin, host: url.host };
+}
+function parseMastodonInstance(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed || /\s/.test(trimmed)) return null;
+  const bare = trimmed.replace(/^@+/, "");
+  const address = ADDRESS.exec(bare);
+  const url = toUrl(address ? address[1] : bare);
+  if (!url) return null;
+  const remote = REMOTE_PROFILE_PATH.exec(url.pathname);
+  if (!address && remote) {
+    let decoded;
+    try {
+      decoded = decodeURIComponent(remote[1]);
+    } catch {
+      return null;
+    }
+    const home = toUrl(decoded);
+    if (!home) return null;
+    return fromUrl(home);
+  }
+  return fromUrl(url);
+}
+
+// src/commands/accounts.ts
 async function readSecretFromStdin(prompt) {
   const stdin = process.stdin;
   process.stderr.write(prompt);
@@ -1158,24 +1210,29 @@ accountsCommand.command("connect-x").description("Connect a new X/Twitter accoun
     process.exit(1);
   }
 });
-accountsCommand.command("connect-bluesky").description("Connect a Bluesky account via app password").requiredOption(
+accountsCommand.command("connect-bluesky").description(
+  "Connect a Bluesky account with an app password (xxxx-xxxx-xxxx-xxxx), never your account password"
+).requiredOption(
   "--handle <handle>",
   "Bluesky handle. The first part alone is enough (user), and user.bsky.social, a handle on your own domain, or the account email also work"
-).option("--app-password <password>", "App password (omit to enter securely via prompt)").option("--json", "Output raw JSON").action(async (opts, cmd) => {
+).option(
+  "--app-password <password>",
+  "Bluesky app password, shaped xxxx-xxxx-xxxx-xxxx. Create one in Bluesky under Settings, Privacy and Security, App Passwords (omit to enter securely via prompt)"
+).option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     let appPassword = opts.appPassword;
     if (!appPassword) {
-      appPassword = await readSecretFromStdin("App Password: ");
-      if (!appPassword) {
-        error("App password is required");
-        process.exit(1);
-      }
+      appPassword = await readSecretFromStdin("App password (xxxx-xxxx-xxxx-xxxx): ");
+    }
+    if (!appPassword || !isBlueskyAppPassword(appPassword)) {
+      error(`${BLUESKY_APP_PASSWORD_REQUIRED}: ${BLUESKY_APP_PASSWORD_MESSAGE}`);
+      process.exit(1);
     }
     const result = await client.connectBlueskyAccount({
       platform: "bluesky",
       identifier: opts.handle,
-      app_password: appPassword
+      app_password: normalizeBlueskyAppPassword(appPassword)
     });
     if (wantsJson(opts, cmd)) {
       json(result);
@@ -1183,7 +1240,7 @@ accountsCommand.command("connect-bluesky").description("Connect a Bluesky accoun
       info(`Connected Bluesky account: ${result.username} (${result.platform_user_id})`);
     }
   } catch (err) {
-    error(err instanceof Error ? err.message : "Failed to connect Bluesky account");
+    apiError(err, "Failed to connect Bluesky account");
     process.exit(1);
   }
 });
@@ -1232,13 +1289,18 @@ accountsCommand.command("connect-threads").description("Connect a Threads (Meta)
 });
 accountsCommand.command("connect-mastodon").description("Connect a Mastodon account via OAuth").requiredOption(
   "--instance <instance>",
-  "Mastodon instance. A bare host is enough (mastodon.social), and https://mastodon.social or an @you@fosstodon.org address also work"
+  "Your Mastodon server, handle or profile URL: mastodon.social, @you@mastodon.social and https://mastodon.social/@you all work. Only the server is kept"
 ).option("--json", "Output raw JSON").action(async (opts, cmd) => {
+  const instance = parseMastodonInstance(String(opts.instance ?? ""));
+  if (!instance) {
+    error(`${MASTODON_INSTANCE_INVALID}: ${MASTODON_INSTANCE_MESSAGE}`);
+    process.exit(1);
+  }
   const client = getClient();
   try {
     const result = await client.connectMastodonAccount({
       platform: "mastodon",
-      instance_url: opts.instance
+      instance_url: instance.origin
     });
     if (wantsJson(opts, cmd)) {
       json(result);
@@ -1249,7 +1311,7 @@ accountsCommand.command("connect-mastodon").description("Connect a Mastodon acco
 `);
     }
   } catch (err) {
-    error(err instanceof Error ? err.message : "Failed to start Mastodon connection");
+    apiError(err, "Failed to start Mastodon connection");
     process.exit(1);
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chirpie",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Chirpie CLI: post to social media from the command line",
   "repository": {
     "type": "git",
@@ -44,7 +44,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@chirpie/sdk": "^1.2.5",
+    "@chirpie/sdk": "^1.2.6",
     "commander": "^13"
   },
   "devDependencies": {