v7 refactor

Author: Unitech

CHANGELOG.md

@@ -1,4 +1,22 @@
 
+## 7.0.0
+
+- Require Node.js >= 20.0.0
+- Internalize pm2-axon, pm2-axon-rpc, pm2-io-bpm, pm2-io-agent, fclone as local modules
+- Internalize pm2-multimeter and charm into lib/tools/multimeter (zero external deps)
+- Replace `needle` with native `fetch` (CliAuth, TAR publish)
+- Replace `enquirer` with lightweight built-in prompt (boilerplate selector)
+- Replace `promptly` with built-in lib/tools/prompt
+- Replace `mkdirp` with native `fs.mkdirSync({ recursive: true })`
+- Replace `source-map-support` with native `process.setSourceMapsEnabled()`
+- Replace `sprintf-js` with template literals (Dashboard)
+- Replace `url.parse()` with native `URL` constructor (Serve, Utility, CliAuth)
+- Remove `fclone` npm dep, use internalized module
+- Add OpenTelemetry tracing as direct dependencies
+- Add test scripts for internalized modules (bpm, axon, axon-rpc, io-agent)
+- Expand Docker parallel test runner to cover all internalized module tests
+- Drop auto source map file detection in Common.prepareAppConf
+
 ## 6.0.14
 
 - Fixed version of @pm2/pm2-version-check #6055

constants.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2022 the PM2 project authors. All rights reserved.
+ * Copyright 2013-present the PM2 project authors. All rights reserved.
  * Use of this source code is governed by a license that
  * can be found in the LICENSE file.
  */

examples/misc-examples/client.js

@@ -1,7 +1,7 @@
 
 
 var Wrap = require('./wrap.js');
