package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.6.1-alpha.3",
+	"version": "2025.6.1-alpha.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/frontend/src/composables/use-uploader.ts

@@ -24,14 +24,7 @@ export type UploaderFeatures = {
 	crop?: boolean;
 };
 
-const THUMBNAIL_SUPPORTED_TYPES = [
-	'image/jpeg',
-	'image/png',
-	'image/webp',
-	'image/svg+xml',
-];
-
-const IMAGE_COMPRESSION_SUPPORTED_TYPES = [
+const COMPRESSION_SUPPORTED_TYPES = [
 	'image/jpeg',
 	'image/png',
 	'image/webp',
@@ -52,13 +45,6 @@ const IMAGE_EDITING_SUPPORTED_TYPES = [
 
 const WATERMARK_SUPPORTED_TYPES = IMAGE_EDITING_SUPPORTED_TYPES;
 
-const IMAGE_PREPROCESS_NEEDED_TYPES = [
-	...WATERMARK_SUPPORTED_TYPES,
-	...IMAGE_COMPRESSION_SUPPORTED_TYPES,
-	...CROPPING_SUPPORTED_TYPES,
-	...IMAGE_EDITING_SUPPORTED_TYPES,
-];
-
 const mimeTypeMap = {
 	'image/webp': 'webp',
 	'image/jpeg': 'jpg',
@@ -70,7 +56,7 @@ export type UploaderItem = {
 	name: string;
 	uploadName?: string;
 	progress: { max: number; value: number } | null;
-	thumbnail: string | null;
+	thumbnail: string;
 	preprocessing: boolean;
 	uploading: boolean;
 	uploaded: Misskey.entities.DriveFile | null;
@@ -135,7 +121,7 @@ export function useUploader(options: {
 			id,
 			name: prefer.s.keepOriginalFilename ? filename : id + extension,
 			progress: null,
-			thumbnail: THUMBNAIL_SUPPORTED_TYPES.includes(file.type) ? window.URL.createObjectURL(file) : null,
+			thumbnail: window.URL.createObjectURL(file),
 			preprocessing: false,
 			uploading: false,
 			aborted: false,
@@ -158,7 +144,7 @@ export function useUploader(options: {
 	}
 
 	function removeItem(item: UploaderItem) {
-		if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
+		URL.revokeObjectURL(item.thumbnail);
 		items.value.splice(items.value.indexOf(item), 1);
 	}
 
@@ -210,7 +196,7 @@ export function useUploader(options: {
 				text: i18n.ts.cropImage,
 				action: async () => {
 					const cropped = await os.cropImageFile(item.file, { aspectRatio: null });
-					if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
+					URL.revokeObjectURL(item.thumbnail);
 					items.value.splice(items.value.indexOf(item), 1, {
 						...item,
 						file: markRaw(cropped),
@@ -239,7 +225,7 @@ export function useUploader(options: {
 						image: item.file,
 					}, {
 						ok: (file) => {
-							if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
+							URL.revokeObjectURL(item.thumbnail);
 							items.value.splice(items.value.indexOf(item), 1, {
 								...item,
 								file: markRaw(file),
@@ -309,7 +295,7 @@ export function useUploader(options: {
 		}
 
 		if (
-			IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(item.file.type) &&
+			COMPRESSION_SUPPORTED_TYPES.includes(item.file.type) &&
 			!item.preprocessing &&
 			!item.uploading &&
 			!item.uploaded
@@ -475,25 +461,10 @@ export function useUploader(options: {
 	async function preprocess(item: UploaderItem): Promise<void> {
 		item.preprocessing = true;
 
-		try {
-			if (IMAGE_PREPROCESS_NEEDED_TYPES.includes(item.file.type)) {
-				await preprocessForImage(item);
-			}
-		} catch (err) {
-			console.error('Failed to preprocess image', err);
+		let file: Blob | File = item.file;
+		const imageBitmap = await window.createImageBitmap(file);
 
-			// nop
-		}
-
-		item.preprocessing = false;
-	}
-
-	async function preprocessForImage(item: UploaderItem): Promise<void> {
-		const imageBitmap = await window.createImageBitmap(item.file);
-
-		let preprocessedFile: Blob | File = item.file;
-
-		const needsWatermark = item.watermarkPresetId != null && WATERMARK_SUPPORTED_TYPES.includes(preprocessedFile.type);
+		const needsWatermark = item.watermarkPresetId != null && WATERMARK_SUPPORTED_TYPES.includes(file.type);
 		const preset = prefer.s.watermarkPresets.find(p => p.id === item.watermarkPresetId);
 		if (needsWatermark && preset != null) {
 			const canvas = window.document.createElement('canvas');
@@ -508,7 +479,7 @@ export function useUploader(options: {
 
 			renderer.render();
 
-			preprocessedFile = await new Promise<Blob>((resolve) => {
+			file = await new Promise<Blob>((resolve) => {
 				canvas.toBlob((blob) => {
 					if (blob == null) {
 						throw new Error('Failed to convert canvas to blob');
@@ -520,7 +491,7 @@ export function useUploader(options: {
 		}
 
 		const compressionSettings = getCompressionSettings(item.compressionLevel);
-		const needsCompress = item.compressionLevel !== 0 && compressionSettings && IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(preprocessedFile.type) && !(await isAnimated(preprocessedFile));
+		const needsCompress = item.compressionLevel !== 0 && compressionSettings && COMPRESSION_SUPPORTED_TYPES.includes(file.type) && !(await isAnimated(file));
 
 		if (needsCompress) {
 			const config = {
@@ -531,13 +502,13 @@ export function useUploader(options: {
 			};
 
 			try {
-				const result = await readAndCompressImage(preprocessedFile, config);
-				if (result.size < preprocessedFile.size || preprocessedFile.type === 'image/webp') {
-					// The compression may not always reduce the file size
-					// (and WebP is not browser safe yet)
-					preprocessedFile = result;
+				const result = await readAndCompressImage(file, config);
+				if (result.size < file.size || file.type === 'image/webp') {
+				// The compression may not always reduce the file size
+				// (and WebP is not browser safe yet)
+					file = result;
 					item.compressedSize = result.size;
-					item.uploadName = preprocessedFile.type !== config.mimeType ? `${item.name}.${mimeTypeMap[config.mimeType]}` : item.name;
+					item.uploadName = file.type !== config.mimeType ? `${item.name}.${mimeTypeMap[config.mimeType]}` : item.name;
 				}
 			} catch (err) {
 				console.error('Failed to resize image', err);
@@ -547,16 +518,17 @@ export function useUploader(options: {
 			item.uploadName = item.name;
 		}
 
-		imageBitmap.close();
+		URL.revokeObjectURL(item.thumbnail);
+		item.thumbnail = window.URL.createObjectURL(file);
+		item.preprocessedFile = markRaw(file);
+		item.preprocessing = false;
 
-		if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
-		item.thumbnail = THUMBNAIL_SUPPORTED_TYPES.includes(preprocessedFile.type) ? window.URL.createObjectURL(preprocessedFile) : null;
-		item.preprocessedFile = markRaw(preprocessedFile);
+		imageBitmap.close();
 	}
 
 	onUnmounted(() => {
 		for (const item of items.value) {
-			if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
+			URL.revokeObjectURL(item.thumbnail);
 		}
 	});
 

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.6.1-alpha.3",
+	"version": "2025.6.1-alpha.2",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",