@lde/fastify-rdf 0.4.0 → 0.4.2

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAQ7E,OAAO,EAEL,KAAK,iBAAiB,EAEvB,MAAM,YAAY,CAAC;AAgIpB;;;;;;;;;GASG;AACH,iBAAe,gBAAgB,CAC7B,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CAqFf;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,yBAGrB,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAQ7E,OAAO,EAEL,KAAK,iBAAiB,EAEvB,MAAM,YAAY,CAAC;AAyIpB;;;;;;;;;GASG;AACH,iBAAe,gBAAgB,CAC7B,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CAqFf;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,yBAGrB,CAAC"}

package/dist/plugin.js

@@ -58,45 +58,54 @@ async function streamToDataset(stream) {
  */
 async function registerRdfParsers(server, parseAll) {
     const contentTypes = (await rdfParser.getContentTypes()).filter((type) => type !== 'application/json');
-    server.addContentTypeParser(contentTypes, function (_request, payload, done) {
-        // Collect the raw body; the preParsing hook is not needed because
-        // Fastify passes the raw payload stream here.
+    const jsonLdType = 'application/ld+json';
+    // JSON-LD is JSON.parse'd eagerly so the body is a plain object when
+    // Fastify runs preValidation (schema checks happen before preHandler).
+    // Other RDF types are stored as a raw Buffer for the preHandler hook.
+    server.addContentTypeParser(contentTypes, function (request, payload, done) {
+        const isJsonLd = request.headers['content-type']?.split(';')[0].trim() === jsonLdType;
         const chunks = [];
         payload.on('data', (chunk) => chunks.push(chunk));
-        payload.on('end', () => done(null, Buffer.concat(chunks)));
+        payload.on('end', () => {
+            if (!isJsonLd)
+                return done(null, Buffer.concat(chunks));
+            try {
+                done(null, JSON.parse(Buffer.concat(chunks).toString('utf8')));
+            }
+            catch (err) {
+                err.statusCode = 400;
+                done(err);
+            }
+        });
         payload.on('error', done);
     });
     server.addHook('preHandler', async (request) => {
-        // Only act on requests that matched an RDF content type parser.
-        if (!request.body ||
-            !Buffer.isBuffer(request.body) ||
-            !request.headers['content-type']) {
+        if (!request.body || !request.headers['content-type'])
             return;
-        }
         const contentType = request.headers['content-type'].split(';')[0].trim();
-        if (!contentTypes.includes(contentType)) {
+        if (!contentTypes.includes(contentType))
             return;
-        }
-        if (parseAll || request.routeOptions.config.parseRdf) {
-            try {
-                const bodyStream = Readable.from(request.body);
-                const quadStream = rdfParser.parse(bodyStream, { contentType });
-                request.body = await streamToDataset(quadStream);
-            }
-            catch (cause) {
-                const error = new Error('Invalid RDF body', {
-                    cause,
-                });
-                error.statusCode = 400;
+        if (!(parseAll || request.routeOptions.config.parseRdf)) {
+            // Not a parseRdf route: JSON-LD is already parsed; reject other RDF.
+            if (contentType !== jsonLdType) {
+                const error = new Error(`Unsupported Media Type: ${contentType}`);
+                error.statusCode = 415;
                 throw error;
             }
+            return;
         }
-        else if (contentType === 'application/ld+json') {
-            request.body = JSON.parse(request.body.toString('utf8'));
+        try {
+            // JSON-LD body is already an object; re-stringify for rdf-parse.
+            const raw = Buffer.isBuffer(request.body)
+                ? request.body
+                : Buffer.from(JSON.stringify(request.body));
+            request.body = await streamToDataset(rdfParser.parse(Readable.from(raw), { contentType }));
         }
-        else {
-            const error = new Error(`Unsupported Media Type: ${contentType}`);
-            error.statusCode = 415;
+        catch (cause) {
+            const error = new Error('Invalid RDF body', {
+                cause,
+            });
+            error.statusCode = 400;
             throw error;
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lde/fastify-rdf",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Fastify plugin for serving RDF data with content negotiation",
   "repository": {
     "url": "git+https://github.com/ldengine/lde.git",