@ezs/basics 1.22.3 → 1.22.5

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.22.5](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.22.4...@ezs/basics@1.22.5) (2022-12-21)
+
+
+### Bug Fixes
+
+* 🐛 timeout and retry error ([efa2cfa](https://github.com/Inist-CNRS/ezs/commit/efa2cfaab4b827700d8e89d1bc59cfb266237ec2))
+
+
+
+
+
+## [1.22.4](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.22.3...@ezs/basics@1.22.4) (2022-12-02)
+
+
+### Bug Fixes
+
+* on retry, input stream was lost ([1b710f1](https://github.com/Inist-CNRS/ezs/commit/1b710f19d1dd163bcaf3580f0d23def6f948423a))
+
+
+
+
+
 ## [1.22.3](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.22.2...@ezs/basics@1.22.3) (2022-09-19)
 
 

package/README.md

@@ -619,6 +619,11 @@ The output will be the returned content of URL.
 
 Useful to send JSON data to an API and get results.
 
+Warning :
+if retries === 1,  it will directly use the stream
+to connect to the server otherwise the stream will be fully
+read to be buffered and sent to the server (n times)
+
 #### Parameters
 
 -   `url` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** URL to fetch

package/lib/url-connect.js

@@ -17,7 +17,9 @@ var _parseHeaders = _interopRequireDefault(require("parse-headers"));
 
 var _asyncRetry = _interopRequireDefault(require("async-retry"));
 
-var _request = _interopRequireDefault(require("./request"));
+var _getStream = _interopRequireDefault(require("get-stream"));
+
+var _fetchWithProxy = _interopRequireDefault(require("fetch-with-proxy"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -28,6 +30,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  *
  * Useful to send JSON data to an API and get results.
  *
+ * Warning :
+ * if retries === 1,  it will directly use the stream
+ * to connect to the server otherwise the stream will be fully
+ * read to be buffered and sent to the server (n times)
+ *
  * @name URLConnect
  * @param {String} [url] URL to fetch
  * @param {String} [json=false] Parse as JSON the content of URL
@@ -48,26 +55,78 @@ async function URLConnect(data, feed) {
   if (this.isFirst()) {
     const timeout = Number(this.getParam('timeout')) || 1000;
     const headers = (0, _parseHeaders.default)([].concat(this.getParam('header')).filter(Boolean).join('\n'));
-    const controller = new _nodeAbortController.default();
     this.input = ezs.createStream(ezs.objectMode());
     const output = ezs.createStream(ezs.objectMode());
     this.whenFinish = feed.flow(output);
     (0, _streamWrite.default)(this.input, data, () => feed.end());
-    const bodyIn = this.input.pipe(ezs('dump')).pipe(ezs.toBuffer());
+    const streamIn = this.input.pipe(ezs('dump'));
+    let bodyIn;
+
+    if (retries === 1) {
+      bodyIn = streamIn.pipe(ezs.toBuffer());
+    } else {
+      bodyIn = await (0, _getStream.default)(streamIn);
+      headers['Content-Type'] = 'application/json';
+    }
+
     const parameters = {
       method: 'POST',
       body: bodyIn,
-      timeout,
-      headers,
-      signal: controller.signal
-    };
-    const options = {
-      retries
+      headers
     };
 
-    const onError = e => {
-      controller.abort();
-
+    try {
+      await (0, _asyncRetry.default)(async (bail, numberOfTimes) => {
+        if (numberOfTimes > 1) {
+          (0, _debug.default)('ezs')(`Attempts to reconnect (${numberOfTimes})`);
+        }
+
+        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
+        });
+
+        if (!response.ok) {
+          const err = new Error(response.statusText);
+          const text = await response.text();
+          err.responseText = text;
+          throw err;
+        }
+
+        if (retries === 1) {
+          const bodyOut = json ? response.body.pipe(_JSONStream.default.parse('*')) : response.body;
+          bodyOut.once('data', () => {
+            clearTimeout(timeoutHandle);
+          });
+          bodyOut.once('error', e => {
+            output.emit('error', e);
+            clearTimeout(timeoutHandle);
+          });
+          bodyOut.pipe(output);
+        } else {
+          const bodyOutRaw = await (0, _getStream.default)(response.body);
+
+          if (json) {
+            try {
+              const bodyOut = JSON.parse(bodyOutRaw);
+              bodyOut.forEach(item => output.write(item));
+            } catch (ee) {
+              throw ee;
+            }
+          } else {
+            output.write(bodyOutRaw);
+          }
+
+          output.end();
+        }
+      }, {
+        retries
+      });
+    } catch (e) {
       if (!noerror) {
         (0, _debug.default)('ezs')(`Break item #${this.getIndex()} [URLConnect] <${e}>`);
         feed.stop(e);
@@ -76,15 +135,6 @@ async function URLConnect(data, feed) {
       }
 
       output.end();
-    };
-
-    try {
-      const response = await (0, _asyncRetry.default)((0, _request.default)(url, parameters), options);
-      const bodyOut = json ? response.body.pipe(_JSONStream.default.parse('*')) : response.body;
-      bodyOut.once('error', onError);
-      bodyOut.pipe(output);
-    } catch (e) {
-      onError(e);
     }
 
     ;
@@ -93,7 +143,9 @@ async function URLConnect(data, feed) {
 
   if (this.isLast()) {
     this.input.end();
-    this.whenFinish.finally(() => feed.close());
+    this.whenFinish.finally(() => {
+      feed.close();
+    });
     return;
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ezs/basics",
   "description": "Basics statements for EZS",
-  "version": "1.22.3",
+  "version": "1.22.5",
   "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",
+    "get-stream": "6.0.1",
     "lodash.escaperegexp": "4.1.2",
     "lodash.get": "4.4.2",
     "lodash.mapkeys": "4.6.0",
@@ -36,7 +37,7 @@
   "directories": {
     "test": "test"
   },
-  "gitHead": "7fa485938639c0821968dc60de66d248e15a9cdf",
+  "gitHead": "41c6ff719d5312aef866016cbe891aa2cc53fa4e",
   "homepage": "https://github.com/Inist-CNRS/ezs/tree/master/packages/basics#readme",
   "keywords": [
     "ezs"