fix: 🐛 display status & message error

Inist-CNRS · Jul 2, 2020 · 2f67590 · 2f67590
1 parent c7ed6e4
commit 2f67590
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/packages/analytics/src/combine.js b/packages/analytics/src/combine.js
@@ -66,14 +66,13 @@ export default function combine(data, feed) {
             append: this.getParam('append'),
         });
         const cache = this.getParam('cache');
-        let pipeline;
+        let statements;
         if (cache) {
-            pipeline = ezs(cache, { commands });
+            statements = [ezs(cache, { commands }, this.getEnv())];
         } else {
-            const statements = ezs.compileCommands(commands, this.getEnv());
-            pipeline = ezs.createPipeline(input, statements);
+            statements = ezs.compileCommands(commands, this.getEnv());
         }
-        const output = pipeline
+        const output = ezs.createPipeline(input, statements)
             .pipe(ezs.catch())
             .on('data', async (item) => {
                 const key = get(item, 'id');

diff --git a/packages/basics/src/url-connect.js b/packages/basics/src/url-connect.js
@@ -14,7 +14,7 @@ function URLConnect(data, feed) {
         })
             .then((response) => {
                 if (response.status !== 200) {
-                    const msg = `Received status code ${response.statusCode} (${response.statusMessage})'`;
+                    const msg = `Received status code ${response.status} (${response.statusText})'`;
                     throw new Error(msg);
                 }
                 return response.body;

diff --git a/packages/basics/src/url-fetch.js b/packages/basics/src/url-fetch.js
@@ -12,9 +12,7 @@ function URLFetch(data, feed) {
     fetch(url)
         .then((response) => {
             if (response.status !== 200) {
-                const msg = `Received status code ${response.statusCode} (${
-                    response.statusMessage
-                })'`;
+                const msg = `Received status code ${response.status} (${response.statusText})'`;
                 throw new Error(msg);
             }
             return json ? response.json() : response.text();

diff --git a/packages/basics/src/url-stream.js b/packages/basics/src/url-stream.js
@@ -15,7 +15,7 @@ function URLStream(data, feed) {
     fetch(cURL.href)
         .then((response) => {
             if (response.status !== 200) {
-                const msg = `Received status code ${response.statusCode} (${response.statusMessage})'`;
+                const msg = `Received status code ${response.status} (${response.statusText})'`;
                 throw new Error(msg);
             }
             return response.body;

diff --git a/packages/basics/test/url-stream.js b/packages/basics/test/url-stream.js
@@ -28,4 +28,20 @@ describe('URLStream', () => {
                 done();
             });
     });
+    test('#2', (done) => {
+        const input = [1, 2, 3, 4, 5];
+        from(input)
+            .pipe(ezs('URLStream', {
+                url: 'https://httpbin.org/status/400',
+            }))
+            .pipe(ezs.catch())
+            .on('error', (e) => {
+                expect(e.message).toEqual(expect.stringContaining('400'));
+                done();
+            })
+            .on('end', () => {
+                done(new Error('Error is the right behavior'));
+            });
+    });
+
 });