@abtnode/core 1.8.63 → 1.8.64-beta-0b5ede51

package/lib/states/blocklet.js

@@ -23,7 +23,6 @@ const logger = require('@abtnode/logger')('state-blocklet');
 const BaseState = require('./base');
 const { checkDuplicateComponents, ensureMeta } = require('../util/blocklet');
 const { validateBlockletMeta } = require('../util');
-const { validateBlockletController } = require('../validators/blocklet');
 
 const lock = new Lock('blocklet-port-assign-lock');
 
@@ -122,21 +121,6 @@ class BlockletState extends BaseState {
     });
   }
 
-  async isExternalBlocklet(did) {
-    if (!did) {
-      return false;
-    }
-
-    const exist = await this.findOne({
-      $or: [{ 'meta.did': did }, { appDid: did }],
-      controller: {
-        $exists: true,
-      },
-    });
-
-    return !!exist;
-  }
-
   async getBlockletStatus(did) {
     return new Promise((resolve, reject) => {
       if (!did) {
@@ -212,7 +196,6 @@ class BlockletState extends BaseState {
     deployedFrom = '',
     mode = BLOCKLET_MODES.PRODUCTION,
     children: rawChildren = [],
-    controller,
   } = {}) {
     return this.getBlocklet(meta.did).then(
       (exist) =>
@@ -251,13 +234,8 @@ class BlockletState extends BaseState {
               ports,
               environments: [],
               children,
-              controller,
             };
 
-            if (controller) {
-              data.controller = await validateBlockletController(controller);
-            }
-
             // add to db
             this.insert(data, (err, doc) => {
               lock.release();

package/lib/util/blocklet.js

@@ -88,6 +88,7 @@ const {
   findInterfacePortByName,
   validateBlockletMeta,
   prettyURL,
+  getNFTState,
 } = require('./index');
 
 const getComponentConfig = (meta) => meta.components || meta.children;
@@ -1392,6 +1393,11 @@ const getBlocklet = async ({
   blocklet.enablePassportIssuance = get(settings, 'enablePassportIssuance', true);
   blocklet.settings = settings || {};
 
+  const extrasMeta = await states.blockletExtras.getMeta(blocklet.meta.did);
+  if (extrasMeta) {
+    blocklet.controller = extrasMeta.controller;
+  }
+
   blocklet.settings.storeList = blocklet.settings.storeList || [];
 
   if (!blocklet.settings.storeList.find((x) => x.url === BLOCKLET_STORE.url)) {
@@ -1491,7 +1497,11 @@ const getConfigFromPreferences = (blocklet) => {
 
 const consumeServerlessNFT = async ({ nftId, nodeInfo, blocklet }) => {
   try {
-    const { url } = nodeInfo.launcher;
+    const state = await getNFTState(blocklet.controller.chainHost, nftId);
+    if (!state) {
+      throw new Error(`get nft state failed, chainHost: ${blocklet.controller.chainHost}, nftId: ${nftId}`);
+    }
+
     const type = WalletType({
       role: types.RoleType.ROLE_APPLICATION,
       pk: types.KeyType.ED25519,
@@ -1502,7 +1512,8 @@ const consumeServerlessNFT = async ({ nftId, nodeInfo, blocklet }) => {
 
     const body = { nftId, appURL };
 
-    const { data } = await axios.post(joinURL(url, '/api/serverless/consume'), body, {
+    const { launcherUrl } = state.data.value;
+    const { data } = await axios.post(joinURL(launcherUrl, '/api/serverless/consume'), body, {
       headers: {
         'x-sig': toBase58(wallet.sign(stableStringify(body))),
       },
@@ -1618,6 +1629,16 @@ const validateAppConfig = async (config, blockletDid, states) => {
       throw new Error(`${x.key}(${x.value}) is not a valid http address`);
     }
   }
+
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACES_URL) {
+    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 ({ sk, did, states }) => {

package/lib/validators/util.js

@@ -13,6 +13,7 @@ const getMultipleLangParams = (context) => ({
 const blockletController = Joi.object({
   nftId: Joi.DID().required(),
   nftOwner: Joi.DID().required(),
+  chainHost: Joi.string().uri().required(),
   appMaxCount: Joi.number().required().min(1),
 }).options({ stripUnknown: true });
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.63",
+  "version": "1.8.64-beta-0b5ede51",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,33 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.63",
-    "@abtnode/certificate-manager": "1.8.63",
-    "@abtnode/constant": "1.8.63",
-    "@abtnode/cron": "1.8.63",
-    "@abtnode/db": "1.8.63",
-    "@abtnode/logger": "1.8.63",
-    "@abtnode/queue": "1.8.63",
-    "@abtnode/rbac": "1.8.63",
-    "@abtnode/router-provider": "1.8.63",
-    "@abtnode/static-server": "1.8.63",
-    "@abtnode/timemachine": "1.8.63",
-    "@abtnode/util": "1.8.63",
-    "@arcblock/did": "1.18.36",
+    "@abtnode/auth": "1.8.64-beta-0b5ede51",
+    "@abtnode/certificate-manager": "1.8.64-beta-0b5ede51",
+    "@abtnode/constant": "1.8.64-beta-0b5ede51",
+    "@abtnode/cron": "1.8.64-beta-0b5ede51",
+    "@abtnode/db": "1.8.64-beta-0b5ede51",
+    "@abtnode/logger": "1.8.64-beta-0b5ede51",
+    "@abtnode/queue": "1.8.64-beta-0b5ede51",
+    "@abtnode/rbac": "1.8.64-beta-0b5ede51",
+    "@abtnode/router-provider": "1.8.64-beta-0b5ede51",
+    "@abtnode/static-server": "1.8.64-beta-0b5ede51",
+    "@abtnode/timemachine": "1.8.64-beta-0b5ede51",
+    "@abtnode/util": "1.8.64-beta-0b5ede51",
+    "@arcblock/did": "1.18.37",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.36",
-    "@arcblock/event-hub": "1.18.36",
-    "@arcblock/jwt": "^1.18.36",
+    "@arcblock/did-util": "1.18.37",
+    "@arcblock/event-hub": "1.18.37",
+    "@arcblock/jwt": "^1.18.37",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.36",
-    "@blocklet/constant": "1.8.63",
-    "@blocklet/meta": "1.8.63",
-    "@blocklet/sdk": "1.8.63",
+    "@arcblock/vc": "1.18.37",
+    "@blocklet/constant": "1.8.64-beta-0b5ede51",
+    "@blocklet/meta": "1.8.64-beta-0b5ede51",
+    "@blocklet/sdk": "1.8.64-beta-0b5ede51",
+    "@did-space/client": "^0.1.66",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.36",
-    "@ocap/util": "1.18.36",
-    "@ocap/wallet": "1.18.36",
+    "@ocap/mcrypto": "1.18.37",
+    "@ocap/util": "1.18.37",
+    "@ocap/wallet": "1.18.37",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -55,7 +56,7 @@
     "detect-port": "^1.5.1",
     "escape-string-regexp": "^4.0.0",
     "flat": "^5.0.2",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.1.0",
     "get-port": "^5.1.1",
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
@@ -64,6 +65,7 @@
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
+    "node-stream-zip": "^1.15.0",
     "p-limit": "^3.1.0",
     "pm2": "^5.2.0",
     "semver": "^7.3.8",
@@ -77,7 +79,8 @@
     "ua-parser-js": "^1.0.2",
     "unzipper": "^0.10.11",
     "url-join": "^4.0.1",
-    "uuid": "7.0.3"
+    "uuid": "7.0.3",
+    "valid-url": "^1.0.9"
   },
   "devDependencies": {
     "compression": "^1.7.4",
@@ -85,5 +88,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "69c7bf7f79fbabc8718d8ec0c6fb36ce9477cfd8"
+  "gitHead": "fbb72fdf88ea44c949ea951b84ab0506805bda7d"
 }

package/lib/validators/blocklet.js

@@ -1,5 +0,0 @@
-const { blockletController } = require('./util');
-
-module.exports = {
-  validateBlockletController: (entity) => blockletController.validateAsync(entity),
-};