worker-timers-broker 7.1.9 → 8.0.0

package/build/es2019/interfaces/index.d.ts

@@ -0,0 +1,2 @@
+export * from './worker-timers-broker-definition';
+//# sourceMappingURL=index.d.ts.map

package/build/es2019/interfaces/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC"}

package/build/es2019/interfaces/index.js

@@ -0,0 +1,2 @@
+export * from './worker-timers-broker-definition';
+//# sourceMappingURL=index.js.map

package/build/es2019/interfaces/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC"}

package/build/es2019/interfaces/worker-timers-broker-definition.d.ts

@@ -0,0 +1,8 @@
+import { IBrokerDefinition } from 'broker-factory';
+export interface IWorkerTimersBrokerDefinition extends IBrokerDefinition {
+    clearInterval(timerId: number): void;
+    clearTimeout(timerId: number): void;
+    setInterval(func: Function, delay?: number, ...args: any[]): number;
+    setTimeout(func: Function, delay?: number, ...args: any[]): number;
+}
+//# sourceMappingURL=worker-timers-broker-definition.d.ts.map

package/build/es2019/interfaces/worker-timers-broker-definition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-timers-broker-definition.d.ts","sourceRoot":"","sources":["../../../src/interfaces/worker-timers-broker-definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,WAAW,6BAA8B,SAAQ,iBAAiB;IACpE,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAErC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpC,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAEpE,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;CACtE"}

package/build/es2019/interfaces/worker-timers-broker-definition.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=worker-timers-broker-definition.js.map

package/build/es2019/interfaces/worker-timers-broker-definition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-timers-broker-definition.js","sourceRoot":"","sources":["../../../src/interfaces/worker-timers-broker-definition.ts"],"names":[],"mappings":""}

package/build/es2019/module.d.ts

@@ -1,7 +1,6 @@
-export declare const load: (url: string) => {
-    clearInterval: (timerId: number) => void;
-    clearTimeout: (timerId: number) => void;
-    setInterval: (func: Function, delay?: number, ...args: any[]) => number;
-    setTimeout: (func: Function, delay?: number, ...args: any[]) => number;
-};
+import { TWorkerTimersBrokerLoader, TWorkerTimersBrokerWrapper } from './types';
+export * from './interfaces/index';
+export * from './types/index';
+export declare const wrap: TWorkerTimersBrokerWrapper;
+export declare const load: TWorkerTimersBrokerLoader;
 //# 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":"AAKA,eAAO,MAAM,IAAI,QAAS,MAAM;6BAqFI,MAAM;4BAeP,MAAM;wBAeV,QAAQ,2BAAsB,GAAG,EAAE;uBAmCpC,QAAQ,2BAAsB,GAAG,EAAE;CAyBhE,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAMhF,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAM9B,eAAO,MAAM,IAAI,EAAE,0BAwFjB,CAAC;AAEH,eAAO,MAAM,IAAI,EAAE,yBAIlB,CAAC"}

package/build/es2019/module.js

@@ -1,146 +1,89 @@
+import { createBroker } from 'broker-factory';
 import { generateUniqueNumber } from 'fast-unique-numbers';
