- Updated dependencies

- Aligned request cancelation between clients

Author: ferdikoomen

package.json

@@ -60,7 +60,7 @@
     "dependencies": {
         "@types/node-fetch": "^2.5.12",
         "abort-controller": "^3.0.0",
-        "axios": "^0.24.0",
+        "axios": "^0.25.0",
         "camelcase": "^6.3.0",
         "commander": "^8.3.0",
         "form-data": "^4.0.0",
@@ -69,22 +69,22 @@
         "node-fetch": "^2.6.6"
     },
     "devDependencies": {
-        "@babel/cli": "7.16.7",
-        "@babel/core": "7.16.7",
-        "@babel/preset-env": "7.16.7",
+        "@babel/cli": "7.16.8",
+        "@babel/core": "7.16.12",
+        "@babel/preset-env": "7.16.11",
         "@babel/preset-typescript": "7.16.7",
         "@rollup/plugin-commonjs": "21.0.1",
         "@rollup/plugin-node-resolve": "13.1.3",
         "@rollup/plugin-typescript": "8.3.0",
         "@types/express": "4.17.13",
         "@types/glob": "7.2.0",
         "@types/jest": "27.4.0",
-        "@types/node": "17.0.8",
+        "@types/node": "17.0.10",
         "@types/qs": "6.9.7",
-        "@typescript-eslint/eslint-plugin": "5.9.0",
-        "@typescript-eslint/parser": "5.9.0",
+        "@typescript-eslint/eslint-plugin": "5.10.0",
+        "@typescript-eslint/parser": "5.10.0",
         "codecov": "3.8.3",
-        "eslint": "8.6.0",
+        "eslint": "8.7.0",
         "eslint-config-prettier": "8.3.0",
         "eslint-plugin-prettier": "4.0.0",
         "eslint-plugin-simple-import-sort": "7.0.0",
@@ -93,14 +93,14 @@
         "jest": "27.4.7",
         "jest-cli": "27.4.7",
         "prettier": "2.5.1",
-        "puppeteer": "13.0.1",
-        "qs": "6.10.2",
+        "puppeteer": "13.1.1",
+        "qs": "6.10.3",
         "rimraf": "^3.0.2",
-        "rollup": "2.63.0",
+        "rollup": "2.66.0",
         "rollup-plugin-node-externals": "3.1.2",
         "rollup-plugin-terser": "7.0.2",
         "ts-node": "10.4.0",
         "tslib": "2.3.1",
-        "typescript": "4.5.4"
+        "typescript": "4.5.5"
     }
 }

src/templates/core/ApiRequestOptions.hbs

@@ -11,4 +11,4 @@ export type ApiRequestOptions = {
     readonly mediaType?: string;
     readonly responseHeader?: string;
     readonly errors?: Record<number, string>;
-}
+};

src/templates/core/ApiResult.hbs

@@ -6,4 +6,4 @@ export type ApiResult = {
     readonly status: number;
     readonly statusText: string;
     readonly body: any;
-}
+};

src/templates/core/CancelablePromise.hbs

