@simplepush/cli 0.5.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.5.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");
@@ -2883,6 +2908,7 @@ const broadcastOption$1 = Options.boolean("broadcast").pipe(Options.withAlias("b
 const orgTopicOption$1 = Options.text("org-topic").pipe(Options.withAlias("o"), Options.withDescription("Send to an org topic by value (from `sp org topics list`). Org send; mutually exclusive with --member, --broadcast, and -k/--topic (the personal topic)."), Options.optional);
 const tagOption$1 = Options.text("tag").pipe(Options.withDescription("Optional notification tag — recipients can use it to coalesce / replace prior notifications with the same tag."), Options.optional);
 const imageOption = Options.text("image").pipe(Options.withDescription("Image URL to show in the push (PNG/JPEG/GIF). Renders on iOS + Android. Mutually exclusive with --audio. URLs only — file uploads are SDK-only."), Options.optional);
+const linkOption$2 = Options.text("link").pipe(Options.withAlias("l"), Options.withDescription("A URL shown as an \"Open link\" button on the push. Any scheme: https opens the browser, an app's deep link (unifi-protect://...) opens that app. Mutually exclusive with the input flags."), Options.optional);
 const audioOption = Options.text("audio").pipe(Options.withDescription("Audio URL to play inline in the push (AIFF/WAV/MP3/M4A; iOS only). Mutually exclusive with --image. URLs only."), Options.optional);
 const noEncryptOption$2 = Options.boolean("no-encrypt").pipe(Options.withDescription("Send the body in plaintext even when an unlocked vault is available."));
 const actionInputOption = Options.text("action-input").pipe(Options.withAlias("a"), Options.withDescription("Add an actions input: tap-buttons the recipient answers with (e.g. Accept/Deny). Format: `[description;]key=Label[:style],...`, actions comma-separated; style is default|destructive. Use `\\,` for a literal comma in a label. A notification carries at most one input."), Options.optional);
@@ -2932,6 +2958,7 @@ const notifyCommand = Command.make("notify", {
 	tag: tagOption$1,
 	image: imageOption,
 	audio: audioOption,
+	link: linkOption$2,
 	"text-input": textInputOption,
 	"choice-input": choiceInputOption,
 	"action-input": actionInputOption,
@@ -2961,6 +2988,7 @@ const notifyCommand = Command.make("notify", {
 	const message = args.content;
 	const imageUrl = Option.getOrUndefined(args.image);
 	const audioUrl = Option.getOrUndefined(args.audio);
+	const linkUrl = Option.getOrUndefined(args.link);
 	if (imageUrl !== void 0 && audioUrl !== void 0) return yield* Effect.fail(new UserError({ message: "only one of --image or --audio may be set" }));
 	const mediaUrl = imageUrl ?? audioUrl;
 	const mediaKind = imageUrl !== void 0 ? "image" : "audio";
@@ -2969,6 +2997,7 @@ const notifyCommand = Command.make("notify", {
 		if (notifyMediaContentType(mediaUrl, mediaKind) === null) return yield* Effect.fail(new UserError({ message: `--${mediaKind} URL must point to a supported ${mediaKind} type (by extension); got "${mediaUrl}"` }));
 	}
 	const input = yield* parseNotificationInput(args["text-input"], Option.getOrUndefined(args["choice-input"]), Option.getOrUndefined(args["action-input"]));
+	if (input !== void 0 && linkUrl !== void 0) return yield* Effect.fail(new UserError({ message: "a notification carries either an input or --link, not both: the input's buttons take the action slots, so the link would never be shown" }));
 	if (isOrgTarget) {
 		const api = yield* Api;
 		const vault = yield* (yield* VaultAccess).forSendOrPlaintext(args.noEncrypt);
@@ -2985,7 +3014,8 @@ const notifyCommand = Command.make("notify", {
 			...tagOpt !== void 0 ? { tag: tagOpt } : {},
 			...input !== void 0 ? { input } : {},
 			...imageUrl !== void 0 ? { image: imageUrl } : {},
-			...audioUrl !== void 0 ? { audio: audioUrl } : {}
+			...audioUrl !== void 0 ? { audio: audioUrl } : {},
+			...linkUrl !== void 0 ? { link: linkUrl } : {}
 		};
 		yield* Effect.scoped(Effect.gen(function* () {
 			const client = yield* acquireOrgClient({
@@ -3045,7 +3075,8 @@ const notifyCommand = Command.make("notify", {
 		...tagOpt !== void 0 ? { tag: tagOpt } : {},
 		...input !== void 0 ? { input } : {},
 		...imageUrl !== void 0 ? { image: imageUrl } : {},
-		...audioUrl !== void 0 ? { audio: audioUrl } : {}
+		...audioUrl !== void 0 ? { audio: audioUrl } : {},
+		...linkUrl !== void 0 ? { link: linkUrl } : {}
 	};
 	yield* Effect.scoped(Effect.gen(function* () {
 		const client = yield* acquireClient({