@codingame/monaco-vscode-files-service-override 6.0.0 → 6.0.2

package/files.js

@@ -27,7 +27,7 @@ import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/
 import { BrowserElevatedFileService } from './vscode/src/vs/workbench/services/files/browser/elevatedFileService.js';
 import { IElevatedFileService } from 'vscode/vscode/vs/workbench/services/files/common/elevatedFileService.service';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
-import { newWriteableStream } from 'vscode/vscode/vs/base/common/stream';
+import { newWriteableStream, listenStream } from 'vscode/vscode/vs/base/common/stream';
 import { registerServiceInitializePreParticipant, checkServicesNotInitialized } from 'vscode/lifecycle';
 import { logsPath } from 'vscode/workbench';
 import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution._configuration';
@@ -238,10 +238,11 @@ class RegisteredFileSystemProvider extends Disposable {
         return Promise.resolve(toWrite.byteLength);
     }
     _lookupRoot(authority) {
-        let root = this.rootByAuthority.get(authority);
+        const _authority = authority.toLowerCase();
+        let root = this.rootByAuthority.get(_authority);
         if (root == null) {
             root = new RegisteredDirectory();
-            this.rootByAuthority.set(authority, root);
+            this.rootByAuthority.set(_authority, root);
         }
         return root;
     }
@@ -304,7 +305,7 @@ class RegisteredFileSystemProvider extends Disposable {
         }
         const name = parts[parts.length - 1];
         if (directory.getChildren(name) != null) {
-            throw new Error(`file '${uri.toString()}' already exists`);
+            throw new Error(`file '${extUri.joinPath(uri, name).toString()}/' already exists`);
         }
         const disposableStore = new DisposableStore();
         disposableStore.add(toDisposable(() => {
@@ -353,11 +354,8 @@ class RegisteredFileSystemProvider extends Disposable {
             try {
                 if (file.readStream == null || typeof opts.length === 'number' || typeof opts.position === 'number') {
                     let buffer = await file.read();
-                    if (typeof opts.position === 'number') {
-                        buffer = buffer.slice(opts.position);
-                    }
-                    if (typeof opts.length === 'number') {
-                        buffer = buffer.slice(0, opts.length);
+                    if (typeof opts.position === 'number' || typeof opts.length === 'number') {
+                        buffer = buffer.slice(opts.position ?? 0, opts.length);
                     }
                     stream.end(buffer);
                 }
@@ -493,37 +491,17 @@ class OverlayFileSystemProvider {
     get delegates() {
         return ( this.providers.map(({ provider }) => provider));
     }
-    async readFromDelegates(caller) {
+    async readFromDelegates(caller, token) {
         if (this.delegates.length === 0) {
             throw createFileSystemProviderError('No delegate', FileSystemProviderErrorCode.Unavailable);
         }
         let firstError;
         for (const delegate of this.delegates) {
-            try {
-                return await caller(delegate);
-            }
-            catch (err) {
-                firstError ?? (firstError = err);
-                if (err instanceof FileSystemProviderError && [
-                    FileSystemProviderErrorCode.NoPermissions,
-                    FileSystemProviderErrorCode.FileNotFound,
-                    FileSystemProviderErrorCode.Unavailable
-                ].includes(err.code)) {
-                    continue;
-                }
-                throw err;
+            if (token != null && token.isCancellationRequested) {
+                throw new Error('Cancelled');
             }
-        }
-        throw firstError;
-    }
-    readFromDelegatesSync(caller) {
-        if (this.delegates.length === 0) {
-            throw createFileSystemProviderError('No delegate', FileSystemProviderErrorCode.Unavailable);
-        }
-        let firstError;
-        for (const delegate of this.delegates) {
             try {
-                return caller(delegate);
+                return await caller(delegate);
             }
             catch (err) {
                 firstError ?? (firstError = err);
@@ -577,20 +555,43 @@ class OverlayFileSystemProvider {
         return this.readFromDelegates(delegate => delegate.readFile(resource));
     }
     readFileStream(resource, opts, token) {
-        return this.readFromDelegatesSync(delegate => {
+        const writableStream = newWriteableStream(data => VSBuffer.concat(( data.map(data => VSBuffer.wrap(data)))).buffer);
+        this.readFromDelegates(async (delegate) => {
             if (hasFileReadStreamCapability(delegate)) {
-                return delegate.readFileStream(resource, opts, token);
+                const stream = delegate.readFileStream(resource, opts, token);
+                await new Promise((resolve, reject) => {
+                    let dataReceived = false;
+                    listenStream(stream, {
+                        onData(data) {
+                            dataReceived = true;
+                            void writableStream.write(data);
+                        },
+                        onEnd() {
+                            writableStream.end();
+                            resolve();
+                        },
+                        onError(err) {
+                            if (!dataReceived) {
+                                reject(err);
+                            }
+                            else {
+                                writableStream.error(err);
+                            }
+                        }
+                    }, token);
+                });
             }
             else {
-                const stream = newWriteableStream(data => VSBuffer.concat(( data.map(data => VSBuffer.wrap(data)))).buffer);
-                delegate.readFile(resource).then(data => {
-                    stream.end(data);
-                }, err => {
-                    stream.error(err);
-                });
-                return stream;
+                let data = await this.readFile(resource);
+                if (typeof opts.position === 'number' || typeof opts.length === 'number') {
+                    data = data.slice(opts.position ?? 0, opts.length);
+                }
+                return writableStream.end(data);
             }
+        }, token).catch(err => {
+            writableStream.error(err);
         });
+        return writableStream;
     }
     async readdir(resource) {
         const results = await Promise.allSettled(( this.delegates.map(async (delegate) => delegate.readdir(resource))));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.2"
   }
 }