jspurefix 1.2.0 → 2.0.0

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

@@ -0,0 +1,70 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TcpAcceptorListener = void 0;
+const tcp_acceptor_1 = require("./tcp-acceptor");
+const tsyringe_1 = require("tsyringe");
+const di_tokens_1 = require("../../runtime/di-tokens");
+const fix_entity_1 = require("../fix-entity");
+let TcpAcceptorListener = class TcpAcceptorListener extends fix_entity_1.FixEntity {
+    constructor(config) {
+        super(config);
+        this.config = config;
+    }
+    start() {
+        return new Promise((accept, reject) => __awaiter(this, void 0, void 0, function* () {
+            const logger = this.config.logFactory.logger('acceptor');
+            const sessionContainer = this.config.sessionContainer;
+            if (!sessionContainer.isRegistered(di_tokens_1.DITokens.FixSession)) {
+                reject(new Error(`application must register a DI token '${di_tokens_1.DITokens.FixSession}' - see src/sample`));
+            }
+            logger.info('starting.');
+            const acceptor = sessionContainer.resolve(tcp_acceptor_1.TcpAcceptor);
+            acceptor.on('transport', (t) => {
+                logger.info(`creates new transport using DI token ${di_tokens_1.DITokens.FixSession}.`);
+                const acceptorSession = sessionContainer.resolve(di_tokens_1.DITokens.FixSession);
+                acceptorSession.run(t).then(() => {
+                    logger.info('ends');
+                    acceptor.close(() => {
+                        logger.info('acceptor closed.');
+                        accept(true);
+                    });
+                }).catch((e) => {
+                    logger.info(`error in session - close listener ${e.message}`);
+                    acceptor.close(() => {
+                        logger.info('acceptor closed.');
+                        reject(e);
+                    });
+                });
+            });
+            acceptor.listen();
+        }));
+    }
+};
+TcpAcceptorListener = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(di_tokens_1.DITokens.IJsFixConfig)),
+    __metadata("design:paramtypes", [Object])
+], TcpAcceptorListener);
+exports.TcpAcceptorListener = TcpAcceptorListener;
+//# sourceMappingURL=tcp-acceptor-listener.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tcp-acceptor-listener.js","sourceRoot":"","sources":["../../../src/transport/tcp/tcp-acceptor-listener.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA,iDAA4C;AAE5C,uCAA6C;AAE7C,uDAAkD;AAClD,8CAAyC;AAGzC,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,sBAAS;IAChD,YAA4D,MAAoB;QAC9E,KAAK,CAAC,MAAM,CAAC,CAAA;QAD6C,WAAM,GAAN,MAAM,CAAc;IAEhF,CAAC;IAED,KAAK;QACH,OAAO,IAAI,OAAO,CAAM,CAAO,MAAM,EAAE,MAAM,EAAE,EAAE;YAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YACxD,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAA;YACrD,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,oBAAQ,CAAC,UAAU,CAAC,EAAE;gBACvD,MAAM,CAAC,IAAI,KAAK,CAAC,yCAAyC,oBAAQ,CAAC,UAAU,oBAAoB,CAAC,CAAC,CAAA;aACpG;YACD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACxB,MAAM,QAAQ,GAAgB,gBAAgB,CAAC,OAAO,CAAc,0BAAW,CAAC,CAAA;YAChF,QAAQ,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAe,EAAE,EAAE;gBAC3C,MAAM,CAAC,IAAI,CAAC,wCAAwC,oBAAQ,CAAC,UAAU,GAAG,CAAC,CAAA;gBAC3E,MAAM,eAAe,GAAG,gBAAgB,CAAC,OAAO,CAAa,oBAAQ,CAAC,UAAU,CAAC,CAAA;gBACjF,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC/B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACnB,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE;wBAClB,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;wBAC/B,MAAM,CAAC,IAAI,CAAC,CAAA;oBACd,CAAC,CAAC,CAAA;gBACJ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;oBACpB,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;oBAC7D,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE;wBAClB,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;wBAC/B,MAAM,CAAC,CAAC,CAAC,CAAA;oBACX,CAAC,CAAC,CAAA;gBACJ,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,MAAM,EAAE,CAAA;QACnB,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAlCY,mBAAmB;IAD/B,IAAA,qBAAU,GAAE;IAEG,WAAA,IAAA,iBAAM,EAAC,oBAAQ,CAAC,YAAY,CAAC,CAAA;;GADhC,mBAAmB,CAkC/B;AAlCY,kDAAmB","sourcesContent":["import { IJsFixConfig } from '../../config'\r\nimport { FixAcceptor } from '../fix-acceptor'\r\nimport { TcpAcceptor } from './tcp-acceptor'\r\nimport { MsgTransport } from '../factory'\r\nimport { inject, injectable } from 'tsyringe'\r\nimport { FixSession } from '../session/fix-session'\r\nimport { DITokens } from '../../runtime/di-tokens'\r\nimport { FixEntity } from '../fix-entity'\r\n\r\n@injectable()\r\nexport class TcpAcceptorListener extends FixEntity {\r\n  constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig) {\r\n    super(config)\r\n  }\r\n\r\n  start (): Promise<any> {\r\n    return new Promise<any>(async (accept, reject) => {\r\n      const logger = this.config.logFactory.logger('acceptor')\r\n      const sessionContainer = this.config.sessionContainer\r\n      if (!sessionContainer.isRegistered(DITokens.FixSession)) {\r\n        reject(new Error(`application must register a DI token '${DITokens.FixSession}' - see src/sample`))\r\n      }\r\n      logger.info('starting.')\r\n      const acceptor: FixAcceptor = sessionContainer.resolve<FixAcceptor>(TcpAcceptor)\r\n      acceptor.on('transport', (t: MsgTransport) => {\r\n        logger.info(`creates new transport using DI token ${DITokens.FixSession}.`)\r\n        const acceptorSession = sessionContainer.resolve<FixSession>(DITokens.FixSession)\r\n        acceptorSession.run(t).then(() => {\r\n          logger.info('ends')\r\n          acceptor.close(() => {\r\n            logger.info('acceptor closed.')\r\n            accept(true)\r\n          })\r\n        }).catch((e: Error) => {\r\n          logger.info(`error in session - close listener ${e.message}`)\r\n          acceptor.close(() => {\r\n            logger.info('acceptor closed.')\r\n            reject(e)\r\n          })\r\n        })\r\n      })\r\n      acceptor.listen()\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

