api-tuner 0.4.0 → 0.4.2

package/lib/download-eye.js

@@ -0,0 +1,32 @@
+#! /usr/bin/env node
+/* eslint-disable no-console */
+import fs from 'node:fs'
+import { Readable } from 'node:stream'
+import * as tar from 'tar'
+
+async function main() {
+  const EYE_VERSION = process.env.EYE_VERSION
+  const url = `https://github.com/eyereasoner/eye/archive/refs/tags/v${EYE_VERSION}.tar.gz`
+
+  // Download and extract tarball directly from stream
+  const res = await fetch(url)
+  if (!res.ok) throw new Error(`Failed to download: ${res.statusText}`)
+  await new Promise((resolve, reject) => {
+    Readable.fromWeb(res.body)
+      .pipe(tar.x())
+      .on('finish', resolve)
+      .on('error', reject)
+  })
+
+  // Remove existing 'eye' directory if it exists
+  if (fs.existsSync('eye')) {
+    fs.rmSync('eye', { recursive: true, force: true })
+  }
+  // Rename extracted folder
+  fs.renameSync(`eye-${EYE_VERSION}`, 'eye')
+}
+
+main().catch(err => {
+  console.error(err)
+  process.exit(1)
+})

package/lib/merge-curl-output.js

@@ -1,5 +1,7 @@
 import * as fs from 'node:fs/promises';
 import { createReadStream } from 'node:fs';
+import { writeFile } from 'node:fs/promises';
+import url from 'node:url';
 // eslint-disable-next-line import/default
 import jsonld from 'jsonld';
 import rdf from '@zazuko/env-node';
@@ -33,18 +35,12 @@ const ns = rdf.namespace('https://api-tuner.described.at/');
         parser = rdf.formats.parsers.get(contentType);
     }
     if (parser) {
-        const bodyGraph = rdf.blankNode();
-        const bodyStream = parser.import(createReadStream(bodyPath));
-        for await (const quad of bodyStream) {
-            response.dataset.add(rdf.quad(quad.subject, quad.predicate, quad.object, bodyGraph));
-        }
-        response.addOut(ns.body, bodyGraph);
+        const body = parser.import(createReadStream(bodyPath));
+        await writeFile(`${bodyPath}.nt`, rdf.formats.serializers.get('application/n-triples').import(body));
+        response.addOut(ns.body, rdf.namedNode(url.pathToFileURL(`${bodyPath}.nt`).toString()));
     }
     else {
-        const body = await fs.readFile(bodyPath, 'utf-8');
-        if (body) {
-            response.addOut(ns.body, body);
-        }
+        response.addOut(ns.body, bodyPath);
     }
     const headers = Object.entries(headersJson).flatMap(([header, values]) => values.map(value => response.blankNode().addOut(ns('name'), header).addOut(ns.value, value)));
     response.addOut(ns.headers, headers);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-tuner",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "main": "index.js",
   "type": "module",
   "license": "MIT",
@@ -8,7 +8,7 @@
     "api-tuner": "./bin/tuner.sh"
   },
   "scripts": {
-    "download-eye": "EYE_VERSION=11.16.4 ./lib/download-eye.sh",
+    "download-eye": "EYE_VERSION=11.16.4 ./lib/download-eye.js",
     "postinstall": "([ -d eye ] || npm run download-eye) && eye/install.sh --prefix=eye",
     "prepare": "husky",
     "lint": "eslint . --quiet --ignore-path .gitignore",
@@ -36,7 +36,8 @@
     "is-absolute-url": "^4.0.1",
     "jsonld": "^8.3.3",
     "rdf-validate-shacl": "^0.5.6",
-    "replacestream": "^4.0.3"
+    "replacestream": "^4.0.3",
+    "tar": "^7.5.1"
   },
   "devDependencies": {
     "@rdfjs/types": "^1",
@@ -59,5 +60,8 @@
     "*.{js,ts}": [
       "eslint --fix --quiet"
     ]
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

package/rules/assertions.n3

@@ -57,8 +57,20 @@ prefix log: <http://www.w3.org/2000/10/swap/log#>
   ?res tuner:body ?body .
 } <= {
   ?res log:includes {
-    [] a tuner:Response ; tuner:body ?body .
+    [] a tuner:Response ; tuner:body ?bodyPath .
   } .
+
+  (
+    {
+      ?bodyPath log:rawType log:Literal .
+    }
+    {
+      ("cat " ?bodyPath)!string:concatenation log:shell ?body .
+    }
+    {
+      ?bodyPath log:semantics ?body .
+    }
+  ) log:ifThenElseIn [] .
 } .
 
 {

package/rules/requests.n3

@@ -6,8 +6,6 @@ PREFIX tuner: <https://api-tuner.described.at/>
 prefix file: <http://www.w3.org/2000/10/swap/file#>
 prefix earl: <http://www.w3.org/ns/earl#>
 
-
-
 {
   ?req tuner:response ?res .
 } <= {
@@ -85,7 +83,6 @@ prefix earl: <http://www.w3.org/ns/earl#>
     ?res^tuner:trace .
   } log:callWithCleanup {
     { ?responseHeadersFile!file:rm } log:callWithCleanup true .
-    { ?responseBodyFile!file:rm } log:callWithCleanup true .
     { ?responseFile!file:rm } log:callWithCleanup true .
   } .
 } .

package/lib/download-eye.sh

@@ -1,6 +0,0 @@
-curl -sL https://github.com/eyereasoner/eye/archive/refs/tags/v"${EYE_VERSION}".tar.gz -o eye.tar.gz
-
-tar -xvzf eye.tar.gz
-rm eye.tar.gz
-
-mv eye-"${EYE_VERSION}" eye