@abtnode/core 1.8.30 → 1.8.32

package/lib/index.js

@@ -11,7 +11,6 @@ const { listProviders } = require('@abtnode/router-provider');
 const { DEFAULT_CERTIFICATE_EMAIL, EVENTS } = require('@abtnode/constant');
 
 const RoutingSnapshot = require('./states/routing-snapshot');
-const BlockletRegistry = require('./blocklet/registry');
 const BlockletManager = require('./blocklet/manager/disk');
 const RouterManager = require('./router/manager');
 const getRouterHelpers = require('./router/helper');
@@ -27,6 +26,7 @@ const DomainStatus = require('./util/domain-status');
 const Upgrade = require('./util/upgrade');
 const resetNode = require('./util/reset-node');
 const DiskMonitor = require('./util/disk-monitor');
+const StoreUtil = require('./util/store');
 const createQueue = require('./queue');
 const createEvents = require('./event');
 const pm2Events = require('./blocklet/manager/pm2-events');
@@ -123,15 +123,12 @@ function ABTNode(options) {
     },
   });
 
-  const blockletRegistry = new BlockletRegistry();
-
   const teamManager = new TeamManager({ nodeDid: options.nodeDid, dataDirs, states });
 
   const blockletManager = new BlockletManager({
     dataDirs,
     startQueue,
     installQueue,
-    registry: blockletRegistry,
     daemon: options.daemon,
     teamManager,
   });
