@difizen/libro-kernel 0.1.21 → 0.2.0

package/es/kernelspec/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/kernelspec/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAItD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,KAAK,KAAK,UAAU,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;GAEG;AACH,qBACa,iBAAkB,SAAQ,WAAY,YAAW,UAAU,CAAC,QAAQ;IAE/E,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAE/C;;;;OAIG;;IAoCH;;OAEG;IAGH;;OAEG;IAKH;;OAEG;IAKH,IAAI,UAAU,yBAEb;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,WAAW,GAAG,IAAI,CAE9B;IAED;;OAEG;IACH,IAAI,YAAY,IAAI,SAAS,CAAC,WAAW,CAAC,CAEzC;IAED;;OAEG;IACH,IAAa,iBAAiB,IAAI,SAAS,CAAC,KAAK,CAAC,CAEjD;IAED;;OAEG;IACM,OAAO,IAAI,IAAI;IAKxB;;;;;;;;OAQG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;OAEG;cACa,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB7C,UAAmB,wBAAwB,iBAAwB;IAEnE,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC;IAI3B,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAQ;IAC5C,SAAS,CAAC,mBAAmB,uBAA8B;IAC3D,SAAS,CAAC,aAAa,wBAA+B;CACvD;AAED;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IACjC;;OAEG;IACH,UAAiB,QAAS,SAAQ,WAAW,CAAC,QAAQ;QACpD;;WAEG;QACH,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;KACzD;CACF"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/kernelspec/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAItD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,KAAK,KAAK,UAAU,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;GAEG;AACH,qBACa,iBAAkB,SAAQ,WAAY,YAAW,UAAU,CAAC,QAAQ;IAE/E,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAE/C;;;;OAIG;;IAwBH;;OAEG;IAGH;;OAEG;IAKH;;OAEG;IAKH,IAAI,UAAU,yBAEb;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,WAAW,GAAG,IAAI,CAE9B;IAED;;OAEG;IACH,IAAI,YAAY,IAAI,SAAS,CAAC,WAAW,CAAC,CAEzC;IAED;;OAEG;IACH,IAAa,iBAAiB,IAAI,SAAS,CAAC,KAAK,CAAC,CAEjD;IAED;;OAEG;IACM,OAAO,IAAI,IAAI;IAKxB;;;;;;;;OAQG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;OAEG;cACa,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB7C,UAAmB,wBAAwB,iBAAwB;IAEnE,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC;IAI3B,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAQ;IAC5C,SAAS,CAAC,mBAAmB,uBAA8B;IAC3D,SAAS,CAAC,aAAa,wBAA+B;CACvD;AAED;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IACjC;;OAEG;IACH,UAAiB,QAAS,SAAQ,WAAW,CAAC,QAAQ;QACpD;;WAEG;QACH,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;KACzD;CACF"}

package/es/kernelspec/manager.js

@@ -21,6 +21,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'transform-class-properties is enabled and runs after the decorators transform.'); }
 import { deepEqual, Poll } from '@difizen/libro-common';
+import { getOrigin } from '@difizen/mana-app';
 import { Emitter, Deferred } from '@difizen/mana-app';
 import { inject, singleton } from '@difizen/mana-app';
 import { prop } from '@difizen/mana-app';
