@steedos/service-api 2.5.3-beta.22 → 2.5.3-beta.25

package/index.js

@@ -13,8 +13,6 @@ const {
 const SteedosRouter = require('@steedos/router');
 const _ = require('lodash');
 const ServiceObjectGraphql = require('@steedos/service-object-graphql')
-const open = require('open');
-
 
 const mixinOptions = {
 
@@ -92,7 +90,6 @@ const mixinOptions = {
  */
 module.exports = {
 	name: "api",
-    projectStarted: false,
 	mixins: [ApiGateway,
 		// GraphQL Apollo Server
 		ApolloService(mixinOptions),
@@ -210,6 +207,89 @@ module.exports = {
 					res.writeHead(err.code || 500);
 					res.end(JSON.stringify({ error: err.message, detail: err }));
 				}
+			},
+			{
+				path: "/api/v1",
+
+				whitelist: [
+					"rest.*",
+				],
+
+				// Route-level Express middlewares. More info: https://moleculer.services/docs/0.14/moleculer-web.html#Middlewares
+				use: [],
+
+				// Enable/disable parameter merging method. More info: https://moleculer.services/docs/0.14/moleculer-web.html#Disable-merging
+				mergeParams: true,
+
+				// Enable authentication. Implement the logic into `authenticate` method. More info: https://moleculer.services/docs/0.14/moleculer-web.html#Authentication
+				authentication: true,
+
+				// Enable authorization. Implement the logic into `authorize` method. More info: https://moleculer.services/docs/0.14/moleculer-web.html#Authorization
+				authorization: true,
+
+				// The auto-alias feature allows you to declare your route alias directly in your services.
+				// The gateway will dynamically build the full routes from service schema.
+				autoAliases: true,
+
+				aliases: {
+
+				},
+
+				/** 
+				 * Before call hook. You can check the request.
+				 * @param {Context} ctx 
+				 * @param {Object} route 
+				 * @param {IncomingRequest} req 
+				 * @param {ServerResponse} res 
+				 * @param {Object} data
+				 * 
+				onBeforeCall(ctx, route, req, res) {
+					// Set request headers to context meta
+					ctx.meta.userAgent = req.headers["user-agent"];
+				}, */
+
+				/**
+				 * After call hook. You can modify the data.
+				 * @param {Context} ctx 
+				 * @param {Object} route 
+				 * @param {IncomingRequest} req 
+				 * @param {ServerResponse} res 
+				 * @param {Object} data
+				onAfterCall(ctx, route, req, res, data) {
+					// Async function which return with Promise
+					return doSomething(ctx, res, data);
+				}, */
+
+				// Calling options. More info: https://moleculer.services/docs/0.14/moleculer-web.html#Calling-options
+				callingOptions: {},
+
+				bodyParsers: {
+					json: {
+						strict: false,
+						limit: "10MB"
+					},
+					urlencoded: {
+						extended: true,
+						limit: "10MB"
+					}
+				},
+
+				// Mapping policy setting. More info: https://moleculer.services/docs/0.14/moleculer-web.html#Mapping-policy
+				mappingPolicy: "all", // Available values: "all", "restrict"
+
+				// Enable/disable logging
+				logging: false,
+
+				// Route error handler
+				onError(req, res, err) {
+					res.setHeader("Content-Type", "application/json; charset=utf-8");
+					res.writeHead(err.code || 500);
+					res.end(JSON.stringify({
+						"status": -1,
+						"msg": err.message,
+						"data": {}
+					}));
+				}
 			}
 		],
 
@@ -732,30 +812,6 @@ module.exports = {
 	created() {
 		this.app = SteedosRouter.staticRouter();
 	},
-	events:{
-		'service-ui.started': function(){
-			this.app.use("/", this.express());
-		},
-		"$packages.changed": function(){
-			if (!this.projectStarted) {
-				this.projectStarted = true
-				// 开发环境, 显示耗时
-				if(process.env.NODE_ENV == 'development' && global.__startDate){
-					console.log('耗时: ' + (new Date().getTime() - global.__startDate.getTime()) + ' ms');
-				}
-				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.');
-					}
-				}
-			}
-		}
-	},
 	async started() {
 
 		this.broker.createService(require("@steedos/service-ui"));
@@ -772,9 +828,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.5.3-beta.22",
+  "version": "2.5.3-beta.25",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@steedos/auth": "2.5.3-beta.22",
-    "@steedos/router": "2.5.3-beta.22",
-    "@steedos/service-object-graphql": "2.5.3-beta.22",
-    "@steedos/service-ui": "2.5.3-beta.22",
+    "@steedos/auth": "2.5.3-beta.25",
+    "@steedos/router": "2.5.3-beta.25",
+    "@steedos/service-object-graphql": "2.5.3-beta.25",
+    "@steedos/service-ui": "2.5.3-beta.25",
     "graphql": "^15.8.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-type-json": "^0.3.2",
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c2f418258d9316b17bd6c4e615be4d418d955dce"
+  "gitHead": "02543361b65c5eabe667a581687f13fde3b358a8"
 }