@difizen/libro-terminal 0.1.7 → 0.1.8

package/es/connection.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { ISettings } from '@difizen/libro-kernel';
 import { ServerConnection } from '@difizen/libro-kernel';
 import type { Disposable, Disposed, Event } from '@difizen/mana-app';
 import { Emitter } from '@difizen/mana-app';
@@ -19,13 +18,14 @@ export declare class TerminalConnection implements Disposable, Disposed {
     protected _reconnectAttempt: number;
     protected _pendingMessages: TerminalMessage[];
     terminalRestAPI: TerminalRestAPI;
+    serverConnection: ServerConnection;
     disposed: boolean;
     /**
      * Construct a new terminal session.
      */
     constructor(options: TerminalOption & {
         name: string;
-    }, serverConnection: ServerConnection);
+    });
     /**
      * A signal emitted when a message is received from the server.
      */
@@ -42,7 +42,7 @@ export declare class TerminalConnection implements Disposable, Disposed {
     /**
      * The server settings for the session.
      */
-    readonly serverSettings: ISettings;
+    get serverSettings(): import("@difizen/libro-kernel").ISettings;
     /**
      * Dispose of the resources held by the session.
      */

package/es/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAGrE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAG5C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACb,wBAAwB,EAEzB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,qBACa,kBAAmB,YAAW,UAAU,EAAE,QAAQ;IAC7D,SAAS,CAAC,WAAW,gBAAuB;IAC5C,SAAS,CAAC,gBAAgB,2BAAkC;IAC5D,SAAS,CAAC,iBAAiB,EAAE,wBAAwB,CAAgB;IACrE,SAAS,CAAC,wBAAwB,oCAA2C;IAC7E,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAa;IACzD,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAa;IACtC,SAAS,CAAC,KAAK,aAEb;IACF,SAAS,CAAC,eAAe,SAAK;IAC9B,SAAS,CAAC,iBAAiB,SAAK;IAChC,SAAS,CAAC,gBAAgB,EAAE,eAAe,EAAE,CAAM;IAC1B,eAAe,EAAE,eAAe,CAAC;IAE1D,QAAQ,UAAS;IAEjB;;OAEG;gBAEuB,OAAO,EAAE,cAAc,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EACxC,gBAAgB,EAAE,gBAAgB;IAO9D;;OAEG;IACH,IAAI,eAAe,IAAI,KAAK,CAAC,eAAe,CAAC,CAE5C;IAED,IAAI,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,CAE5B;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,aAAa,CAEzB;IAED;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC;IAEnC;;OAEG;IACH,OAAO,IAAI,IAAI;IAUf;;;;;;OAMG;IACH,IAAI,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAIpC;;;;OAIG;IACH,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,UAAO,GAAG,IAAI;IAc1D;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IAa9B,oBAAoB,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7C;;OAEG;IACH,SAAS,QAAO,QAAQ,IAAI,CAAC,CA2B3B;IAEF;;OAEG;IACH,UAAU,IAAI,IAAI;IA+BlB;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IAY9B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B;;;;;OAKG;IACH,SAAS,CAAC,aAAa,aAiCrB;IAGF,SAAS,CAAC,YAAY,UAAW,YAAY,UAsB3C;IAEF,SAAS,CAAC,UAAU,UAAW,UAAU,UAKvC;IAEF;;OAEG;IACH,SAAS,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,wBAAwB,GAAG,IAAI;IAsBnF,SAAS,CAAC,gBAAgB;IAM1B,IAAI,uBAAuB,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAE7D;IAED,IAAI,gBAAgB,IAAI,wBAAwB,CAE/C;CACF;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAItE"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAGrE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAG5C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACb,wBAAwB,EAEzB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,qBACa,kBAAmB,YAAW,UAAU,EAAE,QAAQ;IAC7D,SAAS,CAAC,WAAW,gBAAuB;IAC5C,SAAS,CAAC,gBAAgB,2BAAkC;IAC5D,SAAS,CAAC,iBAAiB,EAAE,wBAAwB,CAAgB;IACrE,SAAS,CAAC,wBAAwB,oCAA2C;IAC7E,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAa;IACzD,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAa;IACtC,SAAS,CAAC,KAAK,aAEb;IACF,SAAS,CAAC,eAAe,SAAK;IAC9B,SAAS,CAAC,iBAAiB,SAAK;IAChC,SAAS,CAAC,gBAAgB,EAAE,eAAe,EAAE,CAAM;IAC1B,eAAe,EAAE,eAAe,CAAC;IAChC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7D,QAAQ,UAAS;IAEjB;;OAEG;gBACiC,OAAO,EAAE,cAAc,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAK9E;;OAEG;IACH,IAAI,eAAe,IAAI,KAAK,CAAC,eAAe,CAAC,CAE5C;IAED,IAAI,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,CAE5B;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,aAAa,CAEzB;IAED;;OAEG;IACH,IAAI,cAAc,8CAEjB;IAED;;OAEG;IACH,OAAO,IAAI,IAAI;IAUf;;;;;;OAMG;IACH,IAAI,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAIpC;;;;OAIG;IACH,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,UAAO,GAAG,IAAI;IAc1D;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IAa9B,oBAAoB,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7C;;OAEG;IACH,SAAS,QAAO,QAAQ,IAAI,CAAC,CA2B3B;IAEF;;OAEG;IACH,UAAU,IAAI,IAAI;IA+BlB;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IAY9B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B;;;;;OAKG;IACH,SAAS,CAAC,aAAa,aAiCrB;IAGF,SAAS,CAAC,YAAY,UAAW,YAAY,UAsB3C;IAEF,SAAS,CAAC,UAAU,UAAW,UAAU,UAKvC;IAEF;;OAEG;IACH,SAAS,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,wBAAwB,GAAG,IAAI;IAsBnF,SAAS,CAAC,gBAAgB;IAM1B,IAAI,uBAAuB,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAE7D;IAED,IAAI,gBAAgB,IAAI,wBAAwB,CAE/C;CACF;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAItE"}

