@difizen/libro-terminal 0.1.14 → 0.1.16

package/es/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAU,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAM3E,CAAC;AAEF,qBACa,2BACX,YAAW,mBAAmB,EAAE,sBAAsB;IAEjC,WAAW,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC;IAClC,SAAS,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAC5C,OAAO,EAAE,eAAe,CAAC;IAClD,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;IAS1D,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;CAuBlD"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAU,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAU3E,CAAC;AAEF,qBACa,2BACX,YAAW,mBAAmB,EAAE,sBAAsB;IAEjC,WAAW,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC;IAClC,SAAS,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAC5C,OAAO,EAAE,eAAe,CAAC;IAClD,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;IAS1D,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;CAqClD"}

package/es/command.js

@@ -24,6 +24,10 @@ export var TerminalCommands = {
     id: 'libro-terminal-open',
     label: '新建终端',
     keybind: 'ctrl+`'
+  },
+  CloseTerminal: {
+    id: 'libro-terminal-close',
+    label: '关闭终端'
   }
 };
 export var TerminalCommandContribution = (_dec = singleton({
@@ -52,16 +56,14 @@ export var TerminalCommandContribution = (_dec = singleton({
       var _this = this;
       commands.registerCommand(TerminalCommands['OpenTerminal'], {
         execute: function () {
-          var _execute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var _execute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(name) {
             var terminalView, slot;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   _context.prev = 0;
                   _context.next = 3;
-                  return _this.viewManager.getOrCreateView(LibroTerminalView, {
-                    id: _this.manager.newTerminalName()
-                  });
+                  return _this.viewManager.getOrCreateView(LibroTerminalView, _this.manager.getTerminalArgs(name));
                 case 3:
                   terminalView = _context.sent;
                   _context.next = 6;
@@ -85,12 +87,43 @@ export var TerminalCommandContribution = (_dec = singleton({
               }
             }, _callee, null, [[0, 10]]);
           }));
-          function execute() {
+          function execute(_x) {
             return _execute.apply(this, arguments);
           }
           return execute;
         }()
       });
+      commands.registerCommand(TerminalCommands['CloseTerminal'], {
+        execute: function () {
+          var _execute2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(name) {
+            var terminalView;
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.prev = 0;
+                  _context2.next = 3;
+                  return _this.viewManager.getOrCreateView(LibroTerminalView, _this.manager.getTerminalArgs(name));
+                case 3:
+                  terminalView = _context2.sent;
+                  terminalView.dispose();
+                  _context2.next = 10;
+                  break;
+                case 7:
+                  _context2.prev = 7;
+                  _context2.t0 = _context2["catch"](0);
+                  console.error(_context2.t0);
+                case 10:
+                case "end":
+                  return _context2.stop();
+              }
+            }, _callee2, null, [[0, 7]]);
+          }));
+          function execute(_x2) {
+            return _execute2.apply(this, arguments);
+          }
+          return execute;
+        }()
+      });
     }
   }]);
   return TerminalCommandContribution;

package/es/manager.d.ts

