@abtnode/core 1.8.14 → 1.8.17

package/lib/util/blocklet.js

@@ -11,6 +11,7 @@ const ssri = require('ssri');
 const diff = require('deep-diff');
 
 const { toHex } = require('@ocap/util');
+const { isValid: isValidDid } = require('@arcblock/did');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const pm2 = require('@abtnode/util/lib/async-pm2');
 const sleep = require('@abtnode/util/lib/sleep');
@@ -58,11 +59,13 @@ const {
   getBlockletMetaFromUrls,
   getBlockletMetaFromUrl,
 } = require('@blocklet/meta/lib/util-meta');
+const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
 
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
 
 const isRequirementsSatisfied = require('./requirement');
 const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
+const { getBlockletDomainGroupName } = require('./router');
 const { isBeforeInstalled, expandBundle, findInterfacePortByName, validateBlockletMeta } = require('./index');
 
 /**
@@ -208,7 +211,8 @@ const fillBlockletConfigs = (blocklet, configs) => {
     acc[x.key] = x.value;
     return acc;
   }, {});
-  blocklet.environmentObj = (blocklet.environments || []).reduce((acc, x) => {
+  blocklet.environments = blocklet.environments || [];
+  blocklet.environmentObj = blocklet.environments.reduce((acc, x) => {
     acc[x.key] = x.value;
     return acc;
   }, {});
@@ -1223,6 +1227,72 @@ const ensureMeta = (meta, { name, did } = {}) => {
   return newMeta;
 };
 
+const getBlocklet = async ({
+  did,
+  dataDirs,
+  states,
+  e2eMode = false,
+  validateEnv = true,
+  throwOnNotExist = true,
+  ensureDirs = true,
+} = {}) => {
+  if (!did) {
+    throw new Error('Blocklet did does not exist');
+  }
+  if (!isValidDid(did)) {
+    throw new Error(`Blocklet did is invalid: ${did}`);
+  }
+
+  if (!dataDirs) {
+    throw new Error('dataDirs does not exist');
+  }
+
+  if (!states) {
+    throw new Error('states does not exist');
+  }
+
+  const blocklet = await states.blocklet.getBlocklet(did);
+  if (!blocklet) {
+    if (throwOnNotExist) {
+      throw new Error(`can not find blocklet in database by did ${did}`);
+    }
+    return null;
+  }
+
+  // app settings
+  const settings = await states.blockletExtras.getSettings(blocklet.meta.did);
+  blocklet.trustedPassports = get(settings, 'trustedPassports') || [];
+  blocklet.enablePassportIssuance = get(settings, 'enablePassportIssuance', true);
+  blocklet.settings = settings || {};
+
+  // app site
+  const sites = await states.site.getSites();
+  const domain = getBlockletDomainGroupName(blocklet.meta.did);
+  blocklet.site = (sites || []).find((x) => x.domain === domain);
+
+  await forEachBlocklet(blocklet, async (component, { id, level, ancestors }) => {
+    // component env
+    component.env = {
+      id,
+      name: getComponentName(component, ancestors),
+      processId: getComponentProcessId(component, ancestors),
+      ...getComponentDirs(component, {
+        dataDirs,
+        ensure: ensureDirs,
+        validate: validateEnv,
+        ancestors,
+        e2eMode: level === 0 ? e2eMode : false,
+      }),
+    };
+
+    // component config
+    const configs = await states.blockletExtras.getConfigs([...ancestors.map((x) => x.meta.did), component.meta.did]);
+    fillBlockletConfigs(component, configs);
+  });
+
+  return blocklet;
+};
+
 module.exports = {
   forEachBlocklet,
   getBlockletMetaFromUrl: (url) => getBlockletMetaFromUrl(url, { logger }),
@@ -1261,4 +1331,5 @@ module.exports = {
   needBlockletDownload,
   findAvailableDid,
   ensureMeta,
+  getBlocklet,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.14",
+  "version": "1.8.17",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,31 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.8.14",
-    "@abtnode/constant": "1.8.14",
-    "@abtnode/cron": "1.8.14",
-    "@abtnode/db": "1.8.14",
-    "@abtnode/logger": "1.8.14",
-    "@abtnode/queue": "1.8.14",
-    "@abtnode/rbac": "1.8.14",
-    "@abtnode/router-provider": "1.8.14",
-    "@abtnode/static-server": "1.8.14",
-    "@abtnode/timemachine": "1.8.14",
-    "@abtnode/util": "1.8.14",
-    "@arcblock/did": "1.17.17",
+    "@abtnode/auth": "1.8.17",
+    "@abtnode/certificate-manager": "1.8.17",
+    "@abtnode/constant": "1.8.17",
+    "@abtnode/cron": "1.8.17",
+    "@abtnode/db": "1.8.17",
+    "@abtnode/logger": "1.8.17",
+    "@abtnode/queue": "1.8.17",
+    "@abtnode/rbac": "1.8.17",
+    "@abtnode/router-provider": "1.8.17",
+    "@abtnode/static-server": "1.8.17",
+    "@abtnode/timemachine": "1.8.17",
+    "@abtnode/util": "1.8.17",
+    "@arcblock/did": "1.17.19",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.17",
-    "@arcblock/event-hub": "1.17.17",
-    "@arcblock/jwt": "^1.17.17",
+    "@arcblock/did-util": "1.17.19",
+    "@arcblock/event-hub": "1.17.19",
+    "@arcblock/jwt": "^1.17.19",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.17.17",
-    "@blocklet/meta": "1.8.14",
-    "@blocklet/sdk": "1.8.14",
+    "@arcblock/vc": "1.17.19",
+    "@blocklet/meta": "1.8.17",
+    "@blocklet/sdk": "1.8.17",
     "@fidm/x509": "^1.2.1",
-    "@nedb/core": "^1.3.4",
-    "@nedb/multi": "^1.3.4",
-    "@ocap/mcrypto": "1.17.17",
-    "@ocap/util": "1.17.17",
-    "@ocap/wallet": "1.17.17",
+    "@ocap/mcrypto": "1.17.19",
+    "@ocap/util": "1.17.19",
+    "@ocap/wallet": "1.17.19",
     "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -81,5 +80,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "4b0cee41fd03d09301e2c35af46dd9e513473ef8"
+  "gitHead": "aa1854b3b71a6250182bfcad794235099f38a514"
 }