@heyputer/puter.js 2.0.5 → 2.0.6

package/index.d.ts

@@ -488,7 +488,7 @@ export {
     KVPair, LaunchAppOptions, MenubarOptions,
     MenuItem, MkdirOptions,
     MoveOptions, Networking,
-    Permissions, ReaddirOptions, ReadOptions, SpaceInfo, StatsPeriod, Subdomain, ThemeData, ToolCall, ToolDefinition, Txt2ImgOptions,
+    Permissions, Puter, ReaddirOptions, ReadOptions, SpaceInfo, StatsPeriod, Subdomain, ThemeData, ToolCall, ToolDefinition, Txt2ImgOptions,
     Txt2SpeechOptions, UI, UpdateAppAttributes, User, WindowOptions, WorkerDeployment,
     WorkerExecOptions,
     WorkerInfo, Workers, WriteOptions

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@heyputer/puter.js",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "description": "Puter.js - A JavaScript library for interacting with Puter services.",
     "main": "src/index.js",
     "types": "index.d.ts",

package/src/modules/FileSystem/index.js

@@ -1,23 +1,23 @@
 import io from '../../lib/socket.io/socket.io.esm.min.js';
 
 // Operations
-import space from "./operations/space.js";
-import mkdir from "./operations/mkdir.js";
-import copy from "./operations/copy.js";
-import rename from "./operations/rename.js";
-import upload from "./operations/upload.js";
-import read from "./operations/read.js";
-import move from "./operations/move.js";
-import write from "./operations/write.js";
-import sign from "./operations/sign.js";
-import symlink from './operations/symlink.js';
+import copy from './operations/copy.js';
+import mkdir from './operations/mkdir.js';
+import move from './operations/move.js';
+import read from './operations/read.js';
 import readdir from './operations/readdir.js';
+import rename from './operations/rename.js';
+import sign from './operations/sign.js';
+import space from './operations/space.js';
 import stat from './operations/stat.js';
-// Why is this called deleteFSEntry instead of just delete? because delete is 
+import symlink from './operations/symlink.js';
+import upload from './operations/upload.js';
+import write from './operations/write.js';
+// Why is this called deleteFSEntry instead of just delete? because delete is
 // a reserved keyword in javascript
-import deleteFSEntry from "./operations/deleteFSEntry.js";
 import { AdvancedBase } from '../../../../putility/index.js';
 import FSItem from '../FSItem.js';
+import deleteFSEntry from './operations/deleteFSEntry.js';
 import getReadURL from './operations/getReadUrl.js';
 
 export class PuterJSFileSystemModule extends AdvancedBase {
@@ -39,7 +39,7 @@ export class PuterJSFileSystemModule extends AdvancedBase {
     readdir = readdir;
     stat = stat;
 
-    FSItem = FSItem
+    FSItem = FSItem;
 
     static NARI_METHODS = {
         // stat: {
@@ -50,7 +50,7 @@ export class PuterJSFileSystemModule extends AdvancedBase {
         //         return svc_fs.filesystem.stat(parameters);
         //     }
         // },
-    }
+    };
 
     /**
      * Creates a new instance with the given authentication token, API origin, and app ID,
@@ -61,7 +61,7 @@ export class PuterJSFileSystemModule extends AdvancedBase {
      * @param {string} APIOrigin - Origin of the API server. Used to build the API endpoint URLs.
      * @param {string} appID - ID of the app to use.
      */
-    constructor (context) {
+    constructor(context) {
         super();
         this.authToken = context.authToken;
         this.APIOrigin = context.APIOrigin;
@@ -81,7 +81,6 @@ export class PuterJSFileSystemModule extends AdvancedBase {
         });
     }
 
-
     /**
      * Initializes the socket connection to the server using the current API origin.
      * If a socket connection already exists, it disconnects it before creating a new one.
@@ -92,17 +91,21 @@ export class PuterJSFileSystemModule extends AdvancedBase {
      * @returns {void}
      */
     initializeSocket() {
-        if (this.socket) {
+        if ( globalThis.puter.env === 'nodejs' ){
+            return;
+        }
+        if ( this.socket ) {
             this.socket.disconnect();
         }
 
         this.socket = io(this.APIOrigin, {
             auth: {
                 auth_token: this.authToken,
-            }
+            },
         });
 
         this.bindSocketEvents();
+
     }
 
     bindSocketEvents() {
@@ -117,16 +120,20 @@ export class PuterJSFileSystemModule extends AdvancedBase {
         this.socket.on('item.moved', (item) => {
             // todo: NAIVE PURGE
             puter._cache.flushall();
-        }); 
+        });
 
         this.socket.on('connect', () => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Connected', this.socket.id);
+            }
         });
 
         this.socket.on('disconnect', () => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Disconnected');
+            }
 
             // todo: NAIVE PURGE
             // purge cache on disconnect since we may have become out of sync
@@ -134,28 +141,38 @@ export class PuterJSFileSystemModule extends AdvancedBase {
         });
 
         this.socket.on('reconnect', (attempt) => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Reconnected', this.socket.id);
+            }
         });
 
         this.socket.on('reconnect_attempt', (attempt) => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Reconnection Attemps', attempt);
+            }
         });
 
         this.socket.on('reconnect_error', (error) => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Reconnection Error', error);
+            }
         });
 
         this.socket.on('reconnect_failed', () => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Reconnection Failed');
+            }
         });
 
         this.socket.on('error', (error) => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.error('FileSystem Socket Error:', error);
+            }
         });
     }
 