@@ -207,6 +204,7 @@ function ABTNode(options) {
     upgradeComponents: blockletManager.updateChildren.bind(blockletManager),
     getLatestBlockletVersion: blockletManager.getLatestBlockletVersion.bind(blockletManager),
     getBlockletMetaFromUrl: blockletManager.getMetaFromUrl.bind(blockletManager),
+    getBlockletByBundle: blockletManager.getBlockletByBundle.bind(blockletManager),
     resetBlocklet: blockletManager.reset.bind(blockletManager),
     deleteBlockletProcess: blockletManager.deleteProcess.bind(blockletManager),
     configPublicToStore: blockletManager.configPublicToStore.bind(blockletManager),
@@ -226,9 +224,9 @@ function ABTNode(options) {
     updateAllBlockletEnvironment: blockletManager.updateAllBlockletEnvironment.bind(blockletManager),
     setBlockletInitialized: blockletManager.setInitialized.bind(blockletManager),
 
-    // Registry
-    getBlockletMeta: blockletRegistry.getBlockletMeta.bind(blockletRegistry),
-    getRegistryMeta: BlockletRegistry.getRegistryMeta,
+    // Store
+    getBlockletMeta: StoreUtil.getBlockletMeta,
+    getRegistryMeta: StoreUtil.getRegistryMeta,
 
     // Node State
     getNodeInfo: nodeAPI.getInfo.bind(nodeAPI),

package/lib/states/README.md

@@ -33,3 +33,6 @@ All Blocklet Server states are managed by files in this folder.
 - `children`: component of app, same structure as parent, can be nested
 - `mountPoint` mount path of web site. _component only_
 - `dynamic` is dynamically added. _component only_
+- `controller`
+- `tokens`
+  - `downloadTokenList`

package/lib/states/blocklet.js

@@ -23,6 +23,7 @@ const logger = require('@abtnode/logger')('state-blocklet');
 const BaseState = require('./base');
 const { checkDuplicateComponents, ensureMeta } = require('../util/blocklet');
 const { validateBlockletMeta } = require('../util');
+const { validateBlockletController } = require('../validators/blocklet');
 
 const lock = new Lock('blocklet-port-assign-lock');
 
@@ -180,11 +181,12 @@ class BlockletState extends BaseState {
     deployedFrom = '',
     mode = BLOCKLET_MODES.PRODUCTION,
     children: rawChildren = [],
+    controller,
   } = {}) {
     return this.getBlocklet(meta.did).then(
-      (doc) =>
+      (exist) =>
         new Promise(async (resolve, reject) => {
-          if (doc) {
+          if (exist) {
             reject(new Error('Blocklet already added'));
             return;
           }
@@ -208,29 +210,33 @@ class BlockletState extends BaseState {
 
             fixChildren(children);
 
+            const data = {
+              appDid: null, // will updated later when updating blocklet environments
+              mode,
+              meta: sanitized,
+              status,
+              source,
+              deployedFrom,
+              ports,
+              environments: [],
+              children,
+              controller,
+            };
+
+            if (controller) {
+              data.controller = await validateBlockletController(controller);
+            }
+
             // add to db
-            this.insert(
-              {
-                appDid: null, // will updated later when updating blocklet environments
-                mode,
-                meta: sanitized,
-                status,
-                source,
-                deployedFrom,
-                ports,
-                environments: [],
-                children,
-              },
-              (err, newDoc) => {
-                lock.release();
-                if (err) {
-                  return reject(err);
-                }
-
-                this.emit('add', newDoc);
-                return resolve(newDoc);
+            this.insert(data, (err, doc) => {
+              lock.release();
+              if (err) {
+                return reject(err);
               }
-            );
+
+              this.emit('add', doc);
+              return resolve(doc);
+            });
           } catch (err) {
             lock.release();
             reject(err);

package/lib/states/user.js

@@ -124,6 +124,22 @@ class User extends BaseState {
     };
   }
 
+  async getUsersByDids({ dids, query } = {}) {
+    const { approved } = query || {};
+    const didList = dids || [];
+
+    const queryParam = {
+      did: { $in: didList },
+    };
+
+    if (!isNullOrUndefined(approved)) {
+      queryParam.approved = !!approved;
+    }
+
+    // get data
+    return this.find(queryParam);
+  }
+
   async getUser(did) {
     const doc = await this.findOne({ did });
     return doc;

package/lib/team/manager.js

@@ -328,8 +328,8 @@ class TeamManager extends EventEmitter {
         if (this.cache[did].session) {
           await closeDatabase(this.cache[did].session.db);
         }
-      } catch (err) {
-        logger.error('Failed to close database', { did, err });
+      } catch (error) {
+        logger.error('Failed to close database', { did, error });
       }
     }
 

package/lib/util/blocklet.js

@@ -23,6 +23,7 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const hashFiles = require('@abtnode/util/lib/hash-files');
 const isPathPrefixEqual = require('@abtnode/util/lib/is-path-prefix-equal');
 const { BLOCKLET_MAX_MEM_LIMIT_IN_MB } = require('@abtnode/constant');
+const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 
 const SCRIPT_ENGINES_WHITE_LIST = ['npm', 'npx', 'pnpm', 'yarn'];
 
@@ -259,8 +260,7 @@ const getAppSystemEnvironments = (blocklet, nodeInfo) => {
   const appName = title || name || result.name;
   const appDescription = description || result.description;
 
-  // FIXME: we should use https here when possible, eg, when did-gateway is available
-  const appUrl = `http://${getDidDomainForBlocklet({ name, daemonDid: nodeInfo.did, didDomain: nodeInfo.didDomain })}`;
+  const appUrl = `https://${getDidDomainForBlocklet({ name, daemonDid: nodeInfo.did, didDomain: nodeInfo.didDomain })}`;
 
   return {
     BLOCKLET_DID: did,
@@ -946,7 +946,7 @@ const pruneBlockletBundle = async ({ blocklets, installDir, blockletSettings })
     const fillAppDirs = async (dir, level = 'root') => {
       if (level === 'version') {
         appDirs.push({
-          key: path.relative(installDir, dir),
+          key: formatBackSlash(path.relative(installDir, dir)),
           dir,
         });
 
@@ -974,7 +974,7 @@ const pruneBlockletBundle = async ({ blocklets, installDir, blockletSettings })
 
   const ensureBundleDirRemoved = async (dir) => {
     const relativeDir = path.relative(installDir, dir);
-    const arr = relativeDir.split('/').filter(Boolean);
+    const arr = relativeDir.split(path.sep).filter(Boolean);
     const { length } = arr;
     const bundleName = arr[length - 2];
     const scopeName = length > 2 ? arr[length - 3] : '';

package/lib/util/requirement.js

@@ -1,8 +1,10 @@
 const semver = require('semver');
 
-let { version: actualVersion } = require('../../package.json');
+let { version: actualServerVersion } = require('../../package.json');
 
-const defaults = { abtnode: '>= 1.1.0', os: '*', cpu: '*' };
+const { version: actualNodejsVersion } = process;
+
+const defaults = { abtnode: '>= 1.1.0', os: '*', cpu: '*', nodejs: '*' };
 
 const isSatisfied = (requirements, throwOnUnsatisfied = true) => {
   if (!requirements || typeof requirements !== 'object') {
@@ -10,15 +12,23 @@ const isSatisfied = (requirements, throwOnUnsatisfied = true) => {
   }
 
   const { platform: actualOs, arch: actualCpu } = process;
-  const { os: expectedOs, cpu: expectedCpu, abtnode, server } = Object.assign(defaults, requirements);
-  const expectedVersion = server || abtnode;
+  const {
+    os: expectedOs,
+    cpu: expectedCpu,
+    abtnode,
+    server,
+    nodejs: expectedNodejsVersion,
+  } = Object.assign(defaults, requirements);
+  const expectedServerVersion = server || abtnode;
 
   const isOsSatisfied =
     expectedOs === '*' || expectedOs === actualOs || (Array.isArray(expectedOs) && expectedOs.includes(actualOs));
   const isCpuSatisfied =
     expectedCpu === '*' || expectedCpu === actualCpu || (Array.isArray(expectedCpu) && expectedCpu.includes(actualCpu));
 
-  const isVersionSatisfied = semver.satisfies(semver.coerce(actualVersion), expectedVersion);
+  const isServerVersionSatisfied = semver.satisfies(semver.coerce(actualServerVersion), expectedServerVersion);
+
+  const isNodejsVersionSatisfied = semver.satisfies(semver.coerce(actualNodejsVersion), expectedNodejsVersion);
 
   if (throwOnUnsatisfied) {
     if (isOsSatisfied === false) {
@@ -27,19 +37,25 @@ const isSatisfied = (requirements, throwOnUnsatisfied = true) => {
     if (isCpuSatisfied === false) {
       throw new Error(`Your blocklet is not supported on architecture ${actualCpu}`);
     }
-    if (isVersionSatisfied === false) {
+    if (isServerVersionSatisfied === false) {
+      throw new Error(
+        `Expected server version for the blocklet is ${expectedServerVersion}, but your server version is ${actualServerVersion}, please upgrade or downgrade your server to continue.`
+      );
+    }
+    if (isNodejsVersionSatisfied === false) {
       throw new Error(
-        `Expected server version for the blocklet is ${expectedVersion}, but your server version is ${actualVersion}, please upgrade or downgrade your server to continue.`
+        `Expected Nodejs version for the blocklet is ${expectedNodejsVersion}, but your Nodejs version is ${actualNodejsVersion}, please upgrade or downgrade Nodejs and restart your server.`
       );
     }
   }
 
-  return isOsSatisfied && isCpuSatisfied && isVersionSatisfied;
+  return isOsSatisfied && isCpuSatisfied && isServerVersionSatisfied;
 };
 
 // Just for test
-isSatisfied._setActualVersion = (d) => {
-  actualVersion = d;
+isSatisfied._setActualServerVersion = (d) => {
+  actualServerVersion = d;
 };
+isSatisfied._actualNodejsVersion = actualNodejsVersion;
 
 module.exports = isSatisfied;

package/lib/util/{registry.js → store.js}

@@ -8,6 +8,7 @@ const { name } = require('../../package.json');
 const logger = require('@abtnode/logger')(`${name}:util:registry`); // eslint-disable-line
 
 const request = require('./request');
+const { fixAndVerifyMetaFromStore } = require('./blocklet');
 
 const validateRegistryURL = async (registry) => {
   const url = joinURL(registry, BLOCKLET_STORE_API_PREFIX, `/blocklets.json?__t__=${Date.now()}`);
@@ -83,8 +84,58 @@ const parseSourceUrl = async (url) => {
   };
 };
 
+const resolveTarballURL = async ({ did, tarball = '', registryUrl = '' }) => {
+  if (!tarball) {
+    return '';
+  }
+
+  if (tarball.startsWith('file://')) {
+    return decodeURIComponent(tarball);
+  }
+
+  if (tarball.startsWith('http://') || tarball.startsWith('https://')) {
+    return tarball;
+  }
+
+  if (!registryUrl) {
+    return '';
+  }
+
+  if (!did) {
+    return '';
+  }
+
+  return joinURL(registryUrl, 'api', 'blocklets', did, tarball);
+};
+
+const getBlockletMeta = async ({ did, registryUrl }) => {
+  const url = joinURL(registryUrl, BLOCKLET_STORE_API_PREFIX, `/blocklets/${did}/blocklet.json?__t__=${Date.now()}`);
+
+  const { data } = await request.get(url);
+  try {
+    if (data.did !== did) {
+      throw new Error('Invalid blocklet meta: did does not match');
+    }
+
+    const meta = fixAndVerifyMetaFromStore(data);
+
+    meta.dist.tarball = await resolveTarballURL({
+      did,
+      tarball: meta.dist.tarball,
+      registryUrl,
+    });
+
+    return meta;
+  } catch (err) {
+    logger.error('failed to get blocklet meta', { did, data, error: err });
+    throw err;
+  }
+};
+
 module.exports = {
   validateRegistryURL,
   getRegistryMeta,
   parseSourceUrl,
+  getBlockletMeta,
+  resolveTarballURL,
 };

package/lib/validators/blocklet.js

@@ -0,0 +1,15 @@
+const JOI = require('joi');
+const { didExtension } = require('@blocklet/meta/lib/extension');
+
+const Joi = JOI.extend(didExtension);
+
+const blockletController = Joi.object({
+  id: Joi.DID().required(), // userDid
+  vcId: Joi.DID().required(),
+  appMaxCount: Joi.number().required().min(1),
+  expireDate: Joi.date(),
+}).options({ stripUnknown: true });
+
+module.exports = {
+  validateBlockletController: (entity) => blockletController.validateAsync(entity),
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.30",
+  "version": "1.8.32",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,32 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.30",
-    "@abtnode/certificate-manager": "1.8.30",
-    "@abtnode/constant": "1.8.30",
-    "@abtnode/cron": "1.8.30",
-    "@abtnode/db": "1.8.30",
-    "@abtnode/logger": "1.8.30",
-    "@abtnode/queue": "1.8.30",
-    "@abtnode/rbac": "1.8.30",
-    "@abtnode/router-provider": "1.8.30",
-    "@abtnode/static-server": "1.8.30",
-    "@abtnode/timemachine": "1.8.30",
-    "@abtnode/util": "1.8.30",
-    "@arcblock/did": "1.17.23",
+    "@abtnode/auth": "1.8.32",
+    "@abtnode/certificate-manager": "1.8.32",
+    "@abtnode/constant": "1.8.32",
+    "@abtnode/cron": "1.8.32",
+    "@abtnode/db": "1.8.32",
+    "@abtnode/logger": "1.8.32",
+    "@abtnode/queue": "1.8.32",
+    "@abtnode/rbac": "1.8.32",
+    "@abtnode/router-provider": "1.8.32",
+    "@abtnode/static-server": "1.8.32",
+    "@abtnode/timemachine": "1.8.32",
+    "@abtnode/util": "1.8.32",
+    "@arcblock/did": "1.18.1",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.23",
-    "@arcblock/event-hub": "1.17.23",
-    "@arcblock/jwt": "^1.17.23",
+    "@arcblock/did-util": "1.18.1",
+    "@arcblock/event-hub": "1.18.1",
+    "@arcblock/jwt": "^1.18.1",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.17.23",
-    "@blocklet/constant": "1.8.30",
-    "@blocklet/meta": "1.8.30",
-    "@blocklet/sdk": "1.8.30",
+    "@arcblock/vc": "1.18.1",
+    "@blocklet/constant": "1.8.32",
+    "@blocklet/meta": "1.8.32",
+    "@blocklet/sdk": "1.8.32",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.17.23",
-    "@ocap/util": "1.17.23",
-    "@ocap/wallet": "1.17.23",
+    "@ocap/mcrypto": "1.18.1",
+    "@ocap/util": "1.18.1",
+    "@ocap/wallet": "1.18.1",
     "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -57,7 +57,7 @@
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
     "is-url": "^1.2.4",
-    "joi": "^17.6.2",
+    "joi": "17.6.3",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
@@ -81,5 +81,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "cb294f4ee7382c6ef7692b6c2c33ad080fced13e"
+  "gitHead": "8502244aeda5926b3433c1dd9142e63233e3c23c"
 }

package/lib/blocklet/registry.js

@@ -1,74 +0,0 @@
-const joinURL = require('url-join');
-const { BLOCKLET_STORE_API_PREFIX } = require('@abtnode/constant');
-
-const { name } = require('../../package.json');
-
-const logger = require('@abtnode/logger')(`${name}:blocklet:registry`); // eslint-disable-line
-
-const request = require('../util/request');
-
-const states = require('../states');
-const { fixAndVerifyMetaFromStore } = require('../util/blocklet');
-const { validateRegistryURL, getRegistryMeta } = require('../util/registry');
-
-class BlockletRegistry {
-  constructor() {
-    this.blocklets = [];
-    this.cacheId = '';
-  }
-
-  getBlocklet(id, registryUrl) {
-    return this.getBlockletMeta({ did: id, registryUrl });
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  async getBlockletMeta({ did, registryUrl }, context) {
-    const defaultRegistryUrl = await states.node.getBlockletRegistry();
-
-    const url = joinURL(
-      registryUrl || defaultRegistryUrl,
-      BLOCKLET_STORE_API_PREFIX,
-      `/blocklets/${did}/blocklet.json?__t__=${Date.now()}`
-    );
-
-    const { data } = await request.get(url);
-    try {
-      if (data.did !== did) {
-        throw new Error('Invalid blocklet meta: did does not match');
-      }
-
-      return fixAndVerifyMetaFromStore(data);
-    } catch (err) {
-      logger.error('failed to get blocklet meta', { did, data, error: err });
-      throw err;
-    }
-  }
-
-  async resolveTarballURL({ did, tarball = '', registryUrl = '' }) {
-    if (!tarball) {
-      return '';
-    }
-
-    if (tarball.startsWith('file://')) {
-      return decodeURIComponent(tarball);
-    }
-
-    if (tarball.startsWith('http://') || tarball.startsWith('https://')) {
-      return tarball;
-    }
-
-    const defaultRegistryUrl = await states.node.getBlockletRegistry();
-    return joinURL(registryUrl || defaultRegistryUrl, 'api', 'blocklets', did, tarball);
-  }
-
-  clearCache() {
-    this.cacheId = '';
-    this.blocklets = [];
-  }
-}
-
-BlockletRegistry.validateRegistryURL = validateRegistryURL;
-
-BlockletRegistry.getRegistryMeta = getRegistryMeta;
-
-module.exports = BlockletRegistry;