@abtnode/core 1.16.6-beta-56be9f01 → 1.16.6-beta-e2082fec

package/lib/router/helper.js

@@ -252,8 +252,8 @@ const ensureWellknownRule = async (sites = []) => {
   const wellknownPort = await getWellknownSitePort();
 
   for (const site of sites) {
-    if (isBlockletSite(site.domain)) {
-      // add /.well-known for blocklet
+    // 不向 default site & ip site & wellknown site 添加 wellknown rule
+    if (![DOMAIN_FOR_INTERNAL_SITE, DOMAIN_FOR_IP_SITE, DOMAIN_FOR_DEFAULT_SITE].includes(site.domain)) {
       const isExists = site.rules.find((x) => x.from.pathPrefix === WELLKNOWN_PATH_PREFIX);
       if (!isExists) {
         site.rules.push({

package/lib/states/audit-log.js

@@ -156,12 +156,14 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `joined team ${team} by ${args.reason}`;
     case 'updateUser':
       return `${args.reason} and received **${args.passport.name}** passport from ${team}`;
+    case 'connectAccount':
+      return `user ${user} connect with account ${args.connectedAccount.provider}: ${args.connectedAccount.did}`;
     case 'switchProfile':
       return `switched profile to ${args.profile.fullName} for ${team}`;
     case 'switchPassport':
-      return `switched passport to ${args.passport.name} for ${team}`;
+      return `${args.provider} user ${user} switched passport to ${args.passport.name} for ${team}`;
     case 'login':
-      return `${user} logged in to ${team} with passport ${args.passport.name}`;
+      return `${args.provider} user ${user} logged in to ${team} with passport ${args.passport.name}`;
     case 'updateWhoCanAccess':
       return `updated access control policy to **${args.whoCanAccess}**`;
     case 'configPassportIssuance':
@@ -321,6 +323,7 @@ const getLogCategory = (action) => {
     case 'configTrustedFactories':
     case 'delegateTransferNFT':
     case 'createTransferInvitation':
+    case 'connectAccount':
       return 'team';
 
     // accessKeys

package/lib/util/blocklet.js

@@ -339,7 +339,7 @@ const getAppOverwrittenEnvironments = (blocklet, nodeInfo) => {
     result[x] = blocklet.configObj[x];
   });
 
-  const keys = ['BLOCKLET_APP_SK', 'BLOCKLET_APP_CHAIN_TYPE'];
+  const keys = ['BLOCKLET_APP_SK', 'BLOCKLET_APP_CHAIN_TYPE', 'BLOCKLET_WALLET_TYPE'];
   const isAppDidRewritten = keys.some((key) => blocklet.configObj[key]);
   if (!isAppDidRewritten) {
     return result;

package/lib/util/index.js

@@ -2,7 +2,6 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const dns = require('dns');
-const unzipper = require('unzipper');
 const crypto = require('crypto');
 const shell = require('shelljs');
 const get = require('lodash/get');
@@ -12,6 +11,7 @@ const joinUrl = require('url-join');
 const { Certificate } = require('@fidm/x509');
 const getPortLib = require('get-port');
 const v8 = require('v8');
+const StreamZip = require('node-stream-zip');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const axios = require('@abtnode/util/lib/axios');
 const { encode: encodeBase32 } = require('@abtnode/util/lib/base32');
@@ -251,8 +251,12 @@ const getBaseUrls = async (node, ips) => {
   }));
 };
 
-const expandBundle = (bundlePath, destDir) =>
-  unzipper.Open.file(bundlePath).then((d) => d.extract({ path: destDir, concurrency: 20 }));
+const expandBundle = async (bundlePath, destDir) => {
+  // eslint-disable-next-line new-cap
+  const zip = new StreamZip.async({ file: bundlePath });
+  await zip.extract(null, destDir);
+  await zip.close();
+};
 
 // eslint-disable-next-line no-shadow
 const findInterfaceByName = (blocklet, name) => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-56be9f01",
+  "version": "1.16.6-beta-e2082fec",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,35 +19,35 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.6-beta-56be9f01",
-    "@abtnode/certificate-manager": "1.16.6-beta-56be9f01",
-    "@abtnode/constant": "1.16.6-beta-56be9f01",
-    "@abtnode/cron": "1.16.6-beta-56be9f01",
-    "@abtnode/db": "1.16.6-beta-56be9f01",
-    "@abtnode/logger": "1.16.6-beta-56be9f01",
-    "@abtnode/queue": "1.16.6-beta-56be9f01",
-    "@abtnode/rbac": "1.16.6-beta-56be9f01",
-    "@abtnode/router-provider": "1.16.6-beta-56be9f01",
-    "@abtnode/static-server": "1.16.6-beta-56be9f01",
-    "@abtnode/timemachine": "1.16.6-beta-56be9f01",
-    "@abtnode/util": "1.16.6-beta-56be9f01",
-    "@arcblock/did": "1.18.76",
-    "@arcblock/did-auth": "1.18.76",
-    "@arcblock/did-ext": "^1.18.76",
+    "@abtnode/auth": "1.16.6-beta-e2082fec",
+    "@abtnode/certificate-manager": "1.16.6-beta-e2082fec",
+    "@abtnode/constant": "1.16.6-beta-e2082fec",
+    "@abtnode/cron": "1.16.6-beta-e2082fec",
+    "@abtnode/db": "1.16.6-beta-e2082fec",
+    "@abtnode/logger": "1.16.6-beta-e2082fec",
+    "@abtnode/queue": "1.16.6-beta-e2082fec",
+    "@abtnode/rbac": "1.16.6-beta-e2082fec",
+    "@abtnode/router-provider": "1.16.6-beta-e2082fec",
+    "@abtnode/static-server": "1.16.6-beta-e2082fec",
+    "@abtnode/timemachine": "1.16.6-beta-e2082fec",
+    "@abtnode/util": "1.16.6-beta-e2082fec",
+    "@arcblock/did": "1.18.77",
+    "@arcblock/did-auth": "1.18.77",
+    "@arcblock/did-ext": "^1.18.77",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.76",
-    "@arcblock/event-hub": "1.18.76",
-    "@arcblock/jwt": "^1.18.76",
+    "@arcblock/did-util": "1.18.77",
+    "@arcblock/event-hub": "1.18.77",
+    "@arcblock/jwt": "^1.18.77",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.76",
-    "@blocklet/constant": "1.16.6-beta-56be9f01",
-    "@blocklet/meta": "1.16.6-beta-56be9f01",
-    "@blocklet/sdk": "1.16.6-beta-56be9f01",
-    "@did-space/client": "^0.2.87",
+    "@arcblock/vc": "1.18.77",
+    "@blocklet/constant": "1.16.6-beta-e2082fec",
+    "@blocklet/meta": "1.16.6-beta-e2082fec",
+    "@blocklet/sdk": "1.16.6-beta-e2082fec",
+    "@did-space/client": "^0.2.88",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.76",
-    "@ocap/util": "1.18.76",
-    "@ocap/wallet": "1.18.76",
+    "@ocap/mcrypto": "1.18.77",
+    "@ocap/util": "1.18.77",
+    "@ocap/wallet": "1.18.77",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -83,7 +83,6 @@
     "tar": "^6.1.11",
     "transliteration": "^2.3.5",
     "ua-parser-js": "^1.0.2",
-    "unzipper": "^0.10.11",
     "url-join": "^4.0.1",
     "uuid": "7.0.3",
     "valid-url": "^1.0.9"
@@ -94,5 +93,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "f93c24693ed27c4a2821ec33c345696afe6f001a"
+  "gitHead": "851e0ab17f1c6e160aedc47fcdbf7dd54dfa7237"
 }