2.0.4 (#235)

* handle edgecase minutes

* fix logs

* have log show exact update minutes

* version bump

* bump python too

* bump some static files

Author: cohenaj194

.github/workflows/electron-exe-build.yml

@@ -1,7 +1,7 @@
 name: Build EXE & DMG for Electron App
 
 env:
-  AAA_VERSION: "2.0.3"
+  AAA_VERSION: "2.0.4"
 
 on:
   workflow_dispatch:

.github/workflows/windows-exe-build.yml

@@ -1,7 +1,7 @@
 name: Build Windows Executable
 
 env:
-  AAA_VERSION: "1.6.1"
+  AAA_VERSION: "1.6.2"
 
 on:
   workflow_dispatch:

AzerothAuctionAssassin.py

@@ -5,7 +5,7 @@
 import sys
 from datetime import datetime
 
-AAA_VERSION = "1.6.1"
+AAA_VERSION = "1.6.2"
 
 windowsApp_Path = None
 try:

StaticData/ilvl_items.json

@@ -1151,6 +1151,18 @@
     "ilvl": 242,
     "is_stackable": 0
   },
+  "190731": {
+    "itemID": 190731,
+    "itemName": "Deceiver's Illusionary Signet",
+    "itemQuality": 3,
+    "required_level": 60,
+    "item_class": 4,
+    "item_subclass": 0,
+    "purchase_price": 2100778,
+    "sell_price": 420155,
+    "ilvl": 242,
+    "is_stackable": 0
+  },
   "190732": {
     "itemID": 190732,
     "itemName": "Strand of Tainted Relics",
@@ -11746,5 +11758,41 @@
     "sell_price": 0,
     "ilvl": 400,
     "is_stackable": 0
+  },
+  "258931": {
+    "itemID": 258931,
+    "itemName": "Tarnished Dawnlit Sentinel's Cover",
+    "itemQuality": 2,
+    "required_level": 80,
+    "item_class": 4,
+    "item_subclass": 3,
+    "purchase_price": 240882,
+    "sell_price": 48176,
+    "ilvl": 226,
+    "is_stackable": 0
+  },
+  "258941": {
+    "itemID": 258941,
+    "itemName": "Tarnished Dawnlit Commander's Mantle",
+    "itemQuality": 2,
+    "required_level": 80,
+    "item_class": 4,
+    "item_subclass": 4,
+    "purchase_price": 232306,
+    "sell_price": 46461,
+    "ilvl": 226,
+    "is_stackable": 0
+  },
+  "258944": {
+    "itemID": 258944,
+    "itemName": "Tarnished Dawnlit Cleaver",
+    "itemQuality": 2,
+    "required_level": 80,
+    "item_class": 2,
+    "item_subclass": 0,
+    "purchase_price": 448228,
+    "sell_price": 89645,
+    "ilvl": 226,
+    "is_stackable": 0
   }
 }

StaticData/item_names.json

@@ -24740,6 +24740,7 @@
   "190726": "Extract of Prodigious Sands",
   "190729": "Vigorous Sentinel's Seal",
   "190730": "Matriarch's Shell Band",
+  "190731": "Deceiver's Illusionary Signet",
   "190732": "Strand of Tainted Relics",
   "190733": "Circle of Akkaris",
   "190735": "Varruth's Guillotine",
@@ -29628,6 +29629,7 @@
   "236857": "Potion of Mysterious Frostbound",
   "236870": "Potion of Mysterious Tremorshards",
   "236949": "Mote of Light",
+  "236952": "Mote of Pure Void",
   "236957": "Hollowbane Portal Key",
   "236959": "Empty Mysterious Potion",
   "236967": "Grubber Lure",
@@ -29645,6 +29647,7 @@
   "237359": "Refulgent Copper Ore",
   "237362": "Umbral Tin Ore",
   "237364": "Brilliant Silver Ore",
+  "237366": "Dazzling Thorium",
   "237435": "Nightfall Darkcaster's Cloak",
   "237436": "Nightfall Darkcaster's Vestment",
   "237437": "Nightfall Darkcaster's Sandals",
@@ -29714,6 +29717,12 @@
   "238212": "Desolate Talus",
   "238213": "Desolate Talus",
   "238254": "Nuts and Bolts",
+  "238367": "Root Crab",
+  "238377": "Blood Hunter",
+  "238482": "A Whole Lot of Nothing",
+  "238487": "Kickin' Can",
+  "238489": "Definitely Not a Rock",
+  "238494": "Another's Treasure",
   "238799": "Harrowed Ichor",
   "238800": "Soggy Bone Splinters",
   "238801": "Mite-Kissed Silver Tooth",
