@aigens/aigens-sdk-core 0.0.5 → 0.0.8

package/ios/Plugin/WebContainer.swift

@@ -0,0 +1,83 @@
+//
+//  WebContainer.swift
+//  AigensSdkCore
+//
+//  Created by 陈培爵 on 2022/6/7.
+//
+
+import UIKit
+
+class WebContainer: UIView {
+    @IBOutlet weak var activity: UIActivityIndicatorView!
+    
+    @IBOutlet weak var errorWrapper: UIView!
+    
+    @IBOutlet weak var errorTextView: UITextView!
+    
+    public weak var vc: WebContainerViewController?
+    
+    public func setTheme(_ color: String) {
+        if let color = UIColor.getHex(hex: color) {
+            self.backgroundColor = color
+        }
+    }
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        print("awakeFromNib")
+    }
+    
+    private func hiddenSelf() {
+        self.alpha = 1.0
+        UIView.animate(withDuration: 0.5, animations: {
+            self.alpha = 0
+        })
+    }
+    
+    public func showLoading(_ show: Bool) {
+        if show {
+            self.alpha = 1.0
+            activity.isHidden = false
+            activity.backgroundColor = .clear
+            activity.color = .darkGray
+            activity.alpha = 1.0
+        }else {
+            hiddenSelf()
+            activity?.isHidden = true
+        }
+    }
+    public func showError(_ show: Bool, _ error: String? = nil) {
+        if let e = error {
+            errorTextView?.text = e
+        }
+        if show {
+            errorWrapper?.isHidden = false
+            self.alpha = 1.0
+        }else {
+            errorWrapper?.isHidden = true
+            self.alpha = 0
+        }
+        
+    }
+    
+    /*
+    // Only override draw() if you perform custom drawing.
+    // An empty implementation adversely affects performance during animation.
+    override func draw(_ rect: CGRect) {
+        // Drawing code
+    }
+    */
+    @IBAction func dismiss(_ sender: UIButton) {
+        self.vc?.dismiss(animated: true);
+    }
+    
+    @IBAction func reload(_ sender: UIButton) {
+        self.vc?.webView?.reload()
+    }
+}
+
+extension WebContainer {
+    class func webContainer() -> WebContainer {
+        let bundle = Bundle(for: WebContainer.self)
+        return bundle.loadNibNamed("WebContainer", owner: self, options: nil)?.first as! WebContainer
+    }
+}

