@tstdl/base 0.71.3 → 0.71.6
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/api/server/gateway.d.ts +1 -2
- package/api/server/gateway.js +16 -21
- package/api/server/gateway.js.map +1 -1
- package/application/application.d.ts +2 -0
- package/application/application.js +6 -1
- package/application/application.js.map +1 -1
- package/database/mongo/module.js +1 -1
- package/database/mongo/module.js.map +1 -1
- package/package.json +7 -7
package/api/server/gateway.d.ts
CHANGED
|
@@ -6,8 +6,7 @@ import type { HttpServerRequestContext } from "../../http/server/http-server";
|
|
|
6
6
|
import { Logger } from "../../logger";
|
|
7
7
|
import type { Type } from "../../types";
|
|
8
8
|
import type { AsyncMiddleware, AsyncMiddlewareNext } from "../../utils/middleware";
|
|
9
|
-
import
|
|
10
|
-
import type { URLPatternResult } from 'urlpattern-polyfill/dist/url-pattern.interfaces';
|
|
9
|
+
import 'urlpattern-polyfill';
|
|
11
10
|
import type { ApiControllerImplementation, ApiDefinition, ApiEndpointDefinition, ApiEndpointMethod, ApiEndpointServerImplementation } from '../types';
|
|
12
11
|
import type { ApiController } from './api-controller';
|
|
13
12
|
export declare type ApiGatewayMiddlewareContext = {
|
package/api/server/gateway.js
CHANGED
|
@@ -22,15 +22,12 @@ const schema_1 = require("../../schema");
|
|
|
22
22
|
const array_1 = require("../../utils/array");
|
|
23
23
|
const helpers_1 = require("../../utils/helpers");
|
|
24
24
|
const middleware_1 = require("../../utils/middleware");
|
|
25
|
-
const object_1 = require("../../utils/object");
|
|
26
25
|
const type_guards_1 = require("../../utils/type-guards");
|
|
26
|
+
require("urlpattern-polyfill");
|
|
27
27
|
const types_1 = require("../types");
|
|
28
28
|
const api_controller_1 = require("./api-controller");
|
|
29
29
|
const error_handler_1 = require("./error-handler");
|
|
30
30
|
const middlewares_1 = require("./middlewares");
|
|
31
|
-
const UrlPattern = object_1.ForwardRef.create();
|
|
32
|
-
// eslint-disable-next-line no-eval
|
|
33
|
-
void eval('import(\'urlpattern-polyfill\')').then((imported) => object_1.ForwardRef.setRef(UrlPattern, imported.URLPattern));
|
|
34
31
|
/**
|
|
35
32
|
* router for {@link ApiTransport} requests to {@link ApiImplementation}
|
|
36
33
|
* @todo error handling (standardized format, serialization etc.)
|
|
@@ -71,23 +68,21 @@ let ApiGateway = ApiGateway_1 = class ApiGateway {
|
|
|
71
68
|
const method = (_b = endpointDefinition.method) !== null && _b !== void 0 ? _b : 'GET';
|
|
72
69
|
let resourceApis = this.apis.get(resource);
|
|
73
70
|
if ((0, type_guards_1.isUndefined)(resourceApis)) {
|
|
74
|
-
resourceApis =
|
|
75
|
-
resource
|
|
76
|
-
pattern: {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
endpoints: { value: new Map() }
|
|
90
|
-
});
|
|
71
|
+
resourceApis = {
|
|
72
|
+
resource,
|
|
73
|
+
pattern: new globalThis.URLPattern({
|
|
74
|
+
pathname: resource,
|
|
75
|
+
baseURL: 'http://localhost',
|
|
76
|
+
username: '*',
|
|
77
|
+
password: '*',
|
|
78
|
+
protocol: '*',
|
|
79
|
+
hostname: '*',
|
|
80
|
+
port: '*',
|
|
81
|
+
search: '*',
|
|
82
|
+
hash: '*'
|
|
83
|
+
}),
|
|
84
|
+
endpoints: new Map()
|
|
85
|
+
};
|
|
91
86
|
this.apis.set(resource, resourceApis);
|
|
92
87
|
}
|
|
93
88
|
const endpointImplementation = (_d = (_c = implementation[name]) === null || _c === void 0 ? void 0 : _c.bind(implementation)) !== null && _d !== void 0 ? _d : (0, helpers_1.deferThrow)(new error_1.NotImplementedError(`endpoint ${name} for resource ${resource} not implemented`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../source/api/server/gateway.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,+CAA+F;AAC/F,uCAA8E;AAE9E,8CAAmD;AAGnD,yCAAkC;AAClC,yCAAmG;AAEnG,6CAAwC;AACxC,iDAAqD;AAErD,uDAA4D;AAC5D
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../source/api/server/gateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,11 @@ export declare class Application {
|
|
|
6
6
|
private static get instance();
|
|
7
7
|
private readonly logger;
|
|
8
8
|
private readonly moduleTypes;
|
|
9
|
+
private readonly moduleInstances;
|
|
9
10
|
private readonly shutdownPromise;
|
|
10
11
|
constructor(logger: Logger);
|
|
11
12
|
static registerModule(moduleType: Type<Module>): void;
|
|
13
|
+
static registerModuleInstance(module: Module): void;
|
|
12
14
|
static run(): Promise<void>;
|
|
13
15
|
static shutdown(): Promise<void>;
|
|
14
16
|
registerModule(moduleType: Type<Module>): void;
|
|
@@ -26,6 +26,7 @@ let Application = Application_1 = class Application {
|
|
|
26
26
|
constructor(logger) {
|
|
27
27
|
this.logger = logger;
|
|
28
28
|
this.moduleTypes = new Set();
|
|
29
|
+
this.moduleInstances = new Set();
|
|
29
30
|
this.shutdownPromise = new promise_1.DeferredPromise();
|
|
30
31
|
}
|
|
31
32
|
static get instance() {
|
|
@@ -37,6 +38,9 @@ let Application = Application_1 = class Application {
|
|
|
37
38
|
static registerModule(moduleType) {
|
|
38
39
|
Application_1.instance.registerModule(moduleType);
|
|
39
40
|
}
|
|
41
|
+
static registerModuleInstance(module) {
|
|
42
|
+
Application_1.instance.moduleInstances.add(module);
|
|
43
|
+
}
|
|
40
44
|
static async run() {
|
|
41
45
|
await Application_1.instance.run();
|
|
42
46
|
}
|
|
@@ -47,7 +51,8 @@ let Application = Application_1 = class Application {
|
|
|
47
51
|
this.moduleTypes.add(moduleType);
|
|
48
52
|
}
|
|
49
53
|
async run() {
|
|
50
|
-
const
|
|
54
|
+
const resolvedModules = await (0, async_iterable_helpers_1.toArrayAsync)((0, async_iterable_helpers_1.mapAsync)(this.moduleTypes, async (type) => container_1.container.resolveAsync(type)));
|
|
55
|
+
const modules = [...resolvedModules, ...this.moduleInstances];
|
|
51
56
|
try {
|
|
52
57
|
await Promise.race([
|
|
53
58
|
runModules(modules, this.logger),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../source/application/application.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA+D;AAC/D,kCAA0C;AAE1C,sCAAkC;AAElC,0DAAuF;AACvF,wCAA4C;AAE5C,4EAAwE;AACxE,sDAAkD;AAElD,IAAA,oCAAiB,GAAE,CAAC;AAGpB,IAAa,WAAW,mBAAxB,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../source/application/application.ts"],"names":[],"mappings":"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"}
|
package/database/mongo/module.js
CHANGED
|
@@ -44,7 +44,7 @@ container_1.container.registerSingleton(classes_1.MongoClient, {
|
|
|
44
44
|
.on('timeout', () => logger.warn('connection timed out'))
|
|
45
45
|
.on('close', () => logger.verbose('connection closed'));
|
|
46
46
|
core_1.disposer.add(async () => client.close(), 10000);
|
|
47
|
-
await (0, core_1.connect)(
|
|
47
|
+
await (0, core_1.connect)(`mongo at ${url}`, async () => client.connect(), logger);
|
|
48
48
|
return client;
|
|
49
49
|
}
|
|
50
50
|
}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../source/database/mongo/module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+CAAwC;AACxC,qCAA2C;AAC3C,yCAAkC;AAClC,yDAAwE;AACxE,iCAAiC;AAGjC,uCAA8D;AAUjD,QAAA,iBAAiB,GAAsB;IAClD,iBAAiB,EAAE,EAAE,GAAG,EAAE,mCAAmC,EAAE;IAC/D,eAAe,EAAE,SAAS;IAC1B,SAAS,EAAE,OAAO;CACnB,CAAC;AAEF,SAAgB,cAAc,CAAC,MAAkC;;IAC/D,yBAAiB,CAAC,eAAe,GAAG,MAAA,MAAM,CAAC,eAAe,mCAAI,yBAAiB,CAAC,eAAe,CAAC;IAChG,yBAAiB,CAAC,iBAAiB,GAAG,MAAA,MAAM,CAAC,iBAAiB,mCAAI,yBAAiB,CAAC,iBAAiB,CAAC;IACtG,yBAAiB,CAAC,SAAS,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,yBAAiB,CAAC,SAAS,CAAC;IAE9E,MAAM,WAAW,GAAG,qBAAS,CAAC,OAAO,CAAC,eAAM,EAAE,yBAAiB,CAAC,SAAS,CAAC,CAAC;IAC3E,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACrI,CAAC;AAPD,wCAOC;AAED,qBAAS,CAAC,iBAAiB,CAAC,qBAAW,EAAE;IACvC,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;QAC3C,IAAA,2BAAa,EAAC,QAAQ,EAAE,2CAA2C,CAAC,CAAC;QAErE,MAAM,EAAE,GAAG,KAAiB,QAAQ,EAApB,OAAO,UAAK,QAAQ,EAA9B,OAAmB,CAAW,CAAC;QAErC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,eAAM,EAAE,yBAAiB,CAAC,SAAS,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAI,qBAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE7C,MAAM;aACH,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;aACzD,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACjD,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;aACxD,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAE1D,eAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;QAEhD,MAAM,IAAA,cAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../source/database/mongo/module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.71.
|
|
3
|
+
"version": "0.71.6",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
"@types/minio": "7.0",
|
|
24
24
|
"@types/node": ">=16",
|
|
25
25
|
"@types/yup": "0.29",
|
|
26
|
-
"@typescript-eslint/eslint-plugin": "5.
|
|
27
|
-
"@typescript-eslint/parser": "5.
|
|
28
|
-
"eslint": "8.
|
|
26
|
+
"@typescript-eslint/eslint-plugin": "5.20",
|
|
27
|
+
"@typescript-eslint/parser": "5.20",
|
|
28
|
+
"eslint": "8.13",
|
|
29
29
|
"ttypescript": "1.5",
|
|
30
30
|
"typescript": "4.6",
|
|
31
31
|
"typescript-transform-paths": "3.3"
|
|
@@ -37,10 +37,10 @@
|
|
|
37
37
|
"got": "^12.0",
|
|
38
38
|
"koa": "^2.13",
|
|
39
39
|
"minio": "^7.0",
|
|
40
|
-
"mongodb": "4.
|
|
40
|
+
"mongodb": "4.5",
|
|
41
41
|
"superstruct": "^0.15",
|
|
42
|
-
"undici": "^
|
|
43
|
-
"urlpattern-polyfill": "^
|
|
42
|
+
"undici": "^5.0",
|
|
43
|
+
"urlpattern-polyfill": "^4.0"
|
|
44
44
|
},
|
|
45
45
|
"peerDependenciesMeta": {
|
|
46
46
|
"@tstdl/angular": {
|