chore: update some logs on extension host process service

packages/connection/src/node/common-channel-handler.ts

@@ -121,19 +121,18 @@ export class CommonChannelHandler extends WebSocketHandler {
 
  // 心跳消息
  if (msgObj.kind === 'heartbeat') {
- // console.log(`heartbeat msg ${msgObj.clientId}`)
  connection.send(stringify(`heartbeat ${msgObj.clientId}`));
  } else if (msgObj.kind === 'client') {
  const clientId = msgObj.clientId;
- this.logger.log('new connection clientId', clientId);
+ this.logger.log(`New connection with id ${clientId}`);
  connectionId = clientId;
  this.connectionMap.set(clientId, connection);
  this.hearbeat(connectionId, connection);
  // channel 消息处理
  } else if (msgObj.kind === 'open') {
  const channelId = msgObj.id; // CommonChannelHandler.channelId ++;
  const { path } = msgObj;
- this.logger.log('new open channelId', channelId, 'channelPath', path);
+ this.logger.log(`Open a new connection channel ${channelId} with path ${path}`);
 
  // 生成 channel 对象
  const connectionSend = this.channelConnectionSend(connection);
@@ -162,14 +161,12 @@ export class CommonChannelHandler extends WebSocketHandler {
 
  channel.ready();
  } else {
- // console.log('connection message', msgObj.id, msgObj.kind, this.channelMap.get(msgObj.id));
-
  const { id } = msgObj;
  const channel = this.channelMap.get(id);
  if (channel) {
  channel.handleMessage(msgObj);
  } else {
- this.logger.warn(`channel ${id} not found`);
+ this.logger.warn(`The channel(${id}) was not found`);
  }
  }
  } catch (e) {
@@ -184,15 +181,15 @@ export class CommonChannelHandler extends WebSocketHandler {
  clearTimeout(this.heartbeatMap.get(connectionId) as NodeJS.Timeout);
  this.heartbeatMap.delete(connectionId);
 
- this.logger.verbose(`clear heartbeat ${connectionId}`);
+ this.logger.verbose(`Clear heartbeat from channel ${connectionId}`);
  }
 
  Array.from(this.channelMap.values())
  .filter((channel) => channel.id.toString().indexOf(connectionId) !== -1)
  .forEach((channel) => {
  channel.close(1, 'close');
  this.channelMap.delete(channel.id);
- this.logger.verbose(`remove channel ${channel.id}`);
+ this.logger.verbose(`Remove connection channel ${channel.id}`);
  });
  });
  });

packages/core-node/src/connection.ts

@@ -37,7 +37,7 @@ export function createServerConnection2(
  // 事件由 connection 的时机来触发
  commonChannelPathHandler.register('RPCService', {
  handler: (connection: WSChannel, clientId: string) => {
- logger.log(`set rpc connection ${clientId}`);
+ logger.log(`New RPC connection ${clientId}`);
 
  const serviceCenter = new RPCServiceCenter(undefined, logger);
  const serviceChildInjector = bindModuleBackService(injector, modulesInstances, serviceCenter, clientId);
@@ -50,10 +50,10 @@ export function createServerConnection2(
  serviceCenter.removeConnection(serverConnection);
  serviceChildInjector.disposeAll();
 
- logger.log(`remove rpc connection ${clientId} `);
+ logger.log(`Remove RPC connection ${clientId}`);
  });
  },
- dispose: (connection: ws, connectionClientId: string) => {},
+ dispose: () => {},
  });
 
  socketRoute.registerHandler(channelHandler);
@@ -76,15 +76,12 @@ export function createNetServerConnection(server: net.Server, injector, modulesI
  );
 
  server.on('connection', (connection) => {
- logger.log('set net rpc connection');
  const serverConnection = createSocketConnection(connection);
  serviceCenter.setConnection(serverConnection);
 
  connection.on('close', () => {
  serviceCenter.removeConnection(serverConnection);
  serviceChildInjector.disposeAll();
-
- logger.log('remove net rpc connection');
  });
  });
 
@@ -97,15 +94,13 @@ export function bindModuleBackService(
  serviceCenter: RPCServiceCenter,
  clientId?: string,
 ) {
- const logger = injector.get(INodeLogger);
  const { createRPCService } = initRPCService(serviceCenter);
 
  const childInjector = injector.createChild();
  for (const module of modules) {
  if (module.backServices) {
  for (const service of module.backServices) {
  if (service.token) {
- logger.log('back service', service.token);
  const serviceToken = service.token;
 
  if (!injector.creatorMap.has(serviceToken)) {

packages/extension/src/browser/extension-node.service.ts

@@ -20,6 +20,7 @@ import {
 } from '@opensumi/ide-core-browser';
 
 import {
+ CONNECTION_HANDLE_BETWEEN_EXTENSION_AND_MAIN_THREAD,
  ExtensionNodeServiceServerPath,
  IExtension,
  IExtensionHostService,
@@ -172,7 +173,7 @@ export class NodeExtProcessService implements AbstractNodeExtProcessService<IExt
  mainThreadCenter.setConnection(createElectronClientConnection(connectPath));
  } else {
  const WSChannelHandler = this.injector.get(IWSChannelHandler);
- const channel = await WSChannelHandler.openChannel('ExtMainThreadConnection');
+ const channel = await WSChannelHandler.openChannel(CONNECTION_HANDLE_BETWEEN_EXTENSION_AND_MAIN_THREAD);
  mainThreadCenter.setConnection(createWebSocketConnection(channel));
  }
 

packages/extension/src/common/const.ts

@@ -0,0 +1 @@
+export const CONNECTION_HANDLE_BETWEEN_EXTENSION_AND_MAIN_THREAD = 'ExtMainThreadConnection';