@karpeleslab/klbfw 0.1.13 → 0.2.1

package/upload.js

@@ -1,354 +1,822 @@
+/**
+ * KLB Upload Module
+ * 
+ * This module handles file uploads to KLB API endpoints.
+ * It supports both browser and Node.js environments with a unified API.
+ * 
+ * The module handles:
+ * - File upload to KLB API endpoints
+ * - Multiple upload protocols (PUT and AWS multipart)
+ * - Progress tracking
+ * - Pause, resume, retry, and cancel operations
+ * - Browser and Node.js compatibility
+ * 
+ * Browser usage:
+ * ```js
+ * // Open file picker and upload selected files
+ * upload.upload.init('Misc/Debug:testUpload')()
+ *   .then(result => console.log('Upload complete', result));
+ * 
+ * // Upload a specific File object
+ * upload.upload.append('Misc/Debug:testUpload', fileObject)
+ *   .then(result => console.log('Upload complete', result));
+ * 
+ * // Track progress
+ * upload.upload.onprogress = (status) => {
+ *   console.log('Progress:', status.running.map(i => i.status));
+ * };
+ * 
+ * // Cancel an upload
+ * upload.upload.cancelItem(uploadId);
+ * ```
+ * 
+ * Node.js usage:
+ * ```js
+ * // For Node.js environments, first install dependencies:
+ * // npm install node-fetch xmldom
+ * 
+ * // Initialize upload with specific file paths
+ * upload.upload.init('Misc/Debug:testUpload')(['./file1.txt', './file2.jpg'])
+ *   .then(result => console.log('Upload complete', result));
+ * 
+ * // Or create a custom file object with path
+ * const file = {
+ *   name: 'test.txt',
+ *   size: 1024,
+ *   type: 'text/plain',
+ *   path: '/path/to/file.txt'
+ * };
+ * upload.upload.append('Misc/Debug:testUpload', file)
+ *   .then(result => console.log('Upload complete', result));
+ * ```
+ * 
+ * @module upload
+ */
+
 const rest = require('./rest');
 const fwWrapper = require('./fw-wrapper');
