@henryqw/pi-bark 0.1.3 → 0.2.0

package/README.md

@@ -51,8 +51,8 @@ The `body` value is the same text that Pi's `/copy` command selects. Markdown, c
 | --- | --- | --- |
 | `/copyb` | command | Copy the last agent message and send a Bark push notification. |
 | `/set-bark <device-key> [server-url]` | command | Save the Device Key and Bark server URL. |
-| `/bark-notifications on\|off\|inherit` | command | Override automatic status notifications for the current CWD. |
-| `/bark-notifications default on\|off` | command | Set the default for CWDs without an override. |
+| `/bark on\|off\|inherit` | command | Override automatic status notifications for the current CWD. |
+| `/bark default on\|off` | command | Set the default for CWDs without an override. |
 | `pi-bark-key [--force \| --disable]` | executable | Generate, replace, or disable the Custom Encryption Key. |
 
 ### Automatic status notifications
@@ -69,7 +69,7 @@ An unset session name appears as `Unnamed`. Status notifications do not include
 Automatic notifications are enabled by default. Disable them only in the current CWD:
 
 ```text
-/bark-notifications off
+/bark off
 ```
 
 Use `on` to enable the current CWD explicitly. Use `inherit` to remove its override. The CWD then follows the global default.
@@ -77,7 +77,7 @@ Use `on` to enable the current CWD explicitly. Use `inherit` to remove its overr
 Change that default for all CWDs without an override:
 
 ```text
-/bark-notifications default off
+/bark default off
 ```
 
 These settings do not affect `/copyb`. CWD overrides live in pi-bark's global config, not in project files.

package/dist/src/encryption.js

@@ -1,9 +1,8 @@
 import { createCipheriv, randomBytes } from "node:crypto";
 import { ENCRYPTION_KEY_BYTES } from "./config.js";
