MAGPIE integration (sims in analyzer)

Dockerfile-fe

@@ -10,6 +10,7 @@ ENV PATH /opt/liwords-ui/node_modules/.bin:$PATH
 
 COPY ./liwords-ui/package.json ./liwords-ui/package-lock.json ./
 COPY ./liwords-ui/wolges-wasm-pkg ./wolges-wasm-pkg
+COPY ./liwords-ui/magpie-wasm-pkg ./magpie-wasm-pkg
 
 RUN ["npm", "ci"]
 

cmd/liwords-api/main.go

@@ -120,6 +120,18 @@ func NewLoggingServerHooks() *twirp.ServerHooks {
 	}
 }
 
+// this CORS middleware is needed for SharedArrayBuffer to be enabled!
+// func corsMiddlewareGenerator() (mw func(http.Handler) http.Handler) {
+// 	mw = func(h http.Handler) http.Handler {
+// 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+// 			w.Header().Add("Cross-Origin-Opener-Policy", "same-origin")
+// 			w.Header().Add("Cross-Origin-Embedder-Policy", "require-corp")
+// 			h.ServeHTTP(w, r)
+// 		})
+// 	}
+// 	return
+// }
+
 // func NewInterceptorCustomError() twirp.Interceptor {
 // 	return func(next twirp.Method) twirp.Method {
 // 		return func(ctx context.Context, req interface{}) (interface{}, error) {
@@ -197,7 +209,7 @@ func main() {
 		apiserver.AuthenticationMiddlewareGenerator(stores.SessionStore),
 		apiserver.APIKeyMiddlewareGenerator(),
 		config.CtxMiddlewareGenerator(cfg),
-
+		// corsMiddlewareGenerator(),
 		hlog.AccessHandler(func(r *http.Request, status int, size int, d time.Duration) {
 			path := strings.Split(r.URL.Path, "/")
 			method := path[len(path)-1]

docker-compose.yml

@@ -102,8 +102,7 @@ services:
   #   networks:
   #     - aeronet
 
-  socket:
-    &socketsetup
+  socket: &socketsetup
     build:
       context: ../liwords-socket
       dockerfile: Dockerfile-dev
@@ -209,7 +208,9 @@ services:
       - traefik.enable=true
 
       - "traefik.http.middlewares.floc.headers.customresponseheaders.Permissions-Policy=interest-cohort=()"
-      - "traefik.http.routers.liwords-fe.middlewares=floc"
+      - "traefik.http.middlewares.cors-opener.headers.customresponseheaders.Cross-Origin-Opener-Policy=same-origin"
+      - "traefik.http.middlewares.cors-embedder.headers.customresponseheaders.Cross-Origin-Embedder-Policy=require-corp"
+      - "traefik.http.routers.liwords-fe.middlewares=floc,cors-opener,cors-embedder"
       - "traefik.http.routers.liwords-fe.rule=PathPrefix(`/`)"
       - "traefik.http.routers.liwords-fe.service=liwords-fe-service"
       - "traefik.http.routers.liwords-fe.entrypoints=web"

liwords-ui/.eslintignore

@@ -3,3 +3,4 @@ build/*
 public/*
 src/react-app-env.d.ts
 src/serviceWorker.ts
+magpie-wasm-pkg/*

liwords-ui/.prettierignore

@@ -1,2 +1,3 @@
 src/gen/**/*.js
-src/gen/**/*.ts
+src/gen/**/*.ts
+src/magpie-wasm-pkg/*

liwords-ui/config-overrides.js

@@ -4,28 +4,29 @@ module.exports = {
   // reduce bundle size by only including antd icons we need
   resolve: {
     alias: {
-      "@ant-design/icons$": path.resolve(__dirname, "./src/icons.js")
-    }
+      '@ant-design/icons$': path.resolve(__dirname, './src/icons.js'),
+    },
   },
 
-  webpack: function(config, env) {
+  webpack: function (config, env) {
+    /*
     const wasmExtensionRegExp = /\.wasm$/;
     config.module.rules.forEach((rule) => {
-        (rule.oneOf || []).forEach((oneOf) => {
+      (rule.oneOf || []).forEach((oneOf) => {
         if (!oneOf.loader && oneOf.type === 'asset/resource') {
-            oneOf.exclude.push(wasmExtensionRegExp);
+          oneOf.exclude.push(wasmExtensionRegExp);
         }
-        });
+      });
     });
-
+    */
     config.experiments = {
-        asyncWebAssembly: true,
+      asyncWebAssembly: true,
     };
     return config;
   },
 
-  devServer: function(configFunction) {
-    return function(proxy, allowedHost) {
+  devServer: function (configFunction) {
+    return function (proxy, allowedHost) {
       const config = configFunction(proxy, allowedHost);
       config.webSocketServer = config.webSocketServer || {};
       config.webSocketServer.options = {
@@ -35,20 +36,20 @@ module.exports = {
       if (process.env.WDS_PROXY) {
         console.log('Webpack dev-server proxy is on...');
         config.proxy = {
-            ...config.proxy,
-            '/twirp': 'http://localhost:8001',
-            '/gameimg': 'http://localhost:8001',
-            '/ws': {
-                target: 'ws://localhost:8087',
-                ws: true
-            }
+          ...config.proxy,
+          '/twirp': 'http://localhost:8001',
+          '/gameimg': 'http://localhost:8001',
+          '/ws': {
+            target: 'ws://localhost:8087',
+            ws: true,
+          },
         };
       }
       config.client = {
         ...config.client,
         overlay: false,
       };
       return config;
-    }
-  }
+    };
+  },
 };