@@ -29964,6 +29973,8 @@
   "245672": "Blade of the Void Swamp",
   "245746": "Energy Barrel",
   "245747": "Energy Urn",
+  "245830": "Ace of Hunt",
+  "245831": "Two of Hunt",
   "245884": "Energy Pyramid",
   "245950": "Dark Iron Portable Forge",
   "245955": "Dark Iron's Ceremonial Mace",
@@ -29995,6 +30006,7 @@
   "246784": "Dark Iron's Ancient Crusher",
   "246801": "Dark Iron's Mighty Crossbow",
   "246809": "Inspired Writer's Quill",
+  "246838": "Kafa Press",
   "247220": "Mushan Dumpling Stack",
   "247222": "Drake Kebab Platter",
   "247224": "Valdrakken Blossomfruit Platter",
@@ -30189,6 +30201,9 @@
   "258560": "Drust Enchanter's Rod",
   "258561": "Kyrian Aspirant's Rolled Cushion",
   "258838": "Gold Dye",
+  "258931": "Tarnished Dawnlit Sentinel's Cover",
+  "258941": "Tarnished Dawnlit Commander's Mantle",
+  "258944": "Tarnished Dawnlit Cleaver",
   "259053": "Warm Teak Dye",
   "259078": "Basic Birch Dye",
   "259096": "Mesquite Brown Dye",
@@ -30257,8 +30272,10 @@
   "260588": "Jendry's Donut",
   "260589": "Flame-Blessed Beach Towel",
   "260615": "Void Dust Residue",
+  "260636": "Algae Covered Stone",
   "260638": "Fine Void Residue",
   "260659": "Stellar Vortex Residue",
+  "260661": "Glowing Shrub",
   "260665": "Sizable Tusk",
   "260699": "Maldraxxian Runic Tablet",
   "260947": "White Dye Pigment",

mega_alerts.py

@@ -718,6 +718,33 @@ def check_pet_ilvl_stats(item, desired_pet_list):
             }
 
         #### MAIN ####
+        def is_in_scan_window(
+            current_min, last_upload_min, scan_time_min, scan_time_max
+        ):
+            """
+            Check if current_min is within the scan window, handling minute wraparound (0-59).
+
+            Args:
+                current_min: Current minute (0-59)
+                last_upload_min: Last upload minute (0-59)
+                scan_time_min: Minutes before upload to start scanning (can be negative)
+                scan_time_max: Minutes after upload to stop scanning
+
+            Returns:
+                bool: True if current_min is within the scan window
+            """
+            # Calculate the start and end of the scan window, wrapping around 0-59
+            start_min = (last_upload_min + scan_time_min) % 60
+            end_min = (last_upload_min + scan_time_max) % 60
+
+            # Handle wraparound: if start > end, the range crosses the hour boundary
+            if start_min <= end_min:
+                # Normal range (no wraparound): e.g., 5 to 10
+                return start_min <= current_min <= end_min
+            else:
+                # Wraparound range: e.g., 59 to 2 means [59, 0, 1, 2]
+                return current_min >= start_min or current_min <= end_min
+
         def main():
             while self.running:
                 current_min = int(datetime.now().minute)
@@ -731,9 +758,12 @@ def main():
                 matching_realms = [
                     realm["dataSetID"]
                     for realm in mega_data.get_upload_time_list()
-                    if realm["lastUploadMinute"] + mega_data.SCAN_TIME_MIN
-                    <= current_min
-                    <= realm["lastUploadMinute"] + mega_data.SCAN_TIME_MAX
+                    if is_in_scan_window(
+                        current_min,
+                        realm["lastUploadMinute"],
+                        mega_data.SCAN_TIME_MIN,
+                        mega_data.SCAN_TIME_MAX,
+                    )
                 ]
                 # mega wants extra alerts
                 if mega_data.EXTRA_ALERTS:

node-ui/index.html

@@ -33,7 +33,7 @@
       <header class="topbar">
         <div>
           <div class="eyebrow">Azeroth Auction Assassin</div>
-          <div class="title">Version: 2.0.3</div>
+          <div class="title">Version: 2.0.4</div>
         </div>
         <div class="actions">
           <div class="nav-controls">

node-ui/mega-alerts.js

