Released: '1.0.10'.

Author: guy0090

gradle.properties

@@ -1 +1 @@
-version=1.0.9
+version=1.0.10

gradle/libs.versions.toml

@@ -1,31 +1,31 @@
-[versions]
-apache-commons-lang3 = "3.17.0"
-apache-http5 = "5.5"
-commons-io = "2.19.0"
-jakarta-inject = "2.0.1"
-jsoup = "1.20.1"
-lombok = "1.18.38"
-redisson = "3.49.0"
-researchgate = "3.1.0"
-spring-boot = "3.5.0"
-spring-dependencies = "1.1.7"
-struct = "2.2.0"
-version-catalog = "1.0.0"
-versions = "0.52.0"
-
-[plugins]
-researchgate-release = { id = "net.researchgate.release", version.ref = "researchgate" }
-spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
-spring-dependencies = { id = "io.spring.dependency-management", version.ref = "spring-dependencies" }
-version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog" }
-versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
-
-[libraries]
-apache-http5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "apache-http5" }
-apache-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "apache-commons-lang3" }
-commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
-jakarta-inject = { module = "jakarta.inject:jakarta.inject-api", version.ref = "jakarta-inject" }
-jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
-lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
-redisson = { module = "org.redisson:redisson-spring-data-35", version.ref = "redisson" }
-struct = { module = "org.thshsh:struct", version.ref = "struct" }
+[versions]
+apache-commons-lang3 = "3.18.0"
+apache-http5 = "5.5"
+commons-io = "2.20.0"
+jakarta-inject = "2.0.1"
+jsoup = "1.21.1"
+lombok = "1.18.38"
+redisson = "3.51.0"
+researchgate = "3.1.0"
+spring-boot = "3.5.5"
+spring-dependencies = "1.1.7"
+struct = "2.2.0"
+version-catalog = "1.0.0"
+versions = "0.52.0"
+
+[plugins]
+researchgate-release = { id = "net.researchgate.release", version.ref = "researchgate" }
+spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
+spring-dependencies = { id = "io.spring.dependency-management", version.ref = "spring-dependencies" }
+version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog" }
+versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
+
+[libraries]
+apache-http5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "apache-http5" }
+apache-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "apache-commons-lang3" }
+commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
+jakarta-inject = { module = "jakarta.inject:jakarta.inject-api", version.ref = "jakarta-inject" }
+jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
+lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
+redisson = { module = "org.redisson:redisson-spring-data-35", version.ref = "redisson" }
+struct = { module = "org.thshsh:struct", version.ref = "struct" }

src/main/java/io/arsha/api/controllers/AbstractController.java

