@amerged/ohmyhost-runtime 0.1.37 → 0.1.39

package/src/packages/customer-runtime/src/storage.ts

@@ -7,6 +7,7 @@ import {
   postGatewayJson,
   requireConfiguredUlid,
   validateGatewayConnection,
+  throwGatewayRelayError,
   type GatewayConnection,
 } from "./http.js";
 import {
@@ -33,10 +34,12 @@ export interface StorageUploadInput {
   readonly bytes: Uint8Array;
 }
 
+/** Server-only private files; use global fetch for gateway and signed-object transports. */
 export function createPrivateStorageClient(
   configuration: GatewayConnection & {
     readonly projectId: string;
     readonly environmentId: string;
+    /** Global fetch for short-lived signed object URLs; explicit transports remain test seams. */
     readonly capabilityFetch: (request: Request) => Promise<Response>;
   },
 ) {
@@ -79,18 +82,22 @@ export function createPrivateStorageClient(
     if (response.status !== 200) throwStorageError(response.status, response.body, environmentId);
     const record = response.body as Record<string, unknown>;
     if (record?.["state"] === "completed") {
-      const completed = exactRecord(response.body, ["state", "transfer_id"]);
+      const completed = exactRecord(response.body, ["state", "transfer_id"], response.status);
       return Object.freeze({
         state: "completed" as const,
-        transferId: requireUlid(completed["transfer_id"]),
+        transferId: requireUlid(completed["transfer_id"], response.status),
       });
     }
-    const ready = exactRecord(response.body, ["state", "transfer_id", "capability"]);
-    if (ready["state"] !== "ready") invalidResponse();
+    const ready = exactRecord(
+      response.body,
+      ["state", "transfer_id", "capability"],
+      response.status,
+    );
+    if (ready["state"] !== "ready") invalidResponse(response.status);
     return Object.freeze({
       state: "ready" as const,
-      transferId: requireUlid(ready["transfer_id"]),
-      capability: parseCapability(ready["capability"], "PUT", input.objectKey),
+      transferId: requireUlid(ready["transfer_id"], response.status),
+      capability: parseCapability(ready["capability"], "PUT", input.objectKey, response.status),
     });
   }
 
@@ -107,11 +114,12 @@ export function createPrivateStorageClient(
     if (response.status !== 200 && response.status !== 202) {
       throwStorageError(response.status, response.body, environmentId);
     }
-    const record = exactRecord(response.body, ["state", "transfer_id"]);
-    if (record["state"] !== "completed" && record["state"] !== "pending") invalidResponse();
+    const record = exactRecord(response.body, ["state", "transfer_id"], response.status);
+    if (record["state"] !== "completed" && record["state"] !== "pending")
+      invalidResponse(response.status);
     return Object.freeze({
       state: record["state"],
-      transferId: requireUlid(record["transfer_id"]),
+      transferId: requireUlid(record["transfer_id"], response.status),
     });
   }
 
@@ -127,9 +135,9 @@ export function createPrivateStorageClient(
       8 * 1024,
     );
     if (response.status !== 200) throwStorageError(response.status, response.body, environmentId);
-    const record = exactRecord(response.body, ["state", "capability"]);
-    if (record["state"] !== "ready") invalidResponse();
-    return parseCapability(record["capability"], "GET", objectKey);
+    const record = exactRecord(response.body, ["state", "capability"], response.status);
+    if (record["state"] !== "ready") invalidResponse(response.status);
+    return parseCapability(record["capability"], "GET", objectKey, response.status);
   }
 
   async function deleteObject(input: { idempotencyKey: string; objectKey: string }) {
@@ -142,11 +150,11 @@ export function createPrivateStorageClient(
       input.idempotencyKey,
     );
     if (response.status !== 200) throwStorageError(response.status, response.body, environmentId);
-    const record = exactRecord(response.body, ["state", "deletion_id"]);
-    if (record["state"] !== "completed") invalidResponse();
+    const record = exactRecord(response.body, ["state", "deletion_id"], response.status);
+    if (record["state"] !== "completed") invalidResponse(response.status);
     return Object.freeze({
       state: "completed" as const,
-      deletionId: requireUlid(record["deletion_id"]),
+      deletionId: requireUlid(record["deletion_id"], response.status),
     });
   }
 
@@ -257,9 +265,9 @@ export function createPrivateStorageClient(
         controller.signal,
       );
       if (response.status !== 200) throwStorageError(response.status, value, environmentId);
-      const record = exactRecord(value, ["state", "results"]);
+      const record = exactRecord(value, ["state", "results"], response.status);
       if (!Array.isArray(record["results"]) || record["results"].length !== objects.length)
-        invalidResponse();
+        invalidResponse(response.status);
       const results = record["results"].map((value, index): StorageDeleteResult => {
         const candidate = value as Record<string, unknown>;
         const item = exactRecord(
@@ -269,22 +277,23 @@ export function createPrivateStorageClient(
             : candidate?.["state"] === "pending"
               ? ["object_key", "state", "retry_at"]
               : ["object_key", "state", "code", "retryable"],
+          response.status,
         );
         const requested = objects[index];
         if (requested === undefined || item["object_key"] !== requested.objectKey)
-          invalidResponse();
+          invalidResponse(response.status);
         const objectKey = requested.objectKey;
         if (item["state"] === "completed")
           return Object.freeze({
             state: "completed",
             objectKey,
-            deletionId: requireUlid(item["deletion_id"]),
+            deletionId: requireUlid(item["deletion_id"], response.status),
           });
         if (item["state"] === "pending") {
           return Object.freeze({
             state: "pending",
             objectKey,
-            retryAt: requireRetryAt(item["retry_at"]),
+            retryAt: requireRetryAt(item["retry_at"], response.status),
           });
         }
         if (
@@ -293,7 +302,7 @@ export function createPrivateStorageClient(
           typeof item["retryable"] !== "boolean" ||
           (item["code"] === "object_not_found" && item["retryable"] !== false)
         )
-          invalidResponse();
+          invalidResponse(response.status);
         return Object.freeze({
           state: "failed",
           objectKey,
@@ -305,10 +314,10 @@ export function createPrivateStorageClient(
         record["state"] !==
         (results.every((item) => item.state === "completed") ? "completed" : "partial")
       )
-        invalidResponse();
+        invalidResponse(response.status);
       if (controller.signal.aborted || Date.now() >= deadline) {
         controller.abort();
-        throw new CustomerRuntimeGatewayError("gateway_timeout", null, true);
+        throw new CustomerRuntimeGatewayError("gateway_timeout", response.status, true);
       }
       return Object.freeze(results);
     } finally {
@@ -341,16 +350,18 @@ function validateBatchKeys(value: readonly string[]): readonly string[] {
   return Object.freeze(Array.from(value));
 }
 
-function parseCapability(value: unknown, operation: "GET" | "PUT", objectKey: string) {
-  const record = exactRecord(value, [
-    "operation",
-    "objectKey",
-    "url",
-    "expiresAt",
-    "expectedContentLength",
-    "requiredHeaders",
-  ]);
-  const headers = exactHeaders(record["requiredHeaders"]);
+function parseCapability(
+  value: unknown,
+  operation: "GET" | "PUT",
+  objectKey: string,
+  status: number,
+) {
+  const record = exactRecord(
+    value,
+    ["operation", "objectKey", "url", "expiresAt", "expectedContentLength", "requiredHeaders"],
+    status,
+  );
+  const headers = exactHeaders(record["requiredHeaders"], status);
   if (
     record["operation"] !== operation ||
     record["objectKey"] !== objectKey ||
@@ -363,7 +374,7 @@ function parseCapability(value: unknown, operation: "GET" | "PUT", objectKey: st
         Number(record["expectedContentLength"]) < 0 ||
         Number(record["expectedContentLength"]) > 1_073_741_824))
   ) {
-    invalidResponse();
+    invalidResponse(status);
   }
   return Object.freeze({
     operation,
@@ -376,8 +387,8 @@ function parseCapability(value: unknown, operation: "GET" | "PUT", objectKey: st
   });
 }
 
-function exactHeaders(value: unknown): Readonly<Record<string, string>> {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) invalidResponse();
+function exactHeaders(value: unknown, status: number): Readonly<Record<string, string>> {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) invalidResponse(status);
   const entries = Object.entries(value as Record<string, unknown>);
   if (
     entries.length > 16 ||
@@ -390,12 +401,13 @@ function exactHeaders(value: unknown): Readonly<Record<string, string>> {
         /[\r\n]/u.test(header),
     )
   ) {
-    invalidResponse();
+    invalidResponse(status);
   }
   return Object.freeze(Object.fromEntries(entries) as Record<string, string>);
 }
 
 function throwStorageError(status: number, body: unknown, environmentId: string): never {
+  throwGatewayRelayError(status, body);
   const candidate = body as Record<string, unknown>;
   const record = exactRecord(
     body,
@@ -407,6 +419,7 @@ function throwStorageError(status: number, body: unknown, environmentId: string)
         : typeof body === "object" && body !== null && "transfer_id" in body
           ? ["code", "transfer_id"]
           : ["code"],
+    status,
   );
   const code = record["code"];
   if (status === 401 && code === "unauthorized") {
@@ -416,7 +429,7 @@ function throwStorageError(status: number, body: unknown, environmentId: string)
     throw new CustomerRuntimeGatewayError("storage_object_not_found", status, false);
   }
   if (status === 409 && code === "upload_expired") {
-    requireUlid(record["transfer_id"]);
+    requireUlid(record["transfer_id"], status);
     throw new CustomerRuntimeGatewayError("storage_upload_expired", status, false);
   }
   if (status === 409 && code === "data_change_in_progress") {
@@ -432,11 +445,11 @@ function throwStorageError(status: number, body: unknown, environmentId: string)
       "storage_binding_data_changed",
       status,
       false,
-      `environment ${environmentId} now uses a different data area; create a new deployment plan and redeploy that environment. Repeating this request will not update this deployment's binding`,
+      `the environment's data area changed while this request ran; read the current state for environment ${environmentId} and issue a new request`,
     );
   }
   if (status === 409 && code === "storage_delete_pending") {
-    const retryAt = requireRetryAt(record["retry_at"]);
+    const retryAt = requireRetryAt(record["retry_at"], status);
     throw new CustomerRuntimeGatewayError(
       "storage_delete_pending",
       status,
@@ -450,20 +463,17 @@ function throwStorageError(status: number, body: unknown, environmentId: string)
   if (status === 413 && typeof code === "string") {
     throw new CustomerRuntimeGatewayError("storage_quota_exceeded", status, false);
   }
-  if (status === 503 && code === "storage_gateway_unavailable") {
-    throw new CustomerRuntimeGatewayError("gateway_unavailable", status, true);
-  }
-  return invalidResponse();
+  return invalidResponse(status);
 }
 
-function requireRetryAt(value: unknown): string {
+function requireRetryAt(value: unknown, status: number): string {
   if (
     typeof value !== "string" ||
     !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/u.test(value) ||
     !Number.isFinite(Date.parse(value)) ||
     new Date(value).toISOString() !== value
   )
-    invalidResponse();
+    invalidResponse(status);
   return value;
 }
 
@@ -507,8 +517,9 @@ function validSignedUrl(value: string): boolean {
   }
 }
 
-function requireUlid(value: unknown): string {
-  if (typeof value !== "string" || !/^[0-9A-HJKMNP-TV-Z]{26}$/u.test(value)) invalidResponse();
+function requireUlid(value: unknown, status: number | null = null): string {
+  if (typeof value !== "string" || !/^[0-9A-HJKMNP-TV-Z]{26}$/u.test(value))
+    invalidResponse(status);
   return value;
 }
 

package/dist/mail-attachments.d.ts

@@ -1,8 +0,0 @@
-import { type GatewayConnection } from "./http.js";
-/** Stream owned attachments through the private mail binding using the environment's runtime key. */
-export declare function createMailAttachmentClient(configuration: GatewayConnection & {
-    projectId: string;
-}): {
-    download(downloadPath: string): Promise<Response>;
-};
-//# sourceMappingURL=mail-attachments.d.ts.map

package/dist/mail-attachments.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mail-attachments.d.ts","sourceRoot":"","sources":["../src/mail-attachments.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,WAAW,CAAC;AAEnB,qGAAqG;AACrG,wBAAgB,0BAA0B,CACxC,aAAa,EAAE,iBAAiB,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE;2BAazB,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;EA8B1D"}

package/dist/mail-attachments.js

@@ -1,32 +0,0 @@
-import { validateGatewayConnection, fetchWithTimeout, requireConfiguredUlid, } from "./http.js";
-import { CustomerRuntimeGatewayError } from "./errors.js";
-/** Stream owned attachments through the private mail binding using the environment's runtime key. */
-export function createMailAttachmentClient(configuration) {
-    const connection = validateGatewayConnection(configuration);
-    const projectId = requireConfiguredUlid(configuration.projectId, "projectId", "OHMYHOST_PROJECT_ID");
-    const pattern = new RegExp(`^/v1/projects/${projectId}/environments/[0-7][0-9A-HJKMNP-TV-Z]{25}/mail/messages/[0-7][0-9A-HJKMNP-TV-Z]{25}/attachments/[A-Za-z0-9_-]{1,128}$`, "u");
-    return {
-        async download(downloadPath) {
-            if (!pattern.test(downloadPath))
-                throw new CustomerRuntimeGatewayError("gateway_request_invalid", null, false);
-            const response = await fetchWithTimeout(connection.fetch, new Request(new URL(downloadPath, connection.endpoint), {
-                redirect: "manual",
-                headers: { authorization: `Bearer ${connection.key}` },
-            }), connection.timeoutMilliseconds);
-            if (response.status !== 200) {
-                await response.body?.cancel();
-                throw new CustomerRuntimeGatewayError(response.status === 410
-                    ? "mail_content_expired"
-                    : response.status === 413
-                        ? "mail_attachment_too_large"
-                        : response.status === 404
-                            ? "mail_message_not_found"
-                            : response.status === 401
-                                ? "unauthorized"
-                                : "gateway_unavailable", response.status, response.status >= 500);
-            }
-            return response;
-        },
-    };
-}
-//# sourceMappingURL=mail-attachments.js.map

package/dist/mail-attachments.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mail-attachments.js","sourceRoot":"","sources":["../src/mail-attachments.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,qBAAqB,GAEtB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAC1D,qGAAqG;AACrG,MAAM,UAAU,0BAA0B,CACxC,aAAwD;IAExD,MAAM,UAAU,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,qBAAqB,CACrC,aAAa,CAAC,SAAS,EACvB,WAAW,EACX,qBAAqB,CACtB,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,MAAM,CACxB,iBAAiB,SAAS,uHAAuH,EACjJ,GAAG,CACJ,CAAC;IACF,OAAO;QACL,KAAK,CAAC,QAAQ,CAAC,YAAoB;YACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC7B,MAAM,IAAI,2BAA2B,CAAC,yBAAyB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAChF,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,UAAU,CAAC,KAAK,EAChB,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE;gBACtD,QAAQ,EAAE,QAAQ;gBAClB,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,UAAU,CAAC,GAAG,EAAE,EAAE;aACvD,CAAC,EACF,UAAU,CAAC,mBAAmB,CAC/B,CAAC;YACF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC5B,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;gBAC9B,MAAM,IAAI,2BAA2B,CACnC,QAAQ,CAAC,MAAM,KAAK,GAAG;oBACrB,CAAC,CAAC,sBAAsB;oBACxB,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG;wBACvB,CAAC,CAAC,2BAA2B;wBAC7B,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG;4BACvB,CAAC,CAAC,wBAAwB;4BAC1B,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG;gCACvB,CAAC,CAAC,cAAc;gCAChB,CAAC,CAAC,qBAAqB,EAC/B,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,MAAM,IAAI,GAAG,CACvB,CAAC;YACJ,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;KACF,CAAC;AACJ,CAAC"}

package/src/packages/customer-runtime/src/mail-attachments.ts

@@ -1,53 +0,0 @@
-import {
-  validateGatewayConnection,
-  fetchWithTimeout,
-  requireConfiguredUlid,
-  type GatewayConnection,
-} from "./http.js";
-import { CustomerRuntimeGatewayError } from "./errors.js";
-/** Stream owned attachments through the private mail binding using the environment's runtime key. */
-export function createMailAttachmentClient(
-  configuration: GatewayConnection & { projectId: string },
-) {
-  const connection = validateGatewayConnection(configuration);
-  const projectId = requireConfiguredUlid(
-    configuration.projectId,
-    "projectId",
-    "OHMYHOST_PROJECT_ID",
-  );
-  const pattern = new RegExp(
-    `^/v1/projects/${projectId}/environments/[0-7][0-9A-HJKMNP-TV-Z]{25}/mail/messages/[0-7][0-9A-HJKMNP-TV-Z]{25}/attachments/[A-Za-z0-9_-]{1,128}$`,
-    "u",
-  );
-  return {
-    async download(downloadPath: string): Promise<Response> {
-      if (!pattern.test(downloadPath))
-        throw new CustomerRuntimeGatewayError("gateway_request_invalid", null, false);
-      const response = await fetchWithTimeout(
-        connection.fetch,
-        new Request(new URL(downloadPath, connection.endpoint), {
-          redirect: "manual",
-          headers: { authorization: `Bearer ${connection.key}` },
-        }),
-        connection.timeoutMilliseconds,
-      );
-      if (response.status !== 200) {
-        await response.body?.cancel();
-        throw new CustomerRuntimeGatewayError(
-          response.status === 410
-            ? "mail_content_expired"
-            : response.status === 413
-              ? "mail_attachment_too_large"
-              : response.status === 404
-                ? "mail_message_not_found"
-                : response.status === 401
-                  ? "unauthorized"
-                  : "gateway_unavailable",
-          response.status,
-          response.status >= 500,
-        );
-      }
-      return response;
-    },
-  };
-}