@ezs/basics 1.23.2 → 1.23.4

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.23.4](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.23.3...@ezs/basics@1.23.4) (2023-03-24)
+
+
+### Bug Fixes
+
+* 🐛 CSV.stream not support multi-byte utf8 characters ([1e15c9c](https://github.com/Inist-CNRS/ezs/commit/1e15c9c9061f8927d67bec36577e7c0d5bb15d8e))
+
+
+
+
+
+## [1.23.3](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.23.2...@ezs/basics@1.23.3) (2023-02-27)
+
+
+### Bug Fixes
+
+* 🐛 fetch timeout vs feed timeout ([163e0bf](https://github.com/Inist-CNRS/ezs/commit/163e0bf81df5f3d8ef7d2fedc6b8bf95ec2c8534))
+
+
+
+
+
 ## [1.23.2](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.23.1...@ezs/basics@1.23.2) (2023-02-17)
 
 

package/lib/csv-parse.js

@@ -9,25 +9,30 @@ var _csvString = _interopRequireDefault(require("csv-string"));
 
 var _streamWrite = _interopRequireDefault(require("stream-write"));
 
+var _string_decoder = require("string_decoder");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function CSVParse(data, feed) {
   const separator = this.getParam('separator');
   const quote = this.getParam('quote');
 
-  if (!this.handle) {
-    this.handle = _csvString.default.createStream({
+  if (!this.decoder) {
+    this.decoder = new _string_decoder.StringDecoder('utf8');
+    this.input = _csvString.default.createStream({
       separator,
       quote
     });
-    this.handle.on('data', obj => feed.write(obj));
+    this.whenFinish = feed.flow(this.input);
   }
 
-  if (!this.isLast()) {
-    (0, _streamWrite.default)(this.handle, data, () => feed.end());
-  } else {
-    this.handle.end(() => feed.close());
+  if (this.isLast()) {
+    this.decoder.end();
+    this.whenFinish.finally(() => feed.close());
+    return this.input.end();
   }
+
+  (0, _streamWrite.default)(this.input, Buffer.isBuffer(data) ? this.decoder.write(data) : data, () => feed.end());
 }
 /**
  * Take `String` and parse it as CSV to generate arrays.

package/lib/txt-parse.js

@@ -5,8 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _string_decoder = require("string_decoder");
+
 function TXTParse(data, feed) {
+  if (!this.decoder) {
+    this.decoder = new _string_decoder.StringDecoder('utf8');
+  }
+
   if (this.isLast()) {
+    this.decoder.end();
     return feed.end();
   }
 
@@ -23,7 +30,7 @@ function TXTParse(data, feed) {
   let lines;
 
   if (Buffer.isBuffer(data)) {
-    lines = data.toString().split(separator);
+    lines = this.decoder.write(data).split(separator);
   } else if (typeof data === 'string') {
     lines = data.split(separator);
   } else {

package/lib/url-connect.js

@@ -7,6 +7,8 @@ exports.default = URLConnect;
 
 var _JSONStream = _interopRequireDefault(require("JSONStream"));
 
+var _from = _interopRequireDefault(require("from"));
+
 var _debug = _interopRequireDefault(require("debug"));
 
 var _streamWrite = _interopRequireDefault(require("stream-write"));
@@ -70,6 +72,7 @@ async function URLConnect(data, feed) {
     }
 
     const parameters = {
+      timeout,
       method: 'POST',
       body: bodyIn,
       headers
@@ -82,10 +85,6 @@ async function URLConnect(data, feed) {
         }
 
         const controller = new _nodeAbortController.default();
-        const timeoutHandle = setTimeout(() => {
-          (0, _debug.default)('ezs')(`The maximum time allowed to start sending data has been reached (${timeout} msec).`);
-          controller.abort();
-        }, timeout);
         const response = await (0, _fetchWithProxy.default)(url, { ...parameters,
           signal: controller.signal
         });
@@ -99,30 +98,15 @@ async function URLConnect(data, feed) {
 
         if (retries === 1) {
           const bodyOut = json ? response.body.pipe(_JSONStream.default.parse('*')) : response.body;
-          bodyOut.once('data', () => {
-            clearTimeout(timeoutHandle);
-          });
           bodyOut.once('error', e => {
+            controller.abort();
             output.emit('error', e);
-            clearTimeout(timeoutHandle);
           });
           bodyOut.pipe(output);
         } else {
           const bodyOutRaw = await (0, _getStream.default)(response.body);
-          clearTimeout(timeoutHandle);
-
-          if (json) {
-            try {
-              const bodyOut = JSON.parse(bodyOutRaw);
-              bodyOut.forEach(item => output.write(item));
-            } catch (ee) {
-              throw ee;
-            }
-          } else {
-            output.write(bodyOutRaw);
-          }
-
-          output.end();
+          const bodyOutArray = JSON.parse(bodyOutRaw);
+          (0, _from.default)(bodyOutArray).pipe(output);
         }
       }, {
         retries

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ezs/basics",
   "description": "Basics statements for EZS",
-  "version": "1.23.2",
+  "version": "1.23.4",
   "author": "Nicolas Thouvenin <nthouvenin@gmail.com>",
   "bugs": "https://github.com/Inist-CNRS/ezs/issues",
   "dependencies": {
@@ -12,6 +12,7 @@
     "debug": "4.3.3",
     "fetch-with-proxy": "3.0.1",
     "flat": "5.0.2",
+    "from": "0.1.7",
     "get-stream": "6.0.1",
     "higher-path": "1.0.0",
     "lodash.escaperegexp": "4.1.2",
@@ -38,7 +39,7 @@
   "directories": {
     "test": "test"
   },
-  "gitHead": "78a03050c3106e54a2a10c70ea67091b8b1ee711",
+  "gitHead": "8da84f8d6833a91a2ae87fdb635070a811c3f9ef",
   "homepage": "https://github.com/Inist-CNRS/ezs/tree/master/packages/basics#readme",
   "keywords": [
     "ezs"