@aigens/aigens-sdk-core 0.0.3 → 0.0.7

package/README.md

@@ -14,9 +14,10 @@ npx cap sync
 <docgen-index>
 
 * [`echo(...)`](#echo)
+* [`dismiss(...)`](#dismiss)
 * [`finish(...)`](#finish)
+* [`getMember(...)`](#getmember)
 * [`openBrowser(...)`](#openbrowser)
-* [`scan(...)`](#scan)
 
 </docgen-index>
 
@@ -38,6 +39,21 @@ echo(options: any) => Promise<any>
 --------------------
 
 
+### dismiss(...)
+
+```typescript
+dismiss(options: any) => Promise<any>
+```
+
+| Param         | Type             |
+| ------------- | ---------------- |
+| **`options`** | <code>any</code> |
+
+**Returns:** <code>Promise&lt;any&gt;</code>
+
+--------------------
+
+
 ### finish(...)
 
 ```typescript
@@ -53,10 +69,10 @@ finish(options: any) => Promise<any>
 --------------------
 
 
-### openBrowser(...)
+### getMember(...)
 
 ```typescript
-openBrowser(options: any) => Promise<any>
+getMember(options: any) => Promise<any>
 ```
 
 | Param         | Type             |
@@ -68,10 +84,10 @@ openBrowser(options: any) => Promise<any>
 --------------------
 
 
-### scan(...)
+### openBrowser(...)
 
 ```typescript
-scan(options: any) => Promise<any>
+openBrowser(options: any) => Promise<any>
 ```
 
 | Param         | Type             |

package/android/build.gradle

@@ -53,9 +53,6 @@ dependencies {
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
 
-    implementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false }
-    implementation 'com.google.zxing:core:3.3.0'
-
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aigens.sdk.plugins">
+    package="com.aigens.sdk">
 </manifest>

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

@@ -5,16 +5,23 @@ import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
+import android.webkit.WebResourceError;
 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;
+import com.getcapacitor.Bridge;
 import com.getcapacitor.BridgeActivity;
+import com.getcapacitor.BridgeWebViewClient;
 import com.getcapacitor.CapConfig;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginLoadException;
 import com.getcapacitor.PluginManager;
+import com.aigens.sdk.R;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -25,9 +32,26 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class WebContainerActivity extends BridgeActivity {
 
+    private boolean DEBUG = CorePlugin.DEBUG;
+    private String url;
+    private boolean navbar = false;
+    private Map member;
+
+    private void debug(Object... msgs){
+
+
+        if(DEBUG){
+            for(Object m: msgs){
+                System.out.println(m);
+            }
+
+        }
+    }
+
 
 
     @Override
@@ -35,8 +59,19 @@ public class WebContainerActivity extends BridgeActivity {
 
         super.onCreate(savedInstanceState);
 
+        setContentView(R.layout.sdk_layout_main);
+
         Intent intent = getIntent();
-        String url = intent.getStringExtra("URL");
+        this.url = intent.getStringExtra("url");
+
+        //if navbar = true, show nav bar with "Done" button
+        this.navbar = intent.getBooleanExtra("navbar", false);
+
+        this.member = (Map) intent.getSerializableExtra("member");
+
+        if(this.member != null) {
+            CorePlugin.setMember(this.member);
+        }
 
         System.out.println("OPEN URL:"+ url);
 
@@ -44,8 +79,14 @@ public class WebContainerActivity extends BridgeActivity {
             System.err.println("CONFIG ERROR MISSING NATIVE URL");
         }
 
+        if(member != null){
+            debug("member", member);
+        }
+
         JSONObject config = readConfig();
 
+        debug("config", config);
+
         JSONObject server = config.optJSONObject("server");
 
         try {
@@ -53,6 +94,9 @@ public class WebContainerActivity extends BridgeActivity {
                 server.putOpt("url", url);
             }
 
+            //need to set this to avoid loading ServiceWorker
+            config.put("appendUserAgent", "AigensSDK");
+
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -66,7 +110,6 @@ public class WebContainerActivity extends BridgeActivity {
         for(Class c: auto){
 
             String clsName = c.getName();
-            //System.err.println("auto loaded plugins:" + clsName);
 
             if(clsName.endsWith("SplashScreenPlugin")){
                 //don't add the splash screen plugin so it doesn't show the splash screen again
@@ -76,18 +119,73 @@ public class WebContainerActivity extends BridgeActivity {
 
         }
 
-        //plugins.addAll(auto);
-
-        //plugins.add(CorePlugin2.class);
-        //plugins.add(AppPlugin.class);
-        //plugins.add(GeolocationPlugin.class);
+        debug("App plugins:" + plugins);
 
         super.init(savedInstanceState, plugins, cc);
 
         //still have time to override webview client to avoid any intercept
-        BypassWebViewClient wvc = new BypassWebViewClient();
+
+        BypassWebViewClient wvc = new BypassWebViewClient(this.bridge);
         this.bridge.getWebView().setWebViewClient(wvc);
 
+        initView();
+        initLayout(false, true, false);
+    }
+
+    private void initView(){
+
+        Button backButton = (Button) findViewById(R.id.back);
+        backButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+
+                debug("Back Clicked");
+                WebContainerActivity.this.finish();
+            }
+        });
+
+        Button reloadButton = (Button) findViewById(R.id.reload);
+        reloadButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+
+                debug("Reload Clicked");
+                reload();
+            }
+        });
+
+    }
+
+    private void reload(){
+
+        String url = this.url;
+
+        /*
+        if(DEBUG){
+            url = "https://test.order.place/test/app/store/500?nocache=true";
+        }*/
+
+        this.initLayout(false, true, false);
+        this.bridge.getWebView().reload();
+
+    }
+
+    private void initLayout(boolean showWeb, boolean showInfo, boolean showError){
+
+        if(showError){
+            showWeb = false;
+            showInfo = false;
+        }
+
+        View info = findViewById(R.id.info);
+        info.setVisibility(showInfo ? View.VISIBLE : View.INVISIBLE);
+
+        View error = findViewById(R.id.error);
+        error.setVisibility(showError ? View.VISIBLE : View.INVISIBLE);
+
+        bridge.getWebView().setVisibility(showWeb ? View.VISIBLE : View.INVISIBLE);
+
+
     }
 
     private List<Class<? extends Plugin>> loadPlugins(){
@@ -154,37 +252,87 @@ public class WebContainerActivity extends BridgeActivity {
     }
 
     //BridgeWebViewClient
-    class BypassWebViewClient extends WebViewClient {
+    class BypassWebViewClient extends BridgeWebViewClient {
 
+        public BypassWebViewClient(Bridge bridge) {
+            super(bridge);
+        }
+
+        //somehow this must call parent, otherwise plugins won't work
         @Override
         public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
 
-            return null;
+
+            String url = request.getUrl().toString();
+            //debug("shouldInterceptRequest", url);
+
+
+            if(url.indexOf("//scan") > 0){
+                return null;
+            }
+
+            return super.shouldInterceptRequest(view, request);
+
+            //super.shouldInterceptRequest(view, request);
+            //return null;
         }
 
 
         @Override
         public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-            //System.err.println("shouldOverrideUrlLoading:" + request.getUrl());
+            debug("shouldOverrideUrlLoading", request.getUrl());
             //Uri url = request.getUrl();
+
+            //return super.shouldOverrideUrlLoading(view, request);
+
             return false;
         }
 
         @Override
         public boolean shouldOverrideUrlLoading(WebView view, String url) {
-            //System.err.println("shouldOverrideUrlLoadingOld:" + url);
+            debug("shouldOverrideUrlLoading", url);
             //return bridge.launchIntent(Uri.parse(url));
+
+            //return super.shouldOverrideUrlLoading(view, url);
+
             return false;
         }
 
         @Override
         public void onPageStarted(WebView view, String url, Bitmap favicon) {
 
-            //System.err.println("onPageStarted:" + url);
+            debug("onPageStarted", url);
 
-            //super.onPageStarted(view, url, favicon);
+            super.onPageStarted(view, url, favicon);
 
+            //bridge.getWebView().setVisibility(View.VISIBLE);
+            initLayout(true, false, false);
         }
+
+        @Override
+        public void onPageFinished (WebView view, String url){
+
+            debug("onPageFinished", url);
+            //bridge.getWebView().setVisibility(View.VISIBLE);
+        }
+
+        @Override
+        public void onReceivedError (WebView view, int errorCode, String description, String failingUrl){
+            debug("onReceivedErrorOld", errorCode, description, failingUrl);
+
+            initLayout(false, true, true);
+        }
+
+        /*
+        @Override
+        public void onReceivedError (WebView view,
+                                     WebResourceRequest request,
+                                     WebResourceError error){
+
+            debug("onReceivedError2", request.getUrl());
+        }*/
     }
 
+
+
 }

package/android/src/main/java/com/aigens/sdk/plugins/CorePlugin.java

@@ -12,105 +12,59 @@ import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
-import com.journeyapps.barcodescanner.ScanContract;
-import com.journeyapps.barcodescanner.ScanOptions;
+
+import org.json.JSONException;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 @CapacitorPlugin(name = "Core")
 public class CorePlugin extends Plugin {
 
+    public static boolean DEBUG = false;
+
+    private static Map member;
+
+    private void debug(Object msg){
+
+        if(DEBUG){
+            System.out.println(msg);
+        }
+
+    }
+
+    public static void setMember(Map member){
+        CorePlugin.member = member;
+    }
 
     @Override
     protected void handleOnStart(){
 
-        prepareScan();
     }
 
     @PluginMethod()
     public void echo(PluginCall call) {
         String value = call.getString("value");
 
+        debug("CorePlugin echo:" + value);
+
         JSObject ret = new JSObject();
         ret.put("value", value);
         call.resolve(ret);
     }
 
-    private PluginCall scanCall;
-
     @PluginMethod()
-    public void scan(PluginCall call) {
-
-        System.err.println("SCANNING!!");
-
-        this.scanCall = call;
-        scanRaw();
-
-
-    }
-
-    // Register the launcher and result handler
-
-    private ActivityResultLauncher<ScanOptions> barcodeLauncher;
-
-    private void prepareScan(){
-
-        AppCompatActivity act = getActivity();
-
-        barcodeLauncher = act.registerForActivityResult(new ScanContract(),
-            result -> {
-
-                if(scanCall == null){
-                    System.err.println("Missing scan callback");
-                    return;
-                }
-
-                if(result.getContents() == null) {
-                    //Toast.makeText(MyActivity.this, "Cancelled", Toast.LENGTH_LONG).show();
-                    System.err.println("scan cancelled");
-                    JSObject ret = new JSObject();
-                    ret.put("hasContent", false);
-                    ret.put("success", false);
-                    scanCall.resolve(ret);
-                } else {
-                    //Toast.makeText(MyActivity.this, "Scanned: " + result.getContents(), Toast.LENGTH_LONG).show();
-                    String val = result.getContents();
-
-                    System.err.println("scan result:" + val);
-
-                    if(val != null && val.length() > 0){
-
-                        JSObject ret = new JSObject();
-                        ret.put("content", val);
-                        ret.put("hasContent", true);
-                        ret.put("success", true);
-                        scanCall.resolve(ret);
-                    }else{
-
-                        JSObject ret = new JSObject();
-                        ret.put("hasContent", false);
-                        ret.put("success", false);
-                        scanCall.resolve(ret);
-                    }
+    public void getMember(PluginCall call) {
 
+        debug("CorePlugin getMember:" + member);
 
-
-                }
-                scanCall = null;
-            });
+        JSObject ret = new JSObject();
+        ret.put("member", member);
+        call.resolve(ret);
     }
 
-    private void scanRaw(){
-
-        ScanOptions options = new ScanOptions();
-        //options.setDesiredBarcodeFormats(ScanOptions.ONE_D_CODE_TYPES);
-        options.setPrompt("");
-        //options.setCameraId(0);  // Use a specific camera of the device
-        options.setBeepEnabled(false);
-        options.setOrientationLocked(false);
-        options.setBarcodeImageEnabled(true);
-
-        //options.setBarcodeImageEnabled(true);
-        barcodeLauncher.launch(options);
-    }
 
     // Launch
     //public void onButtonClick(View view) {
@@ -124,6 +78,13 @@ public class CorePlugin extends Plugin {
 
     }
 
+    @PluginMethod()
+    public void dismiss(PluginCall call) {
+
+        getActivity().finish();
+
+    }
+
     @PluginMethod()
     public void openBrowser(PluginCall call) {
 
@@ -132,12 +93,31 @@ public class CorePlugin extends Plugin {
         if(url == null) return;
 
         JSObject options = call.getObject("options", null);
+        JSObject member = call.getObject("member", null);
+
+        Map memMap = new HashMap();
+
+        if(member != null){
+            Iterator<String> iter = member.keys();
+            while(iter.hasNext()){
+                String k = iter.next();
+                try {
+                    Object v = member.get(k);
+                    memMap.put(k, v);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+            }
+        }
 
         Activity act = getActivity();
 
         Intent intent = new Intent(act, WebContainerActivity.class);
 
-        intent.putExtra("URL", url);
+        intent.putExtra("url", url);
+        intent.putExtra("member", (Serializable) memMap);
+
         act.startActivity(intent);
 
         JSObject ret = new JSObject();

package/android/src/main/res/layout/sdk_layout_main.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.getcapacitor.BridgeActivity"
+    >
+
+    <com.getcapacitor.CapacitorWebView
+        android:id="@+id/webview"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+    </com.getcapacitor.CapacitorWebView>
+
+    <LinearLayout
+        android:id="@+id/info"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ProgressBar
+            android:id="@+id/progress"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/error"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="8dp"
+            android:text="Exit" />
+
+        <Button
+            android:id="@+id/reload"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Reload" />
+
+    </LinearLayout>
+
+
+</FrameLayout>

package/dist/docs.json

@@ -21,6 +21,22 @@
         "complexTypes": [],
         "slug": "echo"
       },
+      {
+        "name": "dismiss",
+        "signature": "(options: any) => Promise<any>",
+        "parameters": [
+          {
+            "name": "options",
+            "docs": "",
+            "type": "any"
+          }
+        ],
+        "returns": "Promise<any>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "dismiss"
+      },
       {
         "name": "finish",
         "signature": "(options: any) => Promise<any>",
@@ -38,7 +54,7 @@
         "slug": "finish"
       },
       {
-        "name": "openBrowser",
+        "name": "getMember",
         "signature": "(options: any) => Promise<any>",
         "parameters": [
           {
@@ -51,10 +67,10 @@
         "tags": [],
         "docs": "",
         "complexTypes": [],
-        "slug": "openbrowser"
+        "slug": "getmember"
       },
       {
-        "name": "scan",
+        "name": "openBrowser",
         "signature": "(options: any) => Promise<any>",
         "parameters": [
           {
@@ -67,7 +83,7 @@
         "tags": [],
         "docs": "",
         "complexTypes": [],
-        "slug": "scan"
+        "slug": "openbrowser"
       }
     ],
     "properties": []

package/dist/esm/definitions.d.ts

@@ -1,6 +1,7 @@
 export interface CorePlugin {
     echo(options: any): Promise<any>;
+    dismiss(options: any): Promise<any>;
     finish(options: any): Promise<any>;
+    getMember(options: any): Promise<any>;
     openBrowser(options: any): Promise<any>;
-    scan(options: any): Promise<any>;
 }

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export interface CorePlugin {\n    echo(options: any): Promise<any>;\n    finish(options: any): Promise<any>;\n    openBrowser(options: any): Promise<any>;\n    scan(options: any): Promise<any>;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export interface CorePlugin {\n    echo(options: any): Promise<any>;\n    dismiss(options: any): Promise<any>;\n    finish(options: any): Promise<any>;\n    getMember(options: any): Promise<any>;\n    openBrowser(options: any): Promise<any>;\n\n}\n"]}

package/dist/esm/web.d.ts

@@ -2,7 +2,8 @@ import { WebPlugin } from '@capacitor/core';
 import type { CorePlugin } from './definitions';
 export declare class CoreWeb extends WebPlugin implements CorePlugin {
     echo(options: any): Promise<any>;
+    getMember(options: any): Promise<any>;
+    dismiss(options: any): Promise<any>;
     finish(options: any): Promise<any>;
     openBrowser(options: any): Promise<any>;
-    scan(options: any): Promise<any>;
 }

package/dist/esm/web.js

@@ -4,6 +4,18 @@ export class CoreWeb extends WebPlugin {
         console.log('ECHO', options);
         return options;
     }
+    async getMember(options) {
+        var _a, _b;
+        console.log('GET MEMBER', options);
+        var result = {};
+        var w = window;
+        result.member = (_b = (_a = w.aigens) === null || _a === void 0 ? void 0 : _a.context) === null || _b === void 0 ? void 0 : _b.member;
+        return result;
+    }
+    async dismiss(options) {
+        console.log('DISMISS', options);
+        return options;
+    }
     async finish(options) {
         console.log('FINISH', options);
         return options;
@@ -12,9 +24,5 @@ export class CoreWeb extends WebPlugin {
         console.log(options);
         throw new Error('Method not implemented.');
     }
-    async scan(options) {
-        console.log(options);
-        throw new Error('Method not implemented.');
-    }
 }
 //# sourceMappingURL=web.js.map