jspurefix 5.11.1 → 5.11.2

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

@@ -22,7 +22,8 @@ export class HttpAcceptor extends FixAcceptor {
 
   constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig) {
     super(config?.description?.application ?? null)
-    this.logger = config.logFactory.logger(`${config?.description?.application?.name}:HttpAcceptor`)
+    this.logger = config.logFactory.logger(`${config?.description?.application?.name}:HttpAcceptor`,
+      { component: 'HttpAcceptor', app: config?.description?.application?.name, role: 'acceptor' })
     this.logger.info('creating http server')
     this.router = express.Router()
     this.router.use(bodyParser.json())

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

@@ -11,7 +11,8 @@ export class HttpInitiator extends FixEntity {
   logger: IJsFixLogger
   constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig) {
     super(config)
-    this.logger = config.logFactory.logger('initiator')
+    this.logger = config.logFactory.logger('initiator',
+      { component: 'HttpInitiator', role: 'initiator' })
   }
 
   async start (): Promise<any> {

package/src/transport/http/http-json-sample-adapter.ts

@@ -13,7 +13,7 @@ export class HttpJsonSampleAdapter implements IHttpAdapter {
   private token: string | null = null
   private readonly routes: Map<string, IHtmlRoute> = new Map<string, IHtmlRoute>()
   constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig) {
-    this.logger = config.logFactory.logger('http.adapter')
+    this.logger = config.logFactory.logger('http.adapter', { component: 'HttpJsonSampleAdapter' })
     const routes = this.routes
     const options = config?.description?.application?.http?.options
     if (!options) {

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

@@ -61,7 +61,8 @@ export abstract class FixSession extends events.EventEmitter {
         heartBeat: config.description.HeartBtInt,
         lastPeerMsgSeqNum: config.description.LastReceivedSeqNum
       })
-    this.sessionLogger = config.logFactory.logger(`${this.me}:FixSession`)
+    this.sessionLogger = config.logFactory.logger(`${this.me}:FixSession`,
+      { component: 'FixSession', app: this.me, role: description?.application?.type })
     this.initiator = description?.application?.type === 'initiator'
     this.acceptor = !this.initiator
     this.checkMsgIntegrity = this.acceptor

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

@@ -53,7 +53,7 @@ export class SessionRegistry implements ISessionRegistry {
   private readonly logger: IJsFixLogger | null
 
   constructor (logFactory?: JsFixLoggerFactory) {
-    this.logger = logFactory?.logger('SessionRegistry') ?? null
+    this.logger = logFactory?.logger('SessionRegistry', { component: 'SessionRegistry' }) ?? null
   }
 
   public get count (): number {

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

@@ -39,7 +39,8 @@ export class RecoveringTcpInitiator extends FixEntity {
     super(jsFixConfig)
     this.application = this.jsFixConfig.description.application ?? null
     const name = this.application?.name ?? 'na'
-    this.logger = jsFixConfig.logFactory.logger(`${name}:RecoveringTcpInitiator`)
+    this.logger = jsFixConfig.logFactory.logger(`${name}:RecoveringTcpInitiator`,
+      { component: 'RecoveringTcpInitiator', app: name, role: 'initiator' })
     if (!this.application) {
       throw new Error('no application in session description.')
     }

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

@@ -27,7 +27,8 @@ export class TcpAcceptorListener extends FixEntity {
 
   async start (): Promise<any> {
     return await new Promise<any>(async (resolve, reject) => {
-      const logger = this.config.logFactory.logger('acceptor')
+      const logger = this.config.logFactory.logger('acceptor',
+        { component: 'TcpAcceptorListener', role: 'acceptor' })
       const sessionContainer = this.config.sessionContainer
       if (!sessionContainer.isRegistered(DITokens.FixSession)) {
         reject(new Error(`application must register a DI token '${DITokens.FixSession}' - see src/sample`))
@@ -93,7 +94,8 @@ export class TcpAcceptorListener extends FixEntity {
    */
   stop (): void {
     if (this.acceptor) {
-      const logger = this.config.logFactory.logger('acceptor')
+      const logger = this.config.logFactory.logger('acceptor',
+        { component: 'TcpAcceptorListener', role: 'acceptor' })
       logger.info('acceptor stopping')
       this.acceptor.close(() => {
         logger.info('acceptor closed.')

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

@@ -18,7 +18,8 @@ export class TcpAcceptor extends FixAcceptor {
 
   constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig) {
     super(config.description.application ?? null)
-    this.logger = config.logFactory.logger(`${config.description.application?.name}:TcpAcceptor`)
+    this.logger = config.logFactory.logger(`${config.description.application?.name}:TcpAcceptor`,
+      { component: 'TcpAcceptor', app: config.description.application?.name, role: 'acceptor' })
     const tlsOptions: TlsOptions | null = this.tlsOptions()
     if (tlsOptions) {
       this.tlsServer()

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

@@ -21,7 +21,8 @@ export class TcpInitiatorConnector extends FixEntity {
   async start (reconnectTimeout: number = 0): Promise<any> {
 
     return await new Promise<any>(async (resolve, reject) => {
-      const logger = this.config.logFactory.logger('initiator')
+      const logger = this.config.logFactory.logger('initiator',
+      { component: 'TcpInitiatorConnector', role: 'initiator' })
       const sessionContainer = this.config.sessionContainer
       if (!sessionContainer.isRegistered(DITokens.FixSession)) {
         reject(new Error(`application must register a DI token '${DITokens.FixSession}' - see src/sample`))
@@ -64,7 +65,8 @@ export class TcpInitiatorConnector extends FixEntity {
   }
 
   async connect (initiatorSession: FixSession): Promise<any> {
-    const logger = this.config.logFactory.logger('initiator')
+    const logger = this.config.logFactory.logger('initiator',
+      { component: 'TcpInitiatorConnector', role: 'initiator' })
     const initiator: FixInitiator = this.config.sessionContainer.resolve<FixInitiator>(TcpInitiator)
     logger.info('connecting ...')
     const initiatorTransport: MsgTransport = await initiator.connect(this.connectTimeoutSecs)

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

@@ -33,7 +33,8 @@ export class TcpInitiator extends FixInitiator {
   constructor (@inject(DITokens.IJsFixConfig) public readonly jsFixConfig: IJsFixConfig) {
     super(jsFixConfig.description.application ?? null)
     const name = this.application?.name ?? 'initiator'
-    this.logger = jsFixConfig.logFactory.logger(`${name}:TcpInitiator`)
+    this.logger = jsFixConfig.logFactory.logger(`${name}:TcpInitiator`,
+      { component: 'TcpInitiator', app: name, role: 'initiator' })
     if (!this.application) {
       throw new Error('no application in session description.')
     }