@nginstack/engine-node 60.0.1 → 60.0.8

package/README.md

@@ -6,7 +6,7 @@ Engine node API can be used to start and stop an Engine programmatically in a No
 
 ### Prerequisites
 
-* [Node.js](https://nodejs.org) 14 or greater.
+* [Node.js](https://nodejs.org) 16 or greater.
 
 ### Installation
 

package/lib/Engine.js

@@ -1,7 +1,6 @@
 const child_process = require('child_process');
 const path = require('path');
 const fs = require('fs');
-const url = require('url');
 const del = require('del');
 const request = require('request');
 const getPort = require('get-port');
@@ -15,7 +14,7 @@ const net = require('net');
 
 tmp.setGracefulCleanup();
 
-const ENGINE_APP = 'Engine64.exe';
+const ENGINE_APP = os.platform() == 'win32' ? 'engine64.exe' : 'engine';
 const NGINT_APP_PATH = '/bin/win64/ngint.exe';
 const EXIT_CODE_RESTART_REQUIRED = 4;
 const ENGINE_STATUS_URL = '/api/service-status/v1/status';
@@ -79,6 +78,7 @@ class Engine {
     this.v8_ = options.v8 || false;
     this.startupTimeout = options.startupTimeout || ENGINE_STARTUP_TIMEOUT;
     this.startedSuccessfully = false;
+    this.inShutdown_ = false;
     this.redirectLogsToStdout_ = options.redirectLogsToStdout || false;
     this.onEngineClose_ = null;
     if (options.instanceId) {
@@ -125,15 +125,10 @@ class Engine {
       this.monitorTimeoutId_ = null;
     }
     this.monitorEnabled_ = true;
-    request.get(url.format({
-      protocol: 'http',
-      hostname: 'localhost',
-      port: this.httpPort,
-      pathname: ENGINE_STATUS_URL
-    }), (error, response) => {
+    request.get(`http://localhost:${this.httpPort}${ENGINE_STATUS_URL}`, (_error, response) => {
       if (response && response.statusCode) {
         this.lastStatusCode_ = response.statusCode;
-        if (this.lastStatusCode_ === 500) {
+        if (this.lastStatusCode_ === 500 && !this.inShutdown_) {
           console.info(`Engine response (${response.statusCode}):\n${response.body}`);
         }
       } else {
@@ -250,9 +245,12 @@ class Engine {
             if (!httpUrl.startsWith('http://') && !httpUrl.startsWith('https://')) {
               httpUrl = 'http://' + httpUrl;
             }
-            request.get(url.resolve(httpUrl, ENGINE_DOWNLOAD_URL))
+            request.get(new URL(ENGINE_DOWNLOAD_URL, httpUrl).toString())
               .pipe(fs.createWriteStream(this.enginePath))
               .on('close', () => {
+                if (os.platform() != 'win32') {
+                  fs.chmodSync(path.join(this.installPath, ENGINE_APP), '755');
+                }
                 resolve();
               })
               .on('error', (reqErr) => {
@@ -329,10 +327,13 @@ class Engine {
           args.push('--additionalLoggerConfig=\'' + logConfig + '\'');
         }
 
-        this.process_ = child_process.spawn(ENGINE_APP, args, {
-          cwd: this.installPath,
-          windowsHide: true
-        });
+        this.inShutdown_ = false;
+        this.process_ = child_process.spawn(path.join(this.installPath, ENGINE_APP),
+          args,
+          {
+            cwd: this.installPath,
+            windowsHide: true
+          });
 
         this.process_.on('error', (err) => {
           console.error('Error starting Engine process:', err);
@@ -423,6 +424,7 @@ class Engine {
           } else {
             resolve();
           }
+          this.inShutdown_ = false;
         };
         this.sendShutdownCommand_();
       } else {
@@ -438,21 +440,28 @@ class Engine {
   sendShutdownCommand_() {
     if (this.process_) {
       let forceKill = true;
-      if (fs.existsSync(this.ngintPath_)) {
-        try {
-          console.info('Shutdown command sent to Engine process');
-          child_process.execFileSync(
-            this.ngintPath_,
-            ['shutdown', this.process_.pid, ENGINE_SHUTDOWN_TIMEOUT],
-            {
-              cwd: this.installPath,
-              windowsHide: true
-            }
-          );
-          forceKill = false;
-        } catch (e) {
-          console.error('Error stopping Engine', e);
+      this.inShutdown_ = true;
+      if (os.platform() == 'win32') {
+        if (fs.existsSync(this.ngintPath_)) {
+          try {
+            console.info('Shutdown command sent to Engine process');
+            child_process.execFileSync(
+              this.ngintPath_,
+              ['shutdown', this.process_.pid, ENGINE_SHUTDOWN_TIMEOUT],
+              {
+                cwd: this.installPath,
+                windowsHide: true
+              }
+            );
+            forceKill = false;
+          } catch (e) {
+            console.error('Error stopping Engine', e);
+          }
+        } else {
+          console.info('ngint was not found');
         }
+      } else {
+        process.kill(this.process_.pid, 'SIGTERM');
       }
       if (forceKill) {
         console.info('Kill signal sent to Engine process');
@@ -506,7 +515,7 @@ class Engine {
     const hash = crypto.createHash('sha256');
     hash.update(os.hostname());
     hash.update(getWorkspacePath());
-    return ('_' + hash.digest('hex').toUpperCase()).substr(0, INSTANCE_ID_LENGTH);
+    return ('_' + hash.digest('hex').toUpperCase()).substring(0, INSTANCE_ID_LENGTH);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nginstack/engine-node",
-  "version": "60.0.1",
+  "version": "60.0.8",
   "publishConfig": {
     "access": "public"
   },
@@ -24,5 +24,5 @@
     "thread-sleep": "^2.2.0",
     "tmp": "^0.2.1"
   },
-  "gitHead": "0d6cc445ee3e472515a1d861dd515539102dea79"
+  "gitHead": "827772c130491ba242eabe4dff2d42d6d309bc37"
 }