refactor: consolidate push payload source resolution

Author: thymikee

src/core/dispatch.ts

@@ -20,7 +20,7 @@ import { isDeepLinkTarget } from './open-target.ts';
 import type { RawSnapshotNode } from '../utils/snapshot.ts';
 import type { CliFlags } from '../utils/command-schema.ts';
 import { emitDiagnostic, withDiagnosticTimer } from '../utils/diagnostics.ts';
-import { looksLikeInlineJson } from '../utils/json-input.ts';
+import { resolvePayloadInput } from '../utils/payload-input.ts';
 
 export type BatchStep = {
   command: string;
@@ -550,11 +550,10 @@ function clampIosSwipeDuration(durationMs: number): number {
 }
 
 async function readNotificationPayload(payloadArg: string): Promise<Record<string, unknown>> {
-  const trimmed = payloadArg.trim();
-  if (!trimmed) {
-    throw new AppError('INVALID_ARGS', 'push payload cannot be empty');
-  }
-  const payloadText = await resolvePushPayloadText(payloadArg, trimmed);
+  const source = resolvePayloadInput(payloadArg, { subject: 'Push payload' });
+  const payloadText = source.kind === 'inline'
+    ? source.text
+    : await readPushPayloadFile(source.path);
   try {
     const parsed = JSON.parse(payloadText) as unknown;
     if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
@@ -567,26 +566,23 @@ async function readNotificationPayload(payloadArg: string): Promise<Record<strin
   }
 }
 
-async function resolvePushPayloadText(payloadArg: string, trimmedArg: string): Promise<string> {
-  const filePayload = await tryReadPushPayloadFile(payloadArg);
-  if (filePayload !== null) return filePayload;
-  if (looksLikeInlineJson(trimmedArg)) return trimmedArg;
-  throw new AppError('INVALID_ARGS', `Push payload file not found: ${payloadArg}`);
-}
-
-async function tryReadPushPayloadFile(payloadArg: string): Promise<string | null> {
+async function readPushPayloadFile(payloadPath: string): Promise<string> {
   try {
-    return await fs.readFile(payloadArg, 'utf8');
+    return await fs.readFile(payloadPath, 'utf8');
   } catch (error) {
     const code = (error as NodeJS.ErrnoException).code;
-    if (code === 'ENOENT') return null;
+    if (code === 'ENOENT') {
+      throw new AppError('INVALID_ARGS', `Push payload file not found: ${payloadPath}`);
+    }
     if (code === 'EISDIR') {
-      throw new AppError('INVALID_ARGS', `Push payload path is not a file: ${payloadArg}`);
+      throw new AppError('INVALID_ARGS', `Push payload path is not a file: ${payloadPath}`);
     }
     if (code === 'EACCES' || code === 'EPERM') {
-      throw new AppError('INVALID_ARGS', `Push payload file is not readable: ${payloadArg}`);
+      throw new AppError('INVALID_ARGS', `Push payload file is not readable: ${payloadPath}`);
     }
-    throw new AppError('COMMAND_FAILED', `Unable to read push payload file: ${payloadArg}`, { cause: String(error) });
+    throw new AppError('COMMAND_FAILED', `Unable to read push payload file: ${payloadPath}`, {
+      cause: String(error),
+    });
   }
 }
 

src/daemon/handlers/session.ts

@@ -32,7 +32,7 @@ import {
   isClickLikeCommand,
   parseReplaySeriesFlags,
 } from '../script-utils.ts';
-import { looksLikeInlineJson } from '../../utils/json-input.ts';
+import { resolvePayloadInput } from '../../utils/payload-input.ts';
 import {
   appendAppLogMarker,
   clearAppLogFiles,
@@ -450,7 +450,7 @@ export async function handleSessionCommands(params: {
         ok: false,
         error: {
           code: 'INVALID_ARGS',
-          message: 'push requires: push <bundle|package> <payload.json|inline-json>',
+          message: 'push requires <bundle|package> <payload.json|inline-json>',
         },
       };
     }
@@ -872,29 +872,12 @@ export async function handleSessionCommands(params: {
 }
 
 function maybeResolvePushPayloadPath(payloadArg: string, cwd?: string): string {
-  const trimmed = payloadArg.trim();
-  const resolvedPath = SessionStore.expandHome(trimmed, cwd);
-  try {
-    const stat = fs.statSync(resolvedPath);
-    if (!stat.isFile()) {
-      throw new AppError('INVALID_ARGS', `Push payload path is not a file: ${resolvedPath}`);
-    }
-    return resolvedPath;
-  } catch (error) {
-    const code = (error as NodeJS.ErrnoException).code;
-    if (code === 'EACCES' || code === 'EPERM') {
-      throw new AppError('INVALID_ARGS', `Push payload file is not readable: ${resolvedPath}`);
-    }
-    if (code && code !== 'ENOENT') {
-      throw new AppError('COMMAND_FAILED', `Unable to read push payload file: ${resolvedPath}`, {
-        cause: String(error),
-      });
-    }
-  }
-  if (looksLikeInlineJson(trimmed)) {
-    return trimmed;
-  }
-  throw new AppError('INVALID_ARGS', `Push payload file not found: ${resolvedPath}`);
+  const resolved = resolvePayloadInput(payloadArg, {
+    subject: 'Push payload',
+    cwd,
+    expandPath: (value, currentCwd) => SessionStore.expandHome(value, currentCwd),
+  });
+  return resolved.kind === 'file' ? resolved.path : resolved.text;
 }
 
 async function runBatchCommands(

src/utils/payload-input.ts

@@ -0,0 +1,51 @@
+import fs from 'node:fs';
+import { AppError } from './errors.ts';
+import { looksLikeInlineJson } from './json-input.ts';
+
+export type ResolvedPayloadInput =
+  | { kind: 'file'; path: string }
+  | { kind: 'inline'; text: string };
+
+export function resolvePayloadInput(
+  value: string,
+  options?: {
+    subject?: string;
+    cwd?: string;
+    expandPath?: (value: string, cwd?: string) => string;
+  },
+): ResolvedPayloadInput {
+  const subject = options?.subject ?? 'Payload';
+  const trimmed = value.trim();
+  if (!trimmed) {
+    throw new AppError('INVALID_ARGS', `${subject} cannot be empty`);
+  }
+
+  const resolvedPath = options?.expandPath
+    ? options.expandPath(trimmed, options.cwd)
+    : trimmed;
+
+  try {
+    const stat = fs.statSync(resolvedPath);
+    if (!stat.isFile()) {
+      throw new AppError('INVALID_ARGS', `${subject} path is not a file: ${resolvedPath}`);
+    }
+    return { kind: 'file', path: resolvedPath };
+  } catch (error) {
+    if (error instanceof AppError) throw error;
+    const code = (error as NodeJS.ErrnoException).code;
+    if (code === 'EACCES' || code === 'EPERM') {
+      throw new AppError('INVALID_ARGS', `${subject} file is not readable: ${resolvedPath}`);
+    }
+    if (code && code !== 'ENOENT') {
+      throw new AppError('COMMAND_FAILED', `Unable to read ${subject} file: ${resolvedPath}`, {
+        cause: String(error),
+      });
+    }
+  }
+
+  if (looksLikeInlineJson(trimmed)) {
+    return { kind: 'inline', text: trimmed };
+  }
+  throw new AppError('INVALID_ARGS', `${subject} file not found: ${resolvedPath}`);
+}
+