package/es/connection.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, _class, _class2, _descriptor;
+var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -25,11 +25,11 @@ import { Emitter } from '@difizen/mana-app';
 import { inject } from '@difizen/mana-app';
 import { TerminalOption } from "./protocol.js";
 import { TerminalRestAPI } from "./restapi.js";
-export var TerminalConnection = (_dec = transient(), _dec2 = inject(TerminalRestAPI), _dec(_class = (_class2 = /*#__PURE__*/function () {
+export var TerminalConnection = (_dec = transient(), _dec2 = inject(TerminalRestAPI), _dec3 = inject(ServerConnection), _dec(_class = (_class2 = /*#__PURE__*/function () {
   /**
    * Construct a new terminal session.
    */
-  function TerminalConnection(options, serverConnection) {
+  function TerminalConnection(options) {
     var _this = this;
     _classCallCheck(this, TerminalConnection);
     this._onDisposed = new Emitter();
@@ -45,6 +45,7 @@ export var TerminalConnection = (_dec = transient(), _dec2 = inject(TerminalRest
     this._reconnectAttempt = 0;
     this._pendingMessages = [];
     _initializerDefineProperty(this, "terminalRestAPI", _descriptor, this);
+    _initializerDefineProperty(this, "serverConnection", _descriptor2, this);
     this.disposed = false;
     /**
      * Reconnect to a terminal.
@@ -135,7 +136,6 @@ export var TerminalConnection = (_dec = transient(), _dec2 = inject(TerminalRest
         _this._reconnect();
       }
     };
-    this.serverSettings = serverConnection.settings;
     this._name = options.name;
     this._createSocket();
   }
@@ -143,7 +143,6 @@ export var TerminalConnection = (_dec = transient(), _dec2 = inject(TerminalRest
   /**
    * A signal emitted when a message is received from the server.
    */
-  TerminalConnection = inject(ServerConnection)(TerminalConnection, undefined, 1) || TerminalConnection;
   TerminalConnection = inject(TerminalOption)(TerminalConnection, undefined, 0) || TerminalConnection;
   _createClass(TerminalConnection, [{
     key: "messageReceived",
@@ -180,12 +179,17 @@ export var TerminalConnection = (_dec = transient(), _dec2 = inject(TerminalRest
      * The server settings for the session.
      */
   }, {
-    key: "dispose",
-    value:
+    key: "serverSettings",
+    get: function get() {
+      return this.serverConnection.settings;
+    }
+
     /**
      * Dispose of the resources held by the session.
      */
-    function dispose() {
+  }, {
+    key: "dispose",
+    value: function dispose() {
       if (this.disposed) {
         return;
       }
@@ -377,6 +381,11 @@ export var TerminalConnection = (_dec = transient(), _dec2 = inject(TerminalRest
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "serverConnection", [_dec3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 export function getRandomIntInclusive(min, max) {
   min = Math.ceil(min);

package/es/manager.d.ts

@@ -1,5 +1,4 @@
 import { Poll } from '@difizen/libro-common';
-import type { ISettings } from '@difizen/libro-kernel';
 import { ServerConnection } from '@difizen/libro-kernel';
 import type { Disposable, Disposed, Event } from '@difizen/mana-app';
 import { Emitter } from '@difizen/mana-app';
@@ -19,14 +18,15 @@ export declare class TerminalManager implements Disposable, Disposed {
     protected get _models(): TerminalModel[];
     terminalRestAPI: TerminalRestAPI;
     terminalConnectionFactory: TerminalConnectionFactory;
+    serverConnection: ServerConnection;
     /**
      * Construct a new terminal manager.
      */
-    constructor(serverConnection: ServerConnection);
+    constructor();
     /**
      * The server settings of the manager.
      */
-    readonly serverSettings: ISettings;
+    get serverSettings(): import("@difizen/libro-kernel").ISettings;
     /**
      * Test whether the manager is ready.
      */

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,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,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;AAEpD,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;;OAEG;gBACmC,gBAAgB,EAAE,gBAAgB;IAyBxE;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC;IAEnC;;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;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;AAErE,OAAO,EAAE,OAAO,EAAU,MAAM,mBAAmB,CAAC;AAEpD,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;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IAE7D;;OAEG;;IAwBH;;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;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; }
@@ -23,11 +23,11 @@ import { singleton } from '@difizen/mana-app';
 import { Emitter, inject } from '@difizen/mana-app';
 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 = inject(TerminalRestAPI), _dec3 = inject(TerminalConnectionFactory), _dec4 = inject(ServerConnection), _dec(_class = (_class2 = /*#__PURE__*/function () {
   /**
    * Construct a new terminal manager.
    */
-  function TerminalManager(serverConnection) {
+  function TerminalManager() {
     var _this = this;
     _classCallCheck(this, TerminalManager);
     this.disposed = false;
@@ -40,6 +40,7 @@ export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI
     _initializerDefineProperty(this, "terminalRestAPI", _descriptor, this);
     // @inject(ServerConnection) serverConnection: ServerConnection;
     _initializerDefineProperty(this, "terminalConnectionFactory", _descriptor2, this);
+    _initializerDefineProperty(this, "serverConnection", _descriptor3, this);
     this.getOrCreate = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
         var name, cwd, connection, models;
@@ -98,8 +99,6 @@ export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI
         return _ref.apply(this, arguments);
       };
     }();
-    this.serverSettings = serverConnection.settings;
-
     //
     // Start polling with exponential backoff.
     this._pollModels = new Poll({
@@ -139,7 +138,6 @@ export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI
   /**
    * The server settings of the manager.
    */
-  TerminalManager = inject(ServerConnection)(TerminalManager, undefined, 0) || TerminalManager;
   _createClass(TerminalManager, [{
     key: "_models",
     get: function get() {
@@ -150,12 +148,17 @@ export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI
       });
     }
   }, {
-    key: "isReady",
-    get:
+    key: "serverSettings",
+    get: function get() {
+      return this.serverConnection.settings;
+    }
+
     /**
      * Test whether the manager is ready.
      */
-    function get() {
+  }, {
+    key: "isReady",
+    get: function get() {
       return this._isReady;
     }
 
@@ -471,4 +474,9 @@ export var TerminalManager = (_dec = singleton(), _dec2 = inject(TerminalRestAPI
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "serverConnection", [_dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-terminal",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "",
   "keywords": [
     "libro"
@@ -31,9 +31,9 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-core": "^0.1.7",
-    "@difizen/libro-common": "^0.1.7",
-    "@difizen/libro-kernel": "^0.1.7",
+    "@difizen/libro-core": "^0.1.8",
+    "@difizen/libro-common": "^0.1.8",
+    "@difizen/libro-kernel": "^0.1.8",
     "@difizen/mana-app": "latest",
     "@ant-design/icons": "^5.1.0",
     "xterm-addon-search": "^0.13.0",

package/src/connection.ts

@@ -1,6 +1,5 @@
 import type { JSONPrimitive } from '@difizen/libro-common';
 import { URL } from '@difizen/libro-common';
-import type { ISettings } from '@difizen/libro-kernel';
 import { ServerConnection } from '@difizen/libro-kernel';
 import type { Disposable, Disposed, Event } from '@difizen/mana-app';
 import { transient } from '@difizen/mana-app';
@@ -33,17 +32,14 @@ export class TerminalConnection implements Disposable, Disposed {
   protected _reconnectAttempt = 0;
   protected _pendingMessages: TerminalMessage[] = [];
   @inject(TerminalRestAPI) terminalRestAPI: TerminalRestAPI;
+  @inject(ServerConnection) serverConnection: ServerConnection;
 
   disposed = false;
 
   /**
    * Construct a new terminal session.
    */
-  constructor(
-    @inject(TerminalOption) options: TerminalOption & { name: string },
-    @inject(ServerConnection) serverConnection: ServerConnection,
-  ) {
-    this.serverSettings = serverConnection.settings;
+  constructor(@inject(TerminalOption) options: TerminalOption & { name: string }) {
     this._name = options.name;
     this._createSocket();
   }
@@ -76,7 +72,9 @@ export class TerminalConnection implements Disposable, Disposed {
   /**
    * The server settings for the session.
    */
-  readonly serverSettings: ISettings;
+  get serverSettings() {
+    return this.serverConnection.settings;
+  }
 
   /**
    * Dispose of the resources held by the session.

package/src/manager.ts

@@ -2,7 +2,6 @@
 // Distributed under the terms of the Modified BSD License.
 
 import { Poll } from '@difizen/libro-common';
-import type { ISettings } from '@difizen/libro-kernel';
 import { NetworkError, ServerConnection } from '@difizen/libro-kernel';
 import type { Disposable, Disposed, Event } from '@difizen/mana-app';
 import { singleton } from '@difizen/mana-app';
@@ -34,12 +33,12 @@ export class TerminalManager implements Disposable, Disposed {
   // @inject(ServerConnection) serverConnection: ServerConnection;
   @inject(TerminalConnectionFactory)
   terminalConnectionFactory: TerminalConnectionFactory;
+  @inject(ServerConnection) serverConnection: ServerConnection;
+
   /**
    * Construct a new terminal manager.
    */
-  constructor(@inject(ServerConnection) serverConnection: ServerConnection) {
-    this.serverSettings = serverConnection.settings;
-
+  constructor() {
     //
     // Start polling with exponential backoff.
     this._pollModels = new Poll({
@@ -65,7 +64,9 @@ export class TerminalManager implements Disposable, Disposed {
   /**
    * The server settings of the manager.
    */
-  readonly serverSettings: ISettings;
+  get serverSettings() {
+    return this.serverConnection.settings;
+  }
 
   /**
    * Test whether the manager is ready.