@arcblock/pm2-prom-module 2.6.6 → 2.6.8

package/core/app.js

@@ -59,6 +59,7 @@ class App {
                 status: pidData.status,
                 appUrl: pidData.appUrl,
                 appName: pidData.appName,
+                appPid: pidData.appPid,
             };
         }
         else {

package/core/pm2.js

@@ -49,6 +49,7 @@ const updateAppPidsData = (workingApp, pidData) => {
         status: pidData.status,
         appUrl: pidData.appUrl,
         appName: pidData.appName,
+        appPid: pidData.appPid,
     });
 };
 const detectActiveApps = () => {
@@ -95,6 +96,7 @@ const detectActiveApps = () => {
                     status: pm2_env.status,
                     appUrl: pm2_env.BLOCKLET_APP_URL,
                     appName: pm2_env.BLOCKLET_APP_NAME,
+                    appPid: pm2_env.BLOCKLET_APP_PID,
                 };
             }
         });
@@ -161,6 +163,9 @@ const detectActiveApps = () => {
             if (stats && Object.keys(stats).length) {
                 for (const [pid, stat] of Object.entries(stats)) {
                     const pidId = Number(pid);
+                    if (!stat) {
+                        continue;
+                    }
                     if (pidId && pidsMonit[pidId]) {
                         pidsMonit[pidId].cpu = Math.round(stat.cpu * 10) / 10;
                         pidsMonit[pidId].memory = stat.memory;
@@ -220,16 +225,19 @@ const detectActiveApps = () => {
             return () => __awaiter(void 0, void 0, void 0, function* () {
                 return {
                     appName: app.appName,
+                    appPid: app.appPid,
                     urls: yield (0, domain_1.getAppDomainList)(app.appUrl),
                 };
             });
-        }), { concurrency: 8 }).then((apps) => {
+        }), { concurrency: 8 })
+            .then((apps) => {
             for (const app of apps) {
                 for (const url of app.urls) {
-                    metrics_1.metricAppDomainList === null || metrics_1.metricAppDomainList === void 0 ? void 0 : metrics_1.metricAppDomainList.set({ appName: app.appName, domain: url }, app.urls.length);
+                    metrics_1.metricAppDomainList === null || metrics_1.metricAppDomainList === void 0 ? void 0 : metrics_1.metricAppDomainList.set({ appName: app.appName, domain: url, appPid: app.appPid }, app.urls.length);
                 }
             }
-        }).catch(error => console.error(error));
+        })
+            .catch((error) => console.error(error));
     });
 };
 const startPm2Connect = (conf) => {

package/metrics/index.js

@@ -151,7 +151,7 @@ const initMetrics = (prefix) => {
         name: `${prefix}_${METRIC_APP_DOMAIN_LIST}`,
         help: 'Show app domain list',
         registers: [exports.registry],
-        labelNames: ['appName', 'domain'],
+        labelNames: ['appName', 'domain', 'appPid'],
     });
     exports.metricAppAverageMemory = new prom_client_1.default.Gauge({
         name: `${prefix}_${METRIC_APP_AVERAGE_MEMORY}`,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@arcblock/pm2-prom-module",
-    "version": "2.6.6",
+    "version": "2.6.8",
     "publishConfig": {
         "access": "public"
     },

package/utils/domain.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppDomainList = getAppDomainList;
 const is_url_1 = __importDefault(require("is-url"));
-const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const ufo_1 = require("ufo");
 const keyv_1 = __importDefault(require("keyv"));
 const sqlite_1 = __importDefault(require("@keyv/sqlite"));
@@ -39,14 +38,15 @@ function getAppDomainList(url) {
                 return [url];
             }
             if (yield appDomainListCache.has(url)) {
-                return yield appDomainListCache.get(url);
+                return (yield appDomainListCache.get(url));
             }
             const response = yield fetch((0, ufo_1.joinURL)(url, '__blocklet__.js?type=json'));
-            const domainAliases = ((_a = (yield response.json())) === null || _a === void 0 ? void 0 : _a.domainAliases) || [];
-            if (!(0, isEmpty_1.default)(domainAliases)) {
+            const domainAliases = (_a = (yield response.json())) === null || _a === void 0 ? void 0 : _a.domainAliases;
+            if (Array.isArray(domainAliases) && domainAliases.length) {
                 yield appDomainListCache.set(url, domainAliases);
+                return domainAliases;
             }
-            return domainAliases || [url];
+            return [url];
         }
         catch (error) {
             console.error(error);