files.com 1.0.204 → 1.0.207

package/_VERSION

@@ -1 +1 @@
-1.0.204
+1.0.207

package/docs/models/Site.md

@@ -562,6 +562,7 @@ await Site.update({
 * `user_requests_notify_admins` (boolean): Send email to site admins when a user request is received?
 * `ftp_enabled` (boolean): Is FTP enabled?
 * `sftp_enabled` (boolean): Is SFTP enabled?
+* `bundle_watermark_value` (object): Preview watermark settings applied to all bundle items. Uses the same keys as Behavior.value
 * `allowed_2fa_method_sms` (boolean): Is SMS two factor authentication allowed?
 * `allowed_2fa_method_u2f` (boolean): Is U2F two factor authentication allowed?
 * `allowed_2fa_method_totp` (boolean): Is TOTP two factor authentication allowed?

package/docs/models/UsageDailySnapshot.md

@@ -14,9 +14,7 @@
   "deleted_files_storage": "65536",
   "deleted_files_counted_in_minimum": "65536",
   "root_storage": "65536",
-  "usage_by_top_level_dir": [
-    ""
-  ]
+  "usage_by_top_level_dir": ""
 }
 ```
 
@@ -30,7 +28,7 @@
 * `deleted_files_storage` (int64): GB of Files Native Storage used on this day for files that have been deleted and are stored as backups.
 * `deleted_files_counted_in_minimum` (int64): GB of Files Native Storage used on this day for files that have been permanently deleted but were uploaded less than 30 days ago, and are still billable.
 * `root_storage` (int64): GB of Files Native Storage used for the root folder.  Included here because this value will not be part of `usage_by_top_level_dir`
-* `usage_by_top_level_dir` (array): Usage broken down by each top-level folder
+* `usage_by_top_level_dir` (object): Usage broken down by each top-level folder
 
 ---
 

package/lib/models/File.js

@@ -900,15 +900,15 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
   this.options = _objectSpread({}, options);
 });
 (0, _defineProperty2.default)(File, "_openUpload", /*#__PURE__*/function () {
-  var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(path) {
+  var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(path, paramsRaw) {
     var params, response, partData;
     return _regenerator.default.wrap(function _callee11$(_context11) {
       while (1) {
         switch (_context11.prev = _context11.next) {
           case 0:
-            params = {
+            params = _objectSpread(_objectSpread({}, paramsRaw), {}, {
               action: 'put'
-            };
+            });
             _context11.next = 3;
             return _Api.default.sendRequest("/files/".concat(encodeURIComponent(path)), 'POST', params);
 
@@ -937,7 +937,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee11);
   }));
 
-  return function (_x5) {
+  return function (_x5, _x6) {
     return _ref13.apply(this, arguments);
   };
 }());
@@ -981,7 +981,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee12);
   }));
 
-  return function (_x6, _x7, _x8) {
+  return function (_x7, _x8, _x9) {
     return _ref14.apply(this, arguments);
   };
 }());
@@ -1006,19 +1006,19 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee13);
   }));
 
-  return function (_x9) {
+  return function (_x10) {
     return _ref15.apply(this, arguments);
   };
 }());
 (0, _defineProperty2.default)(File, "uploadStream", /*#__PURE__*/function () {
-  var _ref16 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee16(destinationPath, readableStream) {
+  var _ref16 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee16(destinationPath, readableStream, params) {
     var fileUploadPart, file;
     return _regenerator.default.wrap(function _callee16$(_context16) {
       while (1) {
         switch (_context16.prev = _context16.next) {
           case 0:
             _context16.next = 2;
-            return File._openUpload(destinationPath);
+            return File._openUpload(destinationPath, params);
 
           case 2:
             fileUploadPart = _context16.sent;
@@ -1047,40 +1047,48 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
                     while (1) {
                       switch (_context14.prev = _context14.next) {
                         case 0:
+                          _context14.prev = 0;
                           length += chunk.length;
 
                           if (!(length > fileUploadPart.partsize)) {
-                            _context14.next = 12;
+                            _context14.next = 13;
                             break;
                           }
 
                           readableStream.pause();
                           buffer = _safeBuffer.Buffer.concat(chunks);
-                          _context14.next = 6;
+                          _context14.next = 7;
                           return File._continueUpload(destinationPath, ++part, fileUploadPart);
 
-                        case 6:
+                        case 7:
                           nextFileUploadPart = _context14.sent;
-                          _context14.next = 9;
+                          _context14.next = 10;
                           return _Api.default.sendFilePart(nextFileUploadPart.upload_uri, 'PUT', buffer);
 
-                        case 9:
+                        case 10:
                           chunks = [];
                           length = 0;
                           readableStream.resume();
 
-                        case 12:
+                        case 13:
                           chunks.push(_safeBuffer.Buffer.from(chunk));
+                          _context14.next = 19;
+                          break;
 
-                        case 13:
+                        case 16:
+                          _context14.prev = 16;
+                          _context14.t0 = _context14["catch"](0);
+                          reject(_context14.t0);
+
+                        case 19:
                         case "end":
                           return _context14.stop();
                       }
                     }
-                  }, _callee14);
+                  }, _callee14, null, [[0, 16]]);
                 }));
 
-                return function (_x12) {
+                return function (_x14) {
                   return _ref17.apply(this, arguments);
                 };
               }());
@@ -1090,35 +1098,44 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
                   while (1) {
                     switch (_context15.prev = _context15.next) {
                       case 0:
+                        _context15.prev = 0;
+
                         if (!(chunks.length > 0)) {
-                          _context15.next = 7;
+                          _context15.next = 8;
                           break;
                         }
 
                         buffer = _safeBuffer.Buffer.concat(chunks);
-                        _context15.next = 4;
+                        _context15.next = 5;
                         return File._continueUpload(destinationPath, ++part, fileUploadPart);
 
-                      case 4:
+                      case 5:
                         nextFileUploadPart = _context15.sent;
-                        _context15.next = 7;
+                        _context15.next = 8;
                         return _Api.default.sendFilePart(nextFileUploadPart.upload_uri, 'PUT', buffer);
 
-                      case 7:
-                        _context15.next = 9;
+                      case 8:
+                        _context15.next = 10;
                         return File._completeUpload(fileUploadPart);
 
-                      case 9:
+                      case 10:
                         response = _context15.sent;
                         createdFile = new File(response.data);
                         resolve(createdFile);
+                        _context15.next = 18;
+                        break;
+
+                      case 15:
+                        _context15.prev = 15;
+                        _context15.t0 = _context15["catch"](0);
+                        reject(_context15.t0);
 
-                      case 12:
+                      case 18:
                       case "end":
                         return _context15.stop();
                     }
                   }
-                }, _callee15);
+                }, _callee15, null, [[0, 15]]);
               })));
             });
 
@@ -1139,12 +1156,12 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee16, null, [[5, 12]]);
   }));
 
-  return function (_x10, _x11) {
+  return function (_x11, _x12, _x13) {
     return _ref16.apply(this, arguments);
   };
 }());
 (0, _defineProperty2.default)(File, "uploadData", /*#__PURE__*/function () {
-  var _ref19 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(destinationPath, data) {
+  var _ref19 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(destinationPath, data, params) {
     return _regenerator.default.wrap(function _callee17$(_context17) {
       while (1) {
         switch (_context17.prev = _context17.next) {
@@ -1157,7 +1174,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
             throw new errors.MissingParameterError('Upload data was not provided');
 
           case 2:
-            return _context17.abrupt("return", File.uploadStream(destinationPath, _readableStream.default.from(data)));
+            return _context17.abrupt("return", File.uploadStream(destinationPath, _readableStream.default.from(data), params));
 
           case 3:
           case "end":
@@ -1167,12 +1184,12 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee17);
   }));
 
-  return function (_x13, _x14) {
+  return function (_x15, _x16, _x17) {
     return _ref19.apply(this, arguments);
   };
 }());
 (0, _defineProperty2.default)(File, "uploadFile", /*#__PURE__*/function () {
-  var _ref20 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(destinationPath, sourceFilePath) {
+  var _ref20 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(destinationPath, sourceFilePath, params) {
     var _require3, openDiskFileReadStream, stream;
 
     return _regenerator.default.wrap(function _callee18$(_context18) {
@@ -1189,7 +1206,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
           case 2:
             _require3 = require('../isomorphic/File.node.js'), openDiskFileReadStream = _require3.openDiskFileReadStream;
             stream = openDiskFileReadStream(sourceFilePath);
-            return _context18.abrupt("return", File.uploadStream(destinationPath, stream));
+            return _context18.abrupt("return", File.uploadStream(destinationPath, stream, params));
 
           case 5:
           case "end":
@@ -1199,7 +1216,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee18);
   }));
 
-  return function (_x15, _x16) {
+  return function (_x18, _x19, _x20) {
     return _ref20.apply(this, arguments);
   };
 }());
@@ -1329,7 +1346,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee19);
   }));
 
-  return function (_x17) {
+  return function (_x21) {
     return _ref21.apply(this, arguments);
   };
 }());
@@ -1395,7 +1412,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
     }, _callee20);
   }));
 
-  return function (_x18) {
+  return function (_x22) {
     return _ref22.apply(this, arguments);
   };
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "files.com",
-  "version": "1.0.204",
+  "version": "1.0.207",
   "description": "Files.com SDK for JavaScript",
   "keywords": [
     "files.com",

package/src/models/File.js

@@ -28,8 +28,8 @@ class File {
   }
 
   isLoaded = () => !!this.attributes.path
-  static _openUpload = async path => {
-    const params = { action: 'put' }
+  static _openUpload = async (path, paramsRaw) => {
+    const params = { ...paramsRaw, action: 'put' }
     const response = await Api.sendRequest(`/files/${encodeURIComponent(path)}`, 'POST', params)
 
     if (!response) {
@@ -76,8 +76,11 @@ class File {
     return Api.sendRequest(`/files/${encodeURIComponent(fileUploadPart.path)}`, 'POST', params)
   }
 
-  static uploadStream = async (destinationPath, readableStream) => {
-    const fileUploadPart = await File._openUpload(destinationPath)
+  /**
+   * @note see File.copy() for list of supported params
+   */
+  static uploadStream = async (destinationPath, readableStream, params) => {
+    const fileUploadPart = await File._openUpload(destinationPath, params)
 
     if (!fileUploadPart) {
       return
@@ -92,37 +95,45 @@ class File {
         readableStream.on('error', error => { reject(error) })
 
         readableStream.on('data', async chunk => {
-          length += chunk.length
+          try {
+            length += chunk.length
 
-          if (length > fileUploadPart.partsize) {
-            readableStream.pause()
+            if (length > fileUploadPart.partsize) {
+              readableStream.pause()
 
-            const buffer = Buffer.concat(chunks)
-            const nextFileUploadPart = await File._continueUpload(destinationPath, ++part, fileUploadPart)
+              const buffer = Buffer.concat(chunks)
+              const nextFileUploadPart = await File._continueUpload(destinationPath, ++part, fileUploadPart)
 
-            await Api.sendFilePart(nextFileUploadPart.upload_uri, 'PUT', buffer)
+              await Api.sendFilePart(nextFileUploadPart.upload_uri, 'PUT', buffer)
 
-            chunks = []
-            length = 0
+              chunks = []
+              length = 0
 
-            readableStream.resume()
-          }
+              readableStream.resume()
+            }
 
-          chunks.push(Buffer.from(chunk))
+            chunks.push(Buffer.from(chunk))
+          } catch (error) {
+            reject(error)
+          }
         })
 
         readableStream.on('end', async () => {
-          if (chunks.length > 0) {
-            const buffer = Buffer.concat(chunks)
-            const nextFileUploadPart = await File._continueUpload(destinationPath, ++part, fileUploadPart)
+          try {
+            if (chunks.length > 0) {
+              const buffer = Buffer.concat(chunks)
+              const nextFileUploadPart = await File._continueUpload(destinationPath, ++part, fileUploadPart)
 
-            await Api.sendFilePart(nextFileUploadPart.upload_uri, 'PUT', buffer)
-          }
+              await Api.sendFilePart(nextFileUploadPart.upload_uri, 'PUT', buffer)
+            }
 
-          const response = await File._completeUpload(fileUploadPart)
-          const createdFile = new File(response.data)
+            const response = await File._completeUpload(fileUploadPart)
+            const createdFile = new File(response.data)
 
-          resolve(createdFile)
+            resolve(createdFile)
+          } catch (error) {
+            reject(error)
+          }
         })
       })
 
@@ -134,16 +145,20 @@ class File {
 
   /**
    * data - string, Buffer, Stream, any object implementing Symbol.iterator or Symbol.asyncIterator
+   * @note see File.copy() for list of supported params
    */
-  static uploadData = async (destinationPath, data) => {
+  static uploadData = async (destinationPath, data, params) => {
     if (!data) {
       throw new errors.MissingParameterError('Upload data was not provided')
     }
 
-    return File.uploadStream(destinationPath, Readable.from(data))
+    return File.uploadStream(destinationPath, Readable.from(data), params)
   }
 
-  static uploadFile = async (destinationPath, sourceFilePath) => {
+  /**
+   * @note see File.copy() for list of supported params
+   */
+  static uploadFile = async (destinationPath, sourceFilePath, params) => {
     if (isBrowser()) {
       throw new errors.NotImplementedError('Disk file uploads are only available in a NodeJS environment')
     }
@@ -151,7 +166,7 @@ class File {
     const { openDiskFileReadStream } = require('../isomorphic/File.node.js')
     const stream = openDiskFileReadStream(sourceFilePath)
 
-    return File.uploadStream(destinationPath, stream)
+    return File.uploadStream(destinationPath, stream, params)
   }
 
   downloadToStream = async writableStream => {

package/src/models/Site.js

@@ -498,6 +498,7 @@ class Site {
   //   user_requests_notify_admins - boolean - Send email to site admins when a user request is received?
   //   ftp_enabled - boolean - Is FTP enabled?
   //   sftp_enabled - boolean - Is SFTP enabled?
+  //   bundle_watermark_value - object - Preview watermark settings applied to all bundle items. Uses the same keys as Behavior.value
   //   allowed_2fa_method_sms - boolean - Is SMS two factor authentication allowed?
   //   allowed_2fa_method_u2f - boolean - Is U2F two factor authentication allowed?
   //   allowed_2fa_method_totp - boolean - Is TOTP two factor authentication allowed?

package/src/models/UsageDailySnapshot.js

@@ -53,7 +53,7 @@ class UsageDailySnapshot {
   // int64 # GB of Files Native Storage used for the root folder.  Included here because this value will not be part of `usage_by_top_level_dir`
   getRootStorage = () => this.attributes.root_storage
 
-  // array # Usage broken down by each top-level folder
+  // object # Usage broken down by each top-level folder
   getUsageByTopLevelDir = () => this.attributes.usage_by_top_level_dir