@@ -2233,12 +2233,77 @@ async function runAlerts(state, progress, runOnce = false) {
     // Scan starts at lastUploadMinute + SCAN_TIME_MIN
     // Scan ends at lastUploadMinute + SCAN_TIME_MAX
     // Commodities are included automatically if they're in upload_timers and match the time window
+
+    /**
+     * Check if current_min is within the scan window, handling minute wraparound (0-59).
+     * @param {number} current_min - Current minute (0-59)
+     * @param {number} last_upload_min - Last upload minute (0-59)
+     * @param {number} scan_time_min - Minutes before upload to start scanning (can be negative)
+     * @param {number} scan_time_max - Minutes after upload to stop scanning
+     * @returns {boolean} True if current_min is within the scan window
+     */
+    const isInScanWindow = (
+      current_min,
+      last_upload_min,
+      scan_time_min,
+      scan_time_max
+    ) => {
+      // Calculate the start and end of the scan window, wrapping around 0-59
+      // JavaScript's modulo operator handles negative numbers differently than Python,
+      // so we need to ensure positive values first
+      const start_min = (((last_upload_min + scan_time_min) % 60) + 60) % 60
+      const end_min = (((last_upload_min + scan_time_max) % 60) + 60) % 60
+
+      // Handle wraparound: if start > end, the range crosses the hour boundary
+      if (start_min <= end_min) {
+        // Normal range (no wraparound): e.g., 5 to 10
+        return start_min <= current_min && current_min <= end_min
+      } else {
+        // Wraparound range: e.g., 59 to 2 means [59, 0, 1, 2]
+        return current_min >= start_min || current_min <= end_min
+      }
+    }
+
+    /**
+     * Get all scan trigger minutes based on upload times and scan window settings.
+     * @returns {Set<number>} Set of all minutes when scans will trigger
+     */
+    const getScanTriggerMinutes = () => {
+      const scanMinutes = new Set()
+      const uploadMinutes = state.get_upload_time_minutes()
+
+      for (const uploadMin of uploadMinutes) {
+        const start_min = (((uploadMin + state.SCAN_TIME_MIN) % 60) + 60) % 60
+        const end_min = (((uploadMin + state.SCAN_TIME_MAX) % 60) + 60) % 60
+
+        if (start_min <= end_min) {
+          // Normal range (no wraparound)
+          for (let min = start_min; min <= end_min; min++) {
+            scanMinutes.add(min)
+          }
+        } else {
+          // Wraparound range: e.g., 59 to 2 means [59, 0, 1, 2]
+          for (let min = start_min; min < 60; min++) {
+            scanMinutes.add(min)
+          }
+          for (let min = 0; min <= end_min; min++) {
+            scanMinutes.add(min)
+          }
+        }
+      }
+
+      return scanMinutes
+    }
+
     let matching_realms = state
       .get_upload_time_list()
-      .filter(
-        (realm) =>
-          realm.lastUploadMinute + state.SCAN_TIME_MIN <= current_min &&
-          current_min <= realm.lastUploadMinute + state.SCAN_TIME_MAX
+      .filter((realm) =>
+        isInScanWindow(
+          current_min,
+          realm.lastUploadMinute,
+          state.SCAN_TIME_MIN,
+          state.SCAN_TIME_MAX
+        )
       )
       .map((r) => r.dataSetID)
 
@@ -2269,15 +2334,23 @@ async function runAlerts(state, progress, runOnce = false) {
         state.THREADS
       )
     } else {
+      const uploadMinutes = Array.from(state.get_upload_time_minutes()).sort(
+        (a, b) => a - b
+      )
+      const scanTriggerMinutes = Array.from(getScanTriggerMinutes()).sort(
+        (a, b) => a - b
+      )
       progress(
-        `The updates will come\non min ${Array.from(
-          state.get_upload_time_minutes()
-        ).join(",")}\nof each hour.`
+        `The updates will come on min ${uploadMinutes.join(
+          ","
+        )} of each hour. Scans trigger on min ${scanTriggerMinutes.join(",")}.`
       )
       log(
-        `Blizzard API data only updates 1 time per hour. The updates will come on minute ${Array.from(
-          state.get_upload_time_minutes()
-        )} of each hour. ${new Date().toISOString()} is not the update time.`
+        `Blizzard API data only updates 1 time per hour. The updates will come on minute ${uploadMinutes.join(
+          ", "
+        )} of each hour. Scans will trigger on minutes ${scanTriggerMinutes.join(
+          ", "
+        )}. ${new Date().toISOString()} is not the update time.`
       )
       await delay(20000) // Wait 20 seconds before checking again
     }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aaa-node-ui",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Node-based GUI to manage Azeroth Auction Assassin configs and run WoW AH Price Scans!",
   "license": "MIT",
   "main": "node-ui/main.js",