getta 1.0.11 → 1.0.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "getta",
   "description": "An isomorphic rest client based on the Fetch API.",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "author": "Dylan Aubrey",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/getta",

package/src/main.ts

@@ -219,7 +219,7 @@ export class Getta {
     context.startTime = this._performance.now();
 
     try {
-      const { headers: requestHeaders, redirects, retries, ...rest } = options;
+      const { redirects, retries, ...rest } = options;
 
       return await new Promise<FetchResponse>((resolve, reject) => {
         void (async () => {
@@ -240,11 +240,12 @@ export class Getta {
           if (!redirects && !retries) {
             this._log?.(consts.REQUEST_SENT, {
               context: {
+                fetchMethod: rest.method,
                 fetchRedirets: redirects,
+                fetchRequestHeaders: rest.headers,
                 fetchRetries: retries,
                 fetchUrl: endpoint,
-                requestHeaders,
-                ...rest,
+                logEntryName: 'FETCH_REQUEST_SENT',
                 ...context,
               },
               stats: { startTime: context.startTime },
@@ -253,7 +254,7 @@ export class Getta {
 
           // Casting as fetch response does not support generics.
           // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          const res = (await fetch(endpoint, { ...rest, headers: requestHeaders })) as FetchResponse;
+          const res = (await fetch(endpoint, rest)) as FetchResponse;
 
           clearTimeout(fetchTimer);
 
@@ -268,7 +269,6 @@ export class Getta {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 headers.get(consts.LOCATION_HEADER)!,
                 {
-                  headers: requestHeaders,
                   redirects,
                   status,
                   ...rest,
@@ -286,7 +286,6 @@ export class Getta {
                 res,
                 endpoint,
                 {
-                  headers: requestHeaders,
                   retries,
                   ...rest,
                 },
@@ -321,7 +320,7 @@ export class Getta {
       const endTime = this._performance.now();
 
       this._log?.(consts.REQUEST_FAILED, {
-        context: { error, fetchUrl: endpoint, ...rest },
+        context: { error, fetchUrl: endpoint, logEntryName: 'FETCH_REQUEST_FAILED', ...rest },
         stats: { duration: startTime ? endTime - startTime : 0, endTime, startTime },
       });
 
@@ -461,12 +460,13 @@ export class Getta {
 
     this._log?.(consts.RESPONSE_RECEIVED, {
       context: {
+        fetchMethod: method,
         fetchRedirects: redirects,
+        fetchResponseHeaders: Object.fromEntries(headers.entries()),
+        fetchResponseStatus: status,
         fetchRetries: retries,
         fetchUrl: endpoint,
-        method,
-        responseHeaders: headers,
-        status,
+        logEntryName: 'FETCH_RESPONSE_RECEIVED',
         ...otherContext,
       },
       stats: { duration, endTime, startTime },