wip

doctorpangloss · doctorpangloss · commit 52db127c9b48 · 2025-07-01T17:56:32.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 b39cabbd2f6b4007c68f9166c9074dbed5fd8dd8
+Subproject commit bba969634a663f55e59ec0aab500ade0f7fcaa19
diff --git a/spellsource-graphql/graphql/shared/queries/getCollectionCards.graphql b/spellsource-graphql/graphql/shared/queries/getCollectionCards.graphql
diff --git a/spellsource-graphql/src/graphile.config.ts b/spellsource-graphql/src/graphile.config.ts
@@ -28,6 +28,7 @@ const preset: GraphileConfig.Preset = {
   plugins: [PgOmitArchivedPlugin],
   grafserv: {
     graphiql: true,
+    websockets: true,
   },
   schema: {
     dontSwallowErrors: true,
diff --git a/spellsource-protos/src/main/csharp/HiddenSwitch/Framework/Sources/Hiddenswitch.cs b/spellsource-protos/src/main/csharp/HiddenSwitch/Framework/Sources/Hiddenswitch.cs
diff --git a/spellsource-protos/src/main/csharp/HiddenSwitch/Framework/Sources/Spellsource.cs b/spellsource-protos/src/main/csharp/HiddenSwitch/Framework/Sources/Spellsource.cs
@@ -33898,7 +33898,10 @@ public Sprite Clone() {
     public const int NamedFieldNumber = 1;
     private string named_ = "";
     /// <summary>
-    /// The sprite name in the client.
+    /// The address to retrieve the sprite.
+    /// When this is a plain string, this corresponds to a sprite name inside the Unity client.
+    /// Otherwise, this is treated as a URL.
+    /// The server will reject art in untrusted domains.
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
@@ -33913,7 +33916,7 @@ public string Named {
     public const int PivotFieldNumber = 2;
     private global::Spellsource.Proto.Sprite.Types.SpritePivot pivot_ = global::Spellsource.Proto.Sprite.Types.SpritePivot.Bottom;
     /// <summary>
-    /// The sprite's pivor point.
+    /// The sprite's pivot point.
     /// 
     ///  - BOTTOM: The center bottom of the sprite (i.e. 0.5, 1.0)
     ///  - DIMETRIC_2X1_FLOOR: Calculates the pivot point by ascending one pixel from the bottom for every four pixels
diff --git a/spellsource-protos/src/main/proto/hiddenswitch.proto b/spellsource-protos/src/main/proto/hiddenswitch.proto
@@ -95,9 +95,7 @@ message ServerConfiguration {
   }
 
   message GraphQLConfiguration {
-    string host = 1;
-    int32 port = 2;
-    string route = 3;
+    string url = 5;
   }
 
   PostgresConfiguration pg = 1;
@@ -123,7 +121,12 @@ message ClientConfiguration {
     string keycloakAccountManagementUrl = 2;
   }
 
+  message GraphQlConfiguration {
+    string graphQlUrl = 1;
+  }
+
   AccountsConfiguration accounts = 1;
+  GraphQlConfiguration graphQl = 2;
 }
 
 
diff --git a/spellsource-protos/src/main/proto/spellsource.proto b/spellsource-protos/src/main/proto/spellsource.proto
@@ -1521,10 +1521,13 @@ message Sprite {
         FLYING = 3;
     }
 
-    // The sprite name in the client.
+    // The address to retrieve the sprite.
+    // When this is a plain string, this corresponds to a sprite name inside the Unity client.
+    // Otherwise, this is treated as a URL.
+    // The server will reject art in untrusted domains.
     string named = 1;
 
-    // The sprite's pivor point.
+    // The sprite's pivot point.
     // 
     //  - BOTTOM: The center bottom of the sprite (i.e. 0.5, 1.0)
     //  - DIMETRIC_2X1_FLOOR: Calculates the pivot point by ascending one pixel from the bottom for every four pixels
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/Accounts.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/Accounts.java
@@ -56,19 +56,13 @@
 import static java.util.stream.Collectors.toMap;
 
 /**
- * Implements the account services from {@link AccountsApi} against Keycloak, the open source Java identity management
- * application.
+ * Implements the account services from {@link AccountsApi} against Keycloak, the open source Java identity management application.
  * <p>
  * In the server, a {@link Keycloak} instance is used to create and manage user accounts.
  * <p>
- * The client creates an account with {@link com.hiddenswitch.framework.rpc.VertxUnauthenticatedGrpcClient}. The access
- * token returned by the reply, {@link LoginOrCreateReply#getAccessTokenResponse()}'s
- * {@link AccessTokenResponse#getToken()}
+ * The client creates an account with {@link com.hiddenswitch.framework.rpc.VertxUnauthenticatedGrpcClient}. The access token returned by the reply, {@link LoginOrCreateReply#getAccessTokenResponse()}'s {@link AccessTokenResponse#getToken()}
  * <p>
- * Keycloak manages the migration of the {@link com.hiddenswitch.framework.schema.keycloak.Keycloak} SQL schema. The
- * {@link com.hiddenswitch.framework.schema.keycloak.tables.UserEntity} table's
- * {@link com.hiddenswitch.framework.schema.keycloak.tables.UserEntity#ID} field is the user ID used throughout the
- * application.
+ * Keycloak manages the migration of the {@link com.hiddenswitch.framework.schema.keycloak.Keycloak} SQL schema. The {@link com.hiddenswitch.framework.schema.keycloak.tables.UserEntity} table's {@link com.hiddenswitch.framework.schema.keycloak.tables.UserEntity#ID} field is the user ID used throughout the application.
  */
 public class Accounts {
 	public static final String SHOW_PREMADE_DECKS = "showPremadeDecks";
@@ -95,8 +89,7 @@ public class Accounts {
 	 *   }
 	 * </pre>
 	 * <p>
-	 * Since vertx code is typically async, the GRPC context's data is only valid in the first scope of the GRPC server
-	 * implementation.
+	 * Since vertx code is typically async, the GRPC context's data is only valid in the first scope of the GRPC server implementation.
 	 *
 	 * @return A {@link UserEntity} SQL model of a user record
 	 * @see #userId() when the user ID will suffice
@@ -127,8 +120,7 @@ var record = await(dao.findOneById(userId));
 	 *   }
 	 * </pre>
 	 * <p>
-	 * Since vertx code is typically async, the GRPC context's data is only valid in the first scope of the GRPC server
-	 * implementation.
+	 * Since vertx code is typically async, the GRPC context's data is only valid in the first scope of the GRPC server implementation.
 	 *
 	 * @return a user ID, or {@code null} if no token was retrieved
 	 */
@@ -263,6 +255,9 @@ public Future<ClientConfiguration> getConfiguration(Empty request) {
 								.setKeycloakResetPasswordUrl(URI.create(authUrl + KEYCLOAK_FORGOT_PASSWORD_PATH).normalize().toString())
 								.setKeycloakAccountManagementUrl(URI.create(authUrl + KEYCLOAK_LOGIN_PATH).normalize().toString())
 								.build())
+						.setGraphQl(ClientConfiguration.GraphQlConfiguration
+								.newBuilder()
+								.setGraphQlUrl(config.getGraphql().getUrl()))
 						.build());
 			}
 		}::bindAll;
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/Environment.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/Environment.java
@@ -565,17 +565,19 @@ public static NetworkInterface mainInterface() {
 			var isSelfAssigned = false;
 			var isHyperV = false;
 			var isMacOSBridgeNet = false;
+			var isTailscale = false;
 			try {
 				isSelfAssigned = ni.inetAddresses().anyMatch(i -> i.getHostAddress().startsWith("169"));
 				isLoopback = ni.isLoopback();
 				supportsMulticast = ni.supportsMulticast();
 				isVirtualbox = ni.getDisplayName().contains("VirtualBox") || ni.getDisplayName().contains("Host-Only");
 				isHyperV = ni.getDisplayName().contains("Hyper-V");
 				isMacOSBridgeNet = ni.getDisplayName().startsWith("bridge");
+				isTailscale = ni.getDisplayName().toLowerCase().contains("tailscale");
 			} catch (IOException failure) {
 			}
 			var hasIPv4 = ni.getInterfaceAddresses().stream().anyMatch(ia -> ia.getAddress() instanceof Inet4Address);
-			return supportsMulticast && !isSelfAssigned && !isLoopback && !ni.isVirtual() && hasIPv4 && !isVirtualbox && !isHyperV && !isMacOSBridgeNet;
+			return supportsMulticast && !isSelfAssigned && !isLoopback && !ni.isVirtual() && hasIPv4 && !isVirtualbox && !isHyperV && !isMacOSBridgeNet && !isTailscale;
 		}).sorted(Comparator.comparing(NetworkInterface::getName)).findFirst().orElse(null);
 	}
 
