jspurefix 5.9.1 → 5.10.0

package/src/transport/session/fix-session.ts

@@ -4,6 +4,7 @@ import { FixSessionState } from './fix-session-state'
 import { MsgTransport } from '../factory'
 import { MsgTag } from '../../types'
 import { ILooseObject } from '../../collections/collection'
+import { SendCallback } from '../send-callback'
 
 import * as events from 'events'
 import { SessionState } from './session-state'
@@ -401,17 +402,35 @@ export abstract class FixSession extends events.EventEmitter {
     }
   }
 
-  protected send (msgType: string, obj: ILooseObject): void {
+  /**
+   * @param callback optional, invoked once the message has been encoded and handed to
+   * the transport, or as soon as that fails.  Without it a send is fire and forget:
+   * nothing tells the caller which sequence number the message went out under, and a
+   * message dropped because the session is down, or refused by the encoder, goes
+   * unanswered.  See https://github.com/TimelordUK/jspurefix/issues/86
+   */
+  protected send (msgType: string, obj: ILooseObject, callback: SendCallback | null = null): void {
     const state = this.sessionState.state
     switch (state) {
       case SessionState.Stopped: {
-        this.sessionLogger.warning(`can't send in state ${this.stateString()}`)
+        const msg = `can't send in state ${this.stateString()}`
+        this.sessionLogger.warning(msg)
+        // the message is dropped either way - but a caller that asked to be told is
+        // now told, instead of watching for a log line
+        callback?.(new Error(msg), { msgType, header: null, encoded: null })
         break
       }
 
       default: {
         this.sessionState.LastSentAt = new Date()
-        this.transport?.transmitter.send(msgType, obj)
+        const transmitter = this.transport?.transmitter
+        if (!transmitter) {
+          const msg = `no transport to send ${msgType} on`
+          this.sessionLogger.warning(msg)
+          callback?.(new Error(msg), { msgType, header: null, encoded: null })
+          break
+        }
+        transmitter.send(msgType, obj, callback)
         break
       }
     }

package/src/transport/session/resend-request-manager.ts

@@ -46,7 +46,7 @@ export class ResendAction {
 }
 
 export class PendingResendRange {
-  private readonly receivedSeqs: Set<number> = new Set()
+  private readonly receivedSeqs = new Set<number>()
 
   constructor (
     public readonly begin: number,
@@ -190,11 +190,11 @@ export class ResendRequestManager {
     // keep requestHistory for debugging
   }
 
-  get pending (): ReadonlyArray<PendingResendRange> {
+  get pending (): readonly PendingResendRange[] {
     return this.pendingRequests.slice()
   }
 
-  get history (): ReadonlyArray<ResendRequestRecord> {
+  get history (): readonly ResendRequestRecord[] {
     return this.requestHistory.slice()
   }
 
@@ -240,7 +240,7 @@ export class ResendRequestManager {
       return { begin: gapBegin, end: gapEnd }
     }
 
-    const covered: Set<number> = new Set()
+    const covered = new Set<number>()
     for (const pending of this.pendingRequests) {
       for (let seq = pending.begin; seq <= pending.end; seq++) {
         covered.add(seq)

package/src/transport/session/session-description.ts

@@ -1,5 +1,6 @@
 import { IMsgApplication } from '../msg-application'
 import { StoreConfig } from '../../store/store-config'
+import { ILooseObject } from '../../collections/collection'
 
 export interface IDynamicSessionParams {
   readonly Name: string
@@ -15,6 +16,19 @@ export interface IDynamicSessionParams {
 
 export interface ISessionDescription extends IDynamicSessionParams {
   readonly application?: IMsgApplication
+  /**
+   * Extra fields to place on the outbound Logon, merged over the ones the engine
+   * derives from this description.  Counterparties routinely demand a tag the
+   * standard Logon does not carry - an account, a default application version, a
+   * free text token - and this is the no-code way to send it:
+   *
+   *   "Logon": { "Account": "TVKD_001", "DefaultApplVerID": "9" }
+   *
+   * A field named here still has to exist on Logon in the dictionary the session
+   * loads, otherwise the encoder has no tag to write it to.  Set a field to null to
+   * suppress one the engine would otherwise send.  See issues #93, #39, #96.
+   */
+  readonly Logon?: ILooseObject
   HeartBtInt: number
   LastSentSeqNum?: number
   readonly LastReceivedSeqNum?: number

package/src/transport/session/session-sequence-coordinator.ts

@@ -160,7 +160,7 @@ export class SessionSequenceCoordinator {
     this.resendManager.recordRequestSent(begin, end, now)
   }
 
-  get pendingResendRequests (): ReadonlyArray<PendingResendRange> {
+  get pendingResendRequests (): readonly PendingResendRange[] {
     return this.resendManager.pending
   }
 

package/src/transport/session/session-sequence-store.ts

@@ -6,9 +6,9 @@
 export interface ISessionSequenceStore {
   senderSeqNum: number
   targetSeqNum: number
-  setSenderSeqNum (value: number): Promise<void>
-  setTargetSeqNum (value: number): Promise<void>
-  reset (): Promise<void>
+  setSenderSeqNum: (value: number) => Promise<void>
+  setTargetSeqNum: (value: number) => Promise<void>
+  reset: () => Promise<void>
 }
 
 /**

package/src/transport/tcp/tcp-initiator.ts

@@ -198,7 +198,7 @@ export class TcpInitiator extends FixInitiator {
       const timeoutPromise = promisify(setTimeout)
       const reconnectSeconds = application?.reconnectSeconds ?? 5
       let retries = 0
-      let lastError: Error = initialError as Error
+      let lastError: Error | undefined = initialError
       const name = application?.name ?? 'initiator'
       this.th = setInterval(() => {
         ++retries