fix: uptime calc

Author: izadoesdev

apps/api/src/query/builders/uptime.ts

@@ -8,7 +8,7 @@ import type { Filter, SimpleQueryConfig } from "../types";
  * - site_id: Website identifier
  * - url: Monitored URL
  * - timestamp: Check timestamp
- * - status: 1 = up, 0 = down
+ * - status: 1 = up, 0 = down, 2 = pending
  * - http_code: HTTP response code
  * - ttfb_ms: Time to first byte (ms)
  * - total_ms: Total response time (ms)
@@ -25,9 +25,9 @@ export const UptimeBuilders: Record<string, SimpleQueryConfig> = {
 			sql: `
 				SELECT 
 					COUNT(*) as total_checks,
-					sum(status) as successful_checks,
-					COUNT(*) - sum(status) as failed_checks,
-					round((sum(status) / COUNT(*)) * 100, 2) as uptime_percentage,
+					countIf(status = 1) as successful_checks,
+					countIf(status = 0) as failed_checks,
+					if((countIf(status = 1) + countIf(status = 0)) = 0, 0, round((countIf(status = 1) / (countIf(status = 1) + countIf(status = 0))) * 100, 2)) as uptime_percentage,
 					avg(total_ms) as avg_response_time,
 					quantile(0.50)(total_ms) as p50_response_time,
 					quantile(0.75)(total_ms) as p75_response_time,
@@ -73,9 +73,9 @@ export const UptimeBuilders: Record<string, SimpleQueryConfig> = {
 					SELECT 
 						${timeGroup} as date,
 						COUNT(*) as total_checks,
-						sum(status) as successful_checks,
-						COUNT(*) - sum(status) as failed_checks,
-						round((sum(status) / COUNT(*)) * 100, 2) as uptime_percentage,
+						countIf(status = 1) as successful_checks,
+						countIf(status = 0) as failed_checks,
+						if((countIf(status = 1) + countIf(status = 0)) = 0, 0, round((countIf(status = 1) / (countIf(status = 1) + countIf(status = 0))) * 100, 2)) as uptime_percentage,
 						avg(total_ms) as avg_response_time,
 						quantile(0.50)(total_ms) as p50_response_time,
 						quantile(0.95)(total_ms) as p95_response_time,
@@ -230,9 +230,9 @@ export const UptimeBuilders: Record<string, SimpleQueryConfig> = {
 				SELECT 
 					probe_region as region,
 					COUNT(*) as total_checks,
-					sum(status) as successful_checks,
-					COUNT(*) - sum(status) as failed_checks,
-					round((sum(status) / COUNT(*)) * 100, 2) as uptime_percentage,
+					countIf(status = 1) as successful_checks,
+					countIf(status = 0) as failed_checks,
+					if((countIf(status = 1) + countIf(status = 0)) = 0, 0, round((countIf(status = 1) / (countIf(status = 1) + countIf(status = 0))) * 100, 2)) as uptime_percentage,
 					avg(total_ms) as avg_response_time,
 					quantile(0.95)(total_ms) as p95_response_time
 				FROM ${UPTIME_TABLE}

apps/uptime/package.json

@@ -7,6 +7,7 @@
   },
   "dependencies": {
     "@databuddy/db": "workspace:*",
+    "@databuddy/services": "workspace:*",
     "elysia": "^1.4.18"
   }
 }

apps/uptime/src/actions.ts

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
 import { connect } from "node:tls";
-import { chQuery, db, eq, websites } from "@databuddy/db";
+import { chQuery } from "@databuddy/db";
+import { getWebsiteById } from "@databuddy/services/websites";
 import type { ActionResult, UptimeData } from "./types";
 import { MonitorStatus } from "./types";
 
@@ -41,9 +42,7 @@ export async function lookupWebsite(
     id: string
 ): Promise<ActionResult<{ id: string; domain: string }>> {
     try {
-        const site = await db.query.websites.findFirst({
-            where: eq(websites.id, id),
-        });
+        const site = await getWebsiteById(id);
 
         if (!site) {
             return { success: false, error: `Website ${id} not found` };

bun.lock

@@ -381,6 +381,7 @@
       "version": "1.0.0",
       "dependencies": {
         "@databuddy/db": "workspace:*",
+        "@databuddy/services": "workspace:*",
         "elysia": "^1.4.18",
       },
     },
@@ -541,6 +542,16 @@
         "vue",
       ],
     },
+    "packages/services": {
+      "name": "@databuddy/services",
+      "version": "1.0.0",
+      "dependencies": {
+        "@databuddy/db": "workspace:*",
+      },
+      "devDependencies": {
+        "typescript": "^5.9.3",
+      },
+    },
     "packages/shared": {
       "name": "@databuddy/shared",
       "version": "0.0.1",
@@ -778,6 +789,8 @@
 
     "@databuddy/sdk": ["@databuddy/sdk@workspace:packages/sdk"],
 
+    "@databuddy/services": ["@databuddy/services@workspace:packages/services"],
+
     "@databuddy/shared": ["@databuddy/shared@workspace:packages/shared"],
 
     "@databuddy/tracker": ["@databuddy/tracker@workspace:packages/tracker"],

packages/services/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "@databuddy/services",
+  "version": "1.0.0",
+  "exports": {
+    "./websites": "./src/websites.ts"
+  },
+  "dependencies": {
+    "@databuddy/db": "workspace:*"
+  },
+  "devDependencies": {
+    "typescript": "^5.9.3"
+  }
+}

packages/services/src/websites.ts

@@ -0,0 +1,17 @@
+import { db, eq, websites } from "@databuddy/db";
+import type { InferSelectModel } from "drizzle-orm";
+
+export type Website = InferSelectModel<typeof websites>;
+
+export async function getWebsiteById(id: string): Promise<Website | null> {
+	try {
+		const website = await db.query.websites.findFirst({
+			where: eq(websites.id, id),
+		});
+
+		return website || null;
+	} catch (error) {
+		console.error("Failed to get website by ID:", error);
+		return null;
+	}
+}

packages/services/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ES2022",
+    "lib": ["ES2022"],
+    "moduleResolution": "bundler",
+    "strict": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    },
+    "composite": true,
+    "declaration": true,
+    "declarationMap": true,
+    "outDir": "./dist",
+    "rootDir": "./src"
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist", "**/*.test.ts", "**/*.spec.ts"]
+}