@steedos/service-metadata-objects 2.1.78 → 2.1.85

package/src/actionsHandler.ts

@@ -1,6 +1,6 @@
 import _ = require("lodash");
 import { METADATA_TYPE } from ".";
-import { getObjectServiceName, getOriginalObject, refreshObject } from "./objects";
+import { getObjectServiceName, getOriginalObject, refreshObject, MONGO_BASE_OBJECT, SQL_BASE_OBJECT } from "./objects";
 export type SObject = {
     name: string,
     [x: string]: any
@@ -26,7 +26,7 @@ export class ActionHandlers {
     onRegister: any = null;
     onDestroy: any = null;
     onRegistered: any = null;
-	registerObjectMemEntry: Map<string, number>;
+	registerObjectMemEntry: Map<string, any>;
 
     constructor(onRegister, onDestroy, onRegistered){
         this.onRegister = onRegister;
@@ -36,11 +36,13 @@ export class ActionHandlers {
     }
 
 	async registerObject(ctx, objectApiName, data, meta) {
-        if(this.onRegister && _.isFunction(this.onRegister)){
+        if (objectApiName != MONGO_BASE_OBJECT &&
+            objectApiName != SQL_BASE_OBJECT && this.onRegister && _.isFunction(this.onRegister)) {
             await this.onRegister(data)
         }
         await ctx.broker.call('metadata.add', {key: cacherKey(objectApiName), data: data}, {meta: meta});
-        if(this.onRegistered && _.isFunction(this.onRegistered)){
+        if (objectApiName != MONGO_BASE_OBJECT &&
+            objectApiName != SQL_BASE_OBJECT && this.onRegistered && _.isFunction(this.onRegistered)) {
             await this.onRegistered(data)
         }
 		// 为每个对象 setTimeout 延时执行
@@ -51,7 +53,7 @@ export class ActionHandlers {
 		}
 		timeoutId = setTimeout(function(){
 			ctx.broker.emit("metadata.objects.inserted", {objectApiName: objectApiName, isInsert: true});
-			ctx.broker.emit(`@${objectApiName}.metadata.objects.inserted`, {objectApiName: objectApiName, isInsert: true, data: data});
+            ctx.broker.broadcast(`${data.datasource}.@${objectApiName}.metadata.objects.inserted`, { objectApiName: objectApiName, isInsert: true, data: data });
 			registerObjectMemEntry.delete(objectApiName);
 		}, DELAY_MESSAGE_OF_OBJECT_CHANGED);
 		registerObjectMemEntry.set(objectApiName, timeoutId);
@@ -95,19 +97,24 @@ export class ActionHandlers {
                 metadataType: METADATA_TYPE,
                 metadataApiName: metadataApiName,
             }, {meta: ctx.meta});
-    
-            if(metadataConfig && metadataConfig.metadata){
+
+            if (metadataConfig && metadataConfig.metadata) {
                 config.list_views = _.defaultsDeep(metadataConfig.metadata.list_views || {}, config.list_views || {});
                 config = _.defaultsDeep(config, metadataConfig.metadata);
             }
         }
-        await ctx.broker.call('metadata.addServiceMetadata', {key: cacherKey(metadataApiName), data: config}, {meta: Object.assign({}, ctx.meta, {metadataType: METADATA_TYPE, metadataApiName: metadataApiName})})
+
+        await ctx.broker.call('metadata.addServiceMetadata', { key: cacherKey(metadataApiName), data: config }, { meta: Object.assign({}, ctx.meta, { metadataType: METADATA_TYPE, metadataApiName: metadataApiName }) })
+
         const objectConfig = await refreshObject(ctx, metadataApiName);
-        if(!objectConfig){
-            return ;
+
+        if (!objectConfig) {
+            return;
         }
+
         const objectServiceName = getObjectServiceName(metadataApiName);
-        return await this.registerObject(ctx, metadataApiName, objectConfig, {
+
+        const result = await this.registerObject(ctx, metadataApiName, objectConfig, {
             caller: {
                 // nodeID: broker.nodeID,
                 service: {
@@ -117,6 +124,44 @@ export class ActionHandlers {
                 }
             }
         });
+        return result;
+    }
+
+    async addConfigs(ctx: any): Promise<boolean> {
+        let configs = ctx.params.data;
+        for (let config of configs) {
+            if (config.extend) {
+                config.name = config.extend
+            }
+            const metadataApiName = config.name;
+            if (!config.isMain) {
+                const metadataConfig = await ctx.broker.call('metadata.getServiceMetadata', {
+                    serviceName: ctx.meta.metadataServiceName,
+                    metadataType: METADATA_TYPE,
+                    metadataApiName: metadataApiName,
+                }, { meta: ctx.meta });
+                if (metadataConfig && metadataConfig.metadata) {
+                    config.list_views = _.defaultsDeep(metadataConfig.metadata.list_views || {}, config.list_views || {});
+                    config = _.defaultsDeep(config, metadataConfig.metadata);
+                }
+            }
+            await ctx.broker.call('metadata.addServiceMetadata', { key: cacherKey(metadataApiName), data: config }, { meta: Object.assign({}, ctx.meta, { metadataType: METADATA_TYPE, metadataApiName: metadataApiName }) })
+            const objectConfig = await refreshObject(ctx, metadataApiName);
+            if (!objectConfig) {
+                return;
+            }
+            const objectServiceName = getObjectServiceName(metadataApiName);
+            await this.registerObject(ctx, metadataApiName, objectConfig, {
+                caller: {
+                    // nodeID: broker.nodeID,
+                    service: {
+                        name: objectServiceName,
+                        // version: broker.service.version, TODO
+                        // fullName: broker.service.fullName, TODO
+                    }
+                }
+            });
+        }
     }
 
     async change(ctx: any): Promise<boolean> {

package/src/objects/index.ts

@@ -11,6 +11,19 @@ export function getObjectServiceName(objectApiName: string) {
     return `@${objectApiName}`;
 }
 
+function isExpried(expiredAt: number) {
+    return expiredAt <= new Date().getTime();
+}
+
+const BASE_OBJECT_CACHE = {
+    [MONGO_BASE_OBJECT]: {
+        data: null,
+    },
+    [SQL_BASE_OBJECT]: {
+        data: null,
+    }
+};
+
 async function getBaseObjectConfig(ctx, datasourceName) {
     const serviceName = "*";
     const metadataType = METADATA_TYPE;
@@ -18,12 +31,25 @@ async function getBaseObjectConfig(ctx, datasourceName) {
     if (datasourceName === "default" || datasourceName === "meteor") {
         metadataApiName = MONGO_BASE_OBJECT;
     }
+
+    const cacheData = BASE_OBJECT_CACHE[metadataApiName];
+    if (cacheData && cacheData.data && isExpried(cacheData.expiredAt)) {
+        return cacheData.data;
+    }
+
     const configs = await ctx.broker.call(`metadata.getServiceMetadatas`, {
         serviceName,
         metadataType,
         metadataApiName: metadataApiName,
     }, {meta: ctx.meta});
-    return configs && configs.length > 0 ? configs[0]?.metadata : null;
+
+    const config = configs && configs.length > 0 ? configs[0]?.metadata : null;
+    BASE_OBJECT_CACHE[metadataApiName] = {
+        data: config,
+        expiredAt: new Date().getTime() + 10 * 1000
+    }
+
+    return config;
 }
 
 async function getObjectConfigs(ctx, objectApiName) {

package/src/objects.service.ts

@@ -5,6 +5,8 @@ import { FormulaActionHandler } from './formula/formulaActionHandler';
 import { SummaryActionHandler } from './summary/summaryActionHandler';
 import { LookupActionHandler } from './lookup/LookupActionHandler';
 import { METADATA_TYPE } from '.';
+import * as _ from 'lodash';
+
 module.exports = {
     name: "objects",
     /**
@@ -70,6 +72,11 @@ module.exports = {
                 return await this.objetActionHandlers.addConfig(ctx);
             }
         },
+        addConfigs: {
+            async handler(ctx) {
+                return await this.objetActionHandlers.addConfigs(ctx);
+            }
+        }, 
         change: {
             async handler(ctx) {
                 return await this.objetActionHandlers.change(ctx);
@@ -175,11 +182,11 @@ module.exports = {
                 const mastersInfo = this.masterDetailActionHandler.getMastersInfoKey(objectApiName);
                 const lookupDetailsInfo = this.lookupActionHandler.getDetailsInfoKey(objectApiName);
 
-                const results = await ctx.broker.call('metadata.mget', { keys: [detailsInfoKey, mastersInfo, lookupDetailsInfo] });
+                const results = await ctx.broker.call('metadata.mfilter', { keys: [detailsInfoKey, mastersInfo, lookupDetailsInfo] });
                 return {
-                    details: results[0],
-                    masters: results[1],
-                    lookup_details: results[2],
+                    details: _.compact(_.map(results[0], 'metadata')),
+                    masters: _.compact(_.map(results[1], 'metadata')),
+                    lookup_details: _.compact(_.map(results[2], 'metadata')),
                 }
             }
         },