broker-factory 3.1.10 → 3.1.11

package/build/es2019/factories/create-broker.d.ts

@@ -0,0 +1,9 @@
+import type { generateUniqueNumber as generateUniqueNumberFunction } from 'fast-unique-numbers';
+import { IWorkerDefinition } from 'worker-factory';
+import type { isMessagePort as isMessagePortFunction } from '../guards/message-port';
+import { IBrokerDefinition, IDefaultBrokerDefinition } from '../interfaces';
+import { TBrokerImplementation } from '../types';
+import type { createCreateOrGetOngoingRequests } from './create-or-get-ongoing-requests';
+import type { createExtendBrokerImplementation } from './extend-broker-implementation';
+export declare const createBrokerFactory: (createOrGetOngoingRequests: ReturnType<typeof createCreateOrGetOngoingRequests>, extendBrokerImplementation: ReturnType<typeof createExtendBrokerImplementation>, generateUniqueNumber: typeof generateUniqueNumberFunction, isMessagePort: typeof isMessagePortFunction) => <T extends IBrokerDefinition, U extends IWorkerDefinition>(brokerImplementation: TBrokerImplementation<T, U>) => ((sender: MessagePort | Worker) => T & IDefaultBrokerDefinition);
+//# sourceMappingURL=create-broker.d.ts.map

package/build/es2019/factories/create-broker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-broker.d.ts","sourceRoot":"","sources":["../../../src/factories/create-broker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,IAAI,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAE,iBAAiB,EAA6C,MAAM,gBAAgB,CAAC;AAC9F,OAAO,KAAK,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAgB,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AACzF,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,gCAAgC,CAAC;AAEvF,eAAO,MAAM,mBAAmB,GAExB,4BAA4B,UAAU,CAAC,OAAO,gCAAgC,CAAC,EAC/E,4BAA4B,UAAU,CAAC,OAAO,gCAAgC,CAAC,EAC/E,sBAAsB,OAAO,4BAA4B,EACzD,eAAe,OAAO,qBAAqB,MAE9C,CAAC,SAAS,iBAAiB,EAAE,CAAC,SAAS,iBAAiB,EACrD,sBAAsB,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,KAClD,CAAC,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,KAAK,CAAC,GAAG,wBAAwB,CAmDjE,CAAC"}

package/build/es2019/factories/create-broker.js

@@ -0,0 +1,43 @@
+export const createBrokerFactory = (createOrGetOngoingRequests, extendBrokerImplementation, generateUniqueNumber, isMessagePort) => (brokerImplementation) => {
+    const fullBrokerImplementation = extendBrokerImplementation(brokerImplementation);
+    return (sender) => {
+        const ongoingRequests = createOrGetOngoingRequests(sender);
+        sender.addEventListener('message', (({ data: message }) => {
+            const { id } = message;
+            if (id !== null && ongoingRequests.has(id)) {
+                const { reject, resolve } = ongoingRequests.get(id);
+                ongoingRequests.delete(id);
+                if (message.error === undefined) {
+                    resolve(message.result);
+                }
+                else {
+                    reject(new Error(message.error.message));
+                }
+            }
+        }));
+        if (isMessagePort(sender)) {
+            sender.start();
+        }
+        const call = (method, params = null, transferables = []) => {
+            return new Promise((resolve, reject) => {
+                const id = generateUniqueNumber(ongoingRequests);
+                ongoingRequests.set(id, { reject, resolve });
+                if (params === null) {
+                    sender.postMessage({ id, method }, transferables);
+                }
+                else {
+                    sender.postMessage({ id, method, params }, transferables);
+                }
+            });
+        };
+        const notify = (method, params, transferables = []) => {
+            sender.postMessage({ id: null, method, params }, transferables);
+        };
+        let functions = {};
+        for (const [key, handler] of Object.entries(fullBrokerImplementation)) {
+            functions = { ...functions, [key]: handler({ call, notify }) };
+        }
+        return { ...functions };
+    };
+};
+//# sourceMappingURL=create-broker.js.map

package/build/es2019/factories/create-broker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-broker.js","sourceRoot":"","sources":["../../../src/factories/create-broker.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,mBAAmB,GAC5B,CACI,0BAA+E,EAC/E,0BAA+E,EAC/E,oBAAyD,EACzD,aAA2C,EAC7C,EAAE,CACJ,CACI,oBAAiD,EACe,EAAE;IAClE,MAAM,wBAAwB,GAAG,0BAA0B,CAAC,oBAAoB,CAAC,CAAC;IAElF,OAAO,CAAC,MAA4B,EAAE,EAAE;QACpC,MAAM,eAAe,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;QAE3D,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAgB,EAAE,EAAE;YACnF,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;YAEvB,IAAI,EAAE,KAAK,IAAI,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBACzC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAA4C,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAE7F,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAE3B,IAA0B,OAAQ,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBACrD,OAAO,CAAwB,OAAQ,CAAC,MAAM,CAAC,CAAC;gBACpD,CAAC;qBAAM,CAAC;oBACJ,MAAM,CAAC,IAAI,KAAK,CAAuB,OAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBACpE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;QAEJ,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;QAED,MAAM,IAAI,GAAG,CAAoB,MAAS,EAAE,SAAyB,IAAI,EAAE,gBAAuC,EAAE,EAAE,EAAE;YACpH,OAAO,IAAI,OAAO,CAA6B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/D,MAAM,EAAE,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;gBAEjD,eAAe,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;gBAE7C,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;oBAClB,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAkB,aAAa,CAAC,CAAC;gBACtE,CAAC;qBAAM,CAAC;oBACJ,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAkB,aAAa,CAAC,CAAC;gBAC9E,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,CAAoB,MAAS,EAAE,MAAsB,EAAE,gBAAuC,EAAE,EAAE,EAAE;YAC/G,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAkB,aAAa,CAAC,CAAC;QACpF,CAAC,CAAC;QAEF,IAAI,SAAS,GAAW,EAAE,CAAC;QAE3B,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,CAAC;YACpE,SAAS,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACnE,CAAC;QAED,OAAqC,EAAE,GAAG,SAAS,EAAE,CAAC;IAC1D,CAAC,CAAC;AACN,CAAC,CAAC"}

