npm - zibri - Versions diffs - 2.4.0 → 2.5.0 - Mend

zibri 2.4.0 → 2.5.0

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 (859) hide show

package/dist/cjs/websocket/models/connection/socket-io-websocket-connection.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"socket-io-websocket-connection.model.js","sourceRoot":"","sources":["../../../../../src/websocket/models/connection/socket-io-websocket-connection.model.ts"],"names":[],"mappings":";;;~~AAGA~~,kEAA8E;AAG9E;;GAEG;AACH,MAAa,2BAA2B;~~IAmBP~~;~~IAAuB~~;~~IAlBpD~~,+CAA+C;IACtC,EAAE,CAAS;IACpB;;;OAGG;IACM,SAAS,CAAU;~~IAC5B~~,+CAA+C;IAC/C,IAAI,MAAM;QACN,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;IAC7C,CAAC;IACD,IAAI,MAAM,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IAC9C,CAAC;IAED,~~YAA6B~~,MAAc,~~EAAS~~,MAA0B;~~QAAjD~~,WAAM,GAAN,MAAM,CAAQ;~~QAAS~~,WAAM,GAAN,MAAM,CAAoB;~~QAC1E~~,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACH,UAAU,CAAC,KAAc;QACrB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,KAA0B,EAAE,IAAsB;QACnD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAI,KAA0B,EAAE,IAAsB,EAAE,OAAe;QACpF,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAM,CAAC;IAC5E,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI,CAAC,QAA2B;QAClC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK,CAAC,QAA2B;QACnC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAClC,OAAO;QACX,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,QAAoC;QAC7C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,qCAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAkE;QACpE,0DAA0D;QAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CACJ;~~AAzFD~~,~~kEAyFC~~"}
1	+ {"version":3,"file":"socket-io-websocket-connection.model.js","sourceRoot":"","sources":["../../../../../src/websocket/models/connection/socket-io-websocket-connection.model.ts"],"names":[],"mappings":";;;AAIA,kEAA8E;AAG9E;;GAEG;AACH,MAAa,2BAA2B;IAqBf;IACV;IACE;IAtBb,+CAA+C;IACtC,EAAE,CAAS;IACpB;;;OAGG;IACM,SAAS,CAAU;IAE5B,+CAA+C;IAC/C,IAAI,MAAM;QACN,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;IAC7C,CAAC;IACD,IAAI,MAAM,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IAC9C,CAAC;IAED,YACqB,MAAc,EACxB,MAA0B,EACxB,eAAwB;QAFhB,WAAM,GAAN,MAAM,CAAQ;QACxB,WAAM,GAAN,MAAM,CAAoB;QACxB,oBAAe,GAAf,eAAe,CAAS;QAGjC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACH,UAAU,CAAC,KAAc;QACrB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,KAA0B,EAAE,IAAsB;QACnD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAI,KAA0B,EAAE,IAAsB,EAAE,OAAe;QACpF,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAM,CAAC;IAC5E,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI,CAAC,QAA2B;QAClC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK,CAAC,QAA2B;QACnC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAClC,OAAO;QACX,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,QAAoC;QAC7C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,qCAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAkE;QACpE,0DAA0D;QAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CACJ;AA/FD,kEA+FC"}

package/dist/cjs/websocket/models/websocket-controller-route-configuration.model.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { SupportedVersionsOptions } from '../../versioning/supported-versions-options.model';
 /**
  * The configuration for a websocket controller route.
  */
@@ -10,5 +11,10 @@ export type WebsocketControllerRouteConfiguration = {
      * The name of the method on the controller that is responsible for handling messages to the websocket event.
      */
     controllerMethod: string;
+    /**
+     * The supported versions of this route.
+     * Defaults to '^latest'.
+     */
+    versions: SupportedVersionsOptions | undefined;
 };
 //# sourceMappingURL=websocket-controller-route-configuration.model.d.ts.map

package/dist/cjs/websocket/models/websocket-controller-route-configuration.model.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"websocket-controller-route-configuration.model.d.ts","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-controller-route-configuration.model.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,qCAAqC,GAAG;IAChD;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAA;~~CAC3B~~,CAAC"}
1	+ {"version":3,"file":"websocket-controller-route-configuration.model.d.ts","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-controller-route-configuration.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAE7F;;GAEG;AACH,MAAM,MAAM,qCAAqC,GAAG;IAChD;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,QAAQ,EAAE,wBAAwB,GAAG,SAAS,CAAA;CACjD,CAAC"}

package/dist/cjs/websocket/models/websocket-message.model.d.ts CHANGED Viewed

