@heyputer/puter.js 2.0.4 → 2.0.6

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);
+            }
         });
     }
 }