direct batch get tests and type simplification

nats-io · Nov 6, 2024 · 4fb61dc · 4fb61dc
1 parent 69eb332
commit 4fb61dc
Show file tree

Hide file tree

Showing 5 changed files with 404 additions and 140 deletions.
diff --git a/jetstream/src/jsapi_types.ts b/jetstream/src/jsapi_types.ts
@@ -493,16 +493,25 @@ export type NextMsgRequest = {
    */
   next_by_subj: string;
 };
+
 export type DirectMsgRequest =
   | SeqMsgRequest
   | LastForMsgRequest
-  | NextMsgRequest;
+  | NextMsgRequest
+  | StartTimeMsgRequest;
 
 // FIXME: new options on the server
+
+export interface DirectBatchFilter {
+  multi_last: string[];
+}
+
 export type DirectBatchOptions = {
+  multi_last: string[];
   batch?: number;
+
+  seq?: number;
   max_bytes?: number;
-  multi_last: string[];
   up_to_seq?: number;
   up_to_time?: Date | string;
 };
@@ -803,6 +812,13 @@ export interface SeqMsgRequest {
   seq: number;
 }
 
+export interface StartTimeMsgRequest {
+  /**
+   * Start time for the message
+   */
+  start_time: Date | string;
+}
+
 // FIXME: remove number as it is deprecated
 export type MsgRequest = SeqMsgRequest | LastForMsgRequest | number;
 

diff --git a/jetstream/src/jsclient.ts b/jetstream/src/jsclient.ts
@@ -48,7 +48,7 @@ import type {
   ApiResponse,
   JetStreamAccountStats,
 } from "./jsapi_types.ts";
-import { DirectStreamAPIImpl } from "./jsm.ts";
+import { DirectStreamAPIImpl } from "./jsm_direct.ts";
 import { JetStreamError } from "./jserrors.ts";
 
 export function toJetStreamClient(

diff --git a/jetstream/src/jsm.ts → jetstream/src/jsm_direct.ts b/jetstream/src/jsm.ts → jetstream/src/jsm_direct.ts