@steedos/service-cachers-manager 2.7.0 → 2.7.1-beta.10

package/lib/metadata-cachers/index.d.ts

@@ -4,3 +4,4 @@ export { WorkflowOutboundMessageCacher } from './workflow_outbound_messages';
 export { WorkflowRuleCacher } from './workflow_rule';
 export { ObjectValidationRulesCacher } from './object_validation_rules';
 export { SettingsCacher } from './settings';
+export { ObjectWebhookCacher } from './object_webhook';

package/lib/metadata-cachers/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SettingsCacher = exports.ObjectValidationRulesCacher = exports.WorkflowRuleCacher = exports.WorkflowOutboundMessageCacher = exports.WorkflowNotificationCacher = exports.ActionFieldUpdateCacher = void 0;
+exports.ObjectWebhookCacher = exports.SettingsCacher = exports.ObjectValidationRulesCacher = exports.WorkflowRuleCacher = exports.WorkflowOutboundMessageCacher = exports.WorkflowNotificationCacher = exports.ActionFieldUpdateCacher = void 0;
 var action_field_updates_1 = require("./action_field_updates");
 Object.defineProperty(exports, "ActionFieldUpdateCacher", { enumerable: true, get: function () { return action_field_updates_1.ActionFieldUpdateCacher; } });
 var workflow_notifications_1 = require("./workflow_notifications");
@@ -13,4 +13,6 @@ var object_validation_rules_1 = require("./object_validation_rules");
 Object.defineProperty(exports, "ObjectValidationRulesCacher", { enumerable: true, get: function () { return object_validation_rules_1.ObjectValidationRulesCacher; } });
 var settings_1 = require("./settings");
 Object.defineProperty(exports, "SettingsCacher", { enumerable: true, get: function () { return settings_1.SettingsCacher; } });
+var object_webhook_1 = require("./object_webhook");
+Object.defineProperty(exports, "ObjectWebhookCacher", { enumerable: true, get: function () { return object_webhook_1.ObjectWebhookCacher; } });
 //# sourceMappingURL=index.js.map

package/lib/metadata-cachers/index.js.map

@@ -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;AACpC,uCAA2C;AAAlC,0GAAA,cAAc,OAAA"}
+{"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;AACvB,mDAAsD;AAA7C,qHAAA,mBAAmB,OAAA"}

package/lib/metadata-cachers/object_webhook.d.ts

@@ -0,0 +1,4 @@
+import { MetadataCacherBase } from './base';
+export declare class ObjectWebhookCacher extends MetadataCacherBase {
+    constructor();
+}

package/lib/metadata-cachers/object_webhook.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObjectWebhookCacher = void 0;
+var tslib_1 = require("tslib");
+var base_1 = require("./base");
+var ObjectWebhookCacher = (function (_super) {
+    tslib_1.__extends(ObjectWebhookCacher, _super);
+    function ObjectWebhookCacher() {
+        return _super.call(this, 'object_webhooks', true, { active: true }) || this;
+    }
+    return ObjectWebhookCacher;
+}(base_1.MetadataCacherBase));
+exports.ObjectWebhookCacher = ObjectWebhookCacher;
+//# sourceMappingURL=object_webhook.js.map

package/lib/metadata-cachers/object_webhook.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"object_webhook.js","sourceRoot":"","sources":["../../src/metadata-cachers/object_webhook.ts"],"names":[],"mappings":";;;;AAOA,+BAA2C;AAE3C;IAAyC,+CAAkB;IACvD;eACI,kBAAM,iBAAiB,EAAE,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;IAClD,CAAC;IACL,0BAAC;AAAD,CAAC,AAJD,CAAyC,yBAAkB,GAI1D;AAJY,kDAAmB"}

package/lib/metadata-cachers/settings.d.ts

@@ -1,4 +1,7 @@
 import { MetadataCacherBase } from './base';
 export declare class SettingsCacher extends MetadataCacherBase {
     constructor();
+    onAdded(doc: any): void;
+    onChanged(newDoc: any, oldDoc: any): void;
+    onRemoved(doc: any): void;
 }

