@rsdk/core 4.10.2 → 4.11.0-next.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.11.0-next.0](https://github.com/R-Vision/rsdk/compare/v4.10.2...v4.11.0-next.0) (2024-07-04)
+
+### Features
+
+* add multiple protocols support for UrlParser (ex: http/https) ([#250](https://github.com/R-Vision/rsdk/issues/250)) ([f2f7cce](https://github.com/R-Vision/rsdk/commit/f2f7cce81582ac2eefcf25edfa4ca81397f09c0f))
+
 ## [4.10.2](https://github.com/R-Vision/rsdk/compare/v4.10.2-next.0...v4.10.2) (2024-07-03)
 
 **Note:** Version bump only for package @rsdk/core

package/dist/config/parsers/url/exception.d.ts

@@ -4,5 +4,5 @@ export declare class InvalidUrl extends BootstrapException {
     constructor(str: string, cause: unknown);
 }
 export declare class InvalidProtocol extends BootstrapException {
-    constructor(expectedProtocol: string, protocol: string, url: URL);
+    constructor(expectedProtocols: string[], protocol: string, url: URL);
 }

package/dist/config/parsers/url/exception.js

@@ -11,12 +11,12 @@ class InvalidUrl extends exceptions_1.BootstrapException {
 }
 exports.InvalidUrl = InvalidUrl;
 class InvalidProtocol extends exceptions_1.BootstrapException {
-    constructor(expectedProtocol, protocol, url) {
-        super(`Invalid protocol: <${protocol}>, expected: ${expectedProtocol}`, {
+    constructor(expectedProtocols, protocol, url) {
+        super(`Invalid protocol: <${protocol}>, expected: ${expectedProtocols}`, {
             details: {
                 protocol,
                 url,
-                expectedProtocol,
+                expected: expectedProtocols,
             },
         });
     }

package/dist/config/parsers/url/exception.js.map

@@ -1 +1 @@
-{"version":3,"file":"exception.js","sourceRoot":"","sources":["../../../../src/config/parsers/url/exception.ts"],"names":[],"mappings":";;;AAAA,oDAAyD;AAEzD,MAAa,UAAW,SAAQ,+BAAkB;IAChD,YAAY,GAAW,EAAE,KAAc;QACrC,KAAK,CAAC,wBAAwB,GAAG,GAAG,EAAE;YACpC,KAAK;SACN,CAAC,CAAC;IACL,CAAC;CACF;AAND,gCAMC;AAED,MAAa,eAAgB,SAAQ,+BAAkB;IACrD,YAAY,gBAAwB,EAAE,QAAgB,EAAE,GAAQ;QAC9D,KAAK,CAAC,sBAAsB,QAAQ,gBAAgB,gBAAgB,EAAE,EAAE;YACtE,OAAO,EAAE;gBACP,QAAQ;gBACR,GAAG;gBACH,gBAAgB;aACjB;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAVD,0CAUC"}
+{"version":3,"file":"exception.js","sourceRoot":"","sources":["../../../../src/config/parsers/url/exception.ts"],"names":[],"mappings":";;;AAAA,oDAAyD;AAEzD,MAAa,UAAW,SAAQ,+BAAkB;IAChD,YAAY,GAAW,EAAE,KAAc;QACrC,KAAK,CAAC,wBAAwB,GAAG,GAAG,EAAE;YACpC,KAAK;SACN,CAAC,CAAC;IACL,CAAC;CACF;AAND,gCAMC;AAED,MAAa,eAAgB,SAAQ,+BAAkB;IACrD,YAAY,iBAA2B,EAAE,QAAgB,EAAE,GAAQ;QACjE,KAAK,CAAC,sBAAsB,QAAQ,gBAAgB,iBAAiB,EAAE,EAAE;YACvE,OAAO,EAAE;gBACP,QAAQ;gBACR,GAAG;gBACH,QAAQ,EAAE,iBAAiB;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAVD,0CAUC"}

package/dist/config/parsers/url/url.parser.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import type { PropertyParser } from '../../types';
 export declare class UrlParser implements PropertyParser<URL> {
-    readonly protocol?: string | undefined;
-    constructor(protocol?: string | undefined);
+    private readonly protocols;
+    constructor(...protocols: string[]);
     type(): string;
     description(): string;
     parse(value: unknown): URL;

package/dist/config/parsers/url/url.parser.js

@@ -4,9 +4,9 @@ exports.UrlParser = void 0;
 const common_1 = require("@rsdk/common");
 const exception_1 = require("./exception");
 class UrlParser {
-    protocol;
-    constructor(protocol) {
-        this.protocol = protocol;
+    protocols;
+    constructor(...protocols) {
+        this.protocols = protocols;
     }
     type() {
         return 'URL';
@@ -26,11 +26,11 @@ class UrlParser {
         }
     }
     assertProtocol(url) {
-        if (!this.protocol) {
+        if (!this.protocols) {
             return;
         }
-        if (url.protocol !== this.protocol) {
-            throw new exception_1.InvalidProtocol(this.protocol, url.protocol, url);
+        if (!this.protocols.includes(url.protocol)) {
+            throw new exception_1.InvalidProtocol(this.protocols, url.protocol, url);
         }
     }
 }

package/dist/config/parsers/url/url.parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.parser.js","sourceRoot":"","sources":["../../../../src/config/parsers/url/url.parser.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAItC,2CAA0D;AAE1D,MAAa,SAAS;IACC;IAArB,YAAqB,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IAAG,CAAC;IAE1C,IAAI;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,WAAW;QACT,OAAO,oCAAoC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,KAAc;QAClB,eAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEvB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;YAE3B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO,GAAG,CAAC;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,sBAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,GAAQ;QAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,IAAI,2BAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;CACF;AAhCD,8BAgCC"}
+{"version":3,"file":"url.parser.js","sourceRoot":"","sources":["../../../../src/config/parsers/url/url.parser.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAItC,2CAA0D;AAE1D,MAAa,SAAS;IACH,SAAS,CAAW;IAErC,YAAY,GAAG,SAAmB;QAChC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,IAAI;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,WAAW;QACT,OAAO,oCAAoC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,KAAc;QAClB,eAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEvB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;YAE3B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO,GAAG,CAAC;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,sBAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,GAAQ;QAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,2BAAe,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF;AArCD,8BAqCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/core",
-  "version": "4.10.2",
+  "version": "4.11.0-next.0",
   "description": "Nestjs based microservice chassis",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -36,5 +36,5 @@
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "964c823b622103b52ef0cd5870490fed9bca2a41"
+  "gitHead": "aa062f61e9bab39cdec54b104254660017b9aa0f"
 }

package/src/config/parsers/url/exception.ts

@@ -9,12 +9,12 @@ export class InvalidUrl extends BootstrapException {
 }
 
 export class InvalidProtocol extends BootstrapException {
-  constructor(expectedProtocol: string, protocol: string, url: URL) {
-    super(`Invalid protocol: <${protocol}>, expected: ${expectedProtocol}`, {
+  constructor(expectedProtocols: string[], protocol: string, url: URL) {
+    super(`Invalid protocol: <${protocol}>, expected: ${expectedProtocols}`, {
       details: {
         protocol,
         url,
-        expectedProtocol,
+        expected: expectedProtocols,
       },
     });
   }

package/src/config/parsers/url/url.parser.ts

@@ -5,7 +5,11 @@ import type { PropertyParser } from '../../types';
 import { InvalidProtocol, InvalidUrl } from './exception';
 
 export class UrlParser implements PropertyParser<URL> {
-  constructor(readonly protocol?: string) {}
+  private readonly protocols: string[];
+
+  constructor(...protocols: string[]) {
+    this.protocols = protocols;
+  }
 
   type(): string {
     return 'URL';
@@ -29,11 +33,12 @@ export class UrlParser implements PropertyParser<URL> {
   }
 
   private assertProtocol(url: URL): void {
-    if (!this.protocol) {
+    if (!this.protocols) {
       return;
     }
-    if (url.protocol !== this.protocol) {
-      throw new InvalidProtocol(this.protocol, url.protocol, url);
+
+    if (!this.protocols.includes(url.protocol)) {
+      throw new InvalidProtocol(this.protocols, url.protocol, url);
     }
   }
 }