Merge remote-tracking branch 'origin/master'

farfromrefug · farfromrefug · commit 611d48ffc762 · 2024-02-28T17:06:10.000+01:00
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [farfromrefug]
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 # NativeScript
 hooks/
 node_modules/
-/platforms/
+platforms
 
 # NativeScript Template
 *.js.map
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,5 +1,7 @@
+compressionLevel: mixed
+
 nmHoistingLimits: workspaces
 
 nodeLinker: node-modules
 
-yarnPath: tools/.yarn/releases/yarn-3.6.4.cjs
+yarnPath: tools/.yarn/releases/yarn-4.0.1.cjs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.8](https://github.com/nativescript-community/https/compare/v4.1.7...v4.1.8) (2023-11-21)
+
+### Bug Fixes
+
+* **ios:** ensure progress is run on main thread(for now) ([60a4453](https://github.com/nativescript-community/https/commit/60a44530f2371996a952c8566f2d9fded26d5b1e))
+
+## [4.1.7](https://github.com/nativescript-community/https/compare/v4.1.6...v4.1.7) (2023-11-21)
+
+## [4.1.5](https://github.com/nativescript-community/https/compare/v4.1.4...v4.1.5) (2023-11-02)
+
+### Bug Fixes
+
+* **ios:** rewrote to support all HTTP methods. ([4a25a73](https://github.com/nativescript-community/https/commit/4a25a73dc672e051370591e11e2dfe98127a60a5))
+
 ## [4.1.6](https://github.com/nativescript-community/https/compare/v4.1.4...v4.1.6) (2023-11-13)
 
 ### Bug Fixes
diff --git a/demo-vue b/demo-vue
@@ -1 +1 @@
-Subproject commit d39854b2affb19ae6d5680b0810a7b301b289e57
+Subproject commit 00fab65ca6187ff4dc096a875c71c60dae0587f0
diff --git a/docs/assets/navigation.js b/docs/assets/navigation.js
diff --git a/docs/assets/search.js b/docs/assets/search.js
diff --git a/lerna.json b/lerna.json
@@ -1,43 +1,32 @@
 {
-    "version": "4.1.6",
+    "version": "4.1.8",
+    "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
     "packages": [
         "packages/*"
     ],
     "npmClient": "yarn",
     "useWorkspaces": true,
     "command": {
         "publish": {
-            "conventionalCommits": true,
-            "conventionalBlacklist": [
-                "chore"
-            ],
-            "changelogPreset": "angular",
-            "createRelease": "github",
-            "commitHooks": false,
-            "private": false,
-            "ignoreChanges": [
-                "*.md",
-                "docs/**"
-            ]
-        },
-        "version": {
-            "conventionalCommits": true,
-            "conventionalBlacklist": [
-                "chore"
-            ],
-            "changelogPreset": "angular",
-            "createRelease": "github",
-            "commitHooks": false,
-            "private": false,
-            "ignoreChanges": [
-                "*.md",
-                "docs/**"
-            ]
-        },
-        "bootstrap": {
-            "npmClientArgs": [
-                "--no-package-lock"
+            "cleanupTempFiles": true,
+            "removePackageFields": [
+                "devDependencies",
+                "scripts"
             ]
         }
-    }
+    },
+    "npmClientArgs": [
+        "--no-package-lock"
+    ],
+    "commitHooks": false,
+    "createRelease": "github",
+    "conventionalCommits": true,
+    "private": false,
+    "message": "chore(release): publish new version %v",
+    "changelogPreset": "conventional-changelog-conventionalcommits",
+    "ignoreChanges": [
+        "**/__fixtures__/**",
+        "**/__tests__/**",
+        "**/*.md"
+    ]
 }
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
         "plugin.watch.android": "npm i && npm-watch build.android",
         "plugin.watch.ios": "npm i && npm-watch build.ios",
         "plugin.watch": "npm run plugin.watch.tsc & npm run plugin.watch.android & npm run plugin.watch.ios",
-        "publish": "npm run setup && npm run clean && npm run build.all && npm run readme && npm run doc && npm run commit_readme_doc_changes ; lerna publish",
+        "publish": "npm run setup && npm run clean && npm run build.all && npm run readme && npm run doc && npm run commit_readme_doc_changes && lerna publish",
         "publish.major": "npm run build && lerna publish major --create-release=github --force-publish",
         "sync": "node ./tools/sync.js",
         "commitmsg": "commitlint -e $GIT_PARAMS",
@@ -32,7 +32,7 @@
         "start": "./node_modules/.bin/ntl -A -s 15 -o",
         "submodules": "git submodule update --init",
         "update": "node ./tools/update.js",
-        "commit_readme_doc_changes": "git add docs/** *.md ; git commit -m \"readme/doc\""
+        "commit_readme_doc_changes": "git add docs/** *.md ; git commit -m \"readme/doc\" ; echo \"commit readme doc done\""
     },
     "keywords": [
         "secure",
@@ -99,12 +99,7 @@
     },
     "workspaces": [
         "packages/*",
-        "demo-vue",
-        "demo-vue3",
-        "demo-ng",
-        "demo-svelte",
-        "demo-react",
-        "demo-snippets"
+        "demo*"
     ],
     "engines": {
         "npm": "please use yarn or pnpm",
diff --git a/packages/https/CHANGELOG.md b/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.1.8](https://github.com/nativescript-community/https/compare/v4.1.7...v4.1.8) (2023-11-21)
+
+**Note:** Version bump only for package @nativescript-community/https
+
+## [4.1.7](https://github.com/nativescript-community/https/compare/v4.1.6...v4.1.7) (2023-11-21)
+
+**Note:** Version bump only for package @nativescript-community/https
+
 ## [4.1.6](https://github.com/nativescript-community/https/compare/v4.1.4...v4.1.6) (2023-11-13)
 
 **Note:** Version bump only for package @nativescript-community/https
diff --git a/packages/https/package.json b/packages/https/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/https",
-    "version": "4.1.6",
+    "version": "4.1.8",
     "description": "Nativescript plugin for https requests",
     "main": "index",
     "sideEffects": false,
diff --git a/src/https/request.ios.ts b/src/https/request.ios.ts
@@ -1,4 +1,5 @@
 import { File, ImageSource, Utils } from '@nativescript/core';
+import { dispatchToMainThread} from '@nativescript/core/utils';
 import { CacheOptions, HttpsFormDataParam, HttpsRequest, HttpsRequestOptions, HttpsResponse, HttpsSSLPinningOptions, HttpsResponseLegacy as IHttpsResponseLegacy } from '.';
 import { getFilenameFromUrl, parseJSON } from './request.common';
 export { addInterceptor, addNetworkInterceptor } from './request.common';
@@ -373,7 +374,10 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
 
     const progress = opts.onProgress
         ? (progress: NSProgress) => {
+            dispatchToMainThread(()=>{
               opts.onProgress(progress.completedUnitCount, progress.totalUnitCount);
+            })
+
           }
         : null;
     let task: NSURLSessionDataTask;
@@ -463,14 +467,19 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                 }
             } else if (opts.method === 'PUT'){
                 if (opts.body instanceof File) {
-                    const request = NSURLRequest.requestWithURL(NSURL.URLWithString(opts.url));
+                    const request = NSMutableURLRequest.alloc().initWithURL(NSURL.URLWithString(opts.url));
+                    request.HTTPMethod = opts.method;
+                    Object.keys(heads).forEach(k=>{
+                        request.setValueForHTTPHeaderField(heads[k], k);
+                    });
                     task = manager.uploadTaskWithRequestFromFileProgressCompletionHandler(request, NSURL.fileURLWithPath(opts.body.path), progress, (response: NSURLResponse, responseObject: any, error: NSError)=>{
                         if (error){
                             failure(task, error);
                         } else {
                             success(task, responseObject);
                         }
                     });
+                    task.resume();
                 } else {
                     let data: NSData;
                     // TODO: add support for Buffers
@@ -481,14 +490,19 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                     } else {
                         data = NSString.stringWithString(JSON.stringify(opts.body)).dataUsingEncoding(NSUTF8StringEncoding);
                     }
-                const request = NSURLRequest.requestWithURL(NSURL.URLWithString(opts.url));
-                        task = manager.uploadTaskWithRequestFromDataProgressCompletionHandler(request, data, progress, (response: NSURLResponse, responseObject: any, error: NSError)=>{
-                            if (error){
-                                failure(task, error);
-                            } else {
-                                success(task, responseObject);
-                            }
-                        });
+                    const request = NSMutableURLRequest.alloc().initWithURL(NSURL.URLWithString(opts.url));
+                    request.HTTPMethod = opts.method;
+                    Object.keys(heads).forEach(k=>{
+                        request.setValueForHTTPHeaderField(heads[k], k);
+                    });
+                    task = manager.uploadTaskWithRequestFromDataProgressCompletionHandler(request, data, progress, (response: NSURLResponse, responseObject: any, error: NSError)=>{
+                        if (error){
+                            failure(task, error);
+                        } else {
+                            success(task, responseObject);
+                        }
+                    });
+                    task.resume();
                 }
             } else {
                 let dict = null;
@@ -498,29 +512,7 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                     dict = NSJSONSerialization.JSONObjectWithDataOptionsError(NSString.stringWithString(opts.content).dataUsingEncoding(NSUTF8StringEncoding), 0 as any);
                 }
                 task = manager.dataTaskWithHTTPMethodURLStringParametersHeadersUploadProgressDownloadProgressSuccessFailure(opts.method, opts.url, dict, headers, progress, progress, success, failure);
-                // switch (opts.method) {
-                //     case 'GET':
-                //         task = manager.GETParametersHeadersProgressSuccessFailure(opts.url, dict, headers, progress, success, failure);
-                //         manager.requestSerializer.requestWithMethodURLStringParametersError(method, URLString, parameters)
-                //         break;
-                //     case 'POST':
-                //         task = manager.POSTParametersHeadersProgressSuccessFailure(opts.url, dict, headers, progress, success, failure);
-                //         break;
-                //     case 'PUT':
-                //         task = manager.PUTParametersHeadersSuccessFailure(opts.url, dict, headers, success, failure);
-                //         break;
-                //     case 'DELETE':
-                //         task = manager.DELETEParametersHeadersSuccessFailure(opts.url, dict, headers, success, failure);
-                //         break;
-                //     case 'PATCH':
-                //         task = manager.PATCHParametersHeadersSuccessFailure(opts.url, dict, headers, success, failure);
-                //         break;
-                //     case 'HEAD':
-                //         task = manager.HEADParametersHeadersSuccessFailure(opts.url, dict, headers, success, failure);
-                //         break;
-                //     default:
-                //         throw new Error('method_not_supported_multipart');
-                // }
+                task.resume();
             }
             if (task && tag) {
                 runningRequests[tag] = task;
diff --git a/tools b/tools
@@ -1 +1 @@
-Subproject commit 2f3f6b0a4d368966b4f432e95cd4a8ba641bb9a7
+Subproject commit 25e1331bce11b827443dd9428d3d7f42ddc64e28
diff --git a/yarn.lock b/yarn.lock
