@herbertgao/pi-extensions 2026.9.9 → 2026.9.11

package/node_modules/@narumitw/pi-caffeinate/src/dbus-inhibit.ts

@@ -11,143 +11,137 @@ const DBUS_CALL_TIMEOUT_MS = 2_000;
 type DbusFailureHandler = (error: Error) => void;
 
 export interface DbusScreenSaverClient {
-	setFailureHandler(handler: DbusFailureHandler | undefined): void;
-	inhibit(reason: string, signal?: AbortSignal): Promise<void>;
-	uninhibit(): Promise<void>;
-	close(): Promise<void>;
+  setFailureHandler(handler: DbusFailureHandler | undefined): void;
+  inhibit(reason: string, signal?: AbortSignal): Promise<void>;
+  uninhibit(): Promise<void>;
+  close(): Promise<void>;
 }
 
 export type DbusScreenSaverFactory = () => Promise<DbusScreenSaverClient>;
 
 export async function defaultDbusScreenSaverFactory(): Promise<DbusScreenSaverClient> {
-	const { sessionBus } = await import("dbus-native");
-	return new NativeScreenSaverClient(sessionBus());
+  const { sessionBus } = await import("dbus-native");
+  return new NativeScreenSaverClient(sessionBus());
 }
 
 class NativeScreenSaverClient implements DbusScreenSaverClient {
-	private cookie?: number;
-	private objectPath?: string;
-	private failureHandler?: DbusFailureHandler;
-	private pendingFailure?: Error;
-	private lastConnectionError?: Error;
-	private closing = false;
-
-	private readonly handleConnectionError = (error: unknown) => {
-		this.lastConnectionError = toError(error, "D-Bus session connection failed");
-		if (this.cookie !== undefined) this.reportFailure(this.lastConnectionError);
-	};
-
-	private readonly handleConnectionClose = (error?: unknown) => {
-		if (this.closing || this.cookie === undefined) return;
-		this.reportFailure(
-			toError(error, this.lastConnectionError?.message ?? "D-Bus session connection closed"),
-		);
-	};
-
-	constructor(private readonly bus: MessageBus) {
-		this.bus.connection.on("error", this.handleConnectionError);
-		this.bus.connection.on("close", this.handleConnectionClose);
-	}
-
-	setFailureHandler(handler: DbusFailureHandler | undefined): void {
-		this.failureHandler = handler;
-		if (!handler || !this.pendingFailure) return;
-		const failure = this.pendingFailure;
-		this.pendingFailure = undefined;
-		handler(failure);
-	}
-
-	async inhibit(reason: string, signal?: AbortSignal): Promise<void> {
-		let lastError: unknown;
-		for (const objectPath of SCREENSAVER_OBJECT_PATHS) {
-			if (signal?.aborted) throw abortReason(signal);
-			try {
-				this.cookie = await invoke<number>(
-					this.bus,
-					{
-						destination: SCREENSAVER_BUS_NAME,
-						path: objectPath,
-						interface: SCREENSAVER_INTERFACE,
-						member: "Inhibit",
-						signature: "ss",
-						body: [INHIBIT_APPLICATION_NAME, reason],
-					},
-					signal,
-				);
-				this.objectPath = objectPath;
-				return;
-			} catch (error) {
-				if (signal?.aborted) throw abortReason(signal);
-				lastError = error;
-			}
-		}
-		throw new Error(`D-Bus idle inhibit failed: ${formatError(lastError)}`, {
-			cause: lastError,
-		});
-	}
-
-	async uninhibit(): Promise<void> {
-		if (this.cookie === undefined || !this.objectPath) return;
-		const cookie = this.cookie;
-		this.cookie = undefined;
-		const objectPath = this.objectPath;
-		this.objectPath = undefined;
-		await invoke<void>(this.bus, {
-			destination: SCREENSAVER_BUS_NAME,
-			path: objectPath,
-			interface: SCREENSAVER_INTERFACE,
-			member: "UnInhibit",
-			signature: "u",
-			body: [cookie],
-		});
-	}
-
-	async close(): Promise<void> {
-		this.closing = true;
-		this.cookie = undefined;
-		this.objectPath = undefined;
-		this.failureHandler = undefined;
-		try {
-			await this.bus.close();
-		} finally {
-			this.bus.connection.off("error", this.handleConnectionError);
-			this.bus.connection.off("close", this.handleConnectionClose);
-		}
-	}
-
-	private reportFailure(error: Error): void {
-		if (this.cookie === undefined) return;
-		this.cookie = undefined;
-		this.objectPath = undefined;
-		if (this.failureHandler) this.failureHandler(error);
-		else this.pendingFailure = error;
-	}
+  private cookie?: number;
+  private objectPath?: string;
+  private failureHandler?: DbusFailureHandler;
+  private pendingFailure?: Error;
+  private lastConnectionError?: Error;
+  private closing = false;
+
+  private readonly handleConnectionError = (error: unknown) => {
+    this.lastConnectionError = toError(error, "D-Bus session connection failed");
+    if (this.cookie !== undefined) this.reportFailure(this.lastConnectionError);
+  };
+
+  private readonly handleConnectionClose = (error?: unknown) => {
+    if (this.closing || this.cookie === undefined) return;
+    this.reportFailure(toError(error, this.lastConnectionError?.message ?? "D-Bus session connection closed"));
+  };
+
+  constructor(private readonly bus: MessageBus) {
+    this.bus.connection.on("error", this.handleConnectionError);
+    this.bus.connection.on("close", this.handleConnectionClose);
+  }
+
+  setFailureHandler(handler: DbusFailureHandler | undefined): void {
+    this.failureHandler = handler;
+    if (!handler || !this.pendingFailure) return;
+    const failure = this.pendingFailure;
+    this.pendingFailure = undefined;
+    handler(failure);
+  }
+
+  async inhibit(reason: string, signal?: AbortSignal): Promise<void> {
+    let lastError: unknown;
+    for (const objectPath of SCREENSAVER_OBJECT_PATHS) {
+      if (signal?.aborted) throw abortReason(signal);
+      try {
+        this.cookie = await invoke<number>(
+          this.bus,
+          {
+            destination: SCREENSAVER_BUS_NAME,
+            path: objectPath,
+            interface: SCREENSAVER_INTERFACE,
+            member: "Inhibit",
+            signature: "ss",
+            body: [INHIBIT_APPLICATION_NAME, reason],
+          },
+          signal,
+        );
+        this.objectPath = objectPath;
+        return;
+      } catch (error) {
+        if (signal?.aborted) throw abortReason(signal);
+        lastError = error;
+      }
+    }
+    throw new Error(`D-Bus idle inhibit failed: ${formatError(lastError)}`, {
+      cause: lastError,
+    });
+  }
+
+  async uninhibit(): Promise<void> {
+    if (this.cookie === undefined || !this.objectPath) return;
+    const cookie = this.cookie;
+    this.cookie = undefined;
+    const objectPath = this.objectPath;
+    this.objectPath = undefined;
+    await invoke<void>(this.bus, {
+      destination: SCREENSAVER_BUS_NAME,
+      path: objectPath,
+      interface: SCREENSAVER_INTERFACE,
+      member: "UnInhibit",
+      signature: "u",
+      body: [cookie],
+    });
+  }
+
+  async close(): Promise<void> {
+    this.closing = true;
+    this.cookie = undefined;
+    this.objectPath = undefined;
+    this.failureHandler = undefined;
+    try {
+      await this.bus.close();
+    } finally {
+      this.bus.connection.off("error", this.handleConnectionError);
+      this.bus.connection.off("close", this.handleConnectionClose);
+    }
+  }
+
+  private reportFailure(error: Error): void {
+    if (this.cookie === undefined) return;
+    this.cookie = undefined;
+    this.objectPath = undefined;
+    if (this.failureHandler) this.failureHandler(error);
+    else this.pendingFailure = error;
+  }
 }
 
