@ossy/event-store 3.4.0 → 3.7.0

package/README.md

@@ -155,13 +155,20 @@ import { Mongo } from '@ossy/event-store'
 await Mongo.connect(process.env.DB_URL)
 ```
 
-Recommended indexes for `eventstore`:
+Recommended indexes (created at startup by `ensureEventStoreIndexes`):
 
 ```js
+// eventstore
 { resourceId: 1, version: 1 }  // stream queries
-{ type: 1, event: 1 }          // projection replay / task triggers
+
+// aggregates
+{ id: 1 }                                      // snapshot get-by-id
+{ type: 1, 'state.email': 1 }                  // user lookup (sparse)
+{ 'state.belongsTo': 1, 'state.location': 1 }  // folder list/search (sparse)
 ```
 
+`{ type: 1, event: 1 }` on `eventstore` is still useful for projection replay / task triggers but is not created automatically.
+
 ---
 
 ## Testing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/event-store",
-  "version": "3.4.0",
+  "version": "3.7.0",
   "description": "Ossy Event Store — Aggregate, EventStore, and MongoDB client",
   "repository": {
     "type": "git",
@@ -37,5 +37,5 @@
   "files": [
     "src"
   ],
-  "gitHead": "d36b69444268d172bc3e8e1dc77e67afc63f8650"
+  "gitHead": "622d97535abad08415963405ace2f5aaaecd7ca4"
 }

package/src/aggregate-rebuild.js

@@ -95,18 +95,25 @@ export class AggregateRebuild {
       return
     }
 
-    return EventStore.GetResourceStreams()
-      .then(streams => Promise.allSettled(
-        streams.map(({ resourceId, type }) => AggregateRebuild.BuildAndSaveResource(resourceId, type)),
-      ))
-      .then(async results => {
-        await ProjectionRebuild.rebuildAll()
-        const failed = results.filter(r => r.status === 'rejected')
-        const success = results.filter(r => r.status === 'fulfilled')
-        log.info('[AggregateRebuild][BuildAndSaveAll] Finished building aggregates')
-        log.info(`[AggregateRebuild][BuildAndSaveAll] Failed: ${failed.length}`)
-        log.info(`[AggregateRebuild][BuildAndSaveAll] Success: ${success.length}`)
-      })
+    // Fan-out of every stream at once OOMs 1–2 GB Fargate tasks (website-ossy
+    // deploy 2026-08-20). Rebuild in batches so Mongo load and RSS stay bounded.
+    const streams = await EventStore.GetResourceStreams()
+    const results = []
+    for (let offset = 0; offset < streams.length; offset += 8) {
+      const batchResults = await Promise.allSettled(
+        streams.slice(offset, offset + 8).map(({ resourceId, type }) =>
+          AggregateRebuild.BuildAndSaveResource(resourceId, type),
+        ),
+      )
+      results.push(...batchResults)
+    }
+
+    await ProjectionRebuild.rebuildAll()
+    const failed = results.filter(r => r.status === 'rejected')
+    const success = results.filter(r => r.status === 'fulfilled')
+    log.info('[AggregateRebuild][BuildAndSaveAll] Finished building aggregates')
+    log.info(`[AggregateRebuild][BuildAndSaveAll] Failed: ${failed.length}`)
+    log.info(`[AggregateRebuild][BuildAndSaveAll] Success: ${success.length}`)
   }
 }
 

package/src/aggregate-rebuild.spec.js

@@ -1,5 +1,7 @@
-import { describe, expect, it } from '@jest/globals'
-import { selectTailEventsForRebuild } from './aggregate-rebuild.js'
+import { afterEach, describe, expect, it, jest } from '@jest/globals'
+import { AggregateRebuild, selectTailEventsForRebuild } from './aggregate-rebuild.js'
+import { EventStore } from './event-store.js'
+import { ProjectionRebuild } from './projection-rebuild.js'
 
 describe('selectTailEventsForRebuild', () => {
   const resourceId = 'res_1'
@@ -40,6 +42,45 @@ describe('selectTailEventsForRebuild', () => {
   })
 })
 
+describe('BuildAndSaveAll', () => {
+  afterEach(() => {
+    AggregateRebuild._schemaMap = {}
+    AggregateRebuild._aggregateMap = {}
+    jest.restoreAllMocks()
+  })
+
+  it('rebuilds resource streams in batches of 8', async () => {
+    AggregateRebuild.registerAggregate({
+      id: '@ossy/test/aggregate',
+      Aggregate: class {
+        static SchemaId = 'test.schema'
+      },
+    })
+
+    const streams = Array.from({ length: 10 }, (_, i) => ({
+      resourceId: `res_${i}`,
+      type: 'test.schema',
+    }))
+    jest.spyOn(EventStore, 'GetResourceStreams').mockResolvedValue(streams)
+
+    let inFlight = 0
+    let maxInFlight = 0
+    jest.spyOn(AggregateRebuild, 'BuildAndSaveResource').mockImplementation(async () => {
+      inFlight += 1
+      maxInFlight = Math.max(maxInFlight, inFlight)
+      await new Promise(resolve => setTimeout(resolve, 15))
+      inFlight -= 1
+    })
+    jest.spyOn(ProjectionRebuild, 'rebuildAll').mockResolvedValue()
+
+    await AggregateRebuild.BuildAndSaveAll()
+
+    expect(AggregateRebuild.BuildAndSaveResource).toHaveBeenCalledTimes(10)
+    expect(maxInFlight).toBeLessThanOrEqual(8)
+    expect(ProjectionRebuild.rebuildAll).toHaveBeenCalledTimes(1)
+  })
+})
+
 describe('incremental rebuild semantics', () => {
   it('folds only tail events onto snapshot state', () => {
     const View = (events, state = {}) =>

package/src/ensure-indexes.js

@@ -9,6 +9,8 @@ let ensured = false
  * Ensure MongoDB indexes required for aggregate/event-stream reads.
  * Without `{ resourceId, version }` on `eventstore`, every `getResourceStream`
  * call scans the full collection — sign-up and changestream rebuilds deadlock under load.
+ * Without `{ state.belongsTo, state.location }` on `aggregates`, folder list/search
+ * examines the whole collection, including audit snapshots that are not in any folder.
  */
 export async function ensureEventStoreIndexes () {
   if (ensured) return
@@ -29,6 +31,10 @@ export async function ensureEventStoreIndexes () {
       { type: 1, 'state.email': 1 },
       { name: 'type_state_email', background: true, sparse: true },
     )
+    await aggregates.createIndex(
+      { 'state.belongsTo': 1, 'state.location': 1 },
+      { name: 'state_belongsTo_location', background: true, sparse: true },
+    )
   })
 
   ensured = true