chore(lobbies): fix tests with stricter validation

rivet-gg · Sep 17, 2024 · 21c16e3 · 21c16e3
1 parent 84bb55b
commit 21c16e3
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 12 deletions.
diff --git a/modules/lobbies/scripts/list.ts b/modules/lobbies/scripts/list.ts
@@ -19,6 +19,10 @@ interface LobbyListEntry {
 	id: string;
   version: string;
   tags: Record<string, string>;
+  createdAt: string;
+  players: number;
+  maxPlayers: number;
+  maxPlayersDirect: number;
 }
 
 export async function run(
@@ -46,11 +50,11 @@ export async function run(
     id: lobby.id,
     version: lobby.version,
     tags: lobby.tags,
-    createdAt: lobby.createdAt,
+    createdAt: new Date(lobby.createdAt).toISOString(),
     players: lobby.players,
     maxPlayers: lobby.maxPlayers,
     maxPlayersDirect: lobby.maxPlayersDirect,
-  }));
+  } satisfies LobbyListEntry));
 
 	return { lobbies: lobbyList };
 }
diff --git a/modules/lobbies/tests/e2e.ts b/modules/lobbies/tests/e2e.ts
@@ -82,7 +82,7 @@ test("lobby tags", async (ctx: TestContext) => {
 		{
 			version: VERSION,
 			region: REGION,
-			tags: { gameMode: "a", region: "atl" },
+			tags: { gameMode: "a" },
 			players: [{}],
 			maxPlayers: 8,
 			maxPlayersDirect: 8,

diff --git a/modules/tokens/scripts/create.ts b/modules/tokens/scripts/create.ts
@@ -1,5 +1,5 @@
 import { ScriptContext, Database, Query } from "../module.gen.ts";
-import { TokenWithSecret, tokenFromRow } from "../utils/types.ts";
+import { TokenWithSecret, tokenFromRow, tokenWithSecretFromRow } from "../utils/types.ts";
 
 export interface Request {
 	type: string;
@@ -28,7 +28,7 @@ export async function run(
     .returning();
 
 	return {
-		token: tokenFromRow(rows[0]!),
+		token: tokenWithSecretFromRow(rows[0]!),
 	};
 }
 

diff --git a/modules/tokens/scripts/extend.ts b/modules/tokens/scripts/extend.ts
@@ -1,5 +1,5 @@
 import { ScriptContext, Query, Database } from "../module.gen.ts";
-import { tokenFromRow, TokenWithSecret } from "../utils/types.ts";
+import { tokenFromRow, TokenWithSecret, tokenWithSecretFromRow } from "../utils/types.ts";
 
 export interface Request {
 	token: string;
@@ -27,6 +27,6 @@ export async function run(
 
 	// Return the updated token
 	return {
-		token: tokenFromRow(rows[0]!),
+		token: tokenWithSecretFromRow(rows[0]!),
 	};
 }
diff --git a/modules/tokens/scripts/revoke.ts b/modules/tokens/scripts/revoke.ts
@@ -5,7 +5,7 @@ export interface Request {
 }
 
 export interface Response {
-	updates: { [key: string]: TokenUpdate };
+	updates: Record<string, TokenUpdate>;
 }
 
 export enum TokenUpdate {

diff --git a/modules/tokens/tests/validate.ts b/modules/tokens/tests/validate.ts
@@ -3,7 +3,8 @@ import {
 	assertEquals,
 	assertGreater,
 	assertRejects,
-} from "https://deno.land/[email protected]/assert/mod.ts";
+} from "jsr:@std/assert";
+import { omit } from "jsr:@std/collections";
 
 test(
 	"validate token not found",
@@ -95,7 +96,7 @@ test(
 			...validateResAfterWait.token,
 			expireAt: null,
 		}, {
-			...token,
+			...omit(token, ["token"]),
 			expireAt: null,
 		});
 	},

diff --git a/modules/tokens/utils/types.ts b/modules/tokens/utils/types.ts
@@ -15,11 +15,22 @@ export interface TokenWithSecret extends Token {
 
 export function tokenFromRow(
 	row: typeof Database.tokens.$inferSelect
-): TokenWithSecret {
+): Token {
 	return {
-		...row,
+    id: row.id,
+    type: row.type,
+    meta: row.meta,
 		createdAt: row.createdAt.toISOString(),
 		expireAt: row.expireAt?.toISOString() ?? null,
 		revokedAt: row.revokedAt?.toISOString() ?? null,
 	};
 }
+
+export function tokenWithSecretFromRow(
+	row: typeof Database.tokens.$inferSelect
+): TokenWithSecret {
+	return {
+    ...tokenFromRow(row),
+    token: row.token,
+	};
+}