@weapnl/js-junction 0.0.6 → 0.0.7

package/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## v0.0.7
+- Request cancel improvements.
+
 ## v0.0.6
 - Added support for request cancellation by key.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapnl/js-junction",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "This project allows you to easily consume API's built with Junction.",
   "main": "./src/index.js",
   "scripts": {

package/src/builder/model.js

@@ -116,6 +116,8 @@ export default class Model extends Request {
      * @returns {this[]} List of models.
      */
     async index () {
+        this._connection.cancelRunning(this);
+
         this._response = await this._connection.get(
             this._queryString(),
             this.bodyParameters,
@@ -146,6 +148,8 @@ export default class Model extends Request {
 
         if (! identifier) return null;
 
+        this._connection.cancelRunning(this);
+
         this._response = await this._connection.get(
             this._queryString(identifier),
             this.bodyParameters,
@@ -170,6 +174,8 @@ export default class Model extends Request {
      * @returns {this} The created model.
      */
     async store (extraData = {}) {
+        this._connection.cancelRunning(this);
+
         this._response = await this._connection.post(
             this._queryString(),
             { ...this._attributes.toJson(this), ...extraData },
@@ -194,6 +200,8 @@ export default class Model extends Request {
      * @returns {this} The updated model.
      */
     async update (extraData = {}) {
+        this._connection.cancelRunning(this);
+
         this._response = await this._connection.put(
             this._queryString(this._identifier),
             { ...this._attributes.toJson(this), ...extraData },
@@ -216,6 +224,8 @@ export default class Model extends Request {
      * @returns {boolean} Whether the deletion was successful.
      */
     async destroy () {
+        this._connection.cancelRunning(this);
+
         this._response = await this._connection.delete(
             this._queryString(this._identifier),
         );

package/src/connection.js

@@ -11,8 +11,6 @@ export default class Connection {
         this.running = false;
         this.canceled = false;
         this.failed = false;
-
-        this._request = null;
     }
 
     cancel () {
@@ -23,8 +21,8 @@ export default class Connection {
         this.canceled = true;
     }
 
-    setRequest (request) {
-        this._request = request;
+    cancelRunning (request) {
+        this._api.cancelRunning(request);
     }
 
     setConfig (config) {
@@ -58,8 +56,6 @@ export default class Connection {
             url = `/${url}`;
         }
 
-        this._api.cancelRunning(this._request);
-
         const config = {
             url: (this._api ? this._api.baseUrl : api.baseUrl) + url,
             method,

package/src/request.js

@@ -32,7 +32,6 @@ export default class Request {
         this._onForbidden = () => {};
 
         this._connection = new Connection();
-        this._connection.setRequest(this);
 
         this._response = null;
         this.key = null;
@@ -74,6 +73,8 @@ export default class Request {
     async get () {
         const url = this.url ?? this.constructor.endpoint;
 
+        this._connection.cancelRunning(this);
+
         this._response = await this._connection.get(
             url,
             this.bodyParameters,
@@ -92,6 +93,8 @@ export default class Request {
     async post (data = {}) {
         const url = this.url ?? this.constructor.endpoint;
 
+        this._connection.cancelRunning(this);
+
         this._response = await this._connection.post(
             url,
             data,
@@ -110,6 +113,8 @@ export default class Request {
     async put (data = {}) {
         const url = this.url ?? this.constructor.endpoint;
 
+        this._connection.cancelRunning(this);
+
         this._response = await this._connection.put(
             url,
             { ...data, ...this.bodyParameters },
@@ -126,6 +131,8 @@ export default class Request {
     async delete () {
         const url = this.url ?? this.constructor.endpoint;
 
+        this._connection.cancelRunning(this);
+
         this._response = await this._connection.delete(
             url,
         );
@@ -144,6 +151,8 @@ export default class Request {
     async storeFiles (files = {}, data = {}) {
         const url = this.url ?? this.constructor.endpoint;
 
+        this._connection.cancelRunning(this);
+
         this._connection.setConfig({
             headers: {
                 'Content-Type': 'multipart/form-data',