chore(deps): use gts v2

fixes issues #167 #148

Author: hdp617

.eslintignore

@@ -0,0 +1,3 @@
+**/node_modules
+build/
+test/

.eslintrc.json

@@ -0,0 +1,3 @@
+{
+    "extends": "./node_modules/gts"
+}

.prettierrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+    ...require('gts/.prettierrc.json')
+}

package-lock.json

@@ -43,7 +43,7 @@
     "@types/node": "11.15.20",
     "@types/on-finished": "2.3.1",
     "@types/supertest": "2.0.10",
-    "gts": "1.0.0",
+    "gts": "2.0.2",
     "mocha": "8.1.0",
     "power-assert": "1.6.1",
     "supertest": "4.0.2",

package.json

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import * as express from 'express';
-import { CloudEventsContext } from './functions';
+import {CloudEventsContext} from './functions';
 
 /**
  * Checks whether the incoming request is a CloudEvents event in binary content

src/cloudevents.ts

@@ -12,26 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import * as express from 'express';
 
 export interface HttpFunction {
-  // tslint:disable-next-line:no-any express interface.
   (req: express.Request, res: express.Response): any;
 }
 export interface EventFunction {
-  // tslint:disable-next-line:no-any
   (data: {}, context: Context): any;
 }
 export interface EventFunctionWithCallback {
-  // tslint:disable-next-line:no-any
   (data: {}, context: Context, callback: Function): any;
 }
 export interface CloudEventFunction {
-  // tslint:disable-next-line:no-any
   (cloudevent: CloudEventsContext): any;
 }
 export interface CloudEventFunctionWithCallback {
-  // tslint:disable-next-line:no-any
   (cloudevent: CloudEventsContext, callback: Function): any;
 }
 export type HandlerFunction =
@@ -101,7 +97,7 @@ export interface CloudEventsContext {
    */
   contenttype?: string;
 
-  // tslint:disable-next-line:no-any CloudEvents extension attributes.
+  // CloudEvents extension attributes.
   [key: string]: any;
 }
 

src/functions.ts

@@ -32,11 +32,11 @@
 //     unmarshalled as CloudEvents from an incoming request.
 
 import * as minimist from 'minimist';
-import { resolve } from 'path';
+import {resolve} from 'path';
 
-import { getUserFunction } from './loader';
+import {getUserFunction} from './loader';
 
-import { ErrorHandler, SignatureType, getServer } from './invoker';
+import {ErrorHandler, SignatureType, getServer} from './invoker';
 
 // Supported command-line flags
 const FLAG = {
@@ -80,6 +80,7 @@ if (SIGNATURE_TYPE === undefined) {
       SignatureType
     ).join(', ')}.`
   );
+  // eslint-disable-next-line no-process-exit
   process.exit(1);
 }
 
@@ -91,12 +92,14 @@ if (process.argv[2] === '-h' || process.argv[2] === '--help') {
 Documentation:
   https://github.com/GoogleCloudPlatform/functions-framework-nodejs`
   );
+  // eslint-disable-next-line no-process-exit
   process.exit(0);
 }
 
 const USER_FUNCTION = getUserFunction(CODE_LOCATION, TARGET);
 if (!USER_FUNCTION) {
   console.error('Could not load the function, shutting down.');
+  // eslint-disable-next-line no-process-exit
   process.exit(1);
 }
 

src/index.ts

@@ -21,14 +21,15 @@
 //     functions with HTTP trigger).
 
 import * as bodyParser from 'body-parser';
+// eslint-disable-next-line node/no-deprecated-api
 import * as domain from 'domain';
 import * as express from 'express';
 import * as http from 'http';
 import * as onFinished from 'on-finished';
 
