split fetch/fetch.server to avoid breaking (#219)

deco-sites · Sep 1, 2023 · f3d16fe · f3d16fe
1 parent 85aaba8
commit f3d16fe
Show file tree

Hide file tree

Showing 21 changed files with 77 additions and 39 deletions.
diff --git a/commerce/butterCMS/client.ts b/commerce/butterCMS/client.ts
@@ -1,5 +1,5 @@
 import { Account } from "$live/blocks/account.ts";
-import { fetchAPI } from "../../utils/fetch.ts";
+import { fetchAPI } from "../../utils/fetch.server.ts";
 import { CategoriesData, Page, PostData, PostsData } from "./types.ts";
 
 export interface Locale {

diff --git a/commerce/nuvemShop/client.ts b/commerce/nuvemShop/client.ts
@@ -1,5 +1,5 @@
 import { Account } from "./types.ts";
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import {
   ProductBaseNuvemShop,
   ProductSearchParams,

diff --git a/commerce/occ/client.ts b/commerce/occ/client.ts
@@ -1,5 +1,5 @@
 import { Account } from "$live/blocks/account.ts";
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import {
   CategorySearchResult,
   OccProductPage,

diff --git a/commerce/shopify/client.ts b/commerce/shopify/client.ts
@@ -1,5 +1,5 @@
 import { Account } from "$live/blocks/account.ts";
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import { Product } from "./types.ts";
 
 const gql = (x: TemplateStringsArray) => x.toString().trim();

diff --git a/commerce/yourViews/client.ts b/commerce/yourViews/client.ts
@@ -1,4 +1,4 @@
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import { Ratings, Reviews } from "./types.ts";
 
 export type ClientYourViews = ReturnType<typeof createClient>;

diff --git a/packs/font/loaders/font.ts b/packs/font/loaders/font.ts
@@ -1,4 +1,4 @@
-import { fetchSafe } from "deco-sites/std/utils/fetch.ts";
+import { fetchSafe } from "deco-sites/std/utils/fetch.server.ts";
 
 const ALLOWED_ORIGINS = new Set(["https://fonts.gstatic.com"]);
 

diff --git a/packs/linxImpulse/loaders/autocompletes/popular.ts b/packs/linxImpulse/loaders/autocompletes/popular.ts
@@ -6,7 +6,7 @@ import {
 } from "deco-sites/std/packs/linxImpulse/utils/transform.ts";
 import { paths } from "deco-sites/std/packs/linxImpulse/utils/path.ts";
 import type { Context } from "deco-sites/std/packs/linxImpulse/accounts/linxImpulse.ts";
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 
 interface AutocompletesPopularReponse {
   requestId: string;

diff --git a/packs/linxImpulse/loaders/autocompletes/suggestions.ts b/packs/linxImpulse/loaders/autocompletes/suggestions.ts
@@ -11,7 +11,7 @@ import {
 } from "deco-sites/std/packs/linxImpulse/utils/transform.ts";
 import { paths } from "deco-sites/std/packs/linxImpulse/utils/path.ts";
 import type { Context } from "deco-sites/std/packs/linxImpulse/accounts/linxImpulse.ts";
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import { HttpError } from "deco-sites/std/utils/HttpError.ts";
 
 interface AutocompletesResponse {

diff --git a/packs/linxImpulse/loaders/pages/recommendations.ts b/packs/linxImpulse/loaders/pages/recommendations.ts
@@ -13,7 +13,7 @@ import {
 } from "deco-sites/std/packs/linxImpulse/utils/transform.ts";
 import { paths } from "deco-sites/std/packs/linxImpulse/utils/path.ts";
 import type { Context } from "deco-sites/std/packs/linxImpulse/accounts/linxImpulse.ts";
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 
 export interface Props {
   /**

diff --git a/packs/linxImpulse/loaders/products/similarItems.ts b/packs/linxImpulse/loaders/products/similarItems.ts
@@ -13,7 +13,7 @@ import {
 } from "deco-sites/std/packs/linxImpulse/utils/transform.ts";
 import { paths } from "deco-sites/std/packs/linxImpulse/utils/path.ts";
 import type { Context } from "deco-sites/std/packs/linxImpulse/accounts/linxImpulse.ts";
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import { HttpError } from "deco-sites/std/utils/HttpError.ts";
 
 export interface Props {

diff --git a/packs/linxImpulse/loaders/search.ts b/packs/linxImpulse/loaders/search.ts
@@ -14,7 +14,7 @@ import {
 } from "deco-sites/std/packs/linxImpulse/utils/transform.ts";
 import { paths } from "deco-sites/std/packs/linxImpulse/utils/path.ts";
 import type { Context } from "deco-sites/std/packs/linxImpulse/accounts/linxImpulse.ts";
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import { HttpError } from "deco-sites/std/utils/HttpError.ts";
 
 const sortOptions = [

diff --git a/packs/vnda/actions/cart/addItem.ts b/packs/vnda/actions/cart/addItem.ts
@@ -1,5 +1,5 @@
 import { HttpError } from "deco-sites/std/utils/HttpError.ts";
-import { fetchAPI, fetchSafe } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI, fetchSafe } from "deco-sites/std/utils/fetch.server.ts";
 import { getSetCookies, setCookie } from "std/http/mod.ts";
 import type { Context } from "../../accounts/vnda.ts";
 import { DECO_USER_AGENT, USER_AGENT_HEADER } from "../../constants.ts";

diff --git a/packs/vnda/actions/cart/setShippingAddress.ts b/packs/vnda/actions/cart/setShippingAddress.ts
@@ -1,4 +1,4 @@
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import type { Context } from "../../accounts/vnda.ts";
 import type { Cart, Shipping } from "../../types.ts";
 import { paths } from "../../utils/paths.ts";

diff --git a/packs/vnda/actions/cart/updateCoupon.ts b/packs/vnda/actions/cart/updateCoupon.ts
@@ -1,4 +1,4 @@
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import type { Context } from "../../accounts/vnda.ts";
 import type { Cart, Coupon } from "../../types.ts";
 import { paths } from "../../utils/paths.ts";

diff --git a/packs/vnda/actions/cart/updateItem.ts b/packs/vnda/actions/cart/updateItem.ts
@@ -1,4 +1,4 @@
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import type { Context } from "../../accounts/vnda.ts";
 import type { Cart, OrderForm } from "../../types.ts";
 import { paths } from "../../utils/paths.ts";

diff --git a/packs/vnda/client.ts b/packs/vnda/client.ts
@@ -1,5 +1,5 @@
 import { SortOption } from "deco-sites/std/commerce/types.ts";
-import { fetchAPI, fetchSafe } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI, fetchSafe } from "deco-sites/std/utils/fetch.server.ts";
 import { Account as ConfigVNDA } from "./accounts/vnda.ts";
 import {
   BASE_URL_PROD,

diff --git a/packs/vnda/loaders/cart.ts b/packs/vnda/loaders/cart.ts
@@ -1,5 +1,5 @@
 import { HttpError } from "deco-sites/std/utils/HttpError.ts";
-import { fetchAPI } from "deco-sites/std/utils/fetch.ts";
+import { fetchAPI } from "deco-sites/std/utils/fetch.server.ts";
 import type { Context } from "../accounts/vnda.ts";
 import type { Cart, OrderForm, RelatedItem } from "../types.ts";
 import { paths } from "../utils/paths.ts";

diff --git a/utils/fetch.server.ts b/utils/fetch.server.ts
@@ -0,0 +1,31 @@
+import * as fetcher from "https://denopkg.com/deco-cx/[email protected]/utils/fetch.ts";
+
+export interface FetchOptions {
+  withProxyCache?: boolean;
+}
+
+export const fetchSafe = (
+  input: string | Request | URL,
+  init?: RequestInit & FetchOptions,
+) =>
+  fetcher.fetchSafe(input, {
+    ...init,
+    deco: init?.withProxyCache
+      ? {
+        cache: "stale-while-revalidate",
+      }
+      : undefined,
+  });
+
+export const fetchAPI = <T>(
+  input: string | Request | URL,
+  init?: RequestInit & FetchOptions,
+): Promise<T> =>
+  fetcher.fetchAPI(input, {
+    ...init,
+    deco: init?.withProxyCache
+      ? {
+        cache: "stale-while-revalidate",
+      }
+      : undefined,
+  });
diff --git a/utils/fetch.test.ts b/utils/fetch.test.ts
@@ -3,7 +3,10 @@ import {
   assertSpyCalls,
   spy,
 } from "https://deno.land/[email protected]/testing/mock.ts";
-import { CONNECTION_CLOSED_MESSAGE, retryExceptionOr500 } from "./fetch.ts";
+import {
+  CONNECTION_CLOSED_MESSAGE,
+  retryExceptionOr500,
+} from "./fetch.server.ts";
 import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
 
 Deno.test("retry handler", async (t) => {

diff --git a/utils/fetch.ts b/utils/fetch.ts
@@ -1,31 +1,35 @@
-import * as fetcher from "https://denopkg.com/deco-cx/[email protected]/utils/fetch.ts";
+import { HttpError } from "deco-sites/std/utils/HttpError.ts";
 
 export interface FetchOptions {
   withProxyCache?: boolean;
 }
 
-export const fetchSafe = (
+export const fetchSafe = async (
   input: string | Request | URL,
   init?: RequestInit & FetchOptions,
-) =>
-  fetcher.fetchSafe(input, {
-    ...init,
-    deco: init?.withProxyCache
-      ? {
-        cache: "stale-while-revalidate",
-      }
-      : undefined,
-  });
+) => {
+  const response = await fetch(input, init);
+
+  if (response.ok) {
+    return response;
+  }
+
+  console.error(`${input}\n`, response, `\n`);
+  throw new HttpError(response.status, `${input}`);
+};
 
-export const fetchAPI = <T>(
+export const fetchAPI = async <T>(
   input: string | Request | URL,
   init?: RequestInit & FetchOptions,
-): Promise<T> =>
-  fetcher.fetchAPI(input, {
+): Promise<T> => {
+  const headers = new Headers(init?.headers);
+
+  headers.set("accept", "application/json");
+
+  const response = await fetchSafe(input, {
     ...init,
-    deco: init?.withProxyCache
-      ? {
-        cache: "stale-while-revalidate",
-      }
-      : undefined,
+    headers,
   });
+
+  return response.json();
+};
diff --git a/utils/fetchVTEX.ts b/utils/fetchVTEX.ts
@@ -1,8 +1,8 @@
-import { FetchOptions } from "./fetch.ts";
+import { FetchOptions } from "./fetch.server.ts";
 import {
   fetchAPI as fetchAPIBase,
   fetchSafe as fetchSafeBase,
-} from "./fetch.ts";
+} from "./fetch.server.ts";
 
 const processFetch = async (
   _fetch: (