Pre Desert Perpetual fixes (#89)

* fix floodgates status

* update schemas

* fix types

Author: owens1127

open-api/openapi.json

@@ -488,7 +488,7 @@
       },
       "CheatCheckBitmask": {
         "type": "string",
-        "description": "A bitmask of flagged heuristics:\n2^0 = Manual\n2^1 = Leviathan\n2^2 = EaterOfWorlds\n2^3 = SpireOfStars\n2^4 = LastWish\n2^5 = ScourgeOfThePast\n2^6 = CrownOfSorrow\n2^7 = GardenOfSalvation\n2^8 = DeepStoneCrypt\n2^9 = VaultOfGlass\n2^10 = VowOfTheDisciple\n2^11 = KingsFall\n2^12 = RootOfNightmares\n2^13 = CrotasEnd\n2^14 = SalvationsEdge\n2^15 = Raid15\n2^16 = Raid16\n2^17 = Raid17\n2^18 = Raid18\n2^19 = Raid19\n2^20 = Raid20\n2^21 = Raid21\n2^22 = Raid22\n2^23 = Raid23\n2^24 = Raid24\n2^25 = Raid25\n2^26 = Raid26\n2^27 = Raid27\n2^28 = Raid28\n2^29 = Raid29\n2^30 = Raid30\n2^31 = Raid31\n2^32 = Raid32\n2^33 = Pantheon\n2^34 = Bit34\n2^35 = Bit35\n2^36 = Bit36\n2^37 = Bit37\n2^38 = Bit38\n2^39 = Bit39\n2^40 = Bit40\n2^41 = Bit41\n2^42 = Bit42\n2^43 = Bit43\n2^44 = Bit44\n2^45 = Bit45\n2^46 = Bit46\n2^47 = Bit47\n2^48 = Bit48\n2^49 = Bit49\n2^50 = Bit50\n2^51 = Bit51\n2^52 = Bit52\n2^53 = Solo\n2^54 = TotalInstanceKills\n2^55 = TwoPlusCheaters\n2^56 = PlayerTotalKills\n2^57 = PlayerWeaponDiversity\n2^58 = PlayerSuperKills\n2^59 = PlayerGrenadeKills\n2^60 = TooFast\n2^61 = TooFewPlayersFresh\n2^62 = TooFewPlayersCheckpoint",
+        "description": "A bitmask of flagged heuristics:\n2^0 = Manual\n2^1 = Leviathan\n2^2 = EaterOfWorlds\n2^3 = SpireOfStars\n2^4 = LastWish\n2^5 = ScourgeOfThePast\n2^6 = CrownOfSorrow\n2^7 = GardenOfSalvation\n2^8 = DeepStoneCrypt\n2^9 = VaultOfGlass\n2^10 = VowOfTheDisciple\n2^11 = KingsFall\n2^12 = RootOfNightmares\n2^13 = CrotasEnd\n2^14 = SalvationsEdge\n2^15 = Raid15\n2^16 = Raid16\n2^17 = Raid17\n2^18 = Raid18\n2^19 = Raid19\n2^20 = Raid20\n2^21 = Raid21\n2^22 = Raid22\n2^23 = Raid23\n2^24 = Raid24\n2^25 = Raid25\n2^26 = Raid26\n2^27 = Raid27\n2^28 = Raid28\n2^29 = Raid29\n2^30 = Raid30\n2^31 = Raid31\n2^32 = Raid32\n2^33 = Pantheon\n2^34 = Bit34\n2^35 = Bit35\n2^36 = Bit36\n2^37 = Bit37\n2^38 = Bit38\n2^39 = Bit39\n2^40 = Bit40\n2^41 = Bit41\n2^42 = Bit42\n2^43 = Bit43\n2^44 = Bit44\n2^45 = Bit45\n2^46 = Bit46\n2^47 = PlayerHeavyAmmoKills\n2^48 = FastLowmanCheckpoint\n2^49 = UnlikelyLowman\n2^50 = PlayerKillsShare\n2^51 = TimeDilation\n2^52 = FirstClear\n2^53 = Solo\n2^54 = TotalInstanceKills\n2^55 = TwoPlusCheaters\n2^56 = PlayerTotalKills\n2^57 = PlayerWeaponDiversity\n2^58 = PlayerSuperKills\n2^59 = PlayerGrenadeKills\n2^60 = TooFast\n2^61 = TooFewPlayersFresh\n2^62 = TooFewPlayersCheckpoint",
         "format": "int64"
       },
       "InstanceBlacklist": {
@@ -1543,6 +1543,17 @@
               "membershipType"
             ]
           },
+          "activityDifficultyTier": {
+            "type": "integer"
+          },
+          "selectedSkullHashes": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "minimum": 0,
+              "format": "uint32"
+            }
+          },
           "entries": {
             "type": "array",
             "items": {
@@ -2950,6 +2961,17 @@
               "membershipType"
             ]
           },
+          "activityDifficultyTier": {
+            "type": "integer"
+          },
+          "selectedSkullHashes": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "minimum": 0,
+              "format": "uint32"
+            }
+          },
           "entries": {
             "type": "array",
             "items": {

src/integrations/rabbitmq/api.ts

@@ -12,8 +12,9 @@ const auth = btoa(`${user}:${password}`)
 interface RabbitQueueResponse {
     messages: number
     backing_queue_status?: {
-        avg_ack_ingress_rate: number
+        // other fields ommitted for brevity
         avg_ingress_rate: number
+        avg_egress_rate: number
     }
 }
 

src/schema/components/InstanceStanding.ts

@@ -57,12 +57,12 @@ enum CheatFlagIndex {
     Bit44,
     Bit45,
     Bit46,
-    Bit47,
-    Bit48,
-    Bit49,
-    Bit50,
-    Bit51,
-    Bit52,
+    PlayerHeavyAmmoKills,
+    FastLowmanCheckpoint,
+    UnlikelyLowman,
+    PlayerKillsShare,
+    TimeDilation,
+    FirstClear,
     Solo,
     TotalInstanceKills,
     TwoPlusCheaters,

src/schema/components/RaidHubPostGameCarnageReport.ts

@@ -32,6 +32,8 @@ export const zRaidHubPostGameCarnageReport = registry.register(
                     membershipType: zDestinyMembershipType
                 })
                 .strip(),
+            activityDifficultyTier: z.number().int().optional(),
+            selectedSkullHashes: z.array(zUInt32()).optional(),
             entries: z.array(
                 z
                     .object({

src/services/floodgates/floodgates.test.ts

@@ -113,7 +113,7 @@ describe("getFloodgatesStatus", () => {
             spyFetchQueue.mockResolvedValueOnce({
                 messages: 10,
                 backing_queue_status: {
-                    avg_ack_ingress_rate: 0.5,
+                    avg_egress_rate: 0.5,
                     avg_ingress_rate: 1.0
                 }
             })

src/services/floodgates/index.ts

@@ -22,7 +22,7 @@ export const getFloodgatesStatus = async () => {
     return {
         waiting: data.messages,
         ackRateSeconds:
-            Math.round(10_000 * (data.backing_queue_status?.avg_ack_ingress_rate ?? 0)) / 10_000,
+            Math.round(10_000 * (data.backing_queue_status?.avg_egress_rate ?? 0)) / 10_000,
         ingressRateSeconds:
             Math.round(10_000 * (data.backing_queue_status?.avg_ingress_rate ?? 0)) / 10_000
     }