Further graphql websocket setup and rogue run functionality

doombubbles · doombubbles · commit afc1c6297faf · 2025-08-18T16:46:22.000-07:00
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/spellsource-cards-git/src/main/resources/cards/formats/format_rogue.json b/spellsource-cards-git/src/main/resources/cards/formats/format_rogue.json
@@ -42,6 +42,7 @@
     "WHAT_LIES_BENEATH",
     "SOURCESTORM",
     "CORE",
-    "CUSTOM"
+    "CUSTOM",
+    "ROGUE"
   ]
 }
diff --git a/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_2.json b/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_2.json
@@ -1,5 +1,5 @@
 {
-  "name": "Level 1",
+  "name": "Level 2",
   "type": "ENCHANTMENT",
   "heroClass": "ANY",
   "rarity": "LEGENDARY",
diff --git a/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_3.json b/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_3.json
@@ -1,5 +1,5 @@
 {
-  "name": "Level 1",
+  "name": "Level 3",
   "type": "ENCHANTMENT",
   "heroClass": "ANY",
   "rarity": "LEGENDARY",
diff --git a/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_4.json b/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_4.json
@@ -1,5 +1,5 @@
 {
-  "name": "Level 1",
+  "name": "Level 4",
   "type": "ENCHANTMENT",
   "heroClass": "ANY",
   "rarity": "LEGENDARY",
diff --git a/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_5.json b/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_5.json
@@ -1,5 +1,5 @@
 {
-  "name": "Level 1",
+  "name": "Level 5",
   "type": "ENCHANTMENT",
   "heroClass": "ANY",
   "rarity": "LEGENDARY",
diff --git a/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_6.json b/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_6.json
@@ -1,5 +1,5 @@
 {
-  "name": "Level 1",
+  "name": "Level 6",
   "type": "ENCHANTMENT",
   "heroClass": "ANY",
   "rarity": "LEGENDARY",
diff --git a/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_7.json b/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_7.json
@@ -1,5 +1,5 @@
 {
-  "name": "Level 1",
+  "name": "Level 7",
   "type": "ENCHANTMENT",
   "heroClass": "ANY",
   "rarity": "LEGENDARY",
diff --git a/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_8.json b/spellsource-cards-git/src/main/resources/cards/uncollectible/rogue/level_8.json
@@ -1,5 +1,5 @@
 {
-  "name": "Level 1",
+  "name": "Level 8",
   "type": "ENCHANTMENT",
   "heroClass": "ANY",
   "rarity": "LEGENDARY",
diff --git a/spellsource-game/src/main/java/net/demilich/metastone/game/entities/heroes/HeroClass.java b/spellsource-game/src/main/java/net/demilich/metastone/game/entities/heroes/HeroClass.java
@@ -36,6 +36,7 @@ public class HeroClass {
 	public static final String TWILIGHT = "TWILIGHT";
 	public static final String CANDY = "CANDY";
 	public static final String PEACH = "PEACH";
+	public static final String TOAST = "TOAST";
 
 
 	/**
diff --git a/spellsource-graphql/graphql/client/fragments/rogueChoice.graphql b/spellsource-graphql/graphql/client/fragments/rogueChoice.graphql
@@ -0,0 +1,6 @@
+fragment rogueChoice on RogueChoice {
+    id
+    cards
+    canPick
+    canReroll
+}
diff --git a/spellsource-graphql/graphql/client/fragments/rogueRun.graphql b/spellsource-graphql/graphql/client/fragments/rogueRun.graphql
@@ -7,13 +7,9 @@ fragment rogueRun on RogueRun {
     startedAt
     gold
     deck
-    opponentDeck
-    deckByDeck {
-        ...deck
-        ...deckCards
-    }
     currentChoice {
-        cards
-        canPick
+        ...rogueChoice
     }
+    opponentDeck
+    opponentInfo
 }
diff --git a/spellsource-graphql/graphql/client/mutations/resignRogueRun.graphql b/spellsource-graphql/graphql/client/mutations/resignRogueRun.graphql
@@ -0,0 +1,5 @@
+mutation resignRogueRun($rogueId: BigInt!) {
+    resignRogueRun(input: {rogueId: $rogueId}) {
+        __typename
+    }
+}
diff --git a/spellsource-graphql/graphql/client/mutations/skipBoss.graphql b/spellsource-graphql/graphql/client/mutations/skipBoss.graphql
@@ -0,0 +1,5 @@
+mutation skipBoss($rogueId: BigInt!) {
+    skipBoss(rogueId: $rogueId) {
+        ...rogueRun
+    }
+}
diff --git a/spellsource-graphql/graphql/client/queries/getRogueBot.graphql b/spellsource-graphql/graphql/client/queries/getRogueBot.graphql
diff --git a/spellsource-graphql/package.json b/spellsource-graphql/package.json
@@ -21,10 +21,12 @@
     "dotenv": "^16.4.7",
     "express": "^4.21.2",
     "graphql": "16.8.1",
+    "graphql-ws": "^6.0.6",
     "jsonwebtoken": "^9.0.2",
     "jwks-rsa": "^3.1.0",
     "postgraphile": "^5.0.0-beta.37",
-    "postgraphile-plugin-connection-filter": "^3.0.0-beta.1"
+    "postgraphile-plugin-connection-filter": "^3.0.0-beta.1",
+    "ws": "^8.18.3"
   },
   "devDependencies": {
     "@graphql-codegen/c-sharp": "^5.1.0",
@@ -39,6 +41,7 @@
     "@graphql-codegen/typescript-resolvers": "^3.1.1",
     "@types/cors": "^2.8.14",
     "@types/jsonwebtoken": "^9",
+    "@types/ws": "^8",
     "nodemon": "^3.1.9",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3"
diff --git a/spellsource-graphql/schema.graphql b/spellsource-graphql/schema.graphql
@@ -460,6 +460,12 @@ type Mutation {
     """
     input: ArchiveCardInput!
   ): ArchiveCardPayload
+  resignRogueRun(
+    """
+    The exclusive input argument for this mutation. An object type, make sure to see documentation for this object’s fields.
+    """
+    input: ResignRogueRunInput!
+  ): ResignRogueRunPayload
   publishCard(
     """
     The exclusive input argument for this mutation. An object type, make sure to see documentation for this object’s fields.
@@ -654,6 +660,7 @@ type Mutation {
   makeRogueChoice(choiceId: BigInt!, choices: [Int!]!): RogueRun!
   reroll(choiceId: BigInt!): RogueRun!
   trashCard(rogueId: BigInt!, cardId: String!): RogueRun!
+  skipBoss(rogueId: BigInt!): RogueRun!
 }
 
 """An object with a globally unique `ID`."""
@@ -1363,6 +1370,9 @@ input RogueRunFilter {
   """Filter by the object’s `gold` field."""
   gold: IntFilter
 
+  """Filter by the object’s `opponentInfo` field."""
+  opponentInfo: StringFilter
+
   """Filter by the object’s `rogueChoicesByRogueRun` relation."""
   rogueChoicesByRogueRun: RogueRunToManyRogueChoiceFilter
 
@@ -2063,6 +2073,7 @@ type RogueRun implements Node {
   A globally unique identifier. Can be used in various places throughout the system to identify this single value.
   """
   nodeId: ID!
+  opponentInfo: String
   currentChoice: RogueChoice
   id: BigInt!
   player: String!
@@ -2316,6 +2327,9 @@ input RogueRunCondition {
 
   """Checks for equality with the object’s `gold` field."""
   gold: Int
+
+  """Checks for equality with the object’s `opponentInfo` field."""
+  opponentInfo: String
 }
 
 """A `CardsInDeck` edge in the connection."""
@@ -2941,6 +2955,30 @@ input ArchiveCardInput {
   cardId: String
 }
 
+"""The output of our `resignRogueRun` mutation."""
+type ResignRogueRunPayload {
+  """
+  The exact same `clientMutationId` that was provided in the mutation input,
+  unchanged and unused. May be used by a client to track mutations.
+  """
+  clientMutationId: String
+
+  """
+  Our root query field type. Allows us to run any query from our mutation payload.
+  """
+  query: Query
+}
+
+"""All input for the `resignRogueRun` mutation."""
+input ResignRogueRunInput {
+  """
+  An arbitrary string value with no semantic meaning. Will be included in the
+  payload verbatim. May be used to track mutations by the client.
+  """
+  clientMutationId: String
+  rogueId: BigInt
+}
+
 """The output of our `publishCard` mutation."""
 type PublishCardPayload {
   """
diff --git a/spellsource-graphql/src/apollo-server.ts b/spellsource-graphql/src/apollo-server.ts
@@ -4,19 +4,42 @@ import { ApolloServerPluginLandingPageDisabled } from "@apollo/server/plugin/dis
 import express, { Application, NextFunction, Request, Response } from "express";
 import { createFullSchema } from "./schema/stitching";
 import { AuthRequest } from "./auth";
+import { WebSocketServer } from "ws";
+import { Server } from "node:http";
+import { useServer } from "graphql-ws/use/ws";
+import { ApolloServerPluginDrainHttpServer } from "@apollo/server/plugin/drainHttpServer";
 
 type Handler = (req: Request, res: Response, next: NextFunction) => void;
 
-export const setupApolloServer = async (app: Application): Promise<ApolloServer> => {
+export const setupApolloServer = async (app: Application, httpServer: Server): Promise<ApolloServer> => {
   const schema = await createFullSchema();
 
   // const subscriptionServer = SubscriptionServer.create({ schema, execute, subscribe }, { server, path });
 
+  const wsServer = new WebSocketServer({
+    server: httpServer,
+    path: "/subscriptions",
+  });
+
+  const serverCleanup = useServer({ schema }, wsServer);
+
   const apolloServer = new ApolloServer({
     schema,
-    plugins: [ApolloServerPluginLandingPageDisabled()]
-
+    plugins: [
+      ApolloServerPluginLandingPageDisabled(),
+      ApolloServerPluginDrainHttpServer({ httpServer }),
+      {
+        async serverWillStart() {
+          return {
+            async drainServer() {
+              await serverCleanup.dispose();
+            },
+          };
+        },
+      },
+    ],
   });
+
   await apolloServer.start();
 
   if (process.env.NODE_ENV === "production") {
@@ -26,8 +49,8 @@ export const setupApolloServer = async (app: Application): Promise<ApolloServer>
     "/graphql",
     express.json(),
     expressMiddleware(apolloServer, {
-      context: async ({ req }) => (req as AuthRequest)
-    })
+      context: async ({ req }) => req as AuthRequest,
+    }),
   );
 
   return apolloServer;
@@ -40,4 +63,4 @@ const addGraphiqlHeaders: Handler = (req, res, next) => {
   res.setHeader("access-control-allow-methods", "POST");
 
   next();
-};
+};
diff --git a/spellsource-graphql/src/graphile.config.ts b/spellsource-graphql/src/graphile.config.ts
@@ -13,43 +13,46 @@ export const pgPool = new Pool({
   host: pgHost,
   database: pgDatabase,
   port: pgPort,
-  connectionTimeoutMillis: 1000 // Set connection timeout to 1 second,
+  connectionTimeoutMillis: 1000, // Set connection timeout to 1 second,
 });
 
 const preset: GraphileConfig.Preset = {
   extends: [
     PostGraphileAmberPreset,
     makeV4Preset({
       dynamicJson: true,
-      subscriptions: true
+      subscriptions: true,
     }),
-    PostGraphileConnectionFilterPreset
+    PostGraphileConnectionFilterPreset,
   ],
   plugins: [PgOmitArchivedPlugin],
   schema: {
     dontSwallowErrors: true,
     retryOnInitFail: true,
     /*exportSchemaSDLPath: "schema.graphql",*/
     pgArchivedColumnName: "is_archived",
-    connectionFilterAllowNullInput: true
+    connectionFilterAllowNullInput: true,
+  },
+  grafserv: {
+    websockets: true,
   },
   pgServices: [
     makePgService({
       schemas: ["spellsource"],
       pubsub: true,
       pool: pgPool,
-      pgSettingsForIntrospection: ({
-        role: "website"
-      }),
+      pgSettingsForIntrospection: {
+        role: "website",
+      },
       pgSettings: (ctx) => {
         const req = ctx as unknown as AuthRequest;
         return {
           role: req.admin ? "admin" : req.auth ? "website" : undefined, // TODO use different roles for website / client / server ? or just rename role to "user"
-          "user.id": req.auth?.sub ?? ""
+          "user.id": req.auth?.sub ?? "",
         };
-      }
-    })
-  ]
+      },
+    }),
+  ],
 };
 
 export default preset;
diff --git a/spellsource-graphql/src/server.ts b/spellsource-graphql/src/server.ts
@@ -21,8 +21,7 @@ import { setupApolloServer } from "./apollo-server";
   app.use(`/graphql`, authenticate);
 
   const server = createServer(app);
-  server.on("error", () => {
-  });
+  server.on("error", () => {});
   server.listen(graphqlPort, graphqlHost);
   console.log(`Server listening at http://${graphqlHost}:${graphqlPort}`);
 
@@ -42,8 +41,7 @@ import { setupApolloServer } from "./apollo-server";
     }
   }
 
