chore: add JS linter

Update CordovaHttpBase.java - Bugfix 482, omit Accept-Charset header

.eslintignore

@@ -0,0 +1,6 @@
+node_modules
+temp
+platforms
+**/*.min.js
+www/umd-tough-cookie.js
+www/lodash.js

.eslintrc.json

@@ -0,0 +1,25 @@
+{
+  "env": {
+    "browser": true,
+    "node": true,
+    "es2020": true
+  },
+  "extends": [
+    "eslint:recommended"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2020,
+    "sourceType": "script"
+  },
+  "overrides": [
+    {
+      "files": [
+        "test/**/*.js",
+        "www/**/*.js"
+      ],
+      "env": {
+        "mocha": true
+      }
+    }
+  ]
+}

.github/workflows/ci.yml

@@ -1,21 +1,47 @@
 name: Cordova HTTP Plugin CI
 
-on: [push]
+on:
+  push:
+  workflow_dispatch:
+    inputs:
+      ci_reason:
+        description: "Optional note for manual runs"
+        required: false
 
 env:
-  nodejs: "16.x"
+  node_version: "22.x"
+  java_distribution: "zulu"
+  java_version: "17"
+  gradle_version: "7.6.1"
   BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
   BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Install node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.node_version }}
+          cache: npm
+          cache-dependency-path: package-lock.json
+      - name: Install node modules
+        run: npm ci
+      - name: Run ESLint
+        run: npm run lint
+
   test-www-interface:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Install Node.js ${{ env.nodejs }}
-        uses: actions/setup-node@v1
+      - name: Install node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.nodejs }}
+          node-version: ${{ env.node_version }}
+          cache: npm
+          cache-dependency-path: package-lock.json
       - name: Install node modules
         run: npm ci
       - name: Run WWW interface tests
@@ -23,50 +49,118 @@ jobs:
 
   build-ios:
     runs-on: macOS-latest
+    outputs:
+      run-tests: ${{ steps.should-run-tests.outputs.run_tests }}
     steps:
       - uses: actions/checkout@v1
-      - name: Install Node.js ${{ env.nodejs }}
-        uses: actions/setup-node@v1
+      - name: Install node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.nodejs }}
+          node-version: ${{ env.node_version }}
+          cache: npm
+          cache-dependency-path: package-lock.json
+      - id: should-run-tests
+        # need to find a solution for signing iOS App so we can build for device target instead simulator
+        # for now we skip iOS tests on BrowserStack
+        run: echo "run_tests=false" >> "$GITHUB_OUTPUT"
       - name: Install node modules
         run: npm ci
       - name: Update test cert for httpbin.org
         run: npm run update:cert
-      # need to find a solution for signing iOS App so we can build for device target instead simulator
       - name: Build test app
         run: scripts/build-test-app.sh --ios --emulator
       - name: Upload artifact to BrowserStack
-        if: env.BROWSERSTACK_USERNAME != ''
+        if: steps.should-run-tests.outputs.run_tests == 'true'
         run: scripts/upload-browserstack.sh --ios
-      # need to have an App for device target
-      # - name: Run e2e tests
-      #   if: env.BROWSERSTACK_USERNAME != ''
-      #   run: scripts/test-app.sh --ios --device
+
+  test-ios:
+    needs: build-ios
+    if: needs.build-ios.outputs.run-tests == 'true'
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Install node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.node_version }}
+          cache: npm
+          cache-dependency-path: package-lock.json
+      - name: Install node modules
+        run: npm ci
+      - name: Run e2e tests (iOS)
+        run: scripts/test-app.sh --ios --device
 
   build-android:
     runs-on: ubuntu-latest
+    outputs:
+      run-tests: ${{ steps.should-run-tests.outputs.run_tests }}
     steps:
       - uses: actions/checkout@v1
-      - name: Install Node.js ${{ env.nodejs }}
-        uses: actions/setup-node@v1
+      - name: Install node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.nodejs }}
+          node-version: ${{ env.node_version }}
+          cache: npm
+          cache-dependency-path: package-lock.json
+      - id: should-run-tests
+        run: |
+          if [ -n "${BROWSERSTACK_USERNAME}" ]; then
+            echo "run_tests=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "run_tests=false" >> "$GITHUB_OUTPUT"
+          fi
       - name: Install node modules
         run: npm ci
-      - name: Install JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Install JDK
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: ${{ env.java_distribution }}
+          java-version: ${{ env.java_version }}
+          java-package: jdk
+      - name: Ensure Android build-tools 33.0.2
+        run: yes | "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" "build-tools;33.0.2"
+      - name: Install Gradle
+        run: |
+          set -euo pipefail
+          curl -sSL "https://services.gradle.org/distributions/gradle-${{ env.gradle_version }}-bin.zip" -o gradle.zip
+          unzip -q gradle.zip -d "$HOME/gradle"
+          echo "$HOME/gradle/gradle-${{ env.gradle_version }}/bin" >> "$GITHUB_PATH"
+          rm gradle.zip
       - name: Update test cert for httpbin.org
         run: npm run update:cert
