@abtnode/core 1.16.10-beta-75a4b94c → 1.16.10-beta-cceee857

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/blocklet/manager/disk.js +4 -0
  2. package/lib/states/blocklet-extras.js +3 -51
  3. package/package.json +18 -18
package/lib/blocklet/manager/disk.js CHANGED
@@ -2310,6 +2310,10 @@ class BlockletManager extends BaseBlockletManager {
2310
2310
  if (blocklet?.controller?.nftId && process.env.NODE_ENV !== 'test') {
2311
2311
  const nodeInfo = await states.node.read();
2312
2312
  await consumeServerlessNFT({ nftId: blocklet.controller.nftId, nodeInfo, blocklet });
2313
+ await states.blockletExtras.updateByDid(did, {
2314
+ controller: { ...blocklet.controller, consumedAt: new Date().toISOString() },
2315
+ });
2316
+
2313
2317
  this.emit(BlockletEvents.nftConsumed, { blocklet, context });
2314
2318
  }
2315
2319
 
package/lib/states/blocklet-extras.js CHANGED
@@ -14,51 +14,6 @@ const { validateAddMeta, validateExpiredInfo } = require('../validators/blocklet
14
14
 
15
15
  const noop = (k) => (v) => v[k];
16
16
 
17
- // type Settings = {
18
- // whoCanAccess: string;
19
- // initialized: boolean;
20
- // owner: {
21
- // did: string;
22
- // pk: string;
23
- // };
24
- // storeList: Array<getStoreMeta & {
25
- // protected: boolean,
26
- // url: string,
27
- // }>; // 在 blocklet dashboard 添加组件时的商店列表
28
- // navigations: any;
29
- // trustedPassports: any;
30
- // trustedFactories: any;
31
- // enablePassportIssuance: boolean;
32
- // children: Array<any>; // deleted children
33
- // publicToStore: boolean;
34
- // navigation: Array[{
35
- // title: string;
36
- // child: DID | Name;
37
- // }]; // deprecated
38
- // };
39
-
40
- // type Configs = {
41
- // [componentDid: string]: Config;
42
- // };
43
-
44
- // type Children = Array<{
45
- // did: string, // application index
46
- // configs: Configs,
47
- // children: Children
48
- // }>;
49
-
50
- // type ExtraState = {
51
- // did: string; // application index
52
- // meta: {
53
- // did: string; // application index
54
- // name: string; // application index
55
- // };
56
- // controller: BlockletController;
57
- // settings: Settings;
58
- // configs: Configs;
59
- // children: Children
60
- // };
61
-
62
17
  /**
63
18
  * @extends BaseState<import('@abtnode/models').BlockletExtraState>
64
19
  */
@@ -266,12 +221,9 @@ class BlockletExtrasState extends BaseState {
266
221
  }
267
222
 
268
223
  async getExpiredList() {
269
- const now = dayjs();
270
-
271
- return super.find({
272
- 'controller.nftId': { $exists: true },
273
- expiredAt: { $exists: true, $lte: now.subtract(EXPIRED_BLOCKLET_DATA_RETENTION_DAYS, 'days').toISOString() },
274
- });
224
+ const deadline = dayjs().subtract(EXPIRED_BLOCKLET_DATA_RETENTION_DAYS, 'days').toISOString();
225
+ const docs = await super.find({ expiredAt: { $exists: true } });
226
+ return docs.filter((x) => x.controller?.nftId).filter((x) => x.expiredAt <= deadline);
275
227
  }
276
228
 
277
229
  encryptSecurityData({ data, _rootDid } = {}) {
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "access": "public"
5
5
  },
6
- "version": "1.16.10-beta-75a4b94c",
6
+ "version": "1.16.10-beta-cceee857",
7
7
  "description": "",
8
8
  "main": "lib/index.js",
9
9
  "files": [
@@ -19,18 +19,18 @@
19
19
  "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
20
20
  "license": "Apache-2.0",
21
21
  "dependencies": {
22
- "@abtnode/auth": "1.16.10-beta-75a4b94c",
23
- "@abtnode/certificate-manager": "1.16.10-beta-75a4b94c",
24
- "@abtnode/constant": "1.16.10-beta-75a4b94c",
25
- "@abtnode/cron": "1.16.10-beta-75a4b94c",
26
- "@abtnode/logger": "1.16.10-beta-75a4b94c",
27
- "@abtnode/models": "1.16.10-beta-75a4b94c",
28
- "@abtnode/queue": "1.16.10-beta-75a4b94c",
29
- "@abtnode/rbac": "1.16.10-beta-75a4b94c",
30
- "@abtnode/router-provider": "1.16.10-beta-75a4b94c",
31
- "@abtnode/static-server": "1.16.10-beta-75a4b94c",
32
- "@abtnode/timemachine": "1.16.10-beta-75a4b94c",
33
- "@abtnode/util": "1.16.10-beta-75a4b94c",
22
+ "@abtnode/auth": "1.16.10-beta-cceee857",
23
+ "@abtnode/certificate-manager": "1.16.10-beta-cceee857",
24
+ "@abtnode/constant": "1.16.10-beta-cceee857",
25
+ "@abtnode/cron": "1.16.10-beta-cceee857",
26
+ "@abtnode/logger": "1.16.10-beta-cceee857",
27
+ "@abtnode/models": "1.16.10-beta-cceee857",
28
+ "@abtnode/queue": "1.16.10-beta-cceee857",
29
+ "@abtnode/rbac": "1.16.10-beta-cceee857",
30
+ "@abtnode/router-provider": "1.16.10-beta-cceee857",
31
+ "@abtnode/static-server": "1.16.10-beta-cceee857",
32
+ "@abtnode/timemachine": "1.16.10-beta-cceee857",
33
+ "@abtnode/util": "1.16.10-beta-cceee857",
34
34
  "@arcblock/did": "1.18.80",
35
35
  "@arcblock/did-auth": "1.18.80",
36
36
  "@arcblock/did-ext": "^1.18.80",
@@ -41,10 +41,10 @@
41
41
  "@arcblock/pm2-events": "^0.0.5",
42
42
  "@arcblock/validator": "^1.18.80",
43
43
  "@arcblock/vc": "1.18.80",
44
- "@blocklet/constant": "1.16.10-beta-75a4b94c",
45
- "@blocklet/meta": "1.16.10-beta-75a4b94c",
46
- "@blocklet/sdk": "1.16.10-beta-75a4b94c",
47
- "@did-space/client": "^0.2.91",
44
+ "@blocklet/constant": "1.16.10-beta-cceee857",
45
+ "@blocklet/meta": "1.16.10-beta-cceee857",
46
+ "@blocklet/sdk": "1.16.10-beta-cceee857",
47
+ "@did-space/client": "^0.2.99",
48
48
  "@fidm/x509": "^1.2.1",
49
49
  "@ocap/mcrypto": "1.18.80",
50
50
  "@ocap/util": "1.18.80",
@@ -96,5 +96,5 @@
96
96
  "express": "^4.18.2",
97
97
  "jest": "^27.5.1"
98
98
  },
99
- "gitHead": "99012d13c2bc6df85709a9a5cb854c8c30a14013"
99
+ "gitHead": "821e24df918ee50a05c64e0da6757926d42a948d"
100
100
  }