@rsdk/core 2.4.4-next.0 → 2.6.0-next.1

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.6.0-next.1](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.0...v2.6.0-next.1) (2023-07-04)
+
+### Bug Fixes
+
+* **@rsdk/core:** unused check in url parser ([07f9140](https://github.com/R-Vision/rsdk/commit/07f91402aed2a3f13225e5bc70311de3341dcd2d))
+
+### Features
+
+* add url-parser options ([7d589a9](https://github.com/R-Vision/rsdk/commit/7d589a9b822bc2f66825f2c67ddd6f44bd65e771))
+
+# [2.5.0](https://github.com/R-Vision/rsdk/compare/v2.4.4-next.0...v2.5.0) (2023-06-23)
+
+**Note:** Version bump only for package @rsdk/core
+
 ## [2.4.4-next.0](https://github.com/R-Vision/rsdk/compare/v2.4.3...v2.4.4-next.0) (2023-06-22)
 
 **Note:** Version bump only for package @rsdk/core

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

@@ -0,0 +1,7 @@
+import { BootstrapException } from '../../../exceptions';
+export declare class InvalidUrl extends BootstrapException {
+    constructor(str: string, cause: unknown);
+}
+export declare class InvalidProtocol extends BootstrapException {
+    constructor(expectedProtocol: string, protocol: string, url: URL);
+}

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

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InvalidProtocol = exports.InvalidUrl = void 0;
+const exceptions_1 = require("../../../exceptions");
+class InvalidUrl extends exceptions_1.BootstrapException {
+    constructor(str, cause) {
+        super(`Invalid url string: <${str}>`, {
+            cause,
+        });
+    }
+}
+exports.InvalidUrl = InvalidUrl;
+class InvalidProtocol extends exceptions_1.BootstrapException {
+    constructor(expectedProtocol, protocol, url) {
+        super(`Invalid protocol: <${protocol}>, expected: ${expectedProtocol}`, {
+            details: {
+                protocol,
+                url,
+                expectedProtocol,
+            },
+        });
+    }
+}
+exports.InvalidProtocol = InvalidProtocol;
+//# sourceMappingURL=exception.js.map

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

@@ -0,0 +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"}

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

@@ -1 +1,2 @@
 export * from './url.parser';
+export { InvalidUrl } from './exception';

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

@@ -14,5 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InvalidUrl = void 0;
 __exportStar(require("./url.parser"), exports);
+var exception_1 = require("./exception");
+Object.defineProperty(exports, "InvalidUrl", { enumerable: true, get: function () { return exception_1.InvalidUrl; } });
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/config/parsers/url/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/config/parsers/url/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,yCAAyC;AAAhC,uGAAA,UAAU,OAAA"}

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

@@ -1,6 +1,9 @@
 import type { PropertyParser, RawConfigValue } from '../../types';
 export declare class UrlParser implements PropertyParser<URL> {
+    readonly protocol?: string | undefined;
+    constructor(protocol?: string | undefined);
     type(): string;
     description(): string;
     parse(value: RawConfigValue): URL;
+    private assertProtocol;
 }

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

@@ -2,7 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UrlParser = void 0;
 const common_1 = require("@rsdk/common");
+const exception_1 = require("./exception");
 class UrlParser {
+    protocol;
+    constructor(protocol) {
+        this.protocol = protocol;
+    }
     type() {
         return 'URL';
     }
@@ -11,7 +16,22 @@ class UrlParser {
     }
     parse(value) {
         common_1.Assert.isString(value);
-        return new URL(value);
+        try {
+            const url = new URL(value);
+            this.assertProtocol(url);
+            return url;
+        }
+        catch (error) {
+            throw new exception_1.InvalidUrl(value, error);
+        }
+    }
+    assertProtocol(url) {
+        if (!this.protocol) {
+            return;
+        }
+        if (url.protocol !== this.protocol) {
+            throw new exception_1.InvalidProtocol(this.protocol, url.protocol, url);
+        }
     }
 }
 exports.UrlParser = UrlParser;

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,MAAa,SAAS;IACpB,IAAI;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,WAAW;QACT,OAAO,oCAAoC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,KAAqB;QACzB,eAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEvB,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACF;AAdD,8BAcC"}
+{"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,KAAqB;QACzB,eAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEvB,IAAI;YACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;YAE3B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,sBAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACpC;IACH,CAAC;IAEO,cAAc,CAAC,GAAQ;QAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO;SACR;QACD,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,EAAE;YAClC,MAAM,IAAI,2BAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SAC7D;IACH,CAAC;CACF;AAhCD,8BAgCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/core",
-  "version": "2.4.4-next.0",
+  "version": "2.6.0-next.1",
   "description": "Nestjs based microservice chassis",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -32,7 +32,7 @@
     "@nestjs/microservices": "^9.0.0",
     "@rsdk/autodoc.protocol": "^2.4.2",
     "@rsdk/common": "^2.4.2",
-    "@rsdk/decorators": "^2.4.4-next.0",
+    "@rsdk/decorators": "^2.5.0",
     "@rsdk/logging": "^2.4.2",
     "@rsdk/metadata": "^2.4.2",
     "@rsdk/nest-tools": "^2.4.2",
@@ -40,5 +40,5 @@
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "8ce6ac3f258bd974485a1967f206deb03f5c6e2d"
+  "gitHead": "aa325d2181ddb9438fd4596bc2c793121ad3ef6f"
 }

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

@@ -0,0 +1,21 @@
+import { BootstrapException } from '../../../exceptions';
+
+export class InvalidUrl extends BootstrapException {
+  constructor(str: string, cause: unknown) {
+    super(`Invalid url string: <${str}>`, {
+      cause,
+    });
+  }
+}
+
+export class InvalidProtocol extends BootstrapException {
+  constructor(expectedProtocol: string, protocol: string, url: URL) {
+    super(`Invalid protocol: <${protocol}>, expected: ${expectedProtocol}`, {
+      details: {
+        protocol,
+        url,
+        expectedProtocol,
+      },
+    });
+  }
+}

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

@@ -1 +1,2 @@
 export * from './url.parser';
+export { InvalidUrl } from './exception';

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

@@ -2,7 +2,11 @@ import { Assert } from '@rsdk/common';
 
 import type { PropertyParser, RawConfigValue } from '../../types';
 
+import { InvalidProtocol, InvalidUrl } from './exception';
+
 export class UrlParser implements PropertyParser<URL> {
+  constructor(readonly protocol?: string) {}
+
   type(): string {
     return 'URL';
   }
@@ -14,6 +18,22 @@ export class UrlParser implements PropertyParser<URL> {
   parse(value: RawConfigValue): URL {
     Assert.isString(value);
 
-    return new URL(value);
+    try {
+      const url = new URL(value);
+
+      this.assertProtocol(url);
+      return url;
+    } catch (error) {
+      throw new InvalidUrl(value, error);
+    }
+  }
+
+  private assertProtocol(url: URL): void {
+    if (!this.protocol) {
+      return;
+    }
+    if (url.protocol !== this.protocol) {
+      throw new InvalidProtocol(this.protocol, url.protocol, url);
+    }
   }
 }