fix: font cache

Author: JacobLinCool

src/core/exts/font.ts

@@ -29,17 +29,18 @@ export async function FontExtension(generator: Generator): Promise<Extension> {
         names.map(async (name) => {
             try {
                 const url = `${remote_base}${name.replace(/\s+/g, "_")}.json`;
-                const cached = await generator.cache.get(url);
+                const cached = await generator.cache?.match(url);
                 if (cached) {
-                    supported[name.toLowerCase()] = cached;
+                    supported[name.toLowerCase()] = await cached.json();
                     generator.log(`Loaded cached font ${name}`);
                 } else {
                     const res = await fetch(url);
                     if (res.ok) {
-                        const data = (await res.json()) as { name: string; base64: string };
+                        const data = (await res.clone().json()) as { name: string; base64: string };
                         supported[name.toLowerCase()] = { name, base64: data.base64 };
                         generator.log(`loaded remote font "${name}"`);
-                        generator.cache.put(url, data);
+                        // @ts-expect-error Response not match
+                        generator.cache?.put(url, res);
                     } else {
                         return;
                     }

src/core/exts/remote-style.ts

@@ -8,9 +8,9 @@ export function RemoteStyleExtension(generator: Generator): Extension {
     if (Array.isArray(urls)) {
         externals.push(
             ...urls.map(async (url) => {
-                const cahced = await generator.cache.get(url);
+                const cahced = await generator.cache?.match(url);
                 if (cahced) {
-                    return cahced;
+                    return cahced.text();
                 }
 
                 const data = await fetch(url)
@@ -21,7 +21,7 @@ export function RemoteStyleExtension(generator: Generator): Extension {
                     )
                     .catch((err) => `/* ${url} ${err} */`);
 
-                generator.cache.put(url, data);
+                generator.cache?.put(url, new Response(data));
                 return data;
             }),
         );