|
`settings.chunkSize` {*Number*|dynamic}
@@ -619,7 +608,6 @@ Template.uploadForm.events({
}
template.currentFile.set(false);
},
- streams: 'dynamic',
chunkSize: 'dynamic'
});
}
@@ -642,7 +630,6 @@ Template.uploadForm.events({
// multiple files were selected
Images.insert({
file: e.currentTarget.files[0],
- streams: 'dynamic',
chunkSize: 'dynamic'
}, false).on('start', function () {
template.currentFile.set(this);
@@ -672,7 +659,6 @@ Template.uploadForm.events({
if (e.currentTarget.files && e.currentTarget.files[0]) {
const uploader = Images.insert({
file: e.currentTarget.files[0],
- streams: 'dynamic',
chunkSize: 'dynamic'
}, false);
@@ -751,7 +737,6 @@ Template.uploadForm.events({
// multiple files were selected
Images.insert({
file: e.currentTarget.files[0],
- streams: 'dynamic',
chunkSize: 'dynamic'
}, false).pipe(encrypt).pipe(zip).start();
}
diff --git a/docs/load.md b/docs/load.md
index c908a22..bd84cca 100644
--- a/docs/load.md
+++ b/docs/load.md
@@ -1,27 +1,43 @@
-### `load(url [, opts, callback, proceedAfterUpload])` [*Server*]
+# Download remote file over HTTP
-Write file to FS from remote URL (external resource) and add record to FilesCollection
+Download remote file over HTTP to the file system of a *Server*. Download is efficient, runs in chunks writing data as available directly to FS via stream without holding it in RAM. If error or timeout occurred — unfinished file will get removed from file system.
-- `url` {*String*} - Full address to file, like `scheme://example.com/sample.png`
+```js
+/*
+ * @locus Server
+ */
+
+FilesCollection#load(url [, opts, callback, proceedAfterUpload]);
+```
+
+Write file to file system from remote URL (external resource) and add record to FilesCollection
+
+- `url` {*String*} - Full address to file, like `https://example.com/sample.png`
- `opts` {*Object*} - Recommended properties:
- `opts.fileName` {*String*} - File name with extension, like `name.ext`
- `opts.headers` {*Object*} - Request HTTP headers, to use when requesting the file
- `opts.meta` {*Object*} - Object with custom meta-data
- `opts.type` {*String*} - Mime-type, like `image/png`, if not set - mime-type will be taken from response headers
- `opts.size` {*Number*} - File size in bytes, if not set - file size will be taken from response headers
- - `opts.userId` {*String*} - UserId, default *null*
+ - `opts.userId` {*String*} - UserId, default: `null`
- `opts.fileId` {*String*} - id, optional - if not set - Random.id() will be used
+ - `opts.timeout` {*Number*} - timeout in milliseconds, default: `360000` (*6 mins*); Set to `0` to disable timeout; *Disabling timeout not recommended, sockets won't get closed until server rebooted*
- `callback` {*Function*} - Triggered after first byte is received. With `error`, and `fileRef`, where `fileRef` is a new record from DB
- proceedAfterUpload {*Boolean*} - Proceed `onAfterUpload` hook (*if defined*) after external source is loaded to FS
- Returns {*FilesCollection*} - Current FilesCollection instance
```js
+/*
+ * @locus Server
+ */
+
import { FilesCollection } from 'meteor/ostrio:files';
const Images = new FilesCollection({collectionName: 'Images'});
Images.load('https://raw.githubusercontent.com/VeliovGroup/Meteor-Files/master/logo.png', {
fileName: 'logo.png',
fileId: 'abc123myId', //optional
+ timeout: 60000, // optional timeout
meta: {}
});
```
diff --git a/docs/react-example.md b/docs/react-example.md
index f36e9e0..74c3a81 100644
--- a/docs/react-example.md
+++ b/docs/react-example.md
@@ -66,7 +66,6 @@ class FileUploadComponent extends Component {
locator: self.props.fileLocator,
userId: Meteor.userId() // Optional, used to check on server for file tampering
},
- streams: 'dynamic',
chunkSize: 'dynamic',
allowWebWorkers: true // If you see issues with uploads, change this to false
}, false)
diff --git a/docs/typescript-definitions.md b/docs/typescript-definitions.md
index 57bae7e..e1d1f11 100644
--- a/docs/typescript-definitions.md
+++ b/docs/typescript-definitions.md
@@ -145,7 +145,6 @@ declare module "meteor/ostrio:files" {
onError?: (error: Meteor.Error, fileData: FileData) => any;
onProgress?: (progress: number, fileData: FileData) => any;
onBeforeUpload?: (fileData: FileData) => any;
- streams?: number | 'dynamic';
chunkSize?: number | 'dynamic';
allowWebWorkers?: boolean;
type?: string;
diff --git a/docs/write.md b/docs/write.md
index b0caca7..7512f82 100644
--- a/docs/write.md
+++ b/docs/write.md
@@ -26,7 +26,7 @@ fs.readFile('/data/imgs/sample.png', (error, data) => {
} else {
Images.write(data, {
fileName: 'sample.png',
- fielId: 'abc123myId', //optional
+ fileId: 'abc123myId', //optional
type: 'image/png'
}, (writeError, fileRef) => {
if (writeError) {
diff --git a/index.d.ts b/index.d.ts
index fdd185e..6c3024d 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -142,7 +142,6 @@ declare module "meteor/ostrio:files" {
onError?: (error: Meteor.Error, fileData: FileData) => any;
onProgress?: (progress: number, fileData: FileData) => any;
onBeforeUpload?: (fileData: FileData) => any;
- streams?: number | 'dynamic';
chunkSize?: number | 'dynamic';
allowWebWorkers?: boolean;
type?: string;
diff --git a/lib.js b/lib.js
index 3f8b93a..804cd48 100644
--- a/lib.js
+++ b/lib.js
@@ -200,7 +200,7 @@ const formatFleURL = (fileRef, version = 'original', _URIBase = (__meteor_runtim
if (fileRef.public === true) {
return _root + (version === 'original' ? `${fileRef._downloadRoute}/${fileRef._id}${ext}` : `${fileRef._downloadRoute}/${version}-${fileRef._id}${ext}`);
}
- return _root + `${fileRef._downloadRoute}/${fileRef._collectionName}/${fileRef._id}/${version}/${fileRef._id}${ext}`;
+ return `${_root}${fileRef._downloadRoute}/${fileRef._collectionName}/${fileRef._id}/${version}/${fileRef._id}${ext}`;
};
export { fixJSONParse, fixJSONStringify, formatFleURL, helpers };
diff --git a/package.js b/package.js
index 5734350..5ab99a4 100755
--- a/package.js
+++ b/package.js
@@ -1,23 +1,22 @@
Package.describe({
name: 'ostrio:files',
- version: '1.14.3',
+ version: '2.0.0',
summary: 'Upload files to Meteor application, with 3rd party storage support: AWS:S3, GridFS and other',
git: 'https://github.com/VeliovGroup/Meteor-Files',
documentation: 'README.md'
});
Npm.depends({
- 'fs-extra': '9.0.1',
- 'request-libcurl': '2.2.1',
- 'file-type': '16.0.0',
- eventemitter3: '4.0.7'
+ 'fs-extra': '9.1.0',
+ eventemitter3: '4.0.7',
+ 'abort-controller': '3.0.0'
});
Package.onUse(function(api) {
api.versionsFrom('1.9');
api.use('webapp', 'server');
- api.use(['reactive-var', 'tracker', 'http', 'ddp-client'], 'client');
- api.use(['mongo', 'check', 'random', 'ecmascript', 'ostrio:cookies@2.6.1'], ['client', 'server']);
+ api.use(['reactive-var', 'tracker', 'ddp-client'], 'client');
+ api.use(['mongo', 'check', 'random', 'ecmascript', 'fetch', 'ostrio:cookies@2.7.0'], ['client', 'server']);
api.addAssets('worker.min.js', 'client');
api.mainModule('server.js', 'server');
api.mainModule('client.js', 'client');
diff --git a/server.js b/server.js
index 2bc275a..98e2a9a 100644
--- a/server.js
+++ b/server.js
@@ -1,17 +1,18 @@
-import { Mongo } from 'meteor/mongo';
-import { WebApp } from 'meteor/webapp';
-import { Meteor } from 'meteor/meteor';
-import { Random } from 'meteor/random';
-import { Cookies } from 'meteor/ostrio:cookies';
-import WriteStream from './write-stream.js';
-import { check, Match } from 'meteor/check';
+import { Mongo } from 'meteor/mongo';
+import { fetch } from 'meteor/fetch';
+import { WebApp } from 'meteor/webapp';
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { Cookies } from 'meteor/ostrio:cookies';
+import { check, Match } from 'meteor/check';
+
+import WriteStream from './write-stream.js';
import FilesCollectionCore from './core.js';
import { fixJSONParse, fixJSONStringify, helpers } from './lib.js';
-import fs from 'fs-extra';
-import nodeQs from 'querystring';
-import request from 'request-libcurl';
-import fileType from 'file-type';
+import AbortController from 'abort-controller';
+import fs from 'fs-extra';
+import nodeQs from 'querystring';
import nodePath from 'path';
/*
@@ -518,6 +519,7 @@ export class FilesCollection extends FilesCollectionCore {
}
if (httpReq.headers['x-start'] !== '1') {
+ // CHUNK UPLOAD SCENARIO:
opts = {
fileId: httpReq.headers['x-fileid']
};
@@ -537,6 +539,7 @@ export class FilesCollection extends FilesCollectionCore {
({result, opts} = this._prepareUpload(Object.assign(opts, _continueUpload), user.userId, 'HTTP'));
if (opts.eof) {
+ // FINISH UPLOAD SCENARIO:
this._handleUpload(result, opts, (_error) => {
let error = _error;
if (error) {
@@ -581,6 +584,7 @@ export class FilesCollection extends FilesCollectionCore {
httpResp.end();
}
} else {
+ // START SCENARIO:
try {
opts = JSON.parse(body);
} catch (jsonErr) {
@@ -592,19 +596,19 @@ export class FilesCollection extends FilesCollectionCore {
opts.file = {};
}
- opts.___s = true;
this._debug(`[FilesCollection] [File Start HTTP] ${opts.file.name || '[no-name]'} - ${opts.fileId}`);
if (helpers.isObject(opts.file) && opts.file.meta) {
opts.file.meta = fixJSONParse(opts.file.meta);
}
+ opts.___s = true;
({result} = this._prepareUpload(helpers.clone(opts), user.userId, 'HTTP Start Method'));
if (this.collection.findOne(result._id)) {
throw new Meteor.Error(400, 'Can\'t start upload, data substitution detected!');
}
- opts._id = opts.fileId;
+ opts._id = opts.fileId;
opts.createdAt = new Date();
opts.maxLength = opts.fileLength;
this._preCollection.insert(helpers.omit(opts, '___s'));
@@ -1041,21 +1045,6 @@ export class FilesCollection extends FilesCollectionCore {
mime = fileData.type;
}
- if (fileData.path && (!mime || !helpers.isString(mime))) {
- try {
- let buf = Buffer.alloc(262);
- const fd = fs.openSync(fileData.path, 'r');
- const br = fs.readSync(fd, buf, 0, 262, 0);
- fs.close(fd, NOOP);
- if (br < 262) {
- buf = buf.slice(0, br);
- }
- ({mime} = fileType(buf));
- } catch (e) {
- // We're good
- }
- }
-
if (!mime || !helpers.isString(mime)) {
mime = 'application/octet-stream';
}
@@ -1229,19 +1218,20 @@ export class FilesCollection extends FilesCollectionCore {
* @memberOf FilesCollection
* @name load
* @param {String} url - URL to file
- * @param {Object} opts - Object with file-data
+ * @param {Object} [opts] - Object with file-data
* @param {Object} opts.headers - HTTP headers to use when requesting the file
* @param {String} opts.name - File name, alias: `fileName`
* @param {String} opts.type - File mime-type
* @param {Object} opts.meta - File additional meta-data
* @param {String} opts.userId - UserId, default *null*
* @param {String} opts.fileId - _id, default *null*
+ * @param {Number} opts.timeout - Timeout in milliseconds, default: 360000 (6 mins)
* @param {Function} callback - function(error, fileObj){...}
- * @param {Boolean} proceedAfterUpload - Proceed onAfterUpload hook
- * @summary Download file, write stream to FS and add to FilesCollection Collection
+ * @param {Boolean} [proceedAfterUpload] - Proceed onAfterUpload hook
+ * @summary Download file over HTTP, write stream to FS, and add to FilesCollection Collection
* @returns {FilesCollection} Instance
*/
- load(url, _opts = {}, _callback, _proceedAfterUpload) {
+ load(url, _opts = {}, _callback, _proceedAfterUpload = false) {
this._debug(`[FilesCollection] [load(${url}, ${JSON.stringify(_opts)}, callback)]`);
let opts = _opts;
let callback = _callback;
@@ -1250,7 +1240,7 @@ export class FilesCollection extends FilesCollectionCore {
if (helpers.isFunction(opts)) {
proceedAfterUpload = callback;
callback = opts;
- opts = {};
+ opts = {};
} else if (helpers.isBoolean(callback)) {
proceedAfterUpload = callback;
} else if (helpers.isBoolean(opts)) {
@@ -1263,13 +1253,19 @@ export class FilesCollection extends FilesCollectionCore {
check(proceedAfterUpload, Match.Optional(Boolean));
if (!helpers.isObject(opts)) {
- opts = {};
+ opts = {
+ timeout: 360000
+ };
+ }
+
+ if (!opts.timeout) {
+ opts.timeout = 360000;
}
- const fileId = opts.fileId || Random.id();
- const FSName = this.namingFunction ? this.namingFunction(opts) : fileId;
+ const fileId = opts.fileId || Random.id();
+ const FSName = this.namingFunction ? this.namingFunction(opts) : fileId;
const pathParts = url.split('/');
- const fileName = (opts.name || opts.fileName) ? (opts.name || opts.fileName) : pathParts[pathParts.length - 1] || FSName;
+ const fileName = (opts.name || opts.fileName) ? (opts.name || opts.fileName) : pathParts[pathParts.length - 1].split('?')[0] || FSName;
const {extension, extensionWithDot} = this._getExt(fileName);
opts.path = `${this.storagePath(opts)}${nodePath.sep}${FSName}${extensionWithDot}`;
@@ -1299,45 +1295,106 @@ export class FilesCollection extends FilesCollectionCore {
callback && callback(efError);
this._debug(`[FilesCollection] [load] [ensureFile] [Error:] ${fileName} -> ${opts.path}`, efError);
} else {
- request({
- url,
- headers: opts.headers || {},
- wait: true
- }, (reqError, response) => bound(() => {
- if (reqError) {
- callback && callback(reqError);
- this._debug(`[FilesCollection] [load] [request.get(${url})] Error:`, reqError);
- } else {
- this._debug(`[FilesCollection] [load] Received: ${url}`);
- const result = this._dataToSchema({
- name: fileName,
- path: opts.path,
- meta: opts.meta,
- type: opts.type || response.headers['content-type'] || this._getMimeType({path: opts.path}),
- size: opts.size || parseInt(response.headers['content-length'] || 0),
- userId: opts.userId,
- extension
- });
+ let isEnded = false;
+ let timer = null;
+ const wStream = fs.createWriteStream(opts.path, {flags: 'w', mode: this.permissions, autoClose: true, emitClose: false });
+ const onEnd = (_error, response) => {
+ if (!isEnded) {
+ if (timer) {
+ Meteor.clearTimeout(timer);
+ timer = null;
+ }
- if (!result.size) {
- fs.stat(opts.path, (error, stats) => bound(() => {
- if (error) {
- callback && callback(error);
- } else {
- result.versions.original.size = (result.size = stats.size);
- storeResult(result, callback);
- }
- }));
+ isEnded = true;
+ if (response && response.status === 200) {
+ this._debug(`[FilesCollection] [load] Received: ${url}`);
+ const result = this._dataToSchema({
+ name: fileName,
+ path: opts.path,
+ meta: opts.meta,
+ type: opts.type || response.headers.get('content-type') || this._getMimeType({path: opts.path}),
+ size: opts.size || parseInt(response.headers.get('content-length') || 0),
+ userId: opts.userId,
+ extension
+ });
+
+ if (!result.size) {
+ fs.stat(opts.path, (statError, stats) => {
+ bound(() => {
+ if (statError) {
+ callback && callback(statError);
+ } else {
+ result.versions.original.size = (result.size = stats.size);
+ storeResult(result, callback);
+ }
+ });
+ });
+ } else {
+ storeResult(result, callback);
+ }
} else {
- storeResult(result, callback);
+ const error = _error || new Meteor.Error(response?.status || 408, response?.statusText || 'Bad response with empty details');
+ this._debug(`[FilesCollection] [load] [fetch(${url})] Error:`, error);
+
+ if (!wStream.destroyed) {
+ wStream.destroy();
+ }
+
+ fs.remove(opts.path, (removeError) => {
+ bound(() => {
+ callback && callback(error);
+ if (removeError) {
+ this._debug(`[FilesCollection] [load] [fetch(${url})] [fs.remove(${opts.path})] removeError:`, removeError);
+ }
+ });
+ });
}
}
- })).pipe(fs.createWriteStream(opts.path, {flags: 'w', mode: this.permissions})).send();
+ };
+
+ let resp = void 0;
+ wStream.on('error', (error) => {
+ bound(() => {
+ onEnd(error);
+ });
+ });
+ wStream.on('close', () => {
+ bound(() => {
+ onEnd(void 0, resp);
+ });
+ });
+ wStream.on('finish', () => {
+ bound(() => {
+ onEnd(void 0, resp);
+ });
+ });
+
+ const controller = new AbortController();
+ fetch(url, {
+ headers: opts.headers || {},
+ signal: controller.signal
+ }).then((res) => {
+ resp = res;
+ res.body.on('error', (error) => {
+ bound(() => {
+ onEnd(error);
+ });
+ });
+ res.body.pipe(wStream);
+ }).catch((fetchError) => {
+ onEnd(fetchError);
+ });
+
+ if (opts.timeout > 0) {
+ timer = Meteor.setTimeout(() => {
+ onEnd(new Meteor.Error(408, `Request timeout after ${opts.timeout}ms`));
+ controller.abort();
+ }, opts.timeout);
+ }
}
});
});
-
return this;
}
diff --git a/upload.js b/upload.js
index ac54afc..cc79422 100644
--- a/upload.js
+++ b/upload.js
@@ -1,8 +1,8 @@
-import { HTTP } from 'meteor/http';
-import { Meteor } from 'meteor/meteor';
-import { Random } from 'meteor/random';
-import { Tracker } from 'meteor/tracker';
-import { ReactiveVar } from 'meteor/reactive-var';
+import { fetch } from 'meteor/fetch';
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { Tracker } from 'meteor/tracker';
+import { ReactiveVar } from 'meteor/reactive-var';
import { EventEmitter } from 'eventemitter3';
import { check, Match } from 'meteor/check';
import { fixJSONParse, fixJSONStringify, helpers } from './lib.js';
@@ -23,15 +23,16 @@ export class FileUpload extends EventEmitter {
this.config._debug('[FilesCollection] [FileUpload] [constructor]');
if (!this.config.isBase64) {
- this.file = Object.assign({}, helpers.clone(this.config.file), this.config.fileData);
+ this.file = Object.assign({}, helpers.clone(this.config.file), this.config.fileData);
} else {
- this.file = this.config.fileData;
+ this.file = this.config.fileData;
}
- this.state = new ReactiveVar('active');
- this.onPause = new ReactiveVar(false);
- this.progress = new ReactiveVar(0);
- this.continueFunc = () => { };
- this.estimateTime = new ReactiveVar(1000);
+
+ this.state = new ReactiveVar('active');
+ this.onPause = new ReactiveVar(false);
+ this.progress = new ReactiveVar(0);
+ this.continueFunc = () => {};
+ this.estimateTime = new ReactiveVar(1000);
this.estimateSpeed = new ReactiveVar(0);
this.estimateTimer = Meteor.setInterval(() => {
if (this.state.get() === 'active') {
@@ -52,7 +53,7 @@ export class FileUpload extends EventEmitter {
}
continue() {
this.config._debug('[FilesCollection] [insert] [.continue()]');
- if (this.onPause.get()) {
+ if (this.onPause.get() && Meteor.status().connected) {
this.onPause.set(false);
this.state.set('active');
this.emit('continue', this.file);
@@ -104,14 +105,6 @@ export class UploadInstance extends EventEmitter {
this.config.meta = {};
}
- if (!this.config.streams) {
- this.config.streams = 2;
- }
-
- if (this.config.streams < 1) {
- this.config.streams = 2;
- }
-
if (!helpers.isString(this.config.transport)) {
this.config.transport = 'ddp';
}
@@ -138,7 +131,6 @@ export class UploadInstance extends EventEmitter {
type: Match.Optional(String),
onError: Match.Optional(Function),
onAbort: Match.Optional(Function),
- streams: Match.OneOf('dynamic', Number),
onStart: Match.Optional(Function),
fileName: Match.Optional(String),
isBase64: Match.Optional(Boolean),
@@ -219,7 +211,6 @@ export class UploadInstance extends EventEmitter {
this.startTime = {};
this.config.debug = this.collection.debug;
this.config._debug = this.collection._debug;
- this.currentChunk = 0;
this.transferTime = 0;
this.trackerComp = null;
this.sentChunks = 0;
@@ -259,10 +250,9 @@ export class UploadInstance extends EventEmitter {
this.addListener('prepare', this.prepare);
this.addListener('sendChunk', this.sendChunk);
this.addListener('proceedChunk', this.proceedChunk);
- this.addListener('createStreams', this.createStreams);
this.addListener('calculateStats', helpers.throttle(() => {
- const _t = (this.transferTime / this.sentChunks) / this.config.streams;
+ const _t = (this.transferTime / (this.sentChunks || 1));
this.result.estimateTime.set((_t * (this.fileLength - this.sentChunks)));
this.result.estimateSpeed.set((this.config.chunkSize / (_t / 1000)));
@@ -361,53 +351,56 @@ export class UploadInstance extends EventEmitter {
if (opts.binData) {
if (this.config.transport === 'ddp') {
this.config.ddp.call(this.collection._methodNames._Write, opts, (error) => {
- this.transferTime += (+new Date) - this.startTime[opts.chunkId];
+ this.transferTime += Date.now() - this.startTime[opts.chunkId];
if (error) {
if (this.result.state.get() !== 'aborted') {
this.emit('end', error);
}
} else {
- ++this.sentChunks;
- if (this.sentChunks >= this.fileLength) {
+ if (++this.sentChunks >= this.fileLength) {
this.emit('sendEOF');
- } else if (this.currentChunk < this.fileLength) {
+ } else {
this.emit('upload');
}
this.emit('calculateStats');
}
});
} else {
- HTTP.call('POST', `${_rootUrl}${this.collection.downloadRoute}/${this.collection.collectionName}/__upload`, {
- content: opts.binData,
+ fetch(`${_rootUrl}${this.collection.downloadRoute}/${this.collection.collectionName}/__upload`, {
+ method: 'POST',
+ body: opts.binData,
+ cache: 'no-cache',
+ credentials: 'include',
+ type: 'cors',
headers: {
'x-mtok': (helpers.isObject(Meteor.connection) ? Meteor.connection._lastSessionId : void 0) || null,
'x-fileid': opts.fileId,
'x-chunkid': opts.chunkId,
'content-type': 'text/plain'
- },
- beforeSend(xhr) {
- xhr.withCredentials = true;
- return true;
}
- }, (error) => {
- this.transferTime += +new Date() - this.startTime[opts.chunkId];
- if (error) {
- if (`${error}` === 'Error: network' || `${error}` === 'Error: Connection lost') {
- this.result.pause();
- } else {
- if (this.result.state.get() !== 'aborted') {
- this.emit('end', error);
- }
- }
- } else {
- ++this.sentChunks;
- if (this.sentChunks >= this.fileLength) {
+ }).then((response) => {
+ if (response.status === 204) {
+ this.collection._debug('[FilesCollection] [sendChunk] [fetch()] [then] chunk successfully sent');
+ this.transferTime += Date.now() - this.startTime[opts.chunkId];
+ if (++this.sentChunks >= this.fileLength) {
this.emit('sendEOF');
- } else if (this.currentChunk < this.fileLength) {
+ } else {
this.emit('upload');
}
this.emit('calculateStats');
+ } else {
+ this.emit('end', new Meteor.Error(response.status, 'Can\'t continue upload, session expired. Please, start upload again.'));
}
+ }).catch((error) => {
+ this.collection._debug('[FilesCollection] [sendChunk] [fetch()] [error] EXCEPTION while sending chunk', error);
+ this.transferTime += Date.now() - this.startTime[opts.chunkId];
+ Meteor.setTimeout(() => {
+ if (!Meteor.status().connected || `${error}` === 'Error: network' || `${error}` === 'Error: Connection lost') {
+ this.result.pause();
+ } else if (this.result.state.get() !== 'aborted') {
+ this.emit('end', error);
+ }
+ }, 512);
});
}
}
@@ -427,32 +420,33 @@ export class UploadInstance extends EventEmitter {
this.emit('end', error, result);
});
} else {
- HTTP.call('POST', `${_rootUrl}${this.collection.downloadRoute}/${this.collection.collectionName}/__upload`, {
- content: '',
+ fetch(`${_rootUrl}${this.collection.downloadRoute}/${this.collection.collectionName}/__upload`, {
+ method: 'POST',
+ body: '',
+ cache: 'no-cache',
+ credentials: 'include',
+ type: 'cors',
headers: {
'x-eof': '1',
'x-mtok': (helpers.isObject(Meteor.connection) ? Meteor.connection._lastSessionId : void 0) || null,
'x-fileId': opts.fileId,
'content-type': 'text/plain'
},
- beforeSend(xhr) {
- xhr.withCredentials = true;
- return true;
- }
- }, (error, _result) => {
- let result;
- try {
- result = JSON.parse((helpers.isObject(_result) ? _result.content : void 0) || {});
- } catch (e) {
- console.warn('Something went wrong! [sendEOF] method doesn\'t returned JSON! Looks like you\'re on Cordova app or behind proxy, switching to DDP transport is recommended.');
- result = {};
- }
-
+ }).then((response) => response.json()).then((result) => {
if (result.meta) {
result.meta = fixJSONParse(result.meta);
}
- this.emit('end', error, result);
+ this.emit('end', void 0, result);
+ }).catch((error) => {
+ Meteor.setTimeout(() => {
+ if (!Meteor.status().connected || `${error}` === 'Error: network' || `${error}` === 'Error: Connection lost') {
+ this.result.pause();
+ } else if (this.result.state.get() !== 'aborted') {
+ console.warn('Something went wrong! [sendEOF] method doesn\'t returned JSON! Looks like you\'re on Cordova app or behind proxy, switching to DDP transport is recommended.');
+ this.emit('end', error);
+ }
+ }, 512);
});
}
}
@@ -511,35 +505,24 @@ export class UploadInstance extends EventEmitter {
return this;
}
- if (this.currentChunk <= this.fileLength) {
- ++this.currentChunk;
+ if (this.sentChunks + 1 <= this.fileLength) {
if (this.worker) {
this.worker.postMessage({
f: this.config.file,
- sc: this.sentChunks,
- cc: this.currentChunk,
+ cc: this.sentChunks + 1,
cs: this.config.chunkSize,
ib: this.config.isBase64
});
} else {
- this.emit('proceedChunk', this.currentChunk);
+ this.emit('proceedChunk', this.sentChunks + 1);
}
} else {
this.emit('sendEOF');
}
- this.startTime[this.currentChunk] = +new Date();
+ this.startTime[this.sentChunks + 1] = Date.now();
return this;
}
- createStreams() {
- this.collection._debug('[FilesCollection] [UploadInstance] [createStreams]');
- let i = 1;
- while (i <= this.config.streams) {
- this.emit('upload');
- i++;
- }
- }
-
prepare() {
let _len;
@@ -569,21 +552,7 @@ export class UploadInstance extends EventEmitter {
_len = Math.ceil(this.fileData.size / this.config.chunkSize);
}
- if (this.config.streams === 'dynamic') {
- this.config.streams = helpers.clone(_len);
- if (this.config.streams > 24) { this.config.streams = 24; }
-
- if (this.config.transport === 'http') {
- this.config.streams = Math.round(this.config.streams / 2);
- } else if (isSafari) {
- this.config.streams = 1;
- }
- }
-
this.fileLength = _len <= 0 ? 1 : _len;
- if (this.config.streams > this.fileLength) {
- this.config.streams = this.fileLength;
- }
this.result.config.fileLength = this.fileLength;
const opts = {
@@ -599,14 +568,20 @@ export class UploadInstance extends EventEmitter {
const handleStart = (error) => {
if (error) {
- this.collection._debug('[FilesCollection] [_Start] Error:', error);
- this.emit('end', error);
+ Meteor.setTimeout(() => {
+ if (!Meteor.status().connected || `${error}` === 'Error: network' || `${error}` === 'Error: Connection lost') {
+ this.result.pause();
+ } else if (this.result.state.get() !== 'aborted') {
+ this.collection._debug('[FilesCollection] [_Start] Error:', error);
+ this.emit('end', error);
+ }
+ }, 512);
} else {
this.result.continueFunc = () => {
this.collection._debug('[FilesCollection] [insert] [continueFunc]');
- this.emit('createStreams');
+ this.emit('upload');
};
- this.emit('createStreams');
+ this.emit('upload');
}
};
@@ -617,17 +592,23 @@ export class UploadInstance extends EventEmitter {
opts.file.meta = fixJSONStringify(opts.file.meta);
}
- HTTP.call('POST', `${_rootUrl}${this.collection.downloadRoute}/${this.collection.collectionName}/__upload`, {
- data: opts,
+ fetch(`${_rootUrl}${this.collection.downloadRoute}/${this.collection.collectionName}/__upload`, {
+ method: 'POST',
+ body: JSON.stringify(opts),
+ cache: 'no-cache',
+ credentials: 'include',
+ type: 'cors',
headers: {
'x-start': '1',
'x-mtok': (helpers.isObject(Meteor.connection) ? Meteor.connection._lastSessionId : void 0) || null
- },
- beforeSend(xhr) {
- xhr.withCredentials = true;
- return true;
}
- }, handleStart);
+ }).then((response) => {
+ if (response.status === 204) {
+ handleStart();
+ } else {
+ this.emit('end', new Meteor.Error(response.status, 'Can\'t start upload, make sure you\'re connected to the Internet. Reload the page or try again later.'));
+ }
+ }).catch(handleStart);
}
}
@@ -662,6 +643,9 @@ export class UploadInstance extends EventEmitter {
if (!this.result.onPause.curValue && !Meteor.status().connected) {
this.collection._debug('[FilesCollection] [insert] [Tracker] [pause]');
this.result.pause();
+ } else if (this.result.onPause.curValue && Meteor.status().connected) {
+ this.collection._debug('[FilesCollection] [insert] [Tracker] [continue]');
+ this.result.continue();
}
});
|