Get argon2-browser fork for node.js fix and fix test errors

Author: hlxid

nodecg-io-core/dashboard/esbuild.config.js

@@ -11,32 +11,6 @@ const fs = require("fs");
 const args = new Set(process.argv.slice(2));
 const prod = process.env.NODE_ENV === "production";
 
-// esbuild plugin to bundle wasm modules as base64 encoded strings
-// inside the generate js bundle.
-// This is used for the argon2-browser wasm module.
-// This is documented here: https://github.com/evanw/esbuild/issues/408#issuecomment-757555771
-const wasmPlugin = {
-    name: 'wasm',
-    setup(build) {
-        const namespace = "wasm-binary";
-
-        build.onResolve({ filter: /\.wasm$/ }, args => {
-            if (args.resolveDir === '') {
-                return // Ignore unresolvable paths
-            }
-            return {
-                path: path.isAbsolute(args.path) ? args.path : path.join(args.resolveDir, args.path),
-                namespace,
-            }
-        })
-
-        build.onLoad({ filter: /.*/, namespace }, async (args) => ({
-            contents: await fs.promises.readFile(args.path),
-            loader: 'base64',
-        }))
-    },
-};
-
 const entryPoints = [
     "monaco-editor/esm/vs/language/json/json.worker.js",
     "monaco-editor/esm/vs/editor/editor.worker.js",
@@ -120,7 +94,6 @@ const BuildOptions = {
     // because these code paths aren't executed we can just ignore the error that they don't exist in browser environments.
     // See https://github.com/antelle/argon2-browser/issues/79 and https://github.com/antelle/argon2-browser/issues/26
     external: ["fs", "path"],
-    plugins: [wasmPlugin],
 };
 
 esbuild

nodecg-io-core/extension/__tests__/persistenceManager.ts

@@ -17,8 +17,8 @@ describe("PersistenceManager", () => {
     const validPassword = "myPassword";
     const invalidPassword = "myInvalidPassword";
     const salt = crypto.lib.WordArray.random(128 / 8).toString();
-    const validEncryptionKey = deriveEncryptionKey(validPassword, salt).toString();
-    const invalidEncryptionKey = deriveEncryptionKey(invalidPassword, salt).toString();
+    let validEncryptionKey = ""; // Generated in beforeEach
+    let invalidEncryptionKey = "";
 
     const nodecg = new MockNodeCG();
     const serviceManager = new ServiceManager(nodecg);
@@ -30,7 +30,12 @@ describe("PersistenceManager", () => {
     const encryptedDataReplicant = nodecg.Replicant<EncryptedData>("encryptedConfig");
     let persistenceManager: PersistenceManager;
 
-    beforeEach(() => {
+    beforeEach(async () => {
+        if (!validEncryptionKey || !invalidEncryptionKey) {
+            validEncryptionKey = await deriveEncryptionKey(validPassword, salt);
+            invalidEncryptionKey = await deriveEncryptionKey(invalidPassword, salt);
+        }
+
         encryptedDataReplicant.removeAllListeners();
         encryptedDataReplicant.value = {};
 
@@ -310,6 +315,8 @@ describe("PersistenceManager", () => {
                 else return error("encryption key invalid");
             });
             nodecgBundleReplicant.value = bundleRepValue ?? [nodecg.bundleName];
+            // Wait for automatic login to trigger
+            await new Promise((res) => setTimeout(res, 500));
         }
 
         beforeEach(() => {

nodecg-io-core/extension/persistenceManager.ts

@@ -459,15 +459,15 @@ export class PersistenceManager {
                         throw new Error(loadResult.errorMessage);
                     }
                 } catch (err) {
-                    const logMesssage = `Failed to automatically login: ${err}`;
+                    const logMessage = `Failed to automatically login: ${err}`;
                     if (this.isLoaded()) {
                         // load() threw an error but nodecg-io is currently loaded nonetheless.
                         // Anyway, nodecg-io is loaded which is what we wanted
-                        this.nodecg.log.warn(logMesssage);
+                        this.nodecg.log.warn(logMessage);
                     } else {
                         // Something went wrong and nodecg-io is not loaded.
                         // This is a real error, the password might be wrong or some other issue.
-                        this.nodecg.log.error(logMesssage);
+                        this.nodecg.log.error(logMessage);
                     }
                 }
             }

nodecg-io-core/package.json

@@ -55,7 +55,7 @@
     },
     "dependencies": {
         "ajv": "^8.11.0",
-        "argon2-browser": "^1.18.0",
+        "argon2-browser": "https://github.com/daniel0611/argon2-browser/releases/download/1.19.0/argon2-browser-1.19.0.tgz",
         "crypto-js": "^4.1.1",
         "tslib": "^2.4.0"
     }