wip: resolver

Author: brunozoric

packages/api-sync-system/src/resolver/createEventHandlerPlugin.ts

@@ -35,9 +35,15 @@ export const createEventHandlerPlugin = (params: ICreateEventHandlerPluginParams
         console.log("Resolver handler started.");
         console.log(
             JSON.stringify({
-                records: event.Records
+                event
             })
         );
+        /**
+         * Just end
+         */
+        if (event.Records) {
+            return;
+        }
         try {
             const fetcher = createFetcher({
                 maxRetries: 10,

packages/api-sync-system/src/sync/attachToDynamoDbDocument.ts

@@ -25,9 +25,10 @@ export const decorateClientWithHandler = (
      * Let's check for the handler and then skip attaching.
      */
     // @ts-expect-error
-    if (client.__webinyHandler) {
+    if (client.__webinyHandler?.id === handler.id) {
         return client;
     }
+
     const originalSend = client.send;
     const originalPut = client.put;
     const originalBatchWrite = client.batchWrite;
@@ -68,7 +69,7 @@ export const decorateClientWithHandler = (
 };
 
 export const attachToDynamoDbDocument = ({ handler }: IAttachToDynamoDbDocumentParams): void => {
-    decorateDocumentClient(client => {
+    return decorateDocumentClient(client => {
         return decorateClientWithHandler({
             handler,
             client

packages/api-sync-system/src/sync/createSendDataToEventBridgeOnRequestEnd.ts

@@ -1,6 +1,7 @@
 import type { IHandler } from "./types.js";
 import { convertException } from "@webiny/utils";
 import { createOnRequestResponse, createOnRequestTimeout } from "@webiny/handler";
+import type { Request as FastifyRequest } from "@webiny/handler/types";
 
 const execute = async (handler: IHandler) => {
     try {
@@ -15,12 +16,26 @@ const execute = async (handler: IHandler) => {
     }
 };
 
+const isOptionsRequest = (request: FastifyRequest): boolean => {
+    return request.method.toUpperCase() === "OPTIONS";
+};
+
 export const createSendDataToEventBridgeOnRequestEnd = (handler: IHandler) => {
     return [
-        createOnRequestResponse(async () => {
+        createOnRequestResponse(async request => {
+            if (isOptionsRequest(request)) {
+                console.log("Skipping OPTIONS request - response.");
+                return;
+            }
+            console.log("Executing on request end.");
             return execute(handler);
         }),
-        createOnRequestTimeout(async () => {
+        createOnRequestTimeout(async request => {
+            if (isOptionsRequest(request)) {
+                console.log("Skipping OPTIONS request - timeout.");
+                return;
+            }
+            console.log("Executing on request timeout.");
             return execute(handler);
         })
     ];

packages/api-sync-system/src/sync/handler/Handler.ts

@@ -14,6 +14,7 @@ import { PutEventsCommand } from "@webiny/aws-sdk/client-eventbridge";
 import { convertException } from "@webiny/utils";
 import type { IDetail } from "./types.js";
 import { SQS_EVENT_NAME } from "~/constants.js";
+import { generateAlphaNumericId } from "@webiny/utils/generateId.js";
 
 export interface IHandlerEventBus {
     name: string;
@@ -28,6 +29,7 @@ export interface IHandlerParams {
 }
 
 export class Handler implements IHandler {
+    public readonly id = generateAlphaNumericId();
     private readonly system: ISystem;
     private readonly client: Pick<EventBridgeClient, "send">;
     private commands: ICommandValue[] = [];

packages/api-sync-system/src/sync/handler/HandlerConverter.ts

@@ -32,15 +32,6 @@ export class HandlerConverter implements IHandlerConverter {
                 return converter.convert(command);
             }
         }
-        /**
-         * We ALWAYS log unknown commands as we do not know what user will do with the DynamoDB client.
-         */
-        console.error(`Unknown command: ${command.constructor?.name || "unknown"}`);
-        console.log(
-            JSON.stringify({
-                command
-            })
-        );
 
         return this._default;
     }

packages/api-sync-system/src/sync/handler/converter/BatchGetCommandConverter.ts

@@ -4,7 +4,7 @@ export class NullCommandValue implements ICommandValue {
     /**
      * Does not matter what will be here, we will not use it.
      */
-    public readonly command = "put";
+    public readonly command = "null";
 
     public getItems(): null {
         return null;

packages/api-sync-system/src/sync/handler/converter/GetCommandConverter.ts

@@ -21,6 +21,12 @@ export const createSyncSystemHandlerOnRequestPlugin = (
     return createHandlerOnRequest(async (_, __, context) => {
         const { data: manifest, error } = await getManifest(params);
         if (!manifest?.sync?.region || error) {
+            console.log(
+                JSON.stringify({
+                    error,
+                    noManifest: manifest
+                })
+            );
             return;
         }
 

packages/api-sync-system/src/sync/handler/converter/commands/NullCommandValue.ts

@@ -61,6 +61,7 @@ export interface ISystem {
 }
 
 export interface IHandler {
+    readonly id: string;
     flush(): Promise<void>;
     add(input: IDynamoDbCommand): void;
 }

packages/api-sync-system/src/sync/requestPlugin.ts

@@ -2,7 +2,7 @@ import { Context as BaseContext } from "@webiny/handler-aws/types";
 
 export type CommandType = "put" | "delete";
 export type ExtendedCommandType = "put" | "delete" | "update";
-export type AllCommandType = ExtendedCommandType | "batchWrite";
+export type AllCommandType = ExtendedCommandType | "batchWrite" | "null";
 
 export type DynamoDBTableType = "regular" | "elasticsearch" | "log" | "unknown";
 

packages/api-sync-system/src/sync/types.ts

@@ -35,11 +35,17 @@ export const getDocumentClient = (input?: DynamoDBClientConfig): DynamoDBDocumen
     const config = input || DEFAULT_CONFIG;
     const key = createKey(config);
     if (documentClients[key]) {
+        console.log({
+            existingKey: key
+        });
         return applyDecoration(documentClients[key]);
     }
     const client = new DynamoDBClient(config);
 
     const documentClient = DynamoDBDocument.from(client, documentClientConfig);
+    console.log({
+        newKey: key
+    });
 
     return (documentClients[key] = applyDecoration(documentClient));
 };
@@ -48,13 +54,21 @@ export const getDocumentClient = (input?: DynamoDBClientConfig): DynamoDBDocumen
  */
 const applyDecoration = (client: DynamoDBDocument): DynamoDBDocument => {
     if (!decorateDocumentClientCallable) {
+        console.log("No decoration function provided.");
         return client;
     }
+    console.log("applying decoration");
     // @ts-expect-error
     client.__decoratedByWebiny = true;
     return decorateDocumentClientCallable(client);
 };
 
 export const decorateDocumentClient = (cb: IDecorateDocumentClientCallable): void => {
     decorateDocumentClientCallable = cb;
+    /**
+     * Decorate already existing clients.
+     */
+    for (const key in documentClients) {
+        cb(documentClients[key]);
+    }
 };

packages/api-sync-system/src/types.ts

@@ -408,22 +408,22 @@ export const createHandler = (params: CreateHandlerParams) => {
     /**
      * We need to output the benchmark results at the end of the request in both response and timeout cases
      */
-    app.addHook("onResponse", async () => {
+    app.addHook("onResponse", async (request, reply) => {
         const plugins = app.webiny.plugins.byType<OnRequestResponsePlugin>(
             OnRequestResponsePlugin.type
         );
         for (const plugin of plugins) {
-            await plugin.exec();
+            await plugin.exec(request, reply);
         }
         await context.benchmark.output();
     });
 
-    app.addHook("onTimeout", async () => {
+    app.addHook("onTimeout", async (request, reply) => {
         const plugins = app.webiny.plugins.byType<OnRequestTimeoutPlugin>(
             OnRequestTimeoutPlugin.type
         );
         for (const plugin of plugins) {
-            await plugin.exec();
+            await plugin.exec(request, reply);
         }
         await context.benchmark.output();
     });

packages/aws-sdk/src/client-dynamodb/getDocumentClient.ts

@@ -1,7 +1,8 @@
 import { Plugin } from "@webiny/plugins";
+import type { Reply as FastifyReply, Request as FastifyRequest } from "~/types.js";
 
 export interface IOnRequestResponsePluginCallable {
-    (): Promise<void>;
+    (request: FastifyRequest, reply: FastifyReply): Promise<void>;
 }
 
 export class OnRequestResponsePlugin extends Plugin {
@@ -14,8 +15,8 @@ export class OnRequestResponsePlugin extends Plugin {
         this.cb = cb;
     }
 
-    public async exec(): Promise<void> {
-        return this.cb();
+    public async exec(request: FastifyRequest, reply: FastifyReply): Promise<void> {
+        return this.cb(request, reply);
     }
 }
 

packages/handler/src/fastify.ts

@@ -1,7 +1,8 @@
 import { Plugin } from "@webiny/plugins";
+import type { Reply as FastifyReply, Request as FastifyRequest } from "~/types.js";
 
 export interface IOnRequestTimeoutPluginCallable {
-    (): Promise<void>;
+    (request: FastifyRequest, reply: FastifyReply): Promise<void>;
 }
 
 export class OnRequestTimeoutPlugin extends Plugin {
@@ -14,8 +15,8 @@ export class OnRequestTimeoutPlugin extends Plugin {
         this.cb = cb;
     }
 
-    public async exec(): Promise<void> {
-        return this.cb();
+    public async exec(request: FastifyRequest, reply: FastifyReply): Promise<void> {
+        return this.cb(request, reply);
     }
 }