@simplepush/cli 0.6.0 → 0.7.0

package/dist/main.mjs

@@ -14,7 +14,7 @@ import { mkdir, stat, writeFile } from "node:fs/promises";
 import { connect, createConnection } from "node:net";
 import path, { basename, extname, join } from "node:path";
 //#region package.json
-var version = "0.6.0";
+var version = "0.7.0";
 //#endregion
 //#region src/errors.ts
 /** No CLI session saved — `sp auth login` hasn't been run (or was logged out). */
@@ -573,6 +573,46 @@ const quietOption = Options.boolean("quiet").pipe(Options.withAlias("q"), Option
 /** Shared helper for repeatable validated text options. */
 const mappedText = (name, parse) => Options.text(name).pipe(Options.mapTryCatch(parse, toHelp));
 //#endregion
+//#region src/services/browser.ts
+/** The command line that opens `url` on `platform`. Pure, so it can be tested
+* for every platform from one machine. */
+function browserLaunch(platform, url) {
+	switch (platform) {
+		case "darwin": return {
+			command: "open",
+			args: [url],
+			windowsVerbatimArguments: false
+		};
+		case "win32": return {
+			command: "cmd",
+			args: [
+				"/c",
+				"start",
+				"\"\"",
+				url.replace(/&/g, "^&")
+			],
+			windowsVerbatimArguments: true
+		};
+		default: return {
+			command: "xdg-open",
+			args: [url],
+			windowsVerbatimArguments: false
+		};
+	}
+}
+/** Fire-and-forget. A failure to spawn is swallowed: the caller has already
+* printed the URL, so the user can open it by hand. */
+const openInBrowser = (url) => Effect.sync(() => {
+	const launch = browserLaunch(process.platform, url);
+	try {
+		spawn(launch.command, launch.args, {
+			detached: true,
+			stdio: "ignore",
+			windowsVerbatimArguments: launch.windowsVerbatimArguments
+		}).unref();
+	} catch {}
+});
+//#endregion
 //#region src/format.ts
 function formatInstant(iso) {
 	const d = new Date(iso);
@@ -661,21 +701,6 @@ const startCallbackServer = Effect.gen(function* () {
 		awaitCallback: Deferred.await(callback)
 	};
 });
-const openInBrowser = (url) => Effect.sync(() => {
-	const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
-	const args = process.platform === "win32" ? [
-		"/c",
-		"start",
-		"",
-		url
-	] : [url];
-	try {
-		spawn(cmd, args, {
-			detached: true,
-			stdio: "ignore"
-		}).unref();
-	} catch {}
-});
 function preferDeviceFlow() {
 	if (process.env.SP_AUTH_DEVICE === "1") return true;
 	if (process.env.SSH_CONNECTION || process.env.SSH_TTY) return true;
@@ -2476,7 +2501,7 @@ function formatHit(h) {
 	return [
 		`${h.ref}  [${h.kind}]  ${h.createdAt}`,
 		h.title !== void 0 ? `  ${h.title}` : void 0,
-		h.actor !== void 0 ? `  by: ${h.actor}` : void 0,
+		h.actor !== void 0 ? `  by: ${h.actor.name !== void 0 ? `${h.actor.name} (${h.actor.publicId})` : h.actor.publicId}` : void 0,
 		h.snippet !== void 0 ? `  ${h.snippet}` : void 0,
 		h.location !== void 0 ? `  at: ${h.location.latitude},${h.location.longitude}${h.location.distanceMeters !== void 0 ? ` (${Math.round(h.location.distanceMeters)}m away)` : ""}` : void 0
 	].filter((l) => l !== void 0).join("\n");