package/lib/metadata-cachers/settings.js

@@ -3,11 +3,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingsCacher = void 0;
 var tslib_1 = require("tslib");
 var base_1 = require("./base");
+var _ = require('lodash');
+var formatValue = function (doc) {
+    if (_.isString(doc.value)) {
+        try {
+            doc.value = JSON.parse(doc.value);
+        }
+        catch (error) {
+            console.log(error);
+        }
+    }
+    return doc;
+};
 var SettingsCacher = (function (_super) {
     tslib_1.__extends(SettingsCacher, _super);
     function SettingsCacher() {
         return _super.call(this, 'settings', true, { type: 'space', key: { $exists: true } }) || this;
     }
+    SettingsCacher.prototype.onAdded = function (doc) {
+        _super.prototype.onAdded.call(this, doc);
+        broker.broadcast("@settings.updated.".concat(doc.key), formatValue(doc));
+    };
+    SettingsCacher.prototype.onChanged = function (newDoc, oldDoc) {
+        console.log("settings onChanged");
+        _super.prototype.onChanged.call(this, newDoc, oldDoc);
+        console.log("broadcast settings onChanged");
+        broker.broadcast("@settings.updated.".concat(newDoc.key), formatValue(newDoc));
+    };
+    SettingsCacher.prototype.onRemoved = function (doc) {
+        _super.prototype.onRemoved.call(this, doc);
+    };
     return SettingsCacher;
 }(base_1.MetadataCacherBase));
 exports.SettingsCacher = SettingsCacher;

package/lib/metadata-cachers/settings.js.map

@@ -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"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/metadata-cachers/settings.ts"],"names":[],"mappings":";;;;AAOA,+BAA2C;AAE3C,IAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAI5B,IAAM,WAAW,GAAG,UAAC,GAAG;IACpB,IAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAC;QACrB,IAAI;YACA,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;SACrB;KACJ;IACD,OAAO,GAAG,CAAC;AACf,CAAC,CAAA;AAED;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;IAED,gCAAO,GAAP,UAAQ,GAAQ;QACZ,iBAAM,OAAO,YAAC,GAAG,CAAC,CAAC;QACnB,MAAM,CAAC,SAAS,CAAC,4BAAqB,GAAG,CAAC,GAAG,CAAE,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,CAAC;IAED,kCAAS,GAAT,UAAU,MAAW,EAAE,MAAW;QAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;QACjC,iBAAM,SAAS,YAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC/B,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;QAC3C,MAAM,CAAC,SAAS,CAAC,4BAAqB,MAAM,CAAC,GAAG,CAAE,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,kCAAS,GAAT,UAAU,GAAQ;QACd,iBAAM,SAAS,YAAC,GAAG,CAAC,CAAA;IACxB,CAAC;IACL,qBAAC;AAAD,CAAC,AApBD,CAAoC,yBAAkB,GAoBrD;AApBY,wCAAc"}

package/metadata-cachers.service.js

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2024-03-22 14:37:50
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-04-12 15:17:00
+ * @LastEditTime: 2024-04-24 15:07:09
  * @Description: 由于 collection observe 在 steedos-server.started 事件中被触发报错需要 Fiber ,添加Fiber 后, 不报错,但是无法订阅到数据. 所以单写服务处理此问题.
  * 
  */
@@ -10,7 +10,7 @@
 "use strict";
 const _ = require('lodash')
 const register = require('@steedos/metadata-registrar');
-const { ActionFieldUpdateCacher, WorkflowOutboundMessageCacher, WorkflowNotificationCacher, WorkflowRuleCacher, ObjectValidationRulesCacher, SettingsCacher } = require('./lib/index')
+const { ActionFieldUpdateCacher, WorkflowOutboundMessageCacher, WorkflowNotificationCacher, WorkflowRuleCacher, ObjectValidationRulesCacher, SettingsCacher, ObjectWebhookCacher } = require('./lib/index')
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  * 软件包服务启动后也需要抛出事件。
@@ -84,6 +84,8 @@ module.exports = {
 
 		this.settingsCacher = new SettingsCacher();
 
+		this.objectWebhooksCacher = new ObjectWebhookCacher();
+
 		await this.loadMetadataWorkflows()
 	},
 
