@twin.org/api-server-fastify 0.0.1-next.13 → 0.0.1-next.15

package/dist/cjs/index.cjs

@@ -429,8 +429,8 @@ class FastifyWebServer {
         delete httpServerRequest.query?.EIO;
         delete httpServerRequest.query?.transport;
         httpServerRequest.body = data;
-        await this.runProcessorsSocket(socketRouteProcessors, socketRoute, httpServerRequest, httpResponse, httpRequestIdentity, processorState, async () => {
-            await socket.emit(emitTopic, httpResponse);
+        await this.runProcessorsSocket(socketRouteProcessors, socketRoute, httpServerRequest, httpResponse, httpRequestIdentity, processorState, emitTopic, async (topic, response) => {
+            await socket.emit(topic, response);
         });
     }
     /**
@@ -440,12 +440,14 @@ class FastifyWebServer {
      * @param httpServerRequest The incoming request.
      * @param httpResponse The outgoing response.
      * @param httpRequestIdentity The identity context for the request.
+     * @param processorState The state handed through the processors.
+     * @param requestTopic The topic of the request.
      * @internal
      */
-    async runProcessorsSocket(socketRouteProcessors, socketRoute, httpServerRequest, httpResponse, httpRequestIdentity, processorState, responseEmitter) {
+    async runProcessorsSocket(socketRouteProcessors, socketRoute, httpServerRequest, httpResponse, httpRequestIdentity, processorState, requestTopic, responseEmitter) {
         // Custom emit method which will also call the post processors
-        const postProcessEmit = async (response, responseProcessorState) => {
-            await responseEmitter(response);
+        const postProcessEmit = async (topic, response, responseProcessorState) => {
+            await responseEmitter(topic, response);
             // The post processors are called after the response has been emitted
             for (const postSocketRouteProcessor of socketRouteProcessors) {
                 if (core.Is.function(postSocketRouteProcessor.post)) {
@@ -463,26 +465,26 @@ class FastifyWebServer {
             // But if a pre processor sets a status code, we will emit the response manually, as the pre
             // and post processors do not receive the emit method, they just populate the response object.
             if (!core.Is.empty(httpResponse.statusCode)) {
-                await postProcessEmit(httpResponse, processorState);
+                await postProcessEmit(requestTopic, httpResponse, processorState);
             }
             for (const socketRouteProcessor of socketRouteProcessors) {
                 if (core.Is.function(socketRouteProcessor.process)) {
-                    await socketRouteProcessor.process(httpServerRequest, httpResponse, socketRoute, httpRequestIdentity, processorState, async (processResponse) => {
-                        await postProcessEmit(processResponse, processorState);
+                    await socketRouteProcessor.process(httpServerRequest, httpResponse, socketRoute, httpRequestIdentity, processorState, async (topic, processResponse) => {
+                        await postProcessEmit(topic, processResponse, processorState);
                     });
                 }
             }
             // If the processors set the status to any kind of error then we should emit this manually
             if (core.Is.integer(httpResponse.statusCode) &&
                 httpResponse.statusCode >= web.HttpStatusCode.badRequest) {
-                await postProcessEmit(httpResponse, processorState);
+                await postProcessEmit(requestTopic, httpResponse, processorState);
             }
         }
         catch (err) {
             // Emit any unhandled errors manually
             const { error, httpStatusCode } = apiModels.HttpErrorHelper.processError(err, this._includeErrorStack);
             apiModels.HttpErrorHelper.buildResponse(httpResponse, error, httpStatusCode);
-            await postProcessEmit(httpResponse, processorState);
+            await postProcessEmit(requestTopic, httpResponse, processorState);
         }
     }
     /**

package/dist/esm/index.mjs

@@ -427,8 +427,8 @@ class FastifyWebServer {
         delete httpServerRequest.query?.EIO;
         delete httpServerRequest.query?.transport;
         httpServerRequest.body = data;
-        await this.runProcessorsSocket(socketRouteProcessors, socketRoute, httpServerRequest, httpResponse, httpRequestIdentity, processorState, async () => {
-            await socket.emit(emitTopic, httpResponse);
+        await this.runProcessorsSocket(socketRouteProcessors, socketRoute, httpServerRequest, httpResponse, httpRequestIdentity, processorState, emitTopic, async (topic, response) => {
+            await socket.emit(topic, response);
         });
     }
     /**
@@ -438,12 +438,14 @@ class FastifyWebServer {
      * @param httpServerRequest The incoming request.
      * @param httpResponse The outgoing response.
      * @param httpRequestIdentity The identity context for the request.
+     * @param processorState The state handed through the processors.
+     * @param requestTopic The topic of the request.
      * @internal
      */
-    async runProcessorsSocket(socketRouteProcessors, socketRoute, httpServerRequest, httpResponse, httpRequestIdentity, processorState, responseEmitter) {
+    async runProcessorsSocket(socketRouteProcessors, socketRoute, httpServerRequest, httpResponse, httpRequestIdentity, processorState, requestTopic, responseEmitter) {
         // Custom emit method which will also call the post processors
-        const postProcessEmit = async (response, responseProcessorState) => {
-            await responseEmitter(response);
+        const postProcessEmit = async (topic, response, responseProcessorState) => {
+            await responseEmitter(topic, response);
             // The post processors are called after the response has been emitted
             for (const postSocketRouteProcessor of socketRouteProcessors) {
                 if (Is.function(postSocketRouteProcessor.post)) {
@@ -461,26 +463,26 @@ class FastifyWebServer {
             // But if a pre processor sets a status code, we will emit the response manually, as the pre
             // and post processors do not receive the emit method, they just populate the response object.
             if (!Is.empty(httpResponse.statusCode)) {
-                await postProcessEmit(httpResponse, processorState);
+                await postProcessEmit(requestTopic, httpResponse, processorState);
             }
             for (const socketRouteProcessor of socketRouteProcessors) {
                 if (Is.function(socketRouteProcessor.process)) {
-                    await socketRouteProcessor.process(httpServerRequest, httpResponse, socketRoute, httpRequestIdentity, processorState, async (processResponse) => {
-                        await postProcessEmit(processResponse, processorState);
+                    await socketRouteProcessor.process(httpServerRequest, httpResponse, socketRoute, httpRequestIdentity, processorState, async (topic, processResponse) => {
+                        await postProcessEmit(topic, processResponse, processorState);
                     });
                 }
             }
             // If the processors set the status to any kind of error then we should emit this manually
             if (Is.integer(httpResponse.statusCode) &&
                 httpResponse.statusCode >= HttpStatusCode.badRequest) {
-                await postProcessEmit(httpResponse, processorState);
+                await postProcessEmit(requestTopic, httpResponse, processorState);
             }
         }
         catch (err) {
             // Emit any unhandled errors manually
             const { error, httpStatusCode } = HttpErrorHelper.processError(err, this._includeErrorStack);
             HttpErrorHelper.buildResponse(httpResponse, error, httpStatusCode);
-            await postProcessEmit(httpResponse, processorState);
+            await postProcessEmit(requestTopic, httpResponse, processorState);
         }
     }
     /**

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/api-server-fastify - Changelog
 
-## v0.0.1-next.13
+## v0.0.1-next.15
 
 - Initial Release

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/api-server-fastify",
-	"version": "0.0.1-next.13",
+	"version": "0.0.1-next.15",
 	"description": "Use Fastify as the core web server for APIs",
 	"repository": {
 		"type": "git",
@@ -16,8 +16,8 @@
 	"dependencies": {
 		"@fastify/compress": "8.0.1",
 		"@fastify/cors": "10.0.1",
-		"@twin.org/api-core": "0.0.1-next.13",
-		"@twin.org/api-models": "0.0.1-next.13",
+		"@twin.org/api-core": "0.0.1-next.15",
+		"@twin.org/api-models": "0.0.1-next.15",
 		"@twin.org/core": "next",
 		"@twin.org/logging-models": "next",
 		"@twin.org/nameof": "next",