jspurefix 1.1.2 → 1.4.1

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

@@ -0,0 +1,149 @@
+import { IMsgApplication, ITcpTransportDescription } from '../session-description'
+import { IJsFixConfig, IJsFixLogger } from '../../config'
+import { MakeFixSession } from '../make-fixl-session'
+import { FixSession } from '../fix-session'
+import { SessionState } from '../fix-session-state'
+import { TcpInitiator } from './tcp-initiator'
+import { MsgTransport } from '../msg-transport'
+import * as events from 'events'
+import Timeout = NodeJS.Timeout
+
+/*
+   create one application session instance - and recover a lost transport.  Hence the application
+   will automatically re-connected and the "message recovery" policy enacted i.e. replay from
+   last known sequence number or sequence reset.
+ */
+
+export class RecoveringTcpInitiator extends events.EventEmitter {
+  public tcp: ITcpTransportDescription
+  public session: FixSession
+  private readonly logger: IJsFixLogger
+  private application: IMsgApplication
+  private initiator: TcpInitiator
+  private transport: MsgTransport
+  private th: Timeout = null
+  public recoveryAttemptSecs: number = 5
+  public backoffFailConnectSecs: number = 30
+
+  constructor (public readonly jsFixConfig: IJsFixConfig, public readonly sessionFactory: MakeFixSession) {
+    super()
+    this.application = this.jsFixConfig.description.application
+    this.logger = jsFixConfig.logFactory.logger(`${this.application.name}:RecoveringTcpInitiator`)
+    if (!this.application) {
+      const e: Error = new Error(`no application in session description.`)
+      this.logger.error(e)
+      throw e
+    }
+    this.tcp = this.application.tcp
+    if (!this.tcp) {
+      const e = new Error(`no tcp in session description need tcp { host: hostname, port: port }`)
+      this.logger.error(e)
+      throw e
+    }
+    this.createSession(jsFixConfig, sessionFactory)
+  }
+
+  private createSession (jsFixConfig: IJsFixConfig, sessionFactory: MakeFixSession) {
+    this.logger.info('creating an application session')
+    this.session = sessionFactory(jsFixConfig)
+    this.session.on('done', () => {
+      this.logger.info('session has permanently ended')
+      this.emit('end', this)
+    })
+    this.session.on('end', () => {
+      this.logger.info('session has permanently ended')
+      this.emit('end', this)
+    })
+    this.session.setState(SessionState.DisconnectedNoConnectionToday)
+  }
+
+  public getState (): SessionState {
+    return this.session.getState()
+  }
+
+  private newTransport (transport: MsgTransport) {
+    this.transport = transport
+    this.emit('transport', transport)
+    this.logger.info(`initiator connects id ${(transport.id)}`)
+    const session = this.session
+    session.setState(SessionState.NetworkConnectionEstablished)
+    session.run(transport).then((id: number) => {
+      if (!transport || id === transport.id) {
+        this.emit('end', this)
+      } else {
+        this.logger.info(`old transport ${id} ends waiting on ${(transport.id)}`)
+      }
+    }).catch(e => {
+      this.logger.info(`transport id ${(transport.id)} failed - session state ${session.getState()}`)
+      this.logger.error(e.message)
+      this.recover()
+    })
+    this.logger.info(`running session with transport ${transport.id} state = ${session.getState()}`)
+  }
+
+  private clearTimer () {
+    if (this.th) {
+      clearTimeout(this.th)
+      this.th = null
+    }
+  }
+
+  // at least one connection was established so retry to establish - either
+  // succeed in which case can restart session or fails in which case wait and
+  // restart an attempt to connect
+
+  private recover (): void {
+    this.session.setState(SessionState.DetectBrokenNetworkConnection)
+    this.logger.info(`recover session transport - attempt in ${this.recoveryAttemptSecs} secs`)
+    this.th = setTimeout(() => {
+      this.connect(60).then(t => {
+        this.logger.info(`new transport ${t.id}`)
+      }).catch((e) => {
+        this.logger.info(`failed to re-connect ${e.message} - backoff for ${this.backoffFailConnectSecs}`)
+        this.th = setTimeout(() => {
+          this.logger.info('returning to recover()')
+          this.recover()
+        }, this.backoffFailConnectSecs * 1000)
+      })
+    },this.recoveryAttemptSecs * 1000)
+  }
+
+  // for first connection - reject if no initial connection established within timeout
+  // once connection established, will not resolve until session is ended - i.e. lost
+  // connections are re-established using the same session instance.
+
+  public run (initialTimeout: number = 60): Promise<any> {
+    return new Promise<any>((resolve, reject) => {
+      this.connect(initialTimeout).then(() => {
+        this.on('end', () => {
+          this.clearTimer()
+          this.initiator.end()
+          this.logger.info(`run: transport ${this.transport.id} gracefully ends ${initialTimeout} - resolving`)
+          resolve(null)
+        })
+      }).catch(e => {
+        this.logger.info(`run: failed to connect to first transport ${initialTimeout} - rejecting`)
+        reject(e)
+      })
+    })
+  }
+
+  // return a promise for new transport - or reject if no connection within timeout
+
+  private connect (timeout: number): Promise<MsgTransport> {
+    return new Promise<MsgTransport>((resolve, reject) => {
+      this.logger.info(`connect: start initiator timeout ${timeout}`)
+      this.session.setState(SessionState.InitiateConnection)
+      this.initiator = new TcpInitiator(this.jsFixConfig)
+      this.initiator.connect(timeout).then((transport: MsgTransport) => {
+        this.logger.info(`connect: receive new transport ${transport.id}`)
+        this.newTransport(transport)
+        resolve(transport)
+      }).catch(e => {
+        this.logger.info(`connect: failed to connect within ${timeout} - rejecting`)
+        this.session.setState(SessionState.DetectBrokenNetworkConnection)
+        reject(e)
+      })
+    })
+  }
+}

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

