@kesha-antonov/react-native-background-downloader 4.7.0 → 5.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (79) hide show
  1. package/README.md +85 -37
  2. package/android/build.gradle +5 -1
  3. package/android/consumer-rules.pro +14 -0
  4. package/android/src/main/AndroidManifest.xml +18 -1
  5. package/android/src/main/java/com/eko/UIDTDownloadJobService.kt +5 -567
  6. package/android/src/main/java/com/eko/uidt/CancelDownloadReceiver.kt +4 -58
  7. package/android/src/main/java/com/{eko → kesha_antonov}/DownloadConstants.kt +6 -1
  8. package/android/src/main/java/com/{eko → kesha_antonov}/DownloadEventEmitter.kt +1 -1
  9. package/android/src/main/java/com/{eko → kesha_antonov}/DownloadResult.kt +1 -1
  10. package/android/src/main/java/com/{eko → kesha_antonov}/Downloader.kt +14 -7
  11. package/android/src/main/java/com/{eko → kesha_antonov}/ProgressReporter.kt +1 -1
  12. package/android/src/main/java/com/{eko → kesha_antonov}/PromiseExtensions.kt +1 -1
  13. package/android/src/main/java/com/{eko → kesha_antonov}/RNBGDTaskConfig.kt +1 -1
  14. package/android/src/main/java/com/kesha_antonov/RNBGDUploadTaskConfig.kt +57 -0
  15. package/android/src/main/java/com/{eko → kesha_antonov}/RNBackgroundDownloaderModuleImpl.kt +103 -63
  16. package/android/src/main/java/com/{eko → kesha_antonov}/RNBackgroundDownloaderPackage.kt +1 -1
  17. package/android/src/main/java/com/{eko → kesha_antonov}/ResumableDownloadService.kt +11 -9
  18. package/android/src/main/java/com/{eko → kesha_antonov}/ResumableDownloader.kt +36 -15
  19. package/android/src/main/java/com/kesha_antonov/UIDTDownloadJobService.kt +590 -0
  20. package/android/src/main/java/com/{eko → kesha_antonov}/UnmeteredNetworkGate.kt +136 -19
  21. package/android/src/main/java/com/{eko → kesha_antonov}/UploadEventEmitter.kt +27 -2
  22. package/android/src/main/java/com/{eko → kesha_antonov}/Uploader.kt +189 -19
  23. package/android/src/main/java/com/{eko → kesha_antonov}/handlers/OnBegin.kt +4 -4
  24. package/android/src/main/java/com/{eko → kesha_antonov}/handlers/OnBeginState.kt +1 -1
  25. package/android/src/main/java/com/{eko → kesha_antonov}/handlers/OnProgress.kt +5 -5
  26. package/android/src/main/java/com/{eko → kesha_antonov}/handlers/OnProgressState.kt +1 -1
  27. package/android/src/main/java/com/{eko → kesha_antonov}/interfaces/BeginCallback.kt +1 -1
  28. package/android/src/main/java/com/{eko → kesha_antonov}/interfaces/ProgressCallback.kt +1 -1
  29. package/android/src/main/java/com/kesha_antonov/uidt/CancelDownloadReceiver.kt +68 -0
  30. package/android/src/main/java/com/{eko → kesha_antonov}/uidt/RNBGDFileProvider.kt +1 -1
  31. package/android/src/main/java/com/{eko → kesha_antonov}/uidt/UIDTJobIds.kt +9 -4
  32. package/android/src/main/java/com/{eko → kesha_antonov}/uidt/UIDTJobManager.kt +6 -6
  33. package/android/src/main/java/com/{eko → kesha_antonov}/uidt/UIDTJobState.kt +7 -5
  34. package/android/src/main/java/com/{eko → kesha_antonov}/uidt/UIDTNotificationIds.kt +1 -1
  35. package/android/src/main/java/com/{eko → kesha_antonov}/uidt/UIDTNotificationManager.kt +18 -10
  36. package/android/src/main/java/com/{eko → kesha_antonov}/utils/FileUtils.kt +1 -1
  37. package/android/src/main/java/com/{eko → kesha_antonov}/utils/HeaderUtils.kt +11 -2
  38. package/android/src/main/java/com/{eko → kesha_antonov}/utils/NetworkRequestUtils.kt +1 -1
  39. package/android/src/main/java/com/kesha_antonov/utils/NotificationUtils.kt +24 -0
  40. package/android/src/main/java/com/{eko → kesha_antonov}/utils/ProgressUtils.kt +1 -1
  41. package/android/src/main/java/com/{eko → kesha_antonov}/utils/ReadableConverters.kt +1 -1
  42. package/android/src/main/java/com/{eko → kesha_antonov}/utils/RedirectResolver.kt +32 -4
  43. package/android/src/main/java/com/{eko → kesha_antonov}/utils/StorageManager.kt +5 -5
  44. package/android/src/main/java/com/{eko → kesha_antonov}/utils/TempFileUtils.kt +2 -2
  45. package/android/src/newarch/java/com/{eko → kesha_antonov}/RNBackgroundDownloaderModule.kt +1 -1
  46. package/android/src/oldarch/java/com/{eko → kesha_antonov}/RNBackgroundDownloaderModule.kt +1 -1
  47. package/android/src/test/java/com/kesha_antonov/DownloadCompleteReceiverTest.kt +57 -0
  48. package/android/src/test/java/com/{eko → kesha_antonov}/DownloaderRecoveryTest.kt +2 -2
  49. package/android/src/test/java/com/{eko → kesha_antonov}/DownloaderResumeTest.kt +3 -3
  50. package/android/src/test/java/com/{eko → kesha_antonov}/ResumableDownloaderConcurrencyTest.kt +1 -1
  51. package/android/src/test/java/com/kesha_antonov/ResumableDownloaderRedirectTest.kt +77 -0
  52. package/android/src/test/java/com/{eko → kesha_antonov}/ResumableDownloaderStallTest.kt +1 -1
  53. package/android/src/test/java/com/kesha_antonov/UnmeteredNetworkGateTest.kt +248 -0
  54. package/android/src/test/java/com/kesha_antonov/UploadPartRangesTest.kt +33 -0
  55. package/android/src/test/java/com/{eko → kesha_antonov}/UploaderMultipartTest.kt +11 -2
  56. package/android/src/test/java/com/kesha_antonov/UploaderPartsTest.kt +222 -0
  57. package/android/src/test/java/com/kesha_antonov/UploaderResponseTest.kt +26 -0
  58. package/android/src/test/java/com/{eko → kesha_antonov}/handlers/OnBeginTest.kt +2 -2
  59. package/android/src/test/java/com/{eko → kesha_antonov}/uidt/CancelDownloadReceiverTest.kt +25 -2
  60. package/android/src/test/java/com/{eko → kesha_antonov}/uidt/UIDTJobIdsTest.kt +13 -2
  61. package/android/src/test/java/com/{eko → kesha_antonov}/uidt/UIDTJobManagerTest.kt +1 -1
  62. package/android/src/test/java/com/{eko → kesha_antonov}/uidt/UIDTNotificationIdsTest.kt +1 -1
  63. package/android/src/test/java/com/kesha_antonov/utils/RedirectResolverTest.kt +133 -0
  64. package/bin/react-native-background-downloader.js +197 -0
  65. package/ios/RNBGDUploadTaskConfig.h +26 -0
  66. package/ios/RNBGDUploadTaskConfig.mm +69 -3
  67. package/ios/RNBackgroundDownloader.mm +587 -47
  68. package/lib/NativeRNBackgroundDownloader.d.ts +15 -0
  69. package/lib/UploadTask.d.ts +5 -1
  70. package/lib/UploadTask.js +22 -4
  71. package/lib/index.js +57 -27
  72. package/lib/types.d.ts +33 -2
  73. package/package.json +5 -2
  74. package/src/NativeRNBackgroundDownloader.ts +23 -0
  75. package/src/UploadTask.ts +23 -1
  76. package/src/index.ts +60 -27
  77. package/src/types.ts +42 -2
  78. package/android/src/main/java/com/eko/RNBGDUploadTaskConfig.kt +0 -22
  79. package/android/src/test/java/com/eko/utils/RedirectResolverTest.kt +0 -67
