advanced Bun support #5893 #5774 #5682 #5675 #5777

Unitech · Unitech · commit b3183e2dcec1 · 2024-11-12T13:54:46.000Z
#5692
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -10,7 +10,6 @@ jobs:
     strategy:
       matrix:
         node-version: [22.x, 20.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
     - uses: actions/checkout@v3
diff --git a/bin/pm2 b/bin/pm2
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 SCRIPT_PATH="$(dirname "$0")/../lib/binaries/CLI.js"
 
 # Check if 'bun' is available, otherwise use 'node'
-if command -v bun &> /dev/null
+if command -v bun >/dev/null 2>&1
 then
     bun "$SCRIPT_PATH" "$@"
 else
diff --git a/bin/pm2-dev b/bin/pm2-dev
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 SCRIPT_PATH="$(dirname "$0")/../lib/binaries/DevCLI.js"
 
 # Check if 'bun' is available, otherwise use 'node'
-if command -v bun &> /dev/null
+if command -v bun >/dev/null 2>&1
 then
     bun "$SCRIPT_PATH" "$@"
 else
diff --git a/bin/pm2-docker b/bin/pm2-docker
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 SCRIPT_PATH="$(dirname "$0")/../lib/binaries/Runtime4Docker.js"
 
 # Check if 'bun' is available, otherwise use 'node'
-if command -v bun &> /dev/null
+if command -v bun >/dev/null 2>&1
 then
     bun "$SCRIPT_PATH" "$@"
 else
diff --git a/bin/pm2-runtime b/bin/pm2-runtime
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 SCRIPT_PATH="$(dirname "$0")/../lib/binaries/Runtime4Docker.js"
 
 # Check if 'bun' is available, otherwise use 'node'
-if command -v bun &> /dev/null
+if command -v bun >/dev/null 2>&1
 then
     bun "$SCRIPT_PATH" "$@"
 else
diff --git a/bun.lockb b/bun.lockb
diff --git a/constants.js b/constants.js
@@ -45,6 +45,7 @@ var csts = {
   ERROR_EXIT              : 1,
   CODE_UNCAUGHTEXCEPTION  : 1,
 
+  IS_BUN                  : typeof Bun !== 'undefined',
   IS_WINDOWS              : (process.platform === 'win32' || process.platform === 'win64' || /^(msys|cygwin)$/.test(process.env.OSTYPE)),
   ONLINE_STATUS           : 'online',
   STOPPED_STATUS          : 'stopped',
diff --git a/examples/cluster-http/http.js b/examples/cluster-http/http.js
@@ -3,6 +3,7 @@ var http = require('http');
 
 var server = http.createServer(function(req, res) {
   res.writeHead(200);
+  console.log(`New query`)
   res.end('hey');
 }).listen(process.env.PORT || 8089, '0.0.0.0', function() {
   console.log('App listening on port 8089');
diff --git a/lib/API/Serve.js b/lib/API/Serve.js
@@ -11,12 +11,12 @@ var url = require('url');
 var path = require('path');
 var debug = require('debug')('pm2:serve');
 
-var probe = require('@pm2/io');
-var errorMeter = probe.meter({
-  name      : '404/sec',
-  samples   : 1,
-  timeframe : 60
-})
+// var probe = require('@pm2/io');
+// var errorMeter = probe.meter({
+//   name      : '404/sec',
+//   samples   : 1,
+//   timeframe : 60
+// })
 /**
  * list of supported content types.
  */
diff --git a/lib/API/Startup.js b/lib/API/Startup.js
@@ -21,12 +21,19 @@ module.exports = function(CLI) {
    */
   function isNotRoot(startup_mode, platform, opts, cb) {
     Common.printOut(`${cst.PREFIX_MSG}To ${startup_mode} the Startup Script, copy/paste the following command:`);
+
+    let pm2_bin_path = require.main.filename
+
+    if (pm2_bin_path.includes('/lib/binaries/CLI.js') === true) {
+      pm2_bin_path = pm2_bin_path.replace('/lib/binaries/CLI.js', '/bin/pm2')
+    }
+
     if (opts.user) {
       console.log('sudo env PATH=$PATH:' + path.dirname(process.execPath) + ' pm2 ' + opts.args[1].name() + ' ' + platform + ' -u ' + opts.user + ' --hp ' + process.env.HOME);
       return cb(new Error('You have to run this with elevated rights'));
     }
     return sexec('whoami', {silent: true}, function(err, stdout, stderr) {
-      console.log('sudo env PATH=$PATH:' + path.dirname(process.execPath) + ' ' + require.main.filename + ' ' + opts.args[1].name() + ' ' + platform + ' -u ' + stdout.trim() + ' --hp ' + process.env.HOME);
+      console.log('sudo env PATH=$PATH:' + path.dirname(process.execPath) + ' ' + pm2_bin_path + ' ' + opts.args[1].name() + ' ' + platform + ' -u ' + stdout.trim() + ' --hp ' + process.env.HOME);
       return cb(new Error('You have to run this with elevated rights'));
     });
   }
@@ -336,7 +343,13 @@ module.exports = function(CLI) {
     else
       envPath = util.format('%s:%s', process.env.PATH || '', path.dirname(process.execPath))
 
-    template = template.replace(/%PM2_PATH%/g, process.mainModule.filename)
+    let pm2_bin_path = require.main.filename
+
+    if (pm2_bin_path.includes('/lib/binaries/CLI.js') === true) {
+      pm2_bin_path = pm2_bin_path.replace('/lib/binaries/CLI.js', '/bin/pm2')
+    }
+
+    template = template.replace(/%PM2_PATH%/g, pm2_bin_path)
       .replace(/%NODE_PATH%/g, envPath)
       .replace(/%USER%/g, user)
       .replace(/%HOME_PATH%/g, opts.hp ? path.resolve(opts.hp, '.pm2') : cst.PM2_ROOT_PATH)
diff --git a/lib/API/UX/pm2-ls.js b/lib/API/UX/pm2-ls.js
@@ -478,5 +478,6 @@ module.exports = function(list, commander) {
   if (sysmonit && sysmonit[0])
     miniMonitBar(sysmonit[0])
 
-  checkIfProcessAreDumped(list)
+  // Disable warning message of process list not saved
+  //checkIfProcessAreDumped(list)
 }
diff --git a/lib/Client.js b/lib/Client.js
@@ -248,10 +248,7 @@ Client.prototype.launchDaemon = function(opts, cb) {
   if (!process.env.PM2_DISCRETE_MODE)
     Common.printOut(that.conf.PREFIX_MSG + 'Spawning PM2 daemon with pm2_home=' + this.pm2_home);
 
-  var interpreter = 'node';
-
-  if (which('node') == null)
-    interpreter = process.execPath;
+  var interpreter = process.execPath;
 
   var child = require('child_process').spawn(interpreter, node_args, {
     detached   : true,
@@ -261,7 +258,7 @@ Client.prototype.launchDaemon = function(opts, cb) {
       'SILENT'    : that.conf.DEBUG ? !that.conf.DEBUG : true,
       'PM2_HOME'  : that.pm2_home
     }, process.env),
-    stdio      : ['ipc', out, err]
+    stdio      : [null, out, err, 'ipc']
   });
 
   function onError(e) {
@@ -271,13 +268,13 @@ Client.prototype.launchDaemon = function(opts, cb) {
 
   child.once('error', onError);
 
-  child.unref();
+  if (this.conf.IS_BUN === false)
+    child.unref();
 
   child.once('message', function(msg) {
     debug('PM2 daemon launched with return message: ', msg);
     child.removeListener('error', onError);
     child.disconnect();
-
     if (opts && opts.interactor == false)
       return cb(null, child);
 
diff --git a/lib/Common.js b/lib/Common.js
@@ -372,7 +372,7 @@ Common.sink.determineExecMode = function(app) {
    */
   if (!app.exec_mode &&
       (app.instances >= 1 || app.instances === 0 || app.instances === -1) &&
-      app.exec_interpreter.indexOf('node') > -1) {
+      (app.exec_interpreter.indexOf('node') > -1 || cst.IS_BUN === true)) {
     app.exec_mode = 'cluster_mode';
   } else if (!app.exec_mode) {
     app.exec_mode = 'fork_mode';
@@ -444,6 +444,12 @@ Common.sink.resolveInterpreter = function(app) {
   var extName = path.extname(app.pm_exec_path);
   var betterInterpreter = extItps[extName];
 
+  // Bun support
+  if (noInterpreter && cst.IS_BUN === true) {
+    noInterpreter = false
+    app.exec_interpreter = process.execPath;
+  }
+
   // No interpreter defined and correspondance in schema hashmap
   if (noInterpreter && betterInterpreter) {
     app.exec_interpreter = betterInterpreter;
@@ -458,8 +464,9 @@ Common.sink.resolveInterpreter = function(app) {
     }
   }
   // Else if no Interpreter detect if process is binary
-  else if (noInterpreter)
-    app.exec_interpreter = isBinary(app.pm_exec_path) ? 'none' : 'node';
+  else if (noInterpreter) {
+    app.exec_interpreter = isBinary(app.pm_exec_path) ? 'none' : process.execPath;
+  }
   else if (app.exec_interpreter.indexOf('node@') > -1)
     resolveNodeInterpreter(app);
 
diff --git a/lib/God.js b/lib/God.js
@@ -29,10 +29,19 @@ var Configuration = require('./Configuration.js');
 /**
  * Override cluster module configuration
  */
-cluster.setupMaster({
-  windowsHide: true,
-  exec : path.resolve(path.dirname(module.filename), 'ProcessContainer.js')
-});
+
+if (cst.IS_BUN == true) {
+  cluster.setupMaster({
+    windowsHide: true,
+    exec : path.resolve(path.dirname(module.filename), 'ProcessContainerBun.js')
+  });
+}
+else {
+  cluster.setupMaster({
+    windowsHide: true,
+    exec : path.resolve(path.dirname(module.filename), 'ProcessContainer.js')
+  });
+}
 
 /**
  * Expose God
@@ -269,7 +278,22 @@ God.executeApp = function executeApp(env, cb) {
         God.handleExit(clu, code || 0, signal || 'SIGINT');
       });
 
+
+      if (cst.IS_BUN) {
+        // When starting an app that does not listen on a port
+        // Bun do not call 'online' event
+        // This is a temporary workaround
+        var a = setTimeout(() => {
+          God.clusters_db[clu.pm2_env.pm_id].state = 'online'
+          return readyCb(clu)
+        }, 2000)
+      }
+
       return clu.once('online', function () {
+        if (cst.IS_BUN) {
+          clearTimeout(a);
+        }
+
         if (!clu.pm2_env.wait_ready)
           return readyCb(clu);
 
diff --git a/lib/God/ForkMode.js b/lib/God/ForkMode.js
@@ -39,7 +39,7 @@ module.exports = function ForkMode(God) {
     console.log(`App [${pm2_env.name}:${pm2_env.pm_id}] starting in -fork mode-`)
     var spawn = require('child_process').spawn;
 
-    var interpreter = pm2_env.exec_interpreter || 'node';
+    var interpreter = pm2_env.exec_interpreter || process.execPath;
     var pidFile     = pm2_env.pm_pid_path;
 
     if (interpreter !== 'none') {
diff --git a/lib/ProcessContainer.js b/lib/ProcessContainer.js
@@ -111,22 +111,6 @@ delete process.env.pm2_env;
  * @return
  */
 function exec(script, stds) {
-  if (p.extname(script) == '.coffee') {
-    try {
-      require('coffee-script/register');
-    } catch (e) {
-      console.error('Failed to load CoffeeScript interpreter:', e.message || e);
-    }
-  }
-
-  if (p.extname(script) == '.ls') {
-    try {
-      require('livescript');
-    } catch (e) {
-      console.error('Failed to load LiveScript interpreter:', e.message || e);
-    }
-  }
-
   if (p.extname(script) == '.ts' || p.extname(script) == '.tsx') {
     try {
       require('ts-node/register');
@@ -300,8 +284,14 @@ function exec(script, stds) {
 
     if (ProcessUtils.isESModule(script) === true)
       import(Url.pathToFileURL(process.env.pm_exec_path));
-    else
-      require('module')._load(script, null, true);
+    else {
+      if (cst.IS_BUN) {
+        require(script);
+      }
+      else {
+        require('module')._load(script, null, true);
+      }
+    }
 
     function logError(types, error){
       try {
diff --git a/lib/ProcessContainerBun.js b/lib/ProcessContainerBun.js
diff --git a/lib/ProcessUtils.js b/lib/ProcessUtils.js
diff --git a/package.json b/package.json
diff --git a/test/unit.sh b/test/unit.sh
