@arcblock/pm2-prom-module 2.6.5 → 2.6.7

package/core/app.js

@@ -57,6 +57,9 @@ class App {
                 restartCount: pidData.restartCount,
                 metrics: this.fillMetricsData(pidData.metrics),
                 status: pidData.status,
+                appUrl: pidData.appUrl,
+                appName: pidData.appName,
+                appPid: pidData.appPid,
             };
         }
         else {

package/core/pm2.js

@@ -17,10 +17,13 @@ const pm2_1 = __importDefault(require("pm2"));
 const app_1 = require("./app");
 const utils_1 = require("../utils");
 const cpu_1 = require("../utils/cpu");
+const keyBy_1 = __importDefault(require("lodash/keyBy"));
 const metrics_1 = require("../metrics");
 const app_2 = require("../metrics/app");
 const logger_1 = require("../utils/logger");
 const docker_1 = require("../utils/docker");
+const domain_1 = require("../utils/domain");
+const p_all_1 = __importDefault(require("p-all"));
 const WORKER_CHECK_INTERVAL = 1000;
 const SHOW_STAT_INTERVAL = 10000;
 const APPS = {};
@@ -44,6 +47,9 @@ const updateAppPidsData = (workingApp, pidData) => {
         createdAt: pidData.createdAt,
         metrics: pidData.metrics,
         status: pidData.status,
+        appUrl: pidData.appUrl,
+        appName: pidData.appName,
+        appPid: pidData.appPid,
     });
 };
 const detectActiveApps = () => {
@@ -88,6 +94,9 @@ const detectActiveApps = () => {
                     createdAt: pm2_env.created_at || 0,
                     metrics: pm2_env.axm_monitor,
                     status: pm2_env.status,
+                    appUrl: pm2_env.BLOCKLET_APP_URL,
+                    appName: pm2_env.BLOCKLET_APP_NAME,
+                    appPid: pm2_env.BLOCKLET_APP_PID,
                 };
             }
         });
@@ -197,6 +206,33 @@ const detectActiveApps = () => {
             .catch((err) => {
             console.error(err.stack || err);
         });
+        const uniqAppMaps = (0, keyBy_1.default)(
+        // @ts-expect-error
+        apps.filter((x) => { var _a; return (_a = x.pm2_env) === null || _a === void 0 ? void 0 : _a.BLOCKLET_APP_PID; }), (x) => { var _a; return (_a = x.pm2_env) === null || _a === void 0 ? void 0 : _a.BLOCKLET_APP_PID; });
+        (0, p_all_1.default)(Object.values(uniqAppMaps)
+            .map((x) => x.pid)
+            .map((pid) => {
+            const app = pidsMonit[pid];
+            if (!app) {
+                throw new Error(`App ${pid} does not have active PIDs. Clear app metrics`);
+            }
+            return app;
+        })
+            .map((app) => {
+            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) => {
+            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, appPid: app.appPid }, app.urls.length);
+                }
+            }
+        }).catch(error => console.error(error));
     });
 };
 const startPm2Connect = (conf) => {

package/metrics/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deletePromAppInstancesMetrics = exports.deletePromAppMetrics = exports.combineAllRegistries = exports.initDynamicGaugeMetricClients = exports.initMetrics = exports.dynamicGaugeMetricClients = exports.metricAppStatus = exports.metricAppPidsMemory = exports.metricAppUptime = exports.metricAppRestartCount = exports.metricAppPidsCpuThreshold = exports.metricAppPidsCpuLast = exports.metricAppAverageCpu = exports.metricAppTotalMemory = exports.metricAppAverageMemory = exports.metricAppInstances = exports.metricAvailableApps = exports.registry = void 0;
+exports.deletePromAppInstancesMetrics = exports.deletePromAppMetrics = exports.combineAllRegistries = exports.initDynamicGaugeMetricClients = exports.initMetrics = exports.dynamicGaugeMetricClients = exports.metricAppStatus = exports.metricAppPidsMemory = exports.metricAppUptime = exports.metricAppRestartCount = exports.metricAppPidsCpuThreshold = exports.metricAppPidsCpuLast = exports.metricAppAverageCpu = exports.metricAppTotalMemory = exports.metricAppAverageMemory = exports.metricAppDomainList = exports.metricAppInstances = exports.metricAvailableApps = exports.registry = void 0;
 const prom_client_1 = __importDefault(require("prom-client"));
 const node_os_1 = __importDefault(require("node:os"));
 const cpu_1 = require("../utils/cpu");
@@ -23,6 +23,7 @@ const METRIC_FREE_MEMORY = 'free_memory';
 const METRIC_AVAILABLE_CPU = 'cpu_count';
 const METRIC_AVAILABLE_APPS = 'available_apps';
 const METRIC_APP_INSTANCES = 'app_instances';
+const METRIC_APP_DOMAIN_LIST = 'app_domain_list';
 const METRIC_APP_AVERAGE_MEMORY = 'app_average_memory';
 const METRIC_APP_PIDS_MEMORY = 'app_pids_memory';
 const METRIC_APP_TOTAL_MEMORY = 'app_total_memory';
@@ -146,6 +147,12 @@ const initMetrics = (prefix) => {
         registers: [exports.registry],
         labelNames: ['app'],
     });
+    exports.metricAppDomainList = new prom_client_1.default.Gauge({
+        name: `${prefix}_${METRIC_APP_DOMAIN_LIST}`,
+        help: 'Show app domain list',
+        registers: [exports.registry],
+        labelNames: ['appName', 'domain', 'appPid'],
+    });
     exports.metricAppAverageMemory = new prom_client_1.default.Gauge({
         name: `${prefix}_${METRIC_APP_AVERAGE_MEMORY}`,
         help: 'Show average using memory of an app',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@arcblock/pm2-prom-module",
-    "version": "2.6.5",
+    "version": "2.6.7",
     "publishConfig": {
         "access": "public"
     },
@@ -8,14 +8,19 @@
     "main": "index.js",
     "dependencies": {
         "@abtnode/util": "^1.16.44",
+        "@keyv/sqlite": "^4.0.6",
         "@types/dockerode": "^3.3.42",
         "dockerode": "^4.0.7",
         "internal-ip": "^6.2.0",
+        "is-url": "^1.2.4",
+        "keyv": "^5.5.3",
         "lodash": "^4.17.21",
+        "p-all": "^3.0.0",
         "pidusage": "^3.0.2",
         "pm2": "^6.0.8",
         "pmx": "beta",
         "prom-client": "^15.1.3",
+        "ufo": "^1.6.1",
         "xbytes": "^1.9.1",
         "zx": "^8.8.0"
     },

package/utils/domain.js

@@ -0,0 +1,56 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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"));
+const appDomainListCache = new keyv_1.default({
+    store: new sqlite_1.default({
+        // 这里只能相对路径才能工作
+        uri: 'sqlite://./cache.db',
+        table: 'app_domain_list_cache',
+        busyTimeout: 10000,
+    }),
+    // 默认缓存一个小时
+    ttl: 1000 * 60 * 60,
+});
+function getAppDomainList(url) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        try {
+            if (!url) {
+                return [];
+            }
+            if (!(0, is_url_1.default)(url)) {
+                return [url];
+            }
+            if (yield appDomainListCache.has(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)) {
+                yield appDomainListCache.set(url, domainAliases);
+            }
+            return domainAliases || [url];
+        }
+        catch (error) {
+            console.error(error);
+            return [url];
+        }
+    });
+}