@abtnode/core 1.16.20-beta-e363262e → 1.16.20-beta-ce2cd157

package/lib/blocklet/manager/disk.js

@@ -94,6 +94,7 @@ const pRetry = require('p-retry');
 
 const isFunction = require('lodash/isFunction');
 const { encode } = require('@abtnode/util/lib/base32');
+const formatContext = require('@abtnode/util/lib/format-context');
 const { consumeServerlessNFT, consumeLauncherSession } = require('../../util/launcher');
 const util = require('../../util');
 const {
@@ -190,6 +191,7 @@ const {
   updateSelectedResources,
 } = require('../project');
 const { callFederated } = require('../../util/federated');
+const { isDnsIpMappingCorrect } = require('../../util/ip');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
@@ -270,6 +272,44 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
+  async initialize() {
+    await this.ensureAutoBackupJobs();
+  }
+
+  async ensureAutoBackupJobs() {
+    const blocklets = await states.blockletExtras.find({
+      'settings.autoBackup.enabled': true,
+    });
+
+    const info = await states.node.read();
+
+    await Promise.all(
+      blocklets.map(async (x) => {
+        const { did } = x;
+        const jobId = getBackupJobId(did);
+        const job = await this.backupQueue.get(jobId);
+
+        if (job) {
+          return;
+        }
+
+        this.backupQueue.push(
+          {
+            entity: 'blocklet',
+            action: 'backupToSpaces',
+            did,
+            context: formatContext({
+              user: { did: info.did },
+            }),
+          },
+          jobId,
+          true,
+          BACKUPS.JOB.INTERVAL
+        );
+      })
+    );
+  }
+
   // ============================================================================================
   // Public API for Installing/Upgrading Application or Components
   // ============================================================================================
@@ -2320,7 +2360,31 @@ class DiskBlockletManager extends BaseBlockletManager {
    * }} { blocklet, context }
    * @memberof BlockletManager
    */
-  async _onBackupToSpaces({ did, context, backupState }) {
+  async _onBackupToSpaces({
+    did,
+    context,
+    backupState = {
+      strategy: BACKUPS.STRATEGY.AUTO,
+    },
+  }) {
+    const blocklet = await states.blocklet.getBlocklet(did);
+    const {
+      appDid,
+      meta: { did: appPid },
+    } = blocklet;
+
+    if (backupState?.strategy === BACKUPS.STRATEGY.AUTO && blocklet.status === BlockletStatus.stopped) {
+      // 自动备份时,应用停止运行就跳过本次备份
+      logger.warn('Skip automatic backups because the application is not running.', { appPid });
+      return;
+    }
+
+    const correct = await isDnsIpMappingCorrect(blocklet.meta.did); // dns/ip 映射错误就跳过本次备份
+    if (!correct) {
+      logger.warn('Skipping automatic backups due to dns mapping errors', { appPid });
+      return;
+    }
+
     const {
       user: { did: userDid, locale },
     } = context;
@@ -2339,12 +2403,6 @@ class DiskBlockletManager extends BaseBlockletManager {
       );
     }
 
-    const blocklet = await states.blocklet.getBlocklet(did);
-    const {
-      appDid,
-      meta: { did: appPid },
-    } = blocklet;
-
     let backup = await states.backup.findOne({ appPid }, {}, { createdAt: -1 });
     if (backup?.status !== BACKUPS.STATUS.PROGRESS) {
       // 创建备份记录

package/lib/index.js

@@ -628,6 +628,15 @@ function ABTNode(options) {
           logger.info('Cron jobs start successfully on daemon start');
         }
       }, 1000);
+
+      blockletManager
+        .initialize()
+        .then(() => {
+          logger.info('blockletManager initialized');
+        })
+        .catch((error) => {
+          logger.error('blockletManager initialize failed', { error });
+        });
     }
   });
 

package/lib/states/index.js

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

package/lib/states/node.js

