@volter/twin-googlefonts 1.0.1 → 1.0.3

package/dist/src/semantics/shared.d.ts

@@ -2,6 +2,7 @@ import type { HandlerContext } from '@volter/world-core';
 export declare const FONT = "webfont", CATALOG = "_font_catalog", CSS = "_stylesheet", FILE = "_font_file", KEY = "_api_key";
 export declare const object: (value: unknown) => Record<string, unknown>;
 export declare const assetKey: (value: string) => string;
+export declare const browserClass: (userAgent: string) => string;
 export declare const cssKey: (ctx: HandlerContext, family: string, subset: string, userAgent: string) => string;
 export declare const css2Query: (query: URLSearchParams) => Array<[string, string]> | undefined;
 export declare const css2Key: (ctx: HandlerContext, pairs: Array<[string, string]>, userAgent: string) => string;

package/dist/src/semantics/shared.js

@@ -8,7 +8,55 @@ export const assetKey = (value) => {
     url.searchParams.sort();
     return url.pathname + url.search;
 };
-export const cssKey = (ctx, family, subset, userAgent) => ctx.crypto.digest('sha256', JSON.stringify([family, subset, userAgent]));
+const major = (userAgent, pattern) => Number(pattern.exec(userAgent)?.[1] ?? Number.NaN);
+export const browserClass = (userAgent) => {
+    const ua = userAgent;
+    const platform = /\b(?:Android|iPhone|iPad|iPod)\b/.test(ua) ? 'mobile' : /\bMacintosh\b/.test(ua) ? 'mac' : 'desktop';
+    // an agent that is no browser (none, node, undici, curl) is answered truetype, as an unknown browser on a desktop is
+    if (!ua.startsWith('Mozilla/'))
+        return 'truetype';
+    const legacy = (engine, version) => `legacy ${engine} ${version} ${platform}`;
+    const msie = major(ua, /\bMSIE (\d+)/);
+    if (msie <= 8)
+        return 'eot';
+    if (msie >= 9 || /\bTrident\/7\./.test(ua))
+        return 'woff desktop';
+    // every browser on iOS is Safari's engine, whatever it calls itself (CriOS, FxiOS)
+    const ios = /\bOS (\d+)_(\d+)(?:_\d+)? like Mac OS X\b/.exec(ua);
+    if (ios) {
+        const [v, minor] = [Number(ios[1]), Number(ios[2])];
+        if (v <= 4)
+            return 'svg';
+        return v >= 11 || (v === 10 && minor >= 3) ? 'woff2+range mobile' : legacy('ios', `${v}_${minor}`);
+    }
+    const chrome = /\b(?:HeadlessChrome|Chrome|Chromium|CriOS)\/((\d+)[\d.]*)/.exec(ua);
+    if (chrome) {
+        const v = Number(chrome[2]);
+        if (v >= 43)
+            return `woff2+range ${platform}`;
+        if (platform !== 'desktop')
+            return legacy('chrome', chrome[1]);
+        return v >= 40 ? 'woff+range desktop' : 'woff desktop';
+    }
+    const firefox = /\bFirefox\/((\d+)[\d.]*)/.exec(ua);
+    if (firefox) {
+        const v = Number(firefox[2]);
+        // on macOS Google answers Firefox 44 to 59 the mobile faces, and Firefox 60 and later WOFF with unicode-range
+        if (platform === 'mac')
+            return v >= 60 ? 'woff+range mac' : v >= 44 ? 'woff2+range mobile' : legacy('firefox', firefox[1]);
+        if (v >= 44)
+            return `woff2+range ${platform}`;
+        if (platform !== 'desktop')
+            return legacy('firefox', firefox[1]);
+        return v >= 39 ? 'woff2 desktop' : 'woff desktop';
+    }
+    // Safari on macOS names its version; Android's own browser names one too, and is answered truetype
+    const safari = /\bVersion\/((\d+)[\d.]*)(?: Mobile)?(?:\/\S+)? Safari\//.exec(ua);
+    if (safari && platform === 'mac')
+        return Number(safari[2]) >= 10 ? 'woff+range mac' : legacy('safari', safari[1]);
+    return platform === 'mobile' ? 'truetype mobile' : 'truetype';
+};
+export const cssKey = (ctx, family, subset, userAgent) => ctx.crypto.digest('sha256', JSON.stringify([family, subset, browserClass(userAgent)]));
 // A CSS2 request is its ordered query pairs; family may repeat, text and display may not.
 export const css2Query = (query) => {
     const pairs = [...query.entries()];
@@ -18,6 +66,6 @@ export const css2Query = (query) => {
         return undefined;
     return pairs;
 };
-export const css2Key = (ctx, pairs, userAgent) => ctx.crypto.digest('sha256', JSON.stringify(['css2', pairs, userAgent]));
+export const css2Key = (ctx, pairs, userAgent) => ctx.crypto.digest('sha256', JSON.stringify(['css2', pairs, browserClass(userAgent)]));
 export const googleError = (status, message, kind = status === 403 ? 'PERMISSION_DENIED' : 'INVALID_ARGUMENT') => Response.json({ error: { code: status, message, status: kind } }, { status });
 export const htmlError = (status, message) => new Response('<!doctype html><title>' + status + '</title><p>' + message.replace(/[<>&]/g, c => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;' }[c])) + '</p>', { status, headers: { 'content-type': 'text/html; charset=UTF-8' } });

package/generated/pack-facts.json

@@ -1,11 +1,14 @@
 {
-  "//": "GENERATED by scripts/pack-facts.ts — current pack descriptors and explicit world-runtime server backings; no prior-artifact entries are retained.",
+  "//": "GENERATED by twin-standard facts from the pack descriptor; no prior-artifact entries are retained.",
   "packs": {
     "googlefonts": {
       "adoption": {
         "sdks": [],
         "envStems": [
           "GOOGLE_FONTS"
+        ],
+        "modules": [
+          "next/font/google"
         ]
       },
       "hosts": [
@@ -52,7 +55,7 @@
         "deployment": {
           "field": "deployment",
           "object": "Project API key",
-          "source": "https://cloud.google.com/docs/authentication/api-keys"
+          "source": "https://docs.cloud.google.com/docs/authentication/api-keys"
         },
         "fill": {
           "GOOGLE_FONTS_API_KEY": "api_key"