elasticio-sailor-nodejs 3.0.0-dev7 → 3.0.0-sailor-proxy-dev1

package/run.js

@@ -24,6 +24,7 @@ function prepareSandbox() {
 }
 
 async function putOutToSea(settings, ipc) {
+    logger.trace({ settings }, 'putOutToSea called');
     ipc.send('init:started');
     const deferred = Q.defer();
     sailorInit = deferred.promise;
@@ -31,6 +32,7 @@ async function putOutToSea(settings, ipc) {
 
     //eslint-disable-next-line no-extra-boolean-cast
     if (!!settings.HOOK_SHUTDOWN) {
+        logger.trace('Running hook shutdown');
         disconnectRequired = false;
         //eslint-disable-next-line no-empty-function
         sailor.reportError = () => {
@@ -50,26 +52,10 @@ async function putOutToSea(settings, ipc) {
     }
 
     await sailor.runHookInit();
-    await sailor.run();
     deferred.resolve();
     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);
-    }
+    await sailor.run();
 }
 
 async function gracefulShutdown() {
@@ -82,14 +68,20 @@ async function gracefulShutdown() {
         return;
     }
 
-    // we connect to amqp, create channels, start listen a queue on init and interrupting this process with 'disconnect'
-    // will lead to undefined behaviour
+    // Wait for init to complete before disconnecting
     logger.trace('Checking/waiting for init before graceful shutdown');
     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) {
@@ -98,7 +90,7 @@ async function run(settings, ipc) {
         await putOutToSea(settings, ipc);
         logger.info('Fully initialized and waiting for messages');
     } catch (e) {
-        if (sailor && !sailor.amqpConnection.closed) {
+        if (sailor && !sailor.isConnected()) {
             await sailor.reportError(e);
         }
         logger.criticalErrorAndExit('putOutToSea.catch', e);

package/run.local.js

@@ -0,0 +1,14 @@
+const config = require('./config/local.json');
+
+function setEnvVars() {
+  for (const [key, value] of Object.entries(config)) {
+    process.env[key] = value;
+  }
+}
+setEnvVars();
+
+const { IPC } = require('./lib/ipc');
+const { run } = require('./run');
+const settings = require('./lib/settings.js');
+const ipc = new IPC();
+run(settings.readFrom(process.env), ipc);

package/tsconfig.json

@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "lib": [
+            "es2020"
+        ],
+        "types": ["node", "mocha"],
+        "module": "commonjs",
+        "esModuleInterop": true,
+        "target": "es2019",
+        "noImplicitAny": false,
+        "moduleResolution": "node",
+        "resolveJsonModule": true,
+        "sourceMap": true,
+        "outDir": "dist",
+        "skipLibCheck": true,
+        "typeRoots": ["./node_modules/@types", "./src/@types"]
+    },
+    "include": [
+        "src/**/*"
+    ]
+}