@abtnode/core 1.5.21 → 1.6.3

package/lib/api/node.js

@@ -114,7 +114,7 @@ class NodeAPI {
     const info = await this.state.read();
     const env = await this.state.getEnvironments();
     info.environments = Object.keys(env).map((x) => ({ key: x, value: env[x] }));
-    info.uptime = +new Date() - process.uptime() * 1000;
+    info.uptime = process.uptime() * 1000;
 
     return info;
   }

package/lib/blocklet/registry.js

@@ -3,7 +3,7 @@ const { BlockletGroup } = require('@blocklet/meta/lib/constants');
 const joinURL = require('url-join');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
-const { BLOCKLET_STORE_API_PREFIX } = require('@abtnode/constant');
+const { BLOCKLET_STORE_API_PREFIX, BLOCKLET_STORE_META_PATH } = require('@abtnode/constant');
 
 const { name } = require('../../package.json');
 
@@ -170,7 +170,7 @@ BlockletRegistry.validateRegistryURL = async (registry) => {
 
 BlockletRegistry.getRegistryMeta = async (registry) => {
   try {
-    const url = joinURL(registry, BLOCKLET_STORE_API_PREFIX, `/registry.json?__t__=${Date.now()}`);
+    const url = joinURL(registry, BLOCKLET_STORE_META_PATH, `?__t__=${Date.now()}`);
     const { data } = await request.get(url);
 
     if (!data) {

package/lib/util/blocklet.js

@@ -798,7 +798,7 @@ const getRuntimeInfo = async (appId) => {
   const proc = await getProcessInfo(appId);
   return {
     pid: proc.pid,
-    uptime: proc.pm2_env ? Number(proc.pm2_env.pm_uptime) : 0,
+    uptime: proc.pm2_env ? +new Date() - Number(proc.pm2_env.pm_uptime) : 0,
     memoryUsage: proc.monit.memory,
     cpuUsage: proc.monit.cpu,
     status: proc.pm2_env ? proc.pm2_env.status : null,

package/lib/util/get-ip-dns-domain-for-blocklet.js

@@ -3,7 +3,7 @@ const { DEFAULT_IP_DNS_DOMAIN_SUFFIX } = require('@abtnode/constant');
 
 const SLOT_FOR_IP_DNS_SITE = '888-888-888-888';
 
-const formatName = (name) => slugify(name.replace(/^[@./-]/, '').replace(/[@./]/g, '-'));
+const formatName = (name) => slugify(name.replace(/^[@./-]/, '').replace(/[@./_]/g, '-'));
 
 const hiddenInterfaceNames = ['public', 'publicUrl'];
 

package/lib/util/requirement.js

@@ -10,7 +10,8 @@ const isSatisfied = (requirements, throwOnUnsatisfied = true) => {
   }
 
   const { platform: actualOs, arch: actualCpu } = process;
-  const { os: expectedOs, cpu: expectedCpu, abtnode: expectedVersion } = Object.assign(defaults, requirements);
+  const { os: expectedOs, cpu: expectedCpu, abtnode, server } = Object.assign(defaults, requirements);
+  const expectedVersion = server || abtnode;
 
   const isOsSatisfied =
     expectedOs === '*' || expectedOs === actualOs || (Array.isArray(expectedOs) && expectedOs.includes(actualOs));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.21",
+  "version": "1.6.3",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,26 +19,26 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.5.21",
-    "@abtnode/cron": "1.5.21",
-    "@abtnode/logger": "1.5.21",
-    "@abtnode/queue": "1.5.21",
-    "@abtnode/rbac": "1.5.21",
-    "@abtnode/router-provider": "1.5.21",
-    "@abtnode/static-server": "1.5.21",
-    "@abtnode/timemachine": "1.5.21",
-    "@abtnode/util": "1.5.21",
-    "@arcblock/did": "^1.13.65",
-    "@arcblock/event-hub": "1.13.65",
+    "@abtnode/constant": "1.6.3",
+    "@abtnode/cron": "1.6.3",
+    "@abtnode/logger": "1.6.3",
+    "@abtnode/queue": "1.6.3",
+    "@abtnode/rbac": "1.6.3",
+    "@abtnode/router-provider": "1.6.3",
+    "@abtnode/static-server": "1.6.3",
+    "@abtnode/timemachine": "1.6.3",
+    "@abtnode/util": "1.6.3",
+    "@arcblock/did": "^1.13.71",
+    "@arcblock/event-hub": "1.13.71",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.13.65",
-    "@blocklet/meta": "1.5.21",
+    "@arcblock/vc": "^1.13.71",
+    "@blocklet/meta": "1.6.3",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.13.65",
-    "@ocap/util": "^1.13.65",
-    "@ocap/wallet": "^1.13.65",
+    "@ocap/mcrypto": "^1.13.71",
+    "@ocap/util": "^1.13.71",
+    "@ocap/wallet": "^1.13.71",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.21.4",
     "axon": "^2.0.3",
@@ -73,5 +73,5 @@
     "express": "^4.17.1",
     "jest": "^27.3.1"
   },
-  "gitHead": "db219f519704e8c7ebe60f8448ec6c447ac4e059"
+  "gitHead": "3642ccce1e0ab0e1937e32a7dc119a9763bc21c2"
 }