@abtnode/core 1.8.60 → 1.8.61

package/lib/blocklet/manager/disk.js

@@ -12,14 +12,12 @@ const capitalize = require('lodash/capitalize');
 const { Throttle } = require('stream-throttle');
 const LRU = require('lru-cache');
 const joi = require('joi');
-const isUrl = require('is-url');
 const { isNFTExpired, getNftExpirationDate } = require('@abtnode/util/lib/nft');
 const didDocument = require('@abtnode/util/lib/did-document');
 const { sign } = require('@arcblock/jwt');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { verifyPresentation } = require('@arcblock/vc');
-const { toBase58, isHex } = require('@ocap/util');
-const { fromSecretKey } = require('@ocap/wallet');
+const { toBase58 } = require('@ocap/util');
 const { toSvg: createDidLogo } =
   process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
@@ -55,13 +53,7 @@ const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const toBlockletDid = require('@blocklet/meta/lib/did');
 const { validateMeta } = require('@blocklet/meta/lib/validate');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
-const {
-  titleSchema,
-  descriptionSchema,
-  mountPointSchema,
-  logoSchema,
-  environmentNameSchema,
-} = require('@blocklet/meta/lib/schema');
+const { titleSchema, mountPointSchema, environmentNameSchema } = require('@blocklet/meta/lib/schema');
 const hasReservedKey = require('@blocklet/meta/lib/has-reserved-key');
 
 const { toExternalBlocklet } = toBlockletDid;
@@ -86,7 +78,6 @@ const {
   BLOCKLET_META_FILE,
   BLOCKLET_CONFIGURABLE_KEY,
 } = require('@blocklet/constant');
