Handle internal matchmaking routes in gateway

Author: fernandoBegega

gateway/gateway-service.js

@@ -394,6 +394,17 @@ function buildForwardHeaders(req, user, extraHeaders = {}) {
   return headers;
 }
 
+function buildInternalForwardHeaders(req, user, extraHeaders = {}) {
+  const headers = buildForwardHeaders(req, user, extraHeaders);
+  const forwardedUserId = normalizeOptionalString(req.get('x-user-id'));
+
+  if (!headers['x-user-id'] && forwardedUserId) {
+    headers['x-user-id'] = forwardedUserId;
+  }
+
+  return headers;
+}
+
 function pickPlayBotId(body) {
   const explicitBotId = normalizeOptionalString(body?.bot_id);
   if (explicitBotId) {
@@ -871,6 +882,67 @@ function createExternalApiRouter({ env = process.env, fetchImpl = globalThis.fet
   return router;
 }
 
+function createInternalApiRouter({ serviceUrls, fetchImpl }) {
+  const router = express.Router();
+
+  router.post('/v1/matchmaking/enqueue', express.json(), asyncRoute(async (req, res) => {
+    const user = await getOptionalUser(req, serviceUrls, fetchImpl);
+    const result = await fetchJson(
+      fetchImpl,
+      'gamey service',
+      `${serviceUrls.gamey}/v1/matchmaking/enqueue`,
+      buildJsonInit('POST', req.body, buildInternalForwardHeaders(req, user, {
+        'Content-Type': 'application/json',
+      })),
+    );
+
+    sendPayload(res, result.status, result.payload);
+  }));
+
+  router.get('/v1/matchmaking/tickets/:ticketId', asyncRoute(async (req, res) => {
+    const result = await fetchJson(
+      fetchImpl,
+      'gamey service',
+      `${serviceUrls.gamey}/v1/matchmaking/tickets/${encodeURIComponent(req.params.ticketId)}`,
+      { method: 'GET' },
+    );
+
+    sendPayload(res, result.status, result.payload);
+  }));
+
+  router.post('/v1/matchmaking/tickets/:ticketId/cancel', asyncRoute(async (req, res) => {
+    const result = await fetchJson(
+      fetchImpl,
+      'gamey service',
+      `${serviceUrls.gamey}/v1/matchmaking/tickets/${encodeURIComponent(req.params.ticketId)}/cancel`,
+      { method: 'POST' },
+    );
+
+    sendPayload(res, result.status, result.payload);
+  }));
+
+  router.use((error, _req, res, _next) => {
+    if (res.headersSent) {
+      return;
+    }
+
+    if (error instanceof HttpResponseError) {
+      sendPayload(res, error.status, error.payload ?? { message: error.message });
+      return;
+    }
+
+    if (error instanceof UpstreamConnectionError) {
+      res.status(502).json({ message: `Bad Gateway: ${error.serviceName} unavailable` });
+      return;
+    }
+
+    console.error(error);
+    res.status(500).json({ message: error.message || 'Internal server error' });
+  });
+
+  return router;
+}
+
 function createApp({
   env = process.env,
   proxyFactory = createProxyMiddleware,
@@ -904,6 +976,7 @@ function createApp({
     }
   }));
 
+  app.use('/api', createInternalApiRouter({ serviceUrls, fetchImpl }));
 
   for (const route of proxyRoutes) {
     if (route.mountPath === '/api') {

gateway/tests/services/gateway-service-routes.test.js

@@ -822,3 +822,76 @@ test('POST /external/v1/games works without auth token for anonymous play', asyn
     });
   });
 });
+
+// ---------------------------------------------------------------------------
+// POST /api/v1/matchmaking/enqueue
+// ---------------------------------------------------------------------------
+
+test('POST /api/v1/matchmaking/enqueue forwards JSON and session user id to gamey', async () => {
+  await withJsonServer(async (req, res, body) => {
+    assert.equal(req.method, 'POST');
+    assert.equal(req.url, '/v1/matchmaking/enqueue');
+    assert.equal(req.headers['content-type'], 'application/json');
+    assert.equal(req.headers['x-user-id'], 'adri');
+    assert.deepEqual(body, { size: 7 });
+
+    jsonResponse(res, 200, {
+      api_version: 'v1',
+      ticket_id: 'ticket-1',
+      status: 'waiting',
+      poll_after_ms: 1000,
+      position: 1,
+      game_id: null,
+      player_id: null,
+      player_token: null,
+    });
+  }, async (gameyUrl) => {
+    const { app } = createApp({
+      proxyFactory: noopProxyFactory,
+      env: { GAMEY_SERVICE_URL: gameyUrl },
+    });
+
+    await withServer(app, async (baseUrl) => {
+      const response = await fetch(`${baseUrl}/api/v1/matchmaking/enqueue`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'x-user-id': 'adri',
+        },
+        body: JSON.stringify({ size: 7 }),
+      });
+      const body = await response.json();
+
+      assert.equal(response.status, 200);
+      assert.equal(body.ticket_id, 'ticket-1');
+      assert.equal(body.status, 'waiting');
+    });
+  });
+});
+
+test('POST /api/v1/matchmaking/enqueue forwards gamey validation errors', async () => {
+  await withJsonServer(async (_req, res) => {
+    jsonResponse(res, 400, {
+      api_version: 'v1',
+      bot_id: null,
+      message: 'User already has an active matchmaking ticket: ticket-1',
+    });
+  }, async (gameyUrl) => {
+    const { app } = createApp({
+      proxyFactory: noopProxyFactory,
+      env: { GAMEY_SERVICE_URL: gameyUrl },
+    });
+
+    await withServer(app, async (baseUrl) => {
+      const response = await fetch(`${baseUrl}/api/v1/matchmaking/enqueue`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ size: 7 }),
+      });
+      const body = await response.json();
+
+      assert.equal(response.status, 400);
+      assert.match(body.message, /active matchmaking ticket/);
+    });
+  });
+});