@@ -14,6 +14,7 @@ export declare class TerminalManager implements Disposable, Disposed {
     protected _ready: Promise<void>;
     protected _runningChanged: Emitter<TerminalModel[]>;
     protected _connectionFailure: Emitter<Error>;
+    terminalOptionsCache: Map<any, any>;
     protected _names: string[];
     protected get _models(): TerminalModel[];
     terminalRestAPI: TerminalRestAPI;
@@ -56,6 +57,7 @@ export declare class TerminalManager implements Disposable, Disposed {
      * @returns A new iterator over the running terminals.
      */
     running(): IterableIterator<TerminalModel>;
+    get runningModels(): string[];
     /**
      * Force a refresh of the running terminals.
      *
@@ -101,6 +103,6 @@ export declare class TerminalManager implements Disposable, Disposed {
      */
     protected _onDisposed(terminalConnection: TerminalConnection): void;
     getOrCreate: (options: TerminalOption) => Promise<TerminalConnection>;
-    newTerminalName: () => string;
+    getTerminalArgs: (name?: string) => any;
 }
 //# sourceMappingURL=manager.d.ts.map

package/es/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAgB,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,OAAO,EAAU,MAAM,mBAAmB,CAAC;AAGpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,qBACa,eAAgB,YAAW,UAAU,EAAE,QAAQ;IAC1D,QAAQ,UAAS;IACjB,SAAS,CAAC,QAAQ,UAAS;IAC3B,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC;IAC5B,SAAS,CAAC,oBAAoB,0BAAiC;IAC/D,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,SAAS,CAAC,eAAe,2BAAkC;IAC3D,SAAS,CAAC,kBAAkB,iBAAwB;IAEpD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM;IAChC,SAAS,KAAK,OAAO,IAAI,aAAa,EAAE,CAIvC;IAEwB,eAAe,EAAE,eAAe,CAAC;IAG1D,yBAAyB,EAAE,yBAAyB,CAAC;IACrD,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC;;OAEG;gBACmC,gBAAgB,EAAE,gBAAgB;IAwBxE;;OAEG;IACH,IAAI,cAAc,8CAEjB;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAEzB;IAED;;OAEG;IACH,IAAI,cAAc,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC,CAE3C;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,KAAK,CAAC,KAAK,CAAC,CAEpC;IAED;;OAEG;IACH,OAAO,IAAI,IAAI;IAoBf,SAAS,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,kBAAkB;IAaxD;;;;OAIG;IACH,OAAO,IAAI,gBAAgB,CAAC,aAAa,CAAC;IAI1C;;;;;;;;OAQG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrC;;;;;;;;;;OAUG;IACG,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAMpE;;OAEG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3C;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAelC;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCrC;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAOlE;;OAEG;IACH,SAAS,CAAC,WAAW,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAQnE,WAAW,YAAmB,cAAc,iCAoB1C;IACF,eAAe,eAEb;CACH"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAgB,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAGrE,OAAO,EAAE,OAAO,EAAU,MAAM,mBAAmB,CAAC;AAGpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,qBACa,eAAgB,YAAW,UAAU,EAAE,QAAQ;IAC1D,QAAQ,UAAS;IACjB,SAAS,CAAC,QAAQ,UAAS;IAC3B,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC;IAC5B,SAAS,CAAC,oBAAoB,0BAAiC;IAC/D,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,SAAS,CAAC,eAAe,2BAAkC;IAC3D,SAAS,CAAC,kBAAkB,iBAAwB;IAGpD,oBAAoB,gBAAa;IAKjC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM;IAEhC,SAAS,KAAK,OAAO,IAAI,aAAa,EAAE,CAIvC;IAEwB,eAAe,EAAE,eAAe,CAAC;IAG1D,yBAAyB,EAAE,yBAAyB,CAAC;IACrD,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC;;OAEG;gBACmC,gBAAgB,EAAE,gBAAgB;IAwBxE;;OAEG;IACH,IAAI,cAAc,8CAEjB;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAEzB;IAED;;OAEG;IACH,IAAI,cAAc,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC,CAE3C;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,KAAK,CAAC,KAAK,CAAC,CAEpC;IAED;;OAEG;IACH,OAAO,IAAI,IAAI;IAoBf,SAAS,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,kBAAkB;IAaxD;;;;OAIG;IACH,OAAO,IAAI,gBAAgB,CAAC,aAAa,CAAC;IAI1C,IAAI,aAAa,aAEhB;IAED;;;;;;;;OAQG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrC;;;;;;;;;;OAUG;IACG,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAMpE;;OAEG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3C;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAelC;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCrC;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAOlE;;OAEG;IACH,SAAS,CAAC,WAAW,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAQnE,WAAW,YAAmB,cAAc,iCAoB1C;IAGF,eAAe,UAAW,MAAM,SAW9B;CACH"}