@@ -2,8 +2,8 @@
 
 export class CancelError extends Error {
 
-    constructor(reason: string = 'Promise was canceled') {
-        super(reason);
+    constructor(message: string) {
+        super(message);
         this.name = 'CancelError';
     }
 
@@ -13,7 +13,8 @@ export class CancelError extends Error {
 }
 
 export interface OnCancel {
-    readonly isPending: boolean;
+    readonly isResolved: boolean;
+    readonly isRejected: boolean;
     readonly isCancelled: boolean;
 
     (cancelHandler: () => void): void;
@@ -22,7 +23,8 @@ export interface OnCancel {
 export class CancelablePromise<T> implements Promise<T> {
     readonly [Symbol.toStringTag]: string;
 
-    #isPending: boolean;
+    #isResolved: boolean;
+    #isRejected: boolean;
     #isCancelled: boolean;
     readonly #cancelHandlers: (() => void)[];
     readonly #promise: Promise<T>;
@@ -36,33 +38,43 @@ export class CancelablePromise<T> implements Promise<T> {
             onCancel: OnCancel
         ) => void
     ) {
-        this.#isPending = true;
+        this.#isResolved = false;
+        this.#isRejected = false;
         this.#isCancelled = false;
         this.#cancelHandlers = [];
         this.#promise = new Promise<T>((resolve, reject) => {
             this.#resolve = resolve;
             this.#reject = reject;
 
             const onResolve = (value: T | PromiseLike<T>): void => {
-                if (!this.#isCancelled) {
-                    this.#isPending = false;
-                    this.#resolve?.(value);
+                if (this.#isResolved || this.#isRejected || this.#isCancelled) {
+                    return;
                 }
+                this.#isResolved = true;
+                this.#resolve?.(value);
             };
 
             const onReject = (reason?: any): void => {
-                this.#isPending = false;
+                if (this.#isResolved || this.#isRejected || this.#isCancelled) {
+                    return;
+                }
+                this.#isRejected = true;
                 this.#reject?.(reason);
             };
 
             const onCancel = (cancelHandler: () => void): void => {
-                if (this.#isPending) {
-                    this.#cancelHandlers.push(cancelHandler);
+                if (this.#isResolved || this.#isRejected || this.#isCancelled) {
+                    return;
                 }
+                this.#cancelHandlers.push(cancelHandler);
             };
 
-            Object.defineProperty(onCancel, 'isPending', {
-                get: (): boolean => this.#isPending,
+            Object.defineProperty(onCancel, 'isResolved', {
+                get: (): boolean => this.#isResolved,
+            });
+
+            Object.defineProperty(onCancel, 'isRejected', {
+                get: (): boolean => this.#isRejected,
             });
 
             Object.defineProperty(onCancel, 'isCancelled', {
@@ -91,7 +103,7 @@ export class CancelablePromise<T> implements Promise<T> {
     }
 
     public cancel(): void {
-        if (!this.#isPending || this.#isCancelled) {
+        if (this.#isResolved || this.#isRejected || this.#isCancelled) {
             return;
         }
         this.#isCancelled = true;
@@ -101,10 +113,12 @@ export class CancelablePromise<T> implements Promise<T> {
                     cancelHandler();
                 }
             } catch (error) {
-                this.#reject?.(error);
+                console.warn('Cancellation threw an error', error);
                 return;
             }
         }
+        this.#cancelHandlers.length = 0;
+        this.#reject?.(new CancelError('Request aborted'));
     }
 
     public get isCancelled(): boolean {

src/templates/core/OpenAPI.hbs

@@ -15,7 +15,7 @@ type Config = {
     PASSWORD?: string | Resolver<string>;
     HEADERS?: Headers | Resolver<Headers>;
     ENCODE_PATH?: (path: string) => string;
-}
+};
 
 export const OpenAPI: Config = {
     BASE: '{{{server}}}',

src/templates/core/axios/request.hbs

@@ -60,7 +60,7 @@ import { OpenAPI } from './OpenAPI';
 
 /**
  * Request using axios client
- * @param options The request options from the the service
+ * @param options The request options from the service
  * @returns CancelablePromise<T>
  * @throws ApiError
  */

src/templates/core/fetch/request.hbs

@@ -57,7 +57,7 @@ import { OpenAPI } from './OpenAPI';
 
 /**
  * Request using fetch client
- * @param options The request options from the the service
+ * @param options The request options from the service
  * @returns CancelablePromise<T>
  * @throws ApiError
  */

src/templates/core/node/request.hbs

@@ -61,7 +61,7 @@ import { OpenAPI } from './OpenAPI';
 
 /**
  * Request using node-fetch client
- * @param options The request options from the the service
+ * @param options The request options from the service
  * @returns CancelablePromise<T>
  * @throws ApiError
  */

src/templates/core/xhr/request.hbs

@@ -60,7 +60,7 @@ import { OpenAPI } from './OpenAPI';
 
 /**
  * Request using XHR client
- * @param options The request options from the the service
+ * @param options The request options from the service
  * @returns CancelablePromise<T>
  * @throws ApiError
  */

src/templates/core/xhr/sendRequest.hbs

@@ -16,8 +16,8 @@ async function sendRequest(
 
     return new Promise<XMLHttpRequest>((resolve, reject) => {
         xhr.onload = () => resolve(xhr);
-        xhr.onabort = () => reject(new Error('The user aborted a request.'));
-        xhr.onerror = () => reject(new Error('Network error.'));
+        xhr.onabort = () => reject(new Error('Request aborted'));
+        xhr.onerror = () => reject(new Error('Network error'));
         xhr.send(body || formData);
 
         onCancel(() => xhr.abort());