ozon-grabber 0.1.0 → 0.1.4

package/dist/index.js

@@ -103,6 +103,22 @@ var submitItems = async (config, items) => {
     body: items
   });
 };
+var getSetting = async (config, key) => {
+  const payload = await requestJson(config, `/settings/${key}`);
+  return payload.value;
+};
+var updateSetting = async (config, key, value) => {
+  await requestJson(config, `/settings/${key}`, {
+    method: "POST",
+    body: { value }
+  });
+};
+var markItemAsReturn = async (config, title, price) => {
+  return requestJson(config, "/items/mark-return", {
+    method: "POST",
+    body: { title, price }
+  });
+};
 
 // src/mcp.ts
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
@@ -203,7 +219,13 @@ var extractOrderItems = async (client, tools) => {
   const isPriceText = (text) => /\u20BD|\\b\u0440\u0443\u0431\\.?\\b/i.test(text);
   const isShowMoreText = (text) => /\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C\\s+\u0435\u0449[\u0435\u0451]/i.test(text);
 
-  const shipments = Array.from(document.querySelectorAll('[data-widget="shipmentWidget"]'));
+  const isCancelled = (text) => {
+    const normalized = text.toLowerCase().replace(/\u0451/g, '\u0435');
+    return normalized.includes('\u043E\u0442\u043C\u0435\u043D\u0435\u043D');
+  };
+
+  const shipments = Array.from(document.querySelectorAll('[data-widget="shipmentWidget"]'))
+    .filter((shipment) => !isCancelled(textOf(shipment)));
   if (shipments.length === 0) return [];
 
   const clickShowMore = async () => {
@@ -298,6 +320,73 @@ var extractOrderItems = async (client, tools) => {
     };
   }).filter((item) => item.title.length > 0);
 };
+var extractReturnItems = async (client, tools) => {
+  const evaluateTool = resolveToolName(tools, "evaluate_script");
+  const result = await client.callTool({
+    name: evaluateTool,
+    arguments: {
+      function: `() => {
+  const normalize = (value) => String(value ?? '').replace(/\\s+/g, ' ').trim();
+  const widget = document.querySelector('[data-widget="returnDetails"]');
+  if (!widget) return [];
+
+  const productLinks = Array.from(widget.querySelectorAll('a[href*="/product/"]'));
+  const items = [];
+  const seenTitles = new Set();
+
+  productLinks.forEach(link => {
+    const title = normalize(link.textContent);
+    if (!title || seenTitles.has(title)) return;
+    seenTitles.add(title);
+
+    // Find price nearby. Price is usually in a span containing \u20BD.
+    let root = link.parentElement;
+    let price = null;
+    for (let i = 0; i < 8; i++) {
+       if (!root) break;
+       const spans = Array.from(root.querySelectorAll('span'));
+       const priceSpan = spans.find(s => s.textContent.includes('\u20BD'));
+       if (priceSpan) {
+         price = normalize(priceSpan.textContent);
+         break;
+       }
+       root = root.parentElement;
+    }
+
+    // Image
+    let imageUrl = null;
+    root = link.parentElement;
+    for (let i = 0; i < 8; i++) {
+       if (!root) break;
+       const img = root.querySelector('img');
+       if (img) {
+         imageUrl = img.currentSrc || img.getAttribute('src');
+         break;
+       }
+       root = root.parentElement;
+    }
+
+    items.push({ title, price, imageUrl });
+  });
+  return items;
+}`
+    }
+  });
+  const payload = unwrapToolContent(result.content);
+  if (!Array.isArray(payload)) {
+    return [];
+  }
+  return payload.filter(isRecord2).map((item) => {
+    const title = typeof item.title === "string" ? item.title : "";
+    const price = typeof item.price === "string" ? item.price : null;
+    const imageUrl = typeof item.imageUrl === "string" ? item.imageUrl : void 0;
+    return {
+      title,
+      price,
+      imageUrl
+    };
+  }).filter((item) => item.title.length > 0);
+};
 
 // src/order-loop.ts
 var DEFAULT_ORDER_URL = "https://www.ozon.ru/my/orderdetails/";
@@ -401,15 +490,28 @@ var parseStartOrder = (startOrder) => {
 };
 var formatOrderNumber = (orderNumber, width) => String(orderNumber).padStart(width, "0");
 var buildOrderUrl = (orderId) => `${DEFAULT_ORDER_URL}?order=${encodeURIComponent(orderId)}&selectedTab=archive`;
