@steedos/service-api 3.0.0-beta.2 → 3.0.0-beta.8

package/index.js

@@ -1,8 +1,10 @@
 "use strict";
 
 const ApiGateway = require("moleculer-web");
+const cors = require('cors');
+
 const steedosAuth = require('@steedos/auth');
-const { ApolloService } = require("moleculer-apollo-server");
+const { ApolloService } = require("@steedos/moleculer-apollo-server");
 const { MoleculerServerError } = require("moleculer").Errors;
 const GraphQLJSON = require('graphql-type-json');
 const {
@@ -93,6 +95,37 @@ const mixinOptions = {
 	}
 }
 const ObjectDataLoaderMapKeys = {};
+
+
+// const startServer = (broker)=>{
+// 	broker.waitForServices('api').then(() => {
+// 		const port = process.env.PORT || 5000;
+// 		const express = require('express');
+// 		const app = express();
+// 		app.use(cors());
+
+// 		const session = require('express-session');
+// 		app.use(session({
+// 			secret: process.env.STEEDOS_SESSION_SECRET || 'steedos',
+// 			resave: false,
+// 			saveUninitialized: true,
+// 			cookie: { secure: false, maxAge: 800000 },
+// 			name: 'ivan'
+// 		}))
+// 		app.use((req, res, next)=>{
+// 			next();
+// 		});
+// 		app.use(require('@steedos/router').staticRouter());
+
+// 		app.use(SteedosApi.express());
+
+// 		app.listen(port, () => {
+// 			console.log(`Project is running at ${port}`);
+// 		});
+// 	})
+// }
+
+
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  * @typedef {import('http').IncomingMessage} IncomingRequest Incoming HTTP Request
@@ -113,7 +146,7 @@ module.exports = {
 		server: false,
 
 		// Exposed port
-		port: process.env.PORT || 3001,
+		port: process.env.PORT || 5000,
 
 		// Exposed IP
 		// ip: "0.0.0.0",
@@ -122,12 +155,12 @@ module.exports = {
 		use: [
 			function (req, res, next) {
 				// 如果service-object-grapqhl未结算完成，则提示服务未就绪，刷新重试
-				if (!this.projectStarted) {
-					const message = 'service is not ready, please refresh later.';
-					res.writeHead(503, { 'Content-Type': 'application/json' });
-					res.end(JSON.stringify({ status: 1, msg: message, data: {}, errors: [{ message: message }] }));
-					return;
-				}
+				// if (!this.projectStarted) {
+				// 	const message = 'service is not ready, please refresh later.';
+				// 	res.writeHead(503, { 'Content-Type': 'application/json' });
+				// 	res.end(JSON.stringify({ status: 1, msg: message, data: {}, errors: [{ message: message }] }));
+				// 	return;
+				// }
 				next();
 			}
 		],
@@ -1021,33 +1054,30 @@ module.exports = {
 		'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
-					setTimeout(function () {
-						try {
-							openBrowser(process.env.ROOT_URL);
-						} catch (error) {
-							console.error(error);
-							console.error('auto open browser failed.');
-						}
-					}, 100)
-
-				}
-			}
-		}
+		// "$packages.changed": function (ctx) {
+		// 	if (!this.projectStarted) {
+		// 		this.projectStarted = true
+		// 		// 开发环境, 显示耗时
+		// 		if (process.env.NODE_ENV == 'development' && global.__startDate) {
+		// 			console.log('耗时: ' + (new Date().getTime() - global.__startDate.getTime()) + ' ms');
+		// 		}
+		// 		startServer(ctx.broker);
+		// 		if (process.env.STEEDOS_AUTO_OPEN_BROWSER != 'false') { // 默认打开，如果不想打开，设置STEEDOS_AUTO_OPEN_BROWSER=false
+		// 			setTimeout(function () {
+		// 				try {
+		// 					openBrowser(process.env.ROOT_URL);
+		// 				} catch (error) {
+		// 					console.error(error);
+		// 					console.error('auto open browser failed.');
+		// 				}
+		// 			}, 100)
+
+		// 		}
+		// 	}
+		// }
 	},
 	async started() {
-
 		this.broker.createService(require("@steedos/service-ui"));
-
 		// if (this.settings.server != true && this.settings.steedos_api_port){
 		// 	/* istanbul ignore next */
 		// 	await new this.Promise((resolve, reject) => {
@@ -1063,7 +1093,6 @@ module.exports = {
 		this.broker.waitForServices('~packages-@steedos/service-ui').then(() => {
 			this.app.use("/", this.express());
 		})
-
 		global.SteedosApi = {
 			express: this.express
 		}

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@steedos/service-api",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.8",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@steedos/auth": "3.0.0-beta.2",
-    "@steedos/router": "3.0.0-beta.2",
-    "@steedos/service-object-graphql": "3.0.0-beta.2",
-    "@steedos/service-ui": "3.0.0-beta.2",
+    "@steedos/auth": "3.0.0-beta.8",
+    "@steedos/moleculer-apollo-server": "3.0.0-beta.8",
+    "@steedos/router": "3.0.0-beta.8",
+    "@steedos/service-object-graphql": "3.0.0-beta.8",
+    "@steedos/service-ui": "3.0.0-beta.8",
     "graphql": "^15.8.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-type-json": "^0.3.2",
     "lru_map": "^0.4.1",
     "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"
@@ -22,7 +22,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74",
+  "gitHead": "723d92765db5342a374c7aacb5b835e69f77ca4b",
   "devDependencies": {
     "@types/graphql-iso-date": "^3.4.0",
     "@types/react-dev-utils": "^9.0.11"