@heyputer/puter.js 2.0.14 → 2.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@heyputer/puter.js",
-    "version": "2.0.14",
+    "version": "2.0.15",
     "description": "Puter.js - A JavaScript library for interacting with Puter services.",
     "main": "src/index.js",
     "types": "index.d.ts",
@@ -25,15 +25,17 @@
     ],
     "scripts": {
         "start-server": "npx http-server --cors -c-1",
-        "start-webpack": "webpack && webpack --output-filename puter.dev.js --watch --devtool source-map",
+        "start-webpack": "webpack --stats=errors-only && webpack --output-filename puter.dev.js --watch --devtool source-map --stats=errors-only",
         "start": "concurrently \"npm run start-server\" \"npm run start-webpack\"",
+        "test": "npx http-server --cors -c-1 -o /test",
         "build": "webpack && { echo \"// Copyright 2024-present Puter Technologies Inc. All rights reserved.\"; echo \"// Generated on $(date '+%Y-%m-%d %H:%M')\n\"; cat ./dist/puter.js; } > temp && mv temp ./dist/puter.js",
-        "prepublishOnly": "npm run build && mv dist/puter.js dist/puter.cjs && npm version patch && git add package.json && git commit -m \"chore: bump puter-js version and publish \" && git push"
+        "prepublishOnly": "npm run build && mv dist/puter.js dist/puter.cjs && npm version patch"
     },
     "author": "Puter Technologies Inc.",
     "license": "Apache-2.0",
     "devDependencies": {
         "concurrently": "^8.2.2",
+        "http-server": "^14.1.1",
         "webpack-cli": "^5.1.4"
     },
     "dependencies": {

package/src/index.js

@@ -131,6 +131,7 @@ const puterInit = (function() {
 
             // Initialize the cache using kv.js
             this._cache = new kvjs({dbName: 'puter_cache'});
+            this._opscache = new kvjs();
 
             // "modules" in puter.js are external interfaces for the developer
             this.modules_ = [];
@@ -493,10 +494,21 @@ const puterInit = (function() {
                     console.error('Error accessing localStorage:', error);
                 }
             }
+            // initialize loop for updating caches for major directories
+            if(this.env === 'gui'){
+                // check and update gui fs cache regularly
+                setInterval(puter.checkAndUpdateGUIFScache, 10000);
+            }
             // reinitialize submodules
             this.updateSubmodules();
+
             // rao
             this.request_rao_();
+
+            // perform whoami and cache results
+            puter.getUser().then((user) => {
+                this.whoami = user;
+            });
         };
 
         setAPIOrigin = function(APIOrigin) {
@@ -666,7 +678,12 @@ const puterInit = (function() {
                 // If we went from online to offline, purge the cache
                 if ( wasOnline && !isOnline ) {
                     console.log('Network connection lost - purging cache');
-                    this.purgeCache();
+                    try {
+                        this._cache.flushall();
+                        console.log('Cache purged successfully');
+                    } catch( error ) {
+                        console.error('Error purging cache:', error);
+                    }
                 }
 
                 // Update the previous state
@@ -688,18 +705,48 @@ const puterInit = (function() {
         };
 
         /**
-         * Purges all cached data
-         * @public
+         * Checks and updates the GUI FS cache for most-commonly used paths
+         * @private
          */
-        purgeCache = function() {
-            try {
-                this._cache.flushall();
-                console.log('Cache purged successfully');
-            } catch( error ) {
-                console.error('Error purging cache:', error);
+        checkAndUpdateGUIFScache = function(){
+            // only run in gui environment
+            if(puter.env !== 'gui') return;
+            // only run if user is authenticated
+            if(!puter.whoami) return;
+
+            let username = puter.whoami.username;
+
+            // common paths
+            let home_path = `/${username}`;
+            let desktop_path = `/${username}/Desktop`;
+            let documents_path = `/${username}/Documents`;
+            let public_path = `/${username}/Public`;
+
+            // Home
+            if(!puter._cache.get('readdir:' + home_path)){
+                console.log(`/${username} is not cached, refetching cache`);
+                // fetch home
+                puter.fs.readdir(home_path);
+            }
+            // Desktop
+            if(!puter._cache.get('readdir:' + desktop_path)){
+                console.log(`/${username}/Desktop is not cached, refetching cache`);
+                // fetch desktop
+                puter.fs.readdir(desktop_path);
+            }
+            // Documents
+            if(!puter._cache.get('readdir:' + documents_path)){
+                console.log(`/${username}/Documents is not cached, refetching cache`);
+                // fetch documents
+                puter.fs.readdir(documents_path);
+            }
+            // Public
+            if(!puter._cache.get('readdir:' + public_path)){
+                console.log(`/${username}/Public is not cached, refetching cache`);
+                // fetch public
+                puter.fs.readdir(public_path);
             }
-        };
-
+        }
     }
 
     // Create a new Puter object and return it

package/src/init.cjs

@@ -19,7 +19,7 @@ const init = (authToken) => {
         }
     });
     goodContext.globalThis = goodContext;
-    const code = readFileSync(`${resolve(__filename, '..')}/../dist/puter.js`, 'utf8');
+    const code = readFileSync(`${resolve(__filename, '..')}/../dist/puter.cjs`, 'utf8');
     const context = vm.createContext(goodContext);
     vm.runInNewContext(code, context);
     if ( authToken ) {

package/src/modules/FileSystem/index.js

@@ -123,62 +123,27 @@ export class PuterJSFileSystemModule extends AdvancedBase {
         // });
 
         this.socket.on('item.renamed', (item) => {
-            // delete old item from cache
-            puter._cache.del('item:' + item.old_path);
-            // if a directory
-            if(item.is_dir){
-                // delete readdir
-                puter._cache.del('readdir:' + item.old_path);
-                // descendants items
-                const descendants = puter._cache.keys('item:' + item.old_path + '/*');
-                for(const descendant of descendants){
-                    console.log('Deleting cache for:', descendant);
-                    puter._cache.del(descendant);
-                }
-                // descendants readdirs
-                const descendants_readdir = puter._cache.keys('readdir:' + item.old_path + '/*');
-                for(const descendant of descendants_readdir){
-                    console.log('Deleting cache for:', descendant);
-                    puter._cache.del(descendant);
-                }
-            }
-            // parent readdir
-            puter._cache.del('readdir:' + path.dirname(item.old_path));
+            puter._cache.flushall();
+            console.log('Flushed cache for item.renamed');
         });
 
         this.socket.on('item.removed', (item) => {
             // check original_client_socket_id and if it matches this.socket.id, don't invalidate cache
             puter._cache.flushall();
-            console.log('Flushed cache for item.deleted');
+            console.log('Flushed cache for item.removed');
         });
 
         this.socket.on('item.added', (item) => {
-            // delete item from cache
-            puter._cache.del('item:' + item.path);
-            // delete readdir from cache
-            puter._cache.del('readdir:' + item.path);
-            // delete descendant items from cache
-            const descendant_items = puter._cache.keys('item:' + item.path + '/*');
-            for(const descendant of descendant_items){
-                puter._cache.del(descendant);
-            }
-            // delete descendant readdirs from cache
-            const descendant_readdirs = puter._cache.keys('readdir:' + item.path + '/*');
-            for(const descendant of descendant_readdirs){
-                puter._cache.del(descendant);
-            }
-            // delete parent readdir from cache
-            puter._cache.del('readdir:' + path.dirname(item.path));
+            puter._cache.flushall();
+            console.log('Flushed cache for item.added');
         });
 
         this.socket.on('item.updated', (item) => {
-            // check original_client_socket_id and if it matches this.socket.id, don't invalidate cache
             puter._cache.flushall();
             console.log('Flushed cache for item.updated');
         });
 
         this.socket.on('item.moved', (item) => {
-            // check original_client_socket_id and if it matches this.socket.id, don't invalidate cache
             puter._cache.flushall();
             console.log('Flushed cache for item.moved');
         });

package/src/modules/FileSystem/operations/readdir.js

@@ -1,6 +1,14 @@
 import * as utils from '../../../lib/utils.js';
 import getAbsolutePathForApp from '../utils/getAbsolutePathForApp.js';
 
+// Track in-flight requests to avoid duplicate backend calls
+// Each entry stores: { promise, timestamp }
+const inflightRequests = new Map();
+
+// Time window (in ms) to group duplicate requests together
+// Requests made within this window will share the same backend call
+const DEDUPLICATION_WINDOW_MS = 2000; // 2 seconds
+
 const readdir = async function (...args) {
     let options;
 
@@ -42,56 +50,108 @@ const readdir = async function (...args) {
             }
         }
 
-        // If auth token is not provided and we are in the web environment, 
-        // try to authenticate with Puter
-        if(!puter.authToken && puter.env === 'web'){
-            try{
-                await puter.ui.authenticateWithPuter();
-            }catch(e){
-                // if authentication fails, throw an error
-                reject('Authentication failed.');
+        // Generate deduplication key based on all request parameters
+        const deduplicationKey = JSON.stringify({
+            path: options.path,
+            uid: options.uid,
+            no_thumbs: options.no_thumbs,
+            no_assocs: options.no_assocs,
+            consistency: options.consistency,
+        });
+
+        // Check if there's already an in-flight request for the same parameters
+        const existingEntry = inflightRequests.get(deduplicationKey);
+        const now = Date.now();
+        
+        if (existingEntry) {
+            const timeSinceRequest = now - existingEntry.timestamp;
+            
+            // Only reuse the request if it's within the deduplication window
+            if (timeSinceRequest < DEDUPLICATION_WINDOW_MS) {
+                // Wait for the existing request and return its result
+                try {
+                    const result = await existingEntry.promise;
+                    resolve(result);
+                } catch (error) {
+                    reject(error);
+                }
+                return;
+            } else {
+                // Request is too old, remove it from the tracker
+                inflightRequests.delete(deduplicationKey);
             }
         }
 
-        // create xhr object
-        const xhr = utils.initXhr('/readdir', this.APIOrigin, undefined, "post", "text/plain;actually=json");
+        // Create a promise for this request and store it to deduplicate concurrent calls
+        const requestPromise = new Promise(async (resolveRequest, rejectRequest) => {
+            // If auth token is not provided and we are in the web environment, 
+            // try to authenticate with Puter
+            if(!puter.authToken && puter.env === 'web'){
+                try{
+                    await puter.ui.authenticateWithPuter();
+                }catch(e){
+                    // if authentication fails, throw an error
+                    rejectRequest('Authentication failed.');
+                    return;
+                }
+            }
 
-        // set up event handlers for load and error events
-        utils.setupXhrEventHandlers(xhr, options.success, options.error, async (result) => {
-            // Calculate the size of the result for cache eligibility check
-            const resultSize = JSON.stringify(result).length;
-            
-            // Cache the result if it's not bigger than MAX_CACHE_SIZE
-            const MAX_CACHE_SIZE = 100 * 1024 * 1024;
+            // create xhr object
+            const xhr = utils.initXhr('/readdir', this.APIOrigin, undefined, "post", "text/plain;actually=json");
 
-            if(resultSize <= MAX_CACHE_SIZE){
-                // UPSERT the cache
-                puter._cache.set(cacheKey, result);
-            }
+            // set up event handlers for load and error events
+            utils.setupXhrEventHandlers(xhr, options.success, options.error, async (result) => {
+                // Calculate the size of the result for cache eligibility check
+                const resultSize = JSON.stringify(result).length;
+                
+                // Cache the result if it's not bigger than MAX_CACHE_SIZE
+                const MAX_CACHE_SIZE = 100 * 1024 * 1024;
+
+                if(resultSize <= MAX_CACHE_SIZE){
+                    // UPSERT the cache
+                    puter._cache.set(cacheKey, result);
+                }
 
-            // set each individual item's cache
-            for(const item of result){
-                puter._cache.set('item:' + item.path, item);
+                // set each individual item's cache
+                for(const item of result){
+                    puter._cache.set('item:' + item.path, item);
+                }
+                
+                resolveRequest(result);
+            }, rejectRequest);
+
+            // Build request payload - support both path and uid parameters
+            const payload = {
+                no_thumbs: options.no_thumbs,
+                no_assocs: options.no_assocs,
+                auth_token: this.authToken
+            };
+
+            // Add either uid or path to the payload
+            if (options.uid) {
+                payload.uid = options.uid;
+            } else if (options.path) {
+                payload.path = getAbsolutePathForApp(options.path);
             }
-            
-            resolve(result);
-        }, reject);
 
-        // Build request payload - support both path and uid parameters
-        const payload = {
-            no_thumbs: options.no_thumbs,
-            no_assocs: options.no_assocs,
-            auth_token: this.authToken
-        };
+            xhr.send(JSON.stringify(payload));
+        });
 
-        // Add either uid or path to the payload
-        if (options.uid) {
-            payload.uid = options.uid;
-        } else if (options.path) {
-            payload.path = getAbsolutePathForApp(options.path);
-        }
+        // Store the promise and timestamp in the in-flight tracker
+        inflightRequests.set(deduplicationKey, {
+            promise: requestPromise,
+            timestamp: now,
+        });
 
-        xhr.send(JSON.stringify(payload));
+        // Wait for the request to complete and clean up
+        try {
+            const result = await requestPromise;
+            inflightRequests.delete(deduplicationKey);
+            resolve(result);
+        } catch (error) {
+            inflightRequests.delete(deduplicationKey);
+            reject(error);
+        }
     })
 }