@@ -1,4 +1,4 @@
1
- package com.eko
1
+ package com.kesha_antonov
2
2
 
3
3
  /**
4
4
  * Sealed class representing the possible outcomes of a download operation.
@@ -1,4 +1,4 @@
1
- package com.eko
1
+ package com.kesha_antonov
2
2
 
3
3
  import android.app.DownloadManager
4
4
  import android.content.ComponentName
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicBoolean
28
28
  *
29
29
  * Both use HTTP Range headers to support true pause/resume, even in the background.
30
30
  */
31
- class Downloader(private val context: Context, private val storageManager: com.eko.utils.StorageManager? = null) {
31
+ class Downloader(private val context: Context, private val storageManager: com.kesha_antonov.utils.StorageManager? = null) {
32
32
 
33
33
  companion object {
34
34
  private const val TAG = "RNBackgroundDownloader"
@@ -657,11 +657,18 @@ class Downloader(private val context: Context, private val storageManager: com.e
657
657
  }
658
658
  }
659
659
 
660
- // Manually trigger the receiver from anywhere.
661
- fun broadcast(downloadId: Long) {
662
- val intent = Intent(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
663
- intent.putExtra(DownloadManager.EXTRA_DOWNLOAD_ID, downloadId)
664
- context.sendBroadcast(intent)
660
+ /**
661
+ * Runs the module's download-complete handling for [downloadId], like a
662
+ * DOWNLOAD_COMPLETE broadcast would. Not a real broadcast: the receiver only
663
+ * accepts broadcasts from DownloadManager, so other apps can't fake one.
664
+ */
665
+ @Volatile
666
+ var downloadEndedHandler: ((Long) -> Unit)? = null
667
+
668
+ fun reportDownloadEnded(downloadId: Long) {
669
+ val handler = downloadEndedHandler ?: return
670
+ // On the main thread, where the receiver runs too
671
+ android.os.Handler(android.os.Looper.getMainLooper()).post { handler(downloadId) }
665
672
  }
666
673
 
667
674
  fun checkDownloadStatus(downloadId: Long): WritableMap {
@@ -1,4 +1,4 @@
1
- package com.eko
1
+ package com.kesha_antonov
2
2
 
3
3
  import com.facebook.react.bridge.Arguments
4
4
  import com.facebook.react.bridge.WritableArray
@@ -1,4 +1,4 @@
1
- package com.eko
1
+ package com.kesha_antonov
2
2
 
3
3
  import com.facebook.react.bridge.Promise
4
4
 
@@ -1,4 +1,4 @@
1
- package com.eko
1
+ package com.kesha_antonov
2
2
 
3
3
  import java.io.Serializable
4
4
 
@@ -0,0 +1,57 @@
1
+ package com.kesha_antonov
2
+
3
+ /**
4
+ * Configuration class for upload tasks.
5
+ * Stores all necessary info for an upload and its state.
6
+ */
7
+ data class RNBGDUploadTaskConfig(
8
+ val id: String,
9
+ val url: String,
10
+ val source: String,
11
+ val metadata: String = "{}",
12
+ val method: String = "POST",
13
+ val headers: Map<String, String>? = null,
14
+ val fieldName: String? = null,
15
+ val mimeType: String? = null,
16
+ val parameters: Map<String, String>? = null,
17
+ // Upload source in parts, one URL per part (S3 multipart upload and similar)
18
+ val partUrls: List<String>? = null,
19
+ // Bytes per part; 0 means ceil(file size / number of parts)
20
+ val partSize: Long = 0,
21
+ var reportedBegin: Boolean = false,
22
+ var bytesUploaded: Long = 0,
23
+ var bytesTotal: Long = 0,
24
+ var state: Int = DownloadConstants.TASK_RUNNING,
25
+ var errorCode: Int = 0,
26
+ // Parts the server accepted, persisted so a resumed upload continues after them.
27
+ // Replaced, never mutated: it's serialized while the upload thread runs
28
+ @Volatile var completedParts: List<UploadPartResult>? = null
29
+ )
30
+
31
+ /** One accepted part of an upload with partUrls. */
32
+ data class UploadPartResult(
33
+ // 1-based, as S3's CompleteMultipartUpload numbers parts
34
+ val partNumber: Int,
35
+ val responseCode: Int,
36
+ val responseBody: String,
37
+ // Lowercased header names
38
+ val responseHeaders: Map<String, String>,
39
+ val bytes: Long
40
+ )
41
+
42
+ /**
43
+ * Byte ranges of the parts: every part [partSize] bytes (default ceil(size / count))
44
+ * and the last one what's left. Null when the parts can't cover the file exactly,
45
+ * which includes an empty last part.
46
+ */
47
+ internal fun uploadPartRanges(fileSize: Long, partCount: Int, partSize: Long): List<LongRange>? {
48
+ if (partCount <= 0 || fileSize <= 0) return null
49
+ val size = if (partSize > 0) partSize else (fileSize + partCount - 1) / partCount
50
+ val beforeLast = size * (partCount - 1)
51
+ if (beforeLast >= fileSize || fileSize - beforeLast > size) return null
52
+ return (0 until partCount).map { index ->
53
+ val start = size * index
54
+ val end = if (index == partCount - 1) fileSize else start + size
55
+ start until end
56
+ }
57
+ }
@@ -1,4 +1,4 @@
1
- package com.eko
1
+ package com.kesha_antonov
2
2
 
3
3
  import android.app.DownloadManager
4
4
  import android.content.BroadcastReceiver
@@ -9,14 +9,14 @@ import android.media.MediaScannerConnection
9
9
  import android.net.Uri
10
10
  import android.os.Build
11
11
  import android.util.Log
12
- import com.eko.handlers.OnBegin
13
- import com.eko.handlers.OnProgress
14
- import com.eko.handlers.OnProgressState
15
- import com.eko.interfaces.BeginCallback
16
- import com.eko.utils.HeaderUtils
17
- import com.eko.utils.ReadableConverters
18
- import com.eko.utils.RedirectResolver
19
- import com.eko.utils.StorageManager
12
+ import com.kesha_antonov.handlers.OnBegin
13
+ import com.kesha_antonov.handlers.OnProgress
14
+ import com.kesha_antonov.handlers.OnProgressState
15
+ import com.kesha_antonov.interfaces.BeginCallback
16
+ import com.kesha_antonov.utils.HeaderUtils
17
+ import com.kesha_antonov.utils.ReadableConverters
18
+ import com.kesha_antonov.utils.RedirectResolver
19
+ import com.kesha_antonov.utils.StorageManager
20
20
  import com.facebook.react.bridge.Arguments
21
21
  import com.facebook.react.bridge.Promise
22
22
  import com.facebook.react.bridge.ReactApplicationContext
@@ -46,6 +46,10 @@ class RNBackgroundDownloaderModuleImpl(private val reactContext: ReactApplicatio
46
46
 
47
47
  private val sharedLock = Any()
48
48
 
49
+ // Signature permission held by DownloadProvider, the only legitimate sender
50
+ // of DOWNLOAD_COMPLETE
51
+ private const val DOWNLOAD_COMPLETE_PERMISSION = "android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS"
52
+
49
53
  // Controls whether debug logs are enabled
50
54
  @Volatile
51
55
  private var isLogsEnabled = false
@@ -396,68 +400,75 @@ class RNBackgroundDownloaderModuleImpl(private val reactContext: ReactApplicatio
396
400
 
397
401
  downloadReceiver = object : BroadcastReceiver() {
398
402
  override fun onReceive(context: Context, intent: Intent) {
399
- val downloadId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
403
+ handleDownloadEnded(context, intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1))
404
+ }
405
+ }
406
+ downloader.downloadEndedHandler = { downloadId -> handleDownloadEnded(reactContext, downloadId) }
400
407
 
401
- // Check if this download is being intentionally cancelled (paused or stopped)
402
- val cancelIntent = downloader.getCancelIntent(downloadId)
403
- if (cancelIntent != null) {
404
- downloader.clearCancelIntent(downloadId)
405
- logD(NAME, "Ignoring broadcast for ${cancelIntent.name.lowercase()} download: $downloadId")
406
- return
407
- }
408
+ // DOWNLOAD_COMPLETE isn't a protected broadcast on every Android version, and
409
+ // the receiver has to be exported for DownloadManager to reach it. Requiring
410
+ // DownloadProvider's signature permission keeps other apps from sending a fake
411
+ // one, which would end (and remove) a download that is still running.
412
+ compatRegisterReceiver(reactContext, downloadReceiver!!, filter, true, DOWNLOAD_COMPLETE_PERMISSION)
413
+ isReceiverRegistered = true
414
+ }
408
415
 
409
- val config = downloadIdToConfig[downloadId]
416
+ private fun handleDownloadEnded(context: Context, downloadId: Long) {
417
+ // Check if this download is being intentionally cancelled (paused or stopped)
418
+ val cancelIntent = downloader.getCancelIntent(downloadId)
419
+ if (cancelIntent != null) {
420
+ downloader.clearCancelIntent(downloadId)
421
+ logD(NAME, "Ignoring broadcast for ${cancelIntent.name.lowercase()} download: $downloadId")
422
+ return
423
+ }
410
424
 
411
- if (config != null) {
412
- if (!synchronized(sharedLock) { endedDownloadIds.add(downloadId) }) {
413
- logD(NAME, "Ignoring repeated broadcast for download: $downloadId")
414
- return
415
- }
416
- val downloadStatus = downloader.checkDownloadStatus(downloadId)
417
- val status = downloadStatus.getInt("status")
418
- val localUri = downloadStatus.getString("localUri")
425
+ val config = downloadIdToConfig[downloadId]
419
426
 
420
- stopTaskProgress(config.id)
427
+ if (config != null) {
428
+ if (!synchronized(sharedLock) { endedDownloadIds.add(downloadId) }) {
429
+ logD(NAME, "Ignoring repeated broadcast for download: $downloadId")
430
+ return
431
+ }
432
+ val downloadStatus = downloader.checkDownloadStatus(downloadId)
433
+ val status = downloadStatus.getInt("status")
434
+ val localUri = downloadStatus.getString("localUri")
421
435
 
422
- synchronized(sharedLock) {
423
- // Drop any buffered progress that slipped past stopTaskProgress's clearPendingReport
424
- // (the polling thread may have re-added it between clearPendingReport and this lock)
425
- progressReporter.clearPendingReport(config.id)
426
- when (status) {
427
- DownloadManager.STATUS_SUCCESSFUL -> {
428
- onSuccessfulDownload(config, downloadStatus)
429
- }
430
- DownloadManager.STATUS_FAILED -> {
431
- onFailedDownload(config, downloadStatus)
432
- }
433
- }
436
+ stopTaskProgress(config.id)
434
437
 
435
- if (localUri != null) {
436
- // Prevent memory leaks from MediaScanner.
437
- // Download successful, clean task after media scanning.
438
- val paths = arrayOf(localUri)
439
- MediaScannerConnection.scanFile(context, paths, null) { _, _ ->
440
- if (status == DownloadManager.STATUS_SUCCESSFUL) {
441
- // Not stopTask: DownloadManager.remove() deletes the downloaded file too
442
- releaseCompletedTask(config.id)
443
- } else {
444
- stopTask(config.id)
445
- }
446
- // Cleaned up: a later broadcast finds no config
447
- synchronized(sharedLock) { endedDownloadIds.remove(downloadId) }
448
- }
438
+ synchronized(sharedLock) {
439
+ // Drop any buffered progress that slipped past stopTaskProgress's clearPendingReport
440
+ // (the polling thread may have re-added it between clearPendingReport and this lock)
441
+ progressReporter.clearPendingReport(config.id)
442
+ when (status) {
443
+ DownloadManager.STATUS_SUCCESSFUL -> {
444
+ onSuccessfulDownload(config, downloadStatus)
445
+ }
446
+ DownloadManager.STATUS_FAILED -> {
447
+ onFailedDownload(config, downloadStatus)
448
+ }
449
+ }
450
+
451
+ if (localUri != null) {
452
+ // Prevent memory leaks from MediaScanner.
453
+ // Download successful, clean task after media scanning.
454
+ val paths = arrayOf(localUri)
455
+ MediaScannerConnection.scanFile(context, paths, null) { _, _ ->
456
+ if (status == DownloadManager.STATUS_SUCCESSFUL) {
457
+ // Not stopTask: DownloadManager.remove() deletes the downloaded file too
458
+ releaseCompletedTask(config.id)
449
459
  } else {
450
- // Download failed, clean task.
451
460
  stopTask(config.id)
452
- endedDownloadIds.remove(downloadId)
453
461
  }
462
+ // Cleaned up: a later broadcast finds no config
463
+ synchronized(sharedLock) { endedDownloadIds.remove(downloadId) }
454
464
  }
465
+ } else {
466
+ // Download failed, clean task.
467
+ stopTask(config.id)
468
+ endedDownloadIds.remove(downloadId)
455
469
  }
456
470
  }
457
471
  }
458
-
459
- compatRegisterReceiver(reactContext, downloadReceiver!!, filter, true)
460
- isReceiverRegistered = true
461
472
  }
462
473
 
463
474
  // TAKEN FROM
@@ -466,20 +477,24 @@ class RNBackgroundDownloaderModuleImpl(private val reactContext: ReactApplicatio
466
477
  context: Context,
467
478
  receiver: BroadcastReceiver,
468
479
  filter: IntentFilter,
469
- exported: Boolean
480
+ exported: Boolean,
481
+ broadcastPermission: String? = null
470
482
  ) {
471
483
  if (Build.VERSION.SDK_INT >= 34 && context.applicationInfo.targetSdkVersion >= 34) {
472
484
  context.registerReceiver(
473
485
  receiver,
474
486
  filter,
487
+ broadcastPermission,
488
+ null,
475
489
  if (exported) Context.RECEIVER_EXPORTED else Context.RECEIVER_NOT_EXPORTED
476
490
  )
477
491
  } else {
478
- context.registerReceiver(receiver, filter)
492
+ context.registerReceiver(receiver, filter, broadcastPermission, null)
479
493
  }
480
494
  }
481
495
 
482
496
  private fun unregisterDownloadReceiver() {
497
+ downloader.downloadEndedHandler = null
483
498
  downloadReceiver?.let {
484
499
  try {
485
500
  reactContext.unregisterReceiver(it)
@@ -1420,7 +1435,25 @@ class RNBackgroundDownloaderModuleImpl(private val reactContext: ReactApplicatio
1420
1435
  uploadProgressReporter.reportProgress(id, bytesUploaded, bytesTotal)
1421
1436
  }
1422
1437
 
1423
- override fun onComplete(id: String, responseCode: Int, responseBody: String, bytesUploaded: Long, bytesTotal: Long) {
1438
+ override fun onPartComplete(id: String, part: UploadPartResult) {
1439
+ synchronized(sharedLock) {
1440
+ uploadConfigs[id]?.let { config ->
1441
+ // A new list: the persisted one may be serialized concurrently
1442
+ config.completedParts = config.completedParts.orEmpty() + part
1443
+ storageManager.saveUploadConfigs(uploadConfigs)
1444
+ }
1445
+ }
1446
+ }
1447
+
1448
+ override fun onComplete(
1449
+ id: String,
1450
+ responseCode: Int,
1451
+ responseBody: String,
1452
+ responseHeaders: Map<String, String>,
1453
+ parts: List<UploadPartResult>?,
1454
+ bytesUploaded: Long,
1455
+ bytesTotal: Long
1456
+ ) {
1424
1457
  synchronized(sharedLock) {
1425
1458
  uploadConfigs[id]?.state = DownloadConstants.TASK_COMPLETED
1426
1459
  uploadConfigs.remove(id)
@@ -1429,7 +1462,7 @@ class RNBackgroundDownloaderModuleImpl(private val reactContext: ReactApplicatio
1429
1462
  // Remove from persistent storage on completion
1430
1463
  storageManager.saveUploadConfigs(uploadConfigs)
1431
1464
  }
1432
- uploadEventEmitter.emitComplete(id, responseCode, responseBody, bytesUploaded, bytesTotal)
1465
+ uploadEventEmitter.emitComplete(id, responseCode, responseBody, responseHeaders, parts, bytesUploaded, bytesTotal)
1433
1466
  }
1434
1467
 
1435
1468
  override fun onError(id: String, error: String, errorCode: Int) {
@@ -1495,6 +1528,11 @@ class RNBackgroundDownloaderModuleImpl(private val reactContext: ReactApplicatio
1495
1528
  result
1496
1529
  } else null
1497
1530
 
1531
+ val partUrls = if (options.hasKey("partUrls") && !options.isNull("partUrls")) {
1532
+ options.getArray("partUrls")?.let { array -> (0 until array.size()).mapNotNull { array.getString(it) } }
1533
+ } else null
1534
+ val partSize = if (options.hasKey("partSize") && !options.isNull("partSize")) options.getDouble("partSize").toLong() else 0L
1535
+
1498
1536
  // Progress settings
1499
1537
  val progressIntervalScope = options.getInt("progressInterval")
1500
1538
  // 0 is a valid value (percentage only), so it has to be applied too
@@ -1519,7 +1557,9 @@ class RNBackgroundDownloaderModuleImpl(private val reactContext: ReactApplicatio
1519
1557
  headers = headers,
1520
1558
  fieldName = fieldName,
1521
1559
  mimeType = mimeType,
1522
- parameters = parameters
1560
+ parameters = parameters,
1561
+ partUrls = partUrls,
1562
+ partSize = partSize
1523
1563
  )
1524
1564
 
1525
1565
  synchronized(sharedLock) {
@@ -1,4 +1,4 @@
1
- package com.eko
1
+ package com.kesha_antonov
2
2
 
3
3
  import com.facebook.react.TurboReactPackage
4
4
  import com.facebook.react.bridge.NativeModule
@@ -1,4 +1,4 @@
1
- package com.eko
1
+ package com.kesha_antonov
2
2
 
3
3
  import android.app.Notification
4
4
  import android.app.NotificationChannel
@@ -11,6 +11,7 @@ import android.os.Build
11
11
  import android.os.IBinder
12
12
  import android.os.PowerManager
13
13
  import androidx.core.app.NotificationCompat
14
+ import com.kesha_antonov.utils.NotificationUtils.applyOpenAppIntent
14
15
  import java.util.concurrent.ConcurrentHashMap
15
16
 
16
17
  /**
@@ -24,14 +25,14 @@ class ResumableDownloadService : Service() {
24
25
  private const val WAKELOCK_TAG = "ResumableDownloadService::WakeLock"
25
26
 
26
27
  // Notification group for grouping all download notifications together
27
- private const val NOTIFICATION_GROUP_KEY = "com.eko.DOWNLOAD_GROUP"
28
+ private const val NOTIFICATION_GROUP_KEY = "com.kesha_antonov.DOWNLOAD_GROUP"
28
29
 
29
30
  // Action constants for Intent
30
- const val ACTION_START_DOWNLOAD = "com.eko.action.START_DOWNLOAD"
31
- const val ACTION_PAUSE_DOWNLOAD = "com.eko.action.PAUSE_DOWNLOAD"
32
- const val ACTION_RESUME_DOWNLOAD = "com.eko.action.RESUME_DOWNLOAD"
33
- const val ACTION_CANCEL_DOWNLOAD = "com.eko.action.CANCEL_DOWNLOAD"
34
- const val ACTION_STOP_SERVICE = "com.eko.action.STOP_SERVICE"
31
+ const val ACTION_START_DOWNLOAD = "com.kesha_antonov.action.START_DOWNLOAD"
32
+ const val ACTION_PAUSE_DOWNLOAD = "com.kesha_antonov.action.PAUSE_DOWNLOAD"
33
+ const val ACTION_RESUME_DOWNLOAD = "com.kesha_antonov.action.RESUME_DOWNLOAD"
34
+ const val ACTION_CANCEL_DOWNLOAD = "com.kesha_antonov.action.CANCEL_DOWNLOAD"
35
+ const val ACTION_STOP_SERVICE = "com.kesha_antonov.action.STOP_SERVICE"
35
36
 
36
37
  // Extra keys
37
38
  const val EXTRA_DOWNLOAD_ID = "download_id"
@@ -487,7 +488,7 @@ class ResumableDownloadService : Service() {
487
488
  android.R.drawable.stat_sys_download_done
488
489
  }
489
490
 
490
- return NotificationCompat.Builder(this, DownloadConstants.NOTIFICATION_CHANNEL_ID)
491
+ val builder = NotificationCompat.Builder(this, DownloadConstants.NOTIFICATION_CHANNEL_ID)
491
492
  .setContentTitle("Background Download")
492
493
  .setContentText(contentText)
493
494
  .setSmallIcon(icon)
@@ -495,7 +496,8 @@ class ResumableDownloadService : Service() {
495
496
  .setOngoing(true)
496
497
  .setGroup(NOTIFICATION_GROUP_KEY)
497
498
  .setGroupSummary(true)
498
- .build()
499
+ applyOpenAppIntent(builder, this)
500
+ return builder.build()
499
501
  }
500
502
 
501
503
  private fun updateNotification() {
@@ -1,7 +1,7 @@
1
- package com.eko
1
+ package com.kesha_antonov
2
2
 
3
3
  import android.net.Network
4
- import com.eko.utils.HeaderUtils
4
+ import com.kesha_antonov.utils.HeaderUtils
5
5
  import java.io.File
6
6
  import java.io.FileOutputStream
7
7
  import java.io.InputStream
@@ -472,7 +472,12 @@ class ResumableDownloader {
472
472
  * Execute the download and return a DownloadResult.
473
473
  * This method handles all download logic and returns a type-safe result.
474
474
  */
475
- private fun executeDownload(state: DownloadState, listener: DownloadListener, expectedSessionId: Long): DownloadResult {
475
+ private fun executeDownload(
476
+ state: DownloadState,
477
+ listener: DownloadListener,
478
+ expectedSessionId: Long,
479
+ redirectsLeft: Int = DownloadConstants.MAX_SCHEME_REDIRECTS
480
+ ): DownloadResult {
476
481
  var connection: HttpURLConnection? = null
477
482
  var inputStream: InputStream? = null
478
483
  var outputStream: FileOutputStream? = null
@@ -572,17 +577,33 @@ class ResumableDownloader {
572
577
  HttpURLConnection.HTTP_MOVED_TEMP,
573
578
  HttpURLConnection.HTTP_SEE_OTHER,
574
579
  307, 308 -> {
575
- // Handle redirect
576
- val newUrl = connection.getHeaderField("Location")
577
- if (newUrl != null) {
578
- connection.disconnect()
579
- // Create new state with updated URL
580
- // Note: We preserve bytesDownloaded since the redirect should point to the same resource.
581
- // If the new server doesn't support Range headers, the HTTP_OK case above will reset it.
582
- val newState = state.copyWithUrl(newUrl)
583
- activeDownloads[state.id] = newState
584
- return executeDownload(newState, listener, expectedSessionId)
580
+ // HttpURLConnection follows same-scheme redirects itself, so this only
581
+ // sees ones that switch between http and https - which the platform
582
+ // refuses on purpose. Follow only http -> https upgrades, a bounded
583
+ // number of times, and drop credentials when the host changes.
584
+ val location = connection.getHeaderField("Location")
585
+ val newUrl = location?.let { runCatching { URL(URL(state.url), it) }.getOrNull() }
586
+ val currentUrl = URL(state.url)
587
+ if (newUrl == null || redirectsLeft <= 0 ||
588
+ !currentUrl.protocol.equals("http", ignoreCase = true) ||
589
+ !newUrl.protocol.equals("https", ignoreCase = true)
590
+ ) {
591
+ val error = DownloadResult.httpError(state.id, responseCode, "Refusing to follow redirect to $location")
592
+ listener.onError(state.id, error.message, error.errorCode)
593
+ return error
594
+ }
595
+ connection.disconnect()
596
+ val headers = if (newUrl.host.equals(currentUrl.host, ignoreCase = true)) {
597
+ state.headers
598
+ } else {
599
+ HeaderUtils.withoutCredentials(state.headers)
585
600
  }
601
+ // Create new state with updated URL
602
+ // Note: We preserve bytesDownloaded since the redirect should point to the same resource.
603
+ // If the new server doesn't support Range headers, the HTTP_OK case above will reset it.
604
+ val newState = state.copyWithUrl(newUrl.toString(), headers)
605
+ activeDownloads[state.id] = newState
606
+ return executeDownload(newState, listener, expectedSessionId, redirectsLeft - 1)
586
607
  }
587
608
  416 -> {
588
609
  // Range Not Satisfiable - file might be complete or server doesn't support ranges
@@ -768,12 +789,12 @@ class ResumableDownloader {
768
789
  }
769
790
  }
770
791
 
771
- private fun DownloadState.copyWithUrl(url: String): DownloadState {
792
+ private fun DownloadState.copyWithUrl(url: String, headers: Map<String, String>): DownloadState {
772
793
  return DownloadState(
773
794
  id = this.id,
774
795
  url = url,
775
796
  destination = this.destination,
776
- headers = this.headers,
797
+ headers = headers,
777
798
  isPaused = this.isPaused,
778
799
  isCancelled = this.isCancelled,
779
800
  bytesDownloaded = this.bytesDownloaded,