react-native-kookit 0.2.8 → 0.2.9

package/android/src/main/java/expo/modules/kookit/SmbClient.kt

@@ -87,7 +87,7 @@ class SmbClient {
 
   suspend fun list(path: String?): List<SmbFileInfo> = withContext(Dispatchers.IO) {
     val disk = requireShare()
-    val dirPath = path?.trim()?.ifEmpty { null } ?: ""
+  val dirPath = (path?.trim()?.ifEmpty { null } ?: "").replace('\\', '/').removePrefix("./")
     val results = mutableListOf<SmbFileInfo>()
     for (info in disk.list(dirPath)) {
       val name = info.fileName
@@ -102,11 +102,20 @@ class SmbClient {
   }
 
   suspend fun download(remotePath: String, localPath: String, onProgress: ((Long, Long) -> Unit)? = null) = withContext(Dispatchers.IO) {
-    val disk = requireShare()
+  val disk = requireShare()
+  val normRemote = remotePath.replace('\\', '/').removePrefix("./")
     java.io.File(localPath).parentFile?.mkdirs()
+    // Request read data + attributes to allow QueryInfo; some servers require READ_ATTRIBUTES for size query
+    val readAccess = setOf(
+      AccessMask.FILE_READ_DATA,
+      AccessMask.FILE_READ_ATTRIBUTES,
+      AccessMask.FILE_READ_EA,
+      AccessMask.READ_CONTROL,
+      AccessMask.SYNCHRONIZE
+    )
     disk.openFile(
-      remotePath,
-      setOf(AccessMask.FILE_READ_DATA),
+      normRemote,
+      readAccess,
       setOf(FileAttributes.FILE_ATTRIBUTE_NORMAL),
       SMB2ShareAccess.ALL,
       SMB2CreateDisposition.FILE_OPEN,
@@ -116,13 +125,19 @@ class SmbClient {
         val buffer = ByteArray(8192)
         var total = 0L
         var read: Int
-        val fileSize = f.fileInformation.standardInformation.endOfFile
+        // Some servers deny QueryInfo on the handle unless READ_ATTRIBUTES is requested.
+        // Guard this to allow download to proceed even when size is unavailable.
+        val fileSize = try {
+          f.fileInformation.standardInformation.endOfFile
+        } catch (_: Exception) {
+          -1L
+        }
         while (true) {
           read = f.read(buffer, total)
           if (read <= 0) break
           out.write(buffer, 0, read)
           total += read
-          onProgress?.invoke(total, fileSize)
+          onProgress?.invoke(total, if (fileSize > 0) fileSize else 0L)
         }
         out.flush()
       }
@@ -131,12 +146,20 @@ class SmbClient {
 
   suspend fun upload(localPath: String, remotePath: String, onProgress: ((Long, Long) -> Unit)? = null) = withContext(Dispatchers.IO) {
     val disk = requireShare()
+  val normRemote = remotePath.replace('\\', '/').removePrefix("./")
     val file = java.io.File(localPath)
     val size = file.length()
     file.inputStream().use { input ->
+      val writeAccess = setOf(
+        AccessMask.FILE_WRITE_DATA,
+        AccessMask.FILE_WRITE_ATTRIBUTES,
+        AccessMask.FILE_WRITE_EA,
+        AccessMask.READ_CONTROL,
+        AccessMask.SYNCHRONIZE
+      )
       disk.openFile(
-        remotePath,
-        setOf(AccessMask.FILE_WRITE_DATA),
+        normRemote,
+        writeAccess,
         setOf(FileAttributes.FILE_ATTRIBUTE_NORMAL),
         SMB2ShareAccess.ALL,
         SMB2CreateDisposition.FILE_OVERWRITE_IF,
@@ -156,17 +179,19 @@ class SmbClient {
 
   suspend fun delete(path: String, isDirectory: Boolean = false) = withContext(Dispatchers.IO) {
     val disk = requireShare()
+    val norm = path.replace('\\', '/').removePrefix("./")
     if (isDirectory) {
-      disk.rmdir(path, false)
+      disk.rmdir(norm, false)
     } else {
-      disk.rm(path)
+      disk.rm(norm)
     }
   }
 
   suspend fun mkdir(path: String) = withContext(Dispatchers.IO) {
     val disk = requireShare()
-    if (!disk.folderExists(path)) {
-      disk.mkdir(path)
+    val norm = path.replace('\\', '/').removePrefix("./")
+    if (!disk.folderExists(norm)) {
+      disk.mkdir(norm)
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-kookit",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "React Native module for intercepting volume button presses on iOS and Android, with FTP client functionality",
   "main": "build/index.js",
   "types": "build/index.d.ts",