@@ -125,12 +125,12 @@ protected List<CacheCompositeKey> categoryRequest(Category category, @NonNull St
         var mainCategory = category.getMainCategory();
         var subCategory = category.getSubCategory();
 
-        if (!categoryService.isValidCombination(mainCategory, subCategory)) {
+        if (!categoryService.isValidCombination(mainCategory, subCategory, gameRegion)) {
             throw new MarketRequestException(category);
         }
 
         if (subCategory == null) {
-            var subCategories = categoryService.getSubCategories(mainCategory);
+            var subCategories = categoryService.getSubCategories(mainCategory, gameRegion);
             return subCategories.stream().map(id -> createKey(null, mainCategory, id, gameRegion, MarketEndpoint.MARKET_LIST))
                     .toList();
         } else {

src/main/java/io/arsha/api/data/market/MarketResponse.java

@@ -49,6 +49,11 @@ public boolean hasBadData() {
         return resultMessage == null || resultMessage.equals("0");
     }
 
+    @JsonIgnore
+    public boolean cannotBeRegistered() {
+        return resultCode == 8;
+    }
+
     @JsonIgnore
     public List<String> getResult() {
         return switch (resultMessage) {
@@ -60,4 +65,4 @@ public List<String> getResult() {
         };
     }
 
-}
+}

src/main/java/io/arsha/api/data/market/common/GameRegion.java

@@ -40,4 +40,8 @@ public static GameRegion fromValue(String region) {
 
         return null;
     }
+
+    public boolean isConsole() {
+        return this == CONSOLE_NA || this == CONSOLE_EU || this == CONSOLE_ASIA;
+    }
 }

src/main/java/io/arsha/api/exceptions/CannotBeRegisteredException.java

@@ -8,9 +8,9 @@ public class CannotBeRegisteredException extends AbstractException {
     @Getter
     private final MarketResponse response;
 
-    public CannotBeRegisteredException(String response) {
+    public CannotBeRegisteredException(MarketResponse response) {
         super();
-        this.response = MarketResponse.deserialize(response);
+        this.response = response;
     }
 
 }

src/main/java/io/arsha/api/lib/HuffmanDecoder.java

@@ -1,6 +1,5 @@
 package io.arsha.api.lib;
 
-import io.arsha.api.exceptions.CannotBeRegisteredException;
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 import java.io.ByteArrayInputStream;
@@ -14,19 +13,10 @@
 import org.thshsh.struct.Struct;
 
 // Implementation from https://github.com/shrddr/huffman_heap
+// This isn't entirely accurate anymore, but it used to basically be a direct copy so im keeping it
 @Component
 public class HuffmanDecoder {
 
-    record Node(@Nullable String character, @NotNull Long frequency, @Nullable Node left, @Nullable Node right) {
-        public static Node fromEntry(Map.Entry<String, Long> entry) {
-            return new Node(entry.getKey(), entry.getValue(), null, null);
-        }
-
-        public static Node branch(Node left, Node right) {
-            return new Node(null, left.frequency() + right.frequency(), left, right);
-        }
-    }
-
     private static Map<String, Long> getFrequencies(InputStream buffer) throws IOException {
         var data = Struct.create("<3I").unpack(buffer);
         var chars = (long) data.get(2);
@@ -35,7 +25,7 @@ private static Map<String, Long> getFrequencies(InputStream buffer) throws IOExc
         for (int i = 0; i < chars; i++) {
             var charData = Struct.create("<Ic3b").unpack(buffer);
             var frequency = (long) charData.get(0);
-            var character = new String(new byte[] { (byte) charData.get(1) });
+            var character = new String(new byte[]{(byte) charData.get(1)});
             frequencyMap.put(character, frequency);
         }
         return frequencyMap;
@@ -45,9 +35,7 @@ private static Node getRoot(InputStream stream) throws IOException {
         var frequencies = getFrequencies(stream);
 
         var heap = new PriorityQueue<>(Comparator.comparingLong(Node::frequency));
-        frequencies.entrySet().stream()
-            .map(Node::fromEntry)
-            .forEach(heap::add);
+        frequencies.entrySet().stream().map(Node::fromEntry).forEach(heap::add);
 
         while (heap.size() > 1) {
             var left = heap.poll();
@@ -62,40 +50,50 @@ private static Node getRoot(InputStream stream) throws IOException {
         return heap.peek();
     }
 
-    private static String unpack(Node root, StringBuilder packed) {
+    public String unpack(byte[] buffer) throws IOException {
+        var stream = new ByteArrayInputStream(buffer);
+
+        var root = getRoot(stream);
+        var sizes = Struct.create("<3I").unpack(stream);
+        var bits = (long) sizes.getFirst(); // The bit size of the encoded data
+        // var bytes = (long) sizes.get(1); // The byte size of the encoded data
+        var expectedBytes = (long) sizes.get(2); // The expected byte size of the unpacked data
+
+        var counter = 0;
         var current = root;
         var unpacked = new StringBuilder();
-        for (var i = 0; i < packed.length(); i++) {
-            current = packed.charAt(i) == '0' ? current.left() : current.right();
-            assert current != null;
+        outer:
+        for (var b : stream.readAllBytes()) {
+            if (unpacked.length() > expectedBytes) {
+                throw new IllegalStateException("Unpacked data exceeds expected size");
+            }
 
-            if (current.left() == null && current.right() == null) {
-                unpacked.append(current.character());
-                current = root;
+            for (int i = 7; i >= 0; i--) {
+                if (counter >= bits) {
+                    break outer;
+                }
+                int bit = (b >> i) & 1;
+                current = bit == 0 ? current.left() : current.right();
+                assert current != null;
+                if (current.left() == null && current.right() == null) {
+                    unpacked.append(current.character());
+                    current = root;
+                }
+                counter++;
             }
         }
+
         return unpacked.toString();
     }
 
-    public String decode(byte[] buffer) throws CannotBeRegisteredException, IOException {
-        var testResult = new String(buffer);
-        if (testResult.contains("resultMsg")) { // Probably an item that can't be registered on market (code 8)
-            throw new CannotBeRegisteredException(testResult);
-        }
-
-        var dataIn = new ByteArrayInputStream(buffer);
-        var root = getRoot(dataIn);
-
-        var data = Struct.create("<3I").unpack(dataIn);
-        var bits = (long) data.getFirst(); // The bit size of the encoded data
-        // var bytes = (long) data.get(1); // The byte size of the encoded data
-        // var expectedSize = (long) data.get(2); // The expected byte size of the unpacked data
+    record Node(@Nullable String character, @NotNull Long frequency, @Nullable Node left, @Nullable Node right) {
 
-        var bin = new StringBuilder();
-        for (byte b : dataIn.readAllBytes())
-            bin.append(Integer.toBinaryString(b & 255 | 256).substring(1));
-        if (bin.length() > bits) bin.setLength(Math.toIntExact(bits));
+        public static Node fromEntry(Map.Entry<String, Long> entry) {
+            return new Node(entry.getKey(), entry.getValue(), null, null);
+        }
 
-        return unpack(root, bin);
+        public static Node branch(Node left, Node right) {
+            return new Node(null, left.frequency() + right.frequency(), left, right);
+        }
     }
 }

src/main/java/io/arsha/api/services/MarketCategoryService.java

@@ -3,6 +3,7 @@
 import io.arsha.api.config.MarketCategoriesConfiguration.MarketCategories;
 import io.arsha.api.config.MarketCategoriesConfiguration.MarketCategory;
 import io.arsha.api.config.MarketCategoriesConfiguration.MarketSubCategory;
+import io.arsha.api.data.market.common.GameRegion;
 import jakarta.annotation.Nullable;
 import java.util.List;
 import java.util.Objects;
@@ -24,26 +25,30 @@ public List<Long> getMainCategories() {
                 .toList();
     }
 
-    public List<Long> getSubCategories(Long mainCategory) {
+    public List<Long> getSubCategories(Long mainCategory, GameRegion region) {
         var category = marketCategories.stream()
                 .filter(c -> Objects.equals(c.id(), mainCategory))
                 .findFirst()
                 .orElseThrow();
 
-        return category.subCategories().stream()
-                .map(MarketSubCategory::id)
-                .toList();
+        var subCategories = category.subCategories().stream().map(MarketSubCategory::id);
+        if (region.isConsole() && category.id() == 30) {
+            // Special case for console categories, subcategory 3 of category 30 is not available
+            subCategories = subCategories.filter(sid -> sid != 3);
+        }
+
+        return subCategories.toList();
     }
 
     public boolean isValidCategory(Long category) {
         return marketCategories.stream()
                 .anyMatch(c -> Objects.equals(c.id(), category));
     }
 
-    public boolean isValidCombination(Long mainCategory, @Nullable Long subCategory) {
+    public boolean isValidCombination(Long mainCategory, @Nullable Long subCategory, GameRegion region) {
         if (!isValidCategory(mainCategory)) return false;
 
-        return subCategory == null || getSubCategories(mainCategory).stream()
+        return subCategory == null || getSubCategories(mainCategory, region).stream()
                 .anyMatch(s -> s.equals(subCategory));
     }
 

src/main/java/io/arsha/api/services/MarketRequestService.java

@@ -102,12 +102,15 @@ public CompletableFuture<Tuple2<CacheCompositeKey, Optional<MarketResponse>>> re
     public String huffmanDecode(byte[] data) throws CannotBeRegisteredException, IOException, MarketResponseBodyException {
         var testString = new String(data);
         if (testString.contains("resultMsg")) {
-            throw new CannotBeRegisteredException(testString);
+            var marketResponse = MarketResponse.deserialize(testString);
+            if (marketResponse.cannotBeRegistered()) {
+                throw new CannotBeRegisteredException(marketResponse);
+            }
         }
 
         // Starts with HTML opening tag, probably blocked by Imperva
         if (testString.startsWith("<html")) throw new MarketResponseBodyException();
 
-        return huffmanDecoder.decode(data);
+        return huffmanDecoder.unpack(data);
     }
 }

src/main/resources/categories.json

@@ -94,6 +94,10 @@
       {
         "id": "23",
         "name": "Revolvers"
+      },
+      {
+        "id": "24",
+        "name": "Power Pole"
       }
     ]
   },
@@ -184,6 +188,10 @@
       {
         "id": "21",
         "name": "Shotgun"
+      },
+      {
+        "id": "22",
+        "name": "Gourd Bottle"
       }
     ]
   },
@@ -302,6 +310,10 @@
       {
         "id": "29",
         "name": "Lil' Devil"
+      },
+      {
+        "id": "30",
+        "name": "Jade Pillar"
       }
     ]
   },