[MS-758] feat: Cleanup erors (#24)

* [MS-758] feat: Cleanup erors

* [MS-758] build: Align artifact build

etc/commands/build.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
 # Cleanup
-rm -rf build package.zip
+rm -rf build artifact.zip
 # Install deps
 pnpm install --frozen-lockfile --prod
-pnpm build:serverless
+# Create bundle
+pnpm build
 # Create zip
 cd build;	zip -r -D ../artifact.zip .

etc/scripts/common.mjs

@@ -31,14 +31,6 @@ export const esbuildConfig = {
       authToken: process.env.SENTRY_AUTH_TOKEN,
       disable: !isSentryEnabled,
     }),
-    copy({
-      watch: true,
-      resolveFrom: "cwd",
-      assets: {
-        from: ["./src/api/graphql/schema.graphql"],
-        to: ["./build"],
-      },
-    }),
     copy({
       resolveFrom: "cwd",
       assets: {

package.json

@@ -45,6 +45,7 @@
     "@fastify/error": "^4.0.0",
     "@react-email/components": "^0.0.25",
     "@sentry/aws-serverless": "^8.34.0",
+    "@sentry/esbuild-plugin": "^2.22.5",
     "@sentry/node": "^8.34.0",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.1",
@@ -63,6 +64,7 @@
     "husky": "^9.1.6",
     "jose": "^5.9.4",
     "jsonwebtoken": "^9.0.2",
+    "klona": "^2.0.6",
     "nodemailer": "^6.9.15",
     "path-to-regexp": "^8.2.0",
     "pg": "^8.13.0",
@@ -73,6 +75,7 @@
     "react-email": "^3.0.1",
     "tailwind-merge": "^2.5.4",
     "tailwindcss": "^3.4.14",
+    "traverse": "^0.6.10",
     "ts-invariant": "^0.10.3",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.6.3",
@@ -90,13 +93,13 @@
     "@graphql-codegen/typescript": "^4.1.0",
     "@graphql-codegen/typescript-operations": "^4.3.0",
     "@graphql-typed-document-node/core": "^3.2.0",
-    "@sentry/esbuild-plugin": "^2.22.5",
     "@types/aws-lambda": "^8.10.145",
     "@types/graphql": "^14.5.0",
     "@types/jsonwebtoken": "^9.0.7",
     "@types/node": "^20.16.11",
     "@types/nodemailer": "^6.4.16",
     "@types/pg": "^8.11.10",
+    "@types/traverse": "^0.6.37",
     "@typescript-eslint/parser": "^7.18.0",
     "@vitest/coverage-v8": "^2.1.3",
     "commitizen": "^4.3.1",

src/api/rest/routes.test.ts

@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import * as validate from "@/lib/graphql/validate";
 import * as auth from "@/lib/saleor/auth";
@@ -8,7 +8,7 @@ import { EVENT_HANDLERS } from "./saleor/webhooks";
 
 describe("apiRoutes", () => {
   describe("/api/healthcheck", () => {
-    test("200", async () => {
+    it("200", async () => {
       const app = await createServer();
       const response = await app.inject({
         method: "GET",
@@ -31,7 +31,7 @@ describe("apiRoutes", () => {
       app.sqs.send = sendSpy;
     });
 
-    test("Should return 401 with invalid JWT.", async () => {
+    it("Should return 401 with invalid JWT.", async () => {
       // given
       const expectedStatusCode = 401;
       const expectedJson = {
@@ -56,7 +56,7 @@ describe("apiRoutes", () => {
       expect(response.statusCode).toStrictEqual(expectedStatusCode);
     });
 
-    test("Should return 400 passed when event is not supported.", async () => {
+    it("Should return 400 passed when event is not supported.", async () => {
       // given
       const expectedStatusCode = 400;
       const expectedJson = {
@@ -87,7 +87,7 @@ describe("apiRoutes", () => {
       expect(response.statusCode).toStrictEqual(expectedStatusCode);
     });
 
-    test("Should return proper response.", async () => {
+    it("Should return proper response.", async () => {
       const jwtVerifySpy = vi.spyOn(auth, "verifyJWTSignature");
       const validateSpy = vi.spyOn(validate, "validateDocumentAgainstData");
       const expectedJson = { status: "ok" };

src/api/rest/routes.ts

@@ -5,8 +5,8 @@ import { z } from "zod";
 
 import { CONFIG } from "@/config";
 import { OrderCreatedSubscriptionDocument } from "@/graphql/operations/subscriptions/generated";
-import { serializePayload } from "@/lib/emails/events/helpers";
 import { validateDocumentAgainstData } from "@/lib/graphql/validate";
+import { serializePayload } from "@/lib/payload";
 import { verifyJWTSignature } from "@/lib/saleor/auth";
 import { saleorBearerHeader } from "@/lib/saleor/schema";
 import { getJWKSProvider } from "@/providers/jwks";

src/api/rest/saleor/webhooks.test.ts

@@ -1,8 +1,8 @@
 import { JWTInvalid } from "jose/errors";
-import { beforeEach, describe, expect, test, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { CONFIG } from "@/config";
-import { serializePayload } from "@/lib/emails/events/helpers";
+import { serializePayload } from "@/lib/payload";
 import * as auth from "@/lib/saleor/auth";
 import { createServer } from "@/server";
 
@@ -21,7 +21,7 @@ describe("saleorWebhooksRoutes", () => {
   });
 
   describe("/api/saleor/webhooks/email/*", () => {
-    test.each(EVENT_HANDLERS)(
+    it.each(EVENT_HANDLERS)(
       "should register route for $event event",
       ({ event }) => {
         // Given
@@ -37,7 +37,7 @@ describe("saleorWebhooksRoutes", () => {
       }
     );
 
-    test("require saleor headers", async () => {
+    it("require saleor headers", async () => {
       // Given
       const url = `${baseUrl}account-confirmed`;
       const expectedStatusCode = 400;
@@ -82,7 +82,7 @@ describe("saleorWebhooksRoutes", () => {
       expect(response.statusCode).toStrictEqual(expectedStatusCode);
     });
 
-    test("is protected by JWT", async () => {
+    it("is protected by JWT", async () => {
       // Given
       const url = `${baseUrl}account-confirmed`;
       const expectedStatusCode = 401;
@@ -116,7 +116,7 @@ describe("saleorWebhooksRoutes", () => {
       expect(response.statusCode).toStrictEqual(expectedStatusCode);
     });
 
-    test("it should send SQS message with proper payload", async () => {
+    it("it should send SQS message with proper payload", async () => {
       // Given
       const url = `${baseUrl}account-confirmed`;
       const event = "account_confirmed";

src/api/rest/saleor/webhooks.ts

@@ -20,7 +20,7 @@ import {
   OrderRefundedSubscriptionDocument,
 } from "@/graphql/operations/subscriptions/generated";
 import { type WebhookEventTypeAsyncEnum } from "@/graphql/schema";
-import { serializePayload } from "@/lib/emails/events/helpers";
+import { serializePayload } from "@/lib/payload";
 import { verifyWebhookSignature } from "@/lib/saleor/auth";
 import { saleorWebhookHeaders } from "@/lib/saleor/schema";
 import { getJWKSProvider } from "@/providers/jwks";

src/config.ts

@@ -21,7 +21,7 @@ export const configSchema = z
     // Used for generating paths, selecting localized formatters.
     DEFAULT_REGION: z.string().default("GB"),
     // Email sender info.
-    FROM_EMAIL: z.string().email().default("hello@mirumee.com"),
+    FROM_EMAIL: z.string().email().default("noreply@mirumee.com"),
     FROM_NAME: z.string().default("Mirumee"),
     // Sentry.
     SENTRY_DEBUG: z.boolean().default(false),
@@ -31,7 +31,11 @@ export const configSchema = z
   })
   .and(commonConfigSchema)
   .and(appConfigSchema)
-  .and(saleorAppConfigSchema);
+  .and(saleorAppConfigSchema)
+  .refine((data) => {
+    data.STOREFRONT_URL = new URL(data.STOREFRONT_URL).origin;
+    return data;
+  });
 
 export type ConfigSchema = z.infer<typeof configSchema>;
 

src/emails-sender-proxy.ts

@@ -1,4 +1,3 @@
-import { SQSClient } from "@aws-sdk/client-sqs";
 import { type Context, type SQSEvent, type SQSRecord } from "aws-lambda";
 import { Consumer } from "sqs-consumer";
 
@@ -7,18 +6,14 @@ import { handler, logger } from "@/emails-sender";
 
 const app = Consumer.create({
   queueUrl: CONFIG.SQS_QUEUE_URL,
-  sqs: new SQSClient({
-    useQueueUrlAsEndpoint: false,
-    endpoint: CONFIG.SQS_QUEUE_URL,
-  }),
   handleMessageBatch: async (messages) => {
     const event: SQSEvent = {
       Records: messages as SQSRecord[],
     };
     const context = {} as Context;
     const callback = () => null;
 
-    await handler(event, context, () => callback);
+    return await handler(event, context, () => callback);
   },
 });