Merge branch 'master' of https://github.com/nativescript-community/https

Author: farfromrefug

CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.16](https://github.com/nativescript-community/https/compare/v4.0.15...v4.0.16) (2023-03-14)
+
+
+### Features
+
+* `cancelAllRequests` ([3a014bc](https://github.com/nativescript-community/https/commit/3a014bc9fe797d9b1405b9ed75348fba776d6eb2))
+
+
+
+
+
 ## [4.0.15](https://github.com/nativescript-community/https/compare/v4.0.14...v4.0.15) (2023-03-06)
 
 

lerna.json

@@ -18,5 +18,5 @@
             ]
         }
     },
-    "version": "4.0.15"
+    "version": "4.0.16"
 }

packages/https/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.16](https://github.com/nativescript-community/https/compare/v4.0.15...v4.0.16) (2023-03-14)
+
+**Note:** Version bump only for package @nativescript-community/https
+
+
+
+
+
 ## [4.0.15](https://github.com/nativescript-community/https/compare/v4.0.14...v4.0.15) (2023-03-06)
 
 

packages/https/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/https",
-    "version": "4.0.15",
+    "version": "4.0.16",
     "description": "Nativescript plugin for https requests",
     "main": "index",
     "sideEffects": false,

src/https/request.android.ts

@@ -405,6 +405,32 @@ export function cancelRequest(tag: string, client: okhttp3.OkHttpClient = runnin
     }
 }
 
