From d2e72f5ba62b9f4647ebc23068e201897cd55752 Mon Sep 17 00:00:00 2001 From: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> Date: Tue, 14 May 2024 14:22:53 +0530 Subject: [PATCH 1/8] chore: add debug for wednesday Signed-off-by: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> --- v2/dedup/middleware.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/dedup/middleware.ts b/v2/dedup/middleware.ts index f36126b..c4c97c4 100644 --- a/v2/dedup/middleware.ts +++ b/v2/dedup/middleware.ts @@ -11,7 +11,7 @@ const filePath = 'dedupData.yaml'; export default function middleware( ): (req: Request, res: Response, next: NextFunction) => void { - // console.log("Inside middleware..."); + console.log("Inside middleware..."); // @ts-ignore fs.access(filePath, fs.constants.F_OK, (err) => { @@ -71,8 +71,8 @@ export function afterMiddleware(req: Request, res: Response) { fs.writeFileSync(filePath, yamlData, 'utf-8'); // Log to the console - // console.log("Executed lines by file:", executedLinesByFile); - // console.log("Data has been appended and logged to", filePath); + console.log("Executed lines by file:", executedLinesByFile); + console.log("Data has been appended and logged to", filePath); } // isJsonValid checks whether o is a valid JSON or not From b5a1d32715c4a12311ebe412a7ef2184d1d93f96 Mon Sep 17 00:00:00 2001 From: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> Date: Tue, 14 May 2024 16:07:04 +0530 Subject: [PATCH 2/8] chore: add debug for wednesday Signed-off-by: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> --- v2/dedup/register.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/v2/dedup/register.ts b/v2/dedup/register.ts index f93aa38..0796ced 100644 --- a/v2/dedup/register.ts +++ b/v2/dedup/register.ts @@ -8,6 +8,7 @@ const _ = require('lodash'); // @ts-ignore Hook(["express"], function (exports) { + console.log("Inside keploy hook..."); const expressApp = exports; function keployWrappedExpress() { const keployApp = expressApp(); From bc4f30bbb600d4793fa8af2e9b4f0dce257ea6e0 Mon Sep 17 00:00:00 2001 From: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> Date: Tue, 14 May 2024 18:06:49 +0530 Subject: [PATCH 3/8] chore: add khook in register Signed-off-by: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> --- v2/dedup/register.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/v2/dedup/register.ts b/v2/dedup/register.ts index 0796ced..4d79150 100644 --- a/v2/dedup/register.ts +++ b/v2/dedup/register.ts @@ -3,9 +3,9 @@ import Hook from "require-in-the-middle"; import expressMiddleware from "./middleware"; import bodyParser from "body-parser"; import cors from "cors"; -// import mixin from "merge-descriptors"; -const _ = require('lodash'); +const _ = require('lodash'); +const khook = "keployWrappedExpress"; // @ts-ignore Hook(["express"], function (exports) { console.log("Inside keploy hook..."); @@ -19,7 +19,7 @@ Hook(["express"], function (exports) { keployApp.appliedMiddleware = true; return keployApp; } - + // copy the properties and methods of exported Function object into wrapped Funtion(keployWrappedExpress). // In order to prevent "express._Method_ or express._Field_ is not declared" error. // mixin(keployWrappedExpress, expressApp, false); @@ -27,4 +27,4 @@ Hook(["express"], function (exports) { exports = keployWrappedExpress; return exports; }); -export { }; +export { khook }; From 6740a37c56454b61c548bbfb1dae3d295390adb1 Mon Sep 17 00:00:00 2001 From: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> Date: Wed, 15 May 2024 10:22:43 +0530 Subject: [PATCH 4/8] chore: add khook in register Signed-off-by: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> --- v2/dedup/register.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/dedup/register.ts b/v2/dedup/register.ts index 4d79150..6afaf17 100644 --- a/v2/dedup/register.ts +++ b/v2/dedup/register.ts @@ -27,4 +27,4 @@ Hook(["express"], function (exports) { exports = keployWrappedExpress; return exports; }); -export { khook }; +export { expressMiddleware }; From d7d1f5d76584b4991ae519632def8deb668bde35 Mon Sep 17 00:00:00 2001 From: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> Date: Wed, 15 May 2024 10:26:10 +0530 Subject: [PATCH 5/8] chore: add khook in register Signed-off-by: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> --- v2/dedup/register.ts | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/v2/dedup/register.ts b/v2/dedup/register.ts index 6afaf17..cec27d1 100644 --- a/v2/dedup/register.ts +++ b/v2/dedup/register.ts @@ -7,24 +7,24 @@ import cors from "cors"; const _ = require('lodash'); const khook = "keployWrappedExpress"; // @ts-ignore -Hook(["express"], function (exports) { - console.log("Inside keploy hook..."); - const expressApp = exports; - function keployWrappedExpress() { - const keployApp = expressApp(); +// Hook(["express"], function (exports) { +// console.log("Inside keploy hook..."); +// const expressApp = exports; +// function keployWrappedExpress() { +// const keployApp = expressApp(); - keployApp.use(bodyParser.json()); - keployApp.use(cors()); - keployApp.use(expressMiddleware()); - keployApp.appliedMiddleware = true; - return keployApp; - } +// keployApp.use(bodyParser.json()); +// keployApp.use(cors()); +// keployApp.use(expressMiddleware()); +// keployApp.appliedMiddleware = true; +// return keployApp; +// } - // copy the properties and methods of exported Function object into wrapped Funtion(keployWrappedExpress). - // In order to prevent "express._Method_ or express._Field_ is not declared" error. - // mixin(keployWrappedExpress, expressApp, false); - _.assign(keployWrappedExpress, expressApp); - exports = keployWrappedExpress; - return exports; -}); +// // copy the properties and methods of exported Function object into wrapped Funtion(keployWrappedExpress). +// // In order to prevent "express._Method_ or express._Field_ is not declared" error. +// // mixin(keployWrappedExpress, expressApp, false); +// _.assign(keployWrappedExpress, expressApp); +// exports = keployWrappedExpress; +// return exports; +// }); export { expressMiddleware }; From eac0754f200419475c1407e35ca2bc8c35ca4dca Mon Sep 17 00:00:00 2001 From: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> Date: Wed, 15 May 2024 10:54:14 +0530 Subject: [PATCH 6/8] chore: add khook in register Signed-off-by: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> --- v2/dedup/middleware.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/v2/dedup/middleware.ts b/v2/dedup/middleware.ts index c4c97c4..a3d41a0 100644 --- a/v2/dedup/middleware.ts +++ b/v2/dedup/middleware.ts @@ -128,3 +128,5 @@ function GetCoverage() { } return executedLinesByFile; } + +module.exports = middleware; \ No newline at end of file From 8246f85f52e5bb0a67ba969ae6e807c210f8e97e Mon Sep 17 00:00:00 2001 From: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> Date: Wed, 15 May 2024 11:42:16 +0530 Subject: [PATCH 7/8] chore: add khook in register Signed-off-by: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> --- v2/dedup/register.ts | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/v2/dedup/register.ts b/v2/dedup/register.ts index cec27d1..4d79150 100644 --- a/v2/dedup/register.ts +++ b/v2/dedup/register.ts @@ -7,24 +7,24 @@ import cors from "cors"; const _ = require('lodash'); const khook = "keployWrappedExpress"; // @ts-ignore -// Hook(["express"], function (exports) { -// console.log("Inside keploy hook..."); -// const expressApp = exports; -// function keployWrappedExpress() { -// const keployApp = expressApp(); +Hook(["express"], function (exports) { + console.log("Inside keploy hook..."); + const expressApp = exports; + function keployWrappedExpress() { + const keployApp = expressApp(); -// keployApp.use(bodyParser.json()); -// keployApp.use(cors()); -// keployApp.use(expressMiddleware()); -// keployApp.appliedMiddleware = true; -// return keployApp; -// } + keployApp.use(bodyParser.json()); + keployApp.use(cors()); + keployApp.use(expressMiddleware()); + keployApp.appliedMiddleware = true; + return keployApp; + } -// // copy the properties and methods of exported Function object into wrapped Funtion(keployWrappedExpress). -// // In order to prevent "express._Method_ or express._Field_ is not declared" error. -// // mixin(keployWrappedExpress, expressApp, false); -// _.assign(keployWrappedExpress, expressApp); -// exports = keployWrappedExpress; -// return exports; -// }); -export { expressMiddleware }; + // copy the properties and methods of exported Function object into wrapped Funtion(keployWrappedExpress). + // In order to prevent "express._Method_ or express._Field_ is not declared" error. + // mixin(keployWrappedExpress, expressApp, false); + _.assign(keployWrappedExpress, expressApp); + exports = keployWrappedExpress; + return exports; +}); +export { khook }; From c5e050a4adfe1d98e64fefb7297597832ff22d56 Mon Sep 17 00:00:00 2001 From: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> Date: Wed, 15 May 2024 17:31:22 +0530 Subject: [PATCH 8/8] refactor: add support for normal middleware Signed-off-by: Sarthak Shyngle <50234097+Sarthak160@users.noreply.github.com> --- v2/dedup/middleware.ts | 10 +++++----- v2/dedup/register.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/v2/dedup/middleware.ts b/v2/dedup/middleware.ts index a3d41a0..e9ab2e4 100644 --- a/v2/dedup/middleware.ts +++ b/v2/dedup/middleware.ts @@ -11,7 +11,7 @@ const filePath = 'dedupData.yaml'; export default function middleware( ): (req: Request, res: Response, next: NextFunction) => void { - console.log("Inside middleware..."); + // console.log("Inside middleware..."); // @ts-ignore fs.access(filePath, fs.constants.F_OK, (err) => { @@ -71,8 +71,8 @@ export function afterMiddleware(req: Request, res: Response) { fs.writeFileSync(filePath, yamlData, 'utf-8'); // Log to the console - console.log("Executed lines by file:", executedLinesByFile); - console.log("Data has been appended and logged to", filePath); + // console.log("Executed lines by file:", executedLinesByFile); + // console.log("Data has been appended and logged to", filePath); } // isJsonValid checks whether o is a valid JSON or not @@ -80,7 +80,7 @@ export function afterMiddleware(req: Request, res: Response) { let count = 0; const executedLinebyEachTest = new Array(); function GetCoverage() { - console.log("Inside GetCoverage"); + console.log("Calculating per request coverage..."); count++; let executedLinesByFile = {}; // iterate over global.__coverage__ @@ -123,7 +123,7 @@ function GetCoverage() { // @ts-ignore executedLinebyEachTest.push({ ...hitCounts }); - console.log("Executed lines by file:", executedLinesByFile); + // console.log("Executed lines by file:", executedLinesByFile); // extract s from the coverage data } return executedLinesByFile; diff --git a/v2/dedup/register.ts b/v2/dedup/register.ts index 4d79150..d00427a 100644 --- a/v2/dedup/register.ts +++ b/v2/dedup/register.ts @@ -8,7 +8,7 @@ const _ = require('lodash'); const khook = "keployWrappedExpress"; // @ts-ignore Hook(["express"], function (exports) { - console.log("Inside keploy hook..."); + // console.log("Inside keploy hook..."); const expressApp = exports; function keployWrappedExpress() { const keployApp = expressApp();