@cadenza.io/service 1.8.4 → 1.9.1

package/dist/index.d.mts

@@ -154,11 +154,14 @@ declare class ServiceRegistry {
     static get instance(): ServiceRegistry;
     private instances;
     private deputies;
+    private remoteSignals;
     serviceName: string | null;
     serviceInstanceId: string | null;
     useSocket: boolean;
     retryCount: number;
     handleInstanceUpdateTask: Task;
+    handleRemoteSignalRegistrationTask: Task;
+    getRemoteSignalsTask: Task;
     handleSocketStatusUpdateTask: Task;
     fullSyncTask: Task;
     getAllInstances: Task;

package/dist/index.d.ts

@@ -154,11 +154,14 @@ declare class ServiceRegistry {
     static get instance(): ServiceRegistry;
     private instances;
     private deputies;
+    private remoteSignals;
     serviceName: string | null;
     serviceInstanceId: string | null;
     useSocket: boolean;
     retryCount: number;
     handleInstanceUpdateTask: Task;
+    handleRemoteSignalRegistrationTask: Task;
+    getRemoteSignalsTask: Task;
     handleSocketStatusUpdateTask: Task;
     fullSyncTask: Task;
     getAllInstances: Task;

package/dist/index.js

@@ -327,6 +327,7 @@ var ServiceRegistry = class _ServiceRegistry {
   constructor() {
     this.instances = /* @__PURE__ */ new Map();
     this.deputies = /* @__PURE__ */ new Map();
+    this.remoteSignals = /* @__PURE__ */ new Map();
     this.serviceName = null;
     this.serviceInstanceId = null;
     this.useSocket = false;
@@ -344,12 +345,15 @@ var ServiceRegistry = class _ServiceRegistry {
         if (existing) {
           Object.assign(existing, serviceInstance);
         } else {
-          if (this.deputies.has(serviceName)) {
+          if (this.deputies.has(serviceName) || this.remoteSignals.has(serviceName)) {
             const communicationTypes = Array.from(
               new Set(
                 (_a2 = this.deputies.get(serviceName).map((d) => d.communicationType)) != null ? _a2 : []
               )
             );
+            if (!communicationTypes.includes("signal") && this.remoteSignals.has(serviceName)) {
+              communicationTypes.push("signal");
+            }
             emit("meta.service_registry.dependee_registered", {
               serviceName,
               serviceInstanceId: id,
@@ -382,6 +386,43 @@ var ServiceRegistry = class _ServiceRegistry {
       "CadenzaDB.meta.service_instance.inserted",
       "CadenzaDB.meta.service_instance.updated"
     );
+    this.handleRemoteSignalRegistrationTask = CadenzaService.createMetaTask(
+      "Handle Remote Signal Registration",
+      (ctx) => {
+        const { __remoteServiceName, __emitterSignalName } = ctx;
+        let remoteSignals = this.remoteSignals.get(__remoteServiceName);
+        if (!remoteSignals) {
+          this.remoteSignals.set(__remoteServiceName, []);
+          remoteSignals = this.remoteSignals.get(__remoteServiceName);
+        }
+        if (remoteSignals && remoteSignals.findIndex(
+          (s) => s.__emitterSignalName === __emitterSignalName
+        ) === -1) {
+          remoteSignals.push({
+            __listenerServiceName: ctx.__listenerServiceName,
+            __emitterSignalName,
+            __signalName: ctx.__signalName,
+            __remoteServiceName
+          });
+          return true;
+        }
+        return false;
+      },
+      "Handles registration of remote signals"
+    );
+    this.getRemoteSignalsTask = CadenzaService.createMetaTask(
+      "Get remote signals",
+      (ctx) => {
+        var _a2, _b2;
+        const { serviceName } = ctx;
+        let remoteSignals = (_a2 = this.remoteSignals.get(serviceName)) != null ? _a2 : [];
+        remoteSignals = remoteSignals.concat((_b2 = this.remoteSignals.get("*")) != null ? _b2 : []);
+        return __spreadValues({
+          __remoteSignals: remoteSignals
+        }, ctx);
+      },
+      "Gets remote signals"
+    ).doOn("meta.fetch.handshake_complete");
     this.handleSocketStatusUpdateTask = CadenzaService.createMetaTask(
       "Handle Socket Status Update",
       (ctx) => {
@@ -1111,7 +1152,7 @@ var RestController = class _RestController {
             var _a2;
             const response = yield (0, import_node_fetch.default)(`${URL}/handshake`, {
               method: "POST",
-              body: JSON.stringify(ctx2)
+              body: JSON.stringify(ctx2.handshakeData)
             });
             const result = yield response.json();
             if (result.__status === "error" || result.status !== 200) {
@@ -1125,11 +1166,14 @@ var RestController = class _RestController {
             );
             for (const communicationType of ctx2.communicationTypes) {
               emit2("meta.fetch.service_communication_established", {
-                serviceInstanceId: ctx2.serviceInstanceId,
-                serviceInstanceClientId: CadenzaService.serviceRegistry.serviceInstanceId,
-                communicationType
+                data: {
+                  serviceInstanceId: ctx2.serviceInstanceId,
+                  serviceInstanceClientId: CadenzaService.serviceRegistry.serviceInstanceId,
+                  communicationType
+                }
               });
             }
+            return true;
           }),
           "Sends handshake request",
           {
@@ -1214,10 +1258,24 @@ var RestController = class _RestController {
           }),
           "Requests status"
         ).doOn("meta.fetch.status_check_requested").emits("meta.fetch.status_checked").emitsOnFail("meta.fetch.status_check_failed");
-        emit(`meta.fetch.handshake_requested:${serviceInstanceId}`, __spreadValues({}, ctx));
         return true;
       },
       "Manages REST client requests as fallback"
+    ).then(
+      CadenzaService.createMetaTask(
+        "Prepare handshake",
+        (ctx, emit) => {
+          const { serviceInstanceId, serviceName } = ctx;
+          emit(`meta.fetch.handshake_requested:${serviceInstanceId}`, {
+            serviceInstanceId,
+            serviceName,
+            handshakeData: {
+              // JWT token...
+            }
+          });
+        },
+        "Prepares handshake"
+      )
     ).doOn("meta.service_registry.dependee_registered").emitsOnFail("meta.fetch.connect_failed");
   }
 };
@@ -1511,7 +1569,6 @@ var SignalController = class _SignalController {
       "Handle Signal Registration",
       (ctx, emit) => {
         const { __signalName } = ctx;
-        const firstChar = __signalName.charAt(0);
         const parts = __signalName.split(".");
         const domain = parts[0] === "meta" ? parts[1] : parts[0];
         const action = parts[parts.length - 1];
@@ -1524,24 +1581,55 @@ var SignalController = class _SignalController {
             service_name: CadenzaService.serviceRegistry.serviceName
           }
         });
-        if (firstChar === firstChar.toUpperCase() && firstChar !== firstChar.toLowerCase() || firstChar === "*") {
-          const serviceName = __signalName.split(".")[0];
-          ctx.__listenerServiceName = CadenzaService.serviceRegistry.serviceName;
-          ctx.__emitterSignalName = __signalName.split(".").slice(1).join(".");
-          ctx.__signalName = "meta.signal_controller.foreign_signal_registered";
-          if (serviceName === "*") {
-            emit("meta.signal_controller.wildcard_signal_registered", ctx);
+        return ctx;
+      },
+      "Handles signal registration from a service instance"
+    ).then(
+      CadenzaService.createMetaTask(
+        "Handle foreign signal registration",
+        (ctx, emit) => {
+          const { __signalName } = ctx;
+          const firstChar = __signalName.charAt(0);
+          if (firstChar === firstChar.toUpperCase() && firstChar !== firstChar.toLowerCase() || firstChar === "*") {
+            const serviceName = __signalName.split(".")[0];
+            ctx.__listenerServiceName = CadenzaService.serviceRegistry.serviceName;
+            ctx.__emitterSignalName = __signalName.split(".").slice(1).join(".");
+            ctx.__signalName = "meta.signal_controller.foreign_signal_registered";
+            ctx.__remoteServiceName = serviceName;
+            if (serviceName === "*") {
+              emit("meta.signal_controller.wildcard_signal_registered", ctx);
+            } else {
+              emit(
+                `meta.signal_controller.remote_signal_registered:${serviceName}`,
+                ctx
+              );
+            }
+            return ctx;
+          }
+        }
+      ).then(CadenzaService.serviceRegistry.handleRemoteSignalRegistrationTask)
+    ).doOn("meta.signal_broker.added");
+    CadenzaService.createMetaTask(
+      "Forward signal observations to remote service",
+      (ctx, emit) => {
+        const { __remoteSignals } = ctx;
+        for (const remoteSignal of __remoteSignals) {
+          if (remoteSignal.__remoteServiceName === "*") {
+            emit(
+              "meta.signal_controller.wildcard_signal_registered",
+              remoteSignal
+            );
           } else {
             emit(
-              `meta.signal_controller.remote_signal_registered:${serviceName}`,
-              ctx
+              `meta.signal_controller.remote_signal_registered:${remoteSignal.__remoteServiceName}`,
+              remoteSignal
             );
           }
         }
-        return ctx;
+        return true;
       },
-      "Handles signal registration from a service instance"
-    ).doOn("meta.signal_broker.added");
+      "Forwards signal observations to remote service"
+    ).doAfter(CadenzaService.serviceRegistry.getRemoteSignalsTask);
     CadenzaService.createMetaTask("Handle foreign signal registration", (ctx) => {
       const { __emitterSignalName, __listenerServiceName } = ctx;
       CadenzaService.createSignalTransmissionTask(
@@ -2995,6 +3083,11 @@ var DatabaseController = class _DatabaseController {
         delete context.sort;
         delete context.limit;
         delete context.offset;
+        console.log(
+          "EXECUTED",
+          `db${op.charAt(0).toUpperCase() + op.slice(1)}${tableName.charAt(0).toUpperCase() + tableName.slice(1)}`,
+          context
+        );
         return context;
       }),
       `Auto-generated ${op} task for ${tableName}`,