Merge pull request #124 from quentinrossetti/chore-node18

Chore node18

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:12.22
+      - image: circleci/node
 
     working_directory: ~/node-7z
 

src/events.js

@@ -60,6 +60,18 @@ export const onStdoutFactory = ({ Maybe }) => (stream, chunk) => {
     return stream
   }
 
+  // Progress as a percentage is only displayed to stdout when the `-bsp1`
+  // switch is specified. Progress can has several forms:
+  // - only percent: `  0%`
+  // - with file count: ` 23% 4`
+  // - with file name: ` 23% 4 file.txt`
+  if (stream._isProgressFlag) {
+    const bodyProgress = Maybe.progress(stream, line)
+    if (bodyProgress) {
+      return stream
+    }
+  }
+
   // Optimization: Continue to the next line. At this point if the stream is
   // in stage BODY all data carried by the current line has been processed.
   const stageBody = (stream._stage === STAGE_BODY)
@@ -72,16 +84,6 @@ export const onStdoutFactory = ({ Maybe }) => (stream, chunk) => {
     return stream
   }
 
-  // Progress as a percentage is only displayed to stdout when the `-bsp1`
-  // switch is specified. Progress can has several forms:
-  // - only percent: `  0%`
-  // - with file count: ` 23% 4`
-  // - with file name: ` 23% 4 file.txt`
-  const bodyProgress = Maybe.progress(stream, line)
-  if (bodyProgress) {
-    return stream
-  }
-
   Maybe.bodyData(stream, line)
   return stream
 }

src/lifecycle.js

@@ -17,7 +17,6 @@ import split2 from 'split2'
 import { spawn } from 'child_process'
 import { Readable } from 'stream'
 import { STAGE_HEADERS } from './references.js'
-import { LINE_SPLIT } from './regexp.js'
 const debug = libdebug('node-7z')
 
 export const createFactory = ({
@@ -66,10 +65,10 @@ export const listenFactory = ({
   debug('lifecycle: listen')
   stream._childProcess.on('error', err => errorHandler(stream, err))
   stream._childProcess.stderr
-    .pipe(split2(LINE_SPLIT))
+    .pipe(split2())
     .on('data', chunk => stderrHandler(stream, chunk))
   stream._childProcess.stdout
-    .pipe(split2(LINE_SPLIT))
+    .pipe(split2())
     .on('data', chunk => stdoutHandler(stream, chunk))
   stream._childProcess.on('close', () => endHandler(stream))
   return stream

src/regexp.js

@@ -12,7 +12,6 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-export const LINE_SPLIT = new RegExp('\n|\r\n|\x08+|\r +\r')
 export const BODY_PROGRESS = new RegExp('^ *(?<percent>\\d+)% ?(?<fileCount>\\d+)? ?(?<file>.*)$')
 export const BODY_SYMBOL_FILE = new RegExp('^(?<symbol>[=TU+R.-]) (?<file>.+)$')
 export const BODY_HASH = new RegExp('^(?<hash>\\S+)? +(?<size>\\d*) +(?<file>.+)$')