@cadenza.io/service 1.9.44 → 1.9.45

package/dist/index.js

@@ -1019,27 +1019,11 @@ var RestController = class _RestController {
                 }
                 CadenzaService.createEphemeralMetaTask(
                   "Resolve delegation",
-                  (endCtx) => res.json({
-                    __status: "success",
-                    __result: endCtx.__result
-                  }),
+                  (endCtx) => res.json(__spreadProps(__spreadValues({}, endCtx), {
+                    __status: "success"
+                  })),
                   "Resolves a delegation request"
-                ).doOn(`meta.node.ended_routine_execution:${routineExecId}`).emits(`meta.rest.delegation_resolved:${routineExecId}`);
-                CadenzaService.createEphemeralMetaTask(
-                  "Delegation progress update",
-                  (progressCtx) => {
-                    if (progressCtx.__progress !== void 0) {
-                    }
-                  },
-                  "Updates delegation progress (polling-based for REST)",
-                  {
-                    once: false,
-                    destroyCondition: (progressCtx) => progressCtx.__progress === 1 || progressCtx.__graphComplete
-                  }
-                ).doOn(
-                  `meta.node.routine_execution_progress:${routineExecId}`,
-                  `meta.node.ended_routine_execution:${routineExecId}`
-                );
+                ).doOn(`meta.node.graph_completed:${routineExecId}`).emits(`meta.rest.delegation_resolved:${routineExecId}`);
                 CadenzaService.broker.emit("meta.rest.delegation_requested", __spreadProps(__spreadValues({}, ctx2), {
                   __name: ctx2.__remoteRoutineName
                 }));
@@ -1395,10 +1379,6 @@ var SocketController = class _SocketController {
             (ctx) => {
               const server = ctx.__socketServer;
               server.on("connection", (ws) => {
-                ws.on(
-                  "handshake",
-                  (ctx2) => CadenzaService.broker.emit("meta.socket.handshake", ctx2)
-                );
                 ws.on(
                   "delegation",
                   (ctx2, callback) => {
@@ -1406,9 +1386,7 @@ var SocketController = class _SocketController {
                       "Resolve delegation",
                       callback,
                       "Resolves a delegation request using the provided callback from the client (.emitWithAck())"
-                    ).doOn(
-                      `meta.node.ended_routine_execution:${ctx2.__routineExecId}`
-                    ).emits(
+                    ).doOn(`meta.node.graph_completed:${ctx2.__routineExecId}`).emits(
                       `meta.socket.delegation_resolved:${ctx2.__routineExecId}`
                     );
                     CadenzaService.createEphemeralMetaTask(
@@ -1420,11 +1398,14 @@ var SocketController = class _SocketController {
                       "Updates delegation progress",
                       {
                         once: false,
-                        destroyCondition: (ctx3) => ctx3.data.progress === 1
+                        destroyCondition: (ctx3) => {
+                          var _a2;
+                          return ctx3.data.progress === 1 || ((_a2 = ctx3.data) == null ? void 0 : _a2.progress) === void 0;
+                        }
                       }
                     ).doOn(
                       `meta.node.routine_execution_progress:${ctx2.__routineExecId}`,
-                      `meta.node.ended_routine_execution:${ctx2.__routineExecId}`
+                      `meta.node.graph_completed:${ctx2.__routineExecId}`
                     ).emitsOnFail(
                       `meta.socket.progress_failed:${ctx2.__routineExecId}`
                     );
@@ -1823,7 +1804,7 @@ var GraphMetadataController = class _GraphMetadataController {
               context: ctx.data.context.context,
               is_meta: ctx.data.isMeta
             },
-            return: "id"
+            return: "uuid"
           }
         })
       };
@@ -1845,7 +1826,7 @@ var GraphMetadataController = class _GraphMetadataController {
                 context: context.context,
                 is_meta: ctx.data.isMeta
               },
-              return: "id"
+              return: "uuid"
             }
           })
         };
@@ -1870,7 +1851,7 @@ var GraphMetadataController = class _GraphMetadataController {
                 context: context.context,
                 is_meta: ctx.data.isMeta
               },
-              return: "id"
+              return: "uuid"
             }
           })
         };
@@ -3198,7 +3179,7 @@ var DatabaseController = class _DatabaseController {
   createDatabaseTask(op, tableName, table, queryFunction, options) {
     var _a2, _b2, _c2, _d2;
     const tableNameFormatted = tableName.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
-    const task = CadenzaService.createThrottledTask(
+    CadenzaService.createThrottledTask(
       `db${op.charAt(0).toUpperCase() + op.slice(1)}${tableNameFormatted}`,
       (context, emit) => __async(null, null, function* () {
         var _a3, _b3, _c3, _d3, _e, _f, _g, _h;
@@ -3224,7 +3205,7 @@ var DatabaseController = class _DatabaseController {
         }
         console.log(
           "EXECUTED",
-          `db${op.charAt(0).toUpperCase() + op.slice(1)}${tableName.charAt(0).toUpperCase() + tableName.slice(1)}`,
+          `db${op.charAt(0).toUpperCase() + op.slice(1)}${tableNameFormatted}`,
           JSON.stringify(context).slice(0, 100),
           context.__error
         );
@@ -3262,12 +3243,6 @@ var DatabaseController = class _DatabaseController {
         return typeof signal === "string" ? signal : signal.signal;
       })) != null ? _d2 : []
     );
-    console.log("Created database task", op, tableName, {
-      taskName: task.name,
-      retries: task.retryCount,
-      retryDelay: task.retryDelay,
-      throttled: task.throttled
-    });
   }
 };