@cfworker/cosmos 1.13.1 → 1.13.4

package/dist/client.js

@@ -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.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());
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfworker/cosmos",
-  "version": "1.13.1",
+  "version": "1.13.4",
   "description": "Azure Cosmos DB client for Cloudflare Workers and service workers",
   "keywords": [
     "azure",
@@ -37,16 +37,16 @@
     "test": "cfworker test test/**/*.spec.ts"
   },
   "dependencies": {
-    "@cfworker/worker-types": "^1.12.1",
+    "@cfworker/worker-types": "^1.12.2",
     "@cloudflare/workers-types": "^2.2.2",
-    "base64-arraybuffer": "^1.0.2"
+    "rfc4648": "^1.5.2"
   },
   "devDependencies": {
-    "@cfworker/dev": "^1.14.0",
-    "@types/chai": "^4.3.0",
-    "@types/mocha": "^9.1.0",
+    "@cfworker/dev": "^1.14.1",
+    "@types/chai": "^4.3.3",
+    "@types/mocha": "^9.1.1",
     "chai": "^4.3.6",
-    "mocha": "^9.2.1",
-    "typescript": "^4.5.5"
+    "mocha": "^10.0.0",
+    "typescript": "^4.7.4"
   }
 }

package/src/client.ts

@@ -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}`)