feat: list files backed up

fix: list key correction

backup-server/src/storage.js

@@ -59,10 +59,17 @@ class Storage {
         //TODO must be a better way instead of iterating over all files
         let files = [];
         const list = await this.storage.listFiles();
+
         list.forEach((file) => {
-            const [fileName] = file;
-            if (fileName.startsWith(filePath) && fileName.endsWith('.bin')) {
-                files.push(fileName.substring(fileName.lastIndexOf('/') + 1));
+            const [fullFilePath] = file;
+
+            if (fullFilePath.startsWith(filePath) && fullFilePath.endsWith('.bin')) {
+                //Ignore directories
+                if (fullFilePath.replaceAll(filePath, '').replace(/^\//, "").indexOf('/') !== -1) {
+                    return;
+                }
+
+                files.push(fullFilePath.substring(fullFilePath.lastIndexOf('/') + 1));
             }
         });
 

lib/android/src/main/java/com/reactnativeldk/LdkModule.kt

@@ -1108,7 +1108,6 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
         promise.resolve((res as Result_TransactionNoneZ.Result_TransactionNoneZ_OK).res.hexEncodedString())
     }
 
-
     @ReactMethod
     fun nodeSign(message: String, promise: Promise) {
         keysManager ?: return handleReject(promise, LdkErrors.init_keys_manager)
@@ -1210,6 +1209,29 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
             handleReject(promise, LdkErrors.backup_check_failed, Error(e))
         }
     }
+
+    @ReactMethod
+    fun backupListFiles(promise: Promise) {
+        if (BackupClient.requiresSetup) {
+            return handleReject(promise, LdkErrors.backup_setup_required)
+        }
+
+        try {
+            val list = BackupClient.listFiles()
+
+            val map = Arguments.createMap()
+            val files = Arguments.createArray()
+            list.first.forEach { files.pushString(it) }
+            val channelMonitors = Arguments.createArray()
+            list.second.forEach { channelMonitors.pushString(it) }
+            map.putArray("list", files)
+            map.putArray("channel_monitors", channelMonitors)
+
+            promise.resolve(map)
+        } catch (e: Exception) {
+            handleReject(promise, LdkErrors.backup_check_failed, Error(e))
+        }
+    }
 }
 
 object LdkEventEmitter {

lib/android/src/main/java/com/reactnativeldk/classes/BackupClient.kt

@@ -280,7 +280,7 @@ class BackupClient {
         }
 
         @Throws(BackupError::class)
-        fun retrieveCompleteBackup(): CompleteBackup {
+        fun listFiles(): Pair<Array<String>, Array<String>> {
             val bearer = authToken()
 
             val url = backupUrl(Method.LIST)
@@ -310,20 +310,35 @@ class BackupClient {
             inputStream.close()
 
             val jsonObject = JSONObject(jsonString)
+            val fileList = jsonObject.getJSONArray("list")
+            val channelFileList = jsonObject.getJSONArray("channel_monitors")
+
+            println("fileList: $fileList")
+
+            return Pair(
+                Array(fileList.length()) { idx ->
+                    fileList.getString(idx)
+                },
+                Array(channelFileList.length()) { idx ->
+                    channelFileList.getString(idx)
+                },
+            )
+        }
+
+        @Throws(BackupError::class)
+        fun retrieveCompleteBackup(): CompleteBackup {
+            val list = listFiles()
+            val fileNames = list.first
+            val channelFileNames = list.second
 
             val files = mutableMapOf<String, ByteArray>()
-            val fileNames = jsonObject.getJSONArray("list")
-            for (i in 0 until fileNames.length()) {
-                val filename = fileNames.getString(i)
-                files[filename] = retrieve(Label.MISC(filename))
+            for (fileName in fileNames) {
+                files[fileName] = retrieve(Label.MISC(fileName))
             }
 
             val channelFiles = mutableMapOf<String, ByteArray>()
-            val channelFileNames = jsonObject.getJSONArray("channel_monitors")
-            for (i in 0 until channelFileNames.length()) {
-                val filename = channelFileNames.getString(i)
-
-                channelFiles[filename] = retrieve(Label.CHANNEL_MONITOR(channelId=filename.replace(".bin", "")))
+            for (fileName in channelFileNames) {
+                channelFiles[fileName] = retrieve(Label.CHANNEL_MONITOR(channelId=fileName.replace(".bin", "")))
             }
 
             return CompleteBackup(files = files, channelFiles = channelFiles)

lib/ios/Classes/BackupClient.swift

@@ -53,6 +53,11 @@ struct BackupRetrieveBearer: Codable {
     let expires: Int
 }
 
+struct ListFilesResponse: Codable {
+    let list: [String]
+    let channel_monitors: [String]
+}
+
 class BackupClient {
     enum Label {
         case ping
@@ -309,13 +314,8 @@ class BackupClient {
         return try decrypt(encryptedBackup)
     }
 
-    static func retrieveCompleteBackup() throws -> CompleteBackup {
+    static func listFiles() throws -> ListFilesResponse {
         let bearer = try authToken()
-
-        struct ListFilesResponse: Codable {
-            let list: [String]
-            let channel_monitors: [String]
-        }
 
         var backedUpFilenames: ListFilesResponse?
 
@@ -362,6 +362,11 @@ class BackupClient {
             throw BackupError.missingResponse
         }
 
+        return backedUpFilenames
+    }
+
+    static func retrieveCompleteBackup() throws -> CompleteBackup {
+        let backedUpFilenames = try listFiles()
 
         var allFiles: [String: Data] = [:]
         var channelFiles: [String: Data] = [:]
@@ -385,6 +390,11 @@ class BackupClient {
         return CompleteBackup(files: allFiles, channelFiles: channelFiles)
     }
 
+    struct BackupExists {
+        let exists: Bool
+        let channelFiles: Int
+    }
+
     static func selfCheck() throws {
         //Store a random encrypted string and retrieve it again to confirm the server is working
         let ping = "ping\(arc4random_uniform(99999))"

lib/ios/Ldk.m

@@ -173,6 +173,8 @@ @interface RCT_EXTERN_MODULE(Ldk, NSObject)
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(backupSelfCheck:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(backupListFiles:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 @end
 

lib/ios/Ldk.swift

@@ -73,6 +73,7 @@ enum LdkErrors: String {
     case backup_check_failed = "backup_check_failed"
     case backup_restore_failed = "backup_restore_failed"
     case backup_restore_failed_existing_files = "backup_restore_failed_existing_files"
+    case backup_list_files_failed = "backup_list_files_failed"
 }
 
 enum LdkCallbackResponses: String {
@@ -884,7 +885,7 @@ class Ldk: NSObject {
             guard let invoice = res.getValue() else {
                 return handleReject(reject, .invoice_create_failed)
             }
-                        
+
             return resolve(invoice.asJson) //Invoice class extended in Helpers file
         }
 
@@ -1323,6 +1324,23 @@ class Ldk: NSObject {
             handleReject(reject, .backup_check_failed, error, error.localizedDescription)
         }
     }
+
+    @objc
+    func backupListFiles(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard !BackupClient.requiresSetup else {
+            return handleReject(reject, .backup_setup_required)
+        }
+
+        do {
+            let result = try BackupClient.listFiles()
+            resolve([
+                "list": result.list,
+                "channel_monitors": result.channel_monitors
+            ])
+        } catch {
+            handleReject(reject, .backup_list_files_failed, error, error.localizedDescription)
+        }
+    }
 }
 
 //MARK: Singleton react native event emitter

lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@synonymdev/react-native-ldk",
   "title": "React Native LDK",
-  "version": "0.0.111",
+  "version": "0.0.112",
   "description": "React Native wrapper for LDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

lib/src/ldk.ts

@@ -33,8 +33,8 @@ import {
 	THeader,
 	TAcceptChannelReq,
 	TBackupServerDetails,
-	TNodeSignReq,
-} from './utils/types';
+	TNodeSignReq, TBackedUpFileList,
+} from "./utils/types";
 import { extractPaymentRequest } from './utils/helpers';
 
 const LINKING_ERROR =
@@ -1248,6 +1248,18 @@ class LDK {
 			return err(e);
 		}
 	}
+
+	/**
+	 * List all files that have been backed up
+	 */
+	async backupListFiles(): Promise<Result<TBackedUpFileList>> {
+		try {
+			const res = await NativeLDK.backupListFiles();
+			return ok(res);
+		} catch (e) {
+			return err(e);
+		}
+	}
 }
 
 export default new LDK();

lib/src/utils/types.ts

@@ -584,6 +584,11 @@ export type TBackupServerDetails = {
 	serverPubKey: string;
 };
 
+export type TBackedUpFileList = {
+	list: [string];
+	channel_monitors: [string];
+};
+
 export type TNodeSignReq = {
 	message: string;
 	messagePrefix?: string;