v2.28.5

.dockerignore

@@ -3,7 +3,12 @@ cypress
 node_modules
 build
 dataScripts
-lambda-build
-public
 server
 *.Dockerfile
+
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.gitattributes

@@ -0,0 +1,4 @@
+/.yarn/**            linguist-vendored
+/.yarn/releases/*    binary
+/.yarn/plugins/**/*  binary
+/.pnp.*              binary linguist-generated

.github/workflows/docker_build.yml

@@ -0,0 +1,47 @@
+name: Docker Build and Push
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set image tag based on branch
+        run: echo "IMAGE_TAG=$(if [ "${{ github.ref }}" = "refs/heads/master" ]; then echo 'latest'; else echo 'latest-dev'; fi)" >> $GITHUB_ENV
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./console.Dockerfile
+          push: true
+          tags: ghcr.io/twoabove/noitool-console-search:${{ env.IMAGE_TAG }}
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          cache: "yarn"
+          cache: "npm"
           node-version: ${{ matrix.node }}
 
       - name: Cache build
@@ -50,8 +50,8 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Yarn install
-        run: yarn install --immutable
+      - name: npm install
+        run: npm install --immutable
 
   build:
     needs: setup
@@ -78,7 +78,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          cache: "yarn"
+          cache: "npm"
           node-version: ${{ matrix.node }}
 
       - name: Cache build
@@ -105,7 +105,7 @@ jobs:
             false # This is needed because node throws console.warn messages that
             # get treated as errors in CI
         run: |
-          DISABLE_ESLINT_PLUGIN=true yarn build
+          DISABLE_ESLINT_PLUGIN=true npm run build
           if [ -d "./build" ]; then
             echo "Build dir exists"
             exit 0
@@ -138,7 +138,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          cache: "yarn"
+          cache: "npm"
           node-version: ${{ matrix.node }}
 
       - name: Cache build
@@ -160,7 +160,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: Test
-        run: yarn test
+        run: npm test
         env:
           CI: true
 
@@ -189,7 +189,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          cache: "yarn"
+          cache: "npm"
           node-version: ${{ matrix.node }}
 
       - name: Cache build
@@ -211,7 +211,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: e2e
-        run: yarn e2e
+        run: npm e2e
         env:
           CI:
             false # This is needed because node throws console.warn messages that

.gitignore

@@ -50,6 +50,12 @@ typings/
 
 # Optional npm cache directory
 .npm
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
 
 # Optional eslint cache
 .eslintcache
@@ -105,10 +111,11 @@ dist
 .tern-port
 
 build
-lambda-build
+console-build
 
 ssl
 
 dataScripts/src/mapsToObj/gen
+dataScripts/src/out
 
 cypress/screenshots/

.prettierignore

@@ -1,5 +1,5 @@
 build
-lambda-build
+console-build
 ssl
 dataScripts/src/mapsToObj/gen
 public

README.md

@@ -21,29 +21,42 @@ Current features include:
 
 ### Prerequisites
 
-- The machine should have node installed (ideally v18.6+) and yarn.
+- The machine should have node installed (ideally v18.6+) and npm.
 - Follow to <https://www.noitool.com/?profile=true> and link your patreon account. Under your patreon username, there will now be an id like `6456aff2478c4f8f91701018`
 
 ### Installing and connecting
 
+#### Docker
+
+You can use docker to simply spin up a compute node:
+
+```bash
+docker pull ghcr.io/twoabove/noitool-console-search:latest && docker run -it ghcr.io/twoabove/noitool-console-search:latest --userId xxx
+# Or for dev
+docker pull ghcr.io/twoabove/noitool-console-search:latest-dev && docker run -it ghcr.io/twoabove/noitool-console-search:latest-dev --userId xxx --url https://dev.noitool.com/
+```
+
+#### CLI
+
 To connect to noitool as a compute node, follow these steps:
 
 ```bash
 git clone https://github.com/TwoAbove/noita-tools.git
 cd noita-tools
 git checkout master # for https://www.noitool.com
 # git checkout develop # for https://dev.noitool.com
-yarn install --frozen-lockfile
-yarn lambda-build
-yarn console-search --userId 6456aff2478c4f8f91701018
+npm install --frozen-lockfile
+npm run console-build
+npm run console-search --userId 6456aff2478c4f8f91701018
 ```
 
-console-search args:
+console-search args (or env vars):
 
-- `--url`: default <https://www.noitool.com/>. Change to <https://dev.noitool.com/> for the dev build
-- `--cores`: default `os.cpus()`. The amount of threads to use.
-- `--userId`: The user to connect as.
-- `--exit` default `false`. Add if you want the worker to exit if there are no more jobs.
+- `--url` `NOITOOL_URL`: default <https://www.noitool.com/>. Change to <https://dev.noitool.com/> for the dev build
+- `--cores` `NOITOOL_CORES`: default `os.cpus()`. The amount of threads to use.
+- `--userId` `NOITOOL_USER_ID`: The user to connect as.
+- `--exit` `NOITOOL_EXIT` default `false`. Add if you want the worker to exit if there are no more jobs.
+- `--minRunTime` `NOITOOL_MIN_RUN_TIME` default `0`. This minimum amount of time (in seconds) that the worker will run for. If there are no more jobs, it will exit after this time. A value of 0 means that this is disabled.
 
 ## Technical details and implementation details that I found interesting
 
