aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/util/request-image-size.ts (renamed from src/client/util/request-image-size.js)22
-rw-r--r--src/server/DashUploadUtils.ts4
2 files changed, 12 insertions, 14 deletions
diff --git a/src/client/util/request-image-size.js b/src/client/util/request-image-size.ts
index 502e0fbac..57e8516ac 100644
--- a/src/client/util/request-image-size.js
+++ b/src/client/util/request-image-size.ts
@@ -13,7 +13,7 @@ const request = require('request');
const imageSize = require('image-size');
const HttpError = require('standard-http-error');
-module.exports = function requestImageSize(options) {
+module.exports = function requestImageSize(options: any) {
let opts = {
encoding: null,
};
@@ -36,28 +36,24 @@ module.exports = function requestImageSize(options) {
return new Promise((resolve, reject) => {
const req = request(opts);
- req.on('response', res => {
+ req.on('response', (res: any) => {
if (res.statusCode >= 400) {
return reject(new HttpError(res.statusCode, res.statusMessage));
}
let buffer = Buffer.from([]);
- let size;
+ let size: any;
- res.on('data', chunk => {
+ res.on('data', (chunk: any) => {
buffer = Buffer.concat([buffer, chunk]);
try {
size = imageSize(buffer);
- } catch (err) {
- reject(err);
- return req.abort();
- }
-
- if (size) {
- resolve(size);
- return req.abort();
- }
+ if (size) {
+ resolve(size);
+ return req.abort();
+ }
+ } catch (err) {}
});
res.on('error', reject);
diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 4870d218b..33809824f 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -398,7 +398,9 @@ export namespace DashUploadUtils {
// Use the request library to parse out file level image information in the headers
const { headers } = await new Promise<any>((resolve, reject) => {
return request.head(resolvedUrl, (error, res) => (error ? reject(error) : resolve(res)));
- }).catch(e => console.log(e));
+ }).catch(e => {
+ console.log('Error processing headers: ', e);
+ });
try {
// Compute the native width and height ofthe image with an npm module