fix(worker): use the cached timestamp

yjl9903 · Aug 11, 2023 · fbcbd9c · fbcbd9c
1 parent 541b52c
commit fbcbd9c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/packages/worker/src/query.ts b/packages/worker/src/query.ts
@@ -45,11 +45,12 @@ export const PrefetchFilter = [
 
 export const findResourcesFromDB = memoAsync(
   async (env: Env, options: ResolvedFilterOptions) => {
-    const prisma = makePrisma(env);
-
     const timer = createTimer(`Search Resources`);
     timer.start();
 
+    const prisma = makePrisma(env);
+    const timestampPromise = getRefreshTimestamp(env);
+
     const {
       page,
       pageSize,
@@ -119,8 +120,13 @@ export const findResourcesFromDB = memoAsync(
       }
     });
 
+    const timestamp = await timestampPromise;
     timer.end();
-    return result;
+
+    return {
+      timestamp,
+      resources: result
+    };
   },
   {
     external: {
@@ -147,20 +153,18 @@ export async function searchResources(ctx: Context<{ Bindings: Env }>) {
     return ctx.json({ message: 'Request is not valid' }, 400);
   }
 
-  const timestampPromise = getRefreshTimestamp(ctx.env);
-
-  const result = !isNoCache(ctx)
+  const { timestamp, resources: result } = !isNoCache(ctx)
     ? await findResourcesFromDB(ctx.env, filter)
     : await findResourcesFromDB.raw(ctx.env, filter);
 
   const complete = result.length > filter.pageSize;
   const resources = resolveQueryResult(result.slice(0, filter.pageSize));
 
   return ctx.json({
-    resources,
-    complete,
     filter,
-    timestamp: await timestampPromise
+    complete,
+    timestamp,
+    resources
   });
 }
 

diff --git a/packages/worker/src/state.ts b/packages/worker/src/state.ts
@@ -1,5 +1,5 @@
-import type { Resource, Team, User } from '@prisma/client/edge';
 import type { ResourceDetail } from 'animegarden';
+import type { Resource, Team, User } from '@prisma/client/edge';
 
 import type { Env } from './types';
 
@@ -18,12 +18,13 @@ export function getDetailStore(env: Env) {
 }
 
 export function getResourcesStore(env: Env) {
-  return new KVStore<
-    (Resource & {
+  return new KVStore<{
+    timestamp: Date;
+    resources: (Resource & {
       fansub: Team | null;
       publisher: User;
-    })[]
-  >(env.animegarden, 'resources');
+    })[];
+  }>(env.animegarden, 'resources');
 }
 
 export class KVStore<V> {
@@ -34,7 +35,10 @@ export class KVStore<V> {
    */
   private readonly ttl: number = 60 * 60;
 
-  constructor(private readonly store: KVNamespace, prefix = '') {
+  constructor(
+    private readonly store: KVNamespace,
+    prefix = ''
+  ) {
     this.prefix = prefix + ':';
   }