@ezs/basics 2.5.6 → 2.5.7

package/README.md

@@ -731,14 +731,10 @@ 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
+-   `streaming` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Direct connection to the Object Stream server (disables the retries setting) (optional, default `false`)
 -   `json` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Parse as JSON the content of URL (optional, default `false`)
 -   `timeout` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** Timeout in milliseconds (optional, default `1000`)
 -   `noerror` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Ignore all errors (optional, default `false`)

package/lib/url-connect.js

@@ -21,13 +21,9 @@ 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} [streaming=false] Direct connection to the Object Stream server (disables the retries setting)
  * @param {String} [json=false] Parse as JSON the content of URL
  * @param {Number} [timeout=1000] Timeout in milliseconds
  * @param {Boolean} [noerror=false] Ignore all errors
@@ -37,6 +33,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 async function URLConnect(data, feed) {
   const url = this.getParam('url');
+  const streaming = Boolean(this.getParam('streaming', false));
   const retries = Number(this.getParam('retries', 5));
   const noerror = Boolean(this.getParam('noerror', false));
   const json = this.getParam('json', true);
@@ -53,7 +50,7 @@ async function URLConnect(data, feed) {
     (0, _streamWrite.default)(this.input, data, () => feed.end());
     const streamIn = this.input.pipe(ezs(encoder));
     let bodyIn;
-    if (retries === 1) {
+    if (streaming) {
       bodyIn = streamIn.pipe(ezs.toBuffer());
     } else {
       bodyIn = await (0, _getStream.default)(streamIn);
@@ -81,24 +78,22 @@ async function URLConnect(data, feed) {
           err.responseText = text;
           throw err;
         }
-        if (retries === 1) {
+        if (streaming) {
           const bodyOut = json ? response.body.pipe(_JSONStream.default.parse('*')) : response.body;
           bodyOut.once('error', e => {
             controller.abort();
             output.emit('error', e);
           });
-          bodyOut.pipe(output);
-        } else {
-          if (json) {
-            const bodyOutRaw = await (0, _getStream.default)(response.body);
-            const bodyOutArray = JSON.parse(bodyOutRaw);
-            (0, _from.default)(bodyOutArray).pipe(output);
-          } else {
-            response.body.pipe(output);
-          }
+          return bodyOut.pipe(output);
+        }
+        if (json) {
+          const bodyOutRaw = await (0, _getStream.default)(response.body);
+          const bodyOutArray = JSON.parse(bodyOutRaw);
+          return (0, _from.default)(bodyOutArray).pipe(output);
         }
+        return response.body.pipe(output);
       }, {
-        retries
+        retries: streaming ? 0 : retries
       });
     } catch (e) {
       if (!noerror) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ezs/basics",
   "description": "Basics statements for EZS",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "author": "Nicolas Thouvenin <nthouvenin@gmail.com>",
   "bugs": "https://github.com/Inist-CNRS/ezs/issues",
   "dependencies": {
@@ -41,7 +41,7 @@
   "directories": {
     "test": "test"
   },
-  "gitHead": "2b6b66d47ce0e57ebadfe846c76e0990a992977d",
+  "gitHead": "0667dffb8743f46bdd5cfab7d1cf47801db925c3",
   "homepage": "https://github.com/Inist-CNRS/ezs/tree/master/packages/basics#readme",
   "keywords": [
     "ezs"