Apply code review feedback

Author: garethgeorge

docs/generated/api.json

@@ -1048,7 +1048,7 @@
             {
               "kind": "MethodSignature",
               "canonicalReference": "@google-cloud/functions-framework!InvocationFormat#deserializeRequest:member(1)",
-              "docComment": "/**\n * @param request - the request body as raw bytes\n *\n * @param headers - the headers received on the HTTP request as a map\n */\n",
+              "docComment": "/**\n * Creates an instance of the request type from an invocation request.\n *\n * @param request - the request body as raw bytes\n */\n",
               "excerptTokens": [
                 {
                   "kind": "Content",
@@ -1103,7 +1103,7 @@
             {
               "kind": "MethodSignature",
               "canonicalReference": "@google-cloud/functions-framework!InvocationFormat#serializeResponse:member(1)",
-              "docComment": "/**\n * @param response - \n *\n * @param responseHeaders - mutable object providing headers that will be set on the response\n */\n",
+              "docComment": "/**\n * Writes the response type to the invocation result.\n *\n * @param responseWriter - interface for writing to the invocation result\n *\n * @param response - the response object\n */\n",
               "excerptTokens": [
                 {
                   "kind": "Content",

docs/generated/api.md

@@ -72,9 +72,7 @@ export interface HttpFunction {
 
 // @public
 export interface InvocationFormat<T, U> {
-    // (undocumented)
     deserializeRequest(request: InvocationRequest): T | Promise<T>;
-    // (undocumented)
     serializeResponse(responseWriter: InvocationResponse, response: U): void | Promise<void>;
 }
 

src/functions.ts

@@ -176,15 +176,17 @@ export interface InvocationResponse {
  */
 export interface InvocationFormat<T, U> {
   /**
+   * Creates an instance of the request type from an invocation request.
    *
    * @param request the request body as raw bytes
-   * @param headers the headers received on the HTTP request as a map
    */
   deserializeRequest(request: InvocationRequest): T | Promise<T>;
+
   /**
+   * Writes the response type to the invocation result.
    *
-   * @param response
-   * @param responseHeaders mutable object providing headers that will be set on the response
+   * @param responseWriter interface for writing to the invocation result
+   * @param response the response object
    */
   serializeResponse(
     responseWriter: InvocationResponse,
@@ -199,6 +201,7 @@ export class JsonInvocationFormat<T, U> implements InvocationFormat<T, U> {
   deserializeRequest(request: InvocationRequest): T {
     const body = request.body();
     if (typeof body !== 'string') {
+      console.log(typeof body);
       throw new Error('Unsupported Content-Type, expected application/json');
     }
     try {

src/server.ts

@@ -85,24 +85,18 @@ export function getServer(
   };
 
   // Apply middleware
-  if (functionSignatureType === 'typed') {
-    app.use(
-      bodyParser.text({
-        limit: requestLimit,
-        type: '*/json',
-      })
-    );
-    app.use(
-      bodyParser.text({
-        limit: requestLimit,
-        type: 'text/*',
-      })
-    );
-  } else {
+  if (functionSignatureType !== 'typed') {
+    // If the function is not typed then JSON parsing can be done automatically, otherwise the
+    // functions format must determine deserialization.
     app.use(bodyParser.json(cloudEventsBodySavingOptions));
     app.use(bodyParser.json(defaultBodySavingOptions));
-    app.use(bodyParser.text(defaultBodySavingOptions));
+  } else {
+    const jsonParserOptions = Object.assign({}, defaultBodySavingOptions, {
+      type: 'application/json',
+    });
+    app.use(bodyParser.text(jsonParserOptions));
   }
+  app.use(bodyParser.text(defaultBodySavingOptions));
   app.use(bodyParser.urlencoded(urlEncodedOptions));
   // The parser will process ALL content types so MUST come last.
   // Subsequent parsers will be skipped when one is matched.

test/function_registry.ts

@@ -13,6 +13,7 @@
 // limitations under the License.
 import * as assert from 'assert';
 import * as FunctionRegistry from '../src/function_registry';
+import {JsonInvocationFormat} from '../src';
 
 describe('function_registry', () => {
   it('can register http functions', () => {
@@ -31,6 +32,16 @@ describe('function_registry', () => {
     assert.deepStrictEqual((userFunction as () => string)(), 'CE_PASS');
   });
 
+  it('can register typed functions', () => {
+    FunctionRegistry.typed('typedFunction', (identity: string) => identity);
+    const {userFunction, signatureType} =
+      FunctionRegistry.getRegisteredFunction('typedFunction')!;
+    assert.deepStrictEqual('typed', signatureType);
+
+    assert.ok(!(userFunction instanceof Function));
+    assert.ok(userFunction.format instanceof JsonInvocationFormat);
+  });
+
   it('throws an error if you try to register a function with an invalid URL', () => {
     // Valid function names
     const validFunctions = ['httpFunction', 'ceFunction', 'test-func'];

test/integration/typed.ts

@@ -98,7 +98,7 @@ describe('Typed Function', () => {
       name: 'POST malformatted JSON',
       requestBody: 'ASDF',
       expectedBody:
-        'Failed to parse malformatted JSON in request: Unexpected token A in JSON at position 0',
+        /Failed to parse malformatted JSON in request.*/,
       expectedStatus: 400,
       expectedCallCount: 0,
     },