-
-  await setupApolloServer(app);
+  await setupApolloServer(app, server);
 
   console.log("Postgraphile ready");
 })();
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/Legacy.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/Legacy.java
@@ -345,7 +345,7 @@ public Future<DecksGetResponse> duplicateDeck(GrpcServerRequest<StringValue, Dec
 		}::bindAll;
 	}
 
-	private static Future<Boolean> invalidateDeck(String deckId) {
+	public static Future<Boolean> invalidateDeck(String deckId) {
 		return Future.fromCompletionStage(getBucketForDeck(deckId).deleteAsync(), Vertx.currentContext());
 	}
 
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/graphql/MutationResolver.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/graphql/MutationResolver.java
@@ -11,4 +11,6 @@ public interface MutationResolver {
 
     io.vertx.core.Future<RogueRun> trashCard(java.lang.Long rogueId, String cardId) throws Exception;
 
+    io.vertx.core.Future<RogueRun> skipBoss(java.lang.Long rogueId) throws Exception;
+
 }
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/GraphQLMutationResolverImpl.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/GraphQLMutationResolverImpl.java
@@ -29,4 +29,9 @@ public Future<RogueRun> reroll(Long choiceId) throws Exception {
 	public Future<RogueRun> trashCard(Long rogueId, String cardId) throws Exception {
 		return RogueManager.trashCard(rogueId, cardId).map(RogueRun::new);
 	}
+
+	@Override
+	public Future<RogueRun> skipBoss(Long rogueId) throws Exception {
+		return RogueManager.skipBoss(rogueId).map(r -> new com.hiddenswitch.framework.graphql.RogueRun(r.getId()));
+	}
 }
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/GraphQLQueryResolverImpl.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/GraphQLQueryResolverImpl.java
@@ -22,6 +22,6 @@ public Future<Integer> rerollCost(Long rogueId) throws Exception {
 
 	@Override
 	public Future<List<String>> currentRogueClasses() throws Exception {
-		return Future.succeededFuture(List.of(HeroClass.COPPER));
+		return Future.succeededFuture(List.of(HeroClass.COPPER, HeroClass.TOAST));
 	}
 }
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/RogueManager.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/RogueManager.java
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/SqlCachedCardCatalogue.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/SqlCachedCardCatalogue.java
diff --git a/spellsource-server/src/main/resources/db/migration/V12__Rogue.sql b/spellsource-server/src/main/resources/db/migration/V12__Rogue.sql
diff --git a/spellsource-server/src/main/resources/schema.graphqls b/spellsource-server/src/main/resources/schema.graphqls
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`	`"WHAT_LIES_BENEATH",`
`43`	`43`	`"SOURCESTORM",`
`44`	`44`	`"CORE",`
`45`		`- "CUSTOM"`
	`45`	`+ "CUSTOM",`
	`46`	`+ "ROGUE"`
`46`	`47`	`]`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "Level 1",`
	`2`	`+ "name": "Level 2",`