-      - name: Add workaround for missing DX files in build-tools 32 (https://stackoverflow.com/a/68430992)
-        run: ln -s $ANDROID_HOME/build-tools/32.0.0/d8 $ANDROID_HOME/build-tools/32.0.0/dx && ln -s $ANDROID_HOME/build-tools/32.0.0/lib/d8.jar $ANDROID_HOME/build-tools/32.0.0/lib/dx.jar
+      - name: Shim missing DX binaries (https://stackoverflow.com/a/68430992)
+        run: |
+          set -euo pipefail
+          BUILD_TOOLS_PATH="$(ls -d $ANDROID_HOME/build-tools/*/ | sort -V | tail -n 1)"
+          D8_BIN="${BUILD_TOOLS_PATH}d8"
+          DX_BIN="${BUILD_TOOLS_PATH}dx"
+          D8_JAR="${BUILD_TOOLS_PATH}lib/d8.jar"
+          DX_JAR="${BUILD_TOOLS_PATH}lib/dx.jar"
+          if [ -f "$D8_BIN" ] && [ ! -e "$DX_BIN" ]; then
+            ln -s "$D8_BIN" "$DX_BIN"
+          fi
+          if [ -f "$D8_JAR" ] && [ ! -e "$DX_JAR" ]; then
+            ln -s "$D8_JAR" "$DX_JAR"
+          fi
       - name: Build test app
         run: scripts/build-test-app.sh --android --device
       - name: Upload artifact to BrowserStack
-        if: env.BROWSERSTACK_USERNAME != ''
+        if: steps.should-run-tests.outputs.run_tests == 'true'
         run: scripts/upload-browserstack.sh --android
-      - name: Run e2e tests
-        if: env.BROWSERSTACK_USERNAME != ''
+
+  test-android:
+    needs: build-android
+    if: needs.build-android.outputs.run-tests == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Install node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.node_version }}
+          cache: npm
+          cache-dependency-path: package-lock.json
+      - name: Install node modules
+        run: npm ci
+      - name: Run e2e tests (Android)
         run: scripts/test-app.sh --android --device

.github/workflows/codeql-analysis.yml

@@ -3,60 +3,101 @@
 #
 # You may wish to alter this file to override the set of languages analyzed,
 # or to provide custom queries or build logic.
-name: "CodeQL"
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
 
 on:
   push:
-    branches: [master]
+    branches: ["master"]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
+    branches: ["master"]
   schedule:
-    - cron: '0 20 * * 3'
+    - cron: "0 0 * * 0"
 
 jobs:
   analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
 
     strategy:
       fail-fast: false
       matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['javascript']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
+        include:
+          - language: actions
+            build-mode: none
+          - language: java-kotlin
+            build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
+          - language: javascript-typescript
+            build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Add any setup steps before running the `github/codeql-action/init` action.
+      # This includes steps like installing compilers or runtimes (`actions/setup-node`
+      # or others). This is typically only required for manual builds.
+      # - name: Setup runtime (example)
+      #   uses: actions/setup-example@v1
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v4
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # If the analyze step fails for one of the languages you are analyzing with
+      # "We were unable to automatically build your code", modify the matrix above
+      # to set the build mode to "manual" for that language. Then modify this step
+      # to build your code.
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      - name: Run manual build steps
+        if: matrix.build-mode == 'manual'
+        shell: bash
+        run: |
+          echo 'If you are using a "manual" build mode for one or more of the' \
+            'languages you are analyzing, replace this with the commands to build' \
+            'your code, for example:'
+          echo '  make bootstrap'
+          echo '  make release'
+          exit 1
 
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v4
+        with:
+          category: "/language:${{matrix.language}}"

.travis.yml

