@moxtradeveloper/react-native-moxo-module 9.8.6 → 10.1.3

package/README.md

@@ -56,6 +56,25 @@ install! 'cocoapods', :deterministic_uuids => false
 # Rest of the file.....
 ```
 
+Exception: 
+![pod_error](./docs/pod_error.png)
+if you getting this error post moxo plugin installation, please also add master cocoapod repo as source into Podfile under your iOS project.
+Usually is https://github.com/CocoaPods/Specs.git
+
+```ruby
+require_relative '../node_modules/react-native/scripts/react_native_pods'
+require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+#Add moxo source here
+source 'https://maven.moxtra.com/repo/moxtra-specs.git'
+source 'https://github.com/CocoaPods/Specs.git'
+
+#Change platform version if is not iOS 13
+platform :ios, '13.0'
+install! 'cocoapods', :deterministic_uuids => false
+
+# Rest of the file.....
+```
+
 ## Initialization
 
 ### Login

package/android/build.gradle

@@ -148,7 +148,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.moxtra:mep-sdk:9.8.6"
+  implementation "com.moxtra:mep-sdk:10.1.3"
 // From node_modules
 }
 

package/android/gradle.properties

@@ -1,5 +1,5 @@
-MoxoModule_kotlinVersion=1.9.0
+MoxoModule_kotlinVersion=1.7.0
 MoxoModule_minSdkVersion=21
-MoxoModule_targetSdkVersion=34
-MoxoModule_compileSdkVersion=34
+MoxoModule_targetSdkVersion=31
+MoxoModule_compileSdkVersion=31
 MoxoModule_ndkversion=21.4.7075529

package/android/src/main/java/com/moxomodule/MoxoModuleModule.kt

@@ -7,8 +7,11 @@ import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.moxtra.mepsdk.MEPClient
 import com.moxtra.mepsdk.MEPClientDelegate
+import com.moxtra.mepsdk.data.MEPStartMeetOptions
 import com.moxtra.sdk.LinkConfig
+import com.moxtra.sdk.common.ActionListener
 import com.moxtra.sdk.common.ApiCallback
+import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
@@ -20,7 +23,8 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
   private var mReactContext = reactContext
 
   private val UNREAD_MSG_EVENT = "onUnreadMessageCountUpdated"
-
+  private val TAP_WINDOW_CLOSE_EVENT = "tapWindowCloseEvent"
+  
   override fun getName(): String {
     return NAME
   }
@@ -30,17 +34,15 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
     Log.d(TAG, "setup called with domain: $domain, options: $options")
     var linkConfig: LinkConfig? = null
     try {
-      if (domain != null) {
-        if (options != null && options is String) {
+      if (!domain.isNullOrEmpty() && !options.isNullOrEmpty()) {
           linkConfig = LinkConfig()
           val jsonObject = JSONObject(options)
           val certOrgName: String? = jsonObject.getString("certOrgName")
           val certPublicKey: String? = jsonObject.getString("certPublicKey")
           val ignoreBadCert: Boolean = jsonObject.getBoolean("ignoreBadCert")
-          linkConfig.setCertOrganization(certOrgName)
-          linkConfig.setCertPublicKey(certPublicKey)
-          linkConfig.setIgnoreBadCert(ignoreBadCert)
-        }
+        linkConfig.certOrganization = certOrgName
+        linkConfig.certPublicKey = certPublicKey
+        linkConfig.isIgnoreBadCert = ignoreBadCert
       }
     } catch (e: JSONException) {
 
@@ -49,16 +51,13 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
     mReactContext.runOnUiQueueThread {
       MEPClient.initialize(mReactContext?.applicationContext as Application)
       MEPClient.setupDomain(domain, linkConfig)
-
-      //setup callbacks
-      onUnreadMessageCountUpdated()
     }
   }
 
   @ReactMethod
   fun link(token: String?, promise: Promise?) {
     Log.d(TAG, "link called with token: $token")
-    if (token == null || token.isEmpty()) {
+    if (token.isNullOrEmpty()) {
       promise?.reject("-1", "token is empty or null")
       return
     }
@@ -136,7 +135,7 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
       promise?.reject("-1", "Not linked")
       return
     }
-    if (chatId?.isEmpty() == false) {
+    if (!chatId.isNullOrEmpty()) {
       MEPClient.openChat(chatId, feedSequence?.toLong() ?: 0, object : ApiCallback<Void?> {
         override fun onCompleted(rult: Void?) {
           Log.d(TAG, "openChat successful...")
@@ -177,9 +176,9 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
         )
       }
     }
-    if (uniqueId?.isEmpty() == false) {
+    if (!uniqueId.isNullOrEmpty()) {
       MEPClient.openRelationChat(uniqueId, callback)
-    } else if (email?.isEmpty() == false) {
+    } else if (!email.isNullOrEmpty()) {
       MEPClient.openRelationChatWithEmail(email, callback)
     } else {
       promise?.reject("-1", "Invalid parameter")
@@ -196,8 +195,19 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
 
     MEPClient.getClientDelegate().setOnUnreadMessageListener(listener)
   }
+  
+  private fun onTapWindowClose() {
+    Log.d(TAG, "onTapWindowClose called...")
+    val listener: ActionListener<Void> = ActionListener { _, _ ->
+      run {
+        Log.d(TAG, "onTapWindowClose button clicked...")
+        sendEvent(mReactContext, TAP_WINDOW_CLOSE_EVENT, null)
+      }
+    }
+    MEPClient.getClientDelegate().setOnCloseButtonListener(listener)
+  }
 
-  private fun sendEvent(reactContext: ReactContext, eventName: String, params: Int?) {
+  private fun sendEvent(reactContext: ReactContext, eventName: String, params: Any?) {
     reactContext
       .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
       .emit(eventName, params)
@@ -206,6 +216,10 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun addListener(eventName: String) {
     Log.d(TAG, "addListener called...")
+    when (eventName) {
+        TAP_WINDOW_CLOSE_EVENT ->
+           onTapWindowClose()
+    }
   }
 
   @ReactMethod
@@ -219,7 +233,7 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
       TAG,
       "registerNotification called and token is " + (if (deviceToken == null) "null" else "not null")
     )
-    if (deviceToken != null) {
+    if (!deviceToken.isNullOrEmpty()) {
             MEPClient.registerNotification(
                 deviceToken,
         null, null, null,
@@ -265,7 +279,7 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
                   else -> continue
                 }
               }
-              promise?.resolve(jsonObject.toString())
+              promise?.resolve(json2WritableNativeMap(jsonObject))
             }
 
             override fun onError(errorCode: Int, errorMsg: String?) {
@@ -316,6 +330,55 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
     }
   }
 
+    @ReactMethod
+  fun startMeet(topic: String, options: ReadableMap?, promise: Promise?) {
+    Log.d(TAG, "startMeet called with topic: $topic, options:" + options?.toString())
+    if (topic.isNullOrEmpty()) {
+      promise?.reject("-1", "Topic is empty!")
+      return
+    }
+
+    var callback: ApiCallback<String> = object : ApiCallback<String> {
+      override fun onCompleted(sessionId: String) {
+        Log.d(TAG, "startMeet success ...")
+        val jsonObject = JSONObject()
+        with(jsonObject) {
+          put("session_id", sessionId)
+        }
+        promise?.resolve(json2WritableNativeMap(jsonObject))
+      }
+
+      override fun onError(errorCode: Int, errorMsg: String?) {
+        Log.w(TAG, "startMeet failed with $errorCode and $errorMsg ...")
+        promise?.reject(errorCode.toString(), "startMeet failed with $errorCode and $errorMsg")
+      }
+    }
+
+    //map to MEPStartMeetOptions
+    var mepStartMeetOptions = MEPStartMeetOptions()
+    mepStartMeetOptions.topic = topic
+
+    var mapValues = options?.entryIterator;
+    while (mapValues?.hasNext() == true) {
+      var mapEntry = mapValues.next()
+      when (mapEntry.key) {
+        "chat_id" -> mepStartMeetOptions.chatID = mapEntry.value.toString()
+        "auto_join_audio" -> mepStartMeetOptions.setAutoJoinAudio(mapEntry.value as Boolean)
+        "auto_start_video" -> mepStartMeetOptions.setAutoStartVideo(mapEntry.value as Boolean)
+        "auto_recording" -> mepStartMeetOptions.isAutoRecordingEnabled = mapEntry.value as Boolean
+        "instant_call" -> mepStartMeetOptions.setInstantCall(mapEntry.value as Boolean)
+        "unique_ids" -> {
+          val ids = mapEntry.value
+          if (ids is ReadableNativeArray) {
+            ids.toArrayList().also { mepStartMeetOptions.uniqueIDs = it as ArrayList<String> }
+          }
+        }
+      }
+    }
+
+    MEPClient.startMeet(mepStartMeetOptions, callback)
+  }
+
   private fun json2Intent(jsonObject: JSONObject?): Intent {
     var intent = Intent()
     var keys = jsonObject?.keys();
@@ -341,6 +404,61 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
     return intent
   }
 
+ private fun json2WritableNativeMap(jsonObject: JSONObject?): WritableNativeMap {
+    val writableMap = WritableNativeMap()
+    jsonObject?.let {
+      for (key in jsonObject.keys()) {
+        when (val value = jsonObject.get(key)) {
+          is JSONObject -> {
+            writableMap.putMap(key, json2WritableNativeMap(value))
+          }
+
+          is JSONArray -> {
+            writableMap.putArray(key, json2WritableNativeArray(value))
+          }
+
+          is String -> {
+            writableMap.putString(key, value)
+          }
+
+          is Boolean -> {
+            writableMap.putBoolean(key, value)
+          }
+
+          is Double -> {
+            writableMap.putDouble(key, value)
+          }
+
+          is Int -> {
+            writableMap.putInt(key, value)
+          }
+
+          is Long -> {
+            writableMap.putDouble(key, value.toDouble());
+          }
+
+          else -> {
+            writableMap.putString(key, value.toString())
+          }
+        }
+      }
+    }
+    return writableMap
+  }
+
+  private fun json2WritableNativeArray(jsonArray: JSONArray?): WritableNativeArray {
+    val writableArray = WritableNativeArray()
+    jsonArray?.let {
+      for (i in 0 until jsonArray.length()) {
+        val jsonObject = jsonArray.get(i)
+        if (jsonObject is JSONObject) {
+          writableArray.pushMap(json2WritableNativeMap(jsonObject))
+        }
+      }
+    }
+    return writableArray
+  }
+
   companion object {
     const val NAME = "MoxoModule"
   }

package/ios/MoxoModule.m

@@ -16,6 +16,10 @@ RCT_EXTERN_METHOD(openChat:(NSString *)chatId
 RCT_EXTERN_METHOD(openRelation:(NSDictionary *)user
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(startMeet:(NSString *)topic
+                 options:(NSDictionary *)options
+                 withResolver:(RCTPromiseResolveBlock)resolve
+                 withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(getUnreadMessageCount:(NSDictionary *)options
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)

package/ios/MoxoModule.swift

@@ -3,6 +3,7 @@ class MoxoModule: RCTEventEmitter, MEPClientDelegate {
     let default_error_code = 999
     let default_error_message = "invalid parameters"
     let unread_message_event = "onUnreadMessageCountUpdated"
+    let tap_close_event = "tapWindowCloseEvent"
     private var onUnreadMessageCountUpdated:RCTResponseSenderBlock? = nil;
     
     override class func moduleName() -> String! {
@@ -102,6 +103,28 @@ class MoxoModule: RCTEventEmitter, MEPClientDelegate {
         let ret = MEPClient.sharedInstance().getUnreadMessageCount()
         resolve(ret)
     }
+  
+    @objc(startMeet:options:withResolver:withRejecter:)
+    func startMeet(topic: String, options:Dictionary<String, Any>,resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
+        DispatchQueue.main.async {
+            let meetOption = MEPStartMeetOptions()
+            meetOption.topic = topic
+            meetOption.chatID = options["chat_id"] as? String ?? nil
+            meetOption.uniqueIDs = options["unique_ids"] as? Array ?? nil
+            meetOption.autoJoinAudio = options["auto_join_audio"] as? Bool ?? true
+            meetOption.autoStartVideo = options["auto_start_video"] as? Bool ?? false
+            meetOption.autoRecording = options["auto_recording"] as? Bool ?? false
+            meetOption.instantCall = options["instant_call"] as? Bool ?? false
+            MEPClient.sharedInstance().startMeet(withOption: meetOption) { error, meetId in
+                if let err = error as? NSError {
+                    reject("\(err.code)", err.localizedDescription, error)
+                } else {
+                    let ret = ["session_id": meetId]
+                    resolve(ret)
+                }
+            }
+        }
+    }
     
     //MARK: Notification
     @objc(registerNotification:withResolver:withRejecter:)
@@ -133,9 +156,13 @@ class MoxoModule: RCTEventEmitter, MEPClientDelegate {
         sendEvent(withName: unread_message_event, body: unreadCount)
     }
     
+    func client(_ client: MEPClient, didTapClose sender: Any?) {
+        sendEvent(withName: tap_close_event, body: nil)
+    }
+    
     //MARK: RCTBridgeModule
     override func supportedEvents() -> [String]! {
-        return [unread_message_event]
+        return [unread_message_event, tap_close_event]
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moxtradeveloper/react-native-moxo-module",
-  "version": "9.8.6",
+  "version": "10.1.3",
   "description": "Plugin for adding Moxtra services to react-native Apps.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -57,6 +57,7 @@
   },
   "devDependencies": {
     "@react-native-community/eslint-config": "^3.0.2",
+    "@release-it/conventional-changelog": "^5.0.0",
     "@types/jest": "^28.1.2",
     "@types/react": "~17.0.21",
     "@types/react-native": "0.70.0",
@@ -70,12 +71,10 @@
     "react": "18.1.0",
     "react-native": "0.70.6",
     "react-native-builder-bob": "^0.20.0",
+    "release-it": "^15.0.0",
     "typedoc": "^0.24.8",
     "typescript": "^4.5.2"
   },
-  "overrides": {
-    "semver": "^7.5.3"
-  },
   "resolutions": {
     "@types/react": "17.0.21"
   },
@@ -99,6 +98,23 @@
       "@commitlint/config-conventional"
     ]
   },
+  "release-it": {
+    "git": {
+      "commitMessage": "chore: release ${version}",
+      "tagName": "v${version}"
+    },
+    "npm": {
+      "publish": true
+    },
+    "github": {
+      "release": true
+    },
+    "plugins": {
+      "@release-it/conventional-changelog": {
+        "preset": "angular"
+      }
+    }
+  },
   "eslintConfig": {
     "root": true,
     "extends": [
@@ -143,4 +159,4 @@
       ]
     ]
   }
-}
+}

package/react-native-moxo-module.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.public_header_files = 'ios/*.h'
   s.swift_version = '5.0'
   s.dependency "React-Core"
-  s.dependency 'MEPSDKDylib', '~> 9.8.6'
+  s.dependency 'MEPSDKDylib', '~> 10.1.3'
 
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

package/src/index.tsx

@@ -5,6 +5,7 @@ const LINKING_ERROR =
   '- You rebuilt the app after installing the package\n' +
   '- You are not using Expo Go\n';
 const UNREAD_MSG_EVENT = "onUnreadMessageCountUpdated";
+const TAP_WINDOW_CLOSE_EVENT = "tapWindowCloseEvent";
 
 const MoxoModule = NativeModules.MoxoModule
   ? NativeModules.MoxoModule
@@ -149,3 +150,34 @@ export function showMeetRinger(sessionId:string): Promise<object>  {
   return MoxoModule.showMeetRinger(sessionId);
 }
 
+/**
+ * Start meet with options.
+ * 
+ * @param topic   Topic of meeting
+ * @param options Start meet options.
+ *  {
+ *    "unique_ids": ["unique_id_a", "unique_id_b", ...],  //user unique id array
+ *    "chat_id":"chat_id",             //id of chat where this meeting will start
+ *    "auto_join_audio": true/false,   //default is true
+ *    "auto_start_video": true/false,  //default is false
+ *    "auto_recording": true/false,    //default is false
+ *    "instant_call": true/false       //default is false, set to true to enable call UI with dialer tone when start a meeting with only one user.
+ *                                     //this option only works when unique_ids got only one user, and autoJoinAudio set to true.
+ *  }
+ * @returns session id if start meet successfully:
+ *  {
+ *    "session_id": "255576178"
+ *  }
+ */
+export function startMeet(topic: string, options?: object): Promise<object> {
+  return MoxoModule.startMeet(topic, options);
+}
+
+/**
+ * Set the callback when user tap close button on MEP window
+ * You should call hideMEPWindow() to hide MEP window in this callback if you want to hide MEP window
+*/
+export function onTapWindowClose(callback: () => void) {
+  MoxoEventEmitter.addListener(TAP_WINDOW_CLOSE_EVENT, callback);
+}
+