@volter/twin-googlefonts 1.0.2 → 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/journeys/decisions.json

@@ -13,14 +13,14 @@
       "lane": "css",
       "mechanism": "handler",
       "demand": "All five pinned config.ts UAs",
-      "why": "Use exact published CSS per request/UA, with the real font-family/style/weight/src consumed by fetchCSS; first-use downloads every returned src. Unsupported representations answer a refusal."
+      "why": "Use the exact published CSS per request and browser class (src/semantics/shared.ts browserClass; each of the five pinned config.ts UAs is one class's sample), with the real font-family/style/weight/src consumed by fetchCSS; first-use downloads every returned src. A class with no published representation answers a refusal."
     },
     {
       "operation": "getStylesheet2",
       "lane": "css",
       "mechanism": "handler",
-      "demand": "Dub's Inter weights and Rallly's CJK text subsets, both from a server; Rallly's and Cal.diy's next/font/google build of Inter's variable weights, with next/font's browser User-Agent",
-      "why": "Use the exact published CSS per ordered CSS2 query and User-Agent; a non-browser agent without its own representation reads the one published for no agent, as Google answered the same CSS to none, node and undici. Unpublished families, text subsets and browser representations answer a refusal; text= and display= given twice, or another parameter, are a bad request."
+      "demand": "Dub's Inter weights and Rallly's CJK text subsets, both from a server; Rallly's and Cal.diy's next/font/google build of Inter's variable weights, with next/font's browser User-Agent; Twenty's front end's Inter and DM Mono stylesheets, from a Chromium browser",
+      "why": "Use the exact published CSS per ordered CSS2 query and browser class (src/semantics/shared.ts browserClass, the classes of Google's answers in vendor/browser-classes.json): Google serves any browser, choosing WOFF 2.0 and unicode-range by the browser, and a non-browser agent is the truetype class, as Google answered the same CSS to none, node and undici. A class without a published representation, and unpublished families and text subsets, answer a refusal; text= and display= given twice, or another parameter, are a bad request."
     },
     {
       "operation": "getFontFile",

package/journeys/demand.json

@@ -95,6 +95,28 @@
           "evidence": "the same build"
         }
       ]
+    },
+    {
+      "name": "twentyhq/twenty",
+      "commit": "323e66433ee5b0878f43bc6c54abe4b1ac9be64b",
+      "client": "the front end in a browser (Playwright 1.63's Chromium 153 headless shell in the bench task twenty-20877), its own User-Agent",
+      "backend": [
+        {
+          "call": "GET fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap",
+          "operation": "getStylesheet2",
+          "evidence": "packages/twenty-front/index.html:33 (a stylesheet link, until 3aeb2b0d self-hosts the fonts)"
+        },
+        {
+          "call": "GET fonts.googleapis.com/css2?family=DM+Mono:wght@400;500;600&display=swap",
+          "operation": "getStylesheet2",
+          "evidence": "packages/twenty-front/index.html:37"
+        },
+        {
+          "call": "GET fonts.gstatic.com/s/{inter,dmmono}/... woff2, the faces the page's text needs",
+          "operation": "getFontFile",
+          "evidence": "the browser loads each unicode-range face its text uses"
+        }
+      ]
     }
   ],
   "notDemanded": "OAuth, font submission/publishing UI, effects and advanced catalog capabilities are outside these client paths."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/twin-googlefonts",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "The googlefonts twin (Protocol 3).",
   "author": "Volter (https://github.com/volter-ai)",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "journeys/first-use.json"
   ],
   "peerDependencies": {
-    "@volter/world-core": "^3.0.185"
+    "@volter/world-core": "^3.0.190"
   },
   "engines": {
     "node": ">=22.3"
@@ -54,6 +54,6 @@
     }
   },
   "volterRelease": {
-    "commit": "c41b6615f37f0e7d69753fd85ff9568d9f4c8174"
+    "commit": "71c14672a241845f01d16a370c666e263af87f55"
   }
 }

package/src/manifest.ts

@@ -13,7 +13,7 @@ export const manifest: VendorManifest = {
     protocol: '3', transport: 'rest', archetype: 'crud', bin: 'world-googlefonts',
     resources: ['webfont', '_api_key', '_font_catalog', '_stylesheet', '_font_file'],
     specSource: 'api/spec/SOURCE.md: unchanged Google Discovery; css/spec/SOURCE.md and assets/spec/SOURCE.md: Google documentation and retained font responses',
-    description: 'Google Fonts catalog, exact published CSS representations and genuine font bytes; a World-issued query API key. Seed data is the attributed Antic reference catalog and the CSS2 weights 500-700 of Inter, not the complete live Google catalog.',
+    description: 'Google Fonts catalog, exact published CSS representations and genuine font bytes; a World-issued query API key. Seed data is the attributed Antic reference catalog, the CSS2 weights 500-700 of Inter, the variable weights of Inter and the Inter and DM Mono stylesheets Twenty links, not the complete live Google catalog.',
     // next/font/google fetches the font's stylesheet and files from Google at an app's build (twin-world architecture,
     // Selection: a module that reaches the vendor by itself is evidence, as an SDK is)
     adoption: { sdks: [], envStems: ['GOOGLE_FONTS'], modules: ['next/font/google'] },