@moxtradeveloper/react-native-moxo-module 10.11.2 → 10.13.1

package/src/index.tsx

@@ -1,48 +1,50 @@
-import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
+import { Platform } from 'react-native';
+import type { EventSubscription } from 'react-native';
+import NativeMoxoModule from './NativeMoxoModule';
+import type { Spec } from './NativeMoxoModule';
+
 const LINKING_ERROR =
   `The package 'react-native-moxo-module' doesn't seem to be linked. Make sure: \n\n` +
   Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
   '- 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
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error(LINKING_ERROR);
-        },
-      }
-    )
-const MoxoEventEmitter = new NativeEventEmitter(MoxoModule);
+
+const MoxoModule: Spec =
+  NativeMoxoModule ??
+  new Proxy({} as Spec, {
+    get() {
+      throw new Error(LINKING_ERROR);
+    },
+  });
+
 /**
  * Setup domain
  * Notice: This API MUST be invoked first before 'link'
  *
- * @param {string} baseDomain        - Your server domain
+ * @param {string} domain            - Your server domain
  * @param {object} options           - SSL cert options, sample:
  * {
  *    //SSL cert organization name. Optional, default is null.
- *    "certOrgName" : "Moxo, Inc." 
- *    
+ *    "certOrgName" : "Moxo, Inc."
+ *
  *    //SSL cert public key.
- *    "certPublicKey" : "-----BEGIN PUBLIC KEY-----\nYOUR PUBLIC KEY\n-----END PUBLIC KEY-----\n" 
- *    
+ *    "certPublicKey" : "-----BEGIN PUBLIC KEY-----\nYOUR PUBLIC KEY\n-----END PUBLIC KEY-----\n"
+ *
  *    //Ignore bad SSL cert or not. Default is true.
  *    ignoreBadCert : false
  * }
  */
