@steedos/service-object-graphql 2.5.5 → 2.6.1-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-object-graphql",
-    "version": "2.5.5",
+    "version": "2.6.1-beta.2",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,12 +15,12 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "f1e15b667da1e140e3003bf836d56cd6e36c79e3",
+    "gitHead": "9051772a001ba99aeaf026680ef171d508e92b8f",
     "dependencies": {
-        "@steedos/filters": "2.5.5",
-        "@steedos/i18n": "2.5.5",
-        "@steedos/objectql": "2.5.5",
-        "@steedos/service-object-mixin": "2.5.5",
+        "@steedos/filters": "2.6.1-beta.2",
+        "@steedos/i18n": "2.6.1-beta.2",
+        "@steedos/objectql": "2.6.1-beta.2",
+        "@steedos/service-object-mixin": "2.6.1-beta.2",
         "graphql": "^15.8.0",
         "graphql-parse-resolve-info": "^4.12.3",
         "moleculer": "^0.14.25",

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2023-03-23 15:12:14
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-06-21 17:52:05
+ * @LastEditTime: 2023-06-27 10:06:21
  * @Description: 
  */
 
@@ -14,7 +14,6 @@ const {
     getGraphqlActions,
     getQueryFields
 } = require('./lib');
-const open = require('open');
 
 const { formatFiltersToODataQuery } = require("@steedos/filters");
 
@@ -22,6 +21,8 @@ const serviceObjectMixin = require('@steedos/service-object-mixin');
 
 const { QUERY_DOCS_TOP } = require('./lib/consts');
 
+const { Register } = require('@steedos/metadata-registrar')
+
 const _ = require('lodash');
 
 /**
@@ -35,8 +36,6 @@ module.exports = {
     globalGraphQLSettings: {}, // service-api 里generateGraphQLSchema使用 
     getGraphqlFields: getQueryFields,
 
-    projectStarted: false,
-
     /**
      * Settings
      */
@@ -231,70 +230,61 @@ module.exports = {
      * Events
      */
     events: {
+        "graphql.schema.changed": {
+            params: {},
+            async handler(ctx) {
+                await this.ChangeGlobalGraphQLSettings()
+            }
+        },
         // 此事件表示软件包发生变化（包括加载、卸载、对象发生变化），接收到此事件后重新生成graphql schema
         "$packages.changed": {
             params: {},
             async handler(ctx) {
-                // console.log("Payload:", ctx.params);
-                // console.log("Sender:", ctx.nodeID);
-                // console.log("Metadata:", ctx.meta);
-                // console.log("The called event name:", ctx.eventName);
-
-                const objGraphqlMap = await this.generateObjGraphqlMap(this.name)
-
-                let type = []
-                let query = []
-                let mutation = []
-                let resolvers = {}
-                let resolversQuery = {}
-                let resolversMutation = {}
-
-                for (const objectName in objGraphqlMap) {
-                    if (Object.hasOwnProperty.call(objGraphqlMap, objectName)) {
-                        const gMap = objGraphqlMap[objectName];
-                        type.push(gMap.type)
-                        query = query.concat(gMap.query)
-                        mutation = mutation.concat(gMap.mutation)
-                        resolvers = Object.assign(resolvers, gMap.resolvers)
-                        resolversQuery = Object.assign(resolversQuery, gMap.resolversQuery)
-                        resolversMutation = Object.assign(resolversMutation, gMap.resolversMutation)
-                    }
+                if(broker.nodeID != 'steedos-primary'){
+                    return ;
                 }
-
-                this.globalGraphQLSettings = {
-                    type: type,
-                    query: query,
-                    mutation: mutation,
-                    resolvers: {
-                        ...resolvers,
-                        Query: resolversQuery,
-                        Mutation: resolversMutation
-                    }
+                if(this.setTimeoutId){
+                    clearTimeout(this.setTimeoutId);
+                    this.setTimeoutId = null;
                 }
-
-                // console.log('graphql:', new Date())
-                // console.log(JSON.stringify(query, null, 2))
-
-                // 发送事件，通知ApolloService重新加载graphql schema
-                ctx.emit('$services.changed');
-
-                if (!this.projectStarted) {
-                    this.projectStarted = true
-                    // 开发环境, 显示耗时
-                    if(process.env.NODE_ENV == 'development' && global.__startDate){
-                        console.log('耗时: ' + (new Date().getTime() - global.__startDate.getTime()) + ' ms');
+                this.setTimeoutId = setTimeout(async ()=>{
+                    // console.log("Payload:", ctx.params);
+                    // console.log("Sender:", ctx.nodeID);
+                    // console.log("Metadata:", ctx.meta);
+                    // console.log("The called event name:", ctx.eventName);
+                    const objGraphqlMap = await this.generateObjGraphqlMap(this.name)
+                    let type = []
+                    let query = []
+                    let mutation = []
+                    let resolvers = {}
+                    let resolversQuery = {}
+                    let resolversMutation = {}
+                    
+                    for (const objectName in objGraphqlMap) {
+                        if (Object.hasOwnProperty.call(objGraphqlMap, objectName)) {
+                            const gMap = objGraphqlMap[objectName];
+                            type.push(gMap.type)
+                            query = query.concat(gMap.query)
+                            mutation = mutation.concat(gMap.mutation)
+                            resolvers = Object.assign(resolvers, gMap.resolvers)
+                            resolversQuery = Object.assign(resolversQuery, gMap.resolversQuery)
+                            resolversMutation = Object.assign(resolversMutation, gMap.resolversMutation)
+                        }
                     }
-                    console.log(`Project is running at ${process.env.ROOT_URL}`);
-                    console.log('');
-                    if (process.env.STEEDOS_AUTO_OPEN_BROWSER != 'false') { // 默认打开，如果不想打开，设置STEEDOS_AUTO_OPEN_BROWSER=false
-                        try {
-                            open(process.env.ROOT_URL);
-                        } catch (error) {
-                            console.error(error);
-                            console.error('auto open browser failed.');
+                    const globalGraphQLSettings = {
+                        type: type,
+                        query: query,
+                        mutation: mutation,
+                        resolvers: {
+                            ...resolvers,
+                            Query: resolversQuery,
+                            Mutation: resolversMutation
                         }
                     }
-                }
+                    await Register.add(ctx.broker, {key: 'globalGraphQLSettings', data: globalGraphQLSettings}, {})
+                    ctx.broker.broadcast("graphql.schema.changed")
+
+                }, 100)
             }
         }
     },
@@ -303,7 +293,14 @@ module.exports = {
      * Methods
      */
     methods: {
-
+        async ChangeGlobalGraphQLSettings() {
+            const result = await Register.get(this.broker, 'globalGraphQLSettings');
+            if(result){
+                this.globalGraphQLSettings = result.metadata;
+                // 发送事件，通知ApolloService重新加载graphql schema; api 服务和graphql服务在同一个节点上.
+                this.broker.broadcastLocal('$services.changed');
+            }
+        },
         find: {
             async handler(objectName, query, userSession) {
                 const obj = this.getObject(objectName)
@@ -488,43 +485,7 @@ module.exports = {
      * Service started lifecycle event handler
      */
     async started() {
-        // const that = this;
-        // setTimeout(async function () {
-        //     const objGraphqlMap = await that.generateObjGraphqlMap(that.name)
-
-        //     let globalTypeDefs = []
-        //     let query = []
-        //     let mutation = []
-        //     let resolvers = {}
-        //     let resolversQuery = {}
-        //     let resolversMutation = {}
-
-        //     for (const objectName in objGraphqlMap) {
-        //         if (Object.hasOwnProperty.call(objGraphqlMap, objectName)) {
-        //             const gMap = objGraphqlMap[objectName];
-        //             globalTypeDefs.push(gMap.type)
-        //             query = query.concat(gMap.query)
-        //             mutation = mutation.concat(gMap.mutation)
-        //             resolvers = Object.assign(resolvers, gMap.resolvers)
-        //             resolversQuery = Object.assign(resolversQuery, gMap.resolversQuery)
-        //             resolversMutation = Object.assign(resolversMutation, gMap.resolversMutation)
-        //         }
-        //     }
-
-        //     that.globalTypeDefs = globalTypeDefs
-
-        //     that.settings.graphql = {
-        //         query: query,
-        //         mutation: mutation,
-        //         resolvers: {
-        //             ...resolvers,
-        //             Query: resolversQuery,
-        //             Mutation: resolversMutation
-        //         }
-        //     }
-
-        //     console.log('graphql:', new Date())
-        // }, 20000)
+        await this.ChangeGlobalGraphQLSettings()
     },
 
     /**