-var sha256 = require('js-sha256').sha256;
-
-// retunr time in amz format, eg 20180930T132108Z
-function getAmzTime() {
-    var t = new Date();
-    return t.getUTCFullYear() +
-        '' + pad(t.getUTCMonth() + 1) +
-        pad(t.getUTCDate()) +
-        'T' + pad(t.getUTCHours()) +
-        pad(t.getUTCMinutes()) +
-        pad(t.getUTCSeconds()) +
-        'Z';
+const sha256 = require('js-sha256').sha256;
+
+/**
+ * Environment detection and cross-platform utilities
+ */
+const env = {
+  /**
+   * Detect if running in a browser environment
+   */
+  isBrowser: typeof window !== 'undefined' && typeof document !== 'undefined',
+  
+  /**
+   * Detect if running in a Node.js environment
+   */
+  isNode: typeof process !== 'undefined' && process.versions && process.versions.node,
+  
+  /**
+   * Node.js specific modules (lazy-loaded)
+   */
+  node: {
+    fetch: null,
+    xmlParser: null,
+    fs: null,
+    path: null,
+    EventEmitter: null,
+    eventEmitter: null
+  }
+};
+
+/**
+ * Initialize Node.js dependencies when in Node environment
+ */
+if (env.isNode && !env.isBrowser) {
+  try {
+    env.node.fetch = require('node-fetch');
+    env.node.xmlParser = require('xmldom');
+    env.node.fs = require('fs');
+    env.node.path = require('path');
+    env.node.EventEmitter = require('events');
+    env.node.eventEmitter = new (env.node.EventEmitter)();
+  } catch (e) {
+    console.warn('Node.js dependencies not available. Some functionality may be limited:', e.message);
+    console.warn('To use in Node.js, install: npm install node-fetch xmldom');
+  }
 }
 
-function pad(number) {
-    if (number < 10) {
-        return '0' + number;
+/**
+ * Cross-platform utilities
+ */
+const utils = {
+  /**
+   * Environment-agnostic fetch implementation
+   * @param {string} url - The URL to fetch
+   * @param {Object} options - Fetch options
+   * @returns {Promise} - Fetch promise
+   */
+  fetch(url, options) {
+    if (env.isBrowser && typeof window.fetch === 'function') {
+      return window.fetch(url, options);
+    } else if (env.isNode && env.node.fetch) {
+      return env.node.fetch(url, options);
+    } else if (typeof fetch === 'function') {
+      // For environments where fetch is globally available
+      return fetch(url, options);
     }
-    return number;
-}
-
-// perform call against AWS S3 with the appropriate signature obtained from server
+    return Promise.reject(new Error('fetch not available in this environment'));
+  },
+
+  /**
+   * Environment-agnostic XML parser
+   * @param {string} xmlString - XML string to parse
+   * @returns {Document} - DOM-like document
+   */
+  parseXML(xmlString) {
+    if (env.isBrowser) {
+      return new DOMParser().parseFromString(xmlString, 'text/xml');
+    } else if (env.isNode && env.node.xmlParser) {
+      const DOMParserNode = env.node.xmlParser.DOMParser;
+      const dom = new DOMParserNode().parseFromString(xmlString, 'text/xml');
+      
+      // Add querySelector interface for compatibility
+      dom.querySelector = function(selector) {
+        if (selector === 'UploadId') {
+          const elements = this.getElementsByTagName('UploadId');
+          return elements.length > 0 ? { innerHTML: elements[0].textContent } : null;
+        }
+        return null;
+      };
+      
+      return dom;
+    }
+    throw new Error('XML parsing not available in this environment');
+  },
+
+  /**
+   * Read a file as ArrayBuffer in any environment
+   * @param {File|Object} file - File object or file-like object with path
+   * @param {Function} callback - Callback function(buffer, error)
+   */
+  readFileAsArrayBuffer(file, callback) {
+    if (env.isBrowser) {
+      const reader = new FileReader();
+      reader.addEventListener('loadend', () => callback(reader.result));
+      reader.addEventListener('error', (e) => callback(null, e));
+      reader.readAsArrayBuffer(file);
+    } else if (env.isNode && env.node.fs) {
+      if (file.path) {
+        // Read from filesystem
+        const readStream = env.node.fs.createReadStream(file.path, {
+          start: file.start || 0,
+          end: file.end || undefined
+        });
+        
+        const chunks = [];
+        readStream.on('data', chunk => chunks.push(chunk));
+        readStream.on('end', () => {
+          const buffer = Buffer.concat(chunks);
+          callback(buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength));
+        });
+        readStream.on('error', err => callback(null, err));
+      } else if (file.content) {
+        // Memory buffer
+        const buffer = Buffer.from(file.content);
+        callback(buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength));
+      } else {
+        callback(null, new Error('No file path or content provided'));
+      }
+    } else {
+      callback(null, new Error('File reading not available in this environment'));
+    }
+  },
+
+  /**
+   * Dispatch a custom event in any environment
+   * @param {string} eventName - Event name
+   * @param {Object} detail - Event details
+   */
+  dispatchEvent(eventName, detail) {
+    if (env.isBrowser) {
+      const evt = new CustomEvent(eventName, { detail });
+      document.dispatchEvent(evt);
+    } else if (env.isNode && env.node.eventEmitter) {
+      env.node.eventEmitter.emit(eventName, detail);
+    }
+    // In other environments, events are silently ignored
+  },
+
+  /**
+   * Format a date for AWS (YYYYMMDDTHHMMSSZ)
+   * @returns {string} Formatted date
+   */
+  getAmzTime() {
+    const t = new Date();
+    return t.getUTCFullYear() +
+      this.pad(t.getUTCMonth() + 1) +
+      this.pad(t.getUTCDate()) +
+      'T' + this.pad(t.getUTCHours()) +
+      this.pad(t.getUTCMinutes()) +
+      this.pad(t.getUTCSeconds()) +
+      'Z';
+  },
+
+  /**
+   * Pad a number with leading zero if needed
+   * @param {number} number - Number to pad
+   * @returns {string} Padded number
+   */
+  pad(number) {
+    return number < 10 ? '0' + number : String(number);
+  }
+};
+
+/**
+ * AWS S3 request handler
+ * Performs a signed request to AWS S3 using a signature obtained from the server
+ * 
+ * @param {Object} upInfo - Upload info including bucket endpoint and key
+ * @param {string} method - HTTP method (GET, POST, PUT)
+ * @param {string} query - Query parameters
+ * @param {*} body - Request body
+ * @param {Object} headers - Request headers
+ * @param {Object} context - Request context
+ * @returns {Promise} - Request promise
+ */
 function awsReq(upInfo, method, query, body, headers, context) {
     headers = headers || {};
     context = context || {};
 
-    if (body == "") {
-        var bodyHash = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; // sha256('')
+    // Calculate body hash for AWS signature
+    let bodyHash;
+    
+    if (!body || body === "") {
+        // Empty body hash
+        bodyHash = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
     } else {
-        var bodyHash = sha256(body);
+        try {
+            // Handle different body types
+            let bodyForHash = body;
+            
+            if (body instanceof ArrayBuffer || (body.constructor && body.constructor.name === 'ArrayBuffer')) {
+                bodyForHash = new Uint8Array(body);
+            } else if (body.constructor && body.constructor.name === 'Buffer') {
+                bodyForHash = Buffer.from(body).toString();
+            }
+            
+            bodyHash = sha256(bodyForHash);
+        } catch (e) {
+            console.error("Error calculating hash:", e.message);
+            bodyHash = "UNSIGNED-PAYLOAD";
+        }
     }
 
-    var ts = getAmzTime(); // aws format, eg 20180930T132108Z
-    var ts_d = ts.substring(0, 8);
+    // Create AWS timestamp
+    const timestamp = utils.getAmzTime();
+    const datestamp = timestamp.substring(0, 8);
 
+    // Set AWS headers
     headers["X-Amz-Content-Sha256"] = bodyHash;
-    headers["X-Amz-Date"] = ts;
+    headers["X-Amz-Date"] = timestamp;
 
-    // prepare auth string
-    var aws_auth_str = [
+    // Prepare the string to sign
+    const authStringParts = [
         "AWS4-HMAC-SHA256",
-        ts,
-        ts_d + "/" + upInfo.Bucket_Endpoint.Region + "/s3/aws4_request",
+        timestamp,
+        `${datestamp}/${upInfo.Bucket_Endpoint.Region}/s3/aws4_request`,
         method,
-        "/" + upInfo.Bucket_Endpoint.Name + "/" + upInfo.Key,
+        `/${upInfo.Bucket_Endpoint.Name}/${upInfo.Key}`,
         query,
-        "host:" + upInfo.Bucket_Endpoint.Host,
+        `host:${upInfo.Bucket_Endpoint.Host}`
     ];
 
-    // list headers to sign (host and anything starting with x-)
-    var sign_head = ['host'];
-    var k = Object.keys(headers).sort();
-    for (var i = 0; i < k.length; i++) {
-        var s = k[i].toLowerCase();
-        if (s.substring(0, 2) != "x-") {
-            continue;
+    // Add x-* headers to sign
+    const headersToSign = ['host'];
+    const sortedHeaderKeys = Object.keys(headers).sort();
+    
+    for (const key of sortedHeaderKeys) {
+        const lowerKey = key.toLowerCase();
+        if (lowerKey.startsWith('x-')) {
+            headersToSign.push(lowerKey);
+            authStringParts.push(`${lowerKey}:${headers[key]}`);
         }
-        sign_head.push(s);
-        aws_auth_str.push(s + ":" + headers[k[i]]);
     }
-    aws_auth_str.push("");
-    aws_auth_str.push(sign_head.join(";"));
-    aws_auth_str.push(bodyHash);
-
-    var promise = new Promise(function (resolve, reject) {
-
-        rest.rest("Cloud/Aws/Bucket/Upload/" + upInfo.Cloud_Aws_Bucket_Upload__ + ":signV4", "POST", {headers: aws_auth_str.join("\n")}, context)
-            .then(function (ares) {
-                var u = "https://" + upInfo.Bucket_Endpoint.Host + "/" + upInfo.Bucket_Endpoint.Name + "/" + upInfo.Key;
-                if (query != "") u = u + "?" + query;
-
-                headers["Authorization"] = ares.data.authorization;
-
-                fetch(u, {
-                    method: method,
-                    body: body,
-                    headers: headers
-                })
-                    .then(resolve, reject)
-                    .catch(reject);
-
-
-            }, reject)
-            .catch(reject);
-
+    
+    // Complete the string to sign
+    authStringParts.push('');
+    authStringParts.push(headersToSign.join(';'));
+    authStringParts.push(bodyHash);
+
+    return new Promise((resolve, reject) => {
+        // Get signature from server
+        rest.rest(
+            `Cloud/Aws/Bucket/Upload/${upInfo.Cloud_Aws_Bucket_Upload__}:signV4`,
+            "POST",
+            { headers: authStringParts.join("\n") },
+            context
+        )
+        .then(response => {
+            // Construct the S3 URL
+            let url = `https://${upInfo.Bucket_Endpoint.Host}/${upInfo.Bucket_Endpoint.Name}/${upInfo.Key}`;
+            if (query) url += `?${query}`;
+            
+            // Add the authorization header
+            headers["Authorization"] = response.data.authorization;
+            
+            // Make the actual request to S3
+            return utils.fetch(url, {
+                method,
+                body,
+                headers
+            });
+        })
+        .then(resolve)
+        .catch(reject);
     });
-
-    return promise;
 }
 
+/**
+ * Upload module (IIFE pattern)
+ * @returns {Object} Upload interface
+ */
 module.exports.upload = (function () {
-    var upload = {};
-    var upload_queue = []; // queue of uploads to run
-    var upload_failed = []; // failed upload(s)
-    var upload_running = {}; // currently processing uploads
-    var up_id = 0; // next upload id
-    var last_input = null;
-
-
-    function sendprogress() {
-        if (typeof upload.onprogress === "undefined") return;
-
-        upload.onprogress(upload.getStatus());
+    /**
+     * Upload state
+     */
+    const state = {
+        queue: [],      // Queued uploads
+        failed: [],     // Failed uploads
+        running: {},    // Currently processing uploads
+        nextId: 0,      // Next upload ID
+        lastInput: null // Last created file input element (browser only)
+    };
+    
+    // Public API object
+    const upload = {};
+
+    /**
+     * Helper Functions
+     */
+    
+    /**
+     * Notify progress to listeners
+     * Calls onprogress callback and dispatches events
+     */
+    function sendProgress() {
+        const status = upload.getStatus();
+        
+        // Call the onprogress callback if defined
+        if (typeof upload.onprogress === "function") {
+            upload.onprogress(status);
+        }
+        
+        // Dispatch event for listeners
+        utils.dispatchEvent("upload:progress", status);
     }
-
-    function do_process_pending(up) {
-        up["status"] = "pending-wip";
-        // up is an object with api path, file, dfd
-        var params = up.params;
-
-        // set params for upload
-        params["filename"] = up.file.name;
-        params["size"] = up.file.size;
-        params["lastModified"] = up.file.lastModified / 1000;
-        params["type"] = up.file.type;
-
-        rest.rest(up.path, "POST", params, up.context).then(function (res) {
-            // Method 1: aws signed multipart upload
-            if (res["data"]["Cloud_Aws_Bucket_Upload__"]) {
-                up.info = res["data"]; // contains stuff like Bucket_Endpoint, Key, etc
-
-                // ok we are ready to upload - this will initiate an upload
-                awsReq(up.info, "POST", "uploads=", "", {"Content-Type": up.file.type, "X-Amz-Acl": "private"}, up.context)
-                    .then(response => response.text())
-                    .then(str => (new DOMParser()).parseFromString(str, "text/xml"))
-                    .then(dom => dom.querySelector('UploadId').innerHTML)
-                    .then(function (uploadId) {
-                        up.uploadId = uploadId;
-
-                        // ok, let's compute block size so we know how many parts we need to send
-                        var fsize = up.file.size;
-                        var bsize = Math.ceil(fsize / 10000); // we want ~10k parts
-                        if (bsize < 5242880) bsize = 5242880; // minimum block size = 5MB
-
-                        up.method = 'aws';
-                        up.bsize = bsize;
-                        up.blocks = Math.ceil(fsize / bsize);
-                        up.b = {};
-                        up['status'] = 'uploading';
-                        upload.run();
-                    }).catch(res => failure(up, res))
-                return;
+    
+    /**
+     * Handle upload failure
+     * @param {Object} up - Upload object
+     * @param {*} error - Error data
+     */
+    function handleFailure(up, error) {
+        // Skip if upload is no longer running
+        if (!(up.up_id in state.running)) return;
+        
+        // Check if already in failed list
+        for (const failedItem of state.failed) {
+            if (failedItem.up_id === up.up_id) {
+                return; // Already recorded as failed
             }
-            // Method 2: PUT requests
-            if (res["data"]["PUT"]) {
-                var fsize = up.file.size;
-                var bsize = fsize; // upload file in a single block
-                if (res["data"]["Blocksize"]) {
-                    // this upload target supports multipart PUT upload
-                    bsize = res["data"]["Blocksize"]; // multipart upload
+        }
+        
+        // Record failure
+        up.failure = error;
+        state.failed.push(up);
+        delete state.running[up.up_id];
+        
+        // Continue processing queue
+        upload.run();
+        
+        // Notify progress
+        sendProgress();
+        
+        // Dispatch failure event
+        utils.dispatchEvent("upload:failed", {
+            item: up,
+            res: error
+        });
+    }
+    
+    /**
+     * Process a pending upload
+     * Initiates the upload process with the server
+     * @param {Object} up - Upload object
+     */
+    function processUpload(up) {
+        // Mark as processing
+        up.status = "pending-wip";
+        
+        // Prepare parameters
+        const params = up.params || {};
+        
+        // Set file metadata
+        params.filename = up.file.name;
+        params.size = up.file.size;
+        params.lastModified = up.file.lastModified / 1000;
+        params.type = up.file.type;
+        
+        // Initialize upload with the server
+        rest.rest(up.path, "POST", params, up.context)
+            .then(function(response) {
+                // Method 1: AWS signed multipart upload
+                if (response.data.Cloud_Aws_Bucket_Upload__) {
+                    return handleAwsMultipartUpload(up, response.data);
                 }
-
-                up.info = res["data"];
-                up.method = 'put';
-                up.bsize = bsize;
-                up.blocks = Math.ceil(fsize / bsize);
-                up.b = {};
-                up['status'] = 'uploading';
-                upload.run();
-                return;
-            }
-            // invalid data
-            delete upload_running[up.up_id];
-            upload_failed.push(up);
-            up.reject();
-            return;
+                
+                // Method 2: Direct PUT upload
+                if (response.data.PUT) {
+                    return handlePutUpload(up, response.data);
+                }
+                
+                // Invalid response format
+                delete state.running[up.up_id];
+                state.failed.push(up);
+                up.reject(new Error('Invalid upload response format'));
+            })
+            .catch(error => handleFailure(up, error));
+    }
+    
+    /**
+     * Set up AWS multipart upload
+     * @param {Object} up - Upload object
+     * @param {Object} data - Server response data
+     */
+    function handleAwsMultipartUpload(up, data) {
+        // Store upload info
+        up.info = data;
+        
+        // Initialize multipart upload
+        return awsReq(
+            up.info,
+            "POST",
+            "uploads=",
+            "",
+            {"Content-Type": up.file.type, "X-Amz-Acl": "private"},
+            up.context
+        )
+        .then(response => response.text())
+        .then(str => utils.parseXML(str))
+        .then(dom => dom.querySelector('UploadId').innerHTML)
+        .then(uploadId => {
+            up.uploadId = uploadId;
+            
+            // Calculate optimal block size
+            const fileSize = up.file.size;
+            
+            // Target ~10k parts, but minimum 5MB per AWS requirements
+            let blockSize = Math.ceil(fileSize / 10000);
+            if (blockSize < 5242880) blockSize = 5242880;
+            
+            // Set up upload parameters
+            up.method = 'aws';
+            up.bsize = blockSize;
+            up.blocks = Math.ceil(fileSize / blockSize);
+            up.b = {};
+            up.status = 'uploading';
+            
+            // Continue upload process
+            upload.run();
         })
-            .catch(res => failure(up, res));
+        .catch(error => handleFailure(up, error));
     }
-
-
-    function failure(up, data) {
-        if (!(up.up_id in upload_running)) return;
-
-        for (var i = 0, len = upload_failed.length; i < len; i++) {
-            if (upload_failed[i].up_id === up.up_id) {
-                //already in
-                return;
-            }
+    
+    /**
+     * Set up direct PUT upload
+     * @param {Object} up - Upload object
+     * @param {Object} data - Server response data
+     */
+    function handlePutUpload(up, data) {
+        // Store upload info
+        up.info = data;
+        
+        // Calculate block size (if multipart PUT is supported)
+        const fileSize = up.file.size;
+        let blockSize = fileSize; // Default: single block
+        
+        if (data.Blocksize) {
+            // Server supports multipart upload
+            blockSize = data.Blocksize;
         }
-
-        up.failure = data;
-        upload_failed.push(up);
-        delete upload_running[up.up_id];
+        
+        // Set up upload parameters
+        up.method = 'put';
+        up.bsize = blockSize;
+        up.blocks = Math.ceil(fileSize / blockSize);
+        up.b = {};
+        up.status = 'uploading';
+        
+        // Continue upload process
         upload.run();
-        sendprogress();
-        if (typeof document !== "undefined") {
-            setTimeout(function () {
-                var evt = new CustomEvent("upload:failed", {
-                    detail: {
-                        item: up,
-                        res: data
-                    }
-                });
-                document.dispatchEvent(evt);
-            }, 10);
-        }
     }
 
-    function do_upload_part(up, partno) {
-        // ok, need to start this!
-        up.b[partno] = "pending";
-        var start = partno * up.bsize;
-        var part = up.file.slice(start, start + up.bsize);
-
-        var reader = new FileReader();
-        reader.addEventListener("loadend", function () {
-            switch(up.method) {
-            case 'aws':
-                awsReq(up.info, "PUT", "partNumber=" + (partno + 1) + "&uploadId=" + up.uploadId, reader.result, null, up.context)
-                    .then(function (response) {
-                        up.b[partno] = response.headers.get("ETag");
-                        sendprogress();
-                        upload.run();
-                    }).catch(res => failure(up, res));
-                break;
-            case 'put':
-                let headers = {};
-                headers["Content-Type"] = up.file.type;
-                if (up.blocks > 1) {
-                    // add Content-Range header
-                    // Content-Range: bytes start-end/*
-                    const end = start + reader.result.byteLength - 1; // inclusive
-                    headers["Content-Range"] = "bytes "+start+"-"+end+"/*";
-                }
+    /**
+     * Upload a single part of a file
+     * Handles both AWS multipart and direct PUT methods
+     * @param {Object} up - Upload object
+     * @param {number} partNumber - Part number (0-based)
+     */
+    function uploadPart(up, partNumber) {
+        // Mark part as pending
+        up.b[partNumber] = "pending";
+        
+        // Calculate byte range for this part
+        const startByte = partNumber * up.bsize;
+        const endByte = Math.min(startByte + up.bsize, up.file.size);
+        
+        // Get file slice based on environment
+        let filePart;
+        
+        if (env.isBrowser) {
+            // Browser: use native File.slice
+            filePart = up.file.slice(startByte, endByte);
+        } else if (env.isNode) {
+            // Node.js: create a reference with start/end positions
+            filePart = {
+                path: up.file.path,
+                start: startByte,
+                end: endByte,
+                type: up.file.type,
+                content: up.file.content // For memory buffer based files
+            };
+        } else {
+            handleFailure(up, new Error('Environment not supported'));
+            return;
+        }
 
-                fetch(up.info["PUT"], {
-                    method: "PUT",
-                    body: reader.result,
-                    headers: headers,
-                }).then(function (response) {
-                    up.b[partno] = "done";
-                    sendprogress();
-                    upload.run();
-                }).catch(res => failure(up, res));
-                break;
+        // Read the file part as ArrayBuffer
+        utils.readFileAsArrayBuffer(filePart, (arrayBuffer, error) => {
+            if (error) {
+                handleFailure(up, error);
+                return;
+            }
+            
+            // Choose upload method based on protocol
+            if (up.method === 'aws') {
+                uploadAwsPart(up, partNumber, arrayBuffer);
+            } else if (up.method === 'put') {
+                uploadPutPart(up, partNumber, startByte, arrayBuffer);
+            } else {
+                handleFailure(up, new Error(`Unknown upload method: ${up.method}`));
             }
         });
+    }
+    
+    /**
+     * Upload a part using AWS multipart upload
+     * @param {Object} up - Upload object
+     * @param {number} partNumber - Part number (0-based)
+     * @param {ArrayBuffer} data - Part data
+     */
+    function uploadAwsPart(up, partNumber, data) {
+        // AWS part numbers are 1-based
+        const awsPartNumber = partNumber + 1;
+        
+        awsReq(
+            up.info,
+            "PUT",
+            `partNumber=${awsPartNumber}&uploadId=${up.uploadId}`,
+            data,
+            null,
+            up.context
+        )
+        .then(response => {
+            // Store ETag for this part (needed for completion)
+            up.b[partNumber] = response.headers.get("ETag");
+            
+            // Update progress and continue processing
+            sendProgress();
+            upload.run();
+        })
+        .catch(error => handleFailure(up, error));
+    }
+    
+    /**
+     * Upload a part using direct PUT
+     * @param {Object} up - Upload object
+     * @param {number} partNumber - Part number (0-based)
+     * @param {number} startByte - Starting byte position
+     * @param {ArrayBuffer} data - Part data
+     */
+    function uploadPutPart(up, partNumber, startByte, data) {
+        // Set up headers
+        const headers = {
+            "Content-Type": up.file.type
+        };
+        
+        // Add Content-Range header for multipart PUT
+        if (up.blocks > 1) {
+            const endByte = startByte + data.byteLength - 1; // inclusive
+            headers["Content-Range"] = `bytes ${startByte}-${endByte}/*`;
+        }
 
-        reader.addEventListener("error", function (e) {
-            failure(up, e);
-        });
-
-        reader.readAsArrayBuffer(part);
+        // Perform the PUT request
+        utils.fetch(up.info.PUT, {
+            method: "PUT",
+            body: data,
+            headers: headers,
+        })
+        .then(response => {
+            // Mark part as done
+            up.b[partNumber] = "done";
+            
+            // Update progress and continue processing
+            sendProgress();
+            upload.run();
+        })
+        .catch(error => handleFailure(up, error));
     }
 
 
-    function do_process_uploading(up) {
+    /**
+     * Process an upload in progress
+     * Manages uploading parts and completing the upload
+     * @param {Object} up - Upload object
+     */
+    function processActiveUpload(up) {
+        // Skip if paused or canceled
         if (up.paused || up.canceled) return;
 
-        var p = 0; // pending
-        var d = 0; // done
-        for (var i = 0; i < up.blocks; i++) {
-            if (up.b[i] == undefined) {
-                if (up.paused) break; // do not start new parts if paused
-                do_upload_part(up, i);
-            } else if (up.b[i] != "pending") {
-                d += 1;
+        // Track upload progress
+        let pendingParts = 0;
+        let completedParts = 0;
+        
+        // Process each part
+        for (let i = 0; i < up.blocks; i++) {
+            if (up.b[i] === undefined) {
+                // Part not started yet
+                if (up.paused) break; // Don't start new parts when paused
+                
+                // Start uploading this part
+                uploadPart(up, i);
+                pendingParts++;
+            } else if (up.b[i] !== "pending") {
+                // Part completed
+                completedParts++;
                 continue;
+            } else {
+                // Part in progress
+                pendingParts++;
             }
-            p += 1;
-            if (p >= 3) break;
+            
+            // Limit concurrent uploads
+            if (pendingParts >= 3) break;
         }
 
-        up["done"] = d;
-
-        if (p == 0) {
-            up["status"] = "validating";
-            switch(up.method) {
-            case 'aws':
-                // complete, see https://docs.aws.amazon.com/AmazonS3/latest/API/mpUploadComplete.html
-                var xml = "<CompleteMultipartUpload>";
-                for (var i = 0; i < up.blocks; i++) {
-                    xml += "<Part><PartNumber>" + (i + 1) + "</PartNumber><ETag>" + up.b[i] + "</ETag></Part>";
-                }
-                xml += "</CompleteMultipartUpload>";
-                awsReq(up.info, "POST", "uploadId=" + up.uploadId, xml, null, up.context)
-                .then(response => response.text())
-                .then(function (r) {
-                    // if success, need to call finalize
-                    rest.rest("Cloud/Aws/Bucket/Upload/" + up.info.Cloud_Aws_Bucket_Upload__ + ":handleComplete", "POST", {}, up.context).then(function (ares) {
-                        // SUCCESS!
-                        up["status"] = "complete";
-                        up["final"] = ares["data"];
-                        sendprogress();
-                        up.resolve(up);
-                        delete upload_running[up.up_id];
-                        upload.run();
-                    }).catch(res => failure(up, res));
-                }).catch(res => failure(up, res));
-                break;
-            case 'put':
-                // complete, directly call handleComplete
-                rest.rest(up.info.Complete, "POST", {}, up.context).then(function (ares) {
-                    // success!
-                    up["status"] = "complete";
-                    up["final"] = ares["data"];
-                    sendprogress();
-                    delete upload_running[up.up_id];
-                    up.resolve(up);
-                    upload.run();
-                }).catch(res => failure(up, res));
-                break;
+        // Update upload progress
+        up.done = completedParts;
+
+        // Check if all parts are complete
+        if (pendingParts === 0) {
+            // All parts complete, finalize the upload
+            up.status = "validating";
+            
+            if (up.method === 'aws') {
+                completeAwsUpload(up);
+            } else if (up.method === 'put') {
+                completePutUpload(up);
             }
         }
     }
-
-    // take tasks from queue and run them if needed
-    function fillqueue() {
-        if (Object.keys(upload_running).length >= 3) return; // nothing yet
-        // if (upload_failed.length > 0) return; // need to push "retry" to resume
-
-        // max 3 uploading files
-        while (Object.keys(upload_running).length < 3) {
-            if (upload_queue.length == 0) return;
-            var up = upload_queue.shift();
-            upload_running[up.up_id] = up;
+    
+    /**
+     * Complete AWS multipart upload
+     * @param {Object} up - Upload object
+     */
+    function completeAwsUpload(up) {
+        // Create completion XML
+        // See: https://docs.aws.amazon.com/AmazonS3/latest/API/mpUploadComplete.html
+        let xml = "<CompleteMultipartUpload>";
+        
+        for (let i = 0; i < up.blocks; i++) {
+            // AWS part numbers are 1-based
+            xml += `<Part><PartNumber>${i + 1}</PartNumber><ETag>${up.b[i]}</ETag></Part>`;
         }
-        sendprogress();
+        
+        xml += "</CompleteMultipartUpload>";
+        
+        // Send completion request
+        awsReq(up.info, "POST", `uploadId=${up.uploadId}`, xml, null, up.context)
+            .then(response => response.text())
+            .then(() => {
+                // Call server-side completion handler
+                return rest.rest(
+                    `Cloud/Aws/Bucket/Upload/${up.info.Cloud_Aws_Bucket_Upload__}:handleComplete`,
+                    "POST",
+                    {},
+                    up.context
+                );
+            })
+            .then(response => {
+                // Mark upload as complete
+                up.status = "complete";
+                up.final = response.data;
+                
+                // Notify listeners
+                sendProgress();
+                
+                // Remove from running uploads
+                delete state.running[up.up_id];
+                
+                // Resolve the upload promise
+                up.resolve(up);
+                
+                // Continue processing queue
+                upload.run();
+            })
+            .catch(error => handleFailure(up, error));
+    }
+    
+    /**
+     * Complete direct PUT upload
+     * @param {Object} up - Upload object
+     */
+    function completePutUpload(up) {
+        // Call completion endpoint
+        rest.rest(up.info.Complete, "POST", {}, up.context)
+            .then(response => {
+                // Mark upload as complete
+                up.status = "complete";
+                up.final = response.data;
+                
+                // Notify listeners
+                sendProgress();
+                
+                // Remove from running uploads
+                delete state.running[up.up_id];
+                
+                // Resolve the upload promise
+                up.resolve(up);
+                
+                // Continue processing queue
+                upload.run();
+            })
+            .catch(error => handleFailure(up, error));
     }
 
-
-    upload.getStatus = function () {
-        var prog = {
-            "queue": upload_queue,
-            "running": Object.keys(upload_running).map(function (e) {
-                return upload_running[e]
-            }),
-            "failed": upload_failed,
+    /**
+     * Fill the upload queue with new upload tasks
+     * Takes items from the queue and adds them to running uploads
+     */
+    function fillUploadQueue() {
+        // Skip if we're already running the maximum number of uploads
+        if (Object.keys(state.running).length >= 3) return;
+        
+        // Maximum of 3 concurrent uploads
+        while (Object.keys(state.running).length < 3 && state.queue.length > 0) {
+            // Get next upload from queue
+            const upload = state.queue.shift();
+            
+            // Add to running uploads
+            state.running[upload.up_id] = upload;
+        }
+        
+        // Notify progress
+        sendProgress();
+    }
+    
+    // No need for backward compatibility for private methods
+    
+    /**
+     * Get current upload status
+     * @returns {Object} Status object with queued, running and failed uploads
+     */
+    upload.getStatus = function() {
+        return {
+            queue: state.queue,
+            running: Object.keys(state.running).map(id => state.running[id]),
+            failed: state.failed
         };
-
-        return prog;
     };
-
-    upload.resume = function () {
-        // put failed stuff at end of queue, resume upload
-        while (upload_failed.length > 0) {
-            upload_queue.push(upload_failed.shift());
+    
+    /**
+     * Resume all failed uploads
+     * Moves failed uploads back to the queue
+     */
+    upload.resume = function() {
+        // Move all failed uploads back to the queue
+        while (state.failed.length > 0) {
+            state.queue.push(state.failed.shift());
         }
-
+        
+        // Restart upload process
         upload.run();
     };
 
-    if (typeof document !== "undefined") {
-        upload.init = function (path, params, notify) {
-            // perform upload to a given API, for example Drive/Item/<id>:upload
-            // will allow multiple files to be uploaded
-            params = params || {};
-
+    // Environment-specific initialization
+    upload.init = function (path, params, notify) {
+        // perform upload to a given API, for example Drive/Item/<id>:upload
+        // will allow multiple files to be uploaded
+        params = params || {};
+        
+        if (isBrowser) {
+            // Browser implementation
             if (last_input != null) {
                 last_input.parentNode.removeChild(last_input);
                 last_input = null;
@@ -386,179 +854,277 @@ module.exports.upload = (function () {
 
             input.click();
             return promise;
-        };
-    }
+        } else if (isNode) {
+            // Node.js implementation
+            return function(filePaths) {
+                // Convert string to array if single file path provided
+                if (typeof filePaths === 'string') {
+                    filePaths = [filePaths];
+                }
+                
+                if (!Array.isArray(filePaths)) {
+                    throw new Error('filePaths must be a string or array of strings');
+                }
+                
+                return new Promise(function(resolve, reject) {
+                    const count = filePaths.length;
+                    if (count === 0) {
+                        return resolve();
+                    }
+                    
+                    if (notify !== undefined) notify({status: 'init', count: count});
+                    
+                    let remainingCount = count;
+                    
+                    filePaths.forEach(filePath => {
+                        try {
+                            // Get file info
+                            const stats = nodeFs.statSync(filePath);
+                            const fileName = nodePath.basename(filePath);
+                            
+                            // Create a file-like object
+                            const file = {
+                                name: fileName,
+                                size: stats.size,
+                                lastModified: stats.mtimeMs,
+                                type: 'application/octet-stream', // Default type
+                                path: filePath, // For Node.js reading
+                                // Mock methods needed by upload.js
+                                slice: function(start, end) {
+                                    return {
+                                        path: filePath,
+                                        start: start,
+                                        end: end || stats.size
+                                    };
+                                }
+                            };
+                            
+                            upload.append(path, file, params, fwWrapper.getContext())
+                                .then(function(obj) {
+                                    remainingCount -= 1;
+                                    if (notify !== undefined) notify(obj);
+                                    if (remainingCount === 0) resolve();
+                                })
+                                .catch(function(err) {
+                                    remainingCount -= 1;
+                                    console.error('Error uploading file:', err);
+                                    if (remainingCount === 0) resolve();
+                                });
+                        } catch (err) {
+                            remainingCount -= 1;
+                            console.error('Error processing file:', err);
+                            if (remainingCount === 0) resolve();
+                        }
+                    });
+                    
+                    upload.run();
+                });
+            };
+        } else {
+            // Default implementation for other environments
+            return function() {
+                return Promise.reject(new Error('File upload not supported in this environment'));
+            };
+        }
+    };
 
 
-    upload.append = function (path, file, params, context) {
-        var promise = new Promise(function (resolve, reject) {
+    /**
+     * Add a file to the upload queue
+     * @param {string} path - API path to upload to
+     * @param {File|Object} file - File to upload
+     * @param {Object} params - Upload parameters
+     * @param {Object} context - Request context
+     * @returns {Promise} - Upload promise
+     */
+    upload.append = function(path, file, params, context) {
+        return new Promise((resolve, reject) => {
+            // Process parameters
             params = params || {};
-            context = context || fwWrapper.getContext(); // refer to https://git.atonline.com/templates/atonline_drive_2018/issues/58
-
-            var ctx = {...{}, ...context};
-            upload_queue.push({
+            context = context || fwWrapper.getContext();
+            
+            // Create an upload object
+            const uploadObject = {
                 path: path,
                 file: file,
                 resolve: resolve,
                 reject: reject,
-                "status": "pending",
+                status: "pending",
                 paused: false,
-                up_id: up_id++,
+                up_id: state.nextId++,
                 params: params,
-                context: ctx
-            });
+                context: { ...context }  // Create a copy to avoid modification
+            };
+            
+            // Add to queue
+            state.queue.push(uploadObject);
         });
-
-        return promise;
     };
 
 
-    upload.cancelItem = function (up_id) {
-        var itemKey = -1;
-        for (var i in upload_running) {
-            if (upload_running[i].up_id == up_id) {
-                itemKey = i;
-                break;
-            }
-        }
-        if (itemKey >= 0) {
-            upload_running[itemKey].canceled = true;
-        } else { // /!\ we should be able to cancel the upload of an item even if it's pending, so we're going to look at the queued items
-            for (var i = 0; i < upload_queue.length; i++) {
-                if (upload_queue[i].up_id == up_id) {
-                    upload_queue[i].canceled = true;
+    /**
+     * Cancel an upload in progress or in queue
+     * @param {number} uploadId - Upload ID to cancel
+     */
+    upload.cancelItem = function(uploadId) {
+        // Check running uploads
+        if (state.running[uploadId]) {
+            // Mark running upload as canceled
+            state.running[uploadId].canceled = true;
+        } else {
+            // Check queued uploads
+            for (let i = 0; i < state.queue.length; i++) {
+                if (state.queue[i].up_id === uploadId) {
+                    state.queue[i].canceled = true;
                     break;
                 }
             }
         }
-        sendprogress();
+        
+        // Update progress
+        sendProgress();
     };
-
-    // removes the canceled item of given ID from the queue or running list.
-    upload.deleteItem = function (up_id) {
-        var itemKey = -1;
-        for (var i in upload_running) {
-            if (upload_running[i].up_id == up_id) {
-                itemKey = i;
-                break;
+    
+    /**
+     * Delete an upload from queue or failed list
+     * Only canceled uploads can be removed from running list
+     * @param {number} uploadId - Upload ID to delete
+     */
+    upload.deleteItem = function(uploadId) {
+        // Check running uploads
+        if (state.running[uploadId]) {
+            // Only delete if canceled
+            if (state.running[uploadId].canceled) {
+                delete state.running[uploadId];
             }
-        }
-        if (itemKey >= 0) {
-            if (upload_running[itemKey].canceled)
-                delete upload_running[itemKey];
-        } else { // /!\ we should be able to cancel the upload of an item even if it's pending, so we're going to look at the queued items
-            for (var i = 0; i < upload_queue.length; i++) {
-                if (upload_queue[i].up_id == up_id) {
-                    upload_queue.splice(i, 1);
+        } else {
+            // Check queue
+            for (let i = 0; i < state.queue.length; i++) {
+                if (state.queue[i].up_id === uploadId) {
+                    state.queue.splice(i, 1);
                     break;
                 }
             }
-
-            for (var i = 0; i < upload_failed.length; i++) {
-                if (upload_failed[i].up_id == up_id) {
-                    upload_failed.splice(i, 1);
+            
+            // Check failed uploads
+            for (let i = 0; i < state.failed.length; i++) {
+                if (state.failed[i].up_id === uploadId) {
+                    state.failed.splice(i, 1);
                     break;
                 }
             }
         }
-        sendprogress();
+        
+        // Update progress
+        sendProgress();
     };
-
-
-    // changes the status of the item of given ID to "pause" so it stops triggering "do_process_uploading"
-    upload.pauseItem = function (up_id) {
-        var itemKey = -1;
-        for (var i in upload_running) {
-            if (upload_running[i].up_id == up_id) {
-                itemKey = i;
-                break;
-            }
+    
+    /**
+     * Pause an active upload
+     * @param {number} uploadId - Upload ID to pause
+     */
+    upload.pauseItem = function(uploadId) {
+        // Find upload in running list
+        const upload = state.running[uploadId];
+        
+        // Only pause if active
+        if (upload && upload.status === "uploading") {
+            upload.paused = true;
         }
-        if (itemKey >= 0 && upload_running[itemKey].status == "uploading") // if the item we're willing to pause exists in the running list and is currently uploading
-            upload_running[itemKey].paused = true;
-
-        sendprogress();
+        
+        // Update progress
+        sendProgress();
     };
-
-
-    // changes the status of the item of given ID to "uploading" and triggers "do_process_uploading" on it
-    upload.resumeItem = function (up_id) {
-        var itemKey = -1;
-        for (var i in upload_running) {
-            if (upload_running[i].up_id == up_id) {
-                itemKey = i;
-                break;
-            }
-        }
-        if (itemKey >= 0 && upload_running[itemKey].paused) { // if the item we're willing to resume exists in the running list and is currently paused
-            upload_running[itemKey].paused = false;
-            do_process_uploading(upload_running[itemKey]);
+    
+    /**
+     * Resume a paused upload
+     * @param {number} uploadId - Upload ID to resume
+     */
+    upload.resumeItem = function(uploadId) {
+        // Find upload in running list
+        const upload = state.running[uploadId];
+        
+        // Only resume if paused
+        if (upload && upload.paused) {
+            upload.paused = false;
+            processActiveUpload(upload);
         }
-        sendprogress();
+        
+        // Update progress
+        sendProgress();
     };
-
-
-    upload.retryItem = function (up_id) {
-        var itemKey = -1;
-        var up = undefined;
-        for (var i in upload_failed) {
-            if (upload_failed[i].up_id == up_id) {
-                itemKey = i;
-                up = upload_failed[i];
+    
+    /**
+     * Retry a failed upload
+     * @param {number} uploadId - Upload ID to retry
+     */
+    upload.retryItem = function(uploadId) {
+        // Find upload in failed list
+        let failedUpload = null;
+        let failedIndex = -1;
+        
+        for (let i = 0; i < state.failed.length; i++) {
+            if (state.failed[i].up_id === uploadId) {
+                failedUpload = state.failed[i];
+                failedIndex = i;
                 break;
             }
         }
-        if (itemKey >= 0) {
-            up.failure = {};
-            for (var i = 0, len = upload_queue.length; i < len; i++) {
-                if (upload_queue[i].up_id === up.up_id) {
-                    //already in queue what ?
-                    return;
-                }
+        
+        // Skip if not found
+        if (!failedUpload) return;
+        
+        // Check if already in queue
+        for (let i = 0; i < state.queue.length; i++) {
+            if (state.queue[i].up_id === uploadId) {
+                return; // Already in queue
             }
-
-            //reset pending partNumbers
-            for (var i = 0; i < up.blocks; i++) {
-                if (up.b[i] == "pending") {
-                    up.b[i] = undefined
-                }
-            }
-
-
-            upload_failed.splice(itemKey, 1);
-            upload_queue.push(up);
-
-            upload.run();
-            if (typeof document !== "undefined") {
-                setTimeout(function () {
-                    var evt = new CustomEvent("upload:retry", {
-                        detail: {
-                            item: up,
-                        }
-                    });
-                    document.dispatchEvent(evt);
-                }, 10);
+        }
+        
+        // Reset failure data
+        failedUpload.failure = {};
+        
+        // Reset pending parts
+        for (let i = 0; i < failedUpload.blocks; i++) {
+            if (failedUpload.b[i] === "pending") {
+                failedUpload.b[i] = undefined;
             }
         }
-        sendprogress();
+        
+        // Move from failed to queue
+        state.failed.splice(failedIndex, 1);
+        state.queue.push(failedUpload);
+        
+        // Restart upload
+        upload.run();
+        
+        // Dispatch retry event
+        utils.dispatchEvent("upload:retry", { item: failedUpload });
+        
+        // Update progress
+        sendProgress();
     };
 
 
-    // perform an upload following a response to upload a file from an API.
-    //
-    // TODO: if file is small enough, we can skip the multipart upload and just perform a straight PUT (will fail over 5GB, but we probably want a smaller cutoff, like 32MB or less)
-    upload.run = function () {
-        fillqueue();
-
-        // check for elements in "q", start uploads we can start
-        for (var up_id in upload_running) {
-            var up = upload_running[up_id];
-            switch (up['status']) {
+    /**
+     * Start or continue the upload process
+     * Processes queued uploads and continues running uploads
+     */
+    upload.run = function() {
+        // Fill queue with new uploads
+        fillUploadQueue();
+        
+        // Process running uploads
+        for (const uploadId in state.running) {
+            const upload = state.running[uploadId];
+            
+            // Process based on status
+            switch (upload.status) {
                 case "pending":
-                    do_process_pending(up);
+                    processUpload(upload);
                     break;
                 case "uploading":
-                    do_process_uploading(up);
+                    processActiveUpload(upload);
                     break;
             }
         }