@@ -37,11 +37,11 @@ export declare class WebsocketMessage extends BaseEntity {
     /**
      * The id of the user that has sent the message.
      */
-    senderUserId: string | undefined;
+    senderUserId: string | undefined | null;
     /**
      * The of the connection that has sent the message.
      */
-    senderConnectionId: string | undefined;
+    senderConnectionId: string | undefined | null;
     /**
      * The actual data of the message.
      */

package/dist/cjs/websocket/models/websocket-message.model.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"websocket-message.model.d.ts","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-message.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAIlE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAI5D,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;GAEG;AACH,oBAAY,sBAAsB;IAC9B,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,OAAO,YAAY;CACtB;AAED;;GAEG;AACH,qBACa,gBAAiB,SAAQ,UAAU;IAC5C;;OAEG;IAEH,SAAS,EAAG,IAAI,CAAC;IACjB;;OAEG;IAEH,GAAG,EAAG,MAAM,CAAC;IACb;;OAEG;IAMH,EAAE,EAAG,OAAO,CAAC;IACb;;OAEG;IAEH,KAAK,EAAG,mBAAmB,CAAC;IAC5B;;OAEG;IAEH,MAAM,EAAG,UAAU,CAAC;IACpB;;OAEG;IAEH,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;~~IACjC~~;;OAEG;IAEH,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;~~IACvC~~;;OAEG;IAEH,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B;;OAEG;IAEH,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;IAC7B;;OAEG;IAEH,aAAa,EAAG,sBAAsB,CAAC;IACvC;;;OAGG;IAEH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;;AAED;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,+BAAuD;CAAG"}
1	+ {"version":3,"file":"websocket-message.model.d.ts","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-message.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAIlE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAI5D,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;GAEG;AACH,oBAAY,sBAAsB;IAC9B,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,OAAO,YAAY;CACtB;AAED;;GAEG;AACH,qBACa,gBAAiB,SAAQ,UAAU;IAC5C;;OAEG;IAEH,SAAS,EAAG,IAAI,CAAC;IACjB;;OAEG;IAEH,GAAG,EAAG,MAAM,CAAC;IACb;;OAEG;IAMH,EAAE,EAAG,OAAO,CAAC;IACb;;OAEG;IAEH,KAAK,EAAG,mBAAmB,CAAC;IAC5B;;OAEG;IAEH,MAAM,EAAG,UAAU,CAAC;IACpB;;OAEG;IAEH,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACxC;;OAEG;IAEH,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAC9C;;OAEG;IAEH,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B;;OAEG;IAEH,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;IAC7B;;OAEG;IAEH,aAAa,EAAG,sBAAsB,CAAC;IACvC;;;OAGG;IAEH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;;AAED;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,+BAAuD;CAAG"}

package/dist/cjs/websocket/models/websocket-message.model.js CHANGED Viewed

@@ -126,7 +126,7 @@ __decorate([
     __metadata("design:type", Object)
 ], WebsocketMessage.prototype, "recipientId", void 0);
 exports.WebsocketMessage = WebsocketMessage = __decorate([
-    (0, entity_decorator_1.Entity)()
+    (0, entity_decorator_1.Entity)({ defaultOrder: { seq: 'ASC' } })
 ], WebsocketMessage);
 /**
  * The data required to create a new websocket message.

package/dist/cjs/websocket/models/websocket-message.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"websocket-message.model.js","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-message.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,iGAAqF;AACrF,8DAAkD;AAClD,sEAA4D;AAC5D,+EAAkE;AAClE,mFAAsE;AACtE,oEAA0D;AAE1D,kEAAyD;AAEzD;;GAEG;AACH,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAC9B,qCAAW,CAAA;IACX,uCAAa,CAAA;IACb,6CAAmB,CAAA;AACvB,CAAC,EAJW,sBAAsB,sCAAtB,sBAAsB,QAIjC;AAED;;GAEG;AAEI,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,8BAAU;IAC5C;;OAEG;IAEH,SAAS,CAAQ;IACjB;;OAEG;IAEH,GAAG,CAAU;IACb;;OAEG;IAMH,EAAE,CAAW;IACb;;OAEG;IAEH,KAAK,CAAuB;IAC5B;;OAEG;IAEH,MAAM,CAAc;IACpB;;OAEG;IAEH,YAAY,~~CAAqB~~;~~IACjC~~;;OAEG;IAEH,kBAAkB,~~CAAqB~~;~~IACvC~~;;OAEG;IAEH,IAAI,CAAsB;IAC1B;;OAEG;IAEH,KAAK,CAAwB;IAC7B;;OAEG;IAEH,aAAa,CAA0B;IACvC;;;OAGG;IAEH,WAAW,CAAqB;CACnC,CAAA;AA7DY,4CAAgB;AAKzB;IADC,6BAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;8BACjC,IAAI;mDAAC;AAKjB;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;;6CACjC;AASb;IALC,6BAAQ,CAAC,OAAO,CAAC;QACd,OAAO,EAAE,CAAC,CAAmB,EAAE,EAAE;YAC7B,OAAO,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC;QAC1B,CAAC;KACJ,CAAC;;4CACW;AAKb;IADC,6BAAQ,CAAC,MAAM,EAAE;;+CACU;AAK5B;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,6BAAU,EAAE,CAAC;;gDAClB;AAKpB;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;;~~sDACpB~~;~~AAKjC~~;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;~~4DACE~~;~~AAKvC~~;IADC,6BAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;;8CACpC;AAK1B;IADC,6BAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;;+CAClC;AAK7B;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;;uDACX;AAMvC;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,IAAI,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;;qDACtF;2BA5DvB,gBAAgB;IAD5B,IAAA,yBAAM,~~GAAE~~;~~GACI~~,gBAAgB,CA6D5B;AAED;;GAEG;AACH,MAAa,0BAA2B,SAAQ,IAAA,4BAAS,EAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;CAAG;AAA1G,gEAA0G;AAE1G,+CAA+C;AAC/C,KAAK,UAAU,eAAe;IAC1B,MAAM,IAAI,GAA6D,IAAA,wBAAM,EAAC,IAAA,gDAAkB,EAAC,gBAAgB,CAAC,CAAC,CAAC;IACpH,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1E,OAAO,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AACzC,CAAC"}
1	+ {"version":3,"file":"websocket-message.model.js","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-message.model.ts"],"names":[],"mappings":"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"}

package/dist/cjs/websocket/models/websocket-request.model.d.ts CHANGED Viewed

@@ -1,19 +1,14 @@
 import { BaseWebsocketConnection } from './connection/base-websocket-connection.model';
+import { Header } from '../../http/header.type';
 import { HttpRequest } from '../../http/http-request.model';
-import { KnownHeader } from '../../http/known-header.enum';
-declare class QueryObject implements Record<string, string | undefined> {
-    [key: string]: string | undefined;
-}
-declare class ParamsObject extends QueryObject {
-}
 /**
  * A websocket request sent from a client.
  */
