@things-factory/shell 5.0.0-alpha.3 → 5.0.0-alpha.30
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/themes/tooltip-theme.css +4 -3
- package/dist-server/middlewares/index.js +2 -2
- package/dist-server/middlewares/index.js.map +1 -1
- package/dist-server/pubsub.js +2 -2
- package/dist-server/pubsub.js.map +1 -1
- package/dist-server/server-dev.js +21 -15
- package/dist-server/server-dev.js.map +1 -1
- package/dist-server/server.js +18 -13
- package/dist-server/server.js.map +1 -1
- package/dist-server/utils/list-params-converter.js +12 -12
- package/dist-server/utils/list-params-converter.js.map +1 -1
- package/package.json +25 -25
- package/server/middlewares/index.ts +3 -2
- package/server/pubsub.ts +3 -3
- package/server/server-dev.ts +32 -24
- package/server/server.ts +29 -21
- package/server/utils/list-params-converter.ts +32 -22
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
body {
|
|
2
|
-
|
|
3
|
-
--tooltip-padding: 3px 4px 2px 4px;
|
|
2
|
+
--tooltip-padding: 4px 4px 4px 4px;
|
|
4
3
|
--tooltip-background-color: rgba(0, 0, 0, 0.7);
|
|
5
4
|
--tooltip-font: bold 11px var(--theme-font);
|
|
5
|
+
/*
|
|
6
6
|
--tooltip-left-positon-left: auto;
|
|
7
7
|
--tooltip-left-position-top: 7px;
|
|
8
8
|
--tooltip-left-position-right: 110%;
|
|
9
|
-
--tooltip-left-position-animation: tooltip-left 0.3s ease-out 0s 1 normal;
|
|
9
|
+
--tooltip-left-position-animation: tooltip-left 0.3s ease-out 0s 1 normal;
|
|
10
|
+
*/
|
|
10
11
|
}
|
|
@@ -32,8 +32,8 @@ function initMiddlewares(app) {
|
|
|
32
32
|
await next();
|
|
33
33
|
}
|
|
34
34
|
catch (err) {
|
|
35
|
-
context.status = err.status || 500;
|
|
36
|
-
context.body = err.message;
|
|
35
|
+
context.status = (err === null || err === void 0 ? void 0 : err.status) || 500;
|
|
36
|
+
context.body = err === null || err === void 0 ? void 0 : err.message;
|
|
37
37
|
// emitting error to app.on('error', ...)
|
|
38
38
|
context.app.emit('error', err, context);
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/middlewares/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAAoD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/middlewares/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAAoD;AAEpD,2DAAsD;AAEtD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,iCAAiC,CAAC,CAAA;AAEjE,SAAgB,eAAe,CAAC,GAAG;IACjC,GAAG,CAAC,eAAe,GAAG,YAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;IAEtD,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;QAC/B,YAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF;;;OAGG;IACH,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC9B,IAAI;YACF,MAAM,IAAI,EAAE,CAAA;SACb;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,MAAM,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,KAAI,GAAG,CAAA;YACnC,OAAO,CAAC,IAAI,GAAG,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAA;YAE3B,yCAAyC;YACzC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;SACxC;IACH,CAAC,CAAC,CAAA;IAEF;;;OAGG;IACH,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC9B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;QAEhC,IAAI,MAAM,IAAI,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACnD,OAAO,MAAM,IAAA,oCAAgB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAA;SAC7C;QAED,MAAM,IAAI,EAAE,CAAA;IACd,CAAC,CAAC,CAAA;AACJ,CAAC;AApCD,0CAoCC;AAED,OAAO,CAAC,EAAE,CAAC,+BAAsC,EAAE,CAAC,GAAG,EAAE,sBAAsB,EAAE,EAAE;IACjF,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAEtC,sBAAsB,CAAC,IAAI,CAAC,oCAAgB,CAAC,CAAA;AAC/C,CAAC,CAAC,CAAA;AAEF,sDAAmC"}
|
package/dist-server/pubsub.js
CHANGED
|
@@ -49,7 +49,7 @@ switch (middleware) {
|
|
|
49
49
|
port }, options));
|
|
50
50
|
}
|
|
51
51
|
catch (e) {
|
|
52
|
-
|
|
52
|
+
env_1.logger.error('graphql-kafka-subscriptions module is not installed, so application can not go further.');
|
|
53
53
|
throw e;
|
|
54
54
|
}
|
|
55
55
|
break;
|
|
@@ -65,7 +65,7 @@ const exitHandler = async (evt) => {
|
|
|
65
65
|
await pubsub.close();
|
|
66
66
|
}
|
|
67
67
|
catch (err) {
|
|
68
|
-
|
|
68
|
+
env_1.logger.error(err);
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../server/pubsub.ts"],"names":[],"mappings":";;;;;;AAAA,2EAAuD;AACvD,6EAAyD;AACzD,iEAA8C;AAC9C,sDAA2B;AAC3B,+BAA8B;AAE9B,
|
|
1
|
+
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../server/pubsub.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,31 +3,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
/* following lines should be located in top of the file */
|
|
6
7
|
// @prettier-ignore
|
|
7
8
|
process.env.NODE_ENV = 'development';
|
|
8
9
|
process.setMaxListeners(0);
|
|
9
|
-
|
|
10
|
-
const subscriptions_transport_ws_1 = require("subscriptions-transport-ws");
|
|
11
|
-
const env_1 = require("@things-factory/env");
|
|
12
|
-
const routers_1 = require("./routers");
|
|
13
|
-
const graphql_1 = require("graphql");
|
|
14
|
-
const apollo_server_koa_1 = require("apollo-server-koa");
|
|
10
|
+
/* following lines should be located in top of the file */
|
|
15
11
|
const apollo_server_core_1 = require("apollo-server-core");
|
|
16
|
-
const
|
|
17
|
-
const
|
|
12
|
+
const apollo_server_koa_1 = require("apollo-server-koa");
|
|
13
|
+
const bytes_1 = __importDefault(require("bytes"));
|
|
18
14
|
const co_1 = __importDefault(require("co"));
|
|
19
|
-
const
|
|
20
|
-
const cors_1 = __importDefault(require("@koa/cors"));
|
|
21
|
-
const http_1 = require("http");
|
|
22
|
-
const database_1 = require("./initializers/database");
|
|
15
|
+
const graphql_1 = require("graphql");
|
|
23
16
|
const graphql_upload_1 = require("graphql-upload");
|
|
24
|
-
const
|
|
25
|
-
const
|
|
17
|
+
const http_1 = require("http");
|
|
18
|
+
const koa_1 = __importDefault(require("koa"));
|
|
26
19
|
const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
|
|
20
|
+
const koa_compose_1 = __importDefault(require("koa-compose"));
|
|
21
|
+
const koa_ip_1 = __importDefault(require("koa-ip"));
|
|
27
22
|
const koa_static_1 = __importDefault(require("koa-static"));
|
|
23
|
+
const koa2_connect_history_api_fallback_1 = require("koa2-connect-history-api-fallback");
|
|
24
|
+
/** Never move following lines */
|
|
25
|
+
const subscriptions_transport_ws_1 = require("subscriptions-transport-ws");
|
|
28
26
|
const koa_webpack_1 = __importDefault(require("@hatiolab/koa-webpack"));
|
|
27
|
+
const cors_1 = __importDefault(require("@koa/cors"));
|
|
28
|
+
const env_1 = require("@things-factory/env");
|
|
29
|
+
const graphql_local_client_1 = require("./graphql-local-client");
|
|
30
|
+
const database_1 = require("./initializers/database");
|
|
31
|
+
const routers_1 = require("./routers");
|
|
29
32
|
const schema_1 = require("./schema");
|
|
30
|
-
|
|
33
|
+
process.on('uncaughtException', error => {
|
|
34
|
+
env_1.logger.error(error);
|
|
35
|
+
process.exit(1);
|
|
36
|
+
});
|
|
31
37
|
const debug = require('debug')('things-factory:shell:server-dev');
|
|
32
38
|
const args = require('args');
|
|
33
39
|
args.option('port', 'The port on which the app will be running', env_1.config.get('port', 3000));
|
|
@@ -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;
|
|
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
|
@@ -3,27 +3,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
// @prettier-ignore
|
|
6
7
|
process.env.NODE_ENV = 'production';
|
|
7
8
|
process.setMaxListeners(0);
|
|
8
|
-
const subscriptions_transport_ws_1 = require("subscriptions-transport-ws");
|
|
9
|
-
const env_1 = require("@things-factory/env");
|
|
10
|
-
const routers_1 = require("./routers");
|
|
11
|
-
const graphql_1 = require("graphql");
|
|
12
9
|
const apollo_server_koa_1 = require("apollo-server-koa");
|
|
13
|
-
const
|
|
14
|
-
const koa_1 = __importDefault(require("koa"));
|
|
10
|
+
const bytes_1 = __importDefault(require("bytes"));
|
|
15
11
|
const co_1 = __importDefault(require("co"));
|
|
16
|
-
const
|
|
17
|
-
const cors_1 = __importDefault(require("@koa/cors"));
|
|
18
|
-
const http_1 = require("http");
|
|
19
|
-
const database_1 = require("./initializers/database");
|
|
12
|
+
const graphql_1 = require("graphql");
|
|
20
13
|
const graphql_upload_1 = require("graphql-upload");
|
|
21
|
-
const
|
|
22
|
-
const
|
|
14
|
+
const http_1 = require("http");
|
|
15
|
+
const koa_1 = __importDefault(require("koa"));
|
|
23
16
|
const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
|
|
17
|
+
const koa_compose_1 = __importDefault(require("koa-compose"));
|
|
18
|
+
const koa_ip_1 = __importDefault(require("koa-ip"));
|
|
24
19
|
const koa_static_1 = __importDefault(require("koa-static"));
|
|
20
|
+
const koa2_connect_history_api_fallback_1 = require("koa2-connect-history-api-fallback");
|
|
21
|
+
const subscriptions_transport_ws_1 = require("subscriptions-transport-ws");
|
|
22
|
+
const cors_1 = __importDefault(require("@koa/cors"));
|
|
23
|
+
const env_1 = require("@things-factory/env");
|
|
24
|
+
const graphql_local_client_1 = require("./graphql-local-client");
|
|
25
|
+
const database_1 = require("./initializers/database");
|
|
26
|
+
const routers_1 = require("./routers");
|
|
25
27
|
const schema_1 = require("./schema");
|
|
26
|
-
|
|
28
|
+
process.on('uncaughtException', error => {
|
|
29
|
+
env_1.logger.error(error);
|
|
30
|
+
process.exit(1);
|
|
31
|
+
});
|
|
27
32
|
const args = require('args');
|
|
28
33
|
args.option('port', 'The port on which the app will be running', env_1.config.get('port', 3000));
|
|
29
34
|
const flags = args.parse(process.argv);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../server/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,11 +26,11 @@ const OPERATION_FUNCTION_MAP = {
|
|
|
26
26
|
is_empty_num_id: () => (0, typeorm_1.Raw)(alias => `${alias} IS EMPTY NUMERIC ID`),
|
|
27
27
|
between: value => (0, typeorm_1.Between)(value[0], value[1])
|
|
28
28
|
};
|
|
29
|
-
function getOperatorFunction({ operator,
|
|
29
|
+
function getOperatorFunction({ operator, value }) {
|
|
30
30
|
return OPERATION_FUNCTION_MAP[operator](value);
|
|
31
31
|
}
|
|
32
32
|
function makePaginationParams(pagination) {
|
|
33
|
-
var
|
|
33
|
+
var result = {};
|
|
34
34
|
if (pagination) {
|
|
35
35
|
var { page = 0, limit = 0 } = pagination;
|
|
36
36
|
var skip = 0;
|
|
@@ -38,26 +38,26 @@ function makePaginationParams(pagination) {
|
|
|
38
38
|
if (limit > 0) {
|
|
39
39
|
skip = Math.max(page - 1, 0) * limit;
|
|
40
40
|
take = limit;
|
|
41
|
-
Object.assign(
|
|
41
|
+
Object.assign(result, {
|
|
42
42
|
skip,
|
|
43
43
|
take
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
return
|
|
47
|
+
return result;
|
|
48
48
|
}
|
|
49
49
|
function makeSortingParams(sortings) {
|
|
50
|
-
var
|
|
50
|
+
var result = {};
|
|
51
51
|
if (sortings) {
|
|
52
52
|
var order = {};
|
|
53
53
|
sortings.forEach(s => {
|
|
54
54
|
order[s.name] = s.desc ? 'DESC' : 'ASC';
|
|
55
55
|
});
|
|
56
|
-
Object.assign(
|
|
56
|
+
Object.assign(result, {
|
|
57
57
|
order
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
|
-
return
|
|
60
|
+
return result;
|
|
61
61
|
}
|
|
62
62
|
function makeFilterParams(filters) {
|
|
63
63
|
/* for where AND clauses */
|
|
@@ -82,7 +82,7 @@ function makeFilterParams(filters) {
|
|
|
82
82
|
}
|
|
83
83
|
function convertListParams(params, domain) {
|
|
84
84
|
var { pagination, filters = [], sortings } = params;
|
|
85
|
-
var
|
|
85
|
+
var result = {};
|
|
86
86
|
if (domain) {
|
|
87
87
|
filters.push({
|
|
88
88
|
name: 'domain',
|
|
@@ -91,12 +91,12 @@ function convertListParams(params, domain) {
|
|
|
91
91
|
});
|
|
92
92
|
}
|
|
93
93
|
if (pagination)
|
|
94
|
-
Object.assign(
|
|
94
|
+
Object.assign(result, makePaginationParams(pagination));
|
|
95
95
|
if (sortings)
|
|
96
|
-
Object.assign(
|
|
96
|
+
Object.assign(result, makeSortingParams(sortings));
|
|
97
97
|
if (filters)
|
|
98
|
-
Object.assign(
|
|
99
|
-
return
|
|
98
|
+
Object.assign(result, makeFilterParams(filters));
|
|
99
|
+
return result;
|
|
100
100
|
}
|
|
101
101
|
exports.convertListParams = convertListParams;
|
|
102
102
|
//# sourceMappingURL=list-params-converter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-params-converter.js","sourceRoot":"","sources":["../../server/utils/list-params-converter.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"list-params-converter.js","sourceRoot":"","sources":["../../server/utils/list-params-converter.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": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.30",
|
|
4
4
|
"description": "Core module for framework",
|
|
5
5
|
"bin": {
|
|
6
6
|
"things-factory": "bin/things-factory",
|
|
@@ -31,12 +31,12 @@
|
|
|
31
31
|
"test": "NODE_ENV=test jest"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@apollo/client": "^3.5.
|
|
35
|
-
"@graphql-tools/merge": "^
|
|
36
|
-
"@graphql-tools/schema": "^8.2
|
|
37
|
-
"@graphql-tools/utils": "^8.
|
|
34
|
+
"@apollo/client": "^3.5.10",
|
|
35
|
+
"@graphql-tools/merge": "^8.2.3",
|
|
36
|
+
"@graphql-tools/schema": "^8.3.2",
|
|
37
|
+
"@graphql-tools/utils": "^8.6.2",
|
|
38
38
|
"@hatiolab/koa-webpack": "^6.0.0",
|
|
39
|
-
"@hatiolab/things-scene": "^2.
|
|
39
|
+
"@hatiolab/things-scene": "^2.8.1",
|
|
40
40
|
"@koa/cors": "^3.1.0",
|
|
41
41
|
"@material/mwc-button": "^0.25.3",
|
|
42
42
|
"@material/mwc-fab": "^0.25.3",
|
|
@@ -44,26 +44,26 @@
|
|
|
44
44
|
"@material/mwc-icon-button": "^0.25.3",
|
|
45
45
|
"@material/mwc-slider": "^0.25.3",
|
|
46
46
|
"@material/mwc-textfield": "^0.25.3",
|
|
47
|
-
"@operato/board": "
|
|
48
|
-
"@operato/graphql": "
|
|
49
|
-
"@operato/help": "
|
|
50
|
-
"@operato/layout": "
|
|
51
|
-
"@operato/shell": "
|
|
52
|
-
"@operato/utils": "
|
|
53
|
-
"@things-factory/ejs-remote": "^5.0.0-alpha.
|
|
54
|
-
"@things-factory/env": "^5.0.0-alpha.
|
|
55
|
-
"@things-factory/styles": "^5.0.0-alpha.
|
|
56
|
-
"@things-factory/utils": "^5.0.0-alpha.
|
|
47
|
+
"@operato/board": "1.0.0-beta.0",
|
|
48
|
+
"@operato/graphql": "1.0.0-beta.0",
|
|
49
|
+
"@operato/help": "1.0.0-beta.0",
|
|
50
|
+
"@operato/layout": "1.0.0-beta.0",
|
|
51
|
+
"@operato/shell": "1.0.0-beta.0",
|
|
52
|
+
"@operato/utils": "1.0.0-beta.0",
|
|
53
|
+
"@things-factory/ejs-remote": "^5.0.0-alpha.30",
|
|
54
|
+
"@things-factory/env": "^5.0.0-alpha.30",
|
|
55
|
+
"@things-factory/styles": "^5.0.0-alpha.30",
|
|
56
|
+
"@things-factory/utils": "^5.0.0-alpha.30",
|
|
57
57
|
"@webcomponents/webcomponentsjs": "^2.6.0",
|
|
58
58
|
"@webpack-contrib/schema-utils": "^1.0.0-beta.0",
|
|
59
|
-
"apollo-server-core": "^3.
|
|
60
|
-
"apollo-server-koa": "^3.
|
|
61
|
-
"apollo-server-types": "^3.
|
|
59
|
+
"apollo-server-core": "^3.6.4",
|
|
60
|
+
"apollo-server-koa": "^3.6.4",
|
|
61
|
+
"apollo-server-types": "^3.5.1",
|
|
62
62
|
"apollo-upload-client": "^17.0.0",
|
|
63
63
|
"args": "^5.0.0",
|
|
64
64
|
"broadcastchannel-polyfill": "^1.0.1",
|
|
65
65
|
"chalk": "^4.1.0",
|
|
66
|
-
"class-validator": "^0.
|
|
66
|
+
"class-validator": "^0.13.2",
|
|
67
67
|
"core-js": "^3.16.0",
|
|
68
68
|
"csvtojson": "^2.0.10",
|
|
69
69
|
"debug": "^4.1.1",
|
|
@@ -75,9 +75,9 @@
|
|
|
75
75
|
"graphql-redis-subscriptions": "^2.4.2",
|
|
76
76
|
"graphql-subscriptions": "^2.0.0",
|
|
77
77
|
"graphql-tag": "^2.12.6",
|
|
78
|
-
"graphql-upload": "^
|
|
78
|
+
"graphql-upload": "^13.0.0",
|
|
79
79
|
"haunted": "^4.8.2",
|
|
80
|
-
"html-webpack-plugin": "^
|
|
80
|
+
"html-webpack-plugin": "^5.5.0",
|
|
81
81
|
"husky": "7.0.1",
|
|
82
82
|
"imports-loader": "^3.0.0",
|
|
83
83
|
"inquirer": "^8.2.0",
|
|
@@ -92,14 +92,13 @@
|
|
|
92
92
|
"koa-static": "^5.0.0",
|
|
93
93
|
"koa-unless": "^1.0.7",
|
|
94
94
|
"koa2-connect-history-api-fallback": "^0.1.2",
|
|
95
|
-
"lit": "^2.2.
|
|
95
|
+
"lit": "^2.2.1",
|
|
96
96
|
"loader-utils": "^2.0.0",
|
|
97
97
|
"lodash": "^4.17.15",
|
|
98
98
|
"lodash-es": "^4.17.15",
|
|
99
99
|
"mkdirp": "^1.0.3",
|
|
100
100
|
"mqtt": "^4.3.4",
|
|
101
101
|
"node-fetch": "^2.6.0",
|
|
102
|
-
"node-sass": "^6.0.1",
|
|
103
102
|
"nodemon": "^2.0.2",
|
|
104
103
|
"npm-license-crawler": "^0.2.1",
|
|
105
104
|
"pluralize": "^8.0.0",
|
|
@@ -109,6 +108,7 @@
|
|
|
109
108
|
"redux-thunk": "^2.3.0",
|
|
110
109
|
"regenerator-runtime": "^0.13.2",
|
|
111
110
|
"reselect": "^4.0.0",
|
|
111
|
+
"sass": "^1.49.11",
|
|
112
112
|
"scrollbooster": "^3.0.2",
|
|
113
113
|
"subscriptions-transport-ws": "^0.11.0",
|
|
114
114
|
"sweetalert2": "^10.9.0",
|
|
@@ -129,5 +129,5 @@
|
|
|
129
129
|
"resolutions": {
|
|
130
130
|
"core-js": "^3.16.0"
|
|
131
131
|
},
|
|
132
|
-
"gitHead": "
|
|
132
|
+
"gitHead": "352de3c888d68121aef99da33b31b966d0123328"
|
|
133
133
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { config, logger } from '@things-factory/env'
|
|
2
|
+
|
|
2
3
|
import { domainMiddleware } from './domain-middleware'
|
|
3
4
|
|
|
4
5
|
const debug = require('debug')('things-factory:shell:middleware')
|
|
@@ -18,8 +19,8 @@ export function initMiddlewares(app) {
|
|
|
18
19
|
try {
|
|
19
20
|
await next()
|
|
20
21
|
} catch (err) {
|
|
21
|
-
context.status = err
|
|
22
|
-
context.body = err
|
|
22
|
+
context.status = err?.status || 500
|
|
23
|
+
context.body = err?.message
|
|
23
24
|
|
|
24
25
|
// emitting error to app.on('error', ...)
|
|
25
26
|
context.app.emit('error', err, context)
|
package/server/pubsub.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { PubSub } from 'graphql-subscriptions'
|
|
|
4
4
|
import Redis from 'ioredis'
|
|
5
5
|
import { connect } from 'mqtt'
|
|
6
6
|
|
|
7
|
-
import { config } from '@things-factory/env'
|
|
7
|
+
import { config, logger } from '@things-factory/env'
|
|
8
8
|
|
|
9
9
|
const { middleware, host, port, nodes, topic, options } = config.get('pubsub', {})
|
|
10
10
|
|
|
@@ -56,7 +56,7 @@ switch (middleware) {
|
|
|
56
56
|
...options
|
|
57
57
|
})
|
|
58
58
|
} catch (e) {
|
|
59
|
-
|
|
59
|
+
logger.error('graphql-kafka-subscriptions module is not installed, so application can not go further.')
|
|
60
60
|
throw e
|
|
61
61
|
}
|
|
62
62
|
break
|
|
@@ -73,7 +73,7 @@ const exitHandler = async evt => {
|
|
|
73
73
|
try {
|
|
74
74
|
await pubsub.close()
|
|
75
75
|
} catch (err) {
|
|
76
|
-
|
|
76
|
+
logger.error(err)
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
}
|
package/server/server-dev.ts
CHANGED
|
@@ -1,30 +1,39 @@
|
|
|
1
|
+
/* following lines should be located in top of the file */
|
|
1
2
|
// @prettier-ignore
|
|
2
3
|
process.env.NODE_ENV = 'development'
|
|
3
4
|
process.setMaxListeners(0)
|
|
4
|
-
/** Never move following lines */
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
|
|
8
|
-
import { domainPrivateRouter, domainPublicRouter, globalPrivateRouter, globalPublicRouter } from './routers'
|
|
9
|
-
import { execute, subscribe } from 'graphql'
|
|
10
|
-
|
|
11
|
-
import { ApolloServer } from 'apollo-server-koa'
|
|
6
|
+
/* following lines should be located in top of the file */
|
|
12
7
|
import { ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
|
|
13
|
-
import {
|
|
14
|
-
import
|
|
8
|
+
import { ApolloServer } from 'apollo-server-koa'
|
|
9
|
+
import bytesFormat from 'bytes'
|
|
15
10
|
import co from 'co'
|
|
16
|
-
import
|
|
17
|
-
import cors from '@koa/cors'
|
|
18
|
-
import { createServer } from 'http'
|
|
19
|
-
import { databaseInitializer } from './initializers/database'
|
|
11
|
+
import { execute, subscribe } from 'graphql'
|
|
20
12
|
import { graphqlUploadKoa } from 'graphql-upload'
|
|
21
|
-
import {
|
|
22
|
-
import
|
|
13
|
+
import { createServer } from 'http'
|
|
14
|
+
import Koa from 'koa'
|
|
23
15
|
import koaBodyParser from 'koa-bodyparser'
|
|
16
|
+
import compose from 'koa-compose'
|
|
17
|
+
import ip from 'koa-ip'
|
|
24
18
|
import koaStatic from 'koa-static'
|
|
19
|
+
import { historyApiFallback } from 'koa2-connect-history-api-fallback'
|
|
20
|
+
/** Never move following lines */
|
|
21
|
+
import { ConnectionContext, SubscriptionServer } from 'subscriptions-transport-ws'
|
|
22
|
+
|
|
25
23
|
import koaWebpack from '@hatiolab/koa-webpack'
|
|
24
|
+
import cors from '@koa/cors'
|
|
25
|
+
import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
|
|
26
|
+
|
|
27
|
+
import { GraphqlLocalClient } from './graphql-local-client'
|
|
28
|
+
import { databaseInitializer } from './initializers/database'
|
|
29
|
+
import { domainPrivateRouter, domainPublicRouter, globalPrivateRouter, globalPublicRouter } from './routers'
|
|
26
30
|
import { schema } from './schema'
|
|
27
|
-
|
|
31
|
+
|
|
32
|
+
process.on('uncaughtException', error => {
|
|
33
|
+
logger.error(error)
|
|
34
|
+
|
|
35
|
+
process.exit(1)
|
|
36
|
+
})
|
|
28
37
|
|
|
29
38
|
const debug = require('debug')('things-factory:shell:server-dev')
|
|
30
39
|
|
|
@@ -48,21 +57,20 @@ const compiler = webpack(webpackConfig)
|
|
|
48
57
|
|
|
49
58
|
const PORT = (process.env.PORT = flags.port)
|
|
50
59
|
|
|
51
|
-
const requestBody = config.get('requestBody')||{}
|
|
60
|
+
const requestBody = config.get('requestBody') || {}
|
|
52
61
|
|
|
53
62
|
const bodyParserOption = {
|
|
54
|
-
formLimit: requestBody.formLimit||'10mb',
|
|
55
|
-
jsonLimit: requestBody.jsonLimit||'10mb',
|
|
56
|
-
textLimit: requestBody.textLimit||'10mb'
|
|
63
|
+
formLimit: requestBody.formLimit || '10mb',
|
|
64
|
+
jsonLimit: requestBody.jsonLimit || '10mb',
|
|
65
|
+
textLimit: requestBody.textLimit || '10mb'
|
|
57
66
|
}
|
|
58
67
|
|
|
59
|
-
const fileUpload = config.get('fileUpload')||{}
|
|
68
|
+
const fileUpload = config.get('fileUpload') || {}
|
|
60
69
|
const fileUploadOption = {
|
|
61
|
-
maxFileSize: bytesFormat.parse(fileUpload.maxFileSize)||bytesFormat.parse('10mb'),
|
|
62
|
-
maxFiles: fileUpload.maxFiles||10
|
|
70
|
+
maxFileSize: bytesFormat.parse(fileUpload.maxFileSize) || bytesFormat.parse('10mb'),
|
|
71
|
+
maxFiles: fileUpload.maxFiles || 10
|
|
63
72
|
}
|
|
64
73
|
|
|
65
|
-
|
|
66
74
|
/* bootstrap */
|
|
67
75
|
const bootstrap = async () => {
|
|
68
76
|
await databaseInitializer()
|
package/server/server.ts
CHANGED
|
@@ -1,26 +1,34 @@
|
|
|
1
|
+
// @prettier-ignore
|
|
1
2
|
process.env.NODE_ENV = 'production'
|
|
2
3
|
process.setMaxListeners(0)
|
|
3
4
|
|
|
4
|
-
import { ConnectionContext, SubscriptionServer } from 'subscriptions-transport-ws'
|
|
5
|
-
import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
|
|
6
|
-
import { domainPrivateRouter, domainPublicRouter, globalPrivateRouter, globalPublicRouter } from './routers'
|
|
7
|
-
import { execute, subscribe } from 'graphql'
|
|
8
|
-
|
|
9
5
|
import { ApolloServer } from 'apollo-server-koa'
|
|
10
|
-
import
|
|
11
|
-
import Koa from 'koa'
|
|
6
|
+
import bytesFormat from 'bytes'
|
|
12
7
|
import co from 'co'
|
|
13
|
-
import
|
|
14
|
-
import cors from '@koa/cors'
|
|
15
|
-
import { createServer } from 'http'
|
|
16
|
-
import { databaseInitializer } from './initializers/database'
|
|
8
|
+
import { execute, subscribe } from 'graphql'
|
|
17
9
|
import { graphqlUploadKoa } from 'graphql-upload'
|
|
18
|
-
import {
|
|
19
|
-
import
|
|
10
|
+
import { createServer } from 'http'
|
|
11
|
+
import Koa from 'koa'
|
|
20
12
|
import koaBodyParser from 'koa-bodyparser'
|
|
13
|
+
import compose from 'koa-compose'
|
|
14
|
+
import ip from 'koa-ip'
|
|
21
15
|
import koaStatic from 'koa-static'
|
|
16
|
+
import { historyApiFallback } from 'koa2-connect-history-api-fallback'
|
|
17
|
+
import { ConnectionContext, SubscriptionServer } from 'subscriptions-transport-ws'
|
|
18
|
+
|
|
19
|
+
import cors from '@koa/cors'
|
|
20
|
+
import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
|
|
21
|
+
|
|
22
|
+
import { GraphqlLocalClient } from './graphql-local-client'
|
|
23
|
+
import { databaseInitializer } from './initializers/database'
|
|
24
|
+
import { domainPrivateRouter, domainPublicRouter, globalPrivateRouter, globalPublicRouter } from './routers'
|
|
22
25
|
import { schema } from './schema'
|
|
23
|
-
|
|
26
|
+
|
|
27
|
+
process.on('uncaughtException', error => {
|
|
28
|
+
logger.error(error)
|
|
29
|
+
|
|
30
|
+
process.exit(1)
|
|
31
|
+
})
|
|
24
32
|
|
|
25
33
|
const args = require('args')
|
|
26
34
|
|
|
@@ -32,18 +40,18 @@ const path = require('path')
|
|
|
32
40
|
|
|
33
41
|
const PORT = (process.env.PORT = flags.port)
|
|
34
42
|
|
|
35
|
-
const requestBody = config.get('requestBody')||{}
|
|
43
|
+
const requestBody = config.get('requestBody') || {}
|
|
36
44
|
|
|
37
45
|
const bodyParserOption = {
|
|
38
|
-
formLimit: requestBody.formLimit||'10mb',
|
|
39
|
-
jsonLimit: requestBody.jsonLimit||'10mb',
|
|
40
|
-
textLimit: requestBody.textLimit||'10mb'
|
|
46
|
+
formLimit: requestBody.formLimit || '10mb',
|
|
47
|
+
jsonLimit: requestBody.jsonLimit || '10mb',
|
|
48
|
+
textLimit: requestBody.textLimit || '10mb'
|
|
41
49
|
}
|
|
42
50
|
|
|
43
|
-
const fileUpload = config.get('fileUpload')||{}
|
|
51
|
+
const fileUpload = config.get('fileUpload') || {}
|
|
44
52
|
const fileUploadOption = {
|
|
45
|
-
maxFileSize: bytesFormat.parse(fileUpload.maxFileSize)||bytesFormat.parse('10mb'),
|
|
46
|
-
maxFiles: fileUpload.maxFiles||10
|
|
53
|
+
maxFileSize: bytesFormat.parse(fileUpload.maxFileSize) || bytesFormat.parse('10mb'),
|
|
54
|
+
maxFiles: fileUpload.maxFiles || 10
|
|
47
55
|
}
|
|
48
56
|
/* bootstrap */
|
|
49
57
|
const bootstrap = async () => {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Between, Equal, ILike, In, IsNull, Like, Not, Raw } from 'typeorm'
|
|
1
|
+
import { Between, Equal, FindOperator, ILike, In, IsNull, Like, Not, Raw } from 'typeorm'
|
|
2
2
|
|
|
3
|
-
import { ListParam } from '../service/common-types'
|
|
3
|
+
import { Filter, ListParam, Pagination, Sorting } from '../service/common-types'
|
|
4
4
|
|
|
5
|
-
const OPERATION_FUNCTION_MAP = {
|
|
5
|
+
const OPERATION_FUNCTION_MAP: { [operator: string]: (value: any) => FindOperator<any> } = {
|
|
6
6
|
search: value => ILike(value),
|
|
7
7
|
eq: value => Equal(value),
|
|
8
8
|
noteq: value => Not(Equal(value)),
|
|
@@ -27,12 +27,12 @@ const OPERATION_FUNCTION_MAP = {
|
|
|
27
27
|
between: value => Between(value[0], value[1])
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
function getOperatorFunction({ operator,
|
|
30
|
+
function getOperatorFunction({ operator, value }: { operator: string; value: any }): FindOperator<any> {
|
|
31
31
|
return OPERATION_FUNCTION_MAP[operator](value)
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
function makePaginationParams(pagination) {
|
|
35
|
-
var
|
|
34
|
+
function makePaginationParams(pagination: Pagination) {
|
|
35
|
+
var result = {} as { skip?: number; take?: number }
|
|
36
36
|
if (pagination) {
|
|
37
37
|
var { page = 0, limit = 0 } = pagination
|
|
38
38
|
var skip = 0
|
|
@@ -41,39 +41,39 @@ function makePaginationParams(pagination) {
|
|
|
41
41
|
if (limit > 0) {
|
|
42
42
|
skip = Math.max(page - 1, 0) * limit
|
|
43
43
|
take = limit
|
|
44
|
-
Object.assign(
|
|
44
|
+
Object.assign(result, {
|
|
45
45
|
skip,
|
|
46
46
|
take
|
|
47
47
|
})
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
return
|
|
51
|
+
return result
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
function makeSortingParams(sortings) {
|
|
55
|
-
var
|
|
54
|
+
function makeSortingParams(sortings: Sorting[]) {
|
|
55
|
+
var result = {} as { order?: { [name: string]: 'DESC' | 'ASC' } }
|
|
56
56
|
if (sortings) {
|
|
57
|
-
var order = {}
|
|
57
|
+
var order = {} as { [name: string]: 'DESC' | 'ASC' }
|
|
58
58
|
sortings.forEach(s => {
|
|
59
59
|
order[s.name] = s.desc ? 'DESC' : 'ASC'
|
|
60
60
|
})
|
|
61
61
|
|
|
62
|
-
Object.assign(
|
|
62
|
+
Object.assign(result, {
|
|
63
63
|
order
|
|
64
64
|
})
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
return
|
|
67
|
+
return result
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
function makeFilterParams(filters) {
|
|
70
|
+
function makeFilterParams(filters: Filter[]) {
|
|
71
71
|
/* for where AND clauses */
|
|
72
72
|
const columnFilters = filters.filter(filter => filter.operator !== 'search')
|
|
73
73
|
const columnWhere = columnFilters.reduce((where, f) => {
|
|
74
74
|
where[f.name] = getOperatorFunction(f)
|
|
75
75
|
return where
|
|
76
|
-
}, {})
|
|
76
|
+
}, {} as { [name: string]: FindOperator<any> })
|
|
77
77
|
|
|
78
78
|
const searchFilters = filters.filter(filter => filter.operator === 'search')
|
|
79
79
|
if (searchFilters.length === 0) {
|
|
@@ -95,9 +95,19 @@ function makeFilterParams(filters) {
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
-
export function convertListParams(
|
|
99
|
-
|
|
100
|
-
|
|
98
|
+
export function convertListParams(
|
|
99
|
+
params: ListParam,
|
|
100
|
+
domain?: String
|
|
101
|
+
): {
|
|
102
|
+
where?: { [name: string]: FindOperator<any> }
|
|
103
|
+
order?: {
|
|
104
|
+
[name: string]: 'DESC' | 'ASC'
|
|
105
|
+
}
|
|
106
|
+
skip?: number
|
|
107
|
+
take?: number
|
|
108
|
+
} {
|
|
109
|
+
var { pagination, filters = [], sortings } = params
|
|
110
|
+
var result = {}
|
|
101
111
|
|
|
102
112
|
if (domain) {
|
|
103
113
|
filters.push({
|
|
@@ -107,9 +117,9 @@ export function convertListParams(params: typeof ListParam, domain?: String) {
|
|
|
107
117
|
})
|
|
108
118
|
}
|
|
109
119
|
|
|
110
|
-
if (pagination) Object.assign(
|
|
111
|
-
if (sortings) Object.assign(
|
|
112
|
-
if (filters) Object.assign(
|
|
120
|
+
if (pagination) Object.assign(result, makePaginationParams(pagination))
|
|
121
|
+
if (sortings) Object.assign(result, makeSortingParams(sortings))
|
|
122
|
+
if (filters) Object.assign(result, makeFilterParams(filters))
|
|
113
123
|
|
|
114
|
-
return
|
|
124
|
+
return result
|
|
115
125
|
}
|