@hotmeshio/hotmesh 0.0.5 → 0.0.7

package/build/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hotmeshio/hotmesh",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "description": "Durable Workflows",
     "main": "build/cjs/index.js",
     "module": "build/esm/index.js",

package/build/cjs/services/activities/activity.js

@@ -320,10 +320,9 @@ class Activity {
         telemetry_1.TelemetryService.addTargetTelemetryPaths(consumes, this.config, this.metadata, this.leg);
         let { dad, jid } = this.context.metadata;
         jobId = jobId || jid;
-        //`state` is a flat hash
         const dIds = collator_1.CollatorService.getDimensionsById([...this.config.ancestors, this.metadata.aid], dad);
+        //`state` is a flat hash; context is a tree
         const [state, status] = await this.store.getState(jobId, consumes, dIds);
-        //`context` is a tree
         this.context = (0, utils_1.restoreHierarchy)(state);
         this.initDimensionalAddress(dad);
         this.initSelf(this.context);

package/build/cjs/services/activities/worker.d.ts

@@ -2,6 +2,7 @@ import { Activity } from './activity';
 import { EngineService } from '../engine';
 import { ActivityData, ActivityMetadata, ActivityType, WorkerActivity } from '../../types/activity';
 import { JobState } from '../../types/job';
+import { MultiResponseFlags } from '../../types/redis';
 import { StreamCode, StreamStatus } from '../../types/stream';
 import { TelemetryService } from '../telemetry';
 declare class Worker extends Activity {
@@ -13,5 +14,6 @@ declare class Worker extends Activity {
     processPending(telemetry: TelemetryService): Promise<void>;
     processSuccess(telemetry: TelemetryService): Promise<void>;
     processError(telemetry: TelemetryService): Promise<void>;
+    transitionAdjacent(multiResponse: MultiResponseFlags, telemetry: TelemetryService): Promise<void>;
 }
 export { Worker };

package/build/cjs/services/activities/worker.js

@@ -120,11 +120,9 @@ class Worker extends activity_1.Activity {
         const multi = this.store.getMulti();
         await this.setState(multi);
         await collator_1.CollatorService.notarizeContinuation(this, multi);
-        await this.setStatus(0, multi);
+        await this.setStatus(this.adjacencyList.length, multi);
         const multiResponse = await multi.exec();
-        telemetry.mapActivityAttributes();
-        const jobStatus = this.resolveStatus(multiResponse);
-        telemetry.setActivityAttributes({ 'app.job.jss': jobStatus });
+        this.transitionAdjacent(multiResponse, telemetry);
     }
     async processSuccess(telemetry) {
         this.bindActivityData('output');
@@ -135,14 +133,7 @@ class Worker extends activity_1.Activity {
         await collator_1.CollatorService.notarizeCompletion(this, multi);
         await this.setStatus(this.adjacencyList.length - 1, multi);
         const 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);
+        this.transitionAdjacent(multiResponse, telemetry);
     }
     async processError(telemetry) {
         this.bindActivityError(this.data);
@@ -152,6 +143,9 @@ class Worker extends activity_1.Activity {
         await collator_1.CollatorService.notarizeCompletion(this, multi);
         await this.setStatus(this.adjacencyList.length - 1, multi);
         const multiResponse = await multi.exec();
+        this.transitionAdjacent(multiResponse, telemetry);
+    }
+    async transitionAdjacent(multiResponse, telemetry) {
         telemetry.mapActivityAttributes();
         const jobStatus = this.resolveStatus(multiResponse);
         const attrs = { 'app.job.jss': jobStatus };

package/build/cjs/services/durable/worker.d.ts

@@ -20,6 +20,7 @@ export declare class WorkerService {
      */
     static registerActivities<ACT>(activities: ACT): Registry;
     static create(config: WorkerConfig): Promise<WorkerService>;
+    static resolveWorkflowTarget(workflow: object | Function): [string, Function];
     run(): Promise<void>;
     initActivityWorkflow(config: WorkerConfig, activityTopic: string): Promise<HotMesh>;
     wrapActivityFunctions(): Function;

package/build/cjs/services/durable/worker.js

@@ -99,20 +99,22 @@ class WorkerService {
      * allowing proxyActivities to succeed.
      */
     static registerActivities(activities) {
-        Object.keys(activities).forEach(key => {
-            WorkerService.activityRegistry[key] = activities[key];
-        });
+        if (typeof activities === 'function') {
+            WorkerService.activityRegistry[activities.name] = activities;
+        }
+        else {
+            Object.keys(activities).forEach(key => {
+                WorkerService.activityRegistry[activities[key].name] = activities[key];
+            });
+        }
         return WorkerService.activityRegistry;
     }
     static async create(config) {
+        //always call `registerActivities` before `import`
         WorkerService.connection = config.connection;
-        //pre-cache user activity functions
         WorkerService.registerActivities(config.activities);
-        //import the user's workflow file (triggers activity functions to be wrapped)
         const workflow = await Promise.resolve(`${config.workflowsPath}`).then(s => __importStar(require(s)));
-        const workflowFunctionNames = Object.keys(workflow);
-        const workflowFunctionName = workflowFunctionNames[workflowFunctionNames.length - 1];
-        const workflowFunction = workflow[workflowFunctionName];
+        const [workflowFunctionName, workflowFunction] = WorkerService.resolveWorkflowTarget(workflow);
         const baseTopic = `${config.taskQueue}-${workflowFunctionName}`;
         const activityTopic = `${baseTopic}-activity`;
         const workflowTopic = `${baseTopic}`;
@@ -124,6 +126,18 @@ class WorkerService {
         await WorkerService.activateWorkflow(worker.workflowRunner, workflowTopic, factory_1.getWorkflowYAML);
         return worker;
     }
+    static resolveWorkflowTarget(workflow) {
+        let workflowFunction;
+        if (typeof workflow === 'function') {
+            workflowFunction = workflow;
+        }
+        else {
+            const workflowFunctionNames = Object.keys(workflow);
+            workflowFunction = workflow[workflowFunctionNames[workflowFunctionNames.length - 1]];
+            return WorkerService.resolveWorkflowTarget(workflowFunction);
+        }
+        return [workflowFunction.name, workflowFunction];
+    }
     async run() {
         if (this.workflowRunner) {
             this.workflowRunner.engine.logger.info('WorkerService is running');

package/build/esm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hotmeshio/hotmesh",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "description": "Durable Workflows",
     "main": "build/cjs/index.js",
     "module": "build/esm/index.js",

package/build/esm/services/activities/activity.js

@@ -317,10 +317,9 @@ class Activity {
         TelemetryService.addTargetTelemetryPaths(consumes, this.config, this.metadata, this.leg);
         let { dad, jid } = this.context.metadata;
         jobId = jobId || jid;
-        //`state` is a flat hash
         const dIds = CollatorService.getDimensionsById([...this.config.ancestors, this.metadata.aid], dad);
+        //`state` is a flat hash; context is a tree
         const [state, status] = await this.store.getState(jobId, consumes, dIds);
-        //`context` is a tree
         this.context = restoreHierarchy(state);
         this.initDimensionalAddress(dad);
         this.initSelf(this.context);

package/build/esm/services/activities/worker.d.ts

@@ -2,6 +2,7 @@ import { Activity } from './activity';
 import { EngineService } from '../engine';
 import { ActivityData, ActivityMetadata, ActivityType, WorkerActivity } from '../../types/activity';
 import { JobState } from '../../types/job';
+import { MultiResponseFlags } from '../../types/redis';
 import { StreamCode, StreamStatus } from '../../types/stream';
 import { TelemetryService } from '../telemetry';
 declare class Worker extends Activity {
@@ -13,5 +14,6 @@ declare class Worker extends Activity {
     processPending(telemetry: TelemetryService): Promise<void>;
     processSuccess(telemetry: TelemetryService): Promise<void>;
     processError(telemetry: TelemetryService): Promise<void>;
+    transitionAdjacent(multiResponse: MultiResponseFlags, telemetry: TelemetryService): Promise<void>;
 }
 export { Worker };

package/build/esm/services/activities/worker.js

@@ -117,11 +117,9 @@ class Worker extends Activity {
         const multi = this.store.getMulti();
         await this.setState(multi);
         await CollatorService.notarizeContinuation(this, multi);
-        await this.setStatus(0, multi);
+        await this.setStatus(this.adjacencyList.length, multi);
         const multiResponse = await multi.exec();
-        telemetry.mapActivityAttributes();
-        const jobStatus = this.resolveStatus(multiResponse);
-        telemetry.setActivityAttributes({ 'app.job.jss': jobStatus });
+        this.transitionAdjacent(multiResponse, telemetry);
     }
     async processSuccess(telemetry) {
         this.bindActivityData('output');
@@ -132,14 +130,7 @@ class Worker extends Activity {
         await CollatorService.notarizeCompletion(this, multi);
         await this.setStatus(this.adjacencyList.length - 1, multi);
         const 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);
+        this.transitionAdjacent(multiResponse, telemetry);
     }
     async processError(telemetry) {
         this.bindActivityError(this.data);
@@ -149,6 +140,9 @@ class Worker extends Activity {
         await CollatorService.notarizeCompletion(this, multi);
         await this.setStatus(this.adjacencyList.length - 1, multi);
         const multiResponse = await multi.exec();
+        this.transitionAdjacent(multiResponse, telemetry);
+    }
+    async transitionAdjacent(multiResponse, telemetry) {
         telemetry.mapActivityAttributes();
         const jobStatus = this.resolveStatus(multiResponse);
         const attrs = { 'app.job.jss': jobStatus };

package/build/esm/services/durable/worker.d.ts

@@ -20,6 +20,7 @@ export declare class WorkerService {
      */
     static registerActivities<ACT>(activities: ACT): Registry;
     static create(config: WorkerConfig): Promise<WorkerService>;
+    static resolveWorkflowTarget(workflow: object | Function): [string, Function];
     run(): Promise<void>;
     initActivityWorkflow(config: WorkerConfig, activityTopic: string): Promise<HotMesh>;
     wrapActivityFunctions(): Function;

package/build/esm/services/durable/worker.js

@@ -73,20 +73,22 @@ class WorkerService {
      * allowing proxyActivities to succeed.
      */
     static registerActivities(activities) {
-        Object.keys(activities).forEach(key => {
-            WorkerService.activityRegistry[key] = activities[key];
-        });
+        if (typeof activities === 'function') {
+            WorkerService.activityRegistry[activities.name] = activities;
+        }
+        else {
+            Object.keys(activities).forEach(key => {
+                WorkerService.activityRegistry[activities[key].name] = activities[key];
+            });
+        }
         return WorkerService.activityRegistry;
     }
     static async create(config) {
+        //always call `registerActivities` before `import`
         WorkerService.connection = config.connection;
-        //pre-cache user activity functions
         WorkerService.registerActivities(config.activities);
-        //import the user's workflow file (triggers activity functions to be wrapped)
         const workflow = await import(config.workflowsPath);
-        const workflowFunctionNames = Object.keys(workflow);
-        const workflowFunctionName = workflowFunctionNames[workflowFunctionNames.length - 1];
-        const workflowFunction = workflow[workflowFunctionName];
+        const [workflowFunctionName, workflowFunction] = WorkerService.resolveWorkflowTarget(workflow);
         const baseTopic = `${config.taskQueue}-${workflowFunctionName}`;
         const activityTopic = `${baseTopic}-activity`;
         const workflowTopic = `${baseTopic}`;
@@ -98,6 +100,18 @@ class WorkerService {
         await WorkerService.activateWorkflow(worker.workflowRunner, workflowTopic, getWorkflowYAML);
         return worker;
     }
+    static resolveWorkflowTarget(workflow) {
+        let workflowFunction;
+        if (typeof workflow === 'function') {
+            workflowFunction = workflow;
+        }
+        else {
+            const workflowFunctionNames = Object.keys(workflow);
+            workflowFunction = workflow[workflowFunctionNames[workflowFunctionNames.length - 1]];
+            return WorkerService.resolveWorkflowTarget(workflowFunction);
+        }
+        return [workflowFunction.name, workflowFunction];
+    }
     async run() {
         if (this.workflowRunner) {
             this.workflowRunner.engine.logger.info('WorkerService is running');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotmeshio/hotmesh",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Durable Workflows",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",

package/services/activities/activity.ts

@@ -391,10 +391,9 @@ class Activity {
     TelemetryService.addTargetTelemetryPaths(consumes, this.config, this.metadata, this.leg);
     let { dad, jid } = this.context.metadata;
     jobId = jobId || jid;
-    //`state` is a flat hash
     const dIds = CollatorService.getDimensionsById([...this.config.ancestors, this.metadata.aid], dad);
+    //`state` is a flat hash; context is a tree
     const [state, status] = await this.store.getState(jobId, consumes, dIds);
-    //`context` is a tree
     this.context = restoreHierarchy(state) as JobState;
     this.initDimensionalAddress(dad);
     this.initSelf(this.context);

package/services/activities/worker.ts

@@ -110,6 +110,7 @@ class Worker extends Activity {
 
       telemetry = new TelemetryService(this.engine.appId, this.config, this.metadata, this.context);
       let isComplete = CollatorService.isActivityComplete(this.context.metadata.js);
+
       if (isComplete) {
         this.logger.warn('worker-process-event-duplicate', { jid, aid });
         this.logger.debug('worker-process-event-duplicate-resolution', { resolution: 'Increase HotMesh config `reclaimDelay` timeout.' });
@@ -141,11 +142,9 @@ class Worker extends Activity {
     await this.setState(multi);
     await CollatorService.notarizeContinuation(this, multi);
 
-    await this.setStatus(0, multi);
+    await this.setStatus(this.adjacencyList.length, multi);
     const multiResponse = await multi.exec() as MultiResponseFlags;
-    telemetry.mapActivityAttributes();
-    const jobStatus = this.resolveStatus(multiResponse);
-    telemetry.setActivityAttributes({ 'app.job.jss': jobStatus });
+    this.transitionAdjacent(multiResponse, telemetry);
   }
 
   async processSuccess(telemetry: TelemetryService): Promise<void> {
@@ -158,14 +157,7 @@ class Worker extends Activity {
 
     await this.setStatus(this.adjacencyList.length - 1, multi);
     const multiResponse = await multi.exec() as MultiResponseFlags;
-    telemetry.mapActivityAttributes();
-    const jobStatus = this.resolveStatus(multiResponse);
-    const attrs: StringScalarType = { 'app.job.jss': jobStatus };
-    const messageIds = await this.transition(this.adjacencyList, jobStatus);
-    if (messageIds.length) {
-      attrs['app.activity.mids'] = messageIds.join(',')
-    }
-    telemetry.setActivityAttributes(attrs);
+    this.transitionAdjacent(multiResponse, telemetry);
   }
 
   async processError(telemetry: TelemetryService): Promise<void> {
@@ -177,6 +169,10 @@ class Worker extends Activity {
 
     await this.setStatus(this.adjacencyList.length - 1, multi);
     const multiResponse = await multi.exec() as MultiResponseFlags;
+    this.transitionAdjacent(multiResponse, telemetry);
+  }
+
+  async transitionAdjacent(multiResponse: MultiResponseFlags, telemetry: TelemetryService): Promise<void> {
     telemetry.mapActivityAttributes();
     const jobStatus = this.resolveStatus(multiResponse);
     const attrs: StringScalarType = { 'app.job.jss': jobStatus };

package/services/durable/worker.ts

@@ -92,28 +92,28 @@ export class WorkerService {
    * allowing proxyActivities to succeed.
    */
   static registerActivities<ACT>(activities: ACT): Registry  {
-    Object.keys(activities).forEach(key => {
-      WorkerService.activityRegistry[key] = (activities as any)[key];
-    });
+    if (typeof activities === 'function') {
+      WorkerService.activityRegistry[activities.name] = activities as Function;
+    } else {
+      Object.keys(activities).forEach(key => {
+        WorkerService.activityRegistry[activities[key].name] = (activities as any)[key] as Function;
+      });
+    }
     return WorkerService.activityRegistry;
   }
 
   static async create(config: WorkerConfig) {
+    //always call `registerActivities` before `import`
     WorkerService.connection = config.connection;
-    //pre-cache user activity functions
     WorkerService.registerActivities<typeof config.activities>(config.activities);
-    //import the user's workflow file (triggers activity functions to be wrapped)
     const workflow = await import(config.workflowsPath);
-    const workflowFunctionNames = Object.keys(workflow);
-    const workflowFunctionName = workflowFunctionNames[workflowFunctionNames.length - 1];
-    const workflowFunction = workflow[workflowFunctionName];
+    const [workflowFunctionName, workflowFunction] = WorkerService.resolveWorkflowTarget(workflow);
     const baseTopic = `${config.taskQueue}-${workflowFunctionName}`;
     const activityTopic = `${baseTopic}-activity`;
     const workflowTopic = `${baseTopic}`;
 
     //initialize supporting workflows
     const worker = new WorkerService();
-
     const activityRunner = await worker.initActivityWorkflow(config, activityTopic);
     await WorkerService.activateWorkflow(activityRunner, activityTopic, getActivityYAML);
     worker.workflowRunner = await worker.initWorkerWorkflow(config, workflowTopic, workflowFunction);
@@ -121,6 +121,18 @@ export class WorkerService {
     return worker;
   }
 
+  static resolveWorkflowTarget(workflow: object | Function): [string, Function] {
+    let workflowFunction: Function;
+    if (typeof workflow === 'function') {
+      workflowFunction = workflow;
+    } else {
+      const workflowFunctionNames = Object.keys(workflow);
+      workflowFunction = workflow[workflowFunctionNames[workflowFunctionNames.length - 1]];
+      return WorkerService.resolveWorkflowTarget(workflowFunction);
+    }
+    return [workflowFunction.name, workflowFunction];
+  }
+
   async run() {
     if (this.workflowRunner) {
       this.workflowRunner.engine.logger.info('WorkerService is running');