-export function setup(domain: string, options?:object) {
-  return MoxoModule.setup(domain,options);
+export function setup(domain: string, options?: object) {
+  // Older Android builds accepted the options as a JSON string.
+  const linkOptions =
+    typeof options === 'string' ? JSON.parse(options) : options;
+  return MoxoModule.setup(domain, linkOptions);
 }
 
 /**
  * Link user with access token.
  * @param {string} token             - User access token
-*/
+ */
 export function link(token: string): Promise<boolean> {
   return MoxoModule.link(token);
 }
@@ -50,28 +52,28 @@ export function link(token: string): Promise<boolean> {
 /**
  *  Unlink user.
  * @param {boolean} keepNotification             - Keep notification after user unlink
-*/
+ */
 export function unlink(keepNotification: boolean = false) {
   return MoxoModule.unlink(keepNotification);
 }
 
 /**
  * Show mep main window.
-*/
+ */
 export function showMEPWindow() {
   return MoxoModule.showMEPWindow();
 }
 
 /**
  * Hide mep main window.
-*/
+ */
 export function hideMEPWindow() {
   return MoxoModule.hideMEPWindow();
 }
 
 /**
  * Change language, language code should follow ISO 639-1 standard.
-*/
+ */
 export function changeLanguage(language: string) {
   return MoxoModule.changeLanguage(language);
 }
@@ -80,20 +82,23 @@ export function changeLanguage(language: string) {
  * Open chat with chat Id and scroll to the specified feed
  * @param {string} chatId             - Id of chat.
  * @param {number} feedSequence       - Sequence of feed.
-*/
-export function openChat(chatId: string, feedSequence:number): Promise<boolean> {
-  return MoxoModule.openChat(chatId,feedSequence);
+ */
+export function openChat(
+  chatId: string,
+  feedSequence: number
+): Promise<boolean> {
+  return MoxoModule.openChat(chatId, feedSequence);
 }
 
 /**
  * Open relation chat with user
- * @param {object} options             - User object, includes either uniqueId or email of target relation user, sample: 
+ * @param {object} options             - User object, includes either uniqueId or email of target relation user, sample:
  * {
- *    "uniqueId" : "user_unique_id_1" 
- *    //or 
+ *    "uniqueId" : "user_unique_id_1"
+ *    //or
  *    "email" : "user_email "
  * }
-*/
+ */
 export function openRelation(options: object): Promise<boolean> {
   return MoxoModule.openRelation(options);
 }
@@ -101,8 +106,8 @@ export function openRelation(options: object): Promise<boolean> {
 /**
  *  Get unread message count of current user.
  * @param {object} options             - Reserved option.
-*/
-export function getUnreadMessageCount(options?:object): Promise<number> {
+ */
+export function getUnreadMessageCount(options?: object): Promise<number> {
   return MoxoModule.getUnreadMessageCount(options);
 }
 
@@ -110,17 +115,19 @@ export function getUnreadMessageCount(options?:object): Promise<number> {
  * Set the callback when unread messages count updated
  *
  * @param {function} callback   - Would be invoked when user unread messages count updated, with an integer parameter which represents unread messages count post update
-*/
-export function onUnreadMessageCountUpdated(callback:(count:number) => void) {
-  MoxoEventEmitter.addListener(UNREAD_MSG_EVENT,callback);
+ */
+export function onUnreadMessageCountUpdated(
+  callback: (count: number) => void
+): EventSubscription {
+  return MoxoModule.onUnreadMessageCountUpdated(callback);
 }
 
 /**
- * Register Moxo notification with device token 
+ * Register Moxo notification with device token
  *
  * @param {string} deviceToken   - Device token
-*/
-export function registerNotification(deviceToken:string) {
+ */
+export function registerNotification(deviceToken: string) {
   return MoxoModule.registerNotification(deviceToken);
 }
 
@@ -137,22 +144,24 @@ export function registerNotification(deviceToken:string) {
  *  }
  *
  * @param {object} payload   - Notification payload
-*/
-export function parseNotification(payload:object): Promise<object>  {
+ */
+export function parseNotification(payload: object): Promise<object> {
   return MoxoModule.parseNotification(payload);
 }
 
 /**
  * Show meet ringer with session Id. For Android only.
- * @param {string} sessionId   - session Id 
-*/
-export function showMeetRinger(sessionId:string): Promise<object>  {
-  return MoxoModule.showMeetRinger(sessionId);
+ * @param {string} sessionId   - session Id
+ */
+export function showMeetRinger(sessionId: string): Promise<object> {
+  return MoxoModule.showMeetRinger(
+    sessionId
+  ) as Promise<unknown> as Promise<object>;
 }
 
 /**
  * Start meet with options.
- * 
+ *
  * @param topic   Topic of meeting
  * @param options Start meet options.
  *  {
@@ -176,8 +185,9 @@ export function startMeet(topic: string, options?: object): Promise<object> {
 /**
  * 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);
+ */
+export function onTapWindowClose(callback: () => void): EventSubscription {
+  const subscription = MoxoModule.onTapWindowClose(callback);
+  MoxoModule.enableTapWindowCloseEvent();
+  return subscription;
 }
-

package/android/src/main/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    >
-
-</manifest>

package/ios/MoxoModule-Bridging-Header.h

@@ -1,4 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-#import <React/RCTEventEmitter.h>
-#import "MoxoModuleBridge.h"

package/ios/MoxoModule.m

@@ -1,39 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
-@interface RCT_EXTERN_MODULE(MoxoModule, RCTEventEmitter)
-RCT_EXTERN_METHOD(setup:(NSString *)domain options:(NSDictionary *)options)
-RCT_EXTERN_METHOD(link:(NSString *)token
-                 withResolver:(RCTPromiseResolveBlock)resolve
-                 withRejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(unlink:(BOOL)keepNotification)
-RCT_EXTERN_METHOD(showMEPWindow)
-RCT_EXTERN_METHOD(hideMEPWindow)
-RCT_EXTERN_METHOD(changeLanguage:(NSString *)language)
-RCT_EXTERN_METHOD(openChat:(NSString *)chatId
-                  feedSequence:(NSNumber *__nonnull)feedSequence
-                 withResolver:(RCTPromiseResolveBlock)resolve
-                 withRejecter:(RCTPromiseRejectBlock)reject)
-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)
-RCT_EXTERN_METHOD(onUnreadMessageCountUpdated:(RCTResponseSenderBlock)callback)
-RCT_EXTERN_METHOD(registerNotification:(NSString *)deviceToken
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(parseNotification:(NSDictionary *)payload
-                 withResolver:(RCTPromiseResolveBlock)resolve
-                 withRejecter:(RCTPromiseRejectBlock)reject)
-
-+ (BOOL)requiresMainQueueSetup
-{
-  return YES;
-}
-
-@end

package/ios/MoxoModule.swift

@@ -1,183 +0,0 @@
-@objc(MoxoModule)
-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! {
-        return "MoxoModule"
-    }
-    
-    @objc(setup:options:)
-    func setup(domain: String, options: Dictionary<String, Any>) {
-        MEPClient.sharedInstance().setup(withDomain: domain, linkConfig: nil)
-        MEPClient.sharedInstance().delegate = self
-    }
-
-    @objc(link:withResolver:withRejecter:)
-    func link(token: String,resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
-        MEPClient.sharedInstance().linkUser(withAccessToken: token) { error in
-            if let err = error as? NSError {
-                reject("\(err.code)", err.localizedDescription, error)
-            } else {
-                resolve(true)
-            }
-        }
-    }
-    
-    @objc(unlink:)
-    func unlink(keepNotification: Bool) {
-        DispatchQueue.main.async {
-            if (keepNotification) {
-                MEPClient.sharedInstance().localUnlink()
-            } else {
-                MEPClient.sharedInstance().unlink()
-            }
-        }
-    }
-
-    @objc(showMEPWindow)
-    func showMEPWindow() {
-        DispatchQueue.main.async {
-            MEPClient.sharedInstance().showMEPWindow()
-        }
-    }
-    
-    @objc(hideMEPWindow)
-    func hideMEPWindow() {
-        DispatchQueue.main.async {
-            MEPClient.sharedInstance().hideMEPWindow()
-        }
-    }
-    
-    @objc(changeLanguage:)
-    func changeLanguage(language:String) {
-        DispatchQueue.main.async {
-            MEPClient.sharedInstance().changeLanguage(language)
-        }
-    }
-    
-    @objc(openChat:feedSequence:withResolver:withRejecter:)
-    func openChat(chatId:String,feedSequence:NSNumber,resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            MEPClient.sharedInstance().openChat(chatId, withFeedSequence: feedSequence == 0 ? nil : feedSequence) { error in
-                if let err = error as? NSError {
-                    reject("\(err.code)", err.localizedDescription, error)
-                } else {
-                    resolve(true)
-                }
-            }
-        }
-    }
-    
-    @objc(openRelation:withResolver:withRejecter:)
-    func openRelation(user:Dictionary<String, String>,resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            if let uniqueId = user["uniqueId"] {
-                MEPClient.sharedInstance().openRelationChat(withUniqueID: uniqueId) { error in
-                    if let err = error as? NSError {
-                        reject("\(err.code)", err.localizedDescription, error)
-                    } else {
-                        resolve(true)
-                    }
-                }
-            } else if let email = user["email"] {
-                MEPClient.sharedInstance().openRelationChat(withEmail: email) { error in
-                    if let err = error as? NSError {
-                        reject("\(err.code)", err.localizedDescription, error)
-                    } else {
-                        resolve(true)
-                    }
-                }
-            } else {
-                let err = NSError(domain:MEPSDKErrorDomain, code:self.default_error_code, userInfo:[ NSLocalizedDescriptionKey: "No uniqueId or email found"])
-                reject("\(self.default_error_code)", self.default_error_message, err)
-            }
-        }
-    }
-    
-    @objc(getUnreadMessageCount:withResolver:withRejecter:)
-    func getUnreadMessageCount(options:Dictionary<String,String>, resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
-        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:)
-    func registerNotification(deviceToken:String,resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
-        if let data = Data(hex: deviceToken) {
-            MEPClient.sharedInstance().registerNotification(withDeviceToken: data) { error in
-                if let err = error as? NSError {
-                    reject("\(err.code)", err.localizedDescription, error)
-                } else {
-                    resolve(true)
-                }
-            }
-        }
-    }
-    
-    @objc(parseNotification:withResolver:withRejecter:)
-    func parseNotification(payload:Dictionary<String, Any>,resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
-        MEPClient.sharedInstance().parseRemoteNotification(payload) { error, ret in
-            if let err = error as? NSError {
-                reject("\(err.code)", err.localizedDescription, error)
-            } else {
-                resolve(ret)
-            }
-        }
-    }
-    
-    //MARK: MEPClientDelegate
-    func client(_ client: MEPClient, didUpdateUnreadCount unreadCount: UInt) {
-        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, tap_close_event]
-    }
-}
-
-extension Data {
-    init?(hex: String) {
-        guard hex.count.isMultiple(of: 2) else {
-            return nil
-        }
-        
-        let chars = hex.map { $0 }
-        let bytes = stride(from: 0, to: chars.count, by: 2)
-            .map { String(chars[$0]) + String(chars[$0 + 1]) }
-            .compactMap { UInt8($0, radix: 16) }
-        
-        guard hex.count / bytes.count == 2 else { return nil }
-        self.init(bytes)
-    }
-}