@usesocial/cli 0.11.5 → 0.11.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @usesocial/cli
 
+## 0.11.7
+
+### Patch Changes
+
+- [#60](https://github.com/usesocial/monorepo/pull/60) [`7917857`](https://github.com/usesocial/monorepo/commit/7917857776089ed80dbbd03d7238941a4d95373f) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Fix account-connect billing handoffs so first paid-seat connections create checkout instead of updating a missing subscription.
+
+## 0.11.6
+
+### Patch Changes
+
+- [#59](https://github.com/usesocial/monorepo/pull/59) [`d6f5807`](https://github.com/usesocial/monorepo/commit/d6f58074561524aff14fccb831785fcbd31b4216) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Bind X account connect links to the authenticated CLI user so copied OAuth URLs cannot attach to the wrong usesocial web session.
+
 ## 0.11.5
 
 ### Patch Changes

package/README.md

@@ -142,14 +142,14 @@ profile lookup is needed.
 | `(bare)` | Show who is signed in and list connected accounts. | |
 | `login` | Device sign-in, scope selection, and billing. | |
 | `logout` | Revoke the session and clear the saved token. | |
-| `connect linkedin` | Open or print a LinkedIn connection URL. | write |
-| `connect x` | Open or print an X OAuth URL. | write |
+| `connect linkedin` | Print a LinkedIn connection URL and poll for approval. | write |
+| `connect x` | Print an X OAuth URL and poll for approval. | write |
 | `reconnect linkedin <account>` | Re-auth an existing LinkedIn account. | write |
 | `reconnect x <account>` | Re-auth an existing X account. | write |
 | `disconnect linkedin <account>` | Disconnect a LinkedIn account. | write |
 | `disconnect x <account>` | Disconnect an X account. | write |
 | `billing` | Show seats, subscription, and current usage billing. | |
-| `billing portal` | Open the hosted billing portal and print its URL. | |
+| `billing portal` | Print the hosted billing portal URL. | |
 | `usage` | Aggregate proxy calls and usage. | |
 | `logs` | Recent proxy calls. | |
 | `config account` | Read or set the default connected account selector. | local |

package/dist/index.mjs

@@ -15,7 +15,6 @@ import l__default, { createInterface } from "node:readline";
 import { AsyncLocalStorage } from "node:async_hooks";
 import process$1, { stdin, stdout } from "node:process";
 import { ReadStream } from "node:tty";
-import { spawn } from "node:child_process";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -8204,7 +8203,7 @@ async function resolvePlugins(plugins) {
 function defineCommand(def) {
 	return def;
 }
-async function runCommand$1(cmd, opts) {
+async function runCommand(cmd, opts) {
 	const cmdArgs = await resolveValue$1(cmd.args || {});
 	const parsedArgs = parseArgs$1(opts.rawArgs, cmdArgs);
 	const context = {
@@ -8226,14 +8225,14 @@ async function runCommand$1(cmd, opts) {
 			if (explicitName) {
 				const subCommand = await _findSubCommand(subCommands, explicitName);
 				if (!subCommand) throw new CLIError(`Unknown command ${cyan(explicitName)}`, "E_UNKNOWN_COMMAND");
-				await runCommand$1(subCommand, { rawArgs: opts.rawArgs.slice(subCommandArgIndex + 1) });
+				await runCommand(subCommand, { rawArgs: opts.rawArgs.slice(subCommandArgIndex + 1) });
 			} else {
 				const defaultSubCommand = await resolveValue$1(cmd.default);
 				if (defaultSubCommand) {
 					if (cmd.run) throw new CLIError(`Cannot specify both 'run' and 'default' on the same command.`, "E_DEFAULT_CONFLICT");
 					const subCommand = await _findSubCommand(subCommands, defaultSubCommand);
 					if (!subCommand) throw new CLIError(`Default sub command ${cyan(defaultSubCommand)} not found in subCommands.`, "E_UNKNOWN_COMMAND");
-					await runCommand$1(subCommand, { rawArgs: opts.rawArgs });
+					await runCommand(subCommand, { rawArgs: opts.rawArgs });
 				} else if (!cmd.run) throw new CLIError(`No command specified.`, "E_NO_COMMAND");
 			}
 		}
@@ -21509,15 +21508,9 @@ const LINKEDIN_PLATFORM = "linkedin";
 const DEFAULT_POLL_INTERVAL_MS = 2e3;
 const DEFAULT_POLL_TIMEOUT_MS = 12e4;
 const SEAT_POLL_TIMEOUT_MS$2 = 600 * 1e3;
-const isInteractiveTerminal$1 = (deps) => deps.isInteractiveTerminal?.() ?? process.stdout.isTTY === true;
-const openURL = async (deps, url, options = {}) => {
+const surfaceURL$1 = (deps, url, options = {}) => {
 	const log = deps.log ?? console.error;
-	if (options.log ?? true) log(`Opening ${url}`);
-	if (!(isInteractiveTerminal$1(deps) && deps.openURL)) return {
-		opened: false,
-		url
-	};
-	return await Promise.resolve(deps.openURL(url));
+	if (options.log ?? true) log(`Open this URL: ${url}`);
 };
 const pollForSeat$2 = async (deps) => {
 	const intervalMs = deps.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
@@ -21533,7 +21526,7 @@ const prepareAccountConnect$1 = async (deps) => {
 	if ((await deps.client.billing.status()).canConnect) return;
 	const status = await deps.client.billing.prepareAccountConnect();
 	if (status.canConnect) return;
-	if (status.paymentURL) await openURL(deps, status.paymentURL);
+	if (status.paymentURL) surfaceURL$1(deps, status.paymentURL);
 	await pollForSeat$2(deps);
 };
 const accountUsername = (account) => account.username.replace(/^@+/, "");
@@ -21583,7 +21576,7 @@ const connectLinkedinAccount = async (deps) => {
 		platform: LINKEDIN_PLATFORM,
 		mode: "create"
 	})).url);
-	await openURL(deps, authURL.url, { log: !authURL.openingLogged });
+	surfaceURL$1(deps, authURL.url, { log: !authURL.openingLogged });
 	return {
 		platform: LINKEDIN_PLATFORM,
 		status: "connected",
@@ -21597,7 +21590,7 @@ const reconnectLinkedinAccount = async (deps, identifier) => {
 		mode: "reconnect",
 		account: reconnectCommandTargetFor(account)
 	})).url);
-	await openURL(deps, authURL.url, { log: !authURL.openingLogged });
+	surfaceURL$1(deps, authURL.url, { log: !authURL.openingLogged });
 	return {
 		platform: LINKEDIN_PLATFORM,
 		status: "connected",
@@ -21669,20 +21662,16 @@ const throwXLifecycleError = (error) => {
 const defaultSleep = async (ms) => {
 	await new Promise((resolve) => setTimeout(resolve, ms));
 };
-const resolveWebBaseURL = async (deps) => {
-	return (typeof deps.webBaseURL === "function" ? await deps.webBaseURL() : deps.webBaseURL).replace(/\/+$/, "");
-};
 const connectURLFor = async (deps, reconnectProfileId) => {
-	const url = createURL(await resolveWebBaseURL(deps), "/connect/x/start");
-	if (reconnectProfileId) url.searchParams.set("reconnect", reconnectProfileId);
-	return url.toString();
+	return (await deps.client.accounts.reconnectURL({
+		platform: "x",
+		mode: reconnectProfileId ? "reconnect" : "create",
+		...reconnectProfileId ? { account: `profile_id:${reconnectProfileId}` } : {}
+	})).url;
 };
-const isInteractiveTerminal = (deps) => deps.isInteractiveTerminal?.() ?? process.stdout.isTTY === true;
-const openOrPrint = async (deps, url, options = {}) => {
+const surfaceURL = (deps, url, options = {}) => {
 	const log = deps.log ?? console.error;
-	if (options.log ?? true) log(`Opening ${url}`);
-	if (!(isInteractiveTerminal(deps) && deps.openBrowser)) return;
-	await deps.openBrowser(url);
+	if (options.log ?? true) log(`Open this URL: ${url}`);
 };
 const pollForAccount = async (deps, operation, matches) => {
 	const sleep = deps.sleep ?? defaultSleep;
@@ -21719,7 +21708,7 @@ const prepareAccountConnect = async (deps) => {
 	if ((await deps.client.billing.status()).canConnect) return G.ok();
 	const status = await deps.client.billing.prepareAccountConnect();
 	if (status.canConnect) return G.ok();
-	if (status.paymentURL) await openOrPrint(deps, status.paymentURL);
+	if (status.paymentURL) surfaceURL(deps, status.paymentURL);
 	return pollForSeat$1(deps);
 };
 const accountKey = (account) => account.profileId;
@@ -21768,7 +21757,7 @@ const connectXAccount = async (deps) => {
 	const prepared = await prepareAccountConnect(deps);
 	if (G.isError(prepared)) return G.err(prepared.error);
 	const authURL = await authURLFor(deps, () => connectURLFor(deps));
-	await openOrPrint(deps, authURL.url, { log: !authURL.openingLogged });
+	surfaceURL(deps, authURL.url, { log: !authURL.openingLogged });
 	const account = await pollForAccount(deps, "connect", (candidate) => {
 		if (candidate.status !== "connected") return false;
 		if (!connectedBefore.has(candidate.profileId)) return true;
@@ -21795,7 +21784,7 @@ const reconnectXAccount = async (deps, args) => {
 		account: args.account
 	}));
 	const authURL = await authURLFor(deps, () => connectURLFor(deps, existing.profileId));
-	await openOrPrint(deps, authURL.url, { log: !authURL.openingLogged });
+	surfaceURL(deps, authURL.url, { log: !authURL.openingLogged });
 	const account = await pollForAccount(deps, "reconnect", (candidate) => candidate.profileId === existing.profileId && candidate.status === "connected");
 	if (G.isError(account)) return G.err(account.error);
 	return G.ok({
@@ -23183,7 +23172,7 @@ function createEnv(opts) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.11.5";
+var version$1 = "0.11.7";
 //#endregion
 //#region src/lib/env.ts
 const URLWithTrailingSlash = url().transform(ensureTrailingSlash);
@@ -24378,22 +24367,21 @@ const createBillingCommand = (deps = {}) => {
 	const portal = defineCommand({
 		meta: commandMeta({
 			name: "portal",
-			description: "Open the hosted billing portal.",
+			description: "Print the hosted billing portal URL.",
 			capability: "read",
 			contract: readCLIContract({
 				outputSchema: BillingPortalOutput,
 				hazards: [{
 					code: "billing_portal_handoff",
-					message: "Hosted billing portal handoff; billing changes happen outside the CLI after the URL opens."
+					message: "Hosted billing portal handoff; billing changes happen outside the CLI after the URL is opened."
 				}]
 			})
 		}),
 		run: async () => {
 			const { url } = await clientFrom(deps).billing.portalURL();
-			const result = deps.isInteractiveTerminal?.() === true && deps.openURL !== void 0 ? await deps.openURL?.(url) : void 0;
 			await writeOutput$2(deps, {
-				url: result?.url ?? url,
-				opened: result?.opened === true
+				url,
+				opened: false
 			});
 		}
 	});
@@ -30435,85 +30423,6 @@ const scopePhase = async (ctx) => {
 	};
 };
 //#endregion
-//#region src/lib/browser.ts
-const WSL_VERSION = /microsoft|wsl/i;
-const BROWSER_TARGET_TIMEOUT_MS = 5e3;
-const LOCAL_HOSTS = new Set([
-	"localhost",
-	"127.0.0.1",
-	"::1"
-]);
-const displayURL = (url) => {
-	try {
-		const parsed = new URL(url);
-		parsed.searchParams.delete("token");
-		parsed.hash = "";
-		return parsed.toString();
-	} catch {
-		return url;
-	}
-};
-const hintFor = (url) => LOCAL_HOSTS.has(url.hostname) ? "Start the web app or local worker, or set SOCIAL_API_URL to your deployed social API." : "Check SOCIAL_API_URL and your connection, then try again.";
-const assertBrowserTargetReachable = async (url) => {
-	let parsed;
-	try {
-		parsed = new URL(url);
-	} catch {
-		return;
-	}
-	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return;
-	if (!LOCAL_HOSTS.has(parsed.hostname)) return;
-	const controller = new AbortController();
-	const timeout = setTimeout(() => controller.abort(), BROWSER_TARGET_TIMEOUT_MS);
-	const target = parsed.origin;
-	try {
-		const response = await fetch(target, {
-			method: "GET",
-			redirect: "manual",
-			signal: controller.signal
-		});
-		if (response.status >= 400) throw new Error(`social is reachable at ${displayURL(target)}, but it returned ${response.status}. Try again in a moment.`);
-	} catch (error) {
-		if (error instanceof Error && error.message.startsWith("social is reachable")) throw error;
-		throw new Error(`Can't reach ${displayURL(target)}. ${hintFor(parsed)}`);
-	} finally {
-		clearTimeout(timeout);
-	}
-};
-const runCommand = async (command) => await new Promise((resolve) => {
-	const [file, ...args] = command;
-	if (!file) {
-		resolve(false);
-		return;
-	}
-	const proc = spawn(file, args, { stdio: "ignore" });
-	proc.once("error", () => resolve(false));
-	proc.once("exit", (code) => resolve(code === 0));
-});
-const isWSL = async () => {
-	if (env.WSL_DISTRO_NAME || env.WSL_INTEROP) return true;
-	const version = await readFile("/proc/version", "utf8").catch(() => "");
-	return WSL_VERSION.test(version);
-};
-const openBrowser = async (url) => {
-	await assertBrowserTargetReachable(url);
-	if (process.platform === "darwin") return await runCommand(["open", url]);
-	if (process.platform === "win32") return await runCommand([
-		"cmd",
-		"/c",
-		"start",
-		url
-	]);
-	if (await isWSL()) return await runCommand(["wslview", url]) || await runCommand([
-		"powershell.exe",
-		"-NoProfile",
-		"-Command",
-		"Start-Process",
-		url
-	]);
-	return await runCommand(["xdg-open", url]);
-};
-//#endregion
 //#region src/login/phases/2.seat.ts
 const SEAT_BILLING_DETAILS_URL = publicRouteURLs.pricing;
 const SEAT_PRICING_MESSAGE = `${productBrand.name} costs $20/month/account + usage. Full details at ${SEAT_BILLING_DETAILS_URL}. Continue?`;
@@ -30535,7 +30444,6 @@ const pollForSeat = async (ctx, deps = {}) => {
 	throw new Error("Billing checkout did not complete within 30 minutes. Finish checkout in the browser, then run `social account login` again.");
 };
 const runSeatPhase = async (ctx, deps = {}) => {
-	const openBrowser$1 = deps.openBrowser ?? openBrowser;
 	const status = await ctx.client.billing.status();
 	if (seatAvailable(status)) return {
 		status: "done",
@@ -30551,7 +30459,6 @@ const runSeatPhase = async (ctx, deps = {}) => {
 	};
 	const checkout = await ctx.client.billing.checkoutURL({ returnPath: SEAT_CHECKOUT_RETURN_PATH });
 	ctx.ui.info(checkout.url);
-	await openBrowser$1(checkout.url);
 	return {
 		status: "done",
 		data: await ctx.ui.spinElapsed("Waiting for billing checkout", () => pollForSeat(ctx, deps), "Billing ready")
@@ -31329,7 +31236,7 @@ const lifecycleDepsWithTextLogs = (deps) => ({
 			spinner.start(authHandshakeMessage);
 			try {
 				const url = await operation();
-				spinner.stop(`Opening ${url}`);
+				spinner.stop(`Open this URL: ${url}`);
 				return url;
 			} catch (error) {
 				spinner.error(authHandshakeMessage);
@@ -31338,7 +31245,7 @@ const lifecycleDepsWithTextLogs = (deps) => ({
 		}
 		writeText(deps, authHandshakeMessage);
 		const url = await operation();
-		writeText(deps, `Opening ${url}`);
+		writeText(deps, `Open this URL: ${url}`);
 		return url;
 	}
 });
@@ -31363,7 +31270,7 @@ const runConnectStep = async (deps, platform, listConnected, connectURL) => {
 		return;
 	}
 	const url = await connectURL();
-	writeText(deps, `Opening ${url}`);
+	writeText(deps, `Open this URL: ${url}`);
 	await writeOutput(deps, {
 		status: "pending_approval",
 		platform,
@@ -36704,6 +36611,7 @@ const createCLIDeps = () => {
 			disconnectAccount: client.accounts.disconnect,
 			accounts: {
 				list: client.accounts.list,
+				reconnectURL: client.accounts.reconnectURL,
 				disconnect: client.accounts.disconnect
 			},
 			billing: {
@@ -36794,17 +36702,8 @@ const createCLIDeps = () => {
 				providerId: profile.id
 			};
 		},
-		openBrowser,
 		isInteractiveTerminal: () => process.stdout.isTTY === true,
 		webBaseURL: () => env.SOCIAL_WEB_URL,
-		openURL: async (url) => {
-			const opened = await openBrowser(url);
-			if (!opened) console.error(url);
-			return {
-				opened,
-				url
-			};
-		},
 		writeOutput: printData,
 		ui: createUI(process.stdout.isTTY === true)
 	};
@@ -37489,7 +37388,7 @@ const runSocial = async ({ command = createSocialCommand(), now = Date.now, rawA
 	try {
 		const loginArgError = loginExtraArgError(rawArgs, path);
 		if (loginArgError) throw loginArgError;
-		await runCommand$1(command, { rawArgs });
+		await runCommand(command, { rawArgs });
 	} catch (error) {
 		if (error instanceof SilentExit) return await finish(error.code, telemetry, now);
 		if (isCittyUsageError(error) && process.stderr.isTTY) await printUsage(command, rawArgs);