@abtnode/core 1.16.30-beta-958ae719 → 1.16.30-beta-b80c7bcd

package/lib/blocklet/manager/disk.js

@@ -2297,6 +2297,10 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     await states.blockletExtras.setSettings(did, { autoBackup: value });
+
+    const newState = await this.getBlocklet(did);
+    this.emit(BlockletInternalEvents.appSettingChanged, { appDid: did });
+    this.emit(BlockletEvents.updated, { ...newState, context });
   }
 
   /**
@@ -2323,6 +2327,11 @@ class DiskBlockletManager extends BaseBlockletManager {
     /** @type {import('@abtnode/client').AutoCheckUpdate} */
     const value = { ...autoCheckUpdate };
     await states.blockletExtras.setSettings(did, { autoCheckUpdate: value });
+
+    const newState = await this.getBlocklet(did);
+    this.emit(BlockletInternalEvents.appSettingChanged, { appDid: did });
+    this.emit(BlockletEvents.updated, { ...newState, context });
+
     const jobId = getCheckUpdateJobId(did);
     await this.checkUpdateQueue.delete(jobId);
 
@@ -4247,8 +4256,6 @@ class DiskBlockletManager extends BaseBlockletManager {
             nftId: data.controller.nftId,
           });
 
-          // TODO: 如果绑定了 DID Space 备份到 DID Space
-
           await this.delete({ did, keepData: false, keepConfigs: false, keepLogsDir: false });
           logger.info('the exceed redemption blocklet already deleted', {
             blockletDid: did,

package/lib/event/index.js

@@ -74,7 +74,7 @@ module.exports = ({
         teamManager.deleteTeam(data?.meta?.did);
       }
 
-      // clear cache
+      // clear blocklet cache
       if (
         [
           BlockletEvents.updated,
@@ -86,7 +86,7 @@ module.exports = ({
       ) {
         const did = get(data, 'meta.did');
         if (did) {
-          logger.info('delete blocklet cache on update', { did });
+          logger.info(`delete blocklet cache on ${name}`, { did });
           blockletManager.deleteCache(did);
         }
       }

package/lib/index.js

@@ -379,14 +379,12 @@ function ABTNode(options) {
 
     // auto backup
     updateAutoBackup: blockletManager.updateAutoBackup.bind(blockletManager),
-    getAutoBackup: blockletManager.getAutoBackup.bind(blockletManager),
 
     // blocklet backup record
     getBlockletBackups: blockletManager.getBlockletBackups.bind(blockletManager),
 
     // check update
     updateAutoCheckUpdate: blockletManager.updateAutoCheckUpdate.bind(blockletManager),
-    getAutoCheckUpdate: blockletManager.getAutoCheckUpdate.bind(blockletManager),
 
     // Store
     getBlockletMeta: StoreUtil.getBlockletMeta,

package/lib/router/helper.js

@@ -136,7 +136,7 @@ const attachRuntimeDomainAliases = async ({ sites = [], context = {} }) => {
   }
 
   if (!ip) {
-    const result = await getIp();
+    const result = await getIp({ includeExternal: false });
     if (result) {
       ip = result.internal;
     }

package/lib/util/ip.js

@@ -8,10 +8,10 @@ const { promisify } = require('util');
 const lookup = promisify(dns.lookup);
 
 let cache = null;
-const fetch = async () => {
+const fetch = async (args = {}) => {
   try {
     const start = Date.now();
-    const result = await getIP({ includeV6: true, timeout: 5000 });
+    const result = await getIP({ includeV6: true, timeout: 5000, ...args });
     cache = result;
     logger.info('refetch ip', { result, duration: Date.now() - start });
   } catch (err) {
@@ -21,7 +21,7 @@ const fetch = async () => {
   return cache;
 };
 
-const get = () => cache || fetch();
+const get = (args) => cache || fetch(args);
 const cron = {
   name: 'refetch-ip',
   time: '0 */30 * * * *', // refetch every 30 minutes

package/lib/util/launcher.js

@@ -28,6 +28,7 @@ const {
   USER_AVATAR_URL_PREFIX,
   ROLES,
   LAUNCH_SESSION_STATUS,
+  SERVERLESS_BLOCKLET_DATA_RETENTION_DAYS,
 } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:util:launcher');
@@ -410,13 +411,15 @@ const getLaunchSessionStatus = async (blockletDid, controller) => {
     throw new Error(error);
   }
 
-  logger.info('get launcher session success', { launcherSessionId, launcherSession });
+  logger.info('get launcher session success', { blockletDid, launcherSessionId, launcherSession });
   return launcherSession.status;
 };
 
 const isBlockletExpired = async (blockletDid, controller) => {
   const status = await getLaunchSessionStatus(blockletDid, controller);
-  return [LAUNCH_SESSION_STATUS.expired, LAUNCH_SESSION_STATUS.terminated].includes(status);
+  return [LAUNCH_SESSION_STATUS.overdue, LAUNCH_SESSION_STATUS.canceled, LAUNCH_SESSION_STATUS.terminated].includes(
+    status
+  );
 };
 
 const isLaunchSessionTerminated = (session) => session.status === LAUNCH_SESSION_STATUS.terminated;
@@ -426,9 +429,8 @@ const isBlockletTerminated = async (blockletDid, controller) => {
   return status === LAUNCH_SESSION_STATUS.terminated;
 };
 
-const DATA_RETENTION_DAYS = 30;
 const isDataRetentionExceeded = (terminatedAt) =>
-  !!terminatedAt && dayjs().diff(dayjs(terminatedAt), 'days') > DATA_RETENTION_DAYS;
+  !!terminatedAt && dayjs().diff(dayjs(terminatedAt), 'days') > SERVERLESS_BLOCKLET_DATA_RETENTION_DAYS;
 
 module.exports = {
   consumeServerlessNFT,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.30-beta-958ae719",
+  "version": "1.16.30-beta-b80c7bcd",
   "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.30-beta-958ae719",
-    "@abtnode/auth": "1.16.30-beta-958ae719",
-    "@abtnode/certificate-manager": "1.16.30-beta-958ae719",
-    "@abtnode/constant": "1.16.30-beta-958ae719",
-    "@abtnode/cron": "1.16.30-beta-958ae719",
-    "@abtnode/logger": "1.16.30-beta-958ae719",
-    "@abtnode/models": "1.16.30-beta-958ae719",
-    "@abtnode/queue": "1.16.30-beta-958ae719",
-    "@abtnode/rbac": "1.16.30-beta-958ae719",
-    "@abtnode/router-provider": "1.16.30-beta-958ae719",
-    "@abtnode/static-server": "1.16.30-beta-958ae719",
-    "@abtnode/timemachine": "1.16.30-beta-958ae719",
-    "@abtnode/util": "1.16.30-beta-958ae719",
+    "@abtnode/analytics": "1.16.30-beta-b80c7bcd",
+    "@abtnode/auth": "1.16.30-beta-b80c7bcd",
+    "@abtnode/certificate-manager": "1.16.30-beta-b80c7bcd",
+    "@abtnode/constant": "1.16.30-beta-b80c7bcd",
+    "@abtnode/cron": "1.16.30-beta-b80c7bcd",
+    "@abtnode/logger": "1.16.30-beta-b80c7bcd",
+    "@abtnode/models": "1.16.30-beta-b80c7bcd",
+    "@abtnode/queue": "1.16.30-beta-b80c7bcd",
+    "@abtnode/rbac": "1.16.30-beta-b80c7bcd",
+    "@abtnode/router-provider": "1.16.30-beta-b80c7bcd",
+    "@abtnode/static-server": "1.16.30-beta-b80c7bcd",
+    "@abtnode/timemachine": "1.16.30-beta-b80c7bcd",
+    "@abtnode/util": "1.16.30-beta-b80c7bcd",
     "@arcblock/did": "1.18.128",
     "@arcblock/did-auth": "1.18.128",
     "@arcblock/did-ext": "^1.18.128",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.128",
     "@arcblock/vc": "1.18.128",
-    "@blocklet/constant": "1.16.30-beta-958ae719",
-    "@blocklet/env": "1.16.30-beta-958ae719",
-    "@blocklet/meta": "1.16.30-beta-958ae719",
-    "@blocklet/resolver": "1.16.30-beta-958ae719",
-    "@blocklet/sdk": "1.16.30-beta-958ae719",
-    "@blocklet/store": "1.16.30-beta-958ae719",
+    "@blocklet/constant": "1.16.30-beta-b80c7bcd",
+    "@blocklet/env": "1.16.30-beta-b80c7bcd",
+    "@blocklet/meta": "1.16.30-beta-b80c7bcd",
+    "@blocklet/resolver": "1.16.30-beta-b80c7bcd",
+    "@blocklet/sdk": "1.16.30-beta-b80c7bcd",
+    "@blocklet/store": "1.16.30-beta-b80c7bcd",
     "@did-space/client": "^0.5.17",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.128",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "75590ff3be51e7fe2a070124541aebc203ed16dc"
+  "gitHead": "9d68833290b1a59357b7c362018416b82b5d1503"
 }