@mdbase-dev/connect 0.1.0-beta.61 → 0.1.0-beta.62

package/dist/browser/mdbase-connect.min.js.sha384

@@ -1 +1 @@
-sha384-8q/ad0vEZFISbJVmcgiwghE8Zi5/u4kBtZPskPy+cHhXMEwZoHGTiGdujLx57o8/
+sha384-bNuQ6oZAI3yOsHt34NNTiVWa2gbZsyM2B4Iy1Gy4WQdXBSxEtUIgtaPLepNJYZjW

package/dist/connection-transport.js

@@ -7,7 +7,7 @@ import { PendingMutationStore } from "./pending-mutation-store.js";
 import { directFallbackStatus, isMutation, localNetworkPermission, loopbackRequest, operationFingerprint, operationTransportError, sameAuthorization, throwIfCancelled, unknownMutationOutcome } from "./operation-helpers.js";
 import { apiError, decodeJsonResponse, oauthErrorCode, parseStored, } from "./runtime-utils.js";
 import { readStoredToken } from "./stored-token.js";
-import { withCooperativeRequestBudget, withRequestBudget } from "./request-budget.js";
+import { requestOptionsWithinBudget, withCooperativeRequestBudget, withRequestBudget } from "./request-budget.js";
 import { sendAuthoritySyncRequest } from "./authority-sync-request.js";
 import { freshEncryptedRequest } from "./fresh-encrypted-request.js";
 import { isExplicitConnectorBusyResponse, retryExplicitConnectorBusy } from "./transient-retry.js";
