Merge pull request #13 from sebj54/master

iOS - Add debug mode + emit events without data

Author: farfromrefug

README.md

@@ -87,7 +87,7 @@ The custom `NSURLProtocol` used with UIWebView is shared with all instances of t
 | builtInZoomControls | true / false | Android: Is the built-in zoom mechanisms being used |
 | cacheMode | default / no_cache / cache_first / cache_only | Android: Set caching mode. |
 | databaseStorage | true / false | Android: Enable/Disabled database storage API. Note: It affects all webviews in the process. |
-| debugMode | true / false | Android: Enable chrome debugger for webview on Android. Note: Applies to all webviews in App |
+| debugMode | true / false | Enable chrome debugger for webview on Android and Safari debugger for webview on iOS. Note: Applies to all webviews in App |
 | displayZoomControls | true / false | Android: displays on-screen zoom controls when using the built-in zoom mechanisms |
 | domStorage | true / false | Android: Enable/Disabled DOM Storage API. E.g localStorage |
 | scalesPageToFit | UIWebView: Should webpage scale to fit the view? Defaults to false |

src/webview/index.common.ts

@@ -103,12 +103,6 @@ export const isScrollEnabledProperty = new Property<WebViewExtBase, boolean>({
     valueConverter: booleanConverter
 });
 
-export const normalizeUrlsProperty = new Property<WebViewExtBase, boolean>({
-    name: 'normalizeUrls',
-    defaultValue: true,
-    valueConverter: booleanConverter
-});
-
 export const limitsNavigationsToAppBoundDomainsProperty = new Property<WebViewExtBase, boolean>({
     name: 'limitsNavigationsToAppBoundDomains',
     valueConverter: booleanConverter
@@ -389,7 +383,6 @@ export class UnsupportedSDKError extends Error {
 @CSSType('WebView')
 export abstract class WebViewExtBase extends ContainerView {
     public webConsoleEnabled: boolean;
-    public normalizeUrls: boolean;
 
     public static readonly supportXLocalScheme: boolean;
 
@@ -551,7 +544,6 @@ export abstract class WebViewExtBase extends ContainerView {
      * Callback for the loadFinished-event. Called from the native-webview
      */
     public async _onLoadFinished(url: string, error?: string): Promise<LoadFinishedEventData> {
-        url = this.normalizeURL(url);
         if (Trace.isEnabled()) {
             Trace.write(`WebViewExt._onLoadFinished("${url}", ${error || void 0} ${this.autoInjectJSBridge}) - > Injecting webview-bridge JS code`, WebViewTraceCategory, Trace.messageType.info);
         }
@@ -857,8 +849,6 @@ export abstract class WebViewExtBase extends ContainerView {
         }
 
         if (lcSrc.startsWith(this.interceptScheme) || lcSrc.startsWith('http://') || lcSrc.startsWith('https://') || lcSrc.startsWith('file:///')) {
-            src = this.normalizeURL(src);
-
             if (originSrc !== src) {
                 // Make sure the src-property reflects the actual value.
                 try {
@@ -1115,17 +1105,6 @@ export abstract class WebViewExtBase extends ContainerView {
         this.autoInjectJavaScriptBlocks = this.autoInjectJavaScriptBlocks.filter((data) => data.name !== name);
     }
 
-    public normalizeURL(url: string): string {
-        if (!url || !this.normalizeUrls || url.startsWith(this.interceptScheme)) {
-            return url;
-        }
-        try {
-            return require('url').parse(url).format();
-        } catch (error) {
-            return url;
-        }
-    }
-
     /**
      * Ensure fetch-api is available.
      */
@@ -1588,7 +1567,6 @@ cacheModeProperty.register(WebViewExtBase);
 databaseStorageProperty.register(WebViewExtBase);
 debugModeProperty.register(WebViewExtBase);
 webConsoleProperty.register(WebViewExtBase);
-normalizeUrlsProperty.register(WebViewExtBase);
 displayZoomControlsProperty.register(WebViewExtBase);
 domStorageProperty.register(WebViewExtBase);
 srcProperty.register(WebViewExtBase);

src/webview/index.ios.ts

@@ -7,6 +7,7 @@ import {
     WebViewTraceCategory,
     allowsInlineMediaPlaybackProperty,
     autoInjectJSBridgeProperty,
+    debugModeProperty,
     limitsNavigationsToAppBoundDomainsProperty,
     mediaPlaybackRequiresUserActionProperty,
     scrollBarIndicatorVisibleProperty,
@@ -406,6 +407,16 @@ export class AWebView extends WebViewExtBase {
         this.loadWKUserScripts(enabled);
     }
 
+    [debugModeProperty.getDefault]() {
+        return false;
+    }
+
+    [debugModeProperty.setNative](enabled) {
+        const nativeView = this.nativeViewProtected;
+
+        nativeView.inspectable = !!enabled;
+    }
+
     [scrollBounceProperty.getDefault]() {
         const nativeView = this.nativeViewProtected;
 
@@ -747,7 +758,13 @@ export class WKScriptMessageHandlerNotaImpl extends NSObject implements WKScript
 
         try {
             const message = JSON.parse(webViewMessage.body as string);
-            owner.onWebViewEvent(message.eventName, JSON.parse(message.data));
+
+            try {
+                owner.onWebViewEvent(message.eventName, JSON.parse(message.data));
+            } catch (err) {
+                owner.writeTrace(`userContentControllerDidReceiveScriptMessage(${userContentController}, ${webViewMessage}) - couldn't parse data: ${message.data}`, Trace.messageType.error);
+                owner.onWebViewEvent(message.eventName, message.data);
+            }
         } catch (err) {
             owner.writeTrace(`userContentControllerDidReceiveScriptMessage(${userContentController}, ${webViewMessage}) - bad message: ${webViewMessage.body}`, Trace.messageType.error);
         }