`3`	`3`	`"type": "ENCHANTMENT",`
`4`	`4`	`"heroClass": "ANY",`
`5`	`5`	`"rarity": "LEGENDARY",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "Level 1",`
	`2`	`+ "name": "Level 3",`
`3`	`3`	`"type": "ENCHANTMENT",`
`4`	`4`	`"heroClass": "ANY",`
`5`	`5`	`"rarity": "LEGENDARY",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "Level 1",`
	`2`	`+ "name": "Level 4",`
`3`	`3`	`"type": "ENCHANTMENT",`
`4`	`4`	`"heroClass": "ANY",`
`5`	`5`	`"rarity": "LEGENDARY",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "Level 1",`
	`2`	`+ "name": "Level 5",`
`3`	`3`	`"type": "ENCHANTMENT",`
`4`	`4`	`"heroClass": "ANY",`
`5`	`5`	`"rarity": "LEGENDARY",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "Level 1",`
	`2`	`+ "name": "Level 6",`
`3`	`3`	`"type": "ENCHANTMENT",`
`4`	`4`	`"heroClass": "ANY",`
`5`	`5`	`"rarity": "LEGENDARY",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "Level 1",`
	`2`	`+ "name": "Level 7",`
`3`	`3`	`"type": "ENCHANTMENT",`
`4`	`4`	`"heroClass": "ANY",`
`5`	`5`	`"rarity": "LEGENDARY",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "Level 1",`
	`2`	`+ "name": "Level 8",`
`3`	`3`	`"type": "ENCHANTMENT",`
`4`	`4`	`"heroClass": "ANY",`
`5`	`5`	`"rarity": "LEGENDARY",`