@karpeleslab/klbfw 0.2.10 → 0.2.12

package/fw-wrapper.js

@@ -111,6 +111,24 @@ const setContext = (key, value) => {
  */
 const getToken = () => getFWProperty('token', undefined);
 
+/**
+ * Gets the current token expiration time
+ * @returns {number|undefined} Token expiration time in milliseconds
+ */
+const getTokenExp = () => getFWProperty('token_exp', undefined);
+
+/**
+ * Sets the authentication token and its expiration time
+ * @param {string} token - New token value
+ * @param {number|undefined} tokenExp - Token expiration time in milliseconds
+ */
+const setToken = (token, tokenExp) => {
+    if (typeof FW !== 'undefined') {
+        FW.token = token;
+        FW.token_exp = tokenExp;
+    }
+};
+
 /**
  * Gets the registry
  * @returns {Object|undefined} Registry object
@@ -251,6 +269,8 @@ module.exports.getCurrency = getCurrency;
 module.exports.getContext = getContext;
 module.exports.setContext = setContext;
 module.exports.getToken = getToken;
+module.exports.getTokenExp = getTokenExp;
+module.exports.setToken = setToken;
 module.exports.getRegistry = getRegistry;
 module.exports.getUrl = getUrl;
 module.exports.getSiteStatic = getSiteStatic;

package/internal.js

@@ -104,7 +104,7 @@ const buildRestUrl = (path, withToken, context) => {
  */
 const checkSupport = () => {
     const missingFeatures = [];
-    
+
     if (typeof fetch === "undefined") {
         missingFeatures.push("fetch API");
     }
@@ -112,15 +112,79 @@ const checkSupport = () => {
     if (!fwWrapper.supported()) {
         missingFeatures.push("Framework wrapper");
     }
-    
+
     if (missingFeatures.length > 0) {
         console.error("Missing required features: " + missingFeatures.join(", "));
         return false;
     }
-    
+
     return true;
 };
 
+/**
+ * Checks if token needs refresh and refreshes if necessary
+ * @returns {Promise<void>} Resolves when check/refresh is complete
+ */
+const checkAndRefreshToken = () => {
+    const tokenExp = fwWrapper.getTokenExp();
+
+    // If token_exp is not defined, no refresh needed
+    if (tokenExp === undefined) {
+        return Promise.resolve();
+    }
+
+    const now = Date.now();
+    const fiveMinutes = 5 * 60 * 1000; // 5 minutes in milliseconds
+
+    // Check if token expires within 5 minutes
+    if (tokenExp - now <= fiveMinutes) {
+        // Need to refresh token
+        const callUrl = buildRestUrl('_special/token.json', true);
+        const headers = {};
+
+        if (fwWrapper.getToken() !== '') {
+            headers['Authorization'] = 'Session ' + fwWrapper.getToken();
+        }
+
+        return fetch(callUrl, {
+            method: 'GET',
+            credentials: 'include',
+            headers: headers
+        })
+        .then(response => {
+            if (!response.ok) {
+                // API returned an error, give up by setting token_exp to undefined
+                fwWrapper.setToken(fwWrapper.getToken(), undefined);
+                return;
+            }
+
+            const contentType = response.headers.get('content-type');
+            if (!contentType || contentType.indexOf('application/json') === -1) {
+                // Not JSON response, give up
+                fwWrapper.setToken(fwWrapper.getToken(), undefined);
+                return;
+            }
+
+            return response.json();
+        })
+        .then(json => {
+            if (json && json.token && json.token_exp) {
+                // Update token and token_exp
+                fwWrapper.setToken(json.token, json.token_exp);
+            } else {
+                // Invalid response, give up
+                fwWrapper.setToken(fwWrapper.getToken(), undefined);
+            }
+        })
+        .catch(() => {
+            // Error occurred, give up by setting token_exp to undefined
+            fwWrapper.setToken(fwWrapper.getToken(), undefined);
+        });
+    }
+
+    return Promise.resolve();
+};
+
 /**
  * Makes an internal REST API call
  * @param {string} name - API endpoint name
@@ -137,58 +201,61 @@ const internalRest = (name, verb, params, context) => {
     if (typeof window !== "undefined") {
         context['t'] = getTimezoneData();
     }
-    
-    const callUrl = buildRestUrl(name, true, context);
-    const headers = {};
-    
-    if (fwWrapper.getToken() !== '') {
-        headers['Authorization'] = 'Session ' + fwWrapper.getToken();
-    }
 
-    // Handle GET requests
-    if (verb === "GET") {
-        if (params) {
-            // Check if params is a JSON string, or if it needs encoding
-            if (typeof params === "string") {
-                return fetch(callUrl + "&_=" + encodeURIComponent(params), {
-                    method: verb, 
-                    credentials: 'include', 
-                    headers: headers
-                });
-            } else {
-                return fetch(callUrl + "&_=" + encodeURIComponent(JSON.stringify(params)), {
-                    method: verb, 
-                    credentials: 'include', 
-                    headers: headers
-                });
+    // Check and refresh token if needed before making the request
+    return checkAndRefreshToken().then(() => {
+        const callUrl = buildRestUrl(name, true, context);
+        const headers = {};
+
+        if (fwWrapper.getToken() !== '') {
+            headers['Authorization'] = 'Session ' + fwWrapper.getToken();
+        }
+
+        // Handle GET requests
+        if (verb === "GET") {
+            if (params) {
+                // Check if params is a JSON string, or if it needs encoding
+                if (typeof params === "string") {
+                    return fetch(callUrl + "&_=" + encodeURIComponent(params), {
+                        method: verb,
+                        credentials: 'include',
+                        headers: headers
+                    });
+                } else {
+                    return fetch(callUrl + "&_=" + encodeURIComponent(JSON.stringify(params)), {
+                        method: verb,
+                        credentials: 'include',
+                        headers: headers
+                    });
+                }
             }
+
+            return fetch(callUrl, {
+                method: verb,
+                credentials: 'include',
+                headers: headers
+            });
         }
-        
-        return fetch(callUrl, {
-            method: verb, 
-            credentials: 'include', 
-            headers: headers
-        });
-    }
 
-    // Handle FormData
-    if (typeof FormData !== "undefined" && (params instanceof FormData)) {
+        // Handle FormData
+        if (typeof FormData !== "undefined" && (params instanceof FormData)) {
+            return fetch(callUrl, {
+                method: verb,
+                credentials: 'include',
+                body: params,
+                headers: headers
+            });
+        }
+
+        // Handle JSON requests
+        headers['Content-Type'] = 'application/json; charset=utf-8';
+
         return fetch(callUrl, {
             method: verb,
             credentials: 'include',
-            body: params,
+            body: JSON.stringify(params),
             headers: headers
         });
-    }
-
-    // Handle JSON requests
-    headers['Content-Type'] = 'application/json; charset=utf-8';
-    
-    return fetch(callUrl, {
-        method: verb,
-        credentials: 'include',
-        body: JSON.stringify(params),
-        headers: headers
     });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karpeleslab/klbfw",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "Frontend Framework",
   "main": "index.js",
   "types": "index.d.ts",

package/upload.js

@@ -459,7 +459,7 @@ module.exports.upload = (function () {
         params.filename = up.file.name;
         params.size = up.file.size;
         params.lastModified = up.file.lastModified / 1000;
-        params.type = up.file.type;
+        params.type = up.file.type || "application/octet-stream";
         
         // Initialize upload with the server
         rest.rest(up.path, "POST", params, up.context)
@@ -497,7 +497,7 @@ module.exports.upload = (function () {
             "POST",
             "uploads=",
             "",
-            {"Content-Type": up.file.type, "X-Amz-Acl": "private"},
+            {"Content-Type": up.file.type || "application/octet-stream", "X-Amz-Acl": "private"},
             up.context
         )
         .then(response => response.text())
@@ -609,9 +609,18 @@ module.exports.upload = (function () {
             up.context
         )
         .then(response => {
+            // Verify the response is successful
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+            }
             // Store ETag for this part (needed for completion)
-            up.b[partNumber] = response.headers.get("ETag");
-            
+            const etag = response.headers.get("ETag");
+            // Read response body to ensure request completed
+            return response.text().then(() => etag);
+        })
+        .then(etag => {
+            up.b[partNumber] = etag;
+
             // Update progress and continue processing
             sendProgress();
             upload.run();
@@ -629,7 +638,7 @@ module.exports.upload = (function () {
     function uploadPutPart(up, partNumber, startByte, data) {
         // Set up headers
         const headers = {
-            "Content-Type": up.file.type
+            "Content-Type": up.file.type || "application/octet-stream"
         };
         
         // Add Content-Range header for multipart PUT
@@ -645,9 +654,17 @@ module.exports.upload = (function () {
             headers: headers,
         })
         .then(response => {
+            // Verify the response is successful
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+            }
+            // Read response body to ensure request completed
+            return response.text();
+        })
+        .then(() => {
             // Mark part as done
             up.b[partNumber] = "done";
-            
+
             // Update progress and continue processing
             sendProgress();
             upload.run();