@typetron/framework 0.3.5 → 0.3.9

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.
Files changed (142) hide show
  1. package/Container/ClassResolver.d.ts.map +1 -1
  2. package/Container/ClassResolver.js +6 -2
  3. package/Container/ClassResolver.js.map +1 -1
  4. package/Container/Contracts.d.ts +1 -1
  5. package/Container/Contracts.d.ts.map +1 -1
  6. package/Database/Entity.d.ts +2 -1
  7. package/Database/Entity.d.ts.map +1 -1
  8. package/Database/Entity.js +17 -7
  9. package/Database/Entity.js.map +1 -1
  10. package/Database/EntityNotFoundError.d.ts +3 -0
  11. package/Database/EntityNotFoundError.d.ts.map +1 -1
  12. package/Database/EntityNotFoundError.js +4 -0
  13. package/Database/EntityNotFoundError.js.map +1 -1
  14. package/Database/EntityProxyHandler.d.ts +0 -3
  15. package/Database/EntityProxyHandler.d.ts.map +1 -1
  16. package/Database/EntityProxyHandler.js +0 -2
  17. package/Database/EntityProxyHandler.js.map +1 -1
  18. package/Database/EntityQuery.d.ts.map +1 -1
  19. package/Database/EntityQuery.js +1 -2
  20. package/Database/EntityQuery.js.map +1 -1
  21. package/Database/Fields.d.ts +3 -0
  22. package/Database/Fields.d.ts.map +1 -1
  23. package/Database/Fields.js +10 -4
  24. package/Database/Fields.js.map +1 -1
  25. package/Database/List.d.ts +1 -1
  26. package/Framework/Auth/Auth.d.ts +3 -3
  27. package/Framework/Auth/Auth.d.ts.map +1 -1
  28. package/Framework/Auth/Auth.js +18 -3
  29. package/Framework/Auth/Auth.js.map +1 -1
  30. package/Framework/Auth/index.d.ts.map +1 -1
  31. package/Framework/Auth/index.js +1 -0
  32. package/Framework/Auth/index.js.map +1 -1
  33. package/Framework/Config/AppConfig.d.ts +6 -2
  34. package/Framework/Config/AppConfig.d.ts.map +1 -1
  35. package/Framework/Config/AppConfig.js +1 -1
  36. package/Framework/Config/AppConfig.js.map +1 -1
  37. package/Framework/Config/DatabaseConfig.js +3 -3
  38. package/Framework/Config/DatabaseConfig.js.map +1 -1
  39. package/Framework/Middleware/StaticAssetsMiddleware.d.ts +1 -1
  40. package/Framework/Middleware/StaticAssetsMiddleware.d.ts.map +1 -1
  41. package/Framework/Middleware/StaticAssetsMiddleware.js +42 -24
  42. package/Framework/Middleware/StaticAssetsMiddleware.js.map +1 -1
  43. package/Framework/Providers/WebsocketsProvider.d.ts +2 -0
  44. package/Framework/Providers/WebsocketsProvider.d.ts.map +1 -1
  45. package/Framework/Providers/WebsocketsProvider.js +8 -1
  46. package/Framework/Providers/WebsocketsProvider.js.map +1 -1
  47. package/Framework/Resolvers/EntityResolver.d.ts.map +1 -1
  48. package/Framework/Resolvers/EntityResolver.js +2 -1
  49. package/Framework/Resolvers/EntityResolver.js.map +1 -1
  50. package/Router/Http/ErrorHandler.js +6 -6
  51. package/Router/Http/ErrorHandler.js.map +1 -1
  52. package/Router/Http/Response.d.ts +1 -0
  53. package/Router/Http/Response.d.ts.map +1 -1
  54. package/Router/Http/Response.js +10 -10
  55. package/Router/Http/Response.js.map +1 -1
  56. package/Router/Websockets/Handler.d.ts +1 -2
  57. package/Router/Websockets/Handler.d.ts.map +1 -1
  58. package/Router/Websockets/Handler.js +0 -4
  59. package/Router/Websockets/Handler.js.map +1 -1
  60. package/Router/Websockets/WebsocketEvent.js +1 -1
  61. package/Router/Websockets/WebsocketEvent.js.map +1 -1
  62. package/Router/Websockets/index.d.ts +1 -0
  63. package/Router/Websockets/index.d.ts.map +1 -1
  64. package/Router/Websockets/index.js +1 -0
  65. package/Router/Websockets/index.js.map +1 -1
  66. package/Router/Websockets/types.d.ts +4 -0
  67. package/Router/Websockets/types.d.ts.map +1 -1
  68. package/package.json +3 -3
  69. package/tests/Database/EntityRelationshipsTest.js +24 -22
  70. package/tests/Database/EntityRelationshipsTest.js.map +1 -1
  71. package/tests/Database/EntityTest.js +1 -1
  72. package/tests/Database/EntityTest.js.map +1 -1
  73. package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.d.ts +2 -0
  74. package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.d.ts.map +1 -0
  75. package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.js +166 -0
  76. package/tests/Framework/Middleware/StaticAssetsMiddlewareTest.js.map +1 -0
  77. package/tests/Router/HttpHandlerTest.js +4 -4
  78. package/tests/Router/HttpHandlerTest.js.map +1 -1
  79. package/Web/Contracts.d.ts +0 -4
  80. package/Web/Contracts.d.ts.map +0 -1
  81. package/Web/Contracts.js +0 -3
  82. package/Web/Contracts.js.map +0 -1
  83. package/Web/ErrorHandler.d.ts +0 -10
  84. package/Web/ErrorHandler.d.ts.map +0 -1
  85. package/Web/ErrorHandler.js +0 -52
  86. package/Web/ErrorHandler.js.map +0 -1
  87. package/Web/ErrorHandlerInterface.d.ts +0 -6
  88. package/Web/ErrorHandlerInterface.d.ts.map +0 -1
  89. package/Web/ErrorHandlerInterface.js +0 -7
  90. package/Web/ErrorHandlerInterface.js.map +0 -1
  91. package/Web/Errors/HttpError.d.ts +0 -8
  92. package/Web/Errors/HttpError.d.ts.map +0 -1
  93. package/Web/Errors/HttpError.js +0 -16
  94. package/Web/Errors/HttpError.js.map +0 -1
  95. package/Web/Handler.d.ts +0 -11
  96. package/Web/Handler.d.ts.map +0 -1
  97. package/Web/Handler.js +0 -52
  98. package/Web/Handler.js.map +0 -1
  99. package/Web/Request.d.ts +0 -25
  100. package/Web/Request.d.ts.map +0 -1
  101. package/Web/Request.js +0 -152
  102. package/Web/Request.js.map +0 -1
  103. package/Web/Response.d.ts +0 -16
  104. package/Web/Response.d.ts.map +0 -1
  105. package/Web/Response.js +0 -51
  106. package/Web/Response.js.map +0 -1
  107. package/Web/index.d.ts +0 -84
  108. package/Web/index.d.ts.map +0 -1
  109. package/Web/index.js +0 -100
  110. package/Web/index.js.map +0 -1
  111. package/Web-old/Contracts.d.ts +0 -4
  112. package/Web-old/Contracts.d.ts.map +0 -1
  113. package/Web-old/Contracts.js +0 -3
  114. package/Web-old/Contracts.js.map +0 -1
  115. package/Web-old/ErrorHandler.d.ts +0 -10
  116. package/Web-old/ErrorHandler.d.ts.map +0 -1
  117. package/Web-old/ErrorHandler.js +0 -52
  118. package/Web-old/ErrorHandler.js.map +0 -1
  119. package/Web-old/ErrorHandlerInterface.d.ts +0 -6
  120. package/Web-old/ErrorHandlerInterface.d.ts.map +0 -1
  121. package/Web-old/ErrorHandlerInterface.js +0 -7
  122. package/Web-old/ErrorHandlerInterface.js.map +0 -1
  123. package/Web-old/Errors/HttpError.d.ts +0 -8
  124. package/Web-old/Errors/HttpError.d.ts.map +0 -1
  125. package/Web-old/Errors/HttpError.js +0 -16
  126. package/Web-old/Errors/HttpError.js.map +0 -1
  127. package/Web-old/Handler.d.ts +0 -16
  128. package/Web-old/Handler.d.ts.map +0 -1
  129. package/Web-old/Handler.js +0 -132
  130. package/Web-old/Handler.js.map +0 -1
  131. package/Web-old/Request.d.ts +0 -25
  132. package/Web-old/Request.d.ts.map +0 -1
  133. package/Web-old/Request.js +0 -152
  134. package/Web-old/Request.js.map +0 -1
  135. package/Web-old/Response.d.ts +0 -16
  136. package/Web-old/Response.d.ts.map +0 -1
  137. package/Web-old/Response.js +0 -51
  138. package/Web-old/Response.js.map +0 -1
  139. package/Web-old/index.d.ts +0 -84
  140. package/Web-old/index.d.ts.map +0 -1
  141. package/Web-old/index.js +0 -100
  142. package/Web-old/index.js.map +0 -1
