Skip to content

Commit

Permalink
fix: only output cache hit/miss if CACHE is enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
esroyo committed Feb 14, 2024
1 parent e95ffde commit 4c9d25a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/services.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const denoKv: Promise<Deno.Kv> = Deno.openKv();
5 changes: 3 additions & 2 deletions src/sjs-request-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
isJsResponse,
retrieveCache,
} from './utils.ts';
import { denoKv } from './services.ts';
import { toSystemjs } from './to-systemjs.ts';
import { getBuildTargetFromUA, ScopedPerformance } from '../deps.ts';

Expand All @@ -22,7 +23,7 @@ export async function sjsRequestHandler(
const buildTarget = getBuildTargetFromUA(req.headers.get('user-agent'));
if (CACHE) {
performance.mark('cache-read');
const value = await retrieveCache(Deno.openKv(), [
const value = await retrieveCache(denoKv, [
req.url,
buildTarget,
]);
Expand All @@ -39,8 +40,8 @@ export async function sjsRequestHandler(
false,
);
}
performance.measure('cache-miss', { start: performance.now() });
}
performance.measure('cache-miss', { start: performance.now() });
const selfUrl = new URL(req.url);
const basePath = `/${BASE_PATH}/`.replace(/\/+/g, '/');
const upstreamOrigin = `${UPSTREAM_ORIGIN}/`.replace(/\/+$/, '/');
Expand Down
7 changes: 4 additions & 3 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { kvGet, kvSet, request } from '../deps.ts';
import { denoKv } from './services.ts';

import type { HttpZResponseModel, ResponseProps } from './types.ts';

Expand Down Expand Up @@ -96,7 +97,7 @@ export const retrieveCache = async (
const settledKv = await kv;
const blob = await kvGet(settledKv, ['cache', ...key]);
const value = blob && JSON.parse(new TextDecoder().decode(blob));
settledKv.close();
//settledKv.close();
const isValidCacheEntry = !!(
value &&
value.expires &&
Expand Down Expand Up @@ -125,7 +126,7 @@ export const saveCache = async (
}));
const settledKv = await kv;
await kvSet(settledKv, ['cache', ...key], blob);
settledKv.close();
//settledKv.close();
};

const buildDebugPerformance = (performance: Performance): string => (
Expand Down Expand Up @@ -154,7 +155,7 @@ export const createFinalResponse = async (
const willCache = shouldCache && isCacheable;
if (willCache) {
performance.mark('cache-write');
await saveCache(Deno.openKv(), [url, buildTarget], responseProps);
await saveCache(denoKv, [url, buildTarget], responseProps);
performance.measure('cache-write', 'cache-write');
}

Expand Down

0 comments on commit 4c9d25a

Please sign in to comment.