Replace ajax with fetch (#4241) * Replace ajax with fetch Fix type errors in power-user / group-chats modules * Fix single sprite upload * Return empty object on failed upload

96bdc139371ad71e6609792f125ba60ea8e0fc66

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

Signed

Parents: 55ca4c89b6a55f14890e9d7b1258880cc29c1fcf

public/global.d.ts+6 -0 Viewed

      * @param args - The arguments for the conversion function.
      */
     function convertVideoToAnimatedWebp(args: ConvertVideoArgs): Promise<Uint8Array>;
+    interface ColorPickerEvent extends JQuery.ChangeEvent<HTMLElement> {
+        detail: {
+            rgba: string;
+        };
+    }
+}

public/script.js+47 -37 Viewed

 export const entitiesFilter = new FilterHelper(printCharactersDebounced);
-export function getRequestHeaders() {
+export function getRequestHeaders({ omitContentType = false } = {}) {
-    return {
+    const headers = {
         'Content-Type': 'application/json',
         'X-CSRF-Token': token,
     };
+    if (omitContentType) {
+        delete headers['Content-Type'];
+    }
+    return headers;
+}
 export function getSlideToggleOptions() {

         TempResponseLength.restore(null);
+    }
-    //console.log('Entering settings with name1 = '+name1);
+    const payload = {
-    return jQuery.ajax({
-        type: 'POST',
-        url: '/api/settings/save',
-        data: JSON.stringify({
         firstRun: firstRun,
         accountStorage: accountStorage.getState(),
         currentVersion: currentVersion,

         background: background_settings,
         proxies: proxies,
         selected_proxy: selected_proxy,
-        }, null, 4),
+    };
-        beforeSend: function () { },
-        cache: false,
+    try {
-        dataType: 'json',
+        const result = await fetch('/api/settings/save', {
-        contentType: 'application/json',
+            method: 'POST',
-        //processData: false,
+            headers: getRequestHeaders(),
-        success: async function (data) {
+            body: JSON.stringify(payload),
-            eventSource.emit(event_types.SETTINGS_UPDATED);
+            cache: 'no-cache',
-        },
-        error: function (jqXHR, exception) {
-            toastr.error(t`Check the server connection and reload the page to prevent data loss.`, t`Settings could not be saved`);
-            console.log(exception);
-            console.log(jqXHR);
-        },
         });
+        if (!result.ok) {
+            throw new Error(`Failed to save settings: ${result.statusText}`);
+        }
+        settings = payload;
+        await eventSource.emit(event_types.SETTINGS_UPDATED);
+    } catch (error) {
+        console.error('Error saving settings:', error);
+        toastr.error(t`Check the server connection and reload the page to prevent data loss.`, t`Settings could not be saved`);
+    }
+}
 /**

  * @param {EventTarget} eventTarget Event target to trigger the event on.
  */
 async function importCharacterChat(formData, eventTarget) {
-    const headers = getRequestHeaders();
-    delete headers['Content-Type'];
     const fetchResult = await fetch('/api/chats/import', {
         method: 'POST',
         body: formData,
-        headers: headers,
+        headers: getRequestHeaders({ omitContentType: true }),
         cache: 'no-cache',
     });

         formData.set('avatar', convertedFile);
+    }
-    const headers = getRequestHeaders();
+    const headers = getRequestHeaders({ omitContentType: true });
-    delete headers['Content-Type'];
     if ($('#form_create').attr('actiontype') == 'createcharacter') {
         if (String($('#character_name_pole').val()).length === 0) {

     formData.append('file_type', format);
     if (preserveFileName) formData.append('preserved_name', preserveFileName);
-    const data = await jQuery.ajax({
+    try {
-        type: 'POST',
+        const result = await fetch('/api/characters/import', {
-        url: '/api/characters/import',
+            method: 'POST',
-        data: formData,
+            body: formData,
-        async: true,
+            headers: getRequestHeaders({ omitContentType: true }),
-        cache: false,
+            cache: 'no-cache',
-        contentType: false,
-        processData: false,
         });
+        if (!result.ok) {
+            throw new Error(`Failed to import character: ${result.statusText}`);
+        }
+        const data = await result.json();
         if (data.error) {
-        toastr.error(t`The file is likely invalid or corrupted.`, t`Could not import character`);
+            throw new Error(`Server returned an error: ${data.error}`);
-        return;
+        }
         if (data.file_name !== undefined) {

@@ -9035,11 +9042,14 @@ async function importCharacter(file, { preserveFileName = '', importTags = false
9035	let avatarFileName = `${data.file_name}.png`;	9042	let avatarFileName = `${data.file_name}.png`;
9036	if (importTags) {	9043	if (importTags) {
9037	await importCharactersTags([avatarFileName]);	9044	await importCharactersTags([avatarFileName]);
9038
9039	selectImportedChar(data.file_name);	9045	selectImportedChar(data.file_name);
9040	}	9046	}
9041	return avatarFileName;	9047	return avatarFileName;
9042	}	9048	}
		9049	} catch (error) {
		9050	console.error('Error importing character', error);
		9051	toastr.error(t`The file is likely invalid or corrupted.`, t`Could not import character`);
		9052	}
9043	}	9053	}
9044		9054
9045	async function importFromURL(items, files) {	9055	async function importFromURL(items, files) {

public/scripts/backgrounds.js+1 -4 Viewed

             return;
+        }
-        const headers = getRequestHeaders();
-        delete headers['Content-Type'];
         const response = await fetch('/api/backgrounds/upload', {
             method: 'POST',
-            headers: headers,
+            headers: getRequestHeaders({ omitContentType: true }),
             body: formData,
             cache: 'no-cache',
         });

public/scripts/extensions/expressions/index.js+25 -10 Viewed

     saveSettingsDebounced();
+}
+/**
+ * Handles the file upload process for a sprite image.
+ * @param {string} url URL to upload the file to
+ * @param {FormData} formData FormData object containing the file and other data to upload
+ * @returns {Promise<any>} - The response data from the server
+ */
 async function handleFileUpload(url, formData) {
     try {
-        const data = await jQuery.ajax({
+        const result = await fetch(url, {
-            type: 'POST',
+            method: 'POST',
-            url: url,
+            headers: getRequestHeaders({ omitContentType: true }),
-            data: formData,
+            body: formData,
-            beforeSend: function () { },
+            cache: 'no-cache',
-            cache: false,
-            contentType: false,
-            processData: false,
         });
+        if (!result.ok) {
+            throw new Error(`Upload failed with status ${result.status}`);
+        }
+        const data = await result.json();
         // Refresh sprites list
-        const name = formData.get('name');
+        const name = formData.get('name').toString();
         delete spriteCache[name];
         await fetchImagesNoCache();
         await validateImages(name);
-        return data;
+        return data ?? {};
     } catch (error) {
+        console.error('Error uploading image:', error);
         toastr.error('Failed to upload image');
+        return {};
+    }
+}

         const uploadToast = toastr.info('Please wait...', 'Upload is processing', { timeOut: 0, extendedTimeOut: 0 });
         const { count } = await handleFileUpload('/api/sprites/upload-zip', formData);
         toastr.clear(uploadToast);
+        // Only show success message if at least one image was uploaded
+        if (count) {
             toastr.success(`Uploaded ${count} image(s) for ${name}`);
+        }
         // Reset the input
         e.target.form.reset();

public/scripts/group-chats.js+4 -6 Viewed

  * @returns {number|Object} 0-based character ID or key-value object if full is true
  */
 export function findGroupMemberId(arg, full = false) {
-    arg = arg?.trim();
+    arg = arg?.toString()?.trim();
     if (!arg) {
         console.warn('WARN: No argument provided for findGroupMemberId');

@@ -1358,7 +1358,7 @@ function isGroupMember(group, avatarId) {
1358	}	1358	}
1359	}	1359	}
1360		1360
1361	function getGroupCharacters({ doFilter, onlyMembers } = {}) {	1361	function getGroupCharacters({ doFilter = false, onlyMembers = false } = {}) {
1362	function sortMembersFn(a, b) {	1362	function sortMembersFn(a, b) {
1363	const membersArray = thisGroup?.members ?? newGroupMembers;	1363	const membersArray = thisGroup?.members ?? newGroupMembers;
1364	const aIndex = membersArray.indexOf(a.item.avatar);	1364	const aIndex = membersArray.indexOf(a.item.avatar);

 function updateFavButtonState(state) {
     fav_grp_checked = state;
-    $('#rm_group_fav').val(fav_grp_checked);
+    $('#rm_group_fav').val(String(fav_grp_checked));
     $('#group_favorite_button').toggleClass('fav_on', fav_grp_checked);
     $('#group_favorite_button').toggleClass('fav_off', !fav_grp_checked);
+}

  * @param {EventTarget} eventTarget Element that triggered the import
  */
 export async function importGroupChat(formData, eventTarget) {
-    const headers = getRequestHeaders();
-    delete headers['Content-Type'];
     const fetchResult = await fetch('/api/chats/group/import', {
         method: 'POST',
-        headers: headers,
+        headers: getRequestHeaders({ omitContentType: true }),
         body: formData,
         cache: 'no-cache',
     });

public/scripts/personas.js+2 -8 Viewed

         formData.append('overwrite_name', name);
+    }
-    const headers = getRequestHeaders();
-    delete headers['Content-Type'];
     await fetch('/api/avatars/upload', {
         method: 'POST',
-        headers: headers,
+        headers: getRequestHeaders({ omitContentType: true }),
         cache: 'no-cache',
         body: formData,
     });

         formData.set('avatar', convertedFile);
+    }
-    const headers = getRequestHeaders();
-    delete headers['Content-Type'];
     const response = await fetch(url, {
         method: 'POST',
-        headers: headers,
+        headers: getRequestHeaders({ omitContentType:true }),
         cache: 'no-cache',
         body: formData,
     });

public/scripts/power-user.js+44 -57 Viewed

 import { DEFAULT_REASONING_TEMPLATE, loadReasoningTemplates } from './reasoning.js';
 import { bindModelTemplates } from './chat-templates.js';
-export {
-    loadPowerUserSettings,
-    loadMovingUIState,
-    collapseNewlines,
-    playMessageSound,
-    fixMarkdown,
-    power_user,
-    send_on_enter_options,
-    getContextSettings,
-    applyPowerUserSettings,
-};
 export const toastPositionClasses = [
     'toast-top-left',
     'toast-top-center',

     DOCUMENT: 2,
 };
-const send_on_enter_options = {
+export const send_on_enter_options = {
     DISABLED: -1,
     AUTO: 0,
     ENABLED: 1,

     NONE: 9,
 };
-let power_user = {
+export const power_user = {
     charListGrid: false,
     tokenizer: tokenizers.BEST_MATCH,
     token_padding: 64,

 const setHotswapsDebounced = debounce(favsToHotswap);
-function playMessageSound() {
+export function playMessageSound() {
     if (!power_user.play_message_sound) {
         return;
+    }

  * @example
  * collapseNewlines("\n\n\n"); // "\n"
  */
-function collapseNewlines(x) {
+export function collapseNewlines(x) {
     return x.replaceAll(/\n+/g, '\n');
+}

  * // and you HAVE to handle the cases where multiple pairs of asterisks exist in the same line
  * "^example * text* * harder problem *\n" // "^example *text* *harder problem*\n"
  */
-function fixMarkdown(text, forDisplay) {
+export function fixMarkdown(text, forDisplay) {
     // Find pairs of formatting characters and capture the text in between them
     const format = /([*_]{1,2})([\s\S]*?)\1/gm;
     let matches = [];

                     })
                     //trigger slider changes when user clicks away
                     .on('mouseup blur', function () {
-                        let manualInput = parseFloat(handle.text()).toFixed(decimals);
+                        let manualInput = parseFloat(parseFloat(handle.text()).toFixed(decimals));
                         if (isManualInput) {
                             //disallow manual inputs outside acceptable range
                             if (manualInput >= sliderMin && manualInput <= sliderMax) {
                                 //if value is ok, assign to slider and update handle text and position
                                 newSlider.val(manualInput);
-                                handleSlideEvent.call(newSlider, null, { value: parseFloat(manualInput) }, 'manual');
+                                handleSlideEvent.call(newSlider, null, { value: manualInput }, 'manual');
                                 valueBeforeManualInput = manualInput;
                             } else {
                                 //if value not ok, warn and reset to last known valid value

     function handleSlideEvent(event, ui, type) {
         var handle = $(this).find('.ui-slider-handle');
-        var numVal = Number(ui.value).toFixed(decimals);
+        var numVal = parseFloat(Number(ui.value).toFixed(decimals));
-        offVal = Number(offVal).toFixed(decimals);
+        offVal = parseFloat(Number(offVal).toFixed(decimals));
-        allVal = Number(allVal).toFixed(decimals);
+        allVal = parseFloat(Number(allVal).toFixed(decimals));
         console.log(numVal, sliderMin, sliderMax, numVal > sliderMax, numVal < sliderMin);
         if (numVal > sliderMax) { numVal = sliderMax; }
         if (numVal < sliderMin) { numVal = sliderMin; }
-        var stepNumber = ((ui.value - sliderMin) / stepScale).toFixed(0);
+        var stepNumber = parseFloat(((ui.value - sliderMin) / stepScale).toFixed(0));
         var handleText = (ui.value);
         var leftMargin = (stepNumber / numSteps) * 50 * -1;
         var perStepPercent = 1 / numSteps; //how far in % each step should be on the slider

@@ -1035,10 +1023,9 @@ function applyAvatarStyle() {
1035	}	1023	}
1036		1024
1037	function applyChatDisplay() {	1025	function applyChatDisplay() {
1038		1026	if ([null, undefined].includes(power_user.chat_display)) {
1039	if (!power_user.chat_display === (null \|\| undefined)) {
1040	console.debug('applyChatDisplay: saw no chat display type defined');	1027	console.debug('applyChatDisplay: saw no chat display type defined');
1041	return;	1028	power_user.chat_display = chat_styles.DEFAULT;
1042	}	1029	}
1043	console.debug(`poweruser.chat_display ${power_user.chat_display}`);	1030	console.debug(`poweruser.chat_display ${power_user.chat_display}`);
1044	$('#chat_display').val(power_user.chat_display).prop('selected', true);	1031	$('#chat_display').val(power_user.chat_display).prop('selected', true);

     callGenericPopup(template, POPUP_TYPE.TEXT, '', { wide: true, large: true, allowVerticalScrolling: true });
+}
-function applyPowerUserSettings() {
+export function applyPowerUserSettings() {
     switchUiMode();
     applyFontScale('forced');
     applyThemeColor();

+}
 //MARK: loadPowerUser
-async function loadPowerUserSettings(settings, data) {
+export async function loadPowerUserSettings(settings, data) {
     const defaultStscript = JSON.parse(JSON.stringify(power_user.stscript));
     // Load from settings.json
     if (settings.power_user !== undefined) {

@@ -1552,15 +1539,15 @@ async function loadPowerUserSettings(settings, data) {
1552	context_presets = data.context;	1539	context_presets = data.context;
1553	}	1540	}
1554		1541
1555	if (power_user.chat_display === '') {	1542	if (typeof power_user.chat_display !== 'number') {
1556	power_user.chat_display = chat_styles.DEFAULT;	1543	power_user.chat_display = chat_styles.DEFAULT;
1557	}	1544	}
1558		1545
1559	if (power_user.waifuMode === '') {	1546	if (typeof power_user.waifuMode !== 'boolean') {
1560	power_user.waifuMode = false;	1547	power_user.waifuMode = false;
1561	}	1548	}
1562		1549
1563	if (power_user.chat_width === '') {	1550	if (typeof power_user.chat_width !== 'number') {
1564	power_user.chat_width = 50;	1551	power_user.chat_width = 50;
1565	}	1552	}
1566		1553

     $('#auto_scroll_chat_to_bottom').prop('checked', power_user.auto_scroll_chat_to_bottom);
     $('#bogus_folders').prop('checked', power_user.bogus_folders);
     $('#zoomed_avatar_magnification').prop('checked', power_user.zoomed_avatar_magnification);
-    $(`#tokenizer option[value="${power_user.tokenizer}"]`).attr('selected', true);
+    $(`#tokenizer option[value="${power_user.tokenizer}"]`).prop('selected', true);
-    $(`#send_on_enter option[value=${power_user.send_on_enter}]`).attr('selected', true);
+    $(`#send_on_enter option[value=${power_user.send_on_enter}]`).prop('selected', true);
     $('#confirm_message_delete').prop('checked', power_user.confirm_message_delete !== undefined ? !!power_user.confirm_message_delete : true);
     $('#spoiler_free_mode').prop('checked', power_user.spoiler_free_mode);
     $('#collapse-newlines-checkbox').prop('checked', power_user.collapse_newlines);

     $('#enableZenSliders').prop('checked', power_user.enableZenSliders).trigger('input');
     $('#enableLabMode').prop('checked', power_user.enableLabMode).trigger('input', { fromInit: true });
     $(`input[name="avatar_style"][value="${power_user.avatar_style}"]`).prop('checked', true);
-    $(`#chat_display option[value=${power_user.chat_display}]`).attr('selected', true).trigger('change');
+    $(`#chat_display option[value=${power_user.chat_display}]`).prop('selected', true).trigger('change');
-    $(`#toastr_position option[value=${power_user.toastr_position}]`).attr('selected', true).trigger('change');
+    $(`#toastr_position option[value=${power_user.toastr_position}]`).prop('selected', true).trigger('change');
     $('#chat_width_slider').val(power_user.chat_width);
     $('#token_padding').val(power_user.token_padding);
     $('#aux_field').val(power_user.aux_field);

     document.body.classList.toggle('charListGrid', power_user.charListGrid);
+}
-function loadMovingUIState() {
+export function loadMovingUIState() {
     if (!isMobile()
         && power_user.movingUIState
         && power_user.movingUI === true) {

+}
 // Fetch a compiled object of all preset settings
-function getContextSettings() {
+export function getContextSettings() {
     let compiledSettings = {};
     contextControls.forEach((control) => {

@@ -2397,7 +2384,7 @@ async function saveTheme(name = undefined, theme = undefined) {
2397	}	2384	}
2398	else {	2385	else {
2399	themes[themeIndex] = theme;	2386	themes[themeIndex] = theme;
2400	$(`#themes option[value="${name}"]`).attr('selected', true);	2387	$(`#themes option[value="${name}"]`).prop('selected', true);
2401	}	2388	}
2402		2389
2403	power_user.theme = name;	2390	power_user.theme = name;

@@ -2504,7 +2491,7 @@ async function saveMovingUI() {
2504	}	2491	}
2505	else {	2492	else {
2506	movingUIPresets[movingUIPresetIndex] = movingUIPreset;	2493	movingUIPresets[movingUIPresetIndex] = movingUIPreset;
2507	$(`#movingUIPresets option[value="${name}"]`).attr('selected', true);	2494	$(`#movingUIPresets option[value="${name}"]`).prop('selected', true);
2508	}	2495	}
2509		2496
2510	power_user.movingUIPreset = name;	2497	power_user.movingUIPreset = name;

     });
     const reportZoomLevelDebounced = debounce(() => {
-        const zoomLevel = Number(window.devicePixelRatio).toFixed(2) || 1;
+        const zoomLevel = parseFloat(Number(window.devicePixelRatio).toFixed(2)) || 1;
         const winWidth = window.innerWidth;
         const winHeight = window.innerHeight;
         const originalWidth = winWidth * zoomLevel;

         //attempt to scale movingUI elements naturally across window resizing/zooms
         //this will still break if the zoom level causes mobile styles to come into play.
-        const scaleY = Number(window.innerHeight / coreTruthWinHeight).toFixed(4);
+        const scaleY = parseFloat(Number(window.innerHeight / coreTruthWinHeight).toFixed(4));
-        const scaleX = Number(window.innerWidth / coreTruthWinWidth).toFixed(4);
+        const scaleX = parseFloat(Number(window.innerWidth / coreTruthWinWidth).toFixed(4));
         if (Object.keys(power_user.movingUIState).length > 0) {
             for (var elmntName of Object.keys(power_user.movingUIState)) {

     });
     $('#waifuMode').on('change', () => {
-        power_user.waifuMode = $('#waifuMode').prop('checked');
+        power_user.waifuMode = !!$('#waifuMode').prop('checked');
         switchWaifuMode();
         saveSettingsDebounced();
     });

     $('#chat_width_slider').on('input', function (e, data) {
         const applyMode = data?.forced ? 'forced' : 'normal';
-        power_user.chat_width = Number(e.target.value);
+        power_user.chat_width = Number($(this).val());
         applyChatWidth(applyMode);
         saveSettingsDebounced();
         setHotswapsDebounced();

     $('input[name="font_scale"]').on('input', async function (e, data) {
         const applyMode = data?.forced ? 'forced' : 'normal';
-        power_user.font_scale = Number(e.target.value);
+        power_user.font_scale = Number($(this).val());
         $('#font_scale_counter').val(power_user.font_scale);
         applyFontScale(applyMode);
         saveSettingsDebounced();
     });
     $('input[name="blur_strength"]').on('input', async function (e) {
-        power_user.blur_strength = Number(e.target.value);
+        power_user.blur_strength = Number($(this).val());
         $('#blur_strength_counter').val(power_user.blur_strength);
         applyBlurStrength();
         saveSettingsDebounced();
     });
     $('input[name="shadow_width"]').on('input', async function (e) {
-        power_user.shadow_width = Number(e.target.value);
+        power_user.shadow_width = Number($(this).val());
         $('#shadow_width_counter').val(power_user.shadow_width);
         applyShadowWidth();
         saveSettingsDebounced();
     });
-    $('#main-text-color-picker').on('change', (evt) => {
+    $('#main-text-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.main_text_color = evt.detail.rgba;
         applyThemeColor('main');
         saveSettingsDebounced();
     });
-    $('#italics-color-picker').on('change', (evt) => {
+    $('#italics-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.italics_text_color = evt.detail.rgba;
         applyThemeColor('italics');
         saveSettingsDebounced();
     });
-    $('#underline-color-picker').on('change', (evt) => {
+    $('#underline-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.underline_text_color = evt.detail.rgba;
         applyThemeColor('underline');
         saveSettingsDebounced();
     });
-    $('#quote-color-picker').on('change', (evt) => {
+    $('#quote-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.quote_text_color = evt.detail.rgba;
         applyThemeColor('quote');
         saveSettingsDebounced();
     });
-    $('#blur-tint-color-picker').on('change', (evt) => {
+    $('#blur-tint-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.blur_tint_color = evt.detail.rgba;
         applyThemeColor('blurTint');
         saveSettingsDebounced();
     });
-    $('#chat-tint-color-picker').on('change', (evt) => {
+    $('#chat-tint-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.chat_tint_color = evt.detail.rgba;
         applyThemeColor('chatTint');
         saveSettingsDebounced();
     });
-    $('#user-mes-blur-tint-color-picker').on('change', (evt) => {
+    $('#user-mes-blur-tint-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.user_mes_blur_tint_color = evt.detail.rgba;
         applyThemeColor('userMesBlurTint');
         saveSettingsDebounced();
     });
-    $('#bot-mes-blur-tint-color-picker').on('change', (evt) => {
+    $('#bot-mes-blur-tint-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.bot_mes_blur_tint_color = evt.detail.rgba;
         applyThemeColor('botMesBlurTint');
         saveSettingsDebounced();
     });
-    $('#shadow-color-picker').on('change', (evt) => {
+    $('#shadow-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.shadow_color = evt.detail.rgba;
         applyThemeColor('shadow');
         saveSettingsDebounced();
     });
-    $('#border-color-picker').on('change', (evt) => {
+    $('#border-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
         power_user.border_color = evt.detail.rgba;
         applyThemeColor('border');
         saveSettingsDebounced();

public/scripts/welcome-screen.js+1 -4 Viewed

         console.warn('Error fetching system avatar. Fallback image will be used.', error);
+    }
-    const headers = getRequestHeaders();
-    delete headers['Content-Type'];
     const fetchResult = await fetch('/api/characters/create', {
         method: 'POST',
-        headers: headers,
+        headers: getRequestHeaders({ omitContentType: true }),
         body: formData,
         cache: 'no-cache',
     });

public/scripts/world-info.js+23 -13 Viewed

     return '';
+}
+/**
+ * Imports world info from a file.
+ * @param {File} file File to import
+ */
 export async function importWorldInfo(file) {
     if (!file) {
         return;

         return false;
+    }
-    jQuery.ajax({
+    try {
-        type: 'POST',
+        const result = await fetch('/api/worldinfo/import', {
-        url: '/api/worldinfo/import',
+            method: 'POST',
-        data: formData,
+            headers: getRequestHeaders({ omitContentType: true }),
-        beforeSend: () => { },
+            body: formData,
-        cache: false,
+            cache: 'no-cache',
-        contentType: false,
+        });
-        processData: false,
-        success: async function (data) {
+        if (!result.ok) {
+            throw new Error(`Failed to import world info: ${result.statusText}`);
+        }
+        const data = await result.json();
         if (data.name) {
             await updateWorldInfoList();

@@ -5269,11 +5278,12 @@ export async function importWorldInfo(file) {
5269	$('#world_editor_select').val(newIndex).trigger('change');	5278	$('#world_editor_select').val(newIndex).trigger('change');
5270	}	5279	}
5271		5280
5272	toastr.success(`World Info "${data.name}" imported successfully!`);	5281	toastr.success(t`World Info "${data.name}" imported successfully!`);
		5282	}
		5283	} catch (error) {
		5284	console.error('Error importing world info:', error);
		5285	toastr.error(t`Failed to import World Info`);
5273	}	5286	}
5274	},
5275	error: (_jqXHR, _exception) => { },
5276	});
5277	}	5287	}
5278		5288
5279	/**	5289	/**

src/endpoints/sprites.js+2 -2 Viewed

         // Remove uploaded ZIP file
         fs.unlinkSync(spritePackPath);
-        return response.send({ count: sprites.length });
+        return response.send({ ok: true, count: sprites.length });
     } catch (error) {
         console.error(error);
         return response.sendStatus(500);

         fs.cpSync(spritePath, pathToFile);
         // Remove uploaded file
         fs.unlinkSync(spritePath);
-        return response.sendStatus(200);
+        return response.send({ ok: true });
     } catch (error) {
         console.error(error);
         return response.sendStatus(500);