refactor: share push JSON detection and clean extras validation

Author: thymikee

src/core/dispatch.ts

@@ -20,6 +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';
 
 export type BatchStep = {
   command: string;
@@ -557,10 +558,6 @@ async function readNotificationPayload(payloadArg: string): Promise<Record<strin
   }
 }
 
-function looksLikeInlineJson(value: string): boolean {
-  return (value.startsWith('{') && value.endsWith('}')) || (value.startsWith('[') && value.endsWith(']'));
-}
-
 async function resolvePushPayloadText(payloadArg: string, trimmedArg: string): Promise<string> {
   const filePayload = await tryReadPushPayloadFile(payloadArg);
   if (filePayload !== null) return filePayload;

src/daemon/handlers/session.ts

@@ -32,6 +32,7 @@ import {
   isClickLikeCommand,
   parseReplaySeriesFlags,
 } from '../script-utils.ts';
+import { looksLikeInlineJson } from '../../utils/json-input.ts';
 
 type ReinstallOps = {
   ios: (device: DeviceInfo, app: string, appPath: string) => Promise<{ bundleId: string }>;
@@ -703,10 +704,7 @@ function maybeResolvePushPayloadPath(payloadArg: string, cwd?: string): string {
     }
     return resolvedPath;
   }
-  if (
-    (trimmed.startsWith('{') && trimmed.endsWith('}')) ||
-    (trimmed.startsWith('[') && trimmed.endsWith(']'))
-  ) {
+  if (looksLikeInlineJson(trimmed)) {
     return trimmed;
   }
   throw new AppError('INVALID_ARGS', `Push payload file not found: ${resolvedPath}`);

src/platforms/android/index.ts

@@ -595,17 +595,17 @@ export async function pushAndroidNotification(
   if (receiver) {
     args.push('-n', receiver);
   }
-  const extras = payload.extras ?? {};
-  let extrasCount = 0;
-  if (extras && typeof extras === 'object' && !Array.isArray(extras)) {
-    for (const [key, rawValue] of Object.entries(extras)) {
-      if (!key) continue;
-      appendBroadcastExtra(args, key, rawValue);
-      extrasCount += 1;
-    }
-  } else if (payload.extras !== undefined) {
+  const rawExtras = payload.extras;
+  if (rawExtras !== undefined && (typeof rawExtras !== 'object' || rawExtras === null || Array.isArray(rawExtras))) {
     throw new AppError('INVALID_ARGS', 'Android push payload extras must be an object');
   }
+  const extras = rawExtras ?? {};
+  let extrasCount = 0;
+  for (const [key, rawValue] of Object.entries(extras)) {
+    if (!key) continue;
+    appendBroadcastExtra(args, key, rawValue);
+    extrasCount += 1;
+  }
   await runCmd('adb', adbArgs(device, args));
   return { action, extrasCount };
 }

src/utils/json-input.ts

@@ -0,0 +1,5 @@
+export function looksLikeInlineJson(value: string): boolean {
+  const trimmed = value.trim();
+  return (trimmed.startsWith('{') && trimmed.endsWith('}')) || (trimmed.startsWith('[') && trimmed.endsWith(']'));
+}
+