Skip to content

fix: reject Promises with Error objects #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/copyExifWithoutOrientation.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const getApp1Segment = (blob) => new Promise((resolve, reject) => {
reader.addEventListener('load', ({ target: { result: buffer } }) => {
const view = new DataView(buffer);
let offset = 0;
if (view.getUint16(offset) !== SOI) return reject('not a valid JPEG');
if (view.getUint16(offset) !== SOI) return reject(new Error('not a valid JPEG'));
offset += 2;

while (true) {
Expand All @@ -40,9 +40,9 @@ const getApp1Segment = (blob) => new Promise((resolve, reject) => {
littleEndian = false;
break;
default:
return reject('TIFF header contains invalid endian');
return reject(new Error('TIFF header contains invalid endian'));
}
if (view.getUint16(tiffOffset + 2, littleEndian) !== 0x2a) { return reject('TIFF header contains invalid version'); }
if (view.getUint16(tiffOffset + 2, littleEndian) !== 0x2a) { return reject(new Error('TIFF header contains invalid version')); }

const ifd0Offset = view.getUint32(tiffOffset + 4, littleEndian);
const endOfTagsOffset = tiffOffset
Expand All @@ -56,9 +56,9 @@ const getApp1Segment = (blob) => new Promise((resolve, reject) => {
) {
const tagId = view.getUint16(i, littleEndian);
if (tagId == TAG_ID_ORIENTATION) {
if (view.getUint16(i + 2, littleEndian) !== TAG_TYPE_SHORT) { return reject('Orientation data type is invalid'); }
if (view.getUint16(i + 2, littleEndian) !== TAG_TYPE_SHORT) { return reject(new Error('Orientation data type is invalid')); }

if (view.getUint32(i + 4, littleEndian) !== 1) { return reject('Orientation data count is invalid'); }
if (view.getUint32(i + 4, littleEndian) !== 1) { return reject(new Error('Orientation data count is invalid')); }

view.setUint16(i + 8, 1, littleEndian);
break;
Expand Down
6 changes: 3 additions & 3 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function getDataUrlFromFile(file) {
return new Promise((resolve, reject) => {
const reader = new CustomFileReader();
reader.onload = () => resolve(reader.result);
reader.onerror = (e) => reject(e);
reader.onerror = (event) => reject(new Error(`Error in getDataUrlFromFile: ${event.toString()}`));
reader.readAsDataURL(file);
});
}
Expand All @@ -74,7 +74,7 @@ export function loadImage(src) {
return new Promise((resolve, reject) => {
const img = new Image();
img.onload = () => resolve(img);
img.onerror = (e) => reject(e);
img.onerror = (event) => reject(new Error(`Error in loadImage: ${event.toString()}`));
img.src = src;
});
}
Expand Down Expand Up @@ -366,7 +366,7 @@ export function getExifOrientation(file) {
}
return resolve(-1); // not defined
};
reader.onerror = (e) => reject(e);
reader.onerror = (event) => reject(new Error(`Error in getExifOrientation: ${event.toString()}`));
reader.readAsArrayBuffer(file);
});
}
Expand Down
4 changes: 2 additions & 2 deletions lib/web-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ export default function compressOnWebWorker(file, options) {
}

worker.addEventListener('message', handler);
worker.addEventListener('error', reject);
worker.addEventListener('error', (event) => reject(new Error(`Error in WebWorker: ${event.toString()}`)));
if (options.signal) {
options.signal.addEventListener('abort', () => {
reject(options.signal.reason);
reject(new Error(options.signal.reason));
worker.terminate();
});
}
Expand Down