Changed functions constructor

Author: stevenkellner

.mocharc.js

@@ -12,7 +12,7 @@ module.exports = {
         'test/firebaseProject/**/*.ts'
     ],
     slow: 75,
-    timeout: 5000,
+    timeout: 30000,
     ui: 'bdd',
     'watch-files': [
         'test/**/*.test.ts'

src/admin/functions/FirebaseFunction.ts

@@ -11,14 +11,20 @@ export abstract class FirebaseFunction<Parameters, ReturnType> {
 
     protected logger = new Logger(new FunctionsLogger());
 
+    public userId: string | null = null;
+
     public abstract parametersBuilder: ITypeBuilder<Flattable.Flatten<Parameters>, Parameters>;
 
+    protected constructor(functionName: string) {
+        this.logger.notice(`${functionName}.constructor`);
+    }
+
     public abstract execute(parameters: Parameters): Promise<ReturnType>;
 }
 
 export namespace FirebaseFunction {
 
-    export type Constructor<Parameters, ReturnType> = new (userId: string | null) => FirebaseFunction<Parameters, ReturnType>;
+    export type Constructor<Parameters, ReturnType> = new () => FirebaseFunction<Parameters, ReturnType>;
 
     export class ConstructorWrapper<Parameters, ReturnType> {
 
@@ -45,7 +51,8 @@ export namespace FirebaseFunction {
                     throw new FunctionsError('failed-precondition', 'Invalid MAC tag');
 
                 const userId = request.auth !== undefined ? request.auth.uid : null;
-                const firebaseFunction = new FirebaseFunction(userId);
+                const firebaseFunction = new FirebaseFunction();
+                firebaseFunction.userId = userId;
                 const parameters = firebaseFunction.parametersBuilder.build(request.data.parameters);
                 return firebaseFunction.execute(parameters);
             });

src/admin/functions/FirebaseRequest.ts

@@ -12,6 +12,10 @@ export abstract class FirebaseRequest<Parameters, ReturnType> {
 
     public abstract parametersBuilder: ITypeBuilder<Flattable.Flatten<Parameters>, Parameters>;
 
+    protected constructor(requestName: string) {
+        this.logger.notice(`${requestName}.constructor`);
+    }
+
     public abstract execute(parameters: Parameters): Promise<ReturnType>;
 }
 

src/admin/functions/FirebaseSchedule.ts

@@ -8,6 +8,10 @@ export abstract class FirebaseSchedule {
 
     protected logger = new Logger(new FunctionsLogger());
 
+    protected constructor(scheduleName: string) {
+        this.logger.notice(`${scheduleName}.constructor`);
+    }
+
     public abstract execute(): Promise<void>;
 }
 

test/firebaseProject/functions/src/FirebaseFunction.ts

@@ -11,9 +11,8 @@ export class TestFirebaseFunction extends FirebaseFunction<TestParameters, TestR
         v3: SubParameter.typeBuilder,
     });
 
-    public constructor(userId: string | null) {
-        super();
-        this.logger.notice("TestFirebaseFunction.constructor");
+    public constructor() {
+        super("TestFirebaseFunction");
     }
 
     public async execute(parameters: TestParameters): Promise<TestReturnType> {

test/firebaseProject/functions/src/FirebaseRequest.ts

@@ -12,8 +12,7 @@ export class TestFirebaseRequest extends FirebaseRequest<TestParameters, TestRet
     });
 
     public constructor() {
-        super();
-        this.logger.notice("TestFirebaseFunction.constructor");
+        super("TestFirebaseFunction");
     }
 
     public async execute(parameters: TestParameters): Promise<TestReturnType> {

test/firebaseProject/functions/src/FirebaseSchedule.ts

@@ -3,8 +3,7 @@ import { FirebaseSchedule } from "../../../../lib/admin";
 export class TestFirebaseSchedule extends FirebaseSchedule {
 
     public constructor() {
-        super();
-        this.logger.notice("TestFirebaseSchedule.constructor");
+        super("TestFirebaseSchedule");
     }
 
     public async execute(): Promise<void> {