@beam-network/sdk 0.6.0 → 0.7.0

package/dist/provider-signing.js

@@ -1,3 +1,4 @@
+import { currentSdkPerformance, measureSdkPhase } from "./performance.js";
 import { AbortMultipartUploadCommand, CompleteMultipartUploadCommand, CreateMultipartUploadCommand, GetObjectCommand, HeadObjectCommand, ListPartsCommand, PutObjectCommand, S3Client, UploadPartCommand } from "@aws-sdk/client-s3";
 import { UploadPartCopyCommand, DeleteObjectCommand, ListObjectsV2Command } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
@@ -69,7 +70,7 @@ export function nowIso() {
     return new Date().toISOString();
 }
 export function expiresAtIso(expiresIn) {
-    return new Date(Date.now() + expiresIn * 1000).toISOString();
+    return new Date((Math.floor(Date.now() / 1000) + expiresIn) * 1000).toISOString();
 }
 export async function prepareProviderSource(source, options = {}) {
     const index = options.index ?? 0;
@@ -82,7 +83,7 @@ export async function prepareProviderSource(source, options = {}) {
     if (isS3CompatibleProvider(source)) {
         const endpoint = s3CompatibleEndpoint(source);
         const client = createS3CompatibleClient(source, endpoint);
-        const head = await client.send(new HeadObjectCommand({ Bucket: source.bucket, Key: source.key }), { abortSignal: options.signal });
+        const head = await measureSdkPhase("sdk.metadata_request", () => client.send(new HeadObjectCommand({ Bucket: source.bucket, Key: source.key }), { abortSignal: options.signal }));
         const getUrl = await getSignedUrl(client, new GetObjectCommand({ Bucket: source.bucket, Key: source.key }), { expiresIn });
         return {
             source_id: source.id ?? `src_${index}`,
@@ -113,7 +114,7 @@ export async function prepareProviderSource(source, options = {}) {
             size,
             filename: filename(source.key),
             expires_at: expiresAtIso(expiresIn),
-            metadata: { bucket: source.bucket, key: source.key, base_url: baseUrl }
+            metadata: compactMetadata({ bucket: source.bucket, key: source.key, base_url: baseUrl, storage_location: source.storage_location })
         };
     }
     if (isHuggingFaceProvider(source)) {
@@ -161,7 +162,7 @@ export async function prepareProviderSourceForPlan(source, options = {}) {
             provider: "hippius",
             size,
             filename: filename(source.key),
-            metadata: { bucket: source.bucket, key: source.key, base_url: baseUrl }
+            metadata: compactMetadata({ bucket: source.bucket, key: source.key, base_url: baseUrl, storage_location: source.storage_location })
         };
     }
     if (isHuggingFaceProvider(source)) {
@@ -199,6 +200,7 @@ export function prepareProviderDestination(destination, options = {}) {
             metadata: {
                 bucket: destination.bucket,
                 key: destination.key,
+                storage_location: destination.storage_location,
                 base_url: destination.base_url ?? "https://api.hippius.com"
             }
         };
@@ -307,21 +309,44 @@ export async function inspectDestinationObject(destination, objectKey, signal) {
     const result = await createS3CompatibleClient(destination).send(new HeadObjectCommand({ Bucket: destination.bucket, Key: objectKey }), { abortSignal: signal });
     return { size: result.ContentLength, etag: result.ETag, versionId: result.VersionId, metadata: result.Metadata ?? {} };
 }
+// Never advertise a renewed lifetime for a previously issued provider URL.
+export function boundedGrantExpiry(url, upperBound) {
+    let expiry = Date.parse(upperBound);
+    const query = new URL(url).searchParams;
+    for (const prefix of ["X-Amz", "X-Goog"]) {
+        const date = query.get(`${prefix}-Date`), duration = Number(query.get(`${prefix}-Expires`));
+        if (date && /^\d{8}T\d{6}Z$/.test(date) && Number.isFinite(duration) && duration > 0) {
+            const start = Date.parse(`${date.slice(0, 4)}-${date.slice(4, 6)}-${date.slice(6, 8)}T${date.slice(9, 11)}:${date.slice(11, 13)}:${date.slice(13, 15)}Z`);
+            if (Number.isFinite(start))
+                expiry = Math.min(expiry, start + duration * 1000);
+        }
+    }
+    const epoch = Number(query.get("Expires"));
+    if (Number.isFinite(epoch) && epoch > 0)
+        expiry = Math.min(expiry, epoch * 1000);
+    return new Date(expiry).toISOString();
+}
+export async function signSourceChunk(input) {
+    const expiresAt = expiresAtIso(input.expiresIn);
+    const grant = await signSourceRoute(input);
+    return { ...grant, expiresAt: boundedGrantExpiry(grant.url, expiresAt) };
+}
 export async function signDestinationRoute(input) {
     const targetObjectKey = input.target.object_key;
     if (!targetObjectKey) {
         throw new Error("destination signing target is missing object_key");
     }
+    const destinationExpiresAt = expiresAtIso(input.expiresIn);
     const [destUrl, sourceRoute] = await Promise.all([
-        input.destUrl ?? signDestinationUrl({
+        input.destUrl ?? measureSdkPhase("sdk.destination_signing", () => signDestinationUrl({
             destination: input.destination,
             objectKey: targetObjectKey,
             uploadId: input.uploadId,
             partNumber: input.partNumber,
             expiresIn: input.expiresIn,
             fetchImpl: input.fetchImpl,
-        }),
-        signSourceRoute({
+        })),
+        input.sourceGrant ?? signSourceChunk({
             source: input.source,
             fallbackUrl: input.chunk.source_url,
             chunk: input.chunk,
@@ -337,8 +362,8 @@ export async function signDestinationRoute(input) {
         dest_url: destUrl,
         source_offset: input.chunk.source_offset,
         chunk_size: input.chunk.chunk_size,
-        expires_at: expiresAtIso(input.expiresIn),
-        headers: sourceRoute.headers,
+        expires_at: boundedGrantExpiry(destUrl, new Date(Math.min(Date.parse(destinationExpiresAt), Date.parse(sourceRoute.expiresAt))).toISOString()),
+        headers: { ...sourceRoute.headers },
         metadata: {
             ...(input.target.metadata ?? {}),
             ...(input.multipartGroupId ? { multipart_group_id: input.multipartGroupId } : {}),
@@ -475,7 +500,16 @@ export async function signDestinationUrl(input) {
     }
     return unsupportedProviderConfig(input.destination);
 }
-const s3ClientCache = new Map();
+const s3ClientCache = new WeakMap();
+export function releaseProviderClients(configs) {
+    for (const config of configs) {
+        if (!isS3CompatibleProvider(config))
+            continue;
+        const cached = s3ClientCache.get(config);
+        s3ClientCache.delete(config);
+        cached?.client.destroy();
+    }
+}
 function s3ClientCacheKey(source, endpoint) {
     return JSON.stringify({
         provider: source.provider,
@@ -489,9 +523,12 @@ function s3ClientCacheKey(source, endpoint) {
 }
 function createS3CompatibleClient(source, endpoint = s3CompatibleEndpoint(source)) {
     const cacheKey = s3ClientCacheKey(source, endpoint);
-    const cached = s3ClientCache.get(cacheKey);
-    if (cached)
-        return cached;
+    const cached = s3ClientCache.get(source);
+    if (cached?.identity === cacheKey) {
+        currentSdkPerformance()?.increment("provider_clients_reused");
+        return cached.client;
+    }
+    const setupStarted = performance.now();
     const client = new S3Client({
         region: s3CompatibleRegion(source),
         endpoint,
@@ -503,7 +540,9 @@ function createS3CompatibleClient(source, endpoint = s3CompatibleEndpoint(source
             sessionToken: "session_token" in source ? source.session_token : undefined
         }
     });
-    s3ClientCache.set(cacheKey, client);
+    s3ClientCache.set(source, { identity: cacheKey, client });
+    currentSdkPerformance()?.increment("provider_clients_created");
+    currentSdkPerformance()?.observe("sdk.provider_client_setup", performance.now() - setupStarted);
     return client;
 }
 export function isS3CompatibleProvider(config) {
@@ -554,6 +593,7 @@ function s3CompatibleMetadata(source, endpoint = s3CompatibleEndpoint(source)) {
         bucket: source.bucket,
         key: source.key,
         region: s3CompatibleRegion(source),
+        storage_location: source.storage_location,
         endpoint_url: endpoint,
         account_id: "account_id" in source ? source.account_id : undefined
     });
@@ -567,6 +607,7 @@ export function isHuggingFaceProvider(config) {
 function huggingFaceMetadata(config, etag, commitHash) {
     return compactMetadata({
         driver: "huggingface",
+        storage_location: config.storage_location,
         repo_id: config.repo_id,
         repo_type: huggingFaceRepoType(config),
         revision: huggingFaceRevision(config),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@beam-network/sdk",
-    "version": "0.6.0",
+    "version": "0.7.0",
     "description": "TypeScript SDK for BEAM transfer creation and management.",
     "type": "module",
     "license": "MIT",