diff --git a/spellsource-server/src/main/java/com/hiddenswitch/framework/schema/spellsource/tables/Cards.java b/spellsource-server/src/main/java/com/hiddenswitch/framework/schema/spellsource/tables/Cards.java
diff --git a/spellsource-server/src/main/resources/db/ddl.sql b/spellsource-server/src/main/resources/db/ddl.sql
@@ -3,12 +3,11 @@
 --
 
 -- Dumped from database version 13.11 (Debian 13.11-1.pgdg110+1)
--- Dumped by pg_dump version 17.2 (Debian 17.2-1.pgdg120+1)
+-- Dumped by pg_dump version 13.11
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
-SET transaction_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
@@ -35,15 +34,6 @@ CREATE SCHEMA keycloak;
 
 ALTER SCHEMA keycloak OWNER TO admin;
 
---
--- Name: public; Type: SCHEMA; Schema: -; Owner: admin
---
-
--- *not* creating schema, since initdb creates it
-
-
-ALTER SCHEMA public OWNER TO admin;
-
 --
 -- Name: spellsource; Type: SCHEMA; Schema: -; Owner: admin
 --
@@ -533,7 +523,7 @@ CREATE VIEW spellsource.classes AS
    FROM spellsource.get_classes() get_classes(created_by, class, is_published, collectible, card_script, id, name);
 
 
