@things-factory/shell 5.0.0-zeta.20 → 5.0.0-zeta.21
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/client/elements/oops-progress.js +2 -1
- package/client/index.js +0 -4
- package/dist-server/schema.js +4 -4
- package/dist-server/schema.js.map +1 -1
- package/dist-server/server-dev.js +32 -25
- package/dist-server/server-dev.js.map +1 -1
- package/dist-server/server.js +35 -23
- package/dist-server/server.js.map +1 -1
- package/dist-server/service/common-types/scalar-date.js.map +1 -1
- package/package.json +23 -22
- package/server/schema.ts +4 -4
- package/server/server-dev.ts +35 -27
- package/server/server.ts +38 -24
- package/server/service/common-types/scalar-date.ts +1 -1
- package/things-factory.config.js +0 -4
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import gql from 'graphql-tag'
|
|
1
2
|
import { html, LitElement } from 'lit'
|
|
2
3
|
|
|
3
4
|
import { subscribe } from '@operato/graphql'
|
|
@@ -40,7 +41,7 @@ export class OopsProgress extends LitElement {
|
|
|
40
41
|
|
|
41
42
|
this._subscription = await subscribe(
|
|
42
43
|
{
|
|
43
|
-
query: `
|
|
44
|
+
query: gql`
|
|
44
45
|
subscription {
|
|
45
46
|
data(tag: "${this.tag}") {
|
|
46
47
|
tag
|
package/client/index.js
CHANGED
package/dist-server/schema.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.schema = void 0;
|
|
4
|
-
const
|
|
5
|
-
const graphql_upload_1 = require("graphql-upload");
|
|
4
|
+
const GraphQLUpload_js_1 = require("graphql-upload/GraphQLUpload.js");
|
|
6
5
|
const type_graphql_1 = require("type-graphql");
|
|
7
|
-
const utils_1 = require("@things-factory/utils");
|
|
8
6
|
const schema_1 = require("@graphql-tools/schema");
|
|
7
|
+
const env_1 = require("@things-factory/env");
|
|
8
|
+
const utils_1 = require("@things-factory/utils");
|
|
9
9
|
async function schema() {
|
|
10
10
|
const schemas = env_1.orderedModuleNames
|
|
11
11
|
.map(dep => (0, env_1.loader)(dep).schema)
|
|
@@ -89,7 +89,7 @@ async function schema() {
|
|
|
89
89
|
delete resolvers.Mutation;
|
|
90
90
|
delete resolvers.Subscription;
|
|
91
91
|
delete resolvers.Directive;
|
|
92
|
-
resolvers = Object.assign({ Upload:
|
|
92
|
+
resolvers = Object.assign({ Upload: GraphQLUpload_js_1.GraphQLUpload, Query: (0, utils_1.deepMerge)(Query, queryResolvers), Mutation: (0, utils_1.deepMerge)(Mutation, mutationResolvers), Subscription: (0, utils_1.deepMerge)(Subscription, subscriptionResolvers) }, resolvers);
|
|
93
93
|
var merged = (0, schema_1.mergeSchemas)({
|
|
94
94
|
schemas: [
|
|
95
95
|
await (0, type_graphql_1.buildSchema)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../server/schema.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../server/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,28 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// ts-import-sorter: disable
|
|
2
3
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
5
|
};
|
|
5
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* following lines should be located in top of the file */
|
|
7
|
-
// @prettier-ignore
|
|
7
|
+
/* following 2 lines should be located in top of the file */
|
|
8
8
|
process.env.NODE_ENV = 'development';
|
|
9
9
|
process.setMaxListeners(0);
|
|
10
|
-
/* following lines should be located in top of the file */
|
|
11
10
|
const apollo_server_core_1 = require("apollo-server-core");
|
|
12
11
|
const apollo_server_koa_1 = require("apollo-server-koa");
|
|
13
12
|
const bytes_1 = __importDefault(require("bytes"));
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const graphql_upload_1 = require("graphql-upload");
|
|
13
|
+
const graphqlUploadKoa_js_1 = __importDefault(require("graphql-upload/graphqlUploadKoa.js"));
|
|
14
|
+
const ws_1 = require("graphql-ws/lib/use/ws");
|
|
17
15
|
const http_1 = require("http");
|
|
18
16
|
const koa_1 = __importDefault(require("koa"));
|
|
19
17
|
const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
|
|
20
|
-
const koa_compose_1 = __importDefault(require("koa-compose"));
|
|
21
18
|
const koa_ip_1 = __importDefault(require("koa-ip"));
|
|
22
19
|
const koa_static_1 = __importDefault(require("koa-static"));
|
|
20
|
+
const koa_compose_1 = __importDefault(require("koa-compose"));
|
|
23
21
|
const koa2_connect_history_api_fallback_1 = require("koa2-connect-history-api-fallback");
|
|
24
|
-
|
|
25
|
-
const
|
|
22
|
+
const ws_2 = require("ws");
|
|
23
|
+
const co_1 = __importDefault(require("co"));
|
|
26
24
|
const koa_webpack_1 = __importDefault(require("@hatiolab/koa-webpack"));
|
|
27
25
|
const cors_1 = __importDefault(require("@koa/cors"));
|
|
28
26
|
const env_1 = require("@things-factory/env");
|
|
@@ -85,13 +83,19 @@ const bootstrap = async () => {
|
|
|
85
83
|
process.emit('bootstrap-module-subscription', app, subscriptionMiddleware);
|
|
86
84
|
const builtSchema = await (0, schema_1.schema)();
|
|
87
85
|
const httpServer = (0, http_1.createServer)(app.callback());
|
|
88
|
-
const
|
|
86
|
+
const websocketServer = new ws_2.WebSocketServer({
|
|
87
|
+
server: httpServer,
|
|
88
|
+
path: '/graphql'
|
|
89
|
+
});
|
|
90
|
+
// Save the returned server's info so we can shut down this server later
|
|
91
|
+
const serverCleanup = (0, ws_1.useServer)({
|
|
89
92
|
schema: builtSchema,
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
async
|
|
94
|
-
var {
|
|
93
|
+
context: async (ctx, msg, args) => {
|
|
94
|
+
return ctx['context'];
|
|
95
|
+
},
|
|
96
|
+
onConnect: async (ctx) => {
|
|
97
|
+
var { extra, connectionParams } = ctx;
|
|
98
|
+
var { request } = extra;
|
|
95
99
|
var url = new URL((connectionParams['headers'] || connectionParams).referer);
|
|
96
100
|
var accessToken = url.searchParams.get('access_token');
|
|
97
101
|
connectionParams['headers']['authorization'] = accessToken;
|
|
@@ -102,12 +106,15 @@ const bootstrap = async () => {
|
|
|
102
106
|
var middlewares = [...subscriptionMiddleware];
|
|
103
107
|
const fn = co_1.default.wrap((0, koa_compose_1.default)(middlewares));
|
|
104
108
|
await fn(koacontext);
|
|
105
|
-
return koacontext;
|
|
109
|
+
return (ctx['context'] = koacontext);
|
|
110
|
+
},
|
|
111
|
+
onDisconnect(ctx, code, reason) {
|
|
112
|
+
console.log('Disconnected!');
|
|
113
|
+
},
|
|
114
|
+
onError(ctx, msg, errors) {
|
|
115
|
+
console.error(msg, errors);
|
|
106
116
|
}
|
|
107
|
-
},
|
|
108
|
-
server: httpServer,
|
|
109
|
-
path: '/subscriptions'
|
|
110
|
-
});
|
|
117
|
+
}, websocketServer);
|
|
111
118
|
const server = new apollo_server_koa_1.ApolloServer({
|
|
112
119
|
schema: builtSchema,
|
|
113
120
|
formatError: error => {
|
|
@@ -115,7 +122,6 @@ const bootstrap = async () => {
|
|
|
115
122
|
return error;
|
|
116
123
|
},
|
|
117
124
|
formatResponse: response => {
|
|
118
|
-
// logger.info('response %s', JSON.stringify(response, null, 2))
|
|
119
125
|
return response;
|
|
120
126
|
},
|
|
121
127
|
context: async ({ connection, ctx }) => {
|
|
@@ -132,11 +138,12 @@ const bootstrap = async () => {
|
|
|
132
138
|
'request.credentials': 'same-origin'
|
|
133
139
|
}
|
|
134
140
|
}),
|
|
141
|
+
(0, apollo_server_core_1.ApolloServerPluginDrainHttpServer)({ httpServer }),
|
|
135
142
|
{
|
|
136
143
|
async serverWillStart() {
|
|
137
144
|
return {
|
|
138
145
|
async drainServer() {
|
|
139
|
-
|
|
146
|
+
await serverCleanup.dispose();
|
|
140
147
|
}
|
|
141
148
|
};
|
|
142
149
|
}
|
|
@@ -171,7 +178,7 @@ const bootstrap = async () => {
|
|
|
171
178
|
process.emit('client-rebuilt', app, compiler.outputFileSystem);
|
|
172
179
|
});
|
|
173
180
|
app.use((0, koa_bodyparser_1.default)(bodyParserOption));
|
|
174
|
-
app.use((0,
|
|
181
|
+
app.use((0, graphqlUploadKoa_js_1.default)(fileUploadOption));
|
|
175
182
|
app.use(server.getMiddleware({
|
|
176
183
|
path: '/graphql'
|
|
177
184
|
}));
|
|
@@ -189,7 +196,7 @@ const bootstrap = async () => {
|
|
|
189
196
|
.use(routers_1.domainPublicRouter.allowedMethods())
|
|
190
197
|
.use(routers_1.domainPrivateRouter.routes())
|
|
191
198
|
.use(routers_1.domainPrivateRouter.allowedMethods());
|
|
192
|
-
/* should
|
|
199
|
+
/* should follow this order : history-fallback => webpack-middleware => koaStatic */
|
|
193
200
|
app.use((0, koa2_connect_history_api_fallback_1.historyApiFallback)({ whiteList: [] }));
|
|
194
201
|
app.use(middleware);
|
|
195
202
|
app.use((0, koa_static_1.default)(compiler.outputPath, {
|
|
@@ -197,7 +204,7 @@ const bootstrap = async () => {
|
|
|
197
204
|
}));
|
|
198
205
|
httpServer.listen({ port: PORT }, () => {
|
|
199
206
|
env_1.logger.info(`🚀 Server ready at http://0.0.0.0:${PORT}${server.graphqlPath}`);
|
|
200
|
-
env_1.logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${
|
|
207
|
+
env_1.logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${server.graphqlPath}`);
|
|
201
208
|
process.emit('bootstrap-module-start', { app, config: env_1.config, builtSchema, httpServer });
|
|
202
209
|
});
|
|
203
210
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-dev.js","sourceRoot":"","sources":["../server/server-dev.ts"],"names":[],"mappings":"
|
|
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,24 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// ts-import-sorter: disable
|
|
2
3
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
5
|
};
|
|
5
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
|
|
7
|
+
/* following 2 lines should be located in top of the file */
|
|
7
8
|
process.env.NODE_ENV = 'production';
|
|
8
9
|
process.setMaxListeners(0);
|
|
10
|
+
const apollo_server_core_1 = require("apollo-server-core");
|
|
9
11
|
const apollo_server_koa_1 = require("apollo-server-koa");
|
|
10
12
|
const bytes_1 = __importDefault(require("bytes"));
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const graphql_upload_1 = require("graphql-upload");
|
|
13
|
+
const graphqlUploadKoa_js_1 = __importDefault(require("graphql-upload/graphqlUploadKoa.js"));
|
|
14
|
+
const ws_1 = require("graphql-ws/lib/use/ws");
|
|
14
15
|
const http_1 = require("http");
|
|
15
16
|
const koa_1 = __importDefault(require("koa"));
|
|
16
17
|
const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
|
|
17
|
-
const koa_compose_1 = __importDefault(require("koa-compose"));
|
|
18
18
|
const koa_ip_1 = __importDefault(require("koa-ip"));
|
|
19
19
|
const koa_static_1 = __importDefault(require("koa-static"));
|
|
20
|
+
const koa_compose_1 = __importDefault(require("koa-compose"));
|
|
20
21
|
const koa2_connect_history_api_fallback_1 = require("koa2-connect-history-api-fallback");
|
|
21
|
-
const
|
|
22
|
+
const ws_2 = require("ws");
|
|
23
|
+
const co_1 = __importDefault(require("co"));
|
|
22
24
|
const cors_1 = __importDefault(require("@koa/cors"));
|
|
23
25
|
const env_1 = require("@things-factory/env");
|
|
24
26
|
const graphql_local_client_1 = require("./graphql-local-client");
|
|
@@ -74,29 +76,38 @@ const bootstrap = async () => {
|
|
|
74
76
|
process.emit('bootstrap-module-subscription', app, subscriptionMiddleware);
|
|
75
77
|
const builtSchema = await (0, schema_1.schema)();
|
|
76
78
|
const httpServer = (0, http_1.createServer)(app.callback());
|
|
77
|
-
const
|
|
79
|
+
const websocketServer = new ws_2.WebSocketServer({
|
|
80
|
+
server: httpServer,
|
|
81
|
+
path: '/graphql'
|
|
82
|
+
});
|
|
83
|
+
// Save the returned server's info so we can shut down this server later
|
|
84
|
+
const serverCleanup = (0, ws_1.useServer)({
|
|
78
85
|
schema: builtSchema,
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
async
|
|
83
|
-
var {
|
|
86
|
+
context: async (ctx, msg, args) => {
|
|
87
|
+
return ctx['context'];
|
|
88
|
+
},
|
|
89
|
+
onConnect: async (ctx) => {
|
|
90
|
+
var { extra, connectionParams } = ctx;
|
|
91
|
+
var { request } = extra;
|
|
84
92
|
var url = new URL((connectionParams['headers'] || connectionParams).referer);
|
|
85
93
|
var accessToken = url.searchParams.get('access_token');
|
|
86
94
|
connectionParams['headers']['authorization'] = accessToken;
|
|
87
95
|
request.headers = Object.assign(Object.assign({}, request.headers), (connectionParams['headers'] || connectionParams));
|
|
88
|
-
/* in case connect error(like a authentication error) just throw exception */
|
|
89
96
|
var koacontext = await app.createContext(request, {});
|
|
90
97
|
koacontext['state'] = {};
|
|
98
|
+
/* in case connect error(like a authentication error) just throw exception */
|
|
91
99
|
var middlewares = [...subscriptionMiddleware];
|
|
92
100
|
const fn = co_1.default.wrap((0, koa_compose_1.default)(middlewares));
|
|
93
101
|
await fn(koacontext);
|
|
94
|
-
return koacontext;
|
|
102
|
+
return (ctx['context'] = koacontext);
|
|
103
|
+
},
|
|
104
|
+
onDisconnect(ctx, code, reason) {
|
|
105
|
+
console.log('Disconnected!');
|
|
106
|
+
},
|
|
107
|
+
onError(ctx, msg, errors) {
|
|
108
|
+
console.error(msg, errors);
|
|
95
109
|
}
|
|
96
|
-
},
|
|
97
|
-
server: httpServer,
|
|
98
|
-
path: '/subscriptions'
|
|
99
|
-
});
|
|
110
|
+
}, websocketServer);
|
|
100
111
|
const server = new apollo_server_koa_1.ApolloServer({
|
|
101
112
|
schema: builtSchema,
|
|
102
113
|
formatError: error => {
|
|
@@ -117,18 +128,19 @@ const bootstrap = async () => {
|
|
|
117
128
|
}
|
|
118
129
|
},
|
|
119
130
|
plugins: [
|
|
131
|
+
(0, apollo_server_core_1.ApolloServerPluginDrainHttpServer)({ httpServer }),
|
|
120
132
|
{
|
|
121
133
|
async serverWillStart() {
|
|
122
134
|
return {
|
|
123
135
|
async drainServer() {
|
|
124
|
-
|
|
136
|
+
await serverCleanup.dispose();
|
|
125
137
|
}
|
|
126
138
|
};
|
|
127
139
|
}
|
|
128
140
|
}
|
|
129
141
|
]
|
|
130
142
|
});
|
|
131
|
-
|
|
143
|
+
server.start();
|
|
132
144
|
graphql_local_client_1.GraphqlLocalClient.init(builtSchema, app);
|
|
133
145
|
env_1.orderedModuleNames.forEach(name => {
|
|
134
146
|
const { initMiddlewares } = (0, env_1.loader)(name);
|
|
@@ -144,7 +156,7 @@ const bootstrap = async () => {
|
|
|
144
156
|
debug: false
|
|
145
157
|
});
|
|
146
158
|
app.use((0, koa_bodyparser_1.default)(bodyParserOption));
|
|
147
|
-
app.use((0,
|
|
159
|
+
app.use((0, graphqlUploadKoa_js_1.default)(fileUploadOption));
|
|
148
160
|
app.use(server.getMiddleware({
|
|
149
161
|
path: '/graphql'
|
|
150
162
|
}));
|
|
@@ -162,14 +174,14 @@ const bootstrap = async () => {
|
|
|
162
174
|
.use(routers_1.domainPublicRouter.allowedMethods())
|
|
163
175
|
.use(routers_1.domainPrivateRouter.routes())
|
|
164
176
|
.use(routers_1.domainPrivateRouter.allowedMethods());
|
|
165
|
-
/* should
|
|
177
|
+
/* should follow this order : history-fallback => koaStatic */
|
|
166
178
|
app.use((0, koa2_connect_history_api_fallback_1.historyApiFallback)({ whiteList: [] }));
|
|
167
179
|
app.use((0, koa_static_1.default)(path.join(process.cwd(), 'dist-client'), {
|
|
168
180
|
index: 'index.html'
|
|
169
181
|
}));
|
|
170
182
|
httpServer.listen({ port: PORT }, () => {
|
|
171
183
|
env_1.logger.info(`🚀 Server ready at http://0.0.0.0:${PORT}${server.graphqlPath}`);
|
|
172
|
-
env_1.logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${
|
|
184
|
+
env_1.logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${server.graphqlPath}`);
|
|
173
185
|
process.emit('bootstrap-module-start', { app, config: env_1.config, builtSchema, httpServer });
|
|
174
186
|
});
|
|
175
187
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../server/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../server/server.ts"],"names":[],"mappings":";AAAA,4BAA4B;;;;;AAE5B,4DAA4D;AAC5D,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAA;AACnC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;AAE1B,2DAAsH;AACtH,yDAAgD;AAChD,kDAA+B;AAC/B,6FAAiE;AACjE,8CAAiD;AACjD,+BAAmC;AACnC,8CAAqB;AACrB,oEAA0C;AAC1C,oDAAuB;AACvB,4DAAkC;AAClC,8DAAiC;AACjC,yFAAsE;AACtE,2BAAoC;AACpC,4CAAmB;AAEnB,qDAA4B;AAC5B,6CAAgF;AAEhF,iEAA2D;AAC3D,sDAA6D;AAC7D,uCAA4G;AAC5G,qCAAiC;AAEjC,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,KAAK,CAAC,EAAE;IACtC,YAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAEnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC,CAAC,CAAA;AAEF,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,IAAI,EAAE,CAAA;AAEnD,MAAM,gBAAgB,GAAG;IACvB,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,MAAM;IAC1C,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,MAAM;IAC1C,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,MAAM;CAC3C,CAAA;AAED,MAAM,UAAU,GAAG,YAAM,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;AACjD,MAAM,gBAAgB,GAAG;IACvB,WAAW,EAAE,eAAW,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,eAAW,CAAC,KAAK,CAAC,MAAM,CAAC;IACnF,QAAQ,EAAE,UAAU,CAAC,QAAQ,IAAI,EAAE;CACpC,CAAA;AAED,eAAe;AACf,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAC3B,MAAM,IAAA,8BAAmB,GAAE,CAAA;IAE3B,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAA;IAErB,GAAG,CAAC,GAAG,CACL,IAAA,cAAI,EAAC;QACH,MAAM,EAAE,UAAU,GAAG;YACnB,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAA;QAC1C,CAAC;QACD,aAAa,EAAE,CAAC,kBAAkB,EAAE,sBAAsB,CAAC;QAC3D,MAAM,EAAE,CAAC;QACT,WAAW,EAAE,IAAI;QACjB,6DAA6D;QAC7D,YAAY,EAAE,CAAC,cAAc,EAAE,eAAe,EAAE,QAAQ,CAAC;KAC1D,CAAC,CACH,CAAA;IAED,MAAM,SAAS,GAAG,YAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IACzC,MAAM,SAAS,GAAG,YAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IAEzC,IAAI,SAAS,IAAI,SAAS,EAAE;QAC1B,GAAG,CAAC,GAAG,CACL,IAAA,gBAAE,EAAC;YACD,SAAS;YACT,SAAS;YACT,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;gBAC3B,GAAG,CAAC,MAAM,GAAG,GAAG,CAAA;YAClB,CAAC;SACF,CAAC,CACH,CAAA;KACF;IAED,IAAI,sBAAsB,GAAG,EAAE,CAAA;IAC/B,OAAO,CAAC,IAAI,CAAC,+BAAsC,EAAE,GAAG,EAAE,sBAAsB,CAAC,CAAA;IAEjF,MAAM,WAAW,GAAG,MAAM,IAAA,eAAM,GAAE,CAAA;IAElC,MAAM,UAAU,GAAG,IAAA,mBAAY,EAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC/C,MAAM,eAAe,GAAG,IAAI,oBAAe,CAAC;QAC1C,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,UAAU;KACjB,CAAC,CAAA;IAEF,wEAAwE;IACxE,MAAM,aAAa,GAAG,IAAA,cAAS,EAC7B;QACE,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAA;QACvB,CAAC;QACD,SAAS,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;YACrB,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,GAAG,CAAA;YACrC,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;YAEvB,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC,CAAE,gBAAgB,CAAC,SAAS,CAAS,IAAI,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAA;YACrF,IAAI,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;YACtD,gBAAgB,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC,GAAG,WAAW,CAAA;YAE1D,OAAO,CAAC,OAAO,mCACV,OAAO,CAAC,OAAO,GACf,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAK,gBAAwB,CAAC,CAC9D,CAAA;YAED,IAAI,UAAU,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,EAAS,CAAC,CAAA;YAC5D,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,CAAA;YAExB,6EAA6E;YAC7E,IAAI,WAAW,GAAG,CAAC,GAAG,sBAAsB,CAAC,CAAA;YAC7C,MAAM,EAAE,GAAG,YAAE,CAAC,IAAI,CAAC,IAAA,qBAAO,EAAC,WAAW,CAAC,CAAC,CAAA;YAExC,MAAM,EAAE,CAAC,UAAU,CAAC,CAAA;YAEpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,CAAA;QACtC,CAAC;QACD,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM;YAC5B,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;QAC9B,CAAC;QACD,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM;YACtB,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAC5B,CAAC;KACF,EACD,eAAe,CAChB,CAAA;IAED,MAAM,MAAM,GAAG,IAAI,gCAAY,CAAC;QAC9B,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,KAAK,CAAC,EAAE;YACnB,YAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACnB,OAAO,KAAK,CAAA;QACd,CAAC;QACD,cAAc,EAAE,QAAQ,CAAC,EAAE;YACzB,gEAAgE;YAChE,OAAO,QAAQ,CAAA;QACjB,CAAC;QACD,aAAa,EAAE,IAAI;QACnB,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE;YACrC,IAAI,UAAU,EAAE;gBACd,OAAO,UAAU,CAAC,OAAO,CAAA;aAC1B;iBAAM;gBACL,OAAO,GAAG,CAAA;aACX;QACH,CAAC;QACD,OAAO,EAAE;YACP,IAAA,sDAAiC,EAAC,EAAE,UAAU,EAAE,CAAC;YACjD;gBACE,KAAK,CAAC,eAAe;oBACnB,OAAO;wBACL,KAAK,CAAC,WAAW;4BACf,MAAM,aAAa,CAAC,OAAO,EAAE,CAAA;wBAC/B,CAAC;qBACF,CAAA;gBACH,CAAC;aACF;SACF;KACF,CAAC,CAAA;IAEF,MAAM,CAAC,KAAK,EAAE,CAAA;IAEd,yCAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;IAEzC,wBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAChC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,YAAM,EAAC,IAAI,CAAC,CAAA;QACxC,eAAe,IAAI,eAAe,CAAC,GAAG,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;IACpD,MAAM,CAAC,GAAG,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,oBAAoB,IAAI,EAAE;QAChC,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,KAAK;KACb,CAAC,CAAA;IAEF,GAAG,CAAC,GAAG,CAAC,IAAA,wBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAA;IACxC,GAAG,CAAC,GAAG,CAAC,IAAA,6BAAgB,EAAC,gBAAgB,CAAC,CAAC,CAAA;IAE3C,GAAG,CAAC,GAAG,CACL,MAAM,CAAC,aAAa,CAAC;QACnB,IAAI,EAAE,UAAU;KACjB,CAAC,CACH,CAAA;IAED,aAAa;IACb,OAAO,CAAC,IAAI,CAAC,sCAA6C,EAAE,GAAG,EAAE,4BAAkB,CAAC,CAAA;IACpF,OAAO,CAAC,IAAI,CAAC,uCAA8C,EAAE,GAAG,EAAE,6BAAmB,CAAC,CAAA;IACtF,OAAO,CAAC,IAAI,CAAC,sCAA6C,EAAE,GAAG,EAAE,4BAAkB,CAAC,CAAA;IACpF,OAAO,CAAC,IAAI,CAAC,uCAA8C,EAAE,GAAG,EAAE,6BAAmB,CAAC,CAAA;IAEtF,GAAG;SACA,GAAG,CAAC,4BAAkB,CAAC,MAAM,EAAE,CAAC;SAChC,GAAG,CAAC,4BAAkB,CAAC,cAAc,EAAE,CAAC;SACxC,GAAG,CAAC,6BAAmB,CAAC,MAAM,EAAE,CAAC;SACjC,GAAG,CAAC,6BAAmB,CAAC,cAAc,EAAE,CAAC;SACzC,GAAG,CAAC,4BAAkB,CAAC,MAAM,EAAE,CAAC;SAChC,GAAG,CAAC,4BAAkB,CAAC,cAAc,EAAE,CAAC;SACxC,GAAG,CAAC,6BAAmB,CAAC,MAAM,EAAE,CAAC;SACjC,GAAG,CAAC,6BAAmB,CAAC,cAAc,EAAE,CAAC,CAAA;IAE5C,8DAA8D;IAC9D,GAAG,CAAC,GAAG,CAAC,IAAA,sDAAkB,EAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;IAE9C,GAAG,CAAC,GAAG,CACL,IAAA,oBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE;QACjD,KAAK,EAAE,YAAY;KACpB,CAAC,CACH,CAAA;IAED,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE;QACrC,YAAM,CAAC,IAAI,CAAC,qCAAqC,IAAI,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;QAC7E,YAAM,CAAC,IAAI,CAAC,0CAA0C,IAAI,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;QAElF,OAAO,CAAC,IAAI,CAAC,wBAA+B,EAAE,EAAE,GAAG,EAAE,MAAM,EAAN,YAAM,EAAE,WAAW,EAAE,UAAU,EAAS,CAAC,CAAA;IAChG,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,SAAS,EAAE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scalar-date.js","sourceRoot":"","sources":["../../../server/service/common-types/scalar-date.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AAEpC,QAAA,UAAU,GAAG,IAAI,2BAAiB,CAAC;IAC9C,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,yBAAyB;IACtC,UAAU,CAAC,KAAK;QACd,OAAO,IAAI,IAAI,CAAC,KAAwB,CAAC,CAAA,CAAC,wBAAwB;IACpE,CAAC;IACD,SAAS,CAAC,KAAK;QACb;;;WAGG;QACH,OAAO,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"scalar-date.js","sourceRoot":"","sources":["../../../server/service/common-types/scalar-date.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AAEpC,QAAA,UAAU,GAAG,IAAI,2BAAiB,CAAC;IAC9C,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,yBAAyB;IACtC,UAAU,CAAC,KAAK;QACd,OAAO,IAAI,IAAI,CAAC,KAAwB,CAAC,CAAA,CAAC,wBAAwB;IACpE,CAAC;IACD,SAAS,CAAC,KAAK;QACb;;;WAGG;QACH,OAAO,IAAI,IAAI,CAAC,KAAY,CAAC,CAAC,OAAO,EAAE,CAAA,CAAC,2BAA2B;IACrE,CAAC;IACD,YAAY,CAAC,GAAG;QACd,IAAI,GAAG,CAAC,IAAI,KAAK,cAAI,CAAC,GAAG,EAAE;YACzB,OAAO,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA,CAAC,uCAAuC;SACpE;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/shell",
|
|
3
|
-
"version": "5.0.0-zeta.
|
|
3
|
+
"version": "5.0.0-zeta.21",
|
|
4
4
|
"description": "Core module for framework",
|
|
5
5
|
"bin": {
|
|
6
6
|
"things-factory": "bin/things-factory",
|
|
@@ -45,21 +45,21 @@
|
|
|
45
45
|
"@material/mwc-icon-button": "^0.26.1",
|
|
46
46
|
"@material/mwc-slider": "^0.26.1",
|
|
47
47
|
"@material/mwc-textfield": "^0.26.1",
|
|
48
|
-
"@operato/board": "^1.0.0-beta.
|
|
49
|
-
"@operato/graphql": "^1.0.0-beta.
|
|
50
|
-
"@operato/help": "^1.0.0-beta.
|
|
51
|
-
"@operato/layout": "^1.0.0-beta.
|
|
52
|
-
"@operato/shell": "^1.0.0-beta.
|
|
53
|
-
"@operato/utils": "^1.0.0-beta.
|
|
54
|
-
"@things-factory/ejs-remote": "^5.0.0-zeta.
|
|
55
|
-
"@things-factory/env": "^5.0.0-zeta.
|
|
56
|
-
"@things-factory/styles": "^5.0.0-zeta.
|
|
57
|
-
"@things-factory/utils": "^5.0.0-zeta.
|
|
48
|
+
"@operato/board": "^1.0.0-beta.48",
|
|
49
|
+
"@operato/graphql": "^1.0.0-beta.48",
|
|
50
|
+
"@operato/help": "^1.0.0-beta.48",
|
|
51
|
+
"@operato/layout": "^1.0.0-beta.48",
|
|
52
|
+
"@operato/shell": "^1.0.0-beta.48",
|
|
53
|
+
"@operato/utils": "^1.0.0-beta.48",
|
|
54
|
+
"@things-factory/ejs-remote": "^5.0.0-zeta.21",
|
|
55
|
+
"@things-factory/env": "^5.0.0-zeta.21",
|
|
56
|
+
"@things-factory/styles": "^5.0.0-zeta.21",
|
|
57
|
+
"@things-factory/utils": "^5.0.0-zeta.21",
|
|
58
58
|
"@webcomponents/webcomponentsjs": "^2.6.0",
|
|
59
59
|
"@webpack-contrib/schema-utils": "^1.0.0-beta.0",
|
|
60
|
-
"apollo-server-core": "^3.
|
|
61
|
-
"apollo-server-koa": "^3.
|
|
62
|
-
"apollo-server-types": "^3.6.
|
|
60
|
+
"apollo-server-core": "^3.10.0",
|
|
61
|
+
"apollo-server-koa": "^3.10.0",
|
|
62
|
+
"apollo-server-types": "^3.6.2",
|
|
63
63
|
"apollo-upload-client": "^17.0.0",
|
|
64
64
|
"args": "^5.0.0",
|
|
65
65
|
"broadcastchannel-polyfill": "^1.0.1",
|
|
@@ -71,12 +71,15 @@
|
|
|
71
71
|
"firebase": "^8.0.1",
|
|
72
72
|
"fs-extra": "^9.0.1",
|
|
73
73
|
"glob": "^7.1.6",
|
|
74
|
-
"graphql": "^
|
|
74
|
+
"graphql": "^16.5.0",
|
|
75
|
+
"graphql-language-service-interface": "^2.10.2",
|
|
76
|
+
"graphql-language-service-parser": "^1.10.4",
|
|
77
|
+
"graphql-language-service-utils": "^2.7.1",
|
|
75
78
|
"graphql-mqtt-subscriptions": "^1.2.0",
|
|
76
|
-
"graphql-redis-subscriptions": "^2.
|
|
79
|
+
"graphql-redis-subscriptions": "^2.5.0",
|
|
77
80
|
"graphql-subscriptions": "^2.0.0",
|
|
78
81
|
"graphql-tag": "^2.12.6",
|
|
79
|
-
"graphql-upload": "^
|
|
82
|
+
"graphql-upload": "^15.0.2",
|
|
80
83
|
"graphql-ws": "^5.9.1",
|
|
81
84
|
"haunted": "^5.0.0",
|
|
82
85
|
"html-webpack-plugin": "^5.5.0",
|
|
@@ -92,7 +95,6 @@
|
|
|
92
95
|
"koa-router": "^7.4.0",
|
|
93
96
|
"koa-send": "^5.0.0",
|
|
94
97
|
"koa-static": "^5.0.0",
|
|
95
|
-
"koa-unless": "^1.0.7",
|
|
96
98
|
"koa2-connect-history-api-fallback": "^0.1.2",
|
|
97
99
|
"lit": "^2.2.7",
|
|
98
100
|
"loader-utils": "^2.0.0",
|
|
@@ -112,15 +114,14 @@
|
|
|
112
114
|
"reselect": "^4.0.0",
|
|
113
115
|
"sass": "^1.50.1",
|
|
114
116
|
"scrollbooster": "^3.0.2",
|
|
115
|
-
"subscriptions-transport-ws": "^0.11.0",
|
|
116
117
|
"sweetalert2": "^10.9.0",
|
|
117
|
-
"type-graphql": "
|
|
118
|
+
"type-graphql": "npm:type-graphql-v2-fork@2.0.0-alpha2",
|
|
118
119
|
"typeorm": "^0.2.45",
|
|
119
120
|
"uuid": "^3.4.0",
|
|
120
121
|
"web-animations-js": "^2.3.2",
|
|
121
122
|
"web-push": "^3.5.0",
|
|
122
123
|
"webfontloader": "^1.6.28",
|
|
123
|
-
"ws": "^8.8.
|
|
124
|
+
"ws": "^8.8.1"
|
|
124
125
|
},
|
|
125
126
|
"optionalDependencies": {
|
|
126
127
|
"better-sqlite3": "^7.5.3",
|
|
@@ -130,5 +131,5 @@
|
|
|
130
131
|
"pg": "^8.7.3",
|
|
131
132
|
"sqlite3": "^5.0.8"
|
|
132
133
|
},
|
|
133
|
-
"gitHead": "
|
|
134
|
+
"gitHead": "a63dd238090dc87e77ea07dac34e818d31a277f2"
|
|
134
135
|
}
|
package/server/schema.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { loader, orderedModuleNames } from '@things-factory/env'
|
|
2
|
-
|
|
3
1
|
import { GraphQLSchema } from 'graphql'
|
|
4
|
-
import { GraphQLUpload } from 'graphql-upload'
|
|
2
|
+
import { GraphQLUpload } from 'graphql-upload/GraphQLUpload.js'
|
|
5
3
|
import { buildSchema } from 'type-graphql'
|
|
6
|
-
|
|
4
|
+
|
|
7
5
|
import { mergeSchemas } from '@graphql-tools/schema'
|
|
6
|
+
import { loader, orderedModuleNames } from '@things-factory/env'
|
|
7
|
+
import { deepMerge } from '@things-factory/utils'
|
|
8
8
|
|
|
9
9
|
export async function schema() {
|
|
10
10
|
const schemas = orderedModuleNames
|
package/server/server-dev.ts
CHANGED
|
@@ -1,24 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// ts-import-sorter: disable
|
|
2
|
+
|
|
3
|
+
/* following 2 lines should be located in top of the file */
|
|
3
4
|
process.env.NODE_ENV = 'development'
|
|
4
5
|
process.setMaxListeners(0)
|
|
5
6
|
|
|
6
|
-
|
|
7
|
-
import { ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
|
|
7
|
+
import { ApolloServerPluginDrainHttpServer, ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
|
|
8
8
|
import { ApolloServer } from 'apollo-server-koa'
|
|
9
9
|
import bytesFormat from 'bytes'
|
|
10
|
-
import
|
|
11
|
-
import {
|
|
12
|
-
import { graphqlUploadKoa } from 'graphql-upload'
|
|
10
|
+
import graphqlUploadKoa from 'graphql-upload/graphqlUploadKoa.js'
|
|
11
|
+
import { useServer } from 'graphql-ws/lib/use/ws'
|
|
13
12
|
import { createServer } from 'http'
|
|
14
13
|
import Koa from 'koa'
|
|
15
14
|
import koaBodyParser from 'koa-bodyparser'
|
|
16
|
-
import compose from 'koa-compose'
|
|
17
15
|
import ip from 'koa-ip'
|
|
18
16
|
import koaStatic from 'koa-static'
|
|
17
|
+
import compose from 'koa-compose'
|
|
19
18
|
import { historyApiFallback } from 'koa2-connect-history-api-fallback'
|
|
20
|
-
|
|
21
|
-
import
|
|
19
|
+
import { WebSocketServer } from 'ws'
|
|
20
|
+
import co from 'co'
|
|
22
21
|
|
|
23
22
|
import koaWebpack from '@hatiolab/koa-webpack'
|
|
24
23
|
import cors from '@koa/cors'
|
|
@@ -111,23 +110,29 @@ const bootstrap = async () => {
|
|
|
111
110
|
const builtSchema = await schema()
|
|
112
111
|
|
|
113
112
|
const httpServer = createServer(app.callback())
|
|
113
|
+
const websocketServer = new WebSocketServer({
|
|
114
|
+
server: httpServer,
|
|
115
|
+
path: '/graphql'
|
|
116
|
+
})
|
|
114
117
|
|
|
115
|
-
|
|
118
|
+
// Save the returned server's info so we can shut down this server later
|
|
119
|
+
const serverCleanup = useServer(
|
|
116
120
|
{
|
|
117
121
|
schema: builtSchema,
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
var {
|
|
122
|
+
context: async (ctx, msg, args) => {
|
|
123
|
+
return ctx['context']
|
|
124
|
+
},
|
|
125
|
+
onConnect: async ctx => {
|
|
126
|
+
var { extra, connectionParams } = ctx
|
|
127
|
+
var { request } = extra
|
|
123
128
|
|
|
124
|
-
var url = new URL((connectionParams['headers'] || connectionParams).referer)
|
|
129
|
+
var url = new URL(((connectionParams['headers'] as any) || connectionParams).referer)
|
|
125
130
|
var accessToken = url.searchParams.get('access_token')
|
|
126
131
|
connectionParams['headers']['authorization'] = accessToken
|
|
127
132
|
|
|
128
133
|
request.headers = {
|
|
129
134
|
...request.headers,
|
|
130
|
-
...(connectionParams['headers'] || connectionParams)
|
|
135
|
+
...(connectionParams['headers'] || (connectionParams as any))
|
|
131
136
|
}
|
|
132
137
|
|
|
133
138
|
var koacontext = await app.createContext(request, {} as any)
|
|
@@ -139,13 +144,16 @@ const bootstrap = async () => {
|
|
|
139
144
|
|
|
140
145
|
await fn(koacontext)
|
|
141
146
|
|
|
142
|
-
return koacontext
|
|
147
|
+
return (ctx['context'] = koacontext)
|
|
148
|
+
},
|
|
149
|
+
onDisconnect(ctx, code, reason) {
|
|
150
|
+
console.log('Disconnected!')
|
|
151
|
+
},
|
|
152
|
+
onError(ctx, msg, errors) {
|
|
153
|
+
console.error(msg, errors)
|
|
143
154
|
}
|
|
144
155
|
},
|
|
145
|
-
|
|
146
|
-
server: httpServer,
|
|
147
|
-
path: '/subscriptions'
|
|
148
|
-
}
|
|
156
|
+
websocketServer
|
|
149
157
|
)
|
|
150
158
|
|
|
151
159
|
const server = new ApolloServer({
|
|
@@ -155,7 +163,6 @@ const bootstrap = async () => {
|
|
|
155
163
|
return error
|
|
156
164
|
},
|
|
157
165
|
formatResponse: response => {
|
|
158
|
-
// logger.info('response %s', JSON.stringify(response, null, 2))
|
|
159
166
|
return response
|
|
160
167
|
},
|
|
161
168
|
context: async ({ connection, ctx }) => {
|
|
@@ -171,11 +178,12 @@ const bootstrap = async () => {
|
|
|
171
178
|
'request.credentials': 'same-origin'
|
|
172
179
|
}
|
|
173
180
|
}),
|
|
181
|
+
ApolloServerPluginDrainHttpServer({ httpServer }),
|
|
174
182
|
{
|
|
175
183
|
async serverWillStart() {
|
|
176
184
|
return {
|
|
177
185
|
async drainServer() {
|
|
178
|
-
|
|
186
|
+
await serverCleanup.dispose()
|
|
179
187
|
}
|
|
180
188
|
}
|
|
181
189
|
}
|
|
@@ -241,7 +249,7 @@ const bootstrap = async () => {
|
|
|
241
249
|
.use(domainPrivateRouter.routes())
|
|
242
250
|
.use(domainPrivateRouter.allowedMethods())
|
|
243
251
|
|
|
244
|
-
/* should
|
|
252
|
+
/* should follow this order : history-fallback => webpack-middleware => koaStatic */
|
|
245
253
|
app.use(historyApiFallback({ whiteList: [] }))
|
|
246
254
|
|
|
247
255
|
app.use(middleware)
|
|
@@ -254,7 +262,7 @@ const bootstrap = async () => {
|
|
|
254
262
|
|
|
255
263
|
httpServer.listen({ port: PORT }, () => {
|
|
256
264
|
logger.info(`🚀 Server ready at http://0.0.0.0:${PORT}${server.graphqlPath}`)
|
|
257
|
-
logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${
|
|
265
|
+
logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${server.graphqlPath}`)
|
|
258
266
|
|
|
259
267
|
process.emit('bootstrap-module-start' as any, { app, config, builtSchema, httpServer } as any)
|
|
260
268
|
})
|
package/server/server.ts
CHANGED
|
@@ -1,20 +1,23 @@
|
|
|
1
|
-
//
|
|
1
|
+
// ts-import-sorter: disable
|
|
2
|
+
|
|
3
|
+
/* following 2 lines should be located in top of the file */
|
|
2
4
|
process.env.NODE_ENV = 'production'
|
|
3
5
|
process.setMaxListeners(0)
|
|
4
6
|
|
|
7
|
+
import { ApolloServerPluginDrainHttpServer, ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
|
|
5
8
|
import { ApolloServer } from 'apollo-server-koa'
|
|
6
9
|
import bytesFormat from 'bytes'
|
|
7
|
-
import
|
|
8
|
-
import {
|
|
9
|
-
import { graphqlUploadKoa } from 'graphql-upload'
|
|
10
|
+
import graphqlUploadKoa from 'graphql-upload/graphqlUploadKoa.js'
|
|
11
|
+
import { useServer } from 'graphql-ws/lib/use/ws'
|
|
10
12
|
import { createServer } from 'http'
|
|
11
13
|
import Koa from 'koa'
|
|
12
14
|
import koaBodyParser from 'koa-bodyparser'
|
|
13
|
-
import compose from 'koa-compose'
|
|
14
15
|
import ip from 'koa-ip'
|
|
15
16
|
import koaStatic from 'koa-static'
|
|
17
|
+
import compose from 'koa-compose'
|
|
16
18
|
import { historyApiFallback } from 'koa2-connect-history-api-fallback'
|
|
17
|
-
import {
|
|
19
|
+
import { WebSocketServer } from 'ws'
|
|
20
|
+
import co from 'co'
|
|
18
21
|
|
|
19
22
|
import cors from '@koa/cors'
|
|
20
23
|
import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
|
|
@@ -53,6 +56,7 @@ const fileUploadOption = {
|
|
|
53
56
|
maxFileSize: bytesFormat.parse(fileUpload.maxFileSize) || bytesFormat.parse('10mb'),
|
|
54
57
|
maxFiles: fileUpload.maxFiles || 10
|
|
55
58
|
}
|
|
59
|
+
|
|
56
60
|
/* bootstrap */
|
|
57
61
|
const bootstrap = async () => {
|
|
58
62
|
await databaseInitializer()
|
|
@@ -93,41 +97,50 @@ const bootstrap = async () => {
|
|
|
93
97
|
const builtSchema = await schema()
|
|
94
98
|
|
|
95
99
|
const httpServer = createServer(app.callback())
|
|
100
|
+
const websocketServer = new WebSocketServer({
|
|
101
|
+
server: httpServer,
|
|
102
|
+
path: '/graphql'
|
|
103
|
+
})
|
|
96
104
|
|
|
97
|
-
|
|
105
|
+
// Save the returned server's info so we can shut down this server later
|
|
106
|
+
const serverCleanup = useServer(
|
|
98
107
|
{
|
|
99
108
|
schema: builtSchema,
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
var {
|
|
109
|
+
context: async (ctx, msg, args) => {
|
|
110
|
+
return ctx['context']
|
|
111
|
+
},
|
|
112
|
+
onConnect: async ctx => {
|
|
113
|
+
var { extra, connectionParams } = ctx
|
|
114
|
+
var { request } = extra
|
|
105
115
|
|
|
106
|
-
var url = new URL((connectionParams['headers'] || connectionParams).referer)
|
|
116
|
+
var url = new URL(((connectionParams['headers'] as any) || connectionParams).referer)
|
|
107
117
|
var accessToken = url.searchParams.get('access_token')
|
|
108
118
|
connectionParams['headers']['authorization'] = accessToken
|
|
109
119
|
|
|
110
120
|
request.headers = {
|
|
111
121
|
...request.headers,
|
|
112
|
-
...(connectionParams['headers'] || connectionParams)
|
|
122
|
+
...(connectionParams['headers'] || (connectionParams as any))
|
|
113
123
|
}
|
|
114
124
|
|
|
115
|
-
/* in case connect error(like a authentication error) just throw exception */
|
|
116
125
|
var koacontext = await app.createContext(request, {} as any)
|
|
117
126
|
koacontext['state'] = {}
|
|
118
127
|
|
|
128
|
+
/* in case connect error(like a authentication error) just throw exception */
|
|
119
129
|
var middlewares = [...subscriptionMiddleware]
|
|
120
130
|
const fn = co.wrap(compose(middlewares))
|
|
121
131
|
|
|
122
132
|
await fn(koacontext)
|
|
123
133
|
|
|
124
|
-
return koacontext
|
|
134
|
+
return (ctx['context'] = koacontext)
|
|
135
|
+
},
|
|
136
|
+
onDisconnect(ctx, code, reason) {
|
|
137
|
+
console.log('Disconnected!')
|
|
138
|
+
},
|
|
139
|
+
onError(ctx, msg, errors) {
|
|
140
|
+
console.error(msg, errors)
|
|
125
141
|
}
|
|
126
142
|
},
|
|
127
|
-
|
|
128
|
-
server: httpServer,
|
|
129
|
-
path: '/subscriptions'
|
|
130
|
-
}
|
|
143
|
+
websocketServer
|
|
131
144
|
)
|
|
132
145
|
|
|
133
146
|
const server = new ApolloServer({
|
|
@@ -149,11 +162,12 @@ const bootstrap = async () => {
|
|
|
149
162
|
}
|
|
150
163
|
},
|
|
151
164
|
plugins: [
|
|
165
|
+
ApolloServerPluginDrainHttpServer({ httpServer }),
|
|
152
166
|
{
|
|
153
167
|
async serverWillStart() {
|
|
154
168
|
return {
|
|
155
169
|
async drainServer() {
|
|
156
|
-
|
|
170
|
+
await serverCleanup.dispose()
|
|
157
171
|
}
|
|
158
172
|
}
|
|
159
173
|
}
|
|
@@ -161,7 +175,7 @@ const bootstrap = async () => {
|
|
|
161
175
|
]
|
|
162
176
|
})
|
|
163
177
|
|
|
164
|
-
|
|
178
|
+
server.start()
|
|
165
179
|
|
|
166
180
|
GraphqlLocalClient.init(builtSchema, app)
|
|
167
181
|
|
|
@@ -205,7 +219,7 @@ const bootstrap = async () => {
|
|
|
205
219
|
.use(domainPrivateRouter.routes())
|
|
206
220
|
.use(domainPrivateRouter.allowedMethods())
|
|
207
221
|
|
|
208
|
-
/* should
|
|
222
|
+
/* should follow this order : history-fallback => koaStatic */
|
|
209
223
|
app.use(historyApiFallback({ whiteList: [] }))
|
|
210
224
|
|
|
211
225
|
app.use(
|
|
@@ -216,7 +230,7 @@ const bootstrap = async () => {
|
|
|
216
230
|
|
|
217
231
|
httpServer.listen({ port: PORT }, () => {
|
|
218
232
|
logger.info(`🚀 Server ready at http://0.0.0.0:${PORT}${server.graphqlPath}`)
|
|
219
|
-
logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${
|
|
233
|
+
logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}${server.graphqlPath}`)
|
|
220
234
|
|
|
221
235
|
process.emit('bootstrap-module-start' as any, { app, config, builtSchema, httpServer } as any)
|
|
222
236
|
})
|
|
@@ -11,7 +11,7 @@ export const ScalarDate = new GraphQLScalarType({
|
|
|
11
11
|
* Note: Allow value to be date only like "2021-01-31" to be serialize before passing data to clientside for TypeGraphql.
|
|
12
12
|
* Usage: When database column datatype is "date" and data do not contain any time component.
|
|
13
13
|
*/
|
|
14
|
-
return new Date(value).getTime() // value sent to the client
|
|
14
|
+
return new Date(value as any).getTime() // value sent to the client
|
|
15
15
|
},
|
|
16
16
|
parseLiteral(ast) {
|
|
17
17
|
if (ast.kind === Kind.INT) {
|