package/build/es2019/factories/create-or-get-ongoing-requests.d.ts

@@ -0,0 +1,8 @@
+export declare const createCreateOrGetOngoingRequests: (ongoingRequestsMap: WeakMap<MessagePort | Worker, Map<number, {
+    reject: Function;
+    resolve: Function;
+}>>) => (sender: MessagePort | Worker) => Map<number, {
+    reject: Function;
+    resolve: Function;
+}>;
+//# sourceMappingURL=create-or-get-ongoing-requests.d.ts.map

package/build/es2019/factories/create-or-get-ongoing-requests.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-or-get-ongoing-requests.d.ts","sourceRoot":"","sources":["../../../src/factories/create-or-get-ongoing-requests.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gCAAgC,GACxC,oBAAoB,OAAO,CAAC,WAAW,GAAG,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC,MACvG,QAAQ,WAAW,GAAG,MAAM,KAAG,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAWlF,CAAC"}

package/build/es2019/factories/create-or-get-ongoing-requests.js

@@ -0,0 +1,10 @@
+export const createCreateOrGetOngoingRequests = (ongoingRequestsMap) => (sender) => {
+    if (ongoingRequestsMap.has(sender)) {
+        // @todo TypeScript needs to be convinced that has() works as expected.
+        return ongoingRequestsMap.get(sender);
+    }
+    const ongoingRequests = new Map();
+    ongoingRequestsMap.set(sender, ongoingRequests);
+    return ongoingRequests;
+};
+//# sourceMappingURL=create-or-get-ongoing-requests.js.map

package/build/es2019/factories/create-or-get-ongoing-requests.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-or-get-ongoing-requests.js","sourceRoot":"","sources":["../../../src/factories/create-or-get-ongoing-requests.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gCAAgC,GACzC,CAAC,kBAAuG,EAAE,EAAE,CAC5G,CAAC,MAA4B,EAAwD,EAAE;IACnF,IAAI,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACjC,uEAAuE;QACvE,OAA6D,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChG,CAAC;IAED,MAAM,eAAe,GAAyD,IAAI,GAAG,EAAE,CAAC;IAExF,kBAAkB,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAEhD,OAAO,eAAe,CAAC;AAC3B,CAAC,CAAC"}

package/build/es2019/factories/extend-broker-implementation.d.ts

@@ -0,0 +1,5 @@
+import { IWorkerDefinition } from 'worker-factory';
+import { IBrokerDefinition, IDefaultBrokerDefinition } from '../interfaces';
+import { TBrokerImplementation } from '../types';
+export declare const createExtendBrokerImplementation: (portMap: WeakMap<MessagePort, number>) => <T extends IBrokerDefinition, U extends IWorkerDefinition>(partialBrokerImplementation: TBrokerImplementation<T, U>) => TBrokerImplementation<T & IDefaultBrokerDefinition, U>;
+//# sourceMappingURL=extend-broker-implementation.d.ts.map

package/build/es2019/factories/extend-broker-implementation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extend-broker-implementation.d.ts","sourceRoot":"","sources":["../../../src/factories/extend-broker-implementation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD,eAAO,MAAM,gCAAgC,GACxC,SAAS,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,MACrC,CAAC,SAAS,iBAAiB,EAAE,CAAC,SAAS,iBAAiB,EACrD,6BAA6B,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,KACzD,qBAAqB,CAAC,CAAC,GAAG,wBAAwB,EAAE,CAAC,CA4BnD,CAAC"}

package/build/es2019/{helpers → factories}/extend-broker-implementation.js

