jspurefix 1.1.2 → 1.4.1

package/dist/transport/tcp/index.d.ts

@@ -1,3 +1,4 @@
+export * from './recovering-tcp-initiator';
 export * from './tcp-initiator';
 export * from './tcp-acceptor';
 export * from './initiator';

package/dist/transport/tcp/index.js

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./recovering-tcp-initiator"), exports);
 __exportStar(require("./tcp-initiator"), exports);
 __exportStar(require("./tcp-acceptor"), exports);
 __exportStar(require("./initiator"), exports);

package/dist/transport/tcp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transport/tcp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA+B;AAC/B,iDAA8B;AAC9B,8CAA2B;AAC3B,6CAA0B","sourcesContent":["export * from './tcp-initiator'\r\nexport * from './tcp-acceptor'\r\nexport * from './initiator'\r\nexport * from './acceptor'\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transport/tcp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAA0C;AAC1C,kDAA+B;AAC/B,iDAA8B;AAC9B,8CAA2B;AAC3B,6CAA0B","sourcesContent":["export * from './recovering-tcp-initiator'\r\nexport * from './tcp-initiator'\r\nexport * from './tcp-acceptor'\r\nexport * from './initiator'\r\nexport * from './acceptor'\r\n"]}

package/dist/transport/tcp/initiator.js

