@commercetools/ts-client 2.1.0-alpha.1 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @commercetools/ts-client
 
+## 2.1.1
+
+### Patch Changes
+
+- [#835](https://github.com/commercetools/commercetools-sdk-typescript/pull/835) [`b2c62ba`](https://github.com/commercetools/commercetools-sdk-typescript/commit/b2c62ba105b7fb9fe2eb6a4ae1b95c8d5b67d428) Thanks [@ajimae](https://github.com/ajimae)! - Fix issues with counting special characters' length
+
+## 2.1.0
+
+### Minor Changes
+
+- [#814](https://github.com/commercetools/commercetools-sdk-typescript/pull/814) [`57a16d7`](https://github.com/commercetools/commercetools-sdk-typescript/commit/57a16d75ded60923bf080ef2270c3396fe8bc0e5) Thanks [@ajimae](https://github.com/ajimae)! - Restructure middleware logic
+
 ## 2.0.5
 
 ### Patch Changes

package/dist/commercetools-ts-client.browser.cjs.js

@@ -35,6 +35,17 @@ function _defineProperty(e, r, t) {
   }) : e[r] = t, e;
 }
 
+var Buffer = require('buffer/').Buffer;
+function byteLength(body) {
+  if (body && (typeof body === 'string' || body instanceof Uint8Array)) {
+    return Buffer.byteLength(body).toString();
+  }
+  if (body && typeof body === 'object') {
+    return new TextEncoder().encode(JSON.stringify(body)).length.toString();
+  }
+  return '0';
+}
+
 const HEADERS_CONTENT_TYPES = ['application/json', 'application/graphql'];
 const CONCURRENCT_REQUEST = 20;
 const CTP_API_URL = 'https://api.europe-west1.gcp.commercetools.com';
@@ -259,16 +270,9 @@ async function executor(request) {
   return data;
 }
 
