jspurefix 1.4.1 → 2.0.3

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

@@ -1,28 +1,35 @@
 import { IJsFixConfig, IJsFixLogger } from '../../../config'
-import { acceptor } from '../../../transport'
-import { SkeletonServer } from './skeleton-server'
+import { TcpAcceptorListener } from '../../../transport/tcp'
+import { inject, injectable } from 'tsyringe'
+import { FixEntity } from '../../../transport'
 
-export class RespawnAcceptor {
+@injectable()
+export class RespawnAcceptor extends FixEntity {
   private readonly logger: IJsFixLogger
 
-  constructor (public readonly config: IJsFixConfig) {
+  constructor (@inject('IJsFixConfig') public readonly config: IJsFixConfig) {
+    super(config)
     this.logger = config.logFactory.logger('RespawnAcceptor')
   }
 
   // if acceptor errors e.g. via a forced connection drop, then respawn
   // a set number of times.
 
+  public start (): Promise<any> {
+    return this.waitFor()
+  }
+
   public async waitFor (respawns: number = 1): Promise<any> {
     return new Promise<any>(async (resolve, reject) => {
       let respawned = 0
       while (respawned <= respawns) {
         try {
+          const sessionContainer = this.config.sessionContainer
+          const listener = sessionContainer.resolve<TcpAcceptorListener>(TcpAcceptorListener)
+          const dropConnectionTimeout = respawned === 0 ? 5 : -1
+          sessionContainer.register('dropConnectionTimeout', { useValue: dropConnectionTimeout })
           this.logger.info(`waitFor: waiting for acceptor respawned = ${respawned}`)
-          await acceptor(this.config, (c) => {
-            const dropConnectionTimeout = respawned === 0 ? 5 : -1
-            this.logger.info(`waitFor: create a new acceptor session respawned = ${respawned}, dropConnectionTimeout = ${dropConnectionTimeout}`)
-            return new SkeletonServer(c, dropConnectionTimeout)
-          })
+          await listener.start()
           break
         } catch (e) {
           this.logger.info(`waitFor: error in acceptor respawned = ${respawned}`)

package/src/sample/tcp/recovering-skeleton/skeleton-client.ts

@@ -1,13 +1,15 @@
 import { MsgView } from '../../../buffer'
 import { AsciiSession } from '../../../transport'
 import { IJsFixLogger, IJsFixConfig } from '../../../config'
+import { inject, injectable } from 'tsyringe'
 
+@injectable()
 export class SkeletonClient extends AsciiSession {
   private readonly logger: IJsFixLogger
   private readonly fixLog: IJsFixLogger
 
-  constructor (public readonly config: IJsFixConfig,
-               public readonly logoutSeconds: number = 45) {
+  constructor (@inject('IJsFixConfig') public readonly config: IJsFixConfig,
+               @inject('logoutSeconds') public readonly logoutSeconds: number) {
     super(config)
     this.logReceivedMsgs = true
     this.fixLog = config.logFactory.plain(`jsfix.${config.description.application.name}.txt`)

package/src/sample/tcp/recovering-skeleton/skeleton-server.ts

@@ -1,13 +1,15 @@
 import { MsgView } from '../../../buffer'
 import { AsciiSession } from '../../../transport'
 import { IJsFixLogger, IJsFixConfig } from '../../../config'
+import { inject, injectable } from 'tsyringe'
 
+@injectable()
 export class SkeletonServer extends AsciiSession {
   private readonly logger: IJsFixLogger
   private readonly fixLog: IJsFixLogger
 
-  constructor (public readonly config: IJsFixConfig,
-               public readonly dropConnectionTimeout: number) {
+  constructor (@inject('IJsFixConfig') public readonly config: IJsFixConfig,
+               @inject('dropConnectionTimeout') public readonly dropConnectionTimeout: number) {
     super(config)
     this.logReceivedMsgs = true
     this.fixLog = config.logFactory.plain(`jsfix.${config.description.application.name}.txt`)

package/src/sample/tcp/skeleton/app.ts

@@ -1,27 +1,22 @@
-import { IJsFixConfig } from '../../../config'
-import { Launcher } from '../../launcher'
+import 'reflect-metadata'
+
+import { SessionLauncher, EngineFactory } from '../../../runtime'
 import { SkeletonSession } from './skeleton-session'
-import { initiator, acceptor } from '../../../transport'
+import { IJsFixConfig } from '../../../config'
 
-class AppLauncher extends Launcher {
+class AppLauncher extends SessionLauncher {
   public constructor () {
     super(
       'data/session/test-initiator.json',
       'data/session/test-acceptor.json')
   }
 
-  protected getAcceptor (config: IJsFixConfig): Promise<any> {
-    return acceptor(config, c => new SkeletonSession(c))
-  }
-
-  protected getInitiator (config: IJsFixConfig): Promise<any> {
-    return initiator(config, c => new SkeletonSession(c))
+  protected override makeFactory (config: IJsFixConfig): EngineFactory {
+    return {
+      makeSession: () => new SkeletonSession(config, 45,false)
+    } as EngineFactory
   }
 }
 
 const l = new AppLauncher()
-l.run().then(() => {
-  console.log('finished.')
-}).catch((e: Error) => {
-  console.log(e.message)
-})
+l.exec()

package/src/sample/tcp/skeleton/skeleton-session.ts

@@ -2,14 +2,18 @@ import { MsgView } from '../../../buffer'
 import { AsciiSession } from '../../../transport'
 import { IJsFixLogger, IJsFixConfig } from '../../../config'
 import { ILooseObject } from '../../../collections/collection'
+import { FixMsgStoreRecord } from '../../../store'
+import { inject, injectable } from 'tsyringe'
+import { DITokens } from '../../../runtime'
 
+@injectable()
 export class SkeletonSession extends AsciiSession {
   private readonly logger: IJsFixLogger
   private readonly fixLog: IJsFixLogger
 
-  constructor (public readonly config: IJsFixConfig,
-               public readonly logoutSeconds: number = 45,
-               public useInMemoryStore: boolean = false) {
+  constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig,
+               @inject('logoutSeconds') public readonly logoutSeconds: number,
+               @inject('useInMemoryStore') public useInMemoryStore: boolean) {
     super(config)
     this.logReceivedMsgs = true
     this.fixLog = config.logFactory.plain(`jsfix.${config.description.application.name}.txt`)
@@ -19,7 +23,7 @@ export class SkeletonSession extends AsciiSession {
   protected onApplicationMsg (msgType: string, view: MsgView): void {
     // dispatch messages
     if (this.useInMemoryStore) {
-      const rec = view.toMsgStoreRecord()
+      const rec = FixMsgStoreRecord.toMsgStoreRecord(view)
       this.store.put(rec).then(r => {
         this.logger.info(`store state ${JSON.stringify(r, null, 4)}`)
         this.dispatch(msgType, view)

package/src/sample/tcp/tls-trade-capture/app.ts

@@ -1,31 +1,8 @@
-import { TradeCaptureClient, TradeCaptureServer } from '../trade-capture'
-import { IJsFixConfig } from '../../../config'
-import { Launcher } from '../../launcher'
-import { initiator, acceptor } from '../../../transport'
-
-class AppLauncher extends Launcher {
-  public constructor () {
-    super(
-      'data/session/test-initiator-tls.json',
-      'data/session/test-acceptor-tls.json')
-  }
-
-  protected getAcceptor (config: IJsFixConfig): Promise<any> {
-    return acceptor(config, c => {
-      return new TradeCaptureServer(c)
-    })
-  }
-
-  protected getInitiator (config: IJsFixConfig): Promise<any> {
-    return initiator(config, c => {
-      return new TradeCaptureClient(c)
-    })
-  }
-}
-
-const l = new AppLauncher()
-l.run().then(() => {
-  console.log('finished.')
-}).catch(e => {
-  console.error(e)
-})
+import 'reflect-metadata'
+import { AppLauncher } from '../trade-capture/app-launcher'
+
+const l = new AppLauncher(
+  'data/session/test-initiator-tls.json',
+  'data/session/test-acceptor-tls.json'
+  )
+l.exec()

package/src/sample/tcp/trade-capture/app-launcher.ts

@@ -0,0 +1,22 @@
+import { EngineFactory, SessionLauncher } from '../../../runtime'
+import { IJsFixConfig } from '../../../config'
+import { TradeCaptureClient } from './trade-capture-client'
+import { TradeCaptureServer } from './trade-capture-server'
+
+export class AppLauncher extends SessionLauncher {
+  public constructor (client: string = 'data/session/test-initiator.json',
+                      server: string = 'data/session/test-acceptor.json') {
+    super(
+      client,
+      server)
+  }
+
+  protected override makeFactory (config: IJsFixConfig): EngineFactory {
+    const isInitiator = this.isInitiator(config.description)
+    return {
+      makeSession: () => isInitiator ?
+        new TradeCaptureClient(config) :
+        new TradeCaptureServer(config)
+    } as EngineFactory
+  }
+}

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

@@ -1,28 +1,5 @@
-import { TradeCaptureClient } from './trade-capture-client'
-import { TradeCaptureServer } from './trade-capture-server'
-import { IJsFixConfig } from '../../../config'
-import { Launcher } from '../../launcher'
-import { initiator, acceptor } from '../../../transport'
-
-class AppLauncher extends Launcher {
-  public constructor () {
-    super(
-      'data/session/test-initiator.json',
-      'data/session/test-acceptor.json')
-  }
-
-  protected getAcceptor (config: IJsFixConfig): Promise<any> {
-    return acceptor(config, c => new TradeCaptureServer(c))
-  }
-
-  protected getInitiator (config: IJsFixConfig): Promise<any> {
-    return initiator(config, c => new TradeCaptureClient(c))
-  }
-}
+import 'reflect-metadata'
+import { AppLauncher } from './app-launcher'
 
 const l = new AppLauncher()
-l.run().then(() => {
-  console.log('finished.')
-}).catch(e => {
-  console.error(e)
-})
+l.exec()

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

@@ -1,7 +1,8 @@
 import { MsgView } from '../../../buffer'
 import { AsciiSession } from '../../../transport'
 import { MsgType } from '../../../types'
-import { ITradeCaptureReport, ITradeCaptureReportRequest, ITradeCaptureReportRequestAck } from '../../../types/FIX4.4/repo'
+import { ITradeCaptureReport, ITradeCaptureReportRequest,
+  ITradeCaptureReportRequestAck } from '../../../types/FIX4.4/repo'
 import { IJsFixLogger, IJsFixConfig } from '../../../config'
 import { Dictionary } from '../../../collections'
 import { TradeFactory } from './trade-factory'

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

@@ -3,7 +3,8 @@ import { AsciiSession } from '../../../transport'
 import { MsgType } from '../../../types'
 import { IJsFixLogger, IJsFixConfig } from '../../../config'
 // interfaces generated by compiler to make messages easy in an IDE
-import { ITradeCaptureReportRequest, ITradeCaptureReport, MsgTag, SessionRejectReason, SubscriptionRequestType, TradeRequestStatus } from '../../../types/FIX4.4/repo'
+import { ITradeCaptureReportRequest, ITradeCaptureReport, MsgTag, SessionRejectReason,
+  SubscriptionRequestType, TradeRequestStatus } from '../../../types/FIX4.4/repo'
 import { TradeFactory } from './trade-factory'
 
 export class TradeCaptureServer extends AsciiSession {

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

@@ -36,13 +36,19 @@ export class TradeFactory {
   }
 
   public static tradeCaptureReportRequest (requestId: string, tradeDate: Date): ITradeCaptureReportRequest {
+    const d0 = tradeDate
+    const d1 = new Date(tradeDate.getTime())
+    d1.setDate(d1.getDate() + 1)
     return {
       TradeRequestID: 'all-trades',
       TradeRequestType: TradeRequestType.AllTrades,
       SubscriptionRequestType: SubscriptionRequestType.SnapshotAndUpdates,
       TrdCapDtGrp: [
         {
-          TradeDate: tradeDate
+          TransactTime: d0
+        },
+        {
+          TransactTime: d1
         }
       ]
     } as ITradeCaptureReportRequest

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

@@ -2,13 +2,14 @@ import { IFixMsgStore } from './fix-msg-store'
 import { FixMsgStoreRecord, IFixMsgStoreRecord } from './fix-msg-store-record'
 import { IJsFixConfig } from '../config'
 import { MsgType } from '../types'
-import { AsciiParser, MsgView } from '../buffer'
+import { ElasticBuffer, MsgView } from '../buffer'
+import { AsciiParser } from '../buffer/ascii'
 import { ISequenceReset, IStandardHeader } from '../types/FIX4.4/repo'
 
 export class FixMsgAsciiStoreResend {
   parser: AsciiParser
   constructor (public readonly store: IFixMsgStore, public readonly config: IJsFixConfig) {
-    this.parser = new AsciiParser(this.config.definitions, null, this.config.delimiter)
+    this.parser = new AsciiParser(this.config, null, new ElasticBuffer(160 * 1024))
   }
 
   public getResendRequest (startSeq: number, endSeq: number): Promise<IFixMsgStoreRecord[]> {

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

@@ -3,7 +3,7 @@ import { IJsFixConfig, IJsFixLogger } from '../config'
 import { IFixMsgStoreRecord } from './fix-msg-store-record'
 import { Dictionary } from '../collections'
 import { MsgType } from '../types'
-import { IFixMsgStoreState } from '.'
+import { IFixMsgStoreState } from './fix-msg-store-state'
 
 export class FixMsgMemoryStore implements IFixMsgStore {
   protected readonly logger: IJsFixLogger

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

@@ -1,4 +1,6 @@
 import { ILooseObject } from '../collections/collection'
+import { MsgView } from '../buffer'
+import { MsgTag } from '../types'
 
 export interface IFixMsgStoreRecord {
   readonly msgType: string
@@ -17,6 +19,10 @@ export class FixMsgStoreRecord implements IFixMsgStoreRecord {
                public readonly encoded?: string) {
   }
 
+  static toMsgStoreRecord (v: MsgView): IFixMsgStoreRecord {
+    return new FixMsgStoreRecord(v.getString(MsgTag.MsgType), v.getTyped(MsgTag.SendingTime), v.getTyped(MsgTag.MsgSeqNum), v.toObject())
+  }
+
   clone (): IFixMsgStoreRecord {
     return new FixMsgStoreRecord(this.msgType, this.timestamp, this.seqNum, this.obj, this.encoded)
   }

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

@@ -0,0 +1,6 @@
+export interface IFixMsgStoreState {
+  readonly length: number,
+  readonly firstSeq: number,
+  readonly lastSeq: number
+  readonly id: string
+}

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

@@ -3,13 +3,7 @@
  */
 
 import { IFixMsgStoreRecord } from './fix-msg-store-record'
-
-export interface IFixMsgStoreState {
-  readonly length: number,
-  readonly firstSeq: number,
-  readonly lastSeq: number
-  readonly id: string
-}
+import { IFixMsgStoreState } from './fix-msg-store-state'
 
 export interface IFixMsgStore {
   clear (): Promise<IFixMsgStoreState>

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

@@ -1,10 +1,15 @@
-import { AsciiChars, AsciiEncoder, TimeFormatter } from '../../buffer'
+import { AsciiChars, AsciiEncoder, TimeFormatter } from '../../buffer/ascii'
 import { MsgTransmitter } from '../msg-transmitter'
 import { ILooseObject } from '../../collections/collection'
-import { ContainedFieldSet, MessageDefinition } from '../../dictionary'
+import { ContainedFieldSet } from '../../dictionary/contained'
+import { MessageDefinition } from '../../dictionary/definition'
 import { IJsFixConfig } from '../../config'
 import { IStandardHeader } from '../../types/FIX4.4/repo'
+import { inject, injectable } from 'tsyringe'
+import { DITokens } from '../../runtime/di-tokens'
+import { ElasticBuffer } from '../../buffer'
 
+@injectable()
 export class AsciiMsgTransmitter extends MsgTransmitter {
   public msgSeqNum: number
   public time: Date
@@ -12,9 +17,8 @@ export class AsciiMsgTransmitter extends MsgTransmitter {
   private readonly header: ContainedFieldSet
   private readonly trailer: ContainedFieldSet
 
-  constructor (public readonly config: IJsFixConfig) {
-
-    super(config.definitions, config.description)
+  constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig) {
+    super(config.sessionContainer.resolve<ElasticBuffer>(DITokens.TransmitBuffer), config.definitions, config.description)
     this.msgSeqNum = (config.description.LastSentSeqNum || 0) + 1 // adding 1 as this the next sequence # to use.
     const buffer = this.buffer
     const tf: TimeFormatter = new TimeFormatter(buffer)

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

@@ -1,7 +1,7 @@
-import { ISessionDescription } from '../session-description'
+import { ISessionDescription } from '../session/session-description'
 import { ILooseObject } from '../../collections/collection'
 import { MsgType } from '../../types'
-import { ASessionMsgFactory, ObjectMutator } from '../a-session-msg-factory'
+import { ASessionMsgFactory, ObjectMutator } from '../session/a-session-msg-factory'
 
 import {
   EncryptMethod,

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

@@ -1,10 +1,12 @@
-import { MsgView, SegmentType } from '../../buffer'
+import { MsgView } from '../../buffer'
 import { MsgTag, MsgType, SessionRejectReason } from '../../types'
 import { IJsFixConfig } from '../../config'
-import { IMsgApplication } from '../session-description'
-import { SessionState, TickAction } from '../fix-session-state'
-import { FixSession } from '../fix-session'
+import { FixSession } from '../session/fix-session'
 import { FixMsgAsciiStoreResend, FixMsgMemoryStore, IFixMsgStore, IFixMsgStoreRecord } from '../../store'
+import { SessionState } from '../tcp'
+import { TickAction } from '../tick-action'
+import { IMsgApplication } from '../msg-application'
+import { SegmentType } from '../../buffer/segment/segment-type'
 
 export abstract class AsciiSession extends FixSession {
 
@@ -127,14 +129,14 @@ export abstract class AsciiSession extends FixSession {
       case SessionState.InitiationLogonResponse: {
         const targetCompId = view.getString(MsgTag.TargetCompID)
         if (targetCompId !== state.compId) {
-          const msg: string = `msgType ${msgType} unexpected TargetCompID ${targetCompId}`
+          const msg: string = `msgType ${msgType} unexpected TargetCompID ${targetCompId} expecting ${state.compId})`
           this.sendReject(msgType, seqNum, msg, SessionRejectReason.CompIDProblem)
           return false
         }
 
         const peerCompId = view.getString(MsgTag.SenderCompID)
         if (peerCompId !== state.peerCompId) {
-          const msg: string = `msgType ${msgType} unexpected SenderCompID ${peerCompId}`
+          const msg: string = `msgType ${msgType} unexpected SenderCompID ${peerCompId}  expecting ${state.compId}`
           this.sendReject(msgType, seqNum, msg, SessionRejectReason.CompIDProblem)
           return false
         }
@@ -314,6 +316,7 @@ export abstract class AsciiSession extends FixSession {
   }
 
   private tick (): void {
+    if (!this.transport) return
     const sessionState = this.sessionState
     const action: TickAction = sessionState.calcAction(new Date())
     const application: IMsgApplication = this.transport.config.description.application

package/src/transport/ascii/index.ts

@@ -1,3 +1,2 @@
 export * from './ascii-session'
-export * from './ascii-msg-transmitter'
 export * from './ascii-session-msg-factory'

package/src/transport/duplex/http-duplex.ts

@@ -1,7 +1,7 @@
 import { FixDuplex } from './fix-duplex'
 import { Readable, Writable } from 'stream'
-import { IHttpAdapter } from '../session-description'
 import * as rp from 'request-promise-native'
+import { IHttpAdapter } from '../http/http-adapter'
 
 export class HttpDuplex extends FixDuplex {
   public constructor (public readonly adapter: IHttpAdapter) {

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

@@ -1,8 +1,11 @@
 import { FixDuplex } from './fix-duplex'
 import * as net from 'net'
+import { inject, injectable } from 'tsyringe'
+import { DITokens } from '../../runtime/di-tokens'
 
+@injectable()
 export class TcpDuplex extends FixDuplex {
-  constructor (public readonly socket: net.Socket) {
+  constructor (@inject(DITokens.duplexParam) public readonly socket: net.Socket) {
     super()
     this.readable = socket
     this.writable = socket

package/src/transport/factory/index.ts

@@ -0,0 +1 @@
+export * from './msg-transport'

package/src/transport/factory/msg-transport.ts

@@ -0,0 +1,55 @@
+import { MsgParser } from '../../buffer'
+import { MsgTransmitter } from '../msg-transmitter'
+import { FixDuplex } from '../duplex'
+import { IJsFixConfig } from '../../config'
+import { DITokens } from '../../runtime/di-tokens'
+import { Readable } from 'stream'
+import { inject, injectable } from 'tsyringe'
+
+@injectable()
+export class MsgTransport {
+  public readonly transmitter: MsgTransmitter
+  public readonly receiver: MsgParser
+
+  constructor (@inject(DITokens.sessionId) public readonly id: number,
+               @inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig,
+               @inject(DITokens.FixDuplex) public readonly duplex: FixDuplex) {
+
+    const delimiter = config.delimiter
+    if (!delimiter) {
+      throw new Error(`no delimiter char given.`)
+    }
+
+    const sessionContainer = this.config.sessionContainer
+    sessionContainer.registerInstance<Readable>(DITokens.readStream, this.duplex.readable)
+
+    // let parser replace delimiter with Pipe so fix log does not require
+    // expensive replace
+
+    this.transmitter = sessionContainer.resolve<MsgTransmitter>(DITokens.MsgTransmitter)
+    this.receiver = sessionContainer.resolve<MsgParser>(DITokens.MsgParser)
+
+    // pipe the encoder to say a socket.
+    if (duplex.writable) {
+      this.transmitter.encodeStream.pipe(duplex.writable)
+    }
+  }
+
+  public end (): void {
+    this.duplex.end()
+  }
+
+  public wait (): Promise<any> {
+    return new Promise<any>((resolve, reject) => {
+      this.receiver.on('end', () => {
+        resolve(this.id)
+      })
+      this.receiver.on('error', (e) => {
+        reject(e)
+      })
+      this.transmitter.on('error', (e) => {
+        reject(e)
+      })
+    })
+  }
+}

package/src/transport/fix-acceptor.ts

@@ -1,7 +1,7 @@
 import * as events from 'events'
-import { MsgTransport } from './msg-transport'
-import { IMsgApplication } from './session-description'
+import { MsgTransport } from './factory'
 import { INumericKeyed } from '../collections/collection'
+import { IMsgApplication } from './msg-application'
 
 export abstract class FixAcceptor extends events.EventEmitter {
   public transports: INumericKeyed<MsgTransport> = {}

package/src/transport/fix-entity.ts

@@ -0,0 +1,9 @@
+import { IJsFixConfig } from '../config'
+import * as events from 'events'
+
+export abstract class FixEntity extends events.EventEmitter {
+  abstract start (): Promise<any>
+  constructor (public readonly config: IJsFixConfig) {
+    super()
+  }
+}

package/src/transport/fix-initiator.ts

@@ -1,5 +1,5 @@
-import { IMsgApplication } from './session-description'
-import { MsgTransport } from './msg-transport'
+import { MsgTransport } from './factory'
+import { IMsgApplication } from './msg-application'
 
 export abstract class FixInitiator {
   protected constructor (public readonly application: IMsgApplication) {

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

@@ -1,14 +1,18 @@
-import { FixmlEncoder } from '../../buffer'
+import { FixmlEncoder } from '../../buffer/fixml'
 import { IJsFixConfig } from '../../config'
 import { MsgTransmitter } from '../msg-transmitter'
 import { ILooseObject } from '../../collections/collection'
+import { inject, injectable } from 'tsyringe'
+import { DITokens } from '../../runtime/di-tokens'
+import { ElasticBuffer } from '../../buffer'
 
+@injectable()
 export class FixmlMsgTransmitter extends MsgTransmitter {
   public time: Date
 
-  constructor (public readonly config: IJsFixConfig) {
-    super(config.definitions, config.description)
-    this.encoder = new FixmlEncoder(this.buffer, config.definitions)
+  constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig) {
+    super(config.sessionContainer.resolve<ElasticBuffer>(DITokens.TransmitBuffer), config.definitions, config.description)
+    this.encoder = config.sessionContainer.resolve<FixmlEncoder>(DITokens.MsgEncoder)
   }
 
   public encodeMessage (msgType: string, obj: ILooseObject): void {

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

@@ -1,7 +1,7 @@
-import { ISessionDescription } from './../session-description'
+import { ISessionDescription } from '../session/session-description'
 import { ILooseObject } from '../../collections/collection'
 import { MsgType } from '../../types'
-import { ASessionMsgFactory, ObjectMutator } from '../a-session-msg-factory'
+import { ASessionMsgFactory, ObjectMutator } from '../session/a-session-msg-factory'
 
 import {
   IStandardHeader,

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

@@ -1,9 +1,9 @@
 import { MsgView } from '../../buffer'
-import { SessionState } from '../fix-session-state'
 import { IJsFixConfig } from '../../config'
 import { UserRequestType, UserStatus } from '../../types/FIXML50SP2'
 import { MsgTag } from '../../types'
-import { FixSession } from '../fix-session'
+import { FixSession } from '../session/fix-session'
+import { SessionState } from '../session/session-state'
 
 export abstract class FixmlSession extends FixSession {
 

package/src/transport/fixml/index.ts

@@ -1,5 +1,3 @@
-export * from './acceptor'
 export * from './fixml-request'
 export * from './fixml-session'
-export * from './fixml-msg-transmitter'
 export * from './fixml-session-msg-factory'

package/src/transport/http/html-options.ts

@@ -0,0 +1,8 @@
+export interface IHtmlOptions {
+  method: string,
+  uri: string,
+  json: boolean,
+  body: any,
+  headers: any,
+  resolveWithFullResponse: boolean
+}

package/src/transport/http/html-route.ts

@@ -0,0 +1,6 @@
+import { IHtmlOptions } from './html-options'
+
+export interface IHtmlRoute {
+  name: string,
+  value: IHtmlOptions
+}