review fix

Author: conico974

packages/cloudflare/src/api/durable-objects/queue.spec.ts

@@ -208,10 +208,10 @@ describe("DurableObjectQueue", () => {
 
     it("should add an alarm if there are failed states", async () => {
       const queue = createDurableObjectQueue({ fetchDuration: 10 });
-      const nextAlarm = Date.now() + 1000;
-      queue.routeInFailedState.set("id", { msg: createMessage("id"), retryCount: 0, nextAlarmMs: nextAlarm });
+      const nextAlarmMs = Date.now() + 1000;
+      queue.routeInFailedState.set("id", { msg: createMessage("id"), retryCount: 0, nextAlarmMs });
       await queue.addAlarm();
-      expect(getStorage(queue).setAlarm).toHaveBeenCalledWith(nextAlarm);
+      expect(getStorage(queue).setAlarm).toHaveBeenCalledWith(nextAlarmMs);
     });
 
     it("should not add an alarm if there is already an alarm set", async () => {
@@ -225,9 +225,9 @@ describe("DurableObjectQueue", () => {
 
     it("should set the alarm to the lowest nextAlarm", async () => {
       const queue = createDurableObjectQueue({ fetchDuration: 10 });
-      const nextAlarm = Date.now() + 1000;
+      const nextAlarmMs = Date.now() + 1000;
       const firstAlarm = Date.now() + 500;
-      queue.routeInFailedState.set("id", { msg: createMessage("id"), retryCount: 0, nextAlarmMs: nextAlarm });
+      queue.routeInFailedState.set("id", { msg: createMessage("id"), retryCount: 0, nextAlarmMs });
       queue.routeInFailedState.set("id2", {
         msg: createMessage("id2"),
         retryCount: 0,

packages/cloudflare/src/api/durable-objects/queue.ts

@@ -272,17 +272,17 @@ export class DurableObjectQueueHandler extends DurableObject<CloudflareEnv> {
    */
   checkSyncTable(msg: QueueMessage) {
     try {
-      const isNewer = this.sql
+      const numNewer = this.sql
         .exec<{
-          isNewer: number;
+          numNewer: number;
         }>(
-          "SELECT COUNT(*) as isNewer FROM sync WHERE id = ? AND lastSuccess > ?",
+          "SELECT COUNT(*) as numNewer FROM sync WHERE id = ? AND lastSuccess > ? LIMIT 1",
           `${msg.MessageBody.host}${msg.MessageBody.url}`,
           Math.round(msg.MessageBody.lastModified / 1000)
         )
-        .one().isNewer;
+        .one().numNewer;
 
-      return isNewer > 0;
+      return numNewer > 0;
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e: unknown) {
       return false;

packages/cloudflare/src/cli/build/open-next/compileDurableObjects.ts

@@ -1,7 +1,7 @@
-import fs from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
 
+import { loadBuildId, loadPrerenderManifest } from "@opennextjs/aws/adapters/config/util.js";
 import { type BuildOptions, esbuildSync, getPackagePath } from "@opennextjs/aws/build/helper.js";
 
 export function compileDurableObjects(buildOpts: BuildOptions) {
@@ -17,13 +17,12 @@ export function compileDurableObjects(buildOpts: BuildOptions) {
     ".next"
   );
 
-  // TODO: Reuse the manifest
-  const prerenderManifest = path.join(baseManifestPath, "prerender-manifest.json");
-  const prerenderManifestContent = fs.readFileSync(prerenderManifest, "utf-8");
-  const prerenderManifestJson = JSON.parse(prerenderManifestContent);
-  const previewModeId = prerenderManifestJson.preview.previewModeId;
+  // We need to change the type in aws
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const prerenderManifest = loadPrerenderManifest(baseManifestPath) as any;
+  const previewModeId = prerenderManifest.preview.previewModeId;
 
-  const BUILD_ID = fs.readFileSync(path.join(baseManifestPath, "BUILD_ID"), "utf-8");
+  const BUILD_ID = loadBuildId(baseManifestPath);
 
   return esbuildSync(
     {