@cfworker/cosmos 1.13.0 → 1.13.3

package/dist/client.js

@@ -7,14 +7,14 @@ export class CosmosClient {
     constructor(config) {
         this.requestCharges = 0;
         this.retries = { count: 0, delayMs: 0 };
-        let { endpoint, accountKey } = 'connectionString' in config
+        let { endpoint, masterKey } = 'connectionString' in config
             ? parseConnectionString(config.connectionString)
             : config;
         if (endpoint.endsWith('/')) {
             endpoint = endpoint.slice(0, -1);
         }
         this.endpoint = endpoint;
-        this.signer = getSigner(accountKey);
+        this.signer = getSigner(masterKey);
         this.retryPolicy = config.retryPolicy ?? defaultRetryPolicy;
         this.consistencyLevel = config.consistencyLevel ?? 'Session';
         this.dbId = config.dbId;
@@ -180,7 +180,7 @@ export class CosmosClient {
         };
     }
     async fetchWithRetry(request, context) {
-        const retryRequest = request.clone();
+        const retryRequest = new Request(request.url, request);
         const response = await this.fetch(request);
         context ??= { attempts: 0, cumulativeWaitMs: 0, request, response };
         context.attempts++;

package/dist/signer.d.ts

@@ -9,4 +9,4 @@ export declare class Signer {
         resourceId: string;
     };
 }
-export declare function getSigner(accountKey: string): Signer;
+export declare function getSigner(masterKey: string): Signer;

package/dist/signer.js

@@ -1,15 +1,15 @@
-import { decode as base64ToArrayBuffer, encode as arrayBufferToBase64 } from 'base64-arraybuffer';
+import { base64 } from 'rfc4648';
 export class Signer {
     constructor(masterkey) {
         this.encoder = new TextEncoder();
-        const promiseLike = crypto.subtle.importKey('raw', base64ToArrayBuffer(masterkey), { name: 'HMAC', hash: { name: 'SHA-256' } }, false, ['sign']);
+        const promiseLike = crypto.subtle.importKey('raw', base64.parse(masterkey), { name: 'HMAC', hash: { name: 'SHA-256' } }, false, ['sign']);
         this.masterkey = Promise.resolve(promiseLike);
     }
     async sign(request, date = new Date()) {
         const key = await this.masterkey;
         const payload = this.getPayload(request, date);
         const hashed = await crypto.subtle.sign('HMAC', key, payload);
-        const signature = arrayBufferToBase64(hashed);
+        const signature = base64.stringify(new Uint8Array(hashed));
         request.headers.set('authorization', encodeURIComponent(`type=master&ver=1.0&sig=${signature}`));
         request.headers.set('x-ms-date', date.toUTCString());
     }
@@ -35,9 +35,9 @@ export class Signer {
     }
 }
 const signers = {};
-export function getSigner(accountKey) {
-    if (!signers[accountKey]) {
-        signers[accountKey] = new Signer(accountKey);
+export function getSigner(masterKey) {
+    if (!signers[masterKey]) {
+        signers[masterKey] = new Signer(masterKey);
     }
-    return signers[accountKey];
+    return signers[masterKey];
 }

package/dist/types.d.ts

@@ -58,5 +58,5 @@ export interface Collection extends PersistedResource {
 }
 export interface ConnectionInfo {
     endpoint: string;
-    accountKey: string;
+    masterKey: string;
 }

package/dist/util.js

@@ -31,6 +31,6 @@ export function parseConnectionString(connString) {
     }
     return {
         endpoint: props.AccountEndpoint,
-        accountKey: props.AccountKey
+        masterKey: props.AccountKey
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfworker/cosmos",
-  "version": "1.13.0",
+  "version": "1.13.3",
   "description": "Azure Cosmos DB client for Cloudflare Workers and service workers",
   "keywords": [
     "azure",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@cfworker/worker-types": "^1.12.1",
     "@cloudflare/workers-types": "^2.2.2",
-    "base64-arraybuffer": "^1.0.2"
+    "rfc4648": "^1.5.1"
   },
   "devDependencies": {
     "@cfworker/dev": "^1.14.0",

package/src/client.ts

@@ -27,7 +27,7 @@ export type CosmosClientConfig =
       /**
        * Cosmos DB connection string.
        * @example
-       * "AccountEndpoint=https://xxxxxxxxxx.documents.azure.com:443/;accountKey=xxxxxxxxxx;"
+       * "AccountEndpoint=https://xxxxxxxxxx.documents.azure.com:443/;AccountKey=xxxxxxxxxx;"
        */
       connectionString: string;
     } & CosmosClientConfigBase);
@@ -84,7 +84,7 @@ export class CosmosClient {
   public retries = { count: 0, delayMs: 0 };
 
   constructor(config: CosmosClientConfig) {
-    let { endpoint, accountKey } =
+    let { endpoint, masterKey } =
       'connectionString' in config
         ? parseConnectionString(config.connectionString)
         : config;
@@ -92,7 +92,7 @@ export class CosmosClient {
       endpoint = endpoint.slice(0, -1);
     }
     this.endpoint = endpoint;
-    this.signer = getSigner(accountKey);
+    this.signer = getSigner(masterKey);
     this.retryPolicy = config.retryPolicy ?? defaultRetryPolicy;
     this.consistencyLevel = config.consistencyLevel ?? 'Session';
     this.dbId = config.dbId;
@@ -330,7 +330,7 @@ export class CosmosClient {
     request: Request,
     context?: RetryContext
   ): Promise<Response> {
-    const retryRequest = request.clone();
+    const retryRequest = new Request(request.url, request);
 
     const response = await this.fetch(request);
 

package/src/signer.ts

@@ -1,7 +1,4 @@
-import {
-  decode as base64ToArrayBuffer,
-  encode as arrayBufferToBase64
-} from 'base64-arraybuffer';
+import { base64 } from 'rfc4648';
 
 export class Signer {
   private readonly masterkey: Promise<CryptoKey>;
@@ -10,7 +7,7 @@ export class Signer {
   constructor(masterkey: string) {
     const promiseLike = crypto.subtle.importKey(
       'raw',
-      base64ToArrayBuffer(masterkey),
+      base64.parse(masterkey),
       { name: 'HMAC', hash: { name: 'SHA-256' } },
       false,
       ['sign']
@@ -22,7 +19,7 @@ export class Signer {
     const key = await this.masterkey;
     const payload = this.getPayload(request, date);
     const hashed = await crypto.subtle.sign('HMAC', key, payload);
-    const signature = arrayBufferToBase64(hashed);
+    const signature = base64.stringify(new Uint8Array(hashed));
     request.headers.set(
       'authorization',
       encodeURIComponent(`type=master&ver=1.0&sig=${signature}`)
@@ -55,9 +52,9 @@ export class Signer {
 
 const signers: Record<string, Signer> = {};
 
-export function getSigner(accountKey: string) {
-  if (!signers[accountKey]) {
-    signers[accountKey] = new Signer(accountKey);
+export function getSigner(masterKey: string) {
+  if (!signers[masterKey]) {
+    signers[masterKey] = new Signer(masterKey);
   }
-  return signers[accountKey];
+  return signers[masterKey];
 }

package/src/types.ts

@@ -78,5 +78,5 @@ export interface ConnectionInfo {
   /**
    * Cosmos DB key.
    */
-  accountKey: string;
+  masterKey: string;
 }

package/src/util.ts

@@ -54,6 +54,6 @@ export function parseConnectionString(connString: string): ConnectionInfo {
   }
   return {
     endpoint: props.AccountEndpoint,
-    accountKey: props.AccountKey
+    masterKey: props.AccountKey
   };
 }