-var IN_PROGRESS_MARKERS = [
-  "\u043C\u043E\u0436\u043D\u043E \u0437\u0430\u0431\u0438\u0440\u0430\u0442\u044C",
-  "\u043F\u0435\u0440\u0435\u0434\u0430\u0451\u0442\u0441\u044F \u0432 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0443",
-  "\u043F\u0435\u0440\u0435\u0434\u0430\u0435\u0442\u0441\u044F \u0432 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0443",
-  "\u0432 \u0441\u043B\u0443\u0436\u0431\u0435 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438",
-  "\u0432 \u0441\u0431\u043E\u0440\u043A\u0435",
-  "\u0432 \u043F\u0443\u0442\u0438"
-];
-var COMPLETED_MARKER = "\u043F\u043E\u043B\u0443\u0447\u0435\u043D";
+var buildReturnUrl = (returnNumber) => `https://www.ozon.ru/my/returnDetails?returnNumber=${encodeURIComponent(returnNumber)}`;
+var getReturnPageState = async (client, tools) => {
+  const evaluateTool = resolveToolName(tools, "evaluate_script");
+  const result = await client.callTool({
+    name: evaluateTool,
+    arguments: {
+      function: `() => {
+  const widget = document.querySelector('[data-widget="returnDetails"]');
+  return {
+    hasReturnWidget: Boolean(widget)
+  };
+}`
+    }
+  });
+  const payload = unwrapToolContent2(result.content);
+  if (!isRecord3(payload)) {
+    return { hasReturnWidget: false };
+  }
+  return {
+    hasReturnWidget: Boolean(payload.hasReturnWidget)
+  };
+};
 var getOrderPageState = async (client, tools) => {
   const evaluateTool = resolveToolName(tools, "evaluate_script");
   const result = await client.callTool({
@@ -429,21 +531,14 @@ var getOrderPageState = async (client, tools) => {
   });
   const payload = unwrapToolContent2(result.content);
   if (!isRecord3(payload)) {
-    return { hasItemsBlock: false, shipmentTexts: [], isInProgress: false };
+    return { hasItemsBlock: false, shipmentTexts: [] };
   }
   const hasItemsBlock = Boolean(payload.hasItemsBlock);
   const shipmentTextsRaw = Array.isArray(payload.shipmentTexts) ? payload.shipmentTexts.filter((entry) => typeof entry === "string") : [];
   const shipmentTexts = shipmentTextsRaw.map((text) => normalizeText(text).toLowerCase());
-  const isInProgress = shipmentTexts.some((text) => {
-    if (text.includes(COMPLETED_MARKER)) {
-      return false;
-    }
-    return IN_PROGRESS_MARKERS.some((marker) => text.includes(marker));
-  });
   return {
     hasItemsBlock,
-    shipmentTexts,
-    isInProgress
+    shipmentTexts
   };
 };
 var getOrderTitleText = async (client, tools) => {
@@ -558,11 +653,32 @@ var scanOrders = async (client, tools, userId, startOrder, options = {}) => {
         stopOrderNumber
       };
     }
-    const orderNumber = formatOrderNumber(numeric + offset, width);
+    const orderNumber = options.isReturns ? `R${numeric + offset}` : formatOrderNumber(numeric + offset, width);
     const orderId = `${userId}-${orderNumber}`;
-    const url = buildOrderUrl(orderId);
-    logMessage(options, `Opening order ${orderId}`);
+    const url = options.isReturns ? buildReturnUrl(orderId) : buildOrderUrl(orderId);
+    logMessage(options, `Opening ${options.isReturns ? "return" : "order"} ${orderId}`);
     await openPage(client, tools, url);
+    if (options.isReturns) {
+      const { hasReturnWidget } = await getReturnPageState(client, tools);
+      if (!hasReturnWidget) {
+        logMessage(options, `Return widget missing for ${orderId}, stopping.`);
+        return {
+          orders,
+          scannedOrders: orders.length,
+          stopReason: "missing",
+          stopOrderNumber: orderNumber
+        };
+      }
+      const items2 = await extractReturnItems(client, tools);
+      const orderDate2 = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+      const order2 = { orderId, orderNumber, orderDate: orderDate2, items: items2 };
+      if (options.onOrder) {
+        await options.onOrder(order2);
+      }
+      orders.push(order2);
+      offset += 1;
+      continue;
+    }
     await waitForOrderPageWidgets(
       client,
       tools,
@@ -605,15 +721,6 @@ var scanOrders = async (client, tools, userId, startOrder, options = {}) => {
         stopOrderNumber: orderNumber
       };
     }
-    if (pageState.isInProgress) {
-      logMessage(options, `Order ${orderId} is in progress, stopping scan.`);
-      return {
-        orders,
-        scannedOrders: orders.length,
-        stopReason: "in-progress",
-        stopOrderNumber: orderNumber
-      };
-    }
     if (!titleText) {
       titleText = await getOrderTitleText(client, tools);
     }
@@ -756,6 +863,10 @@ var cli = yargs(hideBin(process.argv)).scriptName("ozon-grabber").command(
       type: "boolean",
       default: false,
       describe: "Enable backend upload and next-order resolution"
+    }).option("returns", {
+      type: "boolean",
+      default: false,
+      describe: "Scan for returns instead of orders"
     });
     return addBackendOptions(configured);
   },
