@hotmeshio/hotmesh 0.0.16 → 0.0.17

package/build/package.json

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

package/build/services/activities/activity.js

@@ -496,7 +496,12 @@ class Activity {
     }
     async transition(adjacencyList, jobStatus) {
         let mIds = [];
-        if (jobStatus <= 0 || this.config.emit) {
+        //emit can be a mapping (allows emissions to be driven by the job state)
+        let emit = false;
+        if (this.config.emit) {
+            emit = pipe_1.Pipe.resolve(this.config.emit, this.context);
+        }
+        if (jobStatus <= 0 || emit) {
             //activity should not send 'emit' if the job is truly over
             const isTrueEmit = jobStatus > 0;
             await this.engine.runJobCompletionTasks(this.context, isTrueEmit);

package/build/services/activities/trigger.js

@@ -151,7 +151,7 @@ class Trigger extends activity_1.Activity {
     }
     async setStats(multi) {
         const md = this.context.metadata;
-        if (this.config.stats?.measures) {
+        if (md.key && this.config.stats?.measures) {
             const config = await this.engine.getVID();
             const reporter = new reporter_1.ReporterService(config, this.store, this.logger);
             await this.store.setStats(md.key, md.jid, md.ts, reporter.resolveTriggerStatistics(this.config, this.context), config, multi);

package/build/services/durable/client.js

@@ -87,6 +87,7 @@ class ClientService {
                 const hotMeshClient = await this.getHotMeshClient(workflowTopic);
                 const payload = {
                     arguments: [...options.args],
+                    parentWorkflowId: options.parentWorkflowId,
                     workflowId: options.workflowId || (0, nanoid_1.nanoid)(),
                     workflowTopic: workflowTopic,
                     backoffCoefficient: options.config?.backoffCoefficient || factory_1.DEFAULT_COEFFICIENT,

package/build/services/durable/factory.js

@@ -25,6 +25,8 @@ const getWorkflowYAML = (app, version) => {
         schema:
           type: object
           properties:
+            parentWorkflowId:
+              type: string
             workflowId:
               type: string
             arguments:
@@ -47,6 +49,11 @@ const getWorkflowYAML = (app, version) => {
           type: trigger
           stats:
             id: '{$self.input.data.workflowId}'
+            key: '{$self.input.data.parentWorkflowId}'
+            granularity: infinity
+            measures:
+              - measure: index
+                target: '{$self.input.data.parentWorkflowId}'
           job:
             maps:
               done: false
@@ -66,6 +73,7 @@ const getWorkflowYAML = (app, version) => {
         w1:
           type: worker
           topic: '{t1.output.data.workflowTopic}'
+          emit: '{$job.data.done}'
           retry:
             '599': [2]
           input:
@@ -123,6 +131,19 @@ const getWorkflowYAML = (app, version) => {
               response: '{$self.output.data.response}'
               done: '{$self.output.data.done}'
 
+        a2:
+          type: activity
+          title: Wait for cleanup signal
+          hook:
+            type: object
+            properties:
+              done:
+                type: boolean
+          job:
+            maps:
+              workflowId: '{t1.output.data.workflowId}'
+
+
         a594:
           title: Wait for signals
           type: await
@@ -280,7 +301,7 @@ const getWorkflowYAML = (app, version) => {
               done: true
 
         s2:
-          title: Awaken sleep flows so they end and self-clean
+          title: Awaken sleeping flows so they end and self-clean
           type: signal
           subtype: all
           key_name: parentWorkflowId
@@ -352,10 +373,55 @@ const getWorkflowYAML = (app, version) => {
                   type: boolean
             maps:
               done: true
+
+        s4:
+          title: Awaken child FLOWS so they end and self-clean
+          type: signal
+          subtype: all
+          key_name: parentWorkflowId
+          key_value:
+            '@pipe':
+              - ['{$job.metadata.jid}', '-f']
+              - ['{@string.concat}']
+          topic: ${app}.childflow.awaken
+          resolver:
+            schema:
+              type: object
+              properties:
+                data:
+                  type: object
+                  properties:
+                    parentWorkflowId:
+                      type: string
+                scrub:
+                  type: boolean
+            maps:
+              data:
+                parentWorkflowId:
+                  '@pipe':
+                    - ['{$job.metadata.jid}', '-f']
+                    - ['{@string.concat}']
+              scrub: true
+          signal:
+            schema:
+              type: object
+              properties:
+                done:
+                  type: boolean
+            maps:
+              done: true
     
       transitions:
         t1:
           - to: a1
+          - to: a2
+            conditions:
+              match:
+                - expected: true
+                  actual:
+                    '@pipe':
+                      - ['{$job.metadata.key}', true, false]
+                      - ['{@conditional.ternary}']
         a1:
           - to: w1
         w1:
@@ -377,11 +443,13 @@ const getWorkflowYAML = (app, version) => {
           - to: s3
             conditions:
               code: [200, 598, 597, 596]
+          - to: s4
+            conditions:
+              code: [200, 598, 597, 596]
         a594:
           - to: c594
             conditions:
               code: 202
-
         a595:
           - to: c595
             conditions:
@@ -389,6 +457,14 @@ const getWorkflowYAML = (app, version) => {
         a599:
           - to: c599
 
+      hooks:
+        ${app}.childflow.awaken:
+          - to: a2
+            conditions:
+              match:
+                - expected: '{t1.output.data.workflowId}'
+                  actual: '{$self.hook.data.id}'
+  
     - subscribes: ${app}.activity.execute
       publishes: ${app}.activity.executed
 

package/build/services/durable/workflow.js

@@ -54,6 +54,7 @@ class WorkflowService {
         const COUNTER = store.get('counter');
         const execIndex = COUNTER.counter = COUNTER.counter + 1;
         const childJobId = `${workflowId}-$${options.workflowName}-${execIndex}`;
+        const parentWorkflowId = `${workflowId}-f`;
         const client = new client_1.ClientService({
             connection: await connection_1.ConnectionService.connect(worker_1.WorkerService.connection),
         });
@@ -65,6 +66,7 @@ class WorkflowService {
             handle = await client.workflow.start({
                 ...options,
                 workflowId: childJobId,
+                parentWorkflowId,
                 workflowTrace,
                 workflowSpan,
             });

package/build/types/durable.d.ts

@@ -10,6 +10,7 @@ type WorkflowOptions = {
     args: any[];
     workflowId: string;
     workflowName?: string;
+    parentWorkflowId?: string;
     workflowTrace?: string;
     workflowSpan?: string;
     config?: WorkflowConfig;

package/package.json

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

package/services/activities/activity.ts

@@ -584,7 +584,12 @@ class Activity {
 
   async transition(adjacencyList: StreamData[], jobStatus: JobStatus): Promise<string[]> {
     let mIds: string[] = [];
-     if (jobStatus <= 0 || this.config.emit) {
+    //emit can be a mapping (allows emissions to be driven by the job state)
+    let emit: boolean = false;
+    if (this.config.emit) {
+      emit = Pipe.resolve(this.config.emit, this.context);
+    }
+    if (jobStatus <= 0 || emit) {
       //activity should not send 'emit' if the job is truly over
       const isTrueEmit = jobStatus > 0;
       await this.engine.runJobCompletionTasks(this.context, isTrueEmit);

package/services/activities/trigger.ts

@@ -178,7 +178,7 @@ class Trigger extends Activity {
 
   async setStats(multi?: RedisMulti): Promise<void> {
     const md = this.context.metadata;
-    if (this.config.stats?.measures) {
+    if (md.key && this.config.stats?.measures) {
       const config = await this.engine.getVID();
       const reporter = new ReporterService(config, this.store, this.logger);
       await this.store.setStats(

package/services/durable/client.ts

@@ -101,6 +101,7 @@ export class ClientService {
       const hotMeshClient = await this.getHotMeshClient(workflowTopic);
       const payload = {
         arguments: [...options.args],
+        parentWorkflowId: options.parentWorkflowId,
         workflowId: options.workflowId || nanoid(),
         workflowTopic: workflowTopic,
         backoffCoefficient: options.config?.backoffCoefficient || DEFAULT_COEFFICIENT,

package/services/durable/factory.ts

@@ -24,6 +24,8 @@ const getWorkflowYAML = (app: string, version: string) => {
         schema:
           type: object
           properties:
+            parentWorkflowId:
+              type: string
             workflowId:
               type: string
             arguments:
@@ -46,6 +48,11 @@ const getWorkflowYAML = (app: string, version: string) => {
           type: trigger
           stats:
             id: '{$self.input.data.workflowId}'
+            key: '{$self.input.data.parentWorkflowId}'
+            granularity: infinity
+            measures:
+              - measure: index
+                target: '{$self.input.data.parentWorkflowId}'
           job:
             maps:
               done: false
@@ -65,6 +72,7 @@ const getWorkflowYAML = (app: string, version: string) => {
         w1:
           type: worker
           topic: '{t1.output.data.workflowTopic}'
+          emit: '{$job.data.done}'
           retry:
             '599': [2]
           input:
@@ -122,6 +130,19 @@ const getWorkflowYAML = (app: string, version: string) => {
               response: '{$self.output.data.response}'
               done: '{$self.output.data.done}'
 
+        a2:
+          type: activity
+          title: Wait for cleanup signal
+          hook:
+            type: object
+            properties:
+              done:
+                type: boolean
+          job:
+            maps:
+              workflowId: '{t1.output.data.workflowId}'
+
+
         a594:
           title: Wait for signals
           type: await
@@ -279,7 +300,7 @@ const getWorkflowYAML = (app: string, version: string) => {
               done: true
 
         s2:
-          title: Awaken sleep flows so they end and self-clean
+          title: Awaken sleeping flows so they end and self-clean
           type: signal
           subtype: all
           key_name: parentWorkflowId
@@ -351,10 +372,55 @@ const getWorkflowYAML = (app: string, version: string) => {
                   type: boolean
             maps:
               done: true
+
+        s4:
+          title: Awaken child FLOWS so they end and self-clean
+          type: signal
+          subtype: all
+          key_name: parentWorkflowId
+          key_value:
+            '@pipe':
+              - ['{$job.metadata.jid}', '-f']
+              - ['{@string.concat}']
+          topic: ${app}.childflow.awaken
+          resolver:
+            schema:
+              type: object
+              properties:
+                data:
+                  type: object
+                  properties:
+                    parentWorkflowId:
+                      type: string
+                scrub:
+                  type: boolean
+            maps:
+              data:
+                parentWorkflowId:
+                  '@pipe':
+                    - ['{$job.metadata.jid}', '-f']
+                    - ['{@string.concat}']
+              scrub: true
+          signal:
+            schema:
+              type: object
+              properties:
+                done:
+                  type: boolean
+            maps:
+              done: true
     
       transitions:
         t1:
           - to: a1
+          - to: a2
+            conditions:
+              match:
+                - expected: true
+                  actual:
+                    '@pipe':
+                      - ['{$job.metadata.key}', true, false]
+                      - ['{@conditional.ternary}']
         a1:
           - to: w1
         w1:
@@ -376,11 +442,13 @@ const getWorkflowYAML = (app: string, version: string) => {
           - to: s3
             conditions:
               code: [200, 598, 597, 596]
+          - to: s4
+            conditions:
+              code: [200, 598, 597, 596]
         a594:
           - to: c594
             conditions:
               code: 202
-
         a595:
           - to: c595
             conditions:
@@ -388,6 +456,14 @@ const getWorkflowYAML = (app: string, version: string) => {
         a599:
           - to: c599
 
+      hooks:
+        ${app}.childflow.awaken:
+          - to: a2
+            conditions:
+              match:
+                - expected: '{t1.output.data.workflowId}'
+                  actual: '{$self.hook.data.id}'
+  
     - subscribes: ${app}.activity.execute
       publishes: ${app}.activity.executed
 

package/services/durable/workflow.ts

@@ -54,6 +54,7 @@ export class WorkflowService {
     const COUNTER = store.get('counter');
     const execIndex = COUNTER.counter = COUNTER.counter + 1;
     const childJobId = `${workflowId}-$${options.workflowName}-${execIndex}`;
+    const parentWorkflowId = `${workflowId}-f`;
 
     const client = new Client({
       connection: await Connection.connect(WorkerService.connection),
@@ -71,6 +72,7 @@ export class WorkflowService {
       handle = await client.workflow.start({
         ...options,
         workflowId: childJobId,
+        parentWorkflowId,
         workflowTrace,
         workflowSpan,
       });

package/types/durable.ts

@@ -12,6 +12,7 @@ type WorkflowOptions = {
   args: any[];          //input arguments to pass in
   workflowId: string;   //execution id (the job id)
   workflowName?: string; //the name of the user's workflow function
+  parentWorkflowId?: string;  //system reserved; the id of the parent; if present the flow will not self-clean until the parent that spawned it self-cleans
   workflowTrace?: string;
   workflowSpan?: string;
   config?: WorkflowConfig;