fs: ll_mkdir -> provider.mkdir

Author: XiaochenCui

src/backend/src/filesystem/ll_operations/ll_mkdir.js

@@ -31,112 +31,13 @@ class LLMkdir extends LLFilesystemOperation {
     }
 
     async _run () {
-        const { context } = this;
-        const { parent, name } = this.values;
-
-        this.checkpoint('lock requested');
-        this.log.noticeme('GET FSLOCK');
-        const svc_fslock = context.get('services').get('fslock');
-        this.log.noticeme('REQUESTING LOCK', {
-            parent: await parent.get('path'),
-            name,
-        });
-        const lock_handle = await svc_fslock.lock_child(
-            await parent.get('path'),
-            name,
-            MODE_WRITE,
-        );
-        this.log.noticeme('GOT LOCK', {
-            parent: await parent.get('path'),
+        const { parent, name, immutable } = this.values;
+        return parent.provider.mkdir({
+            context: this.context,
+            parent,
             name,
+            immutable,
         });
-        this.checkpoint('lock acquired');
-
-        try {
-            return await this._locked_run();
-        } finally {
-            await lock_handle.unlock();
-        }
-    }
-    async _locked_run () {
-        const { _path, uuidv4 } = this.modules;
-        const { context } = this;
-        const { parent, name, immutable, actor } = this.values;
-
-        const ts = Math.round(Date.now() / 1000);
-        const uid = uuidv4();
-        const resourceService = context.get('services').get('resourceService');
-        const svc_fsEntry = context.get('services').get('fsEntryService');
-        const svc_event = context.get('services').get('event');
-        const fs = context.get('services').get('filesystem');
-
-        this.field('fsentry-uid', uid);
-
-        const existing = await fs.node(
-            new NodeChildSelector(parent.selector, name)
-        );
-
-        if ( await existing.exists() ) {
-            throw APIError.create('item_with_same_name_exists', null, {
-                entry_name: name,
-            });
-        }
-
-        this.checkpoint('before acl');
-        const svc_acl = context.get('services').get('acl');
-        if ( ! await parent.exists() ) {
-            throw APIError.create('subject_does_not_exist');
-        }
-        if ( ! await svc_acl.check(actor, parent, 'write') ) {
-            throw await svc_acl.get_safe_acl_error(actor, parent, 'write');
-        }
-
-        resourceService.register({
-            uid,
-            status: RESOURCE_STATUS_PENDING_CREATE,
-        });
-
-        const raw_fsentry = {
-            is_dir: 1,
-            uuid: uid,
-            parent_uid: await parent.get('uid'),
-            path: _path.join(await parent.get('path'), name),
-            user_id: actor.type.user.id,
-            name,
-            created: ts,
-            accessed: ts,
-            modified: ts,
-            immutable: immutable ?? false,
-            ...(this.values.thumbnail ? {
-                thumbnail: this.values.thumbnail,
-            } : {}),
-        };
-
-        this.log.debug('creating fsentry', { fsentry: raw_fsentry })
-
-        this.checkpoint('about to enqueue insert');
-        const entryOp = await svc_fsEntry.insert(raw_fsentry);
-
-        this.field('fsentry-created', false);
-
-        this.checkpoint('enqueued insert');
-        // Asynchronous behaviour temporarily disabled
-        // (async () => {
-            await entryOp.awaitDone();
-            this.log.debug('finished creating fsentry', { uid })
-            resourceService.free(uid);
-            this.field('fsentry-created', true);
-        // })();
-
-        const node = await fs.node(new NodeUIDSelector(uid));
-
-        svc_event.emit('fs.create.directory', {
-            node,
-            context: Context.get(),
-        });
-
-        this.checkpoint('returning node');
-        return node
     }
 }
 

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

@@ -31,6 +31,7 @@ const { ParallelTasks } = require('../../../util/otelutil');
 
 const { TYPE_DIRECTORY } = require('../../../filesystem/FSNodeContext');
 const APIError = require('../../../api/APIError');
+const { MODE_WRITE } = require('../../../services/fs/FSLockService');
 
 class PuterFSProvider extends putility.AdvancedBase {
     static MODULES = {
@@ -429,6 +430,93 @@ class PuterFSProvider extends putility.AdvancedBase {
 
         await tasks.awaitAll();
     }
+
+    /**
+     * Create a new directory.
+     * 
+     * @param {Object} param
+     * @param {Context} param.context
+     * @param {FSNode} param.parent
+     * @param {string} param.name
+     * @param {boolean} param.immutable
+     * @returns {Promise<FSNode>}
+     */
+    async mkdir({ context, parent, name, immutable}) {
+        const { actor, thumbnail } = context.values;
+
+        const svc_fslock = context.get('services').get('fslock');
+        const lock_handle = await svc_fslock.lock_child(
+            await parent.get('path'),
+            name,
+            MODE_WRITE,
+        );
+
+        try {
+            const { _path, uuidv4 } = this.modules;
+
+            const ts = Math.round(Date.now() / 1000);
+            const uid = uuidv4();
+            const resourceService = context.get('services').get('resourceService');
+            const svc_fsEntry = context.get('services').get('fsEntryService');
+            const svc_event = context.get('services').get('event');
+            const fs = context.get('services').get('filesystem');
+
+            const existing = await fs.node(
+                new NodeChildSelector(parent.selector, name)
+            );
+
+            if (await existing.exists()) {
+                throw APIError.create('item_with_same_name_exists', null, {
+                    entry_name: name,
+                });
+            }
+
+            const svc_acl = context.get('services').get('acl');
+            if (! await parent.exists()) {
+                throw APIError.create('subject_does_not_exist');
+            }
+            if (! await svc_acl.check(actor, parent, 'write')) {
+                throw await svc_acl.get_safe_acl_error(actor, parent, 'write');
+            }
+
+            resourceService.register({
+                uid,
+                status: RESOURCE_STATUS_PENDING_CREATE,
+            });
+
+            const raw_fsentry = {
+                is_dir: 1,
+                uuid: uid,
+                parent_uid: await parent.get('uid'),
+                path: _path.join(await parent.get('path'), name),
+                user_id: actor.type.user.id,
+                name,
+                created: ts,
+                accessed: ts,
+                modified: ts,
+                immutable: immutable ?? false,
+                ...(thumbnail ? {
+                    thumbnail: thumbnail,
+                } : {}),
+            };
+
+            const entryOp = await svc_fsEntry.insert(raw_fsentry);
+
+            await entryOp.awaitDone();
+            resourceService.free(uid);
+
+            const node = await fs.node(new NodeUIDSelector(uid));
+
+            svc_event.emit('fs.create.directory', {
+                node,
+                context: Context.get(),
+            });
+
+            return node
+        } finally {
+            await lock_handle.unlock();
+        }
+    }
 }
 
 module.exports = {