change: remove wait parameter

Author: Benjamin-Frost

docs/s4-api-docs.md

@@ -10,8 +10,6 @@ The API provides endpoints to subscribe to the actions of an event and to send a
 
 This endpoint uses HTTP Long Polling, meaning the connection will remain open until an action is available. Clients should make a request to this endpoint and wait for a response. Once a response is received, the client should immediately make another request to continue receiving actions.
 
-For the initial request, it is possible to pass the query parameter `wait=false` to get the current action immediately.
-
 ```
 GET /events/:id/subscribe
 ```

src/events/events.controller.ts

@@ -6,7 +6,6 @@ import {
   NotFoundException,
   Param,
   Post,
-  Query,
   Res,
 } from '@nestjs/common';
 import { Response } from 'express';
@@ -18,21 +17,12 @@ export class EventsController {
   constructor(private readonly eventsService: EventsService) {}
 
   @Get(':id/subscribe')
-  poll(
-    @Res() res: Response,
-    @Param('id') id: string,
-    @Query('wait') waitParam: string,
-  ) {
+  poll(@Res() res: Response, @Param('id') id: string) {
     const event = events.find((e) => e.name === id);
     if (!event) throw new NotFoundException('Event not found');
 
-    const wait = waitParam === 'false';
-    if (wait) {
-      return res.json(this.eventsService.getCurrentAction(event.name));
-    }
-
-    const cb = (data: any) => res.json(data);
-    this.eventsService.addClient({ subscribedEvent: event.name, callback: cb });
+    const callback = (data: any) => res.json(data);
+    this.eventsService.addClient({ subscribedEvent: event.name, callback });
   }
 
   @Post(':id/vote')

src/events/events.service.ts

@@ -14,10 +14,6 @@ export interface Vote {
 @Injectable()
 export class EventsService {
   private clients: Client[] = [];
-  private currentActions: Record<string, any> = events.reduce(
-    (acc, event) => ({ ...acc, [event.name]: { action: null } }),
-    {},
-  );
   private votes: Record<string, Vote[]> = events.reduce(
     (acc, event) => ({ ...acc, [event.name]: [] }),
     {},
@@ -31,11 +27,11 @@ export class EventsService {
     this.clients.push(client);
   }
 
-  notifyClients(event: string) {
+  notifyClients(event: string, action: any) {
     // Notify all clients subscribed to the event
     this.clients
       .filter((client) => client.subscribedEvent === event)
-      .forEach((client) => client.callback(this.currentActions[event]));
+      .forEach((client) => client.callback(action));
 
     // Remove clients subscribed to the event
     this.clients = this.clients.filter(
@@ -53,30 +49,23 @@ export class EventsService {
 
     setTimeout(() => {
       if (selectedAction === 'flashlight') {
-        this.currentActions[event] = { action: { type: 'flashlight' } };
+        this.notifyClients(event, { action: { type: 'flashlight' } });
       } else if (selectedAction === 'vote') {
         const question =
           questions[Math.floor(Math.random() * questions.length)];
-        this.currentActions[event] = { action: { type: 'vote', ...question } };
+        this.notifyClients(event, { action: { type: 'vote', ...question } });
       }
 
-      this.notifyClients(event);
-
       setTimeout(
         () => {
-          this.currentActions[event] = { action: null };
-          this.notifyClients(event);
+          this.notifyClients(event, { action: null });
           this.scheduleNewAction(event);
         },
         selectedAction === 'flashlight' ? 5000 : 15000,
       );
     }, delay);
   }
 
-  getCurrentAction(event: string) {
-    return this.currentActions[event];
-  }
-
   addVote(event: string, answer: 'a' | 'b') {
     this.votes[event].push({ answer, createdAt: new Date() });
   }