@@ -1,17 +1,16 @@
-import { PORT_MAP } from './port-map';
-export const extendBrokerImplementation = (partialBrokerImplementation) => ({
+export const createExtendBrokerImplementation = (portMap) => (partialBrokerImplementation) => ({
     ...partialBrokerImplementation,
     connect: ({ call }) => {
         return async () => {
             const { port1, port2 } = new MessageChannel();
             const portId = await call('connect', { port: port1 }, [port1]);
-            PORT_MAP.set(port2, portId);
+            portMap.set(port2, portId);
             return port2;
         };
     },
     disconnect: ({ call }) => {
         return async (port) => {
-            const portId = PORT_MAP.get(port);
+            const portId = portMap.get(port);
             if (portId === undefined) {
                 throw new Error('The given port is not connected.');
             }

package/build/es2019/factories/extend-broker-implementation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extend-broker-implementation.js","sourceRoot":"","sources":["../../../src/factories/extend-broker-implementation.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,gCAAgC,GACzC,CAAC,OAAqC,EAAE,EAAE,CAC1C,CACI,2BAAwD,EACF,EAAE,CACxD,CAAwD;IACpD,GAAG,2BAA2B;IAC9B,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QAClB,OAAO,KAAK,IAA0B,EAAE;YACpC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,cAAc,EAAE,CAAC;YAE9C,MAAM,MAAM,GAAW,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAEvE,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAE3B,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC;IACN,CAAC;IACD,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACrB,OAAO,KAAK,EAAE,IAAiB,EAAiB,EAAE;YAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEjC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACxD,CAAC;YAED,MAAM,IAAI,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACzC,CAAC,CAAC;IACN,CAAC;IACD,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACtB,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA,CAAC"}

package/build/es2019/module.d.ts

@@ -1,7 +1,4 @@
-import { IWorkerDefinition } from 'worker-factory';
-import { IBrokerDefinition, IDefaultBrokerDefinition } from './interfaces';
-import { TBrokerImplementation } from './types';
 export * from './interfaces/index';
 export * from './types/index';
-export declare const createBroker: <T extends IBrokerDefinition, U extends IWorkerDefinition>(brokerImplementation: TBrokerImplementation<T, U>) => ((sender: MessagePort | Worker) => T & IDefaultBrokerDefinition);
+export declare const createBroker: <T extends import("./interfaces/broker-definition").IBrokerDefinition, U extends import("worker-factory").IWorkerDefinition>(brokerImplementation: import("./types/broker-implementation").TBrokerImplementation<T, U>) => ((sender: MessagePort | Worker) => T & import("./interfaces/default-broker-definition").IDefaultBrokerDefinition);
 //# sourceMappingURL=module.d.ts.map

package/build/es2019/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA6C,MAAM,gBAAgB,CAAC;AAG9F,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAgB,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAMhD,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAiB9B,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,iBAAiB,EAAE,CAAC,SAAS,iBAAiB,EACjF,sBAAsB,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,KAClD,CAAC,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,KAAK,CAAC,GAAG,wBAAwB,CAmDjE,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"AAUA,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAE9B,eAAO,MAAM,YAAY,8UAKxB,CAAC"}

package/build/es2019/module.js

@@ -1,62 +1,13 @@
 import { generateUniqueNumber } from 'fast-unique-numbers';
+import { createBrokerFactory } from './factories/create-broker';
+import { createCreateOrGetOngoingRequests } from './factories/create-or-get-ongoing-requests';
+import { createExtendBrokerImplementation } from './factories/extend-broker-implementation';
 import { isMessagePort } from './guards/message-port';
-import { extendBrokerImplementation } from './helpers/extend-broker-implementation';
 /*
  * @todo Explicitly referencing the barrel file seems to be necessary when enabling the
  * isolatedModules compiler option.
  */
 export * from './interfaces/index';
 export * from './types/index';
-const ONGOING_REQUESTS = new WeakMap();
-const createOrGetOngoingRequests = (sender) => {
-    if (ONGOING_REQUESTS.has(sender)) {
-        // @todo TypeScript needs to be convinced that has() works as expected.
-        return ONGOING_REQUESTS.get(sender);
-    }
-    const ongoingRequests = new Map();
-    ONGOING_REQUESTS.set(sender, ongoingRequests);
-    return ongoingRequests;
-};
-export const createBroker = (brokerImplementation) => {
-    const fullBrokerImplementation = extendBrokerImplementation(brokerImplementation);
-    return (sender) => {
-        const ongoingRequests = createOrGetOngoingRequests(sender);
-        sender.addEventListener('message', (({ data: message }) => {
-            const { id } = message;
-            if (id !== null && ongoingRequests.has(id)) {
-                const { reject, resolve } = ongoingRequests.get(id);
-                ongoingRequests.delete(id);
-                if (message.error === undefined) {
-                    resolve(message.result);
-                }
-                else {
-                    reject(new Error(message.error.message));
-                }
-            }
-        }));
-        if (isMessagePort(sender)) {
-            sender.start();
-        }
-        const call = (method, params = null, transferables = []) => {
-            return new Promise((resolve, reject) => {
-                const id = generateUniqueNumber(ongoingRequests);
-                ongoingRequests.set(id, { reject, resolve });
-                if (params === null) {
-                    sender.postMessage({ id, method }, transferables);
-                }
-                else {
-                    sender.postMessage({ id, method, params }, transferables);
-                }
-            });
-        };
-        const notify = (method, params, transferables = []) => {
-            sender.postMessage({ id: null, method, params }, transferables);
-        };
-        let functions = {};
-        for (const [key, handler] of Object.entries(fullBrokerImplementation)) {
-            functions = { ...functions, [key]: handler({ call, notify }) };
-        }
-        return { ...functions };
-    };
-};
+export const createBroker = createBrokerFactory(createCreateOrGetOngoingRequests(new WeakMap()), createExtendBrokerImplementation(new WeakMap()), generateUniqueNumber, isMessagePort);
 //# sourceMappingURL=module.js.map

package/build/es2019/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,gCAAgC,EAAE,MAAM,4CAA4C,CAAC;AAC9F,OAAO,EAAE,gCAAgC,EAAE,MAAM,0CAA0C,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD;;;GAGG;AACH,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAE9B,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAC3C,gCAAgC,CAAC,IAAI,OAAO,EAA8E,CAAC,EAC3H,gCAAgC,CAAC,IAAI,OAAO,EAAuB,CAAC,EACpE,oBAAoB,EACpB,aAAa,CAChB,CAAC"}

package/build/es5/bundle.js

@@ -1,160 +1,166 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/defineProperty'), require('@babel/runtime/helpers/slicedToArray'), require('fast-unique-numbers'), require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/regenerator')) :
-    typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/defineProperty', '@babel/runtime/helpers/slicedToArray', 'fast-unique-numbers', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/regenerator'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.brokerFactory = {}, global._defineProperty, global._slicedToArray, global.fastUniqueNumbers, global._asyncToGenerator, global._regeneratorRuntime));
-})(this, (function (exports, _defineProperty, _slicedToArray, fastUniqueNumbers, _asyncToGenerator, _regeneratorRuntime) { 'use strict';
-
-    var isMessagePort = function isMessagePort(sender) {
-      return typeof sender.start === 'function';
-    };
-
-    var PORT_MAP = new WeakMap();
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('fast-unique-numbers'), require('@babel/runtime/helpers/defineProperty'), require('@babel/runtime/helpers/slicedToArray'), require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/regenerator')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'fast-unique-numbers', '@babel/runtime/helpers/defineProperty', '@babel/runtime/helpers/slicedToArray', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/regenerator'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.brokerFactory = {}, global.fastUniqueNumbers, global._defineProperty, global._slicedToArray, global._asyncToGenerator, global._regeneratorRuntime));
+})(this, (function (exports, fastUniqueNumbers, _defineProperty, _slicedToArray, _asyncToGenerator, _regeneratorRuntime) { 'use strict';
 
     function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
     function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-    var extendBrokerImplementation = function extendBrokerImplementation(partialBrokerImplementation) {
-      return _objectSpread$1(_objectSpread$1({}, partialBrokerImplementation), {}, {
-        connect: function connect(_ref) {
-          var call = _ref.call;
-          return /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-            var _MessageChannel, port1, port2, portId;
-            return _regeneratorRuntime.wrap(function (_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  _MessageChannel = new MessageChannel(), port1 = _MessageChannel.port1, port2 = _MessageChannel.port2;
-                  _context.next = 1;
-                  return call('connect', {
-                    port: port1
-                  }, [port1]);
-                case 1:
-                  portId = _context.sent;
-                  PORT_MAP.set(port2, portId);
-                  return _context.abrupt("return", port2);
-                case 2:
-                case "end":
-                  return _context.stop();
+    var createBrokerFactory = function createBrokerFactory(createOrGetOngoingRequests, extendBrokerImplementation, generateUniqueNumber, isMessagePort) {
+      return function (brokerImplementation) {
+        var fullBrokerImplementation = extendBrokerImplementation(brokerImplementation);
+        return function (sender) {
+          var ongoingRequests = createOrGetOngoingRequests(sender);
+          sender.addEventListener('message', function (_ref) {
+            var message = _ref.data;
+            var id = message.id;
+            if (id !== null && ongoingRequests.has(id)) {
+              var _ongoingRequests$get = ongoingRequests.get(id),
+                reject = _ongoingRequests$get.reject,
+                resolve = _ongoingRequests$get.resolve;
+              ongoingRequests["delete"](id);
+              if (message.error === undefined) {
+                resolve(message.result);
+              } else {
+                reject(new Error(message.error.message));
+              }
+            }
+          });
+          if (isMessagePort(sender)) {
+            sender.start();
+          }
+          var call = function call(method) {
+            var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+            var transferables = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+            return new Promise(function (resolve, reject) {
+              var id = generateUniqueNumber(ongoingRequests);
+              ongoingRequests.set(id, {
+                reject: reject,
+                resolve: resolve
+              });
+              if (params === null) {
+                sender.postMessage({
+                  id: id,
+                  method: method
+                }, transferables);
+              } else {
+                sender.postMessage({
+                  id: id,
+                  method: method,
+                  params: params
+                }, transferables);
               }
-            }, _callee);
-          }));
-        },
-        disconnect: function disconnect(_ref3) {
-          var call = _ref3.call;
-          return /*#__PURE__*/function () {
-            var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(port) {
-              var portId;
-              return _regeneratorRuntime.wrap(function (_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
+            });
+          };
+          var notify = function notify(method, params) {
+            var transferables = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+            sender.postMessage({
+              id: null,
+              method: method,
+              params: params
+            }, transferables);
+          };
+          var functions = {};
+          for (var _i = 0, _Object$entries = Object.entries(fullBrokerImplementation); _i < _Object$entries.length; _i++) {
+            var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+              key = _Object$entries$_i[0],
+              handler = _Object$entries$_i[1];
+            functions = _objectSpread$1(_objectSpread$1({}, functions), {}, _defineProperty({}, key, handler({
+              call: call,
+              notify: notify
+            })));
+          }
+          return _objectSpread$1({}, functions);
+        };
+      };
+    };
+
+    var createCreateOrGetOngoingRequests = function createCreateOrGetOngoingRequests(ongoingRequestsMap) {
+      return function (sender) {
+        if (ongoingRequestsMap.has(sender)) {
+          // @todo TypeScript needs to be convinced that has() works as expected.
+          return ongoingRequestsMap.get(sender);
+        }
+        var ongoingRequests = new Map();
+        ongoingRequestsMap.set(sender, ongoingRequests);
+        return ongoingRequests;
+      };
+    };
+
+    function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+    function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+    var createExtendBrokerImplementation = function createExtendBrokerImplementation(portMap) {
+      return function (partialBrokerImplementation) {
+        return _objectSpread(_objectSpread({}, partialBrokerImplementation), {}, {
+          connect: function connect(_ref) {
+            var call = _ref.call;
+            return /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+              var _MessageChannel, port1, port2, portId;
+              return _regeneratorRuntime.wrap(function (_context) {
+                while (1) switch (_context.prev = _context.next) {
                   case 0:
-                    portId = PORT_MAP.get(port);
-                    if (!(portId === undefined)) {
-                      _context2.next = 1;
-                      break;
-                    }
-                    throw new Error('The given port is not connected.');
+                    _MessageChannel = new MessageChannel(), port1 = _MessageChannel.port1, port2 = _MessageChannel.port2;
+                    _context.next = 1;
+                    return call('connect', {
+                      port: port1
+                    }, [port1]);
                   case 1:
-                    _context2.next = 2;
-                    return call('disconnect', {
-                      portId: portId
-                    });
+                    portId = _context.sent;
+                    portMap.set(port2, portId);
+                    return _context.abrupt("return", port2);
                   case 2:
                   case "end":
-                    return _context2.stop();
+                    return _context.stop();
                 }
-              }, _callee2);
+              }, _callee);
             }));
-            return function (_x) {
-              return _ref4.apply(this, arguments);
+          },
+          disconnect: function disconnect(_ref3) {
+            var call = _ref3.call;
+            return /*#__PURE__*/function () {
+              var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(port) {
+                var portId;
+                return _regeneratorRuntime.wrap(function (_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      portId = portMap.get(port);
+                      if (!(portId === undefined)) {
+                        _context2.next = 1;
+                        break;
+                      }
+                      throw new Error('The given port is not connected.');
+                    case 1:
+                      _context2.next = 2;
+                      return call('disconnect', {
+                        portId: portId
+                      });
+                    case 2:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }, _callee2);
+              }));
+              return function (_x) {
+                return _ref4.apply(this, arguments);
+              };
+            }();
+          },
+          isSupported: function isSupported(_ref5) {
+            var call = _ref5.call;
+            return function () {
+              return call('isSupported');
             };
-          }();
-        },
-        isSupported: function isSupported(_ref5) {
-          var call = _ref5.call;
-          return function () {
-            return call('isSupported');
-          };
-        }
-      });
-    };
-
-    function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-    function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-    var ONGOING_REQUESTS = new WeakMap();
-    var createOrGetOngoingRequests = function createOrGetOngoingRequests(sender) {
-      if (ONGOING_REQUESTS.has(sender)) {
-        // @todo TypeScript needs to be convinced that has() works as expected.
-        return ONGOING_REQUESTS.get(sender);
-      }
-      var ongoingRequests = new Map();
-      ONGOING_REQUESTS.set(sender, ongoingRequests);
-      return ongoingRequests;
-    };
-    var createBroker = function createBroker(brokerImplementation) {
-      var fullBrokerImplementation = extendBrokerImplementation(brokerImplementation);
-      return function (sender) {
-        var ongoingRequests = createOrGetOngoingRequests(sender);
-        sender.addEventListener('message', function (_ref) {
-          var message = _ref.data;
-          var id = message.id;
-          if (id !== null && ongoingRequests.has(id)) {
-            var _ongoingRequests$get = ongoingRequests.get(id),
-              reject = _ongoingRequests$get.reject,
-              resolve = _ongoingRequests$get.resolve;
-            ongoingRequests["delete"](id);
-            if (message.error === undefined) {
-              resolve(message.result);
-            } else {
-              reject(new Error(message.error.message));
-            }
           }
         });
-        if (isMessagePort(sender)) {
-          sender.start();
-        }
-        var call = function call(method) {
-          var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-          var transferables = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-          return new Promise(function (resolve, reject) {
-            var id = fastUniqueNumbers.generateUniqueNumber(ongoingRequests);
-            ongoingRequests.set(id, {
-              reject: reject,
-              resolve: resolve
-            });
-            if (params === null) {
-              sender.postMessage({
-                id: id,
-                method: method
-              }, transferables);
-            } else {
-              sender.postMessage({
-                id: id,
-                method: method,
-                params: params
-              }, transferables);
-            }
-          });
-        };
-        var notify = function notify(method, params) {
-          var transferables = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-          sender.postMessage({
-            id: null,
-            method: method,
-            params: params
-          }, transferables);
-        };
-        var functions = {};
-        for (var _i = 0, _Object$entries = Object.entries(fullBrokerImplementation); _i < _Object$entries.length; _i++) {
-          var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-            key = _Object$entries$_i[0],
-            handler = _Object$entries$_i[1];
-          functions = _objectSpread(_objectSpread({}, functions), {}, _defineProperty({}, key, handler({
-            call: call,
-            notify: notify
-          })));
-        }
-        return _objectSpread({}, functions);
       };
     };
 
+    var isMessagePort = function isMessagePort(sender) {
+      return typeof sender.start === 'function';
+    };
+
+    var createBroker = createBrokerFactory(createCreateOrGetOngoingRequests(new WeakMap()), createExtendBrokerImplementation(new WeakMap()), fastUniqueNumbers.generateUniqueNumber, isMessagePort);
+
     exports.createBroker = createBroker;
 
 }));