-const { isEmpty } = require('lodash');
 const util = require('../../util');
 const {
   refresh: refreshAccessibleExternalNodeIp,
@@ -125,6 +116,8 @@ const {
   ensureEnvDefault,
   getConfigFromPreferences,
   consumeServerlessNFT,
+  validateAppConfig,
+  checkDuplicateAppSk,
 } = require('../../util/blocklet');
 const StoreUtil = require('../../util/store');
 const states = require('../../states');
@@ -978,77 +971,7 @@ class BlockletManager extends BaseBlockletManager {
           throw new Error(`Cannot set ${x.key} to child blocklet`);
         }
 
-        if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK) {
-          try {
-            fromSecretKey(x.value);
-          } catch {
-            try {
-              fromSecretKey(x.value, 'eth');
-            } catch {
-              throw new Error('Invalid custom blocklet secret key');
-            }
-          }
-
-          // Ensure sk is not used by other blocklets, otherwise we may encounter appDid collision
-          const blocklets = await states.blocklet.getBlocklets({});
-          const others = blocklets.filter((b) => b.meta.did !== did);
-          if (
-            others.some(
-              (b) => b.environments.find((e) => e.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK).value === x.value
-            )
-          ) {
-            throw new Error('Invalid custom blocklet secret key: already used by another blocklet');
-          }
-        }
-
-        if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME) {
-          x.value = await titleSchema.validateAsync(x.value);
-        }
-
-        if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_DESCRIPTION) {
-          x.value = await descriptionSchema.validateAsync(x.value);
-        }
-
-        if (
-          [
-            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO,
-            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT,
-            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE,
-            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON,
-          ].includes(x.key)
-        ) {
-          x.value = await logoSchema.validateAsync(x.value);
-        }
-
-        if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_WALLET_TYPE) {
-          if (['default', 'eth'].includes(x.value) === false) {
-            throw new Error('Invalid blocklet wallet type, only "default" and "eth" are supported');
-          }
-        }
-
-        if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_DELETABLE) {
-          if (['yes', 'no'].includes(x.value) === false) {
-            throw new Error('BLOCKLET_DELETABLE must be either "yes" or "no"');
-          }
-        }
-
-        if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_PASSPORT_COLOR) {
-          if (x.value && x.value !== 'auto') {
-            if (x.value.length !== 7 || !isHex(x.value.slice(-6))) {
-              throw new Error('BLOCKLET_PASSPORT_COLOR must be a hex encoded color, eg. #ffeeaa');
-            }
-          }
-        }
-
-        if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT) {
-          if (isEmpty(x.value)) {
-            throw new Error(`${x.key} can not be empty`);
-          }
-
-          if (!isUrl(x.value)) {
-            throw new Error(`${x.key}(${x.value}) is not a valid http address`);
-          }
-        }
+        await validateAppConfig(x, rootDid, states);
       } else if (!BLOCKLET_CONFIGURABLE_KEY[x.key] && !isPreferenceKey(x)) {
         if (!(blocklet.meta.environments || []).some((y) => y.name === x.key)) {
           // forbid unknown format key
@@ -2362,6 +2285,9 @@ class BlockletManager extends BaseBlockletManager {
     });
     await this._setConfigsFromMeta(did);
 
+    // check duplicate appSk
+    await checkDuplicateAppSk({ did, states });
+
     // fake install bundle
     const bundleDir = getBundleDir(this.installDir, meta);
     fs.mkdirSync(bundleDir, { recursive: true });
@@ -2479,6 +2405,9 @@ class BlockletManager extends BaseBlockletManager {
       await this._setConfigsFromMeta(meta.did);
       await validateBlocklet(blocklet);
 
+      // check duplicate appSk
+      await checkDuplicateAppSk({ did: meta.did, states });
+
       // download
       await this._downloadBlocklet(
         blocklet,
@@ -2743,6 +2672,9 @@ class BlockletManager extends BaseBlockletManager {
 
       await this._setConfigsFromMeta(did);
 
+      // check duplicate appSk
+      await checkDuplicateAppSk({ did, states });
+
       logger.info('blocklet added to database', { did: meta.did });
 
       const blocklet1 = await states.blocklet.setBlockletStatus(did, BlockletStatus.waiting);

package/lib/event.js

@@ -11,6 +11,7 @@ const eventHub =
   process.env.NODE_ENV === 'test' ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
 
 const states = require('./states');
+const { isBeforeInstalled } = require('./util');
 
 const routingSnapshotPrefix = (blocklet) => (blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '[DEV] ' : '');
 
@@ -237,10 +238,12 @@ module.exports = ({
       logger.info('take snapshot after updated blocklet app', { event: eventName, did: blocklet.meta.did, hash });
     }
 
-    try {
-      await blockletManager.runtimeMonitor.monit(blocklet.meta.did);
-    } catch (error) {
-      logger.error('monit runtime info failed', { error });
+    if (blocklet.status && !isBeforeInstalled(blocklet.status)) {
+      try {
+        await blockletManager.runtimeMonitor.monit(blocklet.meta.did);
+      } catch (error) {
+        logger.error('monit runtime info failed', { eventName, error });
+      }
     }
 
     if (payload.blocklet && !payload.meta) {

package/lib/router/index.js

@@ -162,6 +162,10 @@ class Router {
   getLogFilesForToday() {
     return this.provider.getLogFilesForToday();
   }
+
+  getLogDir() {
+    return this.provider.getLogDir();
+  }
 }
 
 Router.formatSites = (sites = []) => {

package/lib/util/blocklet.js

@@ -7,16 +7,18 @@ const shelljs = require('shelljs');
 const os = require('os');
 const tar = require('tar');
 const get = require('lodash/get');
+const isEmpty = require('lodash/isEmpty');
 const streamToPromise = require('stream-to-promise');
 const { Throttle } = require('stream-throttle');
 const ssri = require('ssri');
 const diff = require('deep-diff');
 const createArchive = require('archiver');
+const isUrl = require('is-url');
 const axios = require('@abtnode/util/lib/axios');
 const { stableStringify } = require('@arcblock/vc');
 
 const { fromSecretKey, WalletType } = require('@ocap/wallet');
-const { toHex, toBase58 } = require('@ocap/util');
+const { toHex, toBase58, isHex } = require('@ocap/util');
 const { types } = require('@ocap/mcrypto');
 const { isValid: isValidDid } = require('@arcblock/did');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
@@ -67,7 +69,7 @@ const {
   isEnvShareable,
 } = require('@blocklet/meta/lib/util');
 const toBlockletDid = require('@blocklet/meta/lib/did');
-const { titleSchema, descriptionSchema } = require('@blocklet/meta/lib/schema');
+const { titleSchema, descriptionSchema, logoSchema } = require('@blocklet/meta/lib/schema');
 const {
   getSourceUrlsFromConfig,
   getBlockletMetaFromUrls,
@@ -1017,8 +1019,8 @@ const pruneBlockletBundle = async ({ blocklets, installDir, blockletSettings })
     const bundleName = arr[length - 2];
     const scopeName = length > 2 ? arr[length - 3] : '';
     const bundleDir = path.join(installDir, scopeName, bundleName);
-    const isEmpty = (await fs.promises.readdir(bundleDir)).length === 0;
-    if (isEmpty) {
+    const isDirEmpty = (await fs.promises.readdir(bundleDir)).length === 0;
+    if (isDirEmpty) {
       logger.info('Remove bundle folder', { bundleDir });
       await fs.remove(bundleDir);
     }
@@ -1513,6 +1515,116 @@ const createDataArchive = (dataDir, fileName) => {
   });
 };
 
+/**
+ * this function has side effect on config.value
+ * @param {{ key: string, value?: string }} config
+ */
+const validateAppConfig = async (config, blockletDid, states) => {
+  const x = config;
+
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK) {
+    if (x.value) {
+      try {
+        fromSecretKey(x.value);
+      } catch {
+        try {
+          fromSecretKey(x.value, 'eth');
+        } catch {
+          throw new Error('Invalid custom blocklet secret key');
+        }
+      }
+
+      // Ensure sk is not used by other blocklets, otherwise we may encounter appDid collision
+      const blocklets = await states.blocklet.getBlocklets({});
+      const others = blocklets.filter((b) => b.meta.did !== blockletDid);
+      if (
+        others.some(
+          (b) => b.environments.find((e) => e.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK).value === x.value
+        )
+      ) {
+        throw new Error('Invalid custom blocklet secret key: already used by another blocklet');
+      }
+    } else {
+      delete x.value;
+    }
+  }
+
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME) {
+    x.value = await titleSchema.validateAsync(x.value);
+  }
+
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_DESCRIPTION) {
+    x.value = await descriptionSchema.validateAsync(x.value);
+  }
+
+  if (
+    [
+      BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO,
+      BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT,
+      BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE,
+      BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON,
+    ].includes(x.key)
+  ) {
+    x.value = await logoSchema.validateAsync(x.value);
+  }
+
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_WALLET_TYPE) {
+    if (['default', 'eth'].includes(x.value) === false) {
+      throw new Error('Invalid blocklet wallet type, only "default" and "eth" are supported');
+    }
+  }
+
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_DELETABLE) {
+    if (['yes', 'no'].includes(x.value) === false) {
+      throw new Error('BLOCKLET_DELETABLE must be either "yes" or "no"');
+    }
+  }
+
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_PASSPORT_COLOR) {
+    if (x.value && x.value !== 'auto') {
+      if (x.value.length !== 7 || !isHex(x.value.slice(-6))) {
+        throw new Error('BLOCKLET_PASSPORT_COLOR must be a hex encoded color, eg. #ffeeaa');
+      }
+    }
+  }
+
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT) {
+    if (isEmpty(x.value)) {
+      throw new Error(`${x.key} can not be empty`);
+    }
+
+    if (!isUrl(x.value)) {
+      throw new Error(`${x.key}(${x.value}) is not a valid http address`);
+    }
+  }
+};
+
+const checkDuplicateAppSk = async ({ did, states }) => {
+  const nodeInfo = await states.node.read();
+  const blocklets = await states.blocklet.getBlocklets({});
+  const blocklet = await states.blocklet.getBlocklet(did);
+  const configs = await states.blockletExtras.getConfigs([did]);
+
+  const { wallet } = getBlockletInfo(
+    {
+      meta: blocklet.meta,
+      environments: (configs || []).filter((x) => x.value),
+    },
+    nodeInfo.sk
+  );
+
+  const others = blocklets.filter((b) => b.meta.did !== did);
+
+  const exist = others.find((b) => {
+    const item = (b.environments || []).find((e) => e.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK);
+    return item?.value === toHex(wallet.secretKey);
+  });
+
+  if (exist) {
+    throw new Error(`blocklet secret key already used by ${exist.meta.title || exist.meta.name}`);
+  }
+};
+
 module.exports = {
   consumeServerlessNFT,
   forEachBlocklet,
@@ -1556,4 +1668,6 @@ module.exports = {
   ensureEnvDefault,
   getConfigFromPreferences,
   createDataArchive,
+  validateAppConfig,
+  checkDuplicateAppSk,
 };

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

@@ -1,11 +1,9 @@
-const slugify = require('slugify');
 const { DEFAULT_IP_DOMAIN_SUFFIX } = require('@abtnode/constant');
 const { encode: encodeBase32 } = require('@abtnode/util/lib/base32');
+const formatName = require('@abtnode/util/lib/format-name');
 
 const SLOT_FOR_IP_DNS_SITE = '888-888-888-888';
 
-const formatName = (name) => slugify(name.replace(/^[@./-]/, '').replace(/[@./_]/g, '-'));
-
 const hiddenInterfaceNames = ['public', 'publicUrl'];
 
 const getIpDnsDomainForBlocklet = (blocklet, blockletInterface) => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.60",
+  "version": "1.8.61",
   "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.60",
-    "@abtnode/certificate-manager": "1.8.60",
-    "@abtnode/constant": "1.8.60",
-    "@abtnode/cron": "1.8.60",
-    "@abtnode/db": "1.8.60",
-    "@abtnode/logger": "1.8.60",
-    "@abtnode/queue": "1.8.60",
-    "@abtnode/rbac": "1.8.60",
-    "@abtnode/router-provider": "1.8.60",
-    "@abtnode/static-server": "1.8.60",
-    "@abtnode/timemachine": "1.8.60",
-    "@abtnode/util": "1.8.60",
-    "@arcblock/did": "1.18.34",
+    "@abtnode/auth": "1.8.61",
+    "@abtnode/certificate-manager": "1.8.61",
+    "@abtnode/constant": "1.8.61",
+    "@abtnode/cron": "1.8.61",
+    "@abtnode/db": "1.8.61",
+    "@abtnode/logger": "1.8.61",
+    "@abtnode/queue": "1.8.61",
+    "@abtnode/rbac": "1.8.61",
+    "@abtnode/router-provider": "1.8.61",
+    "@abtnode/static-server": "1.8.61",
+    "@abtnode/timemachine": "1.8.61",
+    "@abtnode/util": "1.8.61",
+    "@arcblock/did": "1.18.36",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.34",
-    "@arcblock/event-hub": "1.18.34",
-    "@arcblock/jwt": "^1.18.34",
+    "@arcblock/did-util": "1.18.36",
+    "@arcblock/event-hub": "1.18.36",
+    "@arcblock/jwt": "^1.18.36",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.34",
-    "@blocklet/constant": "1.8.60",
-    "@blocklet/meta": "1.8.60",
-    "@blocklet/sdk": "1.8.60",
+    "@arcblock/vc": "1.18.36",
+    "@blocklet/constant": "1.8.61",
+    "@blocklet/meta": "1.8.61",
+    "@blocklet/sdk": "1.8.61",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.34",
-    "@ocap/util": "1.18.34",
-    "@ocap/wallet": "1.18.34",
+    "@ocap/mcrypto": "1.18.36",
+    "@ocap/util": "1.18.36",
+    "@ocap/wallet": "1.18.36",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -85,5 +85,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "0a56dc596f58d83f22d1ea0d0145d84e7151f5be"
+  "gitHead": "f68ac14c2074400d392e2171d328f12dbd2e64cb"
 }