@hotmeshio/hotmesh 0.0.36 → 0.0.38

package/README.md

@@ -15,7 +15,7 @@ npm install @hotmeshio/hotmesh
 ## Understanding HotMesh
 HotMesh inverts the relationship to Redis: those functions that once used Redis as a cache, are instead *cached and governed* by Redis. Consider the following. It's a typical microservices network, with a tangled mess of services and functions. There's important business logic in there (functions *A*, *B* and *C* are critical!), but they're hard to find and access.
 
-<img src="https://github.com/hotmeshio/sdk-typescript/blob/main/docs/img/operational_data_layer.png" alt="A Tangled Microservices Network with 3 functions buried within" style="max-width:100%;width:600px;">
+<img src="./docs/img/operational_data_layer.png" alt="A Tangled Microservices Network with 3 valuable functions buried within" style="max-width:100%;width:600px;">
 
 HotMesh creates an *ad hoc*, Redis-backed network of functions and organizes them into a unified service mesh. *Any service with access to Redis can join in the network, bypassing the legacy clutter.*
 
@@ -285,31 +285,31 @@ const hotMesh = await HotMesh.init({
 ```
 
 ### Observability
-Workflows and activities are run according to the rules you define, offering [Graph-Oriented](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/system_lifecycle.md#telemetry) telemetry insights into your legacy function executions.
+Workflows and activities are run according to the rules you define, offering [Graph-Oriented](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/system_lifecycle.md#telemetry) telemetry insights into your legacy function executions.
 
 ## FAQ
-Refer to the [FAQ](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/faq.md) for terminology, definitions, and an exploration of how HotMesh facilitates orchestration use cases.
+Refer to the [FAQ](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/faq.md) for terminology, definitions, and an exploration of how HotMesh facilitates orchestration use cases.
 
 ## Quick Start
-Refer to the [Quick Start](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/quickstart.md) for sample flows you can easily copy, paste, and modify to get started.
+Refer to the [Quick Start](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/quickstart.md) for sample flows you can easily copy, paste, and modify to get started.
 
 ## Developer Guide
-For more details on the complete development process, including information about schemas, APIs, and deployment, consult the [Developer Guide](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/developer_guide.md).
+For more details on the complete development process, including information about schemas, APIs, and deployment, consult the [Developer Guide](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/developer_guide.md).
 
 ## Model Driven Development
-[Model Driven Development](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/model_driven_development.md) is an established strategy for managing process-oriented tasks. Check out this guide to understand its foundational principles.
+[Model Driven Development](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/model_driven_development.md) is an established strategy for managing process-oriented tasks. Check out this guide to understand its foundational principles.
 
 ## Data Mapping
-Exchanging data between activities is central to HotMesh. For detailed information on supported functions and the functional mapping syntax (@pipes), see the [Data Mapping Overview](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/data_mapping.md).
+Exchanging data between activities is central to HotMesh. For detailed information on supported functions and the functional mapping syntax (@pipes), see the [Data Mapping Overview](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/data_mapping.md).
 
 ## Composition
-While the simplest graphs are linear, detailing a consistent sequence of non-cyclical activities, graphs can be layered to represent intricate business scenarios. Some can even be designed to accommodate long-lasting workflows that span months. For more details, check out the [Composable Workflow Guide](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/composable_workflow.md).
+While the simplest graphs are linear, detailing a consistent sequence of non-cyclical activities, graphs can be layered to represent intricate business scenarios. Some can even be designed to accommodate long-lasting workflows that span months. For more details, check out the [Composable Workflow Guide](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/composable_workflow.md).
 
 ## Distributed Orchestration
-HotMesh is a distributed orchestration engine. Refer to the [Distributed Orchestration Guide](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/distributed_orchestration.md) for a detailed breakdown of the approach.
+HotMesh is a distributed orchestration engine. Refer to the [Distributed Orchestration Guide](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/distributed_orchestration.md) for a detailed breakdown of the approach.
 
 ## System Lifecycle
-Gain insight into HotMesh's monitoring, exception handling, and alarm configurations via the [System Lifecycle Guide](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/system_lifecycle.md).
+Gain insight into HotMesh's monitoring, exception handling, and alarm configurations via the [System Lifecycle Guide](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/system_lifecycle.md).
 
 ## Alpha Release
-So what exacty is an [alpha release](https://github.com/hotmeshio/sdk-typescript/blob/main/docs/alpha.md)?
+So what exacty is an [alpha release](https://github.com/hotmeshio/sdk-typescript/tree/main/docs/alpha.md)?

package/build/modules/enums.d.ts

@@ -20,3 +20,4 @@ export declare const BASE_FIDELITY_SECONDS = 15;
 export declare const TEST_FIDELITY_SECONDS = 5;
 export declare const FIDELITY_SECONDS: number;
 export declare const DURABLE_EXPIRE_SECONDS = 1;
+export declare const SCOUT_INTERVAL_SECONDS = 60;

package/build/modules/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DURABLE_EXPIRE_SECONDS = exports.FIDELITY_SECONDS = exports.TEST_FIDELITY_SECONDS = exports.BASE_FIDELITY_SECONDS = exports.EXPIRE_DURATION = exports.STATUS_MESSAGE_UNKNOWN = exports.STATUS_CODE_UNKNOWN = exports.STATUS_CODE_UNACKED = exports.XPENDING_COUNT = exports.XCLAIM_COUNT = exports.XCLAIM_DELAY_MS = exports.BLOCK_TIME_MS = exports.TEST_BLOCK_DURATION = exports.BLOCK_DURATION = exports.GRADUATED_INTERVAL_MS = exports.MAX_TIMEOUT_MS = exports.MAX_RETRIES = exports.OTT_WAIT_TIME = exports.STATUS_CODE_INTERRUPT = exports.STATUS_CODE_TIMEOUT = exports.STATUS_CODE_PENDING = exports.STATUS_CODE_SUCCESS = void 0;
+exports.SCOUT_INTERVAL_SECONDS = exports.DURABLE_EXPIRE_SECONDS = exports.FIDELITY_SECONDS = exports.TEST_FIDELITY_SECONDS = exports.BASE_FIDELITY_SECONDS = exports.EXPIRE_DURATION = exports.STATUS_MESSAGE_UNKNOWN = exports.STATUS_CODE_UNKNOWN = exports.STATUS_CODE_UNACKED = exports.XPENDING_COUNT = exports.XCLAIM_COUNT = exports.XCLAIM_DELAY_MS = exports.BLOCK_TIME_MS = exports.TEST_BLOCK_DURATION = exports.BLOCK_DURATION = exports.GRADUATED_INTERVAL_MS = exports.MAX_TIMEOUT_MS = exports.MAX_RETRIES = exports.OTT_WAIT_TIME = exports.STATUS_CODE_INTERRUPT = exports.STATUS_CODE_TIMEOUT = exports.STATUS_CODE_PENDING = exports.STATUS_CODE_SUCCESS = void 0;
 // Engine Constants
 exports.STATUS_CODE_SUCCESS = 200;
 exports.STATUS_CODE_PENDING = 202;
@@ -27,3 +27,5 @@ exports.TEST_FIDELITY_SECONDS = 5;
 exports.FIDELITY_SECONDS = process.env.NODE_ENV === 'test' ? exports.TEST_FIDELITY_SECONDS : exports.BASE_FIDELITY_SECONDS;
 // DURABLE CONSTANTS
 exports.DURABLE_EXPIRE_SECONDS = 1;
+// TASK CONSTANTS
+exports.SCOUT_INTERVAL_SECONDS = 60;

package/build/modules/errors.d.ts

@@ -68,6 +68,14 @@ declare class InactiveJobError extends Error {
     status: number;
     constructor(jobId: string, status: number, activityId: string);
 }
+declare class GenerationalError extends Error {
+    expected: string;
+    actual: string;
+    jobId: string;
+    activityId: string;
+    dimensionalAddress: string;
+    constructor(expected: string, actual: string, jobId: string, activityId: string, dimensionalAddress: string);
+}
 declare class ExecActivityError extends Error {
     constructor();
 }
@@ -78,4 +86,4 @@ declare class CollationError extends Error {
     fault: CollationFaultType;
     constructor(status: number, leg: ActivityDuplex, stage: CollationStage, fault?: CollationFaultType);
 }
-export { CollationError, DurableFatalError, DurableIncompleteSignalError, DurableMaxedError, DurableRetryError, DurableSleepError, DurableSleepForError, DurableTimeoutError, DurableWaitForSignalError, DuplicateJobError, ExecActivityError, GetStateError, InactiveJobError, MapDataError, RegisterTimeoutError, SetStateError, };
+export { CollationError, DurableFatalError, DurableIncompleteSignalError, DurableMaxedError, DurableRetryError, DurableSleepError, DurableSleepForError, DurableTimeoutError, DurableWaitForSignalError, DuplicateJobError, ExecActivityError, GenerationalError, GetStateError, InactiveJobError, MapDataError, RegisterTimeoutError, SetStateError, };

package/build/modules/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetStateError = exports.RegisterTimeoutError = exports.MapDataError = exports.InactiveJobError = exports.GetStateError = exports.ExecActivityError = exports.DuplicateJobError = exports.DurableWaitForSignalError = exports.DurableTimeoutError = exports.DurableSleepForError = exports.DurableSleepError = exports.DurableRetryError = exports.DurableMaxedError = exports.DurableIncompleteSignalError = exports.DurableFatalError = exports.CollationError = void 0;
+exports.SetStateError = exports.RegisterTimeoutError = exports.MapDataError = exports.InactiveJobError = exports.GetStateError = exports.GenerationalError = exports.ExecActivityError = exports.DuplicateJobError = exports.DurableWaitForSignalError = exports.DurableTimeoutError = exports.DurableSleepForError = exports.DurableSleepError = exports.DurableRetryError = exports.DurableMaxedError = exports.DurableIncompleteSignalError = exports.DurableFatalError = exports.CollationError = void 0;
 class GetStateError extends Error {
     constructor(jobId) {
         super(`${jobId} Not Found`);
@@ -110,6 +110,17 @@ class InactiveJobError extends Error {
     }
 }
 exports.InactiveJobError = InactiveJobError;
+class GenerationalError extends Error {
+    constructor(expected, actual, jobId, activityId, dimensionalAddress) {
+        super("Generational Error");
+        this.expected = expected;
+        this.actual = actual;
+        this.jobId = jobId;
+        this.activityId = activityId;
+        this.dimensionalAddress = dimensionalAddress;
+    }
+}
+exports.GenerationalError = GenerationalError;
 class ExecActivityError extends Error {
     constructor() {
         super("Error occurred while executing activity");

package/build/modules/key.d.ts

@@ -27,25 +27,25 @@
  */
 declare const HMNS = "hmsh";
 declare enum KeyType {
-    APP = 0,
-    ENGINE_ID = 1,
-    HOOKS = 2,
-    JOB_DEPENDENTS = 3,
-    JOB_STATE = 4,
-    JOB_STATS_GENERAL = 5,
-    JOB_STATS_MEDIAN = 6,
-    JOB_STATS_INDEX = 7,
-    HOTMESH = 8,
-    QUORUM = 9,
-    SCHEMAS = 10,
-    SIGNALS = 11,
-    STREAMS = 12,
-    SUBSCRIPTIONS = 13,
-    SUBSCRIPTION_PATTERNS = 14,
-    SYMKEYS = 15,
-    SYMVALS = 16,
-    TIME_RANGE = 17,
-    WORK_ITEMS = 18
+    APP = "APP",
+    ENGINE_ID = "ENGINE",
+    HOOKS = "HOOKS",
+    JOB_DEPENDENTS = "JOB_DEPENDENTS",
+    JOB_STATE = "JOB_STATE",
+    JOB_STATS_GENERAL = "JOB_STATS_GENERAL",
+    JOB_STATS_MEDIAN = "JOB_STATS_MEDIAN",
+    JOB_STATS_INDEX = "JOB_STATS_INDEX",
+    HOTMESH = "HOTMESH",
+    QUORUM = "QUORUM",
+    SCHEMAS = "SCHEMAS",
+    SIGNALS = "SIGNALS",
+    STREAMS = "STREAMS",
+    SUBSCRIPTIONS = "SUBSCRIPTIONS",
+    SUBSCRIPTION_PATTERNS = "SUBSCRIPTION_PATTERNS",
+    SYMKEYS = "SYMKEYS",
+    SYMVALS = "SYMVALS",
+    TIME_RANGE = "TIME_RANGE",
+    WORK_ITEMS = "WORK_ITEMS"
 }
 type KeyStoreParams = {
     appId?: string;
@@ -58,6 +58,7 @@ type KeyStoreParams = {
     facet?: string;
     topic?: string;
     timeValue?: number;
+    scoutType?: 'signal' | 'time';
 };
 declare class KeyService {
     /**

package/build/modules/key.js

@@ -34,25 +34,25 @@ exports.HMNS = HMNS;
 //these are the entity types that are stored in the key/value store
 var KeyType;
 (function (KeyType) {
-    KeyType[KeyType["APP"] = 0] = "APP";
-    KeyType[KeyType["ENGINE_ID"] = 1] = "ENGINE_ID";
-    KeyType[KeyType["HOOKS"] = 2] = "HOOKS";
-    KeyType[KeyType["JOB_DEPENDENTS"] = 3] = "JOB_DEPENDENTS";
-    KeyType[KeyType["JOB_STATE"] = 4] = "JOB_STATE";
-    KeyType[KeyType["JOB_STATS_GENERAL"] = 5] = "JOB_STATS_GENERAL";
-    KeyType[KeyType["JOB_STATS_MEDIAN"] = 6] = "JOB_STATS_MEDIAN";
-    KeyType[KeyType["JOB_STATS_INDEX"] = 7] = "JOB_STATS_INDEX";
-    KeyType[KeyType["HOTMESH"] = 8] = "HOTMESH";
-    KeyType[KeyType["QUORUM"] = 9] = "QUORUM";
-    KeyType[KeyType["SCHEMAS"] = 10] = "SCHEMAS";
-    KeyType[KeyType["SIGNALS"] = 11] = "SIGNALS";
-    KeyType[KeyType["STREAMS"] = 12] = "STREAMS";
-    KeyType[KeyType["SUBSCRIPTIONS"] = 13] = "SUBSCRIPTIONS";
-    KeyType[KeyType["SUBSCRIPTION_PATTERNS"] = 14] = "SUBSCRIPTION_PATTERNS";
-    KeyType[KeyType["SYMKEYS"] = 15] = "SYMKEYS";
-    KeyType[KeyType["SYMVALS"] = 16] = "SYMVALS";
-    KeyType[KeyType["TIME_RANGE"] = 17] = "TIME_RANGE";
-    KeyType[KeyType["WORK_ITEMS"] = 18] = "WORK_ITEMS";
+    KeyType["APP"] = "APP";
+    KeyType["ENGINE_ID"] = "ENGINE";
+    KeyType["HOOKS"] = "HOOKS";
+    KeyType["JOB_DEPENDENTS"] = "JOB_DEPENDENTS";
+    KeyType["JOB_STATE"] = "JOB_STATE";
+    KeyType["JOB_STATS_GENERAL"] = "JOB_STATS_GENERAL";
+    KeyType["JOB_STATS_MEDIAN"] = "JOB_STATS_MEDIAN";
+    KeyType["JOB_STATS_INDEX"] = "JOB_STATS_INDEX";
+    KeyType["HOTMESH"] = "HOTMESH";
+    KeyType["QUORUM"] = "QUORUM";
+    KeyType["SCHEMAS"] = "SCHEMAS";
+    KeyType["SIGNALS"] = "SIGNALS";
+    KeyType["STREAMS"] = "STREAMS";
+    KeyType["SUBSCRIPTIONS"] = "SUBSCRIPTIONS";
+    KeyType["SUBSCRIPTION_PATTERNS"] = "SUBSCRIPTION_PATTERNS";
+    KeyType["SYMKEYS"] = "SYMKEYS";
+    KeyType["SYMVALS"] = "SYMVALS";
+    KeyType["TIME_RANGE"] = "TIME_RANGE";
+    KeyType["WORK_ITEMS"] = "WORK_ITEMS";
 })(KeyType || (KeyType = {}));
 exports.KeyType = KeyType;
 class KeyService {
@@ -74,7 +74,7 @@ class KeyService {
             case KeyType.ENGINE_ID:
                 return `${namespace}:${params.appId}:e:${params.engineId}`;
             case KeyType.WORK_ITEMS:
-                return `${namespace}:${params.appId}:w:`;
+                return `${namespace}:${params.appId}:w:${params.scoutType || ''}`;
             case KeyType.TIME_RANGE:
                 return `${namespace}:${params.appId}:t:${params.timeValue || ''}`;
             case KeyType.APP:

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hotmeshio/hotmesh",
-    "version": "0.0.36",
+    "version": "0.0.38",
     "description": "Unbreakable Workflows",
     "main": "build/index.js",
     "types": "build/index.d.ts",

package/build/services/activities/activity.d.ts

@@ -26,6 +26,11 @@ declare class Activity {
     adjacentIndex: number;
     constructor(config: ActivityType, data: ActivityData, metadata: ActivityMetadata, hook: ActivityData | null, engine: EngineService, context?: JobState);
     setLeg(leg: ActivityLeg): void;
+    /**
+     * Upon entering leg 1 of a duplexed activty, verify
+     * all aspects of the entry including job and activty state
+     */
+    verifyEntry(): Promise<void>;
     processEvent(status?: StreamStatus, code?: StreamCode, type?: 'hook' | 'output'): Promise<void>;
     processPending(telemetry: TelemetryService, type: 'hook' | 'output'): Promise<MultiResponseFlags>;
     processSuccess(telemetry: TelemetryService, type: 'hook' | 'output'): Promise<MultiResponseFlags>;
@@ -50,6 +55,11 @@ declare class Activity {
     bindJobMetadataPaths(): string[];
     bindActivityMetadataPaths(): string[];
     getState(): Promise<void>;
+    /**
+     * if the job is created/deleted/created with the same key,
+     * the 'gid' ensures no stale messages enter the stream
+     */
+    assertGenerationalId(jobGID: string, msgGID?: string): void;
     initDimensionalAddress(dad: string): void;
     initSelf(context: StringAnyType): JobState;
     initPolicies(context: JobState): void;

package/build/services/activities/activity.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Activity = void 0;
+const enums_1 = require("../../modules/enums");
 const errors_1 = require("../../modules/errors");
 const utils_1 = require("../../modules/utils");
 const collator_1 = require("../collator");
@@ -9,7 +10,6 @@ const pipe_1 = require("../pipe");
 const serializer_1 = require("../serializer");
 const telemetry_1 = require("../telemetry");
 const stream_1 = require("../../types/stream");
-const enums_1 = require("../../modules/enums");
 /**
  * The base class for all activities
  */
@@ -30,6 +30,16 @@ class Activity {
     setLeg(leg) {
         this.leg = leg;
     }
+    /**
+     * Upon entering leg 1 of a duplexed activty, verify
+     * all aspects of the entry including job and activty state
+     */
+    async verifyEntry() {
+        this.setLeg(1);
+        await this.getState();
+        collator_1.CollatorService.assertJobActive(this.context.metadata.js, this.context.metadata.jid, this.metadata.aid);
+        await collator_1.CollatorService.notarizeEntry(this);
+    }
     //********  DUPLEX RE-ENTRY POINT  ********//
     async processEvent(status = stream_1.StreamStatus.SUCCESS, code = 200, type = 'output') {
         this.setLeg(2);
@@ -77,6 +87,10 @@ class Activity {
                 this.logger.info('process-event-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.info('process-event-get-job-error', { error });
                 return;
@@ -266,7 +280,7 @@ class Activity {
         return serializer_1.MDATA_SYMBOLS[keys_to_save].KEYS.map((key) => `output/metadata/${key}`);
     }
     async getState() {
-        //assemble list of paths necessary to create 'job state' from the 'symbol hash'
+        const gid = this.context.metadata.gid;
         const jobSymbolHashName = `$${this.config.subscribes}`;
         const consumes = {
             [jobSymbolHashName]: serializer_1.MDATA_SYMBOLS.JOB.KEYS.map((key) => `metadata/${key}`)
@@ -295,10 +309,20 @@ class Activity {
         //`state` is a flat hash; context is a tree
         const [state, status] = await this.store.getState(jid, consumes, dIds);
         this.context = (0, utils_1.restoreHierarchy)(state);
+        this.assertGenerationalId(this.context.metadata.gid, gid);
         this.initDimensionalAddress(dad);
         this.initSelf(this.context);
         this.initPolicies(this.context);
     }
+    /**
+     * if the job is created/deleted/created with the same key,
+     * the 'gid' ensures no stale messages enter the stream
+     */
+    assertGenerationalId(jobGID, msgGID) {
+        if (msgGID !== jobGID) {
+            throw new errors_1.GenerationalError(jobGID, msgGID, this.context.metadata.jid, this.context.metadata.aid, this.context.metadata.dad);
+        }
+    }
     initDimensionalAddress(dad) {
         this.metadata.dad = dad;
     }
@@ -355,6 +379,7 @@ class Activity {
                         metadata: {
                             guid: (0, utils_1.guid)(),
                             jid: this.context.metadata.jid,
+                            gid: this.context.metadata.gid,
                             dad: adjacentDad,
                             aid: toActivityId,
                             spn: this.context['$self'].output.metadata?.l2s,
@@ -383,7 +408,7 @@ class Activity {
         if (adjacencyList.length && jobStatus > 0) {
             const multi = this.store.getMulti();
             for (const execSignal of adjacencyList) {
-                await this.engine.streamSignaler?.publishMessage(null, execSignal, multi);
+                await this.engine.router?.publishMessage(null, execSignal, multi);
             }
             mIds = (await multi.exec());
         }

package/build/services/activities/await.js

@@ -4,8 +4,8 @@ exports.Await = void 0;
 const errors_1 = require("../../modules/errors");
 const activity_1 = require("./activity");
 const collator_1 = require("../collator");
-const stream_1 = require("../../types/stream");
 const telemetry_1 = require("../telemetry");
+const stream_1 = require("../../types/stream");
 const pipe_1 = require("../pipe");
 const utils_1 = require("../../modules/utils");
 class Await extends activity_1.Activity {
@@ -14,14 +14,10 @@ class Await extends activity_1.Activity {
     }
     //********  INITIAL ENTRY POINT (A)  ********//
     async process() {
-        this.logger.debug('await-process', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+        this.logger.debug('await-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();
@@ -47,6 +43,10 @@ class Await 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('await-get-state-error', { error });
                 return;
@@ -59,7 +59,7 @@ class Await extends activity_1.Activity {
         }
         finally {
             telemetry?.endActivitySpan();
-            this.logger.debug('await-process-end', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+            this.logger.debug('await-process-end', { jid: this.context.metadata.jid, gid: this.context.metadata.gid, aid: this.metadata.aid });
         }
     }
     async execActivity(multi) {
@@ -68,6 +68,7 @@ class Await 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,
@@ -82,7 +83,7 @@ class Await extends activity_1.Activity {
                 retry: this.config.retry
             };
         }
-        return (await this.engine.streamSignaler?.publishMessage(null, streamData, multi));
+        return (await this.engine.router?.publishMessage(null, streamData, multi));
     }
 }
 exports.Await = Await;

package/build/services/activities/cycle.js

@@ -12,14 +12,10 @@ class Cycle extends activity_1.Activity {
     }
     //********  LEG 1 ENTRY  ********//
     async process() {
-        this.logger.debug('cycle-process', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+        this.logger.debug('cycle-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);
             this.mapInputData();
@@ -47,6 +43,10 @@ class Cycle extends activity_1.Activity {
                 this.logger.error('cycle-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('cycle-get-state-error', { error });
                 return;
@@ -59,7 +59,7 @@ class Cycle extends activity_1.Activity {
         }
         finally {
             telemetry?.endActivitySpan();
-            this.logger.debug('cycle-process-end', { jid: this.context.metadata.jid, aid: this.metadata.aid });
+            this.logger.debug('cycle-process-end', { jid: this.context.metadata.jid, gid: this.context.metadata.gid, aid: this.metadata.aid });
         }
     }
     /**
@@ -78,15 +78,16 @@ class Cycle extends activity_1.Activity {
         const streamData = {
             metadata: {
                 guid: (0, utils_1.guid)(),
-                dad: collator_1.CollatorService.resolveReentryDimension(this),
                 jid: this.context.metadata.jid,
+                gid: this.context.metadata.gid,
+                dad: collator_1.CollatorService.resolveReentryDimension(this),
                 aid: this.config.ancestor,
                 spn: this.context['$self'].output.metadata?.l1s,
                 trc: this.context.metadata.trc,
             },
             data: this.context.data
         };
-        return (await this.engine.streamSignaler?.publishMessage(null, streamData, multi));
+        return (await this.engine.router?.publishMessage(null, streamData, multi));
     }
 }
 exports.Cycle = Cycle;

package/build/services/activities/hook.d.ts

@@ -1,18 +1,24 @@
 import { Activity } from './activity';
 import { EngineService } from '../engine';
+import { TelemetryService } from '../telemetry';
 import { ActivityData, ActivityMetadata, ActivityType, HookActivity } from '../../types/activity';
 import { HookRule } from '../../types/hook';
 import { JobState, JobStatus } from '../../types/job';
 import { RedisMulti } from '../../types/redis';
 import { StreamCode, StreamStatus } from '../../types/stream';
 /**
- * Listens for `webhook`, `timehook`, and `cycle` (repeat) signals
+ * Supports `signal hook`, `time hook`, and `cycle hook` patterns
  */
 declare class Hook extends Activity {
     config: HookActivity;
     constructor(config: ActivityType, data: ActivityData, metadata: ActivityMetadata, hook: ActivityData | null, engine: EngineService, context?: JobState);
     process(): Promise<string>;
+    /**
+     * does this activity use a time-hook or web-hook
+     */
     doesHook(): boolean;
+    doHook(telemetry: TelemetryService): Promise<void>;
+    doPassThrough(telemetry: TelemetryService): Promise<void>;
     getHookRule(topic: string): Promise<HookRule | undefined>;
     registerHook(multi?: RedisMulti): Promise<string | void>;
     processWebHookEvent(status?: StreamStatus, code?: StreamCode): Promise<JobStatus | void>;