@@ -1,65 +1,96 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TcpAcceptor = void 0;
 const duplex_1 = require("../duplex");
-const msg_transport_1 = require("../msg-transport");
+const factory_1 = require("../factory");
 const fix_acceptor_1 = require("../fix-acceptor");
-const tls_options_1 = require("./tls-options");
 const net_1 = require("net");
 const tls_1 = require("tls");
-class TcpAcceptor extends fix_acceptor_1.FixAcceptor {
+const tls_options_factory_1 = require("./tls-options-factory");
+const tsyringe_1 = require("tsyringe");
+const di_tokens_1 = require("../../runtime/di-tokens");
+let TcpAcceptor = 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);
+        const tlsOptions = this.tlsOptions();
         if (tlsOptions) {
-            try {
-                this.logger.info(`create tls server`);
-                this.server = tls_1.createServer(tlsOptions, (tlsSocket) => {
-                    if (tcp.tls.enableTrace) {
-                        this.logger.info(`enabling tls session trace`);
-                        tlsSocket.enableTrace();
-                    }
-                    if (tlsSocket.authorized) {
-                        tlsSocket.setEncoding('utf8');
-                        const id = nextId++;
-                        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`);
-                    }
-                });
-            }
-            catch (e) {
-                this.logger.error(e);
-                throw e;
-            }
+            this.tlsServer();
         }
         else {
-            try {
-                this.logger.info(`create unsecured server`);
-                this.server = net_1.createServer((socket) => {
-                    const id = nextId++;
-                    this.logger.info(`net creates session ${id} }`);
-                    socket.setNoDelay(true);
-                    this.onSocket(id, socket, config);
-                });
-            }
-            catch (e) {
-                this.logger.error(e);
-                throw e;
-            }
+            this.unsecureServer();
         }
         this.server.on('error', ((err) => {
             throw err;
         }));
     }
+    getId() {
+        this.nextId++;
+        return this.nextId;
+    }
+    tlsServer() {
+        try {
+            const config = this.config;
+            const tcp = this.config.description.application.tcp;
+            const tlsOptions = tls_options_factory_1.TlsOptionsFactory.getTlsOptions(tcp.tls);
+            this.logger.info(`create tls server`);
+            this.server = (0, tls_1.createServer)(tlsOptions, (tlsSocket) => {
+                if (tcp.tls.enableTrace) {
+                    this.logger.info(`enabling tls session trace`);
+                    tlsSocket.enableTrace();
+                }
+                if (tlsSocket.authorized) {
+                    tlsSocket.setEncoding('utf8');
+                    const id = 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`);
+                }
+            });
+        }
+        catch (e) {
+            this.logger.error(e);
+            throw e;
+        }
+    }
+    unsecureServer() {
+        try {
+            const config = this.config;
+            this.logger.info(`create unsecured server`);
+            this.server = (0, net_1.createServer)((socket) => {
+                const id = 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;
+        }
+    }
+    tlsOptions() {
+        const tcp = this.config.description.application.tcp;
+        return tls_options_factory_1.TlsOptionsFactory.getTlsOptions(tcp.tls);
+    }
     onSocket(id, socket, config) {
-        const transport = new msg_transport_1.MsgTransport(id, config, new duplex_1.TcpDuplex(socket));
+        const transport = new factory_1.MsgTransport(id, config, new duplex_1.TcpDuplex(socket));
         this.saveTransport(id, transport);
         transport.receiver.on('end', () => {
             this.harvestTransport(id);
@@ -96,6 +127,11 @@ class TcpAcceptor extends fix_acceptor_1.FixAcceptor {
         const keys = Object.keys(this.transports);
         this.logger.info(`transport ${tid} ends total transports = ${keys.length}`);
     }
-}
+};
+TcpAcceptor = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(di_tokens_1.DITokens.IJsFixConfig)),
+    __metadata("design:paramtypes", [Object])
+], TcpAcceptor);
 exports.TcpAcceptor = TcpAcceptor;
 //# sourceMappingURL=tcp-acceptor.js.map

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":";;;AAAA,sCAAqC;AACrC,oDAA+C;AAC/C,kDAA6C;AAE7C,+CAA6C;AAC7C,6BAAqE;AACrE,6BAA4E;AAE5E,MAAa,WAAY,SAAQ,0BAAW;IAG1C,YAA6B,MAAoB;QAC/C,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;QADV,WAAM,GAAN,MAAM,CAAc;QAE/C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,cAAc,CAAC,CAAA;QAC5F,IAAI,MAAM,GAAW,CAAC,CAAA;QACtB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAA;QACnD,MAAM,UAAU,GAAe,2BAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACrD,IAAI,UAAU,EAAE;YACd,IAAI;gBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;gBACrC,IAAI,CAAC,MAAM,GAAG,kBAAe,CAAC,UAAU,EAAE,CAAC,SAAoB,EAAE,EAAE;oBACjE,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;wBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;wBAC9C,SAAS,CAAC,WAAW,EAAE,CAAA;qBACxB;oBACD,IAAI,SAAS,CAAC,UAAU,EAAE;wBACxB,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;wBAC7B,MAAM,EAAE,GAAW,MAAM,EAAE,CAAA;wBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC,CAAA;wBACrE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;qBACrC;yBAAM;wBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAA;qBAC9E;gBACH,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACpB,MAAM,CAAC,CAAA;aACR;SACF;aAAM;YACL,IAAI;gBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;gBAC3C,IAAI,CAAC,MAAM,GAAG,kBAAe,CAAC,CAAC,MAAc,EAAE,EAAE;oBAC/C,MAAM,EAAE,GAAW,MAAM,EAAE,CAAA;oBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAA;oBAC/C,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;oBACvB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;gBACnC,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACpB,MAAM,CAAC,CAAA;aACR;SACF;QACD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,GAAU,EAAE,EAAE;YACtC,MAAM,GAAG,CAAA;QACX,CAAC,CAAC,CAAC,CAAA;IACL,CAAC;IAEO,QAAQ,CAAE,EAAU,EAAE,MAAc,EAAE,MAAoB;QAChE,MAAM,SAAS,GAAiB,IAAI,4BAAY,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,kBAAS,CAAC,MAAM,CAAC,CAAC,CAAA;QACnF,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;QACjC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YAChC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QACF,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAQ,EAAE,EAAE;YAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,MAAM;QACX,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAA;QACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAA;QAC3C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;QACrD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE;YACvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAA;QAC3E,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IAEM,KAAK,CAAE,QAAgC;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAA;QACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAA;QAClD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC7B,CAAC;IAEO,aAAa,CAAE,GAAW,EAAE,SAAuB;QACzD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;QAChC,MAAM,IAAI,GAAa,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACnD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,GAAG,+BAA+B,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QACvF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;IACnC,CAAC;IAEO,gBAAgB,CAAE,GAAW;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,IAAI,GAAa,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACnD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,GAAG,4BAA4B,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;IAC7E,CAAC;CACF;AA3FD,kCA2FC","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    if (tlsOptions) {\r\n      try {\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 = 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      } catch (e) {\r\n        this.logger.error(e)\r\n        throw e\r\n      }\r\n    } else {\r\n      try {\r\n        this.logger.info(`create unsecured server`)\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      } catch (e) {\r\n        this.logger.error(e)\r\n        throw e\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 '../factory'\r\nimport { FixAcceptor } from '../fix-acceptor'\r\nimport { IJsFixConfig, IJsFixLogger } from '../../config'\r\nimport { createServer as netCreateServer, Server, Socket } from 'net'\r\nimport { createServer as tlsCreateServer, TlsOptions, TLSSocket } from 'tls'\r\nimport { TlsOptionsFactory } from './tls-options-factory'\r\nimport { inject, injectable } from 'tsyringe'\r\nimport { DITokens } from '../../runtime/di-tokens'\r\n\r\n@injectable()\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 (@inject(DITokens.IJsFixConfig) 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    return this.nextId\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 = TlsOptionsFactory.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    return TlsOptionsFactory.getTlsOptions(tcp.tls)\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-connector.d.ts

@@ -0,0 +1,10 @@
+import { IJsFixConfig } from '../../config';
+import { FixSession } from '../session/fix-session';
+import { FixEntity } from '../fix-entity';
+export declare class TcpInitiatorConnector extends FixEntity {
+    readonly config: IJsFixConfig;
+    constructor(config: IJsFixConfig);
+    start(reconnectTimeout?: number): Promise<any>;
+    delay(p: number): Promise<any>;
+    connect(initiatorSession: FixSession): Promise<any>;
+}

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

@@ -0,0 +1,97 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TcpInitiatorConnector = void 0;
+const tcp_initiator_1 = require("./tcp-initiator");
+const tsyringe_1 = require("tsyringe");
+const di_tokens_1 = require("../../runtime/di-tokens");
+const fix_entity_1 = require("../fix-entity");
+let TcpInitiatorConnector = class TcpInitiatorConnector extends fix_entity_1.FixEntity {
+    constructor(config) {
+        super(config);
+        this.config = config;
+    }
+    start(reconnectTimeout = 0) {
+        return new Promise((accept, reject) => __awaiter(this, void 0, void 0, function* () {
+            const logger = this.config.logFactory.logger('initiator');
+            const sessionContainer = this.config.sessionContainer;
+            if (!sessionContainer.isRegistered(di_tokens_1.DITokens.FixSession)) {
+                reject(new Error(`application must register a DI token '${di_tokens_1.DITokens.FixSession}' - see src/sample`));
+            }
+            logger.info(`create session with DI Token ${di_tokens_1.DITokens.FixSession}`);
+            const initiatorSession = sessionContainer.resolve(di_tokens_1.DITokens.FixSession);
+            let connecting = true;
+            while (connecting) {
+                try {
+                    yield this.connect(initiatorSession);
+                    logger.info('session has ended');
+                    connecting = false;
+                    accept(true);
+                }
+                catch (e) {
+                    if (!reconnectTimeout) {
+                        connecting = false;
+                        reject(e);
+                    }
+                    else {
+                        logger.info(`waiting ${reconnectTimeout} to reconnect following error`);
+                        yield this.delay(reconnectTimeout);
+                    }
+                }
+            }
+        }));
+    }
+    delay(p) {
+        return new Promise((accept) => {
+            if (!p) {
+                accept(true);
+            }
+            setTimeout(() => {
+                accept(true);
+            }, p);
+        });
+    }
+    connect(initiatorSession) {
+        return new Promise((accept, reject) => __awaiter(this, void 0, void 0, function* () {
+            const logger = this.config.logFactory.logger('initiator');
+            const initiator = this.config.sessionContainer.resolve(tcp_initiator_1.TcpInitiator);
+            logger.info('connecting ...');
+            const initiatorTransport = yield initiator.connect(22);
+            logger.info('... connected, run session');
+            initiatorSession.run(initiatorTransport).then(() => {
+                logger.info('ends');
+                accept(true);
+            }).catch((e) => {
+                logger.error(e);
+                reject(e);
+            });
+        }));
+    }
+};
+TcpInitiatorConnector = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(di_tokens_1.DITokens.IJsFixConfig)),
+    __metadata("design:paramtypes", [Object])
+], TcpInitiatorConnector);
+exports.TcpInitiatorConnector = TcpInitiatorConnector;
+//# sourceMappingURL=tcp-initiator-connector.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tcp-initiator-connector.js","sourceRoot":"","sources":["../../../src/transport/tcp/tcp-initiator-connector.ts"],"names":[],"mappings":"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","sourcesContent":["import { IJsFixConfig } from '../../config'\r\nimport { FixInitiator } from '../fix-initiator'\r\nimport { TcpInitiator } from './tcp-initiator'\r\nimport { MsgTransport } from '../factory'\r\nimport { FixSession } from '../session/fix-session'\r\nimport { inject, injectable } from 'tsyringe'\r\nimport { DITokens } from '../../runtime/di-tokens'\r\nimport { FixEntity } from '../fix-entity'\r\n\r\n@injectable()\r\nexport class TcpInitiatorConnector extends FixEntity {\r\n  constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig) {\r\n    super(config)\r\n  }\r\n  start (reconnectTimeout: number = 0): Promise<any> {\r\n    return new Promise<any>(async (accept, reject) => {\r\n      const logger = this.config.logFactory.logger('initiator')\r\n      const sessionContainer = this.config.sessionContainer\r\n      if (!sessionContainer.isRegistered(DITokens.FixSession)) {\r\n        reject(new Error(`application must register a DI token '${DITokens.FixSession}' - see src/sample`))\r\n      }\r\n      logger.info(`create session with DI Token ${DITokens.FixSession}`)\r\n      const initiatorSession = sessionContainer.resolve<FixSession>(DITokens.FixSession)\r\n      let connecting: boolean = true\r\n      while (connecting) {\r\n        try {\r\n          await this.connect(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 this.delay(reconnectTimeout)\r\n          }\r\n        }\r\n      }\r\n    })\r\n  }\r\n\r\n  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\n  connect (initiatorSession: FixSession): Promise<any> {\r\n    return new Promise<any>(async (accept, reject) => {\r\n      const logger = this.config.logFactory.logger('initiator')\r\n      const initiator: FixInitiator = this.config.sessionContainer.resolve<FixInitiator>(TcpInitiator)\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}\r\n"]}

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

