serverless-spy 0.0.35 → 0.0.37

package/lib/src/common/envVariableNames.d.ts

@@ -13,7 +13,11 @@ export declare enum envVariableNames {
     SSPY_WS_ENDPOINT = "SSPY_WS_ENDPOINT",
     SSPY_FUNCTION_NAME = "SSPY_FUNCTION_NAME",
     /**
-     *DynamoDB table name that stores active websocket connections.
+     * DynamoDB table name that stores active websocket connections.
      */
-    SSPY_WS_TABLE_NAME = "SSPY_WS_TABLE_NAME"
+    SSPY_WS_TABLE_NAME = "SSPY_WS_TABLE_NAME",
+    /**
+     * Log debugging details.
+     */
+    SSPY_DEBUG = "SSPY_DEBUG"
 }

package/lib/src/common/envVariableNames.js

@@ -19,8 +19,12 @@ var envVariableNames;
     envVariableNames["SSPY_WS_ENDPOINT"] = "SSPY_WS_ENDPOINT";
     envVariableNames["SSPY_FUNCTION_NAME"] = "SSPY_FUNCTION_NAME";
     /**
-     *DynamoDB table name that stores active websocket connections.
+     * DynamoDB table name that stores active websocket connections.
      */
     envVariableNames["SSPY_WS_TABLE_NAME"] = "SSPY_WS_TABLE_NAME";