package/ios/Plugin/WebContainer.xib

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="WebContainer" customModule="Plugin" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="QRW-cT-ZYH">
+                    <rect key="frame" x="188.5" y="119" width="37" height="37"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <color key="color" systemColor="secondaryLabelColor"/>
+                </activityIndicatorView>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9XO-W2-mxO" userLabel="errorWrapper">
+                    <rect key="frame" x="0.0" y="206" width="414" height="690"/>
+                    <subviews>
+                        <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XSc-rN-cN8">
+                            <rect key="frame" x="206.5" y="560" width="1" height="100"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="1" id="JtJ-kb-hPE"/>
+                                <constraint firstAttribute="height" constant="100" id="SFb-3i-Gvl"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rie-2B-ejA" userLabel="reload">
+                            <rect key="frame" x="237.5" y="579" width="70" height="31"/>
+                            <color key="backgroundColor" systemColor="linkColor"/>
+                            <state key="normal" title="Button"/>
+                            <buttonConfiguration key="configuration" style="filled" title="Reload">
+                                <color key="baseForegroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </buttonConfiguration>
+                            <connections>
+                                <action selector="reload:" destination="iN0-l3-epB" eventType="touchUpInside" id="PwX-vF-t6u"/>
+                            </connections>
+                        </button>
+                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Got some errors, please try again later." textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8vI-mF-YrJ">
+                            <rect key="frame" x="30" y="30" width="354" height="519"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <color key="textColor" systemColor="systemPinkColor"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                        </textView>
+                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3jG-Lv-8dD" userLabel="back">
+                            <rect key="frame" x="120.5" y="579" width="70" height="31"/>
+                            <color key="backgroundColor" systemColor="linkColor"/>
+                            <state key="normal" title="Button"/>
+                            <buttonConfiguration key="configuration" style="filled" title="Back">
+                                <color key="baseForegroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </buttonConfiguration>
+                            <connections>
+                                <action selector="dismiss:" destination="iN0-l3-epB" eventType="touchUpInside" id="uVj-47-Wse"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="8vI-mF-YrJ" firstAttribute="leading" secondItem="9XO-W2-mxO" secondAttribute="leading" constant="30" id="AS7-Ga-vyq"/>
+                        <constraint firstItem="Rie-2B-ejA" firstAttribute="leading" secondItem="XSc-rN-cN8" secondAttribute="trailing" constant="30" id="CyI-hc-XkI"/>
+                        <constraint firstItem="3jG-Lv-8dD" firstAttribute="bottom" secondItem="Rie-2B-ejA" secondAttribute="bottom" id="HAh-cE-mQ6"/>
+                        <constraint firstItem="XSc-rN-cN8" firstAttribute="leading" secondItem="3jG-Lv-8dD" secondAttribute="trailing" constant="30" id="PAe-EE-twu"/>
+                        <constraint firstAttribute="bottom" secondItem="XSc-rN-cN8" secondAttribute="bottom" constant="30" id="RPJ-VJ-HXw"/>
+                        <constraint firstAttribute="bottom" secondItem="3jG-Lv-8dD" secondAttribute="bottom" constant="80" id="Upv-ms-zNA"/>
+                        <constraint firstItem="8vI-mF-YrJ" firstAttribute="top" secondItem="9XO-W2-mxO" secondAttribute="top" constant="30" id="YIP-1g-G6E"/>
+                        <constraint firstItem="3jG-Lv-8dD" firstAttribute="top" secondItem="8vI-mF-YrJ" secondAttribute="bottom" constant="30" id="aeR-w6-BjA"/>
+                        <constraint firstItem="8vI-mF-YrJ" firstAttribute="centerX" secondItem="9XO-W2-mxO" secondAttribute="centerX" id="kmK-Va-dvk"/>
+                        <constraint firstAttribute="trailing" secondItem="8vI-mF-YrJ" secondAttribute="trailing" constant="30" id="mUr-wg-3M2"/>
+                        <constraint firstItem="XSc-rN-cN8" firstAttribute="centerX" secondItem="9XO-W2-mxO" secondAttribute="centerX" id="pNO-0x-6Wm"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <constraints>
+                <constraint firstItem="QRW-cT-ZYH" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="75" id="R5H-tF-5z7"/>
+                <constraint firstItem="9XO-W2-mxO" firstAttribute="top" secondItem="QRW-cT-ZYH" secondAttribute="bottom" constant="50" id="X4C-yj-HyP"/>
+                <constraint firstAttribute="bottom" secondItem="9XO-W2-mxO" secondAttribute="bottom" id="cOL-UR-HYb"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="9XO-W2-mxO" secondAttribute="trailing" id="fAe-qZ-xE4"/>
+                <constraint firstItem="9XO-W2-mxO" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="haw-0Q-SQQ"/>
+                <constraint firstItem="QRW-cT-ZYH" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="lwz-JW-uoD"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="activity" destination="QRW-cT-ZYH" id="fKy-zs-iDE"/>
+                <outlet property="errorTextView" destination="8vI-mF-YrJ" id="4uw-Iq-Axh"/>
+                <outlet property="errorWrapper" destination="9XO-W2-mxO" id="ipj-rF-hT1"/>
+            </connections>
+            <point key="canvasLocation" x="137.68115942028987" y="102.45535714285714"/>
+        </view>
+    </objects>
+    <resources>
+        <systemColor name="linkColor">
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="secondaryLabelColor">
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemPinkColor">
+            <color red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
+</document>

package/ios/Plugin/WebContainerViewController.swift

