@abtnode/core 1.16.17-beta-2ac96448 → 1.16.17-beta-3232a7af

package/lib/blocklet/manager/disk.js

@@ -91,6 +91,7 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const pLimit = require('p-limit');
 const pRetry = require('p-retry');
 
+const isFunction = require('lodash/isFunction');
 const { consumeServerlessNFT, consumeLauncherSession } = require('../../util/launcher');
 const util = require('../../util');
 const {
@@ -219,6 +220,18 @@ class DiskBlockletManager extends BaseBlockletManager {
     this.restoreQueue = restoreQueue;
     this.teamManager = teamManager;
 
+    if (isFunction(this.backupQueue.on)) {
+      const handleBackupComplete = async ({ id, job }) => {
+        await this.backupQueue.delete(id);
+
+        const autoBackup = await this.getAutoBackup({ did: id });
+        if (autoBackup?.enabled) {
+          this.backupQueue.push(job, id, true, BACKUPS.JOB.INTERVAL);
+        }
+      };
+      this.backupQueue.on('finished', handleBackupComplete).on('failed', handleBackupComplete);
+    }
+
     // cached installed blocklets for performance
     this.cachedBlocklets = new LRU({
       max: 100,
@@ -1887,13 +1900,14 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     await this.backupQueue.delete(did);
 
+    logger.info('updateAutoBackup.$value', value);
+
     if (value.enabled) {
       const blocklet = await states.blocklet.getBlocklet(did);
       this.backupQueue.push(
         {
           entity: 'blocklet',
           action: 'backupToSpaces',
-          id: did,
           blocklet,
           context,
         },
@@ -2385,22 +2399,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         blocklet,
       });
       throw error;
-    } finally {
-      const autoBackup = await this.getAutoBackup({ did: appPid });
-      if (autoBackup.enabled) {
-        this.backupQueue.push(
-          {
-            entity: 'blocklet',
-            action: 'backupToSpaces',
-            id: appPid,
-            blocklet,
-            context,
-          },
-          appPid,
-          true,
-          BACKUPS.JOB.INTERVAL
-        );
-      }
     }
   }
 
@@ -3576,7 +3574,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         {
           entity: 'blocklet',
           action: 'backupToSpaces',
-          id: did,
           blocklet,
           context,
           backupState: {

package/lib/event/auto-backup-handler.js

@@ -0,0 +1,49 @@
+const debounce = require('lodash/debounce');
+const logger = require('@abtnode/logger')('@abtnode/core:event/auto-backup-handler');
+
+/**
+ * @description
+ * @param {string} eventName
+ * @param {import('@abtnode/client').BlockletState & {context: {}} } payload
+ * @param {import('../blocklet/manager/disk')} blockletManager
+ */
+async function autoBackupHandler(eventName, payload, blockletManager) {
+  const { did } = payload.meta;
+  const autoBackup = await blockletManager.getAutoBackup({ did });
+
+  logger.info('autoBackupHandler.$autoBackup', autoBackup);
+  logger.info('autoBackupHandler.$Boolean(payload.context)', Boolean(payload.context));
+
+  if (autoBackup.enabled && payload.context) {
+    await blockletManager.backupQueue.delete(did);
+
+    blockletManager.backupQueue.push(
+      {
+        entity: 'blocklet',
+        action: 'backupToSpaces',
+        blocklet: payload,
+        context: payload.context,
+      },
+      did
+    );
+  }
+}
+
+const debouncedFuncs = {};
+/**
+ * @description
+ * @param {string} id
+ * @param {Function} fn
+ * @return {Function}
+ */
+function autoBackupHandlerFactory(id, fn) {
+  if (!debouncedFuncs[id]) {
+    debouncedFuncs[id] = debounce(fn, 3000);
+  }
+  return debouncedFuncs[id];
+}
+
+module.exports = {
+  autoBackupHandler,
+  autoBackupHandlerFactory,
+};

package/lib/{event.js → event/index.js}

@@ -11,22 +11,23 @@ const {
   BlockletInternalEvents,
 } = require('@blocklet/constant');
 const { EVENTS } = require('@abtnode/constant');
-const { NodeMonitSender } = require('./monitor/node-monit-sender');
-const handleInstanceInStore = require('./util/public-to-store');
-const { isCLI } = require('./util');
+const { NodeMonitSender } = require('../monitor/node-monit-sender');
+const handleInstanceInStore = require('../util/public-to-store');
+const { isCLI } = require('../util');
 
 const eventHub =
   process.env.NODE_ENV === 'test' ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
 
-const states = require('./states');
-const { getBackupEndpoint, getBackupFilesUrlFromEndpoint, getDIDSpacesUrlFromEndpoint } = require('./util/spaces');
+const states = require('../states');
+const { getBackupEndpoint, getBackupFilesUrlFromEndpoint, getDIDSpacesUrlFromEndpoint } = require('../util/spaces');
+const { autoBackupHandlerFactory, autoBackupHandler } = require('./auto-backup-handler');
 
 const routingSnapshotPrefix = (blocklet) => (blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '[DEV] ' : '');
 
 /**
  *
  * @param {{
- *  blockletManager: import('./blocklet/manager/disk')
+ *  blockletManager: import('../blocklet/manager/disk')
  * }} param0
  * @returns
  */
@@ -400,38 +401,26 @@ module.exports = ({
     listen(blockletManager, eventName, handleBlockletEvent);
   });
 
-  /**
-   * @description
-   * @param {string} eventName
-   * @param {import('@abtnode/client').BlockletState & {context: {}} } payload
-   */
-  async function autoBackupHandler(eventName, payload) {
-    const { did } = payload.meta;
-    const autoBackup = await blockletManager.getAutoBackup({ did });
-
-    if (autoBackup.enabled && payload.context) {
-      await blockletManager.backupQueue.delete(did);
-
-      blockletManager.backupQueue.push(
-        {
-          entity: 'blocklet',
-          action: 'backupToSpaces',
-          id: did,
-          blocklet: payload,
-          context: payload.context,
-        },
-        did
-      );
-    }
-  }
-
   [
     BlockletEvents.componentInstalled,
     BlockletEvents.componentUpgraded,
     BlockletEvents.componentRemoved,
     BlockletEvents.updated,
   ].forEach((eventName) => {
-    listen(blockletManager, eventName, autoBackupHandler);
+    listen(
+      blockletManager,
+      eventName,
+      /**
+       *
+       * @param {string} eventName
+       * @param {import('@abtnode/client').BlockletState & {context: {}} } payload
+       * @returns
+       */
+      (_eventName, payload, ...args) => {
+        const id = payload.meta.did;
+        return autoBackupHandlerFactory(id, autoBackupHandler)(eventName, payload, blockletManager, ...args);
+      }
+    );
   });
 
   Object.keys(BlockletInternalEvents).forEach((key) => {

package/lib/router/manager.js

@@ -18,6 +18,7 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const logger = require('@abtnode/logger')('@abtnode/core:router:manager');
 const { getProvider } = require('@abtnode/router-provider');
 const checkDomainMatch = require('@abtnode/util/lib/check-domain-match');
+const { isDidDomain } = require('@abtnode/util/lib/url-evaluation');
 const {
   DOMAIN_FOR_IP_SITE,
   DOMAIN_FOR_DEFAULT_SITE,
@@ -44,6 +45,7 @@ const { findWebInterface } = require('../util/blocklet');
 const { attachRuntimeDomainAliases, ensureLatestInfo } = require('./helper');
 const Router = require('./index');
 const states = require('../states');
+const { getDidFromDomainGroupName, updateNFTDomainRecord, revokeAndDeleteNFTDomainRecord } = require('../util/router');
 
 const checkPathPrefixInBlackList = (pathPrefix, extraBlackList = []) => {
   const blacklist = [
@@ -184,7 +186,7 @@ class RouterManager extends EventEmitter {
     return dbSite;
   }
 
-  async addDomainAlias({ id, domainAlias: tmpAlias, force }, context = {}) {
+  async addDomainAlias({ id, domainAlias: tmpAlias, force, type, nftDid, chainHost }, context = {}) {
     const domainAlias = await validateAddDomainAlias(tmpAlias, context);
     const dbSite = await states.site.findOne({ id });
     if (!dbSite) {
@@ -215,12 +217,26 @@ class RouterManager extends EventEmitter {
     }
 
     const doc = await states.site.findOne({ id });
-    const updateResult = await states.site.update(
-      { id },
-      { $set: { domainAliases: [...doc.domainAliases, { value: domainAlias, isProtected: false }] } }
-    );
+    const item = { value: domainAlias, isProtected: false };
+    if (type === 'nft-domain') {
+      item.type = type;
+      item.nftDid = nftDid;
+      item.chainHost = chainHost;
+    }
+
+    const updateResult = await states.site.update({ id }, { $set: { domainAliases: [...doc.domainAliases, item] } });
     logger.debug('add domain alias update result', { id, updateResult, domainAlias });
 
+    if (type === 'nft-domain') {
+      const did = getDidFromDomainGroupName(doc.domain); // TODO: 是不是可靠？
+      const didDomain = doc.domainAliases.find((x) => isDidDomain(x.value));
+      const blocklet = await states.blocklet.getBlocklet(did);
+      const nodeInfo = await states.node.read();
+
+      await updateNFTDomainRecord({ name: domainAlias, value: didDomain.value, blocklet, nodeInfo });
+      logger.info('update nft domain record', { domain: domainAlias, didDomain: '', nftDid, id });
+    }
+
     const newSite = await states.site.findOne({ id });
     await attachRuntimeDomainAliases({ sites: newSite, context, node: states.node });
 
@@ -228,12 +244,16 @@ class RouterManager extends EventEmitter {
   }
 
   async deleteDomainAlias({ id, domainAlias: tmpAlias }, context = {}) {
-    const domainAlias = await validateAddDomainAlias(tmpAlias, context);
+    let domainAlias = await validateAddDomainAlias(tmpAlias, context);
+    domainAlias = toLower(domainAlias);
+
     const dbSite = await states.site.findOne({ id });
     if (!dbSite) {
       throw new Error(`site ${id} does not exist`);
     }
 
+    const toDelete = dbSite.domainAliases.find((x) => toLower(x.value) === domainAlias);
+
     dbSite.domainAliases = dbSite.domainAliases.filter((x) => {
       if (typeof x === 'string') {
         return toLower(x) !== domainAlias;
@@ -247,6 +267,18 @@ class RouterManager extends EventEmitter {
 
     await attachRuntimeDomainAliases({ sites: dbSite, context, node: states.node });
 
+    if (toDelete?.type === 'nft-domain') {
+      const blockletDid = getDidFromDomainGroupName(dbSite.domain); // TODO: 是不是可靠？
+      const blocklet = await states.blocklet.getBlocklet(blockletDid);
+      const nodeInfo = await states.node.read();
+
+      revokeAndDeleteNFTDomainRecord({ name: domainAlias, blocklet, nodeInfo })
+        .then(() => logger.info('revoke and delete nft domain record', { domain: domainAlias, blockletDid, id }))
+        .catch((error) =>
+          logger.error('revoke and delete nft domain record failed', { error, domain: domainAlias, blockletDid, id })
+        );
+    }
+
     return dbSite;
   }
 

package/lib/states/index.js

@@ -67,6 +67,8 @@ const init = (dataDirs, config = {}) => {
  *  backup: import('./backup'),
  *  blocklet: import('./blocklet'),
  *  blockletExtras: import('./blocklet-extras'),
+ *  notification: import('./notification'),
+ *  job: import('./job'),
  *  [key: string]: any
  * }}
  */

package/lib/states/node.js

@@ -125,6 +125,7 @@ class NodeState extends BaseState {
       trustedPassports,
       customBlockletNumber: 0,
       webWalletUrl,
+      nftDomainUrl: '', // TODO: Default domain url
     });
 
     if (dek) {

package/lib/util/blocklet.js

@@ -274,6 +274,7 @@ const getAppSystemEnvironments = (blocklet, nodeInfo, dataDirs) => {
 
   const { wallet } = result;
   const appSk = toHex(wallet.secretKey);
+  const appPk = toHex(wallet.publicKey);
   const appId = wallet.address;
   const appName = title || name || result.name;
   const appDescription = description || result.description;
@@ -302,6 +303,7 @@ const getAppSystemEnvironments = (blocklet, nodeInfo, dataDirs) => {
 
   return {
     BLOCKLET_DID: did, // BLOCKLET_DID is always same as BLOCKLET_APP_PID in structV2 application
+    BLOCKLET_APP_PK: appPk,
     BLOCKLET_APP_SK: appSk,
     BLOCKLET_APP_ID: appId,
     BLOCKLET_APP_PSK: appPsk, // permanent sk even the blocklet has been migrated

package/lib/util/router.js

@@ -1,4 +1,10 @@
 const { BLOCKLET_SITE_GROUP_SUFFIX } = require('@abtnode/constant');
+const axios = require('@abtnode/util/lib/axios');
+const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { stableStringify } = require('@arcblock/vc');
+const { toBase58 } = require('@ocap/util');
+const joinURL = require('url-join');
+const logger = require('@abtnode/logger')('@abtnode/core:router:util');
 
 const getBlockletDomainGroupName = (did) => `${did}${BLOCKLET_SITE_GROUP_SUFFIX}`;
 
@@ -7,7 +13,74 @@ const getDidFromDomainGroupName = (name) => {
   return did;
 };
 
+const getNFTDomainHeaders = ({ wallet, payload }) => ({
+  'x-blocklet-sig': toBase58(wallet.sign(stableStringify(payload))),
+});
+
+const updateNFTDomainRecord = async ({ name, value, blocklet, nodeInfo }) => {
+  const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+
+  const payload = {
+    delegatee: wallet.address,
+    domain: name,
+    record: {
+      name,
+      type: 'CNAME',
+      value,
+    },
+  };
+  try {
+    const { data } = await axios({
+      method: 'POST',
+      url: joinURL(nodeInfo.nftDomainUrl, '/api/domains'), // TODO: 替换为真实地址
+      data: payload,
+      headers: getNFTDomainHeaders({ wallet, payload }),
+    });
+
+    return data;
+  } catch (error) {
+    logger.error('updateNFTDomainRecord error', {
+      error,
+      name,
+      value,
+      delegatee: wallet.address,
+      appPid: blocklet.appPid,
+      resp: error.response?.data,
+    });
+    throw new Error('update nft domain record failed');
+  }
+};
+
+const revokeAndDeleteNFTDomainRecord = async ({ name, blocklet, nodeInfo }) => {
+  const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+
+  const payload = {
+    delegatee: wallet.address,
+    domain: name,
+  };
+  try {
+    const { data } = await axios({
+      method: 'DELETE',
+      url: joinURL(nodeInfo.nftDomainUrl, '/api/domains'),
+      data: payload,
+      headers: getNFTDomainHeaders({ wallet, payload }),
+    });
+
+    return data;
+  } catch (error) {
+    logger.error('revokeAndDeleteNFTDomainRecord error', {
+      error,
+      name,
+      appPid: blocklet.appPid,
+      resp: error.response?.data,
+    });
+    throw new Error('revoke nft domain record failed');
+  }
+};
+
 module.exports = {
   getBlockletDomainGroupName,
   getDidFromDomainGroupName,
+  updateNFTDomainRecord,
+  revokeAndDeleteNFTDomainRecord,
 };

package/lib/validators/node.js

@@ -28,6 +28,15 @@ const nodeInfoSchema = Joi.object({
       zh: { 'string.uriCustomScheme': 'Web Wallet 必须是合法的 URL' },
       en: { 'string.uriCustomScheme': 'Web Wallet must be a valid URL' },
     }),
+  nftDomainUrl: Joi.string()
+    .uri({ scheme: [/https?/] })
+    .label('web wallet url')
+    .allow('')
+    .optional()
+    .messages({
+      zh: { 'string.uriCustomScheme': 'NFT Domain 必须是合法的 URL' },
+      en: { 'string.uriCustomScheme': 'NFT Domain must be a valid URL' },
+    }),
   autoUpgrade: Joi.boolean(),
   enableWelcomePage: Joi.boolean(),
   diskAlertThreshold: Joi.number()

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.17-beta-2ac96448",
+  "version": "1.16.17-beta-3232a7af",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.17-beta-2ac96448",
-    "@abtnode/auth": "1.16.17-beta-2ac96448",
-    "@abtnode/certificate-manager": "1.16.17-beta-2ac96448",
-    "@abtnode/constant": "1.16.17-beta-2ac96448",
-    "@abtnode/cron": "1.16.17-beta-2ac96448",
-    "@abtnode/logger": "1.16.17-beta-2ac96448",
-    "@abtnode/models": "1.16.17-beta-2ac96448",
-    "@abtnode/queue": "1.16.17-beta-2ac96448",
-    "@abtnode/rbac": "1.16.17-beta-2ac96448",
-    "@abtnode/router-provider": "1.16.17-beta-2ac96448",
-    "@abtnode/static-server": "1.16.17-beta-2ac96448",
-    "@abtnode/timemachine": "1.16.17-beta-2ac96448",
-    "@abtnode/util": "1.16.17-beta-2ac96448",
+    "@abtnode/analytics": "1.16.17-beta-3232a7af",
+    "@abtnode/auth": "1.16.17-beta-3232a7af",
+    "@abtnode/certificate-manager": "1.16.17-beta-3232a7af",
+    "@abtnode/constant": "1.16.17-beta-3232a7af",
+    "@abtnode/cron": "1.16.17-beta-3232a7af",
+    "@abtnode/logger": "1.16.17-beta-3232a7af",
+    "@abtnode/models": "1.16.17-beta-3232a7af",
+    "@abtnode/queue": "1.16.17-beta-3232a7af",
+    "@abtnode/rbac": "1.16.17-beta-3232a7af",
+    "@abtnode/router-provider": "1.16.17-beta-3232a7af",
+    "@abtnode/static-server": "1.16.17-beta-3232a7af",
+    "@abtnode/timemachine": "1.16.17-beta-3232a7af",
+    "@abtnode/util": "1.16.17-beta-3232a7af",
     "@arcblock/did": "1.18.92",
     "@arcblock/did-auth": "1.18.92",
     "@arcblock/did-ext": "^1.18.92",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.92",
     "@arcblock/vc": "1.18.92",
-    "@blocklet/constant": "1.16.17-beta-2ac96448",
-    "@blocklet/env": "1.16.17-beta-2ac96448",
-    "@blocklet/meta": "1.16.17-beta-2ac96448",
-    "@blocklet/resolver": "1.16.17-beta-2ac96448",
-    "@blocklet/sdk": "1.16.17-beta-2ac96448",
+    "@blocklet/constant": "1.16.17-beta-3232a7af",
+    "@blocklet/env": "1.16.17-beta-3232a7af",
+    "@blocklet/meta": "1.16.17-beta-3232a7af",
+    "@blocklet/resolver": "1.16.17-beta-3232a7af",
+    "@blocklet/sdk": "1.16.17-beta-3232a7af",
     "@did-space/client": "^0.3.11",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.92",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "3f18c2e1dd086879b22faf92b6b6954898ed72ef"
+  "gitHead": "af4067dd2e418c51a0ed96b1ee242ca812904056"
 }