Release 0.15.1

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 18
       - name: create dist
         run: make dist
       - name: release

.github/workflows/run-tests.yml

@@ -17,6 +17,6 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 18
       - name: run tests
         run: make tests

TODO.md

@@ -1,3 +0,0 @@
-* [x] items improvements
-* [x] multiple parties support
-* [ ] pretty UI

build.sbt

@@ -2,7 +2,7 @@ organization := "me.arcanis"
 
 name := "ffxivbis"
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.12"
 
 scalacOptions ++= Seq("-deprecation", "-feature")
 

libraries.sbt

@@ -1,26 +1,25 @@
-val AkkaVersion = "2.6.19"
-val AkkaHttpVersion = "10.2.9"
-val ScalaTestVersion = "3.2.12"
-val SlickVersion = "3.3.3"
+val AkkaVersion = "2.8.6"
+val AkkaHttpVersion = "10.5.3"
+val ScalaTestVersion = "3.2.19"
 
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.11"
+libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.6"
 libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
 
 libraryDependencies += "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion
 libraryDependencies += "com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion
 libraryDependencies += "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion
 libraryDependencies += "com.typesafe.akka" %% "akka-stream" % AkkaVersion
-libraryDependencies += "com.github.swagger-akka-http" %% "swagger-akka-http" % "2.7.0"
-libraryDependencies += "jakarta.platform" % "jakarta.jakartaee-web-api" % "9.1.0"
-libraryDependencies += "ch.megard" %% "akka-http-cors" % "1.1.3"
+libraryDependencies += "com.github.swagger-akka-http" %% "swagger-akka-http" % "2.11.0"
+libraryDependencies += "jakarta.platform" % "jakarta.jakartaee-web-api" % "10.0.0"
+libraryDependencies += "ch.megard" %% "akka-http-cors" % "1.2.0"
 
 libraryDependencies += "io.spray" %%  "spray-json" % "1.3.6"
 
-libraryDependencies += "org.playframework.anorm" %% "anorm" % "2.6.10"
-libraryDependencies += "com.zaxxer" % "HikariCP" % "5.0.1" exclude("org.slf4j", "slf4j-api")
-libraryDependencies += "org.flywaydb" % "flyway-core" % "8.5.12"
-libraryDependencies += "org.xerial" % "sqlite-jdbc" % "3.36.0.3"
-libraryDependencies += "org.postgresql" % "postgresql" % "42.3.6"
+libraryDependencies += "org.playframework.anorm" %% "anorm" % "2.7.0"
+libraryDependencies += "com.zaxxer" % "HikariCP" % "5.1.0" exclude("org.slf4j", "slf4j-api")
+libraryDependencies += "org.flywaydb" % "flyway-core" % "9.16.0"
+libraryDependencies += "org.xerial" % "sqlite-jdbc" % "3.46.0.0"
+libraryDependencies += "org.postgresql" % "postgresql" % "42.7.3"
 
 libraryDependencies += "org.mindrot" % "jbcrypt" % "0.4"
 libraryDependencies += "com.google.guava" % "guava" % "31.0.1-jre"

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.5.8
+sbt.version = 1.7.1

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/JsonSupport.scala

@@ -16,12 +16,12 @@ import java.time.Instant
 
 trait JsonSupport extends SprayJsonSupport with DefaultJsonProtocol {
 
-  private def enumFormat[E <: Enumeration](enum: E): RootJsonFormat[E#Value] =
+  private def enumFormat[E <: Enumeration](enumeration: E): RootJsonFormat[E#Value] =
     new RootJsonFormat[E#Value] {
       override def write(obj: E#Value): JsValue = obj.toString.toJson
       override def read(json: JsValue): E#Value = json match {
-        case JsNumber(value) => enum(value.toInt)
-        case JsString(name) => enum.withName(name)
+        case JsNumber(value) => enumeration(value.toInt)
+        case JsString(name) => enumeration.withName(name)
         case other => deserializationError(s"String or number expected, got $other")
       }
     }

src/main/scala/me/arcanis/ffxivbis/models/Job.scala

@@ -95,6 +95,7 @@ object Job {
   case object RPR extends Drgs
   case object NIN extends Nins
   case object SAM extends Mnks
+  case object VPR extends Mnks
 
   case object BRD extends Ranges
   case object MCH extends Ranges
@@ -103,9 +104,10 @@ object Job {
   case object BLM extends Casters
   case object SMN extends Casters
   case object RDM extends Casters
+  case object PCT extends Casters
 
   val available: Seq[Job] =
-    Seq(PLD, WAR, DRK, GNB, WHM, SCH, AST, SGE, MNK, DRG, RPR, NIN, SAM, BRD, MCH, DNC, BLM, SMN, RDM)
+    Seq(PLD, WAR, DRK, GNB, WHM, SCH, AST, SGE, MNK, DRG, RPR, NIN, SAM, VPR, BRD, MCH, DNC, BLM, SMN, RDM, PCT)
   val availableWithAnyJob: Seq[Job] = available.prepended(AnyJob)
 
   def withName(job: String): Job =

src/main/scala/me/arcanis/ffxivbis/service/bis/XivApi.scala

@@ -15,6 +15,7 @@ import spray.json._
 import scala.concurrent.{ExecutionContext, Future}
 import scala.jdk.CollectionConverters._
 import scala.util.Try
+import scala.util.matching.Regex
 
 trait XivApi extends RequestExecutor {
 
@@ -75,6 +76,10 @@ trait XivApi extends RequestExecutor {
 
 object XivApi {
 
+  private val defaultShop = JsObject("IsUnique" -> JsNumber(1), "StackSize" -> JsNumber(999))
+
+  private val itemRegexp = new Regex("""Item(Receive|Cost)(\d+)""", "type", "index")
+
   private def parseXivapiJsonToShop(
     js: JsObject
   )(implicit executionContext: ExecutionContext): Future[Map[Long, (String, Long)]] = {
@@ -84,12 +89,12 @@ object XivApi {
         .map(_ => "crafted" -> -1L) // you can craft this item
         .orElse { // lets try shop items
           js.fields("SpecialShop").asJsObject.fields.collectFirst {
-            case (shopName, JsArray(array)) if shopName.startsWith("ItemReceive") =>
+            case (shopName, JsArray(array)) if itemRegexp.matches(shopName) =>
               val shopId = array.head match {
                 case JsNumber(id) => id.toLong
                 case other => throw deserializationError(s"Could not parse $other")
               }
-              shopName.replace("ItemReceive", "") -> shopId
+              itemRegexp.findFirstMatchIn(shopName).get.group("index") -> shopId
           }
         }
         .getOrElse(throw deserializationError(s"Could not parse $js"))
@@ -128,7 +133,7 @@ object XivApi {
           if (index == "crafted" && shopId == -1L) PieceType.Crafted
           else
             Try(shopMap(shopId).fields(s"ItemCost$index").asJsObject)
-              .getOrElse(throw new Exception(s"${shopMap(shopId).fields(s"ItemCost$index")}, $index"))
+              .getOrElse(defaultShop)
               .getFields("IsUnique", "StackSize") match {
               case Seq(JsNumber(isUnique), JsNumber(stackSize)) =>
                 if (isUnique == 1 || stackSize.toLong != 999) PieceType.Tome // either upgraded gear or tomes found

version.sbt

@@ -1 +1 @@
-version := "0.13.6"
+version := "0.15.1"