Update queues to properly join and leave, and list.

Author: PhlexPlexico

src/routes/queue.ts

@@ -3,7 +3,7 @@
  * resourcePath: /queue
  * description: Express API router for queue management in G5API.
  */
-
+import config from "config";
 import { Router } from 'express';
 import Utils from "../utility/utils.js";
 import { QueueService } from "../services/queue.js";
@@ -21,10 +21,6 @@ const router = Router();
  *      properties:
  *        name:
  *          type: string
- *          description: Human-readable name of the queue
- *          example: "Support Queue"
- *        slug:
- *          type: string
  *          description: Unique identifier for the queue
  *          example: "support-queue-abc123"
  *        createdAt:
@@ -142,7 +138,7 @@ router.get('/:slug', async (req, res) => {
     res.status(200).json(queue);
   } catch (error: Error | any) {
     console.error('Error fetching queue:', error);
-    if (error.message.includes('not found')) {
+    if (error.message.includes('does not exist')) {
       return res.status(404).json({ error: 'Queue not found.' });
     }
     res.status(500).json({ error: 'Failed to fetch queue.' });
@@ -260,8 +256,8 @@ router.post('/', Utils.ensureAuthenticated, async (req, res) => {
   const isPrivate: boolean = req.body[0].private ? true : false;
 
   try {
-    await QueueService.createQueue(req.user?.steam_id!, maxPlayers, isPrivate);
-    res.json({ message: "Queue created successfully!" });
+    const descriptor = await QueueService.createQueue(req.user?.steam_id!, maxPlayers, isPrivate);
+    res.json({ message: "Queue created successfully!", url: `${config.get("server.apiURL")}/queue/${descriptor.name}` });
   } catch (error) {
     console.error('Error creating queue:', error);
     res.status(500).json({ error: 'Failed to create queue.' });
@@ -330,7 +326,7 @@ router.post('/', Utils.ensureAuthenticated, async (req, res) => {
  */
 router.put('/:slug', Utils.ensureAuthenticated, async (req, res) => {
   const slug: string = req.params.slug;
-  const action: string = req.body.action ? req.body.action : 'join';
+  const action: string = req.body[0].action ? req.body[0].action : 'join';
 
   try {
     if (action === 'join') {

src/services/queue.ts

@@ -8,11 +8,14 @@ const redis = createClient({ url: config.get("server.redisUrl"), });
 const DEFAULT_TTL_SECONDS: number = config.get("server.queueTTL") == 0 ? 3600 : config.get("server.queueTTL");
 
 export class QueueService {
+  
   static async createQueue(ownerId?: string, maxPlayers: number = 10, isPrivate: boolean = false, ttlSeconds: number = DEFAULT_TTL_SECONDS): Promise<QueueDescriptor> {
     let slug: string;
     let key: string;
     let attempts: number = 0;
-
+    if (redis.isOpen === false) {
+      await redis.connect();
+    }
     do {
       slug = Utils.generateSlug();
       key = `queue:${slug}`;
@@ -30,7 +33,6 @@ export class QueueService {
 
     const descriptor: QueueDescriptor = {
       name: slug,
-      slug,
       createdAt,
       expiresAt,
       ownerId,
@@ -139,6 +141,9 @@ export class QueueService {
   }
 
   static async listQueues(requestorSteamId: string, role: string = "user"): Promise<QueueDescriptor[]> {
+    if (redis.isOpen === false) {
+      await redis.connect();
+    }
     const slugs = await redis.sMembers('queues');
     const descriptors: QueueDescriptor[] = [];
 
@@ -167,11 +172,12 @@ export class QueueService {
 }
 
 async function getQueueMetaOrThrow(slug: string): Promise<QueueDescriptor> {
-  const key = `queue:${slug}`;
+  if (redis.isOpen === false) {
+    await redis.connect();
+  }
   const metaKey = `queue-meta:${slug}`;
-
-  const exists = await redis.exists(key);
-  if (!exists) {
+  const members = await redis.sMembers('queues');
+  if (!members.includes(slug)) {
     throw new Error(`Queue ${slug} does not exist or has expired.`);
   }
 

src/types/queues/QueueDescriptor.ts

@@ -1,6 +1,5 @@
 export interface QueueDescriptor {
   name: string;           // Human-readable name
-  slug: string;           // Unique identifier
   createdAt: number;      // Timestamp (ms) when queue was created
   expiresAt: number;      // Timestamp (ms) when queue will expire
   ownerId?: string;       // Optional user ID of the queue creator