Fix lint warnings

Author: sarahsturgeon

web/src/observability/embeds.ts

@@ -59,7 +59,7 @@ const code = (s: string): string => `\`${s}\``;
 const link = (text: string, url: string): string => `[${text}](${url})`;
 const sub = (s: string): string => `-# ${s}`;
 
-const truncate = (s: string, n: number): string => (s.length > n ? s.slice(0, n - 1) + "…" : s);
+const truncate = (s: string, n: number): string => (s.length > n ? `${s.slice(0, n - 1)}…` : s);
 
 const ipLink = (ip: string): string => link(`\`${ip}\``, `https://ipinfo.io/${ip}`);
 
@@ -74,7 +74,7 @@ const ispLink = (ctx: RequestContext): string => {
   return "unknown network";
 };
 
-const ansi = (ansiCode: string, text: string): string => "```ansi\n\u001b[" + ansiCode + "m" + text + "\u001b[0m\n```";
+const ansi = (ansiCode: string, text: string): string => `\`\`\`ansi\n\u001b[${ansiCode}m${text}\u001b[0m\n\`\`\``;
 
 const duration = (ms: number): string => {
   const totalSec = Math.floor(ms / 1000);
@@ -151,7 +151,7 @@ export function buildSessionStartedEmbed(e: SessionStartedEvent): DiscordEmbed {
   if (ctx.userAgent) {
     fields.push({
       name: "User-Agent",
-      value: "```\n" + truncate(ctx.userAgent, LIMIT_UA_INLINE) + "\n```",
+      value: `\`\`\`\n${truncate(ctx.userAgent, LIMIT_UA_INLINE)}\n\`\`\``,
       inline: false,
     });
   }
@@ -217,7 +217,7 @@ export function buildErrorEmbed(e: ErrorEvent): DiscordEmbed {
   lines.push(`### ✖ ${truncate(e.where, 120)}`, ansi("2;31", msg));
 
   if (stack) {
-    lines.push("```ts\n" + truncate(stack, LIMIT_STACK) + "\n```");
+    lines.push(`\`\`\`ts\n${truncate(stack, LIMIT_STACK)}\n\`\`\``);
   }
 
   const ctxSub = contextSubtext(e.context);
@@ -245,7 +245,7 @@ export function buildQueueEnteredEmbed(e: QueueEnteredEvent): DiscordEmbed {
 
   const lines: string[] = [
     `### ${locationHeader(ctx)}`,
-    sub(`position ${code("#" + e.position)} · ${capacityLine(e.capacity, { skipQueue: true })}`),
+    sub(`position ${code(`#${e.position}`)} · ${capacityLine(e.capacity, { skipQueue: true })}`),
   ];
 
   const fields: DiscordEmbedField[] = [

web/src/queue/manager.ts

@@ -7,10 +7,10 @@ import { type CapacitySnapshot, notify, OBS_CONTEXT_HEADER, parseContext } from
 import { hashIP } from "../utils";
 import {
   QUEUE_PREFIX,
-  RESOLVED_PREFIX,
-  SESSION_PREFIX,
   queueKey,
+  RESOLVED_PREFIX,
   resolvedKey,
+  SESSION_PREFIX,
   sessionKey,
   stripResolvedPrefix,
   stripSessionPrefix,
@@ -181,7 +181,8 @@ export class SessionManager extends DurableObject<Env> {
       this.notifyAsync(
         notify.warning(this.env, {
           title: "Missing CF-Connecting-IP",
-          description: "A request reached SessionManager without a CF-Connecting-IP header — per-IP rate limiting is disabled for this session",
+          description:
+            "A request reached SessionManager without a CF-Connecting-IP header — per-IP rate limiting is disabled for this session",
           context: parseContext(request.headers.get(OBS_CONTEXT_HEADER)),
         }),
       );
@@ -232,11 +233,11 @@ export class SessionManager extends DurableObject<Env> {
     const ticketId = url.searchParams.get("ticketId");
     if (!ticketId) return new Response("Missing ticketId", { status: 400 });
 
-    if (this.resolvedTickets.has(ticketId)) {
-      const { sessionId, sessionType } = this.resolvedTickets.get(ticketId)!;
+    const resolved = this.resolvedTickets.get(ticketId);
+    if (resolved) {
       this.resolvedTickets.delete(ticketId);
       void this.ctx.storage.delete(resolvedKey(ticketId));
-      return Response.json({ status: "READY", sessionId, sessionType });
+      return Response.json({ status: "READY", sessionId: resolved.sessionId, sessionType: resolved.sessionType });
     }
 
     const entry = this.waitingQueue.find((p) => p.ticketId === ticketId);

web/src/session/base.ts

@@ -264,7 +264,7 @@ export class BaseSession extends Container<Env> {
       this.startRetries++;
       console.warn(`[onStop] Container died during provisioning, retry ${this.startRetries}/3`);
       await new Promise((r) => setTimeout(r, 2000));
-      void this.startContainer(this.ctx.id.name!);
+      void this.startContainer(this.sessionId);
       return;
     }
     await this.closeSession("container_stopped");
@@ -280,7 +280,8 @@ export class BaseSession extends Container<Env> {
       this.broadcast({
         type: "SYSTEM_NOTICE",
         payload: {
-          message: "We just pushed an update to glua.dev. We can't hot-swap running sessions (yet), so yours had to be closed — sorry about that 🥀 Start a new one to pick up where you left off!",
+          message:
+            "We just pushed an update to glua.dev. We can't hot-swap running sessions (yet), so yours had to be closed — sorry about that 🥀 Start a new one to pick up where you left off!",
         },
       });
       await this.closeSession("deploy_rollout");
@@ -387,9 +388,12 @@ export class BaseSession extends Container<Env> {
   // ── Session timer ──
 
   private timerPayload() {
+    if (this.sessionEndTime === undefined || this.sessionDuration === undefined) {
+      throw new Error("timerPayload called before session became active");
+    }
     return {
-      endTime: this.sessionEndTime!,
-      duration: this.sessionDuration!,
+      endTime: this.sessionEndTime,
+      duration: this.sessionDuration,
       extensionThreshold: SESSION_TIMING.extensionThreshold,
     };
   }
@@ -480,7 +484,7 @@ export class BaseSession extends Container<Env> {
     await manager.fetch("http://do/api/session-closed", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ sessionId: this.ctx.id.name! }),
+      body: JSON.stringify({ sessionId: this.sessionId }),
     });
   }
 
@@ -514,16 +518,16 @@ export class BaseSession extends Container<Env> {
 
   private async flushLogsToR2() {
     if (this.logBuffer.length === 0) return;
-    const logKey = `sessions/${this.ctx.id.name!}/logs.log`;
-    const logsToFlush = this.logBuffer.join("\n") + "\n";
+    const logKey = `sessions/${this.sessionId}/logs.log`;
+    const logsToFlush = `${this.logBuffer.join("\n")}\n`;
     this.logBuffer = [];
 
     try {
       const existingLog = await this.env.LOG_BUCKET.get(logKey);
       const existingContent = existingLog ? await existingLog.text() : "";
       await this.env.LOG_BUCKET.put(logKey, existingContent + logsToFlush);
     } catch (e) {
-      console.error(`Failed to flush logs for ${this.ctx.id.name!}:`, e);
+      console.error(`Failed to flush logs for ${this.sessionId}:`, e);
       this.logBuffer.unshift(...logsToFlush.trim().split("\n"));
       this.notifyAsync(
         notify.error(this.env, {
@@ -541,7 +545,7 @@ export class BaseSession extends Container<Env> {
     const hasNewScripts = Object.keys(this.scriptBuffer).length > 0;
     if (!hasNewScripts && !this.sessionMetadata) return;
 
-    const sessionKey = `sessions/${this.ctx.id.name!}/session.json`;
+    const sessionKey = `sessions/${this.sessionId}/session.json`;
 
     try {
       const existing = await this.env.LOG_BUCKET.get(sessionKey);
@@ -559,7 +563,7 @@ export class BaseSession extends Container<Env> {
       await this.env.LOG_BUCKET.put(sessionKey, JSON.stringify(session));
       this.scriptBuffer = {};
     } catch (e) {
-      console.error(`Failed to flush session data for ${this.ctx.id.name!}:`, e);
+      console.error(`Failed to flush session data for ${this.sessionId}:`, e);
       this.notifyAsync(
         notify.error(this.env, {
           where: "flushSessionToR2",
@@ -590,6 +594,12 @@ export class BaseSession extends Container<Env> {
     this.ctx.waitUntil(promise);
   }
 
+  private get sessionId(): string {
+    const name = this.ctx.id.name;
+    if (!name) throw new Error("Session DO constructed without idFromName");
+    return name;
+  }
+
   private send(ws: WebSocket, message: ServerMessage): void {
     try {
       ws.send(JSON.stringify(message));