@steedos/service-cachers-manager 2.7.0-beta.26 → 2.7.0-beta.28

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 (14) hide show
  1. package/lib/metadata-cachers/base.d.ts +2 -1
  2. package/lib/metadata-cachers/base.js +4 -2
  3. package/lib/metadata-cachers/base.js.map +1 -1
  4. package/lib/metadata-cachers/index.d.ts +1 -0
  5. package/lib/metadata-cachers/index.js +3 -1
  6. package/lib/metadata-cachers/index.js.map +1 -1
  7. package/lib/metadata-cachers/settings.d.ts +4 -0
  8. package/lib/metadata-cachers/settings.js +14 -0
  9. package/lib/metadata-cachers/settings.js.map +1 -0
  10. package/metadata-cachers.service.js +5 -2
  11. package/package.json +5 -5
  12. package/src/metadata-cachers/base.ts +5 -4
  13. package/src/metadata-cachers/index.ts +3 -2
  14. package/src/metadata-cachers/settings.ts +7 -0
package/lib/metadata-cachers/base.d.ts CHANGED
@@ -5,7 +5,8 @@ export declare class MetadataCacherBase {
5
5
  collectionName: any;
6
6
  observeHandle: any;
7
7
  cacherName: any;
8
- constructor(collectionName: any, supportSpace: any);
8
+ observeQuery: any;
9
+ constructor(collectionName: any, supportSpace: any, observeQuery?: {});
9
10
  onAdded(doc: any): void;
10
11
  onChanged(newDoc: any, oldDoc: any): void;
11
12
  onRemoved(doc: any): void;
package/lib/metadata-cachers/base.js CHANGED
@@ -4,15 +4,17 @@ exports.MetadataCacherBase = void 0;
4
4
  var cachers = require('@steedos/cachers');
5
5
  var metadataDriver = require('@steedos/utils').metadataDriver;
6
6
  var MetadataCacherBase = (function () {
7
- function MetadataCacherBase(collectionName, supportSpace) {
7
+ function MetadataCacherBase(collectionName, supportSpace, observeQuery) {
8
+ if (observeQuery === void 0) { observeQuery = {}; }
8
9
  var _this = this;
9
10
  this.supportSpace = true;
10
11
  this.collectionName = collectionName;
11
12
  this.supportSpace = supportSpace;
12
13
  this.cacherName = "metadata.".concat(collectionName);
13
14
  this.cacher = cachers.getCacher(this.cacherName);
15
+ this.observeQuery = observeQuery;
14
16
  try {
15
- this.observeHandle = Creator.getCollection(collectionName).find({}).observe({
17
+ this.observeHandle = Creator.getCollection(collectionName).find(observeQuery).observe({
16
18
  added: function (doc) {
17
19
  _this.onAdded(doc);
18
20
  },
package/lib/metadata-cachers/base.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/metadata-cachers/base.ts"],"names":[],"mappings":";;;AAOA,IAAM,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AACpC,IAAA,cAAc,GAAK,OAAO,CAAC,gBAAgB,CAAC,eAA9B,CAA8B;AAIpD;IAQI,4BAAY,cAAc,EAAE,YAAY;QAAxC,iBAqBC;QA5BD,iBAAY,GAAG,IAAI,CAAC;QAQhB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,mBAAY,cAAc,CAAE,CAAA;QAC9C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,IAAI;YACA,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC;gBACxE,KAAK,EAAE,UAAC,GAAG;oBACP,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBACrB,CAAC;gBACD,OAAO,EAAE,UAAC,GAAG,EAAE,MAAM;oBACjB,KAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;gBAC/B,CAAC;gBACD,OAAO,EAAE,UAAC,GAAG;oBACT,KAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBACvB,CAAC;aACJ,CAAC,CAAC;SACN;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,UAAG,cAAc,yBAAsB,EAAE,KAAK,CAAC,CAAC;SACjE;IACL,CAAC;IAED,oCAAO,GAAP,UAAQ,GAAG;QACP,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,sCAAS,GAAT,UAAU,MAAM,EAAE,MAAM;QACpB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,sCAAS,GAAT,UAAU,GAAG;QACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,gCAAG,GAAH,UAAI,GAAG,EAAE,KAAK;QACV,IAAG,CAAC,GAAG,EAAC;YACJ,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAA;SACjC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,mCAAM,GAAN,UAAO,GAAG;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,gCAAG,GAAH,UAAI,GAAG;QACH,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,iCAAI,GAAJ,UAAK,OAAO,EAAE,OAAQ;QAClB,IAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;YAC5C,OAAO,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,EAAC,OAAO,SAAA,EAAC,EAAE,OAAO,CAAC,CAAC;SAC3D;QACD,OAAO,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,EAAC,OAAO,SAAA,EAAC,CAAC,CAAC;IACnD,CAAC;IAGD,oCAAO,GAAP;QACI,IAAI,IAAI,CAAC,aAAa,EAAE;YACpB,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC5C;IACL,CAAC;IACL,yBAAC;AAAD,CAAC,AA1ED,IA0EC;AA1EY,gDAAkB"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/metadata-cachers/base.ts"],"names":[],"mappings":"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"}
package/lib/metadata-cachers/index.d.ts CHANGED
@@ -3,3 +3,4 @@ export { WorkflowNotificationCacher } from './workflow_notifications';
3
3
  export { WorkflowOutboundMessageCacher } from './workflow_outbound_messages';
4
4
  export { WorkflowRuleCacher } from './workflow_rule';
5
5
  export { ObjectValidationRulesCacher } from './object_validation_rules';
6
+ export { SettingsCacher } from './settings';
package/lib/metadata-cachers/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ObjectValidationRulesCacher = exports.WorkflowRuleCacher = exports.WorkflowOutboundMessageCacher = exports.WorkflowNotificationCacher = exports.ActionFieldUpdateCacher = void 0;
3
+ exports.SettingsCacher = exports.ObjectValidationRulesCacher = exports.WorkflowRuleCacher = exports.WorkflowOutboundMessageCacher = exports.WorkflowNotificationCacher = exports.ActionFieldUpdateCacher = void 0;
4
4
  var action_field_updates_1 = require("./action_field_updates");
5
5
  Object.defineProperty(exports, "ActionFieldUpdateCacher", { enumerable: true, get: function () { return action_field_updates_1.ActionFieldUpdateCacher; } });
6
6
  var workflow_notifications_1 = require("./workflow_notifications");
@@ -11,4 +11,6 @@ var workflow_rule_1 = require("./workflow_rule");
11
11
  Object.defineProperty(exports, "WorkflowRuleCacher", { enumerable: true, get: function () { return workflow_rule_1.WorkflowRuleCacher; } });
12
12
  var object_validation_rules_1 = require("./object_validation_rules");
13
13
  Object.defineProperty(exports, "ObjectValidationRulesCacher", { enumerable: true, get: function () { return object_validation_rules_1.ObjectValidationRulesCacher; } });
14
+ var settings_1 = require("./settings");
15
+ Object.defineProperty(exports, "SettingsCacher", { enumerable: true, get: function () { return settings_1.SettingsCacher; } });
14
16
  //# sourceMappingURL=index.js.map
package/lib/metadata-cachers/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/metadata-cachers/index.ts"],"names":[],"mappings":";;;AAOA,+DAAgE;AAAvD,+HAAA,uBAAuB,OAAA;AAChC,mEAAsE;AAA7D,oIAAA,0BAA0B,OAAA;AACnC,2EAA4E;AAAnE,2IAAA,6BAA6B,OAAA;AACtC,iDAAqD;AAA5C,mHAAA,kBAAkB,OAAA;AAC3B,qEAAuE;AAA9D,sIAAA,2BAA2B,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/metadata-cachers/index.ts"],"names":[],"mappings":";;;AAOA,+DAAgE;AAAvD,+HAAA,uBAAuB,OAAA;AAChC,mEAAsE;AAA7D,oIAAA,0BAA0B,OAAA;AACnC,2EAA4E;AAAnE,2IAAA,6BAA6B,OAAA;AACtC,iDAAqD;AAA5C,mHAAA,kBAAkB,OAAA;AAC3B,qEAAuE;AAA9D,sIAAA,2BAA2B,OAAA;AACpC,uCAA2C;AAAlC,0GAAA,cAAc,OAAA"}
package/lib/metadata-cachers/settings.d.ts ADDED
@@ -0,0 +1,4 @@
1
+ import { MetadataCacherBase } from './base';
2
+ export declare class SettingsCacher extends MetadataCacherBase {
3
+ constructor();
4
+ }
package/lib/metadata-cachers/settings.js ADDED
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.SettingsCacher = void 0;
4
+ var tslib_1 = require("tslib");
5
+ var base_1 = require("./base");
6
+ var SettingsCacher = (function (_super) {
7
+ tslib_1.__extends(SettingsCacher, _super);
8
+ function SettingsCacher() {
9
+ return _super.call(this, 'settings', true, { type: 'space', key: { $exists: true } }) || this;
10
+ }
11
+ return SettingsCacher;
12
+ }(base_1.MetadataCacherBase));
13
+ exports.SettingsCacher = SettingsCacher;
14
+ //# sourceMappingURL=settings.js.map
package/lib/metadata-cachers/settings.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/metadata-cachers/settings.ts"],"names":[],"mappings":";;;;AAAA,+BAA2C;AAE3C;IAAoC,0CAAkB;IAClD;eACI,kBAAM,UAAU,EAAE,IAAI,EAAE,EAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,EAAC,CAAC;IAClE,CAAC;IACL,qBAAC;AAAD,CAAC,AAJD,CAAoC,yBAAkB,GAIrD;AAJY,wCAAc"}
package/metadata-cachers.service.js CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: baozhoutao@steedos.com
3
3
  * @Date: 2024-03-22 14:37:50
4
4
  * @LastEditors: baozhoutao@steedos.com
5
- * @LastEditTime: 2024-03-29 14:52:13
5
+ * @LastEditTime: 2024-04-12 15:17:00
6
6
  * @Description: 由于 collection observe 在 steedos-server.started 事件中被触发报错需要 Fiber ,添加Fiber 后, 不报错,但是无法订阅到数据. 所以单写服务处理此问题.
7
7
  *
8
8
  */
@@ -10,7 +10,7 @@
10
10
  "use strict";
11
11
  const _ = require('lodash')
12
12
  const register = require('@steedos/metadata-registrar');
13
- const { ActionFieldUpdateCacher, WorkflowOutboundMessageCacher, WorkflowNotificationCacher, WorkflowRuleCacher, ObjectValidationRulesCacher } = require('./lib/index')
13
+ const { ActionFieldUpdateCacher, WorkflowOutboundMessageCacher, WorkflowNotificationCacher, WorkflowRuleCacher, ObjectValidationRulesCacher, SettingsCacher } = require('./lib/index')
14
14
  /**
15
15
  * @typedef {import('moleculer').Context} Context Moleculer's Context
16
16
  * 软件包服务启动后也需要抛出事件。
@@ -82,6 +82,8 @@ module.exports = {
82
82
 
83
83
  this.objectValidationRulesCacher = new ObjectValidationRulesCacher()
84
84
 
85
+ this.settingsCacher = new SettingsCacher();
86
+
85
87
  await this.loadMetadataWorkflows()
86
88
  },
87
89
 
@@ -91,5 +93,6 @@ module.exports = {
91
93
  this.workflowNotificationsCacher?.destroy();
92
94
  this.workflowRuleCacher?.destroy();
93
95
  this.objectValidationRulesCacher?.destroy();
96
+ this.settingsCacher?.destroy();
94
97
  }
95
98
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-cachers-manager",
3
- "version": "2.7.0-beta.26",
3
+ "version": "2.7.0-beta.28",
4
4
  "main": "package.service.js",
5
5
  "license": "MIT",
6
6
  "private": false,
@@ -8,12 +8,12 @@
8
8
  "build": "rm -rf ./lib && tsc"
9
9
  },
10
10
  "dependencies": {
11
- "@steedos/cachers": "2.7.0-beta.26",
12
- "@steedos/metadata-registrar": "2.7.0-beta.26",
13
- "@steedos/utils": "2.7.0-beta.26"
11
+ "@steedos/cachers": "2.7.0-beta.28",
12
+ "@steedos/metadata-registrar": "2.7.0-beta.28",
13
+ "@steedos/utils": "2.7.0-beta.28"
14
14
  },
15
15
  "publishConfig": {
16
16
  "access": "public"
17
17
  },
18
- "gitHead": "703c8183a1cf1d28a22d48c07a462f1087ac1dec"
18
+ "gitHead": "55756b53104b59b3b678fd58b564dabd8fed1272"
19
19
  }
package/src/metadata-cachers/base.ts CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: baozhoutao@steedos.com
3
3
  * @Date: 2024-03-22 09:49:22
4
4
  * @LastEditors: baozhoutao@steedos.com
5
- * @LastEditTime: 2024-03-29 13:36:20
5
+ * @LastEditTime: 2024-04-15 16:39:05
6
6
  * @Description:
7
7
  */
8
8
  const cachers = require('@steedos/cachers');
@@ -17,15 +17,17 @@ export class MetadataCacherBase {
17
17
  collectionName;
18
18
  observeHandle;
19
19
  cacherName;
20
+ observeQuery;
20
21
 
21
- constructor(collectionName, supportSpace) {
22
+ constructor(collectionName, supportSpace, observeQuery = {}) {
22
23
  this.collectionName = collectionName;
23
24
  this.supportSpace = supportSpace;
24
25
  this.cacherName = `metadata.${collectionName}`
25
26
  this.cacher = cachers.getCacher(this.cacherName);
27
+ this.observeQuery = observeQuery;
26
28
 
27
29
  try {
28
- this.observeHandle = Creator.getCollection(collectionName).find({}).observe({
30
+ this.observeHandle = Creator.getCollection(collectionName).find(observeQuery).observe({
29
31
  added: (doc)=>{
30
32
  this.onAdded(doc)
31
33
  },
@@ -40,7 +42,6 @@ export class MetadataCacherBase {
40
42
  console.error(`${collectionName} observeHandle error`, error);
41
43
  }
42
44
  }
43
-
44
45
  onAdded(doc){
45
46
  this.set(doc._id, doc);
46
47
  }
package/src/metadata-cachers/index.ts CHANGED
@@ -2,11 +2,12 @@
2
2
  * @Author: baozhoutao@steedos.com
3
3
  * @Date: 2024-03-22 11:23:14
4
4
  * @LastEditors: baozhoutao@steedos.com
5
- * @LastEditTime: 2024-03-29 13:34:19
5
+ * @LastEditTime: 2024-04-12 15:15:45
6
6
  * @Description:
7
7
  */
8
8
  export { ActionFieldUpdateCacher } from './action_field_updates'
9
9
  export { WorkflowNotificationCacher } from './workflow_notifications';
10
10
  export { WorkflowOutboundMessageCacher } from './workflow_outbound_messages'
11
11
  export { WorkflowRuleCacher } from './workflow_rule';
12
- export { ObjectValidationRulesCacher } from './object_validation_rules'
12
+ export { ObjectValidationRulesCacher } from './object_validation_rules'
13
+ export { SettingsCacher } from './settings'
package/src/metadata-cachers/settings.ts ADDED
@@ -0,0 +1,7 @@
1
+ import { MetadataCacherBase } from './base'
2
+
3
+ export class SettingsCacher extends MetadataCacherBase{
4
+ constructor(){
5
+ super('settings', true, {type: 'space', key: {$exists: true}});
6
+ }
7
+ }