11import * as path from "path" ;
2- import { VSBuffer } from "vs/base/common/buffer" ;
2+ import { VSBuffer , VSBufferReadableStream } from "vs/base/common/buffer" ;
33import { Emitter , Event } from "vs/base/common/event" ;
44import { IDisposable } from "vs/base/common/lifecycle" ;
55import { OS } from "vs/base/common/platform" ;
6+ import { ReadableStreamEventPayload } from "vs/base/common/stream" ;
67import { URI , UriComponents } from "vs/base/common/uri" ;
78import { transformOutgoingURIs } from "vs/base/common/uriIpc" ;
89import { IServerChannel } from "vs/base/parts/ipc/common/ipc" ;
910import { IDiagnosticInfo } from "vs/platform/diagnostics/common/diagnostics" ;
1011import { IEnvironmentService } from "vs/platform/environment/common/environment" ;
1112import { ExtensionIdentifier , IExtensionDescription } from "vs/platform/extensions/common/extensions" ;
12- import { FileDeleteOptions , FileOpenOptions , FileOverwriteOptions , FileType , IStat , IWatchOptions } from "vs/platform/files/common/files" ;
13+ import { FileDeleteOptions , FileOpenOptions , FileOverwriteOptions , FileReadStreamOptions , FileType , FileWriteOptions , IStat , IWatchOptions } from "vs/platform/files/common/files" ;
14+ import { createReadStream } from "vs/platform/files/common/io" ;
1315import { DiskFileSystemProvider } from "vs/platform/files/node/diskFileSystemProvider" ;
1416import { ILogService } from "vs/platform/log/common/log" ;
1517import product from "vs/platform/product/common/product" ;
16- import { IRemoteAgentEnvironment } from "vs/platform/remote/common/remoteAgentEnvironment" ;
18+ import { IRemoteAgentEnvironment , RemoteAgentConnectionContext } from "vs/platform/remote/common/remoteAgentEnvironment" ;
1719import { ITelemetryService } from "vs/platform/telemetry/common/telemetry" ;
1820import { INodeProxyService } from "vs/server/src/common/nodeProxy" ;
1921import { getTranslations } from "vs/server/src/node/nls" ;
2022import { getUriTransformer , localRequire } from "vs/server/src/node/util" ;
23+ import { IFileChangeDto } from "vs/workbench/api/common/extHost.protocol" ;
2124import { ExtensionScanner , ExtensionScannerInput } from "vs/workbench/services/extensions/node/extensionPoints" ;
2225
2326/**
@@ -42,7 +45,7 @@ class Watcher extends DiskFileSystemProvider {
4245 }
4346}
4447
45- export class FileProviderChannel implements IServerChannel , IDisposable {
48+ export class FileProviderChannel implements IServerChannel < RemoteAgentConnectionContext > , IDisposable {
4649 private readonly provider : DiskFileSystemProvider ;
4750 private readonly watchers = new Map < string , Watcher > ( ) ;
4851
@@ -53,48 +56,67 @@ export class FileProviderChannel implements IServerChannel, IDisposable {
5356 this . provider = new DiskFileSystemProvider ( this . logService ) ;
5457 }
5558
56- public listen ( context : any , event : string , args ?: any ) : Event < any > {
59+ public listen ( context : RemoteAgentConnectionContext , event : string , args ?: any ) : Event < any > {
5760 switch ( event ) {
58- // This is where the actual file changes are sent. The watch method just
59- // adds things that will fire here. That means we have to split up
60- // watchers based on the session otherwise sessions would get events for
61- // other sessions. There is also no point in having the watcher unless
62- // something is listening. I'm not sure there is a different way to
63- // dispose, anyway.
64- case "filechange" :
65- const session = args [ 0 ] ;
66- const emitter = new Emitter ( {
67- onFirstListenerAdd : ( ) => {
68- const provider = new Watcher ( this . logService ) ;
69- this . watchers . set ( session , provider ) ;
70- const transformer = getUriTransformer ( context . remoteAuthority ) ;
71- provider . onDidChangeFile ( ( events ) => {
72- emitter . fire ( events . map ( ( event ) => ( {
73- ...event ,
74- resource : transformer . transformOutgoing ( event . resource ) ,
75- } ) ) ) ;
76- } ) ;
77- provider . onDidErrorOccur ( ( event ) => emitter . fire ( event ) ) ;
78- } ,
79- onLastListenerRemove : ( ) => {
80- this . watchers . get ( session ) ! . dispose ( ) ;
81- this . watchers . delete ( session ) ;
82- } ,
83- } ) ;
84-
85- return emitter . event ;
61+ case "filechange" : return this . filechange ( context , args [ 0 ] ) ;
62+ case "readFileStream" : return this . readFileStream ( args [ 0 ] , args [ 1 ] ) ;
8663 }
8764
8865 throw new Error ( `Invalid listen "${ event } ) ;
8966 }
9067
68+ private filechange ( context : RemoteAgentConnectionContext , session : string ) : Event < IFileChangeDto [ ] > {
69+ const emitter = new Emitter < IFileChangeDto [ ] > ( {
70+ onFirstListenerAdd : ( ) => {
71+ const provider = new Watcher ( this . logService ) ;
72+ this . watchers . set ( session , provider ) ;
73+ const transformer = getUriTransformer ( context . remoteAuthority ) ;
74+ provider . onDidChangeFile ( ( events ) => {
75+ emitter . fire ( events . map ( ( event ) => ( {
76+ ...event ,
77+ resource : transformer . transformOutgoing ( event . resource ) ,
78+ } ) ) ) ;
79+ } ) ;
80+ provider . onDidErrorOccur ( ( event ) => this . logService . error ( event ) ) ;
81+ } ,
82+ onLastListenerRemove : ( ) => {
83+ this . watchers . get ( session ) ! . dispose ( ) ;
84+ this . watchers . delete ( session ) ;
85+ } ,
86+ } ) ;
87+
88+ return emitter . event ;
89+ }
90+
91+ private readFileStream ( resource : UriComponents , opts : FileReadStreamOptions ) : Event < ReadableStreamEventPayload < VSBuffer > > {
92+ let fileStream : VSBufferReadableStream | undefined ;
93+ const emitter = new Emitter < ReadableStreamEventPayload < VSBuffer > > ( {
94+ onFirstListenerAdd : ( ) => {
95+ if ( ! fileStream ) {
96+ fileStream = createReadStream ( this . provider , this . transform ( resource ) , {
97+ ...opts ,
98+ bufferSize : 64 * 1024 , // From DiskFileSystemProvider
99+ } ) ;
100+ fileStream . on ( "data" , ( data ) => emitter . fire ( data ) ) ;
101+ fileStream . on ( "error" , ( error ) => emitter . fire ( error ) ) ;
102+ fileStream . on ( "end" , ( ) => emitter . fire ( "end" ) ) ;
103+ }
104+ } ,
105+ onLastListenerRemove : ( ) => fileStream && fileStream . destroy ( ) ,
106+ } ) ;
107+
108+ return emitter . event ;
109+ }
110+
91111 public call ( _ : unknown , command : string , args ?: any ) : Promise < any > {
92112 switch ( command ) {
93113 case "stat" : return this . stat ( args [ 0 ] ) ;
94114 case "open" : return this . open ( args [ 0 ] , args [ 1 ] ) ;
95115 case "close" : return this . close ( args [ 0 ] ) ;
96116 case "read" : return this . read ( args [ 0 ] , args [ 1 ] , args [ 2 ] ) ;
117+ case "readFile" : return this . readFile ( args [ 0 ] ) ;
97118 case "write" : return this . write ( args [ 0 ] , args [ 1 ] , args [ 2 ] , args [ 3 ] , args [ 4 ] ) ;
119+ case "writeFile" : return this . writeFile ( args [ 0 ] , args [ 1 ] , args [ 2 ] ) ;
98120 case "delete" : return this . delete ( args [ 0 ] , args [ 1 ] ) ;
99121 case "mkdir" : return this . mkdir ( args [ 0 ] ) ;
100122 case "readdir" : return this . readdir ( args [ 0 ] ) ;
@@ -130,10 +152,18 @@ export class FileProviderChannel implements IServerChannel, IDisposable {
130152 return [ buffer , bytesRead ] ;
131153 }
132154
155+ private async readFile ( resource : UriComponents ) : Promise < VSBuffer > {
156+ return VSBuffer . wrap ( await this . provider . readFile ( this . transform ( resource ) ) ) ;
157+ }
158+
133159 private write ( fd : number , pos : number , buffer : VSBuffer , offset : number , length : number ) : Promise < number > {
134160 return this . provider . write ( fd , pos , buffer . buffer , offset , length ) ;
135161 }
136162
163+ private writeFile ( resource : UriComponents , buffer : VSBuffer , opts : FileWriteOptions ) : Promise < void > {
164+ return this . provider . writeFile ( this . transform ( resource ) , buffer . buffer , opts ) ;
165+ }
166+
137167 private async delete ( resource : UriComponents , opts : FileDeleteOptions ) : Promise < void > {
138168 return this . provider . delete ( this . transform ( resource ) , opts ) ;
139169 }
0 commit comments