-export declare class WebsocketRequest implements Partial<Pick<HttpRequest, 'headers' | 'body' | 'query' | 'params'>> {
-    query: QueryObject | undefined;
-    headers: Partial<Record<KnownHeader, string | undefined>>;
-    params: ParamsObject | undefined;
-    body: unknown | undefined;
+export declare class WebsocketRequest<T = unknown, PathParamsObject extends Record<string, unknown> = Record<string, string | undefined>, QueryParamsObject extends Record<string, unknown> = Record<string, string | undefined>, HeaderParamsObject extends Record<string, unknown> = Partial<Record<Header, string | undefined>>> implements Partial<Pick<HttpRequest<T, PathParamsObject, QueryParamsObject, HeaderParamsObject>, 'headers' | 'body' | 'query' | 'params'>> {
+    query: QueryParamsObject | undefined;
+    headers: HeaderParamsObject | undefined;
+    params: PathParamsObject | undefined;
+    body: T | undefined;
 }
 /**
  * A websocket request with the connection that belongs to it.
@@ -28,5 +23,4 @@ export type WebsocketRequestWithConnection<Connection extends BaseWebsocketConne
      */
     connection: Connection;
 };
-export {};
 //# sourceMappingURL=websocket-request.model.d.ts.map

package/dist/cjs/websocket/models/websocket-request.model.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"websocket-request.model.d.ts","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-request.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AAEvF,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;~~AAC5D~~,OAAO,~~EAAE~~,~~WAAW~~,~~EAAE~~,MAAM,~~8BAA8B,~~CAAC~~;AAG3D~~,~~cAAM~~,~~WAAY~~,~~YAAW~~,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC~~;IAC3D~~,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,~~SAAS~~,~~CAAA;CACpC;AAGD~~,~~cAAM~~,~~YAAa~~,~~SAAQ~~,~~WAAW;CAAG;AAOzC;;GAEG;AACH~~,~~qBAAa~~,~~gBAAiB~~,YAAW,OAAO,CAAC,IAAI,~~CAAC~~,WAAW,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC,~~CAAC~~;~~IAGxG~~,KAAK,EAAE,~~WAAW~~,GAAG,SAAS,CAAC;~~IAI/B~~,OAAO,~~EAAG,OAAO,CAAC,MAAM,CAAC,WAAW,~~EAAE,~~MAAM~~,GAAG,SAAS,CAAC~~,CAAC,CAAC~~;~~IAI3D~~,MAAM,EAAE,~~YAAY~~,GAAG,SAAS,CAAC;~~IAIjC~~,IAAI,EAAE,~~OAAO~~,GAAG,SAAS,CAAC;~~CAC7B~~;AAED;;GAEG;AACH,MAAM,MAAM,8BAA8B,CAAC,UAAU,SAAS,uBAAuB,IAAI;IACrF;;OAEG;IACH,OAAO,EAAE,gBAAgB,CAAC;IAC1B;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;CACzB,CAAC"}
1	+ {"version":3,"file":"websocket-request.model.d.ts","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-request.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AAEvF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAgB5D;;GAEG;AACH,qBAAa,gBAAgB,CACzB,CAAC,GAAG,OAAO,EACX,gBAAgB,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACrF,iBAAiB,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACtF,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAClG,YAAW,OAAO,CAAC,IAAI,CACrB,WAAW,CAAC,CAAC,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,EACvE,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC,CAC3C;IAGG,KAAK,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAIrC,OAAO,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAIxC,MAAM,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAIrC,IAAI,EAAE,CAAC,GAAG,SAAS,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,MAAM,8BAA8B,CAAC,UAAU,SAAS,uBAAuB,IAAI;IACrF;;OAEG;IACH,OAAO,EAAE,gBAAgB,CAAC;IAC1B;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;CACzB,CAAC"}

