convex-batch-processor 1.0.2 → 1.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +60 -2
- package/dist/client/index.d.ts +19 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +3 -0
- package/dist/client/index.js.map +1 -1
- package/dist/component/lib.d.ts +19 -5
- package/dist/component/lib.d.ts.map +1 -1
- package/dist/component/lib.js +83 -30
- package/dist/component/lib.js.map +1 -1
- package/dist/component/schema.d.ts +6 -1
- package/dist/component/schema.d.ts.map +1 -1
- package/dist/component/schema.js +5 -2
- package/dist/component/schema.js.map +1 -1
- package/package.json +1 -1
- package/src/client/index.test.ts +2 -0
- package/src/client/index.ts +29 -1
- package/src/component/lib.ts +106 -32
- package/src/component/schema.ts +5 -2
package/README.md
CHANGED
|
@@ -51,7 +51,8 @@ const analyticsEventValidator = v.object({
|
|
|
51
51
|
type AnalyticsEvent = typeof analyticsEventValidator.type;
|
|
52
52
|
|
|
53
53
|
// Create a batch processor with config
|
|
54
|
-
|
|
54
|
+
// Note: Explicit type annotation is required when the file also exports Convex functions
|
|
55
|
+
const batchProcessor: BatchProcessor<AnalyticsEvent> = new BatchProcessor(components.batchProcessor, {
|
|
55
56
|
maxBatchSize: 100,
|
|
56
57
|
flushIntervalMs: 30000,
|
|
57
58
|
processBatch: internal.analytics.processEventsBatch,
|
|
@@ -261,7 +262,7 @@ The `processBatch` **must be a Convex action** (not a mutation or plain JavaScri
|
|
|
261
262
|
Pass the function reference directly:
|
|
262
263
|
|
|
263
264
|
```typescript
|
|
264
|
-
const batchProcessor = new BatchProcessor(components.batchProcessor, {
|
|
265
|
+
const batchProcessor: BatchProcessor<MyEvent> = new BatchProcessor(components.batchProcessor, {
|
|
265
266
|
maxBatchSize: 100,
|
|
266
267
|
flushIntervalMs: 30000,
|
|
267
268
|
processBatch: internal.myModule.processBatch,
|
|
@@ -279,6 +280,41 @@ export const processBatch = internalAction({
|
|
|
279
280
|
});
|
|
280
281
|
```
|
|
281
282
|
|
|
283
|
+
#### BatchResult
|
|
284
|
+
|
|
285
|
+
Returned by `addItems()`:
|
|
286
|
+
|
|
287
|
+
```typescript
|
|
288
|
+
interface BatchResult {
|
|
289
|
+
batchId: string; // Same ID you passed in
|
|
290
|
+
itemCount: number; // Total items in batch
|
|
291
|
+
flushed: boolean; // Whether batch was flushed
|
|
292
|
+
status: BatchStatus; // "accumulating" | "flushing" | "completed"
|
|
293
|
+
}
|
|
294
|
+
```
|
|
295
|
+
|
|
296
|
+
#### BatchStatusResult
|
|
297
|
+
|
|
298
|
+
Returned by `getBatchStatus()`:
|
|
299
|
+
|
|
300
|
+
```typescript
|
|
301
|
+
interface BatchStatusResult {
|
|
302
|
+
batchId: string; // Same ID you passed in
|
|
303
|
+
batches: Array<{
|
|
304
|
+
status: "accumulating" | "flushing";
|
|
305
|
+
itemCount: number;
|
|
306
|
+
createdAt: number;
|
|
307
|
+
lastUpdatedAt: number;
|
|
308
|
+
}>;
|
|
309
|
+
config: {
|
|
310
|
+
maxBatchSize: number;
|
|
311
|
+
flushIntervalMs: number;
|
|
312
|
+
};
|
|
313
|
+
}
|
|
314
|
+
```
|
|
315
|
+
|
|
316
|
+
The `batches` array contains all active batches. Typically there's one, but during flush there may be both a flushing batch and a new accumulating batch.
|
|
317
|
+
|
|
282
318
|
#### IteratorConfig
|
|
283
319
|
|
|
284
320
|
```typescript
|
|
@@ -311,6 +347,28 @@ interface OnCompleteArgs {
|
|
|
311
347
|
}
|
|
312
348
|
```
|
|
313
349
|
|
|
350
|
+
## TypeScript Notes
|
|
351
|
+
|
|
352
|
+
### Explicit Type Annotation Required
|
|
353
|
+
|
|
354
|
+
When creating a `BatchProcessor` with config in a file that also exports Convex functions (mutations, queries, actions), you must add an explicit type annotation:
|
|
355
|
+
|
|
356
|
+
```typescript
|
|
357
|
+
// ✅ Correct - explicit type annotation
|
|
358
|
+
const batchProcessor: BatchProcessor<MyEvent> = new BatchProcessor(components.batchProcessor, {
|
|
359
|
+
processBatch: internal.myModule.processBatch,
|
|
360
|
+
// ...
|
|
361
|
+
});
|
|
362
|
+
|
|
363
|
+
// ❌ Will cause error TS7022
|
|
364
|
+
const batchProcessor = new BatchProcessor<MyEvent>(components.batchProcessor, {
|
|
365
|
+
processBatch: internal.myModule.processBatch,
|
|
366
|
+
// ...
|
|
367
|
+
});
|
|
368
|
+
```
|
|
369
|
+
|
|
370
|
+
This is due to circular type inference: TypeScript can't infer the type because the `internal` API types are generated from your file's exports, creating a circular dependency. The explicit annotation breaks this cycle.
|
|
371
|
+
|
|
314
372
|
## Error Handling
|
|
315
373
|
|
|
316
374
|
### Batch Accumulator
|
package/dist/client/index.d.ts
CHANGED
|
@@ -52,11 +52,25 @@ export interface FlushResult {
|
|
|
52
52
|
}
|
|
53
53
|
export interface BatchStatusResult {
|
|
54
54
|
batchId: string;
|
|
55
|
+
batches: Array<{
|
|
56
|
+
status: "accumulating" | "flushing";
|
|
57
|
+
itemCount: number;
|
|
58
|
+
createdAt: number;
|
|
59
|
+
lastUpdatedAt: number;
|
|
60
|
+
}>;
|
|
61
|
+
config: {
|
|
62
|
+
maxBatchSize: number;
|
|
63
|
+
flushIntervalMs: number;
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
export interface BatchListItem {
|
|
67
|
+
batchId: string;
|
|
68
|
+
baseBatchId: string;
|
|
69
|
+
sequence: number;
|
|
55
70
|
itemCount: number;
|
|
56
71
|
status: BatchStatus;
|
|
57
72
|
createdAt: number;
|
|
58
73
|
lastUpdatedAt: number;
|
|
59
|
-
config: BatchConfig;
|
|
60
74
|
}
|
|
61
75
|
export interface JobResult {
|
|
62
76
|
jobId: string;
|
|
@@ -109,6 +123,9 @@ export interface BatchProcessorAPI {
|
|
|
109
123
|
batchId: string;
|
|
110
124
|
limit?: number;
|
|
111
125
|
}, FlushHistoryItem[]>;
|
|
126
|
+
getAllBatchesForBaseId: FunctionReference<"query", "internal", {
|
|
127
|
+
baseBatchId: string;
|
|
128
|
+
}, BatchListItem[]>;
|
|
112
129
|
deleteBatch: FunctionReference<"mutation", "internal", {
|
|
113
130
|
batchId: string;
|
|
114
131
|
}, {
|
|
@@ -154,6 +171,7 @@ export declare class BatchProcessor<T = unknown> {
|
|
|
154
171
|
flush(ctx: GenericMutationCtx<any>, batchId: string): Promise<FlushResult>;
|
|
155
172
|
getBatchStatus(ctx: GenericQueryCtx<any>, batchId: string): Promise<BatchStatusResult | null>;
|
|
156
173
|
getFlushHistory(ctx: GenericQueryCtx<any>, batchId: string, limit?: number): Promise<FlushHistoryItem[]>;
|
|
174
|
+
getAllBatchesForBaseId(ctx: GenericQueryCtx<any>, baseBatchId: string): Promise<BatchListItem[]>;
|
|
157
175
|
deleteBatch(ctx: GenericMutationCtx<any>, batchId: string): Promise<{
|
|
158
176
|
deleted: boolean;
|
|
159
177
|
reason?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EAEpB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,UAAU,GAAG,WAAW,CAAC;AACpE,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,CAAC;AAGlF,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,OAAO;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE;QAAE,KAAK,EAAE,CAAC,EAAE,CAAA;KAAE,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,GAAG,OAAO;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,EAAE,iBAAiB,CAC9B,OAAO,EACP,UAAU,EACV;QAAE,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CACjD,CAAC;IACF,YAAY,EAAE,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE;QAAE,KAAK,EAAE,CAAC,EAAE,CAAA;KAAE,CAAC,CAAC;IACtE,UAAU,CAAC,EAAE,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClG,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAGD,UAAU,mBAAmB;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;CAC3B;AAED,UAAU,sBAAsB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"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"}
|
package/dist/client/index.js
CHANGED
|
@@ -34,6 +34,9 @@ export class BatchProcessor {
|
|
|
34
34
|
async getFlushHistory(ctx, batchId, limit) {
|
|
35
35
|
return await ctx.runQuery(this.component.lib.getFlushHistory, { batchId, limit });
|
|
36
36
|
}
|
|
37
|
+
async getAllBatchesForBaseId(ctx, baseBatchId) {
|
|
38
|
+
return await ctx.runQuery(this.component.lib.getAllBatchesForBaseId, { baseBatchId });
|
|
39
|
+
}
|
|
37
40
|
async deleteBatch(ctx, batchId) {
|
|
38
41
|
return await ctx.runMutation(this.component.lib.deleteBatch, { batchId });
|
|
39
42
|
}
|
package/dist/client/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,oBAAoB,GACpB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"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"}
|
package/dist/component/lib.d.ts
CHANGED
|
@@ -31,16 +31,28 @@ export declare const getBatchStatus: import("convex/server").RegisteredQuery<"pu
|
|
|
31
31
|
batchId: string;
|
|
32
32
|
}, Promise<{
|
|
33
33
|
batchId: string;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
34
|
+
batches: {
|
|
35
|
+
status: "accumulating" | "flushing";
|
|
36
|
+
itemCount: number;
|
|
37
|
+
createdAt: number;
|
|
38
|
+
lastUpdatedAt: number;
|
|
39
|
+
}[];
|
|
38
40
|
config: {
|
|
39
41
|
maxBatchSize: number;
|
|
40
42
|
flushIntervalMs: number;
|
|
41
|
-
processBatchHandle: string;
|
|
42
43
|
};
|
|
43
44
|
} | null>>;
|
|
45
|
+
export declare const getAllBatchesForBaseId: import("convex/server").RegisteredQuery<"public", {
|
|
46
|
+
baseBatchId: string;
|
|
47
|
+
}, Promise<{
|
|
48
|
+
batchId: string;
|
|
49
|
+
baseBatchId: string;
|
|
50
|
+
sequence: number;
|
|
51
|
+
itemCount: number;
|
|
52
|
+
status: "accumulating" | "flushing" | "completed";
|
|
53
|
+
createdAt: number;
|
|
54
|
+
lastUpdatedAt: number;
|
|
55
|
+
}[]>>;
|
|
44
56
|
export declare const getFlushHistory: import("convex/server").RegisteredQuery<"public", {
|
|
45
57
|
limit?: number | undefined;
|
|
46
58
|
batchId: string;
|
|
@@ -76,7 +88,9 @@ export declare const getBatch: import("convex/server").RegisteredQuery<"internal
|
|
|
76
88
|
flushIntervalMs: number;
|
|
77
89
|
processBatchHandle: string;
|
|
78
90
|
};
|
|
91
|
+
baseBatchId: string;
|
|
79
92
|
status: "accumulating" | "flushing" | "completed";
|
|
93
|
+
sequence: number;
|
|
80
94
|
itemCount: number;
|
|
81
95
|
createdAt: number;
|
|
82
96
|
lastUpdatedAt: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/component/lib.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/component/lib.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;GAqHnB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;GAyDrB,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;gBAmCC,cAAc,GAAG,UAAU;;;;;;;;;UAWrD,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;KAkBjC,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;KAiB1B,CAAC;AAEH,eAAO,MAAM,WAAW;;;;;;;;GA2BtB,CAAC;AAMH,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;UAQnB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;GA+BvB,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;iBA2D5B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;UAkB5B,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;aAGxB,OAAO;aACP,MAAM;cACL,OAAO;mBACF,MAAM;iBACR,MAAM;GAkBnB,CAAC;AAMH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;GA8C3B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;GAsB3B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;GAyB5B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;;;;;GAuB5B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;UA2B/B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;;;;;;KAmC3B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;;;GAmB5B,CAAC;AAMH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;UAQzB,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;UAK7B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;eAGhB,OAAO;WACX,OAAO;qBACG,MAAM;aACd,MAAM;YACP,MAAM;iBACD,MAAM;GA+FnB,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;iBAc5B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;iBAY3B,CAAC;AAEH,eAAO,MAAM,aAAa;;;;iBAcxB,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;iBAa9B,CAAC"}
|
package/dist/component/lib.js
CHANGED
|
@@ -16,15 +16,30 @@ export const addItems = mutation({
|
|
|
16
16
|
},
|
|
17
17
|
handler: async (ctx, { batchId, items, config }) => {
|
|
18
18
|
const now = Date.now();
|
|
19
|
+
// Parse base batch ID (strip sequence if present)
|
|
20
|
+
const baseBatchId = batchId.includes("::")
|
|
21
|
+
? batchId.split("::")[0]
|
|
22
|
+
: batchId;
|
|
23
|
+
// Find an accumulating batch for this base ID
|
|
19
24
|
let batch = await ctx.db
|
|
20
25
|
.query("batches")
|
|
21
|
-
.withIndex("
|
|
26
|
+
.withIndex("by_baseBatchId_status", (q) => q.eq("baseBatchId", baseBatchId).eq("status", "accumulating"))
|
|
22
27
|
.first();
|
|
23
28
|
let isNewBatch = false;
|
|
24
29
|
if (!batch) {
|
|
25
30
|
isNewBatch = true;
|
|
31
|
+
// Find highest sequence number for this base ID
|
|
32
|
+
const latestBatch = await ctx.db
|
|
33
|
+
.query("batches")
|
|
34
|
+
.withIndex("by_baseBatchId_status", (q) => q.eq("baseBatchId", baseBatchId))
|
|
35
|
+
.order("desc")
|
|
36
|
+
.first();
|
|
37
|
+
const nextSequence = latestBatch ? latestBatch.sequence + 1 : 0;
|
|
38
|
+
const newBatchId = `${baseBatchId}::${nextSequence}`;
|
|
26
39
|
const batchDocId = await ctx.db.insert("batches", {
|
|
27
|
-
batchId,
|
|
40
|
+
batchId: newBatchId,
|
|
41
|
+
baseBatchId,
|
|
42
|
+
sequence: nextSequence,
|
|
28
43
|
items: [],
|
|
29
44
|
itemCount: 0,
|
|
30
45
|
createdAt: now,
|
|
@@ -35,23 +50,7 @@ export const addItems = mutation({
|
|
|
35
50
|
batch = await ctx.db.get(batchDocId);
|
|
36
51
|
}
|
|
37
52
|
if (!batch) {
|
|
38
|
-
throw new Error(`Failed to create batch ${
|
|
39
|
-
}
|
|
40
|
-
// Reset completed batches to accumulating so they can accept new items
|
|
41
|
-
if (batch.status === "completed") {
|
|
42
|
-
await ctx.db.patch(batch._id, {
|
|
43
|
-
status: "accumulating",
|
|
44
|
-
items: [],
|
|
45
|
-
itemCount: 0,
|
|
46
|
-
lastUpdatedAt: now,
|
|
47
|
-
});
|
|
48
|
-
batch = await ctx.db.get(batch._id);
|
|
49
|
-
if (!batch) {
|
|
50
|
-
throw new Error(`Failed to reset batch ${batchId}`);
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
if (batch.status !== "accumulating") {
|
|
54
|
-
throw new Error(`Batch ${batchId} is not in accumulating state (current: ${batch.status})`);
|
|
53
|
+
throw new Error(`Failed to create batch for ${baseBatchId}`);
|
|
55
54
|
}
|
|
56
55
|
const newItems = [...batch.items, ...items];
|
|
57
56
|
const newItemCount = newItems.length;
|
|
@@ -72,7 +71,7 @@ export const addItems = mutation({
|
|
|
72
71
|
processBatchHandle: config.processBatchHandle,
|
|
73
72
|
});
|
|
74
73
|
return {
|
|
75
|
-
batchId,
|
|
74
|
+
batchId: baseBatchId,
|
|
76
75
|
itemCount: newItemCount,
|
|
77
76
|
flushed: true,
|
|
78
77
|
status: "flushing",
|
|
@@ -93,7 +92,7 @@ export const addItems = mutation({
|
|
|
93
92
|
scheduledFlushId,
|
|
94
93
|
});
|
|
95
94
|
return {
|
|
96
|
-
batchId,
|
|
95
|
+
batchId: baseBatchId,
|
|
97
96
|
itemCount: newItemCount,
|
|
98
97
|
flushed: false,
|
|
99
98
|
status: "accumulating",
|
|
@@ -103,15 +102,23 @@ export const addItems = mutation({
|
|
|
103
102
|
export const flushBatch = mutation({
|
|
104
103
|
args: { batchId: v.string() },
|
|
105
104
|
handler: async (ctx, { batchId }) => {
|
|
106
|
-
|
|
105
|
+
// First try exact match (for full batch IDs like "base::0")
|
|
106
|
+
let batch = await ctx.db
|
|
107
107
|
.query("batches")
|
|
108
108
|
.withIndex("by_batchId", (q) => q.eq("batchId", batchId))
|
|
109
109
|
.first();
|
|
110
|
+
// If not found, try as base batch ID and find the accumulating batch
|
|
111
|
+
if (!batch) {
|
|
112
|
+
batch = await ctx.db
|
|
113
|
+
.query("batches")
|
|
114
|
+
.withIndex("by_baseBatchId_status", (q) => q.eq("baseBatchId", batchId).eq("status", "accumulating"))
|
|
115
|
+
.first();
|
|
116
|
+
}
|
|
110
117
|
if (!batch) {
|
|
111
118
|
throw new Error(`Batch ${batchId} not found`);
|
|
112
119
|
}
|
|
113
120
|
if (batch.status !== "accumulating") {
|
|
114
|
-
throw new Error(`Batch ${
|
|
121
|
+
throw new Error(`Batch ${batch.baseBatchId} is not in accumulating state (current: ${batch.status})`);
|
|
115
122
|
}
|
|
116
123
|
if (batch.itemCount === 0) {
|
|
117
124
|
return { batchId, itemCount: 0, flushed: false, reason: "Batch is empty" };
|
|
@@ -142,21 +149,56 @@ export const flushBatch = mutation({
|
|
|
142
149
|
export const getBatchStatus = query({
|
|
143
150
|
args: { batchId: v.string() },
|
|
144
151
|
handler: async (ctx, { batchId }) => {
|
|
145
|
-
|
|
152
|
+
// Parse base batch ID (strip sequence if present)
|
|
153
|
+
const baseBatchId = batchId.includes("::")
|
|
154
|
+
? batchId.split("::")[0]
|
|
155
|
+
: batchId;
|
|
156
|
+
// Find all active (accumulating or flushing) batches for this base ID
|
|
157
|
+
const accumulatingBatches = await ctx.db
|
|
146
158
|
.query("batches")
|
|
147
|
-
.withIndex("
|
|
148
|
-
.
|
|
149
|
-
|
|
159
|
+
.withIndex("by_baseBatchId_status", (q) => q.eq("baseBatchId", baseBatchId).eq("status", "accumulating"))
|
|
160
|
+
.collect();
|
|
161
|
+
const flushingBatches = await ctx.db
|
|
162
|
+
.query("batches")
|
|
163
|
+
.withIndex("by_baseBatchId_status", (q) => q.eq("baseBatchId", baseBatchId).eq("status", "flushing"))
|
|
164
|
+
.collect();
|
|
165
|
+
const activeBatches = [...flushingBatches, ...accumulatingBatches];
|
|
166
|
+
if (activeBatches.length === 0) {
|
|
150
167
|
return null;
|
|
151
168
|
}
|
|
169
|
+
// Use config from any batch (they should all have the same config)
|
|
170
|
+
const config = activeBatches[0].config;
|
|
152
171
|
return {
|
|
172
|
+
batchId: baseBatchId,
|
|
173
|
+
batches: activeBatches.map((batch) => ({
|
|
174
|
+
status: batch.status,
|
|
175
|
+
itemCount: batch.itemCount,
|
|
176
|
+
createdAt: batch.createdAt,
|
|
177
|
+
lastUpdatedAt: batch.lastUpdatedAt,
|
|
178
|
+
})),
|
|
179
|
+
config: {
|
|
180
|
+
maxBatchSize: config.maxBatchSize,
|
|
181
|
+
flushIntervalMs: config.flushIntervalMs,
|
|
182
|
+
},
|
|
183
|
+
};
|
|
184
|
+
},
|
|
185
|
+
});
|
|
186
|
+
export const getAllBatchesForBaseId = query({
|
|
187
|
+
args: { baseBatchId: v.string() },
|
|
188
|
+
handler: async (ctx, { baseBatchId }) => {
|
|
189
|
+
const batches = await ctx.db
|
|
190
|
+
.query("batches")
|
|
191
|
+
.withIndex("by_baseBatchId_status", (q) => q.eq("baseBatchId", baseBatchId))
|
|
192
|
+
.collect();
|
|
193
|
+
return batches.map((batch) => ({
|
|
153
194
|
batchId: batch.batchId,
|
|
195
|
+
baseBatchId: batch.baseBatchId,
|
|
196
|
+
sequence: batch.sequence,
|
|
154
197
|
itemCount: batch.itemCount,
|
|
155
198
|
status: batch.status,
|
|
156
199
|
createdAt: batch.createdAt,
|
|
157
200
|
lastUpdatedAt: batch.lastUpdatedAt,
|
|
158
|
-
|
|
159
|
-
};
|
|
201
|
+
}));
|
|
160
202
|
},
|
|
161
203
|
});
|
|
162
204
|
export const getFlushHistory = query({
|
|
@@ -252,7 +294,7 @@ export const recordFlushResult = internalMutation({
|
|
|
252
294
|
if (!batch)
|
|
253
295
|
return;
|
|
254
296
|
await ctx.db.insert("flushHistory", {
|
|
255
|
-
batchId: batch.
|
|
297
|
+
batchId: batch.baseBatchId, // Store client's original ID, not internal sequence
|
|
256
298
|
itemCount,
|
|
257
299
|
flushedAt: Date.now(),
|
|
258
300
|
durationMs,
|
|
@@ -266,6 +308,17 @@ export const recordFlushResult = internalMutation({
|
|
|
266
308
|
itemCount: 0,
|
|
267
309
|
scheduledFlushId: undefined,
|
|
268
310
|
});
|
|
311
|
+
// Clean up old completed batches for the same base ID
|
|
312
|
+
// Keep only the most recent completed batch to reduce clutter
|
|
313
|
+
const completedBatches = await ctx.db
|
|
314
|
+
.query("batches")
|
|
315
|
+
.withIndex("by_baseBatchId_status", (q) => q.eq("baseBatchId", batch.baseBatchId).eq("status", "completed"))
|
|
316
|
+
.collect();
|
|
317
|
+
// Sort by sequence number descending and delete all but the most recent
|
|
318
|
+
const sortedCompleted = completedBatches.sort((a, b) => b.sequence - a.sequence);
|
|
319
|
+
for (let i = 1; i < sortedCompleted.length; i++) {
|
|
320
|
+
await ctx.db.delete(sortedCompleted[i]._id);
|
|
321
|
+
}
|
|
269
322
|
}
|
|
270
323
|
else {
|
|
271
324
|
let scheduledFlushId = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/component/lib.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/component/lib.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,12 +8,16 @@ declare const _default: import("convex/server").SchemaDefinition<{
|
|
|
8
8
|
flushIntervalMs: number;
|
|
9
9
|
processBatchHandle: string;
|
|
10
10
|
};
|
|
11
|
+
baseBatchId: string;
|
|
11
12
|
status: "accumulating" | "flushing" | "completed";
|
|
13
|
+
sequence: number;
|
|
12
14
|
itemCount: number;
|
|
13
15
|
createdAt: number;
|
|
14
16
|
lastUpdatedAt: number;
|
|
15
17
|
}, {
|
|
16
18
|
batchId: import("convex/values").VString<string, "required">;
|
|
19
|
+
baseBatchId: import("convex/values").VString<string, "required">;
|
|
20
|
+
sequence: import("convex/values").VFloat64<number, "required">;
|
|
17
21
|
items: import("convex/values").VArray<any[], import("convex/values").VAny<any, "required", string>, "required">;
|
|
18
22
|
itemCount: import("convex/values").VFloat64<number, "required">;
|
|
19
23
|
createdAt: import("convex/values").VFloat64<number, "required">;
|
|
@@ -29,8 +33,9 @@ declare const _default: import("convex/server").SchemaDefinition<{
|
|
|
29
33
|
processBatchHandle: import("convex/values").VString<string, "required">;
|
|
30
34
|
}, "required", "maxBatchSize" | "flushIntervalMs" | "processBatchHandle">;
|
|
31
35
|
scheduledFlushId: import("convex/values").VId<import("convex/values").GenericId<"_scheduled_functions"> | undefined, "optional">;
|
|
32
|
-
}, "required", "items" | "batchId" | "config" | "status" | "itemCount" | "createdAt" | "lastUpdatedAt" | "scheduledFlushId" | "config.maxBatchSize" | "config.flushIntervalMs" | "config.processBatchHandle">, {
|
|
36
|
+
}, "required", "items" | "batchId" | "config" | "baseBatchId" | "status" | "sequence" | "itemCount" | "createdAt" | "lastUpdatedAt" | "scheduledFlushId" | "config.maxBatchSize" | "config.flushIntervalMs" | "config.processBatchHandle">, {
|
|
33
37
|
by_batchId: ["batchId", "_creationTime"];
|
|
38
|
+
by_baseBatchId_status: ["baseBatchId", "status", "_creationTime"];
|
|
34
39
|
by_status: ["status", "_creationTime"];
|
|
35
40
|
}, {}, {}>;
|
|
36
41
|
iteratorJobs: import("convex/server").TableDefinition<import("convex/values").VObject<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/component/schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/component/schema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,wBAwDG"}
|
package/dist/component/schema.js
CHANGED
|
@@ -2,7 +2,9 @@ import { defineSchema, defineTable } from "convex/server";
|
|
|
2
2
|
import { v } from "convex/values";
|
|
3
3
|
export default defineSchema({
|
|
4
4
|
batches: defineTable({
|
|
5
|
-
batchId: v.string(),
|
|
5
|
+
batchId: v.string(), // Full ID with sequence: "base::0"
|
|
6
|
+
baseBatchId: v.string(), // Base ID: "base"
|
|
7
|
+
sequence: v.number(), // Sequence number: 0, 1, 2...
|
|
6
8
|
items: v.array(v.any()),
|
|
7
9
|
itemCount: v.number(),
|
|
8
10
|
createdAt: v.number(),
|
|
@@ -16,6 +18,7 @@ export default defineSchema({
|
|
|
16
18
|
scheduledFlushId: v.optional(v.id("_scheduled_functions")),
|
|
17
19
|
})
|
|
18
20
|
.index("by_batchId", ["batchId"])
|
|
21
|
+
.index("by_baseBatchId_status", ["baseBatchId", "status"])
|
|
19
22
|
.index("by_status", ["status"]),
|
|
20
23
|
iteratorJobs: defineTable({
|
|
21
24
|
jobId: v.string(),
|
|
@@ -38,7 +41,7 @@ export default defineSchema({
|
|
|
38
41
|
.index("by_jobId", ["jobId"])
|
|
39
42
|
.index("by_status", ["status"]),
|
|
40
43
|
flushHistory: defineTable({
|
|
41
|
-
batchId: v.string(),
|
|
44
|
+
batchId: v.string(), // Client's original ID (baseBatchId)
|
|
42
45
|
itemCount: v.number(),
|
|
43
46
|
flushedAt: v.number(),
|
|
44
47
|
durationMs: v.number(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/component/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,CAAC,EAAE,MAAM,eAAe,CAAC;AAElC,eAAe,YAAY,CAAC;IAC3B,OAAO,EAAE,WAAW,CAAC;QACpB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/component/schema.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/client/index.test.ts
CHANGED
|
@@ -23,6 +23,7 @@ describe("BatchProcessor client", () => {
|
|
|
23
23
|
flushBatch: {} as any,
|
|
24
24
|
getBatchStatus: {} as any,
|
|
25
25
|
getFlushHistory: {} as any,
|
|
26
|
+
getAllBatchesForBaseId: {} as any,
|
|
26
27
|
deleteBatch: {} as any,
|
|
27
28
|
startIteratorJob: {} as any,
|
|
28
29
|
pauseIteratorJob: {} as any,
|
|
@@ -45,6 +46,7 @@ describe("BatchProcessor client", () => {
|
|
|
45
46
|
flushBatch: {} as any,
|
|
46
47
|
getBatchStatus: {} as any,
|
|
47
48
|
getFlushHistory: {} as any,
|
|
49
|
+
getAllBatchesForBaseId: {} as any,
|
|
48
50
|
deleteBatch: {} as any,
|
|
49
51
|
startIteratorJob: {} as any,
|
|
50
52
|
pauseIteratorJob: {} as any,
|
package/src/client/index.ts
CHANGED
|
@@ -60,12 +60,27 @@ export interface FlushResult {
|
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
export interface BatchStatusResult {
|
|
63
|
+
batchId: string; // Client's original ID
|
|
64
|
+
batches: Array<{
|
|
65
|
+
status: "accumulating" | "flushing";
|
|
66
|
+
itemCount: number;
|
|
67
|
+
createdAt: number;
|
|
68
|
+
lastUpdatedAt: number;
|
|
69
|
+
}>;
|
|
70
|
+
config: {
|
|
71
|
+
maxBatchSize: number;
|
|
72
|
+
flushIntervalMs: number;
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
export interface BatchListItem {
|
|
63
77
|
batchId: string;
|
|
78
|
+
baseBatchId: string;
|
|
79
|
+
sequence: number;
|
|
64
80
|
itemCount: number;
|
|
65
81
|
status: BatchStatus;
|
|
66
82
|
createdAt: number;
|
|
67
83
|
lastUpdatedAt: number;
|
|
68
|
-
config: BatchConfig;
|
|
69
84
|
}
|
|
70
85
|
|
|
71
86
|
export interface JobResult {
|
|
@@ -127,6 +142,12 @@ export interface BatchProcessorAPI {
|
|
|
127
142
|
{ batchId: string; limit?: number },
|
|
128
143
|
FlushHistoryItem[]
|
|
129
144
|
>;
|
|
145
|
+
getAllBatchesForBaseId: FunctionReference<
|
|
146
|
+
"query",
|
|
147
|
+
"internal",
|
|
148
|
+
{ baseBatchId: string },
|
|
149
|
+
BatchListItem[]
|
|
150
|
+
>;
|
|
130
151
|
deleteBatch: FunctionReference<
|
|
131
152
|
"mutation",
|
|
132
153
|
"internal",
|
|
@@ -221,6 +242,13 @@ export class BatchProcessor<T = unknown> {
|
|
|
221
242
|
return await ctx.runQuery(this.component.lib.getFlushHistory, { batchId, limit });
|
|
222
243
|
}
|
|
223
244
|
|
|
245
|
+
async getAllBatchesForBaseId(
|
|
246
|
+
ctx: GenericQueryCtx<any>,
|
|
247
|
+
baseBatchId: string,
|
|
248
|
+
): Promise<BatchListItem[]> {
|
|
249
|
+
return await ctx.runQuery(this.component.lib.getAllBatchesForBaseId, { baseBatchId });
|
|
250
|
+
}
|
|
251
|
+
|
|
224
252
|
async deleteBatch(
|
|
225
253
|
ctx: GenericMutationCtx<any>,
|
|
226
254
|
batchId: string,
|
package/src/component/lib.ts
CHANGED
|
@@ -27,16 +27,37 @@ export const addItems = mutation({
|
|
|
27
27
|
handler: async (ctx, { batchId, items, config }) => {
|
|
28
28
|
const now = Date.now();
|
|
29
29
|
|
|
30
|
+
// Parse base batch ID (strip sequence if present)
|
|
31
|
+
const baseBatchId = batchId.includes("::")
|
|
32
|
+
? batchId.split("::")[0]
|
|
33
|
+
: batchId;
|
|
34
|
+
|
|
35
|
+
// Find an accumulating batch for this base ID
|
|
30
36
|
let batch = await ctx.db
|
|
31
37
|
.query("batches")
|
|
32
|
-
.withIndex("
|
|
38
|
+
.withIndex("by_baseBatchId_status", (q) =>
|
|
39
|
+
q.eq("baseBatchId", baseBatchId).eq("status", "accumulating")
|
|
40
|
+
)
|
|
33
41
|
.first();
|
|
34
42
|
|
|
35
43
|
let isNewBatch = false;
|
|
36
44
|
if (!batch) {
|
|
37
45
|
isNewBatch = true;
|
|
46
|
+
|
|
47
|
+
// Find highest sequence number for this base ID
|
|
48
|
+
const latestBatch = await ctx.db
|
|
49
|
+
.query("batches")
|
|
50
|
+
.withIndex("by_baseBatchId_status", (q) => q.eq("baseBatchId", baseBatchId))
|
|
51
|
+
.order("desc")
|
|
52
|
+
.first();
|
|
53
|
+
|
|
54
|
+
const nextSequence = latestBatch ? latestBatch.sequence + 1 : 0;
|
|
55
|
+
const newBatchId = `${baseBatchId}::${nextSequence}`;
|
|
56
|
+
|
|
38
57
|
const batchDocId = await ctx.db.insert("batches", {
|
|
39
|
-
batchId,
|
|
58
|
+
batchId: newBatchId,
|
|
59
|
+
baseBatchId,
|
|
60
|
+
sequence: nextSequence,
|
|
40
61
|
items: [],
|
|
41
62
|
itemCount: 0,
|
|
42
63
|
createdAt: now,
|
|
@@ -48,25 +69,7 @@ export const addItems = mutation({
|
|
|
48
69
|
}
|
|
49
70
|
|
|
50
71
|
if (!batch) {
|
|
51
|
-
throw new Error(`Failed to create batch ${
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
// Reset completed batches to accumulating so they can accept new items
|
|
55
|
-
if (batch.status === "completed") {
|
|
56
|
-
await ctx.db.patch(batch._id, {
|
|
57
|
-
status: "accumulating",
|
|
58
|
-
items: [],
|
|
59
|
-
itemCount: 0,
|
|
60
|
-
lastUpdatedAt: now,
|
|
61
|
-
});
|
|
62
|
-
batch = await ctx.db.get(batch._id);
|
|
63
|
-
if (!batch) {
|
|
64
|
-
throw new Error(`Failed to reset batch ${batchId}`);
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
if (batch.status !== "accumulating") {
|
|
69
|
-
throw new Error(`Batch ${batchId} is not in accumulating state (current: ${batch.status})`);
|
|
72
|
+
throw new Error(`Failed to create batch for ${baseBatchId}`);
|
|
70
73
|
}
|
|
71
74
|
|
|
72
75
|
const newItems = [...batch.items, ...items];
|
|
@@ -92,7 +95,7 @@ export const addItems = mutation({
|
|
|
92
95
|
});
|
|
93
96
|
|
|
94
97
|
return {
|
|
95
|
-
batchId,
|
|
98
|
+
batchId: baseBatchId,
|
|
96
99
|
itemCount: newItemCount,
|
|
97
100
|
flushed: true,
|
|
98
101
|
status: "flushing",
|
|
@@ -122,7 +125,7 @@ export const addItems = mutation({
|
|
|
122
125
|
});
|
|
123
126
|
|
|
124
127
|
return {
|
|
125
|
-
batchId,
|
|
128
|
+
batchId: baseBatchId,
|
|
126
129
|
itemCount: newItemCount,
|
|
127
130
|
flushed: false,
|
|
128
131
|
status: "accumulating",
|
|
@@ -133,17 +136,28 @@ export const addItems = mutation({
|
|
|
133
136
|
export const flushBatch = mutation({
|
|
134
137
|
args: { batchId: v.string() },
|
|
135
138
|
handler: async (ctx, { batchId }) => {
|
|
136
|
-
|
|
139
|
+
// First try exact match (for full batch IDs like "base::0")
|
|
140
|
+
let batch = await ctx.db
|
|
137
141
|
.query("batches")
|
|
138
142
|
.withIndex("by_batchId", (q) => q.eq("batchId", batchId))
|
|
139
143
|
.first();
|
|
140
144
|
|
|
145
|
+
// If not found, try as base batch ID and find the accumulating batch
|
|
146
|
+
if (!batch) {
|
|
147
|
+
batch = await ctx.db
|
|
148
|
+
.query("batches")
|
|
149
|
+
.withIndex("by_baseBatchId_status", (q) =>
|
|
150
|
+
q.eq("baseBatchId", batchId).eq("status", "accumulating")
|
|
151
|
+
)
|
|
152
|
+
.first();
|
|
153
|
+
}
|
|
154
|
+
|
|
141
155
|
if (!batch) {
|
|
142
156
|
throw new Error(`Batch ${batchId} not found`);
|
|
143
157
|
}
|
|
144
158
|
|
|
145
159
|
if (batch.status !== "accumulating") {
|
|
146
|
-
throw new Error(`Batch ${
|
|
160
|
+
throw new Error(`Batch ${batch.baseBatchId} is not in accumulating state (current: ${batch.status})`);
|
|
147
161
|
}
|
|
148
162
|
|
|
149
163
|
if (batch.itemCount === 0) {
|
|
@@ -181,23 +195,68 @@ export const flushBatch = mutation({
|
|
|
181
195
|
export const getBatchStatus = query({
|
|
182
196
|
args: { batchId: v.string() },
|
|
183
197
|
handler: async (ctx, { batchId }) => {
|
|
184
|
-
|
|
198
|
+
// Parse base batch ID (strip sequence if present)
|
|
199
|
+
const baseBatchId = batchId.includes("::")
|
|
200
|
+
? batchId.split("::")[0]
|
|
201
|
+
: batchId;
|
|
202
|
+
|
|
203
|
+
// Find all active (accumulating or flushing) batches for this base ID
|
|
204
|
+
const accumulatingBatches = await ctx.db
|
|
185
205
|
.query("batches")
|
|
186
|
-
.withIndex("
|
|
187
|
-
|
|
206
|
+
.withIndex("by_baseBatchId_status", (q) =>
|
|
207
|
+
q.eq("baseBatchId", baseBatchId).eq("status", "accumulating")
|
|
208
|
+
)
|
|
209
|
+
.collect();
|
|
188
210
|
|
|
189
|
-
|
|
211
|
+
const flushingBatches = await ctx.db
|
|
212
|
+
.query("batches")
|
|
213
|
+
.withIndex("by_baseBatchId_status", (q) =>
|
|
214
|
+
q.eq("baseBatchId", baseBatchId).eq("status", "flushing")
|
|
215
|
+
)
|
|
216
|
+
.collect();
|
|
217
|
+
|
|
218
|
+
const activeBatches = [...flushingBatches, ...accumulatingBatches];
|
|
219
|
+
|
|
220
|
+
if (activeBatches.length === 0) {
|
|
190
221
|
return null;
|
|
191
222
|
}
|
|
192
223
|
|
|
224
|
+
// Use config from any batch (they should all have the same config)
|
|
225
|
+
const config = activeBatches[0].config;
|
|
226
|
+
|
|
193
227
|
return {
|
|
228
|
+
batchId: baseBatchId,
|
|
229
|
+
batches: activeBatches.map((batch) => ({
|
|
230
|
+
status: batch.status as "accumulating" | "flushing",
|
|
231
|
+
itemCount: batch.itemCount,
|
|
232
|
+
createdAt: batch.createdAt,
|
|
233
|
+
lastUpdatedAt: batch.lastUpdatedAt,
|
|
234
|
+
})),
|
|
235
|
+
config: {
|
|
236
|
+
maxBatchSize: config.maxBatchSize,
|
|
237
|
+
flushIntervalMs: config.flushIntervalMs,
|
|
238
|
+
},
|
|
239
|
+
};
|
|
240
|
+
},
|
|
241
|
+
});
|
|
242
|
+
|
|
243
|
+
export const getAllBatchesForBaseId = query({
|
|
244
|
+
args: { baseBatchId: v.string() },
|
|
245
|
+
handler: async (ctx, { baseBatchId }) => {
|
|
246
|
+
const batches = await ctx.db
|
|
247
|
+
.query("batches")
|
|
248
|
+
.withIndex("by_baseBatchId_status", (q) => q.eq("baseBatchId", baseBatchId))
|
|
249
|
+
.collect();
|
|
250
|
+
|
|
251
|
+
return batches.map((batch) => ({
|
|
194
252
|
batchId: batch.batchId,
|
|
253
|
+
baseBatchId: batch.baseBatchId,
|
|
254
|
+
sequence: batch.sequence,
|
|
195
255
|
itemCount: batch.itemCount,
|
|
196
256
|
status: batch.status,
|
|
197
257
|
createdAt: batch.createdAt,
|
|
198
258
|
lastUpdatedAt: batch.lastUpdatedAt,
|
|
199
|
-
|
|
200
|
-
};
|
|
259
|
+
}));
|
|
201
260
|
},
|
|
202
261
|
});
|
|
203
262
|
|
|
@@ -309,7 +368,7 @@ export const recordFlushResult = internalMutation({
|
|
|
309
368
|
if (!batch) return;
|
|
310
369
|
|
|
311
370
|
await ctx.db.insert("flushHistory", {
|
|
312
|
-
batchId: batch.
|
|
371
|
+
batchId: batch.baseBatchId, // Store client's original ID, not internal sequence
|
|
313
372
|
itemCount,
|
|
314
373
|
flushedAt: Date.now(),
|
|
315
374
|
durationMs,
|
|
@@ -324,6 +383,21 @@ export const recordFlushResult = internalMutation({
|
|
|
324
383
|
itemCount: 0,
|
|
325
384
|
scheduledFlushId: undefined,
|
|
326
385
|
});
|
|
386
|
+
|
|
387
|
+
// Clean up old completed batches for the same base ID
|
|
388
|
+
// Keep only the most recent completed batch to reduce clutter
|
|
389
|
+
const completedBatches = await ctx.db
|
|
390
|
+
.query("batches")
|
|
391
|
+
.withIndex("by_baseBatchId_status", (q) =>
|
|
392
|
+
q.eq("baseBatchId", batch.baseBatchId).eq("status", "completed")
|
|
393
|
+
)
|
|
394
|
+
.collect();
|
|
395
|
+
|
|
396
|
+
// Sort by sequence number descending and delete all but the most recent
|
|
397
|
+
const sortedCompleted = completedBatches.sort((a, b) => b.sequence - a.sequence);
|
|
398
|
+
for (let i = 1; i < sortedCompleted.length; i++) {
|
|
399
|
+
await ctx.db.delete(sortedCompleted[i]._id);
|
|
400
|
+
}
|
|
327
401
|
} else {
|
|
328
402
|
let scheduledFlushId: typeof batch.scheduledFlushId = undefined;
|
|
329
403
|
if (batch.config.flushIntervalMs > 0 && batch.config.processBatchHandle) {
|
package/src/component/schema.ts
CHANGED
|
@@ -3,7 +3,9 @@ import { v } from "convex/values";
|
|
|
3
3
|
|
|
4
4
|
export default defineSchema({
|
|
5
5
|
batches: defineTable({
|
|
6
|
-
batchId: v.string(),
|
|
6
|
+
batchId: v.string(), // Full ID with sequence: "base::0"
|
|
7
|
+
baseBatchId: v.string(), // Base ID: "base"
|
|
8
|
+
sequence: v.number(), // Sequence number: 0, 1, 2...
|
|
7
9
|
items: v.array(v.any()),
|
|
8
10
|
itemCount: v.number(),
|
|
9
11
|
createdAt: v.number(),
|
|
@@ -17,6 +19,7 @@ export default defineSchema({
|
|
|
17
19
|
scheduledFlushId: v.optional(v.id("_scheduled_functions")),
|
|
18
20
|
})
|
|
19
21
|
.index("by_batchId", ["batchId"])
|
|
22
|
+
.index("by_baseBatchId_status", ["baseBatchId", "status"])
|
|
20
23
|
.index("by_status", ["status"]),
|
|
21
24
|
|
|
22
25
|
iteratorJobs: defineTable({
|
|
@@ -47,7 +50,7 @@ export default defineSchema({
|
|
|
47
50
|
.index("by_status", ["status"]),
|
|
48
51
|
|
|
49
52
|
flushHistory: defineTable({
|
|
50
|
-
batchId: v.string(),
|
|
53
|
+
batchId: v.string(), // Client's original ID (baseBatchId)
|
|
51
54
|
itemCount: v.number(),
|
|
52
55
|
flushedAt: v.number(),
|
|
53
56
|
durationMs: v.number(),
|