nodestatus-server 1.2.7-beta.5 → 1.2.9-beta

package/bin/status-server-run.js

@@ -1,19 +1,22 @@
 #!/usr/bin/env node
-const path = require('path');
+import { spawn } from 'child_process';
+import { platform } from 'os';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
 
 const args = process.argv.slice(2).join(' ');
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
-const cp = require('child_process');
-const { platform } = require('os');
-const { resolve } = require('path');
-
-cp.spawn(platform() === 'win32' ? 'npm.cmd' : 'npm', ['run', 'prestart'], {
+spawn(platform() === 'win32' ? 'npm.cmd' : 'npm', ['run', 'prestart'], {
   env: process.env,
   cwd: resolve(__dirname, '../'),
   stdio: 'inherit'
-}).on('close', () => {
+}).on('close', async () => {
   try {
-    const pm2 = require('pm2');
+    // ES6 import not read NODE_PATH env
+    // const pm2 = await import('pm2');
+    const pm2 = createRequire(import.meta.url)('pm2');
     pm2.connect(error => {
       if (error) {
         console.log(error);
@@ -22,7 +25,7 @@ cp.spawn(platform() === 'win32' ? 'npm.cmd' : 'npm', ['run', 'prestart'], {
       pm2.start(
         {
           name: 'nodestatus',
-          script: path.resolve(__dirname, '../build/app.js'),
+          script: resolve(__dirname, '../build/app.js'),
           args
         },
         error => {
@@ -35,6 +38,6 @@ cp.spawn(platform() === 'win32' ? 'npm.cmd' : 'npm', ['run', 'prestart'], {
     console.log(`[ERROR]: ${error.message || error}`);
     console.log('Something wrong. Please check if you have installed pm2 correctly.');
     console.log('Fallback to non-pm2 daemon');
-    require('../build/app');
+    await import('../build/app.js');
   }
 });

package/bin/status-server.js

@@ -1,10 +1,13 @@
 #!/usr/bin/env node
 
-const cp = require('child_process');
-const { platform } = require('os');
-const { resolve } = require('path');
+import { spawn } from 'child_process';
+import { platform } from 'os';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
 
-cp.spawn(platform() === 'win32' ? 'npm.cmd' : 'npm', ['run', 'start'], {
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+spawn(platform() === 'win32' ? 'npm.cmd' : 'npm', ['run', 'start'], {
   env: process.env,
   cwd: resolve(__dirname, '../'),
   stdio: 'inherit'