@difizen/libro-kernel 0.2.18 → 0.2.20

package/es/server/server-manager.d.ts

@@ -15,6 +15,7 @@ export declare class ServerManager {
     get ready(): Promise<ISpecModels>;
     protected kernelSpecRestAPI: KernelSpecRestAPI;
     constructor(kernelSpecRestAPI: KernelSpecRestAPI);
+    loading: boolean;
     launch(): Promise<ISpecModels>;
     protected doLaunch(): Promise<ISpecModels>;
     protected doGetServerStatus(): Promise<ISpecModels | undefined>;

package/es/server/server-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-manager.d.ts","sourceRoot":"","sources":["../../src/server/server-manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBACa,aAAa;IACxB;;OAEG;IAEH,SAAS,CAAC,EAAE,OAAO,CAAQ;IAE3B;;OAEG;IAEH,MAAM,CAAC,EAAE,OAAO,CAAS;IAGzB,UAAU,CAAC,EAAE,WAAW,CAAC;IAEzB,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,CAA+B;IAErE,IAAI,KAAK,yBAER;IAED,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;gBAER,iBAAiB,EAAE,iBAAiB;IAIrE,MAAM;cAaI,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC;cAchC,iBAAiB,IAAI,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CAYtE"}
+{"version":3,"file":"server-manager.d.ts","sourceRoot":"","sources":["../../src/server/server-manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBACa,aAAa;IACxB;;OAEG;IAEH,SAAS,CAAC,EAAE,OAAO,CAAQ;IAE3B;;OAEG;IAEH,MAAM,CAAC,EAAE,OAAO,CAAS;IAGzB,UAAU,CAAC,EAAE,WAAW,CAAC;IAEzB,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,CAA+B;IAErE,IAAI,KAAK,yBAER;IAED,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;gBAER,iBAAiB,EAAE,iBAAiB;IAI3E,OAAO,UAAS;IAEV,MAAM;cA2BI,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC;cAYhC,iBAAiB,IAAI,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CAYtE"}

package/es/server/server-manager.js

@@ -28,6 +28,7 @@ export var ServerManager = (_dec = singleton(), _dec2 = prop(), _dec3 = prop(),
     _initializerDefineProperty(this, "loaded", _descriptor2, this);
     _initializerDefineProperty(this, "kernelspec", _descriptor3, this);
     this.defer = new Deferred();
+    this.loading = false;
     this.kernelSpecRestAPI = kernelSpecRestAPI;
   }
   ServerManager = inject(KernelSpecRestAPI)(ServerManager, undefined, 0) || ServerManager;
@@ -41,17 +42,33 @@ export var ServerManager = (_dec = singleton(), _dec2 = prop(), _dec3 = prop(),
     value: function () {
       var _launch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var _this = this;
+        var current;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              current = this.defer; // 启动中
+              if (!this.loading) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return", current.promise);
+            case 3:
+              // 启动过
+              if (this.loaded) {
+                this.loaded = false;
+                current = new Deferred();
+                this.defer = current;
+              }
+
+              // 首次启动
+              this.loading = true;
               this.doLaunch().then(function (r) {
-                _this.defer.resolve(r);
-                return;
-              }).catch(function () {
-                //
-              });
-              return _context.abrupt("return", this.defer.promise);
-            case 2:
+                _this.loading = false;
+                _this.loaded = true;
+                return current.resolve(r);
+              }).catch(console.error);
+              return _context.abrupt("return", current.promise);
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -75,24 +92,22 @@ export var ServerManager = (_dec = singleton(), _dec2 = prop(), _dec3 = prop(),
             case 2:
               kernelspec = _context2.sent;
               this.launching = true;
-              this.loaded = false;
               if (kernelspec) {
-                _context2.next = 11;
+                _context2.next = 10;
                 break;
               }
-              _context2.next = 8;
+              _context2.next = 7;
               return timeout(1000);
-            case 8:
-              _context2.next = 10;
+            case 7:
+              _context2.next = 9;
               return this.doLaunch();
-            case 10:
+            case 9:
               return _context2.abrupt("return", _context2.sent);
-            case 11:
+            case 10:
               this.launching = false;
-              this.loaded = true;
               this.kernelspec = kernelspec;
               return _context2.abrupt("return", kernelspec);
-            case 15:
+            case 13:
             case "end":
               return _context2.stop();
           }

package/package.json

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

package/src/server/server-manager.ts

@@ -34,29 +34,43 @@ export class ServerManager {
     this.kernelSpecRestAPI = kernelSpecRestAPI;
   }
 
+  loading = false;
+
   async launch() {
+    let current = this.defer;
+
+    // 启动中
+    if (this.loading) {
+      return current.promise;
+    }
+
+    // 启动过
+    if (this.loaded) {
+      this.loaded = false;
+      current = new Deferred<ISpecModels>();
+      this.defer = current;
+    }
+
+    // 首次启动
+    this.loading = true;
     this.doLaunch()
       .then((r) => {
-        this.defer.resolve(r);
-        return;
+        this.loading = false;
+        this.loaded = true;
+        return current.resolve(r);
       })
-      .catch(() => {
-        //
-      });
-
-    return this.defer.promise;
+      .catch(console.error);
+    return current.promise;
   }
 
   protected async doLaunch(): Promise<ISpecModels> {
     const kernelspec = await this.doGetServerStatus();
     this.launching = true;
-    this.loaded = false;
     if (!kernelspec) {
       await timeout(1000);
       return await this.doLaunch();
     }
     this.launching = false;
-    this.loaded = true;
     this.kernelspec = kernelspec;
     return kernelspec;
   }