Skip to content

Open-source status page, incident response and uptime monitoring

chore: migrate unkey v2 (#1638)

Maximilian Kaskeab4574d0a964
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
index c59a0baee..4af54dee7 100644
--- a/apps/dashboard/package.json
+++ b/apps/dashboard/package.json
@@ -73,6 +73,7 @@
"@trpc/react-query": "11.4.4",
"@trpc/server": "11.4.4",
"@trpc/tanstack-react-query": "11.4.4",
+ "@unkey/api": "2.2.0",
"class-variance-authority": "0.7.1",
"clsx": "2.1.1",
"cmdk": "1.1.1",
diff --git a/apps/dashboard/src/components/data-table/incidents/data-table-row-actions.tsx b/apps/dashboard/src/components/data-table/incidents/data-table-row-actions.tsx
index 8fe685de4..d4e717cbc 100644
--- a/apps/dashboard/src/components/data-table/incidents/data-table-row-actions.tsx
+++ b/apps/dashboard/src/components/data-table/incidents/data-table-row-actions.tsx
@@ -109,7 +109,7 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
<QuickActions
actions={actions}
deleteAction={{
- confirmationValue: row.original.title ?? "incident",
+ confirmationValue: row.original.title || "incident",
submitAction: async () => {
await deleteIncidentMutation.mutateAsync({
id: row.original.id,
diff --git a/apps/dashboard/src/components/forms/settings/form-api-key.tsx b/apps/dashboard/src/components/forms/settings/form-api-key.tsx
index 4c251ddac..2cb09d619 100644
--- a/apps/dashboard/src/components/forms/settings/form-api-key.tsx
+++ b/apps/dashboard/src/components/forms/settings/form-api-key.tsx
@@ -51,8 +51,8 @@ export function FormApiKey() {
const createApiKeyMutation = useMutation(
trpc.apiKey.create.mutationOptions({
onSuccess: (data) => {
- if (data.result) {
- setResult(data.result);
+ if (data) {
+ setResult(data);
} else {
throw new Error("Failed to create API key");
}
@@ -131,7 +131,7 @@ export function FormApiKey() {
confirmationValue="API Key"
submitAction={async () => {
await revokeApiKeyMutation.mutateAsync({
- keyId: apiKey.id,
+ keyId: apiKey.keyId,
});
}}
/>
diff --git a/apps/server/package.json b/apps/server/package.json
index f31373c34..b248e55af 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -29,7 +29,7 @@
"@openstatus/utils": "workspace:*",
"@scalar/hono-api-reference": "0.8.5",
"@t3-oss/env-core": "0.7.1",
- "@unkey/api": "0.26.1",
+ "@unkey/api": "2.2.0",
"@upstash/qstash": "2.6.2",
"hono": "4.5.3",
"nanoid": "5.0.7",
diff --git a/apps/server/src/libs/cache/memory.ts b/apps/server/src/libs/cache/memory.ts
index 8022938bf..c9b7e33cc 100644
--- a/apps/server/src/libs/cache/memory.ts
+++ b/apps/server/src/libs/cache/memory.ts
@@ -41,7 +41,7 @@ export class MemoryCache {
clear() {
this.data.clear();
- for (const timer of this.timers.values()) {
+ for (const timer of Array.from(this.timers.values())) {
clearTimeout(timer);
}
this.timers.clear();
diff --git a/apps/server/src/libs/checker/utils.ts b/apps/server/src/libs/checker/utils.ts
index 2f6f42680..ecff4b3a1 100644
--- a/apps/server/src/libs/checker/utils.ts
+++ b/apps/server/src/libs/checker/utils.ts
@@ -33,6 +33,8 @@ export function getCheckerPayload(
headers: transformHeaders(monitor.otelHeaders),
}
: undefined,
+ retry: monitor.retry ?? 0,
+ followRedirects: monitor.followRedirects ?? false,
};
case "tcp":
return {
@@ -51,6 +53,8 @@ export function getCheckerPayload(
headers: transformHeaders(monitor.otelHeaders),
}
: undefined,
+ retry: monitor.retry ?? 0,
+ followRedirects: monitor.followRedirects ?? false,
};
default:
throw new OpenStatusApiError({
diff --git a/apps/server/src/libs/middlewares/auth.ts b/apps/server/src/libs/middlewares/auth.ts
index 17e49cbfd..a84439f9a 100644
--- a/apps/server/src/libs/middlewares/auth.ts
+++ b/apps/server/src/libs/middlewares/auth.ts
@@ -1,4 +1,5 @@
-import { verifyKey } from "@unkey/api";
+import { UnkeyCore } from "@unkey/api/core";
+import { keysVerifyKey } from "@unkey/api/funcs/keysVerifyKey";
import type { Context, Next } from "hono";
import { env } from "@/env";
@@ -22,21 +23,31 @@ export async function authMiddleware(
if (error) {
throw new OpenStatusApiError({
- code: "INTERNAL_SERVER_ERROR",
+ code: "UNAUTHORIZED",
message: error.message,
});
}
- if (!result?.valid || !result?.ownerId) {
+
+ if (!result.valid || !result.ownerId) {
throw new OpenStatusApiError({
code: "UNAUTHORIZED",
message: "Invalid API Key",
});
}
+ const ownerId = Number.parseInt(result.ownerId);
+
+ if (Number.isNaN(ownerId)) {
+ throw new OpenStatusApiError({
+ code: "UNAUTHORIZED",
+ message: "API Key is Not a Number",
+ });
+ }
+
const _workspace = await db
.select()
.from(workspace)
- .where(eq(workspace.id, Number.parseInt(result.ownerId)))
+ .where(eq(workspace.id, ownerId))
.get();
if (!_workspace) {
@@ -72,10 +83,21 @@ async function validateKey(key: string): Promise<{
* > We cannot use `os_` as a prefix for our own keys.
*/
if (key.startsWith("os_")) {
- const { result, error } = await verifyKey(key);
+ const unkey = new UnkeyCore({ rootKey: env.UNKEY_TOKEN });
+ const res = await keysVerifyKey(unkey, { key });
+ if (!res.ok) {
+ console.error("Unkey Error", res.error?.message);
+ return {
+ result: { valid: false, ownerId: undefined },
+ error: { message: "Invalid API verification" },
+ };
+ }
return {
- result: { valid: result?.valid ?? false, ownerId: result?.ownerId },
- error: error ? { message: error.message } : undefined,
+ result: {
+ valid: res.value.data.valid,
+ ownerId: res.value.data.identity?.externalId,
+ },
+ error: undefined,
};
}
// Special bypass for our workspace
diff --git a/apps/server/src/routes/v1/check/http/post.test.ts b/apps/server/src/routes/v1/check/http/post.test.ts
index 7f148baf8..b386bf2f3 100644
--- a/apps/server/src/routes/v1/check/http/post.test.ts
+++ b/apps/server/src/routes/v1/check/http/post.test.ts
@@ -3,10 +3,9 @@ import { expect, test } from "bun:test";
import { afterEach, mock } from "bun:test";
import { app } from "@/index";
-// @ts-expect-error - FIXME: requires a function...
const mockFetch = mock();
-global.fetch = mockFetch;
+global.fetch = mockFetch as unknown as typeof fetch;
mock.module("node-fetch", () => mockFetch);
afterEach(() => {
diff --git a/apps/server/src/routes/v1/index.ts b/apps/server/src/routes/v1/index.ts
index 9792a6fed..09347abef 100644
--- a/apps/server/src/routes/v1/index.ts
+++ b/apps/server/src/routes/v1/index.ts
@@ -108,9 +108,7 @@ api.doc("/openapi", {
api.get(
"/",
Scalar({
- spec: {
- url: "/v1/openapi",
- },
+ url: "/v1/openapi",
servers: [
{
url: "https://api.openstatus.dev/v1",
diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json
index 402862712..53bb99e2e 100644
--- a/apps/server/tsconfig.json
+++ b/apps/server/tsconfig.json
@@ -3,6 +3,8 @@
"include": ["src", "*.ts", "**/*.ts"],
"compilerOptions": {
"jsx": "react-jsx",
+ "module": "preserve",
+ "moduleResolution": "bundler",
"jsxImportSource": "react",
"allowJs": true,
"types": ["bun-types"],
diff --git a/apps/web/package.json b/apps/web/package.json
index fdbb7d888..984d06f21 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -53,7 +53,6 @@
"@trpc/next": "11.4.4",
"@trpc/react-query": "11.4.4",
"@trpc/server": "11.4.4",
- "@unkey/api": "0.26.1",
"@upstash/qstash": "2.6.2",
"@upstash/redis": "1.22.1",
"@vercel/blob": "0.23.3",
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index 8e6a8c1f0..10c388c7b 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -1,6 +1,7 @@
{
"extends": "@openstatus/tsconfig/nextjs.json",
"compilerOptions": {
+ "moduleResolution": "bundler",
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
diff --git a/packages/api/package.json b/packages/api/package.json
index c142e78f2..7257ad0af 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -21,7 +21,7 @@
"@t3-oss/env-core": "0.7.1",
"@trpc/client": "11.4.4",
"@trpc/server": "11.4.4",
- "@unkey/api": "0.26.1",
+ "@unkey/api": "2.2.0",
"@vercel/blob": "0.23.3",
"date-fns": "2.30.0",
"nanoid": "5.0.7",
diff --git a/packages/api/src/router/apiKey.ts b/packages/api/src/router/apiKey.ts
index 29d8075ae..a874702b9 100644
--- a/packages/api/src/router/apiKey.ts
+++ b/packages/api/src/router/apiKey.ts
@@ -1,4 +1,7 @@
-import { Unkey } from "@unkey/api";
+import { UnkeyCore } from "@unkey/api/core";
+import { apisListKeys } from "@unkey/api/funcs/apisListKeys";
+import { keysCreateKey } from "@unkey/api/funcs/keysCreateKey";
+import { keysDeleteKey } from "@unkey/api/funcs/keysDeleteKey";
import { z } from "zod";
import { Events } from "@openstatus/analytics";
@@ -14,7 +17,7 @@ export const apiKeyRouter = createTRPCRouter({
.meta({ track: Events.CreateAPI })
.input(z.object({ ownerId: z.number() }))
.mutation(async ({ input, ctx }) => {
- const unkey = new Unkey({ token: env.UNKEY_TOKEN, cache: "no-cache" });
+ const unkey = new UnkeyCore({ rootKey: env.UNKEY_TOKEN });
const allowedWorkspaces = await db
.select()
@@ -33,44 +36,55 @@ export const apiKeyRouter = createTRPCRouter({
});
}
- const key = await unkey.keys.create({
+ const res = await keysCreateKey(unkey, {
apiId: env.UNKEY_API_ID,
- ownerId: String(input.ownerId),
+ externalId: String(input.ownerId),
prefix: "os",
});
- console.log(key);
+ if (!res.ok) {
+ throw new TRPCError({
+ code: "BAD_REQUEST",
+ message: res.error.message,
+ });
+ }
- return key;
+ return res.value.data;
}),
revoke: protectedProcedure
.meta({ track: Events.RevokeAPI })
.input(z.object({ keyId: z.string() }))
.mutation(async ({ input }) => {
- const unkey = new Unkey({ token: env.UNKEY_TOKEN, cache: "no-cache" });
+ const unkey = new UnkeyCore({ rootKey: env.UNKEY_TOKEN });
- const res = await unkey.keys.delete({ keyId: input.keyId });
- return res;
+ const res = await keysDeleteKey(unkey, { keyId: input.keyId });
+
+ if (!res.ok) {
+ throw new TRPCError({
+ code: "BAD_REQUEST",
+ message: res.error.message,
+ });
+ }
+
+ return res.value;
}),
get: protectedProcedure.query(async ({ ctx }) => {
- const unkey = new Unkey({ token: env.UNKEY_TOKEN, cache: "no-cache" });
+ const unkey = new UnkeyCore({ rootKey: env.UNKEY_TOKEN });
- const data = await unkey.apis.listKeys({
+ const res = await apisListKeys(unkey, {
+ externalId: String(ctx.workspace.id),
apiId: env.UNKEY_API_ID,
- ownerId: String(ctx.workspace.id),
});
- if (data?.error) {
+ if (!res.ok) {
throw new TRPCError({
- code: "INTERNAL_SERVER_ERROR",
- message: "Something went wrong. Please contact us.",
+ code: "BAD_REQUEST",
+ message: res.error.message,
});
}
- const value = data.result.keys?.[0] || null;
-
- return value;
+ return res.value.data[0];
}),
});
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
index b4382e67e..15860ea15 100644
--- a/packages/api/tsconfig.json
+++ b/packages/api/tsconfig.json
@@ -2,6 +2,7 @@
"extends": "@openstatus/tsconfig/nextjs.json",
"include": ["src", "*.ts"],
"compilerOptions": {
+ "moduleResolution": "bundler",
"types": ["bun-types"]
}
}
diff --git a/packages/db/src/schema/plan/config.ts b/packages/db/src/schema/plan/config.ts
index d09752b89..4d045f281 100644
--- a/packages/db/src/schema/plan/config.ts
+++ b/packages/db/src/schema/plan/config.ts
@@ -27,6 +27,7 @@ export const allPlans: Record<
INR: 0,
},
limits: {
+ version: undefined,
monitors: 1,
"synthetic-checks": 30,
periodicity: ["10m", "30m", "1h"],
@@ -65,6 +66,7 @@ export const allPlans: Record<
INR: 3000,
},
limits: {
+ version: undefined,
monitors: 20,
"synthetic-checks": 100,
periodicity: ["1m", "5m", "10m", "30m", "1h"],
@@ -103,6 +105,7 @@ export const allPlans: Record<
INR: 10000,
},
limits: {
+ version: undefined,
monitors: 50,
"synthetic-checks": 300,
periodicity: ["30s", "1m", "5m", "10m", "30m", "1h"],
diff --git a/packages/tinybird/src/client.ts b/packages/tinybird/src/client.ts
index f7998aab5..05ca02e94 100644
--- a/packages/tinybird/src/client.ts
+++ b/packages/tinybird/src/client.ts
@@ -588,7 +588,7 @@ export class OSTinybird {
.number()
.default(0)
.transform((val) => val !== 0),
- region: z.enum(monitorRegions).or(z.string()),
+ region: z.enum(monitorRegions),
timestamp: z.number().int().optional(),
message: z.string().nullable().optional(),
timing: timingSchema,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index af23872e2..5f879ee2f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -218,6 +218,9 @@ importers:
'@trpc/tanstack-react-query':
specifier: 11.4.4
+ '@unkey/api':
+ specifier: 2.2.0
+ version: 2.2.0
class-variance-authority:
specifier: 0.7.1
version: 0.7.1
@@ -477,8 +480,8 @@ importers:
specifier: 0.7.1
'@unkey/api':
- specifier: 0.26.1
- version: 0.26.1
+ specifier: 2.2.0
+ version: 2.2.0
'@upstash/qstash':
specifier: 2.6.2
version: 2.6.2
@@ -895,9 +898,6 @@ importers:
'@trpc/server':
specifier: 11.4.4
version: 11.4.4([email protected])
- '@unkey/api':
- specifier: 0.26.1
- version: 0.26.1
'@upstash/qstash':
specifier: 2.6.2
version: 2.6.2
@@ -1196,8 +1196,8 @@ importers:
specifier: 11.4.4
version: 11.4.4([email protected])
'@unkey/api':
- specifier: 0.26.1
- version: 0.26.1
+ specifier: 2.2.0
+ version: 2.2.0
'@vercel/blob':
specifier: 0.23.3
version: 0.23.3
@@ -6822,14 +6822,8 @@ packages:
'@unhead/[email protected]':
resolution: {integrity: sha512-0zWykKAaJdm+/Y7yi/Yds20PrUK7XabLe9c3IRcjnwYmSWY6z0Cr19VIs3ozCj8P+GhR+/TI2mwtGlueCEYouA==}
- '@unkey/[email protected]':
- resolution: {integrity: sha512-WSYOeZjGbFkO9yA4UsNS6NjprUF9OAYIlBHN/7iRUaFBq+PL502Qe10xNwiwoppYhW6PnrCFobW92vrkjHTcjA==}
-
- '@unkey/[email protected]':
- resolution: {integrity: sha512-DFGb4A7SrusZPP0FYuRIF0CO+Gi4etLUAEJ6EKc+TKYmscL0nEJ2Pr38FyX9MvjI4Wx5l35Wc9KsBjMm9Ybh7w==}
-
- '@unkey/[email protected]':
- resolution: {integrity: sha512-Hj+52XRIlBBl3/qOUq9K71Fwy3PWExBQOpOClVYHdrcmbgqNL6L4EdW/BzliLhqPCdwZTPVSJTnZ3Hw4ZYixsQ==}
+ '@unkey/[email protected]':
+ resolution: {integrity: sha512-XoFWPbZnyos04u+qQTAT+lHymRTNidMK64QywZaWNKbJmorPDd/jZlyKZvL+LNxxBlFXcHOHFtPHPk90wWmcvg==}
'@upstash/[email protected]':
resolution: {integrity: sha512-cpPSR0XJAJs4Ddz9nq3tINlPS5aLfWVCqhhtHnXt4p7qr5+/Znlt1Es736poB/9rnl1hAHrOsOvVj46NEXcVqA==}
@@ -17581,17 +17575,8 @@ snapshots:
hookable: 5.5.3
zhead: 2.2.4
- '@unkey/[email protected]':
- dependencies:
- '@unkey/rbac': 0.3.1
-
- '@unkey/[email protected]':
- dependencies:
- zod: 3.25.76
-
- '@unkey/[email protected]':
+ '@unkey/[email protected]':
dependencies:
- '@unkey/error': 0.2.0
zod: 3.25.76
'@upstash/[email protected]':