@@ -11,15 +11,99 @@ import Capacitor
 
 @objc open class WebContainerViewController: CAPBridgeViewController {
 
+    // {themeColor: "#xxxxxx"}
     public var options: Dictionary<String, Any>?
-
+    
+    var externalProtocols: [String] = [
+        "octopus://", "alipay://", "alipays://", "alipayhk://", "https://itunes.apple.com", "tel:", "mailto:", "itms-apps://itunes.apple.com", "https://apps.apple.com", "payme://"
+    ]
+    let containerView = WebContainer.webContainer()
+    var webContainerView: WebContainer {
+            return containerView
+    }
     override open func viewDidLoad() {
 
         print("WebContainerViewController viewDidLoad")
 
         self.becomeFirstResponder()
         loadWebViewCustom()
-        //loadWebView()
+        initView()
+        
+    }
+    
+    private func initView(){
+        
+        print("VC initView")
+        
+        //let bundle = Bundle(for: WebContainerViewController.self)
+        //let containerView = WebContainerView()
+        //let containerView = bundle.loadNibNamed("WebContainerView", owner: self, options: nil)?.first as! UIView
+        
+        self.view.addSubview(webContainerView)
+        webContainerView.frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.size.width, height: UIScreen.main.bounds.size.height)
+        setupOptions(webContainerView)
+        containerView.vc = self
+        
+//
+//
+
+
+//        let containerView = WebContainerView()
+//        self.view = containerView
+//
+//        //containerView.frame = self.view!.bounds
+//        containerView.backgroundColor = UIColor.red
+//        containerView.translatesAutoresizingMaskIntoConstraints = false
+//
+//        let webview = self.webView
+//        webview?.frame = containerView.webArea!.bounds
+//        webview?.frame.size = containerView.webArea.frame.size
+//        containerView.webArea.addSubview(self.webView!)
+//
+
+        
+    }
+    
+    open override func viewWillLayoutSubviews() {
+        super.viewWillLayoutSubviews()
+        webContainerView.frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.size.width, height: UIScreen.main.bounds.size.height)
+    }
+    
+    private func setupOptions(_ view: WebContainer) {
+        if let theme = self.options?["themeColor"] as? String, let color = UIColor.getHex(hex: theme) {
+            self.view.backgroundColor = color
+            self.webView?.backgroundColor = color
+            self.webView?.scrollView.backgroundColor = color
+            view.setTheme(theme)
+        }
+        if let externalProtocols = options?["externalProtocols"] as? [String] {
+            self.externalProtocols.append(contentsOf: externalProtocols)
+        }
+        
+    }
+    
+    public final func loadWebViewCustom() {
+
+        //let bridge = self.bridge
+        //let plugins = self.bridge["plugins"]
+
+
+        let urlString = self.options?["url"] as? String;
+
+        if(urlString == nil){
+            return;
+        }
+
+        let url = URL(string: urlString!)
+        
+        let member = self.options?["member"] as? Dictionary<String, Any>
+        
+        CorePlugin.member = member
+        
+        //bridge.webViewDelegationHandler.willLoadWebview(webView)
+        _ = webView?.load(URLRequest(url: url!))
+        webView?.navigationDelegate = self
+
     }
 
     //this method overwrite parent to return a desc with custom config.json
@@ -48,29 +132,153 @@ import Capacitor
 
         return descriptor
     }
+    
+    deinit {
+        print("WebContainerViewController deinit")
+    }
 
-    public final func loadWebViewCustom() {
-
-        //let bridge = self.bridge
-        //let plugins = self.bridge["plugins"]
-
+    
+}
 
-        let urlString = self.options?["url"] as? String;
+extension WebContainerViewController: WKNavigationDelegate {
+    // The force unwrap is part of the protocol declaration, so we should keep it.
+    // swiftlint:disable:next implicitly_unwrapped_optional
+    public func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
+        // Reset the bridge on each navigation
+//        self.bridge?.reset()
+    }
+    
+    public func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
+        webContainerView.showError(false)
+        webContainerView.showLoading(true)
+    }
+    
+    public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+        // post a notification for any listeners
+        NotificationCenter.default.post(name: .capacitorDecidePolicyForNavigationAction, object: navigationAction)
 
-        if(urlString == nil){
-            return;
+        // sanity check, these shouldn't ever be nil in practice
+        guard let bridge = bridge, let navURL = navigationAction.request.url else {
+            decisionHandler(.allow)
+            return
         }
-
-        let url = URL(string: urlString!)
-        
-        let member = self.options?["member"] as? Dictionary<String, Any>
         
-        CorePlugin.member = member
+        var isCanOpen = false
+        if externalProtocols.count > 0 {
+            externalProtocols.forEach { (url) in
+                if (navURL.absoluteString.starts(with: url)) {
+                    isCanOpen = UIApplication.shared.canOpenURL(navURL) ;
+                    return;
+                }
+            }
+        }
         
+        if isCanOpen {
+            if #available(iOS 10.0, *) {
+                UIApplication.shared.open(navURL, options: [:], completionHandler: nil);
+            } else {
+                UIApplication.shared.openURL(navURL)
+            }
+            decisionHandler(.cancel)
+            return;
+        }
         
