Merge pull request #624 from zeromq/tests

Fix various failing tests

.eslintrc

@@ -1,9 +1,20 @@
 {
-  "plugins": ["prettier"],
-  "extends": ["plugin:prettier/recommended", "eslint-config-atomic"],
+  "plugins": [
+    "prettier"
+  ],
+  "extends": [
+    "eslint-config-atomic"
+  ],
   "rules": {
-    "@typescript-eslint/quotes": ["error", "double"],
-    "require-await": "off"
+    "@typescript-eslint/quotes": [
+      "error",
+      "double"
+    ],
+    "require-await": "off",
+    "@typescript-eslint/strict-boolean-expressions": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "no-await-in-loop": "off",
+    "class-methods-use-this": "off"
   },
   "ignorePatterns": [
     "node_modules/",
@@ -15,6 +26,8 @@
     "script/*.js",
     "script/*.d.ts",
     "docs/",
-    "docs-raw/"
+    "docs-raw/",
+    "test/unit/compat/",
+    "test/bench/"
   ]
 }

.mocharc.js

@@ -1,10 +1,18 @@
-"use strict"
-
-module.exports = {
+/**
+ * @type {import('mocha').MochaOptions}
+ */
+const config = {
   require: ["ts-node/register", "rocha"],
-  spec: ["test/unit/*-test.ts", "test/unit/compat/*-test.{ts,js}"],
+  spec: [
+    "test/unit/*-test.ts",
+    "test/unit/compat/*-test.js",
+  ],
   "expose-gc": true,
   "v8-expose-gc": true,
   "experimental-worker": true,
   recursive: true,
+  exit: true,
+  parallel: true,
 }
+
+module.exports = config

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    "recommendations": [
+        "hbenl.vscode-mocha-test-adapter",
+        "hbenl.vscode-test-explorer",
+        "llvm-vs-code-extensions.vscode-clangd",
+        "xadillax.gyp",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "mochaExplorer.parallel": true,
+    "mochaExplorer.globImplementation": "vscode"
+}

examples/majordomo/broker.ts

@@ -18,7 +18,7 @@ export class Broker {
     await this.socket.bind(this.address)
 
     const loop = async () => {
-      for await (const [sender, blank, header, ...rest] of this.socket) {
+      for await (const [sender, _blank, header, ...rest] of this.socket) {
         switch (header.toString()) {
           case Header.Client:
             this.handleClient(sender, ...rest)
@@ -32,7 +32,7 @@ export class Broker {
       }
     }
 
-    loop()
+    return loop()
   }
 
   async stop() {
@@ -56,8 +56,10 @@ export class Broker {
       }
 
       case Message.Reply: {
-        const [client, blank, ...rep] = rest
-        this.dispatchReply(worker, client, ...rep)
+        const [client, _blank, ...rep] = rest
+        this.dispatchReply(worker, client, ...rep).catch(err => {
+          console.error(err)
+        })
         break
       }
 
@@ -85,7 +87,7 @@ export class Broker {
 
   dispatchReply(worker: Buffer, client: Buffer, ...rep: Buffer[]) {
     const service = this.getWorkerService(worker)
-    this.getService(service).dispatchReply(worker, client, ...rep)
+    return this.getService(service).dispatchReply(worker, client, ...rep)
   }
 
   deregister(worker: Buffer) {

examples/majordomo/index.ts

@@ -4,7 +4,9 @@ import {Broker} from "./broker"
 import {Worker} from "./worker"
 
 async function sleep(msec: number) {
-  return new Promise(resolve => setTimeout(resolve, msec))
+  return new Promise(resolve => {
+    setTimeout(resolve, msec)
+  })
 }
 
 class TeaWorker extends Worker {
@@ -40,7 +42,7 @@ async function request(
   await socket.send(["MDPC01", service, ...req])
 
   try {
-    const [blank, header, ...res] = await socket.receive()
+    const [_blank, _header, ...res] = await socket.receive()
     console.log(`received '${res.join(", ")}' from '${service}'`)
     return res
   } catch (err) {
@@ -50,9 +52,9 @@ async function request(
 
 async function main() {
   for (const worker of workers) {
-    worker.start()
+    await worker.start()
   }
-  broker.start()
+  await broker.start()
 
   /* Requests are issued in parallel. */
   await Promise.all([
@@ -68,9 +70,9 @@ async function main() {
   ])
 
   for (const worker of workers) {
-    worker.stop()
+    await worker.stop()
   }
-  broker.stop()
+  await broker.stop()
 }
 
 main().catch(err => {

examples/majordomo/service.ts

@@ -15,7 +15,7 @@ export class Service {
 
   dispatchRequest(client: Buffer, ...req: Buffer[]) {
     this.requests.push([client, req])
-    this.dispatchPending()
+    return this.dispatchPending()
   }
 
   async dispatchReply(worker: Buffer, client: Buffer, ...rep: Buffer[]) {
@@ -28,12 +28,15 @@ export class Service {
 
     await this.socket.send([client, null, Header.Client, this.name, ...rep])
 
-    this.dispatchPending()
+    return this.dispatchPending()
   }
 
   async dispatchPending() {
     while (this.workers.size && this.requests.length) {
-      const [key, worker] = this.workers.entries().next().value!
+      const [key, worker] = this.workers.entries().next().value as [
+        string,
+        Buffer,
+      ]
       this.workers.delete(key)
       const [client, req] = this.requests.shift()!
 
@@ -42,6 +45,7 @@ export class Service {
           `${client.toString("hex")} req -> ${worker.toString("hex")}`,
       )
 
+      // eslint-disable-next-line no-await-in-loop
       await this.socket.send([
         worker,
         null,
@@ -59,14 +63,14 @@ export class Service {
       `registered worker ${worker.toString("hex")} for '${this.name}'`,
     )
     this.workers.set(worker.toString("hex"), worker)
-    this.dispatchPending()
+    return this.dispatchPending()
   }
 
   deregister(worker: Buffer) {
     console.log(
       `deregistered worker ${worker.toString("hex")} for '${this.name}'`,
     )
     this.workers.delete(worker.toString("hex"))
-    this.dispatchPending()
+    return this.dispatchPending()
   }
 }

examples/majordomo/worker.ts

@@ -16,8 +16,14 @@ export class Worker {
     await this.socket.send([null, Header.Worker, Message.Ready, this.service])
 
     const loop = async () => {
-      for await (const [blank1, header, type, client, blank2, ...req] of this
-        .socket) {
+      for await (const [
+        _blank1,
+        _header,
+        _type,
+        client,
+        _blank2,
+        ...req
+      ] of this.socket) {
         const rep = await this.process(...req)
         try {
           await this.socket.send([
@@ -34,7 +40,7 @@ export class Worker {
       }
     }
 
-    loop()
+    return loop()
   }
 
   async stop() {

examples/threaded-worker/processor.ts

@@ -22,7 +22,9 @@ export class Processor {
       this.input.bind("inproc://input"),
       this.output.bind("inproc://output"),
       this.signal.bind("inproc://signal"),
-      new Promise(resolve => setTimeout(resolve, 100)),
+      new Promise(resolve => {
+        setTimeout(resolve, 100)
+      }),
     ])
 
     this.exit = Promise.all([ThreadedWorker.spawn(this.threads)])

examples/threaded-worker/threaded-worker.ts

@@ -43,12 +43,14 @@ export class ThreadedWorker {
     const listen = async () => {
       for await (const [sig] of this.signal) {
         if (sig.toString() === "stop") {
-          this.stop()
+          await this.stop()
         }
       }
     }
 
-    listen()
+    listen().catch(err => {
+      throw err
+    })
   }
 
   async stop() {

package.json

@@ -29,6 +29,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/mocha": "^10.0.6",
     "@types/node": "^18.19.34",
+    "@types/proper-lockfile": "^4.1.4",
     "@types/semver": "^7.5.8",
     "@types/shelljs": "^0.8.15",
     "@types/which": "^2.0.2",
@@ -49,6 +50,8 @@
     "npm-run-all2": "^6.2.0",
     "prebuildify": "^6.0.1",
     "prettier": "^2.8.8",
+    "proper-lockfile": "^4.1.2",
+    "random-words": "^1",
     "rocha": "^2.5.10",
     "semver": "^7.6.2",
     "ts-node": "~10.9.2",
@@ -100,7 +103,7 @@
     "format": "prettier --write .",
     "test.electron.renderer": "run-s build && electron-mocha --renderer",
     "lint.clang-format": "clang-format -i -style=file ./src/*.cc ./src/*.h ./src/util/*.h",
-    "lint-test.eslint": "eslint **/*.{ts,tsx,js,jsx,cjs,mjs,json,yaml} --no-error-on-unmatched-pattern --cache --cache-location ./.cache/eslint/",
+    "lint-test.eslint": "eslint ./**/*.{ts,tsx,js,jsx,cjs,mjs,json,yaml} --no-error-on-unmatched-pattern --cache --cache-location ./.cache/eslint/",
     "lint.eslint": "pnpm run lint-test.eslint --fix",
     "lint": "run-p lint.eslint lint.clang-format",
     "lint-test": "run-s lint-test.eslint",