package/dist/cjs/websocket/models/websocket-request.model.js CHANGED Viewed

@@ -39,7 +39,7 @@ __decorate([
     __metadata("design:type", Object)
 ], WebsocketRequest.prototype, "query", void 0);
 __decorate([
-    property_decorator_1.Property.object({ cls: () => HeadersObject, allowAdditionalProperties: true }),
+    property_decorator_1.Property.object({ cls: () => HeadersObject, required: false, allowAdditionalProperties: true }),
     __metadata("design:type", Object)
 ], WebsocketRequest.prototype, "headers", void 0);
 __decorate([

package/dist/cjs/websocket/models/websocket-request.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"websocket-request.model.js","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-request.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mFAAsE;~~AAItE~~,+CAA+C;AAC/C,MAAM,WAAW;CAEhB;AAED,+CAA+C;AAC/C,MAAM,YAAa,SAAQ,WAAW;CAAG;AAEzC,+CAA+C;AAC/C,MAAM,aAAa;CAElB;AAED;;GAEG;AACH,MAAa,gBAAgB;~~IACzB~~,+CAA+C;IAE/C,KAAK,~~CAA0B~~;~~IAE/B~~,+CAA+C;IAE/C,OAAO,~~CAAoD~~;~~IAE3D~~,+CAA+C;IAE/C,MAAM,~~CAA2B~~;~~IAEjC~~,+CAA+C;IAE/C,IAAI,~~CAAsB~~;~~CAC7B~~;~~AAhBD~~,~~4CAgBC~~;AAbG;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;;+~~CAC/D~~;~~AAI/B~~;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;;~~iDACpB~~;~~AAI3D~~;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;;~~gDAC9D~~;~~AAIjC~~;IADC,6BAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;~~8CACZ~~"}
1	+ {"version":3,"file":"websocket-request.model.js","sourceRoot":"","sources":["../../../../src/websocket/models/websocket-request.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mFAAsE;AAKtE,+CAA+C;AAC/C,MAAM,WAAW;CAEhB;AAED,+CAA+C;AAC/C,MAAM,YAAa,SAAQ,WAAW;CAAG;AAEzC,+CAA+C;AAC/C,MAAM,aAAa;CAElB;AAED;;GAEG;AACH,MAAa,gBAAgB;IASzB,+CAA+C;IAE/C,KAAK,CAAgC;IAErC,+CAA+C;IAE/C,OAAO,CAAiC;IAExC,+CAA+C;IAE/C,MAAM,CAA+B;IAErC,+CAA+C;IAE/C,IAAI,CAAgB;CACvB;AAxBD,4CAwBC;AAbG;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;;+CACzD;AAIrC;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;;iDACxD;AAIxC;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;;gDAC1D;AAIrC;IADC,6BAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;8CAClB"}

package/dist/cjs/websocket/services/websocket.service.d.ts CHANGED Viewed

@@ -5,7 +5,6 @@ import { Repository } from '../../data-source/repository';
 import { BeforeAppShutdown } from '../../global/before-app-shutdown.interface';
 import { OnAppInit } from '../../global/on-app-init.interface';
 import { type LoggerInterface } from '../../logging/logger.interface';
-import { type ParserInterface } from '../../parsing/parser.interface';
 import { Newable } from '../../types/newable.type';
 import { type ValidationServiceInterface } from '../../validation/validation-service.interface';
 import { SocketIOWebsocketConnection } from '../models/connection/socket-io-websocket-connection.model';
@@ -20,16 +19,18 @@ import { WebsocketRequestWithConnection } from '../models/websocket-request.mode
 export declare class WebsocketService implements WebsocketServiceInterface<SocketIOWebsocketConnection>, OnAppInit, BeforeAppShutdown {
     private readonly logger;
     private readonly authService;
-    private readonly parser;
     private readonly validationService;
     private readonly channelRepository;
     private readonly messageRepository;
     private readonly options;
     private socketServer;
+    private readonly allEventRoutes;
     private readonly websocketHandlers;
     private readonly websocketChannels;
     private readonly connections;
-    constructor(logger: LoggerInterface, authService: AuthServiceInterface, parser: ParserInterface, validationService: ValidationServiceInterface, channelRepository: Repository<WebsocketChannel>, messageRepository: Repository<WebsocketMessage, CreateWebsocketMessageData>, options: WebsocketOptions);
+    private readonly pendingRouteGroups;
+    private get versioningService();
+    constructor(logger: LoggerInterface, authService: AuthServiceInterface, validationService: ValidationServiceInterface, channelRepository: Repository<WebsocketChannel>, messageRepository: Repository<WebsocketMessage, CreateWebsocketMessageData>, options: WebsocketOptions);
     onAppInit(app: ZibriApplication): Promise<void>;
     beforeAppShutdown(): Promise<void>;
     private onConnect;
@@ -38,13 +39,14 @@ export declare class WebsocketService implements WebsocketServiceInterface<Socke
     registerController(controllerClass: Newable<unknown>): Promise<void>;
     send<B extends boolean = true>(data: WebsocketSendData<SocketIOWebsocketConnection, B>): Promise<B extends false ? void : WebsocketRequestWithConnection<SocketIOWebsocketConnection>>;
     sendToChannel<B extends boolean>(data: WebsocketSendToChannelData<B>): Promise<B extends false ? void : WebsocketRequestWithConnection<SocketIOWebsocketConnection>[]>;
-    sendToAll<B extends boolean>(data: WebsocketSendToAllData<B>, expectResponse?: B): Promise<B extends false ? void : WebsocketRequestWithConnection<SocketIOWebsocketConnection>[]>;
+    sendToAll<B extends boolean>(data: WebsocketSendToAllData<B>): Promise<B extends false ? void : WebsocketRequestWithConnection<SocketIOWebsocketConnection>[]>;
     disconnect(connection: SocketIOWebsocketConnection, close?: boolean): void;
     joinChannel(connection: SocketIOWebsocketConnection, channelId: string): Promise<void>;
     leaveChannel(connection: SocketIOWebsocketConnection, channelId: string): Promise<void>;
     getConnections(): SocketIOWebsocketConnection[];
     findConnectionById(id: string): SocketIOWebsocketConnection;
     findConnectionByUserId(userId: string): SocketIOWebsocketConnection;
+    private createDispatchHandler;
     private createWebsocketMessage;
     private controllerRouteToWebsocketHandler;
     private checkForOrphanedControllers;

package/dist/cjs/websocket/services/websocket.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"websocket.service.d.ts","sourceRoot":"","sources":["../../../../src/websocket/services/websocket.service.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EAAE,iBAAiB,EAA4B,sBAAsB,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC3K,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAK9E,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;~~AAW1D~~,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAE/E,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAG/D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,gCAAgC,CAAC;~~AACtE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,gCAAgC,CAAC;~~AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;~~AAInD~~,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,+CAA+C,CAAC;~~AAEhG~~,OAAO,EAAE,2BAA2B,EAAE,MAAM,2DAA2D,CAAC;AACxG,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAA0B,MAAM,mCAAmC,CAAC;AACzH,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAoB,8BAA8B,EAAE,MAAM,mCAAmC,CAAC;AAYrG;;;GAGG;AACH,qBACa,gBAAiB,YAAW,yBAAyB,CAAC,2BAA2B,CAAC,EAAE,SAAS,EAAE,iBAAiB;~~IAQrH~~,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,~~MAAM~~;~~IAEvB~~,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAElC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAElC,OAAO,CAAC,QAAQ,CAAC,~~iBAAiB~~;~~IAElC~~,OAAO,CAAC,~~QAAQ~~,~~CAAC,OAAO~~;~~IAnB5B~~,OAAO,CAAC,~~YAAY~~,~~CAAU~~;~~IAC9B~~,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA4D;IAC9F,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiE;IACnG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqC;~~gBAI5C~~,MAAM,EAAE,eAAe,EAEvB,WAAW,EAAE,oBAAoB,EAEjC,~~MAAM,EAAE,eAAe,EAEvB,~~iBAAiB,EAAE,0BAA0B,EAE7C,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC,EAE/C,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,EAE3E,OAAO,EAAE,gBAAgB;IAIxC,SAAS,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;~~IAiB~~/C,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;YAI1B,SAAS;~~YA+HT~~,iBAAiB;~~YA6CjB~~,YAAY;IAWpB,kBAAkB,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;~~IA0BpE~~,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,IAAI,EAC/B,IAAI,EAAE,iBAAiB,CAAC,2BAA2B,EAAE,CAAC,CAAC,GACxD,OAAO,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,8BAA8B,CAAC,2BAA2B,CAAC,CAAC;IA6C1F,aAAa,CAAC,CAAC,SAAS,OAAO,EACjC,IAAI,EAAE,0BAA0B,CAAC,CAAC,CAAC,GACpC,OAAO,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,8BAA8B,CAAC,2BAA2B,CAAC,EAAE,CAAC;IAgE5F,SAAS,CAAC,CAAC,SAAS,OAAO,EAC7B,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,~~EAC/B~~,~~cAAc,GAAE,CAAa,GAC9B,~~OAAO,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,8BAA8B,CAAC,2BAA2B,CAAC,EAAE,CAAC;~~IA4DlG~~,UAAU,CAAC,UAAU,EAAE,2BAA2B,EAAE,KAAK,GAAE,OAAc,GAAG,IAAI;IAK1E,WAAW,CAAC,UAAU,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBtF,YAAY,CAAC,UAAU,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;~~IAgB7F~~,cAAc,IAAI,2BAA2B,EAAE;IAK/C,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,2BAA2B;IAS3D,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,2BAA2B;~~YAQrD~~,sBAAsB;IAkBpC,OAAO,CAAC,iCAAiC;IAoEzC,OAAO,CAAC,2BAA2B;YAcrB,kBAAkB;CAanC"}
1	+ {"version":3,"file":"websocket.service.d.ts","sourceRoot":"","sources":["../../../../src/websocket/services/websocket.service.ts"],"names":[],"mappings":"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"}

package/dist/cjs/websocket/services/websocket.service.js CHANGED Viewed

@@ -11,8 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketService = void 0;
+const node_assert_1 = __importDefault(require("node:assert"));
 const socket_io_1 = require("socket.io");
 const als_utilities_1 = require("../../context/als.utilities");
 const websocket_request_context_1 = require("../../context/request/websocket-request.context");
@@ -26,6 +30,7 @@ const error_handler_1 = require("../../error-handling/error-handler");
 const bad_request_error_1 = require("../../error-handling/errors/bad-request.error");
 const http_error_1 = require("../../error-handling/errors/http.error");
 const not_found_error_1 = require("../../error-handling/errors/not-found.error");
+const unauthorized_error_1 = require("../../error-handling/errors/unauthorized.error");
 const is_error_function_1 = require("../../error-handling/is-error.function");
 const global_registry_1 = require("../../global/global-registry");
 const http_status_enum_1 = require("../../http/http-status.enum");
@@ -44,19 +49,22 @@ const websocket_message_model_1 = require("../models/websocket-message.model");
 let WebsocketService = class WebsocketService {
     logger;
     authService;
-    parser;
     validationService;
     channelRepository;
     messageRepository;
     options;
     socketServer;
+    allEventRoutes = [];
     websocketHandlers = {};
     websocketChannels = {};
     connections = [];
-    constructor(logger, authService, parser, validationService, channelRepository, messageRepository, options) {
+    pendingRouteGroups = new Map();
+    get versioningService() {
+        return (0, inject_function_1.inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.VERSIONING_SERVICE);
+    }
+    constructor(logger, authService, validationService, channelRepository, messageRepository, options) {
         this.logger = logger;
         this.authService = authService;
-        this.parser = parser;
         this.validationService = validationService;
         this.channelRepository = channelRepository;
         this.messageRepository = messageRepository;
@@ -73,33 +81,54 @@ let WebsocketService = class WebsocketService {
             await this.registerController(controller);
         }
         this.checkForOrphanedControllers(app.options.websocketControllers);
-        this.socketServer.on('connection', socket => this.onConnect(socket));
+        for (const [event, group] of this.pendingRouteGroups.entries()) {
+            this.websocketHandlers[event] = this.createDispatchHandler(group.entries);
+            await this.logger.debug(`- mounting websocket event "${event}"`);
+        }
+        // eslint-disable-next-line typescript/no-misused-promises
+        this.socketServer.use(async (socket, next) => {
+            const request = {
+                headers: socket.handshake.headers,
+                body: undefined,
+                query: socket.handshake.query,
+                params: {}
+            };
+            const context = new websocket_request_context_1.WebsocketRequestContext(request, undefined, undefined, undefined);
+            const currentUser = await this.authService.getCurrentUser(context, this.authService.strategies, false);
+            if (!await this.options.isAllowedToConnect(currentUser)) {
+                next(new unauthorized_error_1.UnauthorizedError('Not allowed to connect'));
+                return;
+            }
+            try {
+                const version = await this.versioningService.resolveVersion(context);
+                // eslint-disable-next-line typescript/no-unsafe-member-access
+                socket.data.resolvedVersion = version;
+                // eslint-disable-next-line typescript/no-unsafe-member-access
+                socket.data.currentUser = currentUser;
+                next();
+            }
+            catch (error) {
+                next(error instanceof Error ? error : new Error('Could not resolve version', { cause: error }));
+            }
+        });
+        this.socketServer.on('connection', async (socket) => await this.onConnect(socket));
     }
     // eslint-disable-next-line jsdoc/require-jsdoc
     async beforeAppShutdown() {
         await this.socketServer.close();
     }
     async onConnect(socket) {
-        const request = {
-            headers: socket.handshake.headers,
-            body: undefined,
-            query: socket.handshake.query,
-            params: {}
-        };
+        // eslint-disable-next-line typescript/no-unsafe-member-access
+        const currentUser = socket.data.currentUser;
+        // eslint-disable-next-line typescript/no-unsafe-member-access
+        const resolvedVersion = socket.data.resolvedVersion;
         let connection = this.connections.find(c => c.id === socket.id);
-        const context = new websocket_request_context_1.WebsocketRequestContext(request, connection, undefined, undefined);
-        const currentUser = await this.authService.getCurrentUser(context, this.authService.strategies, false);
-        const isAllowedToConnect = await this.options.isAllowedToConnect(currentUser);
-        if (!isAllowedToConnect) {
-            socket.disconnect(true);
-            return;
-        }
         if (connection) {
             connection.offset = socket.handshake.auth.offset;
             await this.recoverConnection(connection, currentUser);
             return;
         }
-        connection = new socket_io_websocket_connection_model_1.SocketIOWebsocketConnection(socket, currentUser?.id);
+        connection = new socket_io_websocket_connection_model_1.SocketIOWebsocketConnection(socket, currentUser?.id, resolvedVersion);
         this.connections.push(connection);
         await this.logger.debug('a user connected');
         connection.onDisconnect(() => this.onDisconnect(connection));
@@ -213,8 +242,7 @@ let WebsocketService = class WebsocketService {
             });
         }
         const messages = await this.messageRepository.findAll({
-            where: whereFilters,
-            order: { seq: 'ASC' }
+            where: whereFilters
         });
         for (const m of messages) {
             await this.send({
@@ -239,18 +267,43 @@ let WebsocketService = class WebsocketService {
     // eslint-disable-next-line jsdoc/require-jsdoc
     async registerController(controllerClass) {
         const controllerData = metadata_utilities_1.MetadataUtilities.getWebsocketControllerData(controllerClass);
+        const currentLatest = global_registry_1.GlobalRegistry.getAppData('version');
+        (0, node_assert_1.default)(currentLatest);
         if (controllerData == undefined) {
             // eslint-disable-next-line stylistic/max-len
             throw new Error(`Could not find websocket controller data on class ${controllerClass.name}. Did you forget to decorate it with @WebsocketController?`);
         }
         const routes = metadata_utilities_1.MetadataUtilities.getWebsocketControllerRoutes(controllerClass);
         for (const route of routes) {
-            const handler = this.controllerRouteToWebsocketHandler(controllerClass, route);
-            if (this.websocketHandlers[route.event]) {
-                throw new Error(`The websocket event "${route.event}" has been defined more than once.`, { cause: controllerClass });
+            const fullEvent = `${controllerData.eventPrefix}${route.event}`;
+            const versions = route.versions ?? controllerData.versions;
+            const overlappingRoute = this.allEventRoutes.find(r => r.key === fullEvent && this.versioningService.hasOverlappingVersions(r.versions, versions, currentLatest));
+            if (overlappingRoute) {
+                const overlappingVersions = this.versioningService.findOverlappingVersions(overlappingRoute.versions, versions, currentLatest);
+                if (overlappingVersions === 'all') {
+                    throw new Error([
+                        `The websocket event "${fullEvent}"`,
+                        'has been defined more than once.',
+                        '(versions: \'all\' has been used)'
+                    ].join(' '), { cause: controllerClass });
+                }
+                throw new Error([
+                    `The websocket event "${fullEvent}"`,
+                    `for the ${overlappingVersions.length > 1 ? 'versions' : 'version'} "${overlappingVersions.join(', ')}"`,
+                    'has been defined more than once.'
+                ].join(' '), { cause: controllerClass });
             }
-            await this.logger.debug(`- mounting websocket event "${route.event}"`);
-            this.websocketHandlers[route.event] = handler;
+            this.allEventRoutes.push({ key: fullEvent, versions });
+            const innerHandler = this.controllerRouteToWebsocketHandler(controllerClass, route);
+            // eslint-disable-next-line typescript/typedef
+            const existing = this.pendingRouteGroups.get(fullEvent);
+            if (existing) {
+                existing.entries.push({ versions, innerHandler });
+            }
+            else {
+                this.pendingRouteGroups.set(fullEvent, { entries: [{ versions, innerHandler }] });
+            }
+            await this.logger.debug(`- registering websocket event "${fullEvent}"`);
         }
     }
     // eslint-disable-next-line jsdoc/require-jsdoc
@@ -288,7 +341,7 @@ let WebsocketService = class WebsocketService {
     }
     // eslint-disable-next-line jsdoc/require-jsdoc
     async sendToChannel(data) {
-        data.expectResponse ??= true;
+        data.expectResponse ??= false;
         const channel = await this.channelRepository.findById(data.channelId);
         const message = await this.createWebsocketMessage(data.persist ?? true, data.message.ok
             ? {
@@ -341,7 +394,8 @@ let WebsocketService = class WebsocketService {
         return res;
     }
     // eslint-disable-next-line jsdoc/require-jsdoc
-    async sendToAll(data, expectResponse = true) {
+    async sendToAll(data) {
+        data.expectResponse ??= false;
         const message = await this.createWebsocketMessage(data.persist ?? true, data.message.ok
             ? {
                 event: data.event,
@@ -362,7 +416,7 @@ let WebsocketService = class WebsocketService {
             await data.responseHandler(message);
             return undefined;
         }
-        if (!expectResponse) {
+        if (!data.expectResponse) {
             this.socketServer.emit(data.event, json_utilities_1.JsonUtilities.parse(json_utilities_1.JsonUtilities.stringify(message)));
             return undefined;
         }
@@ -418,7 +472,7 @@ let WebsocketService = class WebsocketService {
             await this.channelRepository.updateById(channel.id, { userIds: channel.userIds });
         }
         await connection.leave(channel.name);
-        const foundChannel = this.websocketChannels[channel.name]?.find(c => c.id === channel.id);
+        const foundChannel = this.websocketChannels[channel.name]?.find(c => c.id === connection.id);
         if (foundChannel) {
             // eslint-disable-next-line typescript/no-non-null-assertion
             this.websocketChannels[channel.name].splice(this.websocketChannels[channel.name].indexOf(foundChannel), 1);
@@ -444,6 +498,40 @@ let WebsocketService = class WebsocketService {
         }
         return foundConnection;
     }
+    createDispatchHandler(
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    entries) {
+        return async (connection, req, responseHandler) => {
+            try {
+                // eslint-disable-next-line typescript/typedef
+                const match = entries.find(e => this.versioningService.matchesVersion(e.versions, connection.resolvedVersion));
+                if (!match) {
+                    const error = new not_found_error_1.NotFoundError(`Could not find handler for websocket event for version "${connection.resolvedVersion.value}"`);
+                    await this.send({
+                        connection,
+                        event: websocket_event_enum_1.WebsocketEvent.RESPONSE,
+                        message: { ok: false, error, status: error.status, senderUserId: undefined, senderConnectionId: undefined },
+                        responseHandler,
+                        expectResponse: true,
+                        persist: false
+                    });
+                    return;
+                }
+                await match.innerHandler(connection, req, responseHandler);
+            }
+            catch (error) {
+                const err = (0, error_handler_1.toHttpError)(error);
+                await this.send({
+                    connection,
+                    event: websocket_event_enum_1.WebsocketEvent.RESPONSE,
+                    message: { ok: false, error: err, status: err.status, senderUserId: undefined, senderConnectionId: undefined },
+                    responseHandler,
+                    expectResponse: true,
+                    persist: false
+                });
+            }
+        };
+    }
     async createWebsocketMessage(persist, messageData) {
         if ('id' in messageData) {
             return messageData;
@@ -535,12 +623,11 @@ exports.WebsocketService = WebsocketService = __decorate([
     (0, injectable_decorator_1.Injectable)({ register: 'onUse' }),
     __param(0, (0, inject_decorator_1.Inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.LOGGER)),
     __param(1, (0, inject_decorator_1.Inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.AUTH_SERVICE)),
-    __param(2, (0, inject_decorator_1.Inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.PARSER)),
-    __param(3, (0, inject_decorator_1.Inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.VALIDATION_SERVICE)),
-    __param(4, (0, inject_repository_decorator_1.InjectRepository)(websocket_channel_model_1.WebsocketChannel)),
-    __param(5, (0, inject_repository_decorator_1.InjectRepository)(websocket_message_model_1.WebsocketMessage)),
-    __param(6, (0, inject_decorator_1.Inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.WEBSOCKET_OPTIONS)),
-    __metadata("design:paramtypes", [Object, Object, Object, Object, repository_1.Repository,
+    __param(2, (0, inject_decorator_1.Inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.VALIDATION_SERVICE)),
+    __param(3, (0, inject_repository_decorator_1.InjectRepository)(websocket_channel_model_1.WebsocketChannel)),
+    __param(4, (0, inject_repository_decorator_1.InjectRepository)(websocket_message_model_1.WebsocketMessage)),
+    __param(5, (0, inject_decorator_1.Inject)(zibri_di_tokens_default_1.ZIBRI_DI_TOKENS.WEBSOCKET_OPTIONS)),
+    __metadata("design:paramtypes", [Object, Object, Object, repository_1.Repository,
         repository_1.Repository, Object])
 ], WebsocketService);
 //# sourceMappingURL=websocket.service.js.map

package/dist/cjs/websocket/services/websocket.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"websocket.service.js","sourceRoot":"","sources":["../../../../src/websocket/services/websocket.service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"websocket.service.js","sourceRoot":"","sources":["../../../../src/websocket/services/websocket.service.ts"],"names":[],"mappings":"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"}

package/dist/esm/application.js CHANGED Viewed

@@ -180,7 +180,10 @@ class ZibriApplication {
                 for (const [signal, handler] of this.signalHandlers) {
                     process.off(signal, handler);
                 }
-                process.exit(0);
+                if (signal != undefined) {
+                    process.exit(0);
+                }
+                return;
             }
             case app_state_enum_1.AppState.INITIALIZED:
             case app_state_enum_1.AppState.STARTED: {
@@ -194,7 +197,10 @@ class ZibriApplication {
                 await this.beforeAppShutdown(injectables, signal);
                 await this.onAppShutdown(injectables, signal);
                 await this.afterAppShutdown(injectables, signal);
-                process.exit(0);
+                if (signal != undefined) {
+                    process.exit(0);
+                }
+                return;
             }
         }
     }
@@ -343,7 +349,6 @@ class ZibriApplication {
             }
         };
         for (const plugin of this.providedOptions.plugins ?? []) {
-            // TODO: handle order of plugin initialization so that everything is available for DI inside the plugin constructor.
             res.authStrategies = [...plugin.authStrategies, ...res.authStrategies];
             res.bodyParsers = [...plugin.bodyParsers, ...res.bodyParsers];
             res.controllers = [...plugin.controllers, ...res.controllers];