@cadenza.io/service 2.17.22 → 2.17.24

package/dist/index.js

@@ -2070,7 +2070,7 @@ var ServiceRegistry = class _ServiceRegistry {
           } = ctx;
           const normalizedLocalInstance = normalizeServiceInstanceDescriptor({
             ...serviceInstance ?? data ?? queryData?.data ?? {},
-            transports: ctx.transportData ?? []
+            transports: ctx.__transportData ?? ctx.transportData ?? []
           });
           if (!normalizedLocalInstance?.uuid || !normalizedLocalInstance.serviceName) {
             return false;
@@ -2084,14 +2084,24 @@ var ServiceRegistry = class _ServiceRegistry {
           this.retryCount = __retryCount;
           this.isFrontend = typeof __isFrontend === "boolean" ? __isFrontend : !!normalizedLocalInstance.isFrontend;
           console.log("SETUP SERVICE", this.serviceInstanceId);
-          return true;
+          return {
+            ...ctx,
+            serviceInstance: normalizedLocalInstance,
+            data: {
+              ...ctx.data ?? {},
+              uuid: normalizedLocalInstance.uuid,
+              service_name: normalizedLocalInstance.serviceName
+            },
+            __serviceName: normalizedLocalInstance.serviceName,
+            __serviceInstanceId: normalizedLocalInstance.uuid
+          };
         },
         "Sets service instance id after insertion"
       ).emits("meta.service_registry.instance_inserted").then(
         CadenzaService.createMetaTask(
           "Prepare service transport inserts",
           function* (ctx, emit) {
-            const transportData = Array.isArray(ctx.transportData) ? ctx.transportData : [];
+            const transportData = Array.isArray(ctx.__transportData) ? ctx.__transportData : Array.isArray(ctx.transportData) ? ctx.transportData : [];
             for (const transport of transportData) {
               const transportContext = {
                 ...ctx,
@@ -3446,7 +3456,7 @@ var RestController = class _RestController {
                   is_blocked: false,
                   health: {}
                 },
-                transportData: [],
+                __transportData: [],
                 ...ctx
               });
               return;
@@ -3745,7 +3755,7 @@ var RestController = class _RestController {
                   is_blocked: false,
                   health: {}
                 };
-                ctx.transportData = transportData;
+                ctx.__transportData = transportData;
                 delete ctx.__app;
                 CadenzaService.emit(
                   "meta.service_registry.instance_registration_requested",
@@ -8434,6 +8444,7 @@ var GraphSyncController = class _GraphSyncController {
           delayMs: 3e3
         });
         for (const routine of routines) {
+          if (!routine.registered) continue;
           for (const task of routine.tasks) {
             if (!task) {
               console.log("task is null", routine, task);
@@ -8443,6 +8454,9 @@ var GraphSyncController = class _GraphSyncController {
             const tasks = task.getIterator();
             while (tasks.hasNext()) {
               const nextTask = tasks.next();
+              if (!nextTask?.registered) {
+                continue;
+              }
               yield {
                 data: {
                   taskName: nextTask.name,
@@ -8782,6 +8796,9 @@ var GraphSyncController = class _GraphSyncController {
         for (const signal of task.observedSignals) {
           const _signal = signal.split(":")[0];
           if (task.registeredSignals.has(signal)) continue;
+          if (!CadenzaService.signalBroker.signalObservers?.get(_signal)?.registered) {
+            continue;
+          }
           const { isGlobal } = decomposeSignalName(_signal);
           yield {
             data: {
@@ -9147,19 +9164,40 @@ var GraphSyncController = class _GraphSyncController {
         ...ctx,
         intents: Array.from(CadenzaService.inquiryBroker.intents.values())
       };
-    }).doOn("meta.sync_controller.synced_tasks").then(this.splitIntentsTask);
-    CadenzaService.registry.getAllRoutines.clone().doOn("meta.sync_controller.synced_tasks").then(this.splitRoutinesTask);
+    }).doOn(
+      "meta.sync_controller.synced_tasks",
+      "meta.sync_controller.task_registered"
+    ).then(this.splitIntentsTask);
+    CadenzaService.registry.getAllRoutines.clone().doOn(
+      "meta.sync_controller.synced_tasks",
+      "meta.sync_controller.task_registered"
+    ).then(this.splitRoutinesTask);
     CadenzaService.createMetaTask("Get all actors", (ctx) => {
       return {
         ...ctx,
         actors: CadenzaService.getAllActors()
       };
-    }).doOn("meta.sync_controller.synced_tasks").then(this.splitActorsForRegistration);
+    }).doOn(
+      "meta.sync_controller.synced_tasks",
+      "meta.sync_controller.task_registered"
+    ).then(this.splitActorsForRegistration);
     CadenzaService.registry.doForEachTask.clone().doOn("meta.sync_controller.synced_tasks").then(
       this.registerTaskMapTask,
-      this.registerSignalToTaskMapTask,
       this.registerDeputyRelationshipTask
     );
+    CadenzaService.registry.doForEachTask.clone().doOn(
+      "meta.sync_controller.synced_signals"
+    ).then(this.registerSignalToTaskMapTask);
+    CadenzaService.createMetaTask("Get registered task for signal sync", (ctx) => {
+      const task = ctx.task ?? (ctx.__taskName ? CadenzaService.get(ctx.__taskName) : void 0);
+      if (!task) {
+        return false;
+      }
+      return {
+        ...ctx,
+        task
+      };
+    }).doOn("meta.sync_controller.task_registered").then(this.registerSignalToTaskMapTask);
     CadenzaService.registry.doForEachTask.clone().doOn("meta.sync_controller.synced_tasks", "meta.sync_controller.synced_intents").then(this.registerIntentToTaskMapTask);
     CadenzaService.createMetaTask("Get registered task for intent sync", (ctx) => {
       const task = ctx.task ?? (ctx.__taskName ? CadenzaService.get(ctx.__taskName) : void 0);
@@ -9171,8 +9209,21 @@ var GraphSyncController = class _GraphSyncController {
         task
       };
     }).doOn("meta.sync_controller.task_registered").then(this.registerIntentToTaskMapTask);
-    CadenzaService.registry.doForEachTask.clone().doOn("meta.sync_controller.synced_tasks", "meta.sync_controller.synced_actors").then(this.registerActorTaskMapTask);
-    CadenzaService.registry.getAllRoutines.clone().doOn("meta.sync_controller.synced_routines").then(this.splitTasksInRoutines);
+    CadenzaService.registry.doForEachTask.clone().doOn("meta.sync_controller.synced_actors").then(this.registerActorTaskMapTask);
+    CadenzaService.createMetaTask("Get registered task for actor sync", (ctx) => {
+      const task = ctx.task ?? (ctx.__taskName ? CadenzaService.get(ctx.__taskName) : void 0);
+      if (!task) {
+        return false;
+      }
+      return {
+        ...ctx,
+        task
+      };
+    }).doOn("meta.sync_controller.task_registered").then(this.registerActorTaskMapTask);
+    CadenzaService.registry.getAllRoutines.clone().doOn(
+      "meta.sync_controller.task_registered",
+      "meta.sync_controller.synced_routines"
+    ).then(this.splitTasksInRoutines);
     CadenzaService.createMetaTask("Finish sync", (ctx, emit) => {
       emit("global.meta.sync_controller.synced", {
         data: {
@@ -10352,7 +10403,7 @@ var CadenzaService = class {
             is_blocked: false,
             health: {}
           },
-          transportData: [],
+          __transportData: [],
           __serviceName: serviceName,
           __serviceInstanceId: serviceId,
           __useSocket: options.useSocket,