@@ -67,7 +80,6 @@ Prerequisites:
 - [emscripten](https://emscripten.org/docs/getting_started/downloads.html) is installed
 - `npm i -g google-closure-compiler`
 - Node
-- Yarn
 
 After extracting noita wak, run
 
@@ -78,6 +90,7 @@ find . -type f -not -path '*/\.*' -exec sed -i 's/<!------------ MATERIALS -----
 find . -type f -not -path '*/\.*' -exec sed -i 's/<!-- attack_ranged_min_distance="60" -->//g' {} +;
 find . -type f -not -path '*/\.*' -exec sed -i 's/<!---------------- shield ---------------- -->//g' {} +;
 find . -type f -not -path '*/\.*' -exec sed -i 's/<!-- fuse_tnt durability is 11 so this is capable of destroying it -->//g' {} +;
+tac $NOLLA_PATH/entities/misc/eradicate.xml | sed '0,/<Entity>$/s//<\/Entity>/' | tac >$NOLLA_PATH/entities/misc/eradicate.xml;
 ```
 
 to fix comments for the xml parser
@@ -116,6 +129,6 @@ To get the prefix, run:
 npm config get prefix
 ```
 
-Installation (after emscripten): `yarn`
+Installation (after emscripten): `npm i`
 
-Running: `yarn dev`
+Running: `npm run dev`

console.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-slim as build-image
+FROM node:20-slim as build-image
 
 RUN apt-get update && \
   apt-get install -y \
@@ -15,17 +15,24 @@ RUN mkdir -p /app
 
 WORKDIR /app
 
+RUN npm i esbuild
+
 COPY . .
 
-RUN yarn install --frozen-lockfile
+# RUN npm install
+
+RUN npm run console-build
+
+FROM node:20-slim
 
-RUN yarn lambda-build
+RUN apt-get update && \
+  apt-get install -y \
+  python3 make g++
 
-RUN rm -rf node_modules && yarn install --frozen-lockfile --production=true
+WORKDIR /app
 
-FROM node:18-alpine
+COPY --from=build-image /app/console-build /app/
 
-COPY --from=build-image /app/lambda-build  ./
-COPY --from=build-image /app/node_modules  ./
+RUN npm install --production=true
 
-ENTRYPOINT ["node", "consoleSearch.js"]
+ENTRYPOINT ["npm", "run", "start"]

lambdaBuild.js → consoleBuild.js

@@ -1,10 +1,11 @@
 const fs = require("fs");
 const path = require("path");
+
 // const requireResolvePlugin = require('@chialab/esbuild-plugin-require-resolve');
 // const { resolve } = require('path');
 // const tsc = require('tsc-prog');
 
-// rimraf lambda-build/* && tsc --project ./tsconfig.lambda.json && copyfiles -u 1 src/**/*.wasm lambda-build
+// rimraf console-build/* && tsc --project ./tsconfig.lambda.json && copyfiles -u 1 src/**/*.wasm console-build
 
 // tsc.build({
 // 	basePath: __dirname,
@@ -14,7 +15,7 @@ const path = require("path");
 // });
 
 // writeFileSync(
-// 	resolve(__dirname, 'lambda-build/package.json'),
+// 	resolve(__dirname, 'console-build/package.json'),
 // 	JSON.stringify(
 // 		{
 // 			// type: 'commonjs',
@@ -30,8 +31,8 @@ const path = require("path");
 // 		2
 // 	)
 // );
-if (!fs.existsSync("lambda-build")) {
-  fs.mkdirSync("lambda-build");
+if (!fs.existsSync("console-build")) {
+  fs.mkdirSync("console-build");
 }
 
 const pkg = require(path.resolve("./package.json"));
@@ -51,37 +52,32 @@ require("esbuild")
     metafile: true,
     sourcemap: true,
     // minify: true,
-    target: ["node18"],
-    outdir: "lambda-build",
+    target: ["node20"],
     format: "esm",
     banner: {
       js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`,
     },
-    // outfile: 'lambda-build/consoleSearch.js'
+    outdir: "console-build",
     packages: "external",
     external,
   })
   .then(() => {
-    const pkg = {
-      name: "noitool-console",
-      type: "module",
-      module: "consoleSearch.js",
-      version: "0.0.0",
-    };
-
-    fs.writeFileSync(path.resolve(__dirname, "lambda-build", "package.json"), JSON.stringify(pkg, null, 4));
+    fs.copyFileSync(
+      path.resolve(__dirname, "search.package.json"),
+      path.resolve(__dirname, "console-build", "package.json")
+    );
 
     {
       // Need to figure out how to correctly fix URL requires with esbuild
-      const fixFile = path.resolve(__dirname, "lambda-build", "consoleSearch.js");
+      const fixFile = path.resolve(__dirname, "console-build", "consoleSearch.js");
       let f = fs.readFileSync(fixFile, "utf8");
       let result = f.replace("../workers/seedSearcher.worker.node.ts", "./workers/seedSearcher.worker.node.js");
       fs.writeFileSync(fixFile, result);
     }
 
     {
       // Need to figure out how to correctly fix URL requires with esbuild
-      const fixFile = path.resolve(__dirname, "lambda-build", "workers/seedSearcher.worker.node.js");
+      const fixFile = path.resolve(__dirname, "console-build", "workers/seedSearcher.worker.node.js");
       let f = fs.readFileSync(fixFile, "utf8");
       let result = "" + f;
       result = result.replaceAll(`.json";`, `.json"assert{type:"json"};`);

craco.config.js

@@ -21,7 +21,20 @@ module.exports = {
         },
       });
 
+      // https://github.com/facebook/create-react-app/pull/11752#issuecomment-1345231546
+      config.ignoreWarnings = [
+        function ignoreSourcemapsloaderWarnings(warning) {
+          return (
+            warning.module &&
+            warning.module.resource.includes("node_modules") &&
+            warning.details &&
+            warning.details.includes("source-map-loader")
+          );
+        },
+      ];
+
       config.experiments = {
+        css: false,
         futureDefaults: true,
         asyncWebAssembly: true,
       };