@codingame/monaco-vscode-files-service-override 34.0.0 → 34.0.2

package/index.js

@@ -27,7 +27,7 @@ import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/
 import { BrowserElevatedFileService } from './vscode/src/vs/workbench/services/files/browser/elevatedFileService.js';
 import { IElevatedFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/files/common/elevatedFileService.service';
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
-import { newWriteableStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
+import { newWriteableStream, listenStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { registerServiceInitializePreParticipant, checkServicesNotInitialized } from '@codingame/monaco-vscode-api/lifecycle';
 import { logsPath } from '@codingame/monaco-vscode-api/workbench';
@@ -382,7 +382,12 @@ class RegisteredFileSystemProvider extends Disposable {
                 }
             }
             catch (error) {
-                stream.error(createFileSystemProviderError(error, FileSystemProviderErrorCode.Unknown));
+                if (error instanceof FileSystemProviderError) {
+                    stream.error(error);
+                }
+                else {
+                    stream.error(createFileSystemProviderError(error, FileSystemProviderErrorCode.Unknown));
+                }
                 stream.end();
             }
         })();
@@ -500,7 +505,7 @@ class OverlayFileSystemProvider {
     get delegates() {
         return this.providers.map(({ provider }) => provider);
     }
-    readFromDelegates(caller, token) {
+    async readFromDelegates(caller, token) {
         if (this.delegates.length === 0) {
             throw createFileSystemProviderError('No delegate', FileSystemProviderErrorCode.Unavailable);
         }
@@ -510,7 +515,7 @@ class OverlayFileSystemProvider {
                 throw new Error('Cancelled');
             }
             try {
-                return caller(delegate);
+                return await caller(delegate);
             }
             catch (err) {
                 errors.push(err);
@@ -576,27 +581,48 @@ class OverlayFileSystemProvider {
         return await this.readFromDelegates((delegate) => delegate.readFile(resource));
     }
     readFileStream(resource, opts, token) {
-        return this.readFromDelegates((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;
+                    let errored = false;
+                    listenStream(stream, {
+                        onData(data) {
+                            dataReceived = true;
+                            void writableStream.write(data);
+                        },
+                        onEnd() {
+                            if (!errored) {
+                                writableStream.end();
+                                resolve();
+                            }
+                        },
+                        onError(err) {
+                            errored = true;
+                            if (!dataReceived) {
+                                reject(err);
+                            }
+                            else {
+                                writableStream.error(err);
+                            }
+                        }
+                    }, token);
+                });
             }
             else {
-                const writableStream = newWriteableStream((data) => VSBuffer.concat(data.map((data) => VSBuffer.wrap(data))).buffer);
-                (async () => {
-                    try {
-                        let data = await this.readFile(resource);
-                        if (typeof opts.position === 'number' || typeof opts.length === 'number') {
-                            data = data.slice(opts.position ?? 0, opts.length);
-                        }
-                        writableStream.end(data);
-                    }
-                    catch (err) {
-                        writableStream.error(err);
-                    }
-                })();
-                return writableStream;
+                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);
+        }, token).catch((err) => {
+            writableStream.error(err);
+            writableStream.end();
+        });
+        return writableStream;
     }
     async readdir(resource) {
         const results = await Promise.allSettled(this.delegates.map(async (delegate) => await delegate.readdir(resource)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "34.0.0",
+  "version": "34.0.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - files service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "34.0.0"
+    "@codingame/monaco-vscode-api": "34.0.2"
   },
   "main": "index.js",
   "module": "index.js",