From 49073c5c4e1ab1370da4260ebc833705eaabb2b3 Mon Sep 17 00:00:00 2001 From: Martin Guillon Date: Thu, 23 Dec 2021 16:37:40 +0100 Subject: [PATCH 1/2] fix: android allow interceptors --- src/https.android.ts | 2 ++ src/https.common.ts | 9 +++++++++ src/https.d.ts | 2 +- src/https.ios.ts | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/https.android.ts b/src/https.android.ts index 5d0ec53..16f5d2e 100644 --- a/src/https.android.ts +++ b/src/https.android.ts @@ -266,6 +266,8 @@ function getClient(reload: boolean = false, timeout: number = 10): okhttp3.OkHtt } const client = new okhttp3.OkHttpClient.Builder(); + Https.interceptors.forEach((interceptor) => client.addInterceptor(interceptor)); + Https.networkInterceptors.forEach((interceptor) => client.addNetworkInterceptor(interceptor)); if (peer.enabled === true) { if (peer.host || peer.certificate) { const spec = okhttp3.ConnectionSpec.MODERN_TLS; diff --git a/src/https.common.ts b/src/https.common.ts index 80e10be..296c325 100644 --- a/src/https.common.ts +++ b/src/https.common.ts @@ -107,3 +107,12 @@ export function parseJSON(source: string): any { return JSON.parse(src); } + +export const interceptors = []; +export function addInterceptor(interceptor) { + interceptors.push(interceptor); +} +export const networkInterceptors = []; +export function addNetworkInterceptor(interceptor) { + networkInterceptors.push(interceptor); +} diff --git a/src/https.d.ts b/src/https.d.ts index 484917e..a304251 100644 --- a/src/https.d.ts +++ b/src/https.d.ts @@ -8,5 +8,5 @@ export function request(options: Https.HttpsRequestOptions): Promise { - opts.onProgress(progress.completedUnitCount, progress.totalUnitCount); - } + opts.onProgress(progress.completedUnitCount, progress.totalUnitCount); + } : null; let task: NSURLSessionDataTask; From 180ded49a6dd4094fa4c40139e822c73fde9d43e Mon Sep 17 00:00:00 2001 From: Martin Guillon Date: Thu, 23 Dec 2021 16:39:00 +0100 Subject: [PATCH 2/2] v3.3.3 --- CHANGELOG.md | 11 +++++++++++ lerna.json | 2 +- plugin/CHANGELOG.md | 8 ++++++++ plugin/package.json | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c7021e..fe93c17 100644 --- a/CHANGELOG.md +++ b/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. +## [3.3.3](https://github.com/farfromrefug/nativescript-https/compare/v3.3.2...v3.3.3) (2021-12-23) + + +### Bug Fixes + +* android allow interceptors ([49073c5](https://github.com/farfromrefug/nativescript-https/commit/49073c5c4e1ab1370da4260ebc833705eaabb2b3)) + + + + + ## [3.3.2](https://github.com/farfromrefug/nativescript-https/compare/v3.3.1...v3.3.2) (2021-10-21) diff --git a/lerna.json b/lerna.json index 218c527..d4e2fab 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "plugin" ], - "version": "3.3.2", + "version": "3.3.3", "command": { "publish": { "conventionalCommits": true diff --git a/plugin/CHANGELOG.md b/plugin/CHANGELOG.md index 5c3d9e2..1e8d5a6 100644 --- a/plugin/CHANGELOG.md +++ b/plugin/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. +## [3.3.3](https://github.com/farfromrefug/nativescript-https/compare/v3.3.2...v3.3.3) (2021-12-23) + +**Note:** Version bump only for package @nativescript-community/https + + + + + ## [3.3.2](https://github.com/farfromrefug/nativescript-https/compare/v3.3.1...v3.3.2) (2021-10-21) diff --git a/plugin/package.json b/plugin/package.json index 0e3f727..1ded619 100644 --- a/plugin/package.json +++ b/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript-community/https", - "version": "3.3.2", + "version": "3.3.3", "description": "Nativescript plugin for gestures", "main": "https", "sideEffects": false,