From 0bbd0b50044deb6afcee0a25b1a44d5a61f9579f Mon Sep 17 00:00:00 2001
From: Kevin Kipp <kkipp@cloudflare.com>
Date: Fri, 20 Sep 2024 16:50:54 -0500
Subject: [PATCH] Count meetings and associate feedback

---
 app/components/LeaveRoomButton.tsx    |   8 +-
 app/durableObjects/ChatRoom.server.ts | 109 +++++++++++++--
 app/routes/_room.$roomName.room.tsx   |  12 +-
 app/routes/call-quality-feedback.tsx  |  41 ++++--
 app/types/Messages.ts                 |   1 +
 migrations/0001_daily_blink.sql       |  17 +++
 migrations/meta/0001_snapshot.json    | 190 ++++++++++++++++++++++++++
 migrations/meta/_journal.json         |   7 +
 package.json                          |   2 +-
 schema.ts                             |  14 +-
 10 files changed, 374 insertions(+), 27 deletions(-)
 create mode 100644 migrations/0001_daily_blink.sql
 create mode 100644 migrations/meta/0001_snapshot.json

diff --git a/app/components/LeaveRoomButton.tsx b/app/components/LeaveRoomButton.tsx
index 86b0934d..01da2d46 100644
--- a/app/components/LeaveRoomButton.tsx
+++ b/app/components/LeaveRoomButton.tsx
@@ -7,10 +7,12 @@ import { Tooltip } from './Tooltip'
 
 interface LeaveRoomButtonProps {
 	navigateToFeedbackPage: boolean
+	meetingId?: string
 }
 
 export const LeaveRoomButton: FC<LeaveRoomButtonProps> = ({
 	navigateToFeedbackPage,
+	meetingId,
 }) => {
 	const navigate = useNavigate()
 	return (
@@ -18,7 +20,11 @@ export const LeaveRoomButton: FC<LeaveRoomButtonProps> = ({
 			<Button
 				displayType="danger"
 				onClick={() => {
-					navigate(navigateToFeedbackPage ? '/call-quality-feedback' : '/')
+					const params = new URLSearchParams()
+					if (meetingId) params.set('meetingId', meetingId)
+					navigate(
+						navigateToFeedbackPage ? `/call-quality-feedback?${params}` : '/'
+					)
 				}}
 			>
 				<VisuallyHidden>Leave</VisuallyHidden>
diff --git a/app/durableObjects/ChatRoom.server.ts b/app/durableObjects/ChatRoom.server.ts
index 87267b6a..3b47b7e8 100644
--- a/app/durableObjects/ChatRoom.server.ts
+++ b/app/durableObjects/ChatRoom.server.ts
@@ -5,12 +5,15 @@ import assertNever from '~/utils/assertNever'
 import { assertNonNullable } from '~/utils/assertNonNullable'
 import getUsername from '~/utils/getUsername.server'
 
+import { eq, sql } from 'drizzle-orm'
+import type { DrizzleD1Database } from 'drizzle-orm/d1'
 import {
 	Server,
 	type Connection,
 	type ConnectionContext,
 	type WSMessage,
 } from 'partyserver'
+import { getDb, Meetings } from 'schema'
 
 /**
  * The ChatRoom Durable Object Class
@@ -21,6 +24,15 @@ import {
  * to all others.
  */
 export class ChatRoom extends Server<Env> {
+	env: Env
+	db: DrizzleD1Database<Record<string, never>> | null
+
+	constructor(ctx: DurableObjectState, env: Env) {
+		super(ctx, env)
+		this.env = env
+		this.db = getDb(this)
+	}
+
 	static options = {
 		hibernate: true,
 	}
@@ -31,6 +43,7 @@ export class ChatRoom extends Server<Env> {
 	}
 
 	async onStart(): Promise<void> {
+		this.db = getDb(this)
 		// TODO: make this a part of partyserver
 		this.ctx.setWebSocketAutoResponse(
 			new WebSocketRequestResponsePair(
@@ -43,8 +56,8 @@ export class ChatRoom extends Server<Env> {
 		await this.ctx.storage.delete('sessions').catch(() => {
 			console.warn('Failed to delete old sessions storage')
 		})
-		// We can remove this line later
 	}
+
 	async onConnect(
 		connection: Connection<User>,
 		ctx: ConnectionContext
@@ -76,22 +89,68 @@ export class ChatRoom extends Server<Env> {
 
 		// store the user's data in storage
 		await this.ctx.storage.put(`session-${connection.id}`, user)
-
+		await this.trackPeakUserCount()
 		await this.broadcastRoomState()
 	}
 
+	async trackPeakUserCount() {
+		if (this.db) {
+			const meetingId = await this.getMeetingId()
+			const meeting = await this.getMeeting(meetingId)
+			if (!meeting) return
+			if (meeting.ended !== null) {
+				await this.db
+					.update(Meetings)
+					.set({ ended: null })
+					.where(eq(Meetings.id, meeting.id))
+			}
+
+			const previousCount = meeting.peakUserCount
+			const userCount = [...this.getConnections()].length
+			if (userCount > previousCount) {
+				await this.db
+					.update(Meetings)
+					.set({
+						peakUserCount: userCount,
+					})
+					.where(eq(Meetings.id, meeting.id))
+			}
+		}
+	}
+
+	async getMeetingId() {
+		let meetingId = await this.ctx.storage.get<string>('meetingId')
+		if (meetingId) return meetingId
+		meetingId = crypto.randomUUID()
+		await this.ctx.storage.put('meetingId', meetingId)
+		if (this.db) {
+			await this.db.insert(Meetings).values({
+				id: meetingId,
+				peakUserCount: 1,
+			})
+		}
+
+		return meetingId
+	}
+
+	async getMeeting(meetingId: string) {
+		if (!this.db) return null
+		const [meeting] = await this.db
+			.select()
+			.from(Meetings)
+			.where(eq(Meetings.id, meetingId))
+
+		return meeting ?? null
+	}
+
 	async broadcastRoomState() {
 		let didSomeoneQuit = false
+		const meetingId = await this.getMeetingId()
 		const roomState = {
 			type: 'roomState',
 			state: {
-				users: [
-					...(
-						await this.ctx.storage.list<User>({
-							prefix: 'session-',
-						})
-					).values(),
-				],
+				meetingId,
+				users: [...(await this.getUsers()).values()],
 			},
 		} satisfies ServerMessage
 
@@ -234,15 +293,43 @@ export class ChatRoom extends Server<Env> {
 		this.broadcastRoomState()
 	}
 
+	getUsers() {
+		return this.ctx.storage.list<User>({
+			prefix: 'session-',
+		})
+	}
+
+	async endMeeting(meetingId: string) {
+		await this.ctx.storage.delete('meetingId')
+		if (this.db) {
+			// stamp meeting as ended
+			await this.db
+				.update(Meetings)
+				.set({
+					ended: sql`CURRENT_TIMESTAMP`,
+				})
+				.where(eq(Meetings.id, meetingId))
+		}
+	}
+
 	async cleanupOldConnections() {
 		const connections = [...this.getConnections()]
-		const sessionsToCleanUp = await this.ctx.storage.list<User>()
+		const sessionsToCleanUp = await this.getUsers()
+
 		connections.forEach((connection) =>
 			sessionsToCleanUp.delete(`session-${connection.id}`)
 		)
-		return this.ctx.storage
+
+		await this.ctx.storage
 			.delete([...sessionsToCleanUp.keys()])
 			.catch(() => console.warn('Failed to clean up orphaned sessions'))
+
+		const activeUserCount = (await this.getUsers()).size
+		const meetingId = await this.ctx.storage.get<string>('meetingId')
+
+		if (meetingId && activeUserCount === 0) {
+			this.endMeeting(meetingId)
+		}
 	}
 
 	async alarm(): Promise<void> {
diff --git a/app/routes/_room.$roomName.room.tsx b/app/routes/_room.$roomName.room.tsx
index ebdaa99f..76dfa99a 100644
--- a/app/routes/_room.$roomName.room.tsx
+++ b/app/routes/_room.$roomName.room.tsx
@@ -130,7 +130,12 @@ function JoinedRoom({ bugReportsEnabled }: { bugReportsEnabled: boolean }) {
 		peer,
 		dataSaverMode,
 		pushedTracks,
-		room: { otherUsers, websocket, identity },
+		room: {
+			otherUsers,
+			websocket,
+			identity,
+			roomState: { meetingId },
+		},
 	} = useRoomContext()
 
 	const debugEnabled = useDebugEnabled()
@@ -326,7 +331,10 @@ function JoinedRoom({ bugReportsEnabled }: { bugReportsEnabled: boolean }) {
 						className="hidden md:block"
 					></ParticipantsButton>
 					<OverflowMenu bugReportsEnabled={bugReportsEnabled} />
-					<LeaveRoomButton navigateToFeedbackPage={hasDb} />
+					<LeaveRoomButton
+						navigateToFeedbackPage={hasDb}
+						meetingId={meetingId}
+					/>
 				</div>
 			</div>
 			<HighPacketLossWarningsToast />
diff --git a/app/routes/call-quality-feedback.tsx b/app/routes/call-quality-feedback.tsx
index c2f93e86..dc3a7237 100644
--- a/app/routes/call-quality-feedback.tsx
+++ b/app/routes/call-quality-feedback.tsx
@@ -1,6 +1,7 @@
 import { type ActionFunctionArgs } from '@remix-run/cloudflare'
-import { Form } from '@remix-run/react'
+import { Form, useSearchParams } from '@remix-run/react'
 import { AnalyticsSimpleCallFeedback, getDb } from 'schema'
+import invariant from 'tiny-invariant'
 import { Button } from '~/components/Button'
 import { RELEASE } from '~/utils/constants'
 
@@ -17,26 +18,46 @@ export const action = async ({ request, context }: ActionFunctionArgs) => {
 
 	const formData = await request.formData()
 	const experiencedIssues = formData.get('experiencedIssues') === 'true'
+	const meetingId = formData.get('meetingId')
+	invariant(typeof meetingId === 'string')
 	await db.insert(AnalyticsSimpleCallFeedback).values({
 		experiencedIssues: Number(experiencedIssues),
 		version: RELEASE ?? 'dev',
+		meetingId,
 	})
 
 	return redirectToHome
 }
 
 export default function SetUsername() {
+	const [params] = useSearchParams()
+	const meetingId = params.get('meetingId')
 	return (
 		<div className="grid h-full gap-4 place-content-center">
-			<h1 className="text-3xl font-bold">Experience any issues?</h1>
-			<Form className="flex items-end gap-4" method="post">
-				<Button displayType="secondary" value="true" name="experiencedIssues">
-					Yes
-				</Button>
-				<Button displayType="secondary" value="false" name="experiencedIssues">
-					No
-				</Button>
-			</Form>
+			{meetingId ? (
+				<>
+					<h1 className="text-3xl font-bold">Experience any issues?</h1>
+					<Form className="flex items-end gap-4" method="post">
+						<Button
+							displayType="secondary"
+							value="true"
+							name="experiencedIssues"
+						>
+							Yes
+						</Button>
+						<Button
+							displayType="secondary"
+							value="false"
+							name="experiencedIssues"
+						>
+							No
+						</Button>
+						<input type="hidden" name="meetingId" value={meetingId} />
+					</Form>
+				</>
+			) : (
+				<h1>Missing meetingId</h1>
+			)}
 		</div>
 	)
 }
diff --git a/app/types/Messages.ts b/app/types/Messages.ts
index f08bd898..b262f0ea 100644
--- a/app/types/Messages.ts
+++ b/app/types/Messages.ts
@@ -16,6 +16,7 @@ export type User = {
 }
 
 export type RoomState = {
+	meetingId?: string
 	users: User[]
 }
 
diff --git a/migrations/0001_daily_blink.sql b/migrations/0001_daily_blink.sql
new file mode 100644
index 00000000..68c80917
--- /dev/null
+++ b/migrations/0001_daily_blink.sql
@@ -0,0 +1,17 @@
+CREATE TABLE `Meetings` (
+	`id` text PRIMARY KEY NOT NULL,
+	`created` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`modified` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`deleted` text,
+	`userCount` integer NOT NULL,
+	`ended` text
+);
+--> statement-breakpoint
+ALTER TABLE `AnalyticsSimpleCallFeedback` ADD `meetingId` text NOT NULL REFERENCES Meetings(id);--> statement-breakpoint
+/*
+ SQLite does not support "Creating foreign key on existing column" out of the box, we do not generate automatic migration for that, so it has to be done manually
+ Please refer to: https://www.techonthenet.com/sqlite/tables/alter_table.php
+                  https://www.sqlite.org/lang_altertable.html
+
+ Due to that we don't generate migration automatically and it has to be done manually
+*/
\ No newline at end of file
diff --git a/migrations/meta/0001_snapshot.json b/migrations/meta/0001_snapshot.json
new file mode 100644
index 00000000..2b0ccf7c
--- /dev/null
+++ b/migrations/meta/0001_snapshot.json
@@ -0,0 +1,190 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "0160d517-1dc2-44a6-ac94-fa3dd182c488",
+  "prevId": "fe0342f9-5cae-44a5-86d3-368c43bf7869",
+  "tables": {
+    "AnalyticsRefreshes": {
+      "name": "AnalyticsRefreshes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "created": {
+          "name": "created",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "modified": {
+          "name": "modified",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "deleted": {
+          "name": "deleted",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "AnalyticsSimpleCallFeedback": {
+      "name": "AnalyticsSimpleCallFeedback",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "created": {
+          "name": "created",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "modified": {
+          "name": "modified",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "deleted": {
+          "name": "deleted",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "experiencedIssues": {
+          "name": "experiencedIssues",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "meetingId": {
+          "name": "meetingId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "AnalyticsSimpleCallFeedback_meetingId_Meetings_id_fk": {
+          "name": "AnalyticsSimpleCallFeedback_meetingId_Meetings_id_fk",
+          "tableFrom": "AnalyticsSimpleCallFeedback",
+          "tableTo": "Meetings",
+          "columnsFrom": [
+            "meetingId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "Meetings": {
+      "name": "Meetings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created": {
+          "name": "created",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "modified": {
+          "name": "modified",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "deleted": {
+          "name": "deleted",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "userCount": {
+          "name": "userCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ended": {
+          "name": "ended",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/migrations/meta/_journal.json b/migrations/meta/_journal.json
index 9c25e5d4..adedebf9 100644
--- a/migrations/meta/_journal.json
+++ b/migrations/meta/_journal.json
@@ -8,6 +8,13 @@
       "when": 1726697068248,
       "tag": "0000_warm_siren",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1726868649369,
+      "tag": "0001_daily_blink",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 8d9bd2aa..557edfc4 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
 		"test:e2e": "playwright test --headed",
 		"check": "npm run lint && npm run typecheck && npm run test:ci",
 		"db:generate": "drizzle-kit generate",
-		"db:migrate:local": "wrangler d1 migrations apply orange-meets-db --local",
+		"db:migrate:local": "wrangler d1 migrations apply orange-meets-db-development --local",
 		"db:studio:local": "LOCAL_DB_PATH=$(find .wrangler/state/v3/d1/miniflare-D1DatabaseObject -type f -name '*.sqlite' -print -quit) drizzle-kit studio"
 	},
 	"dependencies": {
diff --git a/schema.ts b/schema.ts
index f8cf2784..4988ed9e 100644
--- a/schema.ts
+++ b/schema.ts
@@ -1,7 +1,7 @@
-import type { AppLoadContext } from '@remix-run/cloudflare'
 import { sql } from 'drizzle-orm'
 import { drizzle } from 'drizzle-orm/d1'
 import { integer, sqliteTable, text } from 'drizzle-orm/sqlite-core'
+import type { Env } from '~/types/Env'
 
 const metadataColumns = {
 	id: integer('id').primaryKey({ autoIncrement: true }),
@@ -25,10 +25,20 @@ export const AnalyticsSimpleCallFeedback = sqliteTable(
 		...metadataColumns,
 		version: text('version').notNull(),
 		experiencedIssues: integer('experiencedIssues').notNull(),
+		meetingId: text('meetingId')
+			.references(() => Meetings.id)
+			.notNull(),
 	}
 )
 
-export function getDb(context: AppLoadContext) {
+export const Meetings = sqliteTable('Meetings', {
+	...metadataColumns,
+	id: text('id').primaryKey(),
+	peakUserCount: integer('userCount').notNull(),
+	ended: text('ended'),
+})
+
+export function getDb(context: { env: Env }) {
 	if (!context.env.DB) {
 		return null
 	}