@ossy/platform 1.39.3 → 3.0.2

package/src/tasks/change-stream.js

@@ -17,6 +17,10 @@ export class ChangeStream {
   static _reconnectAttempts = 0
   static _dbUrl = null
   static _client = null
+  /** @type {import('mongodb').ChangeStream | null} */
+  static _changeStream = null
+  /** @type {ReturnType<typeof setTimeout> | null} */
+  static _reconnectTimer = null
 
   /**
    * Opens the MongoDB changestream and wires up reconnect logic.
@@ -33,12 +37,35 @@ export class ChangeStream {
     })
   }
 
-  static stop() {
+  static async stop () {
     ChangeStream._stopped = true
-    if (ChangeStream._client) {
-      ChangeStream._client.close().catch(() => {})
-      ChangeStream._client = null
+
+    if (ChangeStream._reconnectTimer) {
+      clearTimeout(ChangeStream._reconnectTimer)
+      ChangeStream._reconnectTimer = null
+    }
+
+    const stream = ChangeStream._changeStream
+    ChangeStream._changeStream = null
+    if (stream) {
+      try {
+        await stream.close()
+      } catch {
+        // ignore — stream may already be closed
+      }
+    }
+
+    const client = ChangeStream._client
+    ChangeStream._client = null
+    if (client) {
+      try {
+        await client.close()
+      } catch {
+        // ignore
+      }
     }
+
+    log.info('[ChangeStream] Stopped')
   }
 
   static async _getMongoClient() {
@@ -46,7 +73,10 @@ export class ChangeStream {
     return MongoClient
   }
 
-  static async _getClient() {
+  static async _getClient () {
+    if (ChangeStream._stopped) {
+      throw new Error('ChangeStream stopped')
+    }
     if (!ChangeStream._client) {
       const MongoClient = await ChangeStream._getMongoClient()
       ChangeStream._client = new MongoClient(ChangeStream._dbUrl, {
@@ -56,7 +86,8 @@ export class ChangeStream {
     return ChangeStream._client
   }
 
-  static async _resetClient() {
+  static async _resetClient () {
+    if (ChangeStream._stopped) return
     const MongoClient = await ChangeStream._getMongoClient()
     const prev = ChangeStream._client
     ChangeStream._client = new MongoClient(ChangeStream._dbUrl, {
@@ -68,7 +99,7 @@ export class ChangeStream {
     log.info('[ChangeStream] New MongoClient instance created')
   }
 
-  static _scheduleReconnect() {
+  static _scheduleReconnect () {
     if (ChangeStream._stopped) return
 
     const delaySecs = Math.min(Math.pow(2, ChangeStream._reconnectAttempts), 30)
@@ -76,7 +107,12 @@ export class ChangeStream {
 
     log.info(`[ChangeStream] Reconnecting in ${delaySecs}s...`)
 
-    setTimeout(() => {
+    if (ChangeStream._reconnectTimer) {
+      clearTimeout(ChangeStream._reconnectTimer)
+    }
+
+    ChangeStream._reconnectTimer = setTimeout(() => {
+      ChangeStream._reconnectTimer = null
       if (ChangeStream._stopped) return
       ChangeStream._open().catch((error) => {
         log.error('[ChangeStream] Change stream could not be opened', undefined, error)
@@ -85,16 +121,30 @@ export class ChangeStream {
     }, delaySecs * 1000)
   }
 
-  static async _open() {
+  static async _open () {
+    if (ChangeStream._stopped) return
+
     log.info('[ChangeStream] Watching for changes')
 
     const dbName = process.env.DB_NAME || 'test'
     const client = await ChangeStream._getClient()
+    if (ChangeStream._stopped) return
+
     const collection = client.db(dbName).collection('eventstore')
 
+    if (ChangeStream._changeStream) {
+      try {
+        await ChangeStream._changeStream.close()
+      } catch {
+        // ignore
+      }
+      ChangeStream._changeStream = null
+    }
+
     const changeStream = collection.watch([
       { $match: { operationType: 'insert' } },
     ])
+    ChangeStream._changeStream = changeStream
 
     const wasReconnecting = ChangeStream._reconnectAttempts > 0
     ChangeStream._reconnectAttempts = 0
@@ -105,6 +155,7 @@ export class ChangeStream {
     // Ensures only one reconnect is scheduled if both 'error' and 'close' fire for the same failure.
     let reconnectScheduled = false
     const scheduleOnce = () => {
+      if (ChangeStream._stopped) return
       if (!reconnectScheduled) {
         reconnectScheduled = true
         ChangeStream._scheduleReconnect()
@@ -112,6 +163,7 @@ export class ChangeStream {
     }
 
     changeStream.on('error', (error) => {
+      if (ChangeStream._stopped) return
       log.error('[ChangeStream] Change stream error (server keeps running)', undefined, error)
       if (isMongoTopologyClosedError(error)) {
         ChangeStream._resetClient().catch(() => {})
@@ -132,11 +184,19 @@ export class ChangeStream {
     })
 
     changeStream.on('close', () => {
+      if (ChangeStream._changeStream === changeStream) {
+        ChangeStream._changeStream = null
+      }
+      if (ChangeStream._stopped) return
       log.info('[ChangeStream] close detected')
       scheduleOnce()
     })
 
     changeStream.on('end', () => {
+      if (ChangeStream._changeStream === changeStream) {
+        ChangeStream._changeStream = null
+      }
+      if (ChangeStream._stopped) return
       log.info('[ChangeStream] end detected')
       scheduleOnce()
     })

package/src/users.middleware.js

@@ -5,8 +5,14 @@ import { User } from '@ossy/users/server'
 import { Token } from '@ossy/tokens/server'
 import { ConfigService } from './config.service.js'
 import { PoliciesQueries } from '@ossy/policies/server'
+import {
+  OperationTimeoutError,
+  resolveTimeoutMs,
+  withTimeout,
+} from './request-diagnostics.js'
 
 const log = createLogger('users')
+const AUTH_TIMEOUT_MS = resolveTimeoutMs('OSSY_AUTH_TIMEOUT_MS', 10_000)
 
 function normalizeAuthToken (token) {
   const trimmed = String(token ?? '').trim()
@@ -58,29 +64,55 @@ export class UsersMiddleware {
     log.info('[UsersMiddleware] Authenticating')
     log.debug('[UsersMiddleware] authToken', { authToken })
 
-    TokenService.verify(authToken)
-      .then(UsersMiddleware.assertApiTokenActive)
-      .then(payload => {
-        req.authPayload = payload
-        req.tokenScopes = payload?.type === 'Api' ? (payload.scopes ?? ['*']) : null
-        return payload
-      })
-      .then(({ sub }) => Aggregate.Of(User, sub))
-      .then(Aggregate.View())
-      .then(user => {
-        const workspaces = user.workspaces ?? []
+    const authStarted = performance.now()
+    let authFinished = false
+    const finishAuth = (apply) => {
+      if (authFinished) return
+      authFinished = true
+      apply()
+    }
 
-        return PoliciesQueries.GetPoliciesForUser(user.id)
-          .then(policies => {
-            log.info('[UsersMiddleware] Resolved user')
-            req.userId = user.id
-            req.user = { ...user, workspaces, policies }
-            next()
-          })
-      })
+    withTimeout(
+      TokenService.verify(authToken)
+        .then(UsersMiddleware.assertApiTokenActive)
+        .then(payload => {
+          req.authPayload = payload
+          req.tokenScopes = payload?.type === 'Api' ? (payload.scopes ?? ['*']) : null
+          return payload
+        })
+        .then(({ sub }) => Aggregate.Of(User, sub))
+        .then(Aggregate.View())
+        .then(user => {
+          const workspaces = user.workspaces ?? []
+
+          return PoliciesQueries.GetPoliciesForUser(user.id)
+            .then(policies => {
+              finishAuth(() => {
+                log.info('[UsersMiddleware] Resolved user', {
+                  elapsedMs: Math.round(performance.now() - authStarted),
+                })
+                req.userId = user.id
+                req.user = { ...user, workspaces, policies }
+                next()
+              })
+            })
+        }),
+      AUTH_TIMEOUT_MS,
+      'UsersMiddleware.AuthenticateUser',
+    )
       .catch(error => {
+        if (error instanceof OperationTimeoutError) {
+          log.warn('[UsersMiddleware] Auth timed out', {
+            timeoutMs: error.timeoutMs,
+            elapsedMs: Math.round(performance.now() - authStarted),
+          })
+          finishAuth(() => {
+            res.status(504).json({ error: 'Authentication timed out', code: 'AUTH_TIMEOUT' })
+          })
+          return
+        }
         log.debug('[UsersMiddleware] Auth failed; anonymous', { error })
-        asAnonymous()
+        finishAuth(asAnonymous)
       })
   }
 

package/src/schema-ids.js

@@ -1,9 +0,0 @@
-/** Platform envelope schemas (ADR 0008). */
-export const PlatformSchema = Object.freeze({
-  config: '@ossy/platform/schema/config',
-  directory: '@ossy/platform/schema/directory',
-  file: '@ossy/platform/schema/file',
-  taskRun: '@ossy/platform/schema/task-run',
-  actionInvocation: '@ossy/platform/schema/action-invocation',
-  meterEvent: '@ossy/platform/schema/meter-event',
-})