Merge branch 'rc-v1' into 'v1'

Rc v1

See merge request subtype/subspace-api!11

Author: subtype

src/utils/auth.ts

@@ -5,11 +5,14 @@ import { logger } from './logger.js'
 const JWT_SECRET = process.env.JWT_SECRET
 
 export function logIncomingAuth(req: Request, res: Response, next: NextFunction) {
-  logger.debug('Incoming headers:', req.headers)
+  logger.info(
+    `[AUTH] ${req.headers['cf-connecting-ip'] ?? req.ip} - ${req.headers['cf-ipcountry'] ?? 'unknown country'}`
+  )
 
   const authHeader = req.headers.authorization
   if (!authHeader?.startsWith('Bearer ')) {
     logger.warn('No auth header or bad format')
+    logger.debug('Incoming headers:', req.headers)
   } else {
     const token = authHeader.split(' ')[1]
     logger.debug('Inspecting token:', token)

src/utils/rateLimiter.ts

@@ -4,16 +4,16 @@ import { logger } from './logger.js'
 import { Response } from 'express'
 
 export const rateLimiter: RateLimitRequestHandler = rateLimit({
-    windowMs: 60 * 1000,
-    limit: (req: Request): number => {
-        logger.debug(`Rate limit check ${ req.auth ? 'authenticated' : 'anon' } - ${ req.headers['cf-connecting-ip'] ?? req.ip }`)
-        return req.auth ? 60 : 5 // 60 req/min for auth, 5 for anon
-    },
-    keyGenerator: (req: Request): string => {
-        return req.auth?.sub ? `session-${req.auth.sub}` : req.ip!
-    },
-    handler: (req: Request, res: Response) => {
-        logger.warn('Rate limiting IP address:', req.ip)
-        res.status(429).send({ message: 'Rate limited' })
-    }
-})
+  windowMs: 60 * 1000,
+  limit: (req: Request): number => {
+    logger.info(`Rate limit check ${req.auth ? 'authenticated' : 'anon'} - ${req.headers['cf-connecting-ip'] ?? req.ip}`)
+    return req.auth ? 60 : 5 // 60 req/min for auth, 5 for anon
+  },
+  keyGenerator: (req: Request): string => {
+    return req.auth?.sub ? `session-${req.auth.sub}` : req.ip!
+  },
+  handler: (req: Request, res: Response) => {
+    logger.warn('Rate limiting IP address:', req.ip)
+    res.status(429).send({ message: 'Rate limited' })
+  },
+})