@scayle/storefront-core 7.59.1 → 7.60.0

package/dist/rpc/methods/oauth/idp.mjs

@@ -1,4 +1,6 @@
 import { SignJWT } from "jose";
+import { ErrorResponse } from "../../../errors/index.mjs";
+import { HttpStatusCode, HttpStatusMessage } from "../../../constants/index.mjs";
 import { assertSession } from "../../../types/index.mjs";
 import { getOAuthClient } from "../../../api/oauth.mjs";
 import { postLogin } from "../session.mjs";
@@ -7,10 +9,18 @@ export const getExternalIdpRedirect = async function getExternalIdpRedirect2({ q
     return {};
   }
   if (context.idp.idpKeys.length === 0) {
-    return new Response("No IDP keys are configured", { status: 400 });
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No IDP keys are configured"
+    );
   }
   if (!context.idp.idpRedirectURL) {
-    return new Response("No IDP redirect url is configured", { status: 400 });
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No IDP redirect url is configured"
+    );
   }
   const OAuthClient = getOAuthClient(context);
   const redirectUrl = new URL(context.idp.idpRedirectURL);

package/dist/rpc/methods/products.cjs

@@ -8,6 +8,7 @@ var _helpers = require("../../helpers/index.cjs");
 var _constants = require("../../constants/index.cjs");
 var _cache = require("../../cache/index.cjs");
 var _response = require("../../utils/response.cjs");
