@playcademy/vite-plugin 0.2.31 → 0.2.32-beta.1

package/dist/index.js

@@ -25370,7 +25370,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.3.16",
+    version: "0.3.17-beta.37",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -35349,6 +35349,9 @@ var gamePlatformEnum;
 var gameTypeEnum;
 var gameVisibilityEnum;
 var games;
+var gameMemberRoleEnum;
+var gameMembers;
+var gameMembersRelations;
 var gameSessions;
 var gameStates;
 var deploymentProviderEnum;
@@ -35360,6 +35363,7 @@ var customHostnameSslStatusEnum;
 var customHostnameEnvironmentEnum;
 var gameCustomHostnames;
 var init_table3 = __esm(() => {
+  init_drizzle_orm();
   init_pg_core();
   init_table5();
   init_table6();
@@ -35368,9 +35372,6 @@ var init_table3 = __esm(() => {
   gameVisibilityEnum = pgEnum("game_visibility", ["visible", "unlisted", "internal"]);
   games = pgTable("games", {
     id: uuid("id").primaryKey().defaultRandom(),
-    developerId: text("developer_id").references(() => users.id, {
-      onDelete: "set null"
-    }),
     slug: varchar("slug", { length: 255 }).notNull().unique(),
     displayName: varchar("display_name", { length: 255 }).notNull(),
     version: varchar("version", { length: 50 }).notNull(),
@@ -35386,6 +35387,24 @@ var init_table3 = __esm(() => {
     createdAt: timestamp("created_at", { withTimezone: true }).defaultNow(),
     updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow()
   });
+  gameMemberRoleEnum = pgEnum("game_member_role", ["owner", "collaborator"]);
+  gameMembers = pgTable("game_members", {
+    id: uuid("id").primaryKey().defaultRandom(),
+    gameId: uuid("game_id").notNull().references(() => games.id, { onDelete: "cascade" }),
+    userId: text("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
+    role: gameMemberRoleEnum("role").notNull().default("collaborator"),
+    createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
+  }, (table3) => [uniqueIndex("game_members_game_user_idx").on(table3.gameId, table3.userId)]);
+  gameMembersRelations = relations(gameMembers, ({ one }) => ({
+    game: one(games, {
+      fields: [gameMembers.gameId],
+      references: [games.id]
+    }),
+    user: one(users, {
+      fields: [gameMembers.userId],
+      references: [users.id]
+    })
+  }));
   gameSessions = pgTable("game_sessions", {
     id: uuid("id").primaryKey().defaultRandom(),
     userId: text("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
@@ -36223,6 +36242,9 @@ __export(exports_tables_index, {
   gameScoresRelations: () => gameScoresRelations,
   gameScores: () => gameScores,
   gamePlatformEnum: () => gamePlatformEnum,
+  gameMembersRelations: () => gameMembersRelations,
+  gameMembers: () => gameMembers,
+  gameMemberRoleEnum: () => gameMemberRoleEnum,
   gameDeployments: () => gameDeployments,
   gameDeployJobs: () => gameDeployJobs,
   gameCustomHostnames: () => gameCustomHostnames,
@@ -50643,29 +50665,33 @@ var init_game_service = __esm(() => {
       const db2 = this.deps.db;
       const isAdmin = caller?.role === "admin";
       const isDeveloper = caller?.role === "developer";
-      let whereClause;
       if (isAdmin) {
-        whereClause = undefined;
-      } else if (isDeveloper && caller?.id) {
-        whereClause = or(ne(games.visibility, "internal"), eq(games.developerId, caller.id));
-      } else {
-        whereClause = ne(games.visibility, "internal");
+        return db2.query.games.findMany({
+          orderBy: [desc(games.createdAt)]
+        });
+      }
+      if (isDeveloper && caller?.id) {
+        const rows = await db2.select().from(games).where(or(ne(games.visibility, "internal"), exists(db2.select({ one: sql`1` }).from(gameMembers).where(and(eq(gameMembers.gameId, games.id), eq(gameMembers.userId, caller.id)))))).orderBy(desc(games.createdAt));
+        return rows;
       }
       return db2.query.games.findMany({
-        where: whereClause,
+        where: ne(games.visibility, "internal"),
         orderBy: [desc(games.createdAt)]
       });
     }
-    async listManageable(user) {
+    async listAccessible(user) {
       const seesAllGames = user.role === "admin" || user.role === "teacher";
       if (!seesAllGames) {
         this.validateDeveloperStatus(user);
       }
       const db2 = this.deps.db;
-      return db2.query.games.findMany({
-        where: seesAllGames ? undefined : eq(games.developerId, user.id),
-        orderBy: [desc(games.createdAt)]
-      });
+      if (seesAllGames) {
+        return db2.query.games.findMany({
+          orderBy: [desc(games.createdAt)]
+        });
+      }
+      const rows = await db2.select({ games }).from(games).innerJoin(gameMembers, eq(gameMembers.gameId, games.id)).where(eq(gameMembers.userId, user.id)).orderBy(desc(games.createdAt));
+      return rows.map((r) => r.games);
     }
     async getSubjects() {
       const db2 = this.deps.db;
@@ -50689,7 +50715,7 @@ var init_game_service = __esm(() => {
       if (!game) {
         throw new NotFoundError("Game", gameId);
       }
-      this.enforceVisibility(game, caller, gameId);
+      await this.enforceVisibility(game, caller, gameId);
       return game;
     }
     async getBySlug(slug, caller) {
@@ -50700,7 +50726,7 @@ var init_game_service = __esm(() => {
       if (!game) {
         throw new NotFoundError("Game", slug);
       }
-      this.enforceVisibility(game, caller, slug);
+      await this.enforceVisibility(game, caller, slug);
       return game;
     }
     async getManifest(gameId, caller) {
@@ -50866,15 +50892,20 @@ var init_game_service = __esm(() => {
         };
       }
     }
-    enforceVisibility(game, caller, lookupIdentifier) {
+    async enforceVisibility(game, caller, lookupIdentifier) {
       if (game.visibility !== "internal") {
         return;
       }
-      const isAdmin = caller?.role === "admin";
-      const isOwner = caller?.id != null && caller.id === game.developerId;
-      if (!isAdmin && !isOwner) {
+      if (!caller) {
         throw new NotFoundError("Game", lookupIdentifier);
       }
+      if (caller.role === "admin") {
+        return;
+      }
+      if (await this.hasGameMembership(game.id, caller.id)) {
+        return;
+      }
+      throw new NotFoundError("Game", lookupIdentifier);
     }
     async upsertBySlug(slug, data, user) {
       const db2 = this.deps.db;
@@ -50911,17 +50942,24 @@ var init_game_service = __esm(() => {
           ...gameDataForDb,
           id: gameId,
           slug,
-          developerId: user.id,
           metadata: data.metadata || {},
           version: data.gameType === "external" ? "external" : "",
           deploymentUrl: null,
           createdAt: new Date
         };
-        const [createdGame] = await db2.insert(games).values(insertData).returning();
-        if (!createdGame) {
-          logger5.error("Game insert returned no rows", { slug, developerId: user.id });
-          throw new InternalError("DB insert failed to return result for new game");
-        }
+        const createdGame = await db2.transaction(async (tx) => {
+          const [game] = await tx.insert(games).values(insertData).returning();
+          if (!game) {
+            logger5.error("Game insert returned no rows", { slug, userId: user.id });
+            throw new InternalError("DB insert failed to return result for new game");
+          }
+          await tx.insert(gameMembers).values({
+            gameId: game.id,
+            userId: user.id,
+            role: "owner"
+          });
+          return game;
+        });
         gameResponse = createdGame;
       }
       if (data.mapElementId) {
@@ -51019,51 +51057,43 @@ var init_game_service = __esm(() => {
         displayName: gameToDelete.displayName
       };
     }
+    async hasGameMembership(gameId, userId) {
+      const membership = await this.deps.db.query.gameMembers.findFirst({
+        where: and(eq(gameMembers.gameId, gameId), eq(gameMembers.userId, userId)),
+        columns: { id: true }
+      });
+      return Boolean(membership);
+    }
     async validateOwnership(user, gameId) {
-      if (user.role === "admin") {
-        const gameExists = await this.deps.db.query.games.findFirst({
-          where: eq(games.id, gameId),
-          columns: { id: true }
-        });
-        if (!gameExists) {
-          throw new NotFoundError("Game", gameId);
-        }
-        return;
-      }
       const db2 = this.deps.db;
-      const gameOwnership = await db2.query.games.findFirst({
-        where: and(eq(games.id, gameId), eq(games.developerId, user.id)),
+      const gameExists = await db2.query.games.findFirst({
+        where: eq(games.id, gameId),
         columns: { id: true }
       });
-      if (!gameOwnership) {
-        const gameExists = await db2.query.games.findFirst({
-          where: eq(games.id, gameId),
-          columns: { id: true }
-        });
-        if (!gameExists) {
-          throw new NotFoundError("Game", gameId);
-        }
+      if (!gameExists) {
+        throw new NotFoundError("Game", gameId);
+      }
+      if (user.role === "admin") {
+        return;
+      }
+      if (!await this.hasGameMembership(gameId, user.id)) {
         throw new AccessDeniedError("You do not own this game");
       }
     }
     async validateDeveloperAccess(user, gameId) {
       this.validateDeveloperStatus(user);
-      if (user.role === "admin") {
-        const gameExists = await this.deps.db.query.games.findFirst({
-          where: eq(games.id, gameId),
-          columns: { id: true }
-        });
-        if (!gameExists) {
-          throw new NotFoundError("Game", gameId);
-        }
-        return;
-      }
       const db2 = this.deps.db;
-      const existingGame = await db2.query.games.findFirst({
-        where: and(eq(games.id, gameId), eq(games.developerId, user.id)),
+      const gameExists = await db2.query.games.findFirst({
+        where: eq(games.id, gameId),
         columns: { id: true }
       });
-      if (!existingGame) {
+      if (!gameExists) {
+        throw new NotFoundError("Game", gameId);
+      }
+      if (user.role === "admin") {
+        return;
+      }
+      if (!await this.hasGameMembership(gameId, user.id)) {
         throw new NotFoundError("Game", gameId);
       }
     }
@@ -51083,21 +51113,18 @@ var init_game_service = __esm(() => {
     async validateDeveloperAccessBySlug(user, slug) {
       this.validateDeveloperStatus(user);
       const db2 = this.deps.db;
-      if (user.role === "admin") {
-        const game2 = await db2.query.games.findFirst({
-          where: eq(games.slug, slug)
-        });
-        if (!game2) {
-          throw new NotFoundError("Game", slug);
-        }
-        return game2;
-      }
       const game = await db2.query.games.findFirst({
-        where: and(eq(games.slug, slug), eq(games.developerId, user.id))
+        where: eq(games.slug, slug)
       });
       if (!game) {
         throw new NotFoundError("Game", slug);
       }
+      if (user.role === "admin") {
+        return game;
+      }
+      if (!await this.hasGameMembership(game.id, user.id)) {
+        throw new NotFoundError("Game", slug);
+      }
       return game;
     }
     validateDeveloperStatus(user) {
@@ -58779,10 +58806,17 @@ class LogsService {
         throw new AccessDeniedError("Must be an approved developer");
       }
       const game = await db2.query.games.findFirst({
-        where: and(eq(games.slug, slug2), eq(games.developerId, user.id)),
+        where: eq(games.slug, slug2),
         columns: { id: true }
       });
       if (!game) {
+        throw new NotFoundError("Game", slug2);
+      }
+      const membership = await db2.query.gameMembers.findFirst({
+        where: and(eq(gameMembers.gameId, game.id), eq(gameMembers.userId, user.id)),
+        columns: { id: true }
+      });
+      if (!membership) {
         logger28.warn("Developer attempted access to unowned game logs", {
           userId: user.id,
           slug: slug2
@@ -120320,7 +120354,6 @@ async function seedCoreGames(db2) {
   const coreGames = [
     {
       id: CORE_GAME_UUIDS.PLAYGROUND,
-      developerId: DEMO_USERS.developer.id,
       slug: "playground",
       displayName: "Playground",
       version: "local",
@@ -120337,6 +120370,11 @@ async function seedCoreGames(db2) {
   for (const gameData of coreGames) {
     try {
       await db2.insert(games).values(gameData).onConflictDoNothing();
+      await db2.insert(gameMembers).values({
+        gameId: gameData.id,
+        userId: DEMO_USERS.developer.id,
+        role: "owner"
+      }).onConflictDoNothing();
     } catch (error2) {
       logger37.error(`Error seeding core game '${gameData.slug}': ${error2}`);
     }
@@ -120361,7 +120399,6 @@ async function seedCurrentProjectGame(db2, project) {
     }
     const gameRecord = {
       id: desiredGameId ?? crypto.randomUUID(),
-      developerId: DEMO_USERS.developer.id,
       slug: project.slug,
       displayName: project.displayName,
       version: project.version,
@@ -120379,6 +120416,11 @@ async function seedCurrentProjectGame(db2, project) {
     if (!newGame) {
       throw new Error("Failed to create game record");
     }
+    await db2.insert(gameMembers).values({
+      gameId: newGame.id,
+      userId: DEMO_USERS.developer.id,
+      role: "owner"
+    }).onConflictDoNothing();
     if (project.timebackCourses && project.timebackCourses.length > 0) {
       await seedTimebackIntegrations(db2, newGame.id, project.timebackCourses);
     }
@@ -121371,7 +121413,6 @@ var init_schemas2 = __esm(() => {
     id: true,
     slug: true,
     createdAt: true,
-    developerId: true,
     version: true
   }).refine((data) => {
     if (data.gameType === "hosted" && data.deploymentUrl === null) {
@@ -122806,7 +122847,7 @@ var init_domain_controller = __esm(() => {
 });
 var logger48;
 var list3;
-var listManageable;
+var listAccessible;
 var getSubjects;
 var getById2;
 var getBySlug;
@@ -122826,9 +122867,9 @@ var init_game_controller = __esm(() => {
     logger48.debug("Listing games", { userId: ctx.user.id });
     return ctx.services.game.list(ctx.user);
   });
-  listManageable = requireNonAnonymous(async (ctx) => {
-    logger48.debug("Listing manageable games", { userId: ctx.user.id });
-    return ctx.services.game.listManageable(ctx.user);
+  listAccessible = requireNonAnonymous(async (ctx) => {
+    logger48.debug("Listing accessible games", { userId: ctx.user.id });
+    return ctx.services.game.listAccessible(ctx.user);
   });
   getSubjects = requireNonAnonymous(async (ctx) => {
     logger48.debug("Getting game subjects", { userId: ctx.user.id });
@@ -122901,7 +122942,7 @@ var init_game_controller = __esm(() => {
   });
   games2 = {
     list: list3,
-    listManageable,
+    listAccessible,
     getSubjects,
     getById: getById2,
     getManifest,
@@ -125090,6 +125131,7 @@ var init_crud = __esm(() => {
   init_api();
   gameCrudRouter = new Hono2;
   gameCrudRouter.get("/", handle2(games2.list));
+  gameCrudRouter.get("/accessible", handle2(games2.listAccessible));
   gameCrudRouter.get("/:gameId{[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}}/manifest", handle2(games2.getManifest));
   gameCrudRouter.get("/:gameId{[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}}", handle2(games2.getById));
   gameCrudRouter.get("/:slug", handle2(games2.getBySlug));
@@ -125229,10 +125271,12 @@ var init_deploy = __esm(() => {
     const db2 = ctx.db;
     const existingGames = await db2.select().from(games).where(eq(games.slug, slug2));
     const existingGame = existingGames[0];
-    if (existingGame) {
-      const isAdmin = user.role === "admin";
-      const isOwner = existingGame.developerId === user.id;
-      if (!isAdmin && !isOwner) {
+    if (existingGame && user.role !== "admin") {
+      const membership = await db2.query.gameMembers.findFirst({
+        where: and(eq(gameMembers.gameId, existingGame.id), eq(gameMembers.userId, user.id)),
+        columns: { id: true }
+      });
+      if (!membership) {
         return c2.json({
           error: {
             code: "FORBIDDEN",
@@ -125256,17 +125300,24 @@ var init_deploy = __esm(() => {
       if (!body2.metadata?.displayName) {
         return c2.json({ error: { code: "BAD_REQUEST", message: "Display name required for new game" } }, 400);
       }
-      const inserted = await db2.insert(games).values({
+      const gameValues = {
         slug: slug2,
         displayName: body2.metadata.displayName,
         version: "1.0.0",
         platform: body2.metadata.platform ?? "web",
         gameType: "hosted",
-        developerId: user.id,
         deploymentUrl: `http://localhost:4321`,
         metadata: body2.metadata.metadata ?? {}
-      }).returning();
-      game = inserted[0];
+      };
+      game = await db2.transaction(async (tx) => {
+        const [inserted] = await tx.insert(games).values(gameValues).returning();
+        await tx.insert(gameMembers).values({
+          gameId: inserted.id,
+          userId: user.id,
+          role: "owner"
+        });
+        return inserted;
+      });
     }
     let backendCode = body2.code;
     if (!backendCode && body2.codeUploadToken) {
@@ -125345,13 +125396,19 @@ var init_deploy = __esm(() => {
     const ctx = getSandboxContext();
     const game = await ctx.db.query.games.findFirst({
       where: eq(games.slug, slug2 ?? ""),
-      columns: { id: true, developerId: true }
+      columns: { id: true }
     });
     if (!game) {
       return c2.json({ error: { code: "NOT_FOUND", message: "Game not found" } }, 404);
     }
-    if (game.developerId !== user.id && user.role !== "admin") {
-      return c2.json({ error: { code: "NOT_FOUND", message: "Game not found" } }, 404);
+    if (user.role !== "admin") {
+      const membership = await ctx.db.query.gameMembers.findFirst({
+        where: and(eq(gameMembers.gameId, game.id), eq(gameMembers.userId, user.id)),
+        columns: { id: true }
+      });
+      if (!membership) {
+        return c2.json({ error: { code: "NOT_FOUND", message: "Game not found" } }, 404);
+      }
     }
     const job = await ctx.db.query.gameDeployJobs.findFirst({
       where: and(eq(gameDeployJobs.id, jobId), eq(gameDeployJobs.gameId, game.id))
@@ -127644,7 +127701,7 @@ var import_picocolors12 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default2 = {
   name: "@playcademy/vite-plugin",
-  version: "0.2.31",
+  version: "0.2.32-beta.1",
   type: "module",
   exports: {
     ".": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/vite-plugin",
-    "version": "0.2.31",
+    "version": "0.2.32-beta.1",
     "type": "module",
     "exports": {
         ".": {