jspurefix 3.4.0 → 4.0.0

package/src/dictionary/parser/quickfix/node-parser.ts

@@ -1,4 +1,10 @@
-import { ContainedComponentField, ContainedField, ContainedGroupField, ContainedSimpleField } from '../../contained'
+import {
+  ContainedComponentField,
+  ContainedField,
+  ContainedGroupField,
+  ContainedSetBuilder,
+  ContainedSimpleField
+} from '../../contained'
 import { ComponentFieldDefinition, GroupFieldDefinition, SimpleFieldDefinition } from '../../definition'
 import { ParseContext } from './parse-context'
 import { ISaxNode } from '../../sax-node'
@@ -17,7 +23,8 @@ export abstract class NodeParser {
   protected addto (context: ParseContext, containedField: ContainedField): void {
     if (context.set != null) {
       this.progress.newAdds++
-      context.set.add(containedField)
+      const builder = new ContainedSetBuilder(context.set)
+      builder.add(containedField)
     } else {
       this.progress.cacheMisses++
     }
@@ -34,7 +41,7 @@ export abstract class NodeParser {
         throw new Error(`simple field ${node.name} has no parent on which to add.`)
       }
       const fieldName: string = node.attributes.name
-      const fieldDefinition: SimpleFieldDefinition | null = this.progress.definitions.simple.get(fieldName)
+      const fieldDefinition: SimpleFieldDefinition | undefined = this.progress.definitions.simple.get(fieldName)
       if (!fieldDefinition) {
         throw new Error(`simple field ${fieldName} has no declaration in dictionary.`)
       }
@@ -60,7 +67,7 @@ export abstract class NodeParser {
     if (!parent) {
       throw new Error(`component ${node.name} has no parent on which to add.`)
     }
-    const fieldDef: ComponentFieldDefinition | null = this.progress.definitions.component.get(componentName)
+    const fieldDef: ComponentFieldDefinition | undefined = this.progress.definitions.component.get(componentName)
     if (fieldDef) {
       const containedField: ContainedComponentField = this.makeContainedComponent(fieldDef, parent)
       this.addto(parent, containedField)
@@ -146,10 +153,10 @@ export abstract class NodeParser {
       throw new Error(msg)
     }
     const fullQualifiedName = `${this.fullContextName()}.${groupName}`
-    let cached: (GroupFieldDefinition | null) = this.progress.groupDefinitionCache.get(fullQualifiedName)
+    let cached: (GroupFieldDefinition | undefined) = this.progress.groupDefinitionCache.get(fullQualifiedName)
     if (!cached) {
       cached = new GroupFieldDefinition(groupName, groupName, null, noOfField, null)
-      this.progress.groupDefinitionCache.add(fullQualifiedName, cached)
+      this.progress.groupDefinitionCache.set(fullQualifiedName, cached)
     } else {
       cached.reset()
     }

package/src/dictionary/parser/quickfix/parse-context.ts

@@ -1,10 +1,10 @@
-import { ContainedFieldSet } from '../../contained'
+import { IContainedSet } from '../../contained'
 import { ComponentFieldDefinition, GroupFieldDefinition, MessageDefinition } from '../../definition'
 
 export class ParseContext {
   public required: boolean
 
-  constructor (public name: string, public defining: boolean, public set: ContainedFieldSet | null) {
+  constructor (public name: string, public defining: boolean, public set: IContainedSet | null) {
     this.required = false
   }
 

package/src/dictionary/parser/quickfix/parse-progress.ts

@@ -1,6 +1,5 @@
 import { ParseState } from './parse-state'
 import { FixDefinitions, GroupFieldDefinition } from '../../definition'
-import { Dictionary } from '../../../collections'
 
 export class ParseProgress {
   public definitions: FixDefinitions
@@ -13,10 +12,10 @@ export class ParseProgress {
   public previousDelta: number = 0
   public componentPasses: number = 0
   public readonly maxIterations: number = 5
-  public groupDefinitionCache: Dictionary<GroupFieldDefinition> = new Dictionary<GroupFieldDefinition>()
+  public groupDefinitionCache: Map<string, GroupFieldDefinition> = new Map<string, GroupFieldDefinition>()
 
   public toString (): string {
-    return `parseState = ${this.parseState}, numberPasses = ${this.numberPasses}, componentPasses = ${this.componentPasses}, groupCount = ${this.groupDefinitionCache.count()}, cacheMisses = ${this.cacheMisses}, newContexts = ${this.newContexts}, newDefines = ${this.newDefines}, newAdds = ${this.newAdds}, previousDelta = ${this.previousDelta}, delta = ${this.delta()}, changed = ${this.changed()}`
+    return `parseState = ${this.parseState}, numberPasses = ${this.numberPasses}, componentPasses = ${this.componentPasses}, groupCount = ${this.groupDefinitionCache.size}, cacheMisses = ${this.cacheMisses}, newContexts = ${this.newContexts}, newDefines = ${this.newDefines}, newAdds = ${this.newAdds}, previousDelta = ${this.previousDelta}, delta = ${this.delta()}, changed = ${this.changed()}`
   }
 
   public delta (): number {

package/src/dictionary/parser/quickfix/quick-fix-xml-file-builder.ts

@@ -9,13 +9,12 @@ import {
   FieldsDispatch
 } from '../../contained'
 import { keys } from 'lodash'
-import { Dictionary } from '../../../collections'
 import { QuickFixXmlFormatter } from './quick-fix-xml-formatter'
 
 export class QuickFixXmlFileBuilder {
   private readonly usedTags: INumericKeyed<string> = {}
   private readonly requiredComponents: string[] = []
-  private readonly seenComponents: Dictionary<boolean> = new Dictionary<boolean>()
+  private readonly seenComponents: Map<string, boolean> = new Map<string, boolean>()
   private readonly indent: number = 2
   private readonly dispatcher: FieldsDispatch = new FieldsDispatch()
   public readonly elasticBuffer: ElasticBuffer = new ElasticBuffer(10 * 1024)
@@ -121,7 +120,7 @@ export class QuickFixXmlFileBuilder {
    */
   private writeEnumDefinition (sf: SimpleFieldDefinition, leadingIndent: number): string {
     const eb: ElasticBuffer = new ElasticBuffer(2 * 1024)
-    const keys = sf.enums.keys()
+    const keys = Array.from(sf.enums.keys())
     keys.sort()
     keys.forEach(k => {
       eb.writeString(QuickFixXmlFormatter.addEnum(sf.enums.get(k), leadingIndent))
@@ -146,8 +145,8 @@ export class QuickFixXmlFileBuilder {
 
   private writeComponentField (cf: ContainedComponentField, eb: ElasticBuffer, leadingIndent: number): void {
     eb.writeString(QuickFixXmlFormatter.addComponent(cf, leadingIndent))
-    if (!this.seenComponents.containsKey(cf.name)) {
-      this.seenComponents.add(cf.name, true)
+    if (!this.seenComponents.has(cf.name)) {
+      this.seenComponents.set(cf.name, true)
       this.requiredComponents.push(cf.name)
     }
   }

package/src/dictionary/parser/quickfix/quick-fix-xml-file-parser.ts

@@ -1,7 +1,6 @@
-import * as fs from 'fs'
 import { SAXParser } from 'sax'
 import { IDictDoneCb, SAXStream } from '../../dict-primitive'
-import { FixDefinitions } from '../../definition'
+import { FixDefinitions, MessageDefinition } from '../../definition'
 import { FieldDefinitionParser } from './field-definition-parser'
 import { FieldSetParser } from './field-set-parser'
 import { MessageParser } from './message-parser'
@@ -9,7 +8,7 @@ import { NodeParser } from './node-parser'
 import { FixParser } from '../../fix-parser'
 import { GetJsFixLogger } from '../../../config'
 import { promisify } from 'util'
-import { ContainedComponentField } from '../../contained'
+import { ContainedComponentField, ContainedSetBuilder, IContainedSet } from '../../contained'
 import { ISaxNode } from '../../sax-node'
 import { FixDefinitionSource } from '../../fix-definition-source'
 import { VersionUtil } from '../../version-util'
@@ -33,7 +32,7 @@ export class QuickFixXmlFileParser extends FixParser {
       done(e, null)
     })
 
-    saxStream.on('closetag', (name) => {
+    saxStream.on('closetag', (name: string) => {
       if (parser != null) {
         parser.close(saxParser.line, name)
       }
@@ -49,9 +48,7 @@ export class QuickFixXmlFileParser extends FixParser {
       }
     })
 
-    saxStream.on('opentag', (node) => {
-      const saxNode: ISaxNode = node as ISaxNode
-
+    saxStream.on('opentag', (saxNode: ISaxNode) => {
       switch (saxNode.name) {
         case 'fix': {
           switch (progress.parseState) {
@@ -135,7 +132,7 @@ export class QuickFixXmlFileParser extends FixParser {
           switch (progress.parseState) {
             case ParseState.Messages: {
               parser = new FieldSetParser(progress)
-              parser.open(saxParser.line, node)
+              parser.open(saxParser.line, saxNode)
               break
             }
           }
@@ -154,15 +151,16 @@ export class QuickFixXmlFileParser extends FixParser {
 
   private encloseMessages (): void {
     const messages = this.state.definitions.message
-    const keys = messages.keys()
+    const keys = Array.from(messages.keys())
     const trailerName = 'StandardTrailer'
     keys.forEach(k => {
-      const message = messages.get(k)
+      const message: (MessageDefinition | undefined) = messages.get(k)
+      const builder = new ContainedSetBuilder(message as IContainedSet)
       const trailer = this.state.definitions.component.get(trailerName)
-      if (trailer && !message?.components.containsKey(trailerName)) {
+      if (trailer && !message?.components.has(trailerName)) {
         const contained = new ContainedComponentField(trailer, message?.fields?.length ?? 0, true)
         this.state.newAdds++
-        message?.add(contained)
+        builder?.add(contained)
       }
     })
   }

package/src/dictionary/parser/quickfix/quick-fix-xml-formatter.ts

@@ -52,7 +52,7 @@ export class QuickFixXmlFormatter {
     return `${QuickFixXmlFormatter.whitespace(ws)}</group>${newLine}`
   }
 
-  public static addEnum (fe: (FieldEnum | null), ws: number): string {
+  public static addEnum (fe: (FieldEnum | undefined), ws: number): string {
     return `${QuickFixXmlFormatter.whitespace(ws)}<value enum='${fe?.key}' description='${fe?.description ?? fe?.val}'/>${newLine}`
   }
 

package/src/dictionary/set-reduce.ts

@@ -1,5 +1,5 @@
 import {
-  ContainedField, ContainedFieldSet,
+  ContainedField, IContainedSet,
   ContainedGroupField, ContainedSimpleField, ContainedComponentField, ContainedFieldType
 } from './contained'
 import { ITypeDispatcher } from './type-dispatcher'
@@ -33,8 +33,8 @@ export class SetReduce<T> {
     }
   }
 
-  reduce (def: ContainedFieldSet, dispatcher: ITypeDispatcher<T>, init: T): T {
-    return def.fields.reduce((a: any, field: ContainedField) => {
+  reduce (def: IContainedSet, dispatcher: ITypeDispatcher<T>, init: T): T {
+    return def.fields.reduce((a: T, field: ContainedField) => {
       this.reduceField(a, field, dispatcher)
       return a
     }, init)

package/src/index.ts

@@ -2,6 +2,5 @@ export * from './runtime'
 export * from './dictionary'
 export * from './buffer'
 export * from './transport'
-export * from './collections'
 export * from './config'
 export * from './types'

package/src/jsfix-cmd.ts

@@ -19,7 +19,6 @@ import { AsciiMsgTransmitter } from './transport/ascii/ascii-msg-transmitter'
 import { SessionContainer } from './runtime'
 import { DITokens } from './runtime/di-tokens'
 import buildOptions from 'minimist-options'
-import { Dictionary } from './collections'
 import { QuickFixXmlFileBuilder } from './dictionary/parser/quickfix/quick-fix-xml-file-builder'
 
 const fs = require('node-fs-extra')
@@ -202,7 +201,7 @@ export class JsfixCmd {
   private sessionDescription: ISessionDescription
   private delimiter: number = AsciiChars.Soh
   private stats: ILooseObject = {}
-  private readonly filter: Dictionary<boolean> = new Dictionary<boolean>()
+  private readonly filter: Map<string, boolean> = new Map<string, boolean>()
   private messages: number = 0
   private print: boolean = true
 
@@ -425,7 +424,7 @@ export class JsfixCmd {
   }
 
   private field (): void {
-    let sf: SimpleFieldDefinition | null
+    let sf: SimpleFieldDefinition | undefined
     const tag: number = parseInt(argv.field, 10)
     const definitions = this.definitions
     if (!isNaN(tag)) {
@@ -465,7 +464,7 @@ export class JsfixCmd {
 
   private trim (): string {
     this.setFilter()
-    const types = this.filter.count() > 0 ? this.filter.keys() : this.definitions.simple.get('MsgType')?.enums.keys() ?? []
+    const types = this.filter.size > 0 ? Array.from(this.filter.keys()) : Array.from(this.definitions.simple.get('MsgType')?.enums.keys() ?? [])
     const qfb = new QuickFixXmlFileBuilder(this.definitions)
     qfb.write(types)
     return qfb.elasticBuffer.toString()
@@ -524,7 +523,7 @@ export class JsfixCmd {
         })
       }
       types.forEach((mt: any) => {
-        this.filter.add(mt, true)
+        this.filter.set(mt, true)
       })
     }
   }
@@ -555,7 +554,7 @@ export class JsfixCmd {
     // the receiver is message parser which is piped from an input stream - file, socket
     ft.receiver.on('msg', (msgType: string, m: AsciiView) => {
       if (filter) {
-        if (filter.containsKey(msgType)) {
+        if (filter.has(msgType)) {
           return
         }
       }

package/src/sample/tcp/recovering-skeleton/respawn-acceptor.ts

@@ -2,7 +2,6 @@ import { IJsFixConfig, IJsFixLogger } from '../../../config'
 import { TcpAcceptorListener } from '../../../transport/tcp'
 import { inject, injectable } from 'tsyringe'
 import { FixEntity, FixSession } from '../../../transport'
-import { Dictionary } from '../../../collections'
 import { MsgView } from '../../../buffer'
 import { MsgTransport } from '../../../transport/factory'
 import { ILooseObject } from '../../../collections/collection'
@@ -10,7 +9,7 @@ import { ILooseObject } from '../../../collections/collection'
 @injectable()
 export class RespawnAcceptor extends FixEntity {
   private readonly logger: IJsFixLogger
-  private readonly sessions: Dictionary<FixSession> = new Dictionary<FixSession>()
+  private readonly sessions: Map<string, FixSession> = new Map<string, FixSession>()
 
   constructor (@inject('IJsFixConfig') public readonly config: IJsFixConfig) {
     super(config)
@@ -28,27 +27,27 @@ export class RespawnAcceptor extends FixEntity {
     this.logger.info(`rxOnMsg msgType = ${msgType}`)
     const o: ILooseObject = view.toObject() as ILooseObject
     const key: string = o.StandardHeader.SenderCompID
-    if (!this.sessions.containsKey(key)) {
-      this.logger.info(`onSession: new session acceptor SenderCompID = ${key} created, count = ${this.sessions.count()}}`)
-      this.sessions.add(key, session)
+    if (!this.sessions.has(key)) {
+      this.logger.info(`onSession: new session acceptor SenderCompID = ${key} created, count = ${this.sessions.size}}`)
+      this.sessions.set(key, session)
     }
   }
 
   private resetSessionSeqNo (session: FixSession): void {
     const key = this.config.description.TargetCompID
-    if (this.sessions.containsKey(key)) {
+    if (this.sessions.has(key)) {
       const lastSession = this.sessions.get(key)
       const lastPeerSeqNum = lastSession?.lastPeerSeqNum() ?? 0
       this.logger.info(`resetSessionSeqNo: set lastPeerSeqNum ${lastPeerSeqNum} for key ${key}`)
       session.reset(lastPeerSeqNum)
-      this.sessions.remove(key)
+      this.sessions.delete(key)
     }
   }
 
   private resetLastSentSeqNo (): void {
     if (!this.resetSeqNo()) {
       const key = this.config.description.TargetCompID
-      if (this.sessions.containsKey(key)) {
+      if (this.sessions.has(key)) {
         const lastSession = this.sessions.get(key)
         const lastSentSeqNum = lastSession?.lastSentSeqNum() ?? 0
         this.logger.info(`resetLastSentSeqNo: set seqNo ${lastSentSeqNum} for key ${key}`)

package/src/sample/tcp/trade-capture/trade-capture-client.ts

@@ -6,18 +6,17 @@ import {
   ITradeCaptureReportRequestAck
 } from '../../../types/FIX4.4/repo'
 import { IJsFixLogger, IJsFixConfig } from '../../../config'
-import { Dictionary } from '../../../collections'
 import { TradeFactory } from './trade-factory'
 
 export class TradeCaptureClient extends AsciiSession {
   private readonly logger: IJsFixLogger
   private readonly fixLog: IJsFixLogger
-  private readonly reports: Dictionary<ITradeCaptureReport>
+  private readonly reports: Map<string, ITradeCaptureReport>
 
   constructor (public readonly config: IJsFixConfig) {
     super(config)
     this.logReceivedMsgs = true
-    this.reports = new Dictionary<ITradeCaptureReport>()
+    this.reports = new Map<string, ITradeCaptureReport>()
     this.fixLog = config.logFactory.plain(`jsfix.${config?.description?.application?.name}.txt`)
     this.logger = config.logFactory.logger(`${this.me}:TradeCaptureClient`)
   }
@@ -28,8 +27,8 @@ export class TradeCaptureClient extends AsciiSession {
       case MsgType.TradeCaptureReport: {
         // create an object and cast to the interface
         const tc: ITradeCaptureReport = view.toObject() as ITradeCaptureReport
-        this.reports.addUpdate(tc.TradeReportID, tc)
-        this.logger.info(`[reports: ${this.reports.count()}] received tc ExecID = ${tc.ExecID} TradeReportID  = ${tc.TradeReportID} Symbol = ${tc.Instrument.Symbol} ${tc.LastQty} @ ${tc.LastPx}`)
+        this.reports.set(tc.TradeReportID, tc)
+        this.logger.info(`[reports: ${this.reports.size}] received tc ExecID = ${tc.ExecID} TradeReportID  = ${tc.TradeReportID} Symbol = ${tc.Instrument.Symbol} ${tc.LastQty} @ ${tc.LastPx}`)
         break
       }
 

package/src/sample/tcp/trade-capture/trade-capture-server.ts

@@ -32,7 +32,7 @@ export class TradeCaptureServer extends AsciiSession {
 
       default: {
         const seqNum = view.getTyped(MsgTag.MsgSeqNum)
-        const msg = this.config.factory?.reject(msgType, seqNum, `${this.me}: unexpected msg type '${msgType}'`, SessionRejectReason.InvalidMsgType)
+        const msg = this.config.factory?.reject(msgType, seqNum as number, `${this.me}: unexpected msg type '${msgType}'`, SessionRejectReason.InvalidMsgType)
         if (msg) {
           this.send(msgType, msg)
         }

package/src/store/fix-msg-ascii-store-resend.ts

@@ -28,9 +28,15 @@ export class FixMsgAsciiStoreResend {
 
   private inflateRange (startSeq: number, endSeq: number, input: IFixMsgStoreRecord[]): IFixMsgStoreRecord[] {
     const toResend: IFixMsgStoreRecord[] = []
+    // If no records for this given sequence number range, returns a single gap fill
+    if (input.length === 0) {
+      this.gap(startSeq, endSeq + 1, toResend)
+      return toResend
+    }
+
     let expected = startSeq
     for (let i = 0; i < input.length; ++i) {
-      const record = input[i].clone()
+      const record = this.prepareRecordForRetransmission(input[i])
       const seqNum = record.seqNum
       const toGap = seqNum - expected
       if (toGap > 0) {
@@ -48,16 +54,16 @@ export class FixMsgAsciiStoreResend {
     return toResend
   }
 
-  public gap (beginGap: number, seqNum: number, arr: IFixMsgStoreRecord[]): void {
+  private gap (beginGap: number, newSeq: number, arr: IFixMsgStoreRecord[]): void {
     if (beginGap > 0) {
-      arr.push(this.sequenceResetGap(beginGap, seqNum))
+      arr.push(this.sequenceResetGap(beginGap, newSeq))
     }
   }
 
   // if records were sent as encoded text then inflate back to object
   // so can be resent or examined
 
-  public inflate (record: IFixMsgStoreRecord): void {
+  private inflate (record: IFixMsgStoreRecord): void {
     if (record.obj) return
     if (!record.encoded) return
     const parser = this.parser
@@ -71,17 +77,67 @@ export class FixMsgAsciiStoreResend {
     parser.parseText(record.encoded)
   }
 
-  public sequenceResetGap (startGap: number, newSeq: number): IFixMsgStoreRecord {
+  /**
+   * A continuous sequence of messages not being retransmitted should be skipped over using a
+   * single SequenceReset(35=4) message with GapFillFlag(123) set to “Y” and MsgSeqNum(34) set
+   * to the sequence number of the first skipped message and NewSeqNo(36) must always be set
+   * to the value of the next sequence number to be expected by the peer immediately following
+   * the messages being skipped.
+   */
+  private sequenceResetGap (startGap: number, newSeq: number): IFixMsgStoreRecord {
     const factory = this.config.factory
     const gapFill: ISequenceReset = factory?.sequenceReset(newSeq, true) as ISequenceReset
     gapFill.StandardHeader = factory?.header(MsgType.SequenceReset, startGap) as IStandardHeader
     gapFill.StandardHeader.PossDupFlag = true
-    gapFill.NewSeqNo = newSeq
+
     return new FixMsgStoreRecord(
       MsgType.SequenceReset,
       new Date(),
-      newSeq,
+      startGap,
       gapFill,
-      null)
+      null,
+    )
+  }
+
+  /**
+   * Prepares the FIX message as response to ResendRequest (2).
+   *
+   * The FIX session processor retransmitting a message with the PossDupFlag(43) set to "Y" must modify the following fields:
+   *
+   * SendingTime(52) set to the current sending time
+   * OrigSendingTime(122) set to the SendingTime(52) from the original message
+   * Recalculate the BodyLength(9)
+   * Recalculate the CheckSum(10)
+   *
+   * If the message is encrypted, SecureDataLen(90) and SecureData(91) may also require re-encryption and re-encoding
+   *
+   * @see https://www.fixtrading.org/standards/fix-session-layer-online/#message-recovery
+   *
+   * @param originalRecord the FIX message to be retransmitted as possible duplicate
+   * @returns the FIX message ready to be retransmitted
+   */
+  private prepareRecordForRetransmission (originalRecord: IFixMsgStoreRecord): IFixMsgStoreRecord {
+    const retransmitted = originalRecord.clone() // We don't want to accidently change any fields of the original record
+
+    const factory = this.config.factory
+    if (!retransmitted.obj) {
+      retransmitted.obj = {}
+    }
+
+    // Rebuilds header with the updated fields
+    const header = factory?.header(
+      retransmitted.msgType,
+      retransmitted.seqNum,
+      new Date(), // SendingTime(52)
+      {
+        PossDupFlag: true,
+        OrigSendingTime: retransmitted.timestamp
+      }
+    )
+    retransmitted.obj = {
+      ...retransmitted.obj,
+      StandardHeader: header
+    }
+    return retransmitted
   }
 }

package/src/store/fix-msg-memory-store.ts

@@ -1,7 +1,6 @@
 import { IFixMsgStore } from './fix-msg-store'
 import { IJsFixConfig, IJsFixLogger } from '../config'
 import { IFixMsgStoreRecord } from './fix-msg-store-record'
-import { Dictionary } from '../collections'
 import { MsgType } from '../types'
 import { IFixMsgStoreState } from './fix-msg-store-state'
 
@@ -9,7 +8,7 @@ export class FixMsgMemoryStore implements IFixMsgStore {
   protected readonly logger: IJsFixLogger
   public heartbeat: boolean = true
   private sortedBySeqNum: IFixMsgStoreRecord[] = []
-  private readonly excluded: Dictionary<boolean> = new Dictionary<boolean>()
+  private readonly excluded: Map<string, boolean> = new Map<string, boolean>()
   public length: number = 0
   private readonly sessionMessages: string[] = [
     MsgType.Logon,
@@ -131,7 +130,7 @@ export class FixMsgMemoryStore implements IFixMsgStore {
 
   public async put (record: IFixMsgStoreRecord): Promise<IFixMsgStoreState> {
     return await new Promise((resolve, reject) => {
-      if (this.excluded.containsKey(record.msgType)) {
+      if (this.excluded.has(record.msgType)) {
         resolve(this.buildState())
       } else {
         const arr = this.sortedBySeqNum
@@ -154,7 +153,7 @@ export class FixMsgMemoryStore implements IFixMsgStore {
 
   private excludeRange (exclude: string[]): void {
     exclude.forEach(s => {
-      this.excluded.add(s, true)
+      this.excluded.set(s, true)
     })
   }
 

package/src/store/fix-msg-store-record.ts

@@ -20,7 +20,7 @@ export class FixMsgStoreRecord implements IFixMsgStoreRecord {
   }
 
   static toMsgStoreRecord (v: MsgView): IFixMsgStoreRecord {
-    return new FixMsgStoreRecord(v.getString(MsgTag.MsgType) ?? '', v.getTyped(MsgTag.SendingTime), v.getTyped(MsgTag.MsgSeqNum), v.toObject() as ILooseObject)
+    return new FixMsgStoreRecord(v.getString(MsgTag.MsgType) ?? '', v.getTyped(MsgTag.SendingTime) as Date, v.getTyped(MsgTag.MsgSeqNum) as number, v.toObject() as ILooseObject)
   }
 
   clone (): IFixMsgStoreRecord {

package/src/transport/ascii/ascii-msg-transmitter.ts

@@ -1,7 +1,7 @@
 import { AsciiChars, AsciiEncoder, TimeFormatter } from '../../buffer/ascii'
 import { MsgTransmitter } from '../msg-transmitter'
 import { ILooseObject } from '../../collections/collection'
-import { ContainedFieldSet } from '../../dictionary/contained'
+import { IContainedSet } from '../../dictionary/contained'
 import { MessageDefinition } from '../../dictionary/definition'
 import { IJsFixConfig } from '../../config'
 import { IStandardHeader } from '../../types/FIX4.4/repo'
@@ -14,8 +14,8 @@ export class AsciiMsgTransmitter extends MsgTransmitter {
   public msgSeqNum: number
   public time: Date
 
-  private readonly header: ContainedFieldSet | null
-  private readonly trailer: ContainedFieldSet | null
+  private readonly header: IContainedSet | undefined
+  private readonly trailer: IContainedSet | undefined
 
   constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig) {
     super(config.sessionContainer.resolve<ElasticBuffer>(DITokens.TransmitBuffer), config.definitions, config.description)
@@ -65,13 +65,13 @@ export class AsciiMsgTransmitter extends MsgTransmitter {
 
     const buffer = this.buffer
     buffer.reset()
-    const msgDef: MessageDefinition | null = this.definitions.message.get(msgType)
+    const msgDef: MessageDefinition | undefined = this.definitions.message.get(msgType)
     if (!msgDef) {
       this.emit('error', new Error(`ascii transmitter cannot find definition for ${msgType}`))
       return null
     }
-    const headerName = this.header?.name ?? 'header'
-    const trailerName = this.trailer?.name ?? 'trailer'
+    const headerName: string = this.header?.name ?? 'header'
+    const trailerName: string = this.trailer?.name ?? 'trailer'
     encoder.encode(hdr, headerName)
     encoder.encode(bodyProps, msgDef.name)
     const lenPos = encoder.bodyLengthPos

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

@@ -30,7 +30,7 @@ export abstract class AsciiSession extends FixSession {
       default: {
         const state = this.sessionState
         const lastSeq: number = state.lastPeerMsgSeqNum
-        const seqNo: number = view.getTyped(MsgTag.MsgSeqNum)
+        const seqNo: number = view.getTyped(MsgTag.MsgSeqNum) as number
         let ret: boolean = false
         const seqDelta: number = seqNo - lastSeq
         if (seqDelta <= 0) {
@@ -89,7 +89,7 @@ export abstract class AsciiSession extends FixSession {
 
   private checkIntegrity (msgType: string, view: MsgView): boolean {
     const state = this.sessionState
-    const seqNum = view.getTyped(MsgTag.MsgSeqNum)
+    const seqNum = view.getTyped(MsgTag.MsgSeqNum) as number
 
     const received: number = parseInt(view.getString(MsgTag.CheckSum) ?? '', 10)
     const computed = view.checksum()
@@ -160,7 +160,11 @@ export abstract class AsciiSession extends FixSession {
   protected onResendRequest (view: MsgView): void {
     // if no records are in store then send a gap fill for entire sequence
     this.setState(SessionState.HandleResendRequest)
-    const [beginSeqNo, endSeqNo] = view.getTypedTags([MsgTag.BeginSeqNo, MsgTag.EndSeqNo])
+    const [beginSeqNo, requestedEndSeqNo] = view.getTypedTags([MsgTag.BeginSeqNo, MsgTag.EndSeqNo])
+    const endSeqNo = requestedEndSeqNo === 0
+      ? this.sessionState.lastSentSeqNum()
+      : requestedEndSeqNo
+
     this.sessionLogger.info(`onResendRequest getResendRequest beginSeqNo = ${beginSeqNo}, endSeqNo = ${endSeqNo}`)
     this.resender.getResendRequest(beginSeqNo as number, endSeqNo as number).then((records: IFixMsgStoreRecord[]) => {
       const validRecords = records.filter(rec => rec.obj !== null)
@@ -171,7 +175,7 @@ export abstract class AsciiSession extends FixSession {
         }
       })
       this.setState(SessionState.ActiveNormalSession)
-    }).catch(e => {
+    }).catch((e: Error) => {
       this.sessionLogger.error(e)
     })
   }
@@ -225,7 +229,7 @@ export abstract class AsciiSession extends FixSession {
       }
 
       case MsgType.SequenceReset: {
-        const newSeqNo: number = view.getTyped(MsgTag.NewSeqNo)
+        const newSeqNo: number = view.getTyped(MsgTag.NewSeqNo) as number
         logger.info(`peer sends '${msgType}' sequence reset. newSeqNo = ${newSeqNo}`)
         // expect  newSeqNo to be the next message's sequence number.
         this.sessionState.lastPeerMsgSeqNum = newSeqNo - 1
@@ -289,8 +293,8 @@ export abstract class AsciiSession extends FixSession {
     const [heartBtInt, peerCompId, userName, password] = view.getTypedTags([MsgTag.HeartBtInt, MsgTag.SenderCompID, MsgTag.Username, MsgTag.Password])
     logger.info(`peerLogon Username = ${userName}, heartBtInt = ${heartBtInt}, peerCompId = ${peerCompId}, userName = ${userName}`)
     const state = this.sessionState
-    state.peerHeartBeatSecs = view.getTyped(MsgTag.HeartBtInt)
-    state.peerCompId = view.getTyped(MsgTag.SenderCompID)
+    state.peerHeartBeatSecs = view.getTyped(MsgTag.HeartBtInt) as number
+    state.peerCompId = view.getTyped(MsgTag.SenderCompID) as string
     const res = this.onLogon(view, userName as string, password as string)
     // currently not using this.
     logger.info(`peerLogon onLogon returns ${res}`)

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

@@ -31,7 +31,7 @@ export abstract class FixmlSession extends FixSession {
   protected onSessionMsg (msgType: string, view: MsgView): void {
     switch (msgType) {
       case 'UserReq': {
-        const reqType: number = view.getTyped('UserReqTyp')
+        const reqType: number = view.getTyped('UserReqTyp') as number
         switch (reqType) {
           case UserRequestType.LogOnUser: {
             this.peerLogon(view)
@@ -47,7 +47,7 @@ export abstract class FixmlSession extends FixSession {
       }
 
       case 'UserRsp': {
-        const userStatus: number = view.getTyped('UserStatus')
+        const userStatus: number = view.getTyped('UserStatus') as number
         switch (userStatus) {
           case UserStatus.LoggedIn: {
             this.peerLogon(view)
@@ -68,7 +68,7 @@ export abstract class FixmlSession extends FixSession {
     const logger = this.sessionLogger
     const state = this.sessionState
     state.state = SessionState.InitiationLogonReceived
-    state.peerCompId = view.getTyped(MsgTag.SenderCompID)
+    state.peerCompId = view.getTyped(MsgTag.SenderCompID) as string
     if (this.acceptor) {
       const reqId: string = view.getString('UserReqID') ?? 'req'
       const o = this?.config?.factory?.logon(reqId, true)