@ezs/basics 1.22.2 → 1.22.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.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)
+
+
+### Bug Fixes
+
+* 🐛 locations like [files] ([42fb184](https://github.com/Inist-CNRS/ezs/commit/42fb184bba3534bf2123a12d276d89f6809d09a7))
+
+
+
+
+
 ## [1.22.2](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.22.1...@ezs/basics@1.22.2) (2022-09-14)
 
 

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/file-load.js

@@ -54,9 +54,8 @@ async function FILELoad(data, feed) {
 
   const cwd = process.cwd();
   const tpd = (0, _os.tmpdir)();
-  const location = this.getParam('location', tpd);
   const compress = this.getParam('compress', false);
-  const locations = [cwd, tpd, location];
+  const locations = this.ezs.getPath().concat(cwd, tpd, this.getParam('location'));
   const file = locations.filter(Boolean).map(dir => (0, _path.resolve)(dir, String(data).trim())).filter(fil => (0, _fs.existsSync)(fil)).shift();
 
   if (!file) {

package/lib/url-connect.js

@@ -17,6 +17,8 @@ var _parseHeaders = _interopRequireDefault(require("parse-headers"));
 
 var _asyncRetry = _interopRequireDefault(require("async-retry"));
 
+var _getStream = _interopRequireDefault(require("get-stream"));
+
 var _request = _interopRequireDefault(require("./request"));
 
 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
@@ -53,7 +60,16 @@ async function URLConnect(data, feed) {
     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,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ezs/basics",
   "description": "Basics statements for EZS",
-  "version": "1.22.2",
+  "version": "1.22.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",
+    "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": "51729dbb9364dc2a882af2a3cbccbb2e79de89d2",
+  "gitHead": "93076ad048cd7839983724f187b064fd71a0ed52",
   "homepage": "https://github.com/Inist-CNRS/ezs/tree/master/packages/basics#readme",
   "keywords": [
     "ezs"