@hotmeshio/hotmesh 0.0.13 → 0.0.15

package/build/package.json

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

package/build/services/activities/activity.js

@@ -136,10 +136,10 @@ class Activity {
         try {
             this.setLeg(2);
             await this.getState(jobId);
-            const aState = await collator_1.CollatorService.notarizeReentry(this);
-            this.adjacentIndex = collator_1.CollatorService.getDimensionalIndex(aState);
             telemetry = new telemetry_1.TelemetryService(this.engine.appId, this.config, this.metadata, this.context);
             telemetry.startActivitySpan(this.leg);
+            const aState = await collator_1.CollatorService.notarizeReentry(this);
+            this.adjacentIndex = collator_1.CollatorService.getDimensionalIndex(aState);
             this.bindActivityData('hook');
             this.mapJobData();
             this.adjacencyList = await this.filterAdjacent();
@@ -159,6 +159,11 @@ class Activity {
             return jobStatus;
         }
         catch (error) {
+            if (error instanceof errors_1.CollationError) {
+                //caused by external over-signaling; the job is complete
+                this.logger.info('process-hook-event-inactive-error', { error });
+                return;
+            }
             this.logger.error('engine-process-hook-event-error', { error });
             telemetry.setActivityError(error.message);
             throw error;

package/build/services/durable/client.d.ts

@@ -1,6 +1,6 @@
 import { WorkflowHandleService } from './handle';
 import { HotMeshService as HotMesh } from '../hotmesh';
-import { ClientConfig, Connection, SignalOptions, WorkflowOptions } from '../../types/durable';
+import { ClientConfig, Connection, WorkflowOptions } from '../../types/durable';
 export declare class ClientService {
     connection: Connection;
     options: WorkflowOptions;
@@ -9,7 +9,7 @@ export declare class ClientService {
     getHotMeshClient: (worflowTopic: string) => Promise<HotMesh>;
     workflow: {
         start: (options: WorkflowOptions) => Promise<WorkflowHandleService>;
-        signal: (options: SignalOptions) => Promise<void>;
+        signal: (signalId: string, data: Record<any, any>) => Promise<string>;
     };
     activateWorkflow(hotMesh: HotMesh, appId?: string, version?: string): Promise<void>;
     static shutdown(): Promise<void>;

package/build/services/durable/client.js

@@ -95,17 +95,8 @@ class ClientService {
                 const jobId = await hotMeshClient.pub(factory_1.SUBSCRIBES_TOPIC, payload, context);
                 return new handle_1.WorkflowHandleService(hotMeshClient, workflowTopic, jobId);
             },
-            //signal in to activate a paused (waitForSignal) workflow
-            signal: async (options) => {
-                const taskQueueName = options.taskQueue;
-                const workflowName = options.workflowName;
-                const workflowTopic = `${taskQueueName}-${workflowName}`;
-                const hotMeshClient = await this.getHotMeshClient(workflowTopic);
-                const payload = {
-                    id: options.workflowId,
-                    data: { ...options.data },
-                };
-                await hotMeshClient.hook(factory_1.HOOK_ID, payload);
+            signal: async (signalId, data) => {
+                return await (await this.getHotMeshClient('durable.wfs.signal')).hook('durable.wfs.signal', { id: signalId, data });
             }
         };
         this.connection = config.connection;

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

@@ -58,7 +58,7 @@ declare class EngineService {
     hasParentJob(context: JobState): boolean;
     resolveError(metadata: JobMetadata): StreamError | undefined;
     scrub(jobId: string): Promise<void>;
-    hook(topic: string, data: JobData, dad?: string): Promise<JobStatus | void>;
+    hook(topic: string, data: JobData, dad?: string): Promise<string>;
     hookTime(jobId: string, activityId: string): Promise<JobStatus | void>;
     hookAll(hookTopic: string, data: JobData, keyResolver: JobStatsInput, queryFacets?: string[]): Promise<string[]>;
     pub(topic: string, data: JobData, context?: JobState): Promise<string>;

package/build/services/engine/index.js

@@ -341,7 +341,7 @@ class EngineService {
             },
             data,
         };
-        await this.streamSignaler.publishMessage(null, streamData);
+        return await this.streamSignaler.publishMessage(null, streamData);
     }
     async hookTime(jobId, activityId) {
         //the activityid is concatenated with its dimensional address (dad); split to resolve

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

@@ -38,7 +38,7 @@ declare class HotMeshService {
     getIds(topic: string, query: JobStatsInput, queryFacets?: any[]): Promise<IdsResponse>;
     resolveQuery(topic: string, query: JobStatsInput): Promise<GetStatsOptions>;
     scrub(jobId: string): Promise<void>;
-    hook(topic: string, data: JobData, dad?: string): Promise<JobStatus | void>;
+    hook(topic: string, data: JobData, dad?: string): Promise<string>;
     hookAll(hookTopic: string, data: JobData, query: JobStatsInput, queryFacets?: string[]): Promise<string[]>;
     stop(): Promise<void>;
     compress(terms: string[]): Promise<boolean>;

package/build/types/durable.d.ts

@@ -72,4 +72,4 @@ type ActivityConfig = {
         maximumInterval: string;
     };
 };
-export { ActivityConfig, ActivityWorkflowDataType, ClientConfig, ContextType, ConnectionConfig, Connection, NativeConnection, ProxyType, Registry, SignalOptions, WorkerConfig, WorkerOptions, WorkflowDataType, WorkflowOptions, };
+export { ActivityConfig, ActivityWorkflowDataType, ClientConfig, ContextType, ConnectionConfig, Connection, NativeConnection, ProxyType, Registry, SignalOptions, WorkerConfig, WorkflowConfig, WorkerOptions, WorkflowDataType, WorkflowOptions, };

package/build/types/index.d.ts

@@ -3,7 +3,7 @@ export { App, AppVID, AppTransitions, AppSubscriptions } from './app';
 export { AsyncSignal } from './async';
 export { CacheMode } from './cache';
 export { CollationFaultType, CollationStage } from './collator';
-export { ActivityConfig, ActivityWorkflowDataType, ClientConfig, ContextType, ConnectionConfig, Connection, NativeConnection, ProxyType, Registry, WorkerConfig, WorkerOptions, WorkflowDataType, WorkflowOptions, } from './durable';
+export { ActivityConfig, ActivityWorkflowDataType, ClientConfig, ContextType, ConnectionConfig, Connection, NativeConnection, ProxyType, Registry, WorkflowConfig, WorkerConfig, WorkerOptions, WorkflowDataType, WorkflowOptions, } from './durable';
 export { HookCondition, HookConditions, HookGate, HookInterface, HookRule, HookRules, HookSignal } from './hook';
 export { RedisClientType as IORedisClientType, RedisMultiType as IORedisMultiType } from './ioredisclient';
 export { ILogger } from './logger';

package/package.json

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

package/services/activities/activity.ts

@@ -1,4 +1,4 @@
-import { GetStateError } from '../../modules/errors';
+import { CollationError, GetStateError } from '../../modules/errors';
 import {
   formatISODate,
   getValueByPath,
@@ -183,11 +183,11 @@ class Activity {
     try {
       this.setLeg(2);
       await this.getState(jobId);
+      telemetry = new TelemetryService(this.engine.appId, this.config, this.metadata, this.context);
+      telemetry.startActivitySpan(this.leg);
       const aState = await CollatorService.notarizeReentry(this);
       this.adjacentIndex = CollatorService.getDimensionalIndex(aState);
 
-      telemetry = new TelemetryService(this.engine.appId, this.config, this.metadata, this.context);
-      telemetry.startActivitySpan(this.leg);
       this.bindActivityData('hook');
       this.mapJobData();
       this.adjacencyList = await this.filterAdjacent();
@@ -209,6 +209,11 @@ class Activity {
       telemetry.setActivityAttributes(attrs);
       return jobStatus as number;
     } catch (error) {
+      if (error instanceof CollationError) {
+        //caused by external over-signaling; the job is complete
+        this.logger.info('process-hook-event-inactive-error', { error });
+        return;
+      }
       this.logger.error('engine-process-hook-event-error', { error });
       telemetry.setActivityError(error.message);
       throw error;

package/services/durable/client.ts

@@ -1,11 +1,10 @@
 import { nanoid } from 'nanoid';
-import { APP_ID, APP_VERSION, DEFAULT_COEFFICIENT, HOOK_ID, SUBSCRIBES_TOPIC, getWorkflowYAML } from './factory';
+import { APP_ID, APP_VERSION, DEFAULT_COEFFICIENT, SUBSCRIBES_TOPIC, getWorkflowYAML } from './factory';
 import { WorkflowHandleService } from './handle';
 import { HotMeshService as HotMesh } from '../hotmesh';
 import {
   ClientConfig,
   Connection,
-  SignalOptions,
   WorkflowOptions } from '../../types/durable';
 import { JobState } from '../../types/job';
 import { KeyType } from '../../modules/key';
@@ -114,22 +113,10 @@ export class ClientService {
       return new WorkflowHandleService(hotMeshClient, workflowTopic, jobId);
     },
 
-    //signal in to activate a paused (waitForSignal) workflow
-    signal: async (options: SignalOptions): Promise<void> => {
-      const taskQueueName = options.taskQueue;
-      const workflowName = options.workflowName;
-      const workflowTopic = `${taskQueueName}-${workflowName}`;
-      const hotMeshClient = await this.getHotMeshClient(workflowTopic);
-      const payload = {
-        id: options.workflowId,
-        data: { ...options.data },
-      }
-      await hotMeshClient.hook(
-        HOOK_ID,
-        payload
-      );
+    signal: async (signalId: string, data: Record<any, any>): Promise<string> => {
+      return await (await this.getHotMeshClient('durable.wfs.signal')).hook('durable.wfs.signal', { id: signalId, data });
     }
-  };
+  }
 
   async activateWorkflow(hotMesh: HotMesh, appId = APP_ID, version = APP_VERSION): Promise<void> {
     const app = await hotMesh.engine.store.getApp(appId);

package/services/engine/index.ts

@@ -413,7 +413,7 @@ class EngineService {
   }
 
   // ****************** `HOOK` ACTIVITY RE-ENTRY POINT *****************
-  async hook(topic: string, data: JobData, dad?: string): Promise<JobStatus | void> {
+  async hook(topic: string, data: JobData, dad?: string): Promise<string> {
     const hookRule = await this.storeSignaler.getHookRule(topic);
     const [aid, schema] = await this.getSchema(`.${hookRule.to}`);
     if (!dad) {
@@ -432,7 +432,7 @@ class EngineService {
       },
       data,
     };
-    await this.streamSignaler.publishMessage(null, streamData);
+    return await this.streamSignaler.publishMessage(null, streamData) as string;
   }
   async hookTime(jobId: string, activityId: string): Promise<JobStatus | void> {
     //the activityid is concatenated with its dimensional address (dad); split to resolve

package/services/hotmesh/index.ts

@@ -165,7 +165,7 @@ class HotMeshService {
   }
 
   // ****** `HOOK` ACTIVITY RE-ENTRY POINT ******
-  async hook(topic: string, data: JobData, dad?: string): Promise<JobStatus | void> {
+  async hook(topic: string, data: JobData, dad?: string): Promise<string> {
     return await this.engine?.hook(topic, data, dad);
   }
   async hookAll(hookTopic: string, data: JobData, query: JobStatsInput, queryFacets: string[] = []): Promise<string[]> {

package/types/durable.ts

@@ -98,6 +98,7 @@ export {
   Registry,
   SignalOptions,
   WorkerConfig,
+  WorkflowConfig,
   WorkerOptions,
   WorkflowDataType,
   WorkflowOptions,

package/types/index.ts

@@ -36,6 +36,7 @@ export {
     NativeConnection,
     ProxyType,
     Registry,
+    WorkflowConfig,
     WorkerConfig,
     WorkerOptions,
     WorkflowDataType,