-        //bridge.webViewDelegationHandler.willLoadWebview(webView)
-        _ = webView?.load(URLRequest(url: url!))
 
+        // first, give plugins the chance to handle the decision
+//        for pluginObject in bridge.plugins {
+//            let plugin = pluginObject.value
+//            let selector = NSSelectorFromString("shouldOverrideLoad:")
+//            if plugin.responds(to: selector) {
+//                let shouldOverrideLoad = plugin.shouldOverrideLoad(navigationAction)
+//                if shouldOverrideLoad != nil {
+//                    if shouldOverrideLoad == true {
+//                        decisionHandler(.cancel)
+//                        return
+//                    } else if shouldOverrideLoad == false {
+//                        decisionHandler(.allow)
+//                        return
+//                    }
+//                }
+//            }
+//        }
+
+        // next, check if this is covered by the allowedNavigation configuration
+        if let host = navURL.host, bridge.config.shouldAllowNavigation(to: host) {
+            decisionHandler(.allow)
+            return
+        }
+
+        // otherwise, is this a new window or a main frame navigation but to an outside source
+        let toplevelNavigation = (navigationAction.targetFrame == nil || navigationAction.targetFrame?.isMainFrame == true)
+        if navURL.absoluteString.contains(bridge.config.serverURL.absoluteString) == false, toplevelNavigation {
+            // disallow and let the system handle it
+            if UIApplication.shared.applicationState == .active {
+                UIApplication.shared.open(navURL, options: [:], completionHandler: nil)
+            }
+            decisionHandler(.cancel)
+            return
+        }
+
+        // fallthrough to allowing it
+        decisionHandler(.allow)
+    }
+    
+    
+    // The force unwrap is part of the protocol declaration, so we should keep it.
+    // swiftlint:disable:next implicitly_unwrapped_optional
+    public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+//        if case .initialLoad(let isOpaque) = webViewLoadingState {
+//            webView.isOpaque = isOpaque
+//            webViewLoadingState = .subsequentLoad
+//        }
+        webContainerView.showLoading(false)
+        webContainerView.showError(false)
+        CAPLog.print("⚡️  WebView loaded")
+    }
+    
+    // The force unwrap is part of the protocol declaration, so we should keep it.
+    // swiftlint:disable:next implicitly_unwrapped_optional
+    public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+//        if case .initialLoad(let isOpaque) = webViewLoadingState {
+//            webView.isOpaque = isOpaque
+//            webViewLoadingState = .subsequentLoad
+//        }
+        webContainerView.showLoading(false)
+        
+        webContainerView.showError(true, error.localizedDescription)
+        CAPLog.print("⚡️  WebView failed to load")
+        CAPLog.print("⚡️  Error: " + error.localizedDescription)
+    }
+    
+    // The force unwrap is part of the protocol declaration, so we should keep it.
+    // swiftlint:disable:next implicitly_unwrapped_optional
+    public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+        webContainerView.showLoading(false)
+        // cancel
+        let e = error as NSError
+        if (e.code == NSURLErrorCancelled || e.code == -999) {
+            webContainerView.showError(false)
+        }
+        CAPLog.print("⚡️  WebView failed provisional navigation")
+        CAPLog.print("⚡️  Error: " + error.localizedDescription)
+        webContainerView.showError(true, error.localizedDescription)
+    }
+    
+    public func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
+        webView.reload()
+    }
+}
 
+extension UIColor {
+    static func getHex(hex: String, _ alpha: CGFloat = 1.0) -> UIColor? {
+        guard !hex.isEmpty && hex.hasPrefix("#") else { return nil }
+        var rgbValue: UInt32 = 0
+        let scanner = Scanner(string: hex)
+        scanner.scanLocation = 1
+        guard scanner.scanHexInt32(&rgbValue) else { return nil }
+        return UIColor(red: CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0,
+            green: CGFloat((rgbValue & 0xFF00) >> 8) / 255.0,
+            blue: CGFloat((rgbValue & 0xFF)) / 255.0,
+            alpha: alpha);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigens/aigens-sdk-core",
-  "version": "0.0.5",
+  "version": "0.0.8",
   "description": "Aigens Order.Place Core Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -74,5 +74,8 @@
     "android": {
       "src": "android"
     }
+  },
+  "dependencies": {
+    "aigens-mono": "file:../.."
   }
 }