@dvrd/dvr-controls 1.1.35 → 1.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.1.35",
+  "version": "1.1.36",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [
@@ -39,7 +39,6 @@
     "react": "*",
     "react-color": "^2.19.3",
     "react-dom": "*",
-    "typescript": "5.9.3",
     "uuid": "*"
   },
   "dependencies": {
@@ -60,14 +59,14 @@
     "@fortawesome/free-solid-svg-icons": "*",
     "@fortawesome/react-fontawesome": "*",
     "@types/react": "*",
-    "@types/react-color": "^3.0.13",
     "@types/react-dom": "*",
     "@types/react-router": "*",
+    "@types/react-color": "^3.0.13",
     "react": "*",
     "react-color": "^2.19.3",
     "react-dom": "*",
     "react-router": "*",
-    "typescript": "*",
-    "uuid": "*"
+    "uuid": "*",
+    "typescript": "*"
   }
-}
+}

package/src/js/util/requestUtil.ts

@@ -2,12 +2,11 @@
  * Copyright (c) 2024. Dave van Rijn Development
  */
 
-import {OutgoingHttpHeaders} from "http";
 import {showDialog} from './eventUtil';
-import {warn} from "./miscUtil";
+import {warn} from './miscUtil';
 import {FetchMethod, ResponseData} from './interfaces';
 import {getJwt} from './jwtUtil';
-import {voidFunction} from "./controlUtil";
+import {voidFunction} from './controlUtil';
 
 type ResponseHandler = (response: Response, config: FetchOptions) => void;
 
@@ -18,7 +17,7 @@ export interface FetchOptions {
     method?: FetchMethod;
     data?: {};
     stringifyData?: boolean;
-    headers?: OutgoingHttpHeaders;
+    headers?: Headers;
     callback?: (data: ResponseData, response: Response) => void;
     errorCallback?: (response: Response | string) => void;
     credentials?: string;
@@ -28,7 +27,7 @@ export interface FetchOptions {
 }
 
 let abortController: AbortController;
-let defaultHeaders: OutgoingHttpHeaders = {};
+let defaultHeaders: Headers = new Headers();
 let defaultErrorHandler: ResponseHandler | null = null;
 
 function getAbortController(): AbortController | null {
@@ -42,9 +41,9 @@ function getAbortController(): AbortController | null {
 
 const responseDataIsSuccess = (data: ResponseData): boolean => data.status === 'success';
 
-export const setDefaultHeaders = (headers: OutgoingHttpHeaders) => {
+export const setDefaultHeaders = (headers: Headers) => {
     defaultHeaders = headers;
-}
+};
 
 export function setDefaultErrorHandler(errorHandler: ResponseHandler | null) {
     defaultErrorHandler = errorHandler;
@@ -78,7 +77,7 @@ export function sendFetch(config: FetchOptions): AbortController | null {
         body: config.stringifyData === false ? data : JSON.stringify(data, bigIntParser),
         cache: 'no-store',
         credentials: config.credentials,
-        mode: 'cors',
+        mode: 'cors'
     };
     const abortController = config.abortController ?? getAbortController();
     if (abortController) options.signal = abortController.signal;
@@ -142,10 +141,13 @@ function _prepareConfig(options: FetchOptions): FetchOptions {
 }
 
 function setAuthHeader(options: FetchOptions): FetchOptions {
-    const headers: OutgoingHttpHeaders = Object.assign({}, defaultHeaders, options.headers || {});
+    const headers = new Headers(defaultHeaders);
+    const customHeaders = options.headers ?? new Headers();
+    for (const [key, value] of customHeaders.entries())
+        headers.set(key, value);
     const jwt = getJwt();
     if (jwt)
-        headers.Authorization = `JWT ${jwt}`;
+        headers.set('Authorization', `JWT ${jwt}`);
     options.headers = headers;
     return options;
 }