-ALTER VIEW spellsource.classes OWNER TO admin;
+ALTER TABLE spellsource.classes OWNER TO admin;
 
 --
 -- Name: card_message(spellsource.cards, spellsource.classes); Type: FUNCTION; Schema: spellsource; Owner: admin
@@ -2525,7 +2515,7 @@ CREATE VIEW spellsource.collection_cards AS
    FROM spellsource.get_collection_cards() get_collection_cards(id, created_by, card_script, blockly_workspace, name, type, class, cost, collectible, search_message, last_modified, created_at);
 
 
-ALTER VIEW spellsource.collection_cards OWNER TO admin;
+ALTER TABLE spellsource.collection_cards OWNER TO admin;
 
 --
 -- Name: deck_player_attribute_tuples; Type: TABLE; Schema: spellsource; Owner: admin
@@ -5428,14 +5418,6 @@ CREATE POLICY website_view ON spellsource.decks FOR SELECT TO website USING (spe
 CREATE POLICY website_view ON spellsource.published_cards FOR SELECT USING (true);
 
 
---
--- Name: SCHEMA public; Type: ACL; Schema: -; Owner: admin
---
-
-REVOKE USAGE ON SCHEMA public FROM PUBLIC;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
 --
 -- Name: SCHEMA spellsource; Type: ACL; Schema: -; Owner: admin
 --
@@ -5498,7 +5480,7 @@ GRANT ALL ON FUNCTION spellsource.set_cards_in_deck(deck text, card_ids text[])
 -- Name: TABLE user_attribute; Type: ACL; Schema: keycloak; Owner: admin
 --
 
-GRANT SELECT,INSERT,REFERENCES,DELETE,TRIGGER,TRUNCATE,UPDATE ON TABLE keycloak.user_attribute TO website;
+GRANT ALL ON TABLE keycloak.user_attribute TO website;
 
 
 --
diff --git a/spellsource-server/src/main/resources/db/migration/V10__xxx_removed.sql b/spellsource-server/src/main/resources/db/migration/V10__xxx_removed.sql
diff --git a/spellsource-server/src/test/java/com/hiddenswitch/framework/tests/applications/StandaloneApplication.java b/spellsource-server/src/test/java/com/hiddenswitch/framework/tests/applications/StandaloneApplication.java
@@ -87,9 +87,7 @@ public static boolean defaultConfigurationAndServices() {
 				.setShouldMigrate(true)
 				.build());
 		configuration.setGraphql(ServerConfiguration.GraphQLConfiguration.newBuilder()
-				.setHost(GRAPHQL_HOST)
-				.setPort(GRAPHQL.getMappedPort(GraphQLContainer.GRAPHQL_PORT))
-				.setRoute("/graphql")
+				.setUrl(String.format("https://%s:%d/graphql", GRAPHQL_HOST, GRAPHQL.getMappedPort(GraphQLContainer.GRAPHQL_PORT)))
 		);
 		// todo: allow environment variables *only* to override this configuration, but something weird about kube env
 		// configuration.mergeFrom(Environment.environmentConfiguration());
@@ -117,7 +115,7 @@ public static boolean defaultConfigurationAndServices() {
 KEYCLOAK_ISSUER=http://localhost:\{KEYCLOAK.getMappedPort(KeycloakContainer.KEYCLOAK_PORT_HTTP)}/realms/hiddenswitch
 """;
 			FileUtils.writeStringToFile(envFile2, contents2, StandardCharsets.UTF_8);
-			
+
 		} catch (IOException e) {
 			LOGGER.error("Error occurred while writing the environment file for the website.");
 		}
diff --git a/spellsource-server/src/test/resources/logback-test.xml b/spellsource-server/src/test/resources/logback-test.xml
@@ -39,7 +39,7 @@
     <logger name="org.redisson" level="WARN" />
     <logger name="io.github.jklingsporn" level="ERROR" />
     <logger name="com.github.dockerjava" level="ERROR" />
-    <logger name="org.flywaydb" level="DEBUG"/>
+    <logger name="org.flywaydb" level="WARN"/>
     <logger name="org.jboss.resteasy.client.jaxrs.i18n" level="ERROR" />
     <logger name="org.redisson.connection.DNSMonitor" level="ERROR" />
 </configuration>

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,7 @@ message ServerConfiguration {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`message GraphQLConfiguration {`
`98`		`- string host = 1;`
`99`		`- int32 port = 2;`
`100`		`- string route = 3;`
	`98`	`+ string url = 5;`
`101`	`99`	`}`
`102`	`100`
`103`	`101`	`PostgresConfiguration pg = 1;`
`@@ -123,7 +121,12 @@ message ClientConfiguration {`
`123`	`121`	`string keycloakAccountManagementUrl = 2;`
`124`	`122`	`}`
`125`	`123`
	`124`	`+ message GraphQlConfiguration {`
	`125`	`+ string graphQlUrl = 1;`
	`126`	`+ }`
	`127`	`+`
`126`	`128`	`AccountsConfiguration accounts = 1;`
	`129`	`+ GraphQlConfiguration graphQl = 2;`
`127`	`130`	`}`
`128`	`131`
`129`	`132`