@lde/distribution-probe 0.2.3 → 0.2.4

package/dist/probe.js

@@ -551,7 +551,7 @@ async function validateDumpBody(url, headers, options, headResponse) {
         const { text, truncated, corrupt } = await decodeProbeBody(bounded);
         return corrupt
             ? 'Distribution is not valid gzip'
-            : await validateBody(text, getResponse.headers.get('Content-Type'), url, budgetMs, truncated);
+            : await validateBody(text, getResponse.headers.get('Content-Type'), url, budgetController.signal, truncated);
     })().catch(() => null);
     let budgetTimer;
     const budgetExpiry = new Promise((resolve) => {
@@ -697,7 +697,7 @@ const rdfContentTypes = [
 // validated if it happened to fit the read cap in full; beyond that it is
 // inconclusive, and we must not download it in full to find out.
 const nonStreamableRdfContentTypes = ['application/ld+json'];
-async function validateBody(body, contentType, baseIRI, timeoutMs, truncated) {
+async function validateBody(body, contentType, baseIRI, budgetSignal, truncated) {
     if (body.length === 0) {
         // A complete, empty body is a faulty distribution; an empty *prefix* (a
         // truncated read that yielded no bytes, e.g. a corrupt gzip header) is
@@ -717,7 +717,7 @@ async function validateBody(body, contentType, baseIRI, timeoutMs, truncated) {
         // a complete document, small enough to fit the read cap, can be validated.
         return null;
     }
-    const outcome = await classifyRdfBody(body, serialization, baseIRI, timeoutMs, truncated);
+    const outcome = await classifyRdfBody(body, serialization, baseIRI, budgetSignal, truncated);
     switch (outcome.type) {
         case 'empty':
             return 'Distribution contains no RDF triples';
@@ -734,33 +734,45 @@ async function validateBody(body, contentType, baseIRI, timeoutMs, truncated) {
  * Parse an RDF body just far enough to tell whether it carries any triples:
  * resolve on the first triple (presence is all we need, not a full count), on a
  * clean end with none ('empty'), or on a parse error. The parse is bounded by
- * `timeoutMs` because a JSON-LD `@context` is fetched from its origin, and a
- * slow or hanging context host would otherwise stall the probe past its budget;
- * on expiry — and likewise when a remote `@context` is unreachable — the outcome
- * is 'inconclusive', so a valid distribution is never flagged faulty for a
- * context host's failure. `baseIRI` resolves any relative IRIs in the document.
+ * `budgetSignal` – the caller's validation-budget {@link AbortController} –
+ * because a JSON-LD `@context` is fetched from its origin, and a slow or hanging
+ * context host would otherwise stall the probe past its budget; on abort – and
+ * likewise when a remote `@context` is unreachable – the outcome is
+ * 'inconclusive', so a valid distribution is never flagged faulty for a context
+ * host's failure. Sharing the caller's single budget (rather than starting a
+ * second, identical timer) keeps that timeout deterministic: it fires once, when
+ * the budget elapses, instead of leaving an orphan timer to settle on its own
+ * schedule. `baseIRI` resolves any relative IRIs in the document.
  *
  * When `truncated` is true the body is only a bounded prefix of a larger one, so
  * only finding a triple ('hasTriples') is conclusive: a parse error at the cut
  * or a clean end with no triple yet means we did not read far enough, not that
  * the distribution is empty or malformed, and is reported as 'inconclusive'.
  */
-function classifyRdfBody(body, contentType, baseIRI, timeoutMs, truncated) {
+function classifyRdfBody(body, contentType, baseIRI, budgetSignal, truncated) {
     return new Promise((resolve) => {
         const quads = rdfParser.parse(Readable.from([body]), {
             contentType,
             baseIRI,
         });
-        const timer = setTimeout(() => settle({ type: 'inconclusive' }), timeoutMs);
+        const onBudgetElapsed = () => settle({ type: 'inconclusive' });
         let settled = false;
         function settle(outcome) {
             if (settled)
                 return;
             settled = true;
-            clearTimeout(timer);
+            budgetSignal.removeEventListener('abort', onBudgetElapsed);
             quads.destroy();
             resolve(outcome);
         }
+        // The budget may already have elapsed while the body was being read; treat an
+        // already-aborted signal as an immediate expiry rather than waiting for an
+        // 'abort' event that will never come.
+        if (budgetSignal.aborted) {
+            onBudgetElapsed();
+            return;
+        }
+        budgetSignal.addEventListener('abort', onBudgetElapsed, { once: true });
         quads
             .on('data', () => settle({ type: 'hasTriples' }))
             .on('error', (error) => settle(truncated || isRemoteContextError(error)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lde/distribution-probe",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "repository": {
     "url": "git+https://github.com/ldelements/lde.git",
     "directory": "packages/distribution-probe"