@@ -166,7 +183,7 @@ export class PuterJSFileSystemModule extends AdvancedBase {
      * @memberof [FileSystem]
      * @returns {void}
      */
-    setAuthToken (authToken) {
+    setAuthToken(authToken) {
         this.authToken = authToken;
         // reset socket
         this.initializeSocket();
@@ -174,12 +191,12 @@ export class PuterJSFileSystemModule extends AdvancedBase {
 
     /**
      * Sets the API origin and resets the socket connection with the updated API origin.
-     * 
+     *
      * @param {string} APIOrigin - The new API origin.
      * @memberof [Apps]
      * @returns {void}
      */
-    setAPIOrigin (APIOrigin) {
+    setAPIOrigin(APIOrigin) {
         this.APIOrigin = APIOrigin;
         // reset socket
         this.initializeSocket();

package/src/safeLoadPuter.cjs

@@ -1,13 +1,12 @@
-const readFileSync = require('node:fs');
+const { readFileSync } = require('node:fs');
 const vm = require('node:vm');
 
 /**
  * Method for loading puter.js in Node.js environment
  * @param {string} authToken - Optional auth token to initialize puter with
- * @returns {Promise<import('../index').Puter>} The `puter` object from puter.js
+ * @returns {Promise<import('../index.d.ts').puter>} The `puter` object from puter.js
  */
 const safeLoadPuterJs = (authToken) => {
-
     const goodContext = {};
     Object.getOwnPropertyNames(globalThis).forEach(name => {
         try {

package/src/services/Filesystem.js

@@ -1,13 +1,13 @@
-import putility from "@heyputer/putility";
-import { PuterAPIFilesystem } from "../lib/filesystem/APIFS.js";
-import { CachedFilesystem } from "../lib/filesystem/CacheFS.js";
-import { ProxyFilesystem, TFilesystem } from "../lib/filesystem/definitions.js";
+import putility from '@heyputer/putility';
+import { PuterAPIFilesystem } from '../lib/filesystem/APIFS.js';
+import { CachedFilesystem } from '../lib/filesystem/CacheFS.js';
+import { ProxyFilesystem, TFilesystem } from '../lib/filesystem/definitions.js';
+import { PostMessageFilesystem } from '../lib/filesystem/PostMessageFS.js';
 import io from '../lib/socket.io/socket.io.esm.min.js';
-import { PostMessageFilesystem } from "../lib/filesystem/PostMessageFS.js";
 
 export class FilesystemService extends putility.concepts.Service {
     static PROPERTIES = {
-        // filesystem: 
+        // filesystem:
     };
 
     static DEPENDS = ['api-access'];
@@ -19,13 +19,13 @@ export class FilesystemService extends putility.concepts.Service {
                 re-initialize the socket connection whenever the
                 authentication token or API origin is changed.
             `,
-            async do () {
+            async do() {
                 this.initializeSocket();
-            }
-        }
-    ]
+            },
+        },
+    ];
 
-    _init () {
+    _init() {
         const env = this._.context.env;
 
         if ( env === 'app' ) {
@@ -40,14 +40,14 @@ export class FilesystemService extends putility.concepts.Service {
         this.initializeSocket();
     }
 
-    init_app_fs_ () {
+    init_app_fs_() {
         this.fs_nocache_ = new PostMessageFilesystem({
             messageTarget: globalThis.parent,
             rpc: this._.context.util.rpc,
         }).as(TFilesystem);
         this.filesystem = this.fs_nocache_;
     }
-    init_top_fs_ () {
+    init_top_fs_() {
         const api_info = this._.context.services.get('api-access').get_api_info();
         this.fs_nocache_ = new PuterAPIFilesystem({ api_info }).as(TFilesystem);
         this.fs_cache_ = new CachedFilesystem({ delegate: this.fs_nocache_ }).as(TFilesystem);
@@ -56,15 +56,19 @@ export class FilesystemService extends putility.concepts.Service {
         this.filesystem = this.fs_proxy_.as(TFilesystem);
     }
 
-    cache_on () {
+    cache_on() {
         this.fs_proxy_.delegate = this.fs_cache_;
     }
-    cache_off () {
+    cache_off() {
         this.fs_proxy_.delegate = this.fs_nocache_;
     }
 
-    async initializeSocket () {
-        if (this.socket) {
+    async initializeSocket() {
+        if ( globalThis.puter.env === 'nodejs' ){
+            return;
+        }
+
+        if ( this.socket ) {
             this.socket.disconnect();
         }
 
@@ -77,7 +81,7 @@ export class FilesystemService extends putility.concepts.Service {
         }
 
         this.socket = io(api_info.api_origin, {
-            auth: { auth_token: api_info.auth_token }
+            auth: { auth_token: api_info.auth_token },
         });
 
         this.bindSocketEvents();
@@ -85,38 +89,52 @@ export class FilesystemService extends putility.concepts.Service {
 
     bindSocketEvents() {
         this.socket.on('connect', () => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Connected', this.socket.id);
+            }
         });
 
         this.socket.on('disconnect', () => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Disconnected');
+            }
         });
 
         this.socket.on('reconnect', (attempt) => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Reconnected', this.socket.id);
+            }
         });
 
         this.socket.on('reconnect_attempt', (attempt) => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Reconnection Attemps', attempt);
+            }
         });
 
         this.socket.on('reconnect_error', (error) => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Reconnection Error', error);
+            }
         });
 
         this.socket.on('reconnect_failed', () => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.log('FileSystem Socket: Reconnection Failed');
+            }
         });
 
         this.socket.on('error', (error) => {
-            if(puter.debugMode)
+            if ( puter.debugMode )
+            {
                 console.error('FileSystem Socket Error:', error);
+            }
         });
     }
 }