@cadenza.io/service 2.3.13 → 2.3.15

package/dist/index.js

@@ -178,6 +178,7 @@ var DeputyTask = class extends import_core.Task {
     const ctx = context.getContext();
     const metadata = context.getMetadata();
     const deputyContext = {
+      __timeout: this.timeout,
       __localTaskName: this.name,
       __localTaskVersion: this.version,
       __localServiceName: CadenzaService.serviceRegistry.serviceName,
@@ -550,17 +551,22 @@ var ServiceRegistry = class _ServiceRegistry {
     const mergeSyncDataTask = CadenzaService.createUniqueMetaTask(
       "Merge sync data",
       (ctx) => {
-        let joinedContext = {};
-        ctx.joinedContexts.forEach((ctx2) => {
-          joinedContext = { ...joinedContext, ...ctx2 };
-        });
-        console.log(
-          "merging contexts of full sync...",
-          joinedContext.keys().join(", ")
-        );
-        return joinedContext;
+        try {
+          let joinedContext = {};
+          ctx.joinedContexts.forEach((ctx2) => {
+            joinedContext = { ...joinedContext, ...ctx2 };
+          });
+          console.log(
+            "merging contexts of full sync...",
+            joinedContext.keys().join(", ")
+          );
+          return joinedContext;
+        } catch (e) {
+          console.log("Error", e.message, ctx);
+          return false;
+        }
       }
-    ).then(this.handleGlobalSignalRegistrationTask);
+    ).emits("meta.service_registry.initial_sync_complete").then(this.handleGlobalSignalRegistrationTask);
     this.fullSyncTask = CadenzaService.createMetaRoutine("Full sync", [
       CadenzaService.createTask("Confirm full sync", () => {
         console.log("Confirming full sync...");
@@ -1950,7 +1956,7 @@ var SocketController = class _SocketController {
           transports: ["websocket"],
           autoConnect: false
         });
-        emitWhenReady = (event, data, timeoutMs = 2e4, ack) => {
+        emitWhenReady = (event, data, timeoutMs = 6e4, ack) => {
           return new Promise((resolve) => {
             const tryEmit = () => {
               if (!socket?.connected) {
@@ -1984,7 +1990,12 @@ var SocketController = class _SocketController {
                 if (err) {
                   CadenzaService.log(
                     "Socket timeout.",
-                    { error: err.message, socketId: socket?.id, serviceName },
+                    {
+                      event,
+                      error: err.message,
+                      socketId: socket?.id,
+                      serviceName
+                    },
                     "warning"
                   );
                   response = {
@@ -2102,13 +2113,6 @@ var SocketController = class _SocketController {
                     "warning"
                   );
                 }
-                if (result.errored) {
-                  errorCount++;
-                  if (errorCount > ERROR_LIMIT) {
-                    console.error("Too many errors, closing socket", URL);
-                    emit(`meta.socket_shutdown_requested:${fetchId}`, {});
-                  }
-                }
               }
             );
           },
@@ -2129,7 +2133,7 @@ var SocketController = class _SocketController {
               emitWhenReady?.(
                 "delegation",
                 ctx2,
-                2e4,
+                ctx2.__timeout ?? 6e4,
                 (resultContext) => {
                   const requestDuration = Date.now() - requestSentAt;
                   const metadata = resultContext.__metadata;
@@ -2149,13 +2153,6 @@ var SocketController = class _SocketController {
                     }
                   );
                   pendingDelegationIds.delete(ctx2.__metadata.__deputyExecId);
-                  if (resultContext.errored) {
-                    errorCount++;
-                    if (errorCount > ERROR_LIMIT) {
-                      console.error("Too many errors, closing socket", URL);
-                      emit(`meta.socket_shutdown_requested:${fetchId}`, {});
-                    }
-                  }
                   resolve(resultContext);
                 }
               );
@@ -2182,13 +2179,6 @@ var SocketController = class _SocketController {
                     response
                   );
                 }
-                if (response.errored) {
-                  errorCount++;
-                  if (errorCount > ERROR_LIMIT) {
-                    console.error("Too many errors, closing socket", URL);
-                    emit(`meta.socket_shutdown_requested:${fetchId}`, {});
-                  }
-                }
                 resolve(response);
               });
             });
@@ -3831,14 +3821,14 @@ var GraphSyncController = class _GraphSyncController {
             }
           }
         },
-        { concurrency: 50 }
+        { concurrency: 30 }
       ) : CadenzaService.get("dbInsertRoutine"))?.then(
         CadenzaService.createMetaTask("Register routine", (ctx) => {
           if (!ctx.__syncing) {
             return;
           }
           CadenzaService.debounce("meta.sync_controller.synced_resource", {
-            delayMs: 2e3
+            delayMs: 3e3
           });
           CadenzaService.getRoutine(ctx.__routineName).registered = true;
           return true;
@@ -3856,7 +3846,7 @@ var GraphSyncController = class _GraphSyncController {
         const { routines } = ctx;
         if (!routines) return;
         CadenzaService.debounce("meta.sync_controller.synced_resource", {
-          delayMs: 2e3
+          delayMs: 3e3
         });
         for (const routine of routines) {
           for (const task of routine.tasks) {
@@ -3900,7 +3890,7 @@ var GraphSyncController = class _GraphSyncController {
             }
           }
         },
-        { concurrency: 50 }
+        { concurrency: 30 }
       ) : CadenzaService.get("dbInsertTaskToRoutineMap"))?.then(
         CadenzaService.createMetaTask("Register routine task", (ctx) => {
           if (!ctx.__syncing) {
@@ -3919,7 +3909,7 @@ var GraphSyncController = class _GraphSyncController {
       "Split signals for registration",
       function* (ctx) {
         CadenzaService.debounce("meta.sync_controller.synced_resource", {
-          delayMs: 2e3
+          delayMs: 3e3
         });
         const { signals } = ctx;
         if (!signals) return;
@@ -3951,14 +3941,14 @@ var GraphSyncController = class _GraphSyncController {
             }
           }
         },
-        { concurrency: 50 }
+        { concurrency: 30 }
       ) : CadenzaService.get("dbInsertSignalRegistry"))?.then(
         CadenzaService.createMetaTask("Process signal registration", (ctx) => {
           if (!ctx.__syncing) {
             return;
           }
           CadenzaService.debounce("meta.sync_controller.synced_resource", {
-            delayMs: 2e3
+            delayMs: 3e3
           });
           return { signalName: ctx.__signal };
         }).then(
@@ -3974,7 +3964,7 @@ var GraphSyncController = class _GraphSyncController {
       "Split tasks for registration",
       function* (ctx) {
         CadenzaService.debounce("meta.sync_controller.synced_resource", {
-          delayMs: 2e3
+          delayMs: 3e3
         });
         const tasks = ctx.tasks;
         for (const task of tasks) {
@@ -4029,14 +4019,14 @@ var GraphSyncController = class _GraphSyncController {
             }
           }
         },
-        { concurrency: 50 }
+        { concurrency: 30 }
       ) : CadenzaService.get("dbInsertTask"))?.then(
         CadenzaService.createMetaTask("Record registration", (ctx) => {
           if (!ctx.__syncing) {
             return;
           }
           CadenzaService.debounce("meta.sync_controller.synced_resource", {
-            delayMs: 2e3
+            delayMs: 3e3
           });
           CadenzaService.get(ctx.__taskName).registered = true;
           return true;
@@ -4055,7 +4045,7 @@ var GraphSyncController = class _GraphSyncController {
           return;
         }
         CadenzaService.debounce("meta.sync_controller.synced_resource", {
-          delayMs: 2e3
+          delayMs: 3e3
         });
         CadenzaService.get(ctx.__taskName)?.registeredSignals.add(ctx.__signal);
       }
@@ -4098,7 +4088,7 @@ var GraphSyncController = class _GraphSyncController {
             }
           }
         },
-        { concurrency: 50 }
+        { concurrency: 30 }
       ) : CadenzaService.get("dbInsertSignalToTaskMap"))?.then(registerSignalTask)
     );
     this.registerTaskMapTask = CadenzaService.createMetaTask(
@@ -4106,7 +4096,7 @@ var GraphSyncController = class _GraphSyncController {
       function* (ctx) {
         const task = ctx.task;
         CadenzaService.debounce("meta.sync_controller.synced_resource", {
-          delayMs: 2e3
+          delayMs: 3e3
         });
         if (task.hidden || !task.register) return;
         for (const t of task.nextTasks) {
@@ -4145,14 +4135,14 @@ var GraphSyncController = class _GraphSyncController {
             }
           }
         },
-        { concurrency: 50 }
+        { concurrency: 30 }
       ) : CadenzaService.get("dbInsertDirectionalTaskGraphMap"))?.then(
         CadenzaService.createMetaTask("Record task map registration", (ctx) => {
           if (!ctx.__syncing) {
             return;
           }
           CadenzaService.debounce("meta.sync_controller.synced_resource", {
-            delayMs: 2e3
+            delayMs: 3e3
           });
           CadenzaService.get(ctx.__taskName)?.taskMapRegistration.add(
             ctx.__nextTaskName
@@ -4198,7 +4188,7 @@ var GraphSyncController = class _GraphSyncController {
             }
           }
         },
-        { concurrency: 50 }
+        { concurrency: 30 }
       ) : CadenzaService.get("dbInsertDirectionalTaskGraphMap"))?.then(
         CadenzaService.createMetaTask(
           "Record deputy relationship registration",
@@ -4207,14 +4197,17 @@ var GraphSyncController = class _GraphSyncController {
               return;
             }
             CadenzaService.debounce("meta.sync_controller.synced_resource", {
-              delayMs: 2e3
+              delayMs: 3e3
             });
             CadenzaService.get(ctx.__taskName).registeredDeputyMap = true;
           }
         )
       )
     );
-    CadenzaService.signalBroker.getSignalsTask.clone().doOn("meta.sync_controller.sync_tick", "meta.sync_requested").then(this.splitSignalsTask);
+    CadenzaService.signalBroker.getSignalsTask.clone().doOn(
+      "meta.sync_controller.sync_tick",
+      "meta.service_registry.initial_sync_complete"
+    ).then(this.splitSignalsTask);
     CadenzaService.registry.getAllTasks.clone().doOn("meta.sync_controller.synced_signals").then(this.splitTasksForRegistration);
     CadenzaService.registry.getAllRoutines.clone().doOn("meta.sync_controller.synced_tasks").then(this.splitRoutinesTask);
     CadenzaService.registry.doForEachTask.clone().doOn("meta.sync_controller.synced_tasks").then(
@@ -4250,7 +4243,7 @@ var GraphSyncController = class _GraphSyncController {
         { __syncing: true },
         18e4
       );
-      CadenzaService.schedule("meta.sync_requested", { __syncing: true }, 5e3);
+      CadenzaService.schedule("meta.sync_requested", { __syncing: true }, 2e3);
     }
     console.log("Syncing initiated", this.isCadenzaDBReady);
   }