package/package.json

@@ -16,40 +16,28 @@
     },
     "description": "A little factory function to create a broker for a JSON-RPC based Web Worker.",
     "devDependencies": {
-        "@babel/core": "^7.28.4",
+        "@babel/core": "^7.28.5",
         "@babel/plugin-external-helpers": "^7.27.1",
-        "@babel/plugin-transform-runtime": "^7.28.3",
-        "@babel/preset-env": "^7.28.3",
+        "@babel/plugin-transform-runtime": "^7.28.5",
+        "@babel/preset-env": "^7.28.5",
         "@commitlint/cli": "^19.8.1",
         "@commitlint/config-angular": "^19.8.1",
-        "@rollup/plugin-babel": "^6.0.4",
-        "chai": "^4.3.10",
+        "@rollup/plugin-babel": "^6.1.0",
+        "@vitest/browser-webdriverio": "^4.0.16",
         "commitizen": "^4.3.1",
         "cz-conventional-changelog": "^3.3.0",
         "eslint": "^8.57.0",
-        "eslint-config-holy-grail": "^61.0.1",
+        "eslint-config-holy-grail": "^61.0.3",
         "husky": "^9.1.7",
-        "karma": "^6.4.4",
-        "karma-chrome-launcher": "^3.2.0",
-        "karma-firefox-launcher": "^2.1.3",
-        "karma-mocha": "^2.0.1",
-        "karma-sauce-launcher": "^4.3.6",
-        "karma-sinon-chai": "^2.0.2",
-        "karma-webkit-launcher": "^2.6.0",
-        "karma-webpack": "^5.0.1",
-        "lint-staged": "^16.1.6",
-        "mocha": "^11.7.2",
-        "prettier": "^3.6.2",
-        "rimraf": "^6.0.1",
-        "rollup": "^4.52.0",
-        "sinon": "^17.0.2",
-        "sinon-chai": "^3.7.0",
-        "ts-loader": "^9.5.4",
+        "lint-staged": "^16.2.7",
+        "prettier": "^3.7.4",
+        "rimraf": "^6.1.2",
+        "rollup": "^4.53.5",
         "tsconfig-holy-grail": "^15.0.2",
         "tslint": "^6.1.3",
         "tslint-config-holy-grail": "^56.0.6",
-        "typescript": "^5.9.2",
-        "webpack": "^5.101.3"
+        "typescript": "^5.9.3",
+        "vitest": "^4.0.16"
     },
     "files": [
         "build/es2019/",
@@ -74,8 +62,8 @@
         "prepare": "husky",
         "prepublishOnly": "npm run build",
         "test": "npm run lint && npm run build && npm run test:unit",
-        "test:unit": "if [ \"$TYPE\" = \"\" -o \"$TYPE\" = \"unit\" ]; then karma start config/karma/config-unit.js --single-run; fi"
+        "test:unit": "if [ \"$TYPE\" = \"\" -o \"$TYPE\" = \"unit\" ]; then npx vitest --config config/vitest/unit.ts; fi"
     },
     "types": "build/es2019/module.d.ts",
