@amerged/ohmyhost-mcp 0.1.40 → 0.1.42

package/src/packages/contracts/src/credit-pricing.ts

@@ -1,23 +1,28 @@
 export interface OrganizationCreditUsage {
   organization_id: string;
-  month: string;
   as_of: string;
   unit: "microcredits";
-  data: {
-    project_id: string;
-    reserved_micros: string;
-    meters: {
-      environment_id: string | null;
-      meter: string;
-      unit: string;
-      rate_card_id: string;
-      quantity: string;
-      charged_micros: string;
-      funded_micros: string;
-      platform_overrun_micros: string;
+  /** The UTC month (`YYYY-MM`) that `projects[].used_micros` counts. */
+  period: string;
+  /** The first instant of the daily lines: the start of the oldest UTC day that is reported. */
+  from: string;
+  /** What each project has used so far in `period`. */
+  projects: { project_id: string; used_micros: string }[];
+  /** The credit-log lines of the last up to 14 UTC days, grouped by day, project and meter, oldest day first. */
+  days: {
+    day: string;
+    projects: {
+      project_id: string;
+      meters: {
+        environment_id: string | null;
+        meter: string;
+        unit: string;
+        rate_card_id: string;
+        quantity: string;
+        charged_micros: string;
+      }[];
     }[];
   }[];
-  next_cursor: string | null;
 }
 
 /** A bounded read model, not a new source of accounting or billing authorization. */
@@ -38,53 +43,77 @@ export function assertOrganizationCreditUsage(
     typeof input === "string" && /^[0-7][0-9A-HJKMNP-TV-Z]{25}$/u.test(input);
   const amount = (input: unknown) =>
     typeof input === "string" && /^(0|[1-9][0-9]{0,37})$/u.test(input);
-  const report = record(value, "organization_id,month,as_of,unit,data,next_cursor");
+  const instant = (input: unknown) =>
+    typeof input === "string" &&
+    Number.isFinite(Date.parse(input)) &&
+    new Date(input).toISOString() === input;
+  const report = record(value, "organization_id,as_of,unit,period,from,projects,days");
   if (
     !identifier(report["organization_id"]) ||
-    typeof report["month"] !== "string" ||
-    !/^20[0-9]{2}-(0[1-9]|1[0-2])$/u.test(report["month"]) ||
-    typeof report["as_of"] !== "string" ||
-    !Number.isFinite(Date.parse(report["as_of"])) ||
-    new Date(report["as_of"]).toISOString() !== report["as_of"] ||
+    !instant(report["as_of"]) ||
+    !instant(report["from"]) ||
     report["unit"] !== "microcredits" ||
-    !Array.isArray(report["data"]) ||
-    report["data"].length > 20 ||
-    (report["next_cursor"] !== null && !identifier(report["next_cursor"]))
+    typeof report["period"] !== "string" ||
+    !/^20[0-9]{2}-(0[1-9]|1[0-2])$/u.test(report["period"]) ||
+    !Array.isArray(report["projects"]) ||
+    report["projects"].length > 1000 ||
+    !Array.isArray(report["days"]) ||
+    report["days"].length > 15
   )
     throw new TypeError("Invalid usage report");
   let previous = "";
-  for (const input of report["data"]) {
-    const project = record(input, "project_id,reserved_micros,meters");
+  for (const input of report["projects"]) {
+    const project = record(input, "project_id,used_micros");
     if (
       !identifier(project["project_id"]) ||
       String(project["project_id"]) <= previous ||
-      !amount(project["reserved_micros"]) ||
-      !Array.isArray(project["meters"]) ||
-      project["meters"].length > 1000
+      !amount(project["used_micros"])
     )
       throw new TypeError("Invalid usage project");
     previous = String(project["project_id"]);
-    for (const input of project["meters"]) {
-      const meter = record(
-        input,
-        "environment_id,meter,unit,rate_card_id,quantity,charged_micros,funded_micros,platform_overrun_micros",
-      );
-      if (meter["environment_id"] !== null && !identifier(meter["environment_id"]))
-        throw new TypeError("Invalid usage environment");
-      for (const key of ["meter", "unit", "rate_card_id"])
-        if (typeof meter[key] !== "string" || !/^[A-Za-z0-9_.:/-]{1,128}$/u.test(meter[key]))
-          throw new TypeError("Invalid usage meter");
-      for (const key of ["quantity", "charged_micros", "funded_micros", "platform_overrun_micros"])
-        if (!amount(meter[key])) throw new TypeError("Invalid usage amount");
+  }
+  let previousDay = "";
+  for (const input of report["days"]) {
+    const day = record(input, "day,projects");
+    if (
+      typeof day["day"] !== "string" ||
+      !/^20[0-9]{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/u.test(day["day"]) ||
+      day["day"] <= previousDay ||
+      !Array.isArray(day["projects"]) ||
+      day["projects"].length > 1000
+    )
+      throw new TypeError("Invalid usage day");
+    previousDay = day["day"];
+    previous = "";
+    for (const projectInput of day["projects"]) {
+      const project = record(projectInput, "project_id,meters");
       if (
-        BigInt(String(meter["charged_micros"])) !==
-        BigInt(String(meter["funded_micros"])) + BigInt(String(meter["platform_overrun_micros"]))
+        !identifier(project["project_id"]) ||
+        String(project["project_id"]) <= previous ||
+        !Array.isArray(project["meters"]) ||
+        project["meters"].length > 1000
       )
-        throw new TypeError("Inconsistent usage charge");
+        throw new TypeError("Invalid usage project");
+      previous = String(project["project_id"]);
+      for (const meterInput of project["meters"]) {
+        const meter = record(
+          meterInput,
+          "environment_id,meter,unit,rate_card_id,quantity,charged_micros",
+        );
+        if (meter["environment_id"] !== null && !identifier(meter["environment_id"]))
+          throw new TypeError("Invalid usage environment");
+        for (const key of ["meter", "unit", "rate_card_id"])
+          if (typeof meter[key] !== "string" || !/^[A-Za-z0-9_.:/-]{1,128}$/u.test(meter[key]))
+            throw new TypeError("Invalid usage meter");
+        if (
+          typeof meter["quantity"] !== "string" ||
+          !/^(0|[1-9][0-9]{0,29})(\.[0-9]{1,12})?$/u.test(meter["quantity"]) ||
+          !amount(meter["charged_micros"])
+        )
+          throw new TypeError("Invalid usage amount");
+      }
     }
   }
-  if (report["next_cursor"] !== null && report["next_cursor"] !== previous)
-    throw new TypeError("Invalid usage cursor");
 }
 
 export interface PublishedCreditRateCard {
@@ -177,7 +206,7 @@ export function assertPublishedCreditRateCards(
   }
 }
 
-/** Effective feature access and credit buckets from the existing ledger. */
+/** Effective feature access and the credit account: the monthly and one-time credit and what the open reservations hold. */
 export function assertOrganizationAccount(value: unknown): void {
   if (
     !value ||
@@ -203,10 +232,9 @@ export function assertOrganizationAccount(value: unknown): void {
   for (const field of ["available_micros", "monthly_micros", "one_time_micros", "reserved_micros"])
     if (typeof v[field] !== "string" || !/^(0|[1-9][0-9]{0,18})$/u.test(v[field] as string))
       throw new TypeError("Invalid account credits");
-  if (
-    BigInt(String(v["monthly_micros"])) + BigInt(String(v["one_time_micros"])) !==
-    BigInt(String(v["available_micros"]))
-  )
+  const held = BigInt(String(v["reserved_micros"]));
+  const balance = BigInt(String(v["monthly_micros"])) + BigInt(String(v["one_time_micros"]));
+  if (BigInt(String(v["available_micros"])) !== (balance > held ? balance - held : 0n))
     throw new TypeError("Account credit buckets do not balance");
   for (const field of ["as_of", "paid_until", "next_expiry"]) {
     if (field !== "as_of" && v[field] === null) continue;

package/src/packages/contracts/src/database-access.ts

@@ -112,21 +112,12 @@ export interface ProjectDatabaseAccessFields {
     | "data_change"
     | null;
 }
-export type ProjectDatabaseAccess = ProjectDatabaseAccessFields &
-  (
-    | {
-        readonly database: "neondb";
-        readonly provider?: never;
-        readonly transport?: never;
-        readonly websocket_url?: never;
-      }
-    | {
-        readonly provider: "pgcf";
-        readonly transport: "wss";
-        readonly websocket_url: string;
-        readonly database: string;
-      }
-  );
+export type ProjectDatabaseAccess = ProjectDatabaseAccessFields & {
+  readonly provider: "pgcf";
+  readonly transport: "wss";
+  readonly websocket_url: string;
+  readonly database: string;
+};
 export type ProjectDatabaseAccessCredential = ProjectDatabaseAccess & {
   readonly connection_uri: string;
   readonly psql_command: string;
@@ -140,6 +131,9 @@ const ACCESS_KEYS = [
   "mode",
   "role_name",
   "host",
+  "provider",
+  "transport",
+  "websocket_url",
   "database",
   "label",
   "state",
@@ -177,26 +171,23 @@ export function parseProjectDatabaseAccessRequest(value: unknown): ProjectDataba
 export function assertProjectDatabaseAccess(
   value: unknown,
 ): asserts value is ProjectDatabaseAccess {
-  if (!record(value) || !exact(value, accessKeys(value)))
-    throw new TypeError("Invalid database access");
+  if (!record(value) || !exact(value, ACCESS_KEYS)) throw new TypeError("Invalid database access");
   assertAccessFields(value);
 }
 export function assertProjectDatabaseAccessCredential(
   value: unknown,
 ): asserts value is ProjectDatabaseAccessCredential {
-  if (!record(value) || !exact(value, [...accessKeys(value), "connection_uri", "psql_command"]))
+  if (!record(value) || !exact(value, [...ACCESS_KEYS, "connection_uri", "psql_command"]))
     throw new TypeError("Invalid database access credential");
   assertAccessFields(value);
   const uri = value["connection_uri"];
   if (
     typeof uri !== "string" ||
-    (value["provider"] === "pgcf"
-      ? typeof value["psql_command"] !== "string" ||
-        !new RegExp(
-          `^ohmyhost database psql --project [0-7][0-9A-HJKMNP-TV-Z]{25} --environment ${value["environment"]} --mode ${value["mode"]}$`,
-          "u",
-        ).test(value["psql_command"])
-      : value["psql_command"] !== `psql '${uri}'`)
+    typeof value["psql_command"] !== "string" ||
+    !new RegExp(
+      `^ohmyhost database psql --project [0-7][0-9A-HJKMNP-TV-Z]{25} --environment ${value["environment"]} --mode ${value["mode"]}$`,
+      "u",
+    ).test(value["psql_command"])
   )
     throw new TypeError("Invalid database access credential");
   let parsed: URL;
@@ -206,20 +197,14 @@ export function assertProjectDatabaseAccessCredential(
     throw new TypeError("Invalid database access credential");
   }
   if (
-    (value["provider"] === "pgcf"
-      ? !["postgres:", "postgresql:"].includes(parsed.protocol)
-      : parsed.protocol !== "postgresql:") ||
+    !["postgres:", "postgresql:"].includes(parsed.protocol) ||
     decodeURIComponent(parsed.username) !== value["role_name"] ||
     parsed.password === "" ||
     parsed.hostname !== value["host"] ||
-    (value["provider"] === "pgcf"
-      ? parsed.port !== "" && parsed.port !== "5432"
-      : parsed.host !== value["host"]) ||
+    (parsed.port !== "" && parsed.port !== "5432") ||
     decodeURIComponent(parsed.pathname.slice(1)) !== value["database"] ||
     parsed.hash !== "" ||
-    (value["provider"] === "pgcf"
-      ? !["", "?sslmode=require", "?sslmode=verify-full"].includes(parsed.search)
-      : parsed.search !== "?sslmode=require")
+    !["", "?sslmode=require", "?sslmode=verify-full"].includes(parsed.search)
   )
     throw new TypeError("Invalid database access credential");
 }
@@ -235,11 +220,6 @@ export function assertProjectDatabaseAccessPage(
     throw new TypeError("Invalid database access page");
   for (const item of value["items"]) assertProjectDatabaseAccess(item);
 }
-function accessKeys(value: Record<string, unknown>): readonly string[] {
-  return value["provider"] === "pgcf"
-    ? [...ACCESS_KEYS, "provider", "transport", "websocket_url"]
-    : ACCESS_KEYS;
-}
 function assertAccessFields(value: Record<string, unknown>): void {
   const revoked = value["revoked_at"],
     reason = value["revocation_reason"];
@@ -252,12 +232,11 @@ function assertAccessFields(value: Record<string, unknown>): void {
     !ACCESS_ROLE_PATTERN.test(value["role_name"]) ||
     typeof value["host"] !== "string" ||
     !/^[a-z0-9]([a-z0-9.-]{0,251}[a-z0-9])?$/u.test(value["host"]) ||
-    (value["provider"] === "pgcf"
-      ? typeof value["database"] !== "string" ||
-        !/^[a-z][a-z0-9]{19}$/u.test(value["database"]) ||
-        value["transport"] !== "wss" ||
-        value["websocket_url"] !== `wss://${value["host"]}/`
-      : value["database"] !== "neondb") ||
+    value["provider"] !== "pgcf" ||
+    value["transport"] !== "wss" ||
+    value["websocket_url"] !== `wss://${value["host"]}/` ||
+    typeof value["database"] !== "string" ||
+    !/^[a-z][a-z0-9]{19}$/u.test(value["database"]) ||
     (value["label"] !== null && accessLabel(value["label"]) !== value["label"]) ||
     !["active", "expired", "revoked"].includes(String(value["state"])) ||
     !timestamp(value["issued_at"]) ||