+export function cancelAllRequests() {
+    Object.values(notClosedResponses).forEach((req) => req.cancel());
+
+    Object.values(runningClients).forEach((client) => {
+        const dispatcher = client.dispatcher();
+        //When you want to cancel:
+        //A) go through the queued calls and cancel if the tag matches:
+        if (dispatcher.queuedCallsCount() > 0) {
+            const queuedCalls = dispatcher.queuedCalls();
+            for (let index = 0; index < queuedCalls.size(); index++) {
+                const call = queuedCalls.get(index);
+                call.cancel();
+            }
+        }
+
+        //B) go through the running calls and cancel if the tag matches:
+        if (dispatcher.runningCallsCount() > 0) {
+            const runningCalls = dispatcher.runningCalls();
+            for (let index = 0; index < runningCalls.size(); index++) {
+                const call = runningCalls.get(index);
+                call.cancel();
+            }
+        }
+    });
+}
+
 export function clearCookies() {
     if (cookieJar) {
         cookieJar = null;

src/https/request.d.ts

@@ -112,6 +112,7 @@ export function setCache(options?: CacheOptions);
 export function clearCache();
 export function createRequest(opts: HttpsRequestOptions): HttpsRequest;
 export function cancelRequest(tag: string);
+export function cancelAllRequests();
 export function clearCookies();
 export function addNetworkInterceptor(interceptor);
 

src/https/request.ios.ts

@@ -308,6 +308,11 @@ export function cancelRequest(tag: string) {
         runningRequests[tag].cancel();
     }
 }
+export function cancelAllRequests() {
+    Object.values(runningRequests).forEach(request=>{
+        request.cancel()
+    })
+}
 
 export function clearCookies() {
     const storage = NSHTTPCookieStorage.sharedHTTPCookieStorage;

yarn.lock

@@ -2192,7 +2192,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nativescript-community/[email protected], @nativescript-community/https@workspace:packages/https":
+"@nativescript-community/https@npm:4.0.11":
+  version: 4.0.11
+  resolution: "@nativescript-community/https@npm:4.0.11"
+  checksum: 587715cb290fe14e615f67f36e4e8b990176176b66353eea9af2171e16f6822e87dd4645e0d9748aacee7b4564fb51231fa04b671ff1f798137524bb99cefe1a
+  languageName: node
+  linkType: hard
+
+"@nativescript-community/https@workspace:packages/https":
   version: 0.0.0-use.local
   resolution: "@nativescript-community/https@workspace:packages/https"
   languageName: unknown
@@ -2273,10 +2280,10 @@ __metadata:
 
 "@nativescript-community/template-snippet@file:demo-snippets::locator=root-workspace-0b6124%40workspace%3A.":
   version: 0.0.1
-  resolution: "@nativescript-community/template-snippet@file:demo-snippets#demo-snippets::hash=737e66&locator=root-workspace-0b6124%40workspace%3A."
+  resolution: "@nativescript-community/template-snippet@file:demo-snippets#demo-snippets::hash=c63ecc&locator=root-workspace-0b6124%40workspace%3A."
   dependencies:
     "@nativescript-community/https": 4.0.11
-  checksum: d1ba570c0fedbcb0514871e037d901afd6fd1ec74990204a4faa4af860f7eb59f1716cc9e178a804e4ed23ab475b771795772151a9ee1cfbe6abe032691cd6ec
+  checksum: d1cf63a6261cb4e69527dd6b596fd7e0db2e9cf14be9e511d2079230faf7c577da96d0350d3d05610f6c8fac45d2d851b316d5df84cf8d678134af971829fb8b
   languageName: node
   linkType: hard
 
@@ -7435,7 +7442,7 @@ __metadata:
 
 "fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
   version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
   dependencies:
     node-gyp: latest
   conditions: os=darwin
@@ -13148,7 +13155,7 @@ __metadata:
 
 "resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.9.0#~builtin<compat/resolve>":
   version: 1.22.1
-  resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=c3c19d"
+  resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
   dependencies:
     is-core-module: ^2.9.0
     path-parse: ^1.0.7
@@ -13161,7 +13168,7 @@ __metadata:
 
 "resolve@patch:resolve@^2.0.0-next.3#~builtin<compat/resolve>":
   version: 2.0.0-next.4
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin<compat/resolve>::version=2.0.0-next.4&hash=07638b"
   dependencies:
     is-core-module: ^2.9.0
     path-parse: ^1.0.7
@@ -14867,17 +14874,17 @@ __metadata:
 
 "typescript@patch:typescript@^3 || ^4#~builtin<compat/typescript>, typescript@patch:typescript@^4.6.4#~builtin<compat/typescript>":
   version: 4.9.4
-  resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin<compat/typescript>::version=4.9.4&hash=ad5954"
+  resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin<compat/typescript>::version=4.9.4&hash=a1c5e5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 1caaea6cb7f813e64345190fddc4e6c924d0b698ab81189b503763c4a18f7f5501c69362979d36e19c042d89d936443e768a78b0675690b35eb663d19e0eae71
+  checksum: 37f6e2c3c5e2aa5934b85b0fddbf32eeac8b1bacf3a5b51d01946936d03f5377fe86255d4e5a4ae628fd0cd553386355ad362c57f13b4635064400f3e8e05b9d
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@^3.5.3#~builtin<compat/typescript>":
   version: 3.9.10
-  resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=3bd3d3"
+  resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=a1c5e5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
@@ -14887,7 +14894,7 @@ __metadata:
 
 "typescript@patch:typescript@~4.2.3#~builtin<compat/typescript>":
   version: 4.2.4
-  resolution: "typescript@patch:typescript@npm%3A4.2.4#~builtin<compat/typescript>::version=4.2.4&hash=334f98"
+  resolution: "typescript@patch:typescript@npm%3A4.2.4#~builtin<compat/typescript>::version=4.2.4&hash=a1c5e5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
@@ -14897,11 +14904,11 @@ __metadata:
 
 "typescript@patch:typescript@~4.8.4#~builtin<compat/typescript>":
   version: 4.8.4
-  resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=0102e9"
+  resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=a1c5e5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 301459fc3eb3b1a38fe91bf96d98eb55da88a9cb17b4ef80b4d105d620f4d547ba776cc27b44cc2ef58b66eda23fe0a74142feb5e79a6fb99f54fc018a696afa
+  checksum: 563a0ef47abae6df27a9a3ab38f75fc681f633ccf1a3502b1108e252e187787893de689220f4544aaf95a371a4eb3141e4a337deb9895de5ac3c1ca76430e5f0
   languageName: node
   linkType: hard