@@ -58,7 +58,7 @@ class NodeState extends BaseState {
   /**
    * Ensure we have an node record in the database
    *
-   * @returns {object} Node document json
+   * @returns {Promise<import('@abtnode/client').NodeState>} Node document json
    * @memberof NodeState
    */
   async read() {

package/lib/util/ip.js

@@ -1,5 +1,12 @@
+const getIP = require('@abtnode/util/lib/get-ip');
 const getIp = require('@abtnode/util/lib/get-ip');
+const { encode } = require('@abtnode/util/lib/base32');
+const { DEFAULT_DID_DOMAIN } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:ip');
+const dns = require('dns');
+const { promisify } = require('util');
+
+const lookup = promisify(dns.lookup);
 
 let cache = null;
 const fetch = async () => {
@@ -23,6 +30,20 @@ const cron = {
   options: { runOnInit: true, runInService: true },
 };
 
+async function isDnsIpMappingCorrect(did) {
+  try {
+    const { internal, external } = await getIP();
+    const didDomain = `${encode(did)}.${DEFAULT_DID_DOMAIN}`;
+    const { address } = await lookup(didDomain, { rrtype: 'A' });
+
+    return internal === address || external === address;
+  } catch (error) {
+    logger.error(error);
+    return false;
+  }
+}
+
 module.exports.fetch = fetch;
 module.exports.get = get;
 module.exports.cron = cron;
+module.exports.isDnsIpMappingCorrect = isDnsIpMappingCorrect;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.20-beta-e363262e",
+  "version": "1.16.20-beta-ce2cd157",
   "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.20-beta-e363262e",
-    "@abtnode/auth": "1.16.20-beta-e363262e",
-    "@abtnode/certificate-manager": "1.16.20-beta-e363262e",
-    "@abtnode/constant": "1.16.20-beta-e363262e",
-    "@abtnode/cron": "1.16.20-beta-e363262e",
-    "@abtnode/logger": "1.16.20-beta-e363262e",
-    "@abtnode/models": "1.16.20-beta-e363262e",
-    "@abtnode/queue": "1.16.20-beta-e363262e",
-    "@abtnode/rbac": "1.16.20-beta-e363262e",
-    "@abtnode/router-provider": "1.16.20-beta-e363262e",
-    "@abtnode/static-server": "1.16.20-beta-e363262e",
-    "@abtnode/timemachine": "1.16.20-beta-e363262e",
-    "@abtnode/util": "1.16.20-beta-e363262e",
+    "@abtnode/analytics": "1.16.20-beta-ce2cd157",
+    "@abtnode/auth": "1.16.20-beta-ce2cd157",
+    "@abtnode/certificate-manager": "1.16.20-beta-ce2cd157",
+    "@abtnode/constant": "1.16.20-beta-ce2cd157",
+    "@abtnode/cron": "1.16.20-beta-ce2cd157",
+    "@abtnode/logger": "1.16.20-beta-ce2cd157",
+    "@abtnode/models": "1.16.20-beta-ce2cd157",
+    "@abtnode/queue": "1.16.20-beta-ce2cd157",
+    "@abtnode/rbac": "1.16.20-beta-ce2cd157",
+    "@abtnode/router-provider": "1.16.20-beta-ce2cd157",
+    "@abtnode/static-server": "1.16.20-beta-ce2cd157",
+    "@abtnode/timemachine": "1.16.20-beta-ce2cd157",
+    "@abtnode/util": "1.16.20-beta-ce2cd157",
     "@arcblock/did": "1.18.103",
     "@arcblock/did-auth": "1.18.103",
     "@arcblock/did-ext": "^1.18.103",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.103",
     "@arcblock/vc": "1.18.103",
-    "@blocklet/constant": "1.16.20-beta-e363262e",
-    "@blocklet/env": "1.16.20-beta-e363262e",
-    "@blocklet/meta": "1.16.20-beta-e363262e",
-    "@blocklet/resolver": "1.16.20-beta-e363262e",
-    "@blocklet/sdk": "1.16.20-beta-e363262e",
+    "@blocklet/constant": "1.16.20-beta-ce2cd157",
+    "@blocklet/env": "1.16.20-beta-ce2cd157",
+    "@blocklet/meta": "1.16.20-beta-ce2cd157",
+    "@blocklet/resolver": "1.16.20-beta-ce2cd157",
+    "@blocklet/sdk": "1.16.20-beta-ce2cd157",
     "@did-space/client": "^0.3.41",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.103",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "479cea04dd620d8194d6221b2594b6a0f390ba76"
+  "gitHead": "a081d3e4fa2a6d51f343df07eb631fa9300d7538"
 }