@abtnode/core 1.16.24-beta-6975c2c0 → 1.16.24-beta-30f58f8d

package/lib/states/user.js

@@ -188,7 +188,7 @@ class User extends ExtendBase {
   // eslint-disable-next-line require-await
   async getUsers({ query, sort, paging } = {}) {
     const where = {};
-    const { approved, role, search, tags, includeTags } = query || {};
+    const { approved, role, search, tags, includeTags, includePassports } = query || {};
     const shouldIncludeTag = (tags && tags.length) || includeTags;
 
     if (isNullOrUndefined(approved) === false) {
@@ -224,18 +224,39 @@ class User extends ExtendBase {
     if (!Object.keys(sorting).length) {
       sorting.createdAt = -1;
     }
+    const include = [];
+    if (shouldIncludeTag) {
+      include.push(this.getTagInclude(tags));
+    }
+    if (includePassports) {
+      include.push({
+        model: this.models.Passport,
+        as: 'passports',
+      });
+    }
 
-    return this.paginate({ where, include: shouldIncludeTag ? [this.getTagInclude(tags)] : [] }, sorting, paging);
+    return this.paginate({ where, include }, sorting, paging);
   }
 
   // eslint-disable-next-line require-await
   async getUsersByDids({ dids, query }) {
-    const { approved, includeTags } = query || {};
+    const { approved, includeTags, includePassports } = query || {};
     const condition = { did: dids };
     if (isNullOrUndefined(approved) === false) {
       condition.approved = !!approved;
     }
-    return this.find({ where: condition, include: includeTags ? [this.getTagInclude()] : [] });
+    const include = [];
+    if (includeTags) {
+      include.push(this.getTagInclude());
+    }
+    if (includePassports) {
+      include.push({
+        model: this.models.Passport,
+        as: 'passports',
+      });
+    }
+
+    return this.find({ where: condition, include });
   }
 
   // eslint-disable-next-line require-await

package/lib/util/blocklet.js

@@ -106,6 +106,7 @@ const { validate: validateEngine, get: getEngine } = require('../blocklet/manage
 const isRequirementsSatisfied = require('./requirement');
 const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
 const { expandBundle, findInterfacePortByName, prettyURL, templateReplace, getServerDidDomain } = require('./index');
+const { installExternalDependencies } = require('./install-external-dependencies');
 
 /**
  * get blocklet engine info, default is node
@@ -564,6 +565,9 @@ const startBlockletProcess = async (
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
       const startedAt = Date.now();
 
+      // install external dependencies
+      await Promise.resolve(installExternalDependencies(b, { env }));
+
       // run hook
       await preFlight(b, { env });
 

package/lib/util/install-external-dependencies.js

@@ -0,0 +1,35 @@
+const { spawnSync } = require('child_process');
+const fs = require('fs-extra');
+const path = require('path');
+
+function installExternalDependencies(blocklet, { env }) {
+  if (!env.BLOCKLET_APP_DIR) {
+    throw new Error('BLOCKLET_APP_DIR is required');
+  }
+
+  // 读取 BLOCKLET_APP_DIR 的 package.json
+  const packageJsonPath = path.resolve(env.BLOCKLET_APP_DIR, 'package.json');
+  if (!fs.existsSync(packageJsonPath)) {
+    return;
+  }
+
+  const packageJson = fs.readJsonSync(packageJsonPath);
+
+  if (!packageJson.externalManager) {
+    return;
+  }
+
+  const result = spawnSync(packageJson.externalManager, ['install'], {
+    cwd: env.BLOCKLET_APP_DIR,
+    stdio: 'pipe',
+    shell: true,
+  });
+
+  if (result.status !== 0 && result.stderr && result.stderr.toString().trim()) {
+    throw new Error(result.stderr.toString());
+  }
+  if (result.error) {
+    throw result.error;
+  }
+}
+module.exports = { installExternalDependencies };

package/lib/webhook/sender/wallet/index.js

@@ -11,6 +11,7 @@ class WalletSender extends BaseSender {
       const sender = {
         appDid: nodeInfo.did,
         appSk: nodeInfo.sk,
+        type: 'server',
       };
 
       const message = {
@@ -18,7 +19,11 @@ class WalletSender extends BaseSender {
         body: description,
       };
 
-      const { users } = await node.getUsers({ teamDid: nodeInfo.did, paging: { pageSize: 100 } });
+      const { users } = await node.getUsers({
+        teamDid: nodeInfo.did,
+        paging: { pageSize: 100 },
+        query: { includePassports: true },
+      });
       const adminUsers = users
         .filter(
           (x) =>

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.24-beta-6975c2c0",
+  "version": "1.16.24-beta-30f58f8d",
   "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.24-beta-6975c2c0",
-    "@abtnode/auth": "1.16.24-beta-6975c2c0",
-    "@abtnode/certificate-manager": "1.16.24-beta-6975c2c0",
-    "@abtnode/constant": "1.16.24-beta-6975c2c0",
-    "@abtnode/cron": "1.16.24-beta-6975c2c0",
-    "@abtnode/logger": "1.16.24-beta-6975c2c0",
-    "@abtnode/models": "1.16.24-beta-6975c2c0",
-    "@abtnode/queue": "1.16.24-beta-6975c2c0",
-    "@abtnode/rbac": "1.16.24-beta-6975c2c0",
-    "@abtnode/router-provider": "1.16.24-beta-6975c2c0",
-    "@abtnode/static-server": "1.16.24-beta-6975c2c0",
-    "@abtnode/timemachine": "1.16.24-beta-6975c2c0",
-    "@abtnode/util": "1.16.24-beta-6975c2c0",
+    "@abtnode/analytics": "1.16.24-beta-30f58f8d",
+    "@abtnode/auth": "1.16.24-beta-30f58f8d",
+    "@abtnode/certificate-manager": "1.16.24-beta-30f58f8d",
+    "@abtnode/constant": "1.16.24-beta-30f58f8d",
+    "@abtnode/cron": "1.16.24-beta-30f58f8d",
+    "@abtnode/logger": "1.16.24-beta-30f58f8d",
+    "@abtnode/models": "1.16.24-beta-30f58f8d",
+    "@abtnode/queue": "1.16.24-beta-30f58f8d",
+    "@abtnode/rbac": "1.16.24-beta-30f58f8d",
+    "@abtnode/router-provider": "1.16.24-beta-30f58f8d",
+    "@abtnode/static-server": "1.16.24-beta-30f58f8d",
+    "@abtnode/timemachine": "1.16.24-beta-30f58f8d",
+    "@abtnode/util": "1.16.24-beta-30f58f8d",
     "@arcblock/did": "1.18.110",
     "@arcblock/did-auth": "1.18.110",
     "@arcblock/did-ext": "^1.18.110",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.110",
     "@arcblock/vc": "1.18.110",
-    "@blocklet/constant": "1.16.24-beta-6975c2c0",
-    "@blocklet/env": "1.16.24-beta-6975c2c0",
-    "@blocklet/meta": "1.16.24-beta-6975c2c0",
-    "@blocklet/resolver": "1.16.24-beta-6975c2c0",
-    "@blocklet/sdk": "1.16.24-beta-6975c2c0",
-    "@did-space/client": "^0.3.63",
+    "@blocklet/constant": "1.16.24-beta-30f58f8d",
+    "@blocklet/env": "1.16.24-beta-30f58f8d",
+    "@blocklet/meta": "1.16.24-beta-30f58f8d",
+    "@blocklet/resolver": "1.16.24-beta-30f58f8d",
+    "@blocklet/sdk": "1.16.24-beta-30f58f8d",
+    "@did-space/client": "^0.3.64",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.110",
     "@ocap/util": "1.18.110",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "0622d3897a7fb7a01d74e024fa2027e335bbe539"
+  "gitHead": "95f8e79898d7901f0665f3883e3c014c36f16668"
 }