Allow for variable timeout #49

Author: EddyVerbruggen

README.md

@@ -65,6 +65,7 @@ import * as Https from 'nativescript-https'
 Https.request({
 	url: 'https://httpbin.org/get',
 	method: 'GET',
+	timeout: 30 // seconds (default 10)
 }).then(function(response) {
 	console.log('Https.request response', response)
 }).catch(function(error) {

demo/app/app.ts

@@ -1,3 +1,3 @@
 import * as application from 'tns-core-modules/application';
 
-application.start({moduleName: "main-page"});
+application.run({moduleName: "main-page"});

demo/app/main-page.ts

@@ -1,8 +1,8 @@
+import * as Https from 'nativescript-https';
 import * as Observable from 'tns-core-modules/data/observable';
-import * as Page from 'tns-core-modules/ui/page';
 import * as fs from 'tns-core-modules/file-system';
 import * as dialogs from 'tns-core-modules/ui/dialogs';
-import * as Https from 'nativescript-https';
+import * as Page from 'tns-core-modules/ui/page';
 
 export function onNavigatingTo(args: Page.NavigatedData) {
   let page = args.object as Page.Page;
@@ -14,6 +14,7 @@ function getRequest(url: string, allowLargeResponse = false) {
       {
         url,
         method: 'GET',
+        timeout: 1,
         allowLargeResponse
       })
       .then(response => console.log('Https.request response', response))
@@ -57,22 +58,19 @@ export function enableSSLPinning(args: Observable.EventData) {
   let dir = fs.knownFolders.currentApp().getFolder('assets');
   let certificate = dir.getFile('httpbin.org.cer').path;
   Https.enableSSLPinning({host: 'httpbin.org', certificate});
-  let context = (args.object as Page.View).bindingContext as Observable.Observable;
-  context.set('enabled', true);
+  console.log('enabled');
 }
 
 export function enableSSLPinningExpired(args: Observable.EventData) {
   let dir = fs.knownFolders.currentApp().getFolder('assets');
   let certificate = dir.getFile('httpbin.org.expired.cer').path;
   Https.enableSSLPinning({host: 'httpbin.org', certificate});
-  let context = (args.object as Page.View).bindingContext as Observable.Observable;
-  context.set('enabled', true);
+  console.log('enabled');
 }
 
 export function disableSSLPinning(args: Observable.EventData) {
   Https.disableSSLPinning();
-  let context = (args.object as Page.View).bindingContext as Observable.Observable;
-  context.set('enabled', false);
+  console.log('disabled');
 }
 
 

demo/nsconfig.json

@@ -1,3 +1 @@
-{
-	"useLegacyWorkflow": false
-}
+{}

demo/package.json

@@ -2,29 +2,29 @@
   "nativescript": {
     "id": "org.nativescript.plugindemo.https",
     "tns-android": {
-      "version": "5.4.0"
+      "version": "6.1.1"
     },
     "tns-ios": {
-      "version": "5.4.0"
+      "version": "6.1.1"
     }
   },
   "dependencies": {
     "nativescript-https": "file:../src",
     "nativescript-theme-core": "^1.0.4",
-    "nativescript-unit-test-runner": "^0.3.4",
-    "tns-core-modules": "~5.4.0"
+    "nativescript-unit-test-runner": "0.7.0",
+    "tns-core-modules": "~6.1.1"
   },
   "devDependencies": {
     "jasmine-core": "^2.5.2",
-    "karma": "^1.3.0",
-    "karma-jasmine": "^1.0.2",
+    "karma": "4.1.0",
+    "karma-jasmine": "2.0.1",
     "karma-nativescript-launcher": "^0.4.0",
     "nativescript-css-loader": "~0.26.1",
-    "nativescript-dev-typescript": "~0.7.4",
-    "nativescript-dev-webpack": "0.24.1",
-    "tns-platform-declarations": "~5.4.0",
+    "nativescript-dev-webpack": "1.0.1",
+    "tns-platform-declarations": "~6.1.1",
     "tslint": "~5.11.0",
-    "typescript": "~2.9.0"
+    "typescript": "3.4.5",
+    "karma-webpack": "3.0.5"
   },
   "scripts": {
     "build.plugin": "cd ../src && npm run build",

demo/tsconfig.tns.json

@@ -1,7 +1,7 @@
 {
-  "extends": "./tsconfig",
-  "compilerOptions": {
-    "module": "es2015",
-    "moduleResolution": "node"
-  }
+    "extends": "./tsconfig",
+    "compilerOptions": {
+        "module": "es2015",
+        "moduleResolution": "node"
+    }
 }

demo/webpack.config.js

@@ -28,7 +28,6 @@ module.exports = env => {
 
     // Default destination inside platforms/<platform>/...
     const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
-    const appResourcesPlatformDir = platform === "android" ? "Android" : "iOS";
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
@@ -39,12 +38,14 @@ module.exports = env => {
 
         // You can provide the following flags when running 'tns run android|ios'
         snapshot, // --env.snapshot
+        production, // --env.production
         uglify, // --env.uglify
         report, // --env.report
         sourceMap, // --env.sourceMap
         hiddenSourceMap, // --env.hiddenSourceMap
         hmr, // --env.hmr,
-        unitTesting, // --env.unitTesting
+        unitTesting, // --env.unitTesting,
+        verbose, // --env.verbose
     } = env;
     const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap;
     const externals = nsWebpack.getConvertedExternals(env.externals);
@@ -58,14 +59,22 @@ module.exports = env => {
 
     const tsConfigPath = resolve(projectRoot, "tsconfig.tns.json");
 
-    if (platform === "ios") {
-        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+    const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+    if (platform === "ios" && !areCoreModulesExternal) {
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
     };
 
     let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist);
 
+    const itemsToClean = [`${dist}/**/*`];
+    if (platform === "android") {
+        itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "src", "main", "assets", "snapshots")}`);
+        itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
+    }
+
+    nsWebpack.processAppComponents(appComponents, platform);
     const config = {
-        mode: uglify ? "production" : "development",
+        mode: production ? "production" : "development",
         context: appFullPath,
         externals,
         watchOptions: {
@@ -170,24 +179,15 @@ module.exports = env => {
                                 unitTesting,
                                 appFullPath,
                                 projectRoot,
+                                ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform)
                             }
                         },
                     ].filter(loader => !!loader)
                 },
 
                 {
-                    test: /-page\.ts$/,
-                    use: "nativescript-dev-webpack/script-hot-loader"
-                },
-
-                {
-                    test: /\.(css|scss)$/,
-                    use: "nativescript-dev-webpack/style-hot-loader"
-                },
-
-                {
-                    test: /\.(html|xml)$/,
-                    use: "nativescript-dev-webpack/markup-hot-loader"
+                    test: /\.(ts|css|scss|html|xml)$/,
+                    use: "nativescript-dev-webpack/hmr/hot-loader"
                 },
 
                 { test: /\.(html|xml)$/, use: "nativescript-dev-webpack/xml-namespace-loader" },
@@ -228,28 +228,18 @@ module.exports = env => {
             // Define useful constants like TNS_WEBPACK
             new webpack.DefinePlugin({
                 "global.TNS_WEBPACK": "true",
-                "process": undefined,
+                "process": "global.process",
             }),
             // Remove all files from the out dir.
-            new CleanWebpackPlugin([`${dist}/**/*`]),
+            new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }),
             // Copy assets to out dir. Add your own globs as needed.
             new CopyWebpackPlugin([
                 { from: { glob: "fonts/**" } },
                 { from: { glob: "**/*.jpg" } },
                 { from: { glob: "**/*.png" } },
                 { from: { glob: "assets/*.cer" } },
             ], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }),
-            // Generate a bundle starter script and activate it in package.json
-            new nsWebpack.GenerateBundleStarterPlugin(
-                // Don't include `runtime.js` when creating a snapshot. The plugin
-                // configures the WebPack runtime to be generated inside the snapshot
-                // module and no `runtime.js` module exist.
-                (snapshot ? [] : ["./runtime"])
-                    .concat([
-                        "./vendor",
-                        "./bundle",
-                    ])
-            ),
+            new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"),
             // For instructions on how to set up workers with webpack
             // check out https://github.com/nativescript/worker-loader
             new NativeScriptWorkerPlugin(),
@@ -270,18 +260,6 @@ module.exports = env => {
         ],
     };
 
-    // Copy the native app resources to the out dir
-    // only if doing a full build (tns run/build) and not previewing (tns preview)
-    if (!externals || externals.length === 0) {
-        config.plugins.push(new CopyWebpackPlugin([
-            {
-                from: `${appResourcesFullPath}/${appResourcesPlatformDir}`,
-                to: `${dist}/App_Resources/${appResourcesPlatformDir}`,
-                context: projectRoot
-            },
-        ]));
-    }
-
     if (report) {
         // Generate report files for bundles content
         config.plugins.push(new BundleAnalyzerPlugin({

src/https.android.ts

@@ -62,7 +62,7 @@ console.info('nativescript-https > Disabled SSL pinning by default');
 
 let Client: okhttp3.OkHttpClient;
 
-function getClient(reload: boolean = false): okhttp3.OkHttpClient {
+function getClient(reload: boolean = false, timeout: number = 10): okhttp3.OkHttpClient {
   // if (!Client) {
   // 	Client = new okhttp3.OkHttpClient()
   // }
@@ -139,6 +139,15 @@ function getClient(reload: boolean = false): okhttp3.OkHttpClient {
       console.warn('nativescript-https > Undefined host or certificate. SSL pinning NOT working!!!');
     }
   }
+
+  // set connection timeout to override okhttp3 default
+  if (timeout) {
+    client
+        .connectTimeout(timeout, java.util.concurrent.TimeUnit.SECONDS)
+        .writeTimeout(timeout, java.util.concurrent.TimeUnit.SECONDS)
+        .readTimeout(timeout, java.util.concurrent.TimeUnit.SECONDS);
+  }
+
   Client = client.build();
   return Client;
 }
@@ -179,22 +188,12 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
         ));
       }
 
-
       // We have to allow networking on the main thread because larger responses will crash the app with an NetworkOnMainThreadException.
       // Note that it would probably be better to offload it to a Worker or (natively running) AsyncTask.
       // Also note that once set, this policy remains active until the app is killed.
       if (opts.allowLargeResponse) {
         android.os.StrictMode.setThreadPolicy(android.os.StrictMode.ThreadPolicy.LAX);
       }
-	  
-	  //set connection timeout to override okhttp3 default
-      if (opts.timeout) {
-                client = client.newBuilder()
-                .connectTimeout(opts.timeout, java.util.concurrent.TimeUnit.MILLISECONDS)
-                .writeTimeout(opts.timeout, java.util.concurrent.TimeUnit.MILLISECONDS)
-                .readTimeout(opts.timeout, java.util.concurrent.TimeUnit.MILLISECONDS)
-                .build();
-            }
 
       client.newCall(request.build()).enqueue(new okhttp3.Callback({
         onResponse: (task, response) => {

src/https.common.ts

@@ -23,6 +23,9 @@ export interface HttpsRequestOptions {
    * Note that once set to true, this policy remains active until the app is killed.
    */
   allowLargeResponse?: boolean;
+  /**
+   * Default 10 (seconds).
+   */
   timeout?: number;
 }
 

src/https.ios.ts

@@ -151,7 +151,6 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
       }
       manager.requestSerializer.allowsCellularAccess = true;
       manager.securityPolicy = (policies.secured === true) ? policies.secure : policies.def;
-      manager.requestSerializer.timeoutInterval = 10;
 
       let heads = opts.headers;
       if (heads) {
@@ -166,10 +165,8 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
           Object.keys(cont).forEach(key => dict.setValueForKey(cont[key] as any, key));
         }
       }
-	  
-	  if (opts.timeout) {
-          manager.requestSerializer.timeoutInterval = opts.timeout / 1000;
-      }
+
+      manager.requestSerializer.timeoutInterval = opts.timeout ? opts.timeout : 10;
 
       let methods = {
         'GET': 'GETParametersSuccessFailure',