Merge branch 'master' into glicko-api

lichess-org · Nov 19, 2024 · 134478b · 134478b
2 parents 7e352ac + 095f604
commit 134478b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 29 deletions.
diff --git a/ui/ceval/src/engines/engines.ts b/ui/ceval/src/engines/engines.ts
@@ -1,11 +1,11 @@
-import type { BrowserEngineInfo, ExternalEngineInfo, EngineInfo, CevalEngine, Requires } from '../types';
+import type { BrowserEngineInfo, ExternalEngineInfo, EngineInfo, CevalEngine } from '../types';
 import type CevalCtrl from '../ctrl';
 import { SimpleEngine } from './simpleEngine';
 import { StockfishWebEngine } from './stockfishWebEngine';
 import { ThreadedEngine } from './threadedEngine';
 import { ExternalEngine } from './externalEngine';
 import { storedStringProp, StoredProp } from 'common/storage';
-import { isAndroid, isIOS, isIPad, getFirefoxMajorVersion, features, type Feature } from 'common/device';
+import { isAndroid, isIOS, isIPad, features as browserSupport, type Feature } from 'common/device';
 import { xhrHeader } from 'common/xhr';
 import { lichessRules } from 'chessops/compat';
 import { log } from 'common/permalog';
@@ -16,12 +16,8 @@ export class Engines {
   localEngineMap: Map<string, WithMake>;
   externalEngines: ExternalEngineInfo[];
   selectProp: StoredProp<string>;
-  browserSupport: Requires[] = features().slice();
 
   constructor(private ctrl: CevalCtrl) {
-    const firefox = getFirefoxMajorVersion();
-    if (!firefox || firefox > 113) this.browserSupport.push('allowLsfw');
-
     this.localEngineMap = this.makeEngineMap();
     this.localEngines = [...this.localEngineMap.values()].map(e => e.info);
     this.externalEngines = this.ctrl.opts.externalEngines?.map(e => ({ tech: 'EXTERNAL', ...e })) ?? [];
@@ -47,7 +43,7 @@ export class Engines {
         name: 'Fairy Stockfish 14+ NNUE',
         short: 'FSF 14+',
         tech: 'NNUE',
-        requires: ['simd', 'allowLsfw'],
+        requires: ['simd', 'dynamicImportFromWorker'],
         variants: [key],
         assets: {
           version: 'sfw006',
@@ -75,7 +71,7 @@ export class Engines {
             name: 'Stockfish 16 NNUE · 7MB',
             short: 'SF 16 · 7MB',
             tech: 'NNUE',
-            requires: ['simd', 'allowLsfw'],
+            requires: ['simd', 'dynamicImportFromWorker'],
             minMem: 1536,
             assets: {
               version: 'sfw006',
@@ -91,7 +87,7 @@ export class Engines {
             name: 'Stockfish 17 NNUE · 79MB',
             short: 'SF 17 · 79MB',
             tech: 'NNUE',
-            requires: ['simd', 'allowLsfw'],
+            requires: ['simd', 'dynamicImportFromWorker'],
             minMem: 2560,
             assets: {
               version: 'sfw006',
@@ -126,7 +122,7 @@ export class Engines {
             name: 'Fairy Stockfish 14+ HCE',
             short: 'FSF 14+',
             tech: 'HCE',
-            requires: ['simd', 'allowLsfw'],
+            requires: ['simd', 'dynamicImportFromWorker'],
             variants: variants.map(v => v[0]),
             assets: {
               version: 'sfw006',
@@ -214,8 +210,8 @@ export class Engines {
       ]
         .filter(
           e =>
-            e.info.requires.every((req: Requires) => this.browserSupport.includes(req)) &&
-            !(e.info.obsoletedBy && this.browserSupport.includes(e.info.obsoletedBy as Feature)),
+            e.info.requires.every((req: Feature) => browserSupport().includes(req)) &&
+            !(e.info.obsoletedBy && browserSupport().includes(e.info.obsoletedBy as Feature)),
         )
         .map(e => [e.info.id, { info: withDefaults(e.info as BrowserEngineInfo), make: e.make }]),
     );

diff --git a/ui/ceval/src/types.ts b/ui/ceval/src/types.ts
@@ -34,7 +34,7 @@ export interface BaseEngineInfo {
   minThreads?: number;
   maxThreads?: number;
   maxHash?: number;
-  requires?: Requires[];
+  requires?: Feature[];
 }
 
 export interface ExternalEngineInfo extends BaseEngineInfo {
@@ -46,14 +46,12 @@ export interface ExternalEngineInfo extends BaseEngineInfo {
 export interface BrowserEngineInfo extends BaseEngineInfo {
   minMem?: number;
   assets: { root?: string; js?: string; wasm?: string; version?: string; nnue?: string[] };
-  requires: Requires[];
+  requires: Feature[];
   obsoletedBy?: Feature;
 }
 
 export type EngineInfo = BrowserEngineInfo | ExternalEngineInfo;
 
-export type Requires = Feature | 'allowLsfw'; // lsfw = lila-stockfish-web
-
 export type EngineNotifier = (status?: {
   download?: { bytes: number; total: number };
   error?: string;

diff --git a/ui/common/src/device.ts b/ui/common/src/device.ts
@@ -99,7 +99,7 @@ export const isApple: () => boolean = memoize<boolean>(
 
 export const shareIcon: () => string = () => (isApple() ? licon.ShareIos : licon.ShareAndroid);
 
-export type Feature = 'wasm' | 'sharedMem' | 'simd';
+export type Feature = 'wasm' | 'sharedMem' | 'simd' | 'dynamicImportFromWorker';
 
 export const hasFeature = (feat?: string): boolean => !feat || features().includes(feat as Feature);
 
@@ -111,17 +111,23 @@ export const features: () => readonly Feature[] = memoize<readonly Feature[]>(()
     WebAssembly.validate(Uint8Array.from([0, 97, 115, 109, 1, 0, 0, 0]))
   ) {
     features.push('wasm');
-    if (sharedMemoryTest()) {
-      features.push('sharedMem');
-      // i32x4.dot_i16x8_s, i32x4.trunc_sat_f64x2_u_zero
-      const sourceWithSimd = Uint8Array.from([
-        0, 97, 115, 109, 1, 0, 0, 0, 1, 12, 2, 96, 2, 123, 123, 1, 123, 96, 1, 123, 1, 123, 3, 3, 2, 0, 1, 7,
-        9, 2, 1, 97, 0, 0, 1, 98, 0, 1, 10, 19, 2, 9, 0, 32, 0, 32, 1, 253, 186, 1, 11, 7, 0, 32, 0, 253, 253,
-        1, 11,
-      ]);
-      if (WebAssembly.validate(sourceWithSimd)) features.push('simd');
-    }
+    // i32x4.dot_i16x8_s, i32x4.trunc_sat_f64x2_u_zero
+    const sourceWithSimd = Uint8Array.from([
+      0, 97, 115, 109, 1, 0, 0, 0, 1, 12, 2, 96, 2, 123, 123, 1, 123, 96, 1, 123, 1, 123, 3, 3, 2, 0, 1, 7, 9,
+      2, 1, 97, 0, 0, 1, 98, 0, 1, 10, 19, 2, 9, 0, 32, 0, 32, 1, 253, 186, 1, 11, 7, 0, 32, 0, 253, 253, 1,
+      11,
+    ]);
+    if (WebAssembly.validate(sourceWithSimd)) features.push('simd');
+    if (sharedMemoryTest()) features.push('sharedMem');
   }
+  try {
+    new Worker(
+      URL.createObjectURL(
+        new Blob(["import('data:text/javascript,export default {}')"], { type: 'application/javascript' }),
+      ),
+    ).terminate();
+    features.push('dynamicImportFromWorker');
+  } catch {}
   return Object.freeze(features);
 });
 
@@ -143,7 +149,7 @@ function sharedMemoryTest(): boolean {
     if (!(mem.buffer instanceof SharedArrayBuffer)) return false;
 
     window.postMessage(mem.buffer, '*');
-  } catch (_) {
+  } catch {
     return false;
   }
   return mem.buffer instanceof SharedArrayBuffer;

diff --git a/ui/puzzle/src/report.ts b/ui/puzzle/src/report.ts
@@ -32,7 +32,9 @@ export default class Report {
       // the `mate` key theme is not sent, as it is considered redubant with `mateInX`
       ctrl.data.puzzle.themes.some((t: ThemeKey) => t.toLowerCase().includes('mate')) ||
       // if the user has chosen to hide the dialog less than a week ago
-      this.tsHideReportDialog() > Date.now() - 1000 * 3600 * 24 * 7
+      this.tsHideReportDialog() > Date.now() - 1000 * 3600 * 24 * 7 ||
+      // dynamic import from web worker feature is shared by all stockfish 16+ WASMs
+      !ctrl.ceval.engines.active?.requires?.includes('dynamicImportFromWorker')
     )
       return;
     const node = ctrl.node;