-import { FUNCTION_STATUS_HEADER_FIELD } from './types';
-import { logAndSendError } from './logger';
-import { isBinaryCloudEvent, getBinaryCloudEventContext } from './cloudevents';
+import {FUNCTION_STATUS_HEADER_FIELD} from './types';
+import {logAndSendError} from './logger';
+import {isBinaryCloudEvent, getBinaryCloudEventContext} from './cloudevents';
 import {
   HttpFunction,
   EventFunction,
@@ -41,6 +42,7 @@ import {
 // We optionally annotate the express Request with a rawBody field.
 // Express leaves the Express namespace open to allow merging of new fields.
 declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Express {
     export interface Request {
       rawBody?: Buffer;
@@ -63,7 +65,7 @@ let latestRes: express.Response | null = null;
  * @param err Error from function execution.
  * @param res Express response object.
  */
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function sendResponse(result: any, err: Error | null, res: express.Response) {
   if (err) {
     res.set(FUNCTION_STATUS_HEADER_FIELD, 'error');
@@ -131,7 +133,7 @@ function wrapCloudEventFunction(
 ): HttpFunction {
   return (req: express.Request, res: express.Response) => {
     const callback = process.domain.bind(
-      // tslint:disable-next-line:no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (err: Error | null, result: any) => {
         if (res.locals.functionExecutionFinished) {
           console.log('Ignoring extra callback call');
@@ -184,7 +186,7 @@ function wrapEventFunction(
   return (req: express.Request, res: express.Response) => {
     const event = req.body;
     const callback = process.domain.bind(
-      // tslint:disable-next-line:no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (err: Error | null, result: any) => {
         if (res.locals.functionExecutionFinished) {
           console.log('Ignoring extra callback call');
@@ -251,6 +253,7 @@ function registerFunctionRoutes(
   if (functionSignatureType === SignatureType.HTTP) {
     app.use('/favicon.ico|/robots.txt', (req, res, next) => {
       res.sendStatus(404);
+      next();
     });
 
     app.use('/*', (req, res, next) => {
@@ -266,17 +269,17 @@ function registerFunctionRoutes(
     });
   } else if (functionSignatureType === SignatureType.EVENT) {
     app.post('/*', (req, res, next) => {
-      const wrappedUserFunction = wrapEventFunction(userFunction as
-        | EventFunction
-        | EventFunctionWithCallback);
+      const wrappedUserFunction = wrapEventFunction(
+        userFunction as EventFunction | EventFunctionWithCallback
+      );
       const handler = makeHttpHandler(wrappedUserFunction);
       handler(req, res, next);
     });
   } else {
     app.post('/*', (req, res, next) => {
-      const wrappedUserFunction = wrapCloudEventFunction(userFunction as
-        | CloudEventFunction
-        | CloudEventFunctionWithCallback);
+      const wrappedUserFunction = wrapCloudEventFunction(
+        userFunction as CloudEventFunction | CloudEventFunctionWithCallback
+      );
       const handler = makeHttpHandler(wrappedUserFunction);
       handler(req, res, next);
     });
@@ -318,6 +321,7 @@ export class ErrorHandler {
       process.on(signal as NodeJS.Signals, () => {
         console.log(`Received ${signal}`);
         this.server.close(() => {
+          // eslint-disable-next-line no-process-exit
           process.exit();
         });
       });

src/invoker.ts

@@ -21,7 +21,7 @@
 /**
  * Import function signature type's definition.
  */
-import { HandlerFunction } from './functions';
+import {HandlerFunction} from './functions';
 
 /**
  * Returns user's function from function file.
@@ -39,6 +39,7 @@ export function getUserFunction(
       return null;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const functionModule = require(functionModulePath);
     let userFunction = functionTarget
       .split('.')
@@ -52,6 +53,7 @@ export function getUserFunction(
 
     // TODO: do we want 'function' fallback?
     if (typeof userFunction === 'undefined') {
+      // eslint-disable-next-line no-prototype-builtins
       if (functionModule.hasOwnProperty('function')) {
         userFunction = functionModule['function'];
       } else {
@@ -104,7 +106,9 @@ function getFunctionModulePath(codeLocation: string): string | null {
     try {
       // TODO: Decide if we want to keep this fallback.
       path = require.resolve(codeLocation + '/function.js');
-    } catch (ex) {}
+    } catch (ex) {
+      return path;
+    }
   }
   return path;
 }

src/loader.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import * as express from 'express';
-import { FUNCTION_STATUS_HEADER_FIELD } from './types';
+import {FUNCTION_STATUS_HEADER_FIELD} from './types';
 
 /**
  * Logs an error message and sends back an error response to the incoming
@@ -23,7 +23,7 @@ import { FUNCTION_STATUS_HEADER_FIELD } from './types';
  * @param callback A function to be called synchronously.
  */
 export function logAndSendError(
-  // tslint:disable-next-line:no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   err: Error | any,
   res: express.Response | null,
   callback?: Function