@abtnode/core 1.8.13 → 1.8.16

package/lib/api/team.js

@@ -1,13 +1,35 @@
 const { EventEmitter } = require('events');
 const pick = require('lodash/pick');
+const joinUrl = require('url-join');
+
 const logger = require('@abtnode/logger')('@abtnode/core:api:team');
-const { ROLES, genPermissionName, EVENTS, WHO_CAN_ACCESS, PASSPORT_STATUS } = require('@abtnode/constant');
+const {
+  ROLES,
+  genPermissionName,
+  EVENTS,
+  WHO_CAN_ACCESS,
+  PASSPORT_STATUS,
+  WELLKNOWN_SERVICE_PATH_PREFIX,
+} = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { BlockletEvents } = require('@blocklet/meta/lib/constants');
+const { sendToUser } = require('@blocklet/sdk/lib/util/send-notification');
+const {
+  createPassportVC,
+  createPassport,
+  upsertToPassports,
+  createUserPassport,
+} = require('@abtnode/auth/lib/passport');
+const { getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
+const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { parseUserAvatar } = require('@abtnode/util/lib/user-avatar');
+
 const { validateTrustedPassportIssuers } = require('../validators/trusted-passport');
 const { validateCreateRole, validateUpdateRole } = require('../validators/role');
 const { validateCreatePermission, validateUpdatePermission } = require('../validators/permission');
 
+const { getBlocklet } = require('../util/blocklet');
+
 const MAX_USER_PAGE_SIZE = 100;
 
 const validateReservedRole = (role) => {
@@ -17,19 +39,53 @@ const validateReservedRole = (role) => {
   return true;
 };
 
+const sendPassportVcNotification = ({ userDid, appWallet: wallet, locale, vc }) => {
+  try {
+    const receiver = userDid;
+    const sender = { appDid: wallet.address, appSk: wallet.secretKey };
+    const message = {
+      title: {
+        en: 'Receive a Passport',
+        zh: '获得通行证',
+      }[locale],
+      body: {
+        en: 'You got a passport',
+        zh: '你获得了一张通行证',
+      }[locale],
+      attachments: [
+        {
+          type: 'vc',
+          data: {
+            credential: vc,
+            tag: vc.credentialSubject.passport.name,
+          },
+        },
+      ],
+    };
+
+    sendToUser(receiver, message, sender, process.env.ABT_NODE_SERVICE_PORT).catch((error) => {
+      logger.error('Failed send passport vc to wallet', { error });
+    });
+  } catch (error) {
+    logger.error('Failed send passport vc to wallet', { error });
+  }
+};
+
 class TeamAPI extends EventEmitter {
   /**
    *
    * @param {object} states abtnode core StateDB
    */
-  constructor({ teamManager, states }) {
+  constructor({ teamManager, states, dataDirs }) {
     super();
 
     this.notification = states.notification;
     this.node = states.node;
+    this.states = states;
     this.memberInviteExpireTime = 1000 * 3600 * 24 * 30; // 30 days
     this.serverInviteExpireTime = 1000 * 3600; // 1 hour
     this.teamManager = teamManager;
+    this.dataDirs = dataDirs;
   }
 
   // User && Invitation
@@ -223,6 +279,72 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
+  async issuePassportToUser({ teamDid, userDid, role: roleName, notify = true }, context = {}) {
+    const { locale = 'en' } = context;
+
+    const userState = await this.getUserState(teamDid);
+    const user = await userState.getUser(userDid);
+
+    if (!user) {
+      throw new Error(`user does not exist: ${userDid}`);
+    }
+
+    if (!user.approved) {
+      throw new Error(`the user is revoked: ${userDid}`);
+    }
+
+    const rbac = await this.getRBAC(teamDid);
+    const role = await rbac.getRole(roleName);
+
+    if (!role) {
+      throw new Error(`passport does not exist: ${roleName}`);
+    }
+
+    // create vc
+    const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+    const nodeInfo = await this.node.read();
+    const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
+    const { wallet, passportColor, appUrl, name: issuerName } = blockletInfo;
+
+    const vc = createPassportVC({
+      issuerName,
+      issuerWallet: wallet,
+      ownerDid: userDid,
+      passport: await createPassport({
+        role,
+      }),
+      endpoint: getPassportStatusEndpoint({
+        baseUrl: joinUrl(appUrl, WELLKNOWN_SERVICE_PATH_PREFIX),
+        userDid,
+        teamDid,
+      }),
+      ownerProfile: {
+        ...user,
+        avatar: await parseUserAvatar(user.avatar, { dataDir: blocklet.env.dataDir }),
+      },
+      preferredColor: passportColor,
+    });
+
+    // write passport to db
+    const passport = createUserPassport(vc, { role: role.name });
+    user.passports = upsertToPassports(user.passports || [], passport);
+    await this.updateUser({
+      teamDid,
+      user: {
+        did: user.did,
+        pk: user.pk,
+        passports: user.passports,
+      },
+    });
+
+    // send vc to wallet
+    if (notify) {
+      sendPassportVcNotification({ userDid, appWallet: wallet, locale, vc });
+    }
+
+    return user;
+  }
+
   async revokeUserPassport({ teamDid, userDid, passportId } = {}) {
     if (!passportId) {
       throw new Error('Revoked passport should not be empty');

package/lib/blocklet/manager/disk.js

@@ -36,7 +36,6 @@ const {
   forEachBlocklet,
   forEachChild,
   getComponentId,
-  getComponentName,
   getComponentBundleId,
 } = require('@blocklet/meta/lib/util');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
@@ -73,9 +72,7 @@ const {
   getFromCache: getAccessibleExternalNodeIp,
 } = require('../../util/get-accessible-external-node-ip');
 const {
-  getComponentDirs,
   getBlockletMetaFromUrl,
-  fillBlockletConfigs,
   ensureBlockletExpanded,
   getAppSystemEnvironments,
   getComponentSystemEnvironments,
@@ -104,6 +101,7 @@ const {
   needBlockletDownload,
   findAvailableDid,
   ensureMeta,
+  getBlocklet,
 } = require('../../util/blocklet');
 const { parseSourceUrl } = require('../../util/registry');
 const states = require('../../states');
@@ -217,7 +215,7 @@ class BlockletManager extends BaseBlockletManager {
    * @param {{
    *  url: string;
    *  sync: boolean = false;
-   *  downloadToken: string;
+   *  downloadTokenList: Array<{did: string, token: string};
    * }} params
    * @param {{
    *  [key: string]: any
@@ -228,20 +226,16 @@ class BlockletManager extends BaseBlockletManager {
   async install(params, context = {}) {
     logger.debug('install blocklet', { params, context });
 
-    if (params.downloadToken) {
-      const info = await states.node.read();
+    const info = await states.node.read();
 
-      context.headers = Object.assign(context?.headers || {}, {
-        'x-server-did': info.did,
-        'x-download-token': params.downloadToken,
-        // FIXME: 先保证兼容性,后续删除
-        'x-server-publick-key': info.pk,
-        'x-server-public-key': info.pk,
-        'x-server-signature': sign(info.did, info.sk, {
-          exp: (Date.now() + 5 * 60 * 1000) / 1000,
-        }),
-      });
-    }
+    context.headers = Object.assign(context?.headers || {}, {
+      'x-server-did': info.did,
+      'x-server-public-key': info.pk,
+      'x-server-signature': sign(info.did, info.sk, {
+        exp: (Date.now() + 5 * 60 * 1000) / 1000,
+      }),
+    });
+    context.downloadTokenList = params.downloadTokenList || [];
 
     const source = getSourceFromInstallParams(params);
     if (typeof context.startImmediately === 'undefined') {
@@ -289,7 +283,7 @@ class BlockletManager extends BaseBlockletManager {
    * @param {ConfigEntry} configs pre configs
    */
   async installComponent(
-    { rootDid, mountPoint, url, file, did, diffVersion, deleteSet, title, name, configs, downloadToken },
+    { rootDid, mountPoint, url, file, did, diffVersion, deleteSet, title, name, configs, downloadTokenList },
     context = {}
   ) {
     logger.debug('start install component', { rootDid, mountPoint, url });
@@ -308,7 +302,7 @@ class BlockletManager extends BaseBlockletManager {
         did,
         name,
         configs,
-        downloadToken,
+        downloadTokenList,
       });
     }
 
@@ -1298,49 +1292,8 @@ class BlockletManager extends BaseBlockletManager {
     return rootBlocklet;
   }
 
-  async ensureBlocklet(did, { e2eMode = false, validateEnv = true, throwOnNotExist = true } = {}) {
-    if (!isValidDid(did)) {
-      throw new Error(`Blocklet did is invalid: ${did}`);
-    }
-
-    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
-    blocklet.site = await this.getSiteByDid(blocklet.meta.did);
-
-    await forEachBlocklet(blocklet, async (component, { id, level, ancestors }) => {
-      // component env
-      component.env = {
-        id,
-        name: getComponentName(component, ancestors),
-        processId: getComponentProcessId(component, ancestors),
-        ...getComponentDirs(component, {
-          dataDirs: this.dataDirs,
-          ensure: true,
-          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;
+  async ensureBlocklet(did, opts = {}) {
+    return getBlocklet({ ...opts, states, dataDirs: this.dataDirs, did });
   }
 
   async hasBlocklet({ did }) {
@@ -1889,7 +1842,7 @@ class BlockletManager extends BaseBlockletManager {
     name: inputName,
     did: inputDid,
     configs,
-    downloadToken,
+    downloadTokenList,
   }) {
     const blocklet = await this._getBlockletForInstallation(rootDid);
     if (!blocklet) {
@@ -1909,14 +1862,12 @@ class BlockletManager extends BaseBlockletManager {
         ...context,
         headers: {
           'x-server-did': info.did,
-          'x-download-token': downloadToken,
-          // FIXME: 先保证兼容性,后续删除
-          'x-server-publick-key': info.pk,
           'x-server-public-key': info.pk,
           'x-server-signature': sign(info.did, info.sk, {
             exp: (Date.now() + 5 * 60 * 1000) / 1000,
           }),
         },
+        downloadTokenList: downloadTokenList || [],
       };
     }
 
@@ -2482,14 +2433,12 @@ class BlockletManager extends BaseBlockletManager {
         ...context,
         headers: {
           'x-server-did': info.did,
-          'x-download-token': blocklet?.tokens?.paidBlockletDownloadToken,
-          // FIXME: 先保证兼容性,后续删除
-          'x-server-publick-key': info.pk,
           'x-server-public-key': info.pk,
           'x-server-signature': sign(info.did, info.sk, {
             exp: (Date.now() + 5 * 60 * 1000) / 1000,
           }),
         },
+        downloadTokenList: blocklet?.tokens?.downloadTokenList || [],
       };
     }
 
@@ -2726,10 +2675,10 @@ class BlockletManager extends BaseBlockletManager {
       // Update dynamic component meta in blocklet settings
       await this._ensureDynamicChildrenInSettings(blocklet);
 
-      if (context?.headers?.['x-download-token']) {
+      if (context?.downloadTokenList?.length) {
         await states.blocklet.updateBlocklet(did, {
           tokens: {
-            paidBlockletDownloadToken: context.headers['x-download-token'],
+            downloadTokenList: context.downloadTokenList,
           },
         });
       }
@@ -2968,7 +2917,13 @@ class BlockletManager extends BaseBlockletManager {
       }
       ctrlStore[rootDid].set(did, cancelCtrl);
 
-      await downloadFile(url, path.join(cwd, tarballName), { cancelCtrl }, context);
+      const headers = context.headers ? cloneDeep(context.headers) : {};
+      const exist = (context.downloadTokenList || []).find((x) => x.did === did);
+      if (exist) {
+        headers['x-download-token'] = exist.token;
+      }
+
+      await downloadFile(url, path.join(cwd, tarballName), { cancelCtrl }, { ...context, headers });
 
       if (ctrlStore[rootDid]) {
         ctrlStore[rootDid].delete(did);

package/lib/index.js

@@ -163,7 +163,7 @@ function ABTNode(options) {
   } = getRouterHelpers({ dataDirs, routingSnapshot, routerManager, blockletManager, certManager });
 
   const nodeAPI = new NodeAPI(states.node);
-  const teamAPI = new TeamAPI({ states, teamManager });
+  const teamAPI = new TeamAPI({ states, teamManager, dataDirs });
 
   blockletManager.getRoutingRulesByDid = getRoutingRulesByDid;
   blockletManager.getSiteByDid = getSiteByDid;
@@ -298,6 +298,8 @@ function ABTNode(options) {
     // Passport
     revokeUserPassport: teamAPI.revokeUserPassport.bind(teamAPI),
     enableUserPassport: teamAPI.enableUserPassport.bind(teamAPI),
+    issuePassportToUser: teamAPI.issuePassportToUser.bind(teamAPI),
+
     createPassportIssuance: teamAPI.createPassportIssuance.bind(teamAPI),
     getPassportIssuances: teamAPI.getPassportIssuances.bind(teamAPI),
     getPassportIssuance: teamAPI.getPassportIssuance.bind(teamAPI),

package/lib/states/audit-log.js

@@ -3,7 +3,7 @@ const pick = require('lodash/pick');
 const get = require('lodash/get');
 const joinUrl = require('url-join');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
-const { BLOCKLET_SITE_GROUP_SUFFIX } = require('@abtnode/constant');
+const { BLOCKLET_SITE_GROUP_SUFFIX, NODE_SERVICES } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:states:audit-log');
 
 const BaseState = require('./base');
@@ -177,6 +177,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `updated trusted passport issuers to following for ${team}: \n${args.trustedPassports.map(x => `- ${x.remark}: ${x.issuerDid}`).join('\n')}`; // prettier-ignore
     case 'delegateTransferNFT':
       return `${args.owner} ${args.reason}`;
+    case 'issuePassportToUser':
+      return `issued **${args.role}** passport to ${user}`;
 
     // accessKeys
     case 'createAccessKey':
@@ -344,6 +346,12 @@ const getScope = (args = {}) => {
   return null;
 };
 
+const fixActor = (actor) => {
+  if ([NODE_SERVICES.AUTH_SERVICE, 'blocklet'].includes(actor?.role)) {
+    actor.role = '';
+  }
+};
+
 class AuditLogState extends BaseState {
   constructor(baseDir, options = {}) {
     super(baseDir, { filename: 'audit-log.db', ...options });
@@ -399,6 +407,8 @@ class AuditLogState extends BaseState {
         const { ip, ua, user } = context;
         const [info, uaInfo] = await Promise.all([node.states.node.read(), parse(ua)]);
 
+        fixActor(user);
+
         const data = await this.asyncDB.insert({
           scope: getScope(args) || info.did, // server or blocklet did
           action,

package/lib/states/blocklet.js

@@ -39,7 +39,10 @@ const formatBlocklet = (blocklet, phase, dek) => {
       fixInterfaces(b.meta);
     }
 
-    b.children = b.children || [];
+    if (phase === 'onRead') {
+      b.children = b.children || [];
+      b.environments = b.environments || [];
+    }
 
     if (!b.environments || !b.meta || !dek) {
       return;

package/lib/util/blocklet.js

@@ -9,10 +9,9 @@ const streamToPromise = require('stream-to-promise');
 const { Throttle } = require('stream-throttle');
 const ssri = require('ssri');
 const diff = require('deep-diff');
-const any = require('promise.any');
-const joinUrl = require('url-join');
 
 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');
@@ -22,7 +21,7 @@ const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 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, BLOCKLET_STORE_API_BLOCKLET_PREFIX } = require('@abtnode/constant');
+const { BLOCKLET_MAX_MEM_LIMIT_IN_MB } = require('@abtnode/constant');
 
 const {
   BlockletStatus,
@@ -55,19 +54,19 @@ const {
 } = require('@blocklet/meta/lib/util');
 const toBlockletDid = require('@blocklet/meta/lib/did');
 const { titleSchema, descriptionSchema } = require('@blocklet/meta/lib/schema');
+const {
+  getSourceUrlsFromConfig,
+  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 {
-  isBeforeInstalled,
-  expandBundle,
-  getBlockletMetaByUrl,
-  validateUrl,
-  findInterfacePortByName,
-  validateBlockletMeta,
-} = require('./index');
+const { getBlockletDomainGroupName } = require('./router');
+const { isBeforeInstalled, expandBundle, findInterfacePortByName, validateBlockletMeta } = require('./index');
 
 /**
  * get blocklet engine info, default is node
@@ -212,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;
   }, {});
@@ -406,45 +406,6 @@ const getHealthyCheckTimeout = (blocklet, { checkHealthImmediately } = {}) => {
   };
 };
 
-const getBlockletMetaFromUrl = async (url) => {
-  const meta = await getBlockletMetaByUrl(url);
-  delete meta.htmlAst;
-
-  validateBlockletMeta(meta, { ensureDist: true });
-
-  try {
-    const { href } = new URL(meta.dist.tarball, url);
-    const tarball = decodeURIComponent(href);
-
-    try {
-      await validateUrl(tarball, ['application/octet-stream', 'application/x-gzip']);
-    } catch (error) {
-      if (!error.message.startsWith('Cannot get content-type')) {
-        throw error;
-      }
-    }
-    logger.info('resolve tarball url base on meta url', { meta: url, tarball });
-
-    meta.dist.tarball = tarball;
-  } catch (err) {
-    const msg = `Invalid blocklet meta: dist.tarball is not a valid url ${err.message}`;
-    logger.error(msg);
-    throw new Error(msg);
-  }
-
-  return meta;
-};
-
-const getBlockletMetaFromUrls = async (urls) => {
-  try {
-    const meta = await any(urls.map(getBlockletMetaFromUrl));
-    return meta;
-  } catch (err) {
-    logger.error('failed get blocklet meta', { urls, error: err });
-    throw new Error('Failed get blocklet meta');
-  }
-};
-
 /**
  * Start all precesses of a blocklet
  * @param {*} blocklet should contain env props
@@ -695,36 +656,6 @@ const parseChildren = (children, parentMeta = {}, { dynamic } = {}) => {
   return children;
 };
 
-/**
- * @param {*} config defined in childrenSchema in blocklet meta schema
- */
-const getSourceUrlsFromConfig = (config) => {
-  if (config.source) {
-    if (config.source.url) {
-      return [config.source.url].flat();
-    }
-
-    const { store, version, name } = config.source;
-    return [store]
-      .flat()
-      .map((x) =>
-        joinUrl(
-          x,
-          BLOCKLET_STORE_API_BLOCKLET_PREFIX,
-          toBlockletDid(name),
-          !version || version === 'latest' ? '' : version,
-          'blocklet.json'
-        )
-      );
-  }
-
-  if (config.resolved) {
-    return [config.resolved];
-  }
-
-  throw new Error('Invalid child config');
-};
-
 /**
  * this function has side effect on children
  */
@@ -752,7 +683,7 @@ const parseChildrenFromMeta = async (src, context = {}) => {
 
     let m;
     try {
-      m = await getBlockletMetaFromUrls(urls);
+      m = await getBlockletMetaFromUrls(urls, { logger });
     } catch {
       throw new Error(`Failed get component meta: ${config.title || config.name}`);
     }
@@ -1296,9 +1227,75 @@ 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,
+  getBlockletMetaFromUrl: (url) => getBlockletMetaFromUrl(url, { logger }),
   parseChildrenFromMeta,
   parseChildren,
   getComponentDirs,
@@ -1334,5 +1331,5 @@ module.exports = {
   needBlockletDownload,
   findAvailableDid,
   ensureMeta,
-  getSourceUrlsFromConfig,
+  getBlocklet,
 };

package/lib/util/index.js

@@ -36,8 +36,6 @@ const DEFAULT_WELLKNOWN_PORT = 8088;
 
 const logger = require('@abtnode/logger')('@abtnode/core:util');
 
-const request = require('./request');
-
 const validateOwner = (owner) => {
   try {
     return owner && owner.did && owner.pk && isFromPublicKey(owner.did, owner.pk);
@@ -351,66 +349,6 @@ const getBaseUrls = async (node, ips) => {
   }));
 };
 
-const getBlockletMetaByUrl = async (url) => {
-  const { protocol, pathname } = new URL(url);
-
-  if (protocol.startsWith('file')) {
-    const decoded = decodeURIComponent(pathname);
-    if (!fs.existsSync(decoded)) {
-      throw new Error(`File does not exist: ${decoded}`);
-    }
-    const d = await fs.promises.readFile(decoded);
-    const meta = JSON.parse(d);
-    return meta;
-  }
-
-  if (protocol.startsWith('http')) {
-    const { data: meta } = await request({ url, method: 'GET', timeout: 1000 * 20 });
-    if (Object.prototype.toString.call(meta) !== '[object Object]') {
-      throw new Error('Url is not valid');
-    }
-    return meta;
-  }
-
-  throw new Error(`Invalid url protocol: ${protocol.replace(/:$/, '')}`);
-};
-
-const validateUrl = async (url, expectedHttpResTypes = ['application/json', 'text/plain']) => {
-  const parsed = new URL(url);
-  const { protocol, pathname } = parsed;
-
-  // file
-  if (protocol.startsWith('file')) {
-    const decoded = decodeURIComponent(pathname);
-    if (!fs.existsSync(decoded)) {
-      throw new Error(`File does not exist: ${decoded}`);
-    }
-    return true;
-  }
-
-  // http(s)
-  if (protocol.startsWith('http')) {
-    let res;
-
-    try {
-      res = await request({ url, method: 'HEAD', timeout: 1000 * 10 });
-    } catch (err) {
-      throw new Error(`Cannot get content-type from ${url}: ${err.message}`);
-    }
-
-    if (
-      res.headers['content-type'] &&
-      expectedHttpResTypes.some((x) => res.headers['content-type'].includes(x)) === false
-    ) {
-      throw new Error(`Unexpected content-type from ${url}: ${res.headers['content-type']}`);
-    }
-
-    return true;
-  }
-
-  throw new Error(`Invalid url protocol: ${protocol.replace(/:$/, '')}`);
-};
-
 const expandBundle = (bundlePath, destDir) =>
   unzipper.Open.file(bundlePath).then((d) => d.extract({ path: destDir, concurrency: 20 }));
 
@@ -567,8 +505,6 @@ const lib = {
     fixAndValidateService(meta);
     return validateMeta(meta, opts);
   },
-  getBlockletMetaByUrl,
-  validateUrl,
   expandBundle,
   findInterfaceByName,
   findInterfacePortByName,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.13",
+  "version": "1.8.16",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,33 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.8.13",
-    "@abtnode/constant": "1.8.13",
-    "@abtnode/cron": "1.8.13",
-    "@abtnode/db": "1.8.13",
-    "@abtnode/logger": "1.8.13",
-    "@abtnode/queue": "1.8.13",
-    "@abtnode/rbac": "1.8.13",
-    "@abtnode/router-provider": "1.8.13",
-    "@abtnode/static-server": "1.8.13",
-    "@abtnode/timemachine": "1.8.13",
-    "@abtnode/util": "1.8.13",
-    "@arcblock/did": "1.17.15",
+    "@abtnode/auth": "1.8.16",
+    "@abtnode/certificate-manager": "1.8.16",
+    "@abtnode/constant": "1.8.16",
+    "@abtnode/cron": "1.8.16",
+    "@abtnode/db": "1.8.16",
+    "@abtnode/logger": "1.8.16",
+    "@abtnode/queue": "1.8.16",
+    "@abtnode/rbac": "1.8.16",
+    "@abtnode/router-provider": "1.8.16",
+    "@abtnode/static-server": "1.8.16",
+    "@abtnode/timemachine": "1.8.16",
+    "@abtnode/util": "1.8.16",
+    "@arcblock/did": "1.17.17",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.15",
-    "@arcblock/event-hub": "1.17.15",
-    "@arcblock/jwt": "^1.17.15",
+    "@arcblock/did-util": "1.17.17",
+    "@arcblock/event-hub": "1.17.17",
+    "@arcblock/jwt": "^1.17.17",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.17.15",
-    "@blocklet/meta": "1.8.13",
-    "@blocklet/sdk": "1.8.13",
+    "@arcblock/vc": "1.17.17",
+    "@blocklet/meta": "1.8.16",
+    "@blocklet/sdk": "1.8.16",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.3.4",
     "@nedb/multi": "^1.3.4",
-    "@ocap/mcrypto": "1.17.15",
-    "@ocap/util": "1.17.15",
-    "@ocap/wallet": "1.17.15",
+    "@ocap/mcrypto": "1.17.17",
+    "@ocap/util": "1.17.17",
+    "@ocap/wallet": "1.17.17",
     "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -62,7 +63,6 @@
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
     "pm2": "^5.2.0",
-    "promise.any": "^2.0.4",
     "semver": "^7.3.7",
     "shelljs": "^0.8.5",
     "slugify": "^1.6.5",
@@ -82,5 +82,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "028f33d8a3a4f999456bfe8e7bd2e1a53b664b47"
+  "gitHead": "2605cf6ebf2a0c3bb5524cb0f1385ad565fd85d6"
 }