@opra/client 0.20.3 → 0.22.0

package/browser.js

@@ -6,6 +6,11 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
+// ../../build/client/esm/client.js
+import { lastValueFrom as lastValueFrom2, Observable as Observable2 } from "rxjs";
+import { isReadableStreamLike } from "rxjs/internal/util/isReadableStreamLike";
+import { DocumentFactory, HttpHeaderCodes, HttpParams, isBlob, joinPath } from "@opra/common";
+
 // ../../build/client/esm/client-error.js
 var ClientError = class extends Error {
   static {
@@ -24,23 +29,18 @@ var ClientError = class extends Error {
   }
 };
 
-// ../../build/client/esm/http/http-client.js
-import { lastValueFrom as lastValueFrom2, Observable as Observable2 } from "rxjs";
-import { isReadableStreamLike } from "rxjs/internal/util/isReadableStreamLike";
-import { DocumentFactory, HttpHeaderCodes, HttpHeaders as HttpHeaders3, HttpParams, isBlob, joinPath } from "@opra/common";
-
 // ../../build/client/esm/constants.js
 var JSON_CONTENT_TYPE_PATTERN = /^application\/([\w-]+\+)?\bjson\b/i;
 var TEXT_CONTENT_TYPE_PATTERN = /^text\/.*$/i;
 var FORMDATA_CONTENT_TYPE_PATTERN = /^multipart\/\bform-data\b/i;
 var kHttpClientContext = Symbol("kContext");
 
-// ../../build/client/esm/http/http-request-observable.js
+// ../../build/client/esm/http-request-observable.js
 import { lastValueFrom, Observable } from "rxjs";
 import { uid } from "@opra/common";
 
-// ../../build/client/esm/http/http-request.js
-import { HttpHeaders, OpraURL } from "@opra/common";
+// ../../build/client/esm/http-request.js
+import { OpraURL } from "@opra/common";
 var directCopyProperties = [
   "cache",
   "credentials",
@@ -61,7 +61,7 @@ var HttpRequest = class _HttpRequest {
     this.cache = init?.cache || "default";
     this.credentials = init?.credentials || "same-origin";
     this.destination = init?.destination || "";
-    this.headers = new HttpHeaders(init?.headers);
+    this.headers = init?.headers instanceof Headers ? init.headers : new Headers(init?.headers);
     this.integrity = init?.integrity || "";
     this.keepalive = init?.keepalive ?? false;
     this.method = (init?.method || "GET").toUpperCase();
@@ -105,7 +105,7 @@ var HttpRequest = class _HttpRequest {
         this[k] = update[k];
     });
     if (update.headers) {
-      const h = update.headers instanceof HttpHeaders ? update.headers : new HttpHeaders(update.headers);
+      const h = update.headers instanceof Headers ? update.headers : new Headers(update.headers);
       h.forEach((v, k) => {
         if (k.toLowerCase() === "set-cookie") {
           this.headers.append(k, v);
@@ -120,7 +120,7 @@ var HttpRequest = class _HttpRequest {
         this[k] = src[k];
     });
     if (src.headers) {
-      const h = src.headers instanceof HttpHeaders ? src.headers : new HttpHeaders(src.headers);
+      const h = src.headers instanceof Headers ? src.headers : new Headers(src.headers);
       h.forEach((v, k) => {
         if (k.toLowerCase() === "set-cookie") {
           this.headers.append(k, v);
@@ -131,7 +131,24 @@ var HttpRequest = class _HttpRequest {
   }
 };
 
-// ../../build/client/esm/http/http-request-observable.js
+// ../../build/client/esm/types.js
+var HttpObserveType;
+(function(HttpObserveType2) {
+  HttpObserveType2["Response"] = "response";
+  HttpObserveType2["Body"] = "body";
+  HttpObserveType2["Events"] = "events";
+})(HttpObserveType || (HttpObserveType = {}));
+var HttpEventType;
+(function(HttpEventType2) {
+  HttpEventType2["Sent"] = "sent";
+  HttpEventType2["UploadProgress"] = "upload-progress";
+  HttpEventType2["ResponseHeader"] = "response-header";
+  HttpEventType2["DownloadProgress"] = "download-progress";
+  HttpEventType2["Response"] = "response";
+  HttpEventType2["Custom"] = "custom";
+})(HttpEventType || (HttpEventType = {}));
+
+// ../../build/client/esm/http-request-observable.js
 var kRequest = Symbol("kRequest");
 var HttpRequestObservable = class extends Observable {
   static {
@@ -139,14 +156,18 @@ var HttpRequestObservable = class extends Observable {
   }
   constructor(context, options) {
     super((subscriber) => {
-      context.send(options?.observe || "body", this[kRequest]).subscribe(subscriber);
+      context.send(options?.observe || HttpObserveType.Body, this[kRequest]).subscribe(subscriber);
     });
     this[kHttpClientContext] = context;
     this[kRequest] = new HttpRequest(options?.http);
     this.contentId = uid(6);
   }
   header(name, value) {
-    this[kRequest].headers.append(name, value);
+    const headers = this[kRequest].headers;
+    if (Array.isArray(value))
+      value.forEach((v) => headers.append(name, String(v)));
+    else
+      headers.append(name, value);
     return this;
   }
   param(name, value) {
@@ -154,7 +175,7 @@ var HttpRequestObservable = class extends Observable {
     return this;
   }
   async fetch(observe) {
-    return lastValueFrom(this[kHttpClientContext].send(observe || "body", this[kRequest]));
+    return lastValueFrom(this[kHttpClientContext].send(observe || HttpObserveType.Body, this[kRequest]));
   }
   with(cb) {
     cb(this);
@@ -164,7 +185,7 @@ var HttpRequestObservable = class extends Observable {
 HttpRequestObservable.kContext = kHttpClientContext;
 HttpRequestObservable.kRequest = kRequest;
 
-// ../../build/client/esm/http/http-collection-node.js
+// ../../build/client/esm/collection-node.js
 var HttpCollectionNode = class {
   static {
     __name(this, "HttpCollectionNode");
@@ -273,29 +294,28 @@ var HttpCollectionNode = class {
   }
 };
 
-// ../../build/client/esm/http/http-response.js
-import { HttpHeaders as HttpHeaders2 } from "@opra/common";
+// ../../build/client/esm/http-response.js
 var HttpResponse = class _HttpResponse {
   static {
     __name(this, "HttpResponse");
   }
   constructor(init) {
     this.hasBody = false;
-    this.headers = init?.headers instanceof HttpHeaders2 ? init?.headers : new HttpHeaders2(init?.headers);
+    this.headers = init?.headers instanceof Headers ? init?.headers : new Headers(init?.headers);
     this.status = init?.status || 200;
     this.statusText = init?.statusText || "OK";
     this.url = init?.url || null;
     this.ok = this.status >= 200 && this.status < 300;
     this.body = init?.body;
     this.hasBody = init?.body != null || !!init?.hasBody;
-    this.totalMatches = init?.totalMatches;
+    this.totalCount = init?.totalCount;
   }
   clone(update) {
     return new _HttpResponse({ ...this, ...update });
   }
 };
 
-// ../../build/client/esm/http/http-singleton-node.js
+// ../../build/client/esm/singleton-node.js
 var HttpSingletonNode = class {
   static {
     __name(this, "HttpSingletonNode");
@@ -357,7 +377,7 @@ var HttpSingletonNode = class {
   }
 };
 
-// ../../build/client/esm/http/http-client.js
+// ../../build/client/esm/client.js
 var kAssets = Symbol("kAssets");
 var OpraHttpClient = class {
   static {
@@ -375,7 +395,7 @@ var OpraHttpClient = class {
     });
     this.defaults = {
       ...options?.defaults,
-      headers: options?.defaults?.headers instanceof HttpHeaders3 ? options?.defaults?.headers : new HttpHeaders3(options?.defaults?.headers),
+      headers: options?.defaults?.headers instanceof Headers ? options?.defaults?.headers : new Headers(options?.defaults?.headers),
       params: options?.defaults?.params instanceof HttpParams ? options?.defaults?.params : new HttpParams(options?.defaults?.params)
     };
   }
@@ -389,10 +409,10 @@ var OpraHttpClient = class {
     if (promise) {
       return promise;
     }
-    this[kAssets].metadataPromise = promise = lastValueFrom2(this._sendRequest("body", new HttpRequest({
+    this[kAssets].metadataPromise = promise = lastValueFrom2(this._sendRequest(HttpObserveType.Body, new HttpRequest({
       method: "GET",
       url: "$metadata",
-      headers: new HttpHeaders3({ "accept": "application/json" })
+      headers: new Headers({ "accept": "application/json" })
     })));
     return await promise.then(async (body) => {
       const api = await DocumentFactory.createDocument(body);
@@ -463,12 +483,12 @@ var OpraHttpClient = class {
           } else if (Buffer.isBuffer(request.body)) {
             contentType = "application/octet-stream";
             body = request.body;
-            request.headers.set("Content-Size", request.body.length);
+            request.headers.set("Content-Size", String(request.body.length));
             delete request.duplex;
           } else if (isBlob(request.body)) {
             contentType = request.body.type || "application/octet-stream";
             body = request.body;
-            request.headers.set("Content-Size", request.body.length);
+            request.headers.set("Content-Size", String(request.body.length));
             delete request.duplex;
           } else {
             contentType = "application/json";
@@ -489,9 +509,13 @@ var OpraHttpClient = class {
             await interceptor(ctx, request);
           }
         }
-        if (observe === "events")
-          subscriber.next({ event: "sent", request });
-        const response = await this._fetch(url, { ...request, headers: request.headers.toObject() });
+        if (observe === HttpObserveType.Events)
+          subscriber.next({
+            observe,
+            request,
+            event: HttpEventType.Sent
+          });
+        const response = await this._fetch(url, request);
         await this._handleResponse(observe, subscriber, request, response);
       })().catch((error) => subscriber.error(error));
     });
@@ -503,8 +527,8 @@ var OpraHttpClient = class {
     return new HttpResponse(init);
   }
   async _handleResponse(observe, subscriber, request, fetchResponse, ctx) {
-    const headers = new HttpHeaders3(fetchResponse.headers);
-    if (observe === "events") {
+    const headers = fetchResponse.headers;
+    if (observe === HttpObserveType.Events) {
       const response2 = this._createResponse({
         url: fetchResponse.url,
         headers,
@@ -512,17 +536,22 @@ var OpraHttpClient = class {
         statusText: fetchResponse.statusText,
         hasBody: !!fetchResponse.body
       });
-      subscriber.next({ event: "headers-received", request, response: response2 });
+      subscriber.next({
+        observe,
+        request,
+        event: HttpEventType.ResponseHeader,
+        response: response2
+      });
     }
     let body;
     if (fetchResponse.body) {
-      if (JSON_CONTENT_TYPE_PATTERN.test(fetchResponse.headers.get("Content-Type") || "")) {
+      if (JSON_CONTENT_TYPE_PATTERN.test(headers.get("Content-Type") || "")) {
         body = await fetchResponse.json();
         if (typeof body === "string")
           body = JSON.parse(body);
-      } else if (TEXT_CONTENT_TYPE_PATTERN.test(fetchResponse.headers.get("Content-Type") || ""))
+      } else if (TEXT_CONTENT_TYPE_PATTERN.test(headers.get("Content-Type") || ""))
         body = await fetchResponse.text();
-      else if (FORMDATA_CONTENT_TYPE_PATTERN.test(fetchResponse.headers.get("Content-Type") || ""))
+      else if (FORMDATA_CONTENT_TYPE_PATTERN.test(headers.get("Content-Type") || ""))
         body = await fetchResponse.formData();
       else {
         const buf = await fetchResponse.arrayBuffer();
@@ -530,7 +559,7 @@ var OpraHttpClient = class {
           body = buf;
       }
     }
-    if (observe === "body" && fetchResponse.status >= 400 && fetchResponse.status < 600) {
+    if (observe === HttpObserveType.Body && fetchResponse.status >= 400 && fetchResponse.status < 600) {
       subscriber.error(new ClientError({
         message: fetchResponse.status + " " + fetchResponse.statusText,
         status: fetchResponse.status,
@@ -546,8 +575,8 @@ var OpraHttpClient = class {
       statusText: fetchResponse.statusText,
       body
     };
-    if (fetchResponse.headers.has(HttpHeaderCodes.X_Opra_Total_Matches))
-      responseInit.totalMatches = parseInt(fetchResponse.headers.get(HttpHeaderCodes.X_Opra_Total_Matches), 10);
+    if (fetchResponse.headers.has(HttpHeaderCodes.X_Total_Count))
+      responseInit.totalCount = parseInt(fetchResponse.headers.get(HttpHeaderCodes.X_Total_Count), 10);
     const response = this._createResponse(responseInit);
     if (ctx) {
       const responseInterceptors = [
@@ -558,11 +587,16 @@ var OpraHttpClient = class {
         await interceptor(ctx, observe, request);
       }
     }
-    if (observe === "body") {
+    if (observe === HttpObserveType.Body) {
       subscriber.next(body);
     } else {
-      if (observe === "events")
-        subscriber.next({ event: "response", request, response });
+      if (observe === HttpObserveType.Events)
+        subscriber.next({
+          observe,
+          request,
+          event: HttpEventType.Response,
+          response
+        });
       else
         subscriber.next(response);
     }
@@ -571,7 +605,7 @@ var OpraHttpClient = class {
 };
 OpraHttpClient.kAssets = kAssets;
 
-// ../../build/client/esm/http/http-service-base.js
+// ../../build/client/esm/http-service-base.js
 var HttpServiceBase = class {
   static {
     __name(this, "HttpServiceBase");
@@ -583,6 +617,8 @@ var HttpServiceBase = class {
 export {
   ClientError,
   HttpCollectionNode,
+  HttpEventType,
+  HttpObserveType,
   HttpRequest,
   HttpRequestObservable,
   HttpResponse,

package/cjs/{http/http-client.js → client.js}

@@ -4,12 +4,13 @@ exports.OpraHttpClient = void 0;
 const rxjs_1 = require("rxjs");
 const isReadableStreamLike_1 = require("rxjs/internal/util/isReadableStreamLike");
 const common_1 = require("@opra/common");
-const client_error_js_1 = require("../client-error.js");
-const constants_js_1 = require("../constants.js");
-const http_collection_node_js_1 = require("./http-collection-node.js");
+const client_error_js_1 = require("./client-error.js");
+const collection_node_js_1 = require("./collection-node.js");
+const constants_js_1 = require("./constants.js");
 const http_request_js_1 = require("./http-request.js");
 const http_response_js_1 = require("./http-response.js");
-const http_singleton_node_js_1 = require("./http-singleton-node.js");
+const singleton_node_js_1 = require("./singleton-node.js");
+const types_js_1 = require("./types.js");
 const kAssets = Symbol('kAssets');
 class OpraHttpClient {
     constructor(serviceUrl, options) {
@@ -24,8 +25,8 @@ class OpraHttpClient {
         });
         this.defaults = {
             ...options?.defaults,
-            headers: options?.defaults?.headers instanceof common_1.HttpHeaders
-                ? options?.defaults?.headers : new common_1.HttpHeaders(options?.defaults?.headers),
+            headers: options?.defaults?.headers instanceof Headers
+                ? options?.defaults?.headers : new Headers(options?.defaults?.headers),
             params: options?.defaults?.params instanceof common_1.HttpParams
                 ? options?.defaults?.params : new common_1.HttpParams(options?.defaults?.params)
         };
@@ -40,10 +41,10 @@ class OpraHttpClient {
         if (promise) {
             return promise;
         }
-        this[kAssets].metadataPromise = promise = (0, rxjs_1.lastValueFrom)(this._sendRequest('body', new http_request_js_1.HttpRequest({
+        this[kAssets].metadataPromise = promise = (0, rxjs_1.lastValueFrom)(this._sendRequest(types_js_1.HttpObserveType.Body, new http_request_js_1.HttpRequest({
             method: 'GET',
             url: '$metadata',
-            headers: new common_1.HttpHeaders({ 'accept': 'application/json' })
+            headers: new Headers({ 'accept': 'application/json' })
         })));
         return await promise
             .then(async (body) => {
@@ -78,7 +79,7 @@ class OpraHttpClient {
             // ],
             responseInterceptors: []
         };
-        return new http_collection_node_js_1.HttpCollectionNode(ctx);
+        return new collection_node_js_1.HttpCollectionNode(ctx);
     }
     singleton(resourceName) {
         // If name argument is a class, we extract name from the class
@@ -97,7 +98,7 @@ class OpraHttpClient {
             // ],
             responseInterceptors: []
         };
-        return new http_singleton_node_js_1.HttpSingletonNode(ctx);
+        return new singleton_node_js_1.HttpSingletonNode(ctx);
     }
     _sendRequest(observe, request, ctx) {
         return new rxjs_1.Observable(subscriber => {
@@ -121,13 +122,13 @@ class OpraHttpClient {
                     else if (Buffer.isBuffer(request.body)) {
                         contentType = 'application/octet-stream';
                         body = request.body;
-                        request.headers.set('Content-Size', request.body.length);
+                        request.headers.set('Content-Size', String(request.body.length));
                         delete request.duplex;
                     }
                     else if ((0, common_1.isBlob)(request.body)) {
                         contentType = request.body.type || 'application/octet-stream';
                         body = request.body;
-                        request.headers.set('Content-Size', request.body.length);
+                        request.headers.set('Content-Size', String(request.body.length));
                         delete request.duplex;
                     }
                     else {
@@ -149,9 +150,13 @@ class OpraHttpClient {
                         await interceptor(ctx, request);
                     }
                 }
-                if (observe === 'events')
-                    subscriber.next({ event: 'sent', request });
-                const response = await this._fetch(url, { ...request, headers: request.headers.toObject() });
+                if (observe === types_js_1.HttpObserveType.Events)
+                    subscriber.next({
+                        observe,
+                        request,
+                        event: types_js_1.HttpEventType.Sent,
+                    });
+                const response = await this._fetch(url, request);
                 await this._handleResponse(observe, subscriber, request, response);
             })().catch(error => subscriber.error(error));
         });
@@ -163,8 +168,8 @@ class OpraHttpClient {
         return new http_response_js_1.HttpResponse(init);
     }
     async _handleResponse(observe, subscriber, request, fetchResponse, ctx) {
-        const headers = new common_1.HttpHeaders(fetchResponse.headers);
-        if (observe === 'events') {
+        const headers = fetchResponse.headers;
+        if (observe === types_js_1.HttpObserveType.Events) {
             const response = this._createResponse({
                 url: fetchResponse.url,
                 headers,
@@ -172,18 +177,23 @@ class OpraHttpClient {
                 statusText: fetchResponse.statusText,
                 hasBody: !!fetchResponse.body
             });
-            subscriber.next({ event: 'headers-received', request, response });
+            subscriber.next({
+                observe,
+                request,
+                event: types_js_1.HttpEventType.ResponseHeader,
+                response
+            });
         }
         let body;
         if (fetchResponse.body) {
-            if (constants_js_1.JSON_CONTENT_TYPE_PATTERN.test(fetchResponse.headers.get('Content-Type') || '')) {
+            if (constants_js_1.JSON_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || '')) {
                 body = await fetchResponse.json();
                 if (typeof body === 'string')
                     body = JSON.parse(body);
             }
-            else if (constants_js_1.TEXT_CONTENT_TYPE_PATTERN.test(fetchResponse.headers.get('Content-Type') || ''))
+            else if (constants_js_1.TEXT_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || ''))
                 body = await fetchResponse.text();
-            else if (constants_js_1.FORMDATA_CONTENT_TYPE_PATTERN.test(fetchResponse.headers.get('Content-Type') || ''))
+            else if (constants_js_1.FORMDATA_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || ''))
                 body = await fetchResponse.formData();
             else {
                 const buf = await fetchResponse.arrayBuffer();
@@ -191,7 +201,7 @@ class OpraHttpClient {
                     body = buf;
             }
         }
-        if (observe === 'body' && fetchResponse.status >= 400 && fetchResponse.status < 600) {
+        if (observe === types_js_1.HttpObserveType.Body && fetchResponse.status >= 400 && fetchResponse.status < 600) {
             subscriber.error(new client_error_js_1.ClientError({
                 message: fetchResponse.status + ' ' + fetchResponse.statusText,
                 status: fetchResponse.status,
@@ -207,8 +217,8 @@ class OpraHttpClient {
             statusText: fetchResponse.statusText,
             body
         };
-        if (fetchResponse.headers.has(common_1.HttpHeaderCodes.X_Opra_Total_Matches))
-            responseInit.totalMatches = parseInt(fetchResponse.headers.get(common_1.HttpHeaderCodes.X_Opra_Total_Matches), 10);
+        if (fetchResponse.headers.has(common_1.HttpHeaderCodes.X_Total_Count))
+            responseInit.totalCount = parseInt(fetchResponse.headers.get(common_1.HttpHeaderCodes.X_Total_Count), 10);
         const response = this._createResponse(responseInit);
         if (ctx) {
             const responseInterceptors = [
@@ -219,12 +229,17 @@ class OpraHttpClient {
                 await interceptor(ctx, observe, request);
             }
         }
-        if (observe === 'body') {
+        if (observe === types_js_1.HttpObserveType.Body) {
             subscriber.next(body);
         }
         else {
-            if (observe === 'events')
-                subscriber.next({ event: 'response', request, response });
+            if (observe === types_js_1.HttpObserveType.Events)
+                subscriber.next({
+                    observe,
+                    request,
+                    event: types_js_1.HttpEventType.Response,
+                    response
+                });
             else
                 subscriber.next(response);
         }

package/cjs/{http/http-collection-node.js → collection-node.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpCollectionNode = void 0;
-const constants_js_1 = require("../constants.js");
+const constants_js_1 = require("./constants.js");
 const http_request_observable_js_1 = require("./http-request-observable.js");
 class HttpCollectionNode {
     constructor(context) {

package/cjs/{http/http-request-observable.js → http-request-observable.js}

@@ -3,20 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpRequestObservable = void 0;
 const rxjs_1 = require("rxjs");
 const common_1 = require("@opra/common");
-const constants_js_1 = require("../constants.js");
+const constants_js_1 = require("./constants.js");
 const http_request_js_1 = require("./http-request.js");
+const types_js_1 = require("./types.js");
 const kRequest = Symbol('kRequest');
 class HttpRequestObservable extends rxjs_1.Observable {
     constructor(context, options) {
         super((subscriber) => {
-            context.send(options?.observe || 'body', this[kRequest]).subscribe((subscriber));
+            context.send(options?.observe || types_js_1.HttpObserveType.Body, this[kRequest]).subscribe((subscriber));
         });
         this[constants_js_1.kHttpClientContext] = context;
         this[kRequest] = new http_request_js_1.HttpRequest(options?.http);
         this.contentId = (0, common_1.uid)(6);
     }
     header(name, value) {
-        this[kRequest].headers.append(name, value);
+        const headers = this[kRequest].headers;
+        if (Array.isArray(value))
+            value.forEach(v => headers.append(name, String(v)));
+        else
+            headers.append(name, value);
         return this;
     }
     param(name, value) {
@@ -24,7 +29,7 @@ class HttpRequestObservable extends rxjs_1.Observable {
         return this;
     }
     async fetch(observe) {
-        return (0, rxjs_1.lastValueFrom)(this[constants_js_1.kHttpClientContext].send(observe || 'body', this[kRequest]));
+        return (0, rxjs_1.lastValueFrom)(this[constants_js_1.kHttpClientContext].send(observe || types_js_1.HttpObserveType.Body, this[kRequest]));
     }
     with(cb) {
         cb(this);

package/cjs/{http/http-request.js → http-request.js}

@@ -10,7 +10,7 @@ class HttpRequest {
         this.cache = init?.cache || 'default';
         this.credentials = init?.credentials || 'same-origin';
         this.destination = init?.destination || '';
-        this.headers = new common_1.HttpHeaders(init?.headers);
+        this.headers = init?.headers instanceof Headers ? init.headers : new Headers(init?.headers);
         this.integrity = init?.integrity || '';
         this.keepalive = init?.keepalive ?? false;
         this.method = (init?.method || 'GET').toUpperCase();
@@ -54,9 +54,9 @@ class HttpRequest {
                 this[k] = update[k];
         });
         if (update.headers) {
-            const h = update.headers instanceof common_1.HttpHeaders
+            const h = update.headers instanceof Headers
                 ? update.headers
-                : new common_1.HttpHeaders(update.headers);
+                : new Headers(update.headers);
             h.forEach((v, k) => {
                 if (k.toLowerCase() === 'set-cookie') {
                     this.headers.append(k, v);
@@ -72,9 +72,9 @@ class HttpRequest {
                 this[k] = src[k];
         });
         if (src.headers) {
-            const h = src.headers instanceof common_1.HttpHeaders
+            const h = src.headers instanceof Headers
                 ? src.headers
-                : new common_1.HttpHeaders(src.headers);
+                : new Headers(src.headers);
             h.forEach((v, k) => {
                 if (k.toLowerCase() === 'set-cookie') {
                     this.headers.append(k, v);

package/cjs/{http/http-response.js → http-response.js}

@@ -1,22 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpResponse = void 0;
-const common_1 = require("@opra/common");
 class HttpResponse {
     constructor(init) {
         /**
          * Returns true if response has body to be received
          */
         this.hasBody = false;
-        this.headers = init?.headers instanceof common_1.HttpHeaders ? init?.headers
-            : new common_1.HttpHeaders(init?.headers);
+        this.headers = init?.headers instanceof Headers ? init?.headers
+            : new Headers(init?.headers);
         this.status = init?.status || 200;
         this.statusText = init?.statusText || 'OK';
         this.url = init?.url || null;
         this.ok = this.status >= 200 && this.status < 300;
         this.body = init?.body;
         this.hasBody = init?.body != null || !!init?.hasBody;
-        this.totalMatches = init?.totalMatches;
+        this.totalCount = init?.totalCount;
     }
     clone(update) {
         return new HttpResponse({ ...this, ...update });

package/cjs/index.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./client.js"), exports);
 tslib_1.__exportStar(require("./client-error.js"), exports);
-tslib_1.__exportStar(require("./http/http-client.js"), exports);
-tslib_1.__exportStar(require("./http/http-collection-node.js"), exports);
-tslib_1.__exportStar(require("./http/http-request.js"), exports);
-tslib_1.__exportStar(require("./http/http-request-observable.js"), exports);
-tslib_1.__exportStar(require("./http/http-response.js"), exports);
-tslib_1.__exportStar(require("./http/http-service-base.js"), exports);
-tslib_1.__exportStar(require("./http/http-singleton-node.js"), exports);
-tslib_1.__exportStar(require("./http/http-types.js"), exports);
+tslib_1.__exportStar(require("./collection-node.js"), exports);
+tslib_1.__exportStar(require("./http-request.js"), exports);
+tslib_1.__exportStar(require("./http-request-observable.js"), exports);
+tslib_1.__exportStar(require("./http-response.js"), exports);
+tslib_1.__exportStar(require("./http-service-base.js"), exports);
+tslib_1.__exportStar(require("./singleton-node.js"), exports);
+tslib_1.__exportStar(require("./types.js"), exports);

package/cjs/{http/http-singleton-node.js → singleton-node.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpSingletonNode = void 0;
-const constants_js_1 = require("../constants.js");
+const constants_js_1 = require("./constants.js");
 const http_request_observable_js_1 = require("./http-request-observable.js");
 class HttpSingletonNode {
     constructor(context) {