Merge pull request #610 from TaloDev/develop

Release 0.87.3

Author: tudddorrr

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "game-services",
-  "version": "0.87.2",
+  "version": "0.87.3",
   "description": "",
   "main": "src/index.ts",
   "scripts": {

package.json

@@ -12,7 +12,6 @@ if (process.env.NODE_ENV !== 'test' && typeof process.env.HYPERDX_API_KEY === 's
   })
 
   const nodeMonitorMeter = metrics.getMeter('node-monitor-meter')
-
   const gauge = nodeMonitorMeter.createObservableGauge(
     'process.runtime.nodejs.memory.heap.total',
     {

src/lib/tracing/enable-tracing.ts

@@ -96,14 +96,19 @@ export default async function httpTracingMiddleware(ctx: Context, next: Next) {
     ...buildHeaders('request', ctx.request.headers),
     'http.method': ctx.method,
     'http.route': ctx.path,
-    'http.request.body': JSON.stringify(deepFilterData(ctx.request.body, true))
+    'http.request.body': ctx.request.body
+      ? JSON.stringify(deepFilterData(ctx.request.body, true))
+      : undefined
   })
 
   ctx.res.on('finish', () => {
     setTraceAttributes({
       ...buildHeaders('response', ctx.response.headers),
+      'http.status': ctx.status,
       'http.response_size': ctx.response.length,
-      'http.response.body': JSON.stringify(deepFilterData(ctx.response.body, true))
+      'http.response.body': ctx.response.body
+        ? JSON.stringify(deepFilterData(ctx.response.body, true))
+        : undefined
     })
   })
 

src/middleware/http-tracing-middleware.ts

@@ -288,7 +288,7 @@ export default class UserPublicService extends Service {
     const { code, userId } = req.body
     const em: EntityManager = req.ctx.em
 
-    const user = await em.getRepository(User).findOneOrFail(userId)
+    const user = await em.repo(User).findOneOrFail(userId, { populate: ['organisation.games'] })
 
     const redis: Redis = req.ctx.redis
     const hasSession = (await redis.get(`2fa:${user.id}`)) === 'true'

src/services/public/user-public.service.ts

@@ -0,0 +1,29 @@
+import { metrics } from '@opentelemetry/api'
+import { WebSocket } from 'ws'
+import Socket from '.'
+
+export function enableSocketTracing(socket: Socket) {
+  if (process.env.NODE_ENV === 'test') {
+    return
+  }
+
+  const socketMonitorMeter = metrics.getMeter('socket-monitor-meter')
+
+  const openGauge = socketMonitorMeter.createObservableGauge('talo.socket.connections.open')
+  openGauge.addCallback((result) => {
+    const allClients = Array.from(socket.getServer().clients.values())
+    result.observe(allClients.filter((c) => c.readyState === WebSocket.OPEN).length)
+  })
+
+  const closedGauge = socketMonitorMeter.createObservableGauge('talo.socket.connections.not-open')
+  closedGauge.addCallback((result) => {
+    const allClients = Array.from(socket.getServer().clients.values())
+    result.observe(allClients.filter((c) => c.readyState !== WebSocket.OPEN).length)
+  })
+
+  const ticketedGauge = socketMonitorMeter.createObservableGauge('talo.socket.connections.ticketed')
+  ticketedGauge.addCallback((result) => {
+    const allClients = socket.findConnections(() => true)
+    result.observe(allClients.length)
+  })
+}

src/socket/enableSocketTracing.ts

@@ -13,6 +13,7 @@ import SocketTicket from './socketTicket'
 import { getSocketTracer } from './socketTracer'
 import { FlushSocketEventsQueueHandler } from '../lib/queues/game-metrics/flush-socket-events-queue-handler'
 import { v4 } from 'uuid'
+import { enableSocketTracing } from './enableSocketTracing'
 
 type CloseConnectionOptions = {
   code?: number
@@ -52,6 +53,8 @@ export default class Socket {
     })
 
     this.redis = createRedisConnection()
+
+    enableSocketTracing(this)
   }
 
   getServer(): WebSocketServer {

src/socket/index.ts

@@ -1,11 +1,15 @@
 import request from 'supertest'
 import UserFactory from '../../../fixtures/UserFactory'
 import { differenceInMinutes, sub } from 'date-fns'
+import createOrganisationAndGame from '../../../utils/createOrganisationAndGame'
 
 describe('User public service - login', () => {
   it('should let a user login', async () => {
-    const user = await new UserFactory().loginable().one()
-    user.lastSeenAt = new Date(2020, 1, 1)
+    const [organisation] = await createOrganisationAndGame()
+    const user = await new UserFactory().loginable().state(() => ({
+      organisation,
+      lastSeenAt: new Date(2020, 1, 1)
+    })).one()
     await em.persistAndFlush(user)
 
     const res = await request(app)
@@ -16,7 +20,7 @@ describe('User public service - login', () => {
     expect(res.body.accessToken).toBeTruthy()
     expect(res.body.user).toBeTruthy()
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
     expect(new Date(res.body.user.lastSeenAt).getDay()).toEqual(new Date().getDay())
   })
 

tests/services/_public/user-public/login.test.ts

@@ -1,11 +1,15 @@
 import request from 'supertest'
 import UserSession from '../../../../src/entities/user-session'
 import UserFactory from '../../../fixtures/UserFactory'
+import createOrganisationAndGame from '../../../utils/createOrganisationAndGame'
 
 describe('User public service - refresh', () => {
   it('should let a user refresh their session if they have one', async () => {
-    const user = await new UserFactory().one()
-    user.lastSeenAt = new Date(2020, 1, 1)
+    const [organisation] = await createOrganisationAndGame()
+    const user = await new UserFactory().state(() => ({
+      organisation,
+      lastSeenAt: new Date(2020, 1, 1)
+    })).one()
     const session = new UserSession(user)
     await em.persistAndFlush(session)
 
@@ -17,7 +21,7 @@ describe('User public service - refresh', () => {
     expect(res.body.accessToken).toBeTruthy()
     expect(res.body.user).toBeTruthy()
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
 
     expect(new Date(res.body.user.lastSeenAt).getDay()).toEqual(new Date().getDay())
   })

tests/services/_public/user-public/refresh.test.ts

@@ -5,6 +5,7 @@ import createUserAndToken from '../../../utils/createUserAndToken'
 import UserTwoFactorAuth from '../../../../src/entities/user-two-factor-auth'
 import User from '../../../../src/entities/user'
 import generateRecoveryCodes from '../../../../src/lib/auth/generateRecoveryCodes'
+import createOrganisationAndGame from '../../../utils/createOrganisationAndGame'
 
 async function setTwoFactorAuthSession(user: User) {
   await redis.set(`2fa:${user.id}`, 'true')
@@ -15,9 +16,10 @@ async function removeTwoFactorAuthSession(user: User) {
 }
 
 async function createUserWithTwoFactorAuth(em: EntityManager): Promise<[string, User]> {
+  const [organisation] = await createOrganisationAndGame()
   const [token, user] = await createUserAndToken({
     twoFactorAuth: new UserTwoFactorAuth('blah')
-  })
+  }, organisation)
 
   user.twoFactorAuth!.enabled = true
   user.recoveryCodes = new Collection<UserRecoveryCode>(user, generateRecoveryCodes(user))
@@ -39,7 +41,7 @@ describe('User public service - use recovery code', () => {
 
     expect(res.body.user).toBeTruthy()
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
 
     expect(res.body.accessToken).toBeTruthy()
     expect(res.body.newRecoveryCodes).toBeUndefined()