refactor: simplify http emitter

src/transport/emitter.ts

@@ -1,5 +1,5 @@
 import { CloudEvent } from "../event/cloudevent";
-import { emitBinary, emitStructured } from "./http";
+import { emitBinary, emitStructured } from "./http/emitter";
 import { Protocol } from "./protocols";
 import { AxiosResponse } from "axios";
 import { Agent } from "http";

src/transport/http/binary_emitter.ts → src/transport/http/emitter.ts

@@ -1,11 +1,16 @@
 import axios, { AxiosRequestConfig, AxiosResponse } from "axios";
-
 import { CloudEvent, Version } from "../../event/cloudevent";
 import { TransportOptions } from "../emitter";
 import { Headers, headersFor } from "./headers";
 import { asData } from "../../event/validation";
 import CONSTANTS from "../../constants";
 
+const defaults = {
+  headers: {
+    [CONSTANTS.HEADER_CONTENT_TYPE]: CONSTANTS.DEFAULT_CE_CONTENT_TYPE,
+  },
+};
+
 /**
  * Send a CloudEvent over HTTP POST to the `options.url` provided.
  * @param {CloudEvent} event the event to send to the remote endpoint
@@ -16,16 +21,22 @@ export async function emitBinary(event: CloudEvent, options: TransportOptions):
   if (event.specversion !== Version.V1 && event.specversion !== Version.V03) {
     return Promise.reject(`Unknown spec version ${event.specversion}`);
   }
-  return emit(event, options, headersFor(event));
-}
-
-async function emit(event: CloudEvent, options: TransportOptions, headers: Headers): Promise<AxiosResponse> {
   const contentType: Headers = { [CONSTANTS.HEADER_CONTENT_TYPE]: CONSTANTS.DEFAULT_CONTENT_TYPE };
   const config = {
     ...options,
     method: "POST",
-    headers: { ...contentType, ...headers, ...(options.headers as Headers) },
+    headers: { ...contentType, ...headersFor(event), ...(options.headers as Headers) },
     data: asData(event.data, event.datacontenttype as string),
   };
   return axios.request(config as AxiosRequestConfig);
 }
+
+export function emitStructured(event: CloudEvent, options: TransportOptions): Promise<AxiosResponse> {
+  const config = {
+    ...defaults,
+    ...options,
+    method: "POST",
+    data: event,
+  };
+  return axios.request(config as AxiosRequestConfig);
+}

test/integration/http_binding_03.ts

@@ -2,7 +2,7 @@ import "mocha";
 import { expect } from "chai";
 import nock from "nock";
 
-import { emitBinary, emitStructured } from "../../src/transport/http";
+import { emitBinary, emitStructured } from "../../src/transport/http/emitter";
 import { CloudEvent, Version } from "../../src";
 import { AxiosResponse } from "axios";
 

test/integration/http_binding_1.ts

@@ -4,7 +4,7 @@ import { expect } from "chai";
 import nock from "nock";
 
 import { CloudEvent, Version } from "../../src";
-import { emitBinary, emitStructured } from "../../src/transport/http";
+import { emitBinary, emitStructured } from "../../src/transport/http/emitter";
 import { asBase64 } from "../../src/event/validation";
 import { AxiosResponse } from "axios";