[fix]: fix edge case problem on Windows (if adapter calls 'readDir' on single file) (#2993)

* fix edge case problem on Windows (if adapter calls 'readDir' on single file)

* add test and should fail

* fix test

* and now test should pass

Author: foxriver76

CHANGELOG.md

@@ -4,6 +4,9 @@
 	## __WORK IN PROGRESS__
 -->
 
+## __WORK IN PROGRESS__ - Lucy
+* (@foxriver76) fix edge case problem on Windows (if adapter calls `readDir` on single file)
+
 ## 7.0.6 (2024-12-08) - Lucy
 * (@foxriver76) fixed UI upgrade if admin is running on privileged port (<1024)
 

packages/controller/test/lib/testFiles.ts

@@ -1,4 +1,5 @@
 import type { TestContext } from '../_Types.js';
+import { objectsUtils as utils } from '@iobroker/db-objects-redis';
 
 export function register(it: Mocha.TestFunction, expect: Chai.ExpectStatic, context: TestContext): void {
     const testName = `${context.name} ${context.adapterShortName} files: `;
@@ -223,6 +224,14 @@ export function register(it: Mocha.TestFunction, expect: Chai.ExpectStatic, cont
         });
     });
 
+    it(`${testName}should respond with 'ERROR_NOT_FOUND' if calling readDir on a single file`, async () => {
+        const objects = context.objects;
+        const fileName = 'dir/notADir.txt';
+
+        await objects.writeFileAsync(testId, fileName, 'dataInFile');
+        expect(objects.readDirAsync(testId, fileName)).to.be.eventually.rejectedWith(utils.ERRORS.ERROR_NOT_FOUND);
+    });
+
     it(`${testName}should read file and prevent path traversing`, done => {
         const objects = context.objects;
         objects.readFile(testId, '../../myFileA/abc1.txt', null, (err, data, _mimeType) => {

packages/db-objects-file/src/lib/objects/objectsInMemFileDB.js

@@ -627,7 +627,7 @@ export class ObjectsInMemoryFileDB extends InMemoryFileDB {
         }
 
         const location = path.join(this.objectsDir, id, name);
-        if (fs.existsSync(location)) {
+        if (fs.existsSync(location) && fs.statSync(location).isDirectory()) {
             const dirFiles = fs.readdirSync(location);
             for (let i = 0; i < dirFiles.length; i++) {
                 if (dirFiles[i] === '..' || dirFiles[i] === '.') {

packages/db-objects-jsonl/src/lib/objects/objectsInMemServerRedis.js

@@ -908,52 +908,53 @@ export class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
                 return void handler.sendArray(responseId, isScan ? ['0', response] : response);
             }
         }
+
         if (namespace === this.namespaceFile || namespace === this.namespaceObjects) {
+            if (isMeta !== undefined) {
+                // such a request should never happen
+                return handler.sendArray(responseId, isScan ? ['0', []] : []); // send out file or full db response
+            }
+
             // Handle request to get meta data keys
-            if (isMeta === undefined) {
-                let res;
-                try {
-                    res = this._readDir(id, name);
-                    if (!res || !res.length) {
-                        res = [
-                            {
-                                file: '_data.json',
-                                stats: {},
-                                isDir: false,
-                                virtualFile: true,
-                                notExists: true,
-                            },
-                        ];
-                    }
-                } catch (e) {
-                    if (!e.message.endsWith(utils.ERRORS.ERROR_NOT_FOUND)) {
-                        return void handler.sendError(responseId, new Error(`ERROR readDir id=${id}: ${e.message}`));
-                    }
-                    res = [];
+            let res;
+            try {
+                res = this._readDir(id, name);
+                if (!res || !res.length) {
+                    res = [
+                        {
+                            file: '_data.json',
+                            stats: {},
+                            isDir: false,
+                            virtualFile: true,
+                            notExists: true,
+                        },
+                    ];
                 }
-                let baseName = name || '';
-                if (baseName.length && !baseName.endsWith('/')) {
-                    baseName += '/';
+            } catch (e) {
+                if (!e.message.endsWith(utils.ERRORS.ERROR_NOT_FOUND)) {
+                    return void handler.sendError(responseId, new Error(`ERROR readDir id=${id}: ${e.message}`));
                 }
-                res.forEach(arr => {
-                    let entryId = id;
-                    if (arr.isDir) {
-                        if (entryId === '' || entryId === '*') {
-                            entryId = arr.file;
-                            arr.file = '_data.json'; // We return a "virtual file" to mark the directory as existing
-                        } else {
-                            arr.file += '/_data.json'; // We return a "virtual file" to mark the directory as existing
-                        }
-                    }
-                    // We need to simulate the Meta data here, so return both
-                    response.push(this.getFileId(entryId, baseName + arr.file, true));
-                    response.push(this.getFileId(entryId, baseName + arr.file, false));
-                });
-                handler.sendArray(responseId, isScan ? ['0', response] : response); // send out file or full db response
-            } else {
-                // such a request should never happen
-                handler.sendArray(responseId, isScan ? ['0', []] : []); // send out file or full db response
+                res = [];
             }
+            let baseName = name || '';
+            if (baseName.length && !baseName.endsWith('/')) {
+                baseName += '/';
+            }
+            res.forEach(arr => {
+                let entryId = id;
+                if (arr.isDir) {
+                    if (entryId === '' || entryId === '*') {
+                        entryId = arr.file;
+                        arr.file = '_data.json'; // We return a "virtual file" to mark the directory as existing
+                    } else {
+                        arr.file += '/_data.json'; // We return a "virtual file" to mark the directory as existing
+                    }
+                }
+                // We need to simulate the Meta data here, so return both
+                response.push(this.getFileId(entryId, baseName + arr.file, true));
+                response.push(this.getFileId(entryId, baseName + arr.file, false));
+            });
+            handler.sendArray(responseId, isScan ? ['0', response] : response); // send out file or full db response
         } else if (namespace === this.namespaceSet) {
             handler.sendArray(responseId, isScan ? ['0', []] : []); // send out empty array, we have no sets
         } else {