@opensumi/ide-connection 3.0.2-next-1715826860.0 → 3.0.2-next-1715852509.0

package/src/common/ws-channel.ts

@@ -1,16 +1,10 @@
 import { Type } from '@furyjs/fury';
 
 import { EventEmitter } from '@opensumi/events';
-import {
-  DisposableCollection,
-  DisposableStore,
-  EventQueue,
-  StateTracer,
-  randomString,
-} from '@opensumi/ide-core-common';
+import { DisposableCollection, DisposableStore, EventQueue } from '@opensumi/ide-core-common';
 
 import { IConnectionShape } from './connection/types';
-import { oneOf } from './fury-extends/one-of';
+import { oneOf7 } from './fury-extends/one-of';
 import { ISumiConnectionOptions, SumiConnection } from './rpc/connection';
 import { ILogger } from './types';
 
@@ -32,6 +26,27 @@ export interface PongMessage {
   clientId: string;
 }
 
+/**
+ * `open` message is used to open a new channel.
+ * `path` is used to identify which handler should be used to handle the channel.
+ * `clientId` is used to identify the client.
+ */
+export interface OpenMessage {
+  kind: 'open';
+  id: string;
+  path: string;
+  clientId: string;
+}
+
+/**
+ * when server receive a `open` message, it should reply a `server-ready` message.
+ * this is indicate that the channel is ready to use.
+ */
+export interface ServerReadyMessage {
+  kind: 'server-ready';
+  id: string;
+}
+
 /**
  * `data` message indicate that the channel has received some data.
  * the `content` field is the data, it should be a string.
@@ -55,6 +70,15 @@ export interface CloseMessage {
   reason: string;
 }
 
+export type ChannelMessage =
+  | PingMessage
+  | PongMessage
+  | OpenMessage
+  | ServerReadyMessage
+  | DataMessage
+  | BinaryMessage
+  | CloseMessage;
+
 export interface IWSChannelCreateOptions {
   /**
    * every channel's unique id, it only used in client to server architecture.
@@ -148,14 +172,6 @@ export class WSChannel {
     this._isServerReady = false;
   }
 
-  onServerReady(cb: () => void) {
-    if (this._isServerReady) {
-      cb();
-      return;
-    }
-    return this.emitter.on('open', cb);
-  }
-
   resume() {
     this._isServerReady = true;
     if (this.sendQueue) {
@@ -169,11 +185,7 @@ export class WSChannel {
   dispatch(msg: ChannelMessage) {
     switch (msg.kind) {
       case 'server-ready':
-        this.stateTracer.fulfill(msg.token);
         this.resume();
-        if (this.timer) {
-          clearTimeout(this.timer);
-        }
         this.emitter.emit('open', msg.id);
         break;
       case 'data':
@@ -185,55 +197,16 @@ export class WSChannel {
     }
   }
 
-  stateTracer = this._disposables.add(new StateTracer());
-
-  /**
-   * @param connectionToken 一个 connection token 用于在全链路中追踪一个 channel 的生命周期，防止 channel 被重复打开
-   */
-  open(path: string, clientId: string, connectionToken = randomString(16)) {
+  open(path: string, clientId: string) {
     this.channelPath = path;
-
-    if (this.stateTracer.has(connectionToken)) {
-      this.logger.warn(
-        `channel already opened or in progress, path: ${path}, clientId: ${clientId}, connectionToken: ${connectionToken}`,
-      );
-      return;
-    }
-
-    this.stateTracer.record(connectionToken);
-
     this.connection.send(
       stringify({
         kind: 'open',
         id: this.id,
         path,
         clientId,
-        connectionToken,
       }),
     );
-
-    if (this._ensureServerReady) {
-      this.ensureOpenSend(path, clientId, connectionToken);
-    }
-
-    return connectionToken;
-  }
-
-  protected timer: NodeJS.Timeout;
-  /**
-   * 启动定时器，确保 server-ready 消息在一定时间内到达
-   */
-  protected ensureOpenSend(path: string, clientId: string, connectionToken: string) {
-    if (this.timer) {
-      clearTimeout(this.timer);
-    }
-    this.timer = setTimeout(() => {
-      if (this._isServerReady) {
-        return;
-      }
-      this.stateTracer.delete(connectionToken);
-      this.open(path, clientId, connectionToken);
-    }, 500);
   }
 
   send(content: string) {
@@ -287,61 +260,23 @@ export class WSChannel {
   }
 
   dispose() {
-    if (this.timer) {
-      clearTimeout(this.timer);
-    }
-    this.sendQueue = [];
     this._disposables.dispose();
   }
 }
 
-interface IWSServerChannelCreateOptions extends IWSChannelCreateOptions {
-  clientId: string;
-}
-
 /**
  * The server side channel, it will send a `server-ready` message after it receive a `open` message.
  */
 export class WSServerChannel extends WSChannel {
-  messageQueue: ChannelMessage[] = [];
-
-  clientId: string;
-  constructor(public connection: IConnectionShape<Uint8Array>, options: IWSServerChannelCreateOptions) {
-    super(connection, options);
-    this.clientId = options.clientId;
-  }
-  serverReady(token: string) {
+  serverReady() {
     this.connection.send(
       stringify({
         kind: 'server-ready',
         id: this.id,
-        token,
       }),
     );
   }
-
-  dispatch(msg: ChannelMessage) {
-    switch (msg.kind) {
-      case 'data':
-        this.emitter.emit('message', msg.content);
-        break;
-      case 'binary':
-        this.emitter.emit('binary', msg.binary);
-        break;
-    }
-  }
 }
-
-export type ChannelMessage =
-  | PingMessage
-  | PongMessage
-  | OpenMessage
-  | ServerReadyMessage
-  | DataMessage
-  | BinaryMessage
-  | CloseMessage
-  | ErrorMessage;
-
 export const PingProtocol = Type.object('ping', {
   clientId: Type.string(),
   id: Type.string(),
@@ -352,56 +287,14 @@ export const PongProtocol = Type.object('pong', {
   id: Type.string(),
 });
 
-/**
- * `open` message is used to open a new channel.
- * `path` is used to identify which handler should be used to handle the channel.
- * `clientId` is used to identify the client.
- */
-export interface OpenMessage {
-  kind: 'open';
-  id: string;
-  path: string;
-  clientId: string;
-  connectionToken: string;
-}
-
 export const OpenProtocol = Type.object('open', {
   clientId: Type.string(),
   id: Type.string(),
   path: Type.string(),
-  connectionToken: Type.string(),
 });
 
-/**
- * when server receive a `open` message, it should reply a `server-ready` message.
- * this is indicate that the channel is ready to use.
- */
-export interface ServerReadyMessage {
-  kind: 'server-ready';
-  id: string;
-  token: string;
-}
-
 export const ServerReadyProtocol = Type.object('server-ready', {
   id: Type.string(),
-  token: Type.string(),
-});
-
-export enum ErrorMessageCode {
-  ChannelNotFound = 1,
-}
-
-export interface ErrorMessage {
-  kind: 'error';
-  id: string;
-  code: ErrorMessageCode;
-  message: string;
-}
-
-export const ErrorProtocol = Type.object('error', {
-  id: Type.string(),
-  code: Type.uint16(),
-  message: Type.string(),
 });
 
 export const DataProtocol = Type.object('data', {
@@ -420,7 +313,7 @@ export const CloseProtocol = Type.object('close', {
   reason: Type.string(),
 });
 
-const serializer = oneOf([
+const serializer = oneOf7([
   PingProtocol,
   PongProtocol,
   OpenProtocol,
@@ -428,7 +321,6 @@ const serializer = oneOf([
   DataProtocol,
   BinaryProtocol,
   CloseProtocol,
-  ErrorProtocol,
 ]);
 
 export function stringify(obj: ChannelMessage): Uint8Array {

package/src/node/ws.ts

@@ -107,7 +107,6 @@ export class WebSocketServerRoute {
 
       if (wsHandlerIndex === wsHandlerLength) {
         this.logger.error(`request.url ${request.url} mismatch!`);
-        socket.destroy();
       }
     });
   }