dev: make puterfs a mountpoint

src/backend/src/filesystem/FilesystemService.js

@@ -34,7 +34,7 @@ const { DB_WRITE } = require("../services/database/consts");
 const { UserActorType } = require('../services/auth/Actor');
 const { get_user } = require('../helpers');
 const BaseService = require('../services/BaseService');
-const { PuterFSProvider } = require('./puterfs/PuterFSProvider.js');
+const { PuterFSProvider } = require('../modules/puterfs/lib/PuterFSProvider.js');
 
 class FilesystemService extends BaseService {
     static MODULES = {
@@ -344,8 +344,11 @@ class FilesystemService extends BaseService {
             }
         }
 
+        const svc_mountpoint = this.services.get('mountpoint');
+        const provider = await svc_mountpoint.get_provider(selector);
+
         let fsNode = new FSNodeContext({
-            provider: new PuterFSProvider(),
+            provider,
             services: this.services,
             selector,
             fs: this

src/backend/src/modules/puterfs/MountpointService.js

@@ -19,6 +19,7 @@
  */
 // const Mountpoint = o => ({ ...o });
 
+const { RootNodeSelector, NodeUIDSelector } = require("../../filesystem/node/selectors");
 const BaseService = require("../../services/BaseService");
 
 /**
@@ -38,6 +39,15 @@ const BaseService = require("../../services/BaseService");
 * and their associated storage backends in future implementations.
 */
 class MountpointService extends BaseService {
+    _construct () {
+        this.mounters_ = {};
+        this.mountpoints_ = {};
+    }
+
+    register_mounter (name, mounter) {
+        this.mounters_[name] = mounter;
+    }
+
     /**
     * Initializes the MountpointService instance
     * Sets up initial state with null storage backend
@@ -46,11 +56,65 @@ class MountpointService extends BaseService {
     * @returns {Promise<void>}
     */
     async _init () {
-        // this.mountpoints_ = {};
-        
         // Temporary solution - we'll develop this incrementally
         this.storage_ = null;
     }
+
+    async ['__on_boot.consolidation'] () {
+        const mountpoints = this.config.mountpoints ?? {
+            '/': {
+                mounter: 'puterfs',
+            },
+        };
+
+        for ( const path of Object.keys(mountpoints) ) {
+            const { mounter: mounter_name, options } =
+                mountpoints[path];
+            const mounter = this.mounters_[mounter_name];
+            const provider = await mounter.mount({
+                path,
+                options
+            });
+            this.mountpoints_[path] = {
+                provider,
+            };
+        }
+
+        this.services.emit('filesystem.ready', {
+            mountpoints: Object.keys(this.mountpoints_),
+        });
+    }
+    
+    async get_provider (selector) {
+        if ( selector instanceof RootNodeSelector ) {
+            return this.mountpoints_['/'].provider;
+        }
+
+        if ( selector instanceof NodeUIDSelector ) {
+            return this.mountpoints_['/'].provider;
+        }
+
+        const probe = {};
+        selector.setPropertiesKnownBySelector(probe);
+        if ( probe.path ) {
+            let longest_mount_path = '';
+            for ( const path of Object.keys(this.mountpoints_) ) {
+                if ( ! probe.path.startsWith(path) ) {
+                    continue;
+                }
+                if ( path.length > longest_mount_path.length ) {
+                    longest_mount_path = path;
+                }
+            }
+
+            if ( longest_mount_path ) {
+                return this.mountpoints_[longest_mount_path].provider;
+            }
+        }
+
+        // Use root mountpoint as fallback
+        return this.mountpoints_['/'].provider;
+    }
     
     // Temporary solution - we'll develop this incrementally
     set_storage (storage) {

src/backend/src/modules/puterfs/PuterFSModule.js

@@ -15,6 +15,9 @@ class PuterFSModule extends AdvancedBase {
         
         const { MountpointService } = require('./MountpointService');
         services.registerService('mountpoint', MountpointService);
+
+        const { PuterFSService } = require('./PuterFSService');
+        services.registerService('puterfs', PuterFSService);
         
         const DatabaseFSEntryFetcher = require("./DatabaseFSEntryFetcher");
         services.registerService('fsEntryFetcher', DatabaseFSEntryFetcher);

src/backend/src/modules/puterfs/PuterFSService.js

@@ -0,0 +1,22 @@
+const BaseService = require("../../services/BaseService");
+const { PuterFSProvider } = require("./lib/PuterFSProvider");
+
+class PuterFSService extends BaseService {
+    async _init () {
+        const svc_mountpoint = this.services.get('mountpoint');
+        svc_mountpoint.register_mounter('puterfs', this.as('mounter'));
+    }
+
+    static IMPLEMENTS = {
+        mounter: {
+            async mount ({ path, options }) {
+                const provider = new PuterFSProvider();
+                return provider;
+            }
+        }
+    }
+}
+
+module.exports = {
+    PuterFSService,
+};

src/backend/src/modules/puterfs/lib/PuterFSProvider.js

@@ -2,9 +2,9 @@ const putility = require('@heyputer/putility');
 const { MultiDetachable } = putility.libs.listener;
 const { TDetachable } = putility.traits;
 
-const { NodeInternalIDSelector, NodeChildSelector, NodeUIDSelector, RootNodeSelector, NodePathSelector } = require("../node/selectors");
-const { Context } = require("../../util/context");
-const fsCapabilities = require('../definitions/capabilities');
+const { NodeInternalIDSelector, NodeChildSelector, NodeUIDSelector, RootNodeSelector, NodePathSelector } = require("../../../filesystem/node/selectors");
+const { Context } = require("../../../util/context");
+const fsCapabilities = require('../../../filesystem/definitions/capabilities');
 
 class PuterFSProvider {
     get_capabilities () {

src/backend/src/services/UserService.js

@@ -14,7 +14,7 @@ class UserService extends BaseService {
         this.dir_system = null;
     }
 
-    async ['__on_boot.consolidation'] () {
+    async ['__on_filesystem.ready'] () {
         const svc_fs = this.services.get('filesystem');
         // Ensure system user has a home directory
         const dir_system = await svc_fs.node(