+    /**
+     * Log debugging details.
+     */
+    envVariableNames["SSPY_DEBUG"] = "SSPY_DEBUG";
 })(envVariableNames = exports.envVariableNames || (exports.envVariableNames = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52VmFyaWFibGVOYW1lcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tb24vZW52VmFyaWFibGVOYW1lcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEVBQTBFO0FBQzFFLG9EQUFvRDs7O0FBRXBELElBQVksZ0JBc0JYO0FBdEJELFdBQVksZ0JBQWdCO0lBQzFCOztPQUVHO0lBQ0gscUVBQWlELENBQUE7SUFFakQ7O09BRUc7SUFDSCw2REFBeUMsQ0FBQTtJQUV6Qzs7T0FFRztJQUNILHlEQUFxQyxDQUFBO0lBRXJDLDZEQUF5QyxDQUFBO0lBRXpDOztPQUVHO0lBQ0gsNkRBQXlDLENBQUE7QUFDM0MsQ0FBQyxFQXRCVyxnQkFBZ0IsR0FBaEIsd0JBQWdCLEtBQWhCLHdCQUFnQixRQXNCM0IiLCJzb3VyY2VzQ29udGVudCI6WyIvL3RoaXMgZmlsZSBpcyBub3QgdW5kZXIgcm9vdCAtPiBjb21tb24gZm9sZGVyIGJlY2F1c2UganNpaSBkb2VzIG5vdCBhbGxvd1xuLy9jaGFuZ2luZyB0c2NvbmZpbmcuanNvbiB0byByZW1vdmUgcm9vdERpciBwcm9wZXJ0eVxuXG5leHBvcnQgZW51bSBlbnZWYXJpYWJsZU5hbWVzIHtcbiAgLyoqXG4gICAqIE5vdGUgdGhhdCB0aGUgZnVuY3Rpb24gaXMgc3Vic2NyaWJlZCB0byBTUVMsIHNvIHdlIG5lZWQgdG8gc2VuZCBzcHkgZXZlbnRzIGFzIGl0IGNvbWVzIGZyb20gU1FTLlxuICAgKi9cbiAgU1NQWV9TVUJTQ1JJQkVEX1RPX1NRUyA9ICdTU1BZX1NVQlNDUklCRURfVE9fU1FTJyxcblxuICAvKipcbiAgICogTWFwcGluZyBvZiByZXNvdXJjZSBBUk5zIHRvIHNlcnZpY2Uga2V5c1xuICAgKi9cbiAgU1NQWV9JTkZSQV9NQVBQSU5HID0gJ1NTUFlfSU5GUkFfTUFQUElORycsXG5cbiAgLyoqXG4gICAqIFdlYiBzb2NrZXQgZW5kcG9pbnQgZm9yIHNlbmRpbmcgYW5kIHJlY2VpdmluZyBzcHkgZXZlbnRzLlxuICAgKi9cbiAgU1NQWV9XU19FTkRQT0lOVCA9ICdTU1BZX1dTX0VORFBPSU5UJyxcblxuICBTU1BZX0ZVTkNUSU9OX05BTUUgPSAnU1NQWV9GVU5DVElPTl9OQU1FJyxcblxuICAvKipcbiAgICpEeW5hbW9EQiB0YWJsZSBuYW1lIHRoYXQgc3RvcmVzIGFjdGl2ZSB3ZWJzb2NrZXQgY29ubmVjdGlvbnMuXG4gICAqL1xuICBTU1BZX1dTX1RBQkxFX05BTUUgPSAnU1NQWV9XU19UQUJMRV9OQU1FJyxcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52VmFyaWFibGVOYW1lcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tb24vZW52VmFyaWFibGVOYW1lcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEVBQTBFO0FBQzFFLG9EQUFvRDs7O0FBRXBELElBQVksZ0JBMkJYO0FBM0JELFdBQVksZ0JBQWdCO0lBQzFCOztPQUVHO0lBQ0gscUVBQWlELENBQUE7SUFFakQ7O09BRUc7SUFDSCw2REFBeUMsQ0FBQTtJQUV6Qzs7T0FFRztJQUNILHlEQUFxQyxDQUFBO0lBRXJDLDZEQUF5QyxDQUFBO0lBRXpDOztPQUVHO0lBQ0gsNkRBQXlDLENBQUE7SUFFekM7O09BRUc7SUFDSCw2Q0FBeUIsQ0FBQTtBQUMzQixDQUFDLEVBM0JXLGdCQUFnQixHQUFoQix3QkFBZ0IsS0FBaEIsd0JBQWdCLFFBMkIzQiIsInNvdXJjZXNDb250ZW50IjpbIi8vdGhpcyBmaWxlIGlzIG5vdCB1bmRlciByb290IC0+IGNvbW1vbiBmb2xkZXIgYmVjYXVzZSBqc2lpIGRvZXMgbm90IGFsbG93XG4vL2NoYW5naW5nIHRzY29uZmluZy5qc29uIHRvIHJlbW92ZSByb290RGlyIHByb3BlcnR5XG5cbmV4cG9ydCBlbnVtIGVudlZhcmlhYmxlTmFtZXMge1xuICAvKipcbiAgICogTm90ZSB0aGF0IHRoZSBmdW5jdGlvbiBpcyBzdWJzY3JpYmVkIHRvIFNRUywgc28gd2UgbmVlZCB0byBzZW5kIHNweSBldmVudHMgYXMgaXQgY29tZXMgZnJvbSBTUVMuXG4gICAqL1xuICBTU1BZX1NVQlNDUklCRURfVE9fU1FTID0gJ1NTUFlfU1VCU0NSSUJFRF9UT19TUVMnLFxuXG4gIC8qKlxuICAgKiBNYXBwaW5nIG9mIHJlc291cmNlIEFSTnMgdG8gc2VydmljZSBrZXlzXG4gICAqL1xuICBTU1BZX0lORlJBX01BUFBJTkcgPSAnU1NQWV9JTkZSQV9NQVBQSU5HJyxcblxuICAvKipcbiAgICogV2ViIHNvY2tldCBlbmRwb2ludCBmb3Igc2VuZGluZyBhbmQgcmVjZWl2aW5nIHNweSBldmVudHMuXG4gICAqL1xuICBTU1BZX1dTX0VORFBPSU5UID0gJ1NTUFlfV1NfRU5EUE9JTlQnLFxuXG4gIFNTUFlfRlVOQ1RJT05fTkFNRSA9ICdTU1BZX0ZVTkNUSU9OX05BTUUnLFxuXG4gIC8qKlxuICAgKiBEeW5hbW9EQiB0YWJsZSBuYW1lIHRoYXQgc3RvcmVzIGFjdGl2ZSB3ZWJzb2NrZXQgY29ubmVjdGlvbnMuXG4gICAqL1xuICBTU1BZX1dTX1RBQkxFX05BTUUgPSAnU1NQWV9XU19UQUJMRV9OQU1FJyxcblxuICAvKipcbiAgICogTG9nIGRlYnVnZ2luZyBkZXRhaWxzLlxuICAgKi9cbiAgU1NQWV9ERUJVRyA9ICdTU1BZX0RFQlVHJyxcbn1cbiJdfQ==

package/lib/src/common/envVariableNames.mjs

@@ -16,8 +16,12 @@ export var envVariableNames;
     envVariableNames["SSPY_WS_ENDPOINT"] = "SSPY_WS_ENDPOINT";
     envVariableNames["SSPY_FUNCTION_NAME"] = "SSPY_FUNCTION_NAME";
     /**
-     *DynamoDB table name that stores active websocket connections.
+     * DynamoDB table name that stores active websocket connections.
      */
     envVariableNames["SSPY_WS_TABLE_NAME"] = "SSPY_WS_TABLE_NAME";
+    /**
+     * Log debugging details.
+     */
+    envVariableNames["SSPY_DEBUG"] = "SSPY_DEBUG";
 })(envVariableNames || (envVariableNames = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52VmFyaWFibGVOYW1lcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tb24vZW52VmFyaWFibGVOYW1lcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwwRUFBMEU7QUFDMUUsb0RBQW9EO0FBRXBELE1BQU0sQ0FBTixJQUFZLGdCQXNCWDtBQXRCRCxXQUFZLGdCQUFnQjtJQUMxQjs7T0FFRztJQUNILHFFQUFpRCxDQUFBO0lBRWpEOztPQUVHO0lBQ0gsNkRBQXlDLENBQUE7SUFFekM7O09BRUc7SUFDSCx5REFBcUMsQ0FBQTtJQUVyQyw2REFBeUMsQ0FBQTtJQUV6Qzs7T0FFRztJQUNILDZEQUF5QyxDQUFBO0FBQzNDLENBQUMsRUF0QlcsZ0JBQWdCLEtBQWhCLGdCQUFnQixRQXNCM0IiLCJzb3VyY2VzQ29udGVudCI6WyIvL3RoaXMgZmlsZSBpcyBub3QgdW5kZXIgcm9vdCAtPiBjb21tb24gZm9sZGVyIGJlY2F1c2UganNpaSBkb2VzIG5vdCBhbGxvd1xuLy9jaGFuZ2luZyB0c2NvbmZpbmcuanNvbiB0byByZW1vdmUgcm9vdERpciBwcm9wZXJ0eVxuXG5leHBvcnQgZW51bSBlbnZWYXJpYWJsZU5hbWVzIHtcbiAgLyoqXG4gICAqIE5vdGUgdGhhdCB0aGUgZnVuY3Rpb24gaXMgc3Vic2NyaWJlZCB0byBTUVMsIHNvIHdlIG5lZWQgdG8gc2VuZCBzcHkgZXZlbnRzIGFzIGl0IGNvbWVzIGZyb20gU1FTLlxuICAgKi9cbiAgU1NQWV9TVUJTQ1JJQkVEX1RPX1NRUyA9ICdTU1BZX1NVQlNDUklCRURfVE9fU1FTJyxcblxuICAvKipcbiAgICogTWFwcGluZyBvZiByZXNvdXJjZSBBUk5zIHRvIHNlcnZpY2Uga2V5c1xuICAgKi9cbiAgU1NQWV9JTkZSQV9NQVBQSU5HID0gJ1NTUFlfSU5GUkFfTUFQUElORycsXG5cbiAgLyoqXG4gICAqIFdlYiBzb2NrZXQgZW5kcG9pbnQgZm9yIHNlbmRpbmcgYW5kIHJlY2VpdmluZyBzcHkgZXZlbnRzLlxuICAgKi9cbiAgU1NQWV9XU19FTkRQT0lOVCA9ICdTU1BZX1dTX0VORFBPSU5UJyxcblxuICBTU1BZX0ZVTkNUSU9OX05BTUUgPSAnU1NQWV9GVU5DVElPTl9OQU1FJyxcblxuICAvKipcbiAgICpEeW5hbW9EQiB0YWJsZSBuYW1lIHRoYXQgc3RvcmVzIGFjdGl2ZSB3ZWJzb2NrZXQgY29ubmVjdGlvbnMuXG4gICAqL1xuICBTU1BZX1dTX1RBQkxFX05BTUUgPSAnU1NQWV9XU19UQUJMRV9OQU1FJyxcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52VmFyaWFibGVOYW1lcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tb24vZW52VmFyaWFibGVOYW1lcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwwRUFBMEU7QUFDMUUsb0RBQW9EO0FBRXBELE1BQU0sQ0FBTixJQUFZLGdCQTJCWDtBQTNCRCxXQUFZLGdCQUFnQjtJQUMxQjs7T0FFRztJQUNILHFFQUFpRCxDQUFBO0lBRWpEOztPQUVHO0lBQ0gsNkRBQXlDLENBQUE7SUFFekM7O09BRUc7SUFDSCx5REFBcUMsQ0FBQTtJQUVyQyw2REFBeUMsQ0FBQTtJQUV6Qzs7T0FFRztJQUNILDZEQUF5QyxDQUFBO0lBRXpDOztPQUVHO0lBQ0gsNkNBQXlCLENBQUE7QUFDM0IsQ0FBQyxFQTNCVyxnQkFBZ0IsS0FBaEIsZ0JBQWdCLFFBMkIzQiIsInNvdXJjZXNDb250ZW50IjpbIi8vdGhpcyBmaWxlIGlzIG5vdCB1bmRlciByb290IC0+IGNvbW1vbiBmb2xkZXIgYmVjYXVzZSBqc2lpIGRvZXMgbm90IGFsbG93XG4vL2NoYW5naW5nIHRzY29uZmluZy5qc29uIHRvIHJlbW92ZSByb290RGlyIHByb3BlcnR5XG5cbmV4cG9ydCBlbnVtIGVudlZhcmlhYmxlTmFtZXMge1xuICAvKipcbiAgICogTm90ZSB0aGF0IHRoZSBmdW5jdGlvbiBpcyBzdWJzY3JpYmVkIHRvIFNRUywgc28gd2UgbmVlZCB0byBzZW5kIHNweSBldmVudHMgYXMgaXQgY29tZXMgZnJvbSBTUVMuXG4gICAqL1xuICBTU1BZX1NVQlNDUklCRURfVE9fU1FTID0gJ1NTUFlfU1VCU0NSSUJFRF9UT19TUVMnLFxuXG4gIC8qKlxuICAgKiBNYXBwaW5nIG9mIHJlc291cmNlIEFSTnMgdG8gc2VydmljZSBrZXlzXG4gICAqL1xuICBTU1BZX0lORlJBX01BUFBJTkcgPSAnU1NQWV9JTkZSQV9NQVBQSU5HJyxcblxuICAvKipcbiAgICogV2ViIHNvY2tldCBlbmRwb2ludCBmb3Igc2VuZGluZyBhbmQgcmVjZWl2aW5nIHNweSBldmVudHMuXG4gICAqL1xuICBTU1BZX1dTX0VORFBPSU5UID0gJ1NTUFlfV1NfRU5EUE9JTlQnLFxuXG4gIFNTUFlfRlVOQ1RJT05fTkFNRSA9ICdTU1BZX0ZVTkNUSU9OX05BTUUnLFxuXG4gIC8qKlxuICAgKiBEeW5hbW9EQiB0YWJsZSBuYW1lIHRoYXQgc3RvcmVzIGFjdGl2ZSB3ZWJzb2NrZXQgY29ubmVjdGlvbnMuXG4gICAqL1xuICBTU1BZX1dTX1RBQkxFX05BTUUgPSAnU1NQWV9XU19UQUJMRV9OQU1FJyxcblxuICAvKipcbiAgICogTG9nIGRlYnVnZ2luZyBkZXRhaWxzLlxuICAgKi9cbiAgU1NQWV9ERUJVRyA9ICdTU1BZX0RFQlVHJyxcbn1cbiJdfQ==

package/listener/ServerlessSpyListenerParams.ts

@@ -3,4 +3,5 @@ import { Credentials } from '@aws-sdk/types';
 export type ServerlessSpyListenerParams = {
   serverlessSpyWsUrl: string;
   credentials?: Credentials;
+  debugMode?: boolean;
 };

package/listener/SpyHandlers.ts.ts

@@ -1,6 +1,7 @@
 import { DynamoDBSpyEvent } from '../common/spyEvents/DynamoDBSpyEvent';
 import { EventBridgeRuleSpyEvent } from '../common/spyEvents/EventBridgeRuleSpyEvent';
 import { EventBridgeSpyEvent } from '../common/spyEvents/EventBridgeSpyEvent';
+import { FunctionConsole } from '../common/spyEvents/FunctionConsole';
 import { FunctionConsoleSpyEvent } from '../common/spyEvents/FunctionConsoleSpyEvent';
 import { FunctionContext } from '../common/spyEvents/FunctionContext';
 import { FunctionRequestSpyEvent } from '../common/spyEvents/FunctionRequestSpyEvent';
@@ -112,13 +113,26 @@ export interface FunctionBaseSpyHandler<TData = any>
     FunctionRequestSpyEvent<TData>,
     FunctionRequestSpyHandler<TData>
   > {
-  // follwedByConsoleLog: () => Promise<
-  //   FunctionBaseSpyHandler<TData> &
-  //     JestExpectWithSpyMethods<
-  //       FunctionRequestSpyEvent<TData>,
-  //       FunctionRequestSpyHandler<TData>
-  //     >
-  // >;
+  followedByConsole: (
+    // This implementation confuses TypeScript which does not accurately display the type.
+    param?: {
+      condition?: (event: {
+        spyEventType: 'FunctionConsole';
+        request: TData;
+        context: FunctionContext;
+        console: FunctionConsole;
+      }) => boolean;
+      timoutMs?: number;
+    }
+  ) => Promise<
+    FunctionBaseSpyHandler<TData> &
+      FunctionConsoleSpyHandler<TData> &
+      JestExpectWithSpyMethods<
+        FunctionConsoleSpyEvent<TData>,
+        FunctionRequestSpyHandler<TData>
+      >
+  >;
+
   followedByResponse: <TDataResponse = any>(
     // This implementation confuses TypeScript which does not accurately display the type.
     // Leave it for reference!
@@ -137,7 +151,7 @@ export interface FunctionBaseSpyHandler<TData = any>
       timoutMs?: number;
     }
   ) => Promise<
-    FunctionResponseSpyHandler &
+    FunctionResponseSpyHandler<TData> &
       JestExpectWithSpyMethods<
         FunctionRequestSpyEvent<TData>,
         FunctionRequestSpyHandler<TData>
@@ -151,8 +165,55 @@ export interface FunctionRequestSpyHandler<TData = any>
 }
 
 export interface FunctionConsoleSpyHandler<TData = any>
-  extends FunctionBaseSpyHandler<TData> {
+  extends JestExpectWithSpyMethods<
+    FunctionConsoleSpyEvent<TData>,
+    FunctionConsoleSpyHandler<TData>
+  > {
   getData: () => PrettifyForDisplay<FunctionConsoleSpyEvent<TData>>;
+  followedByConsole: (
+    // This implementation confuses TypeScript which does not accurately display the type.
+    param?: {
+      condition?: (event: {
+        spyEventType: 'FunctionConsole';
+        request: TData;
+        context: FunctionContext;
+        console: FunctionConsole;
+      }) => boolean;
+      timoutMs?: number;
+    }
+  ) => Promise<
+    FunctionBaseSpyHandler<TData> &
+      FunctionConsoleSpyHandler<TData> &
+      JestExpectWithSpyMethods<
+        FunctionConsoleSpyEvent<TData>,
+        FunctionRequestSpyHandler<TData>
+      >
+  >;
+
+  followedByResponse: <TDataResponse = any>(
+    // This implementation confuses TypeScript which does not accurately display the type.
+    // Leave it for reference!
+    // param: PrettifyForDisplay<
+    //   WaitForParams<
+    //     PrettifyForDisplay<FunctionResponseSpyEvent<TData, TDataResponse>>
+    //   >
+    // >
+    param?: {
+      condition?: (event: {
+        spyEventType: 'FunctionResponse';
+        request: TData;
+        context: FunctionContext;
+        response: TDataResponse;
+      }) => boolean;
+      timoutMs?: number;
+    }
+  ) => Promise<
+    FunctionResponseSpyHandler<TData> &
+      JestExpectWithSpyMethods<
+        FunctionRequestSpyEvent<TData>,
+        FunctionRequestSpyHandler<TData>
+      >
+  >;
 }
 
 export interface FunctionResponseSpyHandler<TData = any>

package/listener/WsListener.ts

@@ -1,5 +1,5 @@
 import { WebSocket } from 'ws';
-import { getWebSocketUrl } from '../common/getWebSocketUrl';
+import { getSignedWebSocketUrl } from '../common/getWebSocketUrl';
 import { FunctionRequestSpyEvent } from '../common/spyEvents/FunctionRequestSpyEvent';
 import { SpyEvent } from '../common/spyEvents/SpyEvent';
 import { SpyMessage } from '../common/spyEvents/SpyMessage';
@@ -16,13 +16,16 @@ export class WsListener<TSpyEvents> {
   private ws?: WebSocket;
   private closed = true;
   private functionPrefix = 'waitFor';
+  private debugMode = false;
+
+  public async start(params: ServerlessSpyListenerParams) {
+    this.debugMode = !!params.debugMode;
 
-  async start(params: ServerlessSpyListenerParams) {
     this.waitForConnection = new Promise((resolve) => {
       this.connectionOpenResolve = resolve;
     });
 
-    const urlSigned = await getWebSocketUrl(
+    const urlSigned = await getSignedWebSocketUrl(
       params.serverlessSpyWsUrl,
       params.credentials
     );
@@ -30,11 +33,14 @@ export class WsListener<TSpyEvents> {
     this.ws = new WebSocket(urlSigned);
     this.closed = false;
     this.ws.on('open', () => {
+      this.log('Connection oppened');
       this.connectionOpenResolve!();
     });
     this.ws.on('message', (data) => {
       if (this.closed) return;
 
+      this.log('Message received', data);
+
       const message = JSON.parse(data.toString()) as SpyMessageStorage;
 
       message.serviceKeyForFunction = message.serviceKey.replace(/#/g, '');
@@ -49,19 +55,20 @@ export class WsListener<TSpyEvents> {
       this.resolveOldTrackerWithNewMessage(message);
     });
     this.ws.on('close', () => {
+      this.log('Connection closed');
+
       this.closed = true;
-      //console.log('disconnected ' + new Date().toISOString());
     });
 
     await this.waitForConnection;
   }
 
-  async stop() {
+  public async stop() {
     this.closed = true;
     this.ws!.close();
   }
 
-  trackerMatchMessage(tracker: Tracker, message: SpyMessageStorage) {
+  private trackerMatchMessage(tracker: Tracker, message: SpyMessageStorage) {
     if (tracker.finished) return;
 
     if (
@@ -83,27 +90,30 @@ export class WsListener<TSpyEvents> {
           (serviceKeyForFunction.endsWith('Request') ||
             serviceKeyForFunction.endsWith('Console'))
         ) {
-          let serviceKeyForFunctionResponse = serviceKeyForFunction;
-
-          if (serviceKeyForFunctionResponse.endsWith('Request')) {
-            serviceKeyForFunctionResponse =
-              serviceKeyForFunctionResponse.substring(
-                0,
-                serviceKeyForFunctionResponse.length - 'Request'.length
-              );
-          } else if (serviceKeyForFunctionResponse.endsWith('Console')) {
-            serviceKeyForFunctionResponse =
-              serviceKeyForFunctionResponse.substring(
-                0,
-                serviceKeyForFunctionResponse.length - 'Console'.length
-              );
+          let serviceKeyForFunctionChain = serviceKeyForFunction;
+
+          if (serviceKeyForFunctionChain.endsWith('Request')) {
+            serviceKeyForFunctionChain = serviceKeyForFunctionChain.substring(
+              0,
+              serviceKeyForFunctionChain.length - 'Request'.length
+            );
+          } else if (serviceKeyForFunctionChain.endsWith('Console')) {
+            serviceKeyForFunctionChain = serviceKeyForFunctionChain.substring(
+              0,
+              serviceKeyForFunctionChain.length - 'Console'.length
+            );
           }
 
-          serviceKeyForFunctionResponse += 'Response';
+          spyAndJestMatchers.followedByConsole = (paramsW: WaitForParams) => {
+            return this.createWaitForXXXFunc(
+              `${serviceKeyForFunctionChain}Console`,
+              (message.data as FunctionRequestSpyEvent).context.awsRequestId
+            )(paramsW);
+          };
 
           spyAndJestMatchers.followedByResponse = (paramsW: WaitForParams) => {
             return this.createWaitForXXXFunc(
-              serviceKeyForFunctionResponse,
+              `${serviceKeyForFunctionChain}Response`,
               (message.data as FunctionRequestSpyEvent).context.awsRequestId
             )(paramsW);
           };
@@ -179,7 +189,7 @@ export class WsListener<TSpyEvents> {
     }
   }
 
-  public createWaitForXXXFunc(
+  private createWaitForXXXFunc(
     serviceKeyForFunction: string,
     functionContextAwsRequestId?: string
   ) {
@@ -195,7 +205,6 @@ export class WsListener<TSpyEvents> {
       };
     });
 
-    //waitForXXXFunc
     return (paramsW?: WaitForParams<SpyEvent>) => {
       tracker.condition = paramsW?.condition;
 
@@ -253,6 +262,12 @@ export class WsListener<TSpyEvents> {
 
     return proxy as ServerlessSpyListener<TSpyEvents>;
   }
+
+  private log(message: string, ...optionalParams: any[]) {
+    if (this.debugMode) {
+      console.debug('SSPY', message, ...optionalParams);
+    }
+  }
 }
 
 type Tracker = {

package/package.json

@@ -32,7 +32,8 @@
     "lint": "eslint **/*.ts",
     "lint-fix": "eslint --fix './**/*.ts'",
     "pretty": "prettier --write '**/*.ts'",
-    "bundle-extension": "scripts/run-task bundle-extension"
+    "bundle-extension": "scripts/run-task bundle-extension",
+    "cli": "scripts/run-task cli"
   },
   "author": {
     "name": "Marko (ServerlessLife.com)",
@@ -78,7 +79,8 @@
   },
   "workspaces": [
     "test",
-    "test/cdk"
+    "test/cdk",
+    "cli"
   ],
   "peerDependencies": {
     "aws-cdk-lib": "^2.37.1",
@@ -116,7 +118,7 @@
     "require": "./lib/index.js"
   },
   "license": "Apache-2.0",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "types": "lib/index.d.ts",
   "stability": "stable",
   "jsii": {

package/cli/serverlessSpy.js

@@ -1,73 +0,0 @@
-function run() {
-  const tableBody = document.getElementById("tableBody");
-  var modal = document.getElementById("myModal");
-  var span = document.getElementsByClassName("close")[0];
-  const modalContent = document.getElementById("modalContent");
-  span.onclick = function () {
-    modal.style.display = "none";
-  };
-  window.onclick = function (event) {
-    if (event.target == modal) {
-      modal.style.display = "none";
-    }
-  };
-
-  tableBody.addEventListener("click", function (e) {
-    const dataJson = JSON.stringify(
-      JSON.parse(e.target.parentElement.children[2].textContent),
-      null,
-      2
-    );
-    modalContent.innerText = dataJson;
-    modal.style.display = "block";
-    //alert();
-  });
-
-  const url = "SERVERLESS_SPY_WS_URL";
-  //"wss://m6g3w6ttdh.execute-api.eu-west-1.amazonaws.com/prod?X-Amz-Security-Token=IQoJb3JpZ2luX2VjELL%2F%2F%2F%2F%2F%2F%2F%2F%2F%2FwEaCWV1LXdlc3QtMSJGMEQCIDk%2BzQd0RC2DmEgCJEPoRFAkmnhCZl%2BSIlEG4TummRkIAiBIgNG8Yw%2FOAew3XNAE3yrNCK0G0q%2BZI8MwjEa8xoEonirrAQgbEAQaDDA3NjU4NTk2NzA3NSIMxVUxKhwdqGjFOsRtKsgB2eotQMFgl4CrD8uy%2Fe1UE6K4HVc6uWo0gdjgHMPb5C9Mq0wFgHTiDFjFxIFkJpmCiTRXKqNFrx5lpo9C5Ml1bpcv%2BTopT6wvpbFksxChhhnaqUDHiBaGuys8zEy8Bjlu4jF0nKccmUYdieD70%2FXz99OU4wKPxXyWbr0w82y1Xd6ag8g4VNx3EXEdULq7vkM6H2shSAH8EUlZoTD%2BqvIQvyKS8nta3ebhprO%2BsLRQv2YC6k1w46jHuOjtI7hSnmfSKnkUqAxS6g4wgZrFlwY6mQFNSXz7jSF3IRtdcpMEIp%2Bnghf2LhvZKeW6GkZs4DMeuhPjoBehfmXLJIJWgcvLoheQvIt28ddgHU60%2BoRKhZTxQKhpvSOaAbI6M%2B%2FyHvkC2hTR4fEBtESAMnzo8WocfxdaQQ0YVYq2m5NKSXs3QrrsYIIirkFYhB%2BjAwG8bqBAuE9SQNeIthHjT27hB7KUeIIoXtwSVGutv70%3D&X-Amz-Date=20220808T175057Z&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=ASIARDVHBDXR4QCRLL4O%2F20220808%2Feu-west-1%2Fexecute-api%2Faws4_request&X-Amz-SignedHeaders=host&X-Amz-Signature=d58ab2b792a69f20f8e3bf9bf4fb19c8ec8f271bd1b594f8cd25c02d4c85521d";
-  const ws = new WebSocket(url);
-
-  ws.addEventListener("open", function (event) {
-    console.log("connected " + new Date().toISOString());
-  });
-
-  ws.addEventListener("message", function ({ data }) {
-    //debugger;
-    //console.log(`From server: ${data}`);
-
-    let parsed;
-    try {
-      parsed = JSON.parse(data);
-    } catch (err) {
-      console.error("Can not parse " + data);
-    }
-
-    addLog(parsed);
-
-    // if (parsed) {
-    //   console.log(
-    //     `\x1b[47m\x1b[34m${parsed.timestamp} \x1b[31m🍕 ${
-    //       parsed.serviceKey
-    //     }\x1b[0m\x1b[32m\n${JSON.stringify(parsed.data, null, 2)}\x1b[0m`
-    //   );
-    // }
-  });
-  ws.addEventListener("close", function () {
-    console.log("disconnected " + new Date().toISOString());
-  });
-
-  function addLog(data) {
-    const newRow = document.createElement("tr");
-    newRow.innerHTML = `
-    <td>${new Date(data.timestamp).toLocaleTimeString()}</td>
-    <td>${data.serviceKey}</td>
-    <td>${JSON.stringify(data.data)}</td>
-    `;
-    tableBody.append(newRow);
-  }
-}
-
-document.addEventListener("DOMContentLoaded", function () {
-  console.log("RUN");
-  run();
-});

package/cli/ws.ts

@@ -1,79 +0,0 @@
-import * as fs from 'fs';
-import * as readline from 'readline';
-import WebSocket from 'ws';
-import { getWebSocketUrl } from '../common/getWebSocketUrl';
-
-async function run() {
-  // var credentialsProvider = awsCp.fromTemporaryCredentials();
-  // const credentials = await credentialsProvider();
-
-  // const client = new STSClient({});
-  // client.send()
-
-  // const command = new GetSessionTokenCommand({});
-  // const { Credentials: credentials } = await client.send(command);
-  // //const credentials = s.Credentials;
-
-  // console.log("credentials", credentials);
-
-  // const url = process.argv[2];
-  const url = 'wss://preh1xo1xh.execute-api.eu-west-1.amazonaws.com/prod';
-
-  // https://medium.com/@o.bredenberg/iam-sign-your-api-gateway-websocket-connection-request-no-custom-auth-from-your-frontend-65451166757d
-  const url2 = await getWebSocketUrl(url);
-
-  const ws = new WebSocket(url2);
-
-  const fileDescriptor = fs.openSync('spy_log.json', 'w');
-  // 📢📁⚡️💾 💽 💾 💿 📀🛢🪣📑🔊
-
-  ws.on('open', () => console.log(`connected ${new Date().toISOString()}`));
-  ws.on('message', (data: any) => {
-    // console.log(`From server: ${data}`);
-
-    let parsed;
-    try {
-      parsed = JSON.parse(data);
-    } catch (err) {
-      console.error(`Can not parse ${data}`);
-    }
-
-    if (parsed) {
-      console.log(
-        `\x1b[47m\x1b[34m${parsed.timestamp} \x1b[31m🍕 ${
-          parsed.serviceKey
-        }\x1b[0m\x1b[32m\n${JSON.stringify(parsed.data, null, 2)}\x1b[0m`
-      );
-    }
-
-    fs.write(fileDescriptor, data, (error) => {
-      if (!error) {
-        // fs.close(fileDescriptor);
-      } else {
-        console.error(error);
-      }
-    });
-    fs.write(fileDescriptor, '\n', (error) => {
-      if (!error) {
-        // fs.close(fileDescriptor);
-      } else {
-        console.error(error);
-      }
-    });
-  });
-  ws.on('close', () => {
-    console.log(`disconnected ${new Date().toISOString()}`);
-    fs.close(fileDescriptor, () => undefined);
-    process.exit();
-  });
-
-  readline
-    .createInterface({
-      input: process.stdin,
-      output: process.stdout,
-    })
-    .on('line', (data) => {
-      ws.send(data);
-    });
-}
-run().catch(console.error);