Viren070/AIOStreams
1
0
Fork 0
mirror of https://github.com/Viren070/AIOStreams.git synced 2025-12-01 23:14:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: only use strings for addon options

Browse Source
This commit is contained in:
Viren070
2024-12-28 17:21:23 +00:00
parent ebc530bca7
commit 83149bfec6
6 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/addon/src/addon.ts
+10 -4
View File
@@ -316,16 +316,22 @@ export class AIOStreams {
);
}
case 'gdrive': {
let addonUrl = addon.options.addonUrl as string;
addonUrl = addonUrl.replace('/manifest.json', '/')
const wrapper = new BaseWrapper(addon.options.overrideName ? addon.options.overrideName as string: 'GDrive', addonUrl, addon.options.indexerTimeout ? addon.options.indexerTimeout as number : undefined);
const addonUrl = addon.options.addonUrl?.replace('/manifest.json', '/') + '/';
const wrapper = new BaseWrapper(
addon.options.overrideName || 'GDrive',
addonUrl,
addon.options.indexerTimeout ? parseInt(addon.options.indexerTimeout) : undefined
);
return await wrapper.getParsedStreams(streamRequest);
}
default: {
if (!addon.options.url) {
throw new Error('Addon URL not found');
}
console.log(
`Using base wrapper for addon ${addon.options.name} with url ${addon.options.url}`
);
const wrapper = new BaseWrapper(addon.options.name as string, addon.options.url as string, addon.options.indexerTimeout ? addon.options.indexerTimeout as number : undefined);
const wrapper = new BaseWrapper(addon.options.name || 'Custom', addon.options.url.trim(), addon.options.indexerTimeout ? parseInt(addon.options.indexerTimeout) : undefined);
return await wrapper.getParsedStreams(streamRequest);
}
}
packages/addon/src/config.ts
+7 -19
View File
@@ -332,33 +332,21 @@ export function validateConfig(config: Config): {
}
if (option.type === 'number' && addon.options[option.id]) {
if (typeof addon.options[option.id] !== 'number') {
const input = addon.options[option.id];
if (input !== undefined && !parseInt(input)) {
return createResponse(
false,
'invalidNumber',
`${option.label} must be a number`
);
}
if (option.constraints) {
if (
option.constraints.min !== undefined &&
addon.options[option.id] as number < option.constraints.min
) {
} else if (input !== undefined) {
const value = parseInt(input);
const { min, max } = option.constraints || {};
if ((min !== undefined && value < min) || (max !== undefined && value > max)) {
return createResponse(
false,
'invalidNumber',
`${option.label} must be greater than or equal to ${option.constraints.min}`
);
}
if (
option.constraints.max !== undefined &&
addon.options[option.id] as number > option.constraints.max
) {
return createResponse(
false,
'invalidNumber',
`${option.label} must be less than or equal to ${option.constraints.max}`
`${option.label} must be between ${min} and ${max}`
);
}
}
packages/frontend/src/components/AddonsList.tsx
+6 -6
View File
@@ -33,10 +33,10 @@ const AddonsList: React.FC<AddonsListProps> = ({
const updateOption = (
addonIndex: number,
optionKey: string,
value?: string | boolean | number
value?: string
) => {
const newAddons = [...addons];
newAddons[addonIndex].options[optionKey] = typeof value === 'string' ? value.trim() : value;
newAddons[addonIndex].options[optionKey] = value;
setAddons(newAddons);
};
@@ -92,12 +92,12 @@ const AddonsList: React.FC<AddonsListProps> = ({
{option.type === 'checkbox' && (
<input
type="checkbox"
checked={addon.options[option.id] === true}
checked={addon.options[option.id] === 'true'}
onChange={(e) =>
updateOption(
index,
option.id,
e.target.checked
e.target.checked ? 'true' : 'false'
)
}
className={styles.checkbox}
@@ -118,9 +118,9 @@ const AddonsList: React.FC<AddonsListProps> = ({
{option.type === 'number' && (
<input
type="number"
value={addon.options[option.id] as number}
value={addon.options[option.id]}
onChange={(e) =>
updateOption(index, option.id, e.target.value ? parseInt(e.target.value) : undefined)
updateOption(index, option.id, e.target.value ? e.target.value : undefined)
}
className={styles.textInput}
/>
packages/types/src/types.ts
+1 -1
View File
@@ -108,7 +108,7 @@ export interface Config {
minSize: number | null;
addons: {
id: string;
options: { [key: string]: string | boolean | number | undefined };
options: { [key: string]: string | undefined};
}[];
services: {
name: string;
packages/wrappers/src/torbox.ts
+2 -2
View File
@@ -101,7 +101,7 @@ export class Torbox extends BaseWrapper {
export async function getTorboxStreams(
config: Config,
torboxOptions: {
indexerTimeout?: number;
indexerTimeout?: string;
overrideName?: string;
},
streamRequest: StreamRequest
@@ -118,6 +118,6 @@ export async function getTorboxStreams(
throw new Error('Torbox API key not found');
}
const torbox = new Torbox(torboxApiKey, torboxOptions.indexerTimeout, torboxOptions.overrideName);
const torbox = new Torbox(torboxApiKey, torboxOptions.indexerTimeout ? parseInt(torboxOptions.indexerTimeout) : undefined, torboxOptions.overrideName);
return await torbox.getParsedStreams(streamRequest);
}
packages/wrappers/src/torrentio.ts
+8 -7
View File
@@ -69,9 +69,9 @@ export class Torrentio extends BaseWrapper {
export async function getTorrentioStreams(
config: Config,
torrentioOptions: {
useMultipleInstances?: boolean;
useMultipleInstances?: string;
overrideUrl?: string;
indexerTimeout?: number;
indexerTimeout?: string;
overrideName?: string;
},
streamRequest: StreamRequest
@@ -86,10 +86,11 @@ export async function getTorrentioStreams(
'debridlink',
];
const parsedStreams: ParsedStream[] = [];
const indexerTimeout = torrentioOptions.indexerTimeout ? parseInt(torrentioOptions.indexerTimeout) : undefined;
// If overrideUrl is provided, use it to get streams and skip all other steps
if (torrentioOptions.overrideUrl) {
const torrentio = new Torrentio(null, torrentioOptions.overrideUrl as string, torrentioOptions.indexerTimeout);
const torrentio = new Torrentio(null, torrentioOptions.overrideUrl as string, indexerTimeout);
return torrentio.getParsedStreams(streamRequest);
}
@@ -100,7 +101,7 @@ export async function getTorrentioStreams(
// if no usable services found, use torrentio without any configuration
if (usableServices.length < 0) {
const torrentio = new Torrentio(null, null, torrentioOptions.indexerTimeout);
const torrentio = new Torrentio(null, null, indexerTimeout);
return await torrentio.getParsedStreams(streamRequest);
}
@@ -115,14 +116,14 @@ export async function getTorrentioStreams(
: `${serviceId}=${credentials.apiKey}`;
};
if (torrentioOptions.useMultipleInstances) {
if (torrentioOptions.useMultipleInstances === 'true') {
for (const service of usableServices) {
if (!service.enabled) {
continue;
}
console.log('Creating Torrentio instance with service:', service.id);
let configString = getServicePair(service.id, service.credentials);
const torrentio = new Torrentio(configString, null, torrentioOptions.indexerTimeout);
const torrentio = new Torrentio(configString, null, indexerTimeout);
const streams = await torrentio.getParsedStreams(streamRequest);
parsedStreams.push(...streams);
}
@@ -135,7 +136,7 @@ export async function getTorrentioStreams(
}
configString += getServicePair(service.id, service.credentials) + '|';
}
const torrentio = new Torrentio(configString, null, torrentioOptions.indexerTimeout, torrentioOptions.overrideName);
const torrentio = new Torrentio(configString, null, indexerTimeout, torrentioOptions.overrideName);
return await torrentio.getParsedStreams(streamRequest);
}
}