@arcblock/pm2-prom-module 2.6.7 → 2.6.9

package/core/pm2.js

@@ -163,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;
@@ -226,13 +229,18 @@ const detectActiveApps = () => {
                     urls: yield (0, domain_1.getAppDomainList)(app.appUrl),
                 };
             });
-        }), { concurrency: 8 }).then((apps) => {
+        }), { concurrency: 8 })
+            .then((apps) => {
             for (const app of apps) {
+                if (!app.urls || !Array.isArray(app.urls)) {
+                    continue;
+                }
                 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, appPid: app.appPid }, app.urls.length);
                 }
             }
-        }).catch(error => console.error(error));
+        })
+            .catch((error) => console.error(error));
     });
 };
 const startPm2Connect = (conf) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@arcblock/pm2-prom-module",
-    "version": "2.6.7",
+    "version": "2.6.9",
     "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"));
@@ -38,15 +37,16 @@ function getAppDomainList(url) {
             if (!(0, is_url_1.default)(url)) {
                 return [url];
             }
-            if (yield appDomainListCache.has(url)) {
-                return yield appDomainListCache.get(url);
+            if (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);