@@ -127,10 +127,7 @@ export class ConnectionTransport {
         return withCooperativeRequestBudget(options, this.timeouts.requestMs, (budget) => this.performOperationWithinBudget(pending.operation, pending.request?.input ?? {}, { ...options, signal: budget.signal }, pending));
     }
     async performOperation(operation, input, options = {}) {
-        return withCooperativeRequestBudget(options, this.timeouts.requestMs, (budget) => this.performOperationWithinBudget(operation, input, {
-            ...options,
-            signal: budget.signal
-        }));
+        return withCooperativeRequestBudget(options, this.timeouts.requestMs, (budget) => this.performOperationWithinBudget(operation, input, requestOptionsWithinBudget(options, budget)));
     }
     async performOperationWithinBudget(operation, input, options, storedPending, freshReadRetried = false, connectorBusyRetries = 0, knownRejectedMutationRetry = false) {
         throwIfCancelled(options.signal);
@@ -383,7 +380,7 @@ export class ConnectionTransport {
                         encryptedRequest = pending.envelope;
                     }
                     else {
-                        encryptedRequest = await encryptRelayRequest(this.keyStore, token.keyHandle, { grantId: token.grantId, applicationId: token.clientId, encryption: token.encryption }, operation, input, requestId);
+                        encryptedRequest = await encryptRelayRequest(this.keyStore, token.keyHandle, { grantId: token.grantId, applicationId: token.clientId, encryption: token.encryption }, operation, input, requestId, options.deadlineUnixMs);
                         this.pendingMutationStore.store({
                             collectionId: token.collectionId,
                             ...(token.grantId ? { grantId: token.grantId } : {}),
@@ -401,7 +398,7 @@ export class ConnectionTransport {
                     }
                 }
                 else {
-                    encryptedRequest = await encryptRelayRequest(this.keyStore, token.keyHandle, { grantId: token.grantId, applicationId: token.clientId, encryption: token.encryption }, operation, input);
+                    encryptedRequest = await encryptRelayRequest(this.keyStore, token.keyHandle, { grantId: token.grantId, applicationId: token.clientId, encryption: token.encryption }, operation, input, undefined, options.deadlineUnixMs);
                 }
             }
             catch (error) {
@@ -481,7 +478,7 @@ export class ConnectionTransport {
             }
             let response;
             if (!pendingMutation) {
-                encryptedRequest = await freshEncryptedRequest(this.keyStore, relayToken, operation, input);
+                encryptedRequest = await freshEncryptedRequest(this.keyStore, relayToken, operation, input, options.deadlineUnixMs);
                 requestId = encryptedRequest.request_id;
             }
             try {

package/dist/crypto.d.ts

@@ -46,7 +46,7 @@ export interface AuthorityProofInput {
 /** Sign one remote-authority or token-refresh request with the approved grant key. */
 export declare function signAuthorityRequest(store: GrantKeyStore, handle: string, expectedPublicKey: string, input: AuthorityProofInput): Promise<Record<string, string>>;
 export declare function authorityProofMessage(input: Required<Pick<AuthorityProofInput, "method" | "target" | "credential" | "timestamp" | "nonce">> & Pick<AuthorityProofInput, "body">): Promise<string>;
-export declare function encryptRelayRequest(store: GrantKeyStore, handle: string, binding: RelayBinding, operation: EncryptedRelayOperation, input: unknown, requestId?: string): Promise<EncryptedRelayOperationRequest>;
+export declare function encryptRelayRequest(store: GrantKeyStore, handle: string, binding: RelayBinding, operation: EncryptedRelayOperation, input: unknown, requestId?: string, deadlineUnixMs?: number): Promise<EncryptedRelayOperationRequest>;
 export declare function decryptRelayResponse<Result>(store: GrantKeyStore, handle: string, binding: RelayBinding, request: EncryptedRelayOperationRequest, response: EncryptedRelayOperationResponse): Promise<{
     ok: true;
     result: Result;

package/dist/crypto.js

@@ -157,8 +157,12 @@ export async function authorityProofMessage(input) {
         input.nonce
     ].join("\n");
 }
-export async function encryptRelayRequest(store, handle, binding, operation, input, requestId = crypto.randomUUID()) {
+export async function encryptRelayRequest(store, handle, binding, operation, input, requestId = crypto.randomUUID(), deadlineUnixMs) {
     validateGrantEncryption(binding.encryption);
+    if (deadlineUnixMs !== undefined
+        && (!Number.isSafeInteger(deadlineUnixMs) || deadlineUnixMs <= 0)) {
+        throw new RelayCryptoError("invalid_deadline", "The operation deadline is invalid.");
+    }
     const record = await requireAgreementKey(store, handle, binding.encryption.application_agreement_public_key);
     const counter = await store.nextCounter(handle);
     const metadata = {
@@ -179,6 +183,7 @@ export async function encryptRelayRequest(store, handle, binding, operation, inp
     return {
         type: "encrypted_operation_request",
         ...envelopeMetadata(metadata),
+        ...(deadlineUnixMs === undefined ? {} : { deadline_unix_ms: deadlineUnixMs }),
         ciphertext: bytesToBase64Url(new Uint8Array(ciphertext))
     };
 }

package/dist/fresh-encrypted-request.d.ts

@@ -1,4 +1,4 @@
 import type { CollectionOperation, EncryptedRelayOperationRequest } from "@mdbase-dev/connect-protocol";
 import { type GrantKeyStore } from "./crypto.js";
 import type { StoredToken } from "./internal-types.js";
-export declare function freshEncryptedRequest(keyStore: GrantKeyStore, token: StoredToken, operation: CollectionOperation, input: unknown): Promise<EncryptedRelayOperationRequest>;
+export declare function freshEncryptedRequest(keyStore: GrantKeyStore, token: StoredToken, operation: CollectionOperation, input: unknown, deadlineUnixMs?: number): Promise<EncryptedRelayOperationRequest>;

package/dist/fresh-encrypted-request.js

@@ -1,6 +1,6 @@
 import { encryptRelayRequest, RelayCryptoError } from "./crypto.js";
 import { connectError, serverConnectError } from "./errors.js";
-export async function freshEncryptedRequest(keyStore, token, operation, input) {
+export async function freshEncryptedRequest(keyStore, token, operation, input, deadlineUnixMs) {
     if (!token.encryption || !token.grantId || !token.keyHandle) {
         throw connectError("authorization_binding_incompatible", "The refreshed authorization no longer supports encrypted connector operations.", {
             details: {
@@ -17,7 +17,7 @@ export async function freshEncryptedRequest(keyStore, token, operation, input) {
             grantId: token.grantId,
             applicationId: token.clientId,
             encryption: token.encryption
-        }, operation, input);
+        }, operation, input, undefined, deadlineUnixMs);
     }
     catch (error) {
         if (error instanceof RelayCryptoError) {

package/dist/request-budget.d.ts

@@ -19,6 +19,11 @@ export interface RequestBudget {
     remainingMs(): number | null;
     dispose(): void;
 }
+export type OperationRequestOptions = ConnectRequestOptions & {
+    /** Absolute budget shared with the connector; never supplied directly by callers. */
+    deadlineUnixMs?: number;
+};
+export declare function requestOptionsWithinBudget(options: ConnectRequestOptions, budget: RequestBudget): OperationRequestOptions;
 export declare function createRequestBudget(options?: ConnectRequestOptions, defaultTimeoutMs?: number | null, now?: () => number): RequestBudget;
 export declare function withRequestBudget<Result>(options: ConnectRequestOptions | undefined, defaultTimeoutMs: number | null, operation: (budget: RequestBudget) => Promise<Result>): Promise<Result>;
 /**

package/dist/request-budget.js

@@ -13,6 +13,13 @@ export function resolveConnectTimeouts(timeouts = {}) {
         syncMs: configuredTimeout(timeouts.syncMs, DEFAULT_SYNC_TIMEOUT_MS, "syncMs")
     };
 }
+export function requestOptionsWithinBudget(options, budget) {
+    return {
+        ...options,
+        signal: budget.signal,
+        ...(budget.deadline === null ? {} : { deadlineUnixMs: budget.deadline })
+    };
+}
 export function createRequestBudget(options = {}, defaultTimeoutMs = DEFAULT_REQUEST_TIMEOUT_MS, now = Date.now) {
     const configured = options.timeoutMs === undefined ? defaultTimeoutMs : options.timeoutMs;
     const timeoutMs = configured === null ? null : validTimeout(configured);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdbase-dev/connect",
-  "version": "0.1.0-beta.61",
+  "version": "0.1.0-beta.62",
   "private": false,
   "type": "module",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@mdbase-dev/connect-protocol": "0.1.0-beta.61"
+    "@mdbase-dev/connect-protocol": "0.1.0-beta.62"
   },
   "devDependencies": {
     "esbuild": "^0.28.1",