Further graphql additions

doombubbles · doombubbles · commit 6d57d60232a3 · 2026-04-16T18:40:18.000-07:00
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/spellsource-client/src/unity b/spellsource-client/src/unity
@@ -1 +1 @@
-Subproject commit aa4708b52e493211b3a61d89ca6ac74050eabb35
+Subproject commit f4a1faadaf8aad7153760190f71d43be4b20d4c3
diff --git a/spellsource-graphql/graphql/shared/fragments/gameState.graphql b/spellsource-graphql/graphql/shared/fragments/gameState.graphql
@@ -6,4 +6,29 @@ fragment gameState on GameState {
   turnNumber
   turnState
   timestamp
+  hasPowerHistory
+  powerHistory {
+    eventType
+    id
+    description
+    isPowerHistory
+    isSourcePlayerLocal
+    isTargetPlayerLocal
+    source {
+      ...entitySummary
+    }
+    target {
+      ...entitySummary
+    }
+    targets {
+      ...entitySummary
+    }
+    value
+    cardEvent {
+      card {
+        ...entitySummary
+      }
+      showLocal
+    }
+  }
 }
diff --git a/spellsource-graphql/graphql/shared/mutations/addFriend.graphql b/spellsource-graphql/graphql/shared/mutations/addFriend.graphql
@@ -0,0 +1,8 @@
+mutation addFriend($friendId: String, $usernameWithToken: String) {
+  addFriend(friendId: $friendId, usernameWithToken: $usernameWithToken) {
+    friendId
+    friendName
+    presence
+    since
+  }
+}
diff --git a/spellsource-graphql/graphql/shared/mutations/connectToGame.graphql b/spellsource-graphql/graphql/shared/mutations/connectToGame.graphql
@@ -1,3 +1,3 @@
-mutation connectToGame($playerKey: String!, $playerSecret: String!) {
+mutation connectToGame($playerKey: String, $playerSecret: String) {
   connectToGame(playerKey: $playerKey, playerSecret: $playerSecret)
 }
diff --git a/spellsource-graphql/graphql/shared/mutations/deleteEditableCard.graphql b/spellsource-graphql/graphql/shared/mutations/deleteEditableCard.graphql
@@ -0,0 +1,3 @@
+mutation deleteEditableCard($editableCardId: String!) {
+  deleteCard(editableCardId: $editableCardId)
+}
diff --git a/spellsource-graphql/graphql/shared/mutations/putCard.graphql b/spellsource-graphql/graphql/shared/mutations/putCard.graphql
@@ -0,0 +1,7 @@
+mutation putCard($input: PutCardInput!) {
+  putCard(input: $input) {
+    cardId
+    editableCardId
+    cardScriptErrors
+  }
+}
diff --git a/spellsource-graphql/graphql/shared/mutations/removeFriend.graphql b/spellsource-graphql/graphql/shared/mutations/removeFriend.graphql
@@ -0,0 +1,3 @@
+mutation removeFriend($friendId: String!) {
+  removeFriend(friendId: $friendId)
+}
diff --git a/spellsource-graphql/package.json b/spellsource-graphql/package.json
@@ -26,6 +26,7 @@
     "jwks-rsa": "^3.1.0",
     "postgraphile": "^5.0.0-beta.37",
     "postgraphile-plugin-connection-filter": "^3.0.0-beta.1",
+    "subscriptions-transport-ws": "^0.11.0",
     "ws": "^8.18.3"
   },
   "devDependencies": {
diff --git a/spellsource-graphql/schema.graphql b/spellsource-graphql/schema.graphql
@@ -707,7 +707,7 @@ type Mutation {
   """
   Connect to an active game. Must be called before gameMessages subscription will emit.
   """
-  connectToGame(playerKey: String!, playerSecret: String!): Boolean!
+  connectToGame(playerKey: String, playerSecret: String): Boolean!
 
   """Send a game action in response to an ON_REQUEST_ACTION message."""
   sendGameAction(actionIndex: Int!, repliesTo: String!): Boolean!
@@ -794,6 +794,7 @@ type PublishedCard implements Node {
   ): CardsInDecksConnection!
 }
 
+"""A 64-bit integer serialized as a string for JavaScript compatibility"""
 scalar BigInt
 
 type Card implements Node {
@@ -4407,6 +4408,8 @@ type GameState {
   turnNumber: Int!
   turnState: String!
   timestamp: BigInt!
+  powerHistory: [GameEvent!]
+  hasPowerHistory: Boolean!
 }
 
 type GetCardsResponse {
diff --git a/spellsource-graphql/src/apollo-server.ts b/spellsource-graphql/src/apollo-server.ts
@@ -6,22 +6,50 @@ import { createFullSchema } from "./schema/stitching";
 import { AuthRequest } from "./auth";
 import { WebSocketServer } from "ws";
 import { Server } from "node:http";
+import { GRAPHQL_TRANSPORT_WS_PROTOCOL } from "graphql-ws";
 import { useServer } from "graphql-ws/use/ws";
+import { execute, subscribe } from "graphql";
+import { GRAPHQL_WS, SubscriptionServer } from "subscriptions-transport-ws";
 import { ApolloServerPluginDrainHttpServer } from "@apollo/server/plugin/drainHttpServer";
 
 type Handler = (req: Request, res: Response, next: NextFunction) => void;
 
 export const setupApolloServer = async (app: Application, httpServer: Server): Promise<ApolloServer> => {
   const schema = await createFullSchema();
 
-  // const subscriptionServer = SubscriptionServer.create({ schema, execute, subscribe }, { server, path });
+  // Modern graphql-transport-ws protocol (graphql-ws library)
+  const graphqlWsServer = new WebSocketServer({ noServer: true });
+  const serverCleanup = useServer({ schema }, graphqlWsServer);
 
-  const wsServer = new WebSocketServer({
-    server: httpServer,
-    path: "/subscriptions",
-  });
+  // Legacy graphql-ws subprotocol (subscriptions-transport-ws library) — for Strawberry Shake clients
+  const legacyWsServer = new WebSocketServer({ noServer: true });
+  SubscriptionServer.create(
+    {
+      schema,
+      execute: execute as any,
+      subscribe: subscribe as any,
+    },
+    legacyWsServer,
+  );
+
+  // Route WebSocket upgrade requests to the correct subprotocol handler
+  httpServer.on("upgrade", (req, socket, head) => {
+    if (!req.url?.startsWith("/subscriptions")) return;
 
-  const serverCleanup = useServer({ schema }, wsServer);
+    const protocolHeader = req.headers["sec-websocket-protocol"];
+    const protocols = Array.isArray(protocolHeader)
+      ? protocolHeader
+      : protocolHeader?.split(",").map((p) => p.trim());
+
+    const wss =
+      protocols?.includes(GRAPHQL_WS) && !protocols.includes(GRAPHQL_TRANSPORT_WS_PROTOCOL)
+        ? legacyWsServer
+        : graphqlWsServer;
+
+    wss.handleUpgrade(req, socket, head, (ws) => {
+      wss.emit("connection", ws, req);
+    });
+  });
 
   const apolloServer = new ApolloServer({
     schema,
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/Broadcaster.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/Broadcaster.java
@@ -55,9 +55,7 @@ private DatagramSocket createDatagramSocket(final NetworkInterface networkInterf
 						}
 
 						LOGGER.info("createDatagramSocket: Replying to datagram received from " + packet.sender().toString());
-						// Reply with the local base path
-						var host = Environment.getHostIpAddress();
-						socket.send(getResponsePrefix() + "http://" + host + ":" + Gateway.defaultGrpcPort(), packet.sender().port(), packet.sender().host());
+						socket.send(getResponsePrefix() + Environment.getConfiguration().getGraphql().getUrl(), packet.sender().port(), packet.sender().host());
 					});
 					isListening.complete();
 					LOGGER.info("Broadcaster listening on port " + multicastAddress + ":" + getMulticastPort());
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/GraphQL.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/GraphQL.java
@@ -9,7 +9,14 @@
 import com.hiddenswitch.framework.virtual.concurrent.AbstractVirtualThreadVerticle;
 import graphql.kickstart.tools.SchemaParser;
 import graphql.kickstart.tools.SchemaParserOptions;
+import graphql.language.IntValue;
+import graphql.language.StringValue;
 import graphql.scalars.ExtendedScalars;
+import graphql.schema.Coercing;
+import graphql.schema.CoercingParseLiteralException;
+import graphql.schema.CoercingParseValueException;
+import graphql.schema.CoercingSerializeException;
+import graphql.schema.GraphQLScalarType;
 import io.vertx.core.Future;
 import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.json.JsonObject;
@@ -50,7 +57,36 @@ public void startVirtual() throws Exception {
 						.build())
 				.resolvers(new GraphQLQueryResolverImpl(cardCatalogue), new GraphQLMutationResolverImpl(cardCatalogue), new GraphQLSubscriptionResolverImpl())
 				.scalars(
-						ExtendedScalars.newAliasedScalar("BigInt").aliasedScalar(ExtendedScalars.GraphQLLong).build(),
+						GraphQLScalarType.newScalar()
+								.name("BigInt")
+								.description("A 64-bit integer serialized as a string for JavaScript compatibility")
+								.coercing(new Coercing<Long, String>() {
+									@Override
+									public String serialize(Object input) throws CoercingSerializeException {
+										if (input instanceof Long l) return l.toString();
+										if (input instanceof Integer i) return Integer.toString(i);
+										if (input instanceof Number n) return Long.toString(n.longValue());
+										if (input instanceof String s) return s;
+										throw new CoercingSerializeException("Cannot serialize " + input + " as BigInt");
+									}
+
+									@Override
+									public Long parseValue(Object input) throws CoercingParseValueException {
+										if (input instanceof Long l) return l;
+										if (input instanceof Integer i) return i.longValue();
+										if (input instanceof Number n) return n.longValue();
+										if (input instanceof String s) return Long.parseLong(s);
+										throw new CoercingParseValueException("Cannot parse " + input + " as BigInt");
+									}
+
+									@Override
+									public Long parseLiteral(Object input) throws CoercingParseLiteralException {
+										if (input instanceof IntValue v) return v.getValue().longValueExact();
+										if (input instanceof StringValue v) return Long.parseLong(v.getValue());
+										throw new CoercingParseLiteralException("Cannot parse literal " + input + " as BigInt");
+									}
+								})
+								.build(),
 						ExtendedScalars.DateTime
 				)
 				.build()
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/graphql/GameState.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/graphql/GameState.java
@@ -10,16 +10,20 @@ public class GameState implements java.io.Serializable {
     private int turnNumber;
     private String turnState;
     private java.lang.Long timestamp;
+    private java.util.List<GameEvent> powerHistory;
+    private boolean hasPowerHistory;
 
     public GameState() {
     }
 
-    public GameState(java.util.List<Entity> entities, boolean isLocalPlayerTurn, int turnNumber, String turnState, java.lang.Long timestamp) {
+    public GameState(java.util.List<Entity> entities, boolean isLocalPlayerTurn, int turnNumber, String turnState, java.lang.Long timestamp, java.util.List<GameEvent> powerHistory, boolean hasPowerHistory) {
         this.entities = entities;
         this.isLocalPlayerTurn = isLocalPlayerTurn;
         this.turnNumber = turnNumber;
         this.turnState = turnState;
         this.timestamp = timestamp;
+        this.powerHistory = powerHistory;
+        this.hasPowerHistory = hasPowerHistory;
     }
 
     public java.util.List<Entity> getEntities() {
@@ -57,6 +61,20 @@ public void setTimestamp(java.lang.Long timestamp) {
         this.timestamp = timestamp;
     }
 
+    public java.util.List<GameEvent> getPowerHistory() {
+        return powerHistory;
+    }
+    public void setPowerHistory(java.util.List<GameEvent> powerHistory) {
+        this.powerHistory = powerHistory;
+    }
+
+    public boolean getHasPowerHistory() {
+        return hasPowerHistory;
+    }
+    public void setHasPowerHistory(boolean hasPowerHistory) {
+        this.hasPowerHistory = hasPowerHistory;
+    }
+
 
 
     public static GameState.Builder builder() {
@@ -70,6 +88,8 @@ public static class Builder {
         private int turnNumber;
         private String turnState;
         private java.lang.Long timestamp;
+        private java.util.List<GameEvent> powerHistory;
+        private boolean hasPowerHistory;
 
         public Builder() {
         }
@@ -99,9 +119,19 @@ public Builder setTimestamp(java.lang.Long timestamp) {
             return this;
         }
 
+        public Builder setPowerHistory(java.util.List<GameEvent> powerHistory) {
+            this.powerHistory = powerHistory;
+            return this;
+        }
+
+        public Builder setHasPowerHistory(boolean hasPowerHistory) {
+            this.hasPowerHistory = hasPowerHistory;
+            return this;
+        }
+
 
         public GameState build() {
-            return new GameState(entities, isLocalPlayerTurn, turnNumber, turnState, timestamp);
+            return new GameState(entities, isLocalPlayerTurn, turnNumber, turnState, timestamp, powerHistory, hasPowerHistory);
         }
 
     }
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/GraphQLGameBridge.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/impl/GraphQLGameBridge.java
@@ -114,6 +114,10 @@ private static GameState toGraphQLGameState(Spellsource.GameState proto) {
 				.setTurnNumber(proto.getTurnNumber())
 				.setTurnState(proto.getTurnState())
 				.setTimestamp(proto.getTimestamp())
+				.setPowerHistory(proto.getPowerHistoryList().stream()
+						.map(GraphQLGameBridge::toGraphQLEvent)
+						.collect(Collectors.toList()))
+				.setHasPowerHistory(proto.getHasPowerHistory())
 				.build();
 	}
 
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
diff --git a/spellsource-server/src/main/resources/schema.graphqls b/spellsource-server/src/main/resources/schema.graphqls
diff --git a/spellsource-web/src/__generated__/client.ts b/spellsource-web/src/__generated__/client.ts
diff --git a/vertx-jooq-fork b/vertx-jooq-fork
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-mutation connectToGame($playerKey: String!, $playerSecret: String!) {`
	`1`	`+mutation connectToGame($playerKey: String, $playerSecret: String) {`
`2`	`2`	`connectToGame(playerKey: $playerKey, playerSecret: $playerSecret)`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+mutation deleteEditableCard($editableCardId: String!) {`
	`2`	`+ deleteCard(editableCardId: $editableCardId)`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+mutation removeFriend($friendId: String!) {`
	`2`	`+ removeFriend(friendId: $friendId)`
	`3`	`+}`