filepizza-client 2.1.0 → 2.1.1

package/README.md

@@ -74,7 +74,7 @@ By default, the client:
 - Fetches ICE server configuration from the FilePizza server
 - Attempts to discover a PeerJS signaling server from:
   ```
-  /api/peerjs-servers
+  /api/ice
   ```
 - Falls back to PeerJS defaults if no signaling server is configured
 

package/dist/peerjs.js

@@ -8,26 +8,39 @@ function normalizeBaseUrl(url) {
 }
 function parsePeerJSServerUrl(serverUrlString) {
     const serverUrl = new URL(serverUrlString);
+    const secure = serverUrl.protocol === 'https:';
     return {
         host: serverUrl.hostname,
         port: serverUrl.port
             ? Number.parseInt(serverUrl.port, 10)
-            : serverUrl.protocol === 'https:'
+            : secure
                 ? 443
                 : 80,
         path: serverUrl.pathname,
-        secure: serverUrl.protocol === 'https:',
+        secure,
     };
 }
-export async function getIceServers(filePizzaServerUrl) {
-    try {
-        const response = await fetch(`${normalizeBaseUrl(filePizzaServerUrl)}/api/ice`, {
-            method: 'POST',
-        });
+const iceCache = new Map();
+function fetchIceEndpoint(filePizzaServerUrl) {
+    const baseUrl = normalizeBaseUrl(filePizzaServerUrl);
+    const cached = iceCache.get(baseUrl);
+    if (cached) {
+        return cached;
+    }
+    const promise = (async () => {
+        const response = await fetch(`${baseUrl}/api/ice`, { method: 'POST' });
         if (!response.ok) {
-            throw new Error(`Failed to get ICE servers: ${response.status}`);
+            throw new Error(`Failed to fetch /api/ice: ${response.status}`);
         }
-        const data = await response.json();
+        return (await response.json());
+    })();
+    promise.catch(() => iceCache.delete(baseUrl));
+    iceCache.set(baseUrl, promise);
+    return promise;
+}
+export async function getIceServers(filePizzaServerUrl) {
+    try {
+        const data = await fetchIceEndpoint(filePizzaServerUrl);
         return data.iceServers || DEFAULT_ICE_SERVERS;
     }
     catch (error) {
@@ -37,11 +50,15 @@ export async function getIceServers(filePizzaServerUrl) {
 }
 export async function discoverPeerJSSignalingServer(filePizzaServerUrl) {
     try {
-        const response = await fetch(`${normalizeBaseUrl(filePizzaServerUrl)}/api/peerjs-servers`);
-        if (!response.ok) {
-            return undefined;
+        const data = await fetchIceEndpoint(filePizzaServerUrl);
+        if (data.host) {
+            return {
+                host: data.host,
+                path: data.path,
+                port: data.port,
+                secure: data.secure,
+            };
         }
-        const data = await response.json();
         const firstServer = data.servers?.[0];
         if (!firstServer) {
             return undefined;

package/dist/peerjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"peerjs.js","sourceRoot":"","sources":["../src/peerjs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"peerjs.js","sourceRoot":"","sources":["../src/peerjs.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "filepizza-client",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Client API for FilePizza, a free peer-to-peer file transfer service.",
   "author": "Fares Abawi <fares@abawi.me> (https://abawi.me)",
   "license": "MIT",

package/src/filepizza-uploader.ts

@@ -512,4 +512,4 @@ export class FilePizzaUploader extends EventEmitter {
       totalBytes: context.totalBytes,
     }
   }
-}
+}

package/src/peerjs.ts

@@ -13,38 +13,63 @@ export type PeerJSConfigOptions = {
     discoverPeerJSSignalingServer?: boolean
 }
 
+type IceEndpointResponse = {
+    host?: string
+    path?: string
+    port?: number
+    secure?: boolean
+    servers?: string[]
+    iceServers?: RTCIceServer[]
+}
+
 function normalizeBaseUrl(url: string): string {
     return url.replace(/\/+$/, '')
 }
 
 function parsePeerJSServerUrl(serverUrlString: string): PeerJSSignalingServer {
     const serverUrl = new URL(serverUrlString)
-
+    const secure = serverUrl.protocol === 'https:'
     return {
         host: serverUrl.hostname,
         port: serverUrl.port
             ? Number.parseInt(serverUrl.port, 10)
-            : serverUrl.protocol === 'https:'
+            : secure
                 ? 443
                 : 80,
         path: serverUrl.pathname,
-        secure: serverUrl.protocol === 'https:',
+        secure,
     }
 }
 
-export async function getIceServers(
+const iceCache = new Map<string, Promise<IceEndpointResponse>>()
+
+function fetchIceEndpoint(
     filePizzaServerUrl: string,
-): Promise<RTCIceServer[]> {
-    try {
-        const response = await fetch(`${normalizeBaseUrl(filePizzaServerUrl)}/api/ice`, {
-            method: 'POST',
-        })
+): Promise<IceEndpointResponse> {
+    const baseUrl = normalizeBaseUrl(filePizzaServerUrl)
+    const cached = iceCache.get(baseUrl)
+    if (cached) {
+        return cached
+    }
 
+    const promise = (async () => {
+        const response = await fetch(`${baseUrl}/api/ice`, { method: 'POST' })
         if (!response.ok) {
-            throw new Error(`Failed to get ICE servers: ${response.status}`)
+            throw new Error(`Failed to fetch /api/ice: ${response.status}`)
         }
+        return (await response.json()) as IceEndpointResponse
+    })()
+
+    promise.catch(() => iceCache.delete(baseUrl))
+    iceCache.set(baseUrl, promise)
+    return promise
+}
 
-        const data = await response.json()
+export async function getIceServers(
+    filePizzaServerUrl: string,
+): Promise<RTCIceServer[]> {
+    try {
+        const data = await fetchIceEndpoint(filePizzaServerUrl)
         return data.iceServers || DEFAULT_ICE_SERVERS
     } catch (error) {
         console.error('Error getting ICE servers:', error)
@@ -56,21 +81,21 @@ export async function discoverPeerJSSignalingServer(
     filePizzaServerUrl: string,
 ): Promise<PeerJSSignalingServer | undefined> {
     try {
-        const response = await fetch(
-            `${normalizeBaseUrl(filePizzaServerUrl)}/api/peerjs-servers`,
-        )
-
-        if (!response.ok) {
-            return undefined
+        const data = await fetchIceEndpoint(filePizzaServerUrl)
+
+        if (data.host) {
+            return {
+                host: data.host,
+                path: data.path,
+                port: data.port,
+                secure: data.secure,
+            }
         }
 
-        const data = await response.json()
         const firstServer = data.servers?.[0]
-
         if (!firstServer) {
             return undefined
         }
-
         return parsePeerJSServerUrl(firstServer)
     } catch (error) {
         console.error('Error discovering PeerJS signaling server:', error)
@@ -102,9 +127,7 @@ export async function buildPeerOptions({
     }
 }
 
-export async function createPeer(
-    options: PeerJSConfigOptions,
-): Promise<Peer> {
+export async function createPeer(options: PeerJSConfigOptions): Promise<Peer> {
     const peerOptions = await buildPeerOptions(options)
     const peer = new Peer(peerOptions)
 
@@ -117,9 +140,8 @@ export async function createPeer(
             peer.off('open', onOpen)
             resolve()
         }
-
         peer.on('open', onOpen)
     })
 
     return peer
-}
+}