@toa.io/extensions.exposition 1.0.0-alpha.25 → 1.0.0-alpha.27
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/documentation/query.md +8 -4
- package/features/debug.feature +34 -0
- package/features/octets.feature +11 -0
- package/features/probes.feature +14 -0
- package/features/{queries.feature → query.feature} +31 -0
- package/features/routes.feature +1 -2
- package/features/timing.feature +1 -1
- package/package.json +7 -7
- package/source/Gateway.ts +4 -4
- package/source/HTTP/Context.ts +13 -0
- package/source/HTTP/Server.ts +32 -16
- package/source/Mapping.ts +6 -1
- package/source/Query.test.ts +1 -1
- package/source/Query.ts +29 -22
- package/source/deployment.ts +8 -2
- package/transpiled/Gateway.js +4 -4
- package/transpiled/Gateway.js.map +1 -1
- package/transpiled/HTTP/Context.d.ts +1 -0
- package/transpiled/HTTP/Context.js +9 -0
- package/transpiled/HTTP/Context.js.map +1 -1
- package/transpiled/HTTP/Server.d.ts +5 -1
- package/transpiled/HTTP/Server.js +25 -13
- package/transpiled/HTTP/Server.js.map +1 -1
- package/transpiled/Mapping.js +4 -1
- package/transpiled/Mapping.js.map +1 -1
- package/transpiled/Query.d.ts +1 -0
- package/transpiled/Query.js +19 -18
- package/transpiled/Query.js.map +1 -1
- package/transpiled/deployment.js +8 -2
- package/transpiled/deployment.js.map +1 -1
- package/transpiled/tsconfig.tsbuildinfo +1 -1
|
@@ -26,11 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.Server = void 0;
|
|
29
|
+
exports.DELAY = exports.PORT = exports.Server = void 0;
|
|
30
30
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
31
31
|
const node_os_1 = __importDefault(require("node:os"));
|
|
32
32
|
const http = __importStar(require("node:http"));
|
|
33
33
|
const node_events_1 = require("node:events");
|
|
34
|
+
const promises_1 = require("node:timers/promises");
|
|
34
35
|
const core_1 = require("@toa.io/core");
|
|
35
36
|
const messages_1 = require("./messages");
|
|
36
37
|
const exceptions_1 = require("./exceptions");
|
|
@@ -40,20 +41,14 @@ class Server extends core_1.Connector {
|
|
|
40
41
|
properties;
|
|
41
42
|
authorities;
|
|
42
43
|
process;
|
|
44
|
+
ready = false;
|
|
45
|
+
startedAt = 0;
|
|
43
46
|
constructor(properties) {
|
|
44
47
|
super();
|
|
45
48
|
this.properties = properties;
|
|
46
49
|
this.authorities = Object.fromEntries(Object.entries(properties.authorities).map(([key, value]) => [value, key]));
|
|
47
50
|
this.server.on('request', (req, res) => this.listener(req, res));
|
|
48
51
|
}
|
|
49
|
-
get port() {
|
|
50
|
-
if (this.properties.port !== 0)
|
|
51
|
-
return this.properties.port;
|
|
52
|
-
const address = this.server.address();
|
|
53
|
-
if (address === null || typeof address === 'string')
|
|
54
|
-
throw new Error('Server is not listening on a port.');
|
|
55
|
-
return address.port;
|
|
56
|
-
}
|
|
57
52
|
static create(options) {
|
|
58
53
|
const properties = Object.assign({}, DEFAULTS, options);
|
|
59
54
|
return new Server(properties);
|
|
@@ -62,21 +57,35 @@ class Server extends core_1.Connector {
|
|
|
62
57
|
this.process = process;
|
|
63
58
|
}
|
|
64
59
|
async open() {
|
|
60
|
+
this.startedAt = Date.now();
|
|
65
61
|
this.server.listen(this.properties.port);
|
|
66
62
|
await (0, node_events_1.once)(this.server, 'listening');
|
|
67
|
-
console.info('HTTP Server is listening
|
|
63
|
+
console.info('HTTP Server is listening');
|
|
64
|
+
await (0, promises_1.setTimeout)(this.properties.delay);
|
|
65
|
+
this.ready = true;
|
|
66
|
+
console.info('Ready');
|
|
68
67
|
}
|
|
69
68
|
async close() {
|
|
70
69
|
this.server.close();
|
|
71
|
-
|
|
70
|
+
this.ready = false;
|
|
71
|
+
console.info('HTTP Server stopped accepting new connections');
|
|
72
72
|
await (0, node_events_1.once)(this.server, 'close');
|
|
73
|
-
console.info('HTTP Server has been stopped
|
|
73
|
+
console.info('HTTP Server has been stopped');
|
|
74
74
|
}
|
|
75
75
|
listener(request, response) {
|
|
76
76
|
if (request.method === undefined || !this.properties.methods.has(request.method)) {
|
|
77
77
|
response.writeHead(501).end();
|
|
78
78
|
return;
|
|
79
79
|
}
|
|
80
|
+
if (request.url === '/.ready') {
|
|
81
|
+
if (this.ready)
|
|
82
|
+
response.writeHead(200, { 'cache-control': 'no-store' }).end();
|
|
83
|
+
else {
|
|
84
|
+
const remaining = (Math.ceil((Date.now() - this.startedAt) / 1000)).toString();
|
|
85
|
+
response.writeHead(503, { 'retry-after': remaining }).end();
|
|
86
|
+
}
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
80
89
|
if (request.headers.host === undefined || !(request.headers.host in this.authorities)) {
|
|
81
90
|
response.writeHead(404).end('Unknown authority');
|
|
82
91
|
return;
|
|
@@ -126,10 +135,13 @@ async function adam(request) {
|
|
|
126
135
|
request.pipe(devnull);
|
|
127
136
|
return (0, node_events_1.once)(request, 'end');
|
|
128
137
|
}
|
|
138
|
+
exports.PORT = 8000;
|
|
139
|
+
exports.DELAY = 3; // seconds
|
|
129
140
|
const DEFAULTS = {
|
|
130
141
|
methods: new Set(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS']),
|
|
131
142
|
debug: false,
|
|
132
143
|
trace: false,
|
|
133
|
-
port:
|
|
144
|
+
port: exports.PORT,
|
|
145
|
+
delay: exports.DELAY * 1000
|
|
134
146
|
};
|
|
135
147
|
//# sourceMappingURL=Server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../source/HTTP/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAwB;AACxB,sDAAwB;AACxB,gDAAiC;AACjC,6CAAkC;AAClC,uCAAwC;AACxC,yCAAwD;AACxD,6CAAqD;AACrD,uCAAmC;AAGnC,MAAa,MAAO,SAAQ,gBAAS;IAClB,MAAM,GAAgB,IAAI,CAAC,YAAY,EAAE,CAAA;IACzC,UAAU,CAAY;IACtB,WAAW,CAAwB;IAC5C,OAAO,CAAa;
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../source/HTTP/Server.ts"],"names":[],"mappings":"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"}
|
package/transpiled/Mapping.js
CHANGED
|
@@ -27,12 +27,15 @@ class QueryableMapping extends Mapping {
|
|
|
27
27
|
}
|
|
28
28
|
class InputMapping extends Mapping {
|
|
29
29
|
fit(input, _, parameters) {
|
|
30
|
+
const request = {};
|
|
30
31
|
if (input === undefined && parameters.length > 0)
|
|
31
32
|
input = {};
|
|
32
33
|
if (typeof input === 'object' && input !== null)
|
|
33
34
|
for (const parameter of parameters)
|
|
34
35
|
input[parameter.name] = parameter.value;
|
|
35
|
-
|
|
36
|
+
if (input !== undefined)
|
|
37
|
+
request.input = input;
|
|
38
|
+
return request;
|
|
36
39
|
}
|
|
37
40
|
}
|
|
38
41
|
//# sourceMappingURL=Mapping.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mapping.js","sourceRoot":"","sources":["../source/Mapping.ts"],"names":[],"mappings":";;;AACA,mCAA+B;AAK/B,MAAsB,OAAO;IACpB,MAAM,CAAC,MAAM,CAAE,KAAoB;QACxC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;YACvC,OAAO,IAAI,YAAY,EAAE,CAAA;QAE3B,MAAM,CAAC,GAAG,IAAI,aAAK,CAAC,KAAK,CAAC,CAAA;QAE1B,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAChC,CAAC;CAGF;AAXD,0BAWC;AAED,MAAM,gBAAiB,SAAQ,OAAO;IACnB,KAAK,CAAO;IAE7B,YAAoB,KAAY;QAC9B,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;IAEM,GAAG,CAAE,KAAU,EAAE,EAAc,EAAE,UAAuB;QAC7D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QAE5C,OAAO;YACL,KAAK;YACL,KAAK;SACN,CAAA;IACH,CAAC;CACF;AAED,MAAM,YAAa,SAAQ,OAAO;IACzB,GAAG,CAAE,KAAU,EAAE,CAAU,EAAE,UAAuB;QACzD,IAAI,KAAK,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;YAC9C,KAAK,GAAG,EAAE,CAAA;QAEZ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;YAC7C,KAAK,MAAM,SAAS,IAAI,UAAU;gBAChC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAA;QAE3C,OAAO,
|
|
1
|
+
{"version":3,"file":"Mapping.js","sourceRoot":"","sources":["../source/Mapping.ts"],"names":[],"mappings":";;;AACA,mCAA+B;AAK/B,MAAsB,OAAO;IACpB,MAAM,CAAC,MAAM,CAAE,KAAoB;QACxC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;YACvC,OAAO,IAAI,YAAY,EAAE,CAAA;QAE3B,MAAM,CAAC,GAAG,IAAI,aAAK,CAAC,KAAK,CAAC,CAAA;QAE1B,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAChC,CAAC;CAGF;AAXD,0BAWC;AAED,MAAM,gBAAiB,SAAQ,OAAO;IACnB,KAAK,CAAO;IAE7B,YAAoB,KAAY;QAC9B,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;IAEM,GAAG,CAAE,KAAU,EAAE,EAAc,EAAE,UAAuB;QAC7D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QAE5C,OAAO;YACL,KAAK;YACL,KAAK;SACN,CAAA;IACH,CAAC;CACF;AAED,MAAM,YAAa,SAAQ,OAAO;IACzB,GAAG,CAAE,KAAU,EAAE,CAAU,EAAE,UAAuB;QACzD,MAAM,OAAO,GAAiB,EAAE,CAAA;QAEhC,IAAI,KAAK,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;YAC9C,KAAK,GAAG,EAAE,CAAA;QAEZ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;YAC7C,KAAK,MAAM,SAAS,IAAI,UAAU;gBAChC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAA;QAE3C,IAAI,KAAK,KAAK,SAAS;YACrB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAEvB,OAAO,OAAO,CAAA;IAChB,CAAC;CACF"}
|
package/transpiled/Query.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import type * as core from '@toa.io/core';
|
|
|
5
5
|
export declare class Query {
|
|
6
6
|
private readonly query;
|
|
7
7
|
private readonly closed;
|
|
8
|
+
private readonly prepend;
|
|
8
9
|
constructor(query: syntax.Query);
|
|
9
10
|
fit(query: http.Query, parameters: Parameter[]): core.Query;
|
|
10
11
|
private fitCriteria;
|
package/transpiled/Query.js
CHANGED
|
@@ -29,13 +29,17 @@ const schemas = __importStar(require("./schemas"));
|
|
|
29
29
|
class Query {
|
|
30
30
|
query;
|
|
31
31
|
closed = false;
|
|
32
|
+
prepend = ';';
|
|
32
33
|
constructor(query) {
|
|
33
34
|
if (query.criteria !== undefined) {
|
|
34
|
-
|
|
35
|
-
if (open)
|
|
35
|
+
if (query.criteria.endsWith(';'))
|
|
36
36
|
query.criteria = query.criteria.slice(0, -1);
|
|
37
37
|
else
|
|
38
38
|
this.closed = true;
|
|
39
|
+
if (query.criteria.startsWith(',') || query.criteria.startsWith(';')) {
|
|
40
|
+
this.prepend = query.criteria[0];
|
|
41
|
+
query.criteria = query.criteria.slice(1);
|
|
42
|
+
}
|
|
39
43
|
}
|
|
40
44
|
this.query = query;
|
|
41
45
|
}
|
|
@@ -49,35 +53,31 @@ class Query {
|
|
|
49
53
|
return query;
|
|
50
54
|
}
|
|
51
55
|
fitCriteria(query, parameters) {
|
|
52
|
-
const
|
|
53
|
-
if (this.query.criteria !== undefined)
|
|
54
|
-
criteria.push(this.query.criteria);
|
|
56
|
+
const groups = [];
|
|
55
57
|
const idx = parameters.findIndex((parameter) => parameter.name === 'id');
|
|
56
58
|
if (idx !== -1) {
|
|
57
59
|
query.id = parameters[idx].value;
|
|
58
60
|
parameters.splice(idx, 1);
|
|
59
61
|
}
|
|
60
62
|
if (parameters.length > 0) {
|
|
61
|
-
const
|
|
63
|
+
const criteria = parameters
|
|
62
64
|
.map(({ name, value }) => `${name}==${value}`)
|
|
63
65
|
.join(';');
|
|
64
|
-
|
|
66
|
+
groups.push({ criteria, operator: this.prepend });
|
|
65
67
|
}
|
|
68
|
+
if (this.query.criteria !== undefined)
|
|
69
|
+
groups.push({ criteria: this.query.criteria, operator: ';' });
|
|
66
70
|
if (query.criteria !== undefined)
|
|
67
71
|
if (this.closed)
|
|
68
72
|
throw new http.BadRequest('Query criteria is closed');
|
|
69
73
|
else
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
default:
|
|
78
|
-
query.criteria = '(' + criteria.join(');(') + ')';
|
|
79
|
-
break;
|
|
80
|
-
}
|
|
74
|
+
groups.push({ criteria: query.criteria, operator: WHATEVER });
|
|
75
|
+
if (groups.length > 0)
|
|
76
|
+
query.criteria = groups.reduce((acc, { criteria, operator }, i) => {
|
|
77
|
+
return i === groups.length - 1
|
|
78
|
+
? `${acc}(${criteria})`
|
|
79
|
+
: `${acc}(${criteria})${operator}`;
|
|
80
|
+
}, '');
|
|
81
81
|
}
|
|
82
82
|
fitRanges(qs) {
|
|
83
83
|
const query = qs;
|
|
@@ -104,4 +104,5 @@ function fit(string, range, name) {
|
|
|
104
104
|
`${range[0]} and ${range[1]} inclusive`);
|
|
105
105
|
return number;
|
|
106
106
|
}
|
|
107
|
+
const WHATEVER = ';';
|
|
107
108
|
//# sourceMappingURL=Query.js.map
|
package/transpiled/Query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Query.js","sourceRoot":"","sources":["../source/Query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8B;AAE9B,mDAAoC;AAIpC,MAAa,KAAK;IACC,KAAK,CAAc;IACnB,MAAM,GAAY,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"Query.js","sourceRoot":"","sources":["../source/Query.ts"],"names":[],"mappings":"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"}
|
package/transpiled/deployment.js
CHANGED
|
@@ -33,6 +33,7 @@ const schemas = __importStar(require("./schemas"));
|
|
|
33
33
|
const Directive_1 = require("./Directive");
|
|
34
34
|
const Composition_1 = require("./Composition");
|
|
35
35
|
const syntax_1 = require("./RTD/syntax");
|
|
36
|
+
const Server_1 = require("./HTTP/Server");
|
|
36
37
|
function deployment(_, annotation) {
|
|
37
38
|
node_assert_1.default.ok(annotation !== undefined, 'Exposition context annotation is required');
|
|
38
39
|
schemas.annotation.validate(annotation);
|
|
@@ -40,12 +41,17 @@ function deployment(_, annotation) {
|
|
|
40
41
|
const service = {
|
|
41
42
|
group: 'exposition',
|
|
42
43
|
name: 'gateway',
|
|
43
|
-
port:
|
|
44
|
+
port: Server_1.PORT,
|
|
44
45
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
45
46
|
version: require('../package.json').version,
|
|
46
47
|
variables: [],
|
|
47
48
|
components: labels,
|
|
48
|
-
ingress: { hosts: [] }
|
|
49
|
+
ingress: { hosts: [] },
|
|
50
|
+
probe: {
|
|
51
|
+
path: '/.ready',
|
|
52
|
+
port: Server_1.PORT,
|
|
53
|
+
delay: Server_1.DELAY
|
|
54
|
+
}
|
|
49
55
|
};
|
|
50
56
|
if (annotation?.['/'] !== undefined) {
|
|
51
57
|
const tree = (0, syntax_1.parse)(annotation['/'], Directive_1.shortcuts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../source/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgC;AAEhC,6CAAwC;AAExC,mDAAoC;AACpC,2CAAuC;AACvC,+CAA0C;AAC1C,yCAAoC;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../source/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgC;AAEhC,6CAAwC;AAExC,mDAAoC;AACpC,2CAAuC;AACvC,+CAA0C;AAC1C,yCAAoC;AACpC,0CAA2C;AAE3C,SAAgB,UAAU,CAAE,CAAU,EAAE,UAAuB;IAC7D,qBAAM,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,EAAE,2CAA2C,CAAC,CAAA;IAChF,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;IAEvC,MAAM,MAAM,GAAG,IAAA,wBAAU,GAAE,CAAC,MAAM,CAAA;IAElC,MAAM,OAAO,GAAY;QACvB,KAAK,EAAE,YAAY;QACnB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,aAAI;QACV,8DAA8D;QAC9D,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO;QAC3C,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,MAAM;QAClB,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;QACtB,KAAK,EAAE;YACL,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,aAAI;YACV,KAAK,EAAE,cAAK;SACb;KACF,CAAA;IAED,IAAI,UAAU,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,UAAU,CAAC,GAAG,CAAC,EAAE,qBAAS,CAAC,CAAA;QAE9C,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YACrB,IAAI,EAAE,gBAAgB;YACtB,KAAK,EAAE,IAAA,gBAAM,EAAC,IAAI,CAAC;SACpB,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,UAAU,CAAA;IAEhD,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IAClD,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAA;IACxC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAA;IAEpD,MAAM,UAAU,GAAe,EAAE,WAAW,EAAE,CAAA;IAE9C,IAAI,KAAK,KAAK,IAAI;QAChB,UAAU,CAAC,KAAK,GAAG,IAAI,CAAA;IAEzB,IAAI,KAAK,KAAK,IAAI;QAChB,UAAU,CAAC,KAAK,GAAG,IAAI,CAAA;IAEzB,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;QACrB,IAAI,EAAE,2BAA2B;QACjC,KAAK,EAAE,IAAA,gBAAM,EAAC,UAAU,CAAC;KAC1B,CAAC,CAAA;IAEF,OAAO,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;AAChC,CAAC;AAnDD,gCAmDC"}
|