Fix import of chars and lorebook by chub URL Closes #4011

c3376da3939e9c55555515a17f0e50642e978655

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: e5de348b2e38cbbc0c14677ff58edb24539a4307

src/endpoints/content-manager.js+53 -20 Viewed

 const scaffoldIndexPath = path.join(scaffoldDirectory, 'index.json');
 const WHITELIST_GENERIC_URL_DOWNLOAD_SOURCES = getConfigValue('whitelistImportDomains', []);
 +const USER_AGENT = 'SillyTavern';
 /**
  * @typedef {Object} ContentItem

+}
 async function downloadChubLorebook(id) {
 -    const result = await fetch('https://api.chub.ai/api/lorebooks/download', {
 +    const [lorebooks, creatorName, projectName] = id.split('/');
 -        method: 'POST',
 +    const result = await fetch(`https://api.chub.ai/api/${lorebooks}/${creatorName}/${projectName}`, {
 -        headers: { 'Content-Type': 'application/json' },
 +        method: 'GET',
 -        body: JSON.stringify({
 +        headers: { 'Accept': 'application/json', 'User-Agent': USER_AGENT },
 -            'fullPath': id,
 -            'format': 'SILLYTAVERN',
 -        }),
     });
     if (!result.ok) {
         const text = await result.text();
         console.error('Chub returned error', result.statusText, text);
 +        throw new Error('Failed to fetch lorebook metadata');
 +    }
++
 +    /** @type {any} */
 +    const metadata = await result.json();
 +    const projectId = metadata.node?.id;
++
 +    if (!projectId) {
 +        throw new Error('Project ID not found in lorebook metadata');
 +    }
++
 +    const downloadUrl = `https://api.chub.ai/api/v4/projects/${projectId}/repository/files/raw%252Fsillytavern_raw.json/raw`;
 +    const downloadResult = await fetch(downloadUrl, {
 +        method: 'GET',
 +        headers: { 'Accept': 'application/json', 'User-Agent': USER_AGENT },
 +    });
++
 +    if (!downloadResult.ok) {
 +        const text = await downloadResult.text();
 +        console.error('Chub returned error', downloadResult.statusText, text);
         throw new Error('Failed to download lorebook');
+    }
     const name = id.split('/').pop()projectName;
     const buffer = Buffer.from(await resultdownloadResult.arrayBuffer());
     const fileName = `${sanitize(name)}.json`;
     const fileType = resultdownloadResult.headers.get('content-type');
     return { buffer, fileName, fileType };
+}
 async function downloadChubCharacter(id) {
 -    const result = await fetch('https://api.chub.ai/api/characters/download', {
 +    const [creatorName, projectName] = id.split('/');
 -        method: 'POST',
 +    const result = await fetch(`https://api.chub.ai/api/characters/${creatorName}/${projectName}`, {
 -        headers: { 'Content-Type': 'application/json' },
 +        method: 'GET',
 -        body: JSON.stringify({
 +        headers: { 'Accept': 'application/json', 'User-Agent': USER_AGENT },
 -            'format': 'tavern',
 -            'fullPath': id,
 -        }),
     });
     if (!result.ok) {
         const text = await result.text();
         console.error('Chub returned error', result.statusText, text);
 +        throw new Error('Failed to fetch character metadata');
 +    }
++
 +    /** @type {any} */
 +    const metadata = await result.json();
 +    const downloadUrl = metadata.node?.max_res_url;
++
 +    if (!downloadUrl) {
 +        throw new Error('Download URL not found in character metadata');
 +    }
++
 +    const downloadResult = await fetch(downloadUrl);
++
 +    if (!downloadResult.ok) {
 +        const text = await downloadResult.text();
 +        console.error('Chub returned error', downloadResult.statusText, text);
         throw new Error('Failed to download character');
+    }
     const buffer = Buffer.from(await resultdownloadResult.arrayBuffer());
 -    const fileName = result.headers.get('content-disposition')?.split('filename=')[1] || `${sanitize(id)}.png`;
 +    const fileName =
 -    const fileType = result.headers.get('content-type');
 +        downloadResult.headers.get('content-disposition')?.split('filename=')[1]?.replace(/["']/g, '') ||
 +        `${sanitize(projectName)}.png`;
 +    const fileType = downloadResult.headers.get('content-type');
     return { buffer, fileName, fileType };
+}