@arcblock/pm2-prom-module 2.6.1 → 2.6.3

package/core/pm2.js

@@ -172,6 +172,9 @@ const detectActiveApps = () => {
             // @ts-expect-error
             dockerApps.map((x) => { var _a; return (_a = x.pm2_env) === null || _a === void 0 ? void 0 : _a.BLOCKLET_DOCKER_NAME; })).then((stats) => {
                 stats.map((stat, i) => {
+                    if (!stat) {
+                        return;
+                    }
                     const entry = mapAppPids[dockerApps[i].name];
                     if (entry) {
                         entry.pids.forEach((pid) => {
@@ -199,8 +202,6 @@ const detectActiveApps = () => {
             .catch((err) => {
             console.error(err.stack || err);
         });
-        // get docker stats
-        // @ts-ignore
     });
 };
 const startPm2Connect = (conf) => {

package/metrics/index.js

@@ -18,6 +18,7 @@ const node_os_1 = __importDefault(require("node:os"));
 const cpu_1 = require("../utils/cpu");
 const docker_1 = require("../utils/docker");
 const app_1 = require("./app");
+const METRIC_BLOCKLET_SERVER_INFO = 'blocklet_server_info';
 const METRIC_FREE_MEMORY = 'free_memory';
 const METRIC_AVAILABLE_CPU = 'cpu_count';
 const METRIC_AVAILABLE_APPS = 'available_apps';
@@ -41,6 +42,18 @@ exports.dynamicGaugeMetricClients = {};
 // Metrics
 const initMetrics = (prefix) => {
     currentPrefix = prefix;
+    new prom_client_1.default.Gauge({
+        name: `${prefix}_${METRIC_BLOCKLET_SERVER_INFO}`,
+        help: 'Show blocklet server info',
+        collect() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const info = yield (0, docker_1.getBlockletServerInfo)();
+                this.set(info, 1);
+            });
+        },
+        registers: [exports.registry],
+        labelNames: ['name', 'version', 'mode', 'internalIP'],
+    });
     new prom_client_1.default.Gauge({
         name: `${prefix}_${METRIC_FREE_MEMORY}`,
         help: 'Show available host free memory (System OS)',

package/package.json

@@ -1,12 +1,14 @@
 {
     "name": "@arcblock/pm2-prom-module",
-    "version": "2.6.1",
+    "version": "2.6.3",
     "publishConfig": {
         "access": "public"
     },
     "description": "PM2 module to help collect applications statistic and send it to Prometheus server",
     "main": "index.js",
     "dependencies": {
+        "@abtnode/util": "^1.16.44",
+        "internal-ip": "^6.2.0",
         "pidusage": "^3.0.2",
         "pm2": "^5.3.0",
         "pmx": "beta",
@@ -15,12 +17,12 @@
         "zx": "^4.3.0"
     },
     "scripts": {
-        "predev": "pm2 delete pm2-prom-module || true && npm run build",
-        "dev": "pm2 install .",
+        "predev": "export PM2_HOME=~/.arcblock/abtnode && pm2 delete @arcblock/pm2-prom-module && pm2 uninstall @arcblock/pm2-prom-module || true && npm run build",
+        "dev": "export PM2_HOME=~/.arcblock/abtnode && pm2 install .",
         "build": "tsc -p tsconfig.json",
         "watch": "tsc -w -p tsconfig.json",
         "release": "npm run build && npm publish",
-        "bump:version": "zx scripts/bump-version.mjs --quiet"
+        "bump-version": "zx scripts/bump-version.mjs --quiet"
     },
     "files": [
         "README.md",

package/utils/docker.js

@@ -12,12 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDockerStats = exports.getCPULimit = exports.getFreeMemory = exports.getUsedMemory = exports.getAvailableMemory = exports.hasDockerLimitFiles = void 0;
+exports.getDockerStats = exports.getCPULimit = exports.getFreeMemory = exports.getUsedMemory = exports.getBlockletServerInfo = exports.getAvailableMemory = exports.hasDockerLimitFiles = void 0;
 const promises_1 = require("node:fs/promises");
 const node_os_1 = __importDefault(require("node:os"));
 const cpu_1 = require("./cpu");
 const zx_1 = require("zx");
 const xbytes_1 = __importDefault(require("xbytes"));
+const get_ip_1 = __importDefault(require("@abtnode/util/lib/get-ip"));
+const internal_ip_1 = require("internal-ip");
 // 禁用命令和结果的自动输出
 zx_1.$.verbose = false;
 //const MEMORY_AVAILABLE = '/sys/fs/cgroup/memory.limit_in_bytes';
@@ -50,6 +52,37 @@ const getAvailableMemory = () => __awaiter(void 0, void 0, void 0, function* ()
     }
 });
 exports.getAvailableMemory = getAvailableMemory;
+const getBlockletServerInfo = () => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const internalIP = (yield (0, internal_ip_1.v4)()) ||
+            (yield (0, get_ip_1.default)({ includeExternal: false, timeout: 5000 })).internal;
+        if (!internalIP) {
+            throw new Error('Failed to get internal IP address');
+        }
+        const response = yield fetch(`https://${internalIP.replace(/\./g, '-')}.ip.abtnet.io/.well-known/did.json`);
+        if (response.status !== 200) {
+            throw new Error(`Failed to get blocklet server info, ip: ${internalIP}, status: ${response.status}, statusText: ${response.statusText}`);
+        }
+        const data = yield response.json();
+        const metadata = data.services.find((service) => service.type === 'server').metadata;
+        return {
+            name: metadata.name,
+            version: metadata.version,
+            mode: metadata.mode,
+            internalIP,
+        };
+    }
+    catch (error) {
+        console.error(error);
+        return {
+            name: 'unknown',
+            version: 'unknown',
+            mode: 'unknown',
+            internalIP: 'unknown',
+        };
+    }
+});
+exports.getBlockletServerInfo = getBlockletServerInfo;
 const getUsedMemory = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const data = (yield (0, promises_1.readFile)(MEMORY_USED, { encoding: 'utf8' })).trim();