-// import { v4 as uuidv4 } from 'uuid'
-
-// export default function generateID() {
-//   return uuidv4()
-// }
-
 function generateID() {
   // @ts-ignore
-  const str = ([1e6] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
-  return 'abcdef'[Math.floor(Math.random() * 'abcdef'.length)] + '' + str;
+  return ([1e6] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => (parseInt(c) ^ Math.floor(Math.random() * 256) & 15 >> parseInt(c) / 4).toString(16));
 }
 
 function parse(headers) {
@@ -457,13 +461,6 @@ function createUserAgent(options) {
   return [baseInfo, systemInfo, libraryInfo, contactInfo, customAgent].filter(Boolean).join(' ');
 }
 
-function byteLength(body) {
-  if (typeof body === 'string') return body.length.toString();
-  if (body && typeof body === 'object') return new TextEncoder().encode(JSON.stringify(body)).length.toString();
-  if (body instanceof Uint8Array) return body.length.toString();
-  return '0';
-}
-
 /**
  * validate some essential http options
  * @param options
@@ -751,11 +748,9 @@ function createAuthMiddlewareForAnonymousSessionFlow$1(options) {
         tokenFetchPromise = null;
       }
 
-      // Now the token is present in the tokenCache
+      // Now the token is present in the tokenCache and can be accessed
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -808,9 +803,7 @@ function createAuthMiddlewareForClientCredentialsFlow$1(options) {
 
       // Now the token is present in the tokenCache
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -886,9 +879,7 @@ function createAuthMiddlewareForPasswordFlow$1(options) {
 
       // Now the token is present in the tokenCache
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -937,9 +928,7 @@ function createAuthMiddlewareForRefreshTokenFlow$1(options) {
 
       // Now the token is present in the tokenCache
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -958,7 +947,7 @@ function createConcurrentModificationMiddleware$1(modifierFunction) {
 
         // update the resource version here
         if (version) {
-          if (modifierFunction) {
+          if (modifierFunction && typeof modifierFunction == 'function') {
             request.body = await modifierFunction(version, request, response);
           } else {
             request.body = typeof request.body == 'string' ? {
@@ -1212,8 +1201,8 @@ function createQueueMiddleware$1({
   concurrency = 20
 }) {
   let runningCount = 0;
+  const queue = [];
   const waitForSlot = () => {
-    // dont allow negative or 0 value for concurrency
     if (0 >= concurrency) return Promise.resolve();
     return new Promise(resolve => {
       const tryNext = () => {
@@ -1221,43 +1210,48 @@ function createQueueMiddleware$1({
           runningCount++;
           resolve();
         } else {
-          // Retry until a slot becomes available
-          setTimeout(tryNext, 10);
+          queue.push(tryNext);
         }
       };
-
-      // start
       tryNext();
     });
   };
-  return next => {
-    return async request => {
-      return waitForSlot().then(async () => {
-        // Patch the request to override resolve and reject
-        const patchedRequest = {
-          ...request,
-          resolve(data) {
-            request.resolve(data);
-            runningCount--;
-          },
-          reject(error) {
-            request.reject(error);
-            runningCount--;
-          }
-        };
-        try {
-          return next(patchedRequest);
-        } finally {
-          runningCount--;
+
+  // Function to free up a slot after a request is completed
+  const freeSlot = () => {
+    runningCount--;
+    if (queue.length > 0) {
+      const nextInQueue = queue.shift();
+      if (nextInQueue) {
+        nextInQueue();
+      }
+    }
+  };
+  return next => request => {
+    return waitForSlot().then(() => {
+      const patchedRequest = {
+        ...request,
+        resolve(data) {
+          request.resolve(data);
+          freeSlot();
+        },
+        reject(error) {
+          request.reject(error);
+          freeSlot();
         }
+      };
+
+      // Process the next middleware
+      return next(patchedRequest).finally(() => {
+        freeSlot();
       });
-    };
+    });
   };
 }
 
 var packageJson = {
 	name: "@commercetools/ts-client",
-	version: "2.1.0-alpha.1",
+	version: "2.1.1",
 	engines: {
 		node: ">=14"
 	},
@@ -1291,14 +1285,12 @@ var packageJson = {
 	},
 	dependencies: {
 		"abort-controller": "3.0.0",
+		buffer: "^6.0.3",
 		"node-fetch": "^2.6.1"
 	},
 	files: [
 		"dist",
-		"CHANGELOG.md",
-		"LICENSE",
-		"README.md",
-		"package.json"
+		"CHANGELOG.md"
 	],
 	author: "Chukwuemeka Ajima <meeky.ae@gmail.com>",
 	main: "dist/commercetools-ts-client.cjs.js",

package/dist/commercetools-ts-client.browser.esm.js

@@ -26,6 +26,17 @@ function _defineProperty(e, r, t) {
   }) : e[r] = t, e;
 }
 
+var Buffer = require('buffer/').Buffer;
+function byteLength(body) {
+  if (body && (typeof body === 'string' || body instanceof Uint8Array)) {
+    return Buffer.byteLength(body).toString();
+  }
+  if (body && typeof body === 'object') {
+    return new TextEncoder().encode(JSON.stringify(body)).length.toString();
+  }
+  return '0';
+}
+
 const HEADERS_CONTENT_TYPES = ['application/json', 'application/graphql'];
 const CONCURRENCT_REQUEST = 20;
 const CTP_API_URL = 'https://api.europe-west1.gcp.commercetools.com';
@@ -250,16 +261,9 @@ async function executor(request) {
   return data;
 }
 
-// import { v4 as uuidv4 } from 'uuid'
-
-// export default function generateID() {
-//   return uuidv4()
-// }
-
 function generateID() {
   // @ts-ignore
-  const str = ([1e6] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
-  return 'abcdef'[Math.floor(Math.random() * 'abcdef'.length)] + '' + str;
+  return ([1e6] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => (parseInt(c) ^ Math.floor(Math.random() * 256) & 15 >> parseInt(c) / 4).toString(16));
 }
 
 function parse(headers) {
@@ -448,13 +452,6 @@ function createUserAgent(options) {
   return [baseInfo, systemInfo, libraryInfo, contactInfo, customAgent].filter(Boolean).join(' ');
 }
 
-function byteLength(body) {
-  if (typeof body === 'string') return body.length.toString();
-  if (body && typeof body === 'object') return new TextEncoder().encode(JSON.stringify(body)).length.toString();
-  if (body instanceof Uint8Array) return body.length.toString();
-  return '0';
-}
-
 /**
  * validate some essential http options
  * @param options
@@ -742,11 +739,9 @@ function createAuthMiddlewareForAnonymousSessionFlow$1(options) {
         tokenFetchPromise = null;
       }
 
-      // Now the token is present in the tokenCache
+      // Now the token is present in the tokenCache and can be accessed
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -799,9 +794,7 @@ function createAuthMiddlewareForClientCredentialsFlow$1(options) {
 
       // Now the token is present in the tokenCache
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -877,9 +870,7 @@ function createAuthMiddlewareForPasswordFlow$1(options) {
 
       // Now the token is present in the tokenCache
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -928,9 +919,7 @@ function createAuthMiddlewareForRefreshTokenFlow$1(options) {
 
       // Now the token is present in the tokenCache
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -949,7 +938,7 @@ function createConcurrentModificationMiddleware$1(modifierFunction) {
 
         // update the resource version here
         if (version) {
-          if (modifierFunction) {
+          if (modifierFunction && typeof modifierFunction == 'function') {
             request.body = await modifierFunction(version, request, response);
           } else {
             request.body = typeof request.body == 'string' ? {
@@ -1203,8 +1192,8 @@ function createQueueMiddleware$1({
   concurrency = 20
 }) {
   let runningCount = 0;
+  const queue = [];
   const waitForSlot = () => {
-    // dont allow negative or 0 value for concurrency
     if (0 >= concurrency) return Promise.resolve();
     return new Promise(resolve => {
       const tryNext = () => {
@@ -1212,43 +1201,48 @@ function createQueueMiddleware$1({
           runningCount++;
           resolve();
         } else {
-          // Retry until a slot becomes available
-          setTimeout(tryNext, 10);
+          queue.push(tryNext);
         }
       };
-
-      // start
       tryNext();
     });
   };
-  return next => {
-    return async request => {
-      return waitForSlot().then(async () => {
-        // Patch the request to override resolve and reject
-        const patchedRequest = {
-          ...request,
-          resolve(data) {
-            request.resolve(data);
-            runningCount--;
-          },
-          reject(error) {
-            request.reject(error);
-            runningCount--;
-          }
-        };
-        try {
-          return next(patchedRequest);
-        } finally {
-          runningCount--;
+
+  // Function to free up a slot after a request is completed
+  const freeSlot = () => {
+    runningCount--;
+    if (queue.length > 0) {
+      const nextInQueue = queue.shift();
+      if (nextInQueue) {
+        nextInQueue();
+      }
+    }
+  };
+  return next => request => {
+    return waitForSlot().then(() => {
+      const patchedRequest = {
+        ...request,
+        resolve(data) {
+          request.resolve(data);
+          freeSlot();
+        },
+        reject(error) {
+          request.reject(error);
+          freeSlot();
         }
+      };
+
+      // Process the next middleware
+      return next(patchedRequest).finally(() => {
+        freeSlot();
       });
-    };
+    });
   };
 }
 
 var packageJson = {
 	name: "@commercetools/ts-client",
-	version: "2.1.0-alpha.1",
+	version: "2.1.1",
 	engines: {
 		node: ">=14"
 	},
@@ -1282,14 +1276,12 @@ var packageJson = {
 	},
 	dependencies: {
 		"abort-controller": "3.0.0",
+		buffer: "^6.0.3",
 		"node-fetch": "^2.6.1"
 	},
 	files: [
 		"dist",
-		"CHANGELOG.md",
-		"LICENSE",
-		"README.md",
-		"package.json"
+		"CHANGELOG.md"
 	],
 	author: "Chukwuemeka Ajima <meeky.ae@gmail.com>",
 	main: "dist/commercetools-ts-client.cjs.js",

package/dist/commercetools-ts-client.cjs.dev.js

@@ -35,6 +35,17 @@ function _defineProperty(e, r, t) {
   }) : e[r] = t, e;
 }
 
+var Buffer = require('buffer/').Buffer;
+function byteLength(body) {
+  if (body && (typeof body === 'string' || body instanceof Uint8Array)) {
+    return Buffer.byteLength(body).toString();
+  }
+  if (body && typeof body === 'object') {
+    return new TextEncoder().encode(JSON.stringify(body)).length.toString();
+  }
+  return '0';
+}
+
 const HEADERS_CONTENT_TYPES = ['application/json', 'application/graphql'];
 const CONCURRENCT_REQUEST = 20;
 const CTP_API_URL = 'https://api.europe-west1.gcp.commercetools.com';
@@ -259,16 +270,9 @@ async function executor(request) {
   return data;
 }
 
-// import { v4 as uuidv4 } from 'uuid'
-
-// export default function generateID() {
-//   return uuidv4()
-// }
-
 function generateID() {
   // @ts-ignore
-  const str = ([1e6] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
-  return 'abcdef'[Math.floor(Math.random() * 'abcdef'.length)] + '' + str;
+  return ([1e6] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => (parseInt(c) ^ Math.floor(Math.random() * 256) & 15 >> parseInt(c) / 4).toString(16));
 }
 
 function parse(headers) {
@@ -457,13 +461,6 @@ function createUserAgent(options) {
   return [baseInfo, systemInfo, libraryInfo, contactInfo, customAgent].filter(Boolean).join(' ');
 }
 
-function byteLength(body) {
-  if (typeof body === 'string') return body.length.toString();
-  if (body && typeof body === 'object') return new TextEncoder().encode(JSON.stringify(body)).length.toString();
-  if (body instanceof Uint8Array) return body.length.toString();
-  return '0';
-}
-
 /**
  * validate some essential http options
  * @param options
@@ -751,11 +748,9 @@ function createAuthMiddlewareForAnonymousSessionFlow$1(options) {
         tokenFetchPromise = null;
       }
 
-      // Now the token is present in the tokenCache
+      // Now the token is present in the tokenCache and can be accessed
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -808,9 +803,7 @@ function createAuthMiddlewareForClientCredentialsFlow$1(options) {
 
       // Now the token is present in the tokenCache
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -886,9 +879,7 @@ function createAuthMiddlewareForPasswordFlow$1(options) {
 
       // Now the token is present in the tokenCache
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -937,9 +928,7 @@ function createAuthMiddlewareForRefreshTokenFlow$1(options) {
 
       // Now the token is present in the tokenCache
       tokenCacheObject = tokenCache.get(tokenCacheKey);
-      if (tokenCacheObject && tokenCacheObject.token && Date.now() < tokenCacheObject.expirationTime) {
-        return next(mergeAuthHeader(tokenCacheObject.token, request));
-      }
+      return next(mergeAuthHeader(tokenCacheObject.token, request));
     };
   };
 }
@@ -958,7 +947,7 @@ function createConcurrentModificationMiddleware$1(modifierFunction) {
 
         // update the resource version here
         if (version) {
-          if (modifierFunction) {
+          if (modifierFunction && typeof modifierFunction == 'function') {
             request.body = await modifierFunction(version, request, response);
           } else {
             request.body = typeof request.body == 'string' ? {
@@ -1212,8 +1201,8 @@ function createQueueMiddleware$1({
   concurrency = 20
 }) {
   let runningCount = 0;
+  const queue = [];
   const waitForSlot = () => {
-    // dont allow negative or 0 value for concurrency
     if (0 >= concurrency) return Promise.resolve();
     return new Promise(resolve => {
       const tryNext = () => {
@@ -1221,43 +1210,48 @@ function createQueueMiddleware$1({
           runningCount++;
           resolve();
         } else {
-          // Retry until a slot becomes available
-          setTimeout(tryNext, 10);
+          queue.push(tryNext);
         }
       };
-
-      // start
       tryNext();
     });
   };
-  return next => {
-    return async request => {
-      return waitForSlot().then(async () => {
-        // Patch the request to override resolve and reject
-        const patchedRequest = {
-          ...request,
-          resolve(data) {
-            request.resolve(data);
-            runningCount--;
-          },
-          reject(error) {
-            request.reject(error);
-            runningCount--;
-          }
-        };
-        try {
-          return next(patchedRequest);
-        } finally {
-          runningCount--;
+
+  // Function to free up a slot after a request is completed
+  const freeSlot = () => {
+    runningCount--;
+    if (queue.length > 0) {
+      const nextInQueue = queue.shift();
+      if (nextInQueue) {
+        nextInQueue();
+      }
+    }
+  };
+  return next => request => {
+    return waitForSlot().then(() => {
+      const patchedRequest = {
+        ...request,
+        resolve(data) {
+          request.resolve(data);
+          freeSlot();
+        },
+        reject(error) {
+          request.reject(error);
+          freeSlot();
         }
+      };
+
+      // Process the next middleware
+      return next(patchedRequest).finally(() => {
+        freeSlot();
       });
-    };
+    });
   };
 }
 
 var packageJson = {
 	name: "@commercetools/ts-client",
-	version: "2.1.0-alpha.1",
+	version: "2.1.1",
 	engines: {
 		node: ">=14"
 	},
@@ -1291,14 +1285,12 @@ var packageJson = {
 	},
 	dependencies: {
 		"abort-controller": "3.0.0",
+		buffer: "^6.0.3",
 		"node-fetch": "^2.6.1"
 	},
 	files: [
 		"dist",
-		"CHANGELOG.md",
-		"LICENSE",
-		"README.md",
-		"package.json"
+		"CHANGELOG.md"
 	],
 	author: "Chukwuemeka Ajima <meeky.ae@gmail.com>",
 	main: "dist/commercetools-ts-client.cjs.js",