package/es/manager.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -19,12 +19,13 @@ function _initializerWarningHelper(descriptor, context) { throw new Error('Decor
 
 import { Poll } from '@difizen/libro-common';
 import { NetworkError, ServerConnection } from '@difizen/libro-kernel';
+import { prop } from '@difizen/mana-app';
 import { singleton } from '@difizen/mana-app';
 import { Emitter, inject } from '@difizen/mana-app';
 import { v4 } from 'uuid';
 import { TerminalConnectionFactory } from "./protocol.js";
 import { TerminalRestAPI } from "./restapi.js";
-export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI), _dec3 = inject(TerminalConnectionFactory), _dec(_class = (_class2 = /*#__PURE__*/function () {
+export var TerminalManager = (_dec = singleton(), _dec2 = prop(), _dec3 = inject(TerminalRestAPI), _dec4 = inject(TerminalConnectionFactory), _dec(_class = (_class2 = /*#__PURE__*/function () {
   /**
    * Construct a new terminal manager.
    */
@@ -36,11 +37,13 @@ export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI
     this._terminalConnections = new Set();
     this._runningChanged = new Emitter();
     this._connectionFailure = new Emitter();
+    // 缓存创建terminal的参数
+    this.terminalOptionsCache = new Map();
     // As an optimization, we unwrap the models to just store the names.
-    this._names = [];
-    _initializerDefineProperty(this, "terminalRestAPI", _descriptor, this);
+    _initializerDefineProperty(this, "_names", _descriptor, this);
+    _initializerDefineProperty(this, "terminalRestAPI", _descriptor2, this);
     // @inject(ServerConnection) serverConnection: ServerConnection;
-    _initializerDefineProperty(this, "terminalConnectionFactory", _descriptor2, this);
+    _initializerDefineProperty(this, "terminalConnectionFactory", _descriptor3, this);
     this.getOrCreate = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
         var name, cwd, connection, models;
@@ -99,8 +102,21 @@ export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI
         return _ref.apply(this, arguments);
       };
     }();
-    this.newTerminalName = function () {
-      return v4();
+    // 新建和打开一个已有Terminal，二者所需参数不一样
+    this.getTerminalArgs = function (name) {
+      // 通过缓存值作为option创建终端
+      if (_this.terminalOptionsCache.has(name)) {
+        return _this.terminalOptionsCache.get(name);
+      }
+      if (name) {
+        return {
+          name: name
+        };
+      } else {
+        return {
+          id: v4()
+        };
+      }
     };
     this.serverConnection = serverConnection;
     //
@@ -246,6 +262,11 @@ export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI
     value: function running() {
       return this._models[Symbol.iterator]();
     }
+  }, {
+    key: "runningModels",
+    get: function get() {
+      return this._names;
+    }
 
     /**
      * Force a refresh of the running terminals.
@@ -474,12 +495,19 @@ export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI
     }
   }]);
   return TerminalManager;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "terminalRestAPI", [_dec2], {
+}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "_names", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function initializer() {
+    return [];
+  }
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "terminalRestAPI", [_dec3], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "terminalConnectionFactory", [_dec3], {
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "terminalConnectionFactory", [_dec4], {
   configurable: true,
   enumerable: true,
   writable: true,

package/es/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../src/view.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../src/view.tsx"],"names":[],"mappings":"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"}

package/es/view.js

@@ -211,6 +211,7 @@ export var LibroTerminalView = (_dec = transient(), _dec2 = view('libro-terminal
       _this.fitAddon.fit();
     };
     _this.onViewResize = function () {
+      var _this$container;
       // todo 这里为什么没有触发isAttached
       // if (!this.isVisible || !this.isAttached) {
       //   return;
@@ -219,20 +220,29 @@ export var LibroTerminalView = (_dec = transient(), _dec2 = view('libro-terminal
       if (!_this.isVisible) {
         return;
       }
+      if ((_this$container = _this.container) !== null && _this$container !== void 0 && _this$container.current) {
+        if (_this.container.current.offsetHeight === 0) {
+          return;
+        }
+        if (_this.container.current.offsetWidth === 0) {
+          return;
+        }
+      }
+
+      // 触发term的resize 事件
       _this.processResize();
     };
     _this.processResize = function () {
       _this.open();
       _this.resizeTerminal();
-      _this.setSessionSize();
     };
     _this.open = function () {
       try {
-        var _this$container;
+        var _this$container2;
         if (_this.termOpened) {
           return;
         }
-        var node = (_this$container = _this.container) === null || _this$container === void 0 ? void 0 : _this$container.current;
+        var node = (_this$container2 = _this.container) === null || _this$container2 === void 0 ? void 0 : _this$container2.current;
         if (node) {
           _this.term.open(node);
         }
@@ -343,6 +353,7 @@ export var LibroTerminalView = (_dec = transient(), _dec2 = view('libro-terminal
     // bind onSizeChanged
     _this.toDispose.push(_this.term.onResize(function (data) {
       _this.onSizeChangedEmitter.fire(data);
+      _this.setSessionSize();
     }));
 
     // bind ondata
@@ -380,6 +391,7 @@ export var LibroTerminalView = (_dec = transient(), _dec2 = view('libro-terminal
     value: function afterRestore() {
       var _this2 = this;
       this.initConnection().then(function (connection) {
+        _this2.terminalManager.terminalOptionsCache.set(connection.name, _this2.options);
         _this2._isReady = true;
         _this2.connection = connection;
         _this2.onReadyEmitter.fire(true);
@@ -453,6 +465,7 @@ export var LibroTerminalView = (_dec = transient(), _dec2 = view('libro-terminal
           console.error("Terminal not shut down: ".concat(reason));
         });
       }
+      this.terminalManager.terminalOptionsCache.delete(this.name);
       _get(_getPrototypeOf(LibroTerminalView.prototype), "dispose", this).call(this);
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-terminal",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "",
   "keywords": [
     "libro"
@@ -31,9 +31,9 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-core": "^0.1.14",
-    "@difizen/libro-common": "^0.1.14",
-    "@difizen/libro-kernel": "^0.1.14",
+    "@difizen/libro-core": "^0.1.16",
+    "@difizen/libro-common": "^0.1.16",
+    "@difizen/libro-kernel": "^0.1.16",
     "@ant-design/icons": "^5.1.0",
     "@difizen/mana-app": "latest",
     "lodash.throttle": "^4.1.1",

package/src/command.ts

@@ -15,6 +15,10 @@ export const TerminalCommands: Record<string, Command & { keybind?: string }> =
     label: '新建终端',
     keybind: 'ctrl+`',
   },
+  CloseTerminal: {
+    id: 'libro-terminal-close',
+    label: '关闭终端',
+  },
 };
 
 @singleton({ contrib: [CommandContribution, KeybindingContribution] })
@@ -36,15 +40,14 @@ export class TerminalCommandContribution
 
   registerCommands(commands: CommandRegistry): void {
     commands.registerCommand(TerminalCommands['OpenTerminal'], {
-      execute: async () => {
+      execute: async (name?: string) => {
         try {
           const terminalView =
             await this.viewManager.getOrCreateView<LibroTerminalView>(
               LibroTerminalView,
-              {
-                id: this.manager.newTerminalName(),
-              },
+              this.manager.getTerminalArgs(name),
             );
+
           const slot = await this.config.get(terminalDefaultSlot);
           if (slot) {
             this.slotManager.addView(terminalView, slot, {
@@ -56,5 +59,20 @@ export class TerminalCommandContribution
         }
       },
     });
+    commands.registerCommand(TerminalCommands['CloseTerminal'], {
+      execute: async (name: string) => {
+        try {
+          const terminalView =
+            await this.viewManager.getOrCreateView<LibroTerminalView>(
+              LibroTerminalView,
+              this.manager.getTerminalArgs(name),
+            );
+
+          terminalView.dispose();
+        } catch (e) {
+          console.error(e);
+        }
+      },
+    });
   }
 }

package/src/manager.ts

@@ -4,6 +4,7 @@
 import { Poll } from '@difizen/libro-common';
 import { NetworkError, ServerConnection } from '@difizen/libro-kernel';
 import type { Disposable, Disposed, Event } from '@difizen/mana-app';
+import { prop } from '@difizen/mana-app';
 import { singleton } from '@difizen/mana-app';
 import { Emitter, inject } from '@difizen/mana-app';
 import { v4 } from 'uuid';
@@ -22,8 +23,15 @@ export class TerminalManager implements Disposable, Disposed {
   protected _ready: Promise<void>;
   protected _runningChanged = new Emitter<TerminalModel[]>();
   protected _connectionFailure = new Emitter<Error>();
+
+  // 缓存创建terminal的参数
+  terminalOptionsCache = new Map();
+
   // As an optimization, we unwrap the models to just store the names.
+
+  @prop()
   protected _names: string[] = [];
+
   protected get _models(): TerminalModel[] {
     return this._names.map((name) => {
       return { name };
@@ -143,6 +151,10 @@ export class TerminalManager implements Disposable, Disposed {
     return this._models[Symbol.iterator]();
   }
 
+  get runningModels() {
+    return this._names;
+  }
+
   /**
    * Force a refresh of the running terminals.
    *
@@ -284,7 +296,18 @@ export class TerminalManager implements Disposable, Disposed {
     }
     return connection;
   };
-  newTerminalName = () => {
-    return v4();
+
+  // 新建和打开一个已有Terminal，二者所需参数不一样
+  getTerminalArgs = (name?: string) => {
+    // 通过缓存值作为option创建终端
+    if (this.terminalOptionsCache.has(name)) {
+      return this.terminalOptionsCache.get(name);
+    }
+
+    if (name) {
+      return { name: name };
+    } else {
+      return { id: v4() };
+    }
   };
 }

package/src/view.tsx

@@ -182,6 +182,7 @@ export class LibroTerminalView extends BaseStatefulView {
     this.toDispose.push(
       this.term.onResize((data) => {
         this.onSizeChangedEmitter.fire(data);
+        this.setSessionSize();
       }),
     );
 
@@ -221,6 +222,7 @@ export class LibroTerminalView extends BaseStatefulView {
   override afterRestore() {
     this.initConnection()
       .then((connection) => {
+        this.terminalManager.terminalOptionsCache.set(connection.name, this.options);
         this._isReady = true;
         this.connection = connection;
         this.onReadyEmitter.fire(true);
@@ -265,6 +267,9 @@ export class LibroTerminalView extends BaseStatefulView {
         console.error(`Terminal not shut down: ${reason}`);
       });
     }
+
+    this.terminalManager.terminalOptionsCache.delete(this.name);
+
     super.dispose();
   }
 
@@ -455,13 +460,22 @@ export class LibroTerminalView extends BaseStatefulView {
     if (!this.isVisible) {
       return;
     }
+    if (this.container?.current) {
+      if (this.container.current.offsetHeight === 0) {
+        return;
+      }
+      if (this.container.current.offsetWidth === 0) {
+        return;
+      }
+    }
+
+    // 触发term的resize 事件
     this.processResize();
   };
 
   protected processResize = () => {
     this.open();
     this.resizeTerminal();
-    this.setSessionSize();
   };
 
   protected open = (): void => {