@@ -43,8 +44,6 @@ export var KernelSpecManager = (_dec = singleton(), _dec2 = inject(ServerManager
     var _this;
     _classCallCheck(this, KernelSpecManager);
     _this = _super.call(this);
-
-    // Initialize internal data.
     _initializerDefineProperty(_this, "serverManager", _descriptor, _assertThisInitialized(_this));
     _initializerDefineProperty(_this, "kernelSpecRestAPI", _descriptor2, _assertThisInitialized(_this));
     // protected _isReady = false;
@@ -53,21 +52,6 @@ export var KernelSpecManager = (_dec = singleton(), _dec2 = inject(ServerManager
     _initializerDefineProperty(_this, "_specs", _descriptor3, _assertThisInitialized(_this));
     _this.specsChangedEmitter = new Emitter();
     _this.specsDeferred = new Deferred();
-    _this._ready = Promise.all([_this.requestSpecs()])
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    .then(function (_) {
-      return undefined;
-    })
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    .catch(function (_) {
-      return undefined;
-    }).then(function () {
-      if (_this.isDisposed) {
-        return;
-      }
-      _this._isReady = true;
-      return;
-    });
     _this._pollSpecs = new Poll({
       auto: false,
       factory: function factory() {
@@ -82,10 +66,27 @@ export var KernelSpecManager = (_dec = singleton(), _dec2 = inject(ServerManager
       standby: 'when-hidden'
       // standby: options.standby ?? 'when-hidden',
     });
-    void _this.ready.then(function () {
-      void _this._pollSpecs.start();
-      return;
-    });
+    // Initialize internal data.
+    _this._ready = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return _this.serverManager.ready;
+          case 2:
+            _context.next = 4;
+            return getOrigin(_this._pollSpecs).start();
+          case 4:
+            _context.next = 6;
+            return getOrigin(_this._pollSpecs).tick;
+          case 6:
+            _this._isReady = true;
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))();
     return _this;
   }
 
@@ -162,20 +163,20 @@ export var KernelSpecManager = (_dec = singleton(), _dec2 = inject(ServerManager
   }, {
     key: "refreshSpecs",
     value: (function () {
-      var _refreshSpecs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _refreshSpecs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context.next = 2;
+              _context2.next = 2;
               return this._pollSpecs.refresh();
             case 2:
-              _context.next = 4;
+              _context2.next = 4;
               return this._pollSpecs.tick;
             case 4:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
       function refreshSpecs() {
         return _refreshSpecs.apply(this, arguments);
@@ -189,23 +190,23 @@ export var KernelSpecManager = (_dec = singleton(), _dec2 = inject(ServerManager
   }, {
     key: "requestSpecs",
     value: (function () {
-      var _requestSpecs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _requestSpecs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var specs;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.next = 2;
+              _context3.next = 2;
               return this.kernelSpecRestAPI.getSpecs(this.serverSettings);
             case 2:
-              specs = _context2.sent;
+              specs = _context3.sent;
               if (specs) {
                 this.specsDeferred.resolve(specs);
               }
               if (!this.isDisposed) {
-                _context2.next = 6;
+                _context3.next = 6;
                 break;
               }
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
             case 6:
               if (!this._specs || !deepEqual(specs, this._specs)) {
                 this._specs = specs;
@@ -213,9 +214,9 @@ export var KernelSpecManager = (_dec = singleton(), _dec2 = inject(ServerManager
               }
             case 7:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function requestSpecs() {
         return _requestSpecs.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-kernel",
-  "version": "0.1.21",
+  "version": "0.2.0",
   "description": "",
   "keywords": [
     "ai-infra",
@@ -32,8 +32,8 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-common": "^0.1.21",
-    "@difizen/libro-core": "^0.1.21",
+    "@difizen/libro-common": "^0.2.0",
+    "@difizen/libro-core": "^0.2.0",
     "@difizen/mana-app": "latest",
     "minimist": "^1.2.8",
     "query-string": "^8.1.0",

package/src/kernelspec/manager.ts

@@ -1,5 +1,6 @@
 import { deepEqual, Poll } from '@difizen/libro-common';
 import type { Event as ManaEvent } from '@difizen/mana-app';
+import { getOrigin } from '@difizen/mana-app';
 import { Emitter, Deferred } from '@difizen/mana-app';
 import { inject, singleton } from '@difizen/mana-app';
 import { prop } from '@difizen/mana-app';
@@ -28,21 +29,6 @@ export class KernelSpecManager extends BaseManager implements KernelSpec.IManage
    */
   constructor() {
     super();
-
-    // Initialize internal data.
-    this._ready = Promise.all([this.requestSpecs()])
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      .then((_) => undefined)
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      .catch((_) => undefined)
-      .then(() => {
-        if (this.isDisposed) {
-          return;
-        }
-        this._isReady = true;
-        return;
-      });
-
     this._pollSpecs = new Poll({
       auto: false,
       factory: () => this.requestSpecs(),
@@ -55,10 +41,13 @@ export class KernelSpecManager extends BaseManager implements KernelSpec.IManage
       standby: 'when-hidden',
       // standby: options.standby ?? 'when-hidden',
     });
-    void this.ready.then(() => {
-      void this._pollSpecs.start();
-      return;
-    });
+    // Initialize internal data.
+    this._ready = (async () => {
+      await this.serverManager.ready;
+      await getOrigin(this._pollSpecs).start();
+      await getOrigin(this._pollSpecs).tick;
+      this._isReady = true;
+    })();
   }
 
   /**