@karpeleslab/klbfw 0.2.8 → 0.2.10

package/README.md

@@ -22,7 +22,7 @@ npm install @karpeleslab/klbfw
 For Node.js environments with file upload support, install optional dependencies:
 
 ```bash
-npm install @karpeleslab/klbfw node-fetch xmldom
+npm install @karpeleslab/klbfw node-fetch @xmldom/xmldom
 ```
 
 ## Development
@@ -72,30 +72,35 @@ The upload module provides cross-platform file upload capabilities, supporting b
 
 ```javascript
 // Open file picker and upload selected files
-upload.upload.init('Misc/Debug:testUpload')()
+upload.init('Misc/Debug:testUpload')()
   .then(result => console.log('Upload complete', result));
 
+// Open file picker with custom parameters and notification callback
+upload.init('Support/Ticket:upload', {image_variation: 'alias=mini&strip&scale_crop=300x200'}, (result) => {
+  if (result.status == 'complete') console.log(result.final);
+});
+
 // Upload a specific File object
-upload.upload.append('Misc/Debug:testUpload', fileObject)
+upload.append('Misc/Debug:testUpload', fileObject)
   .then(result => console.log('Upload complete', result));
 
 // Track progress
-upload.upload.onprogress = (status) => {
+upload.onprogress = (status) => {
   console.log('Progress:', status.running.map(i => i.status));
 };
 
 // Cancel an upload
-upload.upload.cancelItem(uploadId);
+upload.cancelItem(uploadId);
 ```
 
 #### Node.js Usage
 
 ```javascript
 // For Node.js environments, first install dependencies:
-// npm install node-fetch xmldom
+// npm install node-fetch @xmldom/xmldom
 
 // Initialize upload with specific file paths
-upload.upload.init('Misc/Debug:testUpload')(['./file1.txt', './file2.jpg'])
+upload.init('Misc/Debug:testUpload')(['./file1.txt', './file2.jpg'])
   .then(result => console.log('Upload complete', result));
 
 // Or create a custom file object with path
@@ -105,7 +110,7 @@ const file = {
   type: 'text/plain',
   path: '/path/to/file.txt'
 };
-upload.upload.append('Misc/Debug:testUpload', file)
+upload.append('Misc/Debug:testUpload', file)
   .then(result => console.log('Upload complete', result));
 ```
 
@@ -255,5 +260,5 @@ Several utilities have been designed to work across environments:
 To use klbfw with full functionality in Node.js, install the optional dependencies:
 
 ```bash
-npm install node-fetch xmldom
+npm install node-fetch @xmldom/xmldom
 ```

package/internal.js

@@ -201,6 +201,30 @@ const internalRest = (name, verb, params, context) => {
 const responseParse = (response, resolve, reject) => {
     // Check if response is ok (status 200-299)
     if (!response.ok) {
+        // Check if the error response is JSON
+        const contentType = response.headers.get("content-type");
+        if (contentType && contentType.indexOf("application/json") !== -1) {
+            // Parse JSON error response
+            response.json()
+                .then(json => {
+                    // Add headers and status to the parsed JSON
+                    json.headers = response.headers;
+                    json.status = response.status;
+                    reject(json);
+                })
+                .catch(error => {
+                    // If JSON parsing fails, reject with basic error info
+                    reject({
+                        message: `HTTP Error: ${response.status} ${response.statusText}`,
+                        status: response.status, 
+                        headers: response.headers,
+                        parseError: error
+                    });
+                });
+            return;
+        }
+        
+        // Non-JSON error response
         reject({
             message: `HTTP Error: ${response.status} ${response.statusText}`,
             status: response.status, 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karpeleslab/klbfw",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "Frontend Framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -31,13 +31,13 @@
   },
   "optionalDependencies": {
     "node-fetch": "^2.7.0",
-    "xmldom": "^0.6.0"
+    "@xmldom/xmldom": "~0.8.4"
   },
   "devDependencies": {
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "node-fetch": "^2.7.0",
-    "xmldom": "^0.6.0"
+    "@xmldom/xmldom": "~0.8.4"
   },
   "jest": {
     "testEnvironment": "jsdom",

package/upload.js

@@ -14,26 +14,31 @@
  * Browser usage:
  * ```js
  * // Open file picker and upload selected files
- * upload.upload.init('Misc/Debug:testUpload')()
+ * upload.init('Misc/Debug:testUpload')()
  *   .then(result => console.log('Upload complete', result));
+ *   
+ * // Open file picker with custom parameters and notification callback
+ * upload.init('Support/Ticket:upload', {image_variation: 'alias=mini&strip&scale_crop=300x200'}, (result) => {
+ *   if (result.status == 'complete') console.log(result.final);
+ * });
  * 
  * // Upload a specific File object
- * upload.upload.append('Misc/Debug:testUpload', fileObject)
+ * upload.append('Misc/Debug:testUpload', fileObject)
  *   .then(result => console.log('Upload complete', result));
  * 
  * // Track progress
- * upload.upload.onprogress = (status) => {
+ * upload.onprogress = (status) => {
  *   console.log('Progress:', status.running.map(i => i.status));
  * };
  * 
  * // Cancel an upload
- * upload.upload.cancelItem(uploadId);
+ * upload.cancelItem(uploadId);
  * ```
  * 
  * Node.js usage:
  * ```js
  * // For Node.js environments, first install dependencies:
- * // npm install node-fetch xmldom
+ * // npm install node-fetch @xmldom/xmldom
  * 
  * // Create a buffer-based file object for upload
  * const file = {
@@ -49,7 +54,7 @@
  *   }
  * };
  * 
- * upload.upload.append('Misc/Debug:testUpload', file)
+ * upload.append('Misc/Debug:testUpload', file)
  *   .then(result => console.log('Upload complete', result));
  * ```
  * 
@@ -93,12 +98,12 @@ const env = {
 if (env.isNode && !env.isBrowser) {
   try {
     env.node.fetch = require('node-fetch');
-    env.node.xmlParser = require('xmldom');
+    env.node.xmlParser = require('@xmldom/xmldom');
     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');
+    console.warn('To use in Node.js, install: npm install node-fetch @xmldom/xmldom');
   }
 }
 
@@ -689,7 +694,7 @@ module.exports.upload = (function () {
         up.done = completedParts;
 
         // Check if all parts are complete
-        if (pendingParts === 0) {
+        if (pendingParts === 0 && completedParts === up.blocks) {
             // All parts complete, finalize the upload
             up.status = "validating";