fix auth and cors

.github/workflows/format-and-push.yml

@@ -18,13 +18,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.head_ref }}  # Checkout the PR branch
+          fetch-depth: 0
 
-      - uses: pnpm/action-setup@v4
-        name: Install pnpm
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
           version: 9.12.1
           run_install: false
@@ -44,7 +44,9 @@ jobs:
             ${{ runner.os }}-pnpm-
 
       - name: Install dependencies & turbo
-        run: pnpm install && pnpm i -g turbo
+        run: |
+          pnpm install
+          pnpm i -g turbo
 
       - name: Format code with Prettier
         run: turbo format:write
@@ -56,7 +58,6 @@ jobs:
             git config --global user.email "github-actions[bot]@users.noreply.github.com"
             git add .
             git commit -m "format: make the code prettier"
-            git push origin ${{ github.head_ref }}
+            git push origin HEAD:${{ github.head_ref }}
           else
             echo "No formatting changes to push."
-          fi

apps/api/__tests__/life.test.ts

@@ -1,4 +1,4 @@
-import { GET } from "../app/api/[[...route]]/route";
+import { GET } from "../app/v1/[[...route]]/route";
 import { describe, it, expect, vi } from "vitest";
 
 vi.mock("@repo/db", () => ({
@@ -13,8 +13,8 @@ vi.mock("@repo/db", () => ({
 }));
 
 describe("Health API", () => {
-  it("GET /api/health should return health status", async () => {
-    const req = new Request("http://localhost:3000/api/health", {
+  it("GET /v1/health should return health status", async () => {
+    const req = new Request("http://localhost:3000/v1/health", {
       method: "GET",
     });
     const res = await GET(req);
@@ -29,8 +29,8 @@ describe("Health API", () => {
 });
 
 describe("Mail API", () => {
-  it("GET /api/mail should return health status", async () => {
-    const req = new Request("http://localhost:3000/api/mail/send", {
+  it("GET /v1/mail should return health status", async () => {
+    const req = new Request("http://localhost:3000/v1/mail/send", {
       method: "GET",
     });
     const res = await GET(req);
@@ -45,8 +45,8 @@ describe("Mail API", () => {
 });
 
 describe("Mail Batch API", () => {
-  it("GET /api/mail should return health status", async () => {
-    const req = new Request("http://localhost:3000/api/mail/send-batch", {
+  it("GET /v1/mail should return health status", async () => {
+    const req = new Request("http://localhost:3000/v1/mail/send-batch", {
       method: "GET",
     });
     const res = await GET(req);

apps/api/app/v1/[[...route]]/auth.ts

@@ -0,0 +1,14 @@
+import { auth } from "@repo/auth";
+import { Hono } from "hono";
+import { auth as Auth } from "@repo/auth";
+
+const app = new Hono<{
+  Variables: {
+    user: typeof Auth.$Infer.Session.user | null;
+    session: typeof Auth.$Infer.Session.session | null;
+  };
+}>();
+
+app.get("/*", (c) => auth.handler(c.req.raw));
+app.post("/*", (c) => auth.handler(c.req.raw));
+export default app;

apps/api/app/api/[[...route]]/route.ts → apps/api/app/v1/[[...route]]/route.ts

@@ -1,6 +1,5 @@
 import { handle } from "hono/vercel";
 import { Hono } from "hono";
-import { auth as Auth } from "@repo/auth";
 import mail from "./mail";
 import test from "./test";
 import session from "./session";
@@ -10,27 +9,29 @@ import health from "./health";
 import user from "./user";
 import contributors from "./contributors";
 import { cors } from "hono/cors";
+import { HonoBase } from "hono/hono-base";
 
 export const runtime = "edge";
 
-const app = new Hono<{
-  Variables: {
-    user: typeof Auth.$Infer.Session.user | null;
-    session: typeof Auth.$Infer.Session.session | null;
-  };
-}>().basePath("/api");
+const app = new Hono().basePath("/v1");
 
 const allowedOrigins = [
+  "http://localhost:3002",
   "http://localhost:3003",
+  "http://localhost:3004",
   "https://www.plura.pro",
   "https://app.plura.pro",
 ];
 
 app.use(
   "*",
   cors({
-    origin: allowedOrigins, // Allow requests from your frontend origin
-    allowMethods: ["GET", "POST", "OPTIONS"],
+    origin: allowedOrigins,
+    allowMethods: ["GET", "POST", "PATCH", "DELETE", "OPTIONS"],
+    allowHeaders: ["Content-Type", "Authorization"],
+    exposeHeaders: ["Content-Length"],
+    maxAge: 600,
+    credentials: true,
   }),
 );
 

apps/api/middleware.ts

@@ -15,5 +15,5 @@ export function middleware(request: NextRequest) {
 }
 
 export const config = {
-  matcher: ["/api/:path*", "/dashboard"],
+  matcher: ["/v1/:path*", "/dashboard"],
 };

apps/app/middleware.ts

@@ -11,7 +11,7 @@ const redirectUrl =
     : "http://localhost:3003/auth";
 export default async function authMiddleware(request: NextRequest) {
   const { data: session } = await betterFetch<Session>(
-    `${baseDomain}/api/auth/get-session`,
+    `${baseDomain}/v1/auth/get-session`,
     {
       baseURL: request.nextUrl.origin,
       headers: {

apps/status/app/page.tsx

@@ -1,20 +1,124 @@
+"use client";
+import { useEffect, useState } from "react";
 import StatusCard from "@/components/custom/status.card";
+import { StatusData } from "@/components/custom/status.tracker";
 import { Activity } from "lucide-react";
 
-export default function Home() {
+interface StatusT {
+  timestamp: string;
+  latencies: {
+    WEB: number;
+    API: number;
+    APP: number;
+  };
+  statuses: {
+    WEB: string;
+    API: string;
+    APP: string;
+  };
+  totalLatency: number;
+  operationCount: number;
+  averageLatency: number;
+}
+
+const Page = () => {
+  const [webStatus, setWebStatus] = useState<StatusData[]>([]);
+  const [apiStatus, setApiStatus] = useState<StatusData[]>([]);
+  const [appStatus, setAppStatus] = useState<StatusData[]>([]);
+  const [isFetching, setIsFetching] = useState(true);
+
+  const fetchStatusData = async () => {
+    try {
+      setIsFetching(true);
+      const siteResponse = await fetch("http://localhost:3001/v1/status/site");
+      const data = await siteResponse.json();
+
+      if (data.siteStatus && data.siteStatus.length > 0) {
+        const today = new Date().toISOString().split("T")[0];
+
+        const todayStatus = data.siteStatus.filter((status: StatusT) =>
+          status.timestamp.startsWith(today)
+        );
+        console.log("todayStatus", todayStatus);
+
+        if (todayStatus.length > 0) {
+          const getServiceStatus = (
+            latency: number,
+            originalStatus: string
+          ): "operational" | "warning" | "down" => {
+            if (originalStatus === "DOWN" || latency >= 1000) return "down";
+            if (latency >= 700) return "warning";
+            return "operational";
+          };
+
+          const webData = todayStatus.map((status: StatusT) => ({
+            status: getServiceStatus(status.latencies.WEB, status.statuses.WEB),
+            timestamp: status.timestamp,
+          }));
+
+          const apiData = todayStatus.map((status: StatusT) => ({
+            status: getServiceStatus(status.latencies.API, status.statuses.API),
+            timestamp: status.timestamp,
+          }));
+
+          const appData = todayStatus.map((status: StatusT) => ({
+            status: getServiceStatus(status.latencies.APP, status.statuses.APP),
+            timestamp: status.timestamp,
+          }));
+
+          setWebStatus(webData);
+          setApiStatus(apiData);
+          setAppStatus(appData);
+        } else {
+          setWebStatus([]);
+          setApiStatus([]);
+          setAppStatus([]);
+        }
+      }
+    } catch (error) {
+      console.error("Error fetching status data:", error);
+    } finally {
+      setIsFetching(false);
+    }
+  };
+
+  useEffect(() => {
+    fetchStatusData();
+    const interval = setInterval(fetchStatusData, 4 * 60 * 1000);
+    return () => clearInterval(interval);
+  }, []);
+
   return (
     <div className="flex flex-col gap-10 h-full w-full items-center justify-center my-10 overflow-auto">
       <div className="fixed bottom-0 left-[-20%] right-0 top-[-10%] h-[500px] w-[500px] rounded-full bg-[radial-gradient(circle_farthest-side,rgba(211,211,211,0.15),rgba(255,255,255,0))]" />
       <div className="flex flex-col items-center justify-center gap-2">
         <div className="p-2 bg-secondary rounded-full">
-        <Activity className="size-8 text-green-500"/>
+          <Activity className="size-8 text-green-500" />
         </div>
-      <h1 className="text-4xl font-bold">All services are online</h1>
-      <span className="text-sm text-muted-foreground">Last updated on Nov 16 at 10:36am IST</span>
+        <h1 className="text-4xl font-bold">
+  {isFetching
+    ? "All services are ..."
+    : webStatus.length > 0 &&
+      apiStatus.length > 0 &&
+      appStatus.length > 0 &&
+      webStatus[webStatus.length - 1].status === "operational" &&
+      apiStatus[apiStatus.length - 1].status === "operational" &&
+      appStatus[appStatus.length - 1].status === "operational"
+    ? "All services are online"
+    : "Some services are experiencing issues"}
+</h1>
+        <span className="text-sm text-muted-foreground">
+          Last updated:{" "}
+          {webStatus.length > 0
+            ? `${new Date(webStatus[webStatus.length - 1].timestamp).toLocaleTimeString('en-IN', { hour: '2-digit', minute: '2-digit', second: '2-digit' })}`
+            : "..."}
+        </span>
       </div>
-      <div className="flex w-full h-full px-10 md:px-40">
-      <StatusCard/>
+      <div className="flex w-full h-full px-10 md:px-40 gap-4">
+        <StatusCard statusData={webStatus} />
       </div>
     </div>
   );
-}
+};
+
+export default Page;

apps/status/components/custom/site/footer.tsx

@@ -1,11 +1,12 @@
+import Link from 'next/link'
 import React from 'react'
 
 export default function Footer() {
   return (
     <footer className="py-6 md:px-8 md:py-0">
       <div className="flex flex-col items-center gap-4 md:h-24 md:flex-row">
-        <p className="text-balance text-center text-sm leading-loose text-muted-foreground md:text-left">
-          &copy; 2024 Plura Ai. All rights reserved.
+        <p className="inline-flex gap-1 text-balance text-center text-sm leading-loose text-muted-foreground md:text-left">
+          Powered by <Link href={"https://l.devwtf.in/plura-x"} className='hover:underline font-semibold text-primary cursor-pointer'>Plura Ai</Link>
         </p>
       </div>
     </footer>