jspurefix 5.6.1 → 5.8.0

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

@@ -320,6 +320,26 @@ export abstract class AsciiSession extends FixSession {
     this.sessionLogger.info('coordinator reset transient state for reconnect')
   }
 
+  protected override async onPreLogon (): Promise<void> {
+    if (!this.config.description.ResetSeqNumFlag) return
+
+    this.sessionLogger.info('initiator has ResetSeqNumFlag=Y, resetting sequences before logon')
+    await this.coordinator.resetSession('initiator ResetSeqNumFlag=Y')
+
+    const transmitter = this.transport?.transmitter as AsciiMsgTransmitter | undefined
+    if (transmitter) {
+      transmitter.msgSeqNum = this.coordinator.nextSenderSeqNum
+    }
+    this.sessionState.lastPeerMsgSeqNum = this.coordinator.lastProcessedPeerSeqNum
+
+    if (this.store) {
+      this.store.clear()
+      this.resender = new FixMsgAsciiStoreResend(this.store, this.config)
+    }
+
+    this.sessionLogger.info(`pre-logon reset complete: encoderSeqNum=${transmitter?.msgSeqNum}`)
+  }
+
   protected override txOnEncoded (msgType: string, data: string, hdr: ILooseObject): void {
     super.txOnEncoded(msgType, data, hdr)
     // Store the encoded message in the session store for recovery/resend

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

@@ -7,7 +7,7 @@ import { FixDuplex, StringDuplex, StringDuplexTraits } from '../duplex'
 import express = require('express')
 import * as bodyParser from 'body-parser'
 import * as http from 'http'
-import { v4 as uuidv4 } from 'uuid'
+import { randomUUID } from 'crypto'
 import { inject, injectable } from 'tsyringe'
 import { DITokens } from '../../runtime/di-tokens'
 
@@ -54,7 +54,7 @@ export class HttpAcceptor extends FixAcceptor {
   private saveTransport (tid: number, transport: MsgTransport): string {
     this.transports[tid] = transport
     const keys: string[] = Object.keys(this.transports)
-    const a = uuidv4()
+    const a = randomUUID()
     this.keys.set(a, transport)
     this.logger.info(`new transport id = ${tid} token = ${a} created total transports = ${keys.length}`)
     this.emit('transport', transport)

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

@@ -95,6 +95,11 @@ export abstract class FixSession extends events.EventEmitter {
 
   private async waitPromise (): Promise<number> {
     const logger = this.sessionLogger
+    if (this.initiator) {
+      // Hook for subclasses to reset sequences when ResetSeqNumFlag=Y is configured —
+      // must run after the store is loaded, before sendLogon stamps a seq num.
+      await this.onPreLogon()
+    }
     return await new Promise<any>((resolve, reject) => {
       if (this.initiator) {
         logger.debug(`initiator sending logon state = ${this.stateString()}`)
@@ -398,6 +403,15 @@ export abstract class FixSession extends events.EventEmitter {
     // Override in subclass to reset coordinator/transient state
   }
 
+  /**
+   * Called for initiators after the store is loaded but before the Logon is sent.
+   * Override to reset sequences/store when ResetSeqNumFlag=Y so the Logon goes out
+   * with MsgSeqNum=1 instead of the recovered sender seq num.
+   */
+  protected async onPreLogon (): Promise<void> {
+    // Default no-op
+  }
+
   protected stop (error: Error | null = null): void {
     if (this.sessionState.state === SessionState.Stopped) {
       return

package/src/util/unzip.js

@@ -1,202 +1,72 @@
 const yauzl = require('yauzl')
 const path = require('path')
 const fs = require('fs')
-const util = require('util')
-const Transform = require('stream').Transform
+const { pipeline } = require('stream/promises')
 
-// thanks to https://github.com/thejoshwolfe/yauzl/blob/master/examples/unzip.js
+// Extracts a zip file into the current working directory.
+//
+// Replaces an older copy of the yauzl example unzip script. The previous
+// version drove a 60Hz progress interval via terminal backspaces and did
+// not attach error handlers to any of the streams in its pipeline. In a
+// non-TTY environment (eg. GitHub Actions) the backspaces produced
+// unreadable output; worse, if any stream errored silently the script
+// hung forever and CI runs were cancelled at the workflow timeout.
+//
+// Follows the canonical yauzl lazyEntries pattern: install 'entry' /
+// 'end' / 'error' handlers once on the zipfile, drive the next read
+// with zipfile.readEntry() at the end of each entry's work.
+// NB: requires yauzl >= 3.3.1 — 3.3.0 truncates inflated streams on
+// Node 26+ (the next entry's readStream stalls without emitting 'end').
 
-let zipFilePath = null
-let offsetArg
-let lenArg
-let endArg
-const args = process.argv.slice(2)
-for (let i = 0; i < args.length; i++) {
-  const arg = args[i]
-  if (arg === '--offset') {
-    i += 1
-    offsetArg = parseInt(args[i])
-    if (isNaN(offsetArg)) throw new Error('--offset argument not parsable as an int')
-  } else if (arg === '--len') {
-    i += 1
-    lenArg = parseInt(args[i])
-    if (isNaN(lenArg)) throw new Error('--len argument not parsable as an int')
-  } else if (arg === '--end') {
-    i += 1
-    endArg = parseInt(args[i])
-    if (isNaN(endArg)) throw new Error('--end argument not parsable as an int')
-  } else if (['-h', '--help'].includes(arg)) {
-    // print help
-    zipFilePath = null
-    break
-  } else if (/^--/.test(arg)) {
-    throw new Error('unrecognized option: ' + arg)
-  } else {
-    if (zipFilePath != null) throw new Error('too many arguments')
-    zipFilePath = arg
-  }
-}
-if (zipFilePath == null || /^-/.test(zipFilePath) || (lenArg != null && endArg != null)) {
-  console.log(
-    'usage: node unzip.js [options] path/to/file.zip\n' +
-    '\n' +
-    'unzips the specified zip file into the current directory\n' +
-    '\n' +
-    'options:\n' +
-    '  --offset START\n' +
-    '  --len LEN\n' +
-    '  --end END\n' +
-    '    interprets the middle of the specified file as a zipfile.\n' +
-    '    starting START number of bytes in from the beginning (default 0).\n' +
-    '    end with length of LEN (default is all the way to the end of the file).\n' +
-    '    or end at byte offset END (exclusive) (default is the end of the file).\n' +
-    '    end can be negative to count backwards from the end of the file\n' +
-    '    (example, `--end -1` excludes the last byte of the file).\n' +
-    '')
+const zipFilePath = process.argv[2]
+if (!zipFilePath) {
+  console.error('usage: node unzip.js path/to/file.zip')
   process.exit(1)
 }
 
-function mkdirp (dir, cb) {
-  if (dir === '.') return cb()
-  fs.stat(dir, function (err) {
-    if (err == null) return cb() // already exists
-
-    const parent = path.dirname(dir)
-    mkdirp(parent, function () {
-      process.stdout.write(dir.replace(/\/$/, '') + '/\n')
-      fs.mkdir(dir, cb)
-    })
-  })
-}
-
-if (offsetArg != null || lenArg != null || endArg != null) {
-  openMiddleOfFile(zipFilePath, { lazyEntries: true }, offsetArg, lenArg, endArg, handleZipFile)
-} else {
-  yauzl.open(zipFilePath, { lazyEntries: true }, handleZipFile)
-}
-
-function openMiddleOfFile (zipFilePath, options, offsetArg, lenArg, endArg, handleZipFile) {
-  fs.open(zipFilePath, 'r', function (err, fd) {
-    if (err != null) throw err
-    fs.fstat(fd, function (err, stats) {
+function extract (zipFilePath) {
+  return new Promise((resolve, reject) => {
+    yauzl.open(zipFilePath, { lazyEntries: true }, (err, zipfile) => {
       if (err) {
-        console.log(err)
+        reject(err)
+        return
       }
-      // resolve optional parameters
-      if (offsetArg == null) offsetArg = 0
-      if (lenArg == null && endArg == null) endArg = stats.size
-      if (endArg == null) endArg = lenArg + offsetArg
-      else if (endArg < 0) endArg = stats.size + endArg
-      // validate parameters
-      if (offsetArg < 0) throw new Error('--offset < 0')
-      if (lenArg < 0) throw new Error('--len < 0')
-      if (offsetArg > endArg) throw new Error('--offset > --end')
-      if (endArg > stats.size) throw new Error('--end/--len goes past EOF')
 
-      // extend RandomAccessReader
-      function MiddleOfFileReader () {
-        yauzl.RandomAccessReader.call(this)
-      }
-      util.inherits(MiddleOfFileReader, yauzl.RandomAccessReader)
-      // implement required and option methods
-      MiddleOfFileReader.prototype._readStreamForRange = function (start, end) {
-        return fs.createReadStream(null, {
-          fd,
-          // shift the start and end offsets
-          start: start + offsetArg,
-          end: end + offsetArg - 1, // the -1 is because fs.createReadStream()'s end option is inclusive
-          autoClose: false
-        })
-      }
-      MiddleOfFileReader.prototype.read = function (buffer, offset, length, position, callback) {
-        // shift the position
-        fs.read(fd, buffer, offset, length, position + offsetArg, callback)
-      }
-      MiddleOfFileReader.prototype.close = function (callback) {
-        fs.close(fd, callback)
-      }
+      zipfile.on('error', reject)
+      zipfile.on('end', resolve)
 
-      yauzl.fromRandomAccessReader(new MiddleOfFileReader(), endArg - offsetArg, options, handleZipFile)
-    })
-  })
-}
-
-function handleZipFile (err, zipfile) {
-  if (err) throw err
+      zipfile.on('entry', (entry) => {
+        const next = () => zipfile.readEntry()
 
-  // track when we've closed all our file handles
-  let handleCount = 0
-
-  function incrementHandleCount () {
-    handleCount++
-  }
-  function decrementHandleCount () {
-    handleCount--
-    if (handleCount === 0) {
-      console.log('all input and output handles closed')
-    }
-  }
-
-  incrementHandleCount()
-  zipfile.on('close', function () {
-    console.log('closed input file')
-    decrementHandleCount()
-  })
+        if (/\/$/.test(entry.fileName)) {
+          fs.promises.mkdir(entry.fileName, { recursive: true })
+            .then(next, reject)
+          return
+        }
 
-  zipfile.readEntry()
-  zipfile.on('entry', function (entry) {
-    if (/\/$/.test(entry.fileName)) {
-      // directory file names end with '/'
-      mkdirp(entry.fileName, function () {
-        if (err) throw err
-        zipfile.readEntry()
-      })
-    } else {
-      // ensure parent directory exists
-      mkdirp(path.dirname(entry.fileName), function () {
-        zipfile.openReadStream(entry, function (err, readStream) {
-          if (err) throw err
-          // report progress through large files
-          let byteCount = 0
-          const totalBytes = entry.uncompressedSize
-          let lastReportedString = byteCount + '/' + totalBytes + '  0%'
-          process.stdout.write(entry.fileName + '...' + lastReportedString)
-          function reportString (msg) {
-            let clearString = ''
-            for (let i = 0; i < lastReportedString.length; i++) {
-              clearString += '\b'
-              if (i >= msg.length) {
-                clearString += ' \b'
+        fs.promises.mkdir(path.dirname(entry.fileName), { recursive: true })
+          .then(() => new Promise((res, rej) => {
+            zipfile.openReadStream(entry, (err, readStream) => {
+              if (err) {
+                rej(err)
+                return
               }
-            }
-            process.stdout.write(clearString + msg)
-            lastReportedString = msg
-          }
-          // report progress at 60Hz
-          const progressInterval = setInterval(function () {
-            reportString(byteCount + '/' + totalBytes + '  ' + ((byteCount / totalBytes * 100) | 0) + '%')
-          }, 1000 / 60)
-          const filter = new Transform()
-          filter._transform = function (chunk, encoding, cb) {
-            byteCount += chunk.length
-            cb(null, chunk)
-          }
-          filter._flush = function (cb) {
-            clearInterval(progressInterval)
-            reportString('')
-            // delete the "..."
-            process.stdout.write('\b \b\b \b\b \b\n')
-            cb()
-            zipfile.readEntry()
-          }
-
-          // pump file contents
-          const writeStream = fs.createWriteStream(entry.fileName)
-          incrementHandleCount()
-          writeStream.on('close', decrementHandleCount)
-          readStream.pipe(filter).pipe(writeStream)
-        })
+              pipeline(readStream, fs.createWriteStream(entry.fileName))
+                .then(() => {
+                  console.log(`${entry.fileName} (${entry.uncompressedSize} bytes)`)
+                  res()
+                }, rej)
+            })
+          }))
+          .then(next, reject)
       })
-    }
+
+      zipfile.readEntry()
+    })
   })
 }
+
+extract(zipFilePath).catch((err) => {
+  console.error(`unzip failed: ${err.message}`)
+  process.exit(1)
+})