@aws-amplify/storage 6.9.5 → 6.9.6-unstable.0f5e997.0

package/src/providers/s3/apis/internal/uploadData/multipart/uploadHandlers.ts

@@ -38,6 +38,7 @@ import { logger } from '../../../../../../utils';
 import { calculateContentCRC32 } from '../../../../utils/crc32';
 import { StorageOperationOptionsInput } from '../../../../../../types/inputs';
 import { IntegrityError } from '../../../../../../errors/IntegrityError';
+import { getContentType } from '../../../../../../utils/contentType';
 
 import { uploadPartExecutor } from './uploadPartExecutor';
 import {
@@ -137,7 +138,9 @@ export const getMultipartUploadHandlers = (
 		const {
 			contentDisposition,
 			contentEncoding,
-			contentType = 'application/octet-stream',
+			contentType = uploadDataOptions?.contentType ??
+				getContentType(data, objectKey) ??
+				'application/octet-stream',
 			metadata,
 			preventOverwrite,
 			onProgress,

package/src/providers/s3/apis/internal/uploadData/putObjectJob.ts

@@ -22,6 +22,7 @@ import {
 } from '../../../utils/constants';
 import { calculateContentCRC32 } from '../../../utils/crc32';
 import { constructContentDisposition } from '../../../utils/constructContentDisposition';
+import { getContentType } from '../../../../../utils/contentType';
 
 /**
  * The input interface for UploadData API with only the options needed for single part upload.
@@ -60,7 +61,9 @@ export const putObjectJob =
 		const {
 			contentDisposition,
 			contentEncoding,
-			contentType = 'application/octet-stream',
+			contentType = uploadDataOptions?.contentType ??
+				getContentType(data, objectKey) ??
+				'application/octet-stream',
 			preventOverwrite,
 			metadata,
 			checksumAlgorithm,

package/src/providers/s3/utils/client/runtime/xhrTransferHandler.ts

@@ -190,7 +190,11 @@ export const xhrTransferHandler: TransferHandler<
 const convertToTransferProgressEvent = (
 	event: ProgressEvent,
 ): TransferProgressEvent => ({
-	transferredBytes: event.loaded,
+	// `loaded` can exceed the `total` in some cases due to platform issues/bugs e.g. React Native & Expo Android
+	// clamp `loaded` values down to `total` if possible.
+	transferredBytes: event.lengthComputable
+		? Math.min(event.loaded, event.total)
+		: event.loaded,
 	totalBytes: event.lengthComputable ? event.total : undefined,
 });
 

package/src/utils/contentType.ts

@@ -0,0 +1,99 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+const MIME_TYPES: Record<string, string> = {
+	// Audio
+	aac: 'audio/aac',
+	mid: 'audio/midi',
+	midi: 'audio/x-midi',
+	mp3: 'audio/mpeg',
+	oga: 'audio/ogg',
+	opus: 'audio/ogg',
+	wav: 'audio/wav',
+	weba: 'audio/webm',
+	// Video
+	avi: 'video/x-msvideo',
+	mp4: 'video/mp4',
+	mpeg: 'video/mpeg',
+	ogv: 'video/ogg',
+	ts: 'video/mp2t',
+	webm: 'video/webm',
+	// Images
+	apng: 'image/apng',
+	avif: 'image/avif',
+	bmp: 'image/bmp',
+	gif: 'image/gif',
+	ico: 'image/vnd.microsoft.icon',
+	jpeg: 'image/jpeg',
+	jpg: 'image/jpeg',
+	png: 'image/png',
+	svg: 'image/svg+xml',
+	tif: 'image/tiff',
+	tiff: 'image/tiff',
+	webp: 'image/webp',
+	// Text
+	css: 'text/css',
+	csv: 'text/csv',
+	htm: 'text/html',
+	html: 'text/html',
+	ics: 'text/calendar',
+	js: 'text/javascript',
+	md: 'text/markdown',
+	mjs: 'text/javascript',
+	txt: 'text/plain',
+	// Application
+	abw: 'application/x-abiword',
+	arc: 'application/x-freearc',
+	azw: 'application/vnd.amazon.ebook',
+	bin: 'application/octet-stream',
+	bz: 'application/x-bzip',
+	bz2: 'application/x-bzip2',
+	cda: 'application/x-cdf',
+	csh: 'application/x-csh',
+	doc: 'application/msword',
+	docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+	eot: 'application/vnd.ms-fontobject',
+	epub: 'application/epub+zip',
+	gz: 'application/gzip',
+	jar: 'application/java-archive',
+	json: 'application/json',
+	jsonld: 'application/ld+json',
+	mpkg: 'application/vnd.apple.installer+xml',
+	odp: 'application/vnd.oasis.opendocument.presentation',
+	ods: 'application/vnd.oasis.opendocument.spreadsheet',
+	odt: 'application/vnd.oasis.opendocument.text',
+	ogx: 'application/ogg',
+	pdf: 'application/pdf',
+	php: 'application/x-httpd-php',
+	ppt: 'application/vnd.ms-powerpoint',
+	pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+	rar: 'application/vnd.rar',
+	rtf: 'application/rtf',
+	sh: 'application/x-sh',
+	tar: 'application/x-tar',
+	vsd: 'application/vnd.visio',
+	webmanifest: 'application/manifest+json',
+	xhtml: 'application/xhtml+xml',
+	xls: 'application/vnd.ms-excel',
+	xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+	xml: 'application/xml',
+	zip: 'application/zip',
+	// Fonts
+	otf: 'font/otf',
+	ttf: 'font/ttf',
+	woff: 'font/woff',
+	woff2: 'font/woff2',
+};
+
+/**
+ * Detect content type from file data or filename extension
+ */
+export const getContentType = (data: any, key: string): string | undefined => {
+	if (data instanceof File && data.type) {
+		return data.type;
+	}
+
+	const ext = key.split('.').pop()?.toLowerCase();
+
+	return ext ? MIME_TYPES[ext] : undefined;
+};