@abtnode/core 1.16.54-beta-20251028-092308-569763e6 → 1.16.54-beta-20251029-230008-54c9843b

package/lib/blocklet/manager/disk.js

@@ -2656,6 +2656,12 @@ class DiskBlockletManager extends BaseBlockletManager {
           options: { runOnInit: false },
           fn: () => this.cleanExpiredBlocklets(),
         },
+        {
+          name: 'send-serverless-heartbeat',
+          time: process.env.ABT_NODE_SERVERLESS_HEARTBEAT_INTERVAL || '*/5 * * * *', // default every 5 minutes
+          options: { runOnInit: false },
+          fn: () => launcher.sendServerlessHeartbeat(),
+        },
       ];
 
       logger.info('enable serverless jobs', serverlessJobs.map((x) => x.name).join(','));

package/lib/blocklet/migration-dist/migration.cjs

@@ -31695,6 +31695,7 @@ const isSatisfiable = (comparators, options) => {
 // already replaced the hyphen ranges
 // turn into a set of JUST comparators.
 const parseComparator = (comp, options) => {
+  comp = comp.replace(re[t.BUILD], '')
   debug('comp', comp, options)
   comp = replaceCarets(comp, options)
   debug('caret', comp)
@@ -32115,11 +32116,25 @@ class SemVer {
       other = new SemVer(other, this.options)
     }
 
-    return (
-      compareIdentifiers(this.major, other.major) ||
-      compareIdentifiers(this.minor, other.minor) ||
-      compareIdentifiers(this.patch, other.patch)
-    )
+    if (this.major < other.major) {
+      return -1
+    }
+    if (this.major > other.major) {
+      return 1
+    }
+    if (this.minor < other.minor) {
+      return -1
+    }
+    if (this.minor > other.minor) {
+      return 1
+    }
+    if (this.patch < other.patch) {
+      return -1
+    }
+    if (this.patch > other.patch) {
+      return 1
+    }
+    return 0
   }
 
   comparePre (other) {
@@ -33020,6 +33035,10 @@ module.exports = debug
 
 const numeric = /^[0-9]+$/
 const compareIdentifiers = (a, b) => {
+  if (typeof a === 'number' && typeof b === 'number') {
+    return a === b ? 0 : a < b ? -1 : 1
+  }
+
   const anum = numeric.test(a)
   const bnum = numeric.test(b)
 
@@ -38964,7 +38983,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.53","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"bun test --bail --timeout 30000","coverage":"bun test --bail --timeout 30000 --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.53","@abtnode/auth":"1.16.53","@abtnode/certificate-manager":"1.16.53","@abtnode/constant":"1.16.53","@abtnode/cron":"1.16.53","@abtnode/db-cache":"1.16.53","@abtnode/docker-utils":"1.16.53","@abtnode/logger":"1.16.53","@abtnode/models":"1.16.53","@abtnode/queue":"1.16.53","@abtnode/rbac":"1.16.53","@abtnode/router-provider":"1.16.53","@abtnode/static-server":"1.16.53","@abtnode/timemachine":"1.16.53","@abtnode/util":"1.16.53","@aigne/aigne-hub":"^0.10.3","@arcblock/did":"^1.26.3","@arcblock/did-connect-js":"^1.26.3","@arcblock/did-ext":"^1.26.3","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.26.3","@arcblock/event-hub":"^1.26.3","@arcblock/jwt":"^1.26.3","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.26.3","@arcblock/vc":"^1.26.3","@blocklet/constant":"1.16.53","@blocklet/did-space-js":"^1.1.34","@blocklet/env":"1.16.53","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.53","@blocklet/resolver":"1.16.53","@blocklet/sdk":"1.16.53","@blocklet/server-js":"1.16.53","@blocklet/store":"1.16.53","@blocklet/theme":"^3.1.51","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.26.3","@ocap/util":"^1.26.3","@ocap/wallet":"^1.26.3","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.53","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"bun test --bail --timeout 30000","coverage":"bun test --bail --timeout 30000 --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.53","@abtnode/auth":"1.16.53","@abtnode/certificate-manager":"1.16.53","@abtnode/constant":"1.16.53","@abtnode/cron":"1.16.53","@abtnode/db-cache":"1.16.53","@abtnode/docker-utils":"1.16.53","@abtnode/logger":"1.16.53","@abtnode/models":"1.16.53","@abtnode/queue":"1.16.53","@abtnode/rbac":"1.16.53","@abtnode/router-provider":"1.16.53","@abtnode/static-server":"1.16.53","@abtnode/timemachine":"1.16.53","@abtnode/util":"1.16.53","@aigne/aigne-hub":"^0.10.3","@arcblock/did":"^1.26.3","@arcblock/did-connect-js":"^1.26.3","@arcblock/did-ext":"^1.26.3","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.26.3","@arcblock/event-hub":"^1.26.3","@arcblock/jwt":"^1.26.3","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.26.3","@arcblock/vc":"^1.26.3","@blocklet/constant":"1.16.53","@blocklet/did-space-js":"^1.1.35","@blocklet/env":"1.16.53","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.53","@blocklet/resolver":"1.16.53","@blocklet/sdk":"1.16.53","@blocklet/server-js":"1.16.53","@blocklet/store":"1.16.53","@blocklet/theme":"^3.1.53","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.26.3","@ocap/util":"^1.26.3","@ocap/wallet":"^1.26.3","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/util/launcher.js

@@ -7,6 +7,7 @@ const pick = require('lodash/pick');
 const uniq = require('lodash/uniq');
 const trim = require('lodash/trim');
 const merge = require('lodash/merge');
+const si = require('systeminformation');
 const isEmpty = require('lodash/isEmpty');
 const {
   getUserAvatarUrl,
@@ -156,6 +157,85 @@ const notifyBlockletUpdated = (blocklet) => notifyLauncher('serverless.blocklet.
 const notifyBlockletStarted = (blocklet) => notifyLauncher('serverless.blocklet.started', blocklet);
 const notifyBlockletStopped = (blocklet) => notifyLauncher('serverless.blocklet.stopped', blocklet);
 
+const getCpuUtilization = async () => {
+  const load = await si.currentLoad();
+  const u = Number(load?.currentLoad);
+
+  return Math.max(0, Math.min(1, u / 100));
+};
+
+const getComponentsAggregate = async () => {
+  try {
+    const list = await states.blocklet.getBlocklets();
+    const counts = {};
+    let total = 0;
+    list.forEach((b) => {
+      const children = Array.isArray(b.children) ? b.children : [];
+      children.forEach((child) => {
+        const key = fromBlockletStatus(child.status) || 'unknown';
+        counts[key] = (counts[key] || 0) + 1;
+        total += 1;
+      });
+    });
+
+    return { total, counts };
+  } catch (error) {
+    logger.error('getComponentsAggregate failed', { error });
+    return { total: 0, counts: {} };
+  }
+};
+
+const sendServerlessHeartbeat = async () => {
+  logger.info('send serverless heartbeat');
+  const nodeInfo = await states.node.read();
+  const launcherUrl = nodeInfo?.launcher?.url;
+  if (!launcherUrl) {
+    logger.error('skip heartbeat: launcher url not configured', {
+      launcher: nodeInfo?.launcher,
+    });
+    return null;
+  }
+
+  const { did } = nodeInfo;
+  const cpuCores = os.cpus().length;
+  const [mem, cpuUtilization, components] = await Promise.all([
+    si.mem(),
+    getCpuUtilization(),
+    getComponentsAggregate(),
+  ]);
+
+  const memoryAvailableMb = mem.available / 1024 / 1024;
+  const memoryTotalMb = mem.total / 1024 / 1024;
+
+  const payload = {
+    name: nodeInfo.name,
+    description: nodeInfo.description,
+    version,
+    did,
+    cpuUtilization,
+    memoryAvailableMb,
+    memoryTotalMb,
+    cpuCores,
+    components,
+  };
+
+  logger.debug('send serverless heartbeat payload', { did, launcherUrl, payload });
+
+  try {
+    const result = await doRequest(nodeInfo.sk, {
+      launcherUrl,
+      pathname: '/api/serverless/heartbeat',
+      payload,
+      method: 'post',
+    });
+    logger.info('sent heartbeat to launcher', { did, launcherUrl, result });
+    return result;
+  } catch (error) {
+    logger.error('send heartbeat failed', { error: error.message, did, launcherUrl });
+    return null;
+  }
+};
+
 const consumeLauncherSession = async ({ params, blocklet }) => {
   try {
     const info = await states.node.read();
@@ -657,4 +737,5 @@ module.exports = {
   notifyBlockletStopped,
   launchBlockletByLauncher,
   launchBlockletWithoutWallet,
+  sendServerlessHeartbeat,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251028-092308-569763e6",
+  "version": "1.16.54-beta-20251029-230008-54c9843b",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,21 +19,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/auth": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/certificate-manager": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/constant": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/cron": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/db-cache": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/docker-utils": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/logger": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/models": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/queue": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/rbac": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/router-provider": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/static-server": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/timemachine": "1.16.54-beta-20251028-092308-569763e6",
-    "@abtnode/util": "1.16.54-beta-20251028-092308-569763e6",
+    "@abtnode/analytics": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/auth": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/certificate-manager": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/constant": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/cron": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/db-cache": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/docker-utils": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/logger": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/models": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/queue": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/rbac": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/router-provider": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/static-server": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/timemachine": "1.16.54-beta-20251029-230008-54c9843b",
+    "@abtnode/util": "1.16.54-beta-20251029-230008-54c9843b",
     "@aigne/aigne-hub": "^0.10.3",
     "@arcblock/did": "^1.26.3",
     "@arcblock/did-connect-js": "^1.26.3",
@@ -45,16 +45,16 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.26.3",
     "@arcblock/vc": "^1.26.3",
-    "@blocklet/constant": "1.16.54-beta-20251028-092308-569763e6",
-    "@blocklet/did-space-js": "^1.1.34",
-    "@blocklet/env": "1.16.54-beta-20251028-092308-569763e6",
+    "@blocklet/constant": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/did-space-js": "^1.1.35",
+    "@blocklet/env": "1.16.54-beta-20251029-230008-54c9843b",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.54-beta-20251028-092308-569763e6",
-    "@blocklet/resolver": "1.16.54-beta-20251028-092308-569763e6",
-    "@blocklet/sdk": "1.16.54-beta-20251028-092308-569763e6",
-    "@blocklet/server-js": "1.16.54-beta-20251028-092308-569763e6",
-    "@blocklet/store": "1.16.54-beta-20251028-092308-569763e6",
-    "@blocklet/theme": "^3.1.51",
+    "@blocklet/meta": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/resolver": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/sdk": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/server-js": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/store": "1.16.54-beta-20251029-230008-54c9843b",
+    "@blocklet/theme": "^3.1.53",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.26.3",
     "@ocap/util": "^1.26.3",
@@ -118,5 +118,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "6143a5fe06862e017da9a2dca2b0ff18c318587b"
+  "gitHead": "21cf7881f5759a9b82e1a852286f048af112bafa"
 }