@simplepush/cli 0.4.0 → 0.6.0

package/dist/main.mjs

@@ -13,6 +13,9 @@ import { Client, DownloadError, OrgClient, TypeFilter, decryptSubmission, decryp
 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";
+//#endregion
 //#region src/errors.ts
 /** No CLI session saved — `sp auth login` hasn't been run (or was logged out). */
 var NotLoggedIn = class extends Data.TaggedError("NotLoggedIn") {};
@@ -1887,7 +1890,7 @@ const formatOption$4 = Options.choice("format", ["json", "pretty"]).pipe(Options
 const sinceOption$1 = mappedText("since", resolveSince).pipe(Options.optional, Options.withDescription("Only items created at or after this instant: ISO-8601, or a relative window like 7d, 12h, 30m."));
 const untilOption$1 = mappedText("until", (raw) => resolveUntil(raw).toISOString()).pipe(Options.optional, Options.withDescription("Only items created at or before this instant (same forms as --since)."));
 const memberOption$3 = Options.text("member").pipe(Options.optional, Options.withDescription("Only items involving this person: a usr_ id, or a member name on an org."));
-const limitOption$1 = Options.integer("limit").pipe(Options.optional, Options.withDescription("Page size (server default 50). With --all this is the page size, not a cap."));
+const limitOption$2 = Options.integer("limit").pipe(Options.optional, Options.withDescription("Page size (server default 50). With --all this is the page size, not a cap."));
 const cursorOption = Options.text("cursor").pipe(Options.optional, Options.withDescription("Continue a previous page: pass the cursor it reported."));
 const allOption = Options.boolean("all").pipe(Options.withDescription("Follow cursors until the last page instead of printing one page and a cursor."));
 const STATUSES = [
@@ -2119,7 +2122,7 @@ function extractRaw(v) {
 const eventTypeOption = Options.text("type").pipe(Options.withDescription("Filter by event type. Repeatable."), Options.repeated);
 const sinceOption = mappedText("since", resolveSince).pipe(Options.withDescription("Replay from this point. Accepts `24h`, `7d`, or an ISO 8601 timestamp."), Options.optional);
 const untilOption = mappedText("until", resolveUntil).pipe(Options.withDescription("Stop at this timestamp. Forces a finite range, so `--follow` is ignored."), Options.optional);
-const limitOption = Options.integer("limit").pipe(Options.withDescription("Maximum number of events to print, then exit."), Options.optional);
+const limitOption$1 = Options.integer("limit").pipe(Options.withDescription("Maximum number of events to print, then exit."), Options.optional);
 const followOption = Options.boolean("follow").pipe(Options.withAlias("f"), Options.withDescription("After history is drained, keep streaming live instead of exiting. Only meaningful with `--since`."));
 const memberOption$2 = Options.text("member").pipe(Options.optional, Options.withDescription("Only events by this person: a usr_ id, or the actor's name."));
 const formatOption$3 = Options.choice("format", [
@@ -2134,7 +2137,7 @@ const eventsCommand = Command.make("events", {
 	member: memberOption$2,
 	since: sinceOption,
 	until: untilOption,
-	limit: limitOption,
+	limit: limitOption$1,
 	follow: followOption,
 	format: formatOption$3,
 	direct: directOption,
@@ -2417,7 +2420,7 @@ const getCommand = Command.make("get", {
 	topic: topicOption,
 	member: memberOption$3,
 	group: groupOption,
-	limit: limitOption$1,
+	limit: limitOption$2,
 	cursor: cursorOption,
 	all: allOption,
 	format: formatOption$4,
@@ -2432,6 +2435,100 @@ const getCommand = Command.make("get", {
 	return Effect.fail(new UserError({ message: `cannot read '${args.what}': ${hint}` }));
 })).pipe(Command.withDescription("Read what came back: 'tasks' or 'submissions' for filtered listings, a tsk_ id for one task with its subtasks, a sub_ id for one subtask, a grptsk_ id for a group's per-recipient roster."));
 //#endregion
+//#region src/commands/search.ts
+const KINDS = [
+	"task",
+	"subtask",
+	"answer",
+	"reply",
+	"notification",
+	"notification_answer",
+	"submission"
+];
+const kindOption = Options.text("kind").pipe(Options.repeated, Options.mapTryCatch((values) => {
+	const flat = values.flatMap((v) => v.split(",")).map((s) => s.trim()).filter((s) => s.length > 0);
+	const bad = flat.filter((s) => !KINDS.includes(s));
+	if (bad.length > 0) throw new Error(`unknown kind ${bad.join(", ")} — use ${KINDS.join(", ")}`);
+	return flat;
+}, (e) => HelpDoc.p(e instanceof Error ? e.message : String(e))), Options.withDescription("Only these hit kinds (repeatable or comma-separated)."));
+function parsePoint(raw) {
+	const parts = raw.split(",");
+	if (parts.length === 2) {
+		const latitude = Number(parts[0].trim());
+		const longitude = Number(parts[1].trim());
+		if (Number.isFinite(latitude) && Number.isFinite(longitude) && Math.abs(latitude) <= 90 && Math.abs(longitude) <= 180) return {
+			latitude,
+			longitude
+		};
+	}
+	throw new Error(`expected \`lat,lng\` with lat in [-90,90] and lng in [-180,180], got '${raw}'`);
+}
+const nearOption = Options.text("near").pipe(Options.mapTryCatch(parsePoint, (e) => HelpDoc.p(e instanceof Error ? e.message : String(e))), Options.optional, Options.withDescription("Center of a radius filter as `lat,lng`; requires --radius. Hits come back with their point and its distance, nearest first when no words are given."));
+const radiusOption = Options.integer("radius").pipe(Options.optional, Options.withDescription("Radius around --near, in meters (1..1000000)."));
+const withinOption = Options.text("within").pipe(Options.mapTryCatch((raw) => {
+	const points = raw.split(";").map((s) => s.trim()).filter((s) => s.length > 0).map(parsePoint);
+	if (points.length < 3) throw new Error("--within needs at least 3 `lat,lng` points separated by `;`");
+	return points;
+}, (e) => HelpDoc.p(e instanceof Error ? e.message : String(e))), Options.optional, Options.withDescription("Polygon to search inside: `lat,lng` corners joined with `;` (at least 3). Not combinable with --near/--radius; hits carry no distance and come newest first without words."));
+const limitOption = Options.integer("limit").pipe(Options.optional, Options.withDescription("Best hits to return; server default 20, at most 100."));
+/** One block per hit: id, kind, when, then whatever the hit carries. */
+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.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");
+}
+const searchCommand = Command.make("search", {
+	words: Args.text({ name: "words" }).pipe(Args.withDescription("The words to look for; all must appear. Quote a phrase (nested quotes) for adjacency. Optional when --near/--radius or --within is given."), Args.repeated),
+	kind: kindOption,
+	since: sinceOption$1,
+	until: untilOption$1,
+	member: memberOption$3,
+	near: nearOption,
+	radius: radiusOption,
+	within: withinOption,
+	limit: limitOption,
+	format: formatOption$4,
+	...credentialOptions
+}, (args) => withQueryClient(args, (ctx) => Effect.gen(function* () {
+	const query = args.words.join(" ").trim();
+	const near = Option.getOrUndefined(args.near);
+	const radius = Option.getOrUndefined(args.radius);
+	const within = Option.getOrUndefined(args.within);
+	const problem = near !== void 0 && radius === void 0 ? "--near requires --radius (meters)" : radius !== void 0 && near === void 0 ? "--radius requires --near" : within !== void 0 && near !== void 0 ? "--within cannot be combined with --near/--radius" : query === "" && near === void 0 && within === void 0 ? "give words to search for, or an area (--near with --radius, or --within)" : void 0;
+	if (problem !== void 0) return yield* Effect.fail(new UserError({ message: problem }));
+	const opts = {
+		...args.kind.length > 0 ? { kind: args.kind } : {},
+		...Option.match(args.since, {
+			onNone: () => ({}),
+			onSome: (since) => ({ since })
+		}),
+		...Option.match(args.until, {
+			onNone: () => ({}),
+			onSome: (until) => ({ until })
+		}),
+		...Option.match(args.member, {
+			onNone: () => ({}),
+			onSome: (member) => ({ member })
+		}),
+		...Option.match(args.limit, {
+			onNone: () => ({}),
+			onSome: (limit) => ({ limit })
+		}),
+		...near !== void 0 && radius !== void 0 ? {
+			near,
+			radiusMeters: radius
+		} : {},
+		...within !== void 0 ? { within } : {}
+	};
+	const res = yield* sdkCall("search", () => ctx.client.search(query === "" ? void 0 : query, opts));
+	for (const h of res.hits) yield* ctx.out.print(args.format === "json" ? JSON.stringify(h) : formatHit(h));
+	if (res.hits.length === 0 && args.format === "pretty") yield* ctx.out.info("no hits");
+}))).pipe(Command.withDescription("Ranked full-text and location search over everything this credential reads, across all time. Words match literally plus stemmed in the org's configured languages; --near/--radius or --within search by place instead of or on top of words."));
+//#endregion
 //#region src/input-spec.ts
 const SETTING_RE = /^[A-Za-z_][A-Za-z0-9_]*=/;
 function looksLikeSetting(seg) {
@@ -2786,6 +2883,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);
@@ -2835,6 +2933,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,
@@ -2864,6 +2963,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";
@@ -2872,6 +2972,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);
@@ -2888,7 +2989,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({
@@ -2948,7 +3050,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({
@@ -3715,7 +3818,7 @@ const fileInput$1 = repeatedText("file-input", void 0, "Add a file upload input.
 const locationInput$1 = repeatedText("location-input", void 0, "Add a location input (the recipient shares their device GPS position from the app). Format: `description[;key=value...]`. Settings: `required=true|false`. Repeatable.");
 const linkOption$1 = repeatedText("link", "l", "Attach a remote URL (a link attachment). Repeatable. For local files use --file.");
 const fileOption$1 = repeatedText("file", "f", "Attach a local file, uploaded as a file attachment (encrypted under the send's key — topic password or org master key — when the send is encrypted). Repeatable.");
-const submitOption$1 = Options.boolean("submit").pipe(Options.withDescription("Require the recipient to explicitly submit the task. Without this, it auto-completes once the required inputs are filled."));
+const autoCommitOption$1 = Options.boolean("auto-commit").pipe(Options.withDescription("Complete the task as inputs are filled, without an explicit Submit. Default is form mode: the recipient submits everything at once."));
 const waitOption$1 = Options.boolean("wait").pipe(Options.withDescription("Block until the task is completed; print the result to stdout. Requires exactly one input on the request."));
 const replyOption$1 = Options.choice("reply", [
 	"one-shot",
@@ -3744,7 +3847,7 @@ const taskCommand = Command.make("task", {
 	"location-input": locationInput$1,
 	link: linkOption$1,
 	file: fileOption$1,
-	submit: submitOption$1,
+	"auto-commit": autoCommitOption$1,
 	wait: waitOption$1,
 	reply: replyOption$1,
 	member: memberOption,
@@ -3795,7 +3898,7 @@ const taskCommand = Command.make("task", {
 		inputs,
 		links: [...args.link],
 		files: [...args.file],
-		autoCommit: !args.submit,
+		autoCommit: args["auto-commit"],
 		reply: Option.getOrUndefined(args.reply),
 		markdown: args.markdown,
 		noEncrypt: args["no-encrypt"],
@@ -3822,7 +3925,7 @@ const taskCommand = Command.make("task", {
 			inputs,
 			links: [...args.link],
 			...files.length > 0 ? { files } : {},
-			autoCommit: !args.submit,
+			autoCommit: args["auto-commit"],
 			...Option.isSome(args.reply) ? { reply: args.reply.value } : {},
 			...args.markdown ? { contentFormat: "markdown" } : {},
 			...expiresAt !== void 0 ? { expiresAt } : {}
@@ -4029,7 +4132,7 @@ const photoInput = Options.text("photo-input").pipe(Options.withDescription("Add
 const voiceRecordingInput = Options.text("voice-recording-input").pipe(Options.withDescription("Add a voice recording input. Format: `description[;key=value...]`. Settings: `required=true|false`. Repeatable."), Options.repeated);
 const fileInput = Options.text("file-input").pipe(Options.withDescription("Add a file upload input. Format: `description[;key=value...]`. Settings: `required=true|false`. Repeatable."), Options.repeated);
 const locationInput = Options.text("location-input").pipe(Options.withDescription("Add a location input (the recipient shares their device GPS position from the app). Format: `description[;key=value...]`. Settings: `required=true|false`. Repeatable."), Options.repeated);
-const submitOption = Options.boolean("submit").pipe(Options.withDescription("Require the recipient to explicitly submit the subtask. Without this, it auto-completes once the required inputs are filled."));
+const autoCommitOption = Options.boolean("auto-commit").pipe(Options.withDescription("Complete the subtask as inputs are filled, without an explicit Submit. Default is form mode: the recipient submits everything at once."));
 const waitOption = Options.boolean("wait").pipe(Options.withDescription("Block until the subtask is completed; print the result to stdout. Requires at least one input on the append. On a group append, the first member's completion wins."));
 const formatOption = Options.choice("format", ["text", "json"]).pipe(Options.withDescription("stdout format for an append: `text` (the bare sub_ id(s), default) or `json` (a `sent` line piped to `sp collect`)."), Options.withDefault("text"));
 const replyOption = Options.choice("reply", [
@@ -4054,7 +4157,7 @@ const subtaskCommand = Command.make("subtask", {
 	"location-input": locationInput,
 	link: linkOption,
 	file: fileOption,
-	submit: submitOption,
+	"auto-commit": autoCommitOption,
 	wait: waitOption,
 	format: formatOption,
 	reply: replyOption,
@@ -4084,7 +4187,7 @@ const subtaskCommand = Command.make("subtask", {
 		...content !== void 0 ? { content } : {},
 		...inputs.length > 0 ? { inputs } : {},
 		links: [...args.link],
-		autoCommit: !args.submit,
+		autoCommit: args["auto-commit"],
 		...Option.isSome(args.reply) ? { reply: args.reply.value } : {},
 		...args.markdown ? { contentFormat: "markdown" } : {}
 	};
@@ -4243,11 +4346,12 @@ const root = Command.make("simplepush").pipe(Command.withSubcommands([
 	taskCommand,
 	subtaskCommand,
 	cancelCommand,
-	getCommand
+	getCommand,
+	searchCommand
 ]));
 const cli = Command.run(root, {
 	name: "Simplepush CLI",
-	version: "0.2.0"
+	version
 });
 const MainLive = Layer.mergeAll(CliOutput.Default, Sodium.Default, AuthStore.Default, VaultStore.Default, InviteStore.Default, Api.Default, VaultAccess.Default).pipe(Layer.provideMerge(FetchHttpClient.layer), Layer.provideMerge(NodeContext.layer));
 /** Render any failure through the typed-error table, then re-fail so the