@blocklet/meta 1.8.26 → 1.8.28

package/lib/constants.js

@@ -1,191 +1,3 @@
-const fromEntry = (entries) => (v) => {
-  const match = Object.entries(entries).find((x) => x[1] === Number(v));
-  return match ? match[0] : 'unknown';
-};
+const constant = require('@blocklet/constant');
 
-const toEntry = (entries) => (v) => Object.keys(entries).find((x) => entries[x] === Number(v));
-
-// Blocklet Status
-
-const BlockletStatus = Object.freeze({
-  added: 0,
-  downloading: 1,
-  downloaded: 2, // Deprecated
-  installing: 3,
-  installed: 4,
-  starting: 5,
-  running: 6,
-  stopping: 7,
-  stopped: 8,
-  error: 9,
-  upgrading: 10,
-  restarting: 11, // Deprecated
-  corrupted: 12,
-  waiting: 13,
-  deleted: 14,
-});
-
-const fromBlockletStatus = fromEntry(BlockletStatus);
-const toBlockletStatus = toEntry(BlockletStatus);
-
-// Blocklet Source
-
-const BlockletSource = Object.freeze({
-  // Installed from Blocklet Store
-  registry: 0,
-
-  // Installed from local development source folder
-  local: 1,
-
-  // Installed from uploading bundle directly
-  upload: 2,
-
-  // Installed from a url (similar to Blocklet Store)
-  url: 3,
-
-  // Installed by custom creation
-  custom: 4,
-});
-
-const fromBlockletSource = fromEntry(BlockletSource);
-const toBlockletSource = toEntry(BlockletSource);
-
-// Blocklet Group(Type)
-
-const BlockletGroup = Object.freeze({
-  // Only static website
-  // The website is served by by Blocklet Server at runtime
-  static: 'static',
-
-  // The runtime instance is provided by its own backend server
-  dapp: 'dapp',
-
-  starter: false, // deprecated
-
-  // This type is used to combine other component blocklets
-  // No instance will be spawned at runtime
-  gateway: 'gateway',
-});
-
-const BLOCKLET_GROUPS = ['dapp', 'static', 'gateway'];
-
-// Blocklet Events
-
-const BlockletEvents = Object.freeze({
-  added: 'blocklet.added',
-  downloadFailed: 'blocklet.downloadFailed',
-  installed: 'blocklet.installed',
-  installFailed: 'blocklet.installFailed',
-  upgraded: 'blocklet.upgraded',
-  upgradeFailed: 'blocklet.upgradedFailed',
-  downgraded: 'blocklet.downgraded',
-  downgradeFailed: 'blocklet.downgradedFailed',
-  updated: 'blocklet.updated',
-  statusChange: 'blocklet.statusChange',
-  removed: 'blocklet.removed',
-  started: 'blocklet.started',
-  startFailed: 'blocklet.startFailed',
-  stopped: 'blocklet.stopped',
-  reloaded: 'blocklet.reloaded', // Deprecated
-  purchaseChange: 'blocklet.purchaseChange',
-});
-
-// Blocklet Interface
-
-const BLOCKLET_INTERFACE_TYPE_WEB = 'web';
-const BLOCKLET_INTERFACE_TYPE_SERVICE = 'service';
-
-// Wellknown interface declares an sub-interface under web interface
-// The path of the wellknown interface must starts with /.well-known, e.g. /.well-known/acme-challenge)
-// The wellknown interface can be mounted to every endpoint of the abtnode and all blocklets on the abtnode
-const BLOCKLET_INTERFACE_TYPE_WELLKNOWN = 'wellknown';
-const BLOCKLET_INTERFACE_TYPES = [
-  BLOCKLET_INTERFACE_TYPE_WEB,
-  BLOCKLET_INTERFACE_TYPE_SERVICE,
-  BLOCKLET_INTERFACE_TYPE_WELLKNOWN,
-];
-
-const BLOCKLET_INTERFACE_PUBLIC = 'publicUrl';
-const BLOCKLET_INTERFACE_WELLKNOWN = 'wellknownUrl'; // Deprecated
-const BLOCKLET_UI_INTERFACES = [BLOCKLET_INTERFACE_PUBLIC];
-const BLOCKLET_STANDARD_INTERFACES = [BLOCKLET_INTERFACE_PUBLIC, BLOCKLET_INTERFACE_WELLKNOWN];
-
-const BLOCKLET_INTERFACE_PROTOCOL_HTTP = 'http';
-const BLOCKLET_INTERFACE_PROTOCOL_TCP = 'tcp';
-const BLOCKLET_INTERFACE_PROTOCOL_UDP = 'udp';
-const BLOCKLET_INTERFACE_PROTOCOLS = [
-  BLOCKLET_INTERFACE_PROTOCOL_TCP,
-  BLOCKLET_INTERFACE_PROTOCOL_UDP,
-  BLOCKLET_INTERFACE_PROTOCOL_HTTP,
-];
-
-module.exports = Object.freeze({
-  BlockletStatus,
-  fromBlockletStatus,
-  toBlockletStatus,
-
-  BlockletSource,
-  fromBlockletSource,
-  toBlockletSource,
-
-  BlockletGroup,
-  BLOCKLET_GROUPS,
-
-  BlockletEvents,
-
-  BLOCKLET_PLATFORMS: ['aix', 'darwin', 'freebsd', 'linux', 'openbsd', 'sunos', 'win32'],
-  BLOCKLET_ARCHITECTURES: ['arm', 'arm64', 'ia32', 'mips', 'mipsel', 'ppc', 'ppc64', 's390', 's390x', 'x32', 'x64'],
-
-  BLOCKLET_MODES: Object.freeze({
-    PRODUCTION: 'production',
-    DEVELOPMENT: 'development',
-  }),
-
-  BLOCKLET_FACTORY_SHARES: { developer: 0.7, store: 0.3 },
-
-  // interface
-  BLOCKLET_INTERFACE_PUBLIC,
-  BLOCKLET_INTERFACE_WELLKNOWN, // Deprecated
-  BLOCKLET_UI_INTERFACES,
-  BLOCKLET_STANDARD_INTERFACES,
-
-  BLOCKLET_INTERFACE_TYPE_WEB,
-  BLOCKLET_INTERFACE_TYPE_SERVICE,
-  BLOCKLET_INTERFACE_TYPE_WELLKNOWN,
-  BLOCKLET_INTERFACE_TYPES,
-
-  BLOCKLET_INTERFACE_PROTOCOL_HTTP,
-  BLOCKLET_INTERFACE_PROTOCOL_TCP,
-  BLOCKLET_INTERFACE_PROTOCOL_UDP,
-  BLOCKLET_INTERFACE_PROTOCOLS,
-
-  BLOCKLET_DYNAMIC_PATH_PREFIX: '*',
-  BLOCKLET_DEFAULT_PORT_NAME: 'BLOCKLET_PORT',
-  BLOCKLET_DEFAULT_PATH_REWRITE: '/',
-
-  // bundle
-  BLOCKLET_RELEASE_FOLDER: '.blocklet/release',
-  BLOCKLET_RELEASE_FILE: 'blocklet.json',
-  BLOCKLET_BUNDLE_FOLDER: '.blocklet/bundle',
-  BLOCKLET_BUNDLE_FILE: 'blocklet.zip',
-  BLOCKLET_ENTRY_FILE: 'blocklet.js',
-  BLOCKLET_META_FILE: 'blocklet.yml',
-  BLOCKLET_META_FILE_ALT: 'blocklet.yaml',
-
-  BLOCKLET_DEFAULT_VERSION: '1.0.0',
-
-  BLOCKLET_LATEST_SPEC_VERSION: '1.2.7',
-  BLOCKLET_LATEST_REQUIREMENT_SERVER: '>=1.7.0',
-  BLOCKLET_LATEST_REQUIREMENT_ABTNODE: '>=1.5.15', // Deprecated
-
-  BLOCKLET_CONFIGURABLE_KEY: {
-    BLOCKLET_CLUSTER_SIZE: 'BLOCKLET_CLUSTER_SIZE',
-    BLOCKLET_APP_NAME: 'BLOCKLET_APP_NAME',
-    BLOCKLET_APP_DESCRIPTION: 'BLOCKLET_APP_DESCRIPTION',
-    BLOCKLET_APP_SK: 'BLOCKLET_APP_SK',
-    BLOCKLET_APP_URL: 'BLOCKLET_APP_URL',
-    BLOCKLET_PASSPORT_COLOR: 'BLOCKLET_PASSPORT_COLOR',
-    BLOCKLET_WALLET_TYPE: 'BLOCKLET_WALLET_TYPE',
-    BLOCKLET_DELETABLE: 'BLOCKLET_DELETABLE',
-  },
-});
+module.exports = constant;

