@cadenza.io/service 2.2.2 → 2.2.4

package/dist/index.js

@@ -329,6 +329,9 @@ var ServiceRegistry = class _ServiceRegistry {
         } else {
           instances.push(serviceInstance);
         }
+        if (this.serviceName === serviceName) {
+          return false;
+        }
         if (!isFrontend && this.deputies.has(serviceName) || this.remoteSignals.has(serviceName)) {
           const clientCreated = instances?.some(
             (i) => i.address === address && i.port === port && i.clientCreated && i.isActive
@@ -455,24 +458,25 @@ var ServiceRegistry = class _ServiceRegistry {
     this.handleServiceHandshakeTask = CadenzaService.createMetaTask(
       "Handle service handshake",
       (ctx, emit) => {
-        const { serviceName, serviceAddress, servicePort } = ctx;
+        const { serviceName, serviceInstanceId } = ctx;
         const serviceInstances = this.instances.get(serviceName);
-        const instances = serviceInstances?.filter(
-          (i) => i.address === serviceAddress && i.port === servicePort
+        const instance = serviceInstances?.find(
+          (i) => i.uuid === serviceInstanceId
         );
-        for (const instance of instances ?? []) {
-          instance.isActive = true;
-          instance.isNonResponsive = false;
-          emit("global.meta.service_registry.service_handshake", {
-            data: {
-              isActive: instance.isActive,
-              isNonResponsive: instance.isNonResponsive
-            },
-            filter: {
-              uuid: instance.uuid
-            }
-          });
+        if (!instance) {
+          return false;
         }
+        instance.isActive = true;
+        instance.isNonResponsive = false;
+        emit("global.meta.service_registry.service_handshake", {
+          data: {
+            isActive: instance.isActive,
+            isNonResponsive: instance.isNonResponsive
+          },
+          filter: {
+            uuid: instance.uuid
+          }
+        });
         return true;
       },
       "Handles service handshake"
@@ -2462,11 +2466,8 @@ var DatabaseController = class _DatabaseController {
   constructor() {
     this.databaseName = "";
     this.dbClient = new import_pg.Pool({
-      user: process.env.DATABASE_USER ?? "postgres",
-      host: process.env.DATABASE_ADDRESS ?? "localhost",
-      port: parseInt(process.env.DATABASE_PORT ?? "5432"),
+      connectionString: process.env.DATABASE_ADDRESS ?? "",
       database: "postgres",
-      password: process.env.DATABASE_PASSWORD ?? "03gibnEF",
       ssl: {
         rejectUnauthorized: false
         // ← This bypasses the chain validation error
@@ -2489,20 +2490,15 @@ var DatabaseController = class _DatabaseController {
                 );
               }
               console.log(`Creating database ${databaseName}`, {
-                user: process.env.DATABASE_USER ?? "postgres",
-                host: process.env.DATABASE_ADDRESS ?? "localhost",
-                port: parseInt(process.env.DATABASE_PORT ?? "5432"),
+                connectionString: process.env.DATABASE_ADDRESS ?? "",
                 database: "postgres",
                 password: process.env.DATABASE_PASSWORD ?? "03gibnEF"
               });
               await this.dbClient.query(`CREATE DATABASE ${databaseName}`);
               console.log(`Database ${databaseName} created`);
               this.dbClient = new import_pg.Pool({
-                user: process.env.DATABASE_USER ?? "postgres",
-                host: process.env.DATABASE_ADDRESS ?? "localhost",
-                port: parseInt(process.env.DATABASE_PORT ?? "5432"),
+                connectionString: process.env.DATABASE_ADDRESS ?? "",
                 database: databaseName,
-                password: process.env.DATABASE_PASSWORD ?? "03gibnEF",
                 ssl: {
                   rejectUnauthorized: false
                   // ← This bypasses the chain validation error
@@ -3284,7 +3280,10 @@ var DatabaseController = class _DatabaseController {
   async updateFunction(tableName, context) {
     const { data, filter = {}, transaction = true } = context;
     if (!data || Object.keys(data).length === 0) {
-      return { errored: true, __error: "No data provided for update" };
+      return {
+        errored: true,
+        __error: `No data provided for update of ${tableName}`
+      };
     }
     let resultContext = {};
     const client = transaction ? await this.getClient() : this.dbClient;