-const RANDOM_TEXT_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 const GCM_IV_BYTES = 12;
 function randomText(length) {
-    return Array.from(randomBytes(length), (byte) => RANDOM_TEXT_ALPHABET[byte & 63]).join("");
+    return randomBytes(length).toString("base64url").slice(0, length);
 }
 export function generateEncryptionKey() {
     return randomText(ENCRYPTION_KEY_BYTES);

package/extensions/bark.ts

@@ -3,7 +3,6 @@ import { copyToClipboard, type ExtensionAPI, type SessionEntry } from "@earendil
 import {
 	createBarkConfigStore,
 	DEFAULT_SERVER_URL,
-	parseDeviceKey,
 	parseServerUrl,
 	statusNotificationsEnabled,
 	type BarkConfig,
@@ -68,28 +67,22 @@ export default function barkExtension(pi: ExtensionAPI, options: BarkExtensionOp
 
 	let statusPushQueue = Promise.resolve();
 	let pendingFinishedPush: AbortController | undefined;
-	const queueStatus = (
+	const queueStatus = async (
 		title: string,
 		cwd: string,
 		shouldSend?: Promise<boolean>,
 		cancelSignal?: AbortSignal,
 	): Promise<void> => {
-		let configSnapshot: BarkConfig;
-		try {
-			configSnapshot = configStore.loadSync().value;
-		} catch (error) {
-			return Promise.reject(error);
-		}
-		if (!configSnapshot.deviceKey || !statusNotificationsEnabled(configSnapshot, cwd)) return Promise.resolve();
+		const configSnapshot = configStore.loadSync().value;
+		if (!configSnapshot.deviceKey || !statusNotificationsEnabled(configSnapshot, cwd)) return;
 		const sessionName = pi.getSessionName()?.trim() || "Unnamed";
 		const contentSnapshot = { title, body: `Pi session: ${sessionName}` };
 		const send = async () => {
 			if (shouldSend && !(await shouldSend)) return;
 			await sendPush(configSnapshot, contentSnapshot, fetchImpl, cancelSignal);
 		};
-		const push = statusPushQueue.then(send, send);
-		statusPushQueue = push;
-		return push;
+		statusPushQueue = statusPushQueue.then(send, send);
+		return statusPushQueue;
 	};
 
 	pi.on("ui_prompt_start", (_event, ctx) => {
@@ -120,12 +113,12 @@ export default function barkExtension(pi: ExtensionAPI, options: BarkExtensionOp
 			});
 	});
 
-	pi.registerCommand("bark-notifications", {
+	pi.registerCommand("bark", {
 		description: "Configure automatic Bark status notifications",
 		handler: async (args, ctx) => {
 			const [first, second, extra] = args.trim().split(/\s+/);
 			if (extra || (first === "default" ? !["on", "off"].includes(second) : second)) {
-				throw new Error("Usage: /bark-notifications <on|off|inherit> | default <on|off>");
+				throw new Error("Usage: /bark <on|off|inherit> | default <on|off>");
 			}
 			if (first === "default") {
 				const enabled = second === "on";
@@ -137,7 +130,7 @@ export default function barkExtension(pi: ExtensionAPI, options: BarkExtensionOp
 				return;
 			}
 			if (!(["on", "off", "inherit"] as const).includes(first as "on" | "off" | "inherit")) {
-				throw new Error("Usage: /bark-notifications <on|off|inherit> | default <on|off>");
+				throw new Error("Usage: /bark <on|off|inherit> | default <on|off>");
 			}
 			const cwd = resolve(ctx.cwd);
 			await configStore.update((config) => {
@@ -182,7 +175,7 @@ export default function barkExtension(pi: ExtensionAPI, options: BarkExtensionOp
 			await configStore.update((config) => ({
 				...config,
 				serverUrl: parseServerUrl(serverUrl),
-				deviceKey: parseDeviceKey(deviceKey),
+				deviceKey,
 			}));
 			ctx.ui.notify("Saved the Bark Device Key and server URL.", "info");
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-bark",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Send Pi session status and agent output to Bark on iOS.",
   "keywords": [
     "pi-package",
@@ -19,7 +19,6 @@
     "dist",
     "docs",
     "extensions",
-    "scripts",
     "src",
     "README.md"
   ],
@@ -28,7 +27,6 @@
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
-    "generate:key": "npm run build && node dist/scripts/generate-encryption-key.js",
     "test": "npm run build && node --test test/*.test.ts",
     "typecheck": "tsc --noEmit --allowImportingTsExtensions --target ES2022 --module NodeNext --moduleResolution NodeNext --skipLibCheck extensions/bark.ts scripts/*.ts src/*.ts test/*.test.ts",
     "prepack": "npm run build",

package/src/encryption.ts

@@ -1,11 +1,10 @@
 import { createCipheriv, randomBytes } from "node:crypto";
 import { ENCRYPTION_KEY_BYTES, type BarkEncryption } from "./config.ts";
 
-const RANDOM_TEXT_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 const GCM_IV_BYTES = 12;
 
 function randomText(length: number): string {
-	return Array.from(randomBytes(length), (byte) => RANDOM_TEXT_ALPHABET[byte & 63]).join("");
+	return randomBytes(length).toString("base64url").slice(0, length);
 }
 
 export function generateEncryptionKey(): string {

package/scripts/generate-encryption-key.ts

@@ -1,52 +0,0 @@
-#!/usr/bin/env node
-
-import {
-	createBarkConfigStore,
-	ENCRYPTION_ALGORITHM,
-	ENCRYPTION_MODE,
-	ENCRYPTION_PADDING,
-} from "../src/config.ts";
-import { generateEncryptionKey } from "../src/encryption.ts";
-
-const args = process.argv.slice(2);
-const force = args.length === 1 && args[0] === "--force";
-const disable = args.length === 1 && args[0] === "--disable";
-
-if (args.length > 1 || (args.length === 1 && !force && !disable)) {
-	console.error("Usage: pi-bark-key [--force | --disable]");
-	process.exitCode = 1;
-} else {
-	const store = createBarkConfigStore();
-	try {
-		if (disable) {
-			await store.update((config) => ({ ...config, encryption: null }));
-			console.log("Disabled Bark push encryption.");
-		} else {
-			let key = "";
-			await store.update((config) => {
-				if (config.encryption && !force) {
-					throw new Error("A Bark Custom Encryption Key already exists. Use --force to replace it.");
-				}
-				key = generateEncryptionKey();
-				return {
-					...config,
-					encryption: {
-						algorithm: ENCRYPTION_ALGORITHM,
-						mode: ENCRYPTION_MODE,
-						padding: ENCRYPTION_PADDING,
-						key,
-					},
-				};
-			});
-			console.log("Generated and saved a Bark Custom Encryption Key.");
-			console.log(`Algorithm: ${ENCRYPTION_ALGORITHM}`);
-			console.log(`Mode: ${ENCRYPTION_MODE}`);
-			console.log(`Padding: ${ENCRYPTION_PADDING}`);
-			console.log(`Key: ${key}`);
-			console.log("Enter these settings in Bark App > Push Encryption.");
-		}
-	} catch (error) {
-		console.error(error instanceof Error ? error.message : String(error));
-		process.exitCode = 1;
-	}
-}