elasticio-sailor-nodejs 3.0.0-dev4 → 3.0.0-dev5

package/config/local.json

@@ -1,6 +1,6 @@
 {
     "LOG_LEVEL": "trace",
-    "ELASTICIO_FLOW_ID": "697b56aca8e2e9b35e1952da",
+    "ELASTICIO_FLOW_ID": "692ee23d4ab5d34bb7321559",
     "ELASTICIO_EXEC_ID": "exec_67890",
     "ELASTICIO_STEP_ID": "step_1",
     "ELASTICIO_CONTAINER_ID": "container_abcde",
@@ -9,11 +9,11 @@
     "ELASTICIO_COMP_ID": "component_3344",
     "ELASTICIO_FUNCTION": "data_trigger",
     "ELASTICIO_API_URI": "http://localhost:9000",
-    "ELASTICIO_API_USERNAME": "task-697b56aca8e2e9b35e1952da",
-    "ELASTICIO_API_KEY": "9b2e0465-b00c-4b57-af91-bfc3a830306c",
+    "ELASTICIO_API_USERNAME": "task-692ee23d4ab5d34bb7321559",
+    "ELASTICIO_API_KEY": "976ffec8-455b-494e-9478-2d66761f4040",
     "ELASTICIO_MESSAGE_CRYPTO_IV": "0.03091345790184",
     "ELASTICIO_MESSAGE_CRYPTO_PASSWORD": "password",
-    "ELASTICIO_SAILOR_PROXY_URI": "http://localhost:4001",
+    "ELASTICIO_SAILOR_PROXY_URI": "http://localhost:5001",
     "ELASTICIO_COMPONENT_PATH": "./spec/component",
     "ELASTICIO_EMIT_LIGHTWEIGHT_MESSAGE": "true"
 }

package/lib/proxy-client.js

@@ -202,6 +202,7 @@ class ProxyClient {
                 return resolve();
             }
 
+            // TODO: what if incoming message is received during graceful shutdown?
             this.clientSession.close(() => {
                 log.debug('Successfully closed HTTP2 connection');
                 resolve();

package/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+node = "18.16.1"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elasticio-sailor-nodejs",
   "description": "The official elastic.io library for bootstrapping and executing for Node.js connectors",
-  "version": "3.0.0-dev4",
+  "version": "3.0.0-dev5",
   "main": "run.js",
   "scripts": {
     "build": "tsc",

package/run.js

@@ -57,23 +57,6 @@ async function putOutToSea(settings, ipc) {
     ipc.send('init:ended');
 }
 
-async function disconnectAndExit() {
-    if (!disconnectRequired) {
-        return;
-    }
-    disconnectRequired = false;
-
-    try {
-        logger.info('Disconnecting...');
-        await sailor.disconnect();
-        logger.info('Successfully disconnected');
-        process.exit();
-    } catch (err) {
-        logger.error(err, 'Unable to disconnect');
-        process.exit(-1);
-    }
-}
-
 async function gracefulShutdown() {
     if (!disconnectRequired) {
         return;
@@ -90,8 +73,15 @@ async function gracefulShutdown() {
     await sailorInit;
     logger.trace('Waited an init before graceful shutdown');
 
-    await sailor.scheduleShutdown();
-    await disconnectAndExit();
+    try {
+        logger.info('Disconnecting...');
+        await sailor.scheduleShutdown();
+        logger.info('Successfully disconnected');
+        process.exit();
+    } catch (err) {
+        logger.error(err, 'Unable to disconnect');
+        process.exit(-1);
+    }
 }
 
 async function run(settings, ipc) {