clearcote 0.38.1 → 0.40.0

package/dist/shaderdialect.js

@@ -8,9 +8,14 @@
  * query alone — rendering is untouched, and the result is byte-identical to what the Windows build
  * reports.
  *
- * OFF unless asked for. The re-translation is a different code path from the one that rendered, so
- * a shader the Vulkan backend accepts but the HLSL translator rejects falls back to the honest
- * SPIR-V for that shader. It is for callers who actually hit this check, not a default.
+ * ON BY DEFAULT for a Windows claim on a non-Windows host (the Docker entrypoint has done this for
+ * CC_PLATFORM=windows since 0.31). Measured 2026-10-06 on a GPU-less Linux host with r30: a Windows
+ * persona answered the query with SwiftShader's SPIR-V text next to "Direct3D11"; with the dialect
+ * set it answered in HLSL. A shader the HLSL translator rejects falls back to the backend's own
+ * output for that shader -- the state every launch was in before, so the default cannot make a page
+ * see anything worse. Pass `shaderDialect: false` to turn it off. On a Windows host the D3D11
+ * backend already answers in HLSL and nothing is set; a Linux or macOS claim never gets HLSL, nor
+ * does a launch that shows the real GPU string or a custom non-Direct3D renderer.
  *
  * Delivered as an environment variable because the code lives in the GPU process, which does not
  * receive the fingerprint switches.
@@ -19,21 +24,66 @@
  */
 export const SHADER_DIALECT_ENV = "CLEARCOTE_SHADER_DIALECT";
 const VALID = ["hlsl"];
+const OFF = ["", "0", "off", "false", "no", "none"];
+/** Switches under which the renderer string is the host's real GPU (SwiftShader, Mesa, ...), not the
+ * persona's Direct3D11 one — HLSL beside it would be the contradiction this option removes. */
+const REAL_GPU_STRING_SWITCHES = ["--disable-gpu-fingerprint", "--disable-gpu-string-spoof"];
+/** The dialect a launch gets when the caller did not choose one: `"hlsl"` when the built command
+ * line claims Windows (`--fingerprint-platform=windows`, the last one wins) with a Direct3D renderer
+ * string and the host is not Windows, else undefined. No default when the page sees the real GPU
+ * string (`--disable-gpu-fingerprint` / `--disable-gpu-string-spoof`) or a custom
+ * `--fingerprint-gpu-renderer` that does not name Direct3D. */
+export function defaultShaderDialect(args, hostPlatform = process.platform) {
+    if (hostPlatform === "win32")
+        return undefined;
+    let claimed;
+    let renderer;
+    for (const a of args ?? []) {
+        if (typeof a !== "string")
+            continue;
+        if (a.startsWith("--fingerprint-platform=")) {
+            claimed = a.slice("--fingerprint-platform=".length).trim().toLowerCase();
+        }
+        else if (a.startsWith("--fingerprint-gpu-renderer=")) {
+            renderer = a.slice("--fingerprint-gpu-renderer=".length);
+        }
+        else if (REAL_GPU_STRING_SWITCHES.includes(a.split("=", 1)[0])) {
+            return undefined;
+        }
+    }
+    if (claimed !== "windows")
+        return undefined;
+    if (renderer !== undefined && !renderer.toLowerCase().includes("direct3d"))
+        return undefined;
+    return "hlsl";
+}
 /**
  * Fold `CLEARCOTE_SHADER_DIALECT` into a launch env.
  *
- * Returns `baseEnv` untouched when no dialect is requested — including `undefined`, so the default
- * Playwright env is preserved rather than being replaced by a copy of `process.env`.
+ * `dialect` undefined -> the default for this claim/host ({@link defaultShaderDialect} over `args`);
+ * `false` or an "off" spelling -> nothing. Returns `baseEnv` untouched when nothing applies —
+ * including the plain no-claim case, so the default Playwright env is preserved rather than being
+ * replaced by a copy of `process.env`. The default never overrides a variable the caller exported.
  *
  * Throws on an unknown dialect rather than ignoring it: a typo would otherwise look like it worked
  * while the engine kept reporting the honest dialect.
  */
