cbl-ionic 0.2.5 → 1.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 (47) hide show
  1. package/CblIonic.podspec +1 -1
  2. package/README.md +12 -0
  3. package/android/build.gradle +1 -1
  4. package/android/src/main/java/cbl/js/kotiln/DatabaseManager.kt +19 -6
  5. package/android/src/main/java/com/couchbase/ionic/CblIonicPluginPlugin.kt +27 -17
  6. package/android/src/main/java/com/couchbase/ionic/ReplicatorHelper.kt +8 -4
  7. package/dist/esm/cblite-js/cblite/core-types.d.ts +5 -1
  8. package/dist/esm/cblite-js/cblite/src/collection.js +17 -17
  9. package/dist/esm/cblite-js/cblite/src/collection.js.map +1 -1
  10. package/dist/esm/cblite-js/cblite/src/database-logging.js +1 -1
  11. package/dist/esm/cblite-js/cblite/src/database-logging.js.map +1 -1
  12. package/dist/esm/cblite-js/cblite/src/database.d.ts +13 -2
  13. package/dist/esm/cblite-js/cblite/src/database.js +65 -40
  14. package/dist/esm/cblite-js/cblite/src/database.js.map +1 -1
  15. package/dist/esm/cblite-js/cblite/src/document.js +1 -1
  16. package/dist/esm/cblite-js/cblite/src/document.js.map +1 -1
  17. package/dist/esm/cblite-js/cblite/src/mutable-document.js +6 -1
  18. package/dist/esm/cblite-js/cblite/src/mutable-document.js.map +1 -1
  19. package/dist/esm/cblite-js/cblite/src/query.js +4 -4
  20. package/dist/esm/cblite-js/cblite/src/query.js.map +1 -1
  21. package/dist/esm/cblite-js/cblite/src/replicated-document.js +2 -2
  22. package/dist/esm/cblite-js/cblite/src/replicated-document.js.map +1 -1
  23. package/dist/esm/cblite-js/cblite/src/replicator-configuration.d.ts +1 -1
  24. package/dist/esm/cblite-js/cblite/src/replicator-configuration.js +9 -3
  25. package/dist/esm/cblite-js/cblite/src/replicator-configuration.js.map +1 -1
  26. package/dist/esm/cblite-js/cblite/src/replicator.js +6 -3
  27. package/dist/esm/cblite-js/cblite/src/replicator.js.map +1 -1
  28. package/dist/esm/cblite-js/cblite/src/scope.js +2 -2
  29. package/dist/esm/cblite-js/cblite/src/scope.js.map +1 -1
  30. package/dist/esm/couchbase-lite/capacitor-engine.d.ts +4 -1
  31. package/dist/esm/couchbase-lite/capacitor-engine.js.map +1 -1
  32. package/dist/plugin.cjs.js +113 -74
  33. package/dist/plugin.cjs.js.map +1 -1
  34. package/dist/plugin.js +113 -74
  35. package/dist/plugin.js.map +1 -1
  36. package/ios/Plugin/CblIonicPlugin.swift +5 -3
  37. package/ios/Plugin/cbl-js-swift/CollectionManager.swift +2 -3
  38. package/ios/Plugin/cbl-js-swift/DatabaseManager.swift +29 -13
  39. package/ios/Plugin/cbl-js-swift/FileSystemHelper.swift +0 -2
  40. package/ios/Plugin/cbl-js-swift/IndexHelper.swift +0 -2
  41. package/ios/Plugin/cbl-js-swift/LoggingManager.swift +0 -2
  42. package/ios/Plugin/cbl-js-swift/MapHelper.swift +0 -2
  43. package/ios/Plugin/cbl-js-swift/QueryHelper.swift +0 -2
  44. package/ios/Plugin/cbl-js-swift/README.md +12 -0
  45. package/ios/Plugin/cbl-js-swift/ReplicatorHelper.swift +0 -2
  46. package/ios/Plugin/cbl-js-swift/ReplicatorManager.swift +0 -2
  47. package/package.json +2 -2
@@ -78,9 +78,11 @@ public class CblIonicPluginPlugin: CAPPlugin {
78
78
  return
79
79
  }
