@valon-technologies/gestalt 0.0.1-alpha.18 → 0.0.1-alpha.19

package/src/s3.ts

@@ -28,7 +28,8 @@ import {
   WriteObjectResponseSchema,
 } from "./internal/gen/v1/s3_pb.ts";
 import { errorMessage, type MaybePromise } from "./api.ts";
-import { RuntimeProvider, type RuntimeProviderOptions } from "./provider.ts";
+import { ProviderBase, type ProviderBaseOptions } from "./provider.ts";
+import { dateFromTimestamp, timestampFromDate } from "./protocol.ts";
 
 /** Base environment variable for discovering S3 runtime sockets. */
 export const ENV_S3_SOCKET = "GESTALT_S3_SOCKET";
@@ -245,7 +246,7 @@ export interface ProviderReadResult {
 /**
  * Runtime hooks required to implement a Gestalt S3 provider.
  */
-export interface S3ProviderOptions extends RuntimeProviderOptions {
+export interface S3ProviderOptions extends ProviderBaseOptions {
   headObject: (ref: ObjectRef) => MaybePromise<ObjectMeta>;
   readObject: (ref: ObjectRef, options?: ReadOptions) => MaybePromise<ProviderReadResult>;
   writeObject: (
@@ -269,7 +270,7 @@ export interface S3ProviderOptions extends RuntimeProviderOptions {
 /**
  * S3 provider implementation consumed by the Gestalt runtime.
  */
-export class S3Provider extends RuntimeProvider {
+export class S3Provider extends ProviderBase {
   readonly kind = "s3" as const;
 
   private readonly headObjectHandler: S3ProviderOptions["headObject"];
@@ -517,7 +518,7 @@ export function createS3Service(
         expiresAt?: { seconds: bigint; nanos: number };
       };
       if (result.expiresAt) {
-        response.expiresAt = toProtoTimestamp(result.expiresAt);
+        response.expiresAt = timestampFromDate(result.expiresAt);
       }
       return create(PresignObjectResponseSchema, response);
     },
@@ -693,7 +694,7 @@ export class S3 {
       headers: cloneStringMap(response.headers),
     };
     if (response.expiresAt) {
-      result.expiresAt = fromProtoTimestamp(response.expiresAt);
+      result.expiresAt = dateFromTimestamp(response.expiresAt);
     }
     return result;
   }
@@ -722,7 +723,7 @@ export class S3 {
       headers: cloneStringMap(response.headers),
     };
     if (response.expiresAt) {
-      result.expiresAt = fromProtoTimestamp(response.expiresAt);
+      result.expiresAt = dateFromTimestamp(response.expiresAt);
     }
     return result;
   }
@@ -1185,7 +1186,7 @@ function toProtoObjectMeta(meta: ObjectMeta) {
     storageClass: meta.storageClass,
   };
   if (meta.lastModified) {
-    value.lastModified = toProtoTimestamp(meta.lastModified);
+    value.lastModified = timestampFromDate(meta.lastModified);
   }
   return value;
 }
@@ -1200,7 +1201,7 @@ function fromProtoObjectMeta(meta: ProtoS3ObjectMeta | undefined): ObjectMeta {
     storageClass: meta?.storageClass ?? "",
   };
   if (meta?.lastModified) {
-    value.lastModified = fromProtoTimestamp(meta.lastModified);
+    value.lastModified = dateFromTimestamp(meta.lastModified);
   }
   return value;
 }
@@ -1214,10 +1215,10 @@ function toProtoReadOptions(options?: ReadOptions) {
     proto.range = toProtoByteRange(options.range);
   }
   if (options?.ifModifiedSince) {
-    proto.ifModifiedSince = toProtoTimestamp(options.ifModifiedSince);
+    proto.ifModifiedSince = timestampFromDate(options.ifModifiedSince);
   }
   if (options?.ifUnmodifiedSince) {
-    proto.ifUnmodifiedSince = toProtoTimestamp(options.ifUnmodifiedSince);
+    proto.ifUnmodifiedSince = timestampFromDate(options.ifUnmodifiedSince);
   }
   return proto;
 }
@@ -1234,10 +1235,10 @@ function fromProtoReadOptions(request: ProtoReadObjectRequest | undefined): Read
     options.ifNoneMatch = request.ifNoneMatch;
   }
   if (request?.ifModifiedSince) {
-    options.ifModifiedSince = fromProtoTimestamp(request.ifModifiedSince);
+    options.ifModifiedSince = dateFromTimestamp(request.ifModifiedSince);
   }
   if (request?.ifUnmodifiedSince) {
-    options.ifUnmodifiedSince = fromProtoTimestamp(request.ifUnmodifiedSince);
+    options.ifUnmodifiedSince = dateFromTimestamp(request.ifUnmodifiedSince);
   }
   return options;
 }
@@ -1330,22 +1331,6 @@ function fromProtoPresignMethod(method: ProtoPresignMethod): PresignMethod {
   }
 }
 
-function toProtoTimestamp(value: Date) {
-  const millis = value.getTime();
-  const seconds = Math.floor(millis / 1000);
-  const nanos = Math.trunc((millis - (seconds * 1000)) * 1_000_000);
-  return {
-    seconds: BigInt(seconds),
-    nanos,
-  };
-}
-
-function fromProtoTimestamp(value: { seconds?: bigint; nanos?: number }): Date {
-  const seconds = Number(value.seconds ?? 0n);
-  const nanos = Number(value.nanos ?? 0);
-  return new Date((seconds * 1000) + Math.trunc(nanos / 1_000_000));
-}
-
 function normalizeProtoInt(value: number | bigint | undefined): bigint {
   if (typeof value === "bigint") {
     return value;

package/src/secrets.ts

@@ -1,17 +1,17 @@
-import { RuntimeProvider, type RuntimeProviderOptions } from "./provider.ts";
+import { ProviderBase, type ProviderBaseOptions } from "./provider.ts";
 import type { MaybePromise } from "./api.ts";
 
 /**
  * Runtime hooks required to implement a Gestalt secrets provider.
  */
-export interface SecretsProviderOptions extends RuntimeProviderOptions {
+export interface SecretsProviderOptions extends ProviderBaseOptions {
   getSecret: (name: string) => MaybePromise<string>;
 }
 
 /**
  * Secrets provider implementation consumed by the Gestalt runtime.
  */
-export class SecretsProvider extends RuntimeProvider {
+export class SecretsProvider extends ProviderBase {
   readonly kind = "secrets" as const;
 
   private readonly getSecretHandler: SecretsProviderOptions["getSecret"];