@@ -9,14 +9,34 @@ import { createServer as tlsCreateServer, TLSSocket, TlsOptions } from 'tls'
 export class TcpAcceptor extends FixAcceptor {
   private server: Server
   private logger: IJsFixLogger
+  private nextId: number = 0
+
   constructor (public readonly config: IJsFixConfig) {
     super(config.description.application)
     this.logger = config.logFactory.logger(`${config.description.application.name}:TcpAcceptor`)
-    let nextId: number = 0
-    const tcp = this.config.description.application.tcp
-    const tlsOptions: TlsOptions = getTlsOptions(tcp.tls)
-    this.logger.info('creating server')
+    const tlsOptions: TlsOptions = this.tlsOptions()
     if (tlsOptions) {
+      this.tlsServer()
+    } else {
+      this.unsecureServer()
+    }
+    this.server.on('error', ((err: Error) => {
+      throw err
+    }))
+  }
+
+  getId (): number {
+    this.nextId++
+    const id: number = this.nextId
+    return id
+  }
+
+  tlsServer (): void {
+    try {
+      const config: IJsFixConfig = this.config
+      const tcp = this.config.description.application.tcp
+      const tlsOptions: TlsOptions = getTlsOptions(tcp.tls)
+      this.logger.info(`create tls server`)
       this.server = tlsCreateServer(tlsOptions, (tlsSocket: TLSSocket) => {
         if (tcp.tls.enableTrace) {
           this.logger.info(`enabling tls session trace`)
@@ -24,24 +44,39 @@ export class TcpAcceptor extends FixAcceptor {
         }
         if (tlsSocket.authorized) {
           tlsSocket.setEncoding('utf8')
-          const id: number = nextId++
+          const id: number = this.getId()
           this.logger.info(`tls creates session ${id} ${tlsSocket.authorized}`)
           this.onSocket(id, tlsSocket, config)
         } else {
           this.logger.info(`no transport created on tls with no authorized connection`)
         }
       })
-    } else {
+    } catch (e) {
+      this.logger.error(e)
+      throw e
+    }
+  }
+
+  unsecureServer () {
+    try {
+      const config = this.config
+      this.logger.info(`create unsecured server`)
       this.server = netCreateServer((socket: Socket) => {
-        const id: number = nextId++
-        this.logger.info(`net creates session ${id} }`)
+        const id: number = this.getId()
+        this.logger.info(`net creates session ${id}`)
         socket.setNoDelay(true)
         this.onSocket(id, socket, config)
       })
+    } catch (e) {
+      this.logger.error(e)
+      throw e
     }
-    this.server.on('error', ((err: Error) => {
-      throw err
-    }))
+  }
+
+  tlsOptions (): TlsOptions {
+    const tcp = this.config.description.application.tcp
+    const tlsOptions: TlsOptions = getTlsOptions(tcp.tls)
+    return tlsOptions
   }
 
   private onSocket (id: number, socket: Socket, config: IJsFixConfig) {

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

@@ -6,9 +6,10 @@ import { IJsFixConfig, IJsFixLogger } from '../../config'
 import { TcpDuplex, FixDuplex } from '../duplex'
 
 import * as util from 'util'
-import { connect as tlsConnect, TLSSocket } from 'tls'
+import { connect as tlsConnect, ConnectionOptions, TLSSocket } from 'tls'
 import { getTlsConnectionOptions } from './tls-options'
-import { Socket, createConnection } from 'net'
+import { createConnection } from 'net'
+import Timeout = NodeJS.Timeout
 
 export enum InitiatorState {
   Idle = 1,
@@ -22,6 +23,7 @@ export class TcpInitiator extends FixInitiator {
   public state: InitiatorState = InitiatorState.Idle
   private readonly logger: IJsFixLogger
   private duplex: FixDuplex
+  private th: Timeout = null
 
   constructor (public readonly jsFixConfig: IJsFixConfig) {
     super(jsFixConfig.description.application)
@@ -40,6 +42,7 @@ export class TcpInitiator extends FixInitiator {
   }
 
   public end (): void {
+    this.clearTimer()
     switch (this.state) {
       case InitiatorState.Connected: {
         this.logger.info('end')
@@ -50,6 +53,8 @@ export class TcpInitiator extends FixInitiator {
 
       default: {
         this.logger.info(`end :state ${this.state}`)
+        this.state = InitiatorState.Stopped
+        break
       }
     }
   }
@@ -75,66 +80,98 @@ export class TcpInitiator extends FixInitiator {
     })
   }
 
-  private tryConnect (): Promise<MsgTransport> {
-    return new Promise<MsgTransport>((resolve, reject) => {
-      const tcp = this.tcp
-      this.logger.info(`tryConnect ${tcp.host}:${tcp.port}`)
-      const connectionOptions: any = getTlsConnectionOptions(tcp)
-      let socket: Socket = null
-      let tlsSocket: TLSSocket = null
-      if (connectionOptions) {
-        tlsSocket = tlsConnect(connectionOptions, () => {
-          this.logger.info(`client connected ${tlsSocket.authorized ? 'authorized' : 'unauthorized'}`)
-          if (!tlsSocket.authorized) {
-            this.logger.warning(`rejecting from state ${this.state} authorizationError ${tlsSocket.authorizationError}`)
-            tlsSocket.end()
-            reject(tlsSocket.authorizationError)
-          } else {
-            tlsSocket.setEncoding('utf8')
-            this.duplex = new TcpDuplex(tlsSocket)
-            resolve(new MsgTransport(0, this.jsFixConfig, this.duplex))
+  private unsecureDuplex (): Promise<TcpDuplex> {
+    const tcp = this.tcp
+    return new Promise<TcpDuplex>((resolve, reject) => {
+      try {
+        this.logger.info(`unsecureDuplex try to connect to endPoint`)
+        const socket = createConnection(tcp, () => {
+          try {
+            this.logger.info(`net.createConnection cb, resolving`)
+            const tcpDuplex = new TcpDuplex(socket)
+            resolve(tcpDuplex)
+          } catch (e) {
+            reject(e)
           }
         })
+      } catch (e) {
+        reject(e)
+      }
+    })
+  }
 
-        if (tcp.tls.enableTrace) {
-          this.logger.info(`enabling tls session trace`)
-          tlsSocket.enableTrace()
-        }
-
-        tlsSocket.on('error', (e) => {
-          reject(e)
-        })
-      } else {
-        socket = createConnection(tcp, () => {
-          this.logger.info(`net.createConnection cb, resolving`)
-          this.duplex = new TcpDuplex(socket)
-          resolve(new MsgTransport(0, this.jsFixConfig, this.duplex))
-          socket.on('error', (e) => {
-            reject(e)
+  private tlsDuplex (): Promise < TcpDuplex > {
+    return new Promise<TcpDuplex>((resolve, reject) => {
+      let tlsSocket: TLSSocket = null
+      const tcp = this.tcp
+      const connectionOptions: ConnectionOptions = getTlsConnectionOptions(tcp)
+      if (connectionOptions) {
+        try {
+          tlsSocket = tlsConnect(connectionOptions, () => {
+            this.logger.info(`client connected ${tlsSocket.authorized ? 'authorized' : 'unauthorized'}`)
+            if (!tlsSocket.authorized) {
+              const error = tlsSocket.authorizationError
+              this.logger.warning(`rejecting from state ${this.state} authorizationError ${error}`)
+              tlsSocket.end()
+              reject(error)
+            } else {
+              tlsSocket.setEncoding('utf8')
+              const tlsDuplex = new TcpDuplex(tlsSocket)
+              if (tcp.tls.enableTrace) {
+                this.logger.info(`enabling tls session trace`)
+                tlsSocket.enableTrace()
+              }
+              this.logger.info(`tlsDuplex resolving`)
+              resolve(tlsDuplex)
+            }
           })
-        })
+        } catch (e) {
+          reject(e)
+        }
       }
     })
   }
 
-  private repeatConnect (timeoutSeconds: number): Promise<MsgTransport> {
+  private tryConnect (): Promise < MsgTransport > {
+    return new Promise<MsgTransport>((resolve, reject) => {
+      const tcp = this.tcp
+      const connectionOptions: ConnectionOptions = getTlsConnectionOptions(tcp)
+      const connector = connectionOptions ? this.tlsDuplex() : this.unsecureDuplex()
+      this.logger.info(`tryConnect ${tcp.host}:${tcp.port}`)
+      connector.then(duplex => {
+        this.duplex = duplex
+        resolve(new MsgTransport(0, this.jsFixConfig, duplex))
+      }).catch(e => {
+        reject(e)
+      })
+    })
+  }
+
+  public clearTimer () {
+    if (this .th) {
+      clearInterval(this.th)
+      this.th = null
+    }
+  }
+
+  private repeatConnect (timeoutSeconds: number): Promise < MsgTransport > {
     return new Promise<MsgTransport>(async (resolve, reject) => {
       const application = this.application
       const promisify = util.promisify
       const timeoutPromise = promisify(setTimeout)
       let retries = 0
-      let timer = setInterval(() => {
+      this.th = setInterval(() => {
         ++retries
         this.tryConnect().then((t: MsgTransport) => {
           this.state = InitiatorState.Connected
-          clearInterval(timer)
+          this.clearTimer()
           resolve(t)
         }).catch((e: Error) => {
           this.logger.info(`${application.name}: retries ${retries} ${e.message}`)
         })
       }, application.reconnectSeconds * 1000)
       timeoutPromise(timeoutSeconds * 1000).then(() => {
-        clearInterval(timer)
+        this.clearTimer()
         this.state = InitiatorState.Stopped
         const e = new Error(`${application.name}: timeout of ${timeoutSeconds} whilst connecting`)
         this.logger.warning(`repeatConnect reject with message ${e.message}`)

package/src/types/FIX4.4/quickfix/advertisement.ts

@@ -1,8 +1,11 @@
+import { IStandardHeader } from './set/standard_header'
 import { IInstrument } from './set/instrument'
 import { IInstrmtLegGrp } from './set/instrmt_leg_grp'
 import { IUndInstrmtGrp } from './set/und_instrmt_grp'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface IAdvertisement {
+  StandardHeader: IStandardHeader
   AdvId: string// 2
   AdvTransType: string// 5
   AdvRefID?: string// 3
@@ -23,4 +26,5 @@ export interface IAdvertisement {
   LastMkt?: string// 30
   TradingSessionID?: string// 336
   TradingSessionSubID?: string// 625
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/allocation_instruction.ts

@@ -1,3 +1,4 @@
+import { IStandardHeader } from './set/standard_header'
 import { IOrdAllocGrp } from './set/ord_alloc_grp'
 import { IExecAllocGrp } from './set/exec_alloc_grp'
 import { IInstrument } from './set/instrument'
@@ -10,8 +11,10 @@ import { IParties } from './set/parties'
 import { IStipulations } from './set/stipulations'
 import { IYieldData } from './set/yield_data'
 import { IAllocGrp } from './set/alloc_grp'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface IAllocationInstruction {
+  StandardHeader: IStandardHeader
   AllocID: string// 70
   AllocTransType: string// 71
   AllocType: number// 626
@@ -75,4 +78,5 @@ export interface IAllocationInstruction {
   TotNoAllocs?: number// 892
   LastFragment?: boolean// 893
   AllocGrp?: IAllocGrp
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/allocation_instruction_ack.ts

@@ -1,7 +1,10 @@
+import { IStandardHeader } from './set/standard_header'
 import { IParties } from './set/parties'
 import { IAllocAckGrp } from './set/alloc_ack_grp'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface IAllocationInstructionAck {
+  StandardHeader: IStandardHeader
   AllocID: string// 70
   Parties?: IParties
   SecondaryAllocID?: string// 793
@@ -18,4 +21,5 @@ export interface IAllocationInstructionAck {
   EncodedTextLen?: number// 354
   EncodedText?: Buffer// 355
   AllocAckGrp?: IAllocAckGrp
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/allocation_report.ts

@@ -1,3 +1,4 @@
+import { IStandardHeader } from './set/standard_header'
 import { IOrdAllocGrp } from './set/ord_alloc_grp'
 import { IExecAllocGrp } from './set/exec_alloc_grp'
 import { IInstrument } from './set/instrument'
@@ -10,8 +11,10 @@ import { IParties } from './set/parties'
 import { IStipulations } from './set/stipulations'
 import { IYieldData } from './set/yield_data'
 import { IAllocGrp } from './set/alloc_grp'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface IAllocationReport {
+  StandardHeader: IStandardHeader
   AllocReportID: string// 755
   AllocID?: string// 70
   AllocTransType: string// 71
@@ -79,4 +82,5 @@ export interface IAllocationReport {
   TotNoAllocs?: number// 892
   LastFragment?: boolean// 893
   AllocGrp?: IAllocGrp
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/allocation_report_ack.ts

@@ -1,7 +1,10 @@
+import { IStandardHeader } from './set/standard_header'
 import { IParties } from './set/parties'
 import { IAllocAckGrp } from './set/alloc_ack_grp'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface IAllocationReportAck {
+  StandardHeader: IStandardHeader
   AllocReportID: string// 755
   AllocID: string// 70
   Parties?: IParties
@@ -19,4 +22,5 @@ export interface IAllocationReportAck {
   EncodedTextLen?: number// 354
   EncodedText?: Buffer// 355
   AllocAckGrp?: IAllocAckGrp
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/assignment_report.ts

@@ -1,11 +1,14 @@
+import { IStandardHeader } from './set/standard_header'
 import { IParties } from './set/parties'
 import { IInstrument } from './set/instrument'
 import { IInstrmtLegGrp } from './set/instrmt_leg_grp'
 import { IUndInstrmtGrp } from './set/und_instrmt_grp'
 import { IPositionQty } from './set/position_qty'
 import { IPositionAmountData } from './set/position_amount_data'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface IAssignmentReport {
+  StandardHeader: IStandardHeader
   AsgnRptID: string// 833
   TotNumAssignmentReports?: number// 832
   LastRptRequested?: boolean// 912
@@ -33,4 +36,5 @@ export interface IAssignmentReport {
   Text?: string// 58
   EncodedTextLen?: number// 354
   EncodedText?: Buffer// 355
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/bid_request.ts

@@ -1,7 +1,10 @@
+import { IStandardHeader } from './set/standard_header'
 import { IBidDescReqGrp } from './set/bid_desc_req_grp'
 import { IBidCompReqGrp } from './set/bid_comp_req_grp'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface IBidRequest {
+  StandardHeader: IStandardHeader
   BidID?: string// 390
   ClientBidID: string// 391
   BidRequestTransType: string// 374
@@ -31,4 +34,5 @@ export interface IBidRequest {
   Text?: string// 58
   EncodedTextLen?: number// 354
   EncodedText?: Buffer// 355
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/bid_response.ts

@@ -1,7 +1,11 @@
+import { IStandardHeader } from './set/standard_header'
 import { IBidCompRspGrp } from './set/bid_comp_rsp_grp'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface IBidResponse {
+  StandardHeader: IStandardHeader
   BidID?: string// 390
   ClientBidID?: string// 391
   BidCompRspGrp?: IBidCompRspGrp
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/business_message_reject.ts

@@ -1,4 +1,8 @@
+import { IStandardHeader } from './set/standard_header'
+import { IStandardTrailer } from './set/standard_trailer'
+
 export interface IBusinessMessageReject {
+  StandardHeader: IStandardHeader
   RefSeqNum?: number// 45
   RefMsgType: string// 372
   BusinessRejectRefID?: string// 379
@@ -6,4 +10,5 @@ export interface IBusinessMessageReject {
   Text?: string// 58
   EncodedTextLen?: number// 354
   EncodedText?: Buffer// 355
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/collateral_assignment.ts

@@ -1,3 +1,4 @@
+import { IStandardHeader } from './set/standard_header'
 import { IParties } from './set/parties'
 import { IExecCollGrp } from './set/exec_coll_grp'
 import { ITrdCollGrp } from './set/trd_coll_grp'
@@ -10,8 +11,10 @@ import { IMiscFeesGrp } from './set/misc_fees_grp'
 import { ISpreadOrBenchmarkCurveData } from './set/spread_or_benchmark_curve_data'
 import { IStipulations } from './set/stipulations'
 import { ISettlInstructionsData } from './set/settl_instructions_data'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface ICollateralAssignment {
+  StandardHeader: IStandardHeader
   CollAsgnID: string// 902
   CollReqID?: string// 894
   CollAsgnReason: number// 895
@@ -59,4 +62,5 @@ export interface ICollateralAssignment {
   Text?: string// 58
   EncodedTextLen?: number// 354
   EncodedText?: Buffer// 355
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/collateral_inquiry.ts

@@ -1,3 +1,4 @@
+import { IStandardHeader } from './set/standard_header'
 import { ICollInqQualGrp } from './set/coll_inq_qual_grp'
 import { IParties } from './set/parties'
 import { IExecCollGrp } from './set/exec_coll_grp'
@@ -10,8 +11,10 @@ import { ITrdRegTimestamps } from './set/trd_reg_timestamps'
 import { ISpreadOrBenchmarkCurveData } from './set/spread_or_benchmark_curve_data'
 import { IStipulations } from './set/stipulations'
 import { ISettlInstructionsData } from './set/settl_instructions_data'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface ICollateralInquiry {
+  StandardHeader: IStandardHeader
   CollInquiryID?: string// 909
   CollInqQualGrp?: ICollInqQualGrp
   SubscriptionRequestType?: string// 263
@@ -56,4 +59,5 @@ export interface ICollateralInquiry {
   Text?: string// 58
   EncodedTextLen?: number// 354
   EncodedText?: Buffer// 355
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/collateral_inquiry_ack.ts

@@ -1,3 +1,4 @@
+import { IStandardHeader } from './set/standard_header'
 import { ICollInqQualGrp } from './set/coll_inq_qual_grp'
 import { IParties } from './set/parties'
 import { IExecCollGrp } from './set/exec_coll_grp'
@@ -6,8 +7,10 @@ import { IInstrument } from './set/instrument'
 import { IFinancingDetails } from './set/financing_details'
 import { IInstrmtLegGrp } from './set/instrmt_leg_grp'
 import { IUndInstrmtGrp } from './set/und_instrmt_grp'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface ICollateralInquiryAck {
+  StandardHeader: IStandardHeader
   CollInquiryID: string// 909
   CollInquiryStatus: number// 945
   CollInquiryResult?: number// 946
@@ -40,4 +43,5 @@ export interface ICollateralInquiryAck {
   Text?: string// 58
   EncodedTextLen?: number// 354
   EncodedText?: Buffer// 355
+  StandardTrailer: IStandardTrailer
 }

package/src/types/FIX4.4/quickfix/collateral_report.ts

@@ -1,3 +1,4 @@
+import { IStandardHeader } from './set/standard_header'
 import { IParties } from './set/parties'
 import { IExecCollGrp } from './set/exec_coll_grp'
 import { ITrdCollGrp } from './set/trd_coll_grp'
@@ -10,8 +11,10 @@ import { IMiscFeesGrp } from './set/misc_fees_grp'
 import { ISpreadOrBenchmarkCurveData } from './set/spread_or_benchmark_curve_data'
 import { IStipulations } from './set/stipulations'
 import { ISettlInstructionsData } from './set/settl_instructions_data'
+import { IStandardTrailer } from './set/standard_trailer'
 
 export interface ICollateralReport {
+  StandardHeader: IStandardHeader
   CollRptID: string// 908
   CollInquiryID?: string// 909
   CollStatus: number// 910
@@ -57,4 +60,5 @@ export interface ICollateralReport {
   Text?: string// 58
   EncodedTextLen?: number// 354
   EncodedText?: Buffer// 355
+  StandardTrailer: IStandardTrailer
 }