@omss/framework 1.1.7 → 1.1.8
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.
- package/dist/services/proxy.service.d.ts +5 -0
- package/dist/services/proxy.service.d.ts.map +1 -1
- package/dist/services/proxy.service.js +35 -6
- package/dist/services/proxy.service.js.map +1 -1
- package/dist/services/source.service.d.ts +1 -0
- package/dist/services/source.service.d.ts.map +1 -1
- package/dist/services/source.service.js +25 -6
- package/dist/services/source.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,10 +5,15 @@ export interface ProxyResponse {
|
|
|
5
5
|
headers?: Record<string, string>;
|
|
6
6
|
}
|
|
7
7
|
export declare class ProxyService {
|
|
8
|
+
private isProd;
|
|
8
9
|
/**
|
|
9
10
|
* Proxy a request to an upstream provider
|
|
10
11
|
*/
|
|
11
12
|
proxyRequest(encodedData: string): Promise<ProxyResponse>;
|
|
13
|
+
/**
|
|
14
|
+
* Determine MIME type from URL or content
|
|
15
|
+
*/
|
|
16
|
+
private getMimeType;
|
|
12
17
|
/**
|
|
13
18
|
* Decode proxy data parameter
|
|
14
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.service.d.ts","sourceRoot":"","sources":["../../src/services/proxy.service.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,qBAAa,YAAY;IACrB;;OAEG;IACG,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy.service.d.ts","sourceRoot":"","sources":["../../src/services/proxy.service.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,MAAM,CAAiD;IAC/D;;OAEG;IACG,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IA4D/D;;OAEG;IACH,OAAO,CAAC,WAAW;IAWnB;;OAEG;IACH,OAAO,CAAC,eAAe;IAkBvB;;OAEG;IACH,OAAO,CAAC,cAAc;IAWtB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAoCvB;;OAEG;IACH,OAAO,CAAC,eAAe;IAIvB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAY5B;;OAEG;IACH,OAAO,CAAC,SAAS;IAmCjB;;;OAGG;IACH,OAAO,CAAC,UAAU;IAoClB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAKtB;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;CAI/E"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import axios from 'axios';
|
|
2
2
|
import { OMSSError } from '../core/errors.js';
|
|
3
3
|
export class ProxyService {
|
|
4
|
+
isProd = process.env.NODE_ENV === 'production';
|
|
4
5
|
/**
|
|
5
6
|
* Proxy a request to an upstream provider
|
|
6
7
|
*/
|
|
7
8
|
async proxyRequest(encodedData) {
|
|
8
9
|
// Decode the data parameter
|
|
9
10
|
const proxyData = this.decodeProxyData(encodedData);
|
|
10
|
-
console.log(`[ProxyService] Proxying request to: ${proxyData.url}`);
|
|
11
|
+
this.isProd ?? console.log(`[ProxyService] Proxying request to: ${proxyData.url}`);
|
|
11
12
|
try {
|
|
12
13
|
const response = await axios.get(proxyData.url, {
|
|
13
14
|
headers: {
|
|
@@ -15,9 +16,12 @@ export class ProxyService {
|
|
|
15
16
|
'User-Agent': proxyData.headers?.['User-Agent'] || 'OMSS-Backend/1.0',
|
|
16
17
|
},
|
|
17
18
|
responseType: 'arraybuffer',
|
|
18
|
-
timeout: 30000,
|
|
19
|
+
timeout: 30000,
|
|
19
20
|
maxRedirects: 5,
|
|
20
|
-
validateStatus: (status) => status < 500,
|
|
21
|
+
validateStatus: (status) => status < 500,
|
|
22
|
+
...(proxyData.headers?.Range && {
|
|
23
|
+
headers: { Range: proxyData.headers.Range },
|
|
24
|
+
}),
|
|
21
25
|
});
|
|
22
26
|
// Check if we need to rewrite manifest files
|
|
23
27
|
const contentType = response.headers['content-type'] || '';
|
|
@@ -29,11 +33,16 @@ export class ProxyService {
|
|
|
29
33
|
}
|
|
30
34
|
return {
|
|
31
35
|
data: responseData,
|
|
32
|
-
contentType: contentType,
|
|
36
|
+
contentType: contentType || this.getMimeType(proxyData.url),
|
|
33
37
|
statusCode: response.status,
|
|
34
38
|
headers: {
|
|
35
|
-
'Cache-Control': response.headers['cache-control'] || 'public, max-age=300',
|
|
36
39
|
'Access-Control-Allow-Origin': '*',
|
|
40
|
+
'Access-Control-Allow-Credentials': 'true',
|
|
41
|
+
'Access-Control-Expose-Headers': 'Content-Type,Content-Range,Accept-Ranges,Cache-Control,Content-Length',
|
|
42
|
+
'Accept-Ranges': 'bytes',
|
|
43
|
+
'Cache-Control': response.headers['cache-control'] || 'public, max-age=3600',
|
|
44
|
+
'Content-Length': response.headers['content-length'],
|
|
45
|
+
'Content-Range': response.headers['content-range'],
|
|
37
46
|
},
|
|
38
47
|
};
|
|
39
48
|
}
|
|
@@ -47,6 +56,26 @@ export class ProxyService {
|
|
|
47
56
|
throw error;
|
|
48
57
|
}
|
|
49
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* Determine MIME type from URL or content
|
|
61
|
+
*/
|
|
62
|
+
getMimeType(url) {
|
|
63
|
+
if (url.match(/\.vtt$/i))
|
|
64
|
+
return 'text/vtt';
|
|
65
|
+
if (url.match(/\.srt$/i))
|
|
66
|
+
return 'text/plain';
|
|
67
|
+
if (url.match(/\.ass|\.ssa$/i))
|
|
68
|
+
return 'text/plain';
|
|
69
|
+
if (url.match(/\.m3u8$/i))
|
|
70
|
+
return 'application/x-mpegURL';
|
|
71
|
+
if (url.match(/\.mpd$/i))
|
|
72
|
+
return 'application/dash+xml';
|
|
73
|
+
if (url.match(/\.(mp4|mkv|webm|avi|mov)$/i))
|
|
74
|
+
return 'video/mp4';
|
|
75
|
+
if (url.match(/\.ts$/i))
|
|
76
|
+
return 'video/mp2t';
|
|
77
|
+
return 'application/x-mpegURL';
|
|
78
|
+
}
|
|
50
79
|
/**
|
|
51
80
|
* Decode proxy data parameter
|
|
52
81
|
*/
|
|
@@ -191,7 +220,7 @@ export class ProxyService {
|
|
|
191
220
|
return new URL(targetUrl, baseDir).toString();
|
|
192
221
|
}
|
|
193
222
|
catch (error) {
|
|
194
|
-
console.warn(`[ProxyService] Failed to resolve URL: ${targetUrl} against ${baseUrl}`);
|
|
223
|
+
this.isProd ?? console.warn(`[ProxyService] Failed to resolve URL: ${targetUrl} against ${baseUrl}`);
|
|
195
224
|
// Fallback: try to construct a valid URL
|
|
196
225
|
try {
|
|
197
226
|
const baseUrlObj = new URL(baseUrl);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.service.js","sourceRoot":"","sources":["../../src/services/proxy.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAS7C,MAAM,OAAO,YAAY;
|
|
1
|
+
{"version":3,"file":"proxy.service.js","sourceRoot":"","sources":["../../src/services/proxy.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source.service.d.ts","sourceRoot":"","sources":["../../src/services/source.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAkB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"source.service.d.ts","sourceRoot":"","sources":["../../src/services/source.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAkB,iBAAiB,EAAqD,MAAM,kBAAkB,CAAA;AAGvI,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAGzD,qBAAa,aAAa;IAKlB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,QAAQ;IAPpB,OAAO,CAAC,aAAa,CAAwC;IAC7D,OAAO,CAAC,aAAa,CAA4C;gBAGrD,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,WAAW,EACxB,QAAQ;;;KAAsC;IAM1D;;OAEG;IACG,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IA2C9D;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IA6C5F;;OAEG;IACG,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBtD;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAK9B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAiB9B;;OAEG;YACW,kBAAkB;IAmDhC;;;OAGG;IACH,OAAO,CAAC,aAAa;IAgDrB;;OAEG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIjE;;OAEG;IACH,gBAAgB,IAAI,MAAM;IAI1B;;OAEG;IACH,OAAO,IAAI,IAAI;CAIlB"}
|
|
@@ -176,13 +176,32 @@ export class SourceService {
|
|
|
176
176
|
}
|
|
177
177
|
/**
|
|
178
178
|
* Build final response from provider results
|
|
179
|
+
* Deduplicates sources and subtitles by URL
|
|
179
180
|
*/
|
|
180
181
|
buildResponse(results) {
|
|
181
|
-
const
|
|
182
|
-
const
|
|
183
|
-
const allDiagnostics =
|
|
182
|
+
const allSourcesMap = new Map();
|
|
183
|
+
const allSubtitlesMap = new Map();
|
|
184
|
+
const allDiagnostics = [];
|
|
185
|
+
// Deduplicate sources by URL
|
|
186
|
+
results.forEach((r) => {
|
|
187
|
+
r.sources.forEach((source) => {
|
|
188
|
+
if (!allSourcesMap.has(source.url)) {
|
|
189
|
+
allSourcesMap.set(source.url, source);
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
// Deduplicate subtitles by URL
|
|
193
|
+
r.subtitles.forEach((subtitle) => {
|
|
194
|
+
if (!allSubtitlesMap.has(subtitle.url)) {
|
|
195
|
+
allSubtitlesMap.set(subtitle.url, subtitle);
|
|
196
|
+
}
|
|
197
|
+
});
|
|
198
|
+
// Collect all diagnostics
|
|
199
|
+
allDiagnostics.push(...r.diagnostics);
|
|
200
|
+
});
|
|
201
|
+
const uniqueSources = Array.from(allSourcesMap.values());
|
|
202
|
+
const uniqueSubtitles = Array.from(allSubtitlesMap.values());
|
|
184
203
|
const failedProviders = results.filter((r) => r.sources.length === 0).length;
|
|
185
|
-
if (failedProviders > 0 &&
|
|
204
|
+
if (failedProviders > 0 && uniqueSources.length > 0) {
|
|
186
205
|
allDiagnostics.push({
|
|
187
206
|
code: 'PARTIAL_SCRAPE',
|
|
188
207
|
message: `Only ${results.length - failedProviders} of ${results.length} providers returned results`,
|
|
@@ -194,8 +213,8 @@ export class SourceService {
|
|
|
194
213
|
return {
|
|
195
214
|
responseId: uuidv4(),
|
|
196
215
|
expiresAt,
|
|
197
|
-
sources:
|
|
198
|
-
subtitles:
|
|
216
|
+
sources: uniqueSources,
|
|
217
|
+
subtitles: uniqueSubtitles,
|
|
199
218
|
diagnostics: allDiagnostics,
|
|
200
219
|
};
|
|
201
220
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source.service.js","sourceRoot":"","sources":["../../src/services/source.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"source.service.js","sourceRoot":"","sources":["../../src/services/source.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED