@abtnode/core 1.6.22 → 1.6.23

package/lib/blocklet/manager/disk.js

@@ -92,6 +92,7 @@ const {
   needBlockletDownload,
   verifyPurchase,
 } = require('../../util/blocklet');
+const { parseSourceUrl } = require('../../util/registry');
 const states = require('../../states');
 const BlockletRegistry = require('../registry');
 const BaseBlockletManager = require('./base');
@@ -673,7 +674,7 @@ class BlockletManager extends BaseBlockletManager {
   /**
    * upgrade blocklet from registry
    */
-  async upgrade({ did, registryUrl }, context) {
+  async upgrade({ did, registryUrl, sync }, context) {
     const blocklet = await states.blocklet.getBlocklet(did);
 
     // TODO: 查看了下目前页面中的升级按钮，都是会传 registryUrl 过来的，这个函数里的逻辑感觉需要在以后做一个简化
@@ -740,6 +741,7 @@ class BlockletManager extends BaseBlockletManager {
       source: BlockletSource.registry,
       deployedFrom: upgradeFromRegistry,
       context,
+      sync,
     });
   }
 
@@ -920,7 +922,6 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const { did, version } = meta;
-    meta.title = `[DEV] ${meta.title || meta.name}`;
 
     const exist = await states.blocklet.getBlocklet(did);
     if (exist) {
@@ -1379,7 +1380,7 @@ class BlockletManager extends BaseBlockletManager {
     }
   }
 
-  async _installFromStore({ did, registry }, context) {
+  async _installFromStore({ did, registry, sync }, context) {
     logger.debug('start install blocklet', { did });
     if (!isValidDid(did)) {
       throw new Error('Blocklet did is invalid');
@@ -1404,6 +1405,7 @@ class BlockletManager extends BaseBlockletManager {
       meta,
       source: BlockletSource.registry,
       deployedFrom: info.cdnUrl || registryUrl,
+      sync,
       context,
     });
   }
@@ -1411,6 +1413,16 @@ class BlockletManager extends BaseBlockletManager {
   async _installFromUrl({ url, sync }, context) {
     logger.debug('start install blocklet', { url });
 
+    const { inStore, registryUrl, blockletDid } = await parseSourceUrl(url);
+    if (inStore) {
+      const exist = await states.blocklet.getBlocklet(blockletDid);
+      if (exist) {
+        return this.upgrade({ did: blockletDid, registryUrl }, context);
+      }
+
+      return this._installFromStore({ did: blockletDid, registry: registryUrl }, context);
+    }
+
     const meta = await getBlockletMetaFromUrl(url);
 
     if (!meta) {

package/lib/blocklet/registry.js

@@ -1,9 +1,7 @@
-const isBase64 = require('is-base64');
 const { BlockletGroup } = require('@blocklet/meta/lib/constants');
 const joinURL = require('url-join');
 const get = require('lodash/get');
-const pick = require('lodash/pick');
-const { BLOCKLET_STORE_API_PREFIX, BLOCKLET_STORE_META_PATH } = require('@abtnode/constant');
+const { BLOCKLET_STORE_API_PREFIX } = require('@abtnode/constant');
 
 const { name } = require('../../package.json');
 
@@ -15,6 +13,7 @@ const states = require('../states');
 const isRequirementsSatisfied = require('../util/requirement');
 const { fixAndVerifyBlockletMeta } = require('../util/blocklet');
 const { translate } = require('../locales');
+const { validateRegistryURL, getRegistryMeta } = require('../util/registry');
 
 const DEFAULT_REFRESH_INTERVAL = 1 * 60 * 1000;
 const MAX_REFRESH_INTERVAL = 1 * 60 * 1000;
@@ -152,54 +151,8 @@ class BlockletRegistry {
   }
 }
 
-BlockletRegistry.validateRegistryURL = async (registry) => {
-  const url = joinURL(registry, BLOCKLET_STORE_API_PREFIX, `/blocklets.json?__t__=${Date.now()}`);
-  try {
-    const res = await request.get(url);
-    if (Array.isArray(res.data)) {
-      return res.data;
-    }
-
-    logger.error('Blocklet list fetch failed ', { url, data: res.data });
-    throw new Error('blocklet list fetch failed');
-  } catch (error) {
-    logger.error('Blocklet registry refresh failed', { url, error });
-    throw new Error(`Invalid Blocklet Registry URL ${registry}: ${error.message}`);
-  }
-};
-
-BlockletRegistry.getRegistryMeta = async (registry) => {
-  try {
-    const url = joinURL(registry, BLOCKLET_STORE_META_PATH, `?__t__=${Date.now()}`);
-    const { data } = await request.get(url);
-
-    if (!data) {
-      return {};
-    }
+BlockletRegistry.validateRegistryURL = validateRegistryURL;
 
-    const requiredFields = ['name', 'description', 'maintainer'];
-
-    const missingFields = requiredFields.filter((x) => !data[x]);
-    if (missingFields.length > 0) {
-      throw new Error(`the registry missing required information: ${missingFields.join(', ')}`);
-    }
-
-    const result = pick(data, ['id', 'name', 'description', 'maintainer', 'cdnUrl', 'chainHost']);
-    const { logoUrl } = data;
-    if (logoUrl) {
-      if (logoUrl.startsWith('http') === true) {
-        result.logoUrl = logoUrl;
-      } else if (isBase64(logoUrl, { allowMime: true })) {
-        result.logoUrl = logoUrl;
-      } else {
-        result.logoUrl = joinURL(registry, logoUrl);
-      }
-    }
-
-    return result;
-  } catch (err) {
-    throw new Error(`Can not get meta info for registry [${registry}]: ${err.message}`);
-  }
-};
+BlockletRegistry.getRegistryMeta = getRegistryMeta;
 
 module.exports = BlockletRegistry;

package/lib/states/blocklet.js

@@ -9,6 +9,7 @@ const detectPort = require('detect-port');
 const Lock = require('@abtnode/util/lib/lock');
 const security = require('@abtnode/util/lib/security');
 const { fixPerson, fixInterfaces } = require('@blocklet/meta/lib/fix');
+const { getDisplayName } = require('@blocklet/meta/lib/util');
 const {
   BlockletStatus,
   BlockletSource,
@@ -25,6 +26,7 @@ const { validateBlockletMeta } = require('../util');
 
 const lock = new Lock('blocklet-port-assign-lock');
 
+const isHex = (str) => /^0x[0-9a-f]+$/i.test(str);
 const getMaxPort = (ports = {}) => Math.max(Object.values(ports).map(Number));
 
 const getExternalPortsFromMeta = (meta) =>
@@ -50,10 +52,10 @@ const formatBlocklet = (blocklet, phase, dek) => {
         if (!env) {
           return;
         }
-        if (phase === 'onUpdate' && env.value.indexOf('0x') === 0) {
+        if (phase === 'onUpdate' && isHex(env.value) === true) {
           env.value = security.encrypt(env.value, b.meta.did, dek);
         }
-        if (phase === 'onRead' && env.value.indexOf('0x') === -1) {
+        if (phase === 'onRead' && isHex(env.value) === false) {
           env.value = security.decrypt(env.value, b.meta.did, dek);
         }
       });
@@ -243,20 +245,17 @@ class BlockletState extends BaseState {
             await this.fillChildrenPorts(children, { oldChildren: doc.children, defaultPort: getMaxPort(ports) });
 
             // add to db
-            const newDoc = await this.updateById(doc._id, {
-              $set: {
-                meta: omit(sanitized, ['htmlAst']),
-                source,
-                deployedFrom,
-                children,
-                ports,
-              },
+            const newDoc = await this.updateBlocklet(meta.did, {
+              meta: omit(sanitized, ['htmlAst']),
+              source,
+              deployedFrom,
+              children,
+              ports,
             });
             lock.release();
 
-            const formatted = formatBlocklet(newDoc, 'onRead', this.options.dek);
-            this.emit('upgrade', formatted);
-            resolve(formatted);
+            this.emit('upgrade', newDoc);
+            resolve(newDoc);
           } catch (err) {
             lock.release();
             reject(err);
@@ -446,8 +445,7 @@ class BlockletState extends BaseState {
       return child;
     });
 
-    await this.update(doc._id, { $set: updates });
-    return formatBlocklet({ ...doc, ...updates }, 'onRead', this.options.dek);
+    return this.updateBlocklet(did, updates);
   }
 
   async fillChildrenPorts(children, { defaultPort = 0, oldChildren } = {}) {
@@ -511,7 +509,7 @@ class BlockletState extends BaseState {
       const { meta, mountPoint, sourceUrl = '', source = '', deployedFrom = '' } = child;
 
       if (!mountPoint) {
-        throw new Error(`mountPoint is required when adding component ${meta.title || meta.name}`);
+        throw new Error(`mountPoint is required when adding component ${getDisplayName(child, true)}`);
       }
 
       if (meta.did === parent.meta.did) {
@@ -542,5 +540,6 @@ class BlockletState extends BaseState {
 }
 
 BlockletState.BlockletStatus = BlockletStatus;
+BlockletState.formatBlocklet = formatBlocklet;
 
 module.exports = BlockletState;

package/lib/util/blocklet.js

@@ -42,7 +42,7 @@ const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
-const { forEachBlocklet, isFreeBlocklet } = require('@blocklet/meta/lib/util');
+const { forEachBlocklet, isFreeBlocklet, getDisplayName } = require('@blocklet/meta/lib/util');
 
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
 
@@ -1069,7 +1069,7 @@ const checkDuplicateComponents = (dynamicComponents, staticComponents) => {
   if (duplicates.length) {
     throw new Error(
       `Cannot add duplicate component${duplicates.length > 1 ? 's' : ''}: ${duplicates
-        .map((x) => x.meta.title || x.meta.name)
+        .map((x) => getDisplayName(x, true))
         .join(', ')}`
     );
   }

package/lib/util/get-domain-for-blocklet.js

@@ -1,5 +1,6 @@
 const slugify = require('slugify');
 const { DEFAULT_IP_DNS_DOMAIN_SUFFIX } = require('@abtnode/constant');
+const md5 = require('@abtnode/util/lib/md5');
 
 const SLOT_FOR_IP_DNS_SITE = '888-888-888-888';
 
@@ -17,7 +18,9 @@ const getIpDnsDomainForBlocklet = (blocklet, blockletInterface) => {
 };
 
 const getDidDomainForBlocklet = ({ name, daemonDid, didDomain }) => {
-  return `${formatName(name)}-${daemonDid.toLowerCase()}.${didDomain}`;
+  const prefix = md5(name).substring(0, 8);
+
+  return `${prefix}-${daemonDid.toLowerCase()}.${didDomain}`;
 };
 
 module.exports = { getIpDnsDomainForBlocklet, getDidDomainForBlocklet };

package/lib/util/registry.js

@@ -0,0 +1,90 @@
+const joinURL = require('url-join');
+const pick = require('lodash/pick');
+const isBase64 = require('is-base64');
+
+const { BLOCKLET_STORE_API_PREFIX, BLOCKLET_STORE_META_PATH } = require('@abtnode/constant');
+
+const { name } = require('../../package.json');
+const logger = require('@abtnode/logger')(`${name}:util:registry`); // eslint-disable-line
+
+const request = require('./request');
+
+const validateRegistryURL = async (registry) => {
+  const url = joinURL(registry, BLOCKLET_STORE_API_PREFIX, `/blocklets.json?__t__=${Date.now()}`);
+  try {
+    const res = await request.get(url);
+    if (Array.isArray(res.data)) {
+      return res.data;
+    }
+
+    logger.error('Blocklet list fetch failed ', { url, data: res.data });
+    throw new Error('blocklet list fetch failed');
+  } catch (error) {
+    logger.error('Blocklet registry refresh failed', { url, error });
+    throw new Error(`Invalid Blocklet Registry URL ${registry}: ${error.message}`);
+  }
+};
+
+const getRegistryMeta = async (registry) => {
+  try {
+    const url = joinURL(registry, BLOCKLET_STORE_META_PATH, `?__t__=${Date.now()}`);
+    const { data } = await request.get(url);
+
+    if (!data) {
+      return {};
+    }
+
+    const requiredFields = ['name', 'description', 'maintainer'];
+
+    const missingFields = requiredFields.filter((x) => !data[x]);
+    if (missingFields.length > 0) {
+      throw new Error(`the registry missing required information: ${missingFields.join(', ')}`);
+    }
+
+    const result = pick(data, ['id', 'name', 'description', 'maintainer', 'cdnUrl', 'chainHost']);
+    const { logoUrl } = data;
+    if (logoUrl) {
+      if (logoUrl.startsWith('http') === true) {
+        result.logoUrl = logoUrl;
+      } else if (isBase64(logoUrl, { allowMime: true })) {
+        result.logoUrl = logoUrl;
+      } else {
+        result.logoUrl = joinURL(registry, logoUrl);
+      }
+    }
+
+    return result;
+  } catch (err) {
+    throw new Error(`Can not get meta info for registry [${registry}]: ${err.message}`);
+  }
+};
+
+const parseSourceUrl = async (url) => {
+  const { origin, pathname } = new URL(url);
+
+  const match = pathname.match(/^\/api\/blocklets\/(\w*)\/blocklet\.json/);
+  if (match) {
+    try {
+      const m = await getRegistryMeta(origin);
+      if (m && m.id) {
+        return {
+          inStore: true,
+          registryUrl: origin,
+          blockletDid: match[1],
+        };
+      }
+    } catch {
+      // meat is not in store, do nothing
+    }
+  }
+
+  return {
+    inStore: false,
+  };
+};
+
+module.exports = {
+  validateRegistryURL,
+  getRegistryMeta,
+  parseSourceUrl,
+};

package/lib/util/service.js

@@ -1,30 +1,15 @@
 const fs = require('fs-extra');
-const { NODE_SERVICES } = require('@abtnode/constant');
-
-const servicesNames = Object.values(NODE_SERVICES);
 
 const getServices = ({ stringifySchema = false } = {}) =>
-  servicesNames
+  ['auth']
     .map((x) => {
-      const service = {};
-
-      // Read service meta
-      try {
-        const packageFile = require.resolve(`${x}/package.json`);
-        const { name, description, version } = fs.readJSONSync(packageFile);
-        service.name = name;
-        service.description = description || name;
-        service.version = version;
-      } catch (err) {
-        return null;
-      }
+      let service;
 
-      // Read service config: optional
       try {
-        const schemaFile = require.resolve(`${x}/api/schema.json`);
-        service.schema = fs.readJSONSync(schemaFile);
+        const metaFile = require.resolve(`@abtnode/blocklet-services/services/${x}/meta.json`);
+        service = fs.readJSONSync(metaFile);
       } catch (err) {
-        service.schema = {};
+        service = {};
       }
 
       if (stringifySchema) {

package/lib/webhook/index.js

@@ -64,7 +64,7 @@ module.exports = ({ events, dataDirs, instance }) => {
       const webhookList = await webhookState.list();
       const nodeInfo = await nodeState.read();
       const { internal, external } = await IP.get();
-      const baseUrls = await getBaseUrls(instance, [internal, external]);
+      const baseUrls = await getBaseUrls(instance, [external, internal]);
       const senderFns = {};
 
       if (webhookList.length) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.22",
+  "version": "1.6.23",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,28 +19,28 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.6.22",
-    "@abtnode/constant": "1.6.22",
-    "@abtnode/cron": "1.6.22",
-    "@abtnode/db": "1.6.22",
-    "@abtnode/logger": "1.6.22",
-    "@abtnode/queue": "1.6.22",
-    "@abtnode/rbac": "1.6.22",
-    "@abtnode/router-provider": "1.6.22",
-    "@abtnode/static-server": "1.6.22",
-    "@abtnode/timemachine": "1.6.22",
-    "@abtnode/util": "1.6.22",
-    "@arcblock/did": "^1.14.16",
-    "@arcblock/event-hub": "1.14.16",
+    "@abtnode/certificate-manager": "1.6.23",
+    "@abtnode/constant": "1.6.23",
+    "@abtnode/cron": "1.6.23",
+    "@abtnode/db": "1.6.23",
+    "@abtnode/logger": "1.6.23",
+    "@abtnode/queue": "1.6.23",
+    "@abtnode/rbac": "1.6.23",
+    "@abtnode/router-provider": "1.6.23",
+    "@abtnode/static-server": "1.6.23",
+    "@abtnode/timemachine": "1.6.23",
+    "@abtnode/util": "1.6.23",
+    "@arcblock/did": "^1.14.19",
+    "@arcblock/event-hub": "1.14.19",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.14.16",
-    "@blocklet/meta": "1.6.22",
+    "@arcblock/vc": "^1.14.19",
+    "@blocklet/meta": "1.6.23",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.14.16",
-    "@ocap/util": "^1.14.16",
-    "@ocap/wallet": "^1.14.16",
+    "@ocap/mcrypto": "^1.14.19",
+    "@ocap/util": "^1.14.19",
+    "@ocap/wallet": "^1.14.19",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.25.0",
     "axon": "^2.0.3",
@@ -75,5 +75,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "18ac52a439dbd04e4ace98d796b6de517503fb14"
+  "gitHead": "6c478fb7e2a30b302981b5339f349c69134e022e"
 }