@@ -26,6 +26,7 @@ function initiator(config, sessionFactory, reconnectTimeout = 0) {
             }
             catch (e) {
                 if (!reconnectTimeout) {
+                    connecting = false;
                     reject(e);
                 }
                 else {

package/dist/transport/tcp/initiator.js.map

@@ -1 +1 @@
-{"version":3,"file":"initiator.js","sourceRoot":"","sources":["../../../src/transport/tcp/initiator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,mDAA8C;AAK9C,SAAgB,SAAS,CAAE,MAAoB,EAAE,cAA8B,EAAE,mBAA2B,CAAC;IAC3G,OAAO,IAAI,OAAO,CAAM,CAAO,MAAM,EAAE,MAAM,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACpD,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC7B,MAAM,gBAAgB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;QAC/C,IAAI,UAAU,GAAY,IAAI,CAAA;QAC9B,OAAO,UAAU,EAAE;YACjB,IAAI;gBACF,MAAM,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;gBACpC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;gBAChC,UAAU,GAAG,KAAK,CAAA;gBAClB,MAAM,CAAC,IAAI,CAAC,CAAA;aACb;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,gBAAgB,EAAE;oBACrB,MAAM,CAAC,CAAC,CAAC,CAAA;iBACV;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,WAAW,gBAAgB,+BAA+B,CAAC,CAAA;oBACvE,MAAM,KAAK,CAAC,gBAAgB,CAAC,CAAA;iBAC9B;aACF;SACF;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AAtBD,8BAsBC;AAED,SAAS,KAAK,CAAE,CAAS;IACvB,OAAO,IAAI,OAAO,CAAM,CAAC,MAAM,EAAE,EAAE;QACjC,IAAI,CAAC,CAAC,EAAE;YACN,MAAM,CAAC,IAAI,CAAC,CAAA;SACb;QACD,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,CAAC,IAAI,CAAC,CAAA;QACd,CAAC,EAAE,CAAC,CAAC,CAAA;IACP,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,IAAI,CAAE,MAAoB,EAAE,gBAA4B;IAC/D,OAAO,IAAI,OAAO,CAAM,CAAO,MAAM,EAAE,MAAM,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACpD,MAAM,SAAS,GAAiB,IAAI,4BAAY,CAAC,MAAM,CAAC,CAAA;QACxD,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC7B,MAAM,kBAAkB,GAAiB,MAAM,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACpE,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;QACzC,gBAAgB,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACjD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACnB,MAAM,CAAC,IAAI,CAAC,CAAA;QACd,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;YACpB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACf,MAAM,CAAC,CAAC,CAAC,CAAA;QACX,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { IJsFixConfig } from '../../config'\r\nimport { FixInitiator } from '../fix-initiator'\r\nimport { TcpInitiator } from './tcp-initiator'\r\nimport { MsgTransport } from '../msg-transport'\r\nimport { MakeFixSession } from '../make-fixl-session'\r\nimport { FixSession } from '../fix-session'\r\n\r\nexport function initiator (config: IJsFixConfig, sessionFactory: MakeFixSession, reconnectTimeout: number = 0): Promise<any> {\r\n  return new Promise<any>(async (accept, reject) => {\r\n    const logger = config.logFactory.logger('initiator')\r\n    logger.info('create session')\r\n    const initiatorSession = sessionFactory(config)\r\n    let connecting: boolean = true\r\n    while (connecting) {\r\n      try {\r\n        await once(config, initiatorSession)\r\n        logger.info('session has ended')\r\n        connecting = false\r\n        accept(true)\r\n      } catch (e) {\r\n        if (!reconnectTimeout) {\r\n          reject(e)\r\n        } else {\r\n          logger.info(`waiting ${reconnectTimeout} to reconnect following error`)\r\n          await delay(reconnectTimeout)\r\n        }\r\n      }\r\n    }\r\n  })\r\n}\r\n\r\nfunction delay (p: number): Promise<any> {\r\n  return new Promise<any>((accept) => {\r\n    if (!p) {\r\n      accept(true)\r\n    }\r\n    setTimeout(() => {\r\n      accept(true)\r\n    }, p)\r\n  })\r\n}\r\n\r\nfunction once (config: IJsFixConfig, initiatorSession: FixSession): Promise<any> {\r\n  return new Promise<any>(async (accept, reject) => {\r\n    const logger = config.logFactory.logger('initiator')\r\n    const initiator: FixInitiator = new TcpInitiator(config)\r\n    logger.info('connecting ...')\r\n    const initiatorTransport: MsgTransport = await initiator.connect(22)\r\n    logger.info('... connected, run session')\r\n    initiatorSession.run(initiatorTransport).then(() => {\r\n      logger.info('ends')\r\n      accept(true)\r\n    }).catch((e: Error) => {\r\n      logger.error(e)\r\n      reject(e)\r\n    })\r\n  })\r\n}\r\n"]}
+{"version":3,"file":"initiator.js","sourceRoot":"","sources":["../../../src/transport/tcp/initiator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,mDAA8C;AAK9C,SAAgB,SAAS,CAAE,MAAoB,EAAE,cAA8B,EAAE,mBAA2B,CAAC;IAC3G,OAAO,IAAI,OAAO,CAAM,CAAO,MAAM,EAAE,MAAM,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACpD,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC7B,MAAM,gBAAgB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;QAC/C,IAAI,UAAU,GAAY,IAAI,CAAA;QAC9B,OAAO,UAAU,EAAE;YACjB,IAAI;gBACF,MAAM,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;gBACpC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;gBAChC,UAAU,GAAG,KAAK,CAAA;gBAClB,MAAM,CAAC,IAAI,CAAC,CAAA;aACb;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,gBAAgB,EAAE;oBACrB,UAAU,GAAG,KAAK,CAAA;oBAClB,MAAM,CAAC,CAAC,CAAC,CAAA;iBACV;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,WAAW,gBAAgB,+BAA+B,CAAC,CAAA;oBACvE,MAAM,KAAK,CAAC,gBAAgB,CAAC,CAAA;iBAC9B;aACF;SACF;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AAvBD,8BAuBC;AAED,SAAS,KAAK,CAAE,CAAS;IACvB,OAAO,IAAI,OAAO,CAAM,CAAC,MAAM,EAAE,EAAE;QACjC,IAAI,CAAC,CAAC,EAAE;YACN,MAAM,CAAC,IAAI,CAAC,CAAA;SACb;QACD,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,CAAC,IAAI,CAAC,CAAA;QACd,CAAC,EAAE,CAAC,CAAC,CAAA;IACP,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,IAAI,CAAE,MAAoB,EAAE,gBAA4B;IAC/D,OAAO,IAAI,OAAO,CAAM,CAAO,MAAM,EAAE,MAAM,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACpD,MAAM,SAAS,GAAiB,IAAI,4BAAY,CAAC,MAAM,CAAC,CAAA;QACxD,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC7B,MAAM,kBAAkB,GAAiB,MAAM,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACpE,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;QACzC,gBAAgB,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACjD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACnB,MAAM,CAAC,IAAI,CAAC,CAAA;QACd,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;YACpB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACf,MAAM,CAAC,CAAC,CAAC,CAAA;QACX,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { IJsFixConfig } from '../../config'\r\nimport { FixInitiator } from '../fix-initiator'\r\nimport { TcpInitiator } from './tcp-initiator'\r\nimport { MsgTransport } from '../msg-transport'\r\nimport { MakeFixSession } from '../make-fixl-session'\r\nimport { FixSession } from '../fix-session'\r\n\r\nexport function initiator (config: IJsFixConfig, sessionFactory: MakeFixSession, reconnectTimeout: number = 0): Promise<any> {\r\n  return new Promise<any>(async (accept, reject) => {\r\n    const logger = config.logFactory.logger('initiator')\r\n    logger.info('create session')\r\n    const initiatorSession = sessionFactory(config)\r\n    let connecting: boolean = true\r\n    while (connecting) {\r\n      try {\r\n        await once(config, initiatorSession)\r\n        logger.info('session has ended')\r\n        connecting = false\r\n        accept(true)\r\n      } catch (e) {\r\n        if (!reconnectTimeout) {\r\n          connecting = false\r\n          reject(e)\r\n        } else {\r\n          logger.info(`waiting ${reconnectTimeout} to reconnect following error`)\r\n          await delay(reconnectTimeout)\r\n        }\r\n      }\r\n    }\r\n  })\r\n}\r\n\r\nfunction delay (p: number): Promise<any> {\r\n  return new Promise<any>((accept) => {\r\n    if (!p) {\r\n      accept(true)\r\n    }\r\n    setTimeout(() => {\r\n      accept(true)\r\n    }, p)\r\n  })\r\n}\r\n\r\nfunction once (config: IJsFixConfig, initiatorSession: FixSession): Promise<any> {\r\n  return new Promise<any>(async (accept, reject) => {\r\n    const logger = config.logFactory.logger('initiator')\r\n    const initiator: FixInitiator = new TcpInitiator(config)\r\n    logger.info('connecting ...')\r\n    const initiatorTransport: MsgTransport = await initiator.connect(22)\r\n    logger.info('... connected, run session')\r\n    initiatorSession.run(initiatorTransport).then(() => {\r\n      logger.info('ends')\r\n      accept(true)\r\n    }).catch((e: Error) => {\r\n      logger.error(e)\r\n      reject(e)\r\n    })\r\n  })\r\n}\r\n"]}

package/dist/transport/tcp/recovering-initiator.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+import { ITcpTransportDescription } from '../session-description';
+import { IJsFixConfig } from '../../config';
+import { InitiatorState } from './tcp-initiator';
+import { MakeFixSession } from '../make-fixl-session';
+import { FixSession } from '../fix-session';
+import * as events from 'events';
+export declare class RecoveringInitiator extends events.EventEmitter {
+    readonly jsFixConfig: IJsFixConfig;
+    readonly sessionFactory: MakeFixSession;
+    tcp: ITcpTransportDescription;
+    session: FixSession;
+    state: InitiatorState;
+    private readonly logger;
+    private application;
+    constructor(jsFixConfig: IJsFixConfig, sessionFactory: MakeFixSession);
+}

package/dist/transport/tcp/recovering-initiator.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecoveringInitiator = void 0;
+const tcp_initiator_1 = require("./tcp-initiator");
+const events = require("events");
+class RecoveringInitiator extends events.EventEmitter {
+    constructor(jsFixConfig, sessionFactory) {
+        super();
+        this.jsFixConfig = jsFixConfig;
+        this.sessionFactory = sessionFactory;
+        this.state = tcp_initiator_1.InitiatorState.Idle;
+        this.application = this.jsFixConfig.description.application;
+        this.logger = jsFixConfig.logFactory.logger(`${this.application.name}:TcpInitiator`);
+        if (!this.application) {
+            const e = 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.logger.info('creating an application session');
+        this.session = sessionFactory(jsFixConfig);
+    }
+}
+exports.RecoveringInitiator = RecoveringInitiator;
+//# sourceMappingURL=recovering-initiator.js.map

package/dist/transport/tcp/recovering-initiator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovering-initiator.js","sourceRoot":"","sources":["../../../src/transport/tcp/recovering-initiator.ts"],"names":[],"mappings":";;;AAEA,mDAAgD;AAGhD,iCAAgC;AAQhC,MAAa,mBAAoB,SAAQ,MAAM,CAAC,YAAY;IAO1D,YAA6B,WAAyB,EAAkB,cAA8B;QACpG,KAAK,EAAE,CAAA;QADoB,gBAAW,GAAX,WAAW,CAAc;QAAkB,mBAAc,GAAd,cAAc,CAAgB;QAJ/F,UAAK,GAAmB,8BAAc,CAAC,IAAI,CAAA;QAMhD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,CAAA;QAC3D,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,eAAe,CAAC,CAAA;QACpF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,MAAM,CAAC,GAAU,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;YACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,MAAM,CAAC,CAAA;SACR;QACD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;QAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACb,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAA;YAC5F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,MAAM,CAAC,CAAA;SACR;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;QACnD,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,WAAW,CAAC,CAAA;IAC5C,CAAC;CACF;AAzBD,kDAyBC","sourcesContent":["import { IMsgApplication, ITcpTransportDescription } from '../session-description'\r\nimport { IJsFixConfig, IJsFixLogger } from '../../config'\r\nimport { InitiatorState } from './tcp-initiator'\r\nimport { MakeFixSession } from '../make-fixl-session'\r\nimport { FixSession } from '../fix-session'\r\nimport * as events from 'events'\r\n\r\n/*\r\n   create one application session instance - and recover a lost transport.  Hence the application\r\n   will automatically re-connected and the \"message recovery\" policy enacted i.e. replay from\r\n   last known sequence number or sequence reset.\r\n */\r\n\r\nexport class RecoveringInitiator extends events.EventEmitter {\r\n  public tcp: ITcpTransportDescription\r\n  public session: FixSession\r\n  public state: InitiatorState = InitiatorState.Idle\r\n  private readonly logger: IJsFixLogger\r\n  private application: IMsgApplication\r\n\r\n  constructor (public readonly jsFixConfig: IJsFixConfig, public readonly sessionFactory: MakeFixSession) {\r\n    super()\r\n    this.application = this.jsFixConfig.description.application\r\n    this.logger = jsFixConfig.logFactory.logger(`${this.application.name}:TcpInitiator`)\r\n    if (!this.application) {\r\n      const e: Error = new Error(`no application in session description.`)\r\n      this.logger.error(e)\r\n      throw e\r\n    }\r\n    this.tcp = this.application.tcp\r\n    if (!this.tcp) {\r\n      const e = new Error(`no tcp in session description need tcp { host: hostname, port: port }`)\r\n      this.logger.error(e)\r\n      throw e\r\n    }\r\n    this.logger.info('creating an application session')\r\n    this.session = sessionFactory(jsFixConfig)\r\n  }\r\n}\r\n"]}

package/dist/transport/tcp/recovering-tcp-initiator.d.ts

@@ -0,0 +1,28 @@
+/// <reference types="node" />
+import { ITcpTransportDescription } from '../session-description';
+import { IJsFixConfig } from '../../config';
+import { MakeFixSession } from '../make-fixl-session';
+import { FixSession } from '../fix-session';
+import { SessionState } from '../fix-session-state';
+import * as events from 'events';
+export declare class RecoveringTcpInitiator extends events.EventEmitter {
+    readonly jsFixConfig: IJsFixConfig;
+    readonly sessionFactory: MakeFixSession;
+    tcp: ITcpTransportDescription;
+    session: FixSession;
+    private readonly logger;
+    private application;
+    private initiator;
+    private transport;
+    private th;
+    recoveryAttemptSecs: number;
+    backoffFailConnectSecs: number;
+    constructor(jsFixConfig: IJsFixConfig, sessionFactory: MakeFixSession);
+    private createSession;
+    getState(): SessionState;
+    private newTransport;
+    private clearTimer;
+    private recover;
+    run(initialTimeout?: number): Promise<any>;
+    private connect;
+}

package/dist/transport/tcp/recovering-tcp-initiator.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecoveringTcpInitiator = void 0;
+const fix_session_state_1 = require("../fix-session-state");
+const tcp_initiator_1 = require("./tcp-initiator");
+const events = require("events");
+class RecoveringTcpInitiator extends events.EventEmitter {
+    constructor(jsFixConfig, sessionFactory) {
+        super();
+        this.jsFixConfig = jsFixConfig;
+        this.sessionFactory = sessionFactory;
+        this.th = null;
+        this.recoveryAttemptSecs = 5;
+        this.backoffFailConnectSecs = 30;
+        this.application = this.jsFixConfig.description.application;
+        this.logger = jsFixConfig.logFactory.logger(`${this.application.name}:RecoveringTcpInitiator`);
+        if (!this.application) {
+            const e = 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);
+    }
+    createSession(jsFixConfig, sessionFactory) {
+        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(fix_session_state_1.SessionState.DisconnectedNoConnectionToday);
+    }
+    getState() {
+        return this.session.getState();
+    }
+    newTransport(transport) {
+        this.transport = transport;
+        this.emit('transport', transport);
+        this.logger.info(`initiator connects id ${(transport.id)}`);
+        const session = this.session;
+        session.setState(fix_session_state_1.SessionState.NetworkConnectionEstablished);
+        session.run(transport).then((id) => {
+            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()}`);
+    }
+    clearTimer() {
+        if (this.th) {
+            clearTimeout(this.th);
+            this.th = null;
+        }
+    }
+    recover() {
+        this.session.setState(fix_session_state_1.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);
+    }
+    run(initialTimeout = 60) {
+        return new Promise((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);
+            });
+        });
+    }
+    connect(timeout) {
+        return new Promise((resolve, reject) => {
+            this.logger.info(`connect: start initiator timeout ${timeout}`);
+            this.session.setState(fix_session_state_1.SessionState.InitiateConnection);
+            this.initiator = new tcp_initiator_1.TcpInitiator(this.jsFixConfig);
+            this.initiator.connect(timeout).then((transport) => {
+                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(fix_session_state_1.SessionState.DetectBrokenNetworkConnection);
+                reject(e);
+            });
+        });
+    }
+}
+exports.RecoveringTcpInitiator = RecoveringTcpInitiator;
+//# sourceMappingURL=recovering-tcp-initiator.js.map

package/dist/transport/tcp/recovering-tcp-initiator.js.map

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

package/dist/transport/tcp/tcp-acceptor.d.ts

@@ -1,10 +1,17 @@
+/// <reference types="node" />
 import { FixAcceptor } from '../fix-acceptor';
 import { IJsFixConfig } from '../../config';
+import { TlsOptions } from 'tls';
 export declare class TcpAcceptor extends FixAcceptor {
     readonly config: IJsFixConfig;
     private server;
     private logger;
+    private nextId;
     constructor(config: IJsFixConfig);
+    getId(): number;
+    tlsServer(): void;
+    unsecureServer(): void;
+    tlsOptions(): TlsOptions;
     private onSocket;
     listen(): void;
     close(callback?: (err?: Error) => void): void;

package/dist/transport/tcp/tcp-acceptor.js

@@ -11,12 +11,30 @@ class TcpAcceptor extends fix_acceptor_1.FixAcceptor {
     constructor(config) {
         super(config.description.application);
         this.config = config;
+        this.nextId = 0;
         this.logger = config.logFactory.logger(`${config.description.application.name}:TcpAcceptor`);
-        let nextId = 0;
-        const tcp = this.config.description.application.tcp;
-        const tlsOptions = tls_options_1.getTlsOptions(tcp.tls);
-        this.logger.info('creating server');
+        const tlsOptions = this.tlsOptions();
         if (tlsOptions) {
+            this.tlsServer();
+        }
+        else {
+            this.unsecureServer();
+        }
+        this.server.on('error', ((err) => {
+            throw err;
+        }));
+    }
+    getId() {
+        this.nextId++;
+        const id = this.nextId;
+        return id;
+    }
+    tlsServer() {
+        try {
+            const config = this.config;
+            const tcp = this.config.description.application.tcp;
+            const tlsOptions = tls_options_1.getTlsOptions(tcp.tls);
+            this.logger.info(`create tls server`);
             this.server = tls_1.createServer(tlsOptions, (tlsSocket) => {
                 if (tcp.tls.enableTrace) {
                     this.logger.info(`enabling tls session trace`);
@@ -24,7 +42,7 @@ class TcpAcceptor extends fix_acceptor_1.FixAcceptor {
                 }
                 if (tlsSocket.authorized) {
                     tlsSocket.setEncoding('utf8');
-                    const id = nextId++;
+                    const id = this.getId();
                     this.logger.info(`tls creates session ${id} ${tlsSocket.authorized}`);
                     this.onSocket(id, tlsSocket, config);
                 }
@@ -33,17 +51,31 @@ class TcpAcceptor extends fix_acceptor_1.FixAcceptor {
                 }
             });
         }
-        else {
+        catch (e) {
+            this.logger.error(e);
+            throw e;
+        }
+    }
+    unsecureServer() {
+        try {
+            const config = this.config;
+            this.logger.info(`create unsecured server`);
             this.server = net_1.createServer((socket) => {
-                const id = nextId++;
-                this.logger.info(`net creates session ${id} }`);
+                const id = this.getId();
+                this.logger.info(`net creates session ${id}`);
                 socket.setNoDelay(true);
                 this.onSocket(id, socket, config);
             });
         }
-        this.server.on('error', ((err) => {
-            throw err;
-        }));
+        catch (e) {
+            this.logger.error(e);
+            throw e;
+        }
+    }
+    tlsOptions() {
+        const tcp = this.config.description.application.tcp;
+        const tlsOptions = tls_options_1.getTlsOptions(tcp.tls);
+        return tlsOptions;
     }
     onSocket(id, socket, config) {
         const transport = new msg_transport_1.MsgTransport(id, config, new duplex_1.TcpDuplex(socket));

package/dist/transport/tcp/tcp-acceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"tcp-acceptor.js","sourceRoot":"","sources":["../../../src/transport/tcp/tcp-acceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { TcpDuplex } from '../duplex'\r\nimport { MsgTransport } from '../msg-transport'\r\nimport { FixAcceptor } from '../fix-acceptor'\r\nimport { IJsFixConfig, IJsFixLogger } from '../../config'\r\nimport { getTlsOptions } from './tls-options'\r\nimport { createServer as netCreateServer, Socket, Server } from 'net'\r\nimport { createServer as tlsCreateServer, TLSSocket, TlsOptions } from 'tls'\r\n\r\nexport class TcpAcceptor extends FixAcceptor {\r\n  private server: Server\r\n  private logger: IJsFixLogger\r\n  constructor (public readonly config: IJsFixConfig) {\r\n    super(config.description.application)\r\n    this.logger = config.logFactory.logger(`${config.description.application.name}:TcpAcceptor`)\r\n    let nextId: number = 0\r\n    const tcp = this.config.description.application.tcp\r\n    const tlsOptions: TlsOptions = getTlsOptions(tcp.tls)\r\n    this.logger.info('creating server')\r\n    if (tlsOptions) {\r\n      this.server = tlsCreateServer(tlsOptions, (tlsSocket: TLSSocket) => {\r\n        if (tcp.tls.enableTrace) {\r\n          this.logger.info(`enabling tls session trace`)\r\n          tlsSocket.enableTrace()\r\n        }\r\n        if (tlsSocket.authorized) {\r\n          tlsSocket.setEncoding('utf8')\r\n          const id: number = nextId++\r\n          this.logger.info(`tls creates session ${id} ${tlsSocket.authorized}`)\r\n          this.onSocket(id, tlsSocket, config)\r\n        } else {\r\n          this.logger.info(`no transport created on tls with no authorized connection`)\r\n        }\r\n      })\r\n    } else {\r\n      this.server = netCreateServer((socket: Socket) => {\r\n        const id: number = nextId++\r\n        this.logger.info(`net creates session ${id} }`)\r\n        socket.setNoDelay(true)\r\n        this.onSocket(id, socket, config)\r\n      })\r\n    }\r\n    this.server.on('error', ((err: Error) => {\r\n      throw err\r\n    }))\r\n  }\r\n\r\n  private onSocket (id: number, socket: Socket, config: IJsFixConfig) {\r\n    const transport: MsgTransport = new MsgTransport(id, config, new TcpDuplex(socket))\r\n    this.saveTransport(id, transport)\r\n    transport.receiver.on('end', () => {\r\n      this.harvestTransport(id)\r\n    })\r\n    transport.receiver.on('error', (e: Error) => {\r\n      this.logger.error(e)\r\n      this.harvestTransport(id)\r\n    })\r\n  }\r\n\r\n  public listen (): void {\r\n    const port = this.config.description.application.tcp.port\r\n    this.logger.info(`start to listen ${port}`)\r\n    this.server.on('connection', () => {\r\n      this.logger.info('insecure connection established')\r\n    })\r\n    this.server.on('secureConnection', (s) => {\r\n      this.logger.info(`secure connection; client authorized: ${s.authorized}`)\r\n    })\r\n    this.server.listen(port)\r\n  }\r\n\r\n  public close (callback?: (err?: Error) => void): void {\r\n    const port = this.config.description.application.tcp.port\r\n    this.logger.info(`close listener on port ${port}`)\r\n    this.server.close(callback)\r\n  }\r\n\r\n  private saveTransport (tid: number, transport: MsgTransport) {\r\n    this.transports[tid] = transport\r\n    const keys: string[] = Object.keys(this.transports)\r\n    this.logger.info(`new transport id = ${tid} created total transports = ${keys.length}`)\r\n    this.emit('transport', transport)\r\n  }\r\n\r\n  private harvestTransport (tid: number) {\r\n    delete this.transports[tid]\r\n    const keys: string[] = Object.keys(this.transports)\r\n    this.logger.info(`transport ${tid} ends total transports = ${keys.length}`)\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"tcp-acceptor.js","sourceRoot":"","sources":["../../../src/transport/tcp/tcp-acceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { TcpDuplex } from '../duplex'\r\nimport { MsgTransport } from '../msg-transport'\r\nimport { FixAcceptor } from '../fix-acceptor'\r\nimport { IJsFixConfig, IJsFixLogger } from '../../config'\r\nimport { getTlsOptions } from './tls-options'\r\nimport { createServer as netCreateServer, Socket, Server } from 'net'\r\nimport { createServer as tlsCreateServer, TLSSocket, TlsOptions } from 'tls'\r\n\r\nexport class TcpAcceptor extends FixAcceptor {\r\n  private server: Server\r\n  private logger: IJsFixLogger\r\n  private nextId: number = 0\r\n\r\n  constructor (public readonly config: IJsFixConfig) {\r\n    super(config.description.application)\r\n    this.logger = config.logFactory.logger(`${config.description.application.name}:TcpAcceptor`)\r\n    const tlsOptions: TlsOptions = this.tlsOptions()\r\n    if (tlsOptions) {\r\n      this.tlsServer()\r\n    } else {\r\n      this.unsecureServer()\r\n    }\r\n    this.server.on('error', ((err: Error) => {\r\n      throw err\r\n    }))\r\n  }\r\n\r\n  getId (): number {\r\n    this.nextId++\r\n    const id: number = this.nextId\r\n    return id\r\n  }\r\n\r\n  tlsServer (): void {\r\n    try {\r\n      const config: IJsFixConfig = this.config\r\n      const tcp = this.config.description.application.tcp\r\n      const tlsOptions: TlsOptions = getTlsOptions(tcp.tls)\r\n      this.logger.info(`create tls server`)\r\n      this.server = tlsCreateServer(tlsOptions, (tlsSocket: TLSSocket) => {\r\n        if (tcp.tls.enableTrace) {\r\n          this.logger.info(`enabling tls session trace`)\r\n          tlsSocket.enableTrace()\r\n        }\r\n        if (tlsSocket.authorized) {\r\n          tlsSocket.setEncoding('utf8')\r\n          const id: number = this.getId()\r\n          this.logger.info(`tls creates session ${id} ${tlsSocket.authorized}`)\r\n          this.onSocket(id, tlsSocket, config)\r\n        } else {\r\n          this.logger.info(`no transport created on tls with no authorized connection`)\r\n        }\r\n      })\r\n    } catch (e) {\r\n      this.logger.error(e)\r\n      throw e\r\n    }\r\n  }\r\n\r\n  unsecureServer () {\r\n    try {\r\n      const config = this.config\r\n      this.logger.info(`create unsecured server`)\r\n      this.server = netCreateServer((socket: Socket) => {\r\n        const id: number = this.getId()\r\n        this.logger.info(`net creates session ${id}`)\r\n        socket.setNoDelay(true)\r\n        this.onSocket(id, socket, config)\r\n      })\r\n    } catch (e) {\r\n      this.logger.error(e)\r\n      throw e\r\n    }\r\n  }\r\n\r\n  tlsOptions (): TlsOptions {\r\n    const tcp = this.config.description.application.tcp\r\n    const tlsOptions: TlsOptions = getTlsOptions(tcp.tls)\r\n    return tlsOptions\r\n  }\r\n\r\n  private onSocket (id: number, socket: Socket, config: IJsFixConfig) {\r\n    const transport: MsgTransport = new MsgTransport(id, config, new TcpDuplex(socket))\r\n    this.saveTransport(id, transport)\r\n    transport.receiver.on('end', () => {\r\n      this.harvestTransport(id)\r\n    })\r\n    transport.receiver.on('error', (e: Error) => {\r\n      this.logger.error(e)\r\n      this.harvestTransport(id)\r\n    })\r\n  }\r\n\r\n  public listen (): void {\r\n    const port = this.config.description.application.tcp.port\r\n    this.logger.info(`start to listen ${port}`)\r\n    this.server.on('connection', () => {\r\n      this.logger.info('insecure connection established')\r\n    })\r\n    this.server.on('secureConnection', (s) => {\r\n      this.logger.info(`secure connection; client authorized: ${s.authorized}`)\r\n    })\r\n    this.server.listen(port)\r\n  }\r\n\r\n  public close (callback?: (err?: Error) => void): void {\r\n    const port = this.config.description.application.tcp.port\r\n    this.logger.info(`close listener on port ${port}`)\r\n    this.server.close(callback)\r\n  }\r\n\r\n  private saveTransport (tid: number, transport: MsgTransport) {\r\n    this.transports[tid] = transport\r\n    const keys: string[] = Object.keys(this.transports)\r\n    this.logger.info(`new transport id = ${tid} created total transports = ${keys.length}`)\r\n    this.emit('transport', transport)\r\n  }\r\n\r\n  private harvestTransport (tid: number) {\r\n    delete this.transports[tid]\r\n    const keys: string[] = Object.keys(this.transports)\r\n    this.logger.info(`transport ${tid} ends total transports = ${keys.length}`)\r\n  }\r\n}\r\n"]}

package/dist/transport/tcp/tcp-initiator.d.ts

@@ -14,9 +14,13 @@ export declare class TcpInitiator extends FixInitiator {
     state: InitiatorState;
     private readonly logger;
     private duplex;
+    private th;
     constructor(jsFixConfig: IJsFixConfig);
     end(): void;
     connect(timeoutSeconds: number): Promise<MsgTransport>;
+    private unsecureDuplex;
+    private tlsDuplex;
     private tryConnect;
+    clearTimer(): void;
     private repeatConnect;
 }

package/dist/transport/tcp/tcp-initiator.js

@@ -29,6 +29,7 @@ class TcpInitiator extends fix_initiator_1.FixInitiator {
         super(jsFixConfig.description.application);
         this.jsFixConfig = jsFixConfig;
         this.state = InitiatorState.Idle;
+        this.th = null;
         this.logger = jsFixConfig.logFactory.logger(`${this.application.name}:TcpInitiator`);
         if (!this.application) {
             const e = new Error(`no application in session description.`);
@@ -43,6 +44,7 @@ class TcpInitiator extends fix_initiator_1.FixInitiator {
         }
     }
     end() {
+        this.clearTimer();
         switch (this.state) {
             case InitiatorState.Connected: {
                 this.logger.info('end');
@@ -52,6 +54,8 @@ class TcpInitiator extends fix_initiator_1.FixInitiator {
             }
             default: {
                 this.logger.info(`end :state ${this.state}`);
+                this.state = InitiatorState.Stopped;
+                break;
             }
         }
     }
@@ -74,65 +78,98 @@ class TcpInitiator extends fix_initiator_1.FixInitiator {
             }
         }));
     }
-    tryConnect() {
+    unsecureDuplex() {
+        const tcp = this.tcp;
         return new Promise((resolve, reject) => {
-            const tcp = this.tcp;
-            this.logger.info(`tryConnect ${tcp.host}:${tcp.port}`);
-            const connectionOptions = tls_options_1.getTlsConnectionOptions(tcp);
-            let socket = null;
-            let tlsSocket = null;
-            if (connectionOptions) {
-                tlsSocket = tls_1.connect(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);
+            try {
+                this.logger.info(`unsecureDuplex try to connect to endPoint`);
+                const socket = net_1.createConnection(tcp, () => {
+                    try {
+                        this.logger.info(`net.createConnection cb, resolving`);
+                        const tcpDuplex = new duplex_1.TcpDuplex(socket);
+                        resolve(tcpDuplex);
                     }
-                    else {
-                        tlsSocket.setEncoding('utf8');
-                        this.duplex = new duplex_1.TcpDuplex(tlsSocket);
-                        resolve(new msg_transport_1.MsgTransport(0, this.jsFixConfig, this.duplex));
+                    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 = net_1.createConnection(tcp, () => {
-                    this.logger.info(`net.createConnection cb, resolving`);
-                    this.duplex = new duplex_1.TcpDuplex(socket);
-                    resolve(new msg_transport_1.MsgTransport(0, this.jsFixConfig, this.duplex));
-                    socket.on('error', (e) => {
-                        reject(e);
+            catch (e) {
+                reject(e);
+            }
+        });
+    }
+    tlsDuplex() {
+        return new Promise((resolve, reject) => {
+            let tlsSocket = null;
+            const tcp = this.tcp;
+            const connectionOptions = tls_options_1.getTlsConnectionOptions(tcp);
+            if (connectionOptions) {
+                try {
+                    tlsSocket = tls_1.connect(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 duplex_1.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);
+                }
             }
         });
     }
+    tryConnect() {
+        return new Promise((resolve, reject) => {
+            const tcp = this.tcp;
+            const connectionOptions = tls_options_1.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 msg_transport_1.MsgTransport(0, this.jsFixConfig, duplex));
+            }).catch(e => {
+                reject(e);
+            });
+        });
+    }
+    clearTimer() {
+        if (this.th) {
+            clearInterval(this.th);
+            this.th = null;
+        }
+    }
     repeatConnect(timeoutSeconds) {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             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) => {
                     this.state = InitiatorState.Connected;
-                    clearInterval(timer);
+                    this.clearTimer();
                     resolve(t);
                 }).catch((e) => {
                     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}`);