tirtc-react-native 2.4.0-alpha.3 → 2.4.0-alpha.4

package/android/src/main/java/com/tange/ai/tirtc/reactnative/TiRtcReactNativeEventBinder.kt

@@ -16,43 +16,40 @@ import com.tange.ai.tirtc.TiRtcVideoOutput
 import com.tange.ai.tirtc.TiRtcVideoOutputErrorListener
 import com.tange.ai.tirtc.TiRtcVideoOutputRenderSizeListener
 import com.tange.ai.tirtc.TiRtcVideoOutputStateListener
-import com.tange.ai.tirtc.TiStore
-import com.tange.ai.tirtc.TiStoreAudioOutput
-import com.tange.ai.tirtc.TiStoreAudioOutputStateListener
-import com.tange.ai.tirtc.TiStoreOutputErrorListener
-import com.tange.ai.tirtc.TiStoreReplay
-import com.tange.ai.tirtc.TiStoreReplayCompletedListener
-import com.tange.ai.tirtc.TiStoreReplayErrorListener
-import com.tange.ai.tirtc.TiStoreTimeChangedListener
-import com.tange.ai.tirtc.TiStoreTokenExpiredListener
-import com.tange.ai.tirtc.TiStoreVideoOutput
-import com.tange.ai.tirtc.TiStoreVideoOutputStateListener
+import com.tange.ai.tirtc.TiCloudStorage
+import com.tange.ai.tirtc.TiCloudStorageAudioOutput
+import com.tange.ai.tirtc.TiCloudStorageAudioOutputStateListener
+import com.tange.ai.tirtc.TiCloudStorageOutputErrorListener
+import com.tange.ai.tirtc.TiCloudStorageReplay
+import com.tange.ai.tirtc.TiCloudStorageReplayCompletedListener
+import com.tange.ai.tirtc.TiCloudStorageReplayErrorListener
+import com.tange.ai.tirtc.TiCloudStorageTimeChangedListener
+import com.tange.ai.tirtc.TiCloudStorageVideoOutput
+import com.tange.ai.tirtc.TiCloudStorageVideoOutputStateListener
 
 internal class TiRtcReactNativeEventBinder(
     private val events: TiRtcReactNativeEventSink,
 ) {
-    fun wireStore(id: Int, store: TiStore) {
-        store.onTokenExpired = TiStoreTokenExpiredListener { events.storeTokenExpired(id) }
-    }
+    fun wireCloudStorage(id: Int, cloudStorage: TiCloudStorage) = Unit
 
-    fun wireStoreReplay(id: Int, replay: TiStoreReplay) {
-        replay.onTimeChanged = TiStoreTimeChangedListener { events.storeReplayTimeChanged(id, it) }
-        replay.onCompleted = TiStoreReplayCompletedListener { events.storeReplayCompleted(id) }
-        replay.onError = TiStoreReplayErrorListener { events.storeReplayError(id, it) }
+    fun wireCloudStorageReplay(id: Int, replay: TiCloudStorageReplay) {
+        replay.onTimeChanged = TiCloudStorageTimeChangedListener { events.tiCloudStorageReplayTimeChanged(id, it) }
+        replay.onCompleted = TiCloudStorageReplayCompletedListener { events.tiCloudStorageReplayCompleted(id) }
+        replay.onError = TiCloudStorageReplayErrorListener { events.tiCloudStorageReplayError(id, it) }
     }
 
-    fun wireStoreAudioOutput(id: Int, output: TiStoreAudioOutput) {
-        output.onStateChanged = TiStoreAudioOutputStateListener {
+    fun wireCloudStorageAudioOutput(id: Int, output: TiCloudStorageAudioOutput) {
+        output.onStateChanged = TiCloudStorageAudioOutputStateListener {
             events.audioOutputStateChanged(id, it.name.lowercase())
         }
-        output.onError = TiStoreOutputErrorListener { events.audioOutputError(id, it) }
+        output.onError = TiCloudStorageOutputErrorListener { events.audioOutputError(id, it) }
     }
 
-    fun wireStoreVideoOutput(id: Int, output: TiStoreVideoOutput) {
-        output.onStateChanged = TiStoreVideoOutputStateListener {
+    fun wireCloudStorageVideoOutput(id: Int, output: TiCloudStorageVideoOutput) {
+        output.onStateChanged = TiCloudStorageVideoOutputStateListener {
             events.videoOutputStateChanged(id, it.name.lowercase())
         }
-        output.onError = TiStoreOutputErrorListener { events.videoOutputError(id, it) }
+        output.onError = TiCloudStorageOutputErrorListener { events.videoOutputError(id, it) }
     }
 
     fun wireConn(

package/android/src/main/java/com/tange/ai/tirtc/reactnative/TiRtcReactNativeEventSink.kt

@@ -44,22 +44,18 @@ internal class TiRtcReactNativeEventSink(
         })
     }
 
-    fun storeTokenExpired(objectId: Int) {
-        emit(base("storeTokenExpired", objectId))
-    }
-
-    fun storeReplayTimeChanged(objectId: Int, timestampMs: Long) {
-        emit(base("storeReplayTimeChanged", objectId).apply {
+    fun tiCloudStorageReplayTimeChanged(objectId: Int, timestampMs: Long) {
+        emit(base("tiCloudStorageReplayTimeChanged", objectId).apply {
             putDouble("timestampMs", timestampMs.toDouble())
         })
     }
 
-    fun storeReplayCompleted(objectId: Int) {
-        emit(base("storeReplayCompleted", objectId))
+    fun tiCloudStorageReplayCompleted(objectId: Int) {
+        emit(base("tiCloudStorageReplayCompleted", objectId))
     }
 
-    fun storeReplayError(objectId: Int, code: Int) {
-        emit(base("storeReplayError", objectId).apply {
+    fun tiCloudStorageReplayError(objectId: Int, code: Int) {
+        emit(base("tiCloudStorageReplayError", objectId).apply {
             putInt("code", TiRtcReactNativeErrors.normalizeAndroid(code))
         })
     }

package/android/src/main/java/com/tange/ai/tirtc/reactnative/TiRtcReactNativeMaps.kt

@@ -2,8 +2,8 @@ package com.tange.ai.tirtc.reactnative
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
-import com.tange.ai.tirtc.TiStoreRecordingRange
-import com.tange.ai.tirtc.TiStoreRecordingDay
+import com.tange.ai.tirtc.TiCloudStorageRecordingRange
+import com.tange.ai.tirtc.TiCloudStorageRecordingDay
 
 internal fun recordingStartResult(code: Int, taskId: Int?): WritableMap =
     Arguments.createMap().apply {
@@ -11,7 +11,7 @@ internal fun recordingStartResult(code: Int, taskId: Int?): WritableMap =
         if (taskId == null) putNull("taskId") else putInt("taskId", taskId)
     }
 
-internal fun storeRecordingsResult(code: Int, ranges: List<TiStoreRecordingRange>): WritableMap =
+internal fun tiCloudStorageRecordingsResult(code: Int, ranges: List<TiCloudStorageRecordingRange>): WritableMap =
     Arguments.createMap().apply {
         putInt("code", code)
         putArray("recordings", Arguments.createArray().apply {
@@ -24,7 +24,7 @@ internal fun storeRecordingsResult(code: Int, ranges: List<TiStoreRecordingRange
         })
     }
 
-internal fun storeRecordingDaysResult(code: Int, days: List<TiStoreRecordingDay>): WritableMap =
+internal fun tiCloudStorageRecordingDaysResult(code: Int, days: List<TiCloudStorageRecordingDay>): WritableMap =
     Arguments.createMap().apply {
         putInt("code", code)
         putArray("days", Arguments.createArray().apply {
@@ -37,7 +37,7 @@ internal fun storeRecordingDaysResult(code: Int, days: List<TiStoreRecordingDay>
         })
     }
 
-internal fun storeReplayInfoResult(code: Int, speed: Int, currentTimeMs: Long?): WritableMap =
+internal fun tiCloudStorageReplayInfoResult(code: Int, speed: Int, currentTimeMs: Long?): WritableMap =
     Arguments.createMap().apply {
         putInt("code", code)
         putInt("speed", speed)

package/android/src/main/java/com/tange/ai/tirtc/reactnative/TiRtcReactNativeRegistry.kt

@@ -6,11 +6,11 @@ import com.tange.ai.tirtc.TiRtcConn
 import com.tange.ai.tirtc.TiRtcVideoInput
 import com.tange.ai.tirtc.TiRtcVideoOutput
 import com.tange.ai.tirtc.TiRtcRecordingTask
-import com.tange.ai.tirtc.TiStore
-import com.tange.ai.tirtc.TiStoreAudioOutput
-import com.tange.ai.tirtc.TiStoreRecordingTask
-import com.tange.ai.tirtc.TiStoreReplay
-import com.tange.ai.tirtc.TiStoreVideoOutput
+import com.tange.ai.tirtc.TiCloudStorage
+import com.tange.ai.tirtc.TiCloudStorageAudioOutput
+import com.tange.ai.tirtc.TiCloudStorageRecordingTask
+import com.tange.ai.tirtc.TiCloudStorageReplay
+import com.tange.ai.tirtc.TiCloudStorageVideoOutput
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -63,17 +63,17 @@ internal object TiRtcReactNativeRegistry {
 
     fun recordingTask(id: Int): TiRtcRecordingTask? = entries[id]?.value as? TiRtcRecordingTask
 
-    fun store(id: Int): TiStore? = entries[id]?.value as? TiStore
+    fun cloudStorage(id: Int): TiCloudStorage? = entries[id]?.value as? TiCloudStorage
 
-    fun storeReplay(id: Int): TiStoreReplay? = entries[id]?.value as? TiStoreReplay
+    fun tiCloudStorageReplay(id: Int): TiCloudStorageReplay? = entries[id]?.value as? TiCloudStorageReplay
 
-    fun storeRecordingTask(id: Int): TiStoreRecordingTask? = entries[id]?.value as? TiStoreRecordingTask
+    fun tiCloudStorageRecordingTask(id: Int): TiCloudStorageRecordingTask? = entries[id]?.value as? TiCloudStorageRecordingTask
 
-    fun storeExportTask(id: Int): StoreExportBridge? = entries[id]?.value as? StoreExportBridge
+    fun tiCloudStorageExportTask(id: Int): CloudStorageExportBridge? = entries[id]?.value as? CloudStorageExportBridge
 
-    fun storeAudioOutput(id: Int): TiStoreAudioOutput? = entries[id]?.value as? TiStoreAudioOutput
+    fun tiCloudStorageAudioOutput(id: Int): TiCloudStorageAudioOutput? = entries[id]?.value as? TiCloudStorageAudioOutput
 
-    fun storeVideoOutput(id: Int): TiStoreVideoOutput? = entries[id]?.value as? TiStoreVideoOutput
+    fun tiCloudStorageVideoOutput(id: Int): TiCloudStorageVideoOutput? = entries[id]?.value as? TiCloudStorageVideoOutput
 
     fun reportVideoOutputError(
         id: Int,

package/android/src/main/java/com/tange/ai/tirtc/reactnative/{TiRtcReactNativeStoreSupport.kt → TiRtcReactNativeStorageSupport.kt}

@@ -1,20 +1,20 @@
 package com.tange.ai.tirtc.reactnative
 
 import com.facebook.react.bridge.Promise
-import com.tange.ai.tirtc.TiStoreExportTask
-import com.tange.ai.tirtc.TiStoreRecordingResult
+import com.tange.ai.tirtc.TiCloudStorageExportTask
+import com.tange.ai.tirtc.TiCloudStorageRecordingResult
 
-internal class StoreExportBridge(
-    private val resolve: (Promise, TiStoreRecordingResult) -> Unit,
+internal class CloudStorageExportBridge(
+    private val resolve: (Promise, TiCloudStorageRecordingResult) -> Unit,
 ) {
-    @Volatile var task: TiStoreExportTask? = null
+    @Volatile var task: TiCloudStorageExportTask? = null
     @Volatile var onDrained: (() -> Unit)? = null
-    private var result: TiStoreRecordingResult? = null
+    private var result: TiCloudStorageRecordingResult? = null
     private val waiters = mutableListOf<Promise>()
     private var invalidated = false
-    private var invalidationCompletion: ((TiStoreRecordingResult?) -> Unit)? = null
+    private var invalidationCompletion: ((TiCloudStorageRecordingResult?) -> Unit)? = null
 
-    fun complete(value: TiStoreRecordingResult) {
+    fun complete(value: TiCloudStorageRecordingResult) {
         val completed = synchronized(this) {
             if (result != null) return
             result = value
@@ -40,7 +40,7 @@ internal class StoreExportBridge(
         }
     }
 
-    fun invalidate(onTerminal: (TiStoreRecordingResult?) -> Unit) {
+    fun invalidate(onTerminal: (TiCloudStorageRecordingResult?) -> Unit) {
         val completed = synchronized(this) {
             invalidated = true
             waiters.clear()

package/android/src/main/java/com/tange/ai/tirtc/reactnative/TiRtcVideoOutputViewManager.kt

@@ -88,7 +88,7 @@ class TiRtcVideoOutputViewManager :
             view.setTag(ATTACHED_GENERATION_TAG, generation)
             return
         }
-        TiRtcReactNativeRegistry.storeVideoOutput(nativeObjectId)?.let { output ->
+        TiRtcReactNativeRegistry.tiCloudStorageVideoOutput(nativeObjectId)?.let { output ->
             val code = output.attachView(view)
             if (TiRtcReactNativeErrors.normalizeAndroid(code) != TiRtcReactNativeErrors.OK) {
                 TiRtcReactNativeRegistry.reportVideoOutputError(nativeObjectId, code)
@@ -101,7 +101,7 @@ class TiRtcVideoOutputViewManager :
 
     private fun detachView(id: Int) {
         TiRtcReactNativeRegistry.videoOutput(id)?.detachView()
-            ?: TiRtcReactNativeRegistry.storeVideoOutput(id)?.detachView()
+            ?: TiRtcReactNativeRegistry.tiCloudStorageVideoOutput(id)?.detachView()
     }
 
     private fun resizeModeForView(view: FrameLayout): TiRtcVideoViewResizeMode =

package/ios/TiRtcReactNative+Conn.mm

@@ -179,14 +179,14 @@ static NSString* TiRtcReactNativeGalleryFileName(NSString* fileName, BOOL video)
   id file = [[self registry] transientObjectForId:(NSInteger)objectId];
   if (![file isKindOfClass:[TiRtcRecordingFile class]] &&
       ![file isKindOfClass:[TiRtcSnapshotFile class]] &&
-      ![file isKindOfClass:[TiStoreRecordingFile class]] &&
-      ![file isKindOfClass:[TiStoreSnapshotFile class]]) {
+      ![file isKindOfClass:[TiCloudStorageRecordingFile class]] &&
+      ![file isKindOfClass:[TiCloudStorageSnapshotFile class]]) {
     resolve(@{@"code" : @(TiRtcReactNativeErrorObjectReleased), @"uri" : (id)kCFNull});
     return;
   }
   NSString* path = [file path];
   BOOL video = [file isKindOfClass:[TiRtcRecordingFile class]] ||
-               [file isKindOfClass:[TiStoreRecordingFile class]];
+               [file isKindOfClass:[TiCloudStorageRecordingFile class]];
   NSString* normalizedName = TiRtcReactNativeGalleryFileName(fileName, video);
   if (normalizedName == nil) {
     resolve(@{@"code" : @6000, @"uri" : (id)kCFNull});
@@ -244,8 +244,8 @@ static NSString* TiRtcReactNativeGalleryFileName(NSString* fileName, BOOL video)
   id file = [[self registry] transientObjectForId:(NSInteger)objectId];
   if (![file isKindOfClass:[TiRtcRecordingFile class]] &&
       ![file isKindOfClass:[TiRtcSnapshotFile class]] &&
-      ![file isKindOfClass:[TiStoreRecordingFile class]] &&
-      ![file isKindOfClass:[TiStoreSnapshotFile class]]) {
+      ![file isKindOfClass:[TiCloudStorageRecordingFile class]] &&
+      ![file isKindOfClass:[TiCloudStorageSnapshotFile class]]) {
     resolve(@(TiRtcReactNativeErrorObjectReleased));
     return;
   }