RPC Protocol ClientProxyHandler Init Events #13172

* don't throw error on possible race condition but log only * initialize dependencies before resolving promise
eclipse-theia · Jan 3, 2024 · 966d462 · 966d462
1 parent 9976a01
commit 966d462
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/plugin-ext/src/common/proxy-handler.ts b/packages/plugin-ext/src/common/proxy-handler.ts
@@ -56,12 +56,12 @@ export class ClientProxyHandler<T extends object> implements ProxyHandler<T> {
             const clientOptions: RpcProtocolOptions = { encoder: this.encoder, decoder: this.decoder, mode: 'clientOnly' };
             this.channelProvider().then(channel => {
                 const rpc = new RpcProtocol(channel, undefined, clientOptions);
-                this.rpcDeferred.resolve(rpc);
                 this.isRpcInitialized = true;
-                this.isInitializing = false;
                 if (this.onInitialize) {
                     this.onInitialize();
                 }
+                this.rpcDeferred.resolve(rpc);
+                this.isInitializing = false;
             });
         }
     }

diff --git a/packages/plugin-ext/src/plugin/documents.ts b/packages/plugin-ext/src/plugin/documents.ts
@@ -158,7 +158,8 @@ export class DocumentsExtImpl implements DocumentsExt {
         const uriString = uri.toString();
         const data = this.editorsAndDocuments.getDocument(uriString);
         if (!data) {
-            throw new Error('unknown document: ' + uriString);
+            console.error('unknown document: ' + uriString);
+            return;
         }
         data.acceptIsDirty(isDirty);
         this._onDidChangeDocument.fire({
@@ -172,7 +173,8 @@ export class DocumentsExtImpl implements DocumentsExt {
         const uriString = uri.toString();
         const data = this.editorsAndDocuments.getDocument(uriString);
         if (!data) {
-            throw new Error('unknown document: ' + uriString);
+            console.error('unknown document: ' + uriString);
+            return;
         }
         data.acceptIsDirty(isDirty);
         data.onEvents(e);