Added transports parameter to GetMultipeerReplicatorStatus

client/src/cbltest/api/multipeer_replicator_types.py

@@ -13,6 +13,17 @@ class MultipeerTransportType(Flag):
     BLUETOOTH = auto()
     ALL = WIFI | BLUETOOTH
 
+    @classmethod
+    def from_string(cls, value: str) -> "MultipeerTransportType":
+        value = value.upper()
+
+        if value == "WIFI":
+            return cls.WIFI
+        elif value == "BLUETOOTH":
+            return cls.BLUETOOTH
+        else:
+            raise ValueError(f"Unknown MultipeerTransportType: {value}")
+
     def to_json(self) -> list[str]:
         cls = type(self)
         # only single-bit members, and only those present in self

client/src/cbltest/response_types.py

@@ -2,6 +2,9 @@
 from typing import Any, Final, cast
 
 from cbltest.api.error_types import ErrorResponseBody
+from cbltest.api.multipeer_replicator_types import (
+    MultipeerTransportType,
+)
 from cbltest.api.replicator_types import (
     ReplicatorActivityLevel,
     ReplicatorDocumentEntry,
@@ -224,6 +227,7 @@ class MultipeerReplicatorStatusEntry:
 
     __peer_id_key: Final[str] = "peerID"
     __status_key: Final[str] = "status"
+    __transport_key: Final[str] = "transport"
 
     @property
     def peer_id(self) -> str:
@@ -235,13 +239,20 @@ def status(self) -> ReplicatorStatusBody:
         """Gets the status of the replicator"""
         return self.__status
 
+    @property
+    def transport(self) -> MultipeerTransportType:
+        """Gets the transport type of the replicator"""
+        return self.__transport
+
     def __init__(self, body: dict):
         assert isinstance(body, dict), (
             "Invalid MultipeerReplicatorStatusEntry received (not an object)"
         )
 
         self.__peer_id = _assert_string_entry(body, self.__peer_id_key)
         self.__status = ReplicatorStatusBody(body.get(self.__status_key, {}))
+        transport_str = _assert_string_entry(body, self.__transport_key)
+        self.__transport = MultipeerTransportType.from_string(transport_str)
 
 
 class PostGetMultipeerReplicatorStatusResponseMethods(ABC):

client/src/cbltest/v1/responses.py

@@ -502,6 +502,7 @@ class PostGetMultipeerReplicatorStatusResponse(
         {
             "peerID": "1234567890abcdef",
             "status": <replicator status>,
+            "transport": "wifi"
         }
     ]
     """

servers/ios/TestServer/ContentTypes/MultipeerReplicatorStatus.swift

@@ -11,6 +11,7 @@ extension ContentTypes {
     struct PeerReplicatorStatus : Content {
         let peerID: String
         let status: ReplicatorStatus
+        let transport: MultipeerTransport
     }
 
     struct MultipeerReplicatorStatus : Content {

servers/ios/TestServer/ContentTypes/MultipeerTransport.swift

@@ -11,4 +11,4 @@ extension ContentTypes {
         case wifi = "WIFI"
         case bluetooth = "BLUETOOTH"
     }
-}
+}

servers/ios/TestServer/Utils/DatabaseManager.swift

@@ -24,7 +24,7 @@ class DatabaseManager {
     private var replicatorDocumentsToken : [ UUID : ListenerToken ] = [:]
 
     private var multipeerReplicators : [ UUID : MultipeerReplicator ] = [:]
-    private var peerReplicatorStatus : [ UUID : [ PeerID: Replicator.Status ] ] = [:]
+    private var peerReplicatorStatus : [ UUID : [ PeerID: PeerReplicatorStatus] ] = [:]
     private var peerReplicatorTransport : [ UUID : [ PeerID: ContentTypes.MultipeerTransport ] ] = [:]
     private var peerReplicatorStatusToken : [ UUID : ListenerToken ] = [:]
     private var peerReplicatorDocuments : [ UUID : [ PeerID: [ ContentTypes.DocumentReplication ] ] ] = [:]
@@ -353,7 +353,7 @@ class DatabaseManager {
 
         let listenerToken = multipeerReplicator.addPeerReplicatorStatusListener(on: listenerQueue) { [weak self] status in
             guard let strongSelf = self else { return }
-            strongSelf.peerReplicatorStatus[id, default: [:]][status.peerID] = status.status
+            strongSelf.peerReplicatorStatus[id, default: [:]][status.peerID] = status
         }
 
         let docReplToken = multipeerReplicator.addPeerDocumentReplicationListener(on: listenerQueue) { [weak self] docRepl in
@@ -397,14 +397,27 @@ class DatabaseManager {
             var replicators: [ContentTypes.PeerReplicatorStatus] = []
 
             if let statuses = peerReplicatorStatus[id] {
-                for (peerID, status) in statuses {
+                for (peerID, peerStatus) in statuses {
+                    let status = peerStatus.status
+                    let transport = peerStatus.transport
                     let docs = peerReplicatorDocuments[id]?[peerID] ?? []
                     let replStatus = ContentTypes.ReplicatorStatus.init(status: status, docs: docs)
-                    replicators.append(ContentTypes.PeerReplicatorStatus(peerID: "\(peerID)", status: replStatus))
+                    let transportType: ContentTypes.MultipeerTransport = {
+                        switch transport {
+                        case .wifi:
+                            return .wifi
+                        case .bluetooth:
+                            return .bluetooth
+                        @unknown default:
+                            fatalError("Unknown transport")
+                        }
+                    }()
+
+                    replicators.append(ContentTypes.PeerReplicatorStatus(peerID: "\(peerID)", status: replStatus, transport:transportType ))
                     peerReplicatorDocuments[id]?[peerID] = [] // Reset after return per spec
                 }
                 // Remove disconected peers with stopped replicators so their statuses are not included next time.
-                peerReplicatorStatus[id] = statuses.filter { $0.value.activity != .stopped }
+                peerReplicatorStatus[id] = statuses.filter { $0.value.status.activity != .stopped }
             }
 
             status = ContentTypes.MultipeerReplicatorStatus.init(replicators: replicators)
@@ -597,7 +610,7 @@ class DatabaseManager {
             .appendingPathComponent(datasetVersion)
             .appendingPathComponent("\(name).cblite2.zip")
             .relativePath
-            
+
         let datasetZipURL = try downloadDatasetFileIfNecessary(relativePath: datasetRelativePath)
         Log.log(level: .debug, message: "Load dataset at \(datasetZipURL.path)")
 
@@ -718,11 +731,11 @@ class DatabaseManager {
         let lines = auth.certificate
             .components(separatedBy: .newlines)
             .filter { !$0.contains("-----BEGIN CERTIFICATE-----") &&
-                      !$0.contains("-----END CERTIFICATE-----") &&
-                      !$0.isEmpty }
+                !$0.contains("-----END CERTIFICATE-----") &&
+                !$0.isEmpty }
 
         let certData = lines.joined()
-
+        
         guard let derData = Data(base64Encoded: certData) else {
             throw TestServerError.badRequest("Failed to convert multipeer authenticator's root certificate from PEM to DER")
         }

spec/api/api.yaml

@@ -1319,13 +1319,16 @@ components:
           type: array
           items:
             type: object
-            required: ['peerID', 'status']
+            required: ['peerID', 'status', 'transport']
             properties:
               peerID:
                 type: string
                 example: '1234567890abcdef'
               status:
                 $ref: '#/components/schemas/ReplicatorStatus'
+              transport:
+                type: string
+                enum: ['WIFI', 'BLUETOOTH']
     MultipeerReplicatorIdentity:
       description: |-
         MultipeerReplicatorIdentity is used to specify a TLS certificate and key particular