@hotmeshio/hotmesh 0.0.36 → 0.0.38

package/build/services/activities/hook.js

@@ -5,11 +5,11 @@ const errors_1 = require("../../modules/errors");
 const activity_1 = require("./activity");
 const collator_1 = require("../collator");
 const pipe_1 = require("../pipe");
-const store_1 = require("../signaler/store");
+const task_1 = require("../task");
 const telemetry_1 = require("../telemetry");
 const stream_1 = require("../../types/stream");
 /**
- * Listens for `webhook`, `timehook`, and `cycle` (repeat) signals
+ * Supports `signal hook`, `time hook`, and `cycle hook` patterns
  */
 class Hook extends activity_1.Activity {
     constructor(config, data, metadata, hook, engine, context) {
@@ -17,45 +17,23 @@ class Hook extends activity_1.Activity {
     }
     //********  INITIAL ENTRY POINT (A)  ********//
     async process() {
-        this.logger.debug('hook-process', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+        this.logger.debug('hook-process', {
+            jid: this.context.metadata.jid,
+            gid: this.context.metadata.gid,
+            aid: this.metadata.aid,
+        });
         let telemetry;
         try {
-            this.setLeg(1);
-            await collator_1.CollatorService.notarizeEntry(this);
-            await this.getState();
-            collator_1.CollatorService.assertJobActive(this.context.metadata.js, this.context.metadata.jid, this.metadata.aid);
+            await this.verifyEntry();
             telemetry = new telemetry_1.TelemetryService(this.engine.appId, this.config, this.metadata, this.context);
             telemetry.startActivitySpan(this.leg);
-            let multiResponse;
-            const multi = this.store.getMulti();
             if (this.doesHook()) {
                 //sleep and wait to awaken upon a signal
-                await this.registerHook(multi);
-                this.mapOutputData();
-                this.mapJobData();
-                await this.setState(multi);
-                await collator_1.CollatorService.authorizeReentry(this, multi);
-                await this.setStatus(0, multi);
-                await multi.exec();
-                telemetry.mapActivityAttributes();
+                await this.doHook(telemetry);
             }
             else {
                 //end the activity and transition to its children
-                this.adjacencyList = await this.filterAdjacent();
-                this.mapOutputData();
-                this.mapJobData();
-                await this.setState(multi);
-                await collator_1.CollatorService.notarizeEarlyCompletion(this, multi);
-                await this.setStatus(this.adjacencyList.length - 1, multi);
-                multiResponse = await multi.exec();
-                telemetry.mapActivityAttributes();
-                const jobStatus = this.resolveStatus(multiResponse);
-                const attrs = { 'app.job.jss': jobStatus };
-                const messageIds = await this.transition(this.adjacencyList, jobStatus);
-                if (messageIds.length) {
-                    attrs['app.activity.mids'] = messageIds.join(',');
-                }
-                telemetry.setActivityAttributes(attrs);
+                await this.doPassThrough(telemetry);
             }
             return this.context.metadata.aid;
         }
@@ -64,6 +42,10 @@ class Hook extends activity_1.Activity {
                 this.logger.error('hook-inactive-job-error', { error });
                 return;
             }
+            else if (error instanceof errors_1.GenerationalError) {
+                this.logger.info('process-event-generational-job-error', { error });
+                return;
+            }
             else if (error instanceof errors_1.GetStateError) {
                 this.logger.error('hook-get-state-error', { error });
                 return;
@@ -76,32 +58,65 @@ class Hook extends activity_1.Activity {
         }
         finally {
             telemetry?.endActivitySpan();
-            this.logger.debug('hook-process-end', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+            this.logger.debug('hook-process-end', { jid: this.context.metadata.jid, gid: this.context.metadata.gid, aid: this.metadata.aid });
         }
     }
-    //********  SIGNAL RE-ENTRY POINT  ********//
+    /**
+     * does this activity use a time-hook or web-hook
+     */
     doesHook() {
-        //does this activity use a time-hook or web-hook
         return !!(this.config.hook?.topic || this.config.sleep);
     }
+    async doHook(telemetry) {
+        const multi = this.store.getMulti();
+        await this.registerHook(multi);
+        this.mapOutputData();
+        this.mapJobData();
+        await this.setState(multi);
+        await collator_1.CollatorService.authorizeReentry(this, multi);
+        await this.setStatus(0, multi);
+        await multi.exec();
+        telemetry.mapActivityAttributes();
+    }
+    async doPassThrough(telemetry) {
+        const multi = this.store.getMulti();
+        let multiResponse;
+        this.adjacencyList = await this.filterAdjacent();
+        this.mapOutputData();
+        this.mapJobData();
+        await this.setState(multi);
+        await collator_1.CollatorService.notarizeEarlyCompletion(this, multi);
+        await this.setStatus(this.adjacencyList.length - 1, multi);
+        multiResponse = await multi.exec();
+        telemetry.mapActivityAttributes();
+        const jobStatus = this.resolveStatus(multiResponse);
+        const attrs = { 'app.job.jss': jobStatus };
+        const messageIds = await this.transition(this.adjacencyList, jobStatus);
+        if (messageIds.length) {
+            attrs['app.activity.mids'] = messageIds.join(',');
+        }
+        telemetry.setActivityAttributes(attrs);
+    }
     async getHookRule(topic) {
         const rules = await this.store.getHookRules();
         return rules?.[topic]?.[0];
     }
     async registerHook(multi) {
         if (this.config.hook?.topic) {
-            const signaler = new store_1.StoreSignaler(this.store, this.logger);
-            return await signaler.registerWebHook(this.config.hook.topic, this.context, this.resolveDad(), multi);
+            const taskService = new task_1.TaskService(this.store, this.logger);
+            return await taskService.registerWebHook(this.config.hook.topic, this.context, this.resolveDad(), multi);
         }
         else if (this.config.sleep) {
             const durationInSeconds = pipe_1.Pipe.resolve(this.config.sleep, this.context);
             const jobId = this.context.metadata.jid;
+            const gId = this.context.metadata.gid;
             const activityId = this.metadata.aid;
             const dId = this.metadata.dad;
-            await this.engine.task.registerTimeHook(jobId, `${activityId}${dId || ''}`, 'sleep', durationInSeconds);
+            await this.engine.taskService.registerTimeHook(jobId, gId, `${activityId}${dId || ''}`, 'sleep', durationInSeconds);
             return jobId;
         }
     }
+    //********  SIGNAL RE-ENTRY POINT  ********//
     async processWebHookEvent(status = stream_1.StreamStatus.SUCCESS, code = 200) {
         this.logger.debug('hook-process-web-hook-event', {
             topic: this.config.hook.topic,
@@ -109,22 +124,24 @@ class Hook extends activity_1.Activity {
             status,
             code,
         });
-        const signaler = new store_1.StoreSignaler(this.store, this.logger);
+        const taskService = new task_1.TaskService(this.store, this.logger);
         const data = { ...this.data };
-        const signal = await signaler.processWebHookSignal(this.config.hook.topic, data);
+        const signal = await taskService.processWebHookSignal(this.config.hook.topic, data);
         if (signal) {
-            const [jobId, aid, dad] = signal;
+            const [jobId, _aid, dad, gId] = signal;
             this.context.metadata.jid = jobId;
+            this.context.metadata.gid = gId;
             this.context.metadata.dad = dad;
             await this.processEvent(status, code, 'hook');
-            if (code === 200) { //otherwise 202 for pending/keepalive
-                await signaler.deleteWebHookSignal(this.config.hook.topic, data);
-            }
+            if (code === 200) {
+                await taskService.deleteWebHookSignal(this.config.hook.topic, data);
+            } //else => 202/keep alive
         } //else => already resolved
     }
     async processTimeHookEvent(jobId) {
         this.logger.debug('hook-process-time-hook-event', {
             jid: jobId,
+            gid: this.context.metadata.gid,
             aid: this.metadata.aid
         });
         await this.processEvent(stream_1.StreamStatus.SUCCESS, 200, 'hook');

package/build/services/activities/interrupt.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Interrupt = void 0;
-const activity_1 = require("./activity");
 const errors_1 = require("../../modules/errors");
+const activity_1 = require("./activity");
 const collator_1 = require("../collator");
 const telemetry_1 = require("../telemetry");
 const pipe_1 = require("../pipe");
@@ -12,20 +12,17 @@ class Interrupt extends activity_1.Activity {
     }
     //********  LEG 1 ENTRY  ********//
     async process() {
-        this.logger.debug('interrupt-process', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+        this.logger.debug('interrupt-process', { jid: this.context.metadata.jid, gid: this.context.metadata.gid, aid: this.metadata.aid });
         let telemetry;
         try {
-            this.setLeg(1);
-            await collator_1.CollatorService.notarizeEntry(this);
-            await this.getState();
-            collator_1.CollatorService.assertJobActive(this.context.metadata.js, this.context.metadata.jid, this.metadata.aid); // Ensure job active
+            await this.verifyEntry();
             telemetry = new telemetry_1.TelemetryService(this.engine.appId, this.config, this.metadata, this.context);
             telemetry.startActivitySpan(this.leg);
             if (this.isInterruptingSelf()) {
-                return await this.interruptSelf(telemetry);
+                await this.interruptSelf(telemetry);
             }
             else {
-                return await this.interruptAnother(telemetry);
+                await this.interruptAnother(telemetry);
             }
         }
         catch (error) {
@@ -33,6 +30,10 @@ class Interrupt extends activity_1.Activity {
                 this.logger.error('interrupt-inactive-job-error', { error });
                 return;
             }
+            else if (error instanceof errors_1.GenerationalError) {
+                this.logger.info('process-event-generational-job-error', { error });
+                return;
+            }
             else if (error instanceof errors_1.GetStateError) {
                 this.logger.error('interrupt-get-state-error', { error });
                 return;
@@ -45,7 +46,7 @@ class Interrupt extends activity_1.Activity {
         }
         finally {
             telemetry?.endActivitySpan();
-            this.logger.debug('interrupt-process-end', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+            this.logger.debug('interrupt-process-end', { jid: this.context.metadata.jid, gid: this.context.metadata.gid, aid: this.metadata.aid });
         }
     }
     async interruptSelf(telemetry) {

package/build/services/activities/signal.js

@@ -13,14 +13,10 @@ class Signal extends activity_1.Activity {
     }
     //********  LEG 1 ENTRY  ********//
     async process() {
-        this.logger.debug('signal-process', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+        this.logger.debug('signal-process', { jid: this.context.metadata.jid, gid: this.context.metadata.gid, aid: this.metadata.aid });
         let telemetry;
         try {
-            //verify entry is allowed
-            this.setLeg(1);
-            await collator_1.CollatorService.notarizeEntry(this);
-            await this.getState();
-            collator_1.CollatorService.assertJobActive(this.context.metadata.js, this.context.metadata.jid, this.metadata.aid);
+            await this.verifyEntry();
             telemetry = new telemetry_1.TelemetryService(this.engine.appId, this.config, this.metadata, this.context);
             telemetry.startActivitySpan(this.leg);
             //save state and notarize early completion (signals only run leg1)
@@ -55,6 +51,10 @@ class Signal extends activity_1.Activity {
                 this.logger.error('signal-inactive-job-error', { error });
                 return;
             }
+            else if (error instanceof errors_1.GenerationalError) {
+                this.logger.info('process-event-generational-job-error', { error });
+                return;
+            }
             else if (error instanceof errors_1.GetStateError) {
                 this.logger.error('signal-get-state-error', { error });
                 return;
@@ -67,7 +67,7 @@ class Signal extends activity_1.Activity {
         }
         finally {
             telemetry?.endActivitySpan();
-            this.logger.debug('signal-process-end', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+            this.logger.debug('signal-process-end', { jid: this.context.metadata.jid, gid: this.context.metadata.gid, aid: this.metadata.aid });
         }
     }
     mapSignalData() {

package/build/services/activities/trigger.js

@@ -55,7 +55,7 @@ class Trigger extends activity_1.Activity {
         finally {
             telemetry?.endJobSpan();
             telemetry?.endActivitySpan();
-            this.logger.debug('trigger-process-end', { subscribes: this.config.subscribes, jid: this.context.metadata.jid });
+            this.logger.debug('trigger-process-end', { subscribes: this.config.subscribes, jid: this.context.metadata.jid, gid: this.context.metadata.gid });
         }
     }
     async setStatus(amount) {
@@ -89,8 +89,10 @@ class Trigger extends activity_1.Activity {
         this.context = {
             metadata: {
                 ...this.metadata,
+                gid: (0, utils_1.guid)(),
                 ngn: this.context.metadata.ngn,
                 pj: this.context.metadata.pj,
+                pg: this.context.metadata.pg,
                 pd: this.context.metadata.pd,
                 pa: this.context.metadata.pa,
                 app: id,
@@ -156,7 +158,7 @@ class Trigger extends activity_1.Activity {
         const depKey = this.config.stats?.parent;
         const resolvedDepKey = depKey ? pipe_1.Pipe.resolve(depKey, this.context) : '';
         if (resolvedDepKey) {
-            await this.store.setDependency(resolvedDepKey, this.context.metadata.tpc, this.context.metadata.jid, multi);
+            await this.store.setDependency(resolvedDepKey, this.context.metadata.tpc, this.context.metadata.jid, this.context.metadata.gid, multi);
         }
     }
     async setStats(multi) {

package/build/services/activities/worker.js

@@ -13,14 +13,10 @@ class Worker extends activity_1.Activity {
     }
     //********  INITIAL ENTRY POINT (A)  ********//
     async process() {
-        this.logger.debug('worker-process', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+        this.logger.debug('worker-process', { jid: this.context.metadata.jid, gid: this.context.metadata.gid, aid: this.metadata.aid });
         let telemetry;
         try {
-            //confirm entry is allowed and restore state
-            this.setLeg(1);
-            await collator_1.CollatorService.notarizeEntry(this);
-            await this.getState();
-            collator_1.CollatorService.assertJobActive(this.context.metadata.js, this.context.metadata.jid, this.metadata.aid);
+            await this.verifyEntry();
             telemetry = new telemetry_1.TelemetryService(this.engine.appId, this.config, this.metadata, this.context);
             telemetry.startActivitySpan(this.leg);
             this.mapInputData();
@@ -46,6 +42,10 @@ class Worker extends activity_1.Activity {
                 this.logger.error('await-inactive-job-error', { error });
                 return;
             }
+            else if (error instanceof errors_1.GenerationalError) {
+                this.logger.info('process-event-generational-job-error', { error });
+                return;
+            }
             else if (error instanceof errors_1.GetStateError) {
                 this.logger.error('worker-get-state-error', { error });
                 return;
@@ -58,7 +58,7 @@ class Worker extends activity_1.Activity {
         }
         finally {
             telemetry?.endActivitySpan();
-            this.logger.debug('worker-process-end', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+            this.logger.debug('worker-process-end', { jid: this.context.metadata.jid, gid: this.context.metadata.gid, aid: this.metadata.aid });
         }
     }
     async execActivity(multi) {
@@ -67,6 +67,7 @@ class Worker extends activity_1.Activity {
             metadata: {
                 guid: (0, utils_1.guid)(),
                 jid: this.context.metadata.jid,
+                gid: this.context.metadata.gid,
                 dad: this.metadata.dad,
                 aid: this.metadata.aid,
                 topic,
@@ -80,7 +81,7 @@ class Worker extends activity_1.Activity {
                 retry: this.config.retry
             };
         }
-        return (await this.engine.streamSignaler?.publishMessage(topic, streamData, multi));
+        return (await this.engine.router?.publishMessage(topic, streamData, multi));
     }
 }
 exports.Worker = Worker;

package/build/services/durable/meshos.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MeshOSService = void 0;
 const _1 = require(".");
-const asyncLocalStorage_1 = require("./asyncLocalStorage");
+const storage_1 = require("../../modules/storage");
 const client_1 = require("./client");
 const search_1 = require("./search");
 const worker_1 = require("./worker");
@@ -92,7 +92,7 @@ class MeshOSService {
                 //wrap the function to return
                 const wrappedFunction = {
                     [funcName]: async (...args) => {
-                        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+                        const store = storage_1.asyncLocalStorage.getStore();
                         const workflowId = store.get('workflowId');
                         //use a Proxy to wrap hook methods
                         const context = new Proxy(my, {

package/build/services/durable/worker.js

@@ -3,7 +3,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkerService = void 0;
 const errors_1 = require("../../modules/errors");
-const asyncLocalStorage_1 = require("./asyncLocalStorage");
+const storage_1 = require("../../modules/storage");
 const factory_1 = require("./factory");
 const hotmesh_1 = require("../hotmesh");
 const search_1 = require("./search");
@@ -173,7 +173,7 @@ class WorkerService {
                 context.set('workflowName', workflowTopic.split('-').pop());
                 context.set('workflowTrace', data.metadata.trc);
                 context.set('workflowSpan', data.metadata.spn);
-                const workflowResponse = await asyncLocalStorage_1.asyncLocalStorage.run(context, async () => {
+                const workflowResponse = await storage_1.asyncLocalStorage.run(context, async () => {
                     return await workflowFunction.apply(this, workflowInput.arguments);
                 });
                 return {

package/build/services/durable/workflow.js

@@ -7,7 +7,7 @@ exports.WorkflowService = void 0;
 const ms_1 = __importDefault(require("ms"));
 const errors_1 = require("../../modules/errors");
 const key_1 = require("../../modules/key");
-const asyncLocalStorage_1 = require("./asyncLocalStorage");
+const storage_1 = require("../../modules/storage");
 const client_1 = require("./client");
 const connection_1 = require("./connection");
 const factory_1 = require("./factory");
@@ -23,7 +23,7 @@ class WorkflowService {
      * @returns {Promise<T>} - the result of the child workflow
      */
     static async executeChild(options) {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const namespace = store.get('namespace');
         const workflowId = store.get('workflowId');
         const originJobId = store.get('originJobId');
@@ -67,7 +67,7 @@ class WorkflowService {
      * @returns {Promise<string>} - the childJobId
      */
     static async startChild(options) {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const namespace = store.get('namespace');
         const workflowId = store.get('workflowId');
         const workflowDimension = store.get('workflowDimension') ?? '';
@@ -140,7 +140,7 @@ class WorkflowService {
      * @returns {Promise<Search>} - a search session
      */
     static async search() {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const workflowId = store.get('workflowId');
         const workflowDimension = store.get('workflowDimension') ?? '';
         const workflowTopic = store.get('workflowTopic');
@@ -157,7 +157,7 @@ class WorkflowService {
      * @returns {Promise<HotMesh>} - a hotmesh client
      */
     static async getHotMesh() {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const workflowTopic = store.get('workflowTopic');
         const namespace = store.get('namespace');
         return await worker_1.WorkerService.getHotMesh(workflowTopic, { namespace });
@@ -167,7 +167,7 @@ class WorkflowService {
      * @returns {WorkflowContext} - the current workflow context
      */
     static getContext() {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const workflowId = store.get('workflowId');
         const workflowDimension = store.get('workflowDimension') ?? '';
         const workflowTopic = store.get('workflowTopic');
@@ -192,7 +192,7 @@ class WorkflowService {
      * @private
      */
     static async isSideEffectAllowed(hotMeshClient, prefix) {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const workflowId = store.get('workflowId');
         const workflowDimension = store.get('workflowDimension') ?? '';
         const COUNTER = store.get('counter');
@@ -213,7 +213,7 @@ class WorkflowService {
      * @returns {number} - a random number between 0 and 1
      */
     static random() {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const COUNTER = store.get('counter');
         const seed = COUNTER.counter = COUNTER.counter + 1;
         return (0, utils_1.deterministicRandom)(seed);
@@ -226,7 +226,7 @@ class WorkflowService {
      * @returns {Promise<string>} - the stream id
      */
     static async signal(signalId, data) {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const workflowTopic = store.get('workflowTopic');
         const namespace = store.get('namespace');
         const hotMeshClient = await worker_1.WorkerService.getHotMesh(workflowTopic, { namespace });
@@ -243,12 +243,12 @@ class WorkflowService {
      * @param {HookOptions} options - the hook options
      */
     static async hook(options) {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const workflowTopic = store.get('workflowTopic');
         const namespace = store.get('namespace');
         const hotMeshClient = await worker_1.WorkerService.getHotMesh(workflowTopic, { namespace });
         if (await WorkflowService.isSideEffectAllowed(hotMeshClient, 'hook')) {
-            const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+            const store = storage_1.asyncLocalStorage.getStore();
             const workflowId = options.workflowId ?? store.get('workflowId');
             let workflowTopic = store.get('workflowTopic');
             if (options.entity || (options.taskQueue && options.workflowName)) {
@@ -264,7 +264,7 @@ class WorkflowService {
         }
     }
     static getLocalState() {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         return {
             workflowId: store.get('workflowId'),
             namespace: store.get('namespace'),
@@ -306,7 +306,7 @@ class WorkflowService {
      * @returns {Promise<string>} - the stream id
      */
     static async interrupt(jobId, options = {}) {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const workflowTopic = store.get('workflowTopic');
         const namespace = store.get('namespace');
         const hotMeshClient = await worker_1.WorkerService.getHotMesh(workflowTopic, { namespace });
@@ -323,7 +323,7 @@ class WorkflowService {
      */
     static async sleepFor(duration) {
         const seconds = (0, ms_1.default)(duration) / 1000;
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const namespace = store.get('namespace');
         const workflowTopic = store.get('workflowTopic');
         const hotMeshClient = await worker_1.WorkerService.getHotMesh(workflowTopic, { namespace });
@@ -348,7 +348,7 @@ class WorkflowService {
      */
     static async sleep(duration) {
         const seconds = (0, ms_1.default)(duration) / 1000;
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const COUNTER = store.get('counter');
         const execIndex = COUNTER.counter = COUNTER.counter + 1;
         const workflowId = store.get('workflowId');
@@ -374,7 +374,7 @@ class WorkflowService {
      * @returns {Promise<Record<any, any>[]>}
      */
     static async waitForSignal(signals, options) {
-        const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+        const store = storage_1.asyncLocalStorage.getStore();
         const COUNTER = store.get('counter');
         const workflowId = store.get('workflowId');
         const workflowTopic = store.get('workflowTopic');
@@ -427,7 +427,7 @@ class WorkflowService {
     }
     static wrapActivity(activityName, options) {
         return async function () {
-            const store = asyncLocalStorage_1.asyncLocalStorage.getStore();
+            const store = storage_1.asyncLocalStorage.getStore();
             const COUNTER = store.get('counter');
             //increment by state (not value) to avoid race conditions
             const execIndex = COUNTER.counter = COUNTER.counter + 1;

package/build/services/engine/index.d.ts

@@ -6,8 +6,7 @@ import { Signal } from '../activities/signal';
 import { Worker } from '../activities/worker';
 import { Trigger } from '../activities/trigger';
 import { ILogger } from '../logger';
-import { StoreSignaler } from '../signaler/store';
-import { StreamSignaler } from '../signaler/stream';
+import { Router } from '../router';
 import { StoreService } from '../store';
 import { StreamService } from '../stream';
 import { SubService } from '../sub';
@@ -27,12 +26,11 @@ declare class EngineService {
     apps: HotMeshApps | null;
     appId: string;
     guid: string;
+    router: Router | null;
     store: StoreService<RedisClient, RedisMulti> | null;
     stream: StreamService<RedisClient, RedisMulti> | null;
     subscribe: SubService<RedisClient, RedisMulti> | null;
-    storeSignaler: StoreSignaler | null;
-    streamSignaler: StreamSignaler | null;
-    task: TaskService | null;
+    taskService: TaskService | null;
     logger: ILogger;
     cacheMode: CacheMode;
     untilVersion: string | null;
@@ -44,7 +42,7 @@ declare class EngineService {
     initStoreChannel(store: RedisClient): Promise<void>;
     initSubChannel(sub: RedisClient): Promise<void>;
     initStreamChannel(stream: RedisClient): Promise<void>;
-    initStreamSignaler(config: HotMeshConfig): StreamSignaler;
+    initRouter(config: HotMeshConfig): Router;
     getVID(vid?: AppVID): Promise<AppVID>;
     setCacheMode(cacheMode: CacheMode, untilVersion: string): void;
     routeToSubscribers(topic: string, message: JobOutput): Promise<void>;
@@ -67,7 +65,7 @@ declare class EngineService {
     interrupt(topic: string, jobId: string, options?: JobInterruptOptions): Promise<string>;
     scrub(jobId: string): Promise<void>;
     hook(topic: string, data: JobData, status?: StreamStatus, code?: StreamCode): Promise<string>;
-    hookTime(jobId: string, activityId: string, type?: 'sleep' | 'expire' | 'interrupt'): Promise<string | void>;
+    hookTime(jobId: string, gId: string, activityId: string, type?: 'sleep' | 'expire' | 'interrupt'): Promise<string | void>;
     hookAll(hookTopic: string, data: JobData, keyResolver: JobStatsInput, queryFacets?: string[]): Promise<string[]>;
     pub(topic: string, data: JobData, context?: JobState): Promise<string>;
     sub(topic: string, callback: JobMessageCallback): Promise<void>;