Update hivegrid-cloud reference to latest main

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
davidandClaude Fable 5 committed 2026-07-08 16:15:37 +02:00
1 parent e98d38e716
commit 7b21524c86
3781 files changed
+373484 -225607

No files matched your search

@@ -1,7 +1,7 @@
import { Hono } from "hono";
import type { ApiConfig } from "@toolctrl/config";
import type { LegacyApiKeySimple } from "@toolctrl/db/api-keys.server";
import { SUBSCRIPTION_FEATURE_LIMIT, type TenantApiUsageFeature } from "@toolctrl/db/usage.server";
import type { ApiConfig } from "@hivegrid/config";
import type { LegacyApiKeySimple } from "@hivegrid/db/api-keys.server";
import { SUBSCRIPTION_FEATURE_LIMIT, type TenantApiUsageFeature } from "@hivegrid/db/usage.server";
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
import { resetApiRuntimeConfigForTests, setApiRuntimeConfigForTests } from "../config.js";
@@ -27,7 +27,8 @@ const TEST_API_CONFIG: ApiConfig = {
jwtSecret: "usage-route-secret",
analytics: {},
mailjet: {},
stripe: {},
lago: { timeoutMs: 10000 },
mollie: { timeoutMs: 10000 },
apiKeys: {
allowLegacyPlaintextFallback: true,
},
@@ -51,8 +52,9 @@ function createApiKeyFixture(patch: Partial<LegacyApiKeySimple> = {}): LegacyApi
alias: "Primary usage key",
expires: null,
tenantId,
createdByUserId: "user_usage_1",
active: true,
entities: [],
scopes: ["*"],
tenant: { id: tenantId, name: "Acme Usage", slug: "acme-usage", deactivatedReason: null },
...patch,
};
@@ -235,7 +237,7 @@ describe("getUsageRequest", () => {
test("swallows IP logging failures and still returns usage", async () => {
const { dependencies, mocks } = buildDeps({ ipLoggingError: new Error("ip write failed") });
const response = await requestUsage(dependencies, { "x-api-key": "valid-secret", "x-forwarded-for": "203.0.113.10, 10.0.0.1" });
const response = await requestUsage(dependencies, { "x-api-key": "valid-secret", "cf-connecting-ip": "203.0.113.10" });
expect(response.status).toBe(200);
await expect(response.json()).resolves.toEqual({ plan: "" });
@@ -1,8 +1,9 @@
import { formatTenantApiUsagePlanTitle, SUBSCRIPTION_FEATURE_LIMIT } from "@toolctrl/db/usage.server";
import { formatTenantApiUsagePlanTitle, SUBSCRIPTION_FEATURE_LIMIT } from "@hivegrid/db/usage.server";
import type { Context } from "hono";
import { extractApiKeyFromRequest } from "../auth.js";
import { getApiRuntimeConfig } from "../config.js";
import { getTrustedClientIp } from "../trusted-client-ip.js";
import { apiError, type ApiErrorEnv } from "../middleware/error-envelope.js";
import type { ApiAppDependencies } from "../app.js";
@@ -102,7 +103,8 @@ async function createApiUsageErrorLog(
}
function getClientIpAddress(request: Request) {
return request.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || request.headers.get("x-real-ip") || "";
// Trusted proxy-set header only; leftmost X-Forwarded-For is client-spoofable.
return getTrustedClientIp(request);
}
function serializeRequestSearchParams(request: Request) {