-    "version": "3.1.10"
+    "version": "3.1.11"
 }

package/src/factories/create-broker.ts

@@ -0,0 +1,69 @@
+import type { generateUniqueNumber as generateUniqueNumberFunction } from 'fast-unique-numbers';
+import { IWorkerDefinition, IWorkerErrorMessage, IWorkerResultMessage } from 'worker-factory';
+import type { isMessagePort as isMessagePortFunction } from '../guards/message-port';
+import { IBrokerDefinition, IDefaultBrokerDefinition, IWorkerEvent } from '../interfaces';
+import { TBrokerImplementation } from '../types';
+import type { createCreateOrGetOngoingRequests } from './create-or-get-ongoing-requests';
+import type { createExtendBrokerImplementation } from './extend-broker-implementation';
+
+export const createBrokerFactory =
+    (
+        createOrGetOngoingRequests: ReturnType<typeof createCreateOrGetOngoingRequests>,
+        extendBrokerImplementation: ReturnType<typeof createExtendBrokerImplementation>,
+        generateUniqueNumber: typeof generateUniqueNumberFunction,
+        isMessagePort: typeof isMessagePortFunction
+    ) =>
+    <T extends IBrokerDefinition, U extends IWorkerDefinition>(
+        brokerImplementation: TBrokerImplementation<T, U>
+    ): ((sender: MessagePort | Worker) => T & IDefaultBrokerDefinition) => {
+        const fullBrokerImplementation = extendBrokerImplementation(brokerImplementation);
+
+        return (sender: MessagePort | Worker) => {
+            const ongoingRequests = createOrGetOngoingRequests(sender);
+
+            sender.addEventListener('message', <EventListener>(({ data: message }: IWorkerEvent) => {
+                const { id } = message;
+
+                if (id !== null && ongoingRequests.has(id)) {
+                    const { reject, resolve } = <{ reject: Function; resolve: Function }>ongoingRequests.get(id);
+
+                    ongoingRequests.delete(id);
+
+                    if ((<IWorkerErrorMessage>message).error === undefined) {
+                        resolve((<IWorkerResultMessage>message).result);
+                    } else {
+                        reject(new Error((<IWorkerErrorMessage>message).error.message));
+                    }
+                }
+            }));
+
+            if (isMessagePort(sender)) {
+                sender.start();
+            }
+
+            const call = <V extends keyof U>(method: V, params: U[V]['params'] = null, transferables: U[V]['transferables'] = []) => {
+                return new Promise<U[V]['response']['result']>((resolve, reject) => {
+                    const id = generateUniqueNumber(ongoingRequests);
+
+                    ongoingRequests.set(id, { reject, resolve });
+
+                    if (params === null) {
+                        sender.postMessage({ id, method }, <Transferable[]>transferables);
+                    } else {
+                        sender.postMessage({ id, method, params }, <Transferable[]>transferables);
+                    }
+                });
+            };
+            const notify = <V extends keyof U>(method: V, params: U[V]['params'], transferables: U[V]['transferables'] = []) => {
+                sender.postMessage({ id: null, method, params }, <Transferable[]>transferables);
+            };
+
+            let functions: object = {};
+
+            for (const [key, handler] of Object.entries(fullBrokerImplementation)) {
+                functions = { ...functions, [key]: handler({ call, notify }) };
+            }
+
+            return <T & IDefaultBrokerDefinition>{ ...functions };
+        };
+    };

