@abtnode/core 1.8.13 → 1.8.14

package/lib/states/blocklet.js

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

package/lib/util/blocklet.js

@@ -9,8 +9,6 @@ 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 logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
@@ -22,7 +20,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 +53,17 @@ 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 { 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 { isBeforeInstalled, expandBundle, findInterfacePortByName, validateBlockletMeta } = require('./index');
 
 /**
  * get blocklet engine info, default is node
@@ -406,45 +402,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 +652,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 +679,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}`);
     }
@@ -1298,7 +1225,7 @@ const ensureMeta = (meta, { name, did } = {}) => {
 
 module.exports = {
   forEachBlocklet,
-  getBlockletMetaFromUrl,
+  getBlockletMetaFromUrl: (url) => getBlockletMetaFromUrl(url, { logger }),
   parseChildrenFromMeta,
   parseChildren,
   getComponentDirs,
@@ -1334,5 +1261,4 @@ module.exports = {
   needBlockletDownload,
   findAvailableDid,
   ensureMeta,
-  getSourceUrlsFromConfig,
 };

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.14",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,32 @@
   "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/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",
     "@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.14",
+    "@blocklet/sdk": "1.8.14",
     "@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 +62,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 +81,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "028f33d8a3a4f999456bfe8e7bd2e1a53b664b47"
+  "gitHead": "4b0cee41fd03d09301e2c35af46dd9e513473ef8"
 }