camstreamerlib 3.2.0 → 3.2.1

package/internal/Digest.d.ts

@@ -1,3 +1,4 @@
 export declare class Digest {
-    static getAuthHeader(user: string, pass: string, method: string, uri: string, wwwAuthenticateHeader: string): string;
+    private nonceCount;
+    getAuthHeader(user: string, pass: string, method: string, uri: string, wwwAuthenticateHeader: string): string;
 }

package/internal/Digest.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Digest = void 0;
 const crypto = require("crypto");
 class Digest {
-    static getAuthHeader(user, pass, method, uri, wwwAuthenticateHeader) {
+    constructor() {
+        this.nonceCount = 1;
+    }
+    getAuthHeader(user, pass, method, uri, wwwAuthenticateHeader) {
         const digestItems = {};
         const digestArr = wwwAuthenticateHeader.substring(wwwAuthenticateHeader.indexOf('Digest') + 6).split(',');
         for (let i = 0; i < digestArr.length; i++) {
@@ -14,11 +17,12 @@ class Digest {
         }
         const HA1 = crypto.createHash('md5').update(`${user}:${digestItems['realm']}:${pass}`).digest('hex');
         const HA2 = crypto.createHash('md5').update(`${method}:${uri}`).digest('hex');
+        const ncValue = ('00000000' + this.nonceCount.toString(16)).slice(-8);
         let response;
         if (digestItems['qop'] !== undefined) {
             response = crypto
                 .createHash('md5')
-                .update(`${HA1}:${digestItems['nonce']}:00000001:162d50aa594e9648:auth:${HA2}`)
+                .update(`${HA1}:${digestItems['nonce']}:${ncValue}:162d50aa594e9648:auth:${HA2}`)
                 .digest('hex');
         }
         else {
@@ -31,8 +35,9 @@ class Digest {
             `uri="${uri}",` +
             `response="${response}"`;
         if (digestItems['qop'] !== undefined) {
-            header += ',qop=auth,nc=00000001,cnonce="162d50aa594e9648"';
+            header += `,qop=auth,nc=${ncValue},cnonce="162d50aa594e9648"`;
         }
+        this.nonceCount++;
         return header;
     }
 }

package/internal/HttpRequestSender.d.ts

@@ -24,5 +24,5 @@ export declare class HttpRequestSender {
     private static getURL;
     private getAuthorization;
     private invalidateAuthorization;
-    private getAuthHeader;
+    private static getAuthHeader;
 }

package/internal/HttpRequestSender.js

@@ -37,10 +37,10 @@ class HttpRequestSender {
             if (options.timeout !== undefined) {
                 setTimeout(() => controller.abort(new Error('Request timeout')), options.timeout);
             }
-            const authData = this.getAuthorization(options, wwwAuthenticateHeader);
-            if (authData) {
+            const authorization = this.getAuthorization(options, wwwAuthenticateHeader);
+            if (authorization !== undefined) {
                 (_a = options.headers) !== null && _a !== void 0 ? _a : (options.headers = {});
-                options.headers['Authorization'] = authData.authHeader;
+                options.headers['Authorization'] = authorization;
             }
             let res;
             if (this.agent) {
@@ -51,8 +51,10 @@ class HttpRequestSender {
                 const req = new Request(url, { body: postData, method: options.method, headers: options.headers });
                 res = yield fetch(req, { signal: controller.signal });
             }
-            if (res.status === 401) {
+            if (!res.ok) {
                 this.invalidateAuthorization();
+            }
+            if (res.status === 401) {
                 const authenticateHeader = res.headers.get('www-authenticate');
                 if (authenticateHeader !== null &&
                     authenticateHeader.indexOf('Digest') !== -1 &&
@@ -81,7 +83,8 @@ class HttpRequestSender {
             (this.authData.host !== options.host ||
                 this.authData.port !== options.port ||
                 this.authData.user !== options.user ||
-                this.authData.pass !== options.pass)) {
+                this.authData.pass !== options.pass ||
+                (wwwAuthenticateHeader !== undefined && this.authData.wwwAuthenticateHeader !== wwwAuthenticateHeader))) {
             this.authData = undefined;
         }
         if (this.authData === undefined) {
@@ -90,21 +93,22 @@ class HttpRequestSender {
                 port: options.port,
                 user: options.user,
                 pass: options.pass,
-                authHeader: this.getAuthHeader(options, wwwAuthenticateHeader),
+                wwwAuthenticateHeader,
+                digest: new Digest_1.Digest(),
             };
         }
-        return this.authData;
+        return HttpRequestSender.getAuthHeader(options, this.authData);
     }
     invalidateAuthorization() {
         this.authData = undefined;
     }
-    getAuthHeader(options, wwwAuthenticateHeader = '') {
+    static getAuthHeader(options, authData) {
         var _a;
         if (options.user === undefined || options.pass === undefined) {
             throw new Error('No credentials found');
         }
-        if (wwwAuthenticateHeader.indexOf('Digest') !== -1) {
-            return Digest_1.Digest.getAuthHeader(options.user, options.pass, (_a = options.method) !== null && _a !== void 0 ? _a : 'GET', options.path, wwwAuthenticateHeader);
+        if (authData.wwwAuthenticateHeader !== undefined && authData.wwwAuthenticateHeader.indexOf('Digest') !== -1) {
+            return authData.digest.getAuthHeader(options.user, options.pass, (_a = options.method) !== null && _a !== void 0 ? _a : 'GET', options.path, authData.wwwAuthenticateHeader);
         }
         else {
             return `Basic ${btoa(options.user + ':' + options.pass)}`;

package/internal/WsClient.js

@@ -65,7 +65,7 @@ class WsClient extends EventEmitter {
             this.isAlive = true;
         });
         if (wwwAuthenticateHeader !== undefined) {
-            this.wsOptions.headers['Authorization'] = Digest_1.Digest.getAuthHeader(this.user, this.pass, 'GET', this.digestAddress, wwwAuthenticateHeader);
+            this.wsOptions.headers['Authorization'] = new Digest_1.Digest().getAuthHeader(this.user, this.pass, 'GET', this.digestAddress, wwwAuthenticateHeader);
         }
         this.ws.on('unexpected-response', (req, res) => __awaiter(this, void 0, void 0, function* () {
             var _b;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camstreamerlib",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Helper library for CamStreamer ACAP applications.",
   "prettier": "@camstreamer/prettier-config",
   "dependencies": {