@opentap/runner-client 1.2.0-beta.1 → 1.2.0-beta.3

package/lib/BaseClient.d.ts

@@ -4,7 +4,18 @@ export declare class BaseClient {
     private connection;
     private baseSubject;
     private connectionOptions;
+    private domainAccess;
+    private _accessToken;
+    private _headers;
     private _timeout;
+    /** Get request access token */
+    get accessToken(): string;
+    /** Set request access token */
+    set accessToken(value: string);
+    /** Get request headers */
+    get headers(): Headers;
+    /** Set request headers */
+    set headers(value: Headers);
     /** Get timeout */
     get timeout(): number;
     /** Set timeout */
@@ -18,6 +29,11 @@ export declare class BaseClient {
      * @returns Promise of an object
      */
     protected request<T>(subject: string, payload?: any, options?: RequestOptions): Promise<T>;
+    /**
+     * Build the headers' object.
+     * @returns {MsgHdrs} Header object
+     */
+    private buildHeaders;
     /**
      * Subscribes to given subject.
      * @param subject The subject to subscribe
@@ -42,9 +58,10 @@ export declare class BaseClient {
     close(): Promise<void>;
     /**
      * Add a domain specific access token to the dictionary.
-     * @param domain
-     * @param accessToken
+     * @param {string} domain
+     * @param {string} accessToken
      */
+    addDomainAccessToken(domain: string, accessToken: string): void;
     /**
      * Generic error callback function.
      * @returns

package/lib/BaseClient.js

@@ -46,15 +46,40 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { ErrorResponse, } from './DTOs';
-import { Empty, ErrorCode, JSONCodec, StringCodec, connect, } from 'nats.ws/cjs/nats.js';
+import { Empty, ErrorCode, JSONCodec, StringCodec, connect, headers, } from 'nats.ws/cjs/nats.js';
 var DEFAULT_TIMEOUT = 6000;
 var BaseClient = /** @class */ (function () {
     function BaseClient(baseSubject, options) {
-        //this.domainAccess = new Map<string, string>();
+        this.domainAccess = new Map();
+        this._headers = new Headers();
         this.baseSubject = baseSubject;
         this.connectionOptions = __assign({}, options) || {};
         this.connectionOptions.timeout = (options === null || options === void 0 ? void 0 : options.timeout) || DEFAULT_TIMEOUT;
     }
+    Object.defineProperty(BaseClient.prototype, "accessToken", {
+        /** Get request access token */
+        get: function () {
+            return this._accessToken;
+        },
+        /** Set request access token */
+        set: function (value) {
+            this._accessToken = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(BaseClient.prototype, "headers", {
+        /** Get request headers */
+        get: function () {
+            return this._headers;
+        },
+        /** Set request headers */
+        set: function (value) {
+            this._headers = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(BaseClient.prototype, "timeout", {
         /** Get timeout */
         get: function () {
@@ -76,7 +101,7 @@ var BaseClient = /** @class */ (function () {
      */
     BaseClient.prototype.request = function (subject, payload, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var stringCodec, data, opts;
+            var stringCodec, data, headers, opts;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -88,7 +113,8 @@ var BaseClient = /** @class */ (function () {
                             return [2 /*return*/, Promise.reject("".concat(subject, ": Connection has been closed! Please reconnect!"))];
                         stringCodec = StringCodec();
                         data = payload ? stringCodec.encode(JSON.stringify(payload)) : Empty;
-                        opts = __assign(__assign({}, options), { timeout: this.timeout });
+                        headers = this.buildHeaders();
+                        opts = __assign(__assign({}, options), { timeout: this.timeout, headers: headers });
                         return [4 /*yield*/, this.connection
                                 .request(subject, data, opts)
                                 .then(function (message) {
@@ -116,6 +142,18 @@ var BaseClient = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Build the headers' object.
+     * @returns {MsgHdrs} Header object
+     */
+    BaseClient.prototype.buildHeaders = function () {
+        var _a, _b;
+        var _headers = headers();
+        this._accessToken && _headers.set('Authorization', this._accessToken);
+        (_a = this.domainAccess) === null || _a === void 0 ? void 0 : _a.forEach(function (value, key) { return _headers.append('DomainAuthorization', "".concat(key, "|").concat(value)); });
+        (_b = this._headers) === null || _b === void 0 ? void 0 : _b.forEach(function (value, key) { return _headers.append(key, value); });
+        return _headers;
+    };
     /**
      * Subscribes to given subject.
      * @param subject The subject to subscribe
@@ -199,14 +237,14 @@ var BaseClient = /** @class */ (function () {
     };
     /**
      * Add a domain specific access token to the dictionary.
-     * @param domain
-     * @param accessToken
+     * @param {string} domain
+     * @param {string} accessToken
      */
-    /* protected setDomainAccessToken(domain: string, accessToken: string): void {
-        if (!domain) return;
-
+    BaseClient.prototype.addDomainAccessToken = function (domain, accessToken) {
+        if (!domain || !accessToken)
+            return;
         this.domainAccess.set(domain, accessToken);
-    } */
+    };
     /**
      * Generic error callback function.
      * @returns

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentap/runner-client",
-  "version": "1.2.0-beta.1",
+  "version": "1.2.0-beta.3",
   "description": "This is the TypeScript Client for the OpenTAP Runner Plugin.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",