@amerged/ohmyhost-cli 0.1.11 → 0.1.14

package/src/apps/product-cli/runtime-contract.ts

@@ -129,6 +129,29 @@ const PROBLEM_POLICY = {
     retryable: true,
     action: "Retry project creation with the same idempotency key.",
   },
+  project_handle_taken: {
+    status: 409,
+    retryable: false,
+    action:
+      "Run 'ohmyhost project handle check' for a free address, then rename to one of the alternatives it returns.",
+  },
+  project_handle_invalid: {
+    status: 409,
+    retryable: false,
+    action:
+      "Choose one to five lowercase words of letters and digits, three to fifty-nine characters, avoiding reserved words.",
+  },
+  project_handle_unchanged: {
+    status: 409,
+    retryable: false,
+    action: "The project already answers on this address; no rename is needed.",
+  },
+  project_rename_blocked: {
+    status: 409,
+    retryable: true,
+    action:
+      "Wait for the running operation to finish, read the project again, then rename with the new ETag.",
+  },
   project_identity_unavailable: {
     status: 503,
     retryable: true,
@@ -196,6 +219,12 @@ const PROBLEM_POLICY = {
     action:
       "Run 'ohmyhost init', apply the matching ohmyhost framework skill, then plan the new commit.",
   },
+  repository_configuration_missing: {
+    status: 409,
+    retryable: false,
+    action:
+      "Place ohmyhost.yaml at the Git repository root and set applicationRoot to the application directory (for example website). Commit and push the change, then plan the new commit.",
+  },
   migration_filename_noncanonical: {
     status: 409,
     retryable: false,
@@ -278,6 +307,7 @@ export class ResponseContractError extends Error {
 }
 
 export interface SafeProblem {
+  readonly requestId: string;
   readonly retryAfterSeconds?: number;
   readonly code: ProblemCode;
   readonly retryable: boolean;
@@ -676,9 +706,9 @@ export const parseDevAccessTicket = (value: unknown): PublicDevAccessTicket => {
     !isUlid(input["project_id"]) ||
     !isUlid(input["environment_id"]) ||
     typeof origin !== "string" ||
-    !/^https:\/\/dev-[a-z]+-[a-z]+-[a-z]+\.(?:dev\.)?check\.omh\.st$/u.test(origin) ||
+    !/^https:\/\/dev-[a-z0-9]+(?:-[a-z0-9]+){0,4}\.(?:dev\.)?check\.omh\.st$/u.test(origin) ||
     typeof redeemUrl !== "string" ||
-    !/^https:\/\/dev-[a-z]+-[a-z]+-[a-z]+\.(?:dev\.)?check\.omh\.st\/\.ohmyhost\/dev-access\/redeem\?stage=dev&ticket=[A-Za-z0-9_-]{43}$/u.test(
+    !/^https:\/\/dev-[a-z0-9]+(?:-[a-z0-9]+){0,4}\.(?:dev\.)?check\.omh\.st\/\.ohmyhost\/dev-access\/redeem\?stage=dev&ticket=[A-Za-z0-9_-]{43}$/u.test(
       redeemUrl,
     ) ||
     new URL(redeemUrl).origin !== origin ||
@@ -880,8 +910,8 @@ const parseProject = (value: unknown): PublicProject => {
     !isUlid(input["organization_id"]) ||
     !boundedString(input["name"], 1, 128) ||
     input["name"] !== input["name"].trim() ||
-    !boundedString(input["handle"], 5, 59) ||
-    !/^[a-z]+-[a-z]+-[a-z]+$/u.test(input["handle"]) ||
+    !boundedString(input["handle"], 3, 59) ||
+    !/^[a-z0-9]+(?:-[a-z0-9]+){0,4}$/u.test(input["handle"]) ||
     (input["data_mode"] !== "shared" && input["data_mode"] !== "isolated") ||
     (input["region"] !== "us" && input["region"] !== "eu") ||
     !isIsoInstant(input["created_at"])
@@ -910,6 +940,7 @@ export const parseProjectPage = (
 export const parseProjectStatus = (value: unknown): Readonly<Record<string, unknown>> => {
   const input = exactRecord(value, [
     "project_id",
+    "etag",
     "handle",
     "region",
     "lifecycle",
@@ -925,8 +956,10 @@ export const parseProjectStatus = (value: unknown): Readonly<Record<string, unkn
   const handle = input["handle"];
   if (
     !isUlid(input["project_id"]) ||
-    !boundedString(handle, 5, 59) ||
-    !/^[a-z]+-[a-z]+-[a-z]+$/u.test(handle) ||
+    typeof input["etag"] !== "string" ||
+    !/^"sha256-[a-f0-9]{64}"$/u.test(input["etag"]) ||
+    !boundedString(handle, 3, 59) ||
+    !/^[a-z0-9]+(?:-[a-z0-9]+){0,4}$/u.test(handle) ||
     (input["region"] !== "us" && input["region"] !== "eu") ||
     (input["lifecycle"] !== "active" &&
       input["lifecycle"] !== "deleting" &&
@@ -1271,100 +1304,6 @@ function validDelivery(input: Readonly<Record<string, unknown>>): boolean {
   );
 }
 
-export type PublicProjectMailDomain =
-  | Readonly<{ domain: string; status: "configured"; configured_at: string }>
-  | Readonly<{
-      domain: string;
-      status: "delegation_required" | "ready" | "verification_pending" | "verification_failed";
-      observed_at?: string;
-      verification_issue?:
-        | "identity_missing"
-        | "identity_verification_failed"
-        | "dkim_verification_failed"
-        | "dkim_records_changed"
-        | "tenant_association_missing"
-        | null;
-      next_check_after_seconds?: 3600 | null;
-      configured_at: string;
-      name_servers: readonly [string, string, string, string];
-      change_id: string;
-    }>;
-
-export const parseProjectMailDomain = (value: unknown): PublicProjectMailDomain => {
-  const input = exactRecord(value, [
-    "domain",
-    "status",
-    "configured_at",
-    "name_servers",
-    "change_id",
-    "observed_at",
-    "verification_issue",
-    "next_check_after_seconds",
-  ]);
-  if (
-    typeof input["domain"] !== "string" ||
-    !/^(?=.{1,253}$)(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,63}$/u.test(
-      input["domain"],
-    ) ||
-    !isIsoInstant(input["configured_at"])
-  ) {
-    throw new ResponseContractError();
-  }
-  if (input["status"] === "configured") {
-    if (
-      input["name_servers"] !== undefined ||
-      input["change_id"] !== undefined ||
-      input["observed_at"] !== undefined ||
-      input["verification_issue"] !== undefined ||
-      input["next_check_after_seconds"] !== undefined
-    ) {
-      throw new ResponseContractError();
-    }
-    return input as unknown as PublicProjectMailDomain;
-  }
-  if (
-    !["delegation_required", "ready", "verification_pending", "verification_failed"].includes(
-      String(input["status"]),
-    ) ||
-    !Array.isArray(input["name_servers"]) ||
-    input["name_servers"].length !== 4 ||
-    new Set(input["name_servers"]).size !== 4 ||
-    input["name_servers"].some(
-      (nameServer) =>
-        typeof nameServer !== "string" ||
-        !/^ns-[0-9]{1,4}\.awsdns-[0-9]{1,2}\.(?:com|net|org|co\.uk)$/u.test(nameServer),
-    ) ||
-    typeof input["change_id"] !== "string" ||
-    !/^C[A-Z0-9]{8,31}$/u.test(input["change_id"])
-  ) {
-    throw new ResponseContractError();
-  }
-  if (input["observed_at"] !== undefined) {
-    if (
-      ![
-        null,
-        "identity_missing",
-        "identity_verification_failed",
-        "dkim_verification_failed",
-        "dkim_records_changed",
-        "tenant_association_missing",
-      ].includes(input["verification_issue"] as string | null)
-    )
-      throw new ResponseContractError();
-    if (
-      !isIsoInstant(input["observed_at"]) ||
-      input["next_check_after_seconds"] !== (input["status"] === "ready" ? null : 3600)
-    )
-      throw new ResponseContractError();
-  } else if (
-    input["next_check_after_seconds"] !== undefined ||
-    input["verification_issue"] !== undefined ||
-    ["verification_pending", "verification_failed"].includes(String(input["status"]))
-  )
-    throw new ResponseContractError();
-  return input as unknown as PublicProjectMailDomain;
-};
-
 export const parseDeploymentPlan = (value: unknown): Readonly<Record<string, unknown>> => {
   const input = exactRecord(value, [
     "id",
@@ -1540,6 +1479,7 @@ export const parseSafeProblem = (value: unknown): SafeProblem => {
     !isHttpsUrl(input["type"]) ||
     !boundedString(input["title"], 1, 160) ||
     !boundedString(input["request_id"], 1, 128) ||
+    /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u.test(input["request_id"]) ||
     typeof input["retryable"] !== "boolean" ||
     !boundedString(input["suggested_action"], 1, 500) ||
     (input["detail"] !== undefined && !boundedString(input["detail"], 1, 2_000)) ||
@@ -1558,6 +1498,7 @@ export const parseSafeProblem = (value: unknown): SafeProblem => {
   )
     throw new ResponseContractError();
   return {
+    requestId: input["request_id"],
     code: code as ProblemCode,
     retryable: policy.retryable,
     suggestedAction:

package/src/packages/contracts/framework-admission.ts

@@ -208,9 +208,9 @@ const FRAMEWORK_CONVERSION_DETAILS: Readonly<
 > = Object.freeze({
   database_binding_private: Object.freeze({
     render: (path: string) =>
-      `"${path}" reads a managed database connection string. Hyperdrive, DATABASE_URL and postgres:// URLs never reach a customer Worker; call the database with createPrivateDatabaseClient from "@ohmyhost/customer-runtime/database". Commit the change, then plan again.`,
+      `"${path}" reads a managed database connection string. HYPERDRIVE is retired; DATABASE_URL and postgres:// URLs never reach a customer Worker. Call the database with createPrivateDatabaseClient from "@ohmyhost/customer-runtime/database". Commit the change, then plan again.`,
     pattern:
-      /^"([^"]+)" reads a managed database connection string\. Hyperdrive, DATABASE_URL and postgres:\/\/ URLs never reach a customer Worker; call the database with createPrivateDatabaseClient from "@ohmyhost\/customer-runtime\/database"\. Commit the change, then plan again\.$/u,
+      /^"([^"]+)" reads a managed database connection string\. HYPERDRIVE is retired; DATABASE_URL and postgres:\/\/ URLs never reach a customer Worker\. Call the database with createPrivateDatabaseClient from "@ohmyhost\/customer-runtime\/database"\. Commit the change, then plan again\.$/u,
   }),
   database_driver_unsupported: Object.freeze({
     render: (path: string) =>

package/src/packages/sdk-ts/generated/index.ts

@@ -3,11 +3,12 @@
 export {
   applyPaidProjectDomain,
   changeDatabaseCompute,
+  changeProjectHandle,
   completeCloudflareDnsAuthorization,
   completeGithubSourceAuthorization,
   configureBillingRecharge,
+  configureManagedMailDomain,
   configureProjectDomains,
-  configureProjectMailDomain,
   configureProjectSourceAutoDeploy,
   connectGithubOrganization,
   createBillingCheckout,
@@ -23,6 +24,7 @@ export {
   deleteEnvironmentSecret,
   deletePaidProjectDomain,
   deleteProject,
+  disableManagedMailReceiving,
   getAccountProfile,
   getBillingCheckout,
   getBillingRecharge,
@@ -33,6 +35,9 @@ export {
   getDeploymentLogs,
   getFeatureInterests,
   getGithubOrganizationConnection,
+  getManagedMailAttachment,
+  getManagedMailDomain,
+  getManagedMailMessage,
   getOperation,
   getOrganizationAccount,
   getOrganizationCredits,
@@ -43,7 +48,6 @@ export {
   getProjectCreditBudget,
   getProjectExport,
   getProjectHandleAvailability,
-  getProjectMailDomain,
   getProjectSource,
   getProjectSourceAutoDeploy,
   getProjectStatus,
@@ -53,6 +57,7 @@ export {
   listDeployments,
   listEnvironmentSecrets,
   listFunctionRuns,
+  listManagedMailMessages,
   listProjectDatabaseAccess,
   listProjects,
   listUserApiKeys,
@@ -62,12 +67,14 @@ export {
   planDeploymentRollback,
   planPaidProjectDomain,
   planProjectDeletion,
+  prepareManagedMailWebhook,
   promoteDeployment,
   putEnvironmentSecret,
   queryProjectDatabase,
   reconcileOperation,
   recordSignupSource,
   registerFeatureInterest,
+  retryManagedMailMessage,
   revokeCurrentSession,
   revokeProjectDatabaseAccess,
   revokeUserApiKey,
@@ -78,6 +85,7 @@ export {
   streamOperationEvents,
   submitContactRequest,
   submitFeedback,
+  verifyManagedMailWebhook,
   writeProjectDatabase,
 } from "./sdk.gen.js";
 export type {
@@ -101,6 +109,11 @@ export type {
   ChangeDatabaseComputeErrors,
   ChangeDatabaseComputeResponse,
   ChangeDatabaseComputeResponses,
+  ChangeProjectHandleData,
+  ChangeProjectHandleError,
+  ChangeProjectHandleErrors,
+  ChangeProjectHandleResponse,
+  ChangeProjectHandleResponses,
   ClientOptions,
   CloudflareDnsAuthorization,
   CloudflareDnsAuthorizationStatus,
@@ -117,18 +130,16 @@ export type {
   ConfigureBillingRechargeErrors,
   ConfigureBillingRechargeResponse,
   ConfigureBillingRechargeResponses,
-  ConfiguredProjectMailDomain,
+  ConfigureManagedMailDomainData,
+  ConfigureManagedMailDomainError,
+  ConfigureManagedMailDomainErrors,
+  ConfigureManagedMailDomainResponse,
+  ConfigureManagedMailDomainResponses,
   ConfigureProjectDomainsData,
   ConfigureProjectDomainsError,
   ConfigureProjectDomainsErrors,
   ConfigureProjectDomainsResponse,
   ConfigureProjectDomainsResponses,
-  ConfigureProjectMailDomainData,
-  ConfigureProjectMailDomainError,
-  ConfigureProjectMailDomainErrors,
-  ConfigureProjectMailDomainRequest,
-  ConfigureProjectMailDomainResponse,
-  ConfigureProjectMailDomainResponses,
   ConfigureProjectSourceAutoDeployData,
   ConfigureProjectSourceAutoDeployError,
   ConfigureProjectSourceAutoDeployErrors,
@@ -203,7 +214,6 @@ export type {
   DatabaseAccessId,
   DatabaseCompute,
   DatabaseEnvironmentFilter,
-  DelegatedProjectMailDomain,
   DeleteEnvironmentSecretData,
   DeleteEnvironmentSecretError,
   DeleteEnvironmentSecretErrors,
@@ -230,6 +240,11 @@ export type {
   DeploymentPlan,
   DeploymentPlanWritable,
   DevAccessTicket,
+  DisableManagedMailReceivingData,
+  DisableManagedMailReceivingError,
+  DisableManagedMailReceivingErrors,
+  DisableManagedMailReceivingResponse,
+  DisableManagedMailReceivingResponses,
   EnvironmentId,
   EnvironmentSecret,
   EnvironmentSecretPage,
@@ -289,6 +304,21 @@ export type {
   GetGithubOrganizationConnectionErrors,
   GetGithubOrganizationConnectionResponse,
   GetGithubOrganizationConnectionResponses,
+  GetManagedMailAttachmentData,
+  GetManagedMailAttachmentError,
+  GetManagedMailAttachmentErrors,
+  GetManagedMailAttachmentResponse,
+  GetManagedMailAttachmentResponses,
+  GetManagedMailDomainData,
+  GetManagedMailDomainError,
+  GetManagedMailDomainErrors,
+  GetManagedMailDomainResponse,
+  GetManagedMailDomainResponses,
+  GetManagedMailMessageData,
+  GetManagedMailMessageError,
+  GetManagedMailMessageErrors,
+  GetManagedMailMessageResponse,
+  GetManagedMailMessageResponses,
   GetOperationData,
   GetOperationError,
   GetOperationErrors,
@@ -337,11 +367,6 @@ export type {
   GetProjectHandleAvailabilityErrors,
   GetProjectHandleAvailabilityResponse,
   GetProjectHandleAvailabilityResponses,
-  GetProjectMailDomainData,
-  GetProjectMailDomainError,
-  GetProjectMailDomainErrors,
-  GetProjectMailDomainResponse,
-  GetProjectMailDomainResponses,
   GetProjectResponse,
   GetProjectResponses,
   GetProjectSourceAutoDeployData,
@@ -400,6 +425,11 @@ export type {
   ListFunctionRunsErrors,
   ListFunctionRunsResponse,
   ListFunctionRunsResponses,
+  ListManagedMailMessagesData,
+  ListManagedMailMessagesError,
+  ListManagedMailMessagesErrors,
+  ListManagedMailMessagesResponse,
+  ListManagedMailMessagesResponses,
   ListProjectDatabaseAccessData,
   ListProjectDatabaseAccessError,
   ListProjectDatabaseAccessErrors,
@@ -415,6 +445,17 @@ export type {
   ListUserApiKeysErrors,
   ListUserApiKeysResponse,
   ListUserApiKeysResponses,
+  ManagedMailContent,
+  ManagedMailContentResult,
+  ManagedMailDisabled,
+  ManagedMailDnsRecord,
+  ManagedMailDomain,
+  ManagedMailDomainRequest,
+  ManagedMailExpired,
+  ManagedMailMessagePage,
+  ManagedMailRetryResult,
+  ManagedMailWebhook,
+  ManagedMailWebhookRequest,
   Operation,
   OperationDeploymentProgress,
   OperationEvent,
@@ -455,6 +496,11 @@ export type {
   PlanProjectDeletionErrors,
   PlanProjectDeletionResponse,
   PlanProjectDeletionResponses,
+  PrepareManagedMailWebhookData,
+  PrepareManagedMailWebhookError,
+  PrepareManagedMailWebhookErrors,
+  PrepareManagedMailWebhookResponse,
+  PrepareManagedMailWebhookResponses,
   ProblemDetails,
   Project,
   ProjectContext,
@@ -476,7 +522,6 @@ export type {
   ProjectHandleAvailability,
   ProjectId,
   ProjectLimit,
-  ProjectMailDomain,
   ProjectNotesReceipt,
   ProjectPage,
   ProjectSource,
@@ -515,6 +560,11 @@ export type {
   RegisterFeatureInterestResponse,
   RegisterFeatureInterestResponses,
   RequestId,
+  RetryManagedMailMessageData,
+  RetryManagedMailMessageError,
+  RetryManagedMailMessageErrors,
+  RetryManagedMailMessageResponse,
+  RetryManagedMailMessageResponses,
   RevokeCurrentSessionData,
   RevokeCurrentSessionError,
   RevokeCurrentSessionErrors,
@@ -577,6 +627,11 @@ export type {
   UserApiKeyCreation,
   UserApiKeyId,
   UserApiKeyPage,
+  VerifyManagedMailWebhookData,
+  VerifyManagedMailWebhookError,
+  VerifyManagedMailWebhookErrors,
+  VerifyManagedMailWebhookResponse,
+  VerifyManagedMailWebhookResponses,
   WriteProjectDatabaseData,
   WriteProjectDatabaseError,
   WriteProjectDatabaseErrors,