Fix rare stream interuption before end, Closes #40

Author: rubensworks

lib/SparqlEndpointFetcher.ts

@@ -6,11 +6,11 @@ import {ISettings, SparqlJsonParser} from "sparqljson-parse";
 import {SparqlXmlParser} from "sparqlxml-parse";
 import {Readable} from "stream";
 import * as stringifyStream from 'stream-to-string';
+import { ReadableWebToNodeStream } from 'readable-web-to-node-stream';
 
 // tslint:disable:no-var-requires
 const n3 = require('n3');
 const isStream = require('is-stream');
-const toNodeReadable = require('web-streams-node').toNodeReadable;
 
 /**
  * A SparqlEndpointFetcher can send queries to SPARQL endpoints,
@@ -209,7 +209,7 @@ export class SparqlEndpointFetcher {
       // Wrap WhatWG readable stream into a Node.js readable stream
       // If the body already is a Node.js stream (in the case of node-fetch), don't do explicit conversion.
       responseStream = isStream(httpResponse.body)
-        ? httpResponse.body : toNodeReadable(httpResponse.body);
+        ? <NodeJS.ReadableStream> <any> httpResponse.body : <NodeJS.ReadableStream> <any> new ReadableWebToNodeStream(httpResponse.body);
     }
 
     // Determine the content type and emit it to the stream

package.json

@@ -37,18 +37,19 @@
   ],
   "dependencies": {
     "@rdfjs/types": "*",
+    "@types/readable-stream": "^2.3.11",
     "@types/sparqljs": "^3.1.3",
     "abort-controller": "^3.0.0",
     "cross-fetch": "^3.0.6",
     "is-stream": "^2.0.0",
     "minimist": "^1.2.0",
     "n3": "^1.6.3",
     "rdf-string": "^1.6.0",
+    "readable-web-to-node-stream": "^3.0.2",
     "sparqljs": "^3.1.2",
     "sparqljson-parse": "^1.7.0",
     "sparqlxml-parse": "^1.5.0",
-    "stream-to-string": "^1.1.0",
-    "web-streams-node": "^0.4.0"
+    "stream-to-string": "^1.1.0"
   },
   "devDependencies": {
     "@types/jest": "^26.0.0",
@@ -65,7 +66,8 @@
     "ts-jest": "^27.0.1",
     "tslint": "^6.0.0",
     "tslint-eslint-rules": "^5.4.0",
-    "typescript": "^4.3.5"
+    "typescript": "^4.3.5",
+    "web-streams-node": "^0.4.0"
   },
   "jest": {
     "globals": {

yarn.lock

@@ -831,6 +831,14 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0"
   integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==
 
+"@types/readable-stream@^2.3.11":
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.11.tgz#942bc4574a1d7ca4368cb9cb4352e3d2b4b51dea"
+  integrity sha512-0z+/apYJwKFz/RHp6mOMxz/y7xOvWPYPevuCEyAY3gXsjtaac02E26RvxA+I96rfvmVH/dEMGXNvyJfViR1FSQ==
+  dependencies:
+    "@types/node" "*"
+    safe-buffer "*"
+
 "@types/sparqljs@^3.1.3":
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/@types/sparqljs/-/sparqljs-3.1.3.tgz#e4b9a2511bc2f14f564559ed6cf567835791a7e9"
@@ -3286,6 +3294,13 @@ readable-stream@^2.2.2, readable-stream@~2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-web-to-node-stream@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb"
+  integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==
+  dependencies:
+    readable-stream "^3.6.0"
+
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
@@ -3367,7 +3382,7 @@ rimraf@^3.0.0:
   dependencies:
     glob "^7.1.3"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@*, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==