@@ -1,55 +0,0 @@
-cache:
-  directories:
-    - node_modules
-
-addons:
-  sauce_connect: true
-
-matrix:
-  include:
-    - name: "iOS Build & Test"
-      language: objective-c
-      os: osx
-      osx_image: xcode12.5
-
-      before_install:
-        - export LANG=en_US.UTF-8 &&
-          nvm use 14
-
-      install:
-        - npm install
-
-      script:
-        - npm run test:js &&
-          npm run update:cert &&
-          scripts/build-test-app.sh --ios --emulator &&
-          scripts/upload-saucelabs.sh --ios &&
-          scripts/test-app.sh --ios --emulator;
-
-    - name: "Android Build & Test"
-      language: android
-
-      before_cache:
-        - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-        - rm -rf $HOME/.gradle/caches/*/plugin-resolution/
-
-      cache:
-        directories:
-          - $HOME/.gradle/caches/
-          - $HOME/.gradle/wrapper/
-
-      before_install:
-        - export LANG=en_US.UTF-8 &&
-          curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - &&
-          sudo apt-get install -y nodejs
-        - yes | sdkmanager "tools" "build-tools;30.0.3" "platforms;android-30" "extras;android;m2repository" "extras;google;m2repository"
-
-      install:
-        - npm install
-
-      script:
-        - npm run test:js &&
-          npm run update:cert &&
-          scripts/build-test-app.sh --android --emulator &&
-          scripts/upload-saucelabs.sh --android &&
-          scripts/test-app.sh --android --emulator;

CONTRIBUTING.md

@@ -73,10 +73,5 @@ If we suggest changes or the [CI build fails](#cibuild), then:
 That's it! Thank you for your contribution!
 
 ### <a name="cibuild"></a> Pull Request Feedback
-You can always check the results of the latest CI builds on
-[Travis CI](https://travis-ci.org/silkimen/cordova-plugin-advanced-http/).
+You can always check the results of the latest CI builds on [Github Actions](https://github.com/silkimen/cordova-plugin-advanced-http/actions).
 You can use this information to inspect failing tests in your PR.
-
-## Attribution
-This document is adapted from
-[AngularJS' Contribution Guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)

README.md

@@ -3,11 +3,8 @@ Cordova Advanced HTTP
 [![npm version](https://img.shields.io/npm/v/cordova-plugin-advanced-http)](https://www.npmjs.com/package/cordova-plugin-advanced-http?activeTab=versions)
 [![MIT Licence](https://img.shields.io/badge/license-MIT-blue?style=flat)](https://opensource.org/licenses/mit-license.php)
 [![downloads/month](https://img.shields.io/npm/dm/cordova-plugin-advanced-http.svg)](https://www.npmjs.com/package/cordova-plugin-advanced-http)
-
-[![Travis Build Status](https://img.shields.io/travis/com/silkimen/cordova-plugin-advanced-http/master?label=Travis%20CI)](https://app.travis-ci.com/silkimen/cordova-plugin-advanced-http)
 [![GitHub Build Status](https://img.shields.io/github/actions/workflow/status/silkimen/cordova-plugin-advanced-http/.github/workflows/ci.yml?branch=master)](https://github.com/silkimen/cordova-plugin-advanced-http/actions)
 
-
 Cordova / Phonegap plugin for communicating with HTTP servers.  Supports iOS, Android and [Browser](#browserSupport).
 
 This is a fork of [Wymsee's Cordova-HTTP plugin](https://github.com/wymsee/cordova-HTTP).
@@ -514,7 +511,6 @@ We made a few modifications to the networking libraries.
 This plugin uses amazing cloud services to maintain quality. CI Builds and E2E testing are powered by:
 
 * [GitHub Actions](https://github.com/features/actions)
-* [Travis CI](https://travis-ci.org/)
 * [BrowserStack](https://www.browserstack.com/)
 * [Sauce Labs](https://saucelabs.com/)
 * [httpbin.org](https://httpbin.org/)

package.json

@@ -7,6 +7,7 @@
     "build:browser": "./scripts/build-test-app.sh --browser",
     "build:android": "./scripts/build-test-app.sh --android --emulator",
     "build:ios": "./scripts/build-test-app.sh --ios --emulator",
+    "lint": "eslint . --ext .js",
     "test:android": "npm run update:cert && npm run build:android && ./scripts/test-app.sh --android --emulator",
     "test:ios": "npm run update:cert && npm run build:ios && ./scripts/test-app.sh --ios --emulator",
     "test:app": "npm run test:android && npm run test:ios",
@@ -61,9 +62,10 @@
     "chai": "4.3.6",
     "colors": "1.4.0",
     "cordova": "11.0.0",
+    "eslint": "^8.57.0",
     "mocha": "9.2.2",
     "umd-tough-cookie": "3.0.0",
     "wd": "1.14.0",
-    "xml2js": "0.4.23"
+    "xml2js": "0.5.0"
   }
 }

scripts/upload-browserstack.sh

@@ -17,13 +17,20 @@ if [ $PLATFORM = "android" ]; then
       -F "file=@$TEMP/platforms/android/app/build/outputs/apk/debug/app-debug.apk" \
       -F "data={\"custom_id\": \"HttpTestAppAndroid\"}"
 else
-  rm -rf $TEMP/HttpDemo.ipa
-  pushd $TEMP/platforms/ios/build/emulator
-  rm -rf ./Payload
-  mkdir -p ./Payload
-  cp -r ./HttpDemo.app ./Payload/HttpDemo.app
-  zip -r $TEMP/HttpDemo.ipa ./Payload
-  popd
+  rm -rf "$TEMP/HttpDemo.ipa"
+  IOS_BUILD_DIR="$TEMP/platforms/ios/build/Debug-iphonesimulator"
+  APP_PATH="$IOS_BUILD_DIR/HttpDemo.app"
+  if [ ! -d "$APP_PATH" ]; then
+    echo "Unable to locate $APP_PATH" >&2
+    exit 1
+  fi
+
+  PAYLOAD_DIR="$TEMP/Payload"
+  rm -rf "$PAYLOAD_DIR"
+  mkdir -p "$PAYLOAD_DIR"
+  cp -R "$APP_PATH" "$PAYLOAD_DIR/HttpDemo.app"
+  (cd "$TEMP" && zip -qr HttpDemo.ipa Payload)
+  rm -rf "$PAYLOAD_DIR"
 
   curl -u $BROWSERSTACK_USERNAME:$BROWSERSTACK_ACCESS_KEY \
       -X POST \

src/android/com/silkimen/cordovahttp/CordovaHttpBase.java

@@ -133,7 +133,6 @@ abstract class CordovaHttpBase implements Runnable {
     request.followRedirects(this.followRedirects);
     request.connectTimeout(this.connectTimeout);
     request.readTimeout(this.readTimeout);
-    request.acceptCharset("UTF-8");
     request.uncompress(true);
 
     if (this.tlsConfiguration.getHostnameVerifier() != null) {

src/android/com/silkimen/cordovahttp/CordovaServerTrust.java

@@ -71,7 +71,7 @@ class CordovaServerTrust implements Runnable {
         this.tlsConfiguration.setTrustManagers(this.noOpTrustManagers);
       } else if ("pinned".equals(this.mode)) {
         this.tlsConfiguration.setHostnameVerifier(null);
-        this.tlsConfiguration.setTrustManagers(this.getTrustManagers(this.getCertsFromBundle("www/certificates")));
+        this.tlsConfiguration.setTrustManagers(this.getTrustManagers(this.getCertsFromBundle(getWebAssetDir() + "/certificates")));
       } else {
         this.tlsConfiguration.setHostnameVerifier(null);
         this.tlsConfiguration.setTrustManagers(this.getTrustManagers(this.getCertsFromKeyStore("AndroidCAStore")));
@@ -84,6 +84,14 @@ class CordovaServerTrust implements Runnable {
     }
   }
 
+  private String getWebAssetDir() {
+    return isRunningOnCapacitor()? "public" : "www";
+  }
+
+  private  boolean isRunningOnCapacitor() {
+    return this.activity.getClass().getSuperclass().getName().contains("com.getcapacitor");
+  }
+
   private TrustManager[] getTrustManagers(KeyStore store) throws GeneralSecurityException {
     String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
     TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmfAlgorithm);

src/browser/cordova-http-plugin.js

@@ -193,7 +193,7 @@ function sendRequest(method, withData, opts, success, failure) {
   }
 
   switch (serializer) {
-    case 'json':
+    case 'json': {
       setDefaultContentType(headers, 'application/json; charset=utf8');
       processedData = serializeJsonData(data);
 
@@ -202,18 +202,21 @@ function sendRequest(method, withData, opts, success, failure) {
       }
 
       break;
+    }
 
-    case 'utf8':
+    case 'utf8': {
       setDefaultContentType(headers, 'text/plain; charset=utf8');
       processedData = data.text;
       break;
+    }
 
-    case 'urlencoded':
+    case 'urlencoded': {
       setDefaultContentType(headers, 'application/x-www-form-urlencoded');
       processedData = serializeParams(data);
       break;
+    }
 
-    case 'multipart':
+    case 'multipart': {
       const contentType = getHeaderValue(headers, 'Content-Type');
 
       // intentionally don't set a default content type
@@ -224,11 +227,13 @@ function sendRequest(method, withData, opts, success, failure) {
 
       processedData = processMultipartData(data);
       break;
+    }
 
-    case 'raw':
+    case 'raw': {
       setDefaultContentType(headers, 'application/octet-stream');
       processedData = data;
       break;
+    }
   }
 
   // requesting text instead of JSON because it's parsed in the response handler
@@ -283,7 +288,7 @@ function sendRequest(method, withData, opts, success, failure) {
   xhr.send(processedData);
 }
 
-function abort(opts, success, failure) {
+function abort(opts, success) {
   var reqId = opts[0];
   var result = false;
 
@@ -318,19 +323,19 @@ var browserInterface = {
   abort: function (success, failure, opts) {
     return abort(opts, success, failure);
   },
-  uploadFile: function (success, failure, opts) {
+  uploadFile: function (success, failure) {
     return failure('advanced-http: function "uploadFile" not supported on browser platform');
   },
-  uploadFiles: function (success, failure, opts) {
+  uploadFiles: function (success, failure) {
     return failure('advanced-http: function "uploadFiles" not supported on browser platform');
   },
-  downloadFile: function (success, failure, opts) {
+  downloadFile: function (success, failure) {
     return failure('advanced-http: function "downloadFile" not supported on browser platform');
   },
-  setServerTrustMode: function (success, failure, opts) {
+  setServerTrustMode: function (success, failure) {
     return failure('advanced-http: function "setServerTrustMode" not supported on browser platform');
   },
-  setClientAuthMode: function (success, failure, opts) {
+  setClientAuthMode: function (success, failure) {
     return failure('advanced-http: function "setClientAuthMode" not supported on browser platform');
   }
 };

src/ios/SM_AFNetworking/SM_AFSecurityPolicy.m

@@ -155,8 +155,18 @@ static NSArray * AFPublicKeyTrustChainForServerTrust(SecTrustRef serverTrust) {
 
 @implementation SM_AFSecurityPolicy
 
++(BOOL) isRunningOnCapacitor {
+    return NSClassFromString(@"CAPPlugin") != nil;
+}
+
 + (NSSet *)certificatesInBundle:(NSBundle *)bundle {
-    NSArray *paths = [bundle pathsForResourcesOfType:@"cer" inDirectory:@"www/certificates"];
+    NSString* assetDir = @"www";
+    if([self isRunningOnCapacitor]) {
+        // we are running on capacitor and its assets dir is 'public'
+        assetDir = @"public";
+    }
+    
+    NSArray *paths = [bundle pathsForResourcesOfType:@"cer" inDirectory: [NSString stringWithFormat:@"%@/certificates", assetDir]];
     NSMutableSet *certificates = [NSMutableSet setWithCapacity:[paths count]];
 
     for (NSString *path in paths) {
@@ -171,7 +181,7 @@ static NSArray * AFPublicKeyTrustChainForServerTrust(SecTrustRef serverTrust) {
     static NSSet *_defaultPinnedCertificates = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+        NSBundle *bundle = [self isRunningOnCapacitor] ? [NSBundle mainBundle] : [NSBundle bundleForClass:[self class]];
         _defaultPinnedCertificates = [self certificatesInBundle:bundle];
     });
 

test/e2e-app-template/package.json

@@ -10,10 +10,10 @@
   "author": "Sefa Ilkimen",
   "license": "Apache-2.0",
   "dependencies": {
-    "cordova": "11.0.0",
-    "cordova-android": "10.1.1",
-    "cordova-browser": "6.0.0",
-    "cordova-ios": "6.2.0",
+    "cordova": "12.0.0",
+    "cordova-android": "12.0.1",
+    "cordova-browser": "7.0.0",
+    "cordova-ios": "7.1.1",
     "cordova-plugin-device": "2.0.3"
   },
   "cordova": {
@@ -26,4 +26,4 @@
       "cordova-plugin-device": {}
     }
   }
-}
+}

test/e2e-app-template/www/index.js

@@ -1,3 +1,5 @@
+/* global hooks, tests */
+
 const app = {
   testIndex: -1,
 

test/e2e-specs.js

@@ -1,3 +1,5 @@
+/* global cordova, resolveLocalFileSystemURL, should */
+
 const hooks = {
   onBeforeEachTest: function (resolve, reject) {
     cordova.plugin.http.clearCookies();
@@ -92,12 +94,12 @@ const helpers = {
     // abort is not working reliably; will be documented in known issues
     return false;
 
-    if (window.cordova && window.cordova.platformId === 'android') {
-      var version = device.version; // NOTE will throw error if cordova is present without cordova-plugin-device
-      var major = parseInt(/^(\d+)(\.|$)/.exec(version)[1], 10);
-      return isFinite(major) && major >= 6;
-    }
-    return true;
+    // if (window.cordova && window.cordova.platformId === 'android') {
+    //   var version = device.version; // NOTE will throw error if cordova is present without cordova-plugin-device
+    //   var major = parseInt(/^(\d+)(\.|$)/.exec(version)[1], 10);
+    //   return isFinite(major) && major >= 6;
+    // }
+    // return true;
   },
   getAbortDelay: function () { return 0; },
   getDemoArrayBuffer: function(size) {
@@ -117,7 +119,6 @@ const helpers = {
 };
 
 const messageFactory = {
-  handshakeFailed: function() { return 'TLS connection could not be established: javax.net.ssl.SSLHandshakeException: Handshake failed' },
   sslTrustAnchor: function () { return 'TLS connection could not be established: javax.net.ssl.SSLHandshakeException: java.security.cert.CertPathValidatorException: Trust anchor for certification path not found.' },
   invalidCertificate: function (domain) { return 'The certificate for this server is invalid. You might be connecting to a server that is pretending to be “' + domain + '” which could put your confidential information at risk.' }
 }
@@ -230,7 +231,7 @@ const tests = [
   },
   {
     description: 'should send JSON object correctly (POST)',
-    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
+    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}" ...',
     before: helpers.setJsonSerializer,
     func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
     validationFunc: function (driver, result) {
@@ -240,7 +241,7 @@ const tests = [
   },
   {
     description: 'should send JSON object correctly (PUT)',
-    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
+    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}" ...',
     before: helpers.setJsonSerializer,
     func: function (resolve, reject) { cordova.plugin.http.put('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
     validationFunc: function (driver, result) {
@@ -250,7 +251,7 @@ const tests = [
   },
   {
     description: 'should send JSON object correctly (PATCH)',
-    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
+    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}" ...',
     before: helpers.setJsonSerializer,
     func: function (resolve, reject) { cordova.plugin.http.patch('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
     validationFunc: function (driver, result) {
@@ -260,7 +261,7 @@ const tests = [
   },
   {
     description: 'should send JSON array correctly (POST) #26',
-    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]\" ...',
+    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]" ...',
     before: helpers.setJsonSerializer,
     func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', [1, 2, 3], {}, resolve, reject); },
     validationFunc: function (driver, result) {
@@ -270,7 +271,7 @@ const tests = [
   },
   {
     description: 'should send JSON array correctly (PUT) #26',
-    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]\" ...',
+    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]" ...',
     before: helpers.setJsonSerializer,
     func: function (resolve, reject) { cordova.plugin.http.put('http://httpbin.org/anything', [1, 2, 3], {}, resolve, reject); },
     validationFunc: function (driver, result) {
@@ -280,7 +281,7 @@ const tests = [
   },
   {
     description: 'should send JSON array correctly (PATCH) #26',
-    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]\" ...',
+    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]" ...',
     before: helpers.setJsonSerializer,
     func: function (resolve, reject) { cordova.plugin.http.patch('http://httpbin.org/anything', [1, 2, 3], {}, resolve, reject); },
     validationFunc: function (driver, result) {
@@ -291,7 +292,7 @@ const tests = [
   },
   {
     description: 'should send url encoded data correctly (POST) #41',
-    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}\" ...',
+    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}" ...',
     before: helpers.setUrlEncodedSerializer,
     func: function (resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
     validationFunc: function (driver, result) {
@@ -301,7 +302,7 @@ const tests = [
   },
   {
     description: 'should send url encoded data correctly (PUT)',
-    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}\" ...',
+    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}" ...',
     before: helpers.setUrlEncodedSerializer,
     func: function (resolve, reject) { cordova.plugin.http.put('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
     validationFunc: function (driver, result) {
@@ -311,7 +312,7 @@ const tests = [
   },
   {
     description: 'should send url encoded data correctly (PATCH)',
-    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}\" ...',
+    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}" ...',
     before: helpers.setUrlEncodedSerializer,
     func: function (resolve, reject) { cordova.plugin.http.patch('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
     validationFunc: function (driver, result) {
@@ -331,7 +332,10 @@ const tests = [
   {
     description: 'should not follow 302 redirect when following redirects is disabled',
     expected: 'rejected: {"status": 302, ...',
-    before: function (resolve, reject) { cordova.plugin.http.setFollowRedirect(false); resolve(); },
+    before: function (resolve) {
+      cordova.plugin.http.setFollowRedirect(false);
+      resolve();
+    },
     func: function (resolve, reject) { cordova.plugin.http.get('http://httpbingo.org/redirect-to?url=http://httpbingo.org/anything', {}, {}, resolve, reject); },
     validationFunc: function (driver, result) {
       result.type.should.be.equal('rejected');
@@ -428,7 +432,7 @@ const tests = [
   },
   {
     description: 'should encode HTTP array params correctly (GET) #45',
-    expected: 'resolved: {"status": 200, "data": "{\\"url\\":\\"http://httpbin.org/get?myArray[]=val1&myArray[]=val2&myArray[]=val3\\"}\" ...',
+    expected: 'resolved: {"status": 200, "data": "{\\"url\\":\\"http://httpbin.org/get?myArray[]=val1&myArray[]=val2&myArray[]=val3\\"}" ...',
     func: function (resolve, reject) {
       cordova.plugin.http.get('http://httpbin.org/get', { myArray: ['val1', 'val2', 'val3'], myString: 'testString' }, {}, resolve, reject);
     },
@@ -456,8 +460,9 @@ const tests = [
   {
     description: 'should throw an error while setting non-string value as global header #54',
     expected: 'throwed: "advanced-http: header values must be strings"',
-    func: function (resolve, reject) {
+    func: function (resolve) {
       cordova.plugin.http.setHeader('myTestHeader', 2);
+      resolve();
     },
     validationFunc: function (driver, result) {
       result.type.should.be.equal('throwed');
@@ -496,7 +501,7 @@ const tests = [
   },
   {
     description: 'should not send programmatically set cookies after running "clearCookies" (GET) #59',
-    expected: 'resolved: {"status": 200, "data": "{\"headers\": {\"Cookie\": \"\"...',
+    expected: 'resolved: {"status": 200, "data": "{"headers": {"Cookie": ""...',
     func: function (resolve, reject) {
       cordova.plugin.http.setCookie('http://httpbin.org/get', 'myCookie=myValue');
       cordova.plugin.http.setCookie('http://httpbin.org/get', 'mySecondCookie=mySecondValue');
@@ -612,7 +617,9 @@ const tests = [
     },
     validationFunc: function (driver, result, targetInfo) {
       result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -2, error: targetInfo.isAndroid ? messageFactory.sslTrustAnchor() : messageFactory.invalidCertificate('sha512.badssl.com') });
+      result.data.status.should.be.equal(-2);
+      result.data.error.should.include(targetInfo.isAndroid ? 'javax.net.ssl.SSLHandshakeException' : 'The certificate for this server is invalid');
+      // result.data.should.be.eql({ status: -2, error: targetInfo.isAndroid ? messageFactory.s^slTrustAnchor() : messageFactory.invalidCertificate('sha512.badssl.com') });
     }
   },
   {
@@ -1010,7 +1017,7 @@ const tests = [
   },
   {
     description: 'should not send any cookies after running "clearCookies" (GET) #248',
-    expected: 'resolved: {"status": 200, "data": "{\"cookies\":{}} ...',
+    expected: 'resolved: {"status": 200, "data": "{"cookies":{}} ...',
     before: helpers.disableFollowingRedirect,
     func: function (resolve, reject) {
       cordova.plugin.http.get('https://httpbin.org/cookies/set?myCookieKey=myCookieValue', {}, {}, function () {
@@ -1175,7 +1182,8 @@ const tests = [
     },
     validationFunc: function (driver, result) {
       result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -2, error: messageFactory.handshakeFailed() });
+      result.data.status.should.be.equal(-2);
+      result.data.error.should.include('UNSUPPORTED_PROTOCOL');
     }
   },
 ];

test/e2e-tooling/caps.js

@@ -60,6 +60,7 @@ const configs = {
 
   // testing on BrowserStack
   browserstackIosDevice: {
+    'appium-version': '1.22.0',
     device: 'iPhone 12',
     os_version: '14',
     project: 'HTTP Test App',
@@ -68,8 +69,9 @@ const configs = {
     'browserstack.networkLogs': false
   },
   browserstackAndroidDevice: {
-    device: 'Google Nexus 6',
-    os_version: '6.0',
+    'appium-version': '1.22.0',
+    device: 'Samsung Galaxy S22 Ultra',
+    os_version: '12.0',
     project: 'HTTP Test App',
     autoWebview: true,
     app: 'HttpTestAppAndroid',
@@ -84,7 +86,7 @@ function getCaps(environment, os, runtime) {
   caps.name = `cordova-plugin-advanced-http (${os})`;
 
   return caps;
-};
+}
 
 function capitalize(text) {
   return text.charAt(0).toUpperCase() + text.slice(1).toLowerCase();

test/e2e-tooling/test.js

@@ -98,7 +98,7 @@ async function validateTestIndex(driver, testIndex) {
 
 async function validateTestTitle(driver, testTitle) {
   const description = await driver.elementById('descriptionLbl').text();
-  const title = description.match(/\d+:\ (.*)/)[1];
+  const title = description.match(/\d+: (.*)/)[1];
 
   title.should.be.equal(testTitle, 'Test description is not matching!');
 }
@@ -106,6 +106,7 @@ async function validateTestTitle(driver, testTitle) {
 async function waitToBeFinished(driver, timeout) {
   const timeoutTimestamp = Date.now() + timeout;
 
+  // eslint-disable-next-line no-constant-condition
   while (true) {
     if (await driver.elementById('statusInput').getValue() === 'finished') {
       return true;

test/js-specs.js

@@ -536,7 +536,7 @@ describe('Common helpers', function () {
         null,
         (response) => {
           response.status.should.be.equal(errorCodes.POST_PROCESSING_FAILED);
-          response.error.should.include('Unexpected token N in JSON at position 0');
+          response.error.should.include('Unexpected token');
         }
       );
 

test/mocks/File.mock.js

@@ -3,7 +3,7 @@ const BlobMock = require('./Blob.mock');
 module.exports = class FileMock extends BlobMock {
   constructor(blob, fileName) {
     super(blob, { type: blob.type });
-    this._fileName = fileName !== undefined ? fileName : 'blob';
+    this._fileName = fileName !== undefined ? fileName : 'blob';
     this.__lastModifiedDate = new Date();
   }
 

www/helpers.js

@@ -1,3 +1,5 @@
+/* global FileSystem */
+
 module.exports = function init(global, jsUtil, cookieHandler, messages, base64, errorCodes, dependencyValidator, ponyfills) {
   var validSerializers = ['urlencoded', 'json', 'utf8', 'raw', 'multipart'];
   var validCertModes = ['default', 'nocheck', 'pinned', 'legacy'];
@@ -66,7 +68,7 @@ module.exports = function init(global, jsUtil, cookieHandler, messages, base64,
     for (var i = 0; i < globalKeys.length; i++) {
       key = globalKeys[i];
 
-      if (!localHeaders.hasOwnProperty(key)) {
+      if (!Object.prototype.hasOwnProperty.call(localHeaders, key)) {
         localHeaders[key] = globalHeaders[key];
       }
     }
@@ -361,7 +363,7 @@ module.exports = function init(global, jsUtil, cookieHandler, messages, base64,
   }
 
   function getMatchingHostHeaders(url, headersList) {
-    var matches = url.match(/^https?\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
+    var matches = url.match(/^https?:\/\/([^/?#]+)(?:[/?#]|$)/i);
     var domain = matches && matches[1];
 
     return headersList[domain] || null;

www/local-storage-store.js

@@ -164,13 +164,15 @@ module.exports = function init(ToughCookie, _) {
   WebStorageCookieStore.prototype._readStore = function () {
     var json = this._storage.getItem(this._storeKey);
 
-    if (json !== null) {
-      try {
-        return JSON.parse(json);
-      } catch (e) { }
+    if (json === null) {
+      return {};
     }
 
-    return {};
+    try {
+      return JSON.parse(json);
+    } catch (e) {
+      return {};
+    }
   };
 
   WebStorageCookieStore.prototype._writeStore = function (store) {

www/public-interface.js

@@ -197,7 +197,7 @@ module.exports = function init(exec, cookieHandler, urlUtil, helpers, globalConf
 
   function post(url, data, headers, success, failure) {
     return publicInterface.sendRequest(url, { method: 'post', data: data, headers: headers }, success, failure);
-  };
+  }
 
   function put(url, data, headers, success, failure) {
     return publicInterface.sendRequest(url, { method: 'put', data: data, headers: headers }, success, failure);
@@ -209,7 +209,7 @@ module.exports = function init(exec, cookieHandler, urlUtil, helpers, globalConf
 
   function get(url, params, headers, success, failure) {
     return publicInterface.sendRequest(url, { method: 'get', params: params, headers: headers }, success, failure);
-  };
+  }
 
   function del(url, params, headers, success, failure) {
     return publicInterface.sendRequest(url, { method: 'delete', params: params, headers: headers }, success, failure);
@@ -221,7 +221,7 @@ module.exports = function init(exec, cookieHandler, urlUtil, helpers, globalConf
 
   function options(url, params, headers, success, failure) {
     return publicInterface.sendRequest(url, { method: 'options', params: params, headers: headers }, success, failure);
-  };
+  }
 
   function uploadFile(url, params, headers, filePath, name, success, failure) {
     return publicInterface.sendRequest(url, { method: 'upload', params: params, headers: headers, filePath: filePath, name: name }, success, failure);

www/url-util.js

@@ -6,7 +6,7 @@ module.exports = function init(jsUtil) {
   }
 
   function parseUrl(url) {
-    var match = url.match(/^(https?\:)\/\/(([^:\/?#]*)(?:\:([0-9]+))?)([\/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
+    var match = url.match(/^(https?:)\/\/(([^:/?#]*)(?::([0-9]+))?)([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
 
     return match && {
         protocol: match[1],
@@ -42,7 +42,7 @@ module.exports = function init(jsUtil) {
     var parts = [];
 
     for (var key in object) {
-      if (!object.hasOwnProperty(key)) {
+      if (!Object.prototype.hasOwnProperty.call(object, key)) {
         continue;
       }