@opra/client 0.20.1 → 0.21.0

package/browser.js

@@ -27,7 +27,7 @@ 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";
+import { DocumentFactory, HttpHeaderCodes, HttpParams, isBlob, joinPath } from "@opra/common";
 
 // ../../build/client/esm/constants.js
 var JSON_CONTENT_TYPE_PATTERN = /^application\/([\w-]+\+)?\bjson\b/i;
@@ -40,7 +40,7 @@ import { lastValueFrom, Observable } from "rxjs";
 import { uid } from "@opra/common";
 
 // ../../build/client/esm/http/http-request.js
-import { HttpHeaders, OpraURL } from "@opra/common";
+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);
@@ -146,7 +146,11 @@ var HttpRequestObservable = class extends Observable {
     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) {
@@ -274,14 +278,13 @@ var HttpCollectionNode = class {
 };
 
 // ../../build/client/esm/http/http-response.js
-import { HttpHeaders as HttpHeaders2 } from "@opra/common";
 var HttpResponse = class _HttpResponse {
   static {
     __name(this, "HttpResponse");
   }
   constructor(init) {
     this.hasBody = false;
-    this.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;
@@ -375,7 +378,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)
     };
   }
@@ -392,7 +395,7 @@ var OpraHttpClient = class {
     this[kAssets].metadataPromise = promise = lastValueFrom2(this._sendRequest("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 +466,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";
@@ -491,7 +494,7 @@ var OpraHttpClient = class {
         }
         if (observe === "events")
           subscriber.next({ event: "sent", request });
-        const response = await this._fetch(url, { ...request, headers: request.headers.toObject() });
+        const response = await this._fetch(url, request);
         await this._handleResponse(observe, subscriber, request, response);
       })().catch((error) => subscriber.error(error));
     });