-import { isCallNotification } from './guards/call-notification';
-import { isClearResponse } from './guards/clear-response';
-export const load = (url) => {
-    // Prefilling the Maps with a function indexed by zero is necessary to be compliant with the specification.
-    const scheduledIntervalFunctions = new Map([[0, () => { }]]); // tslint:disable-line no-empty
-    const scheduledTimeoutFunctions = new Map([[0, () => { }]]); // tslint:disable-line no-empty
-    const unrespondedRequests = new Map();
-    const worker = new Worker(url);
-    worker.addEventListener('message', ({ data }) => {
-        if (isCallNotification(data)) {
-            const { params: { timerId, timerType } } = data;
-            if (timerType === 'interval') {
-                const idOrFunc = scheduledIntervalFunctions.get(timerId);
-                if (typeof idOrFunc === undefined) {
-                    throw new Error('The timer is in an undefined state.');
-                }
-                if (typeof idOrFunc === 'number') {
-                    const timerIdAndTimerType = unrespondedRequests.get(idOrFunc);
-                    if (timerIdAndTimerType === undefined ||
-                        timerIdAndTimerType.timerId !== timerId ||
-                        timerIdAndTimerType.timerType !== timerType) {
-                        throw new Error('The timer is in an undefined state.');
-                    }
-                }
-                else if (typeof idOrFunc === 'function') {
-                    idOrFunc();
-                }
-            }
-            else if (timerType === 'timeout') {
-                const idOrFunc = scheduledTimeoutFunctions.get(timerId);
-                if (typeof idOrFunc === undefined) {
-                    throw new Error('The timer is in an undefined state.');
-                }
-                if (typeof idOrFunc === 'number') {
-                    const timerIdAndTimerType = unrespondedRequests.get(idOrFunc);
-                    if (timerIdAndTimerType === undefined ||
-                        timerIdAndTimerType.timerId !== timerId ||
-                        timerIdAndTimerType.timerType !== timerType) {
-                        throw new Error('The timer is in an undefined state.');
-                    }
-                }
-                else if (typeof idOrFunc === 'function') {
-                    idOrFunc();
-                    // A timeout can be savely deleted because it is only called once.
-                    scheduledTimeoutFunctions.delete(timerId);
-                }
-            }
-        }
-        else if (isClearResponse(data)) {
-            const { id } = data;
-            const timerIdAndTimerType = unrespondedRequests.get(id);
-            if (timerIdAndTimerType === undefined) {
-                throw new Error('The timer is in an undefined state.');
-            }
-            const { timerId, timerType } = timerIdAndTimerType;
-            unrespondedRequests.delete(id);
-            if (timerType === 'interval') {
-                scheduledIntervalFunctions.delete(timerId);
-            }
-            else {
-                scheduledTimeoutFunctions.delete(timerId);
+/*
+ * @todo Explicitly referencing the barrel file seems to be necessary when enabling the
+ * isolatedModules compiler option.
+ */
+export * from './interfaces/index';
+export * from './types/index';
+// Prefilling the Maps with a function indexed by zero is necessary to be compliant with the specification.
+const scheduledIntervalsState = new Map([[0, null]]); // tslint:disable-line no-empty
+const scheduledTimeoutsState = new Map([[0, null]]); // tslint:disable-line no-empty
+export const wrap = createBroker({
+    clearInterval: ({ call }) => {
+        return (timerId) => {
+            if (typeof scheduledIntervalsState.get(timerId) === 'symbol') {
+                scheduledIntervalsState.set(timerId, null);
+                call('clear', { timerId, timerType: 'interval' }).then(() => {
+                    scheduledIntervalsState.delete(timerId);
+                });
             }
-        }
-        else {
-            const { error: { message } } = data;
-            throw new Error(message);
-        }
-    });
-    const clearInterval = (timerId) => {
-        if (typeof scheduledIntervalFunctions.get(timerId) === 'function') {
-            const id = generateUniqueNumber(unrespondedRequests);
-            unrespondedRequests.set(id, { timerId, timerType: 'interval' });
-            scheduledIntervalFunctions.set(timerId, id);
-            worker.postMessage({
-                id,
-                method: 'clear',
-                params: { timerId, timerType: 'interval' }
-            });
-        }
-    };
-    const clearTimeout = (timerId) => {
-        if (typeof scheduledTimeoutFunctions.get(timerId) === 'function') {
-            const id = generateUniqueNumber(unrespondedRequests);
-            unrespondedRequests.set(id, { timerId, timerType: 'timeout' });
-            scheduledTimeoutFunctions.set(timerId, id);
-            worker.postMessage({
-                id,
-                method: 'clear',
-                params: { timerId, timerType: 'timeout' }
-            });
-        }
-    };
-    const setInterval = (func, delay = 0, ...args) => {
-        const timerId = generateUniqueNumber(scheduledIntervalFunctions);
-        scheduledIntervalFunctions.set(timerId, () => {
-            func(...args);
-            // Doublecheck if the interval should still be rescheduled because it could have been cleared inside of func().
-            if (typeof scheduledIntervalFunctions.get(timerId) === 'function') {
-                worker.postMessage({
-                    id: null,
-                    method: 'set',
-                    params: {
-                        delay,
-                        now: performance.timeOrigin + performance.now(),
-                        timerId,
-                        timerType: 'interval'
-                    }
+        };
+    },
+    clearTimeout: ({ call }) => {
+        return (timerId) => {
+            if (typeof scheduledTimeoutsState.get(timerId) === 'symbol') {
+                scheduledTimeoutsState.set(timerId, null);
+                call('clear', { timerId, timerType: 'timeout' }).then(() => {
+                    scheduledTimeoutsState.delete(timerId);
                 });
             }
-        });
-        worker.postMessage({
-            id: null,
-            method: 'set',
-            params: {
+        };
+    },
+    setInterval: ({ call }) => {
+        return (func, delay = 0, ...args) => {
+            const symbol = Symbol();
+            const timerId = generateUniqueNumber(scheduledIntervalsState);
+            scheduledIntervalsState.set(timerId, symbol);
+            const schedule = () => call('set', {
                 delay,
                 now: performance.timeOrigin + performance.now(),
                 timerId,
                 timerType: 'interval'
-            }
-        });
-        return timerId;
-    };
-    const setTimeout = (func, delay = 0, ...args) => {
-        const timerId = generateUniqueNumber(scheduledTimeoutFunctions);
-        scheduledTimeoutFunctions.set(timerId, () => func(...args));
-        worker.postMessage({
-            id: null,
-            method: 'set',
-            params: {
+            }).then(() => {
+                const state = scheduledIntervalsState.get(timerId);
+                if (typeof state === undefined) {
+                    throw new Error('The timer is in an undefined state.');
+                }
+                if (state === symbol) {
+                    func(...args);
+                    // Doublecheck if the interval should still be rescheduled because it could have been cleared inside of func().
+                    if (scheduledIntervalsState.get(timerId) === symbol) {
+                        schedule();
+                    }
+                }
+            });
+            schedule();
+            return timerId;
+        };
+    },
+    setTimeout: ({ call }) => {
+        return (func, delay = 0, ...args) => {
+            const symbol = Symbol();
+            const timerId = generateUniqueNumber(scheduledTimeoutsState);
+            scheduledTimeoutsState.set(timerId, symbol);
+            call('set', {
                 delay,
                 now: performance.timeOrigin + performance.now(),
                 timerId,
                 timerType: 'timeout'
-            }
-        });
-        return timerId;
-    };
-    return {
-        clearInterval,
-        clearTimeout,
-        setInterval,
-        setTimeout
-    };
+            }).then(() => {
+                const state = scheduledTimeoutsState.get(timerId);
+                if (typeof state === 'undefined') {
+                    throw new Error('The timer is in an undefined state.');
+                }
+                if (state === symbol) {
+                    // A timeout can be savely deleted because it is only called once.
+                    scheduledTimeoutsState.delete(timerId);
+                    func(...args);
+                }
+            });
+            return timerId;
+        };
+    }
+});
+export const load = (url) => {
+    const worker = new Worker(url);
+    return wrap(worker);
 };
 //# 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":"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"}

package/build/es2019/types/index.d.ts

@@ -0,0 +1,3 @@
+export * from './worker-timers-broker-loader';
+export * from './worker-timers-broker-wrapper';
+//# sourceMappingURL=index.d.ts.map

package/build/es2019/types/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC"}

package/build/es2019/types/index.js

@@ -0,0 +1,3 @@
+export * from './worker-timers-broker-loader';
+export * from './worker-timers-broker-wrapper';
+//# sourceMappingURL=index.js.map

package/build/es2019/types/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC"}

package/build/es2019/types/worker-timers-broker-loader.d.ts

@@ -0,0 +1,4 @@
+import { IDefaultBrokerDefinition } from 'broker-factory';
+import { IWorkerTimersBrokerDefinition } from '../interfaces';
+export type TWorkerTimersBrokerLoader = (url: string) => IWorkerTimersBrokerDefinition & IDefaultBrokerDefinition;
+//# sourceMappingURL=worker-timers-broker-loader.d.ts.map

package/build/es2019/types/worker-timers-broker-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-timers-broker-loader.d.ts","sourceRoot":"","sources":["../../../src/types/worker-timers-broker-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,MAAM,yBAAyB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,6BAA6B,GAAG,wBAAwB,CAAC"}

package/build/es2019/types/worker-timers-broker-loader.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=worker-timers-broker-loader.js.map

package/build/es2019/types/worker-timers-broker-loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-timers-broker-loader.js","sourceRoot":"","sources":["../../../src/types/worker-timers-broker-loader.ts"],"names":[],"mappings":""}

package/build/es2019/types/worker-timers-broker-wrapper.d.ts

@@ -0,0 +1,4 @@
+import { IDefaultBrokerDefinition } from 'broker-factory';
+import { IWorkerTimersBrokerDefinition } from '../interfaces';
+export type TWorkerTimersBrokerWrapper = (sender: MessagePort | Worker) => IWorkerTimersBrokerDefinition & IDefaultBrokerDefinition;
+//# sourceMappingURL=worker-timers-broker-wrapper.d.ts.map

package/build/es2019/types/worker-timers-broker-wrapper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-timers-broker-wrapper.d.ts","sourceRoot":"","sources":["../../../src/types/worker-timers-broker-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,MAAM,0BAA0B,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,KAAK,6BAA6B,GAAG,wBAAwB,CAAC"}

package/build/es2019/types/worker-timers-broker-wrapper.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=worker-timers-broker-wrapper.js.map

package/build/es2019/types/worker-timers-broker-wrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-timers-broker-wrapper.js","sourceRoot":"","sources":["../../../src/types/worker-timers-broker-wrapper.ts"],"names":[],"mappings":""}

package/build/es5/bundle.js

@@ -1,176 +1,111 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/typeof'), require('fast-unique-numbers')) :
-    typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/typeof', 'fast-unique-numbers'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.workerTimersBroker = {}, global._typeof, global.fastUniqueNumbers));
-})(this, (function (exports, _typeof, fastUniqueNumbers) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/typeof'), require('broker-factory'), require('fast-unique-numbers')) :
+    typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/typeof', 'broker-factory', 'fast-unique-numbers'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.workerTimersBroker = {}, global._typeof, global.brokerFactory, global.fastUniqueNumbers));
+})(this, (function (exports, _typeof, brokerFactory, fastUniqueNumbers) { 'use strict';
 
-    var isCallNotification = function isCallNotification(message) {
-      return message.method !== undefined && message.method === 'call';
-    };
-
-    var isClearResponse = function isClearResponse(message) {
-      return typeof message.id === 'number' && typeof message.result === 'boolean';
-    };
-
-    var load = function load(url) {
-      // Prefilling the Maps with a function indexed by zero is necessary to be compliant with the specification.
-      var scheduledIntervalFunctions = new Map([[0, function () {}]]); // tslint:disable-line no-empty
-      var scheduledTimeoutFunctions = new Map([[0, function () {}]]); // tslint:disable-line no-empty
-      var unrespondedRequests = new Map();
-      var worker = new Worker(url);
-      worker.addEventListener('message', function (_ref) {
-        var data = _ref.data;
-        if (isCallNotification(data)) {
-          var _data$params = data.params,
-            timerId = _data$params.timerId,
-            timerType = _data$params.timerType;
-          if (timerType === 'interval') {
-            var idOrFunc = scheduledIntervalFunctions.get(timerId);
-            if (_typeof(idOrFunc) === undefined) {
-              throw new Error('The timer is in an undefined state.');
-            }
-            if (typeof idOrFunc === 'number') {
-              var timerIdAndTimerType = unrespondedRequests.get(idOrFunc);
-              if (timerIdAndTimerType === undefined || timerIdAndTimerType.timerId !== timerId || timerIdAndTimerType.timerType !== timerType) {
-                throw new Error('The timer is in an undefined state.');
-              }
-            } else if (typeof idOrFunc === 'function') {
-              idOrFunc();
-            }
-          } else if (timerType === 'timeout') {
-            var _idOrFunc = scheduledTimeoutFunctions.get(timerId);
-            if (_typeof(_idOrFunc) === undefined) {
-              throw new Error('The timer is in an undefined state.');
-            }
-            if (typeof _idOrFunc === 'number') {
-              var _timerIdAndTimerType = unrespondedRequests.get(_idOrFunc);
-              if (_timerIdAndTimerType === undefined || _timerIdAndTimerType.timerId !== timerId || _timerIdAndTimerType.timerType !== timerType) {
-                throw new Error('The timer is in an undefined state.');
-              }
-            } else if (typeof _idOrFunc === 'function') {
-              _idOrFunc();
-              // A timeout can be savely deleted because it is only called once.
-              scheduledTimeoutFunctions["delete"](timerId);
-            }
+    // Prefilling the Maps with a function indexed by zero is necessary to be compliant with the specification.
+    var scheduledIntervalsState = new Map([[0, null]]); // tslint:disable-line no-empty
+    var scheduledTimeoutsState = new Map([[0, null]]); // tslint:disable-line no-empty
+    var wrap = brokerFactory.createBroker({
+      clearInterval: function clearInterval(_ref) {
+        var call = _ref.call;
+        return function (timerId) {
+          if (_typeof(scheduledIntervalsState.get(timerId)) === 'symbol') {
+            scheduledIntervalsState.set(timerId, null);
+            call('clear', {
+              timerId: timerId,
+              timerType: 'interval'
+            }).then(function () {
+              scheduledIntervalsState["delete"](timerId);
+            });
           }
-        } else if (isClearResponse(data)) {
-          var id = data.id;
-          var _timerIdAndTimerType2 = unrespondedRequests.get(id);
-          if (_timerIdAndTimerType2 === undefined) {
-            throw new Error('The timer is in an undefined state.');
+        };
+      },
+      clearTimeout: function clearTimeout(_ref2) {
+        var call = _ref2.call;
+        return function (timerId) {
+          if (_typeof(scheduledTimeoutsState.get(timerId)) === 'symbol') {
+            scheduledTimeoutsState.set(timerId, null);
+            call('clear', {
+              timerId: timerId,
+              timerType: 'timeout'
+            }).then(function () {
+              scheduledTimeoutsState["delete"](timerId);
+            });
           }
-          var _timerId = _timerIdAndTimerType2.timerId,
-            _timerType = _timerIdAndTimerType2.timerType;
-          unrespondedRequests["delete"](id);
-          if (_timerType === 'interval') {
-            scheduledIntervalFunctions["delete"](_timerId);
-          } else {
-            scheduledTimeoutFunctions["delete"](_timerId);
+        };
+      },
+      setInterval: function setInterval(_ref3) {
+        var call = _ref3.call;
+        return function (func) {
+          var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+          for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+            args[_key - 2] = arguments[_key];
           }
-        } else {
-          var message = data.error.message;
-          throw new Error(message);
-        }
-      });
-      var clearInterval = function clearInterval(timerId) {
-        if (typeof scheduledIntervalFunctions.get(timerId) === 'function') {
-          var id = fastUniqueNumbers.generateUniqueNumber(unrespondedRequests);
-          unrespondedRequests.set(id, {
-            timerId: timerId,
-            timerType: 'interval'
-          });
-          scheduledIntervalFunctions.set(timerId, id);
-          worker.postMessage({
-            id: id,
-            method: 'clear',
-            params: {
+          var symbol = Symbol();
+          var timerId = fastUniqueNumbers.generateUniqueNumber(scheduledIntervalsState);
+          scheduledIntervalsState.set(timerId, symbol);
+          var _schedule = function schedule() {
+            return call('set', {
+              delay: delay,
+              now: performance.timeOrigin + performance.now(),
               timerId: timerId,
               timerType: 'interval'
-            }
-          });
-        }
-      };
-      var clearTimeout = function clearTimeout(timerId) {
-        if (typeof scheduledTimeoutFunctions.get(timerId) === 'function') {
-          var id = fastUniqueNumbers.generateUniqueNumber(unrespondedRequests);
-          unrespondedRequests.set(id, {
-            timerId: timerId,
-            timerType: 'timeout'
-          });
-          scheduledTimeoutFunctions.set(timerId, id);
-          worker.postMessage({
-            id: id,
-            method: 'clear',
-            params: {
-              timerId: timerId,
-              timerType: 'timeout'
-            }
-          });
-        }
-      };
-      var setInterval = function setInterval(func) {
-        var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-        for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-          args[_key - 2] = arguments[_key];
-        }
-        var timerId = fastUniqueNumbers.generateUniqueNumber(scheduledIntervalFunctions);
-        scheduledIntervalFunctions.set(timerId, function () {
-          func.apply(undefined, args);
-          // Doublecheck if the interval should still be rescheduled because it could have been cleared inside of func().
-          if (typeof scheduledIntervalFunctions.get(timerId) === 'function') {
-            worker.postMessage({
-              id: null,
-              method: 'set',
-              params: {
-                delay: delay,
-                now: performance.timeOrigin + performance.now(),
-                timerId: timerId,
-                timerType: 'interval'
+            }).then(function () {
+              var state = scheduledIntervalsState.get(timerId);
+              if (_typeof(state) === undefined) {
+                throw new Error('The timer is in an undefined state.');
+              }
+              if (state === symbol) {
+                func.apply(void 0, args);
+                // Doublecheck if the interval should still be rescheduled because it could have been cleared inside of func().
+                if (scheduledIntervalsState.get(timerId) === symbol) {
+                  _schedule();
+                }
               }
             });
+          };
+          _schedule();
+          return timerId;
+        };
+      },
+      setTimeout: function setTimeout(_ref4) {
+        var call = _ref4.call;
+        return function (func) {
+          var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+          for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+            args[_key2 - 2] = arguments[_key2];
           }
-        });
-        worker.postMessage({
-          id: null,
-          method: 'set',
-          params: {
-            delay: delay,
-            now: performance.timeOrigin + performance.now(),
-            timerId: timerId,
-            timerType: 'interval'
-          }
-        });
-        return timerId;
-      };
-      var setTimeout = function setTimeout(func) {
-        var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-        for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
-          args[_key2 - 2] = arguments[_key2];
-        }
-        var timerId = fastUniqueNumbers.generateUniqueNumber(scheduledTimeoutFunctions);
-        scheduledTimeoutFunctions.set(timerId, function () {
-          return func.apply(undefined, args);
-        });
-        worker.postMessage({
-          id: null,
-          method: 'set',
-          params: {
+          var symbol = Symbol();
+          var timerId = fastUniqueNumbers.generateUniqueNumber(scheduledTimeoutsState);
+          scheduledTimeoutsState.set(timerId, symbol);
+          call('set', {
             delay: delay,
             now: performance.timeOrigin + performance.now(),
             timerId: timerId,
             timerType: 'timeout'
-          }
-        });
-        return timerId;
-      };
-      return {
-        clearInterval: clearInterval,
-        clearTimeout: clearTimeout,
-        setInterval: setInterval,
-        setTimeout: setTimeout
-      };
+          }).then(function () {
+            var state = scheduledTimeoutsState.get(timerId);
+            if (typeof state === 'undefined') {
+              throw new Error('The timer is in an undefined state.');
+            }
+            if (state === symbol) {
+              // A timeout can be savely deleted because it is only called once.
+              scheduledTimeoutsState["delete"](timerId);
+              func.apply(void 0, args);
+            }
+          });
+          return timerId;
+        };
+      }
+    });
+    var load = function load(url) {
+      var worker = new Worker(url);
+      return wrap(worker);
     };
 
     exports.load = load;
+    exports.wrap = wrap;
 
 }));

package/package.json

@@ -9,19 +9,20 @@
         }
     },
     "dependencies": {
-        "@babel/runtime": "^7.26.0",
+        "@babel/runtime": "^7.26.7",
+        "broker-factory": "^3.1.0",
         "fast-unique-numbers": "^9.0.15",
         "tslib": "^2.8.1",
-        "worker-timers-worker": "^8.0.10"
+        "worker-timers-worker": "^9.0.0"
     },
     "description": "The broker which is used by the worker-timers package.",
     "devDependencies": {
-        "@babel/core": "^7.26.0",
+        "@babel/core": "^7.26.8",
         "@babel/plugin-external-helpers": "^7.25.9",
-        "@babel/plugin-transform-runtime": "^7.25.9",
-        "@babel/preset-env": "^7.26.0",
-        "@commitlint/cli": "^19.6.1",
-        "@commitlint/config-angular": "^19.7.0",
+        "@babel/plugin-transform-runtime": "^7.26.8",
+        "@babel/preset-env": "^7.26.8",
+        "@commitlint/cli": "^19.7.1",
+        "@commitlint/config-angular": "^19.7.1",
         "@rollup/plugin-babel": "^6.0.4",
         "chai": "^4.3.10",
         "commitizen": "^4.3.1",
@@ -40,19 +41,19 @@
         "karma-sinon-chai": "^2.0.2",
         "karma-webkit-launcher": "^2.6.0",
         "karma-webpack": "^5.0.1",
-        "lint-staged": "^15.3.0",
+        "lint-staged": "^15.4.3",
         "load-grunt-config": "^4.0.1",
         "mocha": "^10.8.2",
-        "prettier": "^3.4.2",
+        "prettier": "^3.5.0",
         "rimraf": "^6.0.1",
-        "rollup": "^4.30.0",
+        "rollup": "^4.34.6",
         "sinon": "^17.0.2",
         "sinon-chai": "^3.7.0",
-        "ts-loader": "^9.5.1",
+        "ts-loader": "^9.5.2",
         "tsconfig-holy-grail": "^15.0.2",
         "tslint": "^6.1.3",
         "tslint-config-holy-grail": "^56.0.6",
-        "typescript": "^5.7.2",
+        "typescript": "^5.7.3",
         "webpack": "^5.97.1"
     },
     "files": [
@@ -80,5 +81,5 @@
         "test": "grunt lint && grunt test"
     },
     "types": "build/es2019/module.d.ts",
-    "version": "7.1.9"
+    "version": "8.0.0"
 }

package/src/interfaces/index.ts

@@ -0,0 +1 @@
+export * from './worker-timers-broker-definition';

package/src/interfaces/worker-timers-broker-definition.ts

@@ -0,0 +1,11 @@
+import { IBrokerDefinition } from 'broker-factory';
+
+export interface IWorkerTimersBrokerDefinition extends IBrokerDefinition {
+    clearInterval(timerId: number): void;
+
+    clearTimeout(timerId: number): void;
+
+    setInterval(func: Function, delay?: number, ...args: any[]): number;
+
+    setTimeout(func: Function, delay?: number, ...args: any[]): number;
+}

package/src/module.ts

@@ -1,181 +1,112 @@
+import { createBroker } from 'broker-factory';
 import { generateUniqueNumber } from 'fast-unique-numbers';
-import { IClearRequest, ISetNotification, IWorkerEvent, TTimerType } from 'worker-timers-worker';
-import { isCallNotification } from './guards/call-notification';
-import { isClearResponse } from './guards/clear-response';
-
-export const load = (url: string) => {
-    // Prefilling the Maps with a function indexed by zero is necessary to be compliant with the specification.
-    const scheduledIntervalFunctions: Map<number, number | Function> = new Map([[0, () => {}]]); // tslint:disable-line no-empty
-    const scheduledTimeoutFunctions: Map<number, number | Function> = new Map([[0, () => {}]]); // tslint:disable-line no-empty
-    const unrespondedRequests: Map<number, { timerId: number; timerType: TTimerType }> = new Map();
-
-    const worker = new Worker(url);
-
-    worker.addEventListener('message', ({ data }: IWorkerEvent) => {
-        if (isCallNotification(data)) {
-            const {
-                params: { timerId, timerType }
-            } = data;
-
-            if (timerType === 'interval') {
-                const idOrFunc = scheduledIntervalFunctions.get(timerId);
-
-                if (typeof idOrFunc === undefined) {
-                    throw new Error('The timer is in an undefined state.');
-                }
-
-                if (typeof idOrFunc === 'number') {
-                    const timerIdAndTimerType = unrespondedRequests.get(idOrFunc);
-
-                    if (
-                        timerIdAndTimerType === undefined ||
-                        timerIdAndTimerType.timerId !== timerId ||
-                        timerIdAndTimerType.timerType !== timerType
-                    ) {
+import { TWorkerTimersWorkerDefinition } from 'worker-timers-worker';
+import { IWorkerTimersBrokerDefinition } from './interfaces';
+import { TWorkerTimersBrokerLoader, TWorkerTimersBrokerWrapper } from './types';
+
+/*
+ * @todo Explicitly referencing the barrel file seems to be necessary when enabling the
+ * isolatedModules compiler option.
+ */
+export * from './interfaces/index';
+export * from './types/index';
+
+// Prefilling the Maps with a function indexed by zero is necessary to be compliant with the specification.
+const scheduledIntervalsState: Map<number, null | symbol> = new Map([[0, null]]); // tslint:disable-line no-empty
+const scheduledTimeoutsState: Map<number, null | symbol> = new Map([[0, null]]); // tslint:disable-line no-empty
+
+export const wrap: TWorkerTimersBrokerWrapper = createBroker<IWorkerTimersBrokerDefinition, TWorkerTimersWorkerDefinition>({
+    clearInterval: ({ call }) => {
+        return (timerId) => {
+            if (typeof scheduledIntervalsState.get(timerId) === 'symbol') {
+                scheduledIntervalsState.set(timerId, null);
+
+                call('clear', { timerId, timerType: 'interval' }).then(() => {
+                    scheduledIntervalsState.delete(timerId);
+                });
+            }
+        };
+    },
+    clearTimeout: ({ call }) => {
+        return (timerId) => {
+            if (typeof scheduledTimeoutsState.get(timerId) === 'symbol') {
+                scheduledTimeoutsState.set(timerId, null);
+
+                call('clear', { timerId, timerType: 'timeout' }).then(() => {
+                    scheduledTimeoutsState.delete(timerId);
+                });
+            }
+        };
+    },
+    setInterval: ({ call }) => {
+        return (func: Function, delay = 0, ...args: any[]) => {
+            const symbol = Symbol();
+            const timerId = generateUniqueNumber(scheduledIntervalsState);
+
+            scheduledIntervalsState.set(timerId, symbol);
+
+            const schedule = () =>
+                call('set', {
+                    delay,
+                    now: performance.timeOrigin + performance.now(),
+                    timerId,
+                    timerType: 'interval'
+                }).then(() => {
+                    const state = scheduledIntervalsState.get(timerId);
+
+                    if (typeof state === undefined) {
                         throw new Error('The timer is in an undefined state.');
                     }
-                } else if (typeof idOrFunc === 'function') {
-                    idOrFunc();
-                }
-            } else if (timerType === 'timeout') {
-                const idOrFunc = scheduledTimeoutFunctions.get(timerId);
-
-                if (typeof idOrFunc === undefined) {
-                    throw new Error('The timer is in an undefined state.');
-                }
 
-                if (typeof idOrFunc === 'number') {
-                    const timerIdAndTimerType = unrespondedRequests.get(idOrFunc);
+                    if (state === symbol) {
+                        func(...args);
 
-                    if (
-                        timerIdAndTimerType === undefined ||
-                        timerIdAndTimerType.timerId !== timerId ||
-                        timerIdAndTimerType.timerType !== timerType
-                    ) {
-                        throw new Error('The timer is in an undefined state.');
+                        // Doublecheck if the interval should still be rescheduled because it could have been cleared inside of func().
+                        if (scheduledIntervalsState.get(timerId) === symbol) {
+                            schedule();
+                        }
                     }
-                } else if (typeof idOrFunc === 'function') {
-                    idOrFunc();
-
-                    // A timeout can be savely deleted because it is only called once.
-                    scheduledTimeoutFunctions.delete(timerId);
-                }
-            }
-        } else if (isClearResponse(data)) {
-            const { id } = data;
-
-            const timerIdAndTimerType = unrespondedRequests.get(id);
-
-            if (timerIdAndTimerType === undefined) {
-                throw new Error('The timer is in an undefined state.');
-            }
-
-            const { timerId, timerType } = timerIdAndTimerType;
-
-            unrespondedRequests.delete(id);
-
-            if (timerType === 'interval') {
-                scheduledIntervalFunctions.delete(timerId);
-            } else {
-                scheduledTimeoutFunctions.delete(timerId);
-            }
-        } else {
-            const {
-                error: { message }
-            } = data;
-
-            throw new Error(message);
-        }
-    });
-
-    const clearInterval = (timerId: number) => {
-        if (typeof scheduledIntervalFunctions.get(timerId) === 'function') {
-            const id = generateUniqueNumber(unrespondedRequests);
-
-            unrespondedRequests.set(id, { timerId, timerType: 'interval' });
-            scheduledIntervalFunctions.set(timerId, id);
-
-            worker.postMessage(<IClearRequest>{
-                id,
-                method: 'clear',
-                params: { timerId, timerType: 'interval' }
-            });
-        }
-    };
+                });
 
-    const clearTimeout = (timerId: number) => {
-        if (typeof scheduledTimeoutFunctions.get(timerId) === 'function') {
-            const id = generateUniqueNumber(unrespondedRequests);
+            schedule();
 
-            unrespondedRequests.set(id, { timerId, timerType: 'timeout' });
-            scheduledTimeoutFunctions.set(timerId, id);
+            return timerId;
+        };
+    },
+    setTimeout: ({ call }) => {
+        return (func: Function, delay = 0, ...args: any[]) => {
+            const symbol = Symbol();
+            const timerId = generateUniqueNumber(scheduledTimeoutsState);
 
-            worker.postMessage(<IClearRequest>{
-                id,
-                method: 'clear',
-                params: { timerId, timerType: 'timeout' }
-            });
-        }
-    };
-
-    const setInterval = (func: Function, delay = 0, ...args: any[]) => {
-        const timerId = generateUniqueNumber(scheduledIntervalFunctions);
-
-        scheduledIntervalFunctions.set(timerId, () => {
-            func(...args);
-
-            // Doublecheck if the interval should still be rescheduled because it could have been cleared inside of func().
-            if (typeof scheduledIntervalFunctions.get(timerId) === 'function') {
-                worker.postMessage(<ISetNotification>{
-                    id: null,
-                    method: 'set',
-                    params: {
-                        delay,
-                        now: performance.timeOrigin + performance.now(),
-                        timerId,
-                        timerType: 'interval'
-                    }
-                });
-            }
-        });
+            scheduledTimeoutsState.set(timerId, symbol);
 
-        worker.postMessage(<ISetNotification>{
-            id: null,
-            method: 'set',
-            params: {
+            call('set', {
                 delay,
                 now: performance.timeOrigin + performance.now(),
                 timerId,
-                timerType: 'interval'
-            }
-        });
+                timerType: 'timeout'
+            }).then(() => {
+                const state = scheduledTimeoutsState.get(timerId);
 
-        return timerId;
-    };
+                if (typeof state === 'undefined') {
+                    throw new Error('The timer is in an undefined state.');
+                }
 
-    const setTimeout = (func: Function, delay = 0, ...args: any[]) => {
-        const timerId = generateUniqueNumber(scheduledTimeoutFunctions);
+                if (state === symbol) {
+                    // A timeout can be savely deleted because it is only called once.
+                    scheduledTimeoutsState.delete(timerId);
 
-        scheduledTimeoutFunctions.set(timerId, () => func(...args));
+                    func(...args);
+                }
+            });
 
-        worker.postMessage(<ISetNotification>{
-            id: null,
-            method: 'set',
-            params: {
-                delay,
-                now: performance.timeOrigin + performance.now(),
-                timerId,
-                timerType: 'timeout'
-            }
-        });
+            return timerId;
+        };
+    }
+});
 
-        return timerId;
-    };
+export const load: TWorkerTimersBrokerLoader = (url: string) => {
+    const worker = new Worker(url);
 
-    return {
-        clearInterval,
-        clearTimeout,
-        setInterval,
-        setTimeout
-    };
+    return wrap(worker);
 };

package/src/types/index.ts

@@ -0,0 +1,2 @@
+export * from './worker-timers-broker-loader';
+export * from './worker-timers-broker-wrapper';

package/src/types/worker-timers-broker-loader.ts

@@ -0,0 +1,4 @@
+import { IDefaultBrokerDefinition } from 'broker-factory';
+import { IWorkerTimersBrokerDefinition } from '../interfaces';
+
+export type TWorkerTimersBrokerLoader = (url: string) => IWorkerTimersBrokerDefinition & IDefaultBrokerDefinition;

package/src/types/worker-timers-broker-wrapper.ts

@@ -0,0 +1,4 @@
+import { IDefaultBrokerDefinition } from 'broker-factory';
+import { IWorkerTimersBrokerDefinition } from '../interfaces';
+
+export type TWorkerTimersBrokerWrapper = (sender: MessagePort | Worker) => IWorkerTimersBrokerDefinition & IDefaultBrokerDefinition;

package/build/es2019/guards/call-notification.d.ts

@@ -1,3 +0,0 @@
-import { ICallNotification, TWorkerMessage } from 'worker-timers-worker';
-export declare const isCallNotification: (message: TWorkerMessage) => message is ICallNotification;
-//# sourceMappingURL=call-notification.d.ts.map

package/build/es2019/guards/call-notification.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"call-notification.d.ts","sourceRoot":"","sources":["../../../src/guards/call-notification.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEzE,eAAO,MAAM,kBAAkB,YAAa,cAAc,KAAG,OAAO,IAAI,iBAEvE,CAAC"}

package/build/es2019/guards/call-notification.js

@@ -1,4 +0,0 @@
-export const isCallNotification = (message) => {
-    return message.method !== undefined && message.method === 'call';
-};
-//# sourceMappingURL=call-notification.js.map

package/build/es2019/guards/call-notification.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"call-notification.js","sourceRoot":"","sources":["../../../src/guards/call-notification.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAuB,EAAgC,EAAE;IACxF,OAA2B,OAAQ,CAAC,MAAM,KAAK,SAAS,IAAwB,OAAQ,CAAC,MAAM,KAAK,MAAM,CAAC;AAC/G,CAAC,CAAC"}

package/build/es2019/guards/clear-response.d.ts

@@ -1,3 +0,0 @@
-import { IClearResponse, TWorkerMessage } from 'worker-timers-worker';
-export declare const isClearResponse: (message: TWorkerMessage) => message is IClearResponse;
-//# sourceMappingURL=clear-response.d.ts.map

package/build/es2019/guards/clear-response.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"clear-response.d.ts","sourceRoot":"","sources":["../../../src/guards/clear-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtE,eAAO,MAAM,eAAe,YAAa,cAAc,KAAG,OAAO,IAAI,cAEpE,CAAC"}

package/build/es2019/guards/clear-response.js

@@ -1,4 +0,0 @@
-export const isClearResponse = (message) => {
-    return typeof message.id === 'number' && typeof message.result === 'boolean';
-};
-//# sourceMappingURL=clear-response.js.map

package/build/es2019/guards/clear-response.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"clear-response.js","sourceRoot":"","sources":["../../../src/guards/clear-response.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAuB,EAA6B,EAAE;IAClF,OAAO,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,IAAI,OAAwB,OAAQ,CAAC,MAAM,KAAK,SAAS,CAAC;AACnG,CAAC,CAAC"}

package/src/guards/call-notification.ts

@@ -1,5 +0,0 @@
-import { ICallNotification, TWorkerMessage } from 'worker-timers-worker';
-
-export const isCallNotification = (message: TWorkerMessage): message is ICallNotification => {
-    return (<ICallNotification>message).method !== undefined && (<ICallNotification>message).method === 'call';
-};

package/src/guards/clear-response.ts

@@ -1,5 +0,0 @@
-import { IClearResponse, TWorkerMessage } from 'worker-timers-worker';
-
-export const isClearResponse = (message: TWorkerMessage): message is IClearResponse => {
-    return typeof message.id === 'number' && typeof (<IClearResponse>message).result === 'boolean';
-};