@steedos/service-api 2.6.1-beta.6 → 2.6.2-beta.10

package/index.js

@@ -13,11 +13,12 @@ const {
 const SteedosRouter = require('@steedos/router');
 const _ = require('lodash');
 const ServiceObjectGraphql = require('@steedos/service-object-graphql')
-const open = require('open');
 const DataLoader = require("dataloader");
 const { LRUMap } = require('lru_map');
 const validator = require('validator');
 const enablePlayground = validator.toBoolean(process.env.STEEDOS_GRAPHQL_ENABLE_CONSOLE || 'true', true);
+const openBrowser = require('react-dev-utils/openBrowser');
+const requestIp = require('request-ip');
 const mixinOptions = {
 
 	// Global GraphQL typeDefs
@@ -86,7 +87,7 @@ const mixinOptions = {
 		introspection: enablePlayground
 	}
 }
-
+const ObjectDataLoaderMapKeys = {};
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  * @typedef {import('http').IncomingMessage} IncomingRequest Incoming HTTP Request
@@ -94,13 +95,14 @@ const mixinOptions = {
  */
 module.exports = {
 	name: "api",
-    projectStarted: false,
 	mixins: [ApiGateway,
 		// GraphQL Apollo Server
 		ApolloService(mixinOptions),
 		ServiceObjectGraphql
 	],
 
+    projectStarted: false,
+
 	// More info about settings: https://moleculer.services/docs/0.14/moleculer-web.html
 	settings: {
 		server: false,
@@ -169,10 +171,13 @@ module.exports = {
 				 * @param {ServerResponse} res 
 				 * @param {Object} data
 				 * 
+				 * 
+				*/
 				onBeforeCall(ctx, route, req, res) {
 					// Set request headers to context meta
 					ctx.meta.userAgent = req.headers["user-agent"];
-				}, */
+					ctx.meta.clientIp = requestIp.getClientIp(req);
+				}, 
 
 				/**
 				 * After call hook. You can modify the data.
@@ -323,9 +328,14 @@ module.exports = {
 		 * @param {Object.<string, any>} args - Arguments passed to GraphQL child resolver
 		 * @returns {string} Key to the dataloader instance
 		 */
-		getObjectDataLoaderMapKey(objectName) {
+		getObjectDataLoaderMapKey(objectName, referenceToField = '_id', spaceId) {
 			if (objectName) {
-				return `object:${objectName}`;
+				const key = `${spaceId}_object:${objectName}.${referenceToField}`;
+				if(!ObjectDataLoaderMapKeys[objectName]){
+					ObjectDataLoaderMapKeys[objectName] = [] ;
+				}
+				ObjectDataLoaderMapKeys[objectName].push(key);
+				return key;
 			}
 			// 如果没有objectName，则抛出错误信息
 			throw new Error("objectName is required");
@@ -335,8 +345,12 @@ module.exports = {
 		async objectDataLoaderHandler(actionName, staticParams, rootParams, graphqlCtx) {
 			const rootKeys = Object.keys(rootParams);
 			const {root, args, context, resolveInfo} = graphqlCtx;
+			const userSession = context.ctx.meta.user;
+			const spaceId = userSession.spaceId;
 			const dataLoaderMapKey = this.getObjectDataLoaderMapKey(
 				staticParams.__objectName || staticParams.objectName
+				, staticParams.referenceToField || '_id'
+				, spaceId
 			);
 			const objectDataLoaders = this.objectDataLoaders;
 			// if a dataLoader batching parameter is specified, then all root params can be data loaded;
@@ -359,7 +373,8 @@ module.exports = {
 					batchedParamKey,
 					staticParams,
 					args,
-					{ hashCacheKey: dataLoaderUseAllRootKeys } // must hash the cache key if not loading scalar
+					{ hashCacheKey: dataLoaderUseAllRootKeys }, // must hash the cache key if not loading scalar
+					spaceId
 				);
 				objectDataLoaders.set(dataLoaderMapKey, dataLoader);
 			}
@@ -454,10 +469,13 @@ module.exports = {
 					if(useObjectDataLoader){
 						return await this.objectDataLoaderHandler(actionName, staticParams, rootParams, {root, args, context, resolveInfo});
 					}else if (useDataLoader) {
+						const userSession = context.ctx.meta.user;
+						const spaceId = userSession.spaceId;
 						const dataLoaderMapKey = this.getDataLoaderMapKey(
 							actionName,
 							staticParams,
-							args
+							args,
+							spaceId
 						);
 						// if a dataLoader batching parameter is specified, then all root params can be data loaded;
 						// otherwise use only the primary rootParam
@@ -479,7 +497,8 @@ module.exports = {
 								batchedParamKey,
 								staticParams,
 								args,
-								{ hashCacheKey: dataLoaderUseAllRootKeys } // must hash the cache key if not loading scalar
+								{ hashCacheKey: dataLoaderUseAllRootKeys }, // must hash the cache key if not loading scalar
+								spaceId
 							);
 							context.dataLoaders.set(dataLoaderMapKey, dataLoader);
 						}
@@ -892,6 +911,25 @@ module.exports = {
 			}
 		},
 
+		/**
+		 * Get the unique key assigned to the DataLoader map
+		 * @param {string} actionName - Fully qualified action name to bind to dataloader
+		 * @param {Object.<string, any>} staticParams - Static parameters to use in dataloader
+		 * @param {Object.<string, any>} args - Arguments passed to GraphQL child resolver
+		 * @returns {string} Key to the dataloader instance
+		 */
+		getDataLoaderMapKey(actionName, staticParams, args, spaceId) {
+			if (Object.keys(staticParams).length > 0 || Object.keys(args).length > 0) {
+				// create a unique hash of the static params and the arguments to ensure a unique DataLoader instance
+				const actionParams = _.defaultsDeep({}, args, staticParams);
+				const paramsHash = hash(actionParams);
+				return `${spaceId}_${actionName}:${paramsHash}`;
+			}
+
+			// if no static params or arguments are present then the action name can serve as the key
+			return actionName;
+		},
+
 		/**
 			 * Build a DataLoader instance
 			 *
@@ -910,11 +948,13 @@ module.exports = {
 			batchedParamKey,
 			staticParams,
 			args,
-			{ hashCacheKey = false } = {}
+			{ hashCacheKey = false } = {},
+			spaceId
 		) {
 			const batchLoadFn = keys => {
 				const rootParams = { [batchedParamKey]: keys };
-				return ctx.call(actionName, _.defaultsDeep({}, args, rootParams, staticParams));
+				// !!! 这里的ctx是buildDataLoader时传进来的参数，在后续触发执行batchLoadFn时ctx.meta中的信息依然是旧的，故此函数体中代码不要使用ctx.meta中的信息
+				return ctx.call(actionName, _.defaultsDeep({}, args, rootParams, staticParams), { meta: { ...ctx.meta, spaceId } });
 			};
 
 			const dataLoaderOptions = this.dataLoaderOptions.get(actionName) || {};
@@ -936,19 +976,19 @@ module.exports = {
 		'@objectRecordEvent.*.*': function(ctx){
 			const { objectApiName, isUpdate, isDelete, id, doc } = ctx.params;
 			if(objectApiName && (isUpdate || isDelete)){
-				const key = this.getObjectDataLoaderMapKey(
-					objectApiName
-				);
+				const keys = ObjectDataLoaderMapKeys[objectApiName] || [];
 				let dataLoaderKeys = [id];
 				if(objectApiName === 'space_users'){
 					dataLoaderKeys.push(doc.user)
 				}
-				const loader = this.objectDataLoaders.get(key);
-				if(loader){
-					for(const dataLoaderKey of dataLoaderKeys){
-						loader.clear(dataLoaderKey);
+				_.each(keys, (key)=>{
+					const loader = this.objectDataLoaders.get(key);
+					if(loader){
+						for(const dataLoaderKey of dataLoaderKeys){
+							loader.clear(dataLoaderKey);
+						}
 					}
-				}
+				})
 			}
 		},
 		'service-ui.started': function(){
@@ -964,12 +1004,15 @@ module.exports = {
 				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.');
-					}
+					setTimeout(function () {
+						try {
+							openBrowser(process.env.ROOT_URL);
+						} catch (error) {
+							console.error(error);
+							console.error('auto open browser failed.');
+						}
+					}, 100)
+					
 				}
 			}
 		}
@@ -990,9 +1033,9 @@ module.exports = {
 		// 	});
 		// }
 
-		// this.broker.waitForServices('~packages-@steedos/service-ui').then(() => {
-		// 	this.app.use("/", this.express());
-		// })
+		this.broker.waitForServices('~packages-@steedos/service-ui').then(() => {
+			this.app.use("/", this.express());
+		})
 
 		global.SteedosApi = {
 			express: this.express

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@steedos/service-api",
-  "version": "2.6.1-beta.6",
+  "version": "2.6.2-beta.10",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@steedos/auth": "2.6.1-beta.6",
-    "@steedos/router": "2.6.1-beta.6",
-    "@steedos/service-object-graphql": "2.6.1-beta.6",
-    "@steedos/service-ui": "2.6.1-beta.6",
+    "@steedos/auth": "2.6.2-beta.10",
+    "@steedos/router": "2.6.2-beta.10",
+    "@steedos/service-object-graphql": "2.6.2-beta.10",
+    "@steedos/service-ui": "2.6.2-beta.10",
     "graphql": "^15.8.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-type-json": "^0.3.2",
@@ -15,11 +15,16 @@
     "moleculer": "^0.14.25",
     "moleculer-apollo-server": "^0.3.6",
     "moleculer-web": "^0.10.4",
+    "react-dev-utils": "12.0.1",
     "validator": "^13.6.0"
   },
   "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d77961251196c5352622d977e554660796ed6208"
+  "gitHead": "afbd1c34d1516e44494b5d5a192bbce80e48af93",
+  "devDependencies": {
+    "@types/graphql-iso-date": "^3.4.0",
+    "@types/react-dev-utils": "^9.0.11"
+  }
 }