@abtnode/core 1.16.25-next-0ba03ffc → 1.16.25-next-1e779575

package/lib/blocklet/manager/disk.js

@@ -4086,13 +4086,37 @@ class DiskBlockletManager extends BaseBlockletManager {
       for (const data of blockletExtras) {
         try {
           const { did } = data;
-          const isTerminated = await launcher.isBlockletTerminated(did, data.controller);
+          const launcherSession = await launcher.getLauncherSession({
+            launcherUrl: data.controller.launcherUrl,
+            launcherSessionId: data.controller.launcherSessionId,
+          });
+          const isTerminated = launcher.isLaunchSessionTerminated(launcherSession);
 
           if (!isTerminated) {
             logger.info('skip cleaning the non-exceed redemption blocklet', {
               blockletDid: did,
+              controller: data.controller,
+              launcherSession,
+            });
+            continue;
+          }
+
+          if (!launcherSession.terminatedAt) {
+            logger.error('the blocklet launch session does not have terminatedAt, skip', {
+              blockletDid: did,
+              controller: data.controller,
+              launcherSession,
+            });
+            continue;
+          }
+
+          // 订阅终止后需要再保留一段时间数据
+          if (!launcher.isDataRetentionExceeded(launcherSession.terminatedAt)) {
+            logger.info('skip cleaning the non-exceed redemption blocklet', {
+              blockletDid: did,
+              controller: data.controller,
+              launcherSession,
             });
-            // eslint-disable-next-line no-continue
             continue;
           }
 

package/lib/util/launcher.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const fs = require('fs-extra');
 const joinUrl = require('url-join');
+const dayjs = require('@abtnode/util/lib/dayjs');
 const pick = require('lodash/pick');
 const uniq = require('lodash/uniq');
 const isEmpty = require('lodash/isEmpty');
@@ -109,6 +110,7 @@ const consumeLauncherSession = async ({ params, blocklet }) => {
         appDid: blocklet.appPid,
         appUrl,
         appName: name,
+        installedAt: blocklet.installedAt,
         ownerDid: params.ownerDid,
         componentDids,
       },
@@ -263,6 +265,7 @@ const getLauncherSession = async ({ launcherUrl, launcherSessionId, external = t
       'statusText',
       'subscription',
       'expirationDate',
+      'terminatedAt',
       'reservedUntil',
     ]);
   }
@@ -315,17 +318,25 @@ const isBlockletExpired = async (blockletDid, controller) => {
   return [LAUNCH_SESSION_STATUS.expired, LAUNCH_SESSION_STATUS.terminated].includes(status);
 };
 
+const isLaunchSessionTerminated = (session) => session.status === LAUNCH_SESSION_STATUS.terminated;
+
 const isBlockletTerminated = async (blockletDid, controller) => {
   const status = await getLaunchSessionStatus(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;
+
 module.exports = {
   consumeServerlessNFT,
   consumeLauncherSession,
   reportComponentsEvent,
   setupAppOwner,
   getLauncherSession,
+  isDataRetentionExceeded,
+  isLaunchSessionTerminated,
   isLauncherSessionConsumed,
   isBlockletExpired,
   isBlockletTerminated,

package/lib/validators/router.js

@@ -71,7 +71,11 @@ const ruleSchema = {
     interfaceName: Joi.string() // root interface
       .label('interface name')
       .when('type', { is: ROUTING_RULE_TYPES.BLOCKLET, then: Joi.required() }),
-    response: Joi.object({ status: Joi.number().required(), contentType: Joi.string(), body: Joi.string().required() })
+    response: Joi.object({
+      status: Joi.number().required(),
+      contentType: Joi.string(),
+      body: Joi.string().max(4096).required(),
+    })
       .label('response')
       .when('type', {
         is: ROUTING_RULE_TYPES.DIRECT_RESPONSE,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25-next-0ba03ffc",
+  "version": "1.16.25-next-1e779575",
   "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.25-next-0ba03ffc",
-    "@abtnode/auth": "1.16.25-next-0ba03ffc",
-    "@abtnode/certificate-manager": "1.16.25-next-0ba03ffc",
-    "@abtnode/constant": "1.16.25-next-0ba03ffc",
-    "@abtnode/cron": "1.16.25-next-0ba03ffc",
-    "@abtnode/logger": "1.16.25-next-0ba03ffc",
-    "@abtnode/models": "1.16.25-next-0ba03ffc",
-    "@abtnode/queue": "1.16.25-next-0ba03ffc",
-    "@abtnode/rbac": "1.16.25-next-0ba03ffc",
-    "@abtnode/router-provider": "1.16.25-next-0ba03ffc",
-    "@abtnode/static-server": "1.16.25-next-0ba03ffc",
-    "@abtnode/timemachine": "1.16.25-next-0ba03ffc",
-    "@abtnode/util": "1.16.25-next-0ba03ffc",
+    "@abtnode/analytics": "1.16.25-next-1e779575",
+    "@abtnode/auth": "1.16.25-next-1e779575",
+    "@abtnode/certificate-manager": "1.16.25-next-1e779575",
+    "@abtnode/constant": "1.16.25-next-1e779575",
+    "@abtnode/cron": "1.16.25-next-1e779575",
+    "@abtnode/logger": "1.16.25-next-1e779575",
+    "@abtnode/models": "1.16.25-next-1e779575",
+    "@abtnode/queue": "1.16.25-next-1e779575",
+    "@abtnode/rbac": "1.16.25-next-1e779575",
+    "@abtnode/router-provider": "1.16.25-next-1e779575",
+    "@abtnode/static-server": "1.16.25-next-1e779575",
+    "@abtnode/timemachine": "1.16.25-next-1e779575",
+    "@abtnode/util": "1.16.25-next-1e779575",
     "@arcblock/did": "1.18.113",
     "@arcblock/did-auth": "1.18.113",
     "@arcblock/did-ext": "^1.18.113",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.113",
     "@arcblock/vc": "1.18.113",
-    "@blocklet/constant": "1.16.25-next-0ba03ffc",
-    "@blocklet/env": "1.16.25-next-0ba03ffc",
-    "@blocklet/meta": "1.16.25-next-0ba03ffc",
-    "@blocklet/resolver": "1.16.25-next-0ba03ffc",
-    "@blocklet/sdk": "1.16.25-next-0ba03ffc",
+    "@blocklet/constant": "1.16.25-next-1e779575",
+    "@blocklet/env": "1.16.25-next-1e779575",
+    "@blocklet/meta": "1.16.25-next-1e779575",
+    "@blocklet/resolver": "1.16.25-next-1e779575",
+    "@blocklet/sdk": "1.16.25-next-1e779575",
     "@did-space/client": "^0.3.69",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.113",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "4003cb3e4d32c47cdf097b00b551959db4d5d31a"
+  "gitHead": "a850cb40b003798c7bf6dbbf7546e2feabd85243"
 }