@aigens/aigens-sdk-core 0.0.17 → 0.0.18

package/android/src/main/java/com/aigens/sdk/WebContainerActivity.java

@@ -2,6 +2,7 @@ package com.aigens.sdk;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -13,11 +14,10 @@ import android.util.Log;
 import android.view.View;
 import android.webkit.ServiceWorkerClient;
 import android.webkit.ServiceWorkerController;
-import android.webkit.WebResourceError;
+import android.webkit.ValueCallback;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.Button;
 
 import com.aigens.sdk.plugins.CorePlugin;
@@ -25,9 +25,14 @@ import com.getcapacitor.Bridge;
 import com.getcapacitor.BridgeActivity;
 import com.getcapacitor.BridgeWebViewClient;
 import com.getcapacitor.CapConfig;
+import com.getcapacitor.JSExport;
+import com.getcapacitor.Logger;
+import com.getcapacitor.NativePlugin;
 import com.getcapacitor.Plugin;
+import com.getcapacitor.PluginHandle;
 import com.getcapacitor.PluginLoadException;
 import com.getcapacitor.PluginManager;
+import com.getcapacitor.annotation.CapacitorPlugin;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -37,6 +42,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -50,6 +57,7 @@ public class WebContainerActivity extends BridgeActivity {
     private Map member;
     private Map deeplink;
     private boolean ENVIRONMENT_PRODUCTION = true;
+    private List<Class<? extends Plugin>> allPlugins;
     private String[] shouldRedirectList = new String[]{
             "/scan?",
             "/qr?",
@@ -187,7 +195,7 @@ public class WebContainerActivity extends BridgeActivity {
 
         CapConfig cc = new CapConfig(null, config);
 
-        List<Class<? extends Plugin>> plugins = new ArrayList<>();
+        allPlugins = new ArrayList<>();
 
         List<Class<? extends Plugin>> auto = loadPlugins();
 
@@ -198,7 +206,7 @@ public class WebContainerActivity extends BridgeActivity {
             if (clsName.endsWith("SplashScreenPlugin")) {
                 //don't add the splash screen plugin so it doesn't show the splash screen again
             } else {
-                plugins.add(c);
+                allPlugins.add(c);
             }
 
         }
@@ -210,12 +218,12 @@ public class WebContainerActivity extends BridgeActivity {
                 "com.aigens.alipay.AliPayPlugin",
                 "com.aigens.alipayhk.AliPayhkPlugin",
                 "com.aigens.payme.PaymePlugin",
-        }, plugins);
-        addExtraPlugins(intent.getStringArrayExtra("extraClasspaths"), plugins);
+        }, allPlugins);
+        addExtraPlugins(intent.getStringArrayExtra("extraClasspaths"), allPlugins);
 
-        debug("App plugins:" + plugins);
+        debug("App plugins:" + allPlugins);
 
-        super.init(currentInstanceState, plugins, cc);
+        super.init(currentInstanceState, allPlugins, cc);
 
         //still have time to override webview client to avoid any intercept
 
