replace the associative array with type-safe objects

Author: QuasarStream Team

src/RTCConfiguration.php

@@ -55,17 +55,18 @@ class RTCConfiguration implements RTCConfigurationInterface
     /**
      * Constructs a new RTCConfiguration instance
      *
-     * @param array|null $configuration Optional configuration array. If null,
-     *        default configuration with a Google STUN server will be used.
-     *        Expected keys:
-     *        - 'iceServers': Array of ICE server configurations
-     *        - 'certificatePath': Path to a certificate file (optional)
-     *        - 'privateKeyPath': Path to a private key file (optional)
-     * @throws InvalidArgumentException If iceServer configuration is invalid
+     * @param array<RTCIceServerInterface> $iceServers
+     * @param string|null $certificatePath
+     * @param string|null $privateKeyPath
      */
-    public function __construct(?array $configuration = null)
-    {
-        $configuration !== null ? $this->parseConfiguration($configuration) : $this->getDefaultConfiguration();
+    public function __construct(
+        array $iceServers = [],
+        ?string $certificatePath = null,
+        ?string $privateKeyPath = null
+    ) {
+        $this->iceServers = empty($iceServers) ? $this->getDefaultIceServer() : $iceServers;
+        $this->certificatePath = $certificatePath;
+        $this->privateKeyPath = $privateKeyPath;
     }
 
     /**
@@ -149,11 +150,11 @@ public function setPrivateKeyPath(?string $privateKeyPath): void
      *        - 'iceServers': Array of ICE server configurations (required if present)
      *        - 'certificatePath': Path to a certificate file (optional)
      *        - 'privateKeyPath': Path to a private key file (optional)
-     * @return void
-     * @throws InvalidArgumentException If iceServer configuration is missing required 'urls' key
+     * @return RTCConfiguration
      */
-    private function parseConfiguration(array $configuration): void
+    public static function parseConfiguration(array $configuration): self
     {
+        $iceServers = [];
         if (isset($configuration['iceServers'])) {
             foreach ($configuration["iceServers"] as $iceServer) {
                 if (!isset($iceServer["urls"])) {
@@ -166,23 +167,28 @@ private function parseConfiguration(array $configuration): void
                 $iceServerObj->setCredential($iceServer["credential"] ?? null);
                 $iceServerObj->setCredentialType($iceServer["credentialType"] ?? null);
 
-                $this->addIceServer($iceServerObj);
+                $iceServers[] = $iceServerObj;
             }
+        }else{
+            $iceServers = (new RTCConfiguration)->getDefaultIceServer();
         }
 
-        $this->certificatePath = $configuration["certificatePath"] ?? null;
-        $this->privateKeyPath = $configuration["privateKeyPath"] ?? null;
+        $certificatePath = $configuration["certificatePath"] ?? null;
+        $privateKeyPath = $configuration["privateKeyPath"] ?? null;
+
+        return new static($iceServers, $certificatePath, $privateKeyPath);
     }
 
     /**
-     * Sets up default configuration with Google's public STUN server
+     * return the default ice configuration with Google's public STUN server
      *
-     * @return void
+     * @return array<RTCIceServer>
      */
-    private function getDefaultConfiguration(): void
+    private function getDefaultIceServer(): array
     {
         $iceServer  = new RTCIceServer();
         $iceServer->setUrls([self::DEFAULT_STUN_SERVER]);
-        $this->addIceServer($iceServer);
+
+        return [$iceServer];
     }
 }

src/RTCPeerConnection.php

@@ -245,13 +245,14 @@ class RTCPeerConnection extends EventEmitter implements RTCPeerConnectionInterfa
     /**
      * Creates a new RTCPeerConnection instance.
      *
-     * @param array|RTCConfiguration|null $configuration Configuration options for the connection
+     * @param array|RTCConfigurationInterface $configuration Configuration options for the connection
+     * @throws DateInvalidOperationException If there's an SSL-related error
+     * @throws OpenSSLException If there's an SSL-related error
      * @throws RTCCertificateException If certificate generation fails
-     * @throws OpenSSLException|DateInvalidOperationException If there's an SSL-related error
      */
-    public function __construct(null|array|RTCConfigurationInterface $configuration = null)
+    public function __construct(array|RTCConfigurationInterface $configuration = [])
     {
-        $this->configuration = $configuration instanceof RTCConfigurationInterface ? $configuration : new RTCConfiguration($configuration);
+        $this->configuration = $configuration instanceof RTCConfigurationInterface ? $configuration : RTCConfiguration::parseConfiguration($configuration);
         $this->certificates[] = new RTCCertificate($this->configuration->getPrivateKeyPath(), $this->configuration->getCertificatePath());
         $this->cname = Uuid::uuid4()->toString();
         $this->streamId = Uuid::uuid4()->toString();