do not add name property to message object

Author: github1

src/backends/http/http-support.test.ts

@@ -97,13 +97,13 @@ describe('http-support', () => {
   it('can send the message name as a query param', async () => {
     await p1.subject('test-sub-2')
       // tslint:disable-next-line:no-any
-      .on('test-http', (msg : any) => {
-        return {echo: msg};
+      .on('test-http', (msg : any, header : SubjectMessageHeader) => {
+        return {echo: msg, name: header.name};
       })
       .awaitRegistration();
     const res : Response = await sendHttp(`${port}/api/test-sub-2/123?messageName=test-http`, {});
     const resJson = await res.json();
-    expect(resJson.echo.name)
+    expect(resJson.name)
       .toBe('test-http');
   });
   it('can broadcast messages', async () => {

src/backends/http/http-support.ts

@@ -1,12 +1,12 @@
 import {
-  HttpMessageHeader,
   MeshBackend,
   MeshBackendBase,
   MeshBackendProvider,
   MeshBackendProvision,
   MeshVoidResponse,
   SubjectMessage,
   SubjectMessageEnvelope,
+  SubjectMessageHeader,
   SubjectMessageOptions,
   toMeshBackendProvision
 } from '../../';
@@ -21,8 +21,8 @@ const log : debug.Debugger = debug('meshage')
   .extend('http');
 
 interface PreparedHttpMessage {
-  message: SubjectMessage;
-  headerData: HttpMessageHeader;
+  message : SubjectMessage;
+  headerData : SubjectMessageHeader;
 }
 
 class HttpMeshBackend extends MeshBackendBase {
@@ -71,13 +71,19 @@ class HttpMeshBackend extends MeshBackendBase {
     // tslint:disable-next-line:no-unsafe-any
     const messageName : string = query.messageName ? `${query.messageName}` : req.body.name;
     return {
-      message: {...req.body, name: messageName},
+      message: {...req.body},
       headerData: {
-        headers: req.headers,
-        url: req.url,
-        publicUrl: reqUrl,
-        params,
-        query
+        uid: '', // replaced later,
+        subject: params.subject,
+        partitionKey: params.partitionKey || query.partitionKey,
+        name: messageName,
+        http: {
+          headers: req.headers,
+          url: req.url,
+          publicUrl: reqUrl,
+          params,
+          query
+        }
       }
     };
   }
@@ -162,17 +168,17 @@ class HttpMeshBackend extends MeshBackendBase {
         async (req : express.Request, res : express.Response) => {
           try {
             const httpMessage : PreparedHttpMessage = HttpMeshBackend.prepareHttpMessage(req);
-            if (!httpMessage.message.name) {
+            if (!httpMessage.headerData.name) {
               res.status(400)
                 .send({error: 'Missing message name'});
             } else {
-              const result = await this.send(httpMessage.headerData.params.subject,
+              const result = await this.send(httpMessage.headerData.subject,
                 undefined,
                 httpMessage.message,
                 {
-                  wait: req.query.wait === 'true' || req.query.wait === undefined,
-                  timeout: req.query.timeout === undefined ? undefined : parseInt(`${req.query.timeout}`, 10),
-                  additionalHeaderData: {http: httpMessage.headerData}
+                  wait: httpMessage.headerData.http.query.wait === 'true' || httpMessage.headerData.http.query.wait === undefined,
+                  timeout: httpMessage.headerData.http.query.timeout === undefined ? undefined : parseInt(`${httpMessage.headerData.http.query.timeout}`, 10),
+                  additionalHeaderData: httpMessage.headerData
                 }, true);
               HttpMeshBackend.prepareHttpResponse(result, res);
             }
@@ -185,19 +191,19 @@ class HttpMeshBackend extends MeshBackendBase {
         async (req : express.Request, res : express.Response) => {
           try {
             const httpMessage : PreparedHttpMessage = HttpMeshBackend.prepareHttpMessage(req);
-            if (!httpMessage.message.name) {
+            if (!httpMessage.headerData.name) {
               res.status(400)
                 .send({error: 'Missing message name'});
             } else {
               const result = await this.send(
-                httpMessage.headerData.params.subject,
-                httpMessage.headerData.params.partitionKey,
+                httpMessage.headerData.subject,
+                httpMessage.headerData.partitionKey,
                 httpMessage.message,
                 {
-                  wait: req.query.wait === 'true' || req.query.wait === undefined,
-                  timeout: req.query.timeout === undefined ? undefined : parseInt(`${req.query.timeout}`, 10),
+                  wait: httpMessage.headerData.http.query.wait === 'true' || httpMessage.headerData.http.query.wait === undefined,
+                  timeout: httpMessage.headerData.http.query.timeout === undefined ? undefined : parseInt(`${httpMessage.headerData.http.query.timeout}`, 10),
                   keepSignals: true,
-                  additionalHeaderData: {http: httpMessage.headerData}
+                  additionalHeaderData: httpMessage.headerData
                 },
                 false);
               HttpMeshBackend.prepareHttpResponse(result, res);

src/mesh.ts

@@ -331,12 +331,13 @@ export abstract class MeshBackendBase implements MeshBackend {
                        broadcast : boolean) : Promise<T> {
     // tslint:disable-next-line:no-parameter-reassignment
     options = options || {};
+    options.additionalHeaderData = options.additionalHeaderData || {};
     const messageHeader : SubjectMessageHeader = {
       ...options.additionalHeaderData,
       uid: v4(),
       subject,
       // tslint:disable-next-line:no-unsafe-any
-      name: message.name || message.constructor.name,
+      name: options.additionalHeaderData.name || message.name || message.constructor.name,
       partitionKey
     };
     const messageEnvelope : SubjectMessageEnvelope = {