getta 1.0.8 → 1.0.10

package/package.json

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

package/src/constants.ts

@@ -61,3 +61,5 @@ export const CACHE_CONTROL_HEADER = 'Cache-Control';
 
 export const REQUEST_SENT = 'request_sent';
 export const RESPONSE_RECEIVED = 'response_received';
+export const RESPONSE_FROM_CACHE = 'response_from_cache';
+export const REQUEST_FAILED = 'request_failed';

package/src/main.ts

@@ -308,11 +308,17 @@ export class Getta {
         })();
       });
     } catch (error) {
-      // Based on above code, error is gonna be a type of Error.
+      const { startTime, ...rest } = context;
+      const endTime = this._performance.now();
+
+      this._log?.(consts.REQUEST_FAILED, {
+        context: { error, url: endpoint, ...rest },
+        stats: { duration: startTime ? endTime - startTime : 0, endTime, startTime },
+      });
+
+      // Based on above code, error is going to be a type of Error.
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      const res = { errors: castArray(error) } as FetchResponse;
-      this._logResponse(res, endpoint, options, context);
-      return res;
+      return { errors: castArray(error) } as FetchResponse;
     }
   }
 
@@ -365,9 +371,22 @@ export class Getta {
 
     if (cacheability) {
       if (isCacheabilityValid(cacheability)) {
+        const newHeaders = {
+          ...headers,
+          'cache-control': cacheability.printCacheControl(),
+        };
+
+        this._log?.(consts.RESPONSE_FROM_CACHE, {
+          context: {
+            headers: newHeaders,
+            url: endpoint,
+            ...context,
+          },
+        });
+
         return {
           data: await this._cacheEntryGet(requestHash),
-          headers: new Headers({ 'cache-control': cacheability.printCacheControl() }),
+          headers: new Headers(newHeaders),
         };
       }
 
@@ -425,7 +444,7 @@ export class Getta {
   }
 
   private _logResponse(res: FetchResponse, endpoint: string, options: FetchOptions, context: Context) {
-    const { data, errors, headers, status } = res;
+    const { headers, status } = res;
     const { method, redirects, retries } = options;
     const { startTime, ...otherContext } = context;
     const endTime = this._performance.now();
@@ -433,7 +452,6 @@ export class Getta {
 
     this._log?.(consts.RESPONSE_RECEIVED, {
       context: {
-        body: data ? { data } : { errors: errors ?? [] },
         headers,
         method,
         redirects,