@abtnode/core 1.16.18-beta-bb4ebacc → 1.16.18-beta-f4777312

package/lib/blocklet/manager/disk.js

@@ -433,7 +433,8 @@ class DiskBlockletManager extends BaseBlockletManager {
     return installComponentFromDev({ folder, meta, rootDid, mountPoint, skipParseDependents, manager: this, states });
   }
 
-  checkComponentsForUpdates({ did }) {
+  async checkComponentsForUpdates({ did }) {
+    await this.checkControllerStatus(await this.ensureBlocklet(did), 'upgrade');
     return UpgradeComponents.check({ did, states });
   }
 
@@ -3717,7 +3718,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         did: blocklet.meta.did,
         nftId: blocklet.controller?.nftId,
       });
-      throw new Error(`can not ${action} an expired blocklet`);
+      throw new Error(`Can not ${action} an expired blocklet`);
     }
 
     if (

package/lib/router/helper.js

@@ -149,7 +149,7 @@ const attachRuntimeDomainAliases = async ({ sites = [], context = {} }) => {
         if (domain.value.includes(SLOT_FOR_IP_DNS_SITE)) {
           domain.value = replaceSlotToIp(domain.value, ip);
         } else if (domain.value === DEFAULT_IP_DOMAIN) {
-          domain.value = `${ip.split('.').join('-')}${domain.value.substring(2)}`;
+          domain.value = `${ip.split('.').join('-')}${domain.value.substring(1)}`;
         }
       }
       return domain;

package/lib/states/user.js

@@ -359,7 +359,16 @@ class User extends ExtendBase {
       passports: user.passport ? [{ ...user.passport, lastLoginAt: now }] : [],
     };
 
+    // HACK: joi 会把 null 值过滤掉，暂时手动判断 null 值
+    if (raw.sourceAppPid === null) {
+      updates.sourceAppPid = null;
+    }
+
     if (exist) {
+      // HACK: sourceAppPid 不能更新
+      if (updates.sourceAppPid) {
+        delete updates.sourceAppPid;
+      }
       // update user, connectedAccount, passport
       updates.connectedAccounts = updateConnectedAccount(exist.connectedAccounts, user.connectedAccount);
       updated = await this.updateUser(user.did, updates);

package/lib/util/blocklet.js

@@ -1026,6 +1026,7 @@ const getRuntimeInfo = async (processId) => {
     memoryUsage: proc.monit.memory,
     cpuUsage: proc.monit.cpu,
     status: proc.pm2_env ? proc.pm2_env.status : null,
+    port: proc.pm2_env ? proc.pm2_env.BLOCKLET_PORT : null,
   };
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.18-beta-bb4ebacc",
+  "version": "1.16.18-beta-f4777312",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.18-beta-bb4ebacc",
-    "@abtnode/auth": "1.16.18-beta-bb4ebacc",
-    "@abtnode/certificate-manager": "1.16.18-beta-bb4ebacc",
-    "@abtnode/constant": "1.16.18-beta-bb4ebacc",
-    "@abtnode/cron": "1.16.18-beta-bb4ebacc",
-    "@abtnode/logger": "1.16.18-beta-bb4ebacc",
-    "@abtnode/models": "1.16.18-beta-bb4ebacc",
-    "@abtnode/queue": "1.16.18-beta-bb4ebacc",
-    "@abtnode/rbac": "1.16.18-beta-bb4ebacc",
-    "@abtnode/router-provider": "1.16.18-beta-bb4ebacc",
-    "@abtnode/static-server": "1.16.18-beta-bb4ebacc",
-    "@abtnode/timemachine": "1.16.18-beta-bb4ebacc",
-    "@abtnode/util": "1.16.18-beta-bb4ebacc",
+    "@abtnode/analytics": "1.16.18-beta-f4777312",
+    "@abtnode/auth": "1.16.18-beta-f4777312",
+    "@abtnode/certificate-manager": "1.16.18-beta-f4777312",
+    "@abtnode/constant": "1.16.18-beta-f4777312",
+    "@abtnode/cron": "1.16.18-beta-f4777312",
+    "@abtnode/logger": "1.16.18-beta-f4777312",
+    "@abtnode/models": "1.16.18-beta-f4777312",
+    "@abtnode/queue": "1.16.18-beta-f4777312",
+    "@abtnode/rbac": "1.16.18-beta-f4777312",
+    "@abtnode/router-provider": "1.16.18-beta-f4777312",
+    "@abtnode/static-server": "1.16.18-beta-f4777312",
+    "@abtnode/timemachine": "1.16.18-beta-f4777312",
+    "@abtnode/util": "1.16.18-beta-f4777312",
     "@arcblock/did": "1.18.95",
     "@arcblock/did-auth": "1.18.95",
     "@arcblock/did-ext": "^1.18.95",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.95",
     "@arcblock/vc": "1.18.95",
-    "@blocklet/constant": "1.16.18-beta-bb4ebacc",
-    "@blocklet/env": "1.16.18-beta-bb4ebacc",
-    "@blocklet/meta": "1.16.18-beta-bb4ebacc",
-    "@blocklet/resolver": "1.16.18-beta-bb4ebacc",
-    "@blocklet/sdk": "1.16.18-beta-bb4ebacc",
-    "@did-space/client": "^0.3.22",
+    "@blocklet/constant": "1.16.18-beta-f4777312",
+    "@blocklet/env": "1.16.18-beta-f4777312",
+    "@blocklet/meta": "1.16.18-beta-f4777312",
+    "@blocklet/resolver": "1.16.18-beta-f4777312",
+    "@blocklet/sdk": "1.16.18-beta-f4777312",
+    "@did-space/client": "^0.3.25",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.95",
     "@ocap/util": "1.18.95",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "aca7ff8eb508ecf586108b99a9e07ceab2a62430"
+  "gitHead": "c9a7fe350706fbeaa6268609b3decd407896e234"
 }