+var _errors = require("../../errors/index.cjs");
 const MAX_PER_PAGE = 100;
 const sanitizeAttributesForBAPI = ({
   attributes,
@@ -152,13 +153,17 @@ const getFilters = exports.getFilters = async function getFilters2({
     result = await cached(bapiClient.categories.getByPath, {
       cacheKeyPrefix: `getByPath-categories-${category}`
     })((0, _helpers.splitAndRemoveEmpty)(category));
-    allFiltersForCategory = await (0, _response.unwrap)(fetchAllFiltersForCategory({
+    const response = await fetchAllFiltersForCategory({
       category: {
         id: result.id,
         slug: category
       },
       includedFilters
-    }, context));
+    }, context);
+    if (response instanceof _errors.ErrorResponse) {
+      return response;
+    }
+    allFiltersForCategory = await (0, _response.unwrap)(response);
   }
   const sanitizedAttributes = sanitizeAttributesForBAPI({
     attributes: where?.attributes || [],
@@ -227,14 +232,18 @@ const getProductsByCategory = exports.getProductsByCategory = async function get
       cacheKeyPrefix: `getByPath-categories-${category}`
     })((0, _helpers.splitAndRemoveEmpty)(category));
   }
-  const {
-    filters
-  } = await (0, _response.unwrap)(getFilters({
+  const getFiltersResponse = getFilters({
     category,
     includeSoldOut,
     where,
     includeSellableForFree
-  }, context));
+  }, context);
+  if (getFiltersResponse instanceof _errors.ErrorResponse) {
+    return getFiltersResponse;
+  }
+  const {
+    filters
+  } = await (0, _response.unwrap)(getFiltersResponse);
   const {
     entities: products,
     pagination

package/dist/rpc/methods/products.d.ts

@@ -1,5 +1,6 @@
 import type { FiltersEndpointResponseData } from '@scayle/storefront-api';
 import type { FetchFiltersParams, FetchProductParams, FetchProductsByCategoryParams, FetchProductsByIdsParams, FetchProductsByReferenceKeysParams, FetchProductsCountParams, Product, RpcContext } from '../../types';
+import { ErrorResponse } from '../../errors';
 export declare const getProductById: (options: FetchProductParams, { bapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Product>;
 export declare const getProductsByIds: (options: FetchProductsByIdsParams, { bapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Product[]>;
 export declare const getProductsByReferenceKeys: (options: FetchProductsByReferenceKeysParams, { bapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Product[]>;
@@ -13,11 +14,11 @@ export declare const fetchAllFiltersForCategory: ({ includedFilters, category }:
         id: number;
     };
 }, { cached, bapiClient, campaignKey }: RpcContext) => Promise<string[]>;
-export declare const getFilters: ({ category, includedFilters, where, includeSoldOut, includeSellableForFree, orFiltersOperator, }: FetchFiltersParams, context: RpcContext) => Promise<{
+export declare const getFilters: ({ category, includedFilters, where, includeSoldOut, includeSellableForFree, orFiltersOperator, }: FetchFiltersParams, context: RpcContext) => Promise<(string[] & ErrorResponse) | {
     filters: FiltersEndpointResponseData;
     unfilteredCount: number;
 }>;
-export declare const getProductsByCategory: ({ category, cache, with: _with, perPage, page, where, sort, pricePromotionKey, includeSellableForFree, includeSoldOut, orFiltersOperator, }: FetchProductsByCategoryParams, context: RpcContext) => Promise<{
+export declare const getProductsByCategory: ({ category, cache, with: _with, perPage, page, where, sort, pricePromotionKey, includeSellableForFree, includeSoldOut, orFiltersOperator, }: FetchProductsByCategoryParams, context: RpcContext) => Promise<ErrorResponse | {
     products: Product[];
     pagination: {
         current: number;

package/dist/rpc/methods/products.mjs

@@ -2,6 +2,7 @@ import { splitAndRemoveEmpty } from "../../helpers/index.mjs";
 import { MIN_WITH_PARAMS_PRODUCT } from "../../constants/index.mjs";
 import { MINUTE } from "../../cache/index.mjs";
 import { unwrap } from "../../utils/response.mjs";
+import { ErrorResponse } from "../../errors/index.mjs";
 const MAX_PER_PAGE = 100;
 const sanitizeAttributesForBAPI = ({
   attributes,
@@ -112,12 +113,14 @@ export const getFilters = async function getFilters2({
     result = await cached(bapiClient.categories.getByPath, {
       cacheKeyPrefix: `getByPath-categories-${category}`
     })(splitAndRemoveEmpty(category));
-    allFiltersForCategory = await unwrap(
-      fetchAllFiltersForCategory(
-        { category: { id: result.id, slug: category }, includedFilters },
-        context
-      )
+    const response = await fetchAllFiltersForCategory(
+      { category: { id: result.id, slug: category }, includedFilters },
+      context
     );
+    if (response instanceof ErrorResponse) {
+      return response;
+    }
+    allFiltersForCategory = await unwrap(response);
   }
   const sanitizedAttributes = sanitizeAttributesForBAPI({
     attributes: where?.attributes || [],
@@ -191,12 +194,14 @@ export const getProductsByCategory = async function getProductsByCategory2({
       cacheKeyPrefix: `getByPath-categories-${category}`
     })(splitAndRemoveEmpty(category));
   }
-  const { filters } = await unwrap(
-    getFilters(
-      { category, includeSoldOut, where, includeSellableForFree },
-      context
-    )
+  const getFiltersResponse = getFilters(
+    { category, includeSoldOut, where, includeSellableForFree },
+    context
   );
+  if (getFiltersResponse instanceof ErrorResponse) {
+    return getFiltersResponse;
+  }
+  const { filters } = await unwrap(getFiltersResponse);
   const { entities: products, pagination } = await cached(
     bapiClient.products.query,
     {

package/dist/rpc/methods/session.cjs

@@ -14,17 +14,20 @@ var _user = require("../../utils/user.cjs");
 var _user2 = require("../../rpc/methods/user.cjs");
 var _response = require("../../utils/response.cjs");
 var _oauth = require("../../api/oauth.cjs");
+var _errors = require("../../errors/index.cjs");
 const convertErrorForRpcCall = (error, httpStatuses) => {
   if (error instanceof _fetch.FetchError && httpStatuses.includes(error.response.status)) {
-    return new Response(null, {
-      status: error.response.status
-    });
+    return new _errors.ErrorResponse(error.response.status, error.response.statusText, error.name);
   }
 };
 async function postLogin(context, tokens) {
-  const user = await (0, _response.unwrap)((0, _user2.fetchUser)({
+  const fetchUserResponse = await (0, _user2.fetchUser)({
     accessToken: tokens.access_token
-  }, context));
+  }, context);
+  if (fetchUserResponse instanceof _errors.ErrorResponse) {
+    return fetchUserResponse;
+  }
+  const user = await (0, _response.unwrap)(fetchUserResponse);
   context.updateTokens({
     accessToken: tokens.access_token,
     refreshToken: tokens.refresh_token
@@ -47,24 +50,24 @@ const oauthLogin = async (login, context) => {
   const shopId = context.shopId;
   const client = (0, _oauth.getOAuthClient)(context);
   if (!login.email || !login.password) {
-    throw new Error("Login or password are missing, seems like validation has failed");
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "Login or password are missing");
   }
   try {
     const tokens = await client.login({
       ...login,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND, _constants.HttpStatusCode.FORBIDDEN]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof _errors.ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, {
+      status: _constants.HttpStatusCode.NO_CONTENT
+    });
+  } catch (error) {
+    context.log.error("OAuthClient.login failed", error);
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Login failed");
   }
-  return new Response(null, {
-    status: _constants.HttpStatusCode.NO_CONTENT
-  });
 };
 exports.oauthLogin = oauthLogin;
 const oauthRegister = async (register, context) => {
@@ -76,17 +79,17 @@ const oauthRegister = async (register, context) => {
       ...register,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT, _constants.HttpStatusCode.FORBIDDEN]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof _errors.ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, {
+      status: _constants.HttpStatusCode.NO_CONTENT
+    });
+  } catch (error) {
+    context.log.error("OAuthClient.register failed", error);
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Register failed");
   }
-  return new Response(null, {
-    status: _constants.HttpStatusCode.NO_CONTENT
-  });
 };
 exports.oauthRegister = oauthRegister;
 const oauthGuestLogin = async (guest, context) => {
@@ -98,17 +101,17 @@ const oauthGuestLogin = async (guest, context) => {
       ...guest,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT, _constants.HttpStatusCode.FORBIDDEN]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof _errors.ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, {
+      status: _constants.HttpStatusCode.NO_CONTENT
+    });
+  } catch (error) {
+    context.log.error("OAuthClient.guestLogin failed", error);
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Guest login failed");
   }
-  return new Response(null, {
-    status: _constants.HttpStatusCode.NO_CONTENT
-  });
 };
 exports.oauthGuestLogin = oauthGuestLogin;
 const refreshAccessToken = async context => {
@@ -116,7 +119,7 @@ const refreshAccessToken = async context => {
   const refreshToken = context.refreshToken;
   const client = (0, _oauth.getOAuthClient)(context);
   if (!refreshToken) {
-    throw new Error("No app refresh token provided");
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No refresh token present");
   }
   try {
     const tokens = await client.refreshToken({
@@ -145,7 +148,7 @@ const oauthRevokeToken = async context => {
   (0, _types.assertSession)(context);
   const accessToken = context.accessToken;
   if (!accessToken) {
-    throw new Error("No app oauth authentication credentials");
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusMessage.UNAUTHORIZED, "No access token present");
   }
   const user = context.user;
   const client = (0, _oauth.getOAuthClient)(context);
@@ -179,7 +182,7 @@ const oauthForgetPassword = async ({
   const client = (0, _oauth.getOAuthClient)(context);
   try {
     if (!context.auth.resetPasswordUrl) {
-      throw new Error("Missing password reset URL");
+      return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Missing password reset URL");
     }
     const resetUrl = new URL(context.auth.resetPasswordUrl);
     if (!resetUrl.searchParams.has("hash")) {
@@ -225,7 +228,7 @@ const updatePasswordByHash = async (passwordHash, context) => {
     if (res) {
       return res;
     }
-    throw error;
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Error during update password by hash");
   }
   return new Response(null, {
     status: _constants.HttpStatusCode.NO_CONTENT

package/dist/rpc/methods/session.d.ts

@@ -1,6 +1,7 @@
 import type { Optional } from 'utility-types';
-import type { GuestRequest, LoginRequest, Oauth, RegisterRequest, RpcContext, RpcContextWithSession, UpdatePasswordByHashRequest } from '../../types';
-export declare function postLogin(context: RpcContextWithSession, tokens: Oauth): Promise<void>;
+import type { GuestRequest, LoginRequest, Oauth, RegisterRequest, RpcContext, RpcContextWithSession, ShopUser, UpdatePasswordByHashRequest } from '../../types';
+import { ErrorResponse } from '../../errors';
+export declare function postLogin(context: RpcContextWithSession, tokens: Oauth): Promise<(ShopUser & ErrorResponse) | undefined>;
 export declare const oauthLogin: (login: Optional<LoginRequest, "shop_id">, context: RpcContext) => Promise<Response>;
 export declare const oauthRegister: (register: Optional<RegisterRequest, "shop_id">, context: RpcContext) => Promise<Response>;
 export declare const oauthGuestLogin: (guest: Optional<GuestRequest, "shop_id">, context: RpcContext) => Promise<Response>;

package/dist/rpc/methods/session.mjs

@@ -1,20 +1,34 @@
 import { decodeJwt } from "jose";
 import { assertSession } from "../../types/index.mjs";
-import { DEFAULT_WITH_LISTING, HttpStatusCode } from "../../constants/index.mjs";
+import {
+  DEFAULT_WITH_LISTING,
+  HttpStatusCode,
+  HttpStatusMessage
+} from "../../constants/index.mjs";
 import { FetchError } from "../../utils/fetch.mjs";
 import { mergeBaskets, mergeWishlists } from "../../utils/user.mjs";
 import { fetchUser } from "../../rpc/methods/user.mjs";
 import { unwrap } from "../../utils/response.mjs";
 import { getOAuthClient } from "../../api/oauth.mjs";
+import { ErrorResponse } from "../../errors/index.mjs";
 const convertErrorForRpcCall = (error, httpStatuses) => {
   if (error instanceof FetchError && httpStatuses.includes(error.response.status)) {
-    return new Response(null, { status: error.response.status });
+    return new ErrorResponse(
+      error.response.status,
+      error.response.statusText,
+      error.name
+    );
   }
 };
 export async function postLogin(context, tokens) {
-  const user = await unwrap(
-    fetchUser({ accessToken: tokens.access_token }, context)
+  const fetchUserResponse = await fetchUser(
+    { accessToken: tokens.access_token },
+    context
   );
+  if (fetchUserResponse instanceof ErrorResponse) {
+    return fetchUserResponse;
+  }
+  const user = await unwrap(fetchUserResponse);
   context.updateTokens({
     accessToken: tokens.access_token,
     refreshToken: tokens.refresh_token
@@ -48,27 +62,27 @@ export const oauthLogin = async (login, context) => {
   const shopId = context.shopId;
   const client = getOAuthClient(context);
   if (!login.email || !login.password) {
-    throw new Error(
-      "Login or password are missing, seems like validation has failed"
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "Login or password are missing"
     );
   }
   try {
     const tokens = await client.login({ ...login, shop_id: shopId });
-    await postLogin(context, tokens);
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof ErrorResponse) {
+      return postLoginResponse;
+    }
+    return new Response(null, { status: HttpStatusCode.NO_CONTENT });
   } catch (error) {
-    const res = convertErrorForRpcCall(error, [
+    context.log.error("OAuthClient.login failed", error);
+    return new ErrorResponse(
       HttpStatusCode.INTERNAL_SERVER_ERROR,
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.NOT_FOUND,
-      HttpStatusCode.FORBIDDEN
-    ]);
-    if (res) {
-      return res;
-    }
-    throw error;
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Login failed"
+    );
   }
-  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };
 export const oauthRegister = async (register, context) => {
   assertSession(context);
@@ -79,20 +93,19 @@ export const oauthRegister = async (register, context) => {
       ...register,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.CONFLICT,
-      HttpStatusCode.FORBIDDEN
-    ]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, { status: HttpStatusCode.NO_CONTENT });
+  } catch (error) {
+    context.log.error("OAuthClient.register failed", error);
+    return new ErrorResponse(
+      HttpStatusCode.INTERNAL_SERVER_ERROR,
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Register failed"
+    );
   }
-  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };
 export const oauthGuestLogin = async (guest, context) => {
   assertSession(context);
@@ -103,27 +116,30 @@ export const oauthGuestLogin = async (guest, context) => {
       ...guest,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.CONFLICT,
-      HttpStatusCode.FORBIDDEN
-    ]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, { status: HttpStatusCode.NO_CONTENT });
+  } catch (error) {
+    context.log.error("OAuthClient.guestLogin failed", error);
+    return new ErrorResponse(
+      HttpStatusCode.INTERNAL_SERVER_ERROR,
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Guest login failed"
+    );
   }
-  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };
 export const refreshAccessToken = async (context) => {
   assertSession(context);
   const refreshToken = context.refreshToken;
   const client = getOAuthClient(context);
   if (!refreshToken) {
-    throw new Error("No app refresh token provided");
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No refresh token present"
+    );
   }
   try {
     const tokens = await client.refreshToken({
@@ -150,7 +166,11 @@ export const oauthRevokeToken = async (context) => {
   assertSession(context);
   const accessToken = context.accessToken;
   if (!accessToken) {
-    throw new Error("No app oauth authentication credentials");
+    return new ErrorResponse(
+      HttpStatusCode.UNAUTHORIZED,
+      HttpStatusMessage.UNAUTHORIZED,
+      "No access token present"
+    );
   }
   const user = context.user;
   const client = getOAuthClient(context);
@@ -181,7 +201,11 @@ export const oauthForgetPassword = async ({ email }, context) => {
   const client = getOAuthClient(context);
   try {
     if (!context.auth.resetPasswordUrl) {
-      throw new Error("Missing password reset URL");
+      return new ErrorResponse(
+        HttpStatusCode.INTERNAL_SERVER_ERROR,
+        HttpStatusMessage.INTERNAL_SERVER_ERROR,
+        "Missing password reset URL"
+      );
     }
     const resetUrl = new URL(context.auth.resetPasswordUrl);
     if (!resetUrl.searchParams.has("hash")) {
@@ -231,7 +255,11 @@ export const updatePasswordByHash = async (passwordHash, context) => {
     if (res) {
       return res;
     }
-    throw error;
+    return new ErrorResponse(
+      HttpStatusCode.INTERNAL_SERVER_ERROR,
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Error during update password by hash"
+    );
   }
   return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };

package/dist/rpc/methods/wishlist.cjs

@@ -7,6 +7,7 @@ exports.removeItemFromWishlist = exports.getWishlist = exports.clearWishlist = e
 var _types = require("../../types/index.cjs");
 var _constants = require("../../constants/index.cjs");
 var _response = require("../../utils/response.cjs");
+var _errors = require("../../errors/index.cjs");
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.wishlist ?? _constants.MIN_WITH_PARAMS_WISHLIST;
 }
@@ -40,7 +41,7 @@ const addItemToWishlist = exports.addItemToWishlist = async function addItemToWi
   const resolvedWith = getWithParams(options, context);
   const pricePromotionKey = resolvedWith?.pricePromotionKey ?? "";
   if (!productId && !variantId) {
-    throw new Error("No productId or variantId given");
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No productId or variantId given");
   }
   const result = await bapiClient.wishlist.addItem(wishlistKey, variantId ? {
     variantId
@@ -82,7 +83,11 @@ const removeItemFromWishlist = exports.removeItemFromWishlist = async function r
   });
 };
 const clearWishlist = exports.clearWishlist = async function clearWishlist2(context) {
-  const wishlist = await (0, _response.unwrap)(getWishlist({}, context));
+  const wishlistResponse = await getWishlist({}, context);
+  if (wishlistResponse instanceof _errors.ErrorResponse) {
+    return wishlistResponse;
+  }
+  const wishlist = await (0, _response.unwrap)(wishlistResponse);
   await Promise.all(wishlist.items.map(async item => {
     await removeItemFromWishlist({
       itemKey: item.key

package/dist/rpc/methods/wishlist.mjs

@@ -1,6 +1,11 @@
 import { assertSession } from "../../types/index.mjs";
-import { MIN_WITH_PARAMS_WISHLIST } from "../../constants/index.mjs";
+import {
+  HttpStatusCode,
+  HttpStatusMessage,
+  MIN_WITH_PARAMS_WISHLIST
+} from "../../constants/index.mjs";
 import { unwrap } from "../../utils/response.mjs";
+import { ErrorResponse } from "../../errors/index.mjs";
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.wishlist ?? MIN_WITH_PARAMS_WISHLIST;
 }
@@ -21,7 +26,11 @@ export const addItemToWishlist = async function addItemToWishlist2(options, cont
   const resolvedWith = getWithParams(options, context);
   const pricePromotionKey = resolvedWith?.pricePromotionKey ?? "";
   if (!productId && !variantId) {
-    throw new Error("No productId or variantId given");
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No productId or variantId given"
+    );
   }
   const result = await bapiClient.wishlist.addItem(
     wishlistKey,
@@ -50,7 +59,11 @@ export const removeItemFromWishlist = async function removeItemFromWishlist2(opt
   });
 };
 export const clearWishlist = async function clearWishlist2(context) {
-  const wishlist = await unwrap(getWishlist({}, context));
+  const wishlistResponse = await getWishlist({}, context);
+  if (wishlistResponse instanceof ErrorResponse) {
+    return wishlistResponse;
+  }
+  const wishlist = await unwrap(wishlistResponse);
   await Promise.all(
     wishlist.items.map(async (item) => {
       await removeItemFromWishlist({ itemKey: item.key }, context);

package/dist/utils/timeout.cjs

@@ -9,9 +9,10 @@ const wait = ms => {
 };
 exports.wait = wait;
 const timeout = (ms, promise) => {
-  const breaker = new Promise((_resolve, reject) => {
-    setTimeout(() => reject(new Error("timeout")), ms);
-  });
-  return Promise.race([promise, breaker]);
+  let pendingTimeout;
+  return new Promise((resolve, reject) => {
+    pendingTimeout = setTimeout(() => reject(new Error("timeout")), ms);
+    promise.then(resolve, reject);
+  }).finally(() => clearTimeout(pendingTimeout));
 };
 exports.timeout = timeout;

package/dist/utils/timeout.d.ts

@@ -1,2 +1,2 @@
 export declare const wait: (ms: number) => Promise<unknown>;
-export declare const timeout: (ms: number, promise: Promise<any>) => Promise<any>;
+export declare const timeout: <T>(ms: number, promise: Promise<T>) => Promise<T>;

package/dist/utils/timeout.mjs

@@ -2,8 +2,9 @@ export const wait = (ms) => {
   return new Promise((resolve) => setTimeout(resolve, ms));
 };
 export const timeout = (ms, promise) => {
-  const breaker = new Promise((_resolve, reject) => {
-    setTimeout(() => reject(new Error("timeout")), ms);
-  });
-  return Promise.race([promise, breaker]);
+  let pendingTimeout;
+  return new Promise((resolve, reject) => {
+    pendingTimeout = setTimeout(() => reject(new Error("timeout")), ms);
+    promise.then(resolve, reject);
+  }).finally(() => clearTimeout(pendingTimeout));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.59.1",
+  "version": "7.60.0",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -59,7 +59,7 @@
     "test:ci": "vitest --run --passWithNoTests --coverage --reporter=default --reporter=junit"
   },
   "dependencies": {
-    "@scayle/storefront-api": "17.4.0",
+    "@scayle/storefront-api": "17.4.1",
     "crypto-js": "^4.2.0",
     "hookable": "^5.5.3",
     "jose": "^5.6.3",
@@ -72,19 +72,19 @@
   "devDependencies": {
     "@scayle/eslint-config-storefront": "4.2.0",
     "@types/crypto-js": "4.2.2",
-    "@types/node": "20.14.10",
+    "@types/node": "20.14.11",
     "@types/webpack-env": "1.18.5",
-    "@vitest/coverage-v8": "2.0.2",
+    "@vitest/coverage-v8": "2.0.3",
     "dprint": "0.47.2",
-    "eslint": "9.6.0",
+    "eslint": "9.7.0",
     "eslint-formatter-gitlab": "5.1.0",
-    "publint": "0.2.8",
+    "publint": "0.2.9",
     "rimraf": "6.0.1",
     "ts-node": "10.9.2",
     "typescript": "5.5.3",
     "unbuild": "2.0.0",
     "unstorage": "1.10.2",
-    "vitest": "2.0.2"
+    "vitest": "2.0.3"
   },
   "optionalDependencies": {
     "redis": "4"