package/src/factories/create-or-get-ongoing-requests.ts

@@ -0,0 +1,14 @@
+export const createCreateOrGetOngoingRequests =
+    (ongoingRequestsMap: WeakMap<MessagePort | Worker, Map<number, { reject: Function; resolve: Function }>>) =>
+    (sender: MessagePort | Worker): Map<number, { reject: Function; resolve: Function }> => {
+        if (ongoingRequestsMap.has(sender)) {
+            // @todo TypeScript needs to be convinced that has() works as expected.
+            return <Map<number, { reject: Function; resolve: Function }>>ongoingRequestsMap.get(sender);
+        }
+
+        const ongoingRequests: Map<number, { reject: Function; resolve: Function }> = new Map();
+
+        ongoingRequestsMap.set(sender, ongoingRequests);
+
+        return ongoingRequests;
+    };

package/src/factories/extend-broker-implementation.ts

@@ -0,0 +1,37 @@
+import { IWorkerDefinition } from 'worker-factory';
+import { IBrokerDefinition, IDefaultBrokerDefinition } from '../interfaces';
+import { TBrokerImplementation } from '../types';
+
+export const createExtendBrokerImplementation =
+    (portMap: WeakMap<MessagePort, number>) =>
+    <T extends IBrokerDefinition, U extends IWorkerDefinition>(
+        partialBrokerImplementation: TBrokerImplementation<T, U>
+    ): TBrokerImplementation<T & IDefaultBrokerDefinition, U> =>
+        <TBrokerImplementation<T & IDefaultBrokerDefinition, U>>{
+            ...partialBrokerImplementation,
+            connect: ({ call }) => {
+                return async (): Promise<MessagePort> => {
+                    const { port1, port2 } = new MessageChannel();
+
+                    const portId = <number>await call('connect', { port: port1 }, [port1]);
+
+                    portMap.set(port2, portId);
+
+                    return port2;
+                };
+            },
+            disconnect: ({ call }) => {
+                return async (port: MessagePort): Promise<void> => {
+                    const portId = portMap.get(port);
+
+                    if (portId === undefined) {
+                        throw new Error('The given port is not connected.');
+                    }
+
+                    await call('disconnect', { portId });
+                };
+            },
+            isSupported: ({ call }) => {
+                return () => call('isSupported');
+            }
+        };

