refactor: trim replay progress cleanup

Author: thymikee

src/daemon-client-progress.ts

@@ -6,7 +6,7 @@ import { consumeTextLines } from './utils/line-stream.ts';
 import {
   formatRequestProgressEvent,
   isDaemonProgressEnvelope,
-  isDaemonRpcResponseEnvelope,
+  isDaemonResponseEnvelope,
   shouldStreamRequestProgress,
 } from './daemon/request-progress-protocol.ts';
 
@@ -62,7 +62,7 @@ export function readDaemonHttpProgressResponse(
         writeRequestProgressEvent(message.event);
         return false;
       }
-      if (isDaemonRpcResponseEnvelope(message)) {
+      if (isDaemonResponseEnvelope<unknown>(message)) {
         settled = true;
         clearTimeout();
         handleResponseBody(JSON.stringify(message.response));

src/daemon-client.ts

@@ -284,49 +284,32 @@ async function prepareRemoteRequest(
     });
 
   if (req.command !== 'install' && req.command !== 'reinstall') return baseResult();
-  const installPackageResult = await prepareRemoteInstallPackage(
-    req,
-    info,
-    positionals,
-    flags,
-    clientArtifactPaths,
-  );
-  if (installPackageResult?.prepared) return installPackageResult.prepared;
-  uploadedArtifactId = installPackageResult?.uploadedArtifactId ?? uploadedArtifactId;
+  const installPackageResult = await prepareRemoteInstallPackage(req, info, positionals);
+  uploadedArtifactId = installPackageResult ?? uploadedArtifactId;
   return baseResult();
 }
 
-type RemoteInstallPackageResult = {
-  prepared?: PreparedRemoteRequest;
-  uploadedArtifactId?: string;
-};
-
 async function prepareRemoteInstallPackage(
   req: Omit<DaemonRequest, 'token'>,
   info: DaemonInfo,
   positionals: string[],
-  flags: DaemonRequest['flags'] | undefined,
-  clientArtifactPaths: Record<string, string>,
-): Promise<RemoteInstallPackageResult | null> {
+): Promise<string | undefined> {
   const rawPath = positionals[1];
-  if (rawPath === undefined) return null;
+  if (rawPath === undefined) return undefined;
   if (rawPath.startsWith('remote:')) {
     positionals[1] = rawPath.slice('remote:'.length);
-    return { prepared: createPreparedRemoteRequest({ positionals, flags, clientArtifactPaths }) };
+    return undefined;
   }
 
   const localPath = resolveLocalInstallPath(rawPath, req.meta?.cwd);
-  if (!localPath) {
-    return { prepared: createPreparedRemoteRequest({ positionals, flags, clientArtifactPaths }) };
-  }
+  if (!localPath) return undefined;
 
-  const uploadedArtifactId = await uploadArtifact({
+  return await uploadArtifact({
     localPath,
     baseUrl: info.baseUrl!,
     token: info.token,
     platform: req.flags?.platform,
   });
-  return { uploadedArtifactId };
 }
 
 function applyRemoteArtifactCommand(

src/daemon/request-progress-protocol.ts

@@ -6,14 +6,9 @@ export type DaemonProgressEnvelope = {
   event: RequestProgressEvent;
 };
 
-export type DaemonResponseEnvelope = {
+export type DaemonResponseEnvelope<TResponse = DaemonResponse> = {
   type: 'response';
-  response: DaemonResponse;
-};
-
-export type DaemonRpcResponseEnvelope = {
-  type: 'response';
-  response: unknown;
+  response: TResponse;
 };
 
 export function shouldStreamRequestProgress(req: Pick<DaemonRequest, 'meta'>): boolean {
@@ -29,7 +24,9 @@ export function isDaemonProgressEnvelope(value: unknown): value is DaemonProgres
   );
 }
 
-export function isDaemonResponseEnvelope(value: unknown): value is DaemonResponseEnvelope {
+export function isDaemonResponseEnvelope<TResponse = DaemonResponse>(
+  value: unknown,
+): value is DaemonResponseEnvelope<TResponse> {
   return (
     Boolean(value) &&
     typeof value === 'object' &&
@@ -38,10 +35,6 @@ export function isDaemonResponseEnvelope(value: unknown): value is DaemonRespons
   );
 }
 
-export function isDaemonRpcResponseEnvelope(value: unknown): value is DaemonRpcResponseEnvelope {
-  return isDaemonResponseEnvelope(value);
-}
-
 export function serializeDaemonProgressEnvelope(event: RequestProgressEvent): string {
   return `${JSON.stringify({ type: 'progress', event } satisfies DaemonProgressEnvelope)}\n`;
 }
@@ -51,7 +44,7 @@ export function serializeDaemonResponseEnvelope(response: DaemonResponse): strin
 }
 
 export function serializeDaemonRpcResponseEnvelope(response: unknown): string {
-  return `${JSON.stringify({ type: 'response', response } satisfies DaemonRpcResponseEnvelope)}\n`;
+  return `${JSON.stringify({ type: 'response', response } satisfies DaemonResponseEnvelope<unknown>)}\n`;
 }
 
 export function formatRequestProgressEvent(event: RequestProgressEvent): string | undefined {