fix: make upstream urls unique

Author: An0n-00

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@omss/framework",
-    "version": "1.1.17",
+    "version": "1.1.18",
     "description": "Official OMSS backend framework - Multi-provider streaming media aggregation framework with auto-discovery",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",

package.json

@@ -52,7 +52,7 @@ export class ProxyService {
      * Returns either buffered response or streaming response based on file type
      */
     async proxyRequest(encodedData: string): Promise<ProxyResult> {
-        const proxyData = this.decodeProxyData(encodedData)
+        const proxyData = ProxyService.decodeProxyData(encodedData)
 
         this.isProd ?? console.log(`[ProxyService] Proxying request to: ${proxyData.url}`)
 
@@ -202,7 +202,7 @@ export class ProxyService {
     /**
      * Decode proxy data parameter
      */
-    private decodeProxyData(encodedData: string): ProxyData {
+    public static decodeProxyData(encodedData: string): ProxyData {
         try {
             const decoded = decodeURIComponent(encodedData)
             const data = JSON.parse(decoded) as ProxyData

src/services/proxy.service.ts

@@ -6,6 +6,7 @@ import { OMSSErrors } from '../core/errors.js'
 import { TMDBService } from '../services/tmdb.service.js'
 import { v4 as uuidv4 } from 'uuid'
 import { StremioService } from './stremio.service.js'
+import { ProxyService } from './proxy.service.js'
 
 export class SourceService {
     private tmdbValidator: ReturnType<typeof createTMDBValidator>
@@ -277,15 +278,43 @@ export class SourceService {
         // Deduplicate sources by URL
         results.forEach((r) => {
             r.sources.forEach((source) => {
-                if (!allSourcesMap.has(source.url)) {
-                    allSourcesMap.set(source.url, source)
+                try {
+                    const urlObj = new URL(source.url)
+                    const data = urlObj.searchParams.get('data')
+                    if (!data) throw new Error('Missing data parameter in source URL')
+
+                    const proxyData = ProxyService.decodeProxyData(data)
+
+                    // Use upstream URL as dedup key, but store the original source (with proxy URL)
+                    if (!allSourcesMap.has(proxyData.url)) {
+                        allSourcesMap.set(proxyData.url, source)
+                    }
+                } catch (error) {
+                    console.warn(`[SourceService] Failed to decode source URL: ${source.url}`, error)
+                    // Fallback: dedup by proxy URL itself
+                    if (!allSourcesMap.has(source.url)) {
+                        allSourcesMap.set(source.url, source)
+                    }
                 }
             })
 
             // Deduplicate subtitles by URL
             r.subtitles.forEach((subtitle) => {
-                if (!allSubtitlesMap.has(subtitle.url)) {
-                    allSubtitlesMap.set(subtitle.url, subtitle)
+                try {
+                    const urlObj = new URL(subtitle.url)
+                    const data = urlObj.searchParams.get('data')
+                    if (!data) throw new Error('Missing data parameter in subtitle URL')
+
+                    const proxyData = ProxyService.decodeProxyData(data)
+
+                    if (!allSubtitlesMap.has(proxyData.url)) {
+                        allSubtitlesMap.set(proxyData.url, subtitle)
+                    }
+                } catch (error) {
+                    console.warn(`[SourceService] Failed to decode subtitle URL: ${subtitle.url}`, error)
+                    if (!allSubtitlesMap.has(subtitle.url)) {
+                        allSubtitlesMap.set(subtitle.url, subtitle)
+                    }
                 }
             })
 

src/services/source.service.ts

@@ -84,7 +84,7 @@ export class StremioService {
 
         const promises = enabled.map((a) =>
             this.fetchAddonStreams(a, type, id).catch((err) => {
-                console.error(`[StremioService] Addon '${a.id}' failed:`, err)
+                console.log(`[StremioService] Addon '${a.id}' failed:`, err)
                 return {
                     addonId: a.id,
                     streams: [],