@@ -1,7 +1,7 @@
1
1
  import { User } from './User';
2
2
  import { AuthConfig } from '../Config';
3
3
  import { ID } from '../../Database';
4
- import { Crypt, JWT } from '@Typetron/Encryption';
4
+ import { Crypt, JWT, JWToken } from '@Typetron/Encryption';
5
5
  export declare class Auth {
6
6
  authConfig: AuthConfig;
7
7
  jwt: JWT;
@@ -13,13 +13,13 @@ export declare class Auth {
13
13
  expiresAt: Date;
14
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
21
  register<T extends User>(username: string, password: string): Promise<T>;
22
- verify(token: string): Promise<import("../../Encryption").JWToken<number>>;
22
+ verify(token: string): Promise<JWToken<number>>;
23
23
  private set;
24
24
  }
25
25
  //# sourceMappingURL=Auth.d.ts.map
@@ -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,CAAC,CAAM;IAExB,IAAI,aAAa,IAAI,OAAO,IAAI,CAE/B;IAEK,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;IAYlC,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"}
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,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE1D,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;IAY9C,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,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAQrD,OAAO,CAAC,GAAG;CAWd"}
@@ -23,10 +23,25 @@ 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
- return this.savedUser;
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) {
31
46
  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
47
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../../Framework/Auth/Auth.ts"],"names":[],"mappings":"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"}
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,+CAwBpD"}
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"}
@@ -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;AAzBD,4BAyBC"}
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
- [key: string]: string | string[];
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,CAAO;IAC9B,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAA;IAC3C,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAG,CAAA;IAC5B,YAAY,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAC,CAAA;CACpD"}
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"}
@@ -5,7 +5,7 @@ const BaseConfig_1 = require("./BaseConfig");
5
5
  class AppConfig extends BaseConfig_1.BaseConfig {
6
6
  constructor() {
7
7
  super(...arguments);
8
- this.websocketsPort = 8001;
8
+ this.debug = true;
9
9
  }
10
10
  }
11
11
  exports.AppConfig = AppConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"AppConfig.js","sourceRoot":"","sources":["../../../Framework/Config/AppConfig.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAKzC,MAAa,SAAU,SAAQ,uBAAqB;IAApD;;QAGI,mBAAc,GAAY,IAAI,CAAA;IAIlC,CAAC;CAAA;AAPD,8BAOC"}
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 Drivers_1 = require("@Typetron/Database/Drivers");
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 Drivers_1.SqliteDriver((_a = process.env.database) !== null && _a !== void 0 ? _a : 'database.sqlite'); },
15
- mysql: () => new Drivers_1.MysqlDriver({
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,wDAAsE;AAGtE,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,sBAAY,OAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,iBAAiB,CAAC,CAAA,EAAA;YACzE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,qBAAW,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"}
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
- getExtension(string: string): string | undefined;
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;AAErC,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;IA4BrF,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAOnD"}
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
- const assetsDirectories = this.appConfig.staticAssets;
44
- for (const path in assetsDirectories) {
45
- let directories = assetsDirectories[path];
46
- if (typeof directories === 'string') {
47
- directories = [directories];
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
- for (const directory of directories) {
50
- const uri = path ? request.uri.replace(`/${path}`, '') : request.uri;
51
- let realPath = directory + uri;
52
- let extension = this.getExtension(uri);
53
- if (!extension) {
54
- realPath += '/index.html';
55
- extension = 'html';
56
- }
57
- if (!await this.storage.exists(realPath)) {
58
- continue;
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
- const file = await this.storage.read(realPath);
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
- getExtension(string) {
68
- const parts = string.split('.');
69
- if (parts.length === 1) {
70
- return undefined;
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":";;;;;;;;;;;;AAAA,+CAAoD;AACpD,yCAAsF;AACtF,2CAAuC;AACvC,4CAA2D;AAC3D,sCAAqC;AAGrC,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QAQI,cAAS,GAA4B;YACjC,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE,UAAU;YACjB,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,WAAW;SACrB,CAAA;IAgDL,CAAC;IA9CG,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,IAAoB;QAC/C,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,CAAA;SAC7B;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,OAAO,CAAC,MAAM,KAAK,WAAI,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,YAAY,2BAAkB,EAAE;gBAC3E,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;aAC9C;YACD,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAyB,EAAE,OAAgB;QAC7D,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAA;QACrD,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE;YAClC,IAAI,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;YACzC,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;gBACjC,WAAW,GAAG,CAAC,WAAW,CAAC,CAAA;aAC9B;YACD,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE;gBACjC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAA;gBACpE,IAAI,QAAQ,GAAG,SAAS,GAAG,GAAG,CAAA;gBAC9B,IAAI,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;gBACtC,IAAI,CAAC,SAAS,EAAE;oBACZ,QAAQ,IAAI,aAAa,CAAA;oBACzB,SAAS,GAAG,MAAM,CAAA;iBACrB;gBAED,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBACtC,SAAQ;iBACX;gBACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,IAAI,0BAA0B,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAA;gBACjG,OAAO,IAAI,eAAQ,CAAC,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAC,cAAc,EAAE,WAAW,EAAC,CAAC,CAAA;aAC3E;SACJ;QAED,MAAM,KAAK,CAAA;IACf,CAAC;IAED,YAAY,CAAC,MAAc;QACvB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,SAAS,CAAA;SACnB;QACD,OAAO,KAAK,CAAC,GAAG,EAAE,CAAA;IACtB,CAAC;CACJ,CAAA;AA9DG;IADC,kBAAM,EAAE;8BACE,kBAAS;yDAAA;AAGpB;IADC,kBAAM,EAAE;8BACA,iBAAO;uDAAA;AANP,sBAAsB;IADlC,sBAAU,EAAE;GACA,sBAAsB,CAiElC;AAjEY,wDAAsB"}
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;AAIrC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAQ5D,qBAAa,kBAAmB,SAAQ,QAAQ;IAG5C,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAEhB,OAAO,kCAAwC;IAE/C,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAyElB,WAAW;CAc5B"}
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,EAAsB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAQhF,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"}
@@ -84,7 +84,10 @@ class WebsocketsProvider extends Provider_1.Provider {
84
84
  event: data.event,
85
85
  status: WebsocketMessageStatus.Error
86
86
  };
87
- // console.log('error', errorMessage)
87
+ if (errorMessage.message) {
88
+ const response = await this.errorHandler.handle(error);
89
+ errorMessage.message.message = response.body.message;
90
+ }
88
91
  socket.send(JSON.stringify(errorMessage), isBinary, true);
89
92
  }
90
93
  }
@@ -112,5 +115,9 @@ __decorate([
112
115
  Container_1.Inject(),
113
116
  __metadata("design:type", Websockets_1.Handler)
114
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);
115
122
  exports.WebsocketsProvider = WebsocketsProvider;
116
123
  //# sourceMappingURL=WebsocketsProvider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
@@ -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;AAEpF,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"}
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"}
@@ -4,6 +4,7 @@ exports.EntityResolver = void 0;
4
4
  const Database_1 = require("../../Database");
5
5
  const Http_1 = require("../../Router/Http");
6
6
  const Container_1 = require("../../Container");
7
+ const EntityNotFoundError_1 = require("../../Database/EntityNotFoundError");
7
8
  class EntityResolver extends Container_1.BaseResolver {
8
9
  constructor(container) {
9
10
  super(container);
@@ -18,7 +19,7 @@ class EntityResolver extends Container_1.BaseResolver {
18
19
  if (parameter) {
19
20
  entity = await abstract.find(parameter);
20
21
  if (!entity) {
21
- throw new Error(`Entity '${requestParameterName}' with ${abstract.getPrimaryKey()} '${parameter}' not found`);
22
+ throw new EntityNotFoundError_1.EntityNotFoundError(abstract, `Entity '${requestParameterName}' with ${abstract.getPrimaryKey()} '${parameter}' not found`);
22
23
  }
23
24
  }
24
25
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"EntityResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/EntityResolver.ts"],"names":[],"mappings":";;;AACA,6CAA0D;AAC1D,4CAA2C;AAC3C,+CAAoF;AAEpF,MAAa,cAAe,SAAQ,wBAAY;IAE5C,YAAY,SAAoB;QAC5B,KAAK,CAAC,SAAS,CAAC,CAAA;QAChB,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAAI,QAAmD,EAAE,gBAA0B;;QAC5F,IAAI,MAA0B,CAAA;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,cAAO,CAAC,CAAA;QAC3C,MAAM,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAA;QAC1C,MAAM,SAAS,SAAG,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,mCAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;QACzF,IAAI,SAAS,EAAE;YACX,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACvC,IAAI,CAAC,MAAM,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,WAAW,oBAAoB,UAAU,QAAQ,CAAC,aAAa,EAAE,KAAK,SAAS,aAAa,CAAC,CAAA;aAChH;SACJ;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,wEAAwE,oBAAoB,yCAAyC,oBAAoB,4BAA4B,CAAC,CAAA;SACzM;QAED,aAAa;QACb,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,UAAU,CAAI,QAAwB;QAClC,OAAO,QAAQ,CAAC,SAAS,YAAY,iBAAM,CAAA;IAC/C,CAAC;IAEO,uBAAuB;QAC3B,MAAM,QAAQ,GAAG,8BAAkB,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAA;QAC/C,QAAQ,CAAC,KAAK,GAAG,iBAAK,CAAC,SAAS,CAAA;QAChC,8BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,iBAAM,CAAC,CAAA;IAC5C,CAAC;CACJ;AAlCD,wCAkCC"}
1
+ {"version":3,"file":"EntityResolver.js","sourceRoot":"","sources":["../../../Framework/Resolvers/EntityResolver.ts"],"names":[],"mappings":";;;AACA,6CAA0D;AAC1D,4CAA2C;AAC3C,+CAAoF;AACpF,4EAAwE;AAExE,MAAa,cAAe,SAAQ,wBAAY;IAE5C,YAAY,SAAoB;QAC5B,KAAK,CAAC,SAAS,CAAC,CAAA;QAChB,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAAI,QAAmD,EAAE,gBAA0B;;QAC5F,IAAI,MAA0B,CAAA;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,cAAO,CAAC,CAAA;QAC3C,MAAM,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAA;QAC1C,MAAM,SAAS,SAAG,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,mCAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;QACzF,IAAI,SAAS,EAAE;YACX,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACvC,IAAI,CAAC,MAAM,EAAE;gBACT,MAAM,IAAI,yCAAmB,CAAC,QAAQ,EAAE,WAAW,oBAAoB,UAAU,QAAQ,CAAC,aAAa,EAAE,KAAK,SAAS,aAAa,CAAC,CAAA;aACxI;SACJ;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,wEAAwE,oBAAoB,yCAAyC,oBAAoB,4BAA4B,CAAC,CAAA;SACzM;QAED,aAAa;QACb,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,UAAU,CAAI,QAAwB;QAClC,OAAO,QAAQ,CAAC,SAAS,YAAY,iBAAM,CAAA;IAC/C,CAAC;IAEO,uBAAuB;QAC3B,MAAM,QAAQ,GAAG,8BAAkB,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAA;QAC/C,QAAQ,CAAC,KAAK,GAAG,iBAAK,CAAC,SAAS,CAAA;QAChC,8BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,iBAAM,CAAC,CAAA;IAC5C,CAAC;CACJ;AAlCD,wCAkCC"}
@@ -17,13 +17,13 @@ const Container_1 = require("../../Container");
17
17
  const Config_1 = require("../../Framework/Config");
18
18
  class ErrorHandler {
19
19
  handle(error, request) {
20
- if (this.appConfig.environment === 'production') {
21
- if (error instanceof HttpError_1.HttpError) {
22
- return new Response_1.Response(error.content, error.status);
23
- }
24
- return new Response_1.Response(error.message, index_1.Http.Status.BAD_REQUEST);
20
+ if (this.appConfig.debug) {
21
+ return this.handleDevelopmentError(error, request);
22
+ }
23
+ if (error instanceof HttpError_1.HttpError) {
24
+ return new Response_1.Response(error.content, error.status);
25
25
  }
26
- return this.handleDevelopmentError(error, request);
26
+ return new Response_1.Response(error.message, index_1.Http.Status.BAD_REQUEST);
27
27
  }
28
28
  handleDevelopmentError(error, request) {
29
29
  let code = index_1.Http.Status.BAD_REQUEST, message = '', stack;
@@ -1 +1 @@
1
- {"version":3,"file":"ErrorHandler.js","sourceRoot":"","sources":["../../../Router/Http/ErrorHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAqC;AAErC,kDAA8C;AAC9C,mCAA8B;AAE9B,+CAAwC;AACxC,mDAAkD;AAElD,MAAa,YAAY;IAKrB,MAAM,CAAC,KAAY,EAAE,OAAiB;QAClC,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,KAAK,YAAY,EAAE;YAC7C,IAAI,KAAK,YAAY,qBAAS,EAAE;gBAC5B,OAAO,IAAI,mBAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;aACnD;YACD,OAAO,IAAI,mBAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,YAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;SAC9D;QAED,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;IAEO,sBAAsB,CAAC,KAAY,EAAE,OAAiB;QAC1D,IAAI,IAAI,GAAG,YAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,GAA6B,EAAE,EAAE,KAAe,CAAA;QAE3F,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC7E,IAAI,KAAK,YAAY,qBAAS,EAAE;YAC5B,IAAI,GAAG,KAAK,CAAC,MAAM,CAAA;YACnB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;YACvB,IAAI,OAAO,EAAE;gBACT,KAAK,CAAC,OAAO,CAAC,UAAU,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;aAC3D;SACJ;aAAM;YACH,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;SAC1B;QAED,MAAM,SAAS,GAA0D;YACrE,OAAO,EAAE,KAAK;SACjB,CAAA;QAED,OAAO,IAAI,mBAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IACxC,CAAC;CACJ;AAjCG;IADC,kBAAM,EAAE;8BACE,kBAAS;+CAAA;AAHxB,oCAoCC"}
1
+ {"version":3,"file":"ErrorHandler.js","sourceRoot":"","sources":["../../../Router/Http/ErrorHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAqC;AAErC,kDAA8C;AAC9C,mCAA8B;AAE9B,+CAAwC;AACxC,mDAAkD;AAElD,MAAa,YAAY;IAKrB,MAAM,CAAC,KAAY,EAAE,OAAiB;QAClC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;YACtB,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;SACrD;QAED,IAAI,KAAK,YAAY,qBAAS,EAAE;YAC5B,OAAO,IAAI,mBAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;SACnD;QACD,OAAO,IAAI,mBAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,YAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IAC/D,CAAC;IAEO,sBAAsB,CAAC,KAAY,EAAE,OAAiB;QAC1D,IAAI,IAAI,GAAG,YAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,GAA6B,EAAE,EAAE,KAAe,CAAA;QAE3F,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC7E,IAAI,KAAK,YAAY,qBAAS,EAAE;YAC5B,IAAI,GAAG,KAAK,CAAC,MAAM,CAAA;YACnB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;YACvB,IAAI,OAAO,EAAE;gBACT,KAAK,CAAC,OAAO,CAAC,UAAU,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;aAC3D;SACJ;aAAM;YACH,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;SAC1B;QAED,MAAM,SAAS,GAA0D;YACrE,OAAO,EAAE,KAAK;SACjB,CAAA;QAED,OAAO,IAAI,mBAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IACxC,CAAC;CACJ;AAjCG;IADC,kBAAM,EAAE;8BACE,kBAAS;+CAAA;AAHxB,oCAoCC"}
@@ -11,6 +11,7 @@ export declare class Response<T = any> {
11
11
  static notFound(content: string | object): Response<string | object>;
12
12
  static badRequest(content: string | object): Response<string | object>;
13
13
  static send(response: Response<undefined | number | string | object | Buffer>, serverResponse: ServerResponse): void;
14
+ static getContent(response: Response<number | string | object | undefined>): string | Buffer;
14
15
  setHeader(name: string, value: string): void;
15
16
  setHeaders(headers: OutgoingHttpHeaders): void;
16
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Response.d.ts","sourceRoot":"","sources":["../../../Router/Http/Response.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAA;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAG/B,qBAAa,QAAQ,CAAC,CAAC,GAAG,GAAG;IAGd,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,OAAO,EAAE,mBAAmB;gBAF5B,IAAI,EAAE,CAAC,EACP,MAAM,GAAE,IAAI,CAAC,MAAuB,EACpC,OAAO,GAAE,mBAEf;IAIL,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIlC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIxC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAI1C,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,EAAE,cAAc,EAAE,cAAc;IAqB7G,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAIrC,UAAU,CAAC,OAAO,EAAE,mBAAmB;CAG1C"}
1
+ {"version":3,"file":"Response.d.ts","sourceRoot":"","sources":["../../../Router/Http/Response.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAA;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAG/B,qBAAa,QAAQ,CAAC,CAAC,GAAG,GAAG;IAGd,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,OAAO,EAAE,mBAAmB;gBAF5B,IAAI,EAAE,CAAC,EACP,MAAM,GAAE,IAAI,CAAC,MAAuB,EACpC,OAAO,GAAE,mBAEf;IAIL,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIlC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIxC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAI1C,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,EAAE,cAAc,EAAE,cAAc;IAW7G,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAY1E,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAIrC,UAAU,CAAC,OAAO,EAAE,mBAAmB;CAG1C"}
@@ -22,24 +22,24 @@ class Response {
22
22
  return new Response(content, _1.Http.Status.BAD_REQUEST);
23
23
  }
24
24
  static send(response, serverResponse) {
25
+ const content = this.getContent(response);
26
+ for (const header in response.headers) {
27
+ serverResponse.setHeader(header, response.headers[header] || '');
28
+ }
29
+ serverResponse.statusCode = response.status;
30
+ serverResponse.end(content);
31
+ }
32
+ static getContent(response) {
25
33
  var _a;
26
34
  let content = (_a = response.body) !== null && _a !== void 0 ? _a : '';
27
- let rawContent;
28
35
  if (!(content instanceof buffer_1.Buffer)) {
29
36
  if (content instanceof Object) {
30
37
  content = JSON.stringify(content);
31
38
  response.headers['Content-Type'] = 'application/json';
32
39
  }
33
- rawContent = content.toString();
40
+ return content.toString();
34
41
  }
35
- else {
36
- rawContent = content;
37
- }
38
- for (const header in response.headers) {
39
- serverResponse.setHeader(header, response.headers[header] || '');
40
- }
41
- serverResponse.statusCode = response.status;
42
- serverResponse.end(rawContent);
42
+ return content;
43
43
  }
44
44
  setHeader(name, value) {
45
45
  this.headers[name] = value;
@@ -1 +1 @@
1
- {"version":3,"file":"Response.js","sourceRoot":"","sources":["../../../Router/Http/Response.ts"],"names":[],"mappings":";;;AACA,wBAAwB;AACxB,mCAA+B;AAE/B,kCAAkC;AAClC,MAAa,QAAQ;IAEjB,YACW,IAAO,EACP,SAAsB,OAAI,CAAC,MAAM,CAAC,EAAE,EACpC,UAA+B;QAClC,cAAc,EAAE,WAAW;KAC9B;QAJM,SAAI,GAAJ,IAAI,CAAG;QACP,WAAM,GAAN,MAAM,CAA8B;QACpC,YAAO,GAAP,OAAO,CAEb;IAEL,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,OAAwB;QAC9B,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAAwB;QACpC,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,OAAwB;QACtC,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACzD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,QAAiE,EAAE,cAA8B;;QACzG,IAAI,OAAO,SAAG,QAAQ,CAAC,IAAI,mCAAI,EAAE,CAAA;QACjC,IAAI,UAAuC,CAAA;QAC3C,IAAI,CAAC,CAAC,OAAO,YAAY,eAAM,CAAC,EAAE;YAC9B,IAAI,OAAO,YAAY,MAAM,EAAE;gBAC3B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;gBACjC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAA;aACxD;YACD,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAA;SAClC;aAAM;YACH,UAAU,GAAG,OAAO,CAAA;SACvB;QAED,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE;YACnC,cAAc,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;SACnE;QAED,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAA;QAC3C,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,KAAa;QACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;IAC9B,CAAC;IAED,UAAU,CAAC,OAA4B;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AAnDD,4BAmDC"}
1
+ {"version":3,"file":"Response.js","sourceRoot":"","sources":["../../../Router/Http/Response.ts"],"names":[],"mappings":";;;AACA,wBAAwB;AACxB,mCAA+B;AAE/B,kCAAkC;AAClC,MAAa,QAAQ;IAEjB,YACW,IAAO,EACP,SAAsB,OAAI,CAAC,MAAM,CAAC,EAAE,EACpC,UAA+B;QAClC,cAAc,EAAE,WAAW;KAC9B;QAJM,SAAI,GAAJ,IAAI,CAAG;QACP,WAAM,GAAN,MAAM,CAA8B;QACpC,YAAO,GAAP,OAAO,CAEb;IAEL,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,OAAwB;QAC9B,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAAwB;QACpC,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,OAAwB;QACtC,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACzD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,QAAiE,EAAE,cAA8B;QACzG,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAEzC,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE;YACnC,cAAc,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;SACnE;QAED,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAA;QAC3C,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,QAAwD;;QACtE,IAAI,OAAO,SAAG,QAAQ,CAAC,IAAI,mCAAI,EAAE,CAAA;QACjC,IAAI,CAAC,CAAC,OAAO,YAAY,eAAM,CAAC,EAAE;YAC9B,IAAI,OAAO,YAAY,MAAM,EAAE;gBAC3B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;gBACjC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAA;aACxD;YACD,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAA;SAC5B;QACD,OAAO,OAAO,CAAA;IAClB,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,KAAa;QACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;IAC9B,CAAC;IAED,UAAU,CAAC,OAA4B;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AArDD,4BAqDC"}
@@ -1,11 +1,10 @@
1
1
  import { Container } from '../../Container';
2
2
  import { MiddlewareInterface, Router } from '../../Router';
3
- import { ErrorHandlerInterface, Request, Response } from '../Http';
3
+ import { Request, Response } from '../Http';
4
4
  import { Abstract, Constructor, Type } from '../../Support';
5
5
  import { WebsocketEvent } from './WebsocketEvent';
6
6
  export declare class Handler {
7
7
  router: Router;
8
- errorHandler: ErrorHandlerInterface;
9
8
  onOpen?: WebsocketEvent;
10
9
  onClose?: WebsocketEvent;
11
10
  addEvent(name: string, controller: Constructor, action: string, parametersTypes?: (Type<Function> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]): WebsocketEvent;
@@ -1 +1 @@
1
- {"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAkB,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1E,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,qBAAa,OAAO;IAEhB,MAAM,EAAE,MAAM,CAAA;IAGd,YAAY,EAAE,qBAAqB,CAAA;IAEnC,MAAM,CAAC,EAAE,cAAc,CAAA;IACvB,OAAO,CAAC,EAAE,cAAc,CAAA;IAExB,QAAQ,CACJ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,MAAM,EACd,eAAe,GAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC9D,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO;IAgB9C,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;CAwC1E"}
1
+ {"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAkB,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,qBAAa,OAAO;IAEhB,MAAM,EAAE,MAAM,CAAA;IAEd,MAAM,CAAC,EAAE,cAAc,CAAA;IACvB,OAAO,CAAC,EAAE,cAAc,CAAA;IAExB,QAAQ,CACJ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,MAAM,EACd,eAAe,GAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC9D,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO;IAgB9C,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;CAwC1E"}
@@ -56,9 +56,5 @@ __decorate([
56
56
  Container_1.Inject(),
57
57
  __metadata("design:type", Router_1.Router)
58
58
  ], Handler.prototype, "router", void 0);
59
- __decorate([
60
- Container_1.Inject(),
61
- __metadata("design:type", Http_1.ErrorHandlerInterface)
62
- ], Handler.prototype, "errorHandler", void 0);
63
59
  exports.Handler = Handler;
64
60
  //# sourceMappingURL=Handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmD;AACnD,yCAA0E;AAC1E,kCAAkE;AAElE,qDAAiD;AAEjD,MAAa,OAAO;IAUhB,QAAQ,CACJ,IAAY,EACZ,UAAuB,EACvB,MAAc,EACd,kBAA4D,EAAE,EAC9D,aAA8C,EAAE;QAEhD,MAAM,KAAK,GAAG,IAAI,+BAAc,CAC5B,IAAI,EACJ,UAAU,EACV,MAAM,EACN,eAAe,EACf,UAAU,CACb,CAAA;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,kDAAkD,IAAI,GAAG,CAAC,CAAA;SAC7E;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QACnC,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAAgB;QAE/C,SAAS,CAAC,GAAG,CAAC,cAAO,EAAE,OAAO,CAAC,CAAA;QAE/B,IAAI,KAAK,GAAmB,KAAK,IAAI,EAAE;YACnC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAEjD,IAAI,CAAC,KAAK,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,UAAU,OAAO,CAAC,GAAG,aAAa,CAAC,CAAA;aACtD;YAED,kDAAkD;YAClD,8BAA8B;YAE9B,IAAI,UAAU,GAAmB,KAAK,IAAI,EAAE;gBACxC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;gBAE9D,IAAI,OAAO,YAAY,eAAQ,EAAE;oBAC7B,OAAO,OAAO,CAAA;iBACjB;gBAED,OAAO,eAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;YAC/B,CAAC,CAAA;YAED,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;gBACvC,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACjD,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;YACxE,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACjD,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;QAEF,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;CAEJ;AArEG;IADC,kBAAM,EAAE;8BACD,eAAM;uCAAA;AAGd;IADC,kBAAM,EAAE;8BACK,4BAAqB;6CAAA;AALvC,0BAuEC"}
1
+ {"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmD;AACnD,yCAA0E;AAC1E,kCAA2C;AAE3C,qDAAiD;AAEjD,MAAa,OAAO;IAOhB,QAAQ,CACJ,IAAY,EACZ,UAAuB,EACvB,MAAc,EACd,kBAA4D,EAAE,EAC9D,aAA8C,EAAE;QAEhD,MAAM,KAAK,GAAG,IAAI,+BAAc,CAC5B,IAAI,EACJ,UAAU,EACV,MAAM,EACN,eAAe,EACf,UAAU,CACb,CAAA;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,kDAAkD,IAAI,GAAG,CAAC,CAAA;SAC7E;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QACnC,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAAgB;QAE/C,SAAS,CAAC,GAAG,CAAC,cAAO,EAAE,OAAO,CAAC,CAAA;QAE/B,IAAI,KAAK,GAAmB,KAAK,IAAI,EAAE;YACnC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAEjD,IAAI,CAAC,KAAK,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,UAAU,OAAO,CAAC,GAAG,aAAa,CAAC,CAAA;aACtD;YAED,kDAAkD;YAClD,8BAA8B;YAE9B,IAAI,UAAU,GAAmB,KAAK,IAAI,EAAE;gBACxC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;gBAE9D,IAAI,OAAO,YAAY,eAAQ,EAAE;oBAC7B,OAAO,OAAO,CAAA;iBACjB;gBAED,OAAO,eAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;YAC/B,CAAC,CAAA;YAED,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;gBACvC,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACjD,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;YACxE,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACjD,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;QAEF,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;CAEJ;AAlEG;IADC,kBAAM,EAAE;8BACD,eAAM;uCAAA;AAFlB,0BAoEC"}
@@ -46,7 +46,7 @@ class WebsocketEvent {
46
46
  const value = routeParameters[parameterIndex++];
47
47
  return value === undefined || value === 'undefined' ? undefined : Number(value);
48
48
  }
49
- return container.get(parameter, [routeParameters[parameterIndex]]);
49
+ return container.get(parameter, [routeParameters[parameterIndex++]]);
50
50
  });
51
51
  }
52
52
  }
@@ -1 +1 @@
1
- {"version":3,"file":"WebsocketEvent.js","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketEvent.ts"],"names":[],"mappings":";;;AAGA,0CAA+D;AAG/D,MAAa,cAAc;IAGvB,YACW,OAAO,EAAE,EACT,UAAuB,EACvB,MAAc,EACd,kBAA4D,EAAE,EAC9D,aAA8C,EAAE;QAJhD,SAAI,GAAJ,IAAI,CAAK;QACT,eAAU,GAAV,UAAU,CAAa;QACvB,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAA+C;QAC9D,eAAU,GAAV,UAAU,CAAsC;QAP3D,WAAM,GAAqB,EAAE,CAAA;IAQ1B,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,SAAoB,EAAE,iBAA0C;;QACtE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEvD,IAAI;YACA,MAAM,QAAQ,GAA8B,6BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvG,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,iBAAiB,EACjB,IAAI,CAAC,eAAe,QACpB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,mBAAmB,mCAAI,EAAE,EACnC,SAAS,CACZ,CAAA;YAED,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE;gBACxC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvC,IAAI,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE;oBACvC,KAAK,CAAC,MAAM,EAAE,CAAA;iBACjB;aACJ;YAED,OAAQ,UAAU,CAAC,IAAI,CAAC,MAA2B,CAAc,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;SAClG;QAAC,OAAO,KAAK,EAAE;YACZ,KAAK,CAAC,KAAK,GAAG,eAAe,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAA;YAC9F,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC3B,iBAA0C,EAC1C,eAAiC,EACjC,SAAqB,EACrB,SAAoB;QAEpB,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,kCAAkC;QAClC,MAAM,eAAe,GAAU,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAC/D,OAAO,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;YACvD,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;YACzC,IAAI,gBAAgB,EAAE;gBAClB,OAAO,MAAM,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;aAC3D;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,OAAO,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;aAC3C;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,MAAM,KAAK,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;gBAC/C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAClF;YACD,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC,CAAA;QACtE,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AA9DD,wCA8DC"}
1
+ {"version":3,"file":"WebsocketEvent.js","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketEvent.ts"],"names":[],"mappings":";;;AAGA,0CAA+D;AAG/D,MAAa,cAAc;IAGvB,YACW,OAAO,EAAE,EACT,UAAuB,EACvB,MAAc,EACd,kBAA4D,EAAE,EAC9D,aAA8C,EAAE;QAJhD,SAAI,GAAJ,IAAI,CAAK;QACT,eAAU,GAAV,UAAU,CAAa;QACvB,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAA+C;QAC9D,eAAU,GAAV,UAAU,CAAsC;QAP3D,WAAM,GAAqB,EAAE,CAAA;IAQ1B,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,SAAoB,EAAE,iBAA0C;;QACtE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEvD,IAAI;YACA,MAAM,QAAQ,GAA8B,6BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvG,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,iBAAiB,EACjB,IAAI,CAAC,eAAe,QACpB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,mBAAmB,mCAAI,EAAE,EACnC,SAAS,CACZ,CAAA;YAED,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE;gBACxC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvC,IAAI,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE;oBACvC,KAAK,CAAC,MAAM,EAAE,CAAA;iBACjB;aACJ;YAED,OAAQ,UAAU,CAAC,IAAI,CAAC,MAA2B,CAAc,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;SAClG;QAAC,OAAO,KAAK,EAAE;YACZ,KAAK,CAAC,KAAK,GAAG,eAAe,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAA;YAC9F,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC3B,iBAA0C,EAC1C,eAAiC,EACjC,SAAqB,EACrB,SAAoB;QAEpB,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,kCAAkC;QAClC,MAAM,eAAe,GAAU,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAC/D,OAAO,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;YACvD,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;YACzC,IAAI,gBAAgB,EAAE;gBAClB,OAAO,MAAM,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;aAC3D;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,OAAO,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;aAC3C;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,MAAM,KAAK,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;gBAC/C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAClF;YACD,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AA9DD,wCA8DC"}
@@ -4,6 +4,7 @@ export * from './Handler';
4
4
  export * from './types';
5
5
  export declare class WebSocket {
6
6
  connection: uWebSocket;
7
+ container: Container;
7
8
  id?: number | string;
8
9
  constructor(connection: uWebSocket, container: Container);
9
10
  subscribe(topic: string): void;
@@ -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;IAIC,UAAU,EAAE,UAAU;IAFzC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;gBAED,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS;IAI/D,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,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;IAUhD,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;IAMvD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;CAQjC"}
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;IAIC,UAAU,EAAE,UAAU;IAAS,SAAS,EAAE,SAAS;IAFtE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;gBAED,UAAU,EAAE,UAAU,EAAS,SAAS,EAAE,SAAS;IAItE,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,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;IAUhD,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;IAMvD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;CAQjC"}
@@ -17,6 +17,7 @@ __exportStar(require("./types"), exports);
17
17
  class WebSocket {
18
18
  constructor(connection, container) {
19
19
  this.connection = connection;
20
+ this.container = container;
20
21
  this.reset(container);
21
22
  }
22
23
  subscribe(topic) {