@opensumi/ide-terminal-next 3.0.1 → 3.0.2-next-1715589837.0

package/src/browser/terminal.error.ts

@@ -1,6 +1,5 @@
-import { makeObservable, observable } from 'mobx';
-
 import { Autowired, Injectable } from '@opensumi/di';
+import { Emitter } from '@opensumi/ide-core-common';
 
 import {
   IPtyExitEvent,
@@ -13,9 +12,11 @@ import {
 
 @Injectable()
 export class TerminalErrorService implements ITerminalErrorService {
-  @observable
   errors: Map<string, ITerminalError> = new Map();
 
+  protected _onErrorsChangeEmitter = new Emitter<void>();
+  onErrorsChange = this._onErrorsChangeEmitter.event;
+
   @Autowired(ITerminalService)
   protected readonly service: ITerminalService;
 
@@ -26,9 +27,9 @@ export class TerminalErrorService implements ITerminalErrorService {
   protected readonly view: ITerminalGroupViewService;
 
   constructor() {
-    makeObservable(this);
     this.service.onError((error) => {
       this.errors.set(error.id, error);
+      this._onErrorsChangeEmitter.fire();
     });
 
     this.service.onExit((event: IPtyExitEvent) => {
@@ -44,6 +45,7 @@ export class TerminalErrorService implements ITerminalErrorService {
 
     this.controller.onDidCloseTerminal((e) => {
       this.errors.delete(e.id);
+      this._onErrorsChangeEmitter.fire();
     });
   }
 
@@ -52,6 +54,8 @@ export class TerminalErrorService implements ITerminalErrorService {
     if (client) {
       await 0; // 使后面的 delete 发生在下一个 microTask 中，避免在迭代过程中修改 this.errors
       this.errors.delete(clientId);
+      this._onErrorsChangeEmitter.fire();
+
       client.reset();
       return client.attached.promise;
     }

package/src/browser/terminal.search.ts

@@ -1,5 +1,3 @@
-import { makeObservable, observable } from 'mobx';
-
 import { Autowired, Injectable } from '@opensumi/di';
 import { Emitter, Event, debounce } from '@opensumi/ide-core-common';
 
@@ -7,11 +5,14 @@ import { ITerminalClient, ITerminalController, ITerminalGroupViewService, ITermi
 
 @Injectable()
 export class TerminalSearchService implements ITerminalSearchService {
-  @observable
-  show: boolean;
-
-  @observable
-  input = '';
+  protected _isVisible: boolean = false;
+  get isVisible() {
+    return this._isVisible;
+  }
+  set isVisible(value: boolean) {
+    this._isVisible = value;
+    this._onVisibleChange.fire(value);
+  }
 
   @Autowired(ITerminalController)
   controller: ITerminalController;
@@ -19,35 +20,31 @@ export class TerminalSearchService implements ITerminalSearchService {
   @Autowired(ITerminalGroupViewService)
   terminalView: ITerminalGroupViewService;
 
-  protected _onOpen = new Emitter<void>();
-
-  onOpen: Event<void> = this._onOpen.event;
-
-  constructor() {
-    makeObservable(this);
-  }
+  protected _onVisibleChange = new Emitter<boolean>();
+  onVisibleChange: Event<boolean> = this._onVisibleChange.event;
 
   get client(): ITerminalClient | undefined {
     return this.controller.findClientFromWidgetId(this.terminalView.currentWidget.id);
   }
 
   open() {
-    this.show = true;
-    this._onOpen.fire();
+    this.isVisible = true;
   }
 
   close() {
     this.client?.closeSearch();
-    this.show = false;
+    this.isVisible = false;
   }
 
   clear() {
     this.client?.closeSearch();
-    this.input = '';
+    this.text = '';
   }
 
+  text = '';
+
   @debounce(150)
   search() {
-    this.client?.findNext(this.input);
+    this.client?.findNext(this.text);
   }
 }

package/src/common/controller.ts

@@ -102,6 +102,7 @@ export interface ITerminalController extends Disposable {
   onDidCloseTerminal: Event<ITerminalExitEvent>;
   onDidTerminalTitleChange: Event<ITerminalTitleChangeEvent>;
   onDidChangeActiveTerminal: Event<string>;
+  onThemeBackgroundChange: Event<string>;
 
   requestStartExtensionTerminal(
     proxy: ITerminalProcessExtHostProxy,
@@ -115,13 +116,15 @@ export interface ITerminalController extends Disposable {
 
 export const ITerminalSearchService = Symbol('ITerminalSearchService');
 export interface ITerminalSearchService {
-  show: boolean;
-  input: string;
+  isVisible: boolean;
+  onVisibleChange: Event<boolean>;
+
+  text: string;
+
   open(): void;
   clear(): void;
   close(): void;
   search(): void;
-  onOpen: Event<void>;
 }
 
 export const ITerminalGroupViewService = Symbol('ITerminalGroupViewService');

package/src/common/error.ts

@@ -1,4 +1,6 @@
-import { IShellLaunchConfig } from '..';
+import { Event } from '@opensumi/ide-core-common';
+
+import type { IShellLaunchConfig } from './pty';
 
 export enum ETerminalErrorType {
   CREATE_FAIL = 0,
@@ -40,5 +42,6 @@ export function isTerminalError(data: any): data is ITerminalError {
 export const ITerminalErrorService = Symbol('ITerminalErrorService');
 export interface ITerminalErrorService {
   errors: Map<string, ITerminalError>;
+  onErrorsChange: Event<void>;
   fix(clientId: string): Promise<void>;
 }

package/src/node/pty.proxy.ts

@@ -174,7 +174,7 @@ export class PtyServiceProxy implements IPtyProxyRPCService {
     });
 
     const onDataDisposable = ptyInstance?.onData((e) => {
-      this.debugLogger.debug('ptyServiceCenter: onData', JSON.stringify(e), 'pid:', pid, 'callId', callId);
+      this.debugLogger.debug('ptyServiceCenter: onData', e, 'pid:', pid, 'callId', callId);
       if (typeof e === 'string') {
         // 缓存数据的时候只存放前1024个字符，因为正常情况下也不会超过1024个，如果超过的话，基本上是用户误操作导致的cat 二进制文件或者其他未知问题
         // 比如说某个程序一直通过CSI转义命令来以用户不可见的方式增加终端输出内容

package/src/node/terminal.service.client.ts

@@ -68,6 +68,7 @@ export class TerminalServiceClientImpl extends RPCService<IRPCTerminalService> i
 
   processChange(clientId: string, processName: string): void {
     if (this.client) {
+      this.logger.log(`processChange ${clientId} ${processName}`);
       this.client.$processChange(clientId, processName);
     }
   }