@cadenza.io/service 1.10.17 → 1.11.0

package/dist/index.js

@@ -338,36 +338,29 @@ var ServiceRegistry = class _ServiceRegistry {
       "Handle Instance Update",
       (ctx, emit) => {
         var _a2;
-        const { service_instance } = ctx;
-        const { uuid: uuid4, serviceName, address, port, exposed } = service_instance;
+        const { serviceInstance } = ctx;
+        const { uuid: uuid4, serviceName, address, port, exposed } = serviceInstance;
+        if (uuid4 === this.serviceInstanceId) return;
         if (!this.instances.has(serviceName))
           this.instances.set(serviceName, []);
         const instances = this.instances.get(serviceName);
         const existing = instances.find((i) => i.uuid === uuid4);
         if (existing) {
-          Object.assign(existing, service_instance);
+          Object.assign(existing, serviceInstance);
         } else {
           if (this.deputies.has(serviceName) || this.remoteSignals.has(serviceName) || this.remoteSignals.has("*") && this.serviceName !== serviceName) {
-            const communicationTypes = Array.from(
-              new Set(
-                (_a2 = this.deputies.get(serviceName).map((d) => d.communicationType)) != null ? _a2 : []
-              )
+            const clientCreated = instances == null ? void 0 : instances.some(
+              (i) => i.address === address && i.port === port && i.clientCreated && i.isActive
             );
-            if (!communicationTypes.includes("signal") && (this.remoteSignals.has(serviceName) || this.remoteSignals.has("*"))) {
-              communicationTypes.push("signal");
-            }
-            emit("meta.service_registry.dependee_registered", {
-              serviceName,
-              serviceInstanceId: uuid4,
-              serviceAddress: address,
-              servicePort: port,
-              protocol: exposed ? "https" : "http",
-              communicationTypes
-            });
-            service_instance.clientCreated = true;
-            for (const instance of this.instances.get(serviceName)) {
-              if (instance.clientCreated) continue;
-              instance.clientCreated = true;
+            if (!clientCreated) {
+              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) || this.remoteSignals.has("*"))) {
+                communicationTypes.push("signal");
+              }
               emit("meta.service_registry.dependee_registered", {
                 serviceName,
                 serviceInstanceId: uuid4,
@@ -376,9 +369,22 @@ var ServiceRegistry = class _ServiceRegistry {
                 protocol: exposed ? "https" : "http",
                 communicationTypes
               });
+              serviceInstance.clientCreated = true;
+              for (const instance of this.instances.get(serviceName)) {
+                if (instance.clientCreated) continue;
+                instance.clientCreated = true;
+                emit("meta.service_registry.dependee_registered", {
+                  serviceName,
+                  serviceInstanceId: uuid4,
+                  serviceAddress: address,
+                  servicePort: port,
+                  protocol: exposed ? "https" : "http",
+                  communicationTypes
+                });
+              }
             }
           }
-          instances.push(service_instance);
+          instances.push(serviceInstance);
         }
         return true;
       },
@@ -459,16 +465,20 @@ var ServiceRegistry = class _ServiceRegistry {
         "is_non_responsive",
         "is_blocked",
         "health",
-        "exposed"
+        "exposed",
+        "created"
       ]
     }).doOn("meta.service_registry_sync_requested").then(
-      CadenzaService.createMetaTask("Split service instances", function* (ctx) {
-        const { serviceInstances } = ctx;
-        if (!serviceInstances) return;
-        for (const serviceInstance of serviceInstances) {
-          yield { serviceInstance };
+      CadenzaService.createMetaTask(
+        "Split service instances",
+        function* (ctx) {
+          const { serviceInstances } = ctx;
+          if (!serviceInstances) return;
+          for (const serviceInstance of serviceInstances) {
+            yield { serviceInstance };
+          }
         }
-      }).then(this.handleInstanceUpdateTask)
+      ).then(this.handleInstanceUpdateTask)
       // .emits("meta.process_signal_queue_requested"), // TODO Has to happen after the endpoints has been created...
     );
     this.updateInstanceId = CadenzaService.createMetaTask(
@@ -572,7 +582,7 @@ var ServiceRegistry = class _ServiceRegistry {
         if (instancesToTry.length === 0) {
           if (this.useSocket) {
             emit(
-              `meta.service_registry.socket_failed:${context.__instance}`,
+              `meta.service_registry.socket_failed:${context.__fetchId}`,
               context
             );
           }
@@ -585,17 +595,18 @@ var ServiceRegistry = class _ServiceRegistry {
           selected = instancesToTry[Math.floor(Math.random() * instancesToTry.length)];
         }
         context.__instance = selected.uuid;
+        context.__fetchId = `${selected.address}_${selected.port}`;
         context.__triedInstances = triedInstances;
         context.__triedInstances.push(selected.uuid);
         context.__retries = retries;
         if (this.useSocket) {
           emit(
-            `meta.service_registry.selected_instance_for_socket:${context.__instance}`,
+            `meta.service_registry.selected_instance_for_socket:${context.__fetchId}`,
             context
           );
         } else {
           emit(
-            `meta.service_registry.selected_instance_for_fetch:${context.__instance}`,
+            `meta.service_registry.selected_instance_for_fetch:${context.__fetchId}`,
             context
           );
         }
@@ -625,12 +636,12 @@ var ServiceRegistry = class _ServiceRegistry {
           errored: true
         };
       }
-      const self2 = (_a2 = this.instances.get(this.serviceName)) == null ? void 0 : _a2.find((i) => i.uuid === this.serviceInstanceId);
+      const self = (_a2 = this.instances.get(this.serviceName)) == null ? void 0 : _a2.find((i) => i.uuid === this.serviceInstanceId);
       return __spreadProps(__spreadValues({}, ctx), {
         __status: "ok",
-        __numberOfRunningGraphs: (_b2 = self2 == null ? void 0 : self2.numberOfRunningGraphs) != null ? _b2 : 0,
-        __health: (_c2 = self2 == null ? void 0 : self2.health) != null ? _c2 : {},
-        __active: (_d2 = self2 == null ? void 0 : self2.isActive) != null ? _d2 : false
+        __numberOfRunningGraphs: (_b2 = self == null ? void 0 : self.numberOfRunningGraphs) != null ? _b2 : 0,
+        __health: (_c2 = self == null ? void 0 : self.health) != null ? _c2 : {},
+        __active: (_d2 = self == null ? void 0 : self.isActive) != null ? _d2 : false
       });
     }).doOn("meta.socket.status_check_requested");
     this.insertServiceTask = CadenzaService.createCadenzaDBInsertTask(
@@ -759,11 +770,11 @@ var ServiceRegistry = class _ServiceRegistry {
         "Setup service",
         (ctx) => {
           var _a2, _b2;
-          const { service_instance, data, __useSocket, __retryCount } = ctx;
-          this.serviceInstanceId = (_a2 = service_instance == null ? void 0 : service_instance.uuid) != null ? _a2 : data == null ? void 0 : data.uuid;
+          const { serviceInstance, data, __useSocket, __retryCount } = ctx;
+          this.serviceInstanceId = (_a2 = serviceInstance == null ? void 0 : serviceInstance.uuid) != null ? _a2 : data == null ? void 0 : data.uuid;
           this.instances.set(
-            (_b2 = data == null ? void 0 : data.service_name) != null ? _b2 : service_instance == null ? void 0 : service_instance.service_name,
-            [__spreadValues({}, service_instance != null ? service_instance : data)]
+            (_b2 = data == null ? void 0 : data.service_name) != null ? _b2 : serviceInstance == null ? void 0 : serviceInstance.service_name,
+            [__spreadValues({}, serviceInstance != null ? serviceInstance : data)]
           );
           this.useSocket = __useSocket;
           this.retryCount = __retryCount;
@@ -1173,17 +1184,12 @@ var RestController = class _RestController {
     CadenzaService.createMetaTask(
       "Setup fetch client",
       (ctx, emit) => {
-        const {
-          serviceName,
-          serviceInstanceId,
-          serviceAddress,
-          servicePort,
-          protocol
-        } = ctx;
+        const { serviceName, serviceAddress, servicePort, protocol } = ctx;
         const port = protocol === "https" ? 443 : servicePort;
         const URL = `${protocol}://${serviceAddress}:${port}`;
+        const fetchId = `${serviceAddress}_${port}`;
         CadenzaService.createMetaTask(
-          "Send Handshake",
+          `Send Handshake to ${URL}`,
           (ctx2, emit2) => __async(null, null, function* () {
             var _a2;
             console.log("Sending handshake", ctx2);
@@ -1201,10 +1207,7 @@ var RestController = class _RestController {
                 (_a2 = result.__error) != null ? _a2 : `Failed to connect to service ${serviceName} ${ctx2.serviceInstanceId}`
               );
             }
-            console.log(
-              `Connected to service ${serviceName} ${ctx2.serviceInstanceId}`,
-              result
-            );
+            console.log(`Connected to service ${serviceName} ${URL}`, result);
             for (const communicationType of ctx2.communicationTypes) {
               emit2("meta.fetch.service_communication_established", {
                 data: {
@@ -1223,9 +1226,9 @@ var RestController = class _RestController {
             retryDelayMax: 5e3,
             retryDelayFactor: 1.5
           }
-        ).doOn(`meta.fetch.handshake_requested:${serviceInstanceId}`).emits("meta.fetch.handshake_complete");
+        ).doOn(`meta.fetch.handshake_requested:${fetchId}`).emits("meta.fetch.handshake_complete").emitsOnFail("meta.fetch.handshake_failed");
         CadenzaService.createMetaTask(
-          "Delegate flow to REST server",
+          `Delegate flow to REST server ${URL}`,
           (ctx2, emit2) => __async(null, null, function* () {
             if (ctx2.__remoteRoutineName === void 0) {
               return;
@@ -1256,11 +1259,11 @@ var RestController = class _RestController {
           }),
           "Sends delegation request"
         ).doOn(
-          `meta.service_registry.selected_instance_for_fetch:${serviceInstanceId}`,
-          `meta.service_registry.socket_failed:${serviceInstanceId}`
+          `meta.service_registry.selected_instance_for_fetch:${fetchId}`,
+          `meta.service_registry.socket_failed:${fetchId}`
         ).emitsOnFail("meta.fetch.delegate_failed");
         CadenzaService.createMetaTask(
-          "Transmit signal to server",
+          `Transmit signal to server ${URL}`,
           (ctx2, emit2) => __async(null, null, function* () {
             if (ctx2.__signalName === void 0) {
               return;
@@ -1288,12 +1291,12 @@ var RestController = class _RestController {
           }),
           "Sends signal request"
         ).doOn(
-          `meta.service_registry.selected_instance_for_fetch:${serviceInstanceId}`,
+          `meta.service_registry.selected_instance_for_fetch:${fetchId}`,
           `meta.signal_controller.remote_signal_registered:${serviceName}`,
           "meta.signal_controller.wildcard_signal_registered"
         ).emitsOnFail("meta.fetch.signal_transmission_failed");
         CadenzaService.createMetaTask(
-          "Request status",
+          `Request status from ${URL}`,
           (ctx2) => __async(null, null, function* () {
             let status;
             try {
@@ -1316,12 +1319,20 @@ var RestController = class _RestController {
       CadenzaService.createMetaTask(
         "Prepare handshake",
         (ctx, emit) => {
-          const { serviceInstanceId, serviceName, communicationTypes } = ctx;
-          emit(`meta.fetch.handshake_requested:${serviceInstanceId}`, {
+          const {
+            serviceName,
+            serviceInstanceId,
+            communicationTypes,
+            serviceAddress,
+            servicePort
+          } = ctx;
+          const fetchId = `${serviceAddress}_${servicePort}`;
+          emit(`meta.fetch.handshake_requested:${fetchId}`, {
             serviceInstanceId,
             serviceName,
             communicationTypes,
             handshakeData: {
+              instanceId: CadenzaService.serviceRegistry.serviceInstanceId
               // JWT token...
             }
           });
@@ -1533,16 +1544,12 @@ var SocketController = class _SocketController {
     CadenzaService.createMetaTask(
       "Connect to socket server",
       (ctx) => {
-        const {
-          serviceName,
-          serviceInstanceId,
-          serviceAddress,
-          servicePort,
-          protocol
-        } = ctx;
+        const { serviceName, serviceAddress, servicePort, protocol } = ctx;
         const socketProtocol = protocol === "https" ? "wss" : "ws";
         const port = protocol === "https" ? 443 : servicePort;
-        const socket = (0, import_socket2.io)(`${socketProtocol}://${serviceAddress}:${port}`, {
+        const URL = `${socketProtocol}://${serviceAddress}:${port}`;
+        const fetchId = `${serviceAddress}_${port}`;
+        const socket = (0, import_socket2.io)(URL, {
           reconnection: true,
           reconnectionAttempts: 20,
           reconnectionDelay: 1e3,
@@ -1550,11 +1557,7 @@ var SocketController = class _SocketController {
           randomizationFactor: 0.5,
           retries: 5
         });
-        console.log(
-          "SocketClient: Connecting to",
-          `${socketProtocol}://${serviceAddress}:${port}`,
-          socket
-        );
+        console.log("SocketClient: Connecting to", URL, socket);
         socket.on("connect", () => {
           console.log("SocketClient: CONNECTED");
           CadenzaService.broker.emit("meta.socket_client.connected", ctx);
@@ -1566,7 +1569,7 @@ var SocketController = class _SocketController {
         socket.on("delegation_progress", (ctx2) => {
           CadenzaService.broker.emit(
             `meta.socket_client.delegation_progress:${ctx2.__metadata.__deputyExecId}`,
-            __spreadValues({ serviceInstanceId }, ctx2)
+            ctx2
           );
         });
         socket.on("status_update", (status) => {
@@ -1581,13 +1584,13 @@ var SocketController = class _SocketController {
           CadenzaService.broker.emit("meta.socket_client.error", err);
         });
         socket.on("disconnect", () => {
-          console.log("SocketClient: Disconnected", serviceInstanceId);
+          console.log("SocketClient: Disconnected", URL);
           CadenzaService.broker.emit("meta.socket_client.disconnected", {
-            serviceInstanceId
+            URL
           });
         });
         CadenzaService.createMetaTask(
-          `Delegate flow to ${serviceInstanceId}`,
+          `Delegate flow to ${URL}`,
           (ctx2, emit) => __async(null, null, function* () {
             if (ctx2.__remoteRoutineName === void 0) {
               return;
@@ -1600,10 +1603,7 @@ var SocketController = class _SocketController {
                   __error: `Timeout error: ${err}`,
                   errored: true
                 }, ctx2), ctx2.__metadata);
-                emit(
-                  `meta.socket_client.delegate_failed:${serviceInstanceId}`,
-                  resultContext
-                );
+                emit(`meta.socket_client.delegate_failed`, resultContext);
                 return;
               }
               const metadata = resultContext.__metadata;
@@ -1615,12 +1615,10 @@ var SocketController = class _SocketController {
               );
             });
           }),
-          `Delegate flow to instance ${serviceInstanceId} of service ${serviceName} with address ${serviceAddress}:${servicePort}`
-        ).doOn(
-          `meta.service_registry.selected_instance_for_socket:${serviceInstanceId}`
-        );
+          `Delegate flow to service ${serviceName} with address ${URL}`
+        ).doOn(`meta.service_registry.selected_instance_for_socket:${fetchId}`);
         CadenzaService.createMetaTask(
-          `Transmit signal to ${serviceInstanceId}`,
+          `Transmit signal to ${URL}`,
           (ctx2, emit) => __async(null, null, function* () {
             var _a2;
             if (ctx2.__signalName === void 0) {
@@ -1634,7 +1632,7 @@ var SocketController = class _SocketController {
                   errored: true
                 }, ctx2), ctx2.__metadata);
                 emit(
-                  `meta.socket_client.signal_transmission_failed:${serviceInstanceId}`,
+                  `meta.socket_client.signal_transmission_failed`,
                   response
                 );
                 return;
@@ -1647,15 +1645,13 @@ var SocketController = class _SocketController {
               }
             });
           }),
-          `Transmits signal to instance ${serviceInstanceId} of service ${serviceName} with address ${serviceAddress}:${servicePort}`
-        ).doOn(
-          `meta.service_registry.selected_instance_for_socket:${serviceInstanceId}`
-        );
+          `Transmits signal to service ${serviceName} with address ${URL}`
+        ).doOn(`meta.service_registry.selected_instance_for_socket:${fetchId}`);
         CadenzaService.createMetaTask(
-          "Shutdown SocketClient",
+          `Shutdown SocketClient ${URL}`,
           () => socket.close(),
           "Shuts down the socket client"
-        ).doOn("meta.socket_shutdown_requested").emits("meta.socket_client_shutdown_complete");
+        ).doOn(`meta.socket_shutdown_requested:${fetchId}`).emits("meta.socket_client_shutdown_complete");
         return true;
       },
       "Connects to a specified socket server"
@@ -2012,443 +2008,8 @@ var GraphMetadataController = class _GraphMetadataController {
   }
 };
 
-// node_modules/lodash-es/_freeGlobal.js
-var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
-var freeGlobal_default = freeGlobal;
-
-// node_modules/lodash-es/_root.js
-var freeSelf = typeof self == "object" && self && self.Object === Object && self;
-var root = freeGlobal_default || freeSelf || Function("return this")();
-var root_default = root;
-
-// node_modules/lodash-es/_Symbol.js
-var Symbol2 = root_default.Symbol;
-var Symbol_default = Symbol2;
-
-// node_modules/lodash-es/_getRawTag.js
-var objectProto = Object.prototype;
-var hasOwnProperty = objectProto.hasOwnProperty;
-var nativeObjectToString = objectProto.toString;
-var symToStringTag = Symbol_default ? Symbol_default.toStringTag : void 0;
-function getRawTag(value) {
-  var isOwn = hasOwnProperty.call(value, symToStringTag), tag = value[symToStringTag];
-  try {
-    value[symToStringTag] = void 0;
-    var unmasked = true;
-  } catch (e) {
-  }
-  var result = nativeObjectToString.call(value);
-  if (unmasked) {
-    if (isOwn) {
-      value[symToStringTag] = tag;
-    } else {
-      delete value[symToStringTag];
-    }
-  }
-  return result;
-}
-var getRawTag_default = getRawTag;
-
-// node_modules/lodash-es/_objectToString.js
-var objectProto2 = Object.prototype;
-var nativeObjectToString2 = objectProto2.toString;
-function objectToString(value) {
-  return nativeObjectToString2.call(value);
-}
-var objectToString_default = objectToString;
-
-// node_modules/lodash-es/_baseGetTag.js
-var nullTag = "[object Null]";
-var undefinedTag = "[object Undefined]";
-var symToStringTag2 = Symbol_default ? Symbol_default.toStringTag : void 0;
-function baseGetTag(value) {
-  if (value == null) {
-    return value === void 0 ? undefinedTag : nullTag;
-  }
-  return symToStringTag2 && symToStringTag2 in Object(value) ? getRawTag_default(value) : objectToString_default(value);
-}
-var baseGetTag_default = baseGetTag;
-
-// node_modules/lodash-es/isObjectLike.js
-function isObjectLike(value) {
-  return value != null && typeof value == "object";
-}
-var isObjectLike_default = isObjectLike;
-
-// node_modules/lodash-es/isSymbol.js
-var symbolTag = "[object Symbol]";
-function isSymbol(value) {
-  return typeof value == "symbol" || isObjectLike_default(value) && baseGetTag_default(value) == symbolTag;
-}
-var isSymbol_default = isSymbol;
-
-// node_modules/lodash-es/_arrayMap.js
-function arrayMap(array, iteratee) {
-  var index = -1, length = array == null ? 0 : array.length, result = Array(length);
-  while (++index < length) {
-    result[index] = iteratee(array[index], index, array);
-  }
-  return result;
-}
-var arrayMap_default = arrayMap;
-
-// node_modules/lodash-es/isArray.js
-var isArray = Array.isArray;
-var isArray_default = isArray;
-
-// node_modules/lodash-es/_baseToString.js
-var INFINITY = 1 / 0;
-var symbolProto = Symbol_default ? Symbol_default.prototype : void 0;
-var symbolToString = symbolProto ? symbolProto.toString : void 0;
-function baseToString(value) {
-  if (typeof value == "string") {
-    return value;
-  }
-  if (isArray_default(value)) {
-    return arrayMap_default(value, baseToString) + "";
-  }
-  if (isSymbol_default(value)) {
-    return symbolToString ? symbolToString.call(value) : "";
-  }
-  var result = value + "";
-  return result == "0" && 1 / value == -INFINITY ? "-0" : result;
-}
-var baseToString_default = baseToString;
-
-// node_modules/lodash-es/toString.js
-function toString(value) {
-  return value == null ? "" : baseToString_default(value);
-}
-var toString_default = toString;
-
-// node_modules/lodash-es/_arrayReduce.js
-function arrayReduce(array, iteratee, accumulator, initAccum) {
-  var index = -1, length = array == null ? 0 : array.length;
-  if (initAccum && length) {
-    accumulator = array[++index];
-  }
-  while (++index < length) {
-    accumulator = iteratee(accumulator, array[index], index, array);
-  }
-  return accumulator;
-}
-var arrayReduce_default = arrayReduce;
-
-// node_modules/lodash-es/_basePropertyOf.js
-function basePropertyOf(object) {
-  return function(key) {
-    return object == null ? void 0 : object[key];
-  };
-}
-var basePropertyOf_default = basePropertyOf;
-
-// node_modules/lodash-es/_deburrLetter.js
-var deburredLetters = {
-  // Latin-1 Supplement block.
-  "\xC0": "A",
-  "\xC1": "A",
-  "\xC2": "A",
-  "\xC3": "A",
-  "\xC4": "A",
-  "\xC5": "A",
-  "\xE0": "a",
-  "\xE1": "a",
-  "\xE2": "a",
-  "\xE3": "a",
-  "\xE4": "a",
-  "\xE5": "a",
-  "\xC7": "C",
-  "\xE7": "c",
-  "\xD0": "D",
-  "\xF0": "d",
-  "\xC8": "E",
-  "\xC9": "E",
-  "\xCA": "E",
-  "\xCB": "E",
-  "\xE8": "e",
-  "\xE9": "e",
-  "\xEA": "e",
-  "\xEB": "e",
-  "\xCC": "I",
-  "\xCD": "I",
-  "\xCE": "I",
-  "\xCF": "I",
-  "\xEC": "i",
-  "\xED": "i",
-  "\xEE": "i",
-  "\xEF": "i",
-  "\xD1": "N",
-  "\xF1": "n",
-  "\xD2": "O",
-  "\xD3": "O",
-  "\xD4": "O",
-  "\xD5": "O",
-  "\xD6": "O",
-  "\xD8": "O",
-  "\xF2": "o",
-  "\xF3": "o",
-  "\xF4": "o",
-  "\xF5": "o",
-  "\xF6": "o",
-  "\xF8": "o",
-  "\xD9": "U",
-  "\xDA": "U",
-  "\xDB": "U",
-  "\xDC": "U",
-  "\xF9": "u",
-  "\xFA": "u",
-  "\xFB": "u",
-  "\xFC": "u",
-  "\xDD": "Y",
-  "\xFD": "y",
-  "\xFF": "y",
-  "\xC6": "Ae",
-  "\xE6": "ae",
-  "\xDE": "Th",
-  "\xFE": "th",
-  "\xDF": "ss",
-  // Latin Extended-A block.
-  "\u0100": "A",
-  "\u0102": "A",
-  "\u0104": "A",
-  "\u0101": "a",
-  "\u0103": "a",
-  "\u0105": "a",
-  "\u0106": "C",
-  "\u0108": "C",
-  "\u010A": "C",
-  "\u010C": "C",
-  "\u0107": "c",
-  "\u0109": "c",
-  "\u010B": "c",
-  "\u010D": "c",
-  "\u010E": "D",
-  "\u0110": "D",
-  "\u010F": "d",
-  "\u0111": "d",
-  "\u0112": "E",
-  "\u0114": "E",
-  "\u0116": "E",
-  "\u0118": "E",
-  "\u011A": "E",
-  "\u0113": "e",
-  "\u0115": "e",
-  "\u0117": "e",
-  "\u0119": "e",
-  "\u011B": "e",
-  "\u011C": "G",
-  "\u011E": "G",
-  "\u0120": "G",
-  "\u0122": "G",
-  "\u011D": "g",
-  "\u011F": "g",
-  "\u0121": "g",
-  "\u0123": "g",
-  "\u0124": "H",
-  "\u0126": "H",
-  "\u0125": "h",
-  "\u0127": "h",
-  "\u0128": "I",
-  "\u012A": "I",
-  "\u012C": "I",
-  "\u012E": "I",
-  "\u0130": "I",
-  "\u0129": "i",
-  "\u012B": "i",
-  "\u012D": "i",
-  "\u012F": "i",
-  "\u0131": "i",
-  "\u0134": "J",
-  "\u0135": "j",
-  "\u0136": "K",
-  "\u0137": "k",
-  "\u0138": "k",
-  "\u0139": "L",
-  "\u013B": "L",
-  "\u013D": "L",
-  "\u013F": "L",
-  "\u0141": "L",
-  "\u013A": "l",
-  "\u013C": "l",
-  "\u013E": "l",
-  "\u0140": "l",
-  "\u0142": "l",
-  "\u0143": "N",
-  "\u0145": "N",
-  "\u0147": "N",
-  "\u014A": "N",
-  "\u0144": "n",
-  "\u0146": "n",
-  "\u0148": "n",
-  "\u014B": "n",
-  "\u014C": "O",
-  "\u014E": "O",
-  "\u0150": "O",
-  "\u014D": "o",
-  "\u014F": "o",
-  "\u0151": "o",
-  "\u0154": "R",
-  "\u0156": "R",
-  "\u0158": "R",
-  "\u0155": "r",
-  "\u0157": "r",
-  "\u0159": "r",
-  "\u015A": "S",
-  "\u015C": "S",
-  "\u015E": "S",
-  "\u0160": "S",
-  "\u015B": "s",
-  "\u015D": "s",
-  "\u015F": "s",
-  "\u0161": "s",
-  "\u0162": "T",
-  "\u0164": "T",
-  "\u0166": "T",
-  "\u0163": "t",
-  "\u0165": "t",
-  "\u0167": "t",
-  "\u0168": "U",
-  "\u016A": "U",
-  "\u016C": "U",
-  "\u016E": "U",
-  "\u0170": "U",
-  "\u0172": "U",
-  "\u0169": "u",
-  "\u016B": "u",
-  "\u016D": "u",
-  "\u016F": "u",
-  "\u0171": "u",
-  "\u0173": "u",
-  "\u0174": "W",
-  "\u0175": "w",
-  "\u0176": "Y",
-  "\u0177": "y",
-  "\u0178": "Y",
-  "\u0179": "Z",
-  "\u017B": "Z",
-  "\u017D": "Z",
-  "\u017A": "z",
-  "\u017C": "z",
-  "\u017E": "z",
-  "\u0132": "IJ",
-  "\u0133": "ij",
-  "\u0152": "Oe",
-  "\u0153": "oe",
-  "\u0149": "'n",
-  "\u017F": "s"
-};
-var deburrLetter = basePropertyOf_default(deburredLetters);
-var deburrLetter_default = deburrLetter;
-
-// node_modules/lodash-es/deburr.js
-var reLatin = /[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g;
-var rsComboMarksRange = "\\u0300-\\u036f";
-var reComboHalfMarksRange = "\\ufe20-\\ufe2f";
-var rsComboSymbolsRange = "\\u20d0-\\u20ff";
-var rsComboRange = rsComboMarksRange + reComboHalfMarksRange + rsComboSymbolsRange;
-var rsCombo = "[" + rsComboRange + "]";
-var reComboMark = RegExp(rsCombo, "g");
-function deburr(string) {
-  string = toString_default(string);
-  return string && string.replace(reLatin, deburrLetter_default).replace(reComboMark, "");
-}
-var deburr_default = deburr;
-
-// node_modules/lodash-es/_asciiWords.js
-var reAsciiWord = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
-function asciiWords(string) {
-  return string.match(reAsciiWord) || [];
-}
-var asciiWords_default = asciiWords;
-
-// node_modules/lodash-es/_hasUnicodeWord.js
-var reHasUnicodeWord = /[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
-function hasUnicodeWord(string) {
-  return reHasUnicodeWord.test(string);
-}
-var hasUnicodeWord_default = hasUnicodeWord;
-
-// node_modules/lodash-es/_unicodeWords.js
-var rsAstralRange = "\\ud800-\\udfff";
-var rsComboMarksRange2 = "\\u0300-\\u036f";
-var reComboHalfMarksRange2 = "\\ufe20-\\ufe2f";
-var rsComboSymbolsRange2 = "\\u20d0-\\u20ff";
-var rsComboRange2 = rsComboMarksRange2 + reComboHalfMarksRange2 + rsComboSymbolsRange2;
-var rsDingbatRange = "\\u2700-\\u27bf";
-var rsLowerRange = "a-z\\xdf-\\xf6\\xf8-\\xff";
-var rsMathOpRange = "\\xac\\xb1\\xd7\\xf7";
-var rsNonCharRange = "\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf";
-var rsPunctuationRange = "\\u2000-\\u206f";
-var rsSpaceRange = " \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000";
-var rsUpperRange = "A-Z\\xc0-\\xd6\\xd8-\\xde";
-var rsVarRange = "\\ufe0e\\ufe0f";
-var rsBreakRange = rsMathOpRange + rsNonCharRange + rsPunctuationRange + rsSpaceRange;
-var rsApos = "['\u2019]";
-var rsBreak = "[" + rsBreakRange + "]";
-var rsCombo2 = "[" + rsComboRange2 + "]";
-var rsDigits = "\\d+";
-var rsDingbat = "[" + rsDingbatRange + "]";
-var rsLower = "[" + rsLowerRange + "]";
-var rsMisc = "[^" + rsAstralRange + rsBreakRange + rsDigits + rsDingbatRange + rsLowerRange + rsUpperRange + "]";
-var rsFitz = "\\ud83c[\\udffb-\\udfff]";
-var rsModifier = "(?:" + rsCombo2 + "|" + rsFitz + ")";
-var rsNonAstral = "[^" + rsAstralRange + "]";
-var rsRegional = "(?:\\ud83c[\\udde6-\\uddff]){2}";
-var rsSurrPair = "[\\ud800-\\udbff][\\udc00-\\udfff]";
-var rsUpper = "[" + rsUpperRange + "]";
-var rsZWJ = "\\u200d";
-var rsMiscLower = "(?:" + rsLower + "|" + rsMisc + ")";
-var rsMiscUpper = "(?:" + rsUpper + "|" + rsMisc + ")";
-var rsOptContrLower = "(?:" + rsApos + "(?:d|ll|m|re|s|t|ve))?";
-var rsOptContrUpper = "(?:" + rsApos + "(?:D|LL|M|RE|S|T|VE))?";
-var reOptMod = rsModifier + "?";
-var rsOptVar = "[" + rsVarRange + "]?";
-var rsOptJoin = "(?:" + rsZWJ + "(?:" + [rsNonAstral, rsRegional, rsSurrPair].join("|") + ")" + rsOptVar + reOptMod + ")*";
-var rsOrdLower = "\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])";
-var rsOrdUpper = "\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])";
-var rsSeq = rsOptVar + reOptMod + rsOptJoin;
-var rsEmoji = "(?:" + [rsDingbat, rsRegional, rsSurrPair].join("|") + ")" + rsSeq;
-var reUnicodeWord = RegExp([
-  rsUpper + "?" + rsLower + "+" + rsOptContrLower + "(?=" + [rsBreak, rsUpper, "$"].join("|") + ")",
-  rsMiscUpper + "+" + rsOptContrUpper + "(?=" + [rsBreak, rsUpper + rsMiscLower, "$"].join("|") + ")",
-  rsUpper + "?" + rsMiscLower + "+" + rsOptContrLower,
-  rsUpper + "+" + rsOptContrUpper,
-  rsOrdUpper,
-  rsOrdLower,
-  rsDigits,
-  rsEmoji
-].join("|"), "g");
-function unicodeWords(string) {
-  return string.match(reUnicodeWord) || [];
-}
-var unicodeWords_default = unicodeWords;
-
-// node_modules/lodash-es/words.js
-function words(string, pattern, guard) {
-  string = toString_default(string);
-  pattern = guard ? void 0 : pattern;
-  if (pattern === void 0) {
-    return hasUnicodeWord_default(string) ? unicodeWords_default(string) : asciiWords_default(string);
-  }
-  return string.match(pattern) || [];
-}
-var words_default = words;
-
-// node_modules/lodash-es/_createCompounder.js
-var rsApos2 = "['\u2019]";
-var reApos = RegExp(rsApos2, "g");
-function createCompounder(callback) {
-  return function(string) {
-    return arrayReduce_default(words_default(deburr_default(string).replace(reApos, "")), callback, "");
-  };
-}
-var createCompounder_default = createCompounder;
-
-// node_modules/lodash-es/snakeCase.js
-var snakeCase = createCompounder_default(function(result, word, index) {
-  return result + (index ? "_" : "") + word.toLowerCase();
-});
-var snakeCase_default = snakeCase;
+// src/Cadenza.ts
+var import_lodash_es2 = require("lodash-es");
 
 // src/types/database.ts
 var SCHEMA_TYPES = [
@@ -2471,6 +2032,7 @@ var SCHEMA_TYPES = [
 
 // src/database/DatabaseController.ts
 var import_pg = require("pg");
+var import_lodash_es = require("lodash-es");
 var _a, _b, _c, _d;
 var DatabaseController = class _DatabaseController {
   constructor() {
@@ -3060,6 +2622,15 @@ var DatabaseController = class _DatabaseController {
       }
     });
   }
+  toCamelCase(rows) {
+    return rows.map((row) => {
+      const camelCasedRow = {};
+      for (const [key, value] of Object.entries(row)) {
+        camelCasedRow[(0, import_lodash_es.camelCase)(key)] = value;
+      }
+      return camelCasedRow;
+    });
+  }
   queryFunction(tableName, context) {
     return __async(this, null, function* () {
       const {
@@ -3072,9 +2643,8 @@ var DatabaseController = class _DatabaseController {
       } = context;
       let sql = `SELECT ${fields.length ? fields.join(", ") : "*"} FROM ${tableName}`;
       const params = [];
-      const conditions = [];
       if (Object.keys(filter).length > 0) {
-        conditions.push(this.buildWhereClause(filter, params));
+        sql += " " + this.buildWhereClause(filter, params);
       }
       if (Object.keys(joins).length > 0) {
         sql += " " + this.buildJoinClause(joins);
@@ -3082,15 +2652,19 @@ var DatabaseController = class _DatabaseController {
       if (Object.keys(sort).length > 0) {
         sql += " ORDER BY " + Object.entries(sort).map(([field, direction]) => `${field} ${direction}`).join(", ");
       }
-      if (limit !== void 0) sql += ` LIMIT $${params.length + 1}`;
-      params.push(limit);
-      if (offset !== void 0) sql += ` OFFSET $${params.length + 1}`;
-      params.push(offset);
-      console.log("Query", sql);
+      if (limit !== void 0) {
+        sql += ` LIMIT $${params.length + 1}`;
+        params.push(limit);
+      }
+      if (offset !== void 0) {
+        sql += ` OFFSET $${params.length + 1}`;
+        params.push(offset);
+      }
       try {
         const result = yield this.dbClient.query(sql, params);
+        const rows = this.toCamelCase(result.rows);
         return __spreadValues({
-          [`${tableName}s`]: result.rows,
+          [`${(0, import_lodash_es.camelCase)(tableName)}s`]: rows,
           rowCount: result.rowCount,
           __success: true
         }, context);
@@ -3115,7 +2689,7 @@ var DatabaseController = class _DatabaseController {
         const resolvedData = yield this.resolveNestedData(data, tableName);
         const isBatch = Array.isArray(resolvedData);
         const rows = isBatch ? resolvedData : [resolvedData];
-        const sql = `INSERT INTO ${tableName} (${Object.keys(rows[0]).map(snakeCase_default).join(", ")}) VALUES `;
+        const sql = `INSERT INTO ${tableName} (${Object.keys(rows[0]).map(import_lodash_es.snakeCase).join(", ")}) VALUES `;
         const values = rows.map(
           (row) => `(${Object.values(row).map((value, i) => {
             if (typeof value === "object" && (value == null ? void 0 : value.__effect)) {
@@ -3160,8 +2734,9 @@ var DatabaseController = class _DatabaseController {
           params
         );
         if (transaction) yield client.query("COMMIT");
+        const resultRows = this.toCamelCase(result.rows);
         return {
-          [`${tableName}${isBatch ? "s" : ""}`]: isBatch ? result.rows : result.rows[0],
+          [`${(0, import_lodash_es.camelCase)(tableName)}${isBatch ? "s" : ""}`]: isBatch ? resultRows : resultRows[0],
           rowCount: result.rowCount,
           __inserted: true
         };
@@ -3190,13 +2765,14 @@ var DatabaseController = class _DatabaseController {
         if (transaction) yield client.query("BEGIN");
         const resolvedData = yield this.resolveNestedData(data, tableName);
         const params = Object.values(resolvedData);
-        const setClause = Object.entries(Object.keys(resolvedData)).map(([i, key]) => `${snakeCase_default(key)} = $${parseInt(i) + 1}`).join(", ");
+        const setClause = Object.entries(Object.keys(resolvedData)).map(([i, key]) => `${(0, import_lodash_es.snakeCase)(key)} = $${parseInt(i) + 1}`).join(", ");
         const whereClause = this.buildWhereClause(filter, params);
         const sql = `UPDATE ${tableName} SET ${setClause} ${whereClause} RETURNING *;`;
         const result = yield client.query(sql, params);
         if (transaction) yield client.query("COMMIT");
+        const rows = this.toCamelCase(result.rows);
         return {
-          [`${tableName}`]: result.rows[0],
+          [`${(0, import_lodash_es.camelCase)(tableName)}`]: rows[0],
           __updated: true
         };
       } catch (error) {
@@ -3227,8 +2803,9 @@ var DatabaseController = class _DatabaseController {
         const sql = `DELETE FROM ${tableName} ${whereClause} RETURNING *`;
         const result = yield client.query(sql, params);
         if (transaction) yield client.query("COMMIT");
+        const rows = this.toCamelCase(result.rows);
         return {
-          [`${tableName}`]: result.rows[0],
+          [`${(0, import_lodash_es.camelCase)(tableName)}`]: rows[0],
           __deleted: true
         };
       } catch (error) {
@@ -3249,7 +2826,7 @@ var DatabaseController = class _DatabaseController {
     const conditions = [];
     for (const [key, value] of Object.entries(filter)) {
       if (value !== void 0) {
-        conditions.push(`${snakeCase_default(key)} = $${params.length + 1}`);
+        conditions.push(`${(0, import_lodash_es.snakeCase)(key)} = $${params.length + 1}`);
         params.push(value);
       }
     }
@@ -3258,7 +2835,7 @@ var DatabaseController = class _DatabaseController {
   buildJoinClause(joins) {
     let joinSql = "";
     for (const [table, join] of Object.entries(joins)) {
-      joinSql += ` LEFT JOIN ${snakeCase_default(table)} ${join.alias} ON ${join.on}`;
+      joinSql += ` LEFT JOIN ${(0, import_lodash_es.snakeCase)(table)} ${join.alias} ON ${join.on}`;
       if (join.joins) joinSql += " " + this.buildJoinClause(join.joins);
     }
     return joinSql;
@@ -3682,7 +3259,7 @@ var CadenzaService = class {
     if ((_g = options.cadenzaDB) == null ? void 0 : _g.connect) {
       import_core3.default.broker.emit("meta.initializing_service", {
         // Seed the CadenzaDB
-        service_instance: {
+        serviceInstance: {
           uuid: "cadenza-db",
           serviceName: "CadenzaDB",
           address: (_h = options.cadenzaDB) == null ? void 0 : _h.address,
@@ -3700,7 +3277,7 @@ var CadenzaService = class {
     (_j = options.relatedServices) == null ? void 0 : _j.forEach((service) => {
       var _a3;
       import_core3.default.broker.emit("meta.initializing_service", {
-        service_instance: {
+        serviceInstance: {
           uuid: service[0],
           serviceName: service[1],
           address: service[2].split(":")[0],
@@ -3780,7 +3357,7 @@ var CadenzaService = class {
         port: parseInt((_e = process.env.CADENZA_DB_PORT) != null ? _e : "5000")
       },
       databaseType: "postgres",
-      databaseName: snakeCase_default(name),
+      databaseName: (0, import_lodash_es2.snakeCase)(name),
       poolSize: parseInt((_f = process.env.DATABASE_POOL_SIZE) != null ? _f : "10")
     }, options);
     import_core3.default.broker.emit("meta.database_init_requested", {
@@ -4010,17 +3587,4 @@ var index_default = CadenzaService;
   TaskOptions,
   ThrottleTagGetter
 });
-/*! Bundled license information:
-
-lodash-es/lodash.js:
-  (**
-   * @license
-   * Lodash (Custom Build) <https://lodash.com/>
-   * Build: `lodash modularize exports="es" -o ./`
-   * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
-   * Released under MIT license <https://lodash.com/license>
-   * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
-   * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
-   *)
-*/
 //# sourceMappingURL=index.js.map