fix: remove fetch cache, return byte array as body

fleek-platform · Oct 30, 2024 · 684eec0 · 684eec0
1 parent 1a2b2b8
commit 684eec0
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 543 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/next-on-fleek/package.json b/packages/next-on-fleek/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@fleek-platform/next-on-fleek",
-	"version": "1.15.2",
+	"version": "1.15.3",
 	"main": "./dist/index.js",
 	"module": "./dist/index.js",
 	"types": "./dist/src/index.d.ts",

diff --git a/packages/next-on-fleek/src/buildApplication/buildWorkerFile.ts b/packages/next-on-fleek/src/buildApplication/buildWorkerFile.ts
@@ -51,7 +51,7 @@ export async function buildWorkerFile(
 	{
 		outputDir,
 		workerJsDir,
-		nopDistDir,
+		// nopDistDir,
 		templatesDir,
 		customEntrypoint,
 		minify,
@@ -100,13 +100,13 @@ export async function buildWorkerFile(
 		outfile: outputFile,
 	});
 
-	await build({
-		...defaultBuildOpts,
-		entryPoints: ['adaptor.ts', 'cache-api.ts', 'kv.ts'].map(fileName =>
-			join(templatesDir, 'cache', fileName),
-		),
-		outdir: join(nopDistDir, 'cache'),
-	});
+	// await build({
+	// 	...defaultBuildOpts,
+	// 	entryPoints: ['adaptor.ts', 'cache-api.ts', 'kv.ts'].map(fileName =>
+	// 		join(templatesDir, 'cache', fileName),
+	// 	),
+	// 	outdir: join(nopDistDir, 'cache'),
+	// });
 
 	if (customEntrypoint) {
 		cliLog(`Using custom worker entrypoint '${customEntrypoint}'`);

diff --git a/packages/next-on-fleek/src/buildApplication/generateGlobalJs.ts b/packages/next-on-fleek/src/buildApplication/generateGlobalJs.ts
@@ -86,12 +86,9 @@ export function generateGlobalJs(): string {
 		globalThis.fetch = async (...args) => {
 			const request = new Request(...args);
 
-			let response = await handleInlineAssetRequest(request);
+			const response = await handleInlineAssetRequest(request);
 			if (response) return response;
 
-			// response = await handleSuspenseCacheRequest(request);
-			// if (response) return response;
-
 			setRequestUserAgentIfNeeded(request);
 
 			return originalFetch(request);

diff --git a/packages/next-on-fleek/templates/_worker.js/index.ts b/packages/next-on-fleek/templates/_worker.js/index.ts
@@ -145,8 +145,7 @@ async function adaptFleekRequestToFetch(
 async function adaptFetchResponseToFleekResponse(
 	response: Response,
 ): Promise<FleekResponse> {
-	const body = await response.text();
-	const headers = {};
+	const headers: Record<string, string> = {};
 	response.headers.forEach((value, key) => {
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 		// @ts-ignore
@@ -156,6 +155,6 @@ async function adaptFetchResponseToFleekResponse(
 	return {
 		status: response.status,
 		headers,
-		body,
+		body: await response.bytes(),
 	};
 }
diff --git a/packages/next-on-fleek/templates/_worker.js/utils/cache.ts b/packages/next-on-fleek/templates/_worker.js/utils/cache.ts
diff --git a/packages/next-on-fleek/templates/_worker.js/utils/fetch.ts b/packages/next-on-fleek/templates/_worker.js/utils/fetch.ts
@@ -1,5 +1,3 @@
-import { handleSuspenseCacheRequest } from './cache';
-
 /**
  * Patches the global fetch in ways necessary for Next.js (/next-on-fleek) applications
  * to work
@@ -21,12 +19,7 @@ function applyPatch() {
 	globalThis.fetch = async (...args) => {
 		const request = new Request(...args);
 
-		let response = await handleInlineAssetRequest(request);
-		if (response) return response;
-
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-ignore
-		response = await handleSuspenseCacheRequest(request);
+		const response = await handleInlineAssetRequest(request);
 		if (response) return response;
 
 		setRequestUserAgentIfNeeded(request);

diff --git a/packages/next-on-fleek/templates/_worker.js/utils/request.ts b/packages/next-on-fleek/templates/_worker.js/utils/request.ts
@@ -1,5 +1,3 @@
-import { SUSPENSE_CACHE_URL } from '../../cache';
-
 /**
  * Adjusts the request so that it is formatted as if it were provided by Vercel
  *
@@ -26,7 +24,5 @@ export function adjustRequestForVercel(request: Request): Request {
 		);
 	}
 
-	adjustedHeaders.set('x-vercel-sc-host', SUSPENSE_CACHE_URL);
-
 	return new Request(request, { headers: adjustedHeaders });
 }