80
80
  do {
81
- try DatabaseManager.shared.open (name, databaseConfig: configValue)
81
+ let databaseUniqueName = try DatabaseManager.shared.open (name, databaseConfig: configValue)
82
82
  DispatchQueue.main.async {
83
- call.resolve()
83
+ call.resolve(
84
+ ["databaseUniqueName": databaseUniqueName]
85
+ )
84
86
  return
85
87
  }
86
88
  } catch {
@@ -1320,7 +1322,7 @@ public class CblIonicPluginPlugin: CAPPlugin {
1320
1322
  }
1321
1323
  } else {
1322
1324
  DispatchQueue.main.async {
1323
- call.reject("No such replicator listener")
1325
+ call.reject("No such listener found")
1324
1326
  }
1325
1327
  return
1326
1328
  }
@@ -402,7 +402,6 @@ public class CollectionManager {
402
402
  collectionName: String,
403
403
  scopeName: String,
404
404
  databaseName: String) throws -> CollectionDocumentResult {
405
-
406
405
  guard let collection = try self.getCollection(
407
406
  collectionName,
408
407
  scopeName: scopeName,
@@ -412,7 +411,7 @@ public class CollectionManager {
412
411
  scopeName: scopeName,
413
412
  databaseName: databaseName)
414
413
  }
415
-
414
+
416
415
  do {
417
416
  //create the document
418
417
  let mutableDocument: MutableDocument
@@ -426,7 +425,7 @@ public class CollectionManager {
426
425
  for (key, blob) in blobs {
427
426
  mutableDocument.setBlob(blob, forKey: key)
428
427
  }
429
-
428
+
430
429
  if let concurrencyControlValue = concurrencyControl {
431
430
  let results = try collection.save(document: mutableDocument, concurrencyControl: concurrencyControlValue)
432
431
  if results {
@@ -1,6 +1,5 @@
1
1
  //
2
2
  // DatabaseManager.swift
3
- // Created by Aaron LaBeau on 07/04/24.
4
3
  //
5
4
 
6
5
  import Foundation
@@ -35,6 +34,9 @@ public class DatabaseManager {
35
34
  private var defaultCollectionName: String = "_default"
36
35
  private var defaultScopeName: String = "_default"
37
36
 
37
+ private let databaseQueue = DispatchQueue(label: "com.couchbase.lite.database.access")
38
+
39
+
38
40
  // MARK: - Singleton
39
41
  public static let shared = DatabaseManager()
40
42
 
@@ -46,12 +48,9 @@ public class DatabaseManager {
46
48
  // MARK: - Helper Functions
47
49
 
48
50
  public func getDatabase(_ name: String) -> Database? {
49
- objc_sync_enter(openDatabases)
50
- defer {
51
- objc_sync_exit(openDatabases)
51
+ return databaseQueue.sync {
52
+ return openDatabases[name]
52
53
  }
53
-
54
- return openDatabases[name]
55
54
  }
56
55
 
57
56
  public func buildDatabaseConfig(_ config: [AnyHashable: Any]?) -> DatabaseConfiguration {
@@ -70,15 +69,17 @@ public class DatabaseManager {
70
69
 
71
70
  // MARK: Database Functions
72
71
 
73
- public func open(_ databaseName: String, databaseConfig: [AnyHashable: Any]?) throws {
72
+ public func open(_ databaseName: String, databaseConfig: [AnyHashable: Any]?) throws -> String {
74
73
  do {
75
- if self.openDatabases[databaseName] != nil {
76
- self.openDatabases.removeValue(forKey: databaseName)
77
- }
74
+ let nanoId = generateNanoId()
75
+ let uniqueName = "\(databaseName)_\(nanoId)"
78
76
 
79
77
  let config = self.buildDatabaseConfig(databaseConfig)
80
78
  let database = try Database(name: databaseName, config: config)
81
- self.openDatabases[databaseName] = database
79
+
80
+ openDatabases[uniqueName] = database
81
+
82
+ return uniqueName
82
83
  } catch {
83
84
  throw DatabaseError.unableToOpenDatabase(databaseName: databaseName)
84
85
  }
@@ -100,8 +101,10 @@ public class DatabaseManager {
100
101
  throw DatabaseError.invalidDatabaseName(databaseName: databaseName)
101
102
  }
102
103
  do {
103
- try database.delete()
104
- openDatabases.removeValue(forKey: databaseName)
104
+ return try databaseQueue.sync {
105
+ try database.delete()
106
+ openDatabases.removeValue(forKey: databaseName)
107
+ }
105
108
  } catch {
106
109
  if let nsError = error as NSError?, nsError.code == 19 {
107
110
  // SQLite error code 19 (SQLITE_CONSTRAINT) indicates that the database is locked.
@@ -317,3 +320,16 @@ public class DatabaseManager {
317
320
  }
318
321
  }
319
322
  }
323
+
324
+ func generateNanoId(size: Int = 21) -> String {
325
+ let alphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
326
+ let characters = Array(alphabet)
327
+ var nanoId = ""
328
+
329
+ for _ in 0..<size {
330
+ let randomIndex = Int.random(in: 0..<characters.count)
331
+ nanoId.append(characters[randomIndex])
332
+ }
333
+
334
+ return nanoId
335
+ }
@@ -2,8 +2,6 @@
2
2
  // FileSystemHelper.swift
3
3
  // CbliteSwiftJsLib
4
4
  //
5
- // Created by Aaron LaBeau on 07/04/24.
6
- //
7
5
 
8
6
  import Foundation
9
7
 
@@ -2,8 +2,6 @@
2
2
  // IndexHelper.swift
3
3
  // CbliteSwiftJsLib
4
4
  //
5
- // Created by Aaron LaBeau on 07/04/24.
6
- //
7
5
 
8
6
  import Foundation
9
7
  import CouchbaseLiteSwift
@@ -2,8 +2,6 @@
2
2
  // LoggingManager.swift
3
3
  // CbliteSwiftJsLib
4
4
  //
5
- // Created by Aaron LaBeau on 09/04/24.
6
- //
7
5
 
8
6
  import Foundation
9
7
  import CouchbaseLiteSwift
@@ -1,8 +1,6 @@
1
1
  //
2
2
  // QueryHelper.swift
3
3
  // CbliteSwiftJsLib
4
- //
5
- // Created by Aaron LaBeau on 07/04/24.
6
4
 
7
5
  import Foundation
8
6
  import CouchbaseLiteSwift
@@ -2,8 +2,6 @@
2
2
  // QueryHelper.swift
3
3
  // CbliteSwiftJsLib
4
4
  //
5
- // Created by Aaron LaBeau on 08/04/24.
6
- //
7
5
 
8
6
  import Foundation
9
7
  import CouchbaseLiteSwift
@@ -7,3 +7,15 @@ CbliteSwiftJsLib is a set of shared code to use with various integration librari
7
7
  ## License
8
8
 
9
9
  CbliteSwiftJsLib is available under the Apache 2.0 license. See the LICENSE file for more info.
10
+
11
+ ---
12
+
13
+ ## 📢 Support Policy
14
+
15
+ We truly appreciate your interest in this project!
16
+ This project is **community-maintained**, which means it's **not officially supported** by our support team.
17
+
18
+ If you need help, have found a bug, or want to contribute improvements, the best place to do that is right here — by [opening a GitHub issue](https://github.com/Couchbase-Ecosystem/cbl-js-swift/issues).
19
+ Our support portal is unable to assist with requests related to this project, so we kindly ask that all inquiries stay within GitHub.
20
+
21
+ Your collaboration helps us all move forward together — thank you!
@@ -2,8 +2,6 @@
2
2
  // ReplicatorHelper.swift
3
3
  // CbliteSwiftJsLib
4
4
  //
5
- // Created by Aaron LaBeau on 07/04/24.
6
- //
7
5
 
8
6
  import Foundation
9
7
  import JavaScriptCore
@@ -2,8 +2,6 @@
2
2
  // ReplicatorManager.swift
3
3
  // CbliteSwiftJsLib
4
4
  //
5
- // Created by Aaron LaBeau on 09/04/24.
6
- //
7
5
 
8
6
  import Foundation
9
7
  import CouchbaseLiteSwift
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cbl-ionic",
3
- "version": "0.2.5",
3
+ "version": "1.0.0",
4
4
  "description": "Ionic Capacitor plugin for Couchbase Lite Enterprise (3.2+)",
5
5
  "main": "dist/plugin.cjs.js",
6
6
  "module": "dist/esm/index.js",
@@ -83,4 +83,4 @@
83
83
  "@rollup/plugin-typescript": "^11.1.6"
84
84
  },
85
85
  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
86
- }
86
+ }