@@ -225,16 +233,19 @@ public class WebContainerActivity extends BridgeActivity {
         this.bridge.getWebView().setWebViewClient(wvc);
         this.bridge.getWebView().setWebContentsDebuggingEnabled(true);
 
-        //  this.bridge.getWebView().getSettings().setAppCacheEnabled(false);
-        //  this.bridge.getWebView().clearCache(true);
-        // this.bridge.getWebView().clearHistory();
-        // this.bridge.getWebView().clearFormData();
-        //  this.bridge.getWebView().getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
+
+//          this.bridge.getWebView().getSettings().setAppCacheEnabled(false);
+//          this.bridge.getWebView().clearCache(true);
+//         this.bridge.getWebView().clearHistory();
+//         this.bridge.getWebView().clearFormData();
+//          this.bridge.getWebView().getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
 
         initView(intent);
         initLayout(false, true, false);
 
-        disableServiceWorker(this.url, this.bridge);
+        // sometime not callback , use Use manual injection js
+//        disableServiceWorker(this.url, this.bridge);
+
     }
 
     private void addExtraPlugins(String[] extraClasspaths, List<Class<? extends Plugin>> plugins) {
@@ -346,23 +357,92 @@ public class WebContainerActivity extends BridgeActivity {
         return plugins;
     }
 
+    private boolean isDevMode() {
+        return (this.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+    }
+    private void mapPlugin(List<Class<? extends Plugin>> allPlugins, Map<String, PluginHandle> plugins) {
+        for (Class<? extends Plugin> pluginClass : allPlugins) {
+            String pluginName;
+            CapacitorPlugin pluginAnnotation = pluginClass.getAnnotation(CapacitorPlugin.class);
+            if (pluginAnnotation == null) {
+                NativePlugin legacyPluginAnnotation = pluginClass.getAnnotation(NativePlugin.class);
+                if (legacyPluginAnnotation == null) {
+                    Logger.error("Plugin doesn't have the @CapacitorPlugin annotation. Please add it");
+                    continue;
+                }
+                pluginName = legacyPluginAnnotation.name();
+            } else {
+                pluginName = pluginAnnotation.name();
+            }
+
+            String pluginId = pluginClass.getSimpleName();
+
+            // Use the supplied name as the id if available
+            if (!pluginName.equals("")) {
+                pluginId = pluginName;
+            }
+            try {
+                PluginHandle handle = this.bridge.getPlugin(pluginId);
+                if (handle != null) {
+                    plugins.put(pluginId, handle);
+                }
+            } catch (Exception ex) {
+                Logger.error(
+                        "NativePlugin " +
+                                pluginClass.getName() +
+                                " is invalid. Ensure the @CapacitorPlugin annotation exists on the plugin class and" +
+                                " the class extends Plugin"
+                );
+            }
+        }
+
+    }
+
+    private String getJSInjectorString() {
+        try {
+            String globalJS = JSExport.getGlobalJS(this, config.isLoggingEnabled(), isDevMode());
+            String bridgeJS = JSExport.getBridgeJS(this);
+            Map<String, PluginHandle> plugins = new HashMap<>();
+            mapPlugin(allPlugins, plugins);
+            String pluginJS = JSExport.getPluginJS(plugins.values());
+            String cordovaJS = JSExport.getCordovaJS(this);
+            String cordovaPluginsJS = JSExport.getCordovaPluginJS(this);
+            String cordovaPluginsFileJS = JSExport.getCordovaPluginsFileJS(this);
+            String localUrlJS = "window.WEBVIEW_SERVER_URL = '" + this.url + "';";
+            return (
+                    globalJS +
+                            "\n\n" +
+                            localUrlJS +
+                            "\n\n" +
+                            bridgeJS +
+                            "\n\n" +
+                            pluginJS +
+                            "\n\n" +
+                            cordovaJS +
+                            "\n\n" +
+                            cordovaPluginsFileJS +
+                            "\n\n" +
+                            cordovaPluginsJS
+            );
+        } catch (Exception ex) {
+            Logger.error("Unable to export Capacitor JS. App will not function!", ex);
+        }
+        return "";
+    }
+
     private static boolean SW_DISABLED = false;
 
     private static void disableServiceWorker(String originUrl, Bridge bridge) {
 
         if (SW_DISABLED) return;
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             ServiceWorkerController.getInstance().setServiceWorkerClient(new ServiceWorkerClient() {
                 @Override
                 public WebResourceResponse shouldInterceptRequest(WebResourceRequest request) {
-
-                    // Fixed: Sometimes the plugin cannot be loaded
-//                    String currentUrl = request.getUrl().toString();
-//                    if (currentUrl.equals(originUrl)) {
-//                        return bridge.getLocalServer().shouldInterceptRequest(request);
-//                    }
-//                    return null;
+                    //  don't know why this callback suddenly stopped working
+                    if (bridge == null) {
+                        return null;
+                    }
                     return bridge.getLocalServer().shouldInterceptRequest(request);
                 }
             });
@@ -504,8 +584,9 @@ public class WebContainerActivity extends BridgeActivity {
             String url = request.getUrl().toString();
             //debug("shouldInterceptRequest", url);
 
-            Log.wtf("shouldInterceptRequestUrl:", url);
+//            Log.wtf("shouldInterceptRequestUrl:", url);
 
+            // call super.shouldInterceptRequest(view, request); at: disableServiceWorker method
 
             //support redirect from /scan
 //            for (String r: shouldRedirectList) {
@@ -513,8 +594,6 @@ public class WebContainerActivity extends BridgeActivity {
 //                    return null;
 //                }
 //            }
-
-            // call super.shouldInterceptRequest(view, request); at: disableServiceWorker method
             return null;
 
 //            if(url.indexOf("/scan?") > 0 || url.indexOf("/qr?") > 0 || url.indexOf("//scan") > 0){
@@ -545,6 +624,26 @@ public class WebContainerActivity extends BridgeActivity {
             return shouldOverrideUrl(view, url);
         }
 
+        private void injectJs(String content) {
+            String str = "javascript:(function() { "
+                    + " " //turns to red the background color
+                    + " var script=document.createElement('script'); "
+                    + " script.setAttribute('type','text/javascript'); "
+                    + " script.setAttribute('id', 'test'); "
+                    + " script.innerText='"
+                    + content +
+                    "'; "
+                    + " document.getElementsByTagName('head')[0].appendChild(script); "
+                    + "})()";
+//            Log.wtf("injector", content);
+            bridge.getWebView().evaluateJavascript(content, new ValueCallback<String>() {
+                @Override
+                public void onReceiveValue(String value) {
+//                    Log.i("onReceiveValue", value);
+                }
+            });
+//            bridge.getWebView().loadUrl(str);
+        }
         @Override
         public void onPageStarted(WebView view, String url, Bitmap favicon) {
 
@@ -554,6 +653,8 @@ public class WebContainerActivity extends BridgeActivity {
 
             //bridge.getWebView().setVisibility(View.VISIBLE);
             initLayout(true, false, false);
+
+            injectJs(getJSInjectorString());
         }
 
         @Override

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigens/aigens-sdk-core",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Aigens Order.Place Core Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",