@@ -503,7 +506,7 @@ var OpraHttpClient = class {
     return new HttpResponse(init);
   }
   async _handleResponse(observe, subscriber, request, fetchResponse, ctx) {
-    const headers = new HttpHeaders3(fetchResponse.headers);
+    const headers = fetchResponse.headers;
     if (observe === "events") {
       const response2 = this._createResponse({
         url: fetchResponse.url,
@@ -516,13 +519,13 @@ var OpraHttpClient = class {
     }
     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();

package/cjs/http/http-client.js

@@ -24,8 +24,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)
         };
@@ -43,7 +43,7 @@ class OpraHttpClient {
         this[kAssets].metadataPromise = promise = (0, rxjs_1.lastValueFrom)(this._sendRequest('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) => {
@@ -121,13 +121,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 {
@@ -151,7 +151,7 @@ class OpraHttpClient {
                 }
                 if (observe === 'events')
                     subscriber.next({ event: 'sent', request });
-                const response = await this._fetch(url, { ...request, headers: request.headers.toObject() });
+                const response = await this._fetch(url, request);
                 await this._handleResponse(observe, subscriber, request, response);
             })().catch(error => subscriber.error(error));
         });
@@ -163,7 +163,7 @@ 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);
+        const headers = fetchResponse.headers;
         if (observe === 'events') {
             const response = this._createResponse({
                 url: fetchResponse.url,
@@ -176,14 +176,14 @@ class OpraHttpClient {
         }
         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();

package/cjs/http/http-request-observable.js

@@ -16,7 +16,11 @@ class HttpRequestObservable extends rxjs_1.Observable {
         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) {

package/cjs/http/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

@@ -1,14 +1,14 @@
 "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 = 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;

package/esm/http/http-client.js

@@ -1,6 +1,6 @@
 import { lastValueFrom, Observable } from 'rxjs';
 import { isReadableStreamLike } from 'rxjs/internal/util/isReadableStreamLike';
-import { DocumentFactory, HttpHeaderCodes, HttpHeaders, HttpParams, isBlob, joinPath, } from '@opra/common';
+import { DocumentFactory, HttpHeaderCodes, HttpParams, isBlob, joinPath, } from '@opra/common';
 import { ClientError } from '../client-error.js';
 import { FORMDATA_CONTENT_TYPE_PATTERN, JSON_CONTENT_TYPE_PATTERN, TEXT_CONTENT_TYPE_PATTERN } from '../constants.js';
 import { HttpCollectionNode } from './http-collection-node.js';
@@ -21,8 +21,8 @@ export class OpraHttpClient {
         });
         this.defaults = {
             ...options?.defaults,
-            headers: options?.defaults?.headers instanceof HttpHeaders
-                ? options?.defaults?.headers : new HttpHeaders(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)
         };
@@ -40,7 +40,7 @@ export class OpraHttpClient {
         this[kAssets].metadataPromise = promise = lastValueFrom(this._sendRequest('body', new HttpRequest({
             method: 'GET',
             url: '$metadata',
-            headers: new HttpHeaders({ 'accept': 'application/json' })
+            headers: new Headers({ 'accept': 'application/json' })
         })));
         return await promise
             .then(async (body) => {
@@ -118,13 +118,13 @@ export 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 (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 {
@@ -148,7 +148,7 @@ export class OpraHttpClient {
                 }
                 if (observe === 'events')
                     subscriber.next({ event: 'sent', request });
-                const response = await this._fetch(url, { ...request, headers: request.headers.toObject() });
+                const response = await this._fetch(url, request);
                 await this._handleResponse(observe, subscriber, request, response);
             })().catch(error => subscriber.error(error));
         });
@@ -160,7 +160,7 @@ export class OpraHttpClient {
         return new HttpResponse(init);
     }
     async _handleResponse(observe, subscriber, request, fetchResponse, ctx) {
-        const headers = new HttpHeaders(fetchResponse.headers);
+        const headers = fetchResponse.headers;
         if (observe === 'events') {
             const response = this._createResponse({
                 url: fetchResponse.url,
@@ -173,14 +173,14 @@ export class OpraHttpClient {
         }
         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();

package/esm/http/http-request-observable.js

@@ -13,7 +13,11 @@ export class HttpRequestObservable extends Observable {
         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) {

package/esm/http/http-request.js

@@ -1,5 +1,5 @@
 /// <reference lib="dom" />
-import { HttpHeaders, OpraURL } from '@opra/common';
+import { OpraURL } from '@opra/common';
 const directCopyProperties = ['cache', 'credentials', 'destination', 'headers', 'integrity',
     'keepalive', 'mode', 'redirect', 'referrer', 'referrerPolicy'];
 export class HttpRequest {
@@ -7,7 +7,7 @@ export 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();
@@ -51,9 +51,9 @@ export class HttpRequest {
                 this[k] = update[k];
         });
         if (update.headers) {
-            const h = update.headers instanceof HttpHeaders
+            const h = update.headers instanceof Headers
                 ? update.headers
-                : new HttpHeaders(update.headers);
+                : new Headers(update.headers);
             h.forEach((v, k) => {
                 if (k.toLowerCase() === 'set-cookie') {
                     this.headers.append(k, v);
@@ -69,9 +69,9 @@ export class HttpRequest {
                 this[k] = src[k];
         });
         if (src.headers) {
-            const h = src.headers instanceof HttpHeaders
+            const h = src.headers instanceof Headers
                 ? src.headers
-                : new HttpHeaders(src.headers);
+                : new Headers(src.headers);
             h.forEach((v, k) => {
                 if (k.toLowerCase() === 'set-cookie') {
                     this.headers.append(k, v);

package/esm/http/http-response.js

@@ -1,11 +1,11 @@
-import { HttpHeaders } from '@opra/common';
 export class HttpResponse {
     constructor(init) {
         /**
          * Returns true if response has body to be received
          */
         this.hasBody = false;
-        this.headers = new 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/client",
-  "version": "0.20.1",
+  "version": "0.21.0",
   "description": "Opra Client package",
   "author": "Panates",
   "license": "MIT",
@@ -46,7 +46,7 @@
     "@browsery/i18next": "^0.6.0",
     "@browsery/stream": "^0.5.0",
     "@browsery/util": "^0.4.0",
-    "@opra/common": "^0.20.1",
+    "@opra/common": "^0.21.0",
     "accepts": "^1.3.8",
     "buffer": "^6.0.3",
     "cookie": "^0.5.0",

package/types/http/http-client.d.ts

@@ -1,6 +1,6 @@
 import { Observable, Subscriber } from 'rxjs';
 import { StrictOmit, Type } from 'ts-gems';
-import { ApiDocument, HttpHeaders, HttpParams } from '@opra/common';
+import { ApiDocument, HttpParams } from '@opra/common';
 import { HttpCollectionNode } from './http-collection-node.js';
 import { HttpRequest } from './http-request.js';
 import { HttpResponse } from './http-response.js';
@@ -29,7 +29,7 @@ export declare class OpraHttpClient {
         responseInterceptors: ResponseInterceptor[];
     };
     defaults: StrictOmit<HttpRequestDefaults, 'headers' | 'params'> & {
-        headers: HttpHeaders;
+        headers: Headers;
         params: HttpParams;
     };
     constructor(serviceUrl: string, options?: OpraHttpClientOptions);

package/types/http/http-collection-node.d.ts

@@ -47,7 +47,7 @@ export declare namespace HttpCollectionNode {
         affected: number;
     }
 }
-export declare class HttpCollectionNode<TType, TResponseExt = any> {
+export declare class HttpCollectionNode<TType, TResponseExt = {}> {
     protected [kHttpClientContext]: HttpClientContext;
     constructor(context: HttpClientContext);
     create(data: PartialInput<TType>, options?: StrictOmit<HttpCollectionNode.CreateOptions, 'observe'> & {
@@ -86,6 +86,7 @@ export declare class HttpCollectionNode<TType, TResponseExt = any> {
     get(id: any, options?: StrictOmit<HttpCollectionNode.GetOptions, 'observe'> & {
         observe: 'events';
     }): HttpRequestObservable<HttpEvent, TType, TResponseExt>;
+    findMany(options?: StrictOmit<HttpCollectionNode.FindManyOptions, 'observe'>): HttpRequestObservable<TType[], TType, TResponseExt>;
     findMany(options?: StrictOmit<HttpCollectionNode.FindManyOptions, 'observe'> & {
         observe?: 'body';
     }): HttpRequestObservable<TType[], TType, TResponseExt>;

package/types/http/http-request-observable.d.ts

@@ -11,7 +11,7 @@ export declare namespace HttpRequestObservable {
         http?: HttpRequestDefaults;
     }
 }
-export declare class HttpRequestObservable<T, TBody, TResponseExt = never, TResponse = HttpResponse<TBody> & TResponseExt> extends Observable<T> {
+export declare class HttpRequestObservable<T, TBody, TResponseExt = {}> extends Observable<T> {
     static kContext: symbol;
     static kRequest: symbol;
     readonly contentId: string;
@@ -22,7 +22,7 @@ export declare class HttpRequestObservable<T, TBody, TResponseExt = never, TResp
     param(name: string, value: any): this;
     fetch(): Promise<TBody>;
     fetch(observe: 'body'): Promise<TBody>;
-    fetch(observe: 'response'): Promise<TResponse>;
+    fetch(observe: 'response'): Promise<HttpResponse<TBody> & TResponseExt>;
     with(cb: (_this: this) => void): this;
 }
 export {};

package/types/http/http-request.d.ts

@@ -1,21 +1,23 @@
 /// <reference lib="dom" />
-import { HttpHeaders, HttpParams, OpraURL, OpraURLPath } from '@opra/common';
-export interface HttpRequestInit {
-    cache?: RequestCache;
-    credentials?: RequestCredentials;
-    destination?: RequestDestination;
-    headers?: HttpHeaders.Initiator;
-    integrity?: string;
-    keepalive?: boolean;
-    method?: string;
-    mode?: RequestMode;
-    params?: HttpParams.Initiator;
-    redirect?: RequestRedirect;
-    referrer?: string;
-    referrerPolicy?: ReferrerPolicy;
-    signal?: AbortSignal;
-    url?: string;
-    body?: any;
+import { HttpParams, OpraURL, OpraURLPath } from '@opra/common';
+export declare namespace HttpRequest {
+    interface Initiator {
+        cache?: RequestCache;
+        credentials?: RequestCredentials;
+        destination?: RequestDestination;
+        headers?: HeadersInit;
+        integrity?: string;
+        keepalive?: boolean;
+        method?: string;
+        mode?: RequestMode;
+        params?: HttpParams.Initiator;
+        redirect?: RequestRedirect;
+        referrer?: string;
+        referrerPolicy?: ReferrerPolicy;
+        signal?: AbortSignal;
+        url?: string;
+        body?: any;
+    }
 }
 export declare class HttpRequest {
     /** Returns the cache mode associated with request, which is a string indicating
@@ -30,7 +32,7 @@ export declare class HttpRequest {
     /** Returns a Headers object consisting of the headers associated with request.
      * Note that headers added in the network layer by the user agent will not be accounted for in this object,
      * e.g., the "Host" header. */
-    headers: HttpHeaders;
+    headers: Headers;
     /** Returns request's subresource integrity metadata, which is a cryptographic
      * hash of the resource being fetched.
      * Its value consists of multiple hashes separated by whitespace. [SRI] */
@@ -60,7 +62,7 @@ export declare class HttpRequest {
     /** Body of the http request */
     body?: any;
     duplex?: 'half';
-    constructor(init?: HttpRequestInit);
+    constructor(init?: HttpRequest.Initiator);
     /** Returns the URL of request as a string. */
     get url(): string;
     set url(value: string);
@@ -68,7 +70,7 @@ export declare class HttpRequest {
     get params(): HttpParams;
     /** Returns the path part of URL as OpraURLPath */
     get path(): OpraURLPath;
-    clone(...update: (HttpRequest | HttpRequestInit)[]): HttpRequest;
-    merge(update: HttpRequest | HttpRequestInit): void;
-    inset(src: HttpRequest | HttpRequestInit): void;
+    clone(...update: (HttpRequest | HttpRequest.Initiator)[]): HttpRequest;
+    merge(update: HttpRequest | HttpRequest.Initiator): void;
+    inset(src: HttpRequest | HttpRequest.Initiator): void;
 }

package/types/http/http-response.d.ts

@@ -1,7 +1,6 @@
-import { HttpHeaders } from '@opra/common';
 export declare namespace HttpResponse {
     interface Initiator {
-        headers?: HttpHeaders.Initiator;
+        headers?: HeadersInit;
         status?: number;
         statusText?: string;
         url?: string;
@@ -14,7 +13,7 @@ export declare class HttpResponse<TBody = any> {
     /**
      *  Contains the Headers object associated with the response.
      */
-    readonly headers: HttpHeaders;
+    readonly headers: Headers;
     /**
      *  Contains a Boolean stating whether the response was successful (status in the range 200-299) or not.
      */

package/types/http/http-singleton-node.d.ts

@@ -23,7 +23,7 @@ export declare namespace HttpSingletonNode {
         include?: string[];
     }
 }
-export declare class HttpSingletonNode<TType, TResponseExt = any> {
+export declare class HttpSingletonNode<TType, TResponseExt = {}> {
     protected [kHttpClientContext]: HttpClientContext;
     constructor(context: HttpClientContext);
     create(data: PartialInput<TType>, options?: StrictOmit<HttpSingletonNode.CreateOptions, 'observe'> & {

package/types/http/http-types.d.ts

@@ -1,5 +1,5 @@
 import type { Observable } from 'rxjs';
-import type { HttpHeaders, HttpParams } from '@opra/common';
+import type { HttpParams } from '@opra/common';
 import type { OpraHttpClient } from './http-client.js';
 import type { HttpRequest } from './http-request.js';
 import type { HttpResponse } from './http-response.js';
@@ -16,7 +16,7 @@ export interface HttpClientContext {
     responseInterceptors?: ResponseInterceptor[];
 }
 export type HttpRequestDefaults = Partial<Pick<HttpRequest, 'cache' | 'credentials' | 'destination' | 'integrity' | 'keepalive' | 'mode' | 'redirect' | 'referrer' | 'referrerPolicy'>> & {
-    headers?: HttpHeaders.Initiator;
+    headers?: HeadersInit;
     params?: HttpParams.Initiator;
 };
 export interface HttpEvent {