jspurefix 1.2.0 → 2.0.0

package/script/genkey.ps1

@@ -1,179 +1,179 @@
-
-function read-or-default {
-    Param
-    (
-         [Parameter(Mandatory=$true, Position=0)]
-         [string] $text,
-         [Parameter(Mandatory=$true, Position=1)]
-         [string] $default
-    )
-    $a = Read-Host "$text [$default]"
-    if ($a.Length -eq 0) {
-        $a = $default
-    } 
-    $a
-}
-Function Test-CommandExists {
-    Param ($command)
-    $oldPreference = $ErrorActionPreference
-    $ErrorActionPreference = ‘stop’
-    try {
-        if (Get-Command $command) {
-            1
-        }
-    }
-    Catch {
-        0
-    }
-    Finally {
-        $ErrorActionPreference = $oldPreference
-    }
-} #end function test-CommandExists
-
-if (-Not (Test-CommandExists "openssl")) {
-    Write-Output "openssl does not appear to be in path."
-    exit -1
-}
-
-function New-Folder {
-    param (
-        [Parameter(Mandatory=$true, Position=0)]
-        [string] $name
-    )
-    if (-Not (Test-Path -PathType Container $Name)) {
-        New-Item -Type Directory -p $Name
-    }        
-}
-
-$ROOTPATH = read-or-default "rootpath" "." 
-
-$PATH_CA = "$ROOTPATH/certs/ca"
-$PATH_SERVER = "$ROOTPATH/certs/server"
-$PATH_CLIENT = "$ROOTPATH/certs/client"
-$PATH_TMP = "$ROOTPATH/certs/tmp"
-
-New-Folder($PATH_CA)
-New-Folder($PATH_SERVER)
-New-Folder($PATH_CLIENT)
-New-Folder($PATH_TMP)
-
-Write-Output ""
-Write-Output  "      _____      _  __        _____ _                      _                   "
-Write-Output  "     /  ___|    | |/ _|      /  ___(_)                    | |                  "
-Write-Output  "     \ \`--.  ___| | |_ ______\ \`--. _  __ _ _ __   ___  __| |                "
-Write-Output  "      \`--. \/ _ \ |  _|______|\`--. \ |/ _\` | '_ \ / _ \/ _\` |              "
-Write-Output  "     /\__/ /  __/ | |        /\__/ / | (_| | | | |  __/ (_| |                  "
-Write-Output  "     \____/ \___|_|_|        \____/|_|\__, |_| |_|\___|\__,_|                  "
-Write-Output  "                                       __/ |                                   "
-Write-Output  "                                      |___/                                    "
-Write-Output  "    _____           _         _____                           _                "
-Write-Output  "   /  __ \         | |       |  __ \                         | |               "
-Write-Output  "   | /  \/ ___ _ __| |_ ___  | |  \/ ___ _ __   ___ _ __ __ _| |_ ___  _ __    "
-Write-Output  "   | |    / _ \ '__| __/ __| | | __ / _ \ '_ \ / _ \ '__/ _\` | __/ _ \| '__|  "
-Write-Output  "   | \__/\  __/ |  | |_\__ \ | |_\ \  __/ | | |  __/ | | (_| | || (_) | |      "
-Write-Output  "    \____/\___|_|   \__|___/  \____/\___|_| |_|\___|_|  \__,_|\__\___/|_|      "
-Write-Output  "                                                                               "
-Write-Output  ""
-
-Write-Output  ""
-Write-Output  " Global conf "
-Write-Output  ""
-
-$RSABITS = read-or-default "RSA bit length" "4096" 
-$EXPIREDAYS  = read-or-default "Expire days" "365" 
-
-$PASSWORD = "."
-while ($PASSWORD.Length -lt 4) {
-    $PASSWORD = read-or-default "Password for certs" "jspurefix" 
-    if ($PASSWORD.Length -lt 4) {
-        Write-Output "Password length cannot be lower than 4 chars"
-    }
-}
-
-Write-Output  ""
-Write-Output  " OpenSSL conf "
-Write-Output  ""
-
-# Classic openssl prompt
-
-$GK_C = read-or-default "(C) Country Name (2 letter code)" "US" 
-$GK_ST = read-or-default "(ST) State or Province Name (full name)" "." 
-$GK_L = read-or-default "(L) Locality Name (eg, city)" "city"
-$GK_O  = read-or-default "(O) Organization Name (eg, company)" "ACME Signing Authority Inc" 
-$GK_OU  = read-or-default "(OU) Organizational Unit Name (eg, section) " "." 
-$GK_CN  = read-or-default "(CN) Common Name (eg, your name or your server's hostname) " "localhost" 
-
-$GK_emailAddress = Read-Host "(emailAddress) Email Address []:"
-if ($GK_emailAddress.Length -gt 0) {
-    $GK_emailAddress = "/emailAddress=$GK_emailAddress"
-}
-
-Write-Output "Please enter the following 'extra' attributes"
-Write-Output "to be sent with your certificate request"
-$GK_unstructuredName = Read-Host "(unstructuredName) An optional company name []:" 
-if ($GK_unstructuredName.Length -gt 0) {
-    $GK_unstructuredName = "/unstructuredName=$GK_unstructuredName"
-}
-
-$OTHER_FIELDS = ""
-$ADD_OTHER_FIELD = "Y"
-while ($ADD_OTHER_FIELD -eq "y" || $ADD_OTHER_FIELD -eq "Y") {
-    $ADD_OTHER_FIELD = read-or-default "Add other field [y/N]" "N"
-    if ($ADD_OTHER_FIELD -eq "y" || $ADD_OTHER_FIELD -eq "Y") {
-        $OTHER_FIELD_NAME = Read-Host "Field name: "
-        $OTHER_FIELD_VALUE = Read-Host "Field value: "
-        if ($OTHER_FIELD_VALUE.Length -eq 0) {
-            OTHER_FIELD_VALUE="."
-        }
-        $OTHER_FIELDS = "$OTHER_FIELDS/$OTHER_FIELD_NAME=$OTHER_FIELD_VALUE"
-    }
-}
-
-Write-Output  ""
-Write-Output  "Generate certs "
-Write-Output  ""
-
-# CA 
-Write-Output  ""
-Write-Output  "CA"
-Write-Output  ""
-
-openssl genrsa -des3 -passout "pass:$PASSWORD" -out "$PATH_CA/ca.key" $RSABITS
-
-# Create Authority Certificate
-openssl req -new -x509 -days "$EXPIREDAYS" -key "$PATH_CA/ca.key" -out "$PATH_CA/ca.crt" -passin "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=.$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
-
-# SERVER 
-Write-Output  ""
-Write-Output  "Server"
-Write-Output  ""
-
-# Generate server key
-openssl genrsa -out "$PATH_SERVER/server.key" $RSABITS
-
-# Generate server cert
-openssl req -new -key "$PATH_SERVER/server.key" -out "$PATH_TMP/server.csr" -passout "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=$GK_CN$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
-
-# Sign server cert with self-signed cert
-openssl x509 -req -days "$EXPIREDAYS" -passin "pass:$PASSWORD" -in "$PATH_TMP/server.csr" -CA "$PATH_CA/ca.crt" -CAkey "$PATH_CA/ca.key" -set_serial 01 -out "$PATH_SERVER/server.crt"
-
-# CLIENT 
-
-Write-Output  ""
-Write-Output  "Client"
-Write-Output  ""
-
-openssl genrsa -out "$PATH_CLIENT/client.key" $RSABITS
-
-openssl req -new -key "$PATH_CLIENT/client.key" -out "$PATH_TMP/client.csr" -passout "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=CLIENT$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
-
-openssl x509 -req -days 365 -passin "pass:$PASSWORD" -in "$PATH_TMP/client.csr" -CA "$PATH_CA/ca.crt" -CAkey "$PATH_CA/ca.key" -set_serial 01 -out "$PATH_CLIENT/client.crt"
-
-# Clean tmp dir
-
-Remove-Item -Recurse $PATH_TMP
-
-Write-Output  ""
-Write-Output  "Done !"
-
-exit 0
+
+function read-or-default {
+    Param
+    (
+         [Parameter(Mandatory=$true, Position=0)]
+         [string] $text,
+         [Parameter(Mandatory=$true, Position=1)]
+         [string] $default
+    )
+    $a = Read-Host "$text [$default]"
+    if ($a.Length -eq 0) {
+        $a = $default
+    } 
+    $a
+}
+Function Test-CommandExists {
+    Param ($command)
+    $oldPreference = $ErrorActionPreference
+    $ErrorActionPreference = ‘stop’
+    try {
+        if (Get-Command $command) {
+            1
+        }
+    }
+    Catch {
+        0
+    }
+    Finally {
+        $ErrorActionPreference = $oldPreference
+    }
+} #end function test-CommandExists
+
+if (-Not (Test-CommandExists "openssl")) {
+    Write-Output "openssl does not appear to be in path."
+    exit -1
+}
+
+function New-Folder {
+    param (
+        [Parameter(Mandatory=$true, Position=0)]
+        [string] $name
+    )
+    if (-Not (Test-Path -PathType Container $Name)) {
+        New-Item -Type Directory -p $Name
+    }        
+}
+
+$ROOTPATH = read-or-default "rootpath" "." 
+
+$PATH_CA = "$ROOTPATH/certs/ca"
+$PATH_SERVER = "$ROOTPATH/certs/server"
+$PATH_CLIENT = "$ROOTPATH/certs/client"
+$PATH_TMP = "$ROOTPATH/certs/tmp"
+
+New-Folder($PATH_CA)
+New-Folder($PATH_SERVER)
+New-Folder($PATH_CLIENT)
+New-Folder($PATH_TMP)
+
+Write-Output ""
+Write-Output  "      _____      _  __        _____ _                      _                   "
+Write-Output  "     /  ___|    | |/ _|      /  ___(_)                    | |                  "
+Write-Output  "     \ \`--.  ___| | |_ ______\ \`--. _  __ _ _ __   ___  __| |                "
+Write-Output  "      \`--. \/ _ \ |  _|______|\`--. \ |/ _\` | '_ \ / _ \/ _\` |              "
+Write-Output  "     /\__/ /  __/ | |        /\__/ / | (_| | | | |  __/ (_| |                  "
+Write-Output  "     \____/ \___|_|_|        \____/|_|\__, |_| |_|\___|\__,_|                  "
+Write-Output  "                                       __/ |                                   "
+Write-Output  "                                      |___/                                    "
+Write-Output  "    _____           _         _____                           _                "
+Write-Output  "   /  __ \         | |       |  __ \                         | |               "
+Write-Output  "   | /  \/ ___ _ __| |_ ___  | |  \/ ___ _ __   ___ _ __ __ _| |_ ___  _ __    "
+Write-Output  "   | |    / _ \ '__| __/ __| | | __ / _ \ '_ \ / _ \ '__/ _\` | __/ _ \| '__|  "
+Write-Output  "   | \__/\  __/ |  | |_\__ \ | |_\ \  __/ | | |  __/ | | (_| | || (_) | |      "
+Write-Output  "    \____/\___|_|   \__|___/  \____/\___|_| |_|\___|_|  \__,_|\__\___/|_|      "
+Write-Output  "                                                                               "
+Write-Output  ""
+
+Write-Output  ""
+Write-Output  " Global conf "
+Write-Output  ""
+
+$RSABITS = read-or-default "RSA bit length" "4096" 
+$EXPIREDAYS  = read-or-default "Expire days" "365" 
+
+$PASSWORD = "."
+while ($PASSWORD.Length -lt 4) {
+    $PASSWORD = read-or-default "Password for certs" "jspurefix" 
+    if ($PASSWORD.Length -lt 4) {
+        Write-Output "Password length cannot be lower than 4 chars"
+    }
+}
+
+Write-Output  ""
+Write-Output  " OpenSSL conf "
+Write-Output  ""
+
+# Classic openssl prompt
+
+$GK_C = read-or-default "(C) Country Name (2 letter code)" "US" 
+$GK_ST = read-or-default "(ST) State or Province Name (full name)" "." 
+$GK_L = read-or-default "(L) Locality Name (eg, city)" "city"
+$GK_O  = read-or-default "(O) Organization Name (eg, company)" "ACME Signing Authority Inc" 
+$GK_OU  = read-or-default "(OU) Organizational Unit Name (eg, section) " "." 
+$GK_CN  = read-or-default "(CN) Common Name (eg, your name or your server's hostname) " "localhost" 
+
+$GK_emailAddress = Read-Host "(emailAddress) Email Address []:"
+if ($GK_emailAddress.Length -gt 0) {
+    $GK_emailAddress = "/emailAddress=$GK_emailAddress"
+}
+
+Write-Output "Please enter the following 'extra' attributes"
+Write-Output "to be sent with your certificate request"
+$GK_unstructuredName = Read-Host "(unstructuredName) An optional company name []:" 
+if ($GK_unstructuredName.Length -gt 0) {
+    $GK_unstructuredName = "/unstructuredName=$GK_unstructuredName"
+}
+
+$OTHER_FIELDS = ""
+$ADD_OTHER_FIELD = "Y"
+while ($ADD_OTHER_FIELD -eq "y" || $ADD_OTHER_FIELD -eq "Y") {
+    $ADD_OTHER_FIELD = read-or-default "Add other field [y/N]" "N"
+    if ($ADD_OTHER_FIELD -eq "y" || $ADD_OTHER_FIELD -eq "Y") {
+        $OTHER_FIELD_NAME = Read-Host "Field name: "
+        $OTHER_FIELD_VALUE = Read-Host "Field value: "
+        if ($OTHER_FIELD_VALUE.Length -eq 0) {
+            OTHER_FIELD_VALUE="."
+        }
+        $OTHER_FIELDS = "$OTHER_FIELDS/$OTHER_FIELD_NAME=$OTHER_FIELD_VALUE"
+    }
+}
+
+Write-Output  ""
+Write-Output  "Generate certs "
+Write-Output  ""
+
+# CA 
+Write-Output  ""
+Write-Output  "CA"
+Write-Output  ""
+
+openssl genrsa -des3 -passout "pass:$PASSWORD" -out "$PATH_CA/ca.key" $RSABITS
+
+# Create Authority Certificate
+openssl req -new -x509 -days "$EXPIREDAYS" -key "$PATH_CA/ca.key" -out "$PATH_CA/ca.crt" -passin "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=.$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
+
+# SERVER 
+Write-Output  ""
+Write-Output  "Server"
+Write-Output  ""
+
+# Generate server key
+openssl genrsa -out "$PATH_SERVER/server.key" $RSABITS
+
+# Generate server cert
+openssl req -new -key "$PATH_SERVER/server.key" -out "$PATH_TMP/server.csr" -passout "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=$GK_CN$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
+
+# Sign server cert with self-signed cert
+openssl x509 -req -days "$EXPIREDAYS" -passin "pass:$PASSWORD" -in "$PATH_TMP/server.csr" -CA "$PATH_CA/ca.crt" -CAkey "$PATH_CA/ca.key" -set_serial 01 -out "$PATH_SERVER/server.crt"
+
+# CLIENT 
+
+Write-Output  ""
+Write-Output  "Client"
+Write-Output  ""
+
+openssl genrsa -out "$PATH_CLIENT/client.key" $RSABITS
+
+openssl req -new -key "$PATH_CLIENT/client.key" -out "$PATH_TMP/client.csr" -passout "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=CLIENT$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
+
+openssl x509 -req -days 365 -passin "pass:$PASSWORD" -in "$PATH_TMP/client.csr" -CA "$PATH_CA/ca.crt" -CAkey "$PATH_CA/ca.key" -set_serial 01 -out "$PATH_CLIENT/client.crt"
+
+# Clean tmp dir
+
+Remove-Item -Recurse $PATH_TMP
+
+Write-Output  ""
+Write-Output  "Done !"
+
+exit 0

