@typetron/framework 0.3.4 → 0.3.8
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/Container/ClassResolver.d.ts.map +1 -1
- package/Container/ClassResolver.js +6 -2
- package/Container/ClassResolver.js.map +1 -1
- package/Container/Contracts.d.ts +1 -1
- package/Container/Contracts.d.ts.map +1 -1
- package/Database/Entity.d.ts +2 -1
- package/Database/Entity.d.ts.map +1 -1
- package/Database/Entity.js +17 -7
- package/Database/Entity.js.map +1 -1
- package/Database/EntityNotFoundError.d.ts +3 -0
- package/Database/EntityNotFoundError.d.ts.map +1 -1
- package/Database/EntityNotFoundError.js +4 -0
- package/Database/EntityNotFoundError.js.map +1 -1
- package/Database/EntityProxyHandler.d.ts +0 -3
- package/Database/EntityProxyHandler.d.ts.map +1 -1
- package/Database/EntityProxyHandler.js +0 -2
- package/Database/EntityProxyHandler.js.map +1 -1
- package/Database/EntityQuery.d.ts +5 -4
- package/Database/EntityQuery.d.ts.map +1 -1
- package/Database/EntityQuery.js +20 -9
- package/Database/EntityQuery.js.map +1 -1
- package/Database/Fields.d.ts +3 -0
- package/Database/Fields.d.ts.map +1 -1
- package/Database/Fields.js +10 -4
- package/Database/Fields.js.map +1 -1
- package/Database/List.d.ts +1 -1
- package/Database/Types.d.ts +2 -1
- package/Database/Types.d.ts.map +1 -1
- package/Framework/Auth/Auth.d.ts +3 -3
- package/Framework/Auth/Auth.d.ts.map +1 -1
- package/Framework/Auth/Auth.js +25 -4
- package/Framework/Auth/Auth.js.map +1 -1
- package/Framework/Auth/index.d.ts.map +1 -1
- package/Framework/Auth/index.js +1 -0
- package/Framework/Auth/index.js.map +1 -1
- package/Framework/Config/AppConfig.d.ts +6 -2
- package/Framework/Config/AppConfig.d.ts.map +1 -1
- package/Framework/Config/AppConfig.js +1 -1
- package/Framework/Config/AppConfig.js.map +1 -1
- package/Framework/Config/DatabaseConfig.js +3 -3
- package/Framework/Config/DatabaseConfig.js.map +1 -1
- package/Framework/Middleware/StaticAssetsMiddleware.d.ts +1 -1
- package/Framework/Middleware/StaticAssetsMiddleware.d.ts.map +1 -1
- package/Framework/Middleware/StaticAssetsMiddleware.js +42 -24
- package/Framework/Middleware/StaticAssetsMiddleware.js.map +1 -1
- package/Framework/Providers/WebsocketsProvider.d.ts +2 -0
- package/Framework/Providers/WebsocketsProvider.d.ts.map +1 -1
- package/Framework/Providers/WebsocketsProvider.js +12 -7
- package/Framework/Providers/WebsocketsProvider.js.map +1 -1
- package/Framework/Resolvers/AuthResolver.d.ts.map +1 -1
- package/Framework/Resolvers/AuthResolver.js +0 -8
- package/Framework/Resolvers/AuthResolver.js.map +1 -1
- package/Framework/Resolvers/EntityResolver.d.ts.map +1 -1
- package/Framework/Resolvers/EntityResolver.js +2 -1
- package/Framework/Resolvers/EntityResolver.js.map +1 -1
- package/Router/Http/ErrorHandler.js +6 -6
- package/Router/Http/ErrorHandler.js.map +1 -1
- package/Router/Http/Response.d.ts +1 -0
- package/Router/Http/Response.d.ts.map +1 -1
- package/Router/Http/Response.js +10 -10
- package/Router/Http/Response.js.map +1 -1
- package/Router/Websockets/Handler.d.ts +1 -2
- package/Router/Websockets/Handler.d.ts.map +1 -1
- package/Router/Websockets/Handler.js +0 -4
- package/Router/Websockets/Handler.js.map +1 -1
- package/Router/Websockets/WebsocketEvent.js +1 -1
- package/Router/Websockets/WebsocketEvent.js.map +1 -1
- package/Router/Websockets/index.d.ts +8 -4
- package/Router/Websockets/index.d.ts.map +1 -1
- package/Router/Websockets/index.js +10 -1
- package/Router/Websockets/index.js.map +1 -1
- package/Testing/TestCase.d.ts.map +1 -1
- package/Testing/TestCase.js +12 -2
- package/Testing/TestCase.js.map +1 -1
- package/package.json +4 -3
- package/tests/Database/EntityRelationshipsTest.js +40 -22
- package/tests/Database/EntityRelationshipsTest.js.map +1 -1
- package/tests/Database/EntityTest.js +1 -1
- package/tests/Database/EntityTest.js.map +1 -1
- package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.d.ts +2 -0
- package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.d.ts.map +1 -0
- package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.js +166 -0
- package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.js.map +1 -0
- package/tests/Router/HttpHandlerTest.js +4 -4
- package/tests/Router/HttpHandlerTest.js.map +1 -1
- package/Web/Contracts.d.ts +0 -4
- package/Web/Contracts.d.ts.map +0 -1
- package/Web/Contracts.js +0 -3
- package/Web/Contracts.js.map +0 -1
- package/Web/ErrorHandler.d.ts +0 -10
- package/Web/ErrorHandler.d.ts.map +0 -1
- package/Web/ErrorHandler.js +0 -52
- package/Web/ErrorHandler.js.map +0 -1
- package/Web/ErrorHandlerInterface.d.ts +0 -6
- package/Web/ErrorHandlerInterface.d.ts.map +0 -1
- package/Web/ErrorHandlerInterface.js +0 -7
- package/Web/ErrorHandlerInterface.js.map +0 -1
- package/Web/Errors/HttpError.d.ts +0 -8
- package/Web/Errors/HttpError.d.ts.map +0 -1
- package/Web/Errors/HttpError.js +0 -16
- package/Web/Errors/HttpError.js.map +0 -1
- package/Web/Handler.d.ts +0 -11
- package/Web/Handler.d.ts.map +0 -1
- package/Web/Handler.js +0 -52
- package/Web/Handler.js.map +0 -1
- package/Web/Request.d.ts +0 -25
- package/Web/Request.d.ts.map +0 -1
- package/Web/Request.js +0 -152
- package/Web/Request.js.map +0 -1
- package/Web/Response.d.ts +0 -16
- package/Web/Response.d.ts.map +0 -1
- package/Web/Response.js +0 -51
- package/Web/Response.js.map +0 -1
- package/Web/index.d.ts +0 -84
- package/Web/index.d.ts.map +0 -1
- package/Web/index.js +0 -100
- package/Web/index.js.map +0 -1
- package/Web-old/Contracts.d.ts +0 -4
- package/Web-old/Contracts.d.ts.map +0 -1
- package/Web-old/Contracts.js +0 -3
- package/Web-old/Contracts.js.map +0 -1
- package/Web-old/ErrorHandler.d.ts +0 -10
- package/Web-old/ErrorHandler.d.ts.map +0 -1
- package/Web-old/ErrorHandler.js +0 -52
- package/Web-old/ErrorHandler.js.map +0 -1
- package/Web-old/ErrorHandlerInterface.d.ts +0 -6
- package/Web-old/ErrorHandlerInterface.d.ts.map +0 -1
- package/Web-old/ErrorHandlerInterface.js +0 -7
- package/Web-old/ErrorHandlerInterface.js.map +0 -1
- package/Web-old/Errors/HttpError.d.ts +0 -8
- package/Web-old/Errors/HttpError.d.ts.map +0 -1
- package/Web-old/Errors/HttpError.js +0 -16
- package/Web-old/Errors/HttpError.js.map +0 -1
- package/Web-old/Handler.d.ts +0 -16
- package/Web-old/Handler.d.ts.map +0 -1
- package/Web-old/Handler.js +0 -132
- package/Web-old/Handler.js.map +0 -1
- package/Web-old/Request.d.ts +0 -25
- package/Web-old/Request.d.ts.map +0 -1
- package/Web-old/Request.js +0 -152
- package/Web-old/Request.js.map +0 -1
- package/Web-old/Response.d.ts +0 -16
- package/Web-old/Response.d.ts.map +0 -1
- package/Web-old/Response.js +0 -51
- package/Web-old/Response.js.map +0 -1
- package/Web-old/index.d.ts +0 -84
- package/Web-old/index.d.ts.map +0 -1
- package/Web-old/index.js +0 -100
- package/Web-old/index.js.map +0 -1
package/Database/Fields.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Fields.js","sourceRoot":"","sources":["../../Database/Fields.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Fields.js","sourceRoot":"","sources":["../../Database/Fields.ts"],"names":[],"mappings":"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"}
|
package/Database/List.d.ts
CHANGED
|
@@ -20,6 +20,6 @@ export declare abstract class List<E extends Entity, P extends Entity = Entity>
|
|
|
20
20
|
}
|
|
21
21
|
export declare class ListProxyHandler<E extends Entity, P extends Entity> {
|
|
22
22
|
constructor();
|
|
23
|
-
get(target: List<E, P>, property: string | number): number | E | P | E[] | ((name: string, value: string) => E | undefined) | (<K extends Exclude<keyof E, "fill" | "exists" | "original" | "metadata" | "static" | "getTable" | "load" | "loadCount" | "newQuery" | "delete" | "save" | "getPrimaryKey" | "getPrimaryKeyValue" | "toJSON">>(column: Exclude<keyof E, "fill" | "exists" | "original" | "metadata" | "static" | "getTable" | "load" | "loadCount" | "newQuery" | "delete" | "save" | "getPrimaryKey" | "getPrimaryKeyValue" | "toJSON">, operator: string | number | Date | E[K] | undefined, value?: string | number | Date | E[K] | undefined, boolean?: "AND" | "OR" | "XOR" | undefined) => EntityQuery<E>) | (() => Promise<List<E, P>>) | (() => E[]) | HasManyField<P, E> | BelongsToManyField<P, E> | (() => Promise<E[]>);
|
|
23
|
+
get(target: List<E, P>, property: string | number): number | E | P | E[] | ((name: string, value: string) => E | undefined) | (<K extends Exclude<keyof E, "fill" | "exists" | "original" | "metadata" | "static" | "getTable" | "load" | "loadCount" | "newQuery" | "hydrateWithRelationships" | "delete" | "save" | "getPrimaryKey" | "getPrimaryKeyValue" | "toJSON">>(column: Exclude<keyof E, "fill" | "exists" | "original" | "metadata" | "static" | "getTable" | "load" | "loadCount" | "newQuery" | "hydrateWithRelationships" | "delete" | "save" | "getPrimaryKey" | "getPrimaryKeyValue" | "toJSON">, operator: string | number | Date | E[K] | undefined, value?: string | number | Date | E[K] | undefined, boolean?: "AND" | "OR" | "XOR" | undefined) => EntityQuery<E>) | (() => Promise<List<E, P>>) | (() => E[]) | HasManyField<P, E> | BelongsToManyField<P, E> | (() => Promise<E[]>);
|
|
24
24
|
}
|
|
25
25
|
//# sourceMappingURL=List.d.ts.map
|
package/Database/Types.d.ts
CHANGED
|
@@ -110,8 +110,9 @@ export declare class WhereSubSelect extends WhereExpression {
|
|
|
110
110
|
query: Query;
|
|
111
111
|
constructor(column: string, operator: Operator, query: Query, boolean: Boolean);
|
|
112
112
|
}
|
|
113
|
+
export declare type RelationsTreeQuery = (query: EntityQuery<any>) => void;
|
|
113
114
|
export interface RelationsTree {
|
|
114
|
-
[key: string]: RelationsTree |
|
|
115
|
+
[key: string]: RelationsTree | RelationsTreeQuery;
|
|
115
116
|
}
|
|
116
117
|
export {};
|
|
117
118
|
//# sourceMappingURL=Types.d.ts.map
|
package/Database/Types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../Database/Types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../Database/Types.ts"],"names":[],"mappings":"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"}
|
package/Framework/Auth/Auth.d.ts
CHANGED
|
@@ -11,14 +11,14 @@ export declare class Auth {
|
|
|
11
11
|
* This is primarily used in websocket connections so we don't need to pass the auth token for each weboscket message
|
|
12
12
|
*/
|
|
13
13
|
expiresAt: Date;
|
|
14
|
-
private savedUser
|
|
14
|
+
private savedUser?;
|
|
15
15
|
get authenticable(): typeof User;
|
|
16
|
-
user<T extends User>(): Promise<T>;
|
|
16
|
+
user<T extends User>(): Promise<T | undefined>;
|
|
17
17
|
login(username: string, password: string): Promise<string>;
|
|
18
18
|
loginById(id: ID): Promise<string>;
|
|
19
19
|
loginUser(authenticable: User): Promise<string>;
|
|
20
20
|
sign(id: ID, expiresAtTimestampInSeconds?: number): Promise<string>;
|
|
21
|
-
register(username: string, password: string): Promise<
|
|
21
|
+
register<T extends User>(username: string, password: string): Promise<T>;
|
|
22
22
|
verify(token: string): Promise<import("../../Encryption").JWToken<number>>;
|
|
23
23
|
private set;
|
|
24
24
|
}
|
|
@@ -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;AACtC,OAAO,EAAc,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAEjD,qBACa,IAAI;IAGb,UAAU,EAAE,UAAU,CAAA;IAGtB,GAAG,EAAE,GAAG,CAAA;IAGR,KAAK,EAAE,KAAK,CAAA;IAEZ,EAAE,CAAC,EAAE,EAAE,CAAA;IAEP;;OAEG;IACH,SAAS,OAAa;IAEtB,OAAO,CAAC,SAAS,CAAM;
|
|
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;AACtC,OAAO,EAAc,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAEjD,qBACa,IAAI;IAGb,UAAU,EAAE,UAAU,CAAA;IAGtB,GAAG,EAAE,GAAG,CAAA;IAGR,KAAK,EAAE,KAAK,CAAA;IAEZ,EAAE,CAAC,EAAE,EAAE,CAAA;IAEP;;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,GAAG,SAAS,CAAC;IAkB9C,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUhE,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAIlC,SAAS,CAAC,aAAa,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/C,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,2BAA2B,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAY7D,QAAQ,CAAC,CAAC,SAAS,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAOxE,MAAM,CAAC,KAAK,EAAE,MAAM;IAQ1B,OAAO,CAAC,GAAG;CAWd"}
|
package/Framework/Auth/Auth.js
CHANGED
|
@@ -23,20 +23,41 @@ let Auth = class Auth {
|
|
|
23
23
|
get authenticable() {
|
|
24
24
|
return this.authConfig.entity;
|
|
25
25
|
}
|
|
26
|
+
// @BeforeRequest() // TODO implement the container's '@BeforeRequest' decorator to do something before each request.
|
|
27
|
+
// For example, load the authenticated user in memory again
|
|
28
|
+
// async before() {
|
|
29
|
+
// if (!this.id) {
|
|
30
|
+
// return undefined
|
|
31
|
+
// throw new Error('You tried to use the Auth service without authenticating the user. ' +
|
|
32
|
+
// 'Please use the AuthMiddleware or authenticate the user before using this route')
|
|
33
|
+
// }
|
|
34
|
+
//
|
|
35
|
+
// const user = await this.authenticable.find(this.id)
|
|
36
|
+
// if (!user) {
|
|
37
|
+
// throw new Error(`Authenticated user with ID ${this.id} not found `)
|
|
38
|
+
// }
|
|
39
|
+
// this.savedUser = await this.authenticable.find(this.id)
|
|
40
|
+
// }
|
|
26
41
|
async user() {
|
|
27
|
-
if (this.savedUser) {
|
|
28
|
-
|
|
29
|
-
}
|
|
42
|
+
// if (this.savedUser) { // TODO this if statement should be removed using the @BeforeRequest decorator above
|
|
43
|
+
// return this.savedUser as T
|
|
44
|
+
// }
|
|
30
45
|
if (!this.id) {
|
|
46
|
+
return undefined;
|
|
31
47
|
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');
|
|
32
48
|
}
|
|
33
|
-
|
|
49
|
+
const user = await this.authenticable.find(this.id);
|
|
50
|
+
if (!user) {
|
|
51
|
+
throw new Error(`Authenticated user with ID ${this.id} not found `);
|
|
52
|
+
}
|
|
53
|
+
return this.savedUser = user;
|
|
34
54
|
}
|
|
35
55
|
async login(username, password) {
|
|
36
56
|
const user = await this.authenticable.where((new this.authenticable).getUsername(), username).first();
|
|
37
57
|
if (!user || !await this.crypt.compare(password, user.password)) {
|
|
38
58
|
throw new Error('Invalid credentials');
|
|
39
59
|
}
|
|
60
|
+
delete this.savedUser;
|
|
40
61
|
return this.sign(this.id = user.id);
|
|
41
62
|
}
|
|
42
63
|
loginById(id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA2D;AAE3D,sCAAsC;AAEtC,qDAAiD;AAGjD,IAAa,IAAI,GAAjB,MAAa,IAAI;IAAjB;QAaI;;WAEG;QACH,cAAS,GAAG,IAAI,IAAI,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":"AAGA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,mBAAmB,CAAA;AAEjC,eAAO,MAAM,kBAAkB,eAA0C,CAAA;AAEzE,wBAAgB,QAAQ,aACK,MAAM,YAAY,MAAM,+
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":"AAGA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,mBAAmB,CAAA;AAEjC,eAAO,MAAM,kBAAkB,eAA0C,CAAA;AAEzE,wBAAgB,QAAQ,aACK,MAAM,YAAY,MAAM,+CAyBpD"}
|
package/Framework/Auth/index.js
CHANGED
|
@@ -26,6 +26,7 @@ function AuthUser() {
|
|
|
26
26
|
Container_1.InjectableMetadata.set(metadata, target.constructor);
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
|
+
// TODO refactor this so it doesn't add the metadata to both .routes and .events
|
|
29
30
|
const metadata = Metadata_1.ControllerMetadata.get(target.constructor);
|
|
30
31
|
const route = metadata.routes[property] || new Metadata_1.RouteMetadata();
|
|
31
32
|
route.parametersOverrides[parameterIndex] = async function (container) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAsE;AACtE,oDAAwF;AAExF,yCAAsB;AACtB,yCAAsB;AACtB,oDAAiC;AAEpB,QAAA,kBAAkB,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAA;AAEzE,SAAgB,QAAQ;IACpB,OAAO,UAAU,MAAc,EAAE,QAAgB,EAAE,cAAuB;QACtE,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,MAAM,QAAQ,GAAG,8BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC3D,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,0BAAkB,CAAA;YACpD,QAAQ,CAAC,KAAK,GAAG,iBAAK,CAAC,OAAO,CAAA;YAC9B,8BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;aAAM;YACH,MAAM,QAAQ,GAAG,6BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAE3D,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,wBAAa,EAAE,CAAA;YAC9D,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,KAAK,WAAU,SAAoB;gBAC3E,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAA;YAClD,CAAC,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAA;YAEjC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,wBAAa,EAAE,CAAA;YAC9D,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,KAAK,WAAU,SAAoB;gBAC3E,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAA;YAClD,CAAC,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAA;YAEjC,6BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;IACL,CAAC,CAAA;AACL,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAsE;AACtE,oDAAwF;AAExF,yCAAsB;AACtB,yCAAsB;AACtB,oDAAiC;AAEpB,QAAA,kBAAkB,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAA;AAEzE,SAAgB,QAAQ;IACpB,OAAO,UAAU,MAAc,EAAE,QAAgB,EAAE,cAAuB;QACtE,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,MAAM,QAAQ,GAAG,8BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC3D,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,0BAAkB,CAAA;YACpD,QAAQ,CAAC,KAAK,GAAG,iBAAK,CAAC,OAAO,CAAA;YAC9B,8BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;aAAM;YACH,gFAAgF;YAChF,MAAM,QAAQ,GAAG,6BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAE3D,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,wBAAa,EAAE,CAAA;YAC9D,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,KAAK,WAAU,SAAoB;gBAC3E,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAA;YAClD,CAAC,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAA;YAEjC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,wBAAa,EAAE,CAAA;YAC9D,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,KAAK,WAAU,SAAoB;gBAC3E,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAA;YAClD,CAAC,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAA;YAEjC,6BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;IACL,CAAC,CAAA;AACL,CAAC;AA1BD,4BA0BC"}
|
|
@@ -4,12 +4,16 @@ import { Abstract, Type } from '../../Support';
|
|
|
4
4
|
import { Provider } from '../Provider';
|
|
5
5
|
export declare class AppConfig extends BaseConfig<AppConfig> {
|
|
6
6
|
environment: string;
|
|
7
|
+
debug: boolean;
|
|
7
8
|
port: number;
|
|
8
9
|
websocketsPort?: number;
|
|
9
10
|
middleware: Abstract<MiddlewareInterface>[];
|
|
10
11
|
providers: Type<Provider>[];
|
|
11
12
|
staticAssets?: {
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
url: string;
|
|
14
|
+
path: string;
|
|
15
|
+
basePath?: boolean;
|
|
16
|
+
indexFile?: string;
|
|
17
|
+
}[];
|
|
14
18
|
}
|
|
15
19
|
//# sourceMappingURL=AppConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppConfig.d.ts","sourceRoot":"","sources":["../../../Framework/Config/AppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,qBAAa,SAAU,SAAQ,UAAU,CAAC,SAAS,CAAC;IAChD,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"AppConfig.d.ts","sourceRoot":"","sources":["../../../Framework/Config/AppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,qBAAa,SAAU,SAAQ,UAAU,CAAC,SAAS,CAAC;IAChD,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,UAAO;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAA;IAC3C,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAG,CAAA;IAC5B,YAAY,CAAC,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAC,EAAE,CAAA;CACvF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppConfig.js","sourceRoot":"","sources":["../../../Framework/Config/AppConfig.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAKzC,MAAa,SAAU,SAAQ,uBAAqB;IAApD;;
|
|
1
|
+
{"version":3,"file":"AppConfig.js","sourceRoot":"","sources":["../../../Framework/Config/AppConfig.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAKzC,MAAa,SAAU,SAAQ,uBAAqB;IAApD;;QAEI,UAAK,GAAG,IAAI,CAAA;IAMhB,CAAC;CAAA;AARD,8BAQC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DatabaseConfig = void 0;
|
|
4
4
|
const BaseConfig_1 = require("./BaseConfig");
|
|
5
|
-
const
|
|
5
|
+
const Database_1 = require("@Typetron/Database");
|
|
6
6
|
class DatabaseConfig extends BaseConfig_1.BaseConfig {
|
|
7
7
|
constructor() {
|
|
8
8
|
var _a;
|
|
@@ -11,8 +11,8 @@ class DatabaseConfig extends BaseConfig_1.BaseConfig {
|
|
|
11
11
|
this.migrationsDirectory = 'migrations';
|
|
12
12
|
this.driver = (_a = process.env.databaseDriver) !== null && _a !== void 0 ? _a : 'sqlite';
|
|
13
13
|
this.drivers = {
|
|
14
|
-
sqlite: () => { var _a; return new
|
|
15
|
-
mysql: () => new
|
|
14
|
+
sqlite: () => { var _a; return new Database_1.SqliteDriver((_a = process.env.database) !== null && _a !== void 0 ? _a : 'database.sqlite'); },
|
|
15
|
+
mysql: () => new Database_1.MysqlDriver({
|
|
16
16
|
host: process.env.databaseHost,
|
|
17
17
|
user: process.env.databaseUser,
|
|
18
18
|
password: process.env.databasePassword,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseConfig.js","sourceRoot":"","sources":["../../../Framework/Config/DatabaseConfig.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"DatabaseConfig.js","sourceRoot":"","sources":["../../../Framework/Config/DatabaseConfig.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,iDAA8D;AAG9D,MAAa,cAAe,SAAQ,uBAA0B;IAA9D;;;QACI,sBAAiB,GAAG,KAAK,CAAA;QAEzB,wBAAmB,GAAG,YAAY,CAAA;QAClC,WAAM,SAA0B,OAAO,CAAC,GAAG,CAAC,cAAuC,mCAAI,QAAQ,CAAA;QAE/F,YAAO,GAAyC;YAC5C,MAAM,EAAE,GAAG,EAAE,WAAC,OAAA,IAAI,uBAAY,OAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,iBAAiB,CAAC,CAAA,EAAA;YACzE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,sBAAW,CAAC;gBACzB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBAC9B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBAC9B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;gBACtC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;aACjC,CAAC;SACL,CAAA;IACL,CAAC;CAAA;AAfD,wCAeC"}
|
|
@@ -10,6 +10,6 @@ export declare class StaticAssetsMiddleware implements MiddlewareInterface {
|
|
|
10
10
|
};
|
|
11
11
|
handle(request: Request, next: RequestHandler): Promise<Response<any>>;
|
|
12
12
|
loadStaticAsset(error: RouteNotFoundError, request: Request): Promise<Response>;
|
|
13
|
-
|
|
13
|
+
private getResponse;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=StaticAssetsMiddleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticAssetsMiddleware.d.ts","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"StaticAssetsMiddleware.d.ts","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,qBACa,sBAAuB,YAAW,mBAAmB;IAG9D,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAEhB,SAAS,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CASjC;IAEK,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc;IAW7C,eAAe,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;YA4BvE,WAAW;CAM5B"}
|
|
@@ -1,10 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
2
14
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
15
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
16
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
17
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
18
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
19
|
};
|
|
20
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
21
|
+
if (mod && mod.__esModule) return mod;
|
|
22
|
+
var result = {};
|
|
23
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
24
|
+
__setModuleDefault(result, mod);
|
|
25
|
+
return result;
|
|
26
|
+
};
|
|
8
27
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
28
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
29
|
};
|
|
@@ -15,6 +34,7 @@ const Router_1 = require("../../Router");
|
|
|
15
34
|
const Storage_1 = require("../../Storage");
|
|
16
35
|
const Http_1 = require("../../Router/Http");
|
|
17
36
|
const Config_1 = require("../Config");
|
|
37
|
+
const path = __importStar(require("path"));
|
|
18
38
|
let StaticAssetsMiddleware = class StaticAssetsMiddleware {
|
|
19
39
|
constructor() {
|
|
20
40
|
this.mimeTypes = {
|
|
@@ -40,36 +60,34 @@ let StaticAssetsMiddleware = class StaticAssetsMiddleware {
|
|
|
40
60
|
}
|
|
41
61
|
}
|
|
42
62
|
async loadStaticAsset(error, request) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (
|
|
47
|
-
|
|
63
|
+
var _a, _b;
|
|
64
|
+
const configs = (_a = this.appConfig.staticAssets) !== null && _a !== void 0 ? _a : [];
|
|
65
|
+
for (const config of configs) {
|
|
66
|
+
if (!request.uri.match(config.url)) {
|
|
67
|
+
continue;
|
|
48
68
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
69
|
+
let realPath = path.join(config.path, request.uri);
|
|
70
|
+
let extension = path.extname(realPath).substring(1);
|
|
71
|
+
if (!extension) {
|
|
72
|
+
realPath = path.join(realPath, 'index.html');
|
|
73
|
+
extension = 'html';
|
|
74
|
+
}
|
|
75
|
+
if (!await this.storage.exists(realPath)) {
|
|
76
|
+
if (config.basePath) {
|
|
77
|
+
const basePath = path.join(config.path, (_b = config.indexFile) !== null && _b !== void 0 ? _b : 'index.html');
|
|
78
|
+
return this.getResponse(basePath);
|
|
59
79
|
}
|
|
60
|
-
|
|
61
|
-
const contentType = this.mimeTypes[extension || 'application/octet-stream'] || this.mimeTypes.txt;
|
|
62
|
-
return new Http_1.Response(file, Http_1.Http.Status.OK, { 'Content-type': contentType });
|
|
80
|
+
continue;
|
|
63
81
|
}
|
|
82
|
+
return this.getResponse(realPath, extension);
|
|
64
83
|
}
|
|
65
84
|
throw error;
|
|
66
85
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
}
|
|
72
|
-
return parts.pop();
|
|
86
|
+
async getResponse(filePath, extension) {
|
|
87
|
+
extension = extension !== null && extension !== void 0 ? extension : path.extname(filePath).substring(1);
|
|
88
|
+
const file = await this.storage.read(filePath);
|
|
89
|
+
const contentType = this.mimeTypes[extension || 'application/octet-stream'] || this.mimeTypes.txt;
|
|
90
|
+
return new Http_1.Response(file, Http_1.Http.Status.OK, { 'Content-type': contentType });
|
|
73
91
|
}
|
|
74
92
|
};
|
|
75
93
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticAssetsMiddleware.js","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"StaticAssetsMiddleware.js","sourceRoot":"","sources":["../../../Framework/Middleware/StaticAssetsMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { Provider } from '../Provider';
|
|
2
2
|
import { AppConfig } from '../Config';
|
|
3
|
+
import { ErrorHandlerInterface } from '../../Router/Http';
|
|
3
4
|
import { Handler, WebSocket } from '../../Router/Websockets';
|
|
4
5
|
export declare class WebsocketsProvider extends Provider {
|
|
5
6
|
appConfig: AppConfig;
|
|
6
7
|
handler: Handler;
|
|
8
|
+
errorHandler: ErrorHandlerInterface;
|
|
7
9
|
sockets: Map<string | number, WebSocket>;
|
|
8
10
|
register(): void | Promise<void>;
|
|
9
11
|
private handleEvent;
|
|
@@ -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;
|
|
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,EAAiB,MAAM,mBAAmB,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAQ5D,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;YA4ElB,WAAW;CAc5B"}
|
|
@@ -41,14 +41,12 @@ class WebsocketsProvider extends Provider_1.Provider {
|
|
|
41
41
|
compression: uWebSockets_js_1.DEDICATED_COMPRESSOR_3KB,
|
|
42
42
|
open: (socket) => {
|
|
43
43
|
var _a;
|
|
44
|
-
const socketWrapper = new Websockets_1.WebSocket(socket);
|
|
45
|
-
|
|
46
|
-
socket.container.set(Websockets_1.WebSocket, socketWrapper);
|
|
47
|
-
(_a = this.handler.onOpen) === null || _a === void 0 ? void 0 : _a.run(socket.container, {});
|
|
44
|
+
const socketWrapper = new Websockets_1.WebSocket(socket, this.app.createChildContainer());
|
|
45
|
+
(_a = this.handler.onOpen) === null || _a === void 0 ? void 0 : _a.run(socketWrapper.connection.container, {});
|
|
48
46
|
},
|
|
49
|
-
close: (socket) => {
|
|
47
|
+
close: async (socket) => {
|
|
50
48
|
var _a;
|
|
51
|
-
(_a = this.handler.onClose) === null || _a === void 0 ? void 0 : _a.run(socket.container, {});
|
|
49
|
+
await ((_a = this.handler.onClose) === null || _a === void 0 ? void 0 : _a.run(socket.container, {}));
|
|
52
50
|
},
|
|
53
51
|
/* For brevity we skip the other events (upgrade, open, ping, pong, close) */
|
|
54
52
|
message: async (socket, message, isBinary) => {
|
|
@@ -86,7 +84,10 @@ class WebsocketsProvider extends Provider_1.Provider {
|
|
|
86
84
|
event: data.event,
|
|
87
85
|
status: WebsocketMessageStatus.Error
|
|
88
86
|
};
|
|
89
|
-
|
|
87
|
+
if (errorMessage.message) {
|
|
88
|
+
const response = await this.errorHandler.handle(error);
|
|
89
|
+
errorMessage.message.message = response.body.message;
|
|
90
|
+
}
|
|
90
91
|
socket.send(JSON.stringify(errorMessage), isBinary, true);
|
|
91
92
|
}
|
|
92
93
|
}
|
|
@@ -114,5 +115,9 @@ __decorate([
|
|
|
114
115
|
Container_1.Inject(),
|
|
115
116
|
__metadata("design:type", Websockets_1.Handler)
|
|
116
117
|
], WebsocketsProvider.prototype, "handler", void 0);
|
|
118
|
+
__decorate([
|
|
119
|
+
Container_1.Inject(),
|
|
120
|
+
__metadata("design:type", Http_1.ErrorHandlerInterface)
|
|
121
|
+
], WebsocketsProvider.prototype, "errorHandler", void 0);
|
|
117
122
|
exports.WebsocketsProvider = WebsocketsProvider;
|
|
118
123
|
//# sourceMappingURL=WebsocketsProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAsC;AACtC,+CAAmD;AACnD,sCAAqC;AACrC,mDAAuF;AACvF,+BAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthResolver.d.ts","sourceRoot":"","sources":["../../../Framework/Resolvers/AuthResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,qBAAa,YAAa,SAAQ,YAAY;
|
|
1
|
+
{"version":3,"file":"AuthResolver.d.ts","sourceRoot":"","sources":["../../../Framework/Resolvers/AuthResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,qBAAa,YAAa,SAAQ,YAAY;IAEpC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAIpE,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;CAS3C"}
|
|
@@ -4,17 +4,9 @@ exports.AuthResolver = void 0;
|
|
|
4
4
|
const Container_1 = require("../../Container");
|
|
5
5
|
const Auth_1 = require("../Auth");
|
|
6
6
|
class AuthResolver extends Container_1.BaseResolver {
|
|
7
|
-
// constructor(container: Container) {
|
|
8
|
-
// super(container);
|
|
9
|
-
// this.setScopeToRequest();
|
|
10
|
-
// }
|
|
11
7
|
async resolve(abstract, parameters) {
|
|
12
8
|
return await this.container.get(Auth_1.Auth).user();
|
|
13
9
|
}
|
|
14
|
-
// // tslint:disable-next-line:no-any
|
|
15
|
-
// canResolve<T extends Abstract<any>>(abstract: T): boolean {
|
|
16
|
-
// return abstract.prototype instanceof User;
|
|
17
|
-
// }
|
|
18
10
|
canResolve(abstract) {
|
|
19
11
|
return abstract === Auth_1.AuthUserIdentifier;
|
|
20
12
|
}
|
|
@@ -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,
|
|
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,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,IAAI,EAAkB,CAAA;IAChE,CAAC;IAED,UAAU,CAAI,QAAgB;QAC1B,OAAO,QAAQ,KAAK,yBAAkB,CAAA;IAC1C,CAAC;CAOJ;AAfD,oCAeC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityResolver.d.ts","sourceRoot":"","sources":["../../../Framework/Resolvers/EntityResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,OAAO,EAAE,YAAY,EAAE,SAAS,EAA6B,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"EntityResolver.d.ts","sourceRoot":"","sources":["../../../Framework/Resolvers/EntityResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,OAAO,EAAE,YAAY,EAAE,SAAS,EAA6B,MAAM,iBAAiB,CAAA;AAGpF,qBAAa,cAAe,SAAQ,YAAY;gBAEhC,SAAS,EAAE,SAAS;IAK1B,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG,OAAO,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAkB7G,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO;IAIhD,OAAO,CAAC,uBAAuB;CAKlC"}
|