@difizen/libro-kernel 0.1.1 → 0.1.2

package/es/libro-kernel-connection-manager.d.ts

@@ -5,7 +5,7 @@ import { LibroSessionManager } from './session/libro-session-manager.js';
 export declare class LibroKernelConnectionManager {
     protected sessionManager: LibroSessionManager;
     protected kernelManager: LibroKernelManager;
-    private kernelConnectionMap;
+    protected kernelConnectionMap: Map<string, IKernelConnection>;
     constructor(sessionManager: LibroSessionManager, kernelManager: LibroKernelManager);
     startNew(fileInfo: IContentsModel): Promise<IKernelConnection | undefined>;
     changeKernel(fileInfo: IContentsModel, reuseKernelInfo: {

package/es/libro-kernel-connection-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-kernel-connection-manager.d.ts","sourceRoot":"","sources":["../src/libro-kernel-connection-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,qBACa,4BAA4B;IACvC,SAAS,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAC9C,SAAS,CAAC,aAAa,EAAE,kBAAkB,CAAC;IAG5C,OAAO,CAAC,mBAAmB,CAAiC;gBAG7B,cAAc,EAAE,mBAAmB,EACpC,aAAa,EAAE,kBAAkB;IAOzD,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAS1E,YAAY,CAChB,QAAQ,EAAE,cAAc,EACxB,eAAe,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IAa1C,UAAU,CAAC,QAAQ,EAAE,cAAc;IAYzC,uBAAuB;IAIvB,mBAAmB,CAAC,QAAQ,EAAE,cAAc;CAO7C"}
+{"version":3,"file":"libro-kernel-connection-manager.d.ts","sourceRoot":"","sources":["../src/libro-kernel-connection-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,qBACa,4BAA4B;IACvC,SAAS,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAC9C,SAAS,CAAC,aAAa,EAAE,kBAAkB,CAAC;IAG5C,SAAS,CAAC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBAG/B,cAAc,EAAE,mBAAmB,EACpC,aAAa,EAAE,kBAAkB;IAOzD,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAS1E,YAAY,CAChB,QAAQ,EAAE,cAAc,EACxB,eAAe,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IAa1C,UAAU,CAAC,QAAQ,EAAE,cAAc;IAYzC,uBAAuB;IAIvB,mBAAmB,CAAC,QAAQ,EAAE,cAAc;CAO7C"}

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

@@ -1 +1 @@
-{"version":3,"file":"server-connection.d.ts","sourceRoot":"","sources":["../../src/server/server-connection.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAgBjE,qBACa,gBAAgB;IAE3B,QAAQ,EAAE,SAAS,CAAC;;IASpB,cAAc,CAAC,OAAO,GAAE,OAAO,CAAC,SAAS,CAAM,GAAG,SAAS;IAoC3D;;;;;;;;;;;;OAYG;IACH,WAAW,CACT,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,WAAW,EACjB,QAAQ,GAAE,SAAyB,GAClC,OAAO,CAAC,QAAQ,CAAC;IA+CpB;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAK5C"}
+{"version":3,"file":"server-connection.d.ts","sourceRoot":"","sources":["../../src/server/server-connection.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAgBjE,qBACa,gBAAgB;IAE3B,QAAQ,EAAE,SAAS,CAAC;;IAMpB,cAAc,CAAC,OAAO,GAAE,OAAO,CAAC,SAAS,CAAM,GAAG,SAAS;IAwC3D;;;;;;;;;;;;OAYG;IACH,WAAW,CACT,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,WAAW,EACjB,QAAQ,GAAE,SAAyB,GAClC,OAAO,CAAC,QAAQ,CAAC;IA+CpB;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAK5C"}

package/es/server/server-connection.js

@@ -31,10 +31,7 @@ export var ServerConnection = (_dec = singleton(), _dec2 = prop(), _dec(_class =
   function ServerConnection() {
     _classCallCheck(this, ServerConnection);
     _initializerDefineProperty(this, "settings", _descriptor, this);
-    this.updateSettings({
-      baseUrl: 'http://localhost:8000/',
-      wsUrl: 'ws://localhost:8888/'
-    });
+    this.updateSettings({});
   }
   _createClass(ServerConnection, [{
     key: "updateSettings",
@@ -44,10 +41,14 @@ export var ServerConnection = (_dec = singleton(), _dec2 = prop(), _dec(_class =
       var pageBaseUrl = PageConfig.getBaseUrl();
       var pageWsUrl = PageConfig.getWsUrl();
       var baseUrl = URL.normalize(options.baseUrl) || pageBaseUrl;
-      var wsUrl = options.wsUrl;
-      // Prefer the default wsUrl if we are using the default baseUrl.
-      if (!wsUrl && baseUrl === pageBaseUrl) {
-        wsUrl = pageWsUrl;
+      if (!baseUrl) {
+        baseUrl = window.location.origin + '/';
+      } else if (baseUrl.startsWith('/')) {
+        baseUrl = window.location.origin + baseUrl;
+      }
+      var wsUrl = options.wsUrl || pageWsUrl;
+      if (wsUrl.startsWith('/')) {
+        wsUrl = 'ws' + (window.location.origin + wsUrl).slice(4);
       }
       // Otherwise convert the baseUrl to a wsUrl if possible.
       if (!wsUrl && baseUrl.indexOf('http') === 0) {

package/es/session/libro-session-manager.d.ts

@@ -10,6 +10,7 @@ import type { ISettings } from '../server/index.js';
 import { ServerManager } from '../server/server-manager.js';
 import { LibroSessionFactory } from './libro-session-protocol.js';
 import type { SessionIModel } from './libro-session-protocol.js';
+import type { DeepPartial } from './restapi.js';
 import { SessionRestAPI } from './restapi.js';
 export declare class LibroSessionManager {
     protected sessionFactory: LibroSessionFactory;
@@ -56,7 +57,7 @@ export declare class LibroSessionManager {
     /**
      * Send a PATCH to the server, updating the session path or the kernel.
      */
-    private _patch;
+    protected _patch(body: DeepPartial<SessionIModel>, sessionId?: string): Promise<SessionIModel>;
     /**
      * Change the kernel.
      *

package/es/session/libro-session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-session-manager.d.ts","sourceRoot":"","sources":["../../src/session/libro-session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG/C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAEV,YAAY,EACZ,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAGV,aAAa,EACd,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAY9C,qBACa,mBAAmB;IAC9B,SAAS,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAC9C,SAAS,CAAC,aAAa,EAAE,kBAAkB,CAAC;IACpB,cAAc,EAAE,cAAc,CAAC;IAGvD,YAAY,sBAA6B;IAEzC,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC;IACnC,SAAS,CAAC,aAAa,EAAE,kBAAkB,CAAC;IAC5C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC;IAC5B,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,SAAS,CAAC,QAAQ,UAAS;IAC3B,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IACzC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC9C,SAAS,CAAC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBAGhC,aAAa,EAAE,kBAAkB,EACtC,aAAa,EAAE,aAAa,EACtB,cAAc,EAAE,mBAAmB,EACpC,aAAa,EAAE,kBAAkB,EACrC,cAAc,EAAE,cAAc;IAmCxD;;OAEG;cACa,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC/C,SAAS,CAAC,kBAAkB,iBAAwB;IAEpD;;OAEG;IACH,IAAI,iBAAiB,IAAI,KAAK,CAAC,KAAK,CAAC,CAEpC;IAGD,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IAErC,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM;IAIhD,UAAU,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,EAAE,iBAAiB;IAO1D,eAAe,CACnB,QAAQ,EAAE,cAAc,EACxB,eAAe,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAC7C,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAwEnC,QAAQ,CAAC,QAAQ,EAAE,cAAc;IA2CvC;;;;;;;;OAQG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrC;;OAEG;YACW,MAAM;IAapB;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAC7B,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;CAuDrC"}
+{"version":3,"file":"libro-session-manager.d.ts","sourceRoot":"","sources":["../../src/session/libro-session-manager.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/libro-kernel-connection-manager.ts

@@ -12,7 +12,7 @@ export class LibroKernelConnectionManager {
   protected kernelManager: LibroKernelManager;
 
   @prop()
-  private kernelConnectionMap: Map<string, IKernelConnection>;
+  protected kernelConnectionMap: Map<string, IKernelConnection>;
 
   constructor(
     @inject(LibroSessionManager) sessionManager: LibroSessionManager,

package/src/server/server-connection.ts

@@ -26,20 +26,21 @@ export class ServerConnection {
   settings: ISettings;
 
   constructor() {
-    this.updateSettings({
-      baseUrl: 'http://localhost:8000/',
-      wsUrl: 'ws://localhost:8888/',
-    });
+    this.updateSettings({});
   }
 
   updateSettings(options: Partial<ISettings> = {}): ISettings {
     const pageBaseUrl = PageConfig.getBaseUrl();
     const pageWsUrl = PageConfig.getWsUrl();
-    const baseUrl = URL.normalize(options.baseUrl) || pageBaseUrl;
-    let wsUrl = options.wsUrl;
-    // Prefer the default wsUrl if we are using the default baseUrl.
-    if (!wsUrl && baseUrl === pageBaseUrl) {
-      wsUrl = pageWsUrl;
+    let baseUrl = URL.normalize(options.baseUrl) || pageBaseUrl;
+    if (!baseUrl) {
+      baseUrl = window.location.origin + '/';
+    } else if (baseUrl.startsWith('/')) {
+      baseUrl = window.location.origin + baseUrl;
+    }
+    let wsUrl = options.wsUrl || pageWsUrl;
+    if (wsUrl.startsWith('/')) {
+      wsUrl = 'ws' + (window.location.origin + wsUrl).slice(4);
     }
     // Otherwise convert the baseUrl to a wsUrl if possible.
     if (!wsUrl && baseUrl.indexOf('http') === 0) {

package/src/session/libro-session-manager.ts

@@ -294,7 +294,7 @@ export class LibroSessionManager {
   /**
    * Send a PATCH to the server, updating the session path or the kernel.
    */
-  private async _patch(
+  protected async _patch(
     body: DeepPartial<SessionIModel>,
     sessionId?: string,
   ): Promise<SessionIModel> {