package/lib/payment/v2.js

@@ -2,11 +2,11 @@
 const crypto = require('crypto');
 const debug = require('debug')('@blocklet/meta:payment');
 const joinURL = require('url-join');
-const axios = require('axios').create();
 const stableStringify = require('json-stable-stringify');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
 const cloneDeep = require('lodash/cloneDeep');
+const axios = require('@abtnode/util/lib/axios');
 const { BN, fromTokenToUnit, fromUnitToToken } = require('@ocap/util');
 const { isValidFactory } = require('@ocap/asset');
 const { fromPublicKey } = require('@ocap/wallet');

package/lib/schema.js

@@ -42,6 +42,9 @@ const titleSchema = Joi.string()
     return value;
   });
 const descriptionSchema = Joi.string().trim().min(3).max(160);
+const logoSchema = Joi.string()
+  .uri({ scheme: ['http', 'https'], allowRelative: true })
+  .allow('');
 const mountPointSchema = Joi.string().trim().min(1);
 
 const blockletNameSchema = Joi.string()
@@ -515,6 +518,7 @@ module.exports = {
   distSchema,
   titleSchema,
   descriptionSchema,
+  logoSchema,
   navigationSchema,
   themeSchema,
   mountPointSchema,

package/lib/util-meta.js

@@ -1,5 +1,5 @@
 const fs = require('fs');
-const axios = require('axios');
+const axios = require('@abtnode/util/lib/axios');
 const any = require('promise.any');
 const joinUrl = require('url-join');
 

package/lib/util.js

@@ -11,6 +11,7 @@ const {
   fromBlockletSource,
   BLOCKLET_INTERFACE_TYPE_WEB,
   BLOCKLET_CONFIGURABLE_KEY,
+  CHAIN_INFO_CONFIG,
 } = require('./constants');
 
 const getComponentId = (component, ancestors = []) =>
@@ -189,6 +190,16 @@ const findComponentById = (blocklet, componentId, { _ancestors = [], returnAnces
   return null;
 };
 
+const isEnvShareable = (env) => {
+  return (
+    !!env &&
+    !!(env.key || env.name) &&
+    !env.secure &&
+    env.shared !== false &&
+    !BLOCKLET_CONFIGURABLE_KEY[env.key || env.name]
+  );
+};
+
 const getSharedConfigObj = (component, ancestors) => {
   const res = {};
   if (!ancestors) {
@@ -334,6 +345,10 @@ const hasRunnableComponent = (blocklet) => {
  * @returns blocklet display name
  */
 const getDisplayName = (blocklet, onlyUseMeta = false) => {
+  if (!blocklet) {
+    return '';
+  }
+
   const { meta } = blocklet;
   let displayName;
 
@@ -438,6 +453,14 @@ const replaceSlotToIp = (url, ip) => (url || '').replace(SLOT_FOR_IP_DNS_SITE, (
 
 const urlFriendly = (name) => slugify(name.replace(/^[@./-]/, '').replace(/[@./_]/g, '-'));
 
+// transform process.env.CHAIN_x => { x: v }
+const getChainInfo = (env) =>
+  Object.entries(CHAIN_INFO_CONFIG).reduce((info, x) => {
+    const [envName, [key, value]] = x;
+    info[key] = get(env, envName) || value;
+    return info;
+  }, {});
+
 module.exports = {
   isFreeBlocklet,
   isFreeComponent,
@@ -450,6 +473,7 @@ module.exports = {
   getSharedConfigObj,
   getAppMissingConfigs,
   getComponentMissingConfigs,
+  isEnvShareable,
   wipeSensitiveData,
   hasRunnableComponent,
   getDisplayName,
@@ -465,4 +489,5 @@ module.exports = {
   findComponentById,
   getParentComponentName,
   getConnectAppUrl,
+  getChainInfo,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.26",
+  "version": "1.8.28",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,16 +18,17 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.26",
-    "@abtnode/util": "1.8.26",
-    "@arcblock/did": "1.17.19",
-    "@arcblock/did-ext": "1.17.19",
-    "@arcblock/did-util": "1.17.19",
-    "@arcblock/jwt": "1.17.19",
-    "@ocap/asset": "1.17.19",
-    "@ocap/mcrypto": "1.17.19",
-    "@ocap/util": "1.17.19",
-    "@ocap/wallet": "1.17.19",
+    "@abtnode/constant": "1.8.28",
+    "@abtnode/util": "1.8.28",
+    "@arcblock/did": "1.17.23",
+    "@arcblock/did-ext": "1.17.23",
+    "@arcblock/did-util": "1.17.23",
+    "@arcblock/jwt": "1.17.23",
+    "@blocklet/constant": "1.8.28",
+    "@ocap/asset": "1.17.23",
+    "@ocap/mcrypto": "1.17.23",
+    "@ocap/util": "1.17.23",
+    "@ocap/wallet": "1.17.23",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -35,7 +36,7 @@
     "fs-extra": "^10.1.0",
     "hosted-git-info": "3.0.8",
     "is-glob": "^4.0.3",
-    "joi": "^17.6.0",
+    "joi": "^17.6.2",
     "joi-extension-semver": "^5.0.0",
     "js-yaml": "^4.1.0",
     "json-stable-stringify": "^1.0.1",
@@ -46,12 +47,12 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "body-parser": "^1.20.0",
+    "body-parser": "^1.20.1",
     "compression": "^1.7.4",
-    "detect-port": "^1.3.0",
+    "detect-port": "^1.5.1",
     "expand-tilde": "^2.0.2",
-    "express": "^4.18.1",
+    "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "71937dabc196a98a1bb514789bc32aee44a1e8c4"
+  "gitHead": "af7aacf5507177600ae563ab597cb42d7223b113"
 }