fix: rework. cleanup and tests

package.json

@@ -8,7 +8,7 @@
   "scripts": {
     "prepare": "husky",
     "build": "node build.js",
-    "lint": "eslint . --ext js,cjs,mjs",
+    "lint": "eslint . --ext js,cjs,mjs --fix",
     "test": "c8 --all --include 'src/**/*.js' mocha -i -g 'Post-Deploy' --spec 'test/**/*.test.js'",
     "dev": "if test -e .dev.vars; then wrangler dev --; else echo \"Need a .dev.vars files before starting local dev server\"; fi",
     "dev:remote": "wrangler dev --remote",

src/catalog/delete.js

@@ -10,12 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-/* eslint-disable no-await-in-loop */
-
-import { deleteProducts } from '../utils/r2.js';
 import { errorResponse } from '../utils/http.js';
 
-export async function handleProductDeleteRequest(ctx, config) {
+/**
+ * Handles a DELETE request for a product.
+ * @param {Context} ctx - The context object containing request information and utilities.
+ * @param {StorageClient} storage - The storage object.
+ * @returns {Promise<Response>} - A promise that resolves to the product response.
+ */
+export async function handleProductDeleteRequest(ctx, storage) {
+  const { config } = ctx;
   const { sku } = config;
 
   if (sku === '*') {
@@ -26,7 +30,7 @@ export async function handleProductDeleteRequest(ctx, config) {
     throw errorResponse(400, 'Helix API key is required to delete or unpublish products.');
   }
 
-  const deleteResults = await deleteProducts(ctx, config, [sku]);
+  const deleteResults = await storage.deleteProducts([sku]);
 
   ctx.log.info({
     action: 'delete_products',

src/catalog/fetch.js

@@ -10,17 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import { fetchProduct } from '../utils/r2.js';
-
 /**
  * Handles a GET request for a product.
  * @param {Context} ctx - The context object containing request information and utilities.
- * @param {Config} config - The configuration object with application settings.
+ * @param {StorageClient} storage - The storage object.
  * @returns {Promise<Response>} - A promise that resolves to the product response.
  */
-export async function handleProductFetchRequest(ctx, config) {
+export async function handleProductFetchRequest(ctx, storage) {
   const sku = ctx.url.pathname.split('/').pop();
-  const product = await fetchProduct(ctx, config, sku);
+  const product = await storage.fetchProduct(sku);
 
   return new Response(JSON.stringify(product), {
     headers: { 'Content-Type': 'application/json' },

src/catalog/handler.js

@@ -16,17 +16,18 @@ import { handleProductLookupRequest } from './lookup.js';
 import { handleProductFetchRequest } from './fetch.js';
 import { handleProductSaveRequest } from './update.js';
 import { handleProductDeleteRequest } from './delete.js';
+import StorageR2 from './storage/r2.js';
 
 const ALLOWED_METHODS = ['GET', 'PUT', 'DELETE'];
 
 /**
  * Handles the catalog request.
  * @param {Context} ctx - The context object containing request information and utilities.
- * @param {Config} config - The configuration object with application settings.
  * @param {Request} request - The request object.
  * @returns {Promise<Response>} - A promise that resolves to the catalog response.
  */
-export default async function catalogHandler(ctx, config, request) {
+export default async function catalogHandler(ctx, request) {
+  const { config } = ctx;
   const { method } = ctx.info;
   // Split the pathname into segments and filter out empty strings
   const pathSegments = ctx.url.pathname.split('/').filter(Boolean);
@@ -54,19 +55,23 @@ export default async function catalogHandler(ctx, config, request) {
     storeCode, storeViewCode, subRoute, sku,
   });
 
-  if (subRoute === 'lookup') {
-    if (ctx.info.method === 'GET') {
-      return handleProductLookupRequest(ctx, config);
-    }
-    return errorResponse(405, 'method not allowed');
-  }
+  const storage = new StorageR2(ctx, config);
 
-  if (ctx.info.method === 'PUT') {
-    return handleProductSaveRequest(ctx, config, request);
-  }
+  const routeHandlers = {
+    lookup: {
+      GET: () => handleProductLookupRequest(ctx, storage),
+    },
+    product: {
+      GET: () => handleProductFetchRequest(ctx, storage),
+      PUT: () => handleProductSaveRequest(ctx, request, storage),
+      DELETE: () => handleProductDeleteRequest(ctx, storage),
+    },
+  };
 
-  if (ctx.info.method === 'DELETE') {
-    return handleProductDeleteRequest(ctx, config);
+  const handler = routeHandlers[subRoute]?.[method];
+  if (!handler) {
+    return errorResponse(405, 'method not allowed');
   }
-  return handleProductFetchRequest(ctx, config);
+
+  return handler();
 }

src/catalog/lookup.js

@@ -10,21 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import { listAllProducts, lookupSku } from '../utils/r2.js';
-
 /**
  * Handles a product lookup request.
  * @param {Context} ctx - The context object.
- * @param {Config} config - The configuration object.
  * @returns {Promise<Response>} - A promise that resolves to the product response.
  */
-export async function handleProductLookupRequest(ctx, config) {
+export async function handleProductLookupRequest(ctx, storage) {
+  const { config } = ctx;
   const { search } = ctx.url;
   const params = new URLSearchParams(search);
 
   if (params.has('urlKey') || params.has('urlkey')) {
     const urlkey = params.get('urlKey') || params.get('urlkey');
-    const sku = await lookupSku(ctx, config, urlkey);
+    const sku = await storage.lookupSku(urlkey);
 
     const origin = (ctx.env.ENVIRONMENT === 'dev') ? 'https://adobe-commerce-api-ci.adobeaem.workers.dev' : ctx.url.origin;
     return new Response(undefined, {
@@ -35,7 +33,7 @@ export async function handleProductLookupRequest(ctx, config) {
     });
   }
 
-  const products = await listAllProducts(ctx, config);
+  const products = await storage.listAllProducts(ctx);
 
   const response = {
     total: products.length,