Merged from main

.github/workflows/deploy.yml

@@ -12,6 +12,11 @@ jobs:
     strategy:
       matrix:
         node-version: [20.x]
+    env:
+      AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}'
+      AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}'
+      DATABASE_URL: '${{ secrets.DATABASE_URL }}'
+      NODE_ENV: 'production'
     steps:
       - uses: actions/checkout@v4
 
@@ -24,7 +29,4 @@ jobs:
           args: -c "cd ./apps/server && serverless deploy --stage production"
           entrypoint: /bin/sh
 
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+

apps/server/serverless.ts

@@ -18,11 +18,15 @@ const serverlessConfiguration: AWS = {
     environment: {
       AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1",
       NODE_OPTIONS: "--enable-source-maps --stack-trace-limit=1000",
+      DATABASE_URL: process.env.DATABASE_URL,
     },
   },
   // import the function via paths
   functions: functions,
-  package: { individually: true },
+  package: {
+    individually: true,
+    include: ["certs/*", "src/functions/cron/*"],
+  },
   custom: {
     esbuild: {
       bundle: true,

apps/server/src/functions/cron/getWeeklyHandler.ts

@@ -1,16 +1,30 @@
+import fs from "fs";
+import path from "path";
 import { format } from "date-fns";
 import { logger } from "logger";
 
 import { getWeekInfo } from "@zotmeal/api";
 import { createDrizzle, pool } from "@zotmeal/db";
 import { restaurantNames } from "@zotmeal/utils";
 
-const connectionString = process.env.DATABASE_URL;
+import { env } from "../env";
 
+const isProduction = process.env.NODE_ENV === "production";
+const connectionString = env.DATABASE_URL;
+const sslConfig = isProduction
+  ? {
+      rejectUnauthorized: false,
+      ca: fs.readFileSync(
+        path.join(__dirname, "../../../certs", "global-bundle.pem").toString(),
+      ),
+    }
+  : null;
 export const main = async (_event, _context) => {
   try {
-    const db = createDrizzle({ connectionString });
-
+    const db = createDrizzle({
+      connectionString,
+      ssl: sslConfig,
+    });
     logger.info(`Start get weekly job...`);
 
     const date = format(new Date(), "MM/dd/yyyy");

apps/server/src/functions/cron/testLog.ts

@@ -1,7 +1,5 @@
 import { format } from "date-fns";
 
-import { env } from "../env";
-
 export const main = async (event, context) => {
   try {
     const now = new Date();

apps/server/src/functions/cron/updateDailyHandler.ts

@@ -1,16 +1,30 @@
+import fs from "fs";
+import path from "path";
 import { format } from "date-fns";
 
 import { updateDaily, UpdateDailyParams } from "@zotmeal/api";
 import { createDrizzle, pool } from "@zotmeal/db";
 import { restaurantNames } from "@zotmeal/utils";
 
 import { logger } from "../../../logger";
+import { env } from "../env";
 
-const connectionString = process.env.DATABASE_URL;
-
+const isProduction = process.env.NODE_ENV === "production";
+const connectionString = env.DATABASE_URL;
+const sslConfig = isProduction
+  ? {
+      rejectUnauthorized: false,
+      ca: fs.readFileSync(
+        path.join(__dirname, "../../../certs", "global-bundle.pem").toString(),
+      ),
+    }
+  : null;
 export const main = async (_event, _context) => {
   try {
-    const db = createDrizzle({ connectionString });
+    const db = createDrizzle({
+      connectionString,
+      ssl: sslConfig,
+    });
     logger.info("Start update daily job...");
 
     const date = format(new Date(), "MM/dd/yyyy");

apps/server/src/functions/env.js

@@ -1,12 +1,14 @@
 import dotenv from "dotenv";
 import { z } from "zod";
 
-dotenv.config({
-  path: "../../../../.env",
-});
+if (process.env.NODE_ENV !== "production") {
+  dotenv.config({
+    path: "../../../../.env",
+  });
+}
 const envSchema = z.object({
   DATABASE_URL: z.string(),
 });
-
 const env = envSchema.parse(process.env);
+
 export { env };

apps/server/src/functions/index.ts

@@ -28,6 +28,7 @@ export const functions: AWS["functions"] = {
   },
   getWeekly: {
     handler: "src/functions/cron/getWeeklyHandler.main",
+    timeout: 600,
     events: [
       {
         schedule: {
@@ -39,6 +40,7 @@ export const functions: AWS["functions"] = {
   },
   updateDaily: {
     handler: "src/functions/cron/updateDailyHandler.main",
+    timeout: 600,
     events: [
       {
         schedule: {

package.json

@@ -22,9 +22,10 @@
     "typecheck": "turbo typecheck"
   },
   "devDependencies": {
-    "@zotmeal/prettier-config": "workspace:^0.1.0",
     "@turbo/gen": "^1.13.2",
+    "@zotmeal/prettier-config": "workspace:^0.1.0",
     "prettier": "^3.2.5",
+    "ts-node": "^10.9.2",
     "turbo": "^1.13.2",
     "typescript": "^5.4.3"
   },

packages/db/package.json

@@ -51,6 +51,7 @@
     "pino-pretty": "^11.0.0",
     "postgres": "^3.4.4",
     "tsx": "^4.7.1",
-    "zod": "^3.22.4"
+    "zod": "^3.22.4",
+    "@zotmeal/tsconfig": "workspace:^0.1.0"
   }
 }

packages/db/src/index.ts

@@ -1,4 +1,6 @@
 import { exec } from "child_process";
+import fs from "fs";
+import path from "path";
 import { promisify } from "util";
 import type { PoolConfig } from "pg";
 import { drizzle } from "drizzle-orm/node-postgres";

packages/ui/package.json

@@ -28,7 +28,8 @@
     "react-hook-form": "^7.51.2",
     "sonner": "^1.4.41",
     "tailwind-merge": "^2.2.2",
-    "tailwindcss-animate": "^1.0.7"
+    "tailwindcss-animate": "^1.0.7",
+    "@zotmeal/tsconfig": "workspace:^0.1.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.63",

packages/utils/package.json

@@ -33,6 +33,7 @@
   },
   "prettier": "@zotmeal/prettier-config",
   "dependencies": {
-    "vitest": "^1.4.0"
+    "vitest": "^1.4.0",
+    "@zotmeal/tsconfig": "workspace:^"
   }
 }

packages/validators/package.json

@@ -16,7 +16,8 @@
   "dependencies": {
     "@zotmeal/db": "workspace:^",
     "@zotmeal/utils": "workspace:^",
-    "zod": "^3.22.4"
+    "zod": "^3.22.4",
+    "@zotmeal/tsconfig": "workspace:^0.1.0"
   },
   "devDependencies": {
     "@zotmeal/eslint-config": "workspace:^",