feat: Unitech#4540 support ES import

examples/import/circle.js

@@ -0,0 +1,9 @@
+const PI = 3.14159265359;
+
+export function area(radius) {
+  return (radius ** 2) * PI;
+}
+
+export function circumference(radius) {
+  return 2 * radius * PI;
+}

examples/import/index.js

@@ -0,0 +1,7 @@
+import { area, circumference } from './circle.js';
+
+const r = 3;
+
+console.log(`Circle with radius ${r} has
+  area: ${area(r)};
+  circunference: ${circumference(r)}`);

examples/import/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "import",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "type":"module",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

lib/ProcessContainer.js

@@ -12,6 +12,7 @@
 var p       = require('path');
 var cst     = require('../constants');
 var Utility = require('./Utility.js');
+var ProcessUtils = require('./ProcessUtils');
 
 // Load all env-vars from master.
 var pm2_env = JSON.parse(process.env.pm2_env);
@@ -30,7 +31,7 @@ delete process.env.pm2_env;
 (function ProcessContainer() {
   var fs          = require('fs');
 
-  require('./ProcessUtils').injectModules();
+  ProcessUtils.injectModules()
 
   var stdFile     = pm2_env.pm_log_path;
   var outFile     = pm2_env.pm_out_log_path;
@@ -294,7 +295,10 @@ function exec(script, stds) {
     // Change dir to fix process.cwd
     process.chdir(pm2_env.pm_cwd || process.env.PWD || p.dirname(script));
 
-    require('module')._load(script, null, true);
+    if (ProcessUtils.isESModule(script) === true)
+      import(process.env.pm_exec_path);
+    else
+      require('module')._load(script, null, true);
 
     function logError(types, error){
       try {

lib/ProcessContainerFork.js

@@ -4,7 +4,8 @@
  * can be found in the LICENSE file.
  */
 // Inject custom modules
-require('./ProcessUtils').injectModules();
+var ProcessUtils = require('./ProcessUtils')
+ProcessUtils.injectModules()
 
 if (typeof(process.env.source_map_support) != "undefined" &&
     process.env.source_map_support !== "false") {
@@ -23,8 +24,13 @@ if (process.connected &&
   });
 
 // Require the real application
-if (process.env.pm_exec_path)
-  require('module')._load(process.env.pm_exec_path, null, true);
+if (process.env.pm_exec_path) {
+  if (ProcessUtils.isESModule(process.env.pm_exec_path) === true) {
+    import(process.env.pm_exec_path);
+  }
+  else
+    require('module')._load(process.env.pm_exec_path, null, true);
+}
 else
   throw new Error('Could not _load() the script');
 

lib/ProcessUtils.js

@@ -18,5 +18,26 @@ module.exports = {
         tracing: process.env.trace === 'true' || false
       }, conf))
     }
+  },
+  isESModule(exec_path) {
+    var fs = require('fs')
+    var path = require('path')
+    var semver = require('semver')
+
+    if (semver.satisfies(process.version, '< 13.3.0'))
+      return false
+
+    if (path.extname(exec_path) === '.mjs')
+      return true
+
+    try {
+      var data = JSON.parse(fs.readFileSync(path.join(path.dirname(exec_path), 'package.json')))
+      if (data.type === 'module')
+        return true
+      else
+        return false
+    } catch(e) {
+      return false
+    }
   }
 };

test/e2e.sh

@@ -35,6 +35,8 @@ if [ $SUPV = '<6' ]; then
     exit
 fi
 
+runTest ./test/e2e/esmodule.sh
+
 runTest ./test/e2e/cli/monit.sh
 runTest ./test/e2e/cli/cli-actions-1.sh
 runTest ./test/e2e/cli/cli-actions-2.sh

test/e2e/esmodule.sh

@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+SRC=$(cd $(dirname "$0"); pwd)
+source "${SRC}/include.sh"
+
+# Bootstrap one app
+cd $file_path/esmodules/mjs
+
+#### FORK MODE
+
+$pm2 delete all
+
+$pm2 start index.mjs
+sleep 2
+should 'should have detected es module via .mjs file extension and started 1 app' 'online' 1
+should 'should have application in stable state' 'restart_time: 0' 1
+
+$pm2 restart index
+sleep 2
+should 'should have detected es module via .mjs file extension and started 1 app' 'online' 1
+should 'should have application in stable state' 'restart_time: 1' 1
+
+$pm2 delete all
+
+cd $file_path/esmodules/packagemodule
+
+$pm2 start index.js
+sleep 2
+should 'should have detected es module via .mjs file extension and started 1 app' 'online' 1
+should 'should have application in stable state' 'restart_time: 0' 1
+
+$pm2 restart index
+sleep 2
+should 'should have detected es module via .mjs file extension and started 1 app' 'online' 1
+should 'should have application in stable state' 'restart_time: 1' 1
+
+#### CLUSTER MODE
+
+$pm2 delete all
+
+$pm2 start index.mjs -i 4
+sleep 2
+should 'should have detected es module via .mjs file extension and started 4 apps' 'online' 4
+should 'should have application in stable state' 'restart_time: 0' 4
+
+$pm2 restart index
+sleep 2
+should 'should have detected es module via .mjs file extension and started 4 app' 'online' 4
+should 'should have application in stable state' 'restart_time: 1' 4
+
+$pm2 delete all
+
+cd $file_path/esmodules/packagemodule
+
+$pm2 start index.js -i 4
+sleep 2
+should 'should have detected es module via .mjs file extension and started 4 apps' 'online' 4
+should 'should have application in stable state' 'restart_time: 0' 4
+
+$pm2 restart index
+sleep 2
+should 'should have detected es module via .mjs file extension and started 4 app' 'online' 4
+should 'should have application in stable state' 'restart_time: 1' 4
+
+$pm2 delete all

test/fixtures/esmodules/mjs/circle.mjs

@@ -0,0 +1,9 @@
+const PI = 3.14159265359;
+
+export function area(radius) {
+  return (radius ** 2) * PI;
+}
+
+export function circumference(radius) {
+  return 2 * radius * PI;
+}

test/fixtures/esmodules/mjs/index.mjs

@@ -0,0 +1,10 @@
+import { area, circumference } from './circle.mjs';
+
+const r = 3;
+
+console.log(`Circle with radius ${r} has
+  area: ${area(r)};
+  circunference: ${circumference(r)}`);
+
+setInterval(() => {
+}, 1000)

test/fixtures/esmodules/packagemodule/circle.js

@@ -0,0 +1,9 @@
+const PI = 3.14159265359;
+
+export function area(radius) {
+  return (radius ** 2) * PI;
+}
+
+export function circumference(radius) {
+  return 2 * radius * PI;
+}

test/fixtures/esmodules/packagemodule/index.js

@@ -0,0 +1,10 @@
+import { area, circumference } from './circle.js';
+
+const r = 3;
+
+console.log(`Circle with radius ${r} has
+  area: ${area(r)};
+  circunference: ${circumference(r)}`);
+
+setInterval(() => {
+}, 1000)

test/fixtures/esmodules/packagemodule/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "import",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "type":"module",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}