package/script/test.cmd

@@ -1,3 +1,6 @@
+call npm run repo44-bench-er
 call npm run tcp-tc
 call npm run http-oms
+call npm run tcp-qf-md
+call npm run tcp-rec-sk
 call npm t

package/src/buffer/ascii/ascii-encoder.ts

@@ -1,19 +1,24 @@
 import { ILooseObject } from '../../collections/collection'
-import { ContainedGroupField, ContainedSimpleField, ContainedFieldSet, ContainedField,
-  ContainedFieldType, ContainedComponentField, SimpleFieldDefinition,
-  FixDefinitions, dispatchFields } from '../../dictionary'
+import {
+  ContainedGroupField, ContainedSimpleField,
+  ContainedFieldSet, ContainedField,
+  ContainedComponentField, FieldsDispatch
+} from '../../dictionary/contained'
+import { SimpleFieldDefinition, FixDefinitions } from '../../dictionary/definition'
 import { MsgEncoder } from '../msg-encoder'
 import { ElasticBuffer } from '../elastic-buffer'
 import { TimeFormatter } from './time-formatter'
 import { ITimeFormatter } from './itime-formatter'
-import { AsciiChars } from '../ascii-chars'
-import { Tags, TagType } from '../tags'
+import { AsciiChars } from './ascii-chars'
+import { Tags } from '../tag/tags'
+import { TagType } from '../tag/tag-type'
 
 export class AsciiEncoder extends MsgEncoder {
 
   public bodyLengthPos: number
   public msgTypePos: number
   public tags: Tags
+  public checkGroups: boolean = true
 
   constructor (public readonly buffer: ElasticBuffer,
                public readonly definitions: FixDefinitions,
@@ -39,29 +44,6 @@ export class AsciiEncoder extends MsgEncoder {
     return b
   }
 
-  private static checkGroupInstanceHasDelimiter (gf: ContainedGroupField, instance: ILooseObject): boolean {
-    const delimiterField: ContainedSimpleField = gf.definition.firstSimple
-    if (!delimiterField) {
-      throw new Error(`group definition has delimiter field ${delimiterField.definition.name}`)
-    }
-    // may have a group represented by a component where first simple field is further down.
-    while (instance != null) {
-      if (instance[delimiterField.definition.name] != null) {
-        return true
-      }
-      const first = gf.definition.fields[0]
-      switch (first.type) {
-        case ContainedFieldType.Component: {
-          const cf: ContainedComponentField = first as ContainedComponentField
-          instance = instance[cf.definition.name]
-          break
-        }
-        default:
-          instance = null
-      }
-    }
-  }
-
   // only reset tags after entire message is encoded - <hdr>body<trl>
 
   public reset (): void {
@@ -70,18 +52,29 @@ export class AsciiEncoder extends MsgEncoder {
   }
 
   public encodeSet (objectToEncode: ILooseObject, set: ContainedFieldSet): void {
+    const summary: AsciiEncodeSetSummary = new AsciiEncodeSetSummary()
+    this.encodeObject(objectToEncode, set, summary)
+  }
+
+  private encodeObject (objectToEncode: ILooseObject, set: ContainedFieldSet, state: AsciiEncodeSetSummary): void {
     const fields: ContainedField[] = this.getFields(set, objectToEncode)
-    dispatchFields(fields, {
+    new FieldsDispatch().dispatchFields(fields, {
       simple: (sf: ContainedSimpleField) => {
         const val: any = objectToEncode[sf.name]
-        if (val != null) {
+        // Empty strings are omitted as they result in empty values for tags, which are considered malformed.
+        if (val != null && val !== '') {
+          if (state.count === 0) {
+            state.firstSimple = sf
+          }
+          state.lastSimple = sf
+          state.count++
           this.encodeSimple(objectToEncode, set, sf, val)
         }
       },
       component: (cf: ContainedComponentField) => {
         const instance: ILooseObject = objectToEncode[cf.definition.name]
         if (instance) {
-          this.encodeSet(instance, cf.definition)
+          this.encodeObject(instance, cf.definition, state)
         }
       },
       group: (gf: ContainedGroupField) => {
@@ -107,24 +100,29 @@ export class AsciiEncoder extends MsgEncoder {
   private encodeInstances (o: ILooseObject, gf: ContainedGroupField): void {
     const noOfField: SimpleFieldDefinition = gf.definition.noOfField
     const instances: ILooseObject[] = o[gf.name] || o[noOfField.name]
+
     const buffer = this.buffer
     if (!Array.isArray(instances)) {
       throw new Error(`expected array instance for group ${noOfField.name}`)
     }
     if (instances) {
+      const validator = new GroupValidator(gf)
+      const test: AsciiEncodeSetSummary = validator.test
+
       // a repeated group has number of instances at the start of group
       this.WriteTagEquals(noOfField.tag)
       const posValBegin = buffer.getPos()
       buffer.writeWholeNumber(instances.length)
       this.writeDelimiter(posValBegin, noOfField.tag)
-      instances.forEach((i: ILooseObject) => {
-        if (AsciiEncoder.checkGroupInstanceHasDelimiter(gf, i)) {
-          this.encodeSet(i, gf.definition)
-        } else {
-          const delimiter: ContainedSimpleField = gf.definition.firstSimple
-          throw new Error(`group instance with no delimiter field ${delimiter.definition.name}`)
+      for (let field = 0; field < instances.length; ++field) {
+        const instance: ILooseObject = instances[field]
+        test.reset()
+        const summary = validator.getSummary(field)
+        this.encodeObject(instance, gf.definition, summary)
+        if (this.checkGroups) {
+          validator.assertInstanceValid(field)
         }
-      })
+      }
     }
   }
 
@@ -257,3 +255,47 @@ export class AsciiEncoder extends MsgEncoder {
     }
   }
 }
+
+class GroupValidator {
+  constructor (public readonly gf: ContainedGroupField,
+    public readonly first: AsciiEncodeSetSummary = new AsciiEncodeSetSummary(),
+    public readonly test: AsciiEncodeSetSummary = new AsciiEncodeSetSummary()) {
+  }
+
+  getSummary (field: number) {
+    return field === 0 ? this.first : this.test
+  }
+
+  assertInstanceValid (field: number): void {
+    const first = this.first
+    const test = this.test
+    if (field === 0 && first.empty()) {
+      throw new Error(`first group instance has no delimeter present ${this.gf.name}`)
+    }
+    if (field > 0 && test.empty()) {
+      throw new Error(`group instance [${field}] has no delimeter present ${this.gf.name}`)
+    }
+    if (field > 0) {
+      const firstTag = first.firstSimple.definition.tag
+      const tag = test.firstSimple.definition.tag
+      if (firstTag !== tag) {
+        throw new Error(`group instance [${field}] inconsisent delimeter ${tag} expected tag ${firstTag}`)
+      }
+    }
+  }
+}
+
+class AsciiEncodeSetSummary {
+  constructor (public firstSimple: ContainedSimpleField = null,
+    public lastSimple: ContainedSimpleField = null,
+    public count: number = 0) {
+  }
+  public reset (): void {
+    this.firstSimple = null
+    this.lastSimple = null
+    this.count = 0
+  }
+  public empty (): boolean {
+    return this.firstSimple === null || this.count === 0
+  }
+}

package/src/buffer/ascii/ascii-parser-state.ts

@@ -1,16 +1,11 @@
-import { Tags } from '../tags'
-import { MessageDefinition } from '../../dictionary'
+import { Tags } from '../tag/tags'
+import { MessageDefinition } from '../../dictionary/definition'
 import { ElasticBuffer } from '../elastic-buffer'
+import { ParseState } from './parse-state'
+import { inject, injectable } from 'tsyringe'
+import { DITokens } from '../../runtime/di-tokens'
 
-export enum ParseState {
-  BeginField = 1,
-  ParsingTag = 2,
-  ParsingValue = 3,
-  ParsingRawDataLength = 4,
-  ParsingRawData = 5,
-  MsgComplete = 6
-}
-
+@injectable()
 export class AsciiParserState {
   public message: MessageDefinition
   public locations: Tags
@@ -26,7 +21,7 @@ export class AsciiParserState {
   public rawDataRead: number
   public msgType: string
 
-  constructor (public readonly elasticBuffer: ElasticBuffer) {
+  constructor (@inject(DITokens.ParseBuffer) public readonly elasticBuffer: ElasticBuffer) {
   }
 
   public beginTag (pos: number) {

package/src/buffer/ascii/ascii-parser.ts

@@ -1,37 +1,44 @@
-import { FixDefinitions } from '../../dictionary'
-import { AsciiChars } from '../ascii-chars'
+import { AsciiChars } from './ascii-chars'
 import { AsciiView } from './ascii-view'
 import { AsciiSegmentParser } from './ascii-segment-parser'
-import { AsciiParserState, ParseState } from './ascii-parser-state'
+import { AsciiParserState } from './ascii-parser-state'
 import { Structure } from '../structure'
-import { Tags } from '../tags'
+import { Tags } from '../tag/tags'
 import { MsgParser } from '../msg-parser'
 import { MsgView } from '../msg-view'
 import { Readable } from 'stream'
 import { ElasticBuffer } from '../elastic-buffer'
-import { SegmentDescription, SegmentType } from '../segment-description'
-
+import { SegmentDescription } from '../segment/segment-description'
+import { ParseState } from './parse-state'
+import { IJsFixConfig } from '../../config'
+import { inject, injectable } from 'tsyringe'
+import { DITokens } from '../../runtime/di-tokens'
+import { SegmentType } from '../segment/segment-type'
+
+@injectable()
 export class AsciiParser extends MsgParser {
   private static nextId: number = 0
   public readonly id: number
   public readonly state: AsciiParserState
-  private readonly receivingBuffer: ElasticBuffer
   private readonly segmentParser: AsciiSegmentParser
+  public readonly delimiter: number
+  public readonly writeDelimiter: number
 
   // allocate enough in receive buffer so buffer does not constant resize back after large messages
   // want to keep one slice of memory and constantly reuse it
 
-  constructor (public readonly definitions: FixDefinitions,
-               public readonly readStream: Readable,
-               public readonly delimiter: number,
-               public readonly writeDelimiter: number = delimiter,
-               public readonly maxMessageLen: number = 160 * 1024) {
+  constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig,
+               @inject(DITokens.readStream) public readonly readStream: Readable,
+               @inject(DITokens.ParseBuffer) protected readonly receivingBuffer: ElasticBuffer) {
     super()
+
+    this.delimiter = config.delimiter
+    this.writeDelimiter = config.logDelimiter || AsciiChars.Pipe
+    const definitions = config.definitions
     this.id = AsciiParser.nextId++
-    this.segmentParser = new AsciiSegmentParser(definitions)
-    this.receivingBuffer = new ElasticBuffer(maxMessageLen)
-    this.state = new AsciiParserState(this.receivingBuffer)
-    this.state.locations = new Tags(definitions, maxMessageLen / 10)
+    this.segmentParser = config.sessionContainer.resolve<AsciiSegmentParser>(AsciiSegmentParser)
+    this.state = config.sessionContainer.resolve<AsciiParserState>(AsciiParserState)
+    this.state.locations = new Tags(definitions, this.receivingBuffer.size / 10)
     this.state.beginMessage()
     if (readStream !== null) {
       this.subscribe()