stress: remove custom loader and use esbuild to build (#581)

Closes #542 --------- Co-authored-by: texuf <[email protected]>
river-build · Jul 31, 2024 · 44fce31 · 44fce31
1 parent 5fd3f8a
commit 44fce31
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 138 deletions.
diff --git a/packages/stress/custom-loader.mjs b/packages/stress/custom-loader.mjs
diff --git a/packages/stress/esbuild.config.mjs b/packages/stress/esbuild.config.mjs
@@ -0,0 +1,23 @@
+import { build } from "esbuild";
+import { wasmLoader } from "esbuild-plugin-wasm";
+
+build({
+  entryPoints: ["./src/start.ts", "./src/demo.ts"],
+  bundle: true,
+  sourcemap: "inline",
+  platform: "node",
+  target: "node20",
+  format: "cjs",
+  outdir: "dist",
+  outExtension: { ".js": ".cjs" },
+  plugins: [wasmLoader()],
+  ignoreAnnotations: true,
+  assetNames: "[name]",
+  loader: {
+    ".ts": "ts",
+    ".wasm": "file",
+  },
+}).catch((e) => {
+  console.error(e);
+  process.exit(1);
+});
diff --git a/packages/stress/package.json b/packages/stress/package.json
@@ -3,16 +3,14 @@
     "version": "0.0.1",
     "private": true,
     "packageManager": "[email protected]",
-    "type": "module",
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
     "scripts": {
-        "build": "tsc",
+        "build": "yarn typecheck && yarn build-esbuild",
+        "typecheck": "tsc --noEmit",
+        "build-esbuild": "node esbuild.config.mjs",
         "lint": "eslint . --ext .ts",
         "my-jest": "NODE_TLS_REJECT_UNAUTHORIZED=0 yarn node -r ../../scripts/node-no-warn.js --experimental-vm-modules $(yarn bin jest)",
-        "my-node": "node -r ../../scripts/node-no-warn.js --experimental-loader ./custom-loader.mjs",
-        "start": "yarn my-node ./dist/start.js",
-        "demo": "yarn my-node ./dist/demo.js",
+        "start": "node ./dist/start.cjs",
+        "demo": "node ./dist/demo.cjs",
         "test:ci:with-entitlements": "RIVER_ENV=local_single PROCESS_INDEX=0  DEBUG='stress:*,csb:enc*,csb:dec*' DEBUG_DEPTH='10' yarn my-jest"
     },
     "dependencies": {
@@ -37,6 +35,8 @@
         "@types/node": "^20.5.0",
         "@typescript-eslint/eslint-plugin": "^6.10.0",
         "@typescript-eslint/parser": "^7.14.1",
+        "esbuild": "^0.21.5",
+        "esbuild-plugin-wasm": "^1.1.0",
         "eslint": "^8.53.0",
         "eslint-import-resolver-typescript": "^3.5.5",
         "eslint-plugin-import": "^2.27.5",

diff --git a/packages/stress/src/demo.ts b/packages/stress/src/demo.ts
@@ -118,11 +118,16 @@ async function encryptDecrypt() {
 
 printSystemInfo(logger)
 
-logger.log('==========================spamInfo==========================')
-await spamInfo(1)
-logger.log('=======================encryptDecrypt=======================')
-await encryptDecrypt()
-logger.log('========================sendAMessage========================')
-await sendAMessage()
-
-process.exit(0)
+const run = async () => {
+    logger.log('==========================spamInfo==========================')
+    await spamInfo(1)
+    logger.log('=======================encryptDecrypt=======================')
+    await encryptDecrypt()
+    logger.log('========================sendAMessage========================')
+    await sendAMessage()
+    process.exit(0)
+}
+
+run().catch(() => {
+    process.exit(1)
+})
diff --git a/packages/stress/src/index.ts b/packages/stress/src/index.ts
diff --git a/packages/stress/src/start.ts b/packages/stress/src/start.ts
@@ -35,22 +35,24 @@ function getStressMode(): string {
     return process.env.STRESS_MODE
 }
 
-switch (getStressMode()) {
-    case 'chat':
-        await startStressChat({
-            config,
-            processIndex,
-            rootWallet: getRootWallet().wallet,
-        })
-        break
-    case 'setup_chat':
-        await setupChat({
-            config,
-            rootWallet: getRootWallet().wallet,
-        })
-        break
-    default:
-        throw new Error('unknown stress mode')
+const run = async () => {
+    switch (getStressMode()) {
+        case 'chat':
+            await startStressChat({
+                config,
+                processIndex,
+                rootWallet: getRootWallet().wallet,
+            })
+            break
+        case 'setup_chat':
+            await setupChat({
+                config,
+                rootWallet: getRootWallet().wallet,
+            })
+            break
+        default:
+            throw new Error('unknown stress mode')
+    }
+    exit(0)
 }
-
-exit(0)
+run().catch(() => exit(1))
diff --git a/yarn.lock b/yarn.lock
@@ -3784,6 +3784,8 @@ __metadata:
     "@types/node": ^20.5.0
     "@typescript-eslint/eslint-plugin": ^6.10.0
     "@typescript-eslint/parser": ^7.14.1
+    esbuild: ^0.21.5
+    esbuild-plugin-wasm: ^1.1.0
     eslint: ^8.53.0
     eslint-import-resolver-typescript: ^3.5.5
     eslint-plugin-import: ^2.27.5
@@ -8952,6 +8954,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-plugin-wasm@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "esbuild-plugin-wasm@npm:1.1.0"
+  checksum: 382df12ecb92634d0f526cad4792b0ac5dc8016cdf63e23d9ee099f0f2c530855463cc45045c4a6ec10a6a1bd2ff59b5c4b24e6314a361fa70cc57645caf602b
+  languageName: node
+  linkType: hard
+
 "esbuild@npm:^0.21.3, esbuild@npm:^0.21.5":
   version: 0.21.5
   resolution: "esbuild@npm:0.21.5"