@opensumi/ide-connection 2.27.3-rc-1713838390.0 → 2.27.3-rc-1714116491.0

package/src/common/rpc-service/proxy/sumi.ts

@@ -10,7 +10,6 @@ export class ProxySumi extends ProxyBase<SumiConnection> {
     for (const method of methods) {
       if (method.startsWith('on')) {
         this.connection.onNotification(method, async (...args: any[]) => {
-          this.captureOnNotification(method, args);
           try {
             await this.registry.invoke(method, ...args);
           } catch (e) {
@@ -18,19 +17,7 @@ export class ProxySumi extends ProxyBase<SumiConnection> {
           }
         });
       } else {
-        this.connection.onRequest(method, async (...args: any[]) => {
-          const requestId = this.nextRequestId();
-          this.captureOnRequest(requestId, method, args);
-
-          try {
-            const result = await this.registry.invoke(method, ...args);
-            this.captureOnRequestResult(requestId, method, result);
-            return result;
-          } catch (e) {
-            this.captureOnRequestFail(requestId, method, e);
-            throw e;
-          }
-        });
+        this.connection.onRequest(method, async (...args: any[]) => await this.registry.invoke(method, ...args));
       }
     }
   }
@@ -40,29 +27,15 @@ export class ProxySumi extends ProxyBase<SumiConnection> {
 
     // 调用方法为 on 开头时，作为单项通知
     if (prop.startsWith('on')) {
-      this.captureSendNotification(prop, args);
       this.connection.sendNotification(prop, ...args);
     } else {
-      // generate a unique requestId to associate request and requestResult
-      const requestId = this.nextRequestId();
-      this.captureSendRequest(requestId, prop, args);
-      try {
-        const result = await this.connection.sendRequest(prop, ...args);
-        this.captureSendRequestResult(requestId, prop, result);
-        return result;
-      } catch (error) {
-        this.captureSendRequestFail(requestId, prop, error);
-        throw error;
-      }
+      return await this.connection.sendRequest(prop, ...args);
     }
   }
 
   listen(connection: SumiConnection): void {
     super.listen(connection);
-    connection.onRequestNotFound((method) => {
-      const requestId = this.nextRequestId();
-      this.captureOnRequest(requestId, method, []);
-      this.captureOnRequestFail(requestId, method, METHOD_NOT_REGISTERED);
+    connection.onRequestNotFound(() => {
       throw METHOD_NOT_REGISTERED;
     });
   }

package/src/common/rpc-service/registry.ts

@@ -3,28 +3,33 @@ import { Emitter } from '@opensumi/ide-core-common';
 import { MessageIO, TSumiProtocol, TSumiProtocolMethod } from '../rpc';
 import { RPCServiceMethod } from '../types';
 
+const skipMethods = new Set(['constructor']);
+
 export function getServiceMethods(service: any): string[] {
-  let props: any[] = [];
-
-  if (/^\s*class/.test(service.constructor.toString())) {
-    let obj = service;
-    do {
-      props = props.concat(Object.getOwnPropertyNames(obj));
-    } while ((obj = Object.getPrototypeOf(obj)));
-    props = props.sort().filter((e, i, arr) => e !== arr[i + 1] && typeof service[e] === 'function');
-  } else {
-    for (const prop in service) {
-      if (service[prop] && typeof service[prop] === 'function') {
-        props.push(prop);
+  const props = new Set<string>();
+
+  let obj = service;
+  do {
+    const propertyNames = Object.getOwnPropertyNames(obj);
+
+    for (const prop of propertyNames) {
+      if (skipMethods.has(prop)) {
+        continue;
+      }
+
+      if (typeof service[prop] === 'function') {
+        props.add(prop);
       }
     }
-  }
+  } while ((obj = Object.getPrototypeOf(obj)));
 
-  return props;
+  const array = Array.from(props);
+  array.sort();
+  return array;
 }
 
 /**
- * Store all executable services
+ * Store all executable services, and provide a way to invoke them.
  */
 export class ServiceRegistry {
   protected emitter = new Emitter<string[]>();

package/src/common/ws-channel.ts

@@ -5,7 +5,6 @@ import { DisposableCollection } from '@opensumi/ide-core-common';
 
 import { IConnectionShape } from './connection/types';
 import { oneOf7 } from './fury-extends/one-of';
-import { createWebSocketConnection } from './message';
 import { ISumiConnectionOptions, SumiConnection } from './rpc/connection';
 import { ILogger } from './types';
 
@@ -213,9 +212,6 @@ export class WSChannel {
   onceClose(cb: (code: number, reason: string) => void) {
     return this.emitter.once('close', cb);
   }
-  createMessageConnection() {
-    return createWebSocketConnection(this);
-  }
 
   createConnection() {
     return {