@@ -94,5 +96,6 @@ module.exports = {
 		this.workflowRuleCacher?.destroy();
 		this.objectValidationRulesCacher?.destroy();
 		this.settingsCacher?.destroy();
+		this.objectWebhooksCacher?.destroy()
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-cachers-manager",
-  "version": "2.7.0",
+  "version": "2.7.1-beta.10",
   "main": "package.service.js",
   "license": "MIT",
   "private": false,
@@ -8,12 +8,12 @@
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/cachers": "2.7.0",
-    "@steedos/metadata-registrar": "2.7.0",
-    "@steedos/utils": "2.7.0"
+    "@steedos/cachers": "2.7.1-beta.10",
+    "@steedos/metadata-registrar": "2.7.1-beta.10",
+    "@steedos/utils": "2.7.1-beta.10"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2f1586ea4f8af5b93753878e96f1f48adbef31a7"
+  "gitHead": "ebcec3b98499655769a965cf548456f280f0df18"
 }

package/src/metadata-cachers/base.ts

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2024-03-22 09:49:22
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-04-15 16:39:05
+ * @LastEditTime: 2024-04-24 15:55:16
  * @Description: 
  */
 const cachers = require('@steedos/cachers');

package/src/metadata-cachers/index.ts

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2024-03-22 11:23:14
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-04-12 15:15:45
+ * @LastEditTime: 2024-04-24 09:30:07
  * @Description: 
  */
 export { ActionFieldUpdateCacher } from './action_field_updates'
@@ -10,4 +10,5 @@ export { WorkflowNotificationCacher } from './workflow_notifications';
 export { WorkflowOutboundMessageCacher } from './workflow_outbound_messages'
 export { WorkflowRuleCacher } from './workflow_rule';
 export { ObjectValidationRulesCacher } from './object_validation_rules'
-export { SettingsCacher } from './settings'
+export { SettingsCacher } from './settings'
+export { ObjectWebhookCacher } from './object_webhook'

package/src/metadata-cachers/object_webhook.ts

@@ -0,0 +1,14 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2024-04-24 09:29:28
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-04-24 14:53:42
+ * @Description: 
+ */
+import { MetadataCacherBase } from './base'
+
+export class ObjectWebhookCacher extends MetadataCacherBase{
+    constructor(){
+        super('object_webhooks', true, {active: true});
+    }
+}

package/src/metadata-cachers/settings.ts

@@ -1,7 +1,45 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2024-04-16 09:12:58
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-04-23 11:34:54
+ * @Description: 
+ */
 import { MetadataCacherBase } from './base'
 
+const _ = require('lodash');
+
+declare var broker;
+
+const formatValue = (doc)=>{
+    if(_.isString(doc.value)){
+        try {
+            doc.value = JSON.parse(doc.value);
+        } catch (error) {
+            console.log(error)
+        }
+    }
+    return doc;
+}
+
 export class SettingsCacher extends MetadataCacherBase{
     constructor(){
         super('settings', true, {type: 'space', key: {$exists: true}});
     }
+
+    onAdded(doc: any): void {
+        super.onAdded(doc);
+        broker.broadcast(`@settings.updated.${doc.key}`, formatValue(doc))
+    }
+
+    onChanged(newDoc: any, oldDoc: any): void {
+        console.log(`settings onChanged`)
+        super.onChanged(newDoc, oldDoc)
+        console.log(`broadcast settings onChanged`)
+        broker.broadcast(`@settings.updated.${newDoc.key}`, formatValue(newDoc))
+    }
+
+    onRemoved(doc: any): void {
+        super.onRemoved(doc)
+    }
 }