worker-testbed 1.0.2 → 1.0.3

package/build/index.cjs

@@ -6,7 +6,9 @@ var functoolsKit = require('functools-kit');
 var tape = require('tape');
 
 const workerFileSubject = new functoolsKit.BehaviorSubject();
+const finishSubject = new functoolsKit.Subject();
 let testRegistry = new functoolsKit.ToolRegistry("workertest");
+let testCounter = 0;
 const waitForFile = async () => {
     if (workerFileSubject.data) {
         return workerFileSubject.data;
@@ -29,6 +31,7 @@ const test = async (testName, cb) => {
     const workerFile = await waitForFile();
     tape(testName, async (test) => {
         const [awaiter, { resolve }] = functoolsKit.createAwaiter();
+        testCounter += 1;
         const worker = new worker_threads.Worker(workerFile, {
             workerData: { testName },
         });
@@ -51,12 +54,18 @@ const test = async (testName, cb) => {
                 resolve();
             }
         });
-        return await awaiter;
+        {
+            await awaiter;
+            testCounter -= 1;
+            await finishSubject.next();
+        }
     });
 };
-const run = async (__filename) => {
+const run = async (__filename, cb) => {
     if (worker_threads.isMainThread) {
         await workerFileSubject.next(url.fileURLToPath(__filename));
+        await finishSubject.filter(() => testCounter === 0).toPromise();
+        cb();
         return;
     }
     if (!worker_threads.parentPort) {

package/build/index.mjs

@@ -1,10 +1,12 @@
 import { isMainThread, Worker, parentPort, workerData } from 'worker_threads';
 import { fileURLToPath } from 'url';
-import { BehaviorSubject, ToolRegistry, createAwaiter } from 'functools-kit';
+import { BehaviorSubject, Subject, ToolRegistry, createAwaiter } from 'functools-kit';
 import tape from 'tape';
 
 const workerFileSubject = new BehaviorSubject();
+const finishSubject = new Subject();
 let testRegistry = new ToolRegistry("workertest");
+let testCounter = 0;
 const waitForFile = async () => {
     if (workerFileSubject.data) {
         return workerFileSubject.data;
@@ -27,6 +29,7 @@ const test = async (testName, cb) => {
     const workerFile = await waitForFile();
     tape(testName, async (test) => {
         const [awaiter, { resolve }] = createAwaiter();
+        testCounter += 1;
         const worker = new Worker(workerFile, {
             workerData: { testName },
         });
@@ -49,12 +52,18 @@ const test = async (testName, cb) => {
                 resolve();
             }
         });
-        return await awaiter;
+        {
+            await awaiter;
+            testCounter -= 1;
+            await finishSubject.next();
+        }
     });
 };
-const run = async (__filename) => {
+const run = async (__filename, cb) => {
     if (isMainThread) {
         await workerFileSubject.next(fileURLToPath(__filename));
+        await finishSubject.filter(() => testCounter === 0).toPromise();
+        cb();
         return;
     }
     if (!parentPort) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worker-testbed",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "The AI-ready testbed which use Worker Threads to create isolated vm context",
   "author": {
     "name": "Petr Tripolsky",

package/types.d.ts

@@ -3,6 +3,6 @@ interface ITest {
     fail(msg?: string): void;
 }
 declare const test: (testName: string, cb: (t: ITest) => void) => Promise<void>;
-declare const run: (__filename: string) => Promise<void>;
+declare const run: (__filename: string, cb: () => void) => Promise<void>;
 
 export { run, test };