adds mimetype for html

Author: m-abs

native-src/ios/NotaWebViewExt/NotaWebViewExt/Constants.swift

@@ -11,6 +11,10 @@ import Foundation
 struct Constants {
     static let customURLScheme = "x-local"
     static let mimeType: [String: String] = [
+        "html": "text/html",
+        "htm": "text/html",
+        "xhtml": "text/html",
+        "xhtm": "text/html",
         "css": "text/css",
         "gif": "image/gif",
         "jpeg": "image/jpeg",

src/webview-ext-common.ts

@@ -298,7 +298,7 @@ export class WebViewExtBase extends View {
                 this.writeTrace(`WebViewExt.src = "${originSrc}" x-local resolved to "${src}"`);
             } else {
                 this.writeTrace(`WebViewExt.src = "${originSrc}" x-local couldn't resolve to file`, traceMessageType.error);
-                this._onLoadFinished(src, 'unknown x-local-resource');
+                this._onLoadFinished(src, 'unknown x-local-resource').catch(() => void 0);
                 return;
             }
         }

src/webview-ext.android.ts

@@ -15,21 +15,17 @@ export declare namespace dk {
             class WebViewBridgeInterface extends java.lang.Object {
                 public owner?: WebViewExt;
 
-                emitEventToNativeScript(eventName: string, data: string): void;
+                public emitEventToNativeScript(eventName: string, data: string): void;
             }
         }
     }
 }
-export interface AndroidWebViewClient extends android.webkit.WebViewClient {
-    owner?: WebViewExt;
-}
-
-export interface AndroidWebView extends android.webkit.WebView {
-    client?: AndroidWebViewClient;
-    bridgeInterface?: dk.nota.webviewinterface.WebViewBridgeInterface;
-}
 
 const extToMimeType = new Map<string, string>([
+    ['html', 'text/html'],
+    ['htm', 'text/html'],
+    ['xhtml', 'text/html'],
+    ['xhtm', 'text/html'],
     ['css', 'text/css'],
     ['gif', 'image/gif'],
     ['jpeg', 'image/jpeg'],
@@ -51,6 +47,15 @@ const extToBinaryEncoding = new Set<string>([
 ]);
 
 //#region android_native_classes
+export interface AndroidWebViewClient extends android.webkit.WebViewClient {
+    owner?: WebViewExt;
+}
+
+export interface AndroidWebView extends android.webkit.WebView {
+    client?: AndroidWebViewClient;
+    bridgeInterface?: dk.nota.webviewinterface.WebViewBridgeInterface;
+}
+
 let WebViewExtClient: new () => AndroidWebViewClient;
 let WebViewBridgeInterface: new () => dk.nota.webviewinterface.WebViewBridgeInterface;
 function initializeWebViewClient(): void {
@@ -181,7 +186,7 @@ function initializeWebViewClient(): void {
             }
 
             owner.writeTrace(`WebViewClientClass.onPageFinished("${url}")`);
-            owner._onLoadFinished(url);
+            owner._onLoadFinished(url).catch(() => void 0);
         }
 
         public onReceivedError() {
@@ -201,21 +206,24 @@ function initializeWebViewClient(): void {
                 return;
             }
 
-            owner.writeTrace(`WebViewClientClass.onReceivedError(${error.getErrorCode()}, ${error.getDescription()}, ${error.getUrl && error.getUrl()})`);
+            let url = error.getUrl && error.getUrl();
+            if (!url && typeof request === 'object') {
+                url = request.getUrl().toString();
+            }
 
-            owner._onLoadFinished(error.getUrl && error.getUrl(), `${error.getDescription()}(${error.getErrorCode()})`);
+            owner.writeTrace(`WebViewClientClass.onReceivedErrorAPI23(${error.getErrorCode()}, ${error.getDescription()}, ${url})`);
 
+            owner._onLoadFinished(url, `${error.getDescription()}(${error.getErrorCode()})`).catch(() => void 0);
         }
 
         private onReceivedErrorBeforeAPI23(view: android.webkit.WebView, errorCode: number, description: string, failingUrl: string) {
             super.onReceivedError(view, errorCode, description, failingUrl);
 
             const owner = this.owner;
             if (owner) {
-                owner.writeTrace(`WebViewClientClass.onReceivedError(${errorCode}, "${description}", "${failingUrl}")`);
-                owner._onLoadFinished(failingUrl, `${description}(${errorCode})`);
+                owner.writeTrace(`WebViewClientClass.onReceivedErrorBeforeAPI23(${errorCode}, "${description}", "${failingUrl}")`);
+                owner._onLoadFinished(failingUrl, `${description}(${errorCode})`).catch(() => void 0);
             }
-
         }
     }
 
@@ -229,7 +237,7 @@ function initializeWebViewClient(): void {
             return global.__native(this);
         }
 
-        emitEventToNativeScript(eventName: string, data: string) {
+        public emitEventToNativeScript(eventName: string, data: string) {
             const owner = this.owner;
             if (!owner) {
                 return;

src/webview-ext.ios.ts

@@ -311,7 +311,7 @@ export class WebViewExt extends WebViewExtBase {
         try {
             const message = decodeURIComponent(url.replace(/^js2ios:/, ''));
             const { eventName, resId } = JSON.parse(message);
-            this.executeJavaScript(`window.nsWebViewBridge.getUIWebViewResponse(${JSON.stringify(resId)})`)
+            this.executeJavaScript<any>(`window.nsWebViewBridge.getUIWebViewResponse(${JSON.stringify(resId)})`)
                 .then((data) => {
                     this.onWebViewEvent(eventName, data);
                 })

src/webview-ext.uiwebview.ts

@@ -95,7 +95,7 @@ export class UIWebViewDelegateImpl extends NSObject implements UIWebViewDelegate
         if (webView.request && webView.request.URL) {
             src = webView.request.URL.absoluteString;
         }
-        owner._onLoadFinished(src);
+        owner._onLoadFinished(src).catch(() => void 0);
     }
 
     public webViewDidFailLoadWithError(webView: UIWebView, error: NSError) {
@@ -110,6 +110,6 @@ export class UIWebViewDelegateImpl extends NSObject implements UIWebViewDelegate
         }
 
         owner.writeTrace(`UIWebViewDelegateClass.webViewDidFailLoadWithError("${error.localizedDescription}") url: "${src}"`);
-        owner._onLoadFinished(src, error.localizedDescription);
+        owner._onLoadFinished(src, error.localizedDescription).catch(() => void 0);
     }
 }

src/webview-ext.wkwebview.ts

@@ -89,7 +89,7 @@ export class WKNavigationDelegateImpl extends NSObject implements WKNavigationDe
         if (webView.URL) {
             src = webView.URL.absoluteString;
         }
-        owner._onLoadFinished(src);
+        owner._onLoadFinished(src).catch(() => void 0);
     }
 
     public webViewDidFailNavigationWithError(webView: WKWebView, navigation: WKNavigation, error: NSError): void {
@@ -103,7 +103,7 @@ export class WKNavigationDelegateImpl extends NSObject implements WKNavigationDe
             src = webView.URL.absoluteString;
         }
         owner.writeTrace(`WKNavigationDelegateClass.webViewDidFailNavigationWithError("${error.localizedDescription}")`);
-        owner._onLoadFinished(src, error.localizedDescription);
+        owner._onLoadFinished(src, error.localizedDescription).catch(() => void 0);
     }
 }