ozon-grabber 0.1.4 → 0.1.6

package/dist/index.js

@@ -581,20 +581,23 @@ var getOrderPageWidgetState = async (client, tools) => {
       function: `() => {
   const shipmentWidget = document.querySelector('[data-widget="shipmentWidget"]');
   const titleWidget = document.querySelector('[data-widget="titleWithTimer"]');
+  const returnWidget = document.querySelector('[data-widget="returnDetails"]');
   return {
     hasShipmentWidget: Boolean(shipmentWidget),
-    hasTitleWithTimer: Boolean(titleWidget)
+    hasTitleWithTimer: Boolean(titleWidget),
+    hasReturnWidget: Boolean(returnWidget)
   };
 }`
     }
   });
   const payload = unwrapToolContent2(result.content);
   if (!isRecord3(payload)) {
-    return { hasShipmentWidget: false, hasTitleWithTimer: false };
+    return { hasShipmentWidget: false, hasTitleWithTimer: false, hasReturnWidget: false };
   }
   return {
     hasShipmentWidget: Boolean(payload.hasShipmentWidget),
-    hasTitleWithTimer: Boolean(payload.hasTitleWithTimer)
+    hasTitleWithTimer: Boolean(payload.hasTitleWithTimer),
+    hasReturnWidget: Boolean(payload.hasReturnWidget)
   };
 };
 var waitForOrderPageWidgets = async (client, tools, options, description, timeoutMs, predicate) => {
@@ -603,7 +606,8 @@ var waitForOrderPageWidgets = async (client, tools, options, description, timeou
   let attempts = 0;
   let state = {
     hasShipmentWidget: false,
-    hasTitleWithTimer: false
+    hasTitleWithTimer: false,
+    hasReturnWidget: false
   };
   logMessage(options, `Waiting for ${description} (timeout ${timeoutMs}ms).`);
   while (true) {
@@ -659,7 +663,34 @@ var scanOrders = async (client, tools, userId, startOrder, options = {}) => {
     logMessage(options, `Opening ${options.isReturns ? "return" : "order"} ${orderId}`);
     await openPage(client, tools, url);
     if (options.isReturns) {
-      const { hasReturnWidget } = await getReturnPageState(client, tools);
+      await waitForOrderPageWidgets(
+        client,
+        tools,
+        options,
+        "return page widgets",
+        pageLoadTimeoutMs,
+        (state) => state.hasReturnWidget
+      );
+      let { hasReturnWidget } = await getReturnPageState(client, tools);
+      if (!hasReturnWidget) {
+        logMessage(
+          options,
+          `No return widget detected for ${orderId}, retrying after ${pageLoadRetryDelayMs}ms.`
+        );
+        if (pageLoadRetryDelayMs > 0) {
+          await sleep(pageLoadRetryDelayMs);
+        }
+        await waitForOrderPageWidgets(
+          client,
+          tools,
+          options,
+          "returnDetails",
+          shipmentWidgetTimeoutMs,
+          (state) => state.hasReturnWidget
+        );
+        const updatedState = await getReturnPageState(client, tools);
+        hasReturnWidget = updatedState.hasReturnWidget;
+      }
       if (!hasReturnWidget) {
         logMessage(options, `Return widget missing for ${orderId}, stopping.`);
         return {
@@ -927,12 +958,15 @@ var cli = yargs(hideBin(process.argv)).scriptName("ozon-grabber").command(
             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})`);
+                  const result = await markItemAsReturn(backendConfig, item.title, item.price);
+                  if (result) {
+                    console.log(`Marked item as return: ${item.title} (${item.price})`);
+                  } else {
+                    console.warn(`Could not find item to mark 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;
+                  console.error(`Error marking item as return: ${message}`);
                 }
               }
               await updateSetting(backendConfig, "last_return_id", order.orderNumber);

package/package.json

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