-var axon = require('pm2-axon');
+var axon = require('../../modules/pm2-axon');
 
 var Module = require('module');
 Wrap.wrap(Module, '_load', function(load) {

examples/sourcemap-auto-resolve/API.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2022 the PM2 project authors. All rights reserved.
+ * Copyright 2013-present the PM2 project authors. All rights reserved.
  * Use of this source code is governed by a license that
  * can be found in the LICENSE file.
  */

index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2022 the PM2 project authors. All rights reserved.
+ * Copyright 2013-present the PM2 project authors. All rights reserved.
  * Use of this source code is governed by a license that
  * can be found in the LICENSE file.
  */

lib/API.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2022 the PM2 project authors. All rights reserved.
+ * Copyright 2013-present the PM2 project authors. All rights reserved.
  * Use of this source code is governed by a license that
  * can be found in the LICENSE file.
  */
@@ -13,13 +13,13 @@ const series      = require('async/series');
 const debug       = require('debug')('pm2:cli');
 const util        = require('util');
 const chalk       = require('ansis');
-const fclone      = require('fclone');
+const fclone      = require('../modules/fclone');
 
 var DockerMgmt  = require('./API/ExtraMgmt/Docker.js')
 var conf        = require('../constants.js');
 var Client      = require('./Client');
 var Common      = require('./Common');
-var KMDaemon    = require('@pm2/agent/src/InteractorClient');
+var KMDaemon    = require('../modules/pm2-io-agent/src/InteractorClient');
 var Config      = require('./tools/Config');
 var Modularizer = require('./API/Modules/Modularizer.js');
 var path_structure = require('../paths.js');

lib/API/Containerizer.js

@@ -191,7 +191,7 @@ module.exports = function(CLI) {
   };
 
   CLI.prototype.dockerMode = function(script, opts, mode) {
-    var promptly = require('promptly');
+    var promptly = require('../../tools/prompt');
     var self = this;
     handleExit(self, opts, mode);
 

lib/API/Dashboard.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2022 the PM2 project authors. All rights reserved.
+ * Copyright 2013-present the PM2 project authors. All rights reserved.
  * Use of this source code is governed by a license that
  * can be found in the LICENSE file.
  */
@@ -8,7 +8,6 @@ var os         = require('os');
 var p          = require('path');
 var blessed    = require('@pm2/blessed');
 var debug      = require('debug')('pm2:monit');
-var printf     = require('sprintf-js').sprintf;
 
 // Total memory
 const totalMem = os.totalmem();
@@ -273,17 +272,16 @@ Dashboard.refresh = function(processes) {
     status = status + '{bold}' + processes[i].pm2_env.status + '{/}';
 
     var name = processes[i].pm2_env.name || p.basename(processes[i].pm2_env.pm_exec_path);
+    var maxNameLen = 15;
+    if (name.length > maxNameLen) name = name.substring(0, maxNameLen - 1) + '…';
+    name = name.padEnd(maxNameLen);
 
     // Line of list
-    var item = printf('[%2s] %s {|} Mem: {bold}{%s-fg}%3d{/} MB    CPU: {bold}{%s-fg}%2d{/} %s  %s',
-                       processes[i].pm2_env.pm_id,
-                       name,
-                       gradient(memPercent, [255, 0, 0], [0, 255, 0]),
-                       (processes[i].monit.memory / 1048576).toFixed(2),
-                       gradient(processes[i].monit.cpu, [255, 0, 0], [0, 255, 0]),
-                       processes[i].monit.cpu,
-                       "%",
-                       status);
+    var memMB = (processes[i].monit.memory / 1048576).toFixed(0);
+    var cpu = processes[i].monit.cpu;
+    var memColor = gradient(memPercent, [255, 0, 0], [0, 255, 0]);
+    var cpuColor = gradient(cpu, [255, 0, 0], [0, 255, 0]);
+    var item = `[${String(processes[i].pm2_env.pm_id).padStart(2)}] ${name} Mem: {bold}{${memColor}-fg}${String(memMB).padStart(3)}{/} MB  CPU: {bold}{${cpuColor}-fg}${String(cpu).padStart(2)}{/} %  ${status}`;
 
     // Check if item exist
     if (this.list.getItem(i)) {

lib/API/Deploy.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2022 the PM2 project authors. All rights reserved.
+ * Copyright 2013-present the PM2 project authors. All rights reserved.
  * Use of this source code is governed by a license that
  * can be found in the LICENSE file.
  */

lib/API/Extra.js

@@ -275,7 +275,7 @@ module.exports = function(CLI) {
   CLI.prototype.boilerplate = function(cb) {
     var i = 0
     var projects = []
-    var enquirer = require('enquirer')
+    var promptly = require('../tools/prompt')
     const forEach = require('async/forEach')
 
     fs.readdir(path.join(__dirname, '../templates/sample-apps'), (err, items) => {
@@ -289,32 +289,21 @@ module.exports = function(CLI) {
           next()
         })
       }, () => {
-        const prompt = new enquirer.Select({
-          name: 'boilerplate',
-          message: 'Select a boilerplate',
-          choices: projects.map((p, i) => {
-            return {
-              message: `${chalk.bold.blue(p.name)} ${p.description}`,
-              value: `${i}`
-            }
-          })
-        });
-
-        prompt.run()
-          .then(answer => {
-            var p = projects[parseInt(answer)]
-            basicMDHighlight(fs.readFileSync(path.join(p.fullpath, 'README.md')).toString())
-            console.log(chalk.bold(`>> Project copied inside folder ./${p.folder_name}/\n`))
-            copyDirSync(p.fullpath, path.join(process.cwd(), p.folder_name));
-            this.start(path.join(p.fullpath, 'ecosystem.config.js'), {
-              cwd: p.fullpath
-            }, () => {
-              return cb ? cb.apply(null, arguments) : this.speedList(cst.SUCCESS_EXIT);
-            })
-          })
-          .catch(e => {
+        var choices = projects.map((p) => `${p.name} - ${p.description}`)
+
+        promptly.choose('Select a boilerplate:', choices, (err, answer) => {
+          if (err) return cb ? cb(err) : this.speedList(cst.ERROR_EXIT);
+          var idx = choices.indexOf(answer)
+          var p = projects[idx]
+          basicMDHighlight(fs.readFileSync(path.join(p.fullpath, 'README.md')).toString())
+          console.log(chalk.bold(`>> Project copied inside folder ./${p.folder_name}/\n`))
+          copyDirSync(p.fullpath, path.join(process.cwd(), p.folder_name));
+          this.start(path.join(p.fullpath, 'ecosystem.config.js'), {
+            cwd: p.fullpath
+          }, () => {
             return cb ? cb.apply(null, arguments) : this.speedList(cst.SUCCESS_EXIT);
-          });
+          })
+        })
 
       })
     })