@typetron/framework 0.5.16 → 0.5.18
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/Framework/Application.js +3 -3
- package/Framework/Application.js.map +1 -1
- package/Framework/Auth/Auth.d.ts +4 -5
- package/Framework/Auth/Auth.d.ts.map +1 -1
- package/Framework/Auth/Auth.js +7 -7
- package/Framework/Auth/Auth.js.map +1 -1
- package/Framework/Config/AuthConfig.d.ts +3 -1
- package/Framework/Config/AuthConfig.d.ts.map +1 -1
- package/Framework/Config/AuthConfig.js +1 -0
- package/Framework/Config/AuthConfig.js.map +1 -1
- package/Framework/Middleware/AuthMiddleware.js +1 -1
- package/Framework/Middleware/AuthMiddleware.js.map +1 -1
- package/Framework/Providers/WebsocketsProvider.d.ts.map +1 -1
- package/Framework/Providers/WebsocketsProvider.js +2 -1
- package/Framework/Providers/WebsocketsProvider.js.map +1 -1
- package/Framework/Resolvers/AuthResolver.js +1 -1
- package/Framework/Resolvers/AuthResolver.js.map +1 -1
- package/Router/Websockets/index.d.ts.map +1 -1
- package/Router/Websockets/index.js +2 -0
- package/Router/Websockets/index.js.map +1 -1
- package/Router/Websockets/types.d.ts +1 -0
- package/Router/Websockets/types.d.ts.map +1 -1
- package/Testing/TestCase.js +2 -2
- package/Testing/TestCase.js.map +1 -1
- package/package.json +1 -1
package/Framework/Application.js
CHANGED
|
@@ -60,10 +60,10 @@ class Application extends Container_1.Container {
|
|
|
60
60
|
.whereIn('extension', ['ts'])
|
|
61
61
|
.forEach((file) => {
|
|
62
62
|
const configItem = require(file.path).default;
|
|
63
|
-
if (configItem && configItem.
|
|
63
|
+
if (configItem && configItem instanceof Config_1.BaseConfig) {
|
|
64
64
|
configItem.applyNewValues();
|
|
65
|
-
this.set(configItem.constructor, configItem);
|
|
66
65
|
}
|
|
66
|
+
this.set(configItem.constructor, configItem);
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
registerResolvers() {
|
|
@@ -86,7 +86,7 @@ class Application extends Container_1.Container {
|
|
|
86
86
|
async checkAppSecret() {
|
|
87
87
|
const authConfig = this.get(Config_1.AuthConfig);
|
|
88
88
|
if (!authConfig.signature) {
|
|
89
|
-
throw new Error(
|
|
89
|
+
throw new Error('APP_SECRET is not setup in your \'.env\' file.');
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Application.js","sourceRoot":"","sources":["../../Framework/Application.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAwC;AAExC,+BAA2B;AAE3B,qCAA4D;AAC5D,2DAAuD;AACvD,+DAA2D;AAC3D,uCAAmC;AACnC,gFAA4E;AAC5E,yCAA6F;AAC7F,wCAAoC;AACpC,2DAAuD;AACvD,4CAA2B;AAC3B,gDAAuB;AACvB,uEAAmE;AAEnE,MAAa,WAAY,SAAQ,qBAAS;IAI3B;IACA;IAJX,MAAM,CAAC,sBAAsB,GAAG,QAAQ,CAAA;IAExC,YACW,SAAiB,EACjB,kBAAkB,WAAW,CAAC,sBAAsB;QAE3D,KAAK,EAAE,CAAA;QAHA,cAAS,GAAT,SAAS,CAAQ;QACjB,oBAAe,GAAf,eAAe,CAAqC;QAG3D,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,SAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,GAAG,CAAC,qBAAS,EAAE,IAAI,CAAC,CAAA;QACzB,IAAI,CAAC,GAAG,CAAC,iBAAO,EAAE,SAAS,CAAC,CAAA;IAChC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACf,SAAiB,EACjB,eAAe,GAAG,WAAW,CAAC,sBAAsB;QAEpD,MAAM,GAAG,GAAG,IAAI,IAAI,CAChB,YAAU,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,EACzC,eAAe,CAClB,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,EAAE,CAAA;QACrB,OAAO,GAAG,CAAA;IACd,CAAC;IAED,KAAK,CAAC,WAAW;QACb,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,cAAW,CAAC,CAAA;QAEzC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,kBAAS,CAAC,CAAA;QAErC,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;YAC3B,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,uCAAkB,CAAC,CAAC,CAAA;QACtD,CAAC;QAED,OAAO,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;IACxC,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,SAA2B;QACtD,MAAM,OAAO,CAAC,GAAG,CACb,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACnC,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAA;QAC9B,CAAC,CAAC,CACL,CAAA;IACL,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,eAAuB;QAC5C,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAA;QAE9D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAA;QAEjC,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;YACvC,OAAO,CAAC,IAAI,CACR,gBAAgB,WAAW,gDAAgD,CAC9E,CAAA;QACL,CAAC;QAED,OAAO;aACF,KAAK,CAAC,WAAW,CAAC;aAClB,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC;aAC5B,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACd,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"Application.js","sourceRoot":"","sources":["../../Framework/Application.ts"],"names":[],"mappings":"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"}
|
package/Framework/Auth/Auth.d.ts
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { User } from './User';
|
|
2
2
|
import { AuthConfig } from '../Config';
|
|
3
|
-
import { ID } from '../../Database';
|
|
4
3
|
import { Crypt, JWT, JWToken } from '@Typetron/Encryption';
|
|
5
4
|
export declare class Auth {
|
|
6
|
-
authConfig: AuthConfig
|
|
5
|
+
authConfig: AuthConfig<User>;
|
|
7
6
|
jwt: JWT;
|
|
8
7
|
crypt: Crypt;
|
|
9
|
-
|
|
8
|
+
identifier?: string | number;
|
|
10
9
|
/**
|
|
11
10
|
* This is primarily used in websocket connections so we don't need to pass the auth token for each weboscket message
|
|
12
11
|
*/
|
|
@@ -15,9 +14,9 @@ export declare class Auth {
|
|
|
15
14
|
get authenticable(): typeof User;
|
|
16
15
|
user<T extends User>(): Promise<T>;
|
|
17
16
|
login(username: string, password: string): Promise<string>;
|
|
18
|
-
loginById(id:
|
|
17
|
+
loginById(id: string | number): Promise<string>;
|
|
19
18
|
loginUser(authenticable: User): Promise<string>;
|
|
20
|
-
sign(id:
|
|
19
|
+
sign(id: string | number, expiresAtTimestampInSeconds?: number): Promise<string>;
|
|
21
20
|
register<T extends User>(username: string, password: string): Promise<T>;
|
|
22
21
|
verify(token: string): Promise<JWToken<number>>;
|
|
23
22
|
private set;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE1D,qBACa,IAAI;IAGb,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,CAAA;IAG5B,GAAG,EAAE,GAAG,CAAA;IAGR,KAAK,EAAE,KAAK,CAAA;IAEZ,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAE5B;;OAEG;IACH,SAAS,OAAa;IAEtB,OAAO,CAAC,SAAS,CAAC,CAAM;IAExB,IAAI,aAAa,IAAI,OAAO,IAAI,CAE/B;IAkBK,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;IAkBlC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUhE,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/C,SAAS,CAAC,aAAa,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/C,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,2BAA2B,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAY1E,QAAQ,CAAC,CAAC,SAAS,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAOxE,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAQrD,OAAO,CAAC,GAAG;CAWd"}
|
package/Framework/Auth/Auth.js
CHANGED
|
@@ -17,7 +17,7 @@ let Auth = class Auth {
|
|
|
17
17
|
authConfig;
|
|
18
18
|
jwt;
|
|
19
19
|
crypt;
|
|
20
|
-
|
|
20
|
+
identifier;
|
|
21
21
|
/**
|
|
22
22
|
* This is primarily used in websocket connections so we don't need to pass the auth token for each weboscket message
|
|
23
23
|
*/
|
|
@@ -45,12 +45,12 @@ let Auth = class Auth {
|
|
|
45
45
|
// if (this.savedUser) { // TODO this if statement should be removed using the @BeforeRequest decorator above
|
|
46
46
|
// return this.savedUser as T
|
|
47
47
|
// }
|
|
48
|
-
if (!this.
|
|
48
|
+
if (!this.identifier) {
|
|
49
49
|
throw new Error('You tried to use the Auth service without authenticating the user. Please use the AuthMiddleware or authenticate the user before using this route');
|
|
50
50
|
}
|
|
51
|
-
const user = await this.authenticable.
|
|
51
|
+
const user = await this.authenticable.where(this.authConfig.identityColumn || 'id', this.identifier).first();
|
|
52
52
|
if (!user) {
|
|
53
|
-
throw new Error(`Could not find a user with id '${this.
|
|
53
|
+
throw new Error(`Could not find a user with id '${this.identifier}'`);
|
|
54
54
|
}
|
|
55
55
|
return this.savedUser = user;
|
|
56
56
|
}
|
|
@@ -60,13 +60,13 @@ let Auth = class Auth {
|
|
|
60
60
|
throw new Error('Invalid credentials');
|
|
61
61
|
}
|
|
62
62
|
delete this.savedUser;
|
|
63
|
-
return this.sign(this.
|
|
63
|
+
return this.sign(this.identifier = user[this.authConfig.identityColumn]);
|
|
64
64
|
}
|
|
65
65
|
loginById(id) {
|
|
66
66
|
return this.sign(id);
|
|
67
67
|
}
|
|
68
68
|
loginUser(authenticable) {
|
|
69
|
-
return this.loginById(authenticable[
|
|
69
|
+
return this.loginById(authenticable[this.authConfig.identityColumn]);
|
|
70
70
|
}
|
|
71
71
|
sign(id, expiresAtTimestampInSeconds) {
|
|
72
72
|
return this.jwt.sign({
|
|
@@ -94,7 +94,7 @@ let Auth = class Auth {
|
|
|
94
94
|
this.expiresAt = new Date();
|
|
95
95
|
this.expiresAt.setSeconds(this.expiresAt.getSeconds() + this.authConfig.duration);
|
|
96
96
|
}
|
|
97
|
-
return this.
|
|
97
|
+
return this.identifier = id;
|
|
98
98
|
}
|
|
99
99
|
};
|
|
100
100
|
exports.Auth = Auth;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA2D;AAE3D,sCAAsC;AAEtC,qDAA0D;AAGnD,IAAM,IAAI,GAAV,MAAM,IAAI;IAGb,UAAU,
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { User } from '../Auth';
|
|
2
2
|
import { BaseConfig } from './BaseConfig';
|
|
3
|
-
|
|
3
|
+
import { EntityKeys } from '@Typetron/Database';
|
|
4
|
+
export declare class AuthConfig<T extends User> extends BaseConfig<AuthConfig<T>> {
|
|
4
5
|
entity: typeof User;
|
|
5
6
|
signature: string;
|
|
6
7
|
duration: number;
|
|
7
8
|
saltRounds: number;
|
|
9
|
+
identityColumn: EntityKeys<T>;
|
|
8
10
|
}
|
|
9
11
|
//# sourceMappingURL=AuthConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthConfig.d.ts","sourceRoot":"","sources":["../../../Framework/Config/AuthConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"AuthConfig.d.ts","sourceRoot":"","sources":["../../../Framework/Config/AuthConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,qBAAa,UAAU,CAAC,CAAC,SAAS,IAAI,CAAE,SAAQ,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrE,MAAM,EAAE,OAAO,IAAI,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;CAChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthConfig.js","sourceRoot":"","sources":["../../../Framework/Config/AuthConfig.ts"],"names":[],"mappings":";;;AACA,6CAAyC;
|
|
1
|
+
{"version":3,"file":"AuthConfig.js","sourceRoot":"","sources":["../../../Framework/Config/AuthConfig.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AAGzC,MAAa,UAA2B,SAAQ,uBAAyB;IACrE,MAAM,CAAa;IACnB,SAAS,CAAQ;IACjB,QAAQ,CAAQ;IAChB,UAAU,CAAQ;IAClB,cAAc,CAAe;CAChC;AAND,gCAMC"}
|
|
@@ -50,7 +50,7 @@ const Auth_1 = require("../Auth");
|
|
|
50
50
|
let AuthMiddleware = class AuthMiddleware {
|
|
51
51
|
auth;
|
|
52
52
|
async handle(request, next) {
|
|
53
|
-
if (this.auth.
|
|
53
|
+
if (this.auth.identifier && this.auth.expiresAt > new Date()) {
|
|
54
54
|
return next(request);
|
|
55
55
|
}
|
|
56
56
|
const authHeader = request.headers.authorization || request.body?.token || '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthMiddleware.js","sourceRoot":"","sources":["../../../Framework/Middleware/AuthMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAoD;AAEpD,4CAA4D;AAC5D,kDAAmC;AACnC,kCAA8B;AAIvB,IAAM,cAAc,GAApB,MAAM,cAAc;IAGvB,IAAI,CAAM;IAEV,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,IAAoB;QAC/C,IAAI,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"AuthMiddleware.js","sourceRoot":"","sources":["../../../Framework/Middleware/AuthMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAoD;AAEpD,4CAA4D;AAC5D,kDAAmC;AACnC,kCAA8B;AAIvB,IAAM,cAAc,GAApB,MAAM,cAAc;IAGvB,IAAI,CAAM;IAEV,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,IAAoB;QAC/C,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC,OAAO,CAAC,CAAA;QACxB,CAAC;QACD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,IAAK,OAAO,CAAC,IAA+B,EAAE,KAAK,IAAI,EAAE,CAAA;QACzG,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;QAC/C,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,CAAA;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,YAAY,GAAG,CAAC,iBAAiB,IAAI,KAAK,YAAY,GAAG,CAAC,iBAAiB,EAAE,CAAC;gBACnF,MAAM,IAAI,gBAAS,CAAC,iBAAiB,EAAE,WAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YACpE,CAAC;YACD,MAAM,IAAI,gBAAS,CAAE,KAAe,CAAC,OAAO,EAAE,WAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAC1E,CAAC;IACL,CAAC;CAEJ,CAAA;AAtBY,wCAAc;AAGvB;IADC,IAAA,kBAAM,GAAE;8BACH,WAAI;4CAAA;yBAHD,cAAc;IAD1B,IAAA,sBAAU,GAAE;GACA,cAAc,CAsB1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketsProvider.d.ts","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,OAAO,EAAE,qBAAqB,EAAuB,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EAAuB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AASjF,qBAAa,kBAAmB,SAAQ,QAAQ;IAG5C,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAGhB,YAAY,EAAE,qBAAqB,CAAA;IAEnC,OAAO,kCAAwC;IAE/C,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"WebsocketsProvider.d.ts","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,OAAO,EAAE,qBAAqB,EAAuB,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EAAuB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AASjF,qBAAa,kBAAmB,SAAQ,QAAQ;IAG5C,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAGhB,YAAY,EAAE,qBAAqB,CAAA;IAEnC,OAAO,kCAAwC;IAE/C,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAqGlB,YAAY;CAS7B"}
|
|
@@ -45,7 +45,6 @@ class WebsocketsProvider extends Provider_1.Provider {
|
|
|
45
45
|
// compression: DISABLED,
|
|
46
46
|
maxPayloadLength: 64 * 1024 * 1024,
|
|
47
47
|
open: (socket) => {
|
|
48
|
-
console.info('connection opened');
|
|
49
48
|
const socketWrapper = new Websockets_1.WebSocket(socket, this.app.createChildContainer());
|
|
50
49
|
this.handler.onOpen?.run(socketWrapper.connection.container, {});
|
|
51
50
|
},
|
|
@@ -80,6 +79,7 @@ class WebsocketsProvider extends Provider_1.Provider {
|
|
|
80
79
|
const response = await this.handleAction(extendedSocket.container, data);
|
|
81
80
|
const action = data.action;
|
|
82
81
|
const sentResponse = {
|
|
82
|
+
$id: data.$id,
|
|
83
83
|
action,
|
|
84
84
|
message: response.body,
|
|
85
85
|
status: WebsocketMessageStatus.OK,
|
|
@@ -95,6 +95,7 @@ class WebsocketsProvider extends Provider_1.Provider {
|
|
|
95
95
|
catch (err) {
|
|
96
96
|
const error = err;
|
|
97
97
|
const errorMessage = {
|
|
98
|
+
$id: data.$id,
|
|
98
99
|
message: {
|
|
99
100
|
message: String(error.content ?? error.message),
|
|
100
101
|
stack: error.stack?.split('\n') ?? ['could not generate stack']
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAsC;AACtC,+CAAmD;AACnD,sCAAqC;AACrC,mDAA6D;AAC7D,+BAAkC;AAClC,4CAA8E;AAC9E,wDAAiF;AAEjF,iEAA6D;AAE7D,IAAK,sBAGJ;AAHD,WAAK,sBAAsB;IACvB,mCAAS,CAAA;IACT,yCAAe,CAAA;AACnB,CAAC,EAHI,sBAAsB,KAAtB,sBAAsB,QAG1B;AAED,MAAa,kBAAmB,SAAQ,mBAAQ;IAG5C,SAAS,CAAW;IAGpB,OAAO,CAAS;IAGhB,YAAY,CAAuB;IAEnC,OAAO,GAAG,IAAI,GAAG,EAA8B,CAAA;IAE/C,QAAQ;QACJ,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAA;QAE1C,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;QACtE,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,kBAAW,EAAE,CAAA;QAEvC,MAAM,GAAG,GAAG,IAAA,oBAAG,GAAE,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;YAC9B,GAAG,CAAC,GAAG,CAAC,0EAA0E,CAAC,CAAA;QACvF,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE;YAEP,2CAA2C;YAC3C,WAAW,EAAE,EAAE;YACf,eAAe,EAAE,IAAI,GAAG,IAAI,GAAG,CAAC,EAAI,0BAA0B;YAC9D,2DAA2D;YAC3D,yCAAyC;YACzC,yBAAyB;YACzB,gBAAgB,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;YAElC,IAAI,EAAE,CAAC,MAAuB,EAAE,EAAE;gBAC9B,
|
|
1
|
+
{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const Auth_1 = require("../Auth");
|
|
|
6
6
|
class AuthResolver extends Container_1.BaseResolver {
|
|
7
7
|
async resolve(abstract, parameters) {
|
|
8
8
|
const auth = this.container.get(Auth_1.Auth);
|
|
9
|
-
if (!auth.
|
|
9
|
+
if (!auth.identifier) {
|
|
10
10
|
return undefined;
|
|
11
11
|
}
|
|
12
12
|
return await auth.user();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/AuthResolver.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAC9C,kCAAkD;AAElD,MAAa,YAAa,SAAQ,wBAAY;IAE1C,KAAK,CAAC,OAAO,CAAI,QAAgB,EAAE,UAAoB;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"AuthResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/AuthResolver.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAC9C,kCAAkD;AAElD,MAAa,YAAa,SAAQ,wBAAY;IAE1C,KAAK,CAAC,OAAO,CAAI,QAAgB,EAAE,UAAoB;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,OAAO,SAAyB,CAAA;QACpC,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,IAAI,EAAkB,CAAA;IAC5C,CAAC;IAED,UAAU,CAAI,QAAgB;QAC1B,OAAO,QAAQ,KAAK,yBAAkB,CAAA;IAC1C,CAAC;CAOJ;AAnBD,oCAmBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AAEvB,qBAAa,SAAS;IAK8B,SAAS,EAAE,SAAS;IAH7D,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG;QAAC,SAAS,EAAE,SAAS,CAAA;KAAC,CAAA;IAC3D,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;gBAER,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAAS,SAAS,EAAE,SAAS;IAKpE,SAAS,CAAC,KAAK,EAAE,MAAM;IAIvB,WAAW,CAAC,KAAK,EAAE,MAAM;IAIzB,KAAK,CAAC,SAAS,CAAC,EAAE,SAAS;IAM3B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AAEvB,qBAAa,SAAS;IAK8B,SAAS,EAAE,SAAS;IAH7D,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG;QAAC,SAAS,EAAE,SAAS,CAAA;KAAC,CAAA;IAC3D,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;gBAER,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAAS,SAAS,EAAE,SAAS;IAKpE,SAAS,CAAC,KAAK,EAAE,MAAM;IAIvB,WAAW,CAAC,KAAK,EAAE,MAAM;IAIzB,KAAK,CAAC,SAAS,CAAC,EAAE,SAAS;IAM3B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAWrD,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAM5D,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;CAStC"}
|
|
@@ -41,6 +41,7 @@ class WebSocket {
|
|
|
41
41
|
// tslint:disable-next-line:no-any
|
|
42
42
|
publish(topic, action, body) {
|
|
43
43
|
const sentResponse = {
|
|
44
|
+
$id: 'todo',
|
|
44
45
|
action,
|
|
45
46
|
message: body,
|
|
46
47
|
status: types_1.WebsocketMessageStatus.OK,
|
|
@@ -55,6 +56,7 @@ class WebSocket {
|
|
|
55
56
|
// tslint:disable-next-line:no-any
|
|
56
57
|
send(action, body) {
|
|
57
58
|
const sentResponse = {
|
|
59
|
+
$id: 'todo',
|
|
58
60
|
action,
|
|
59
61
|
message: body,
|
|
60
62
|
status: types_1.WebsocketMessageStatus.OK,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,mCAAgE;AAChE,mDAA+C;AAE/C,4CAAyB;AACzB,0CAAuB;AAEvB,MAAa,SAAS;IAK8B;IAHzC,UAAU,CAA0C;IAC3D,EAAE,CAAkB;IAEpB,YAAY,UAA2B,EAAS,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;QAChE,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAC,SAAS,EAAC,CAAC,CAAA;QACxD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,KAAa;QACnB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,WAAW,CAAC,KAAa;QACrB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,SAAqB;QACvB,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,oBAAoB,EAAE,IAAI,IAAI,qBAAS,EAAE,CAAA;QACpH,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC;IAED,kCAAkC;IAClC,OAAO,CAAC,KAAa,EAAE,MAAc,EAAE,IAAc;QACjD,MAAM,YAAY,GAA4B;YAC1C,MAAM;YACN,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC7E,CAAC;IAED,kCAAkC;IAClC,cAAc,CAAC,KAAa,EAAE,MAAc,EAAE,IAAc;QACxD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACjC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC3B,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,MAAc,EAAE,IAAc;QAC/B,MAAM,YAAY,GAA4B;YAC1C,MAAM;YACN,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnE,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,mCAAgE;AAChE,mDAA+C;AAE/C,4CAAyB;AACzB,0CAAuB;AAEvB,MAAa,SAAS;IAK8B;IAHzC,UAAU,CAA0C;IAC3D,EAAE,CAAkB;IAEpB,YAAY,UAA2B,EAAS,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;QAChE,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAC,SAAS,EAAC,CAAC,CAAA;QACxD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,KAAa;QACnB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,WAAW,CAAC,KAAa;QACrB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,SAAqB;QACvB,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,oBAAoB,EAAE,IAAI,IAAI,qBAAS,EAAE,CAAA;QACpH,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC;IAED,kCAAkC;IAClC,OAAO,CAAC,KAAa,EAAE,MAAc,EAAE,IAAc;QACjD,MAAM,YAAY,GAA4B;YAC1C,GAAG,EAAE,MAAM;YACX,MAAM;YACN,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC7E,CAAC;IAED,kCAAkC;IAClC,cAAc,CAAC,KAAa,EAAE,MAAc,EAAE,IAAc;QACxD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACjC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC3B,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,MAAc,EAAE,IAAc;QAC/B,MAAM,YAAY,GAA4B;YAC1C,GAAG,EAAE,MAAM;YACX,MAAM;YACN,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnE,CAAC;CACJ;AAlDD,8BAkDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/types.ts"],"names":[],"mappings":"AAAA,oBAAY,sBAAsB;IAC9B,EAAE,OAAO;IACT,KAAK,UAAU;CAClB;AAED,MAAM,WAAW,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,CAAC,CAAA;CACd;AAED,MAAM,WAAW,oBAAoB;IACjC,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAEhC,IAAI,CAAC,EAAE,GAAG,CAAA;CACb;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAA;AAExD,MAAM,WAAW,cAAc,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IAChD,MAAM,EAAE,sBAAsB,CAAA;CACjC;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,cAAc,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/types.ts"],"names":[],"mappings":"AAAA,oBAAY,sBAAsB;IAC9B,EAAE,OAAO;IACT,KAAK,UAAU;CAClB;AAED,MAAM,WAAW,MAAM,CAAC,CAAC;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,CAAC,CAAA;CACd;AAED,MAAM,WAAW,oBAAoB;IACjC,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAEhC,IAAI,CAAC,EAAE,GAAG,CAAA;CACb;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAA;AAExD,MAAM,WAAW,cAAc,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IAChD,MAAM,EAAE,sBAAsB,CAAA;CACjC;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,cAAc,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAC,CAAC,CAAA"}
|
package/Testing/TestCase.js
CHANGED
|
@@ -101,8 +101,8 @@ class TestCase {
|
|
|
101
101
|
}
|
|
102
102
|
const parameters = this.convertRouteParametersToString(routeParameters) || {};
|
|
103
103
|
const auth = this.app.get(Auth_1.Auth);
|
|
104
|
-
if (auth.
|
|
105
|
-
const token = await auth.sign(auth.
|
|
104
|
+
if (auth.identifier) {
|
|
105
|
+
const token = await auth.sign(auth.identifier);
|
|
106
106
|
headers.authorization = `Bearer ${token}`;
|
|
107
107
|
}
|
|
108
108
|
const request = new Http_1.Request(route.getUrl(parameters), method, {}, {}, content);
|
package/Testing/TestCase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestCase.js","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":";;;AAAA,2BAAwB;AACxB,yCAAiI;AAEjI,4CAA4D;AAC5D,sCAAkC;AAClC,4CAA8C;AAE9C,qDAA8E;AAG9E,2CAA2D;AAC3D,qDAA4C;AAC5C,sDAAkD;AAGlD,MAAsB,QAAQ;IAC1B,MAAM,CAAC,GAAG,CAAa;IACvB,GAAG,CAAW;IAEd,kCAAkC;IAClC,eAAe,GAAG,IAAI,GAAG,EAAmC,CAAA;IAE5D,sBAAsB,GAAG;QACrB,4BAAgB;KACnB,CAAA;IAKD,KAAK,CAAC,MAAM;QACR,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAChB,QAAQ,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;QAC5C,CAAC;QACD,MAAM,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QACjE,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAA;QAE9C,MAAM,KAAK,GAAG,IAAA,iBAAI,EAAC,kBAAK,CAAC,CAAA;QACzB,IAAA,iBAAI,EAAC,KAAK,CAAC,IAAI,CAAC,IAAA,qBAAQ,GAAE,EAAE,IAAA,qBAAQ,GAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,WAAW,KAAK,EAAE,CAAC,CAAA;QAC9E,IAAA,iBAAI,EAAC,KAAK,CAAC,OAAO,CAAC,IAAA,qBAAQ,GAAE,EAAE,IAAA,qBAAQ,GAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,KAAK,EAAE,KAAK,MAAM,CAAC,CAAC,CAAA;QAEvH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAK,EAAE,IAAA,qBAAQ,EAAC,KAAK,CAAC,CAAC,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,KAAK,KAAI,CAAC;IAEhB,KAAK,CAAC,SAAS,CAAC,EAAM;QAClB,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAC,IAAU;QAClB,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACrB,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC5C,CAAC;IAED,GAAG,CAAwC,SAAiB,EAAE,OAAO,GAAG,EAAE,EAAE,UAA+B,EAAE;QACzG,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IAC7F,CAAC;IAED,IAAI,CACA,KAAyD,EACzD,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IAC1F,CAAC;IAED,KAAK,CACD,KAAyD,EACzD,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IAC3F,CAAC;IAED,GAAG,CACC,KAAyD,EACzD,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IACzF,CAAC;IAED,MAAM,CACF,KAAyD,EACzD,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAyB,CAAA;IAC5F,CAAC;IAED,KAAK,CAAC,MAAM,CAAwC,MAAc,EAAE,OAAkC;QAClG,MAAM,UAAU,GAAG,IAAA,iBAAI,EAAC,sBAAS,CAAC,CAAA;QAElC,IAAA,iBAAI,EAAC,UAAU,CAAC,cAAc,CAAC,IAAA,qBAAQ,GAAE,EAAE,IAAA,qBAAQ,GAAE,EAAE,IAAA,qBAAQ,GAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE;YACzG,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACtD,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;QAEF,IAAA,iBAAI,EAAC,UAAU,CAAC,IAAI,CAAC,IAAA,qBAAQ,GAAE,EAAE,IAAA,qBAAQ,GAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE;YAC5E,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACtD,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAA;QACjD,SAAS,CAAC,GAAG,CAAC,sBAAS,EAAE,IAAA,qBAAQ,EAAC,UAAU,CAAC,CAAC,CAAA;QAE9C,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAElD,yHAAyH;QACzH,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE;YACrC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAA;QACrD,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAiB,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC3E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,YAAY,gBAAS,EAAE,CAAC;gBAC7B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,4BAAqB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAC7E,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;gBACjC,OAAO,aAA4B,CAAA;YACvC,CAAC;YACD,MAAM,KAAK,CAAA;QACf,CAAC;IACL,CAAC;IAED,EAAE,CAAI,MAAc,EAAE,QAA+B;QACjD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC9C,CAAC;IAEO,KAAK,CAAC,OAAO,CACjB,MAAmB,EACnB,SAA6D,EAC7D,OAAO,GAAG,EAAE,EACZ,UAA+B,EAAE;QAEjC,IAAI,eAAe,GAAG,EAAE,CAAA;QACxB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAChC,CAAC,SAAS,EAAE,eAAe,CAAC,GAAG,SAAS,CAAA;QAC5C,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAM,CAAC,CAAA;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAc,CAAA;QACrE,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,aAAa,CAAC,CAAA;QACrD,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,8BAA8B,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;QAE7E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAI,CAAC,CAAA;QAC/B,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"TestCase.js","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":"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"}
|