@blueid/access-capacitor 1.1.0 → 1.4.0

package/android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.3.0'
     }
 }
 
@@ -19,10 +19,10 @@ apply plugin: 'com.android.library'
 
 android {
     namespace "com.blueid.access.plugins.capacitor"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 31
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -45,12 +45,14 @@ android {
 repositories {
     google()
     mavenCentral()
+    maven { url "./repo" }
 }
 
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation project(':capacitor-android')
+    implementation ('net.blueid:access:5.0@aar'){transitive=true}
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"

package/android/settings.gradle

@@ -0,0 +1,4 @@
+rootProject.name = "AndroidCapacitorPlugin"
+include ':capacitor-android'
+project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
+//include ':sdk'

package/android/src/main/java/com/blueid/access/plugins/capacitor/BlueIDAccess.java

@@ -1,11 +1,53 @@
 package com.blueid.access.plugins.capacitor;
 
+import android.app.Application;
+import android.content.Context;
 import android.util.Log;
+import android.widget.Toast;
+
+import com.getcapacitor.App;
+
+import java.util.Map;
+
+import blueid.access.sdk.BluePlugin;
+import blueid.access.sdk.Sdk;
+import kotlin.jvm.functions.Function1;
+
 
 public class BlueIDAccess {
 
+    Sdk sdk;
+
+    private static BlueIDAccess instance = null;
+    private static BluePlugin plugin = null;
+    private final Application application;
+
+    private BlueIDAccess(Application application) {
+        this.application = application;
+        Log.i("Capacitor:", "BlueIDAccess Loaded "+application.getPackageName());
+        sdk = Sdk.INSTANCE;
+        sdk.init(application);
+        plugin = new BluePlugin();
+    }
+
+    public static BlueIDAccess getInstance(Application context) {
+
+        if (instance == null) {
+
+            instance = new BlueIDAccess(context);
+        }
+
+        return instance;
+    }
+
     public String echo(String value) {
-        Log.i("Echo", value);
+        Toast.makeText(application, "Echo "+value, Toast.LENGTH_SHORT).show();
         return value;
     }
+
+    public void runCommand(String command, Object arg0, Object arg1, Object arg2, Function1<Map<String, ? extends Object>, Void> resolve,
+                              Function1<Map<String, ? extends Object>, Void> reject) {
+
+        plugin.runCommand(command, arg0, arg1, arg2, resolve, reject);
+    }
 }

package/android/src/main/java/com/blueid/access/plugins/capacitor/BlueIDAccessPlugin.java

@@ -1,15 +1,40 @@
 package com.blueid.access.plugins.capacitor;
 
+import android.app.Application;
+import android.content.Context;
+import android.util.Log;
+
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Map;
+
+import blueid.access.sdk.core.BlueError;
+import blueid.access.sdk.pb.BlueCore;
+import kotlin.jvm.functions.Function1;
+
 @CapacitorPlugin(name = "BlueIDAccess")
 public class BlueIDAccessPlugin extends Plugin {
 
-    private BlueIDAccess implementation = new BlueIDAccess();
+    private BlueIDAccess implementation;
+
+      @Override
+    public void load() {
+        super.load();
+
+        Application appInstance = (Application) getContext().getApplicationContext();
+        implementation =  BlueIDAccess.getInstance(appInstance);
+
+        Log.i("Capacitor:", "BlueIDAccessPlugin Loaded "+appInstance.getPackageName());
+    }
+
+
 
     @PluginMethod
     public void echo(PluginCall call) {
@@ -19,4 +44,65 @@ public class BlueIDAccessPlugin extends Plugin {
         ret.put("value", implementation.echo(value));
         call.resolve(ret);
     }
+
+    @PluginMethod
+    public void runCommand(PluginCall call) {
+
+        String command = call.getString("command");
+
+        if (command == null || command.isEmpty()) {
+            call.reject("Missing or invalid command");
+            return;
+        }
+
+        Object arg0 = null, arg1 = null, arg2 = null;
+
+        try {
+            arg0 = call.getData().get("arg0");
+            arg1 = call.getData().get("arg1");
+            arg2 = call.getData().get("arg2");
+        } catch (JSONException e) {
+            call.reject(e.getMessage());
+        }
+
+
+        Log.i("AndroidCapacitor:", "data: "+call.getData());
+
+        if (arg0 != null && arg0.toString().equals("null")){ // this is so important don't remove this
+            arg0 = null;
+        }
+        if (arg1 != null && arg1.toString().equals("null")){ // this is so important don't remove this
+            arg1 = null;
+        }
+        if (arg2 != null && arg2.toString().equals("null")){ // this is so important don't remove this
+            arg2 = null;
+        }
+
+
+        implementation.runCommand(command, arg0, arg1, arg2, stringObjectMap -> {
+
+            if (stringObjectMap != null) {
+                JSONObject result = new JSONObject(stringObjectMap);
+
+                try {
+                    call.resolve(JSObject.fromJSONObject(result));
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
+            }else{
+                call.resolve();
+            }
+            return null;
+        }, stringObjectMap -> {
+
+            Object value = stringObjectMap.get("message");
+            String errorMsg = value instanceof String ? (String) value : "Unknown_error";
+
+            Object error = stringObjectMap.get("error");
+
+            int errorValue = (int) (error instanceof Integer ? error : -1);
+            call.reject(errorMsg, String.valueOf(errorValue));
+            return null;
+        });
+    }
 }

package/dist/esm/interop.js

@@ -58,18 +58,21 @@ export class BlueIDAccessInterop {
         if (!command) {
             throw new Error("Missing valid command");
         }
+        console.log('Starting command: ' + JSON.stringify(command));
         const result = await this.runCommandFunc({
             command,
             arg0: encodeArgument(arg0),
             arg1: encodeArgument(arg1),
             arg2: encodeArgument(arg2),
         });
+        console.log('Running command with result : ' + JSON.stringify(result));
         if (!result) {
             return null;
         }
         if (result.data && result.messageTypeName) {
             return decodeResult(result.messageTypeName, result.data);
         }
+        console.log('result from interop ' + command + ' : ' + JSON.stringify(result.data));
         return result.data;
     }
     async terminalRunAll(deviceID, requests, timeoutSeconds = 10.0) {

package/dist/esm/interop.js.map

@@ -1 +1 @@
-{"version":3,"file":"interop.js","sourceRoot":"","sources":["../../src/interop.ts"],"names":[],"mappings":"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","sourcesContent":["//\n// Utilities shared for typescript json-interfaces like react-native and capacitor\n//\n\nimport { Message, protoDelimited } from \"@bufbuild/protobuf\";\n\nimport * as base64 from \"./base64\";\n\nimport * as BlueCore from \"./BlueCore_pb\";\nimport * as BlueLock from \"./BlueLock_pb\";\nimport * as BlueSDK from \"./BlueSDK_pb\";\nimport * as BlueSystem from \"./BlueSystem_pb\";\n\nconst protoModules = [BlueCore, BlueLock, BlueSDK, BlueSystem];\n\nconst getMessageClass = (messageTypeName: string): any => {\n  for (const protoModule of protoModules) {\n    const result = (protoModule as any)[messageTypeName];\n    if (result) {\n      return result;\n    }\n  }\n\n  throw new Error(\n    `No message class found for message type '${messageTypeName}'`\n  );\n};\n\nconst encodeArgument = (arg: any | null): any => {\n  if (arg instanceof Message) {\n    const binary = protoDelimited.enc(arg);\n\n    const binaryString: string[] = [];\n    for (let i = 0; i < binary.length; i++) {\n      binaryString.push(String.fromCharCode(binary[i]!));\n    }\n\n    const base64String = base64.encode(binaryString.join(\"\"));\n    return `message:${base64String}`;\n  }\n  return arg;\n};\n\nconst decodeResult = (\n  messageTypeName: string,\n  messageString: string | null\n): any => {\n  const MessageClass = getMessageClass(messageTypeName);\n\n  if (messageString == null || !messageString.startsWith(\"message:\")) {\n    throw new Error(`Invalid message to decode: '${messageString}'`);\n  }\n\n  const binary = Uint8Array.from(\n    base64.decode(messageString.substring(\"message:\".length)),\n    (v: string) => v.charCodeAt(0)\n  );\n\n  return protoDelimited.dec(MessageClass, binary);\n};\n\nexport interface BlueAccessTerminalRequest {\n  action: string;\n  data: any | null;\n  resultMessageTypeName: string | null;\n}\n\nexport interface BlueAccessTerminalResult {\n  statusCode: BlueCore.BlueReturnCode;\n  data: any | null;\n}\n\nexport interface RunCommandOptions {\n  command: string;\n  arg0: any | null;\n  arg1: any | null;\n  arg2: any | null;\n}\n\nexport interface TerminalRunOptions {\n  deviceID: string;\n  timeoutSeconds: number;\n  requests: BlueAccessTerminalRequest[];\n}\n\nexport interface TerminalRunResult {\n  results: BlueAccessTerminalResult[];\n}\n\nexport interface BlueAccessListener {\n  remove(): Promise<void>;\n}\n\nexport class BlueIDAccessInterop {\n  runCommandFunc: (options: RunCommandOptions) => Promise<any>;\n  terminalRunFunc: (options: TerminalRunOptions) => Promise<TerminalRunResult>;\n  addListenerFunc: (event: string, callback: (data: any) => void) => Promise<BlueAccessListener>;\n\n  constructor(\n    runCommandFunc: (options: RunCommandOptions) => Promise<any>,\n    terminalRunFunc: (options: TerminalRunOptions) => Promise<TerminalRunResult>,\n    addListenerFunc: (event: string, callback: (data: any) => void) => Promise<BlueAccessListener>\n  ) {\n    this.runCommandFunc = runCommandFunc;\n    this.terminalRunFunc = terminalRunFunc;\n    this.addListenerFunc = addListenerFunc;\n  }\n\n  async runCommand(\n    command: string,\n    arg0: any | null = null,\n    arg1: any | null = null,\n    arg2: any | null = null\n  ): Promise<any | void> {\n    if (!command) {\n      throw new Error(\"Missing valid command\");\n    }\n\n    const result = await this.runCommandFunc({\n      command,\n      arg0: encodeArgument(arg0),\n      arg1: encodeArgument(arg1),\n      arg2: encodeArgument(arg2),\n    });\n\n    if (!result) {\n      return null;\n    }\n\n    if (result.data && result.messageTypeName) {\n      return decodeResult(result.messageTypeName, result.data);\n    }\n\n    return result.data;\n  }\n\n  async terminalRunAll(\n    deviceID: string,\n    requests: BlueAccessTerminalRequest[],\n    timeoutSeconds = 10.0,\n  ): Promise<BlueAccessTerminalResult[]> {\n    if (!deviceID) {\n      throw new Error(\"Invalid deviceID\");\n    }\n\n    if (timeoutSeconds <= 0) {\n      throw new Error(\"Invalid timeout\");\n    }\n\n    if (!requests.length) {\n      throw new Error(\"Invalid requests\");\n    }\n\n    const convertedRequests: BlueAccessTerminalRequest[] = requests.map(\n      ({ data, ...otherProps }) => ({\n        ...otherProps,\n        data: encodeArgument(data),\n      })\n    );\n\n    const runResult = await this.terminalRunFunc({\n      deviceID,\n      timeoutSeconds,\n      requests: convertedRequests,\n    });\n\n    if (!runResult?.results?.length) {\n      throw new Error(\"No results received\");\n    }\n\n    const results: BlueAccessTerminalResult[] = [];\n\n    for (let index = 0; index < runResult.results.length; index += 1) {\n      const request = convertedRequests[index];\n\n      if (!request) {\n        throw new Error(\"Invalid request\");\n      }\n\n      const result = runResult.results[index];\n\n      if (!result) {\n        throw new Error(\"Invalid result\");\n      }\n\n      if (request.resultMessageTypeName) {\n        results.push({\n          statusCode: result.statusCode,\n          data: decodeResult(request.resultMessageTypeName, result.data),\n        });\n      } else if (\n        typeof result.data === \"string\" &&\n        result.data.startsWith(\"message:\") &&\n        result.data !== \"message:\"\n      ) {\n        throw new Error(\n          `Missing resultMessageTypeName for action '${request.action}'`\n        );\n      } else {\n        results.push({ statusCode: result.statusCode, data: result.data });\n      }\n    }\n\n    return results;\n  }\n\n  async terminalRun(\n    deviceID: string,\n    request: BlueAccessTerminalRequest,\n    timeoutSeconds = 10.0,\n  ): Promise<BlueAccessTerminalResult> {\n    const results = await this.terminalRunAll(deviceID, [request], timeoutSeconds);\n    \n    if (results?.length !== 1 || !results[0]) {\n      throw new Error('Unexpected results');\n    }\n\n    return results[0];\n  }\n\n  async addListener(event: string, callback: (data: any) => void): Promise<BlueAccessListener> {\n    if (this.addListenerFunc) {\n      return this.addListenerFunc(event, (data: any) => {\n        let eventData = data;\n\n        if (eventData?.data && eventData?.messageTypeName) {\n          eventData = decodeResult(eventData.messageTypeName, eventData.data);\n        }\n\n        callback(eventData);\n      });\n    }\n    throw new Error('No listeners supported.');\n  }\n}\n\nexport * from \"./BlueCore_pb\";\nexport * from \"./BlueLock_pb\";\nexport * from \"./BlueSDK_pb\";\nexport * from \"./BlueSystem_pb\";\n"]}
+{"version":3,"file":"interop.js","sourceRoot":"","sources":["../../src/interop.ts"],"names":[],"mappings":"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","sourcesContent":["//\n// Utilities shared for typescript json-interfaces like react-native and capacitor\n//\n\nimport { Message, protoDelimited } from \"@bufbuild/protobuf\";\n\nimport * as base64 from \"./base64\";\n\nimport * as BlueCore from \"./BlueCore_pb\";\nimport * as BlueLock from \"./BlueLock_pb\";\nimport * as BlueSDK from \"./BlueSDK_pb\";\nimport * as BlueSystem from \"./BlueSystem_pb\";\n\nconst protoModules = [BlueCore, BlueLock, BlueSDK, BlueSystem];\n\nconst getMessageClass = (messageTypeName: string): any => {\n  for (const protoModule of protoModules) {\n    const result = (protoModule as any)[messageTypeName];\n    if (result) {\n      return result;\n    }\n  }\n\n  throw new Error(\n    `No message class found for message type '${messageTypeName}'`\n  );\n};\n\nconst encodeArgument = (arg: any | null): any => {\n  if (arg instanceof Message) {\n    const binary = protoDelimited.enc(arg);\n\n    const binaryString: string[] = [];\n    for (let i = 0; i < binary.length; i++) {\n      binaryString.push(String.fromCharCode(binary[i]!));\n    }\n\n    const base64String = base64.encode(binaryString.join(\"\"));\n    return `message:${base64String}`;\n  }\n  return arg;\n};\n\nconst decodeResult = (\n  messageTypeName: string,\n  messageString: string | null\n): any => {\n  const MessageClass = getMessageClass(messageTypeName);\n\n  if (messageString == null || !messageString.startsWith(\"message:\")) {\n    throw new Error(`Invalid message to decode: '${messageString}'`);\n  }\n\n  const binary = Uint8Array.from(\n    base64.decode(messageString.substring(\"message:\".length)),\n    (v: string) => v.charCodeAt(0)\n  );\n\n  return protoDelimited.dec(MessageClass, binary);\n};\n\nexport interface BlueAccessTerminalRequest {\n  action: string;\n  data: any | null;\n  resultMessageTypeName: string | null;\n}\n\nexport interface BlueAccessTerminalResult {\n  statusCode: BlueCore.BlueReturnCode;\n  data: any | null;\n}\n\nexport interface RunCommandOptions {\n  command: string;\n  arg0: any | null;\n  arg1: any | null;\n  arg2: any | null;\n}\n\nexport interface TerminalRunOptions {\n  deviceID: string;\n  timeoutSeconds: number;\n  requests: BlueAccessTerminalRequest[];\n}\n\nexport interface TerminalRunResult {\n  results: BlueAccessTerminalResult[];\n}\n\nexport interface BlueAccessListener {\n  remove(): Promise<void>;\n}\n\nexport class BlueIDAccessInterop {\n  runCommandFunc: (options: RunCommandOptions) => Promise<any>;\n  terminalRunFunc: (options: TerminalRunOptions) => Promise<TerminalRunResult>;\n  addListenerFunc: (event: string, callback: (data: any) => void) => Promise<BlueAccessListener>;\n\n  constructor(\n    runCommandFunc: (options: RunCommandOptions) => Promise<any>,\n    terminalRunFunc: (options: TerminalRunOptions) => Promise<TerminalRunResult>,\n    addListenerFunc: (event: string, callback: (data: any) => void) => Promise<BlueAccessListener>\n  ) {\n    this.runCommandFunc = runCommandFunc;\n    this.terminalRunFunc = terminalRunFunc;\n    this.addListenerFunc = addListenerFunc;\n  }\n\n  async runCommand(\n    command: string,\n    arg0: any | null = null,\n    arg1: any | null = null,\n    arg2: any | null = null\n  ): Promise<any | void> {\n    if (!command) {\n      throw new Error(\"Missing valid command\");\n    }\n\n    console.log('Starting command: '+ JSON.stringify(command));\n\n    const result = await this.runCommandFunc({\n      command,\n      arg0: encodeArgument(arg0),\n      arg1: encodeArgument(arg1),\n      arg2: encodeArgument(arg2),\n    });\n\n    console.log('Running command with result : '+ JSON.stringify(result));\n\n    if (!result) {\n      return null;\n    }\n\n    if (result.data && result.messageTypeName) {\n      return decodeResult(result.messageTypeName, result.data);\n    }\n\n    console.log('result from interop '+ command + ' : ' + JSON.stringify(result.data));\n\n    return result.data;\n  }\n\n  async terminalRunAll(\n    deviceID: string,\n    requests: BlueAccessTerminalRequest[],\n    timeoutSeconds = 10.0,\n  ): Promise<BlueAccessTerminalResult[]> {\n    if (!deviceID) {\n      throw new Error(\"Invalid deviceID\");\n    }\n\n    if (timeoutSeconds <= 0) {\n      throw new Error(\"Invalid timeout\");\n    }\n\n    if (!requests.length) {\n      throw new Error(\"Invalid requests\");\n    }\n\n    const convertedRequests: BlueAccessTerminalRequest[] = requests.map(\n      ({ data, ...otherProps }) => ({\n        ...otherProps,\n        data: encodeArgument(data),\n      })\n    );\n\n    const runResult = await this.terminalRunFunc({\n      deviceID,\n      timeoutSeconds,\n      requests: convertedRequests,\n    });\n\n    if (!runResult?.results?.length) {\n      throw new Error(\"No results received\");\n    }\n\n    const results: BlueAccessTerminalResult[] = [];\n\n    for (let index = 0; index < runResult.results.length; index += 1) {\n      const request = convertedRequests[index];\n\n      if (!request) {\n        throw new Error(\"Invalid request\");\n      }\n\n      const result = runResult.results[index];\n\n      if (!result) {\n        throw new Error(\"Invalid result\");\n      }\n\n      if (request.resultMessageTypeName) {\n        results.push({\n          statusCode: result.statusCode,\n          data: decodeResult(request.resultMessageTypeName, result.data),\n        });\n      } else if (\n        typeof result.data === \"string\" &&\n        result.data.startsWith(\"message:\") &&\n        result.data !== \"message:\"\n      ) {\n        throw new Error(\n          `Missing resultMessageTypeName for action '${request.action}'`\n        );\n      } else {\n        results.push({ statusCode: result.statusCode, data: result.data });\n      }\n    }\n\n    return results;\n  }\n\n  async terminalRun(\n    deviceID: string,\n    request: BlueAccessTerminalRequest,\n    timeoutSeconds = 10.0,\n  ): Promise<BlueAccessTerminalResult> {\n    const results = await this.terminalRunAll(deviceID, [request], timeoutSeconds);\n    \n    if (results?.length !== 1 || !results[0]) {\n      throw new Error('Unexpected results');\n    }\n\n    return results[0];\n  }\n\n  async addListener(event: string, callback: (data: any) => void): Promise<BlueAccessListener> {\n    if (this.addListenerFunc) {\n      return this.addListenerFunc(event, (data: any) => {\n        let eventData = data;\n\n        if (eventData?.data && eventData?.messageTypeName) {\n          eventData = decodeResult(eventData.messageTypeName, eventData.data);\n        }\n\n        callback(eventData);\n      });\n    }\n    throw new Error('No listeners supported.');\n  }\n}\n\nexport * from \"./BlueCore_pb\";\nexport * from \"./BlueLock_pb\";\nexport * from \"./BlueSDK_pb\";\nexport * from \"./BlueSystem_pb\";\n"]}

package/dist/plugin.cjs.js

@@ -4215,18 +4215,21 @@ class BlueIDAccessInterop {
         if (!command) {
             throw new Error("Missing valid command");
         }
+        console.log('Starting command: ' + JSON.stringify(command));
         const result = await this.runCommandFunc({
             command,
             arg0: encodeArgument(arg0),
             arg1: encodeArgument(arg1),
             arg2: encodeArgument(arg2),
         });
+        console.log('Running command with result : ' + JSON.stringify(result));
         if (!result) {
             return null;
         }
         if (result.data && result.messageTypeName) {
             return decodeResult(result.messageTypeName, result.data);
         }
+        console.log('result from interop ' + command + ' : ' + JSON.stringify(result.data));
         return result.data;
     }
     async terminalRunAll(deviceID, requests, timeoutSeconds = 10.0) {