@@ -45,13 +45,13 @@ export class ExtensionHostProcessManager extends Disposable {
4545 * A map of already activated events to speed things up if the same activation event is triggered multiple times.
4646 */
4747 private readonly _extensionHostProcessFinishedActivateEvents : { [ activationEvent : string ] : boolean ; } ;
48- private _extensionHostProcessRPCProtocol : RPCProtocol ;
48+ private _extensionHostProcessRPCProtocol : RPCProtocol | null ;
4949 private readonly _extensionHostProcessCustomers : IDisposable [ ] ;
5050 private readonly _extensionHostProcessWorker : IExtensionHostStarter ;
5151 /**
5252 * winjs believes a proxy is a promise because it has a `then` method, so wrap the result in an object.
5353 */
54- private _extensionHostProcessProxy : Promise < { value : ExtHostExtensionServiceShape ; } > ;
54+ private _extensionHostProcessProxy : Promise < { value : ExtHostExtensionServiceShape ; } | null > | null ;
5555
5656 constructor (
5757 extensionHostProcessWorker : IExtensionHostStarter ,
@@ -67,7 +67,7 @@ export class ExtensionHostProcessManager extends Disposable {
6767
6868 this . _extensionHostProcessWorker = extensionHostProcessWorker ;
6969 this . onDidCrash = this . _extensionHostProcessWorker . onCrashed ;
70- this . _extensionHostProcessProxy = this . _extensionHostProcessWorker . start ( ) . then (
70+ this . _extensionHostProcessProxy = this . _extensionHostProcessWorker . start ( ) ! . then (
7171 ( protocol ) => {
7272 return { value : this . _createExtensionHostCustomers ( protocol ) } ;
7373 } ,
@@ -105,10 +105,14 @@ export class ExtensionHostProcessManager extends Disposable {
105105 super . dispose ( ) ;
106106 }
107107
108- private async measure ( ) : Promise < ExtHostLatencyResult > {
109- const latency = await this . _measureLatency ( ) ;
110- const down = await this . _measureDown ( ) ;
111- const up = await this . _measureUp ( ) ;
108+ private async measure ( ) : Promise < ExtHostLatencyResult | null > {
109+ const proxy = await this . _getExtensionHostProcessProxy ( ) ;
110+ if ( ! proxy ) {
111+ return null ;
112+ }
113+ const latency = await this . _measureLatency ( proxy ) ;
114+ const down = await this . _measureDown ( proxy ) ;
115+ const up = await this . _measureUp ( proxy ) ;
112116 return {
113117 remoteAuthority : this . _remoteAuthority ,
114118 latency,
@@ -117,10 +121,20 @@ export class ExtensionHostProcessManager extends Disposable {
117121 } ;
118122 }
119123
120- private async _measureLatency ( ) : Promise < number > {
124+ private async _getExtensionHostProcessProxy ( ) : Promise < ExtHostExtensionServiceShape | null > {
125+ if ( ! this . _extensionHostProcessProxy ) {
126+ return null ;
127+ }
128+ const p = await this . _extensionHostProcessProxy ;
129+ if ( ! p ) {
130+ return null ;
131+ }
132+ return p . value ;
133+ }
134+
135+ private async _measureLatency ( proxy : ExtHostExtensionServiceShape ) : Promise < number > {
121136 const COUNT = 10 ;
122137
123- const { value : proxy } = await this . _extensionHostProcessProxy ;
124138 let sum = 0 ;
125139 for ( let i = 0 ; i < COUNT ; i ++ ) {
126140 const sw = StopWatch . create ( true ) ;
@@ -135,21 +149,19 @@ export class ExtensionHostProcessManager extends Disposable {
135149 return ( byteCount * 1000 * 8 ) / elapsedMillis ;
136150 }
137151
138- private async _measureUp ( ) : Promise < number > {
152+ private async _measureUp ( proxy : ExtHostExtensionServiceShape ) : Promise < number > {
139153 const SIZE = 10 * 1024 * 1024 ; // 10MB
140154
141- const { value : proxy } = await this . _extensionHostProcessProxy ;
142155 let b = Buffer . alloc ( SIZE , Math . random ( ) % 256 ) ;
143156 const sw = StopWatch . create ( true ) ;
144157 await proxy . $test_up ( b ) ;
145158 sw . stop ( ) ;
146159 return ExtensionHostProcessManager . _convert ( SIZE , sw . elapsed ( ) ) ;
147160 }
148161
149- private async _measureDown ( ) : Promise < number > {
162+ private async _measureDown ( proxy : ExtHostExtensionServiceShape ) : Promise < number > {
150163 const SIZE = 10 * 1024 * 1024 ; // 10MB
151164
152- const { value : proxy } = await this . _extensionHostProcessProxy ;
153165 const sw = StopWatch . create ( true ) ;
154166 await proxy . $test_down ( SIZE ) ;
155167 sw . stop ( ) ;
@@ -171,9 +183,9 @@ export class ExtensionHostProcessManager extends Disposable {
171183 this . _register ( this . _extensionHostProcessRPCProtocol . onDidChangeResponsiveState ( ( responsiveState : ResponsiveState ) => this . _onDidChangeResponsiveState . fire ( responsiveState ) ) ) ;
172184 const extHostContext : IExtHostContext = {
173185 remoteAuthority : this . _remoteAuthority ,
174- getProxy : < T > ( identifier : ProxyIdentifier < T > ) : T => this . _extensionHostProcessRPCProtocol . getProxy ( identifier ) ,
175- set : < T , R extends T > ( identifier : ProxyIdentifier < T > , instance : R ) : R => this . _extensionHostProcessRPCProtocol . set ( identifier , instance ) ,
176- assertRegistered : ( identifiers : ProxyIdentifier < any > [ ] ) : void => this . _extensionHostProcessRPCProtocol . assertRegistered ( identifiers ) ,
186+ getProxy : < T > ( identifier : ProxyIdentifier < T > ) : T => this . _extensionHostProcessRPCProtocol ! . getProxy ( identifier ) ,
187+ set : < T , R extends T > ( identifier : ProxyIdentifier < T > , instance : R ) : R => this . _extensionHostProcessRPCProtocol ! . set ( identifier , instance ) ,
188+ assertRegistered : ( identifiers : ProxyIdentifier < any > [ ] ) : void => this . _extensionHostProcessRPCProtocol ! . assertRegistered ( identifiers ) ,
177189 } ;
178190
179191 // Named customers
@@ -199,10 +211,12 @@ export class ExtensionHostProcessManager extends Disposable {
199211 return this . _extensionHostProcessRPCProtocol . getProxy ( ExtHostContext . ExtHostExtensionService ) ;
200212 }
201213
202- public activate ( extension : ExtensionIdentifier , activationEvent : string ) : Promise < boolean > {
203- return this . _extensionHostProcessProxy . then ( ( proxy ) => {
204- return proxy . value . $activate ( extension , activationEvent ) ;
205- } ) ;
214+ public async activate ( extension : ExtensionIdentifier , activationEvent : string ) : Promise < boolean > {
215+ const proxy = await this . _getExtensionHostProcessProxy ( ) ;
216+ if ( ! proxy ) {
217+ return false ;
218+ }
219+ return proxy . $activate ( extension , activationEvent ) ;
206220 }
207221
208222 public activateByEvent ( activationEvent : string ) : Promise < void > {
@@ -241,7 +255,7 @@ export class ExtensionHostProcessManager extends Disposable {
241255 return 0 ;
242256 }
243257
244- public resolveAuthority ( remoteAuthority : string ) : Promise < ResolvedAuthority > {
258+ public async resolveAuthority ( remoteAuthority : string ) : Promise < ResolvedAuthority > {
245259 const authorityPlusIndex = remoteAuthority . indexOf ( '+' ) ;
246260 if ( authorityPlusIndex === - 1 ) {
247261 // This authority does not need to be resolved, simply parse the port number
@@ -252,15 +266,27 @@ export class ExtensionHostProcessManager extends Disposable {
252266 port : parseInt ( pieces [ 1 ] , 10 )
253267 } ) ;
254268 }
255- return this . _extensionHostProcessProxy . then ( proxy => proxy . value . $resolveAuthority ( remoteAuthority ) ) ;
269+ const proxy = await this . _getExtensionHostProcessProxy ( ) ;
270+ if ( ! proxy ) {
271+ throw new Error ( `Cannot resolve authority` ) ;
272+ }
273+ return proxy . $resolveAuthority ( remoteAuthority ) ;
256274 }
257275
258- public start ( enabledExtensionIds : ExtensionIdentifier [ ] ) : Promise < void > {
259- return this . _extensionHostProcessProxy . then ( proxy => proxy . value . $startExtensionHost ( enabledExtensionIds ) ) ;
276+ public async start ( enabledExtensionIds : ExtensionIdentifier [ ] ) : Promise < void > {
277+ const proxy = await this . _getExtensionHostProcessProxy ( ) ;
278+ if ( ! proxy ) {
279+ return ;
280+ }
281+ return proxy . $startExtensionHost ( enabledExtensionIds ) ;
260282 }
261283
262- public deltaExtensions ( toAdd : IExtensionDescription [ ] , toRemove : ExtensionIdentifier [ ] ) : Promise < void > {
263- return this . _extensionHostProcessProxy . then ( proxy => proxy . value . $deltaExtensions ( toAdd , toRemove ) ) ;
284+ public async deltaExtensions ( toAdd : IExtensionDescription [ ] , toRemove : ExtensionIdentifier [ ] ) : Promise < void > {
285+ const proxy = await this . _getExtensionHostProcessProxy ( ) ;
286+ if ( ! proxy ) {
287+ return ;
288+ }
289+ return proxy . $deltaExtensions ( toAdd , toRemove ) ;
264290 }
265291}
266292
@@ -328,7 +354,7 @@ interface ExtHostLatencyResult {
328354}
329355
330356interface ExtHostLatencyProvider {
331- measure ( ) : Promise < ExtHostLatencyResult > ;
357+ measure ( ) : Promise < ExtHostLatencyResult | null > ;
332358}
333359
334360let providers : ExtHostLatencyProvider [ ] = [ ] ;
0 commit comments