Bug fixed for nest.js fastify support

SyntaxeQL · Apr 21, 2024 · 43afd5f · 43afd5f
1 parent 5975c50
commit 43afd5f
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.4] - 2024-04-21
+
+### Fixed
+
+- Bug fixed for nest.js fastify support
+
 ## [1.2.3] - 2024-04-19
 
 ### Changed

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Syntaxe middleware for Express.js and Nest.js
 <br/>
 
 [![MIT licensed](https://img.shields.io/badge/license-MIT-0091F7)](./LICENSE)
-![NPM Version](https://img.shields.io/badge/npm-v1.2.3-D50100)
+![NPM Version](https://img.shields.io/badge/npm-v1.2.4-D50100)
 ![Top Language](https://img.shields.io/badge/javascript-100%25-F0DC4E)
 
 <br/>

diff --git a/dist/cjs/lib/engine.js b/dist/cjs/lib/engine.js
diff --git a/dist/cjs/main.js b/dist/cjs/main.js
diff --git a/dist/esm/index.js b/dist/esm/index.js
diff --git a/dist/esm/lib/engine.js b/dist/esm/lib/engine.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "syntaxe-express",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "A middleware built on the original syntaxe data query library for express.js and nest.js applications.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

diff --git a/src/index.js b/src/index.js
@@ -10,30 +10,81 @@ SyntaxeIO.init = (config = null) => {
 };
 
 const SyntaxeRequestGate = class {
-	constructor(config = null){
-		config.app.set('syntaxeEnabledStatus', config.enabled);
-		config.app.use(this.#request);
+	constructor(config = null) {
+		this.#configureForAdapter(config);
 	}
 
-	async #request(req, res, next) {
-		const { resolve, schema, client } = scanDirectives(req, res);
+	#configureForAdapter(config) {
+		try {
+			if (config.app && typeof config.app.getHttpAdapter == "function") {
+				const fastifyEnabled = Object.getOwnPropertySymbols(config.app.getHttpAdapter().getInstance())
+					.find(s => s.toString() == 'Symbol(fastify.state)');
+				if (fastifyEnabled && config.enabled)
+					this.#adjustToAdapterInstance(config);
+			}
+
+			const syntaxeProcessor = (config.enabled ? this.#syntaxeEnabled : this.#syntaxeDisabled);
+
+			config.app.use(syntaxeProcessor);
+		} catch(err) {
+			console.error(err);
+		}
+	}
+
+	#adjustToAdapterInstance(config) {
+		try {
+		  const instance = config.app.getHttpAdapter().getInstance();
+		  instance.addHook('onRequest', (request, reply, done) => {
+		    reply.setHeader = function (key, value) {
+		      return this.raw.setHeader(key, value);
+		    };
 
-		const enabledStatus = req.app.get('syntaxeEnabledStatus');
-
-		res.set('Syntaxe-Enabled', enabledStatus);
+		    reply.end = function () {
+		      this.raw.end();
+		    };
 
-		if (enabledStatus && resolve) {
-			res.syntaxeSchema = await filterSchema(schema);
-			if (res.syntaxeSchema.status)
-				new SyntaxeResponseGate(res);
-			else {
-				res.set('Syntaxe-Schema-Resolved', false);
-				res.set('Syntaxe-Schema-Resolved-Error', 'Query failed. Check your schema and try again.');
+		    request.res = reply;
+
+		    done();
+		  });
+		  instance.addHook('onSend', (request, reply, data, done) => {
+		  	reply.syntaxeSchema = request.raw.syntaxeSchema;
+		  	walkThroughHandler({ data, res: reply })
+		  	.then(result => {
+		  		done(null, result);
+		  	}).catch(e => done(null, data));
+		  });
+		} catch(err) {
+			console.error(err);
+		}
+	}
+
+	async #syntaxeEnabled(req, res, next) {
+		try {
+			const { resolve, schema, client } = scanDirectives(req, res);
+
+			res.setHeader('Syntaxe-Enabled', true);
+
+			if (resolve) {
+				res.syntaxeSchema = req.syntaxeSchema = await filterSchema(schema);
+				if (res.syntaxeSchema.status)
+					new SyntaxeResponseGate(res);
+				else {
+					res.setHeader('Syntaxe-Schema-Resolved', false);
+					res.setHeader('Syntaxe-Schema-Resolved-Error', 'Query failed. Check your schema and try again.');
+				}
 			}
+		} catch(err) {
+			console.error(err);
 		}
 
 		next();
 	}
+
+	async #syntaxeDisabled(req, res, next) {
+		res.setHeader('Syntaxe-Enabled', false);
+		next();
+	}
 };
 
 const SyntaxeResponseGate = class {

diff --git a/src/lib/engine.js b/src/lib/engine.js
@@ -53,8 +53,8 @@ const scanDirectives = (req, res) => {
 
 		return { resolve, schema, client };
 	} catch(err) {
-		res.set('Syntaxe-Schema-Resolved', false);
-		res.set('Syntaxe-Schema-Resolved-Error', String(err));
+		res.setHeader('Syntaxe-Schema-Resolved', false);
+		res.setHeader('Syntaxe-Schema-Resolved-Error', String(err));
 		console.error({
 			date: new Date(),
 			error: err
@@ -247,12 +247,12 @@ const walkThroughHandler = async({ data, res }) => {
 		}
 
 		// response header
-		res.set('Syntaxe-Schema-Resolved', true);
+		res.setHeader('Syntaxe-Schema-Resolved', true);
 
 		return JSON.stringify(result);
 	} catch(err) {
-		res.set('Syntaxe-Schema-Resolved', false);
-		res.set('Syntaxe-Schema-Resolved-Error', String(err));
+		res.setHeader('Syntaxe-Schema-Resolved', false);
+		res.setHeader('Syntaxe-Schema-Resolved-Error', String(err));
 		console.error({
 			date: new Date(),
 			error: err,