package/src/module.ts

@@ -1,9 +1,8 @@
 import { generateUniqueNumber } from 'fast-unique-numbers';
-import { IWorkerDefinition, IWorkerErrorMessage, IWorkerResultMessage } from 'worker-factory';
+import { createBrokerFactory } from './factories/create-broker';
+import { createCreateOrGetOngoingRequests } from './factories/create-or-get-ongoing-requests';
+import { createExtendBrokerImplementation } from './factories/extend-broker-implementation';
 import { isMessagePort } from './guards/message-port';
-import { extendBrokerImplementation } from './helpers/extend-broker-implementation';
-import { IBrokerDefinition, IDefaultBrokerDefinition, IWorkerEvent } from './interfaces';
-import { TBrokerImplementation } from './types';
 
 /*
  * @todo Explicitly referencing the barrel file seems to be necessary when enabling the
@@ -12,72 +11,9 @@ import { TBrokerImplementation } from './types';
 export * from './interfaces/index';
 export * from './types/index';
 
-const ONGOING_REQUESTS = new WeakMap<MessagePort | Worker, Map<number, { reject: Function; resolve: Function }>>();
-
-const createOrGetOngoingRequests = (sender: MessagePort | Worker): Map<number, { reject: Function; resolve: Function }> => {
-    if (ONGOING_REQUESTS.has(sender)) {
-        // @todo TypeScript needs to be convinced that has() works as expected.
-        return <Map<number, { reject: Function; resolve: Function }>>ONGOING_REQUESTS.get(sender);
-    }
-
-    const ongoingRequests: Map<number, { reject: Function; resolve: Function }> = new Map();
-
-    ONGOING_REQUESTS.set(sender, ongoingRequests);
-
-    return ongoingRequests;
-};
-
-export const createBroker = <T extends IBrokerDefinition, U extends IWorkerDefinition>(
-    brokerImplementation: TBrokerImplementation<T, U>
-): ((sender: MessagePort | Worker) => T & IDefaultBrokerDefinition) => {
-    const fullBrokerImplementation = extendBrokerImplementation(brokerImplementation);
-
-    return (sender: MessagePort | Worker) => {
-        const ongoingRequests = createOrGetOngoingRequests(sender);
-
-        sender.addEventListener('message', <EventListener>(({ data: message }: IWorkerEvent) => {
-            const { id } = message;
-
-            if (id !== null && ongoingRequests.has(id)) {
-                const { reject, resolve } = <{ reject: Function; resolve: Function }>ongoingRequests.get(id);
-
-                ongoingRequests.delete(id);
-
-                if ((<IWorkerErrorMessage>message).error === undefined) {
-                    resolve((<IWorkerResultMessage>message).result);
-                } else {
-                    reject(new Error((<IWorkerErrorMessage>message).error.message));
-                }
-            }
-        }));
-
-        if (isMessagePort(sender)) {
-            sender.start();
-        }
-
-        const call = <V extends keyof U>(method: V, params: U[V]['params'] = null, transferables: U[V]['transferables'] = []) => {
-            return new Promise<U[V]['response']['result']>((resolve, reject) => {
-                const id = generateUniqueNumber(ongoingRequests);
-
-                ongoingRequests.set(id, { reject, resolve });
-
-                if (params === null) {
-                    sender.postMessage({ id, method }, <Transferable[]>transferables);
-                } else {
-                    sender.postMessage({ id, method, params }, <Transferable[]>transferables);
-                }
-            });
-        };
-        const notify = <V extends keyof U>(method: V, params: U[V]['params'], transferables: U[V]['transferables'] = []) => {
-            sender.postMessage({ id: null, method, params }, <Transferable[]>transferables);
-        };
-
-        let functions: object = {};
-
-        for (const [key, handler] of Object.entries(fullBrokerImplementation)) {
-            functions = { ...functions, [key]: handler({ call, notify }) };
-        }
-
-        return <T & IDefaultBrokerDefinition>{ ...functions };
-    };
-};
+export const createBroker = createBrokerFactory(
+    createCreateOrGetOngoingRequests(new WeakMap<MessagePort | Worker, Map<number, { reject: Function; resolve: Function }>>()),
+    createExtendBrokerImplementation(new WeakMap<MessagePort, number>()),
+    generateUniqueNumber,
+    isMessagePort
+);

package/build/es2019/helpers/extend-broker-implementation.d.ts

@@ -1,5 +0,0 @@
-import { IWorkerDefinition } from 'worker-factory';
-import { IBrokerDefinition, IDefaultBrokerDefinition } from '../interfaces';
-import { TBrokerImplementation } from '../types';
-export declare const extendBrokerImplementation: <T extends IBrokerDefinition, U extends IWorkerDefinition>(partialBrokerImplementation: TBrokerImplementation<T, U>) => TBrokerImplementation<T & IDefaultBrokerDefinition, U>;
-//# sourceMappingURL=extend-broker-implementation.d.ts.map

package/build/es2019/helpers/extend-broker-implementation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"extend-broker-implementation.d.ts","sourceRoot":"","sources":["../../../src/helpers/extend-broker-implementation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGjD,eAAO,MAAM,0BAA0B,GAAI,CAAC,SAAS,iBAAiB,EAAE,CAAC,SAAS,iBAAiB,EAC/F,6BAA6B,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,KACzD,qBAAqB,CAAC,CAAC,GAAG,wBAAwB,EAAE,CAAC,CA4BnD,CAAC"}

package/build/es2019/helpers/extend-broker-implementation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extend-broker-implementation.js","sourceRoot":"","sources":["../../../src/helpers/extend-broker-implementation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACtC,2BAAwD,EACF,EAAE,CACxD,CAAwD;IACpD,GAAG,2BAA2B;IAC9B,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QAClB,OAAO,KAAK,IAA0B,EAAE;YACpC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,cAAc,EAAE,CAAC;YAE9C,MAAM,MAAM,GAAW,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAEvE,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAE5B,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC;IACN,CAAC;IACD,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACrB,OAAO,KAAK,EAAE,IAAiB,EAAiB,EAAE;YAC9C,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAElC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACxD,CAAC;YAED,MAAM,IAAI,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACzC,CAAC,CAAC;IACN,CAAC;IACD,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACtB,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA,CAAC"}

package/build/es2019/helpers/port-map.d.ts

@@ -1,2 +0,0 @@
-export declare const PORT_MAP: WeakMap<MessagePort, number>;
-//# sourceMappingURL=port-map.d.ts.map

package/build/es2019/helpers/port-map.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"port-map.d.ts","sourceRoot":"","sources":["../../../src/helpers/port-map.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,CAAiB,CAAC"}

package/build/es2019/helpers/port-map.js

@@ -1,2 +0,0 @@
-export const PORT_MAP = new WeakMap();
-//# sourceMappingURL=port-map.js.map

package/build/es2019/helpers/port-map.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"port-map.js","sourceRoot":"","sources":["../../../src/helpers/port-map.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAiC,IAAI,OAAO,EAAE,CAAC"}

package/src/helpers/extend-broker-implementation.ts

@@ -1,36 +0,0 @@
-import { IWorkerDefinition } from 'worker-factory';
-import { IBrokerDefinition, IDefaultBrokerDefinition } from '../interfaces';
-import { TBrokerImplementation } from '../types';
-import { PORT_MAP } from './port-map';
-
-export const extendBrokerImplementation = <T extends IBrokerDefinition, U extends IWorkerDefinition>(
-    partialBrokerImplementation: TBrokerImplementation<T, U>
-): TBrokerImplementation<T & IDefaultBrokerDefinition, U> =>
-    <TBrokerImplementation<T & IDefaultBrokerDefinition, U>>{
-        ...partialBrokerImplementation,
-        connect: ({ call }) => {
-            return async (): Promise<MessagePort> => {
-                const { port1, port2 } = new MessageChannel();
-
-                const portId = <number>await call('connect', { port: port1 }, [port1]);
-
-                PORT_MAP.set(port2, portId);
-
-                return port2;
-            };
-        },
-        disconnect: ({ call }) => {
-            return async (port: MessagePort): Promise<void> => {
-                const portId = PORT_MAP.get(port);
-
-                if (portId === undefined) {
-                    throw new Error('The given port is not connected.');
-                }
-
-                await call('disconnect', { portId });
-            };
-        },
-        isSupported: ({ call }) => {
-            return () => call('isSupported');
-        }
-    };

package/src/helpers/port-map.ts

@@ -1 +0,0 @@
-export const PORT_MAP: WeakMap<MessagePort, number> = new WeakMap();