-export function withShaderDialect(dialect, baseEnv) {
-    if (!dialect)
-        return baseEnv;
-    const value = String(dialect).trim().toLowerCase();
-    if (!VALID.includes(value)) {
-        throw new Error(`shaderDialect must be one of ${VALID.join(", ")} (got ${JSON.stringify(dialect)})`);
+export function withShaderDialect(dialect, baseEnv, args, hostPlatform = process.platform) {
+    let value;
+    if (dialect === undefined || dialect === null) { // null (from JS callers) means "not chosen" too
+        value = defaultShaderDialect(args, hostPlatform);
+        if (!value)
+            return baseEnv;
+        if ((baseEnv ?? process.env)[SHADER_DIALECT_ENV] !== undefined)
+            return baseEnv;
+    }
+    else {
+        if (dialect === false || OFF.includes(String(dialect).trim().toLowerCase()))
+            return baseEnv;
+        value = String(dialect).trim().toLowerCase();
+        if (!VALID.includes(value)) {
+            throw new Error(`shaderDialect must be one of ${VALID.join(", ")} (got ${JSON.stringify(dialect)})`);
+        }
     }
     const src = baseEnv ?? process.env;
     const out = {};

package/dist/shaderdialect.js.map

@@ -1 +1 @@
-{"version":3,"file":"shaderdialect.js","sourceRoot":"","sources":["../src/shaderdialect.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,0BAA0B,CAAC;AAK7D,MAAM,KAAK,GAAsB,CAAC,MAAM,CAAC,CAAC;AAE1C;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAA2B,EAC3B,OAAuD;IAEvD,IAAI,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC;IAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACnD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,gCAAgC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CACpF,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC;IACnC,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,IAAI,CAAC,KAAK,SAAS;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC1E,GAAG,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;IAChC,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"shaderdialect.js","sourceRoot":"","sources":["../src/shaderdialect.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,0BAA0B,CAAC;AAK7D,MAAM,KAAK,GAAsB,CAAC,MAAM,CAAC,CAAC;AAE1C,MAAM,GAAG,GAAsB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAEvE;+FAC+F;AAC/F,MAAM,wBAAwB,GAAsB,CAAC,2BAA2B,EAAE,4BAA4B,CAAC,CAAC;AAEhH;;;;+DAI+D;AAC/D,MAAM,UAAU,oBAAoB,CAAC,IAAwB,EAAE,eAAuB,OAAO,CAAC,QAAQ;IACpG,IAAI,YAAY,KAAK,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/C,IAAI,OAA2B,CAAC;IAChC,IAAI,QAA4B,CAAC;IACjC,KAAK,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;QAC3B,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,SAAS;QACpC,IAAI,CAAC,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAAE,CAAC;YAC5C,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3E,CAAC;aAAM,IAAI,CAAC,CAAC,UAAU,CAAC,6BAA6B,CAAC,EAAE,CAAC;YACvD,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;QAC3D,CAAC;aAAM,IAAI,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjE,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IACD,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC5C,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7F,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAA0C,EAC1C,OAAuD,EACvD,IAAwB,EACxB,eAAuB,OAAO,CAAC,QAAQ;IAEvC,IAAI,KAAyB,CAAC;IAC9B,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC,CAAE,gDAAgD;QAChG,KAAK,GAAG,oBAAoB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK;YAAE,OAAO,OAAO,CAAC;QAC3B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,kBAAkB,CAAC,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC;IACjF,CAAC;SAAM,CAAC;QACN,IAAI,OAAO,KAAK,KAAK,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAAE,OAAO,OAAO,CAAC;QAC5F,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,gCAAgC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CACpF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,GAAG,GAAG,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC;IACnC,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,IAAI,CAAC,KAAK,SAAS;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC1E,GAAG,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;IAChC,OAAO,GAAG,CAAC;AACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clearcote",
-  "version": "0.38.1",
+  "version": "0.40.0",
   "description": "Playwright drop-in for the Clearcote anti-fingerprint Chromium build. launch() returns a standard Playwright Browser backed by the verified Clearcote binary, which is auto-downloaded and SHA-256 checked.",
   "type": "module",
   "main": "./dist/index.js",