@things-factory/shell 4.3.69 → 4.3.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/server-dev.js +143 -136
- package/dist-server/server-dev.js.map +1 -1
- package/dist-server/server.js +2 -1
- package/dist-server/server.js.map +1 -1
- package/package.json +2 -2
- package/server/server-dev.ts +173 -168
- package/server/server.ts +9 -8
|
@@ -52,148 +52,155 @@ const fileUploadOption = {
|
|
|
52
52
|
};
|
|
53
53
|
/* bootstrap */
|
|
54
54
|
const bootstrap = async () => {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
const whitelist = env_1.config.get('whitelist');
|
|
68
|
-
const blacklist = env_1.config.get('blacklist');
|
|
69
|
-
if (whitelist || blacklist) {
|
|
70
|
-
app.use((0, koa_ip_1.default)({
|
|
71
|
-
whitelist,
|
|
72
|
-
blacklist,
|
|
73
|
-
handler: async (ctx, next) => {
|
|
74
|
-
ctx.status = 403;
|
|
75
|
-
}
|
|
55
|
+
try {
|
|
56
|
+
await (0, database_1.databaseInitializer)();
|
|
57
|
+
const app = new koa_1.default();
|
|
58
|
+
app.use((0, cors_1.default)({
|
|
59
|
+
origin: function (ctx) {
|
|
60
|
+
return ctx.request.headers.origin || '*';
|
|
61
|
+
},
|
|
62
|
+
exposeHeaders: ['WWW-Authenticate', 'Server-Authorization'],
|
|
63
|
+
maxAge: 5,
|
|
64
|
+
credentials: true,
|
|
65
|
+
/* allowMethods: ['GET', 'POST', 'DELETE'], -- use default */
|
|
66
|
+
allowHeaders: ['Content-Type', 'Authorization', 'Accept']
|
|
76
67
|
}));
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
async onConnect(connectionParams, webSocket, context) {
|
|
88
|
-
var { request } = context;
|
|
89
|
-
var url = new URL((connectionParams['headers'] || connectionParams).referer);
|
|
90
|
-
var accessToken = url.searchParams.get('access_token');
|
|
91
|
-
connectionParams['headers']['authorization'] = accessToken;
|
|
92
|
-
request.headers = Object.assign(Object.assign({}, request.headers), (connectionParams['headers'] || connectionParams));
|
|
93
|
-
var koacontext = await app.createContext(request, {});
|
|
94
|
-
koacontext['state'] = {};
|
|
95
|
-
/* in case connect error(like a authentication error) just throw exception */
|
|
96
|
-
var middlewares = [...subscriptionMiddleware];
|
|
97
|
-
const fn = co_1.default.wrap((0, koa_compose_1.default)(middlewares));
|
|
98
|
-
await fn(koacontext);
|
|
99
|
-
return koacontext;
|
|
68
|
+
const whitelist = env_1.config.get('whitelist');
|
|
69
|
+
const blacklist = env_1.config.get('blacklist');
|
|
70
|
+
if (whitelist || blacklist) {
|
|
71
|
+
app.use((0, koa_ip_1.default)({
|
|
72
|
+
whitelist,
|
|
73
|
+
blacklist,
|
|
74
|
+
handler: async (ctx, next) => {
|
|
75
|
+
ctx.status = 403;
|
|
76
|
+
}
|
|
77
|
+
}));
|
|
100
78
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
79
|
+
var subscriptionMiddleware = [];
|
|
80
|
+
process.emit('bootstrap-module-subscription', app, subscriptionMiddleware);
|
|
81
|
+
const builtSchema = await (0, schema_1.schema)();
|
|
82
|
+
const httpServer = (0, http_1.createServer)(app.callback());
|
|
83
|
+
const subscriptionServer = subscriptions_transport_ws_1.SubscriptionServer.create({
|
|
84
|
+
schema: builtSchema,
|
|
85
|
+
// These are imported from `graphql`.
|
|
86
|
+
execute: graphql_1.execute,
|
|
87
|
+
subscribe: graphql_1.subscribe,
|
|
88
|
+
async onConnect(connectionParams, webSocket, context) {
|
|
89
|
+
var { request } = context;
|
|
90
|
+
var url = new URL((connectionParams['headers'] || connectionParams).referer);
|
|
91
|
+
var accessToken = url.searchParams.get('access_token');
|
|
92
|
+
connectionParams['headers']['authorization'] = accessToken;
|
|
93
|
+
request.headers = Object.assign(Object.assign({}, request.headers), (connectionParams['headers'] || connectionParams));
|
|
94
|
+
var koacontext = await app.createContext(request, {});
|
|
95
|
+
koacontext['state'] = {};
|
|
96
|
+
/* in case connect error(like a authentication error) just throw exception */
|
|
97
|
+
var middlewares = [...subscriptionMiddleware];
|
|
98
|
+
const fn = co_1.default.wrap((0, koa_compose_1.default)(middlewares));
|
|
99
|
+
await fn(koacontext);
|
|
100
|
+
return koacontext;
|
|
118
101
|
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
102
|
+
}, {
|
|
103
|
+
server: httpServer,
|
|
104
|
+
path: '/subscriptions'
|
|
105
|
+
});
|
|
106
|
+
const server = new apollo_server_koa_1.ApolloServer({
|
|
107
|
+
schema: builtSchema,
|
|
108
|
+
formatError: error => {
|
|
109
|
+
env_1.logger.error(error);
|
|
110
|
+
return error;
|
|
111
|
+
},
|
|
112
|
+
formatResponse: response => {
|
|
113
|
+
// logger.info('response %s', JSON.stringify(response, null, 2))
|
|
114
|
+
return response;
|
|
115
|
+
},
|
|
116
|
+
context: async ({ connection, ctx }) => {
|
|
117
|
+
if (connection) {
|
|
118
|
+
return connection.context;
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
return ctx;
|
|
127
122
|
}
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
123
|
+
},
|
|
124
|
+
plugins: [
|
|
125
|
+
(0, apollo_server_core_1.ApolloServerPluginLandingPageGraphQLPlayground)({
|
|
126
|
+
settings: {
|
|
127
|
+
'request.credentials': 'same-origin'
|
|
128
|
+
}
|
|
129
|
+
}),
|
|
130
|
+
{
|
|
131
|
+
async serverWillStart() {
|
|
132
|
+
return {
|
|
133
|
+
async drainServer() {
|
|
134
|
+
subscriptionServer.close();
|
|
135
|
+
}
|
|
136
|
+
};
|
|
137
|
+
}
|
|
136
138
|
}
|
|
139
|
+
],
|
|
140
|
+
cache: 'bounded'
|
|
141
|
+
});
|
|
142
|
+
server.start();
|
|
143
|
+
graphql_local_client_1.GraphqlLocalClient.init(builtSchema, app);
|
|
144
|
+
env_1.orderedModuleNames.forEach(name => {
|
|
145
|
+
const { initMiddlewares } = (0, env_1.loader)(name);
|
|
146
|
+
initMiddlewares && initMiddlewares(app);
|
|
147
|
+
});
|
|
148
|
+
const render = require('@things-factory/ejs-remote');
|
|
149
|
+
render(app, {
|
|
150
|
+
root: '/views',
|
|
151
|
+
host: `http://127.0.0.1:${PORT}`,
|
|
152
|
+
layout: false,
|
|
153
|
+
viewExt: 'html',
|
|
154
|
+
cache: false,
|
|
155
|
+
debug: false
|
|
156
|
+
});
|
|
157
|
+
const middleware = await (0, koa_webpack_1.default)({
|
|
158
|
+
compiler,
|
|
159
|
+
hotClient: {},
|
|
160
|
+
devMiddleware: {
|
|
161
|
+
publicPath: webpackConfig.output.publicPath,
|
|
162
|
+
stats: { colors: true }
|
|
137
163
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
.use(routers_1.globalPublicRouter.routes())
|
|
179
|
-
.use(routers_1.globalPublicRouter.allowedMethods())
|
|
180
|
-
.use(routers_1.globalPrivateRouter.routes())
|
|
181
|
-
.use(routers_1.globalPrivateRouter.allowedMethods())
|
|
182
|
-
.use(routers_1.domainPublicRouter.routes())
|
|
183
|
-
.use(routers_1.domainPublicRouter.allowedMethods())
|
|
184
|
-
.use(routers_1.domainPrivateRouter.routes())
|
|
185
|
-
.use(routers_1.domainPrivateRouter.allowedMethods());
|
|
186
|
-
/* should be history-fallback => webpack-middleware => koaStatic */
|
|
187
|
-
app.use((0, koa2_connect_history_api_fallback_1.historyApiFallback)({ whiteList: [] }));
|
|
188
|
-
app.use(middleware);
|
|
189
|
-
app.use((0, koa_static_1.default)(compiler.outputPath, {
|
|
190
|
-
index: false
|
|
191
|
-
}));
|
|
192
|
-
httpServer.listen({ port: PORT }, () => {
|
|
193
|
-
env_1.logger.info(`🚀 Server ready at http://0.0.0.0:${PORT}${server.graphqlPath}`);
|
|
194
|
-
env_1.logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${'/subscriptions'}`);
|
|
195
|
-
process.emit('bootstrap-module-start', { app, config: env_1.config, builtSchema, httpServer });
|
|
196
|
-
});
|
|
164
|
+
});
|
|
165
|
+
// only for development mode. triggered after webpack compilation is done.
|
|
166
|
+
compiler.hooks.done.tap({ name: 'server-dev' }, stats => {
|
|
167
|
+
process.emit('client-rebuilt', app, compiler.outputFileSystem);
|
|
168
|
+
});
|
|
169
|
+
app.use((0, koa_bodyparser_1.default)(bodyParserOption));
|
|
170
|
+
app.use((0, graphql_upload_1.graphqlUploadKoa)(fileUploadOption));
|
|
171
|
+
app.use(server.getMiddleware({
|
|
172
|
+
path: '/graphql'
|
|
173
|
+
}));
|
|
174
|
+
/* routers */
|
|
175
|
+
process.emit('bootstrap-module-global-public-route', app, routers_1.globalPublicRouter);
|
|
176
|
+
process.emit('bootstrap-module-global-private-route', app, routers_1.globalPrivateRouter);
|
|
177
|
+
process.emit('bootstrap-module-domain-public-route', app, routers_1.domainPublicRouter);
|
|
178
|
+
process.emit('bootstrap-module-domain-private-route', app, routers_1.domainPrivateRouter);
|
|
179
|
+
app
|
|
180
|
+
.use(routers_1.globalPublicRouter.routes())
|
|
181
|
+
.use(routers_1.globalPublicRouter.allowedMethods())
|
|
182
|
+
.use(routers_1.globalPrivateRouter.routes())
|
|
183
|
+
.use(routers_1.globalPrivateRouter.allowedMethods())
|
|
184
|
+
.use(routers_1.domainPublicRouter.routes())
|
|
185
|
+
.use(routers_1.domainPublicRouter.allowedMethods())
|
|
186
|
+
.use(routers_1.domainPrivateRouter.routes())
|
|
187
|
+
.use(routers_1.domainPrivateRouter.allowedMethods());
|
|
188
|
+
/* should be history-fallback => webpack-middleware => koaStatic */
|
|
189
|
+
app.use((0, koa2_connect_history_api_fallback_1.historyApiFallback)({ whiteList: [] }));
|
|
190
|
+
app.use(middleware);
|
|
191
|
+
app.use((0, koa_static_1.default)(compiler.outputPath, {
|
|
192
|
+
index: false
|
|
193
|
+
}));
|
|
194
|
+
httpServer.listen({ port: PORT }, () => {
|
|
195
|
+
env_1.logger.info(`🚀 Server ready at http://0.0.0.0:${PORT}${server.graphqlPath}`);
|
|
196
|
+
env_1.logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${'/subscriptions'}`);
|
|
197
|
+
process.emit('bootstrap-module-start', { app, config: env_1.config, builtSchema, httpServer });
|
|
198
|
+
});
|
|
199
|
+
}
|
|
200
|
+
catch (error) {
|
|
201
|
+
console.log(error);
|
|
202
|
+
throw error;
|
|
203
|
+
}
|
|
197
204
|
};
|
|
198
205
|
bootstrap();
|
|
199
206
|
//# sourceMappingURL=server-dev.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-dev.js","sourceRoot":"","sources":["../server/server-dev.ts"],"names":[],"mappings":";;;;;AAAA,mBAAmB;AACnB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAA;AACpC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;AAC1B,iCAAiC;AAEjC,2EAAkF;AAClF,6CAAgF;AAChF,uCAA4G;AAC5G,qCAA4C;AAE5C,yDAAgD;AAChD,2DAAmF;AACnF,iEAA2D;AAC3D,8CAAqB;AACrB,4CAAmB;AACnB,8DAAiC;AACjC,qDAA4B;AAC5B,+BAAmC;AACnC,sDAA6D;AAC7D,mDAAiD;AACjD,yFAAsE;AACtE,oDAAuB;AACvB,oEAA0C;AAC1C,4DAAkC;AAClC,wEAA8C;AAC9C,qCAAiC;AACjC,kDAA+B;AAE/B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,iCAAiC,CAAC,CAAA;AAEjE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE5B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,2CAA2C,EAAE,YAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;AAC1F,IAAI,CAAC,MAAM,CACT,SAAS,EACT;kGACgG,EAChG,YAAM,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAC/B,CAAA;AAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAEtC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAClC,MAAM,aAAa,GAAG,OAAO,CAAC,+CAA+C,CAAC,CAAA;AAE9E,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAEvC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA;AAE5C,MAAM,WAAW,GAAG,YAAM,CAAC,GAAG,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"server-dev.js","sourceRoot":"","sources":["../server/server-dev.ts"],"names":[],"mappings":"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"}
|
package/dist-server/server.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../server/server.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAA;AACnC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;AAE1B,2EAAkF;AAClF,6CAAgF;AAChF,uCAA4G;AAC5G,qCAA4C;AAE5C,yDAAgD;AAChD,iEAA2D;AAC3D,8CAAqB;AACrB,4CAAmB;AACnB,8DAAiC;AACjC,qDAA4B;AAC5B,+BAAmC;AACnC,sDAA6D;AAC7D,mDAAiD;AACjD,yFAAsE;AACtE,oDAAuB;AACvB,oEAA0C;AAC1C,4DAAkC;AAClC,qCAAiC;AACjC,kDAA+B;AAE/B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE5B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,2CAA2C,EAAE,YAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;AAE1F,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAEtC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE5B,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA;AAE5C,MAAM,WAAW,GAAG,YAAM,CAAC,GAAG,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../server/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/shell",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.72",
|
|
4
4
|
"description": "Core module for framework",
|
|
5
5
|
"bin": {
|
|
6
6
|
"things-factory": "bin/things-factory",
|
|
@@ -129,5 +129,5 @@
|
|
|
129
129
|
"resolutions": {
|
|
130
130
|
"core-js": "^3.16.0"
|
|
131
131
|
},
|
|
132
|
-
"gitHead": "
|
|
132
|
+
"gitHead": "e2586ea38950d313bef2620334b15aecbc13c96c"
|
|
133
133
|
}
|
package/server/server-dev.ts
CHANGED
|
@@ -48,208 +48,213 @@ const compiler = webpack(webpackConfig)
|
|
|
48
48
|
|
|
49
49
|
const PORT = (process.env.PORT = flags.port)
|
|
50
50
|
|
|
51
|
-
const requestBody = config.get('requestBody')||{}
|
|
51
|
+
const requestBody = config.get('requestBody') || {}
|
|
52
52
|
|
|
53
53
|
const bodyParserOption = {
|
|
54
|
-
formLimit: requestBody.formLimit||'10mb',
|
|
55
|
-
jsonLimit: requestBody.jsonLimit||'10mb',
|
|
56
|
-
textLimit: requestBody.textLimit||'10mb'
|
|
54
|
+
formLimit: requestBody.formLimit || '10mb',
|
|
55
|
+
jsonLimit: requestBody.jsonLimit || '10mb',
|
|
56
|
+
textLimit: requestBody.textLimit || '10mb'
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
const fileUpload = config.get('fileUpload')||{}
|
|
59
|
+
const fileUpload = config.get('fileUpload') || {}
|
|
60
60
|
const fileUploadOption = {
|
|
61
|
-
maxFileSize: bytesFormat.parse(fileUpload.maxFileSize)||bytesFormat.parse('10mb'),
|
|
62
|
-
maxFiles: fileUpload.maxFiles||10
|
|
61
|
+
maxFileSize: bytesFormat.parse(fileUpload.maxFileSize) || bytesFormat.parse('10mb'),
|
|
62
|
+
maxFiles: fileUpload.maxFiles || 10
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
|
|
66
65
|
/* bootstrap */
|
|
67
66
|
const bootstrap = async () => {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const app = new Koa()
|
|
67
|
+
try {
|
|
68
|
+
await databaseInitializer()
|
|
71
69
|
|
|
72
|
-
|
|
73
|
-
cors({
|
|
74
|
-
origin: function (ctx) {
|
|
75
|
-
return ctx.request.headers.origin || '*'
|
|
76
|
-
},
|
|
77
|
-
exposeHeaders: ['WWW-Authenticate', 'Server-Authorization'],
|
|
78
|
-
maxAge: 5,
|
|
79
|
-
credentials: true,
|
|
80
|
-
/* allowMethods: ['GET', 'POST', 'DELETE'], -- use default */
|
|
81
|
-
allowHeaders: ['Content-Type', 'Authorization', 'Accept']
|
|
82
|
-
})
|
|
83
|
-
)
|
|
70
|
+
const app = new Koa()
|
|
84
71
|
|
|
85
|
-
const whitelist = config.get('whitelist')
|
|
86
|
-
const blacklist = config.get('blacklist')
|
|
87
|
-
|
|
88
|
-
if (whitelist || blacklist) {
|
|
89
72
|
app.use(
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
73
|
+
cors({
|
|
74
|
+
origin: function (ctx) {
|
|
75
|
+
return ctx.request.headers.origin || '*'
|
|
76
|
+
},
|
|
77
|
+
exposeHeaders: ['WWW-Authenticate', 'Server-Authorization'],
|
|
78
|
+
maxAge: 5,
|
|
79
|
+
credentials: true,
|
|
80
|
+
/* allowMethods: ['GET', 'POST', 'DELETE'], -- use default */
|
|
81
|
+
allowHeaders: ['Content-Type', 'Authorization', 'Accept']
|
|
96
82
|
})
|
|
97
83
|
)
|
|
98
|
-
}
|
|
99
84
|
|
|
100
|
-
|
|
101
|
-
|
|
85
|
+
const whitelist = config.get('whitelist')
|
|
86
|
+
const blacklist = config.get('blacklist')
|
|
102
87
|
|
|
103
|
-
|
|
88
|
+
if (whitelist || blacklist) {
|
|
89
|
+
app.use(
|
|
90
|
+
ip({
|
|
91
|
+
whitelist,
|
|
92
|
+
blacklist,
|
|
93
|
+
handler: async (ctx, next) => {
|
|
94
|
+
ctx.status = 403
|
|
95
|
+
}
|
|
96
|
+
})
|
|
97
|
+
)
|
|
98
|
+
}
|
|
104
99
|
|
|
105
|
-
|
|
100
|
+
var subscriptionMiddleware = []
|
|
101
|
+
process.emit('bootstrap-module-subscription' as any, app, subscriptionMiddleware)
|
|
106
102
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
103
|
+
const builtSchema = await schema()
|
|
104
|
+
|
|
105
|
+
const httpServer = createServer(app.callback())
|
|
106
|
+
|
|
107
|
+
const subscriptionServer = SubscriptionServer.create(
|
|
108
|
+
{
|
|
109
|
+
schema: builtSchema,
|
|
110
|
+
// These are imported from `graphql`.
|
|
111
|
+
execute,
|
|
112
|
+
subscribe,
|
|
113
|
+
async onConnect(connectionParams: Object, webSocket: WebSocket, context: ConnectionContext) {
|
|
114
|
+
var { request } = context
|
|
115
|
+
|
|
116
|
+
var url = new URL((connectionParams['headers'] || connectionParams).referer)
|
|
117
|
+
var accessToken = url.searchParams.get('access_token')
|
|
118
|
+
connectionParams['headers']['authorization'] = accessToken
|
|
119
|
+
|
|
120
|
+
request.headers = {
|
|
121
|
+
...request.headers,
|
|
122
|
+
...(connectionParams['headers'] || connectionParams)
|
|
123
|
+
}
|
|
124
124
|
|
|
125
|
-
|
|
126
|
-
|
|
125
|
+
var koacontext = await app.createContext(request, {} as any)
|
|
126
|
+
koacontext['state'] = {}
|
|
127
127
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
128
|
+
/* in case connect error(like a authentication error) just throw exception */
|
|
129
|
+
var middlewares = [...subscriptionMiddleware]
|
|
130
|
+
const fn = co.wrap(compose(middlewares))
|
|
131
131
|
|
|
132
|
-
|
|
132
|
+
await fn(koacontext)
|
|
133
133
|
|
|
134
|
-
|
|
135
|
-
}
|
|
136
|
-
},
|
|
137
|
-
{
|
|
138
|
-
server: httpServer,
|
|
139
|
-
path: '/subscriptions'
|
|
140
|
-
}
|
|
141
|
-
)
|
|
142
|
-
|
|
143
|
-
const server = new ApolloServer({
|
|
144
|
-
schema: builtSchema,
|
|
145
|
-
formatError: error => {
|
|
146
|
-
logger.error(error)
|
|
147
|
-
return error
|
|
148
|
-
},
|
|
149
|
-
formatResponse: response => {
|
|
150
|
-
// logger.info('response %s', JSON.stringify(response, null, 2))
|
|
151
|
-
return response
|
|
152
|
-
},
|
|
153
|
-
context: async ({ connection, ctx }) => {
|
|
154
|
-
if (connection) {
|
|
155
|
-
return connection.context
|
|
156
|
-
} else {
|
|
157
|
-
return ctx
|
|
158
|
-
}
|
|
159
|
-
},
|
|
160
|
-
plugins: [
|
|
161
|
-
ApolloServerPluginLandingPageGraphQLPlayground({
|
|
162
|
-
settings: {
|
|
163
|
-
'request.credentials': 'same-origin'
|
|
134
|
+
return koacontext
|
|
164
135
|
}
|
|
165
|
-
}
|
|
136
|
+
},
|
|
166
137
|
{
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
138
|
+
server: httpServer,
|
|
139
|
+
path: '/subscriptions'
|
|
140
|
+
}
|
|
141
|
+
)
|
|
142
|
+
|
|
143
|
+
const server = new ApolloServer({
|
|
144
|
+
schema: builtSchema,
|
|
145
|
+
formatError: error => {
|
|
146
|
+
logger.error(error)
|
|
147
|
+
return error
|
|
148
|
+
},
|
|
149
|
+
formatResponse: response => {
|
|
150
|
+
// logger.info('response %s', JSON.stringify(response, null, 2))
|
|
151
|
+
return response
|
|
152
|
+
},
|
|
153
|
+
context: async ({ connection, ctx }) => {
|
|
154
|
+
if (connection) {
|
|
155
|
+
return connection.context
|
|
156
|
+
} else {
|
|
157
|
+
return ctx
|
|
158
|
+
}
|
|
159
|
+
},
|
|
160
|
+
plugins: [
|
|
161
|
+
ApolloServerPluginLandingPageGraphQLPlayground({
|
|
162
|
+
settings: {
|
|
163
|
+
'request.credentials': 'same-origin'
|
|
164
|
+
}
|
|
165
|
+
}),
|
|
166
|
+
{
|
|
167
|
+
async serverWillStart() {
|
|
168
|
+
return {
|
|
169
|
+
async drainServer() {
|
|
170
|
+
subscriptionServer.close()
|
|
171
|
+
}
|
|
171
172
|
}
|
|
172
173
|
}
|
|
173
174
|
}
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
server.start()
|
|
179
|
-
|
|
180
|
-
GraphqlLocalClient.init(builtSchema, app)
|
|
181
|
-
|
|
182
|
-
orderedModuleNames.forEach(name => {
|
|
183
|
-
const { initMiddlewares } = loader(name)
|
|
184
|
-
initMiddlewares && initMiddlewares(app)
|
|
185
|
-
})
|
|
186
|
-
|
|
187
|
-
const render = require('@things-factory/ejs-remote')
|
|
188
|
-
render(app, {
|
|
189
|
-
root: '/views',
|
|
190
|
-
host: `http://127.0.0.1:${PORT}`,
|
|
191
|
-
layout: false,
|
|
192
|
-
viewExt: 'html',
|
|
193
|
-
cache: false,
|
|
194
|
-
debug: false
|
|
195
|
-
})
|
|
196
|
-
|
|
197
|
-
const middleware = await koaWebpack({
|
|
198
|
-
compiler,
|
|
199
|
-
hotClient: {},
|
|
200
|
-
devMiddleware: {
|
|
201
|
-
publicPath: webpackConfig.output.publicPath,
|
|
202
|
-
stats: { colors: true }
|
|
203
|
-
}
|
|
204
|
-
})
|
|
175
|
+
],
|
|
176
|
+
cache: 'bounded'
|
|
177
|
+
})
|
|
205
178
|
|
|
206
|
-
|
|
207
|
-
compiler.hooks.done.tap({ name: 'server-dev' }, stats => {
|
|
208
|
-
process.emit('client-rebuilt' as any, app, compiler.outputFileSystem)
|
|
209
|
-
})
|
|
179
|
+
server.start()
|
|
210
180
|
|
|
211
|
-
|
|
212
|
-
app.use(graphqlUploadKoa(fileUploadOption))
|
|
181
|
+
GraphqlLocalClient.init(builtSchema, app)
|
|
213
182
|
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
183
|
+
orderedModuleNames.forEach(name => {
|
|
184
|
+
const { initMiddlewares } = loader(name)
|
|
185
|
+
initMiddlewares && initMiddlewares(app)
|
|
217
186
|
})
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
.use(globalPublicRouter.routes())
|
|
228
|
-
.use(globalPublicRouter.allowedMethods())
|
|
229
|
-
.use(globalPrivateRouter.routes())
|
|
230
|
-
.use(globalPrivateRouter.allowedMethods())
|
|
231
|
-
.use(domainPublicRouter.routes())
|
|
232
|
-
.use(domainPublicRouter.allowedMethods())
|
|
233
|
-
.use(domainPrivateRouter.routes())
|
|
234
|
-
.use(domainPrivateRouter.allowedMethods())
|
|
235
|
-
|
|
236
|
-
/* should be history-fallback => webpack-middleware => koaStatic */
|
|
237
|
-
app.use(historyApiFallback({ whiteList: [] }))
|
|
238
|
-
|
|
239
|
-
app.use(middleware)
|
|
240
|
-
|
|
241
|
-
app.use(
|
|
242
|
-
koaStatic(compiler.outputPath, {
|
|
243
|
-
index: false
|
|
187
|
+
|
|
188
|
+
const render = require('@things-factory/ejs-remote')
|
|
189
|
+
render(app, {
|
|
190
|
+
root: '/views',
|
|
191
|
+
host: `http://127.0.0.1:${PORT}`,
|
|
192
|
+
layout: false,
|
|
193
|
+
viewExt: 'html',
|
|
194
|
+
cache: false,
|
|
195
|
+
debug: false
|
|
244
196
|
})
|
|
245
|
-
)
|
|
246
197
|
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
198
|
+
const middleware = await koaWebpack({
|
|
199
|
+
compiler,
|
|
200
|
+
hotClient: {},
|
|
201
|
+
devMiddleware: {
|
|
202
|
+
publicPath: webpackConfig.output.publicPath,
|
|
203
|
+
stats: { colors: true }
|
|
204
|
+
}
|
|
205
|
+
})
|
|
206
|
+
|
|
207
|
+
// only for development mode. triggered after webpack compilation is done.
|
|
208
|
+
compiler.hooks.done.tap({ name: 'server-dev' }, stats => {
|
|
209
|
+
process.emit('client-rebuilt' as any, app, compiler.outputFileSystem)
|
|
210
|
+
})
|
|
211
|
+
|
|
212
|
+
app.use(koaBodyParser(bodyParserOption))
|
|
213
|
+
app.use(graphqlUploadKoa(fileUploadOption))
|
|
214
|
+
|
|
215
|
+
app.use(
|
|
216
|
+
server.getMiddleware({
|
|
217
|
+
path: '/graphql'
|
|
218
|
+
})
|
|
219
|
+
)
|
|
220
|
+
|
|
221
|
+
/* routers */
|
|
222
|
+
process.emit('bootstrap-module-global-public-route' as any, app, globalPublicRouter)
|
|
223
|
+
process.emit('bootstrap-module-global-private-route' as any, app, globalPrivateRouter)
|
|
224
|
+
process.emit('bootstrap-module-domain-public-route' as any, app, domainPublicRouter)
|
|
225
|
+
process.emit('bootstrap-module-domain-private-route' as any, app, domainPrivateRouter)
|
|
226
|
+
|
|
227
|
+
app
|
|
228
|
+
.use(globalPublicRouter.routes())
|
|
229
|
+
.use(globalPublicRouter.allowedMethods())
|
|
230
|
+
.use(globalPrivateRouter.routes())
|
|
231
|
+
.use(globalPrivateRouter.allowedMethods())
|
|
232
|
+
.use(domainPublicRouter.routes())
|
|
233
|
+
.use(domainPublicRouter.allowedMethods())
|
|
234
|
+
.use(domainPrivateRouter.routes())
|
|
235
|
+
.use(domainPrivateRouter.allowedMethods())
|
|
250
236
|
|
|
251
|
-
|
|
252
|
-
|
|
237
|
+
/* should be history-fallback => webpack-middleware => koaStatic */
|
|
238
|
+
app.use(historyApiFallback({ whiteList: [] }))
|
|
239
|
+
|
|
240
|
+
app.use(middleware)
|
|
241
|
+
|
|
242
|
+
app.use(
|
|
243
|
+
koaStatic(compiler.outputPath, {
|
|
244
|
+
index: false
|
|
245
|
+
})
|
|
246
|
+
)
|
|
247
|
+
|
|
248
|
+
httpServer.listen({ port: PORT }, () => {
|
|
249
|
+
logger.info(`🚀 Server ready at http://0.0.0.0:${PORT}${server.graphqlPath}`)
|
|
250
|
+
logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${'/subscriptions'}`)
|
|
251
|
+
|
|
252
|
+
process.emit('bootstrap-module-start' as any, { app, config, builtSchema, httpServer } as any)
|
|
253
|
+
})
|
|
254
|
+
} catch (error) {
|
|
255
|
+
console.log(error)
|
|
256
|
+
throw error
|
|
257
|
+
}
|
|
253
258
|
}
|
|
254
259
|
|
|
255
260
|
bootstrap()
|
package/server/server.ts
CHANGED
|
@@ -32,18 +32,18 @@ const path = require('path')
|
|
|
32
32
|
|
|
33
33
|
const PORT = (process.env.PORT = flags.port)
|
|
34
34
|
|
|
35
|
-
const requestBody = config.get('requestBody')||{}
|
|
35
|
+
const requestBody = config.get('requestBody') || {}
|
|
36
36
|
|
|
37
37
|
const bodyParserOption = {
|
|
38
|
-
formLimit: requestBody.formLimit||'10mb',
|
|
39
|
-
jsonLimit: requestBody.jsonLimit||'10mb',
|
|
40
|
-
textLimit: requestBody.textLimit||'10mb'
|
|
38
|
+
formLimit: requestBody.formLimit || '10mb',
|
|
39
|
+
jsonLimit: requestBody.jsonLimit || '10mb',
|
|
40
|
+
textLimit: requestBody.textLimit || '10mb'
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
-
const fileUpload = config.get('fileUpload')||{}
|
|
43
|
+
const fileUpload = config.get('fileUpload') || {}
|
|
44
44
|
const fileUploadOption = {
|
|
45
|
-
maxFileSize: bytesFormat.parse(fileUpload.maxFileSize)||bytesFormat.parse('10mb'),
|
|
46
|
-
maxFiles: fileUpload.maxFiles||10
|
|
45
|
+
maxFileSize: bytesFormat.parse(fileUpload.maxFileSize) || bytesFormat.parse('10mb'),
|
|
46
|
+
maxFiles: fileUpload.maxFiles || 10
|
|
47
47
|
}
|
|
48
48
|
/* bootstrap */
|
|
49
49
|
const bootstrap = async () => {
|
|
@@ -150,7 +150,8 @@ const bootstrap = async () => {
|
|
|
150
150
|
}
|
|
151
151
|
}
|
|
152
152
|
}
|
|
153
|
-
]
|
|
153
|
+
],
|
|
154
|
+
cache: 'bounded'
|
|
154
155
|
})
|
|
155
156
|
|
|
156
157
|
await server.start()
|