deepline 0.1.12 → 0.1.20

package/dist/repo/apps/play-runner-workers/src/dedup-do.ts

@@ -87,6 +87,7 @@ const COORDINATOR_TRACE_MAX_ENTRIES = 200;
 const FINISH_ALARM_DELAY_MS = 60_000; // self-evict 1 min after finish() called
 const WORKFLOW_POOL_DEFAULT_TTL_MS = 8 * 60 * 1000;
 const WORKFLOW_POOL_RUN_MAPPING_TTL_MS = 60 * 60 * 1000;
+const WORKFLOW_POOL_READY_MAX_AGE_MS = 20_000;
 
 interface DedupEnv {
   PLAY_DEDUP: DurableObjectNamespace;
@@ -248,7 +249,9 @@ export class PlayDedup implements DurableObject {
       }
     }
 
-    return new Response('{}', { headers: { 'content-type': 'application/json' } });
+    return new Response('{}', {
+      headers: { 'content-type': 'application/json' },
+    });
   }
 
   private async handleAwait(req: Request): Promise<Response> {
@@ -313,7 +316,9 @@ export class PlayDedup implements DurableObject {
     // Schedule alarm to evict after a grace period (any straggler awaits
     // get a chance to resolve). Grace = 60s.
     await this.state.storage.setAlarm(Date.now() + FINISH_ALARM_DELAY_MS);
-    return new Response('{}', { headers: { 'content-type': 'application/json' } });
+    return new Response('{}', {
+      headers: { 'content-type': 'application/json' },
+    });
   }
 
   private async handleDebug(_req: Request): Promise<Response> {
@@ -321,7 +326,11 @@ export class PlayDedup implements DurableObject {
     const dump: Record<string, DedupEntry> = {};
     for (const [k, v] of all) dump[k] = v as DedupEntry;
     return new Response(
-      JSON.stringify({ size: all.size, entries: dump, waiters: this.waiters.size }),
+      JSON.stringify({
+        size: all.size,
+        entries: dump,
+        waiters: this.waiters.size,
+      }),
       { headers: { 'content-type': 'application/json' } },
     );
   }
@@ -339,7 +348,8 @@ export class PlayDedup implements DurableObject {
       value.entry !== undefined &&
       value.entry.version === version &&
       value.entry.expiresAt > now &&
-      value.entry.readyAt !== null
+      value.entry.readyAt !== null &&
+      now - value.entry.readyAt <= WORKFLOW_POOL_READY_MAX_AGE_MS
     );
   }
 
@@ -360,6 +370,8 @@ export class PlayDedup implements DurableObject {
       if (
         !entry ||
         entry.expiresAt <= now ||
+        (entry.readyAt !== null &&
+          now - entry.readyAt > WORKFLOW_POOL_READY_MAX_AGE_MS) ||
         (version && entry.version !== version)
       ) {
         expiredKeys.push(key);
@@ -380,16 +392,15 @@ export class PlayDedup implements DurableObject {
   }
 
   private async handlePoolAdd(req: Request): Promise<Response> {
-    const body = (await req.json().catch(() => null)) as
-      | {
-          ids?: unknown;
-          ttlMs?: unknown;
-          version?: unknown;
-          readyAt?: unknown;
-          ready?: unknown;
-        }
-      | null;
-    const version = typeof body?.version === 'string' ? body.version.trim() : '';
+    const body = (await req.json().catch(() => null)) as {
+      ids?: unknown;
+      ttlMs?: unknown;
+      version?: unknown;
+      readyAt?: unknown;
+      ready?: unknown;
+    } | null;
+    const version =
+      typeof body?.version === 'string' ? body.version.trim() : '';
     if (!version) {
       return new Response('version is required', { status: 400 });
     }
@@ -445,7 +456,9 @@ export class PlayDedup implements DurableObject {
       const sorted = [...entries.entries()]
         .map(([key, entry]) => ({ key, entry }))
         .filter((entry) => this.isReadyWorkflowPoolEntry(entry, version, now))
-        .sort((a, b) => a.entry.readyAt - b.entry.readyAt);
+        // Lease the freshest ready instance. Older waiting Workflows are more
+        // likely to be hibernated, so "pooled" otherwise still pays a wake tax.
+        .sort((a, b) => b.entry.readyAt - a.entry.readyAt);
       const selected = sorted[0];
       if (!selected) return;
       leasedId = selected.entry.id;
@@ -461,7 +474,8 @@ export class PlayDedup implements DurableObject {
     if (!version) {
       return new Response('version is required', { status: 400 });
     }
-    await this.gcWorkflowPool(Date.now(), version);
+    const now = Date.now();
+    await this.gcWorkflowPool(now, version);
     const entries = await this.state.storage.list<WorkflowPoolEntry>({
       prefix: WORKFLOW_POOL_KEY_PREFIX,
     });
@@ -469,8 +483,14 @@ export class PlayDedup implements DurableObject {
     let warming = 0;
     for (const entry of entries.values()) {
       if (entry.version !== version) continue;
-      if (entry.readyAt === null) warming += 1;
-      else available += 1;
+      if (
+        entry.readyAt === null ||
+        now - entry.readyAt > WORKFLOW_POOL_READY_MAX_AGE_MS
+      ) {
+        warming += 1;
+      } else {
+        available += 1;
+      }
     }
     return new Response(JSON.stringify({ available, warming }), {
       headers: { 'content-type': 'application/json' },
@@ -502,13 +522,12 @@ export class PlayDedup implements DurableObject {
   }
 
   private async handlePoolPromote(req: Request): Promise<Response> {
-    const body = (await req.json().catch(() => null)) as
-      | {
-          ids?: unknown;
-          version?: unknown;
-        }
-      | null;
-    const version = typeof body?.version === 'string' ? body.version.trim() : '';
+    const body = (await req.json().catch(() => null)) as {
+      ids?: unknown;
+      version?: unknown;
+    } | null;
+    const version =
+      typeof body?.version === 'string' ? body.version.trim() : '';
     if (!version) {
       return new Response('version is required', { status: 400 });
     }
@@ -536,19 +555,21 @@ export class PlayDedup implements DurableObject {
         await this.state.storage.put(writes);
       }
     });
-    return new Response(JSON.stringify({ promoted: Object.keys(writes).length }), {
-      headers: { 'content-type': 'application/json' },
-    });
+    return new Response(
+      JSON.stringify({ promoted: Object.keys(writes).length }),
+      {
+        headers: { 'content-type': 'application/json' },
+      },
+    );
   }
 
   private async handlePoolDelete(req: Request): Promise<Response> {
-    const body = (await req.json().catch(() => null)) as
-      | {
-          ids?: unknown;
-          version?: unknown;
-        }
-      | null;
-    const version = typeof body?.version === 'string' ? body.version.trim() : '';
+    const body = (await req.json().catch(() => null)) as {
+      ids?: unknown;
+      version?: unknown;
+    } | null;
+    const version =
+      typeof body?.version === 'string' ? body.version.trim() : '';
     if (!version) {
       return new Response('version is required', { status: 400 });
     }
@@ -575,34 +596,32 @@ export class PlayDedup implements DurableObject {
   }
 
   private async handlePoolMapRun(req: Request): Promise<Response> {
-    const body = (await req.json().catch(() => null)) as
-      | {
-          runId?: unknown;
-          instanceId?: unknown;
-          version?: unknown;
-        }
-      | null;
+    const body = (await req.json().catch(() => null)) as {
+      runId?: unknown;
+      instanceId?: unknown;
+      version?: unknown;
+    } | null;
     const runId = typeof body?.runId === 'string' ? body.runId : '';
     const instanceId =
       typeof body?.instanceId === 'string' ? body.instanceId : '';
-    const version = typeof body?.version === 'string' ? body.version.trim() : '';
+    const version =
+      typeof body?.version === 'string' ? body.version.trim() : '';
     if (!runId || !instanceId || !version) {
       return new Response('runId, instanceId, and version are required', {
         status: 400,
       });
     }
     const now = Date.now();
-    await this.state.storage.put(
-      `${WORKFLOW_POOL_RUN_KEY_PREFIX}${runId}`,
-      {
-        runId,
-        instanceId,
-        version,
-        createdAt: now,
-        expiresAt: now + WORKFLOW_POOL_RUN_MAPPING_TTL_MS,
-      } satisfies WorkflowRunMapping,
-    );
-    return new Response('{}', { headers: { 'content-type': 'application/json' } });
+    await this.state.storage.put(`${WORKFLOW_POOL_RUN_KEY_PREFIX}${runId}`, {
+      runId,
+      instanceId,
+      version,
+      createdAt: now,
+      expiresAt: now + WORKFLOW_POOL_RUN_MAPPING_TTL_MS,
+    } satisfies WorkflowRunMapping);
+    return new Response('{}', {
+      headers: { 'content-type': 'application/json' },
+    });
   }
 
   private async handlePoolResolveRun(req: Request): Promise<Response> {
@@ -620,7 +639,9 @@ export class PlayDedup implements DurableObject {
       `${WORKFLOW_POOL_RUN_KEY_PREFIX}${runId}`,
     );
     if (mapping && mapping.version !== version) {
-      await this.state.storage.delete(`${WORKFLOW_POOL_RUN_KEY_PREFIX}${runId}`);
+      await this.state.storage.delete(
+        `${WORKFLOW_POOL_RUN_KEY_PREFIX}${runId}`,
+      );
       return new Response(JSON.stringify({ instanceId: null }), {
         headers: { 'content-type': 'application/json' },
       });
@@ -658,9 +679,9 @@ export class PlayDedup implements DurableObject {
   }
 
   private async handleTraceAdd(req: Request): Promise<Response> {
-    const body = (await req.json().catch(() => null)) as
-      | Partial<CoordinatorTraceEntry>
-      | null;
+    const body = (await req
+      .json()
+      .catch(() => null)) as Partial<CoordinatorTraceEntry> | null;
     if (
       !body ||
       (body.source !== 'coordinator' && body.source !== 'dynamic_worker') ||
@@ -693,7 +714,9 @@ export class PlayDedup implements DurableObject {
         await this.state.storage.delete([...entries.keys()].slice(0, overflow));
       }
     });
-    return new Response('{}', { headers: { 'content-type': 'application/json' } });
+    return new Response('{}', {
+      headers: { 'content-type': 'application/json' },
+    });
   }
 
   private async handleTraceList(): Promise<Response> {
@@ -702,7 +725,9 @@ export class PlayDedup implements DurableObject {
     });
     return new Response(
       JSON.stringify({
-        entries: [...entries.values()].sort((left, right) => left.ts - right.ts),
+        entries: [...entries.values()].sort(
+          (left, right) => left.ts - right.ts,
+        ),
       }),
       { headers: { 'content-type': 'application/json' } },
     );