@@ -1,7 +1,7 @@
-import { ITcpTransportDescription } from '../session-description';
 import { FixInitiator } from '../fix-initiator';
-import { MsgTransport } from '../msg-transport';
+import { MsgTransport } from '../factory';
 import { IJsFixConfig } from '../../config';
+import { ITcpTransportDescription } from './tcp-transport-description';
 export declare enum InitiatorState {
     Idle = 1,
     Connecting = 2,
@@ -18,6 +18,8 @@ export declare class TcpInitiator extends FixInitiator {
     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

@@ -1,4 +1,16 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -11,12 +23,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TcpInitiator = exports.InitiatorState = void 0;
 const fix_initiator_1 = require("../fix-initiator");
-const msg_transport_1 = require("../msg-transport");
+const factory_1 = require("../factory");
 const duplex_1 = require("../duplex");
 const util = require("util");
 const tls_1 = require("tls");
-const tls_options_1 = require("./tls-options");
 const net_1 = require("net");
+const tls_options_factory_1 = require("./tls-options-factory");
+const tsyringe_1 = require("tsyringe");
+const di_tokens_1 = require("../../runtime/di-tokens");
 var InitiatorState;
 (function (InitiatorState) {
     InitiatorState[InitiatorState["Idle"] = 1] = "Idle";
@@ -24,7 +38,7 @@ var InitiatorState;
     InitiatorState[InitiatorState["Connected"] = 3] = "Connected";
     InitiatorState[InitiatorState["Stopped"] = 4] = "Stopped";
 })(InitiatorState = exports.InitiatorState || (exports.InitiatorState = {}));
-class TcpInitiator extends fix_initiator_1.FixInitiator {
+let TcpInitiator = class TcpInitiator extends fix_initiator_1.FixInitiator {
     constructor(jsFixConfig) {
         super(jsFixConfig.description.application);
         this.jsFixConfig = jsFixConfig;
@@ -78,47 +92,74 @@ 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 = (0, 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_factory_1.TlsOptionsFactory.getTlsConnectionOptions(tcp);
+            if (connectionOptions) {
+                try {
+                    tlsSocket = (0, 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_factory_1.TlsOptionsFactory.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 factory_1.MsgTransport(0, this.jsFixConfig, duplex));
+            }).catch(e => {
+                reject(e);
+            });
+        });
+    }
     clearTimer() {
         if (this.th) {
             clearInterval(this.th);
@@ -153,6 +194,11 @@ class TcpInitiator extends fix_initiator_1.FixInitiator {
             });
         }));
     }
-}
+};
+TcpInitiator = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(di_tokens_1.DITokens.IJsFixConfig)),
+    __metadata("design:paramtypes", [Object])
+], TcpInitiator);
 exports.TcpInitiator = TcpInitiator;
 //# sourceMappingURL=tcp-initiator.js.map