@@ -767,49 +878,87 @@ var cli = yargs(hideBin(process.argv)).scriptName("ozon-grabber").command(
       const outputPath = argv.output;
       const verbose = argv.verbose;
       const useBackend = Boolean(argv.backend);
+      const isReturns = Boolean(argv.returns);
       const backendConfig = useBackend ? resolveBackendConfig({
         backendUrl: argv.backendUrl,
         backendApiKey: argv.backendApiKey
       }) : null;
-      const resolvedStartOrder = argv.startOrder ?? (backendConfig ? await getNextOrderId(backendConfig) : void 0);
+      let resolvedStartOrder = argv.startOrder;
+      if (isReturns) {
+        if (!resolvedStartOrder && backendConfig) {
+          const lastReturnId = await getSetting(backendConfig, "last_return_id");
+          if (lastReturnId) {
+            const match = lastReturnId.match(/^R(\d+)$/);
+            if (match) {
+              resolvedStartOrder = String(Number.parseInt(match[1], 10) + 1);
+            }
+          }
+        }
+        if (!resolvedStartOrder) {
+          resolvedStartOrder = "1";
+        }
+      } else {
+        if (!resolvedStartOrder && backendConfig) {
+          resolvedStartOrder = await getNextOrderId(backendConfig);
+        }
+      }
       if (!resolvedStartOrder) {
-        throw new Error("Starting order number is required when backend is disabled.");
+        throw new Error("Starting order number is required.");
       }
-      if (backendConfig && !/^\d{4}$/.test(resolvedStartOrder.trim())) {
+      if (!isReturns && backendConfig && !/^\d{4}$/.test(resolvedStartOrder.trim())) {
         throw new Error(
           `Starting order must be a 4-digit string when using backend: ${resolvedStartOrder}.`
         );
       }
-      console.log(`Starting orderId: ${resolvedStartOrder}`);
+      if (isReturns) {
+        console.log(`Starting returns scan for user: ${userId}, from: R${resolvedStartOrder}`);
+      } else {
+        console.log(`Starting orderId: ${resolvedStartOrder}`);
+      }
       const { client, tools } = await connectChromeDevtoolsClient();
       try {
         const summary = await scanOrders(client, tools, userId, resolvedStartOrder, {
           maxOrders,
           pageLoadTimeoutMs,
           verbose,
+          isReturns,
           logger: (message) => console.log(message),
           onOrder: backendConfig ? async (order) => {
-            const items = order.items.map((item) => ({
-              orderId: order.orderNumber,
-              userId,
-              orderDate: order.orderDate,
-              title: item.title,
-              price: item.price,
-              imageUrl: item.imageUrl
-            }));
-            if (items.length === 0) {
-              console.log(`Order ${order.orderId} has no items to submit.`);
-              return;
-            }
-            try {
-              await submitItems(backendConfig, items);
-              console.log(
-                `Submitted order ${order.orderId} (${items.length} items) to backend.`
-              );
-            } catch (error) {
-              const message = error instanceof Error ? error.message : String(error);
-              console.error(`Failed to submit order ${order.orderId}: ${message}`);
-              throw error;
+            if (isReturns) {
+              for (const item of order.items) {
+                try {
+                  await markItemAsReturn(backendConfig, item.title, item.price);
+                  console.log(`Marked item as return: ${item.title} (${item.price})`);
+                } catch (error) {
+                  const message = error instanceof Error ? error.message : String(error);
+                  console.error(`Failed to mark item as return: ${message}`);
+                  throw error;
+                }
+              }
+              await updateSetting(backendConfig, "last_return_id", order.orderNumber);
+            } else {
+              const items = order.items.map((item) => ({
+                orderId: order.orderNumber,
+                userId,
+                orderDate: order.orderDate,
+                title: item.title,
+                price: item.price,
+                imageUrl: item.imageUrl
+              }));
+              if (items.length === 0) {
+                console.log(`Order ${order.orderId} has no items to submit.`);
+                return;
+              }
+              try {
+                await submitItems(backendConfig, items);
+                console.log(
+                  `Submitted order ${order.orderId} (${items.length} items) to backend.`
+                );
+              } catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                console.error(`Failed to submit order ${order.orderId}: ${message}`);
+                throw error;
+              }
             }
           } : void 0
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ozon-grabber",
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "Ozon order history grabber CLI",
   "repository": {
     "type": "git",