fix: only handle scheme file on collaborative mode (#1709)

* fix: only handle scheme `file` on collaborative mode * fix: use `codeUri.scheme` instead * fix: should break all awaiting init content request before removal * refactor: rename variables
opensumi · Sep 23, 2022 · fb474f8 · fb474f8
1 parent 6663c19
commit fb474f8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/packages/collaboration/src/browser/collaboration.service.ts b/packages/collaboration/src/browser/collaboration.service.ts
@@ -255,6 +255,10 @@ export class CollaborationService extends WithEventBus implements ICollaboration
 
   @OnEvent(EditorDocumentModelCreationEvent)
   private async editorDocumentModelCreationHandler(e: EditorDocumentModelCreationEvent) {
+    if (e.payload.uri.scheme !== 'file') {
+      return;
+    }
+
     const uriString = e.payload.uri.toString();
     const { bindingReady, yMapReady } = this.getDeferred(uriString);
     await this.backService.requestInitContent(uriString);
@@ -271,6 +275,10 @@ export class CollaborationService extends WithEventBus implements ICollaboration
 
   @OnEvent(EditorDocumentModelRemovalEvent)
   private async editorDocumentModelRemovalHandler(e: EditorDocumentModelRemovalEvent) {
+    if (e.payload.codeUri.scheme !== 'file') {
+      return;
+    }
+
     const uriString = e.payload.codeUri.toString();
     const { bindingReady } = this.getDeferred(uriString);
     await bindingReady.promise;

diff --git a/packages/collaboration/src/node/y-websocket-server.ts b/packages/collaboration/src/node/y-websocket-server.ts
@@ -27,6 +27,8 @@ export class YWebsocketServerImpl implements IYWebsocketServer {
 
   private server: http.Server;
 
+  private rejectsOfRequestingPromises: Map<string, Set<(reason: string) => void>> = new Map();
+
   initialize() {
     this.logger.debug('init y-websocket server');
 
@@ -84,13 +86,21 @@ export class YWebsocketServerImpl implements IYWebsocketServer {
 
   removeYText(uri: string) {
     this.logger.debug('trying to remove uri', uri);
+
+    // break all still-awaiting promise
+    const rejects = this.rejectsOfRequestingPromises.get(uri);
+    if (rejects) {
+      rejects.forEach((reject) => reject('Remove unresolved promise of this uri'));
+      rejects.clear();
+    }
+
     if (this.yMap.has(uri)) {
       this.yMap.delete(uri);
       this.logger.debug('removed', uri);
     }
   }
 
-  async requestInitContent(uri: string): Promise<void> {
+  private async doRequestInitContent(uri: string): Promise<void> {
     try {
       // load content from disk, not client
       const { content } = await this.fileService.resolveContent(uri);
@@ -104,6 +114,19 @@ export class YWebsocketServerImpl implements IYWebsocketServer {
     }
   }
 
+  async requestInitContent(uri: string): Promise<void> {
+    const promise = new Promise<void>((resolve, reject) => {
+      this.doRequestInitContent(uri).then(() => resolve());
+
+      if (!this.rejectsOfRequestingPromises.has(uri)) {
+        this.rejectsOfRequestingPromises.set(uri, new Set());
+      }
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      this.rejectsOfRequestingPromises.get(uri)!.add(reject);
+    });
+    await promise;
+  }
+
   destroy() {
     this.websocketServer.close();
     this.server.close();