-function invoke<TResult>(
-	bus: MessageBus,
-	message: Message,
-	signal?: AbortSignal,
-): Promise<TResult> {
-	return new Promise<TResult>((resolve, reject) => {
-		bus.invoke(message, { signal, timeout: DBUS_CALL_TIMEOUT_MS }, (error, ...values) => {
-			if (error) reject(error);
-			else resolve(values[0] as TResult);
-		});
-	});
+function invoke<TResult>(bus: MessageBus, message: Message, signal?: AbortSignal): Promise<TResult> {
+  return new Promise<TResult>((resolve, reject) => {
+    bus.invoke(message, { signal, timeout: DBUS_CALL_TIMEOUT_MS }, (error, ...values) => {
+      if (error) reject(error);
+      else resolve(values[0] as TResult);
+    });
+  });
 }
 
 function abortReason(signal: AbortSignal): unknown {
-	return signal.reason ?? new DOMException("D-Bus idle inhibit cancelled", "AbortError");
+  return signal.reason ?? new DOMException("D-Bus idle inhibit cancelled", "AbortError");
 }
 
 function toError(error: unknown, fallback: string): Error {
-	return error instanceof Error ? error : new Error(fallback);
+  return error instanceof Error ? error : new Error(fallback);
 }
 
 function formatError(error: unknown) {
-	if (error instanceof Error) {
-		return error.name === "Error" ? error.message : `${error.name}: ${error.message}`;
-	}
-	return String(error);
+  if (error instanceof Error) {
+    return error.name === "Error" ? error.message : `${error.name}: ${error.message}`;
+  }
+  return String(error);
 }

package/node_modules/@narumitw/pi-caffeinate/src/inhibitor-process.ts

@@ -3,41 +3,41 @@ import process from "node:process";
 import type { InhibitorCommand } from "./inhibitors.js";
 
 export function startInhibitorProcess(
-	command: InhibitorCommand,
-	onError: (error: Error) => void,
-	onUnexpectedExit: (description: string) => void,
+  command: InhibitorCommand,
+  onError: (error: Error) => void,
+  onUnexpectedExit: (description: string) => void,
 ): ChildProcess {
-	const child = spawn(command.command, command.args, {
-		detached: false,
-		stdio: [command.releaseOnStdinClose ? "pipe" : "ignore", "pipe", "pipe"],
-	});
-	child.once("error", onError);
-	child.once("exit", (code, signal) => onUnexpectedExit(formatExit(code, signal)));
-	return child;
+  const child = spawn(command.command, command.args, {
+    detached: false,
+    stdio: [command.releaseOnStdinClose ? "pipe" : "ignore", "pipe", "pipe"],
+  });
+  child.once("error", onError);
+  child.once("exit", (code, signal) => onUnexpectedExit(formatExit(code, signal)));
+  return child;
 }
 
 export function stopInhibitorProcess(child: ChildProcess, command: InhibitorCommand | undefined) {
-	child.removeAllListeners("exit");
-	child.removeAllListeners("error");
-	if (child.killed) return;
+  child.removeAllListeners("exit");
+  child.removeAllListeners("error");
+  if (child.killed) return;
 
-	if (command?.releaseOnStdinClose && child.stdin && !child.stdin.destroyed) {
-		child.stdin.end();
-		if (child.exitCode === null && child.signalCode === null) {
-			const killTimer = setTimeout(() => {
-				if (child.exitCode === null && child.signalCode === null && !child.killed) child.kill();
-			}, 2000);
-			killTimer.unref();
-			child.once("exit", () => clearTimeout(killTimer));
-		}
-	} else if (process.platform === "win32") {
-		child.kill();
-	} else {
-		child.kill("SIGTERM");
-	}
+  if (command?.releaseOnStdinClose && child.stdin && !child.stdin.destroyed) {
+    child.stdin.end();
+    if (child.exitCode === null && child.signalCode === null) {
+      const killTimer = setTimeout(() => {
+        if (child.exitCode === null && child.signalCode === null && !child.killed) child.kill();
+      }, 2000);
+      killTimer.unref();
+      child.once("exit", () => clearTimeout(killTimer));
+    }
+  } else if (process.platform === "win32") {
+    child.kill();
+  } else {
+    child.kill("SIGTERM");
+  }
 }
 
 function formatExit(code: number | null, signal: NodeJS.Signals | null) {
-	if (signal) return `signal ${signal}`;
-	return `code ${code ?? "unknown"}`;
+  if (signal) return `signal ${signal}`;
+  return `code ${code ?? "unknown"}`;
 }

package/node_modules/@narumitw/pi-caffeinate/src/inhibitors.ts

@@ -4,164 +4,146 @@ import process from "node:process";
 import type { CaffeinateMode } from "./settings.js";
 
 export interface InhibitorCommand {
-	command: string;
-	args: string[];
-	description: string;
-	releaseOnStdinClose?: boolean;
-	custom?: boolean;
-	/** Display mode also needs D-Bus because logind idle inhibition misses some compositors. */
-	addDbusIdleInhibit?: boolean;
+  command: string;
+  args: string[];
+  description: string;
+  releaseOnStdinClose?: boolean;
+  custom?: boolean;
+  /** Display mode also needs D-Bus because logind idle inhibition misses some compositors. */
+  addDbusIdleInhibit?: boolean;
 }
 
 export function getInhibitorCommand(mode: CaffeinateMode): InhibitorCommand | undefined {
-	const customCommand = process.env.PI_CAFFEINATE_COMMAND?.trim();
-	if (customCommand) {
-		const [command, ...args] = splitCommand(customCommand);
-		if (command) return { command, args, description: `custom command (${command})`, custom: true };
-	}
-	if (process.platform === "darwin") {
-		return parentBoundUnixCommand(
-			"caffeinate",
-			macCaffeinateArgs(mode),
-			caffeinateDescription(mode),
-		);
-	}
-	if (process.platform === "linux") {
-		if (isWsl() && commandExists("powershell.exe")) {
-			return windowsPowerInhibitorCommand("powershell.exe", mode);
-		}
-		if (commandExists("systemd-inhibit")) {
-			const what = mode === "display" ? "idle:sleep" : "sleep";
-			return parentBoundUnixCommand(
-				"systemd-inhibit",
-				[
-					`--what=${what}`,
-					"--who=pi-caffeinate",
-					"--why=Pi agent is running",
-					"--mode=block",
-					"sleep",
-					"infinity",
-				],
-				`systemd-inhibit (${formatMode(mode)})`,
-				mode === "display",
-			);
-		}
-		if (commandExists("caffeinate")) {
-			return parentBoundUnixCommand(
-				"caffeinate",
-				macCaffeinateArgs(mode),
-				caffeinateDescription(mode),
-				mode === "display",
-			);
-		}
-	}
-	if (process.platform === "win32") return windowsPowerInhibitorCommand("powershell.exe", mode);
-	return undefined;
+  const customCommand = process.env.PI_CAFFEINATE_COMMAND?.trim();
+  if (customCommand) {
+    const [command, ...args] = splitCommand(customCommand);
+    if (command) return { command, args, description: `custom command (${command})`, custom: true };
+  }
+  if (process.platform === "darwin") {
+    return parentBoundUnixCommand("caffeinate", macCaffeinateArgs(mode), caffeinateDescription(mode));
+  }
+  if (process.platform === "linux") {
+    if (isWsl() && commandExists("powershell.exe")) {
+      return windowsPowerInhibitorCommand("powershell.exe", mode);
+    }
+    if (commandExists("systemd-inhibit")) {
+      const what = mode === "display" ? "idle:sleep" : "sleep";
+      return parentBoundUnixCommand(
+        "systemd-inhibit",
+        [`--what=${what}`, "--who=pi-caffeinate", "--why=Pi agent is running", "--mode=block", "sleep", "infinity"],
+        `systemd-inhibit (${formatMode(mode)})`,
+        mode === "display",
+      );
+    }
+    if (commandExists("caffeinate")) {
+      return parentBoundUnixCommand(
+        "caffeinate",
+        macCaffeinateArgs(mode),
+        caffeinateDescription(mode),
+        mode === "display",
+      );
+    }
+  }
+  if (process.platform === "win32") return windowsPowerInhibitorCommand("powershell.exe", mode);
+  return undefined;
 }
 
 function macCaffeinateArgs(mode: CaffeinateMode) {
-	return mode === "sleep" ? ["-ims"] : ["-dimsu"];
+  return mode === "sleep" ? ["-ims"] : ["-dimsu"];
 }
 
 function caffeinateDescription(mode: CaffeinateMode) {
-	return `caffeinate (${formatMode(mode)})`;
+  return `caffeinate (${formatMode(mode)})`;
 }
 
 function parentBoundUnixCommand(
-	command: string,
-	args: string[],
-	description: string,
-	addDbusIdleInhibit = false,
+  command: string,
+  args: string[],
+  description: string,
+  addDbusIdleInhibit = false,
 ): InhibitorCommand {
-	return {
-		command: "sh",
-		args: [
-			"-c",
-			unixParentBoundScript(),
-			"pi-caffeinate-watch",
-			String(process.pid),
-			command,
-			...args,
-		],
-		description,
-		...(addDbusIdleInhibit ? { addDbusIdleInhibit: true } : {}),
-	};
+  return {
+    command: "sh",
+    args: ["-c", unixParentBoundScript(), "pi-caffeinate-watch", String(process.pid), command, ...args],
+    description,
+    ...(addDbusIdleInhibit ? { addDbusIdleInhibit: true } : {}),
+  };
 }
 
 function unixParentBoundScript() {
-	return `parent=$1; shift; "$@" & child=$!; ( while kill -0 "$parent" 2>/dev/null; do sleep 5; done; kill "$child" 2>/dev/null ) & watcher=$!; cleanup() { kill "$watcher" 2>/dev/null; kill "$child" 2>/dev/null; wait "$child" 2>/dev/null; }; trap 'cleanup; exit 0' INT TERM HUP EXIT; wait "$child"; status=$?; kill "$watcher" 2>/dev/null; trap - EXIT; exit "$status"`;
+  return `parent=$1; shift; "$@" & child=$!; ( while kill -0 "$parent" 2>/dev/null; do sleep 5; done; kill "$child" 2>/dev/null ) & watcher=$!; cleanup() { kill "$watcher" 2>/dev/null; kill "$child" 2>/dev/null; wait "$child" 2>/dev/null; }; trap 'cleanup; exit 0' INT TERM HUP EXIT; wait "$child"; status=$?; kill "$watcher" 2>/dev/null; trap - EXIT; exit "$status"`;
 }
 
 function commandExists(command: string) {
-	const searchPath = process.env.PATH ?? "";
-	const extensions = process.platform === "win32" ? ["", ".exe", ".cmd", ".bat"] : [""];
-	for (const directory of searchPath.split(process.platform === "win32" ? ";" : ":")) {
-		if (!directory) continue;
-		for (const extension of extensions) {
-			if (existsSync(path.join(directory, `${command}${extension}`))) return true;
-		}
-	}
-	return false;
+  const searchPath = process.env.PATH ?? "";
+  const extensions = process.platform === "win32" ? ["", ".exe", ".cmd", ".bat"] : [""];
+  for (const directory of searchPath.split(process.platform === "win32" ? ";" : ":")) {
+    if (!directory) continue;
+    for (const extension of extensions) {
+      if (existsSync(path.join(directory, `${command}${extension}`))) return true;
+    }
+  }
+  return false;
 }
 
 export function splitCommand(input: string) {
-	const parts: string[] = [];
-	let current = "";
-	let quote: '"' | "'" | undefined;
-	let escaping = false;
-	for (const char of input) {
-		if (escaping) {
-			current += char;
-			escaping = false;
-			continue;
-		}
-		if (char === "\\") {
-			escaping = true;
-			continue;
-		}
-		if ((char === '"' || char === "'") && !quote) {
-			quote = char;
-			continue;
-		}
-		if (char === quote) {
-			quote = undefined;
-			continue;
-		}
-		if (/\s/.test(char) && !quote) {
-			if (current) {
-				parts.push(current);
-				current = "";
-			}
-			continue;
-		}
-		current += char;
-	}
-	if (current) parts.push(current);
-	return parts;
+  const parts: string[] = [];
+  let current = "";
+  let quote: '"' | "'" | undefined;
+  let escaping = false;
+  for (const char of input) {
+    if (escaping) {
+      current += char;
+      escaping = false;
+      continue;
+    }
+    if (char === "\\") {
+      escaping = true;
+      continue;
+    }
+    if ((char === '"' || char === "'") && !quote) {
+      quote = char;
+      continue;
+    }
+    if (char === quote) {
+      quote = undefined;
+      continue;
+    }
+    if (/\s/.test(char) && !quote) {
+      if (current) {
+        parts.push(current);
+        current = "";
+      }
+      continue;
+    }
+    current += char;
+  }
+  if (current) parts.push(current);
+  return parts;
 }
 
 function windowsPowerInhibitorCommand(command: string, mode: CaffeinateMode): InhibitorCommand {
-	return {
-		command,
-		args: ["-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", windowsInhibitorScript(mode)],
-		description: `PowerShell SetThreadExecutionState (${formatMode(mode)})`,
-		releaseOnStdinClose: true,
-	};
+  return {
+    command,
+    args: ["-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", windowsInhibitorScript(mode)],
+    description: `PowerShell SetThreadExecutionState (${formatMode(mode)})`,
+    releaseOnStdinClose: true,
+  };
 }
 
 export function windowsInhibitorScript(mode: CaffeinateMode) {
-	const flags = mode === "sleep" ? "0x80000001" : "0x80000003";
-	return `$ErrorActionPreference = 'Stop'; Add-Type -Namespace Native -Name Power -MemberDefinition '[DllImport("kernel32.dll")] public static extern uint SetThreadExecutionState(uint esFlags);'; $flags = [uint32]'${flags}'; $release = [uint32]'0x80000000'; $stdin = [Console]::OpenStandardInput(); $buffer = New-Object byte[] 1; $readTask = $stdin.ReadAsync($buffer, 0, 1); try { while ($true) { [Native.Power]::SetThreadExecutionState($flags) | Out-Null; if ($readTask.Wait(30000)) { break } } } finally { [Native.Power]::SetThreadExecutionState($release) | Out-Null }`;
+  const flags = mode === "sleep" ? "0x80000001" : "0x80000003";
+  return `$ErrorActionPreference = 'Stop'; Add-Type -Namespace Native -Name Power -MemberDefinition '[DllImport("kernel32.dll")] public static extern uint SetThreadExecutionState(uint esFlags);'; $flags = [uint32]'${flags}'; $release = [uint32]'0x80000000'; $stdin = [Console]::OpenStandardInput(); $buffer = New-Object byte[] 1; $readTask = $stdin.ReadAsync($buffer, 0, 1); try { while ($true) { [Native.Power]::SetThreadExecutionState($flags) | Out-Null; if ($readTask.Wait(30000)) { break } } } finally { [Native.Power]::SetThreadExecutionState($release) | Out-Null }`;
 }
 
 function isWsl() {
-	try {
-		return existsSync("/proc/sys/fs/binfmt_misc/WSLInterop");
-	} catch {
-		return false;
-	}
+  try {
+    return existsSync("/proc/sys/fs/binfmt_misc/WSLInterop");
+  } catch {
+    return false;
+  }
 }
 
 export function formatMode(mode: CaffeinateMode) {
-	return mode === "sleep" ? "system-awake" : "display-awake";
+  return mode === "sleep" ? "system-awake" : "display-awake";
 }