jupytercad-lab works

package.json

@@ -40,7 +40,9 @@
         "lint": "jlpm run prettier && jlpm run eslint",
         "test": "lerna run test",
         "dev": "python scripts/dev-install.py",
-        "watch": "lerna run --stream watch"
+        "watch:lib": "lerna run --stream watch",
+        "watch": "lerna watch --scope @jupytercad/jupytercad-lab -- lerna run build --since",
+        "build:lab": "lerna run --ignore @jupytercad/jupytercad-app build"
     },
     "resolutions": {
         "@jupyterlab/apputils": "~4.0.0",

packages/base/package.json

@@ -39,7 +39,6 @@
         "@jupyter/collaboration": "^1.0.0",
         "@jupyter/docprovider": "^1.0.0",
         "@jupyter/ydoc": "^0.3.4 || ^1.0.2",
-        "@jupytercad/occ-worker": "^0.3.3",
         "@jupytercad/opencascade": "^0.3.3",
         "@jupytercad/schema": "^0.3.3",
         "@jupyterlab/application": "^4.0.0",

packages/base/src/index.ts

@@ -28,7 +28,6 @@
 export * from './commands';
 export * from './formdialog';
 export * from './mainview';
-export * from './token';
 export * from './tools';
 export * from './types';
 export * from './widget';

packages/base/src/mainview.tsx

@@ -11,6 +11,8 @@ import {
   IAnnotation,
   IDict,
   IJcadObjectDocChange,
+  IJCadWorker,
+  IJCadWorkerRegistry,
   IJupyterCadClientState,
   IJupyterCadDoc,
   IJupyterCadModel
@@ -34,7 +36,6 @@ import { v4 as uuid } from 'uuid';
 import { FloatingAnnotation } from './annotation/view';
 import { getCSSVariableColor, throttle } from './tools';
 import { AxeHelper, CameraSettings, ExplodedView } from './types';
-import { IJCadWorker, IJCadWorkerRegistry } from './token';
 
 // Apply the BVH extension
 THREE.BufferGeometry.prototype.computeBoundsTree = computeBoundsTree;
@@ -103,28 +104,23 @@ export class MainView extends React.Component<IProps, IStates> {
     const lightTheme =
       document.body.getAttribute('data-jp-theme-light') === 'true';
 
+    this._worker = props.workerRegistry?.getWorker(OCC_WORKER_ID);
+
+    const id = this._worker!.initChannel();
+    this._worker!.registerHandler(id, this.messageHandler.bind(this));
+
     this.state = {
-      id: uuid(),
+      id,
       lightTheme,
       loading: true,
       annotations: {},
       firstLoad: true
     };
 
     this._model = this.props.jcadModel;
-    this._worker = props.workerRegistry?.getWorker(OCC_WORKER_ID);
-    console.log('worker is ', this._worker);
 
     this._pointer = new THREE.Vector2();
     this._collaboratorPointers = {};
-    this._messageChannel = new MessageChannel();
-    this._messageChannel.port1.onmessage = msgEvent => {
-      this.messageHandler(msgEvent.data);
-    };
-    this._postMessage(
-      { action: WorkerAction.REGISTER, payload: { id: this.state.id } },
-      this._messageChannel.port2
-    );
     this._model.themeChanged.connect(this._handleThemeChange, this);
 
     this._model.sharedObjectsChanged.connect(
@@ -397,8 +393,6 @@ export class MainView extends React.Component<IProps, IStates> {
         break;
       }
       case MainAction.INITIALIZED: {
-        console.log('im here11');
-
         if (!this._model) {
           return;
         }
@@ -701,17 +695,10 @@ export class MainView extends React.Component<IProps, IStates> {
     this.setState(old => ({ ...old, loading: false }));
   };
 
-  private _postMessage = (
-    msg: Omit<IWorkerMessage, 'id'>,
-    port?: MessagePort
-  ) => {
+  private _postMessage = (msg: Omit<IWorkerMessage, 'id'>) => {
     if (this._worker) {
       const newMsg = { ...msg, id: this.state.id };
-      if (port) {
-        this._worker.postMessage(newMsg, [port]);
-      } else {
-        this._worker.postMessage(newMsg);
-      }
+      this._worker.postMessage(newMsg);
     }
   };
 
@@ -921,11 +908,12 @@ export class MainView extends React.Component<IProps, IStates> {
     });
   };
 
-  private _onSharedObjectsChanged(
+  private async _onSharedObjectsChanged(
     _: IJupyterCadDoc,
     change: IJcadObjectDocChange
-  ): void {
+  ): Promise<void> {
     if (change.objectChange) {
+      await this._worker!.ready;
       this._postMessage({
         action: WorkerAction.LOAD_FILE,
         payload: {

packages/base/src/panelview/leftpanel.tsx

@@ -1,7 +1,10 @@
-import { IAnnotationModel, JupyterCadDoc } from '@jupytercad/schema';
+import {
+  IAnnotationModel,
+  JupyterCadDoc,
+  IJupyterCadTracker
+} from '@jupytercad/schema';
 import { SidePanel } from '@jupyterlab/ui-components';
 
-import { IJupyterCadTracker } from '../token';
 import { IControlPanelModel } from '../types';
 import { Annotations } from './annotations';
 import { ControlPanelHeader } from './header';

packages/base/src/panelview/model.ts

@@ -1,8 +1,8 @@
 import { IJupyterCadDoc, IJupyterCadModel } from '@jupytercad/schema';
 import { ISignal } from '@lumino/signaling';
 
-import { IJupyterCadTracker } from '../token';
-import { IControlPanelModel, IJupyterCadWidget } from '../types';
+import { IJupyterCadTracker, IJupyterCadWidget } from '@jupytercad/schema';
+import { IControlPanelModel } from '../types';
 
 export class ControlPanelModel implements IControlPanelModel {
   constructor(options: ControlPanelModel.IOptions) {

packages/base/src/types.ts

@@ -1,8 +1,6 @@
-import { IDocumentWidget } from '@jupyterlab/docregistry';
-import { ReactWidget } from '@jupyterlab/ui-components';
 import { ISignal } from '@lumino/signaling';
 import { IJupyterCadModel, IJupyterCadDoc, IDict } from '@jupytercad/schema';
-import { IJupyterCadTracker } from './token';
+import { IJupyterCadTracker, IJupyterCadWidget } from '@jupytercad/schema';
 
 export { IDict };
 export type ValueOf<T> = T[keyof T];
@@ -30,8 +28,6 @@ export type CameraSettings = {
   type: 'Perspective' | 'Orthographic';
 };
 
-export type IJupyterCadWidget = IDocumentWidget<ReactWidget, IJupyterCadModel>;
-
 export interface IControlPanelModel {
   disconnect(f: any): void;
   documentChanged: ISignal<IJupyterCadTracker, IJupyterCadWidget | null>;

packages/base/src/widget.tsx

@@ -7,13 +7,8 @@ import { ISignal, Signal } from '@lumino/signaling';
 import * as React from 'react';
 
 import { MainView } from './mainview';
-import {
-  AxeHelper,
-  CameraSettings,
-  ExplodedView,
-  IJupyterCadWidget
-} from './types';
-import { IJCadWorkerRegistry } from './token';
+import { AxeHelper, CameraSettings, ExplodedView } from './types';
+import { IJCadWorkerRegistry, IJupyterCadWidget } from '@jupytercad/schema';
 
 export class JupyterCadWidget
   extends DocumentWidget<JupyterCadPanel, IJupyterCadModel>

packages/occ-worker/src/occworker.ts

@@ -15,27 +15,38 @@ export class OccWorker implements IJCadWorker {
     return this._ready.promise;
   }
 
-  initialize(): string {
+  initChannel(): string {
     const messageChannel = new MessageChannel();
     messageChannel.port1.onmessage = this._processMessage.bind(this);
     const id = uuid();
+    this._messageChannels.set(id, messageChannel);
     const initMessage = {
+      id,
       action: WorkerAction.REGISTER,
       payload: { id }
     };
     this._nativeWorker.postMessage(initMessage, [messageChannel.port2]);
     return id;
   }
+  removeChannel(id: string): void {
+    this._handlers.delete(id);
+    this._messageChannels.delete(id);
+  }
 
   registerHandler(
+    id: string,
     messageHandler: ((msg: any) => void) | ((msg: any) => Promise<void>),
     thisArg?: any
   ): void {
-    if (!this._handlerSet.has(messageHandler)) {
+    if (!this._handlers.has(id)) {
       if (thisArg) {
         messageHandler.bind(thisArg);
       }
-      this._handlerSet.add(messageHandler);
+      this._handlers.set(id, messageHandler);
+    } else {
+      console.error(
+        `${id} is already registered, remove the handler first before re-registering `
+      );
     }
   }
 
@@ -44,16 +55,17 @@ export class OccWorker implements IJCadWorker {
   }
 
   private _processMessage(msg: any): void {
-    if (msg.action === MainAction.INITIALIZED) {
+    if (msg.data.action === MainAction.INITIALIZED) {
       this._ready.resolve();
     } else {
-      this._handlerSet.forEach(cb => cb(msg));
+      this._handlers.forEach(cb => cb(msg.data));
     }
   }
 
   private _ready = new PromiseDelegate<void>();
-  private _handlerSet = new Set<CallableFunction>();
-  private _nativeWorker: Worker; 
+  private _handlers = new Map<string, CallableFunction>();
+  private _messageChannels = new Map<string, MessageChannel>();
+  private _nativeWorker: Worker;
 }
 
 export namespace OccWorker {

packages/schema/src/index.ts

@@ -1,2 +1,3 @@
 export * from './interfaces';
 export * from './model';
+export * from './token';

packages/schema/src/interfaces.ts

@@ -4,9 +4,11 @@ import {
   StateChange,
   YDocument
 } from '@jupyter/ydoc';
+import { IWidgetTracker } from '@jupyterlab/apputils';
 import { IChangedArgs } from '@jupyterlab/coreutils';
-import { DocumentRegistry } from '@jupyterlab/docregistry';
+import { DocumentRegistry, IDocumentWidget } from '@jupyterlab/docregistry';
 import { User } from '@jupyterlab/services';
+import { ReactWidget } from '@jupyterlab/ui-components';
 import { JSONObject } from '@lumino/coreutils';
 import { ISignal, Signal } from '@lumino/signaling';
 
@@ -178,3 +180,50 @@ export interface IAnnotation {
   contents: IAnnotationContent[];
   parent: string;
 }
+
+export interface IJCadWorker {
+  ready: Promise<void>;
+  initChannel(): string;
+  registerHandler(
+    id: string,
+    messageHandler: ((msg: any) => void) | ((msg: any) => Promise<void>),
+    thisArg?: any
+  ): void;
+  removeChannel(id: string): void;
+  postMessage(msg: any): void;
+}
+export interface IJCadWorkerRegistry {
+  /**
+   *
+   *
+   * @param {string} workerId
+   * @param {IJCadWorker} worker
+   */
+  registerWorker(workerId: string, worker: IJCadWorker): void;
+
+  /**
+   *
+   *
+   * @param {string} workerId
+   */
+  unregisterWorker(workerId: string): void;
+
+  /**
+   *
+   *
+   * @param {string} workerId
+   * @return {*}  {(IJCadWorker | undefined)}
+   */
+  getWorker(workerId: string): IJCadWorker | undefined;
+
+  /**
+   *
+   *
+   * @return {*}  {IJCadWorker[]}
+   */
+  getAllWorkers(): IJCadWorker[];
+}
+
+export type IJupyterCadWidget = IDocumentWidget<ReactWidget, IJupyterCadModel>;
+
+export type IJupyterCadTracker = IWidgetTracker<IJupyterCadWidget>;

packages/schema/src/token.ts

@@ -0,0 +1,19 @@
+import { Token } from '@lumino/coreutils';
+
+import {
+  IJCadWorkerRegistry,
+  IJupyterCadTracker,
+  IAnnotationModel
+} from './interfaces';
+
+export const IJupyterCadDocTracker = new Token<IJupyterCadTracker>(
+  'jupyterCadDocTracker'
+);
+
+export const IAnnotationToken = new Token<IAnnotationModel>(
+  'jupytercadAnnotationModel'
+);
+
+export const IJCadWorkerRegistryToken = new Token<IJCadWorkerRegistry>(
+  'jupytercadWorkerRegistry'
+);

packages/schema/src/types.ts

@@ -13,3 +13,4 @@ export * from './_interface/sphere';
 export * from './_interface/torus';
 export * from './interfaces';
 export * from './model';
+export * from './token';