@cadenza.io/service 2.0.13 → 2.0.15

package/dist/index.js

@@ -1026,6 +1026,7 @@ var SignalTransmissionTask = class extends import_core2.Task {
         __deputyTaskName: this.name
       },
       __signalName: this.signalName,
+      __signalEmissionId: metadata.__signalEmission?.uuid,
       ...ctx
     };
     return this.taskFunction(deputyContext, emit, progressCallback);
@@ -2222,6 +2223,7 @@ var SignalController = class _SignalController {
       "Add data to signal emission",
       (ctx) => {
         const signalEmission = ctx.__signalEmission;
+        delete ctx.__signalEmission;
         if (!signalEmission) {
           return false;
         }
@@ -2237,7 +2239,8 @@ var SignalController = class _SignalController {
             is_metric: signalEmission.isMetric ?? false,
             routine_execution_id: signalEmission.routineExecutionId,
             execution_trace_id: signalEmission.executionTraceId,
-            data: ctx,
+            context: ctx,
+            metadata: signalEmission,
             service_name: CadenzaService.serviceRegistry.serviceName,
             service_instance_id: CadenzaService.serviceRegistry.serviceInstanceId
           }
@@ -2246,20 +2249,6 @@ var SignalController = class _SignalController {
       "",
       { isSubMeta: true, concurrency: 100 }
     ).doOn("sub_meta.signal_broker.emitting_signal").emits("global.sub_meta.signal_controller.signal_emitted");
-    CadenzaService.createMetaTask(
-      "Add metadata to signal consumption",
-      (ctx) => {
-        return {
-          data: {
-            ...ctx.data,
-            serviceName: CadenzaService.serviceRegistry.serviceName,
-            serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId
-          }
-        };
-      },
-      "",
-      { isSubMeta: true, concurrency: 100 }
-    ).doOn("meta.node.consumed_signal").emits("global.sub_meta.signal_controller.signal_consumed");
   }
 };
 
@@ -2297,7 +2286,8 @@ var GraphMetadataController = class _GraphMetadataController {
       return {
         data: {
           ...ctx.data,
-          serviceName: CadenzaService.serviceRegistry.serviceName
+          serviceName: CadenzaService.serviceRegistry.serviceName,
+          predecessorServiceName: CadenzaService.serviceRegistry.serviceName
         }
       };
     }).doOn("meta.task.relationship_added").emits("global.meta.graph_metadata.task_relationship_created");
@@ -2333,7 +2323,10 @@ var GraphMetadataController = class _GraphMetadataController {
     CadenzaService.createMetaTask("Handle task signal attachment", (ctx) => {
       return {
         data: {
-          ...ctx.data,
+          ...ctx.data
+        },
+        filter: {
+          ...ctx.filter,
           serviceName: CadenzaService.serviceRegistry.serviceName
         }
       };
@@ -2386,47 +2379,23 @@ var GraphMetadataController = class _GraphMetadataController {
       };
     }).doOn("meta.routine.task_added").emits("global.meta.graph_metadata.task_added_to_routine");
     CadenzaService.createMetaTask("Handle new trace", (ctx) => {
-      const context = ctx.data.context;
-      delete ctx.data.context;
       return {
         data: {
           ...ctx.data,
           service_name: CadenzaService.serviceRegistry.serviceName,
-          service_instance_id: CadenzaService.serviceRegistry.serviceInstanceId,
-          context_id: {
-            subOperation: "insert",
-            table: "context",
-            data: {
-              uuid: context.id,
-              context: context.context,
-              isMeta: ctx.data.isMeta
-            },
-            return: "uuid"
-          }
+          service_instance_id: CadenzaService.serviceRegistry.serviceInstanceId
         }
       };
     }).doOn("meta.runner.new_trace", "sub_meta.signal_broker.new_trace").emits("global.meta.graph_metadata.execution_trace_created");
     CadenzaService.createMetaTask(
       "Handle routine execution creation",
       (ctx) => {
-        const context = ctx.data.context;
-        delete ctx.data.context;
         return {
           queryData: {
             data: {
               ...ctx.data,
               serviceName: CadenzaService.serviceRegistry.serviceName,
-              serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId,
-              contextId: typeof context === "string" ? context : {
-                subOperation: "insert",
-                table: "context",
-                data: {
-                  uuid: context.id,
-                  context: context.context,
-                  isMeta: ctx.data.isMeta
-                },
-                return: "uuid"
-              }
+              serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId
             }
           }
         };
@@ -2445,23 +2414,11 @@ var GraphMetadataController = class _GraphMetadataController {
     CadenzaService.createMetaTask(
       "Handle routine execution ended",
       (ctx) => {
-        const context = ctx.data.resultContext;
-        delete ctx.data.resultContext;
         return {
           data: {
             ...ctx.data,
             serviceName: CadenzaService.serviceRegistry.serviceName,
-            serviceInstance_id: CadenzaService.serviceRegistry.serviceInstanceId,
-            resultContextId: typeof context === "string" ? context : {
-              subOperation: "insert",
-              table: "context",
-              data: {
-                uuid: context.id,
-                context: context.context,
-                is_meta: ctx.data.isMeta
-              },
-              return: "uuid"
-            }
+            serviceInstance_id: CadenzaService.serviceRegistry.serviceInstanceId
           },
           filter: {
             ...ctx.filter
@@ -2474,23 +2431,11 @@ var GraphMetadataController = class _GraphMetadataController {
     CadenzaService.createMetaTask(
       "Handle task execution creation",
       (ctx) => {
-        const context = ctx.data.context;
-        delete ctx.data.context;
         return {
           data: {
             ...ctx.data,
             serviceName: CadenzaService.serviceRegistry.serviceName,
-            serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId,
-            contextId: typeof context === "string" ? context : {
-              subOperation: "insert",
-              table: "context",
-              data: {
-                uuid: context.id,
-                context: context.context,
-                isMeta: ctx.data.isMeta
-              },
-              return: "uuid"
-            }
+            serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId
           }
         };
       },
@@ -2504,7 +2449,7 @@ var GraphMetadataController = class _GraphMetadataController {
       },
       "Handles task execution mapping",
       { concurrency: 100, isSubMeta: true }
-    ).doOn("meta.node.mapped").emits("global.meta.graph_metadata.task_execution_mapped");
+    ).doOn("meta.node.mapped", "meta.node.detected_previous_task_execution").emits("global.meta.graph_metadata.task_execution_mapped");
     CadenzaService.createMetaTask(
       "Handle task execution started",
       () => {
@@ -2516,23 +2461,11 @@ var GraphMetadataController = class _GraphMetadataController {
     CadenzaService.createMetaTask(
       "Handle task execution ended",
       (ctx) => {
-        const context = ctx.data.resultContext;
-        delete ctx.data.resultContext;
         return {
           data: {
             ...ctx.data,
             serviceName: CadenzaService.serviceRegistry.serviceName,
-            serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId,
-            resultContextId: typeof context === "string" ? context : {
-              subOperation: "insert",
-              table: "context",
-              data: {
-                uuid: context.id,
-                context: context.context,
-                isMeta: ctx.data.isMeta ?? false
-              },
-              return: "uuid"
-            }
+            serviceInstanceId: CadenzaService.serviceRegistry.serviceInstanceId
           },
           filter: {
             ...ctx.filter
@@ -2558,38 +2491,7 @@ var GraphMetadataController = class _GraphMetadataController {
       },
       "Handles task execution relationship creation",
       { concurrency: 100, isSubMeta: true }
-    ).doOn("meta.node.mapped").emits("global.meta.graph_metadata.relationship_executed");
-    CadenzaService.createMetaTask(
-      "Handle explicit task execution relationship creation",
-      (ctx) => {
-        return {
-          data: {
-            deputy_task_execution_id: ctx.data.previousTaskExecutionId,
-            task_execution_id: ctx.data.taskExecutionId
-          }
-        };
-      }
-    ).doOn("meta.node.detected_previous_task_execution").emits("global.meta.graph_metadata.explicit_relationship_created");
-    CadenzaService.createMetaTask(
-      "Handle explicit task execution relationship execution",
-      (ctx) => {
-        if (!ctx.__localTaskName) return;
-        return {
-          data: {
-            execution_count: "increment",
-            last_executed: formatTimestamp(Date.now())
-          },
-          filter: {
-            deputy_task_name: ctx.__localTaskName,
-            deputy_task_version: ctx.__localTaskVersion,
-            deputy_service_name: ctx.__localServiceName,
-            triggered_task_name: ctx.filter.taskName,
-            triggered_task_version: ctx.filter.taskVersion,
-            triggered_service_name: CadenzaService.serviceRegistry.serviceName
-          }
-        };
-      }
-    ).doOn("meta.node.detected_previous_task_execution").emits("global.meta.graph_metadata.explicit_relationship_executed");
+    ).doOn("meta.node.mapped", "meta.node.detected_previous_task_execution").emits("global.meta.graph_metadata.relationship_executed");
   }
 };
 
@@ -3931,7 +3833,13 @@ var GraphSyncController = class _GraphSyncController {
               retryDelay: task.retryDelay,
               retryDelayMax: task.retryDelayMax,
               retryDelayFactor: task.retryDelayFactor,
-              service_name: CadenzaService.serviceRegistry.serviceName
+              service_name: CadenzaService.serviceRegistry.serviceName,
+              signals: {
+                emits: Array.from(task.emitsSignals),
+                signalsToEmitAfter: Array.from(task.signalsToEmitAfter),
+                signalsToEmitOnFail: Array.from(task.signalsToEmitOnFail),
+                observed: Array.from(task.observedSignals)
+              }
             },
             __name: task.name
           };
@@ -4008,47 +3916,6 @@ var GraphSyncController = class _GraphSyncController {
         { concurrency: 50 }
       ) : CadenzaService.get("dbInsertSignalToTaskMap"))?.then(registerSignalTask)
     );
-    this.registerTaskToSignalMapTask = CadenzaService.createMetaTask(
-      "Split emitted signals of task",
-      function* (ctx) {
-        const task = ctx.task;
-        if (task.hidden || !task.register) return;
-        for (const signal of task.emitsSignals) {
-          const _signal = signal.split(":")[0];
-          if (task.registeredSignals.has(_signal)) continue;
-          const isOnFail = task.signalsToEmitOnFail.has(signal);
-          yield {
-            data: {
-              signalName: _signal,
-              taskName: task.name,
-              taskVersion: task.version,
-              serviceName: CadenzaService.serviceRegistry.serviceName,
-              isOnFail
-            },
-            signalName: signal,
-            __name: task.name
-          };
-        }
-      }
-    ).then(
-      (this.isCadenzaDBReady ? CadenzaService.createCadenzaDBInsertTask(
-        "task_to_signal_map",
-        {
-          onConflict: {
-            target: [
-              "task_name",
-              "task_version",
-              "service_name",
-              "signal_name"
-            ],
-            action: {
-              do: "nothing"
-            }
-          }
-        },
-        { concurrency: 50 }
-      ) : CadenzaService.get("dbInsertTaskToSignalMap"))?.then(registerSignalTask)
-    );
     this.registerTaskMapTask = CadenzaService.createMetaTask(
       "Register task map to DB",
       function* (ctx) {
@@ -4064,7 +3931,8 @@ var GraphSyncController = class _GraphSyncController {
               taskVersion: t.version,
               predecessorTaskName: task.name,
               predecessorTaskVersion: task.version,
-              serviceName: CadenzaService.serviceRegistry.serviceName
+              serviceName: CadenzaService.serviceRegistry.serviceName,
+              predecessorServiceName: CadenzaService.serviceRegistry.serviceName
             },
             __name: task.name,
             __nextTaskName: t.name
@@ -4081,7 +3949,8 @@ var GraphSyncController = class _GraphSyncController {
               "predecessor_task_name",
               "task_version",
               "predecessor_task_version",
-              "service_name"
+              "service_name",
+              "predecessor_service_name"
             ],
             action: {
               do: "nothing"
@@ -4107,12 +3976,12 @@ var GraphSyncController = class _GraphSyncController {
           if (task.registeredDeputyMap) return;
           return {
             data: {
-              triggered_task_name: task.remoteRoutineName,
-              triggered_task_version: 1,
-              triggered_service_name: task.serviceName,
-              deputy_task_name: task.name,
-              deputy_task_version: task.version,
-              deputy_service_name: CadenzaService.serviceRegistry.serviceName
+              task_name: task.remoteRoutineName,
+              task_version: 1,
+              service_name: task.serviceName,
+              predecessor_task_name: task.name,
+              predecessor_task_version: task.version,
+              predecessor_service_name: CadenzaService.serviceRegistry.serviceName
             },
             __name: task.name
           };
@@ -4120,16 +3989,16 @@ var GraphSyncController = class _GraphSyncController {
       }
     ).then(
       (this.isCadenzaDBReady ? CadenzaService.createCadenzaDBInsertTask(
-        "deputy_task_map",
+        "directional_task_graph_map",
         {
           onConflict: {
             target: [
-              "deputy_task_name",
-              "triggered_task_name",
-              "deputy_task_version",
-              "triggered_task_version",
-              "deputy_service_name",
-              "triggered_service_name"
+              "task_name",
+              "predecessor_task_name",
+              "task_version",
+              "predecessor_task_version",
+              "service_name",
+              "predecessor_service_name"
             ],
             action: {
               do: "nothing"
@@ -4137,7 +4006,7 @@ var GraphSyncController = class _GraphSyncController {
           }
         },
         { concurrency: 50 }
-      ) : CadenzaService.get("dbInsertDeputyTaskMap"))?.then(
+      ) : CadenzaService.get("dbInsertDirectionalTaskGraphMap"))?.then(
         CadenzaService.createMetaTask(
           "Record deputy relationship registration",
           (ctx) => {
@@ -4158,7 +4027,6 @@ var GraphSyncController = class _GraphSyncController {
           CadenzaService.registry.doForEachTask.clone().then(
             this.registerTaskMapTask,
             this.registerSignalToTaskMapTask,
-            this.registerTaskToSignalMapTask,
             this.registerDeputyRelationshipTask
           )
         )