@tomorrowevening/hermes 0.0.33 → 0.0.35

package/package.json

@@ -7,7 +7,7 @@
   "module": "./dist/hermes.js",
   "types": "./types/index.d.ts",
   "type": "module",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "homepage": "https://github.com/tomorrowevening/hermes#readme",
   "bugs": {
     "url": "https://github.com/tomorrowevening/hermes/issues"
@@ -20,9 +20,6 @@
     "Tweakpane"
   ],
   "files": [
-    "src/index.ts",
-    "src/core",
-    "src/editor",
     "dist/hermes.js",
     "dist/hermes.umd.cjs",
     "dist/style.css",
@@ -35,8 +32,7 @@
       "types": "./types/index.d.ts"
     },
     "./dist/style.css": "./dist/style.css",
-    "./server/index.mjs": "./server/index.mjs",
-    "./src/*": "./src/*"
+    "./server/index.mjs": "./server/index.mjs"
   },
   "repository": {
     "type": "git",

package/src/core/Application.ts

@@ -1,111 +0,0 @@
-import BaseRemote from './remote/BaseRemote';
-import { ApplicationMode, BroadcastCallback, BroadcastData } from './types';
-
-export default class Application {
-  components: Map<string, any> = new Map();
-  listen?: BroadcastCallback;
-  
-  // Protected
-  protected _debugEnabled: boolean;
-  protected broadcastChannel?: BroadcastChannel | undefined = undefined;
-  protected webSocket?: WebSocket | undefined = undefined;
-  protected _mode: ApplicationMode = 'app';
-  protected _connected = false;
-  protected useBC = false;
-
-  constructor(id: string, debugEnabled: boolean, useBC:boolean = true, editorHashtag: string = 'editor') {
-    this.editor = debugEnabled && document.location.hash.search(editorHashtag) > -1;
-    this._debugEnabled = debugEnabled;
-
-    if (debugEnabled) {
-      this.useBC = useBC;
-      if (useBC) {
-        this.broadcastChannel = new BroadcastChannel(id);
-        this.broadcastChannel.addEventListener('message', this.messageHandler);
-      } else {
-        this.webSocket = new WebSocket(id);
-        this.webSocket.addEventListener('open', this.openHandler);
-        this.webSocket.addEventListener('close', this.closeHandler);
-        this.webSocket.addEventListener('message', this.messageHandler);
-      }
-    }
-  }
-
-  addComponent(name: string, component: BaseRemote) {
-    this.components.set(name, component);
-  }
-
-  dispose() {
-    if (this.broadcastChannel !== undefined) {
-      this.broadcastChannel.removeEventListener('message', this.messageHandler);
-    }
-    if (this.webSocket !== undefined) {
-      this.webSocket.removeEventListener('open', this.openHandler);
-      this.webSocket.removeEventListener('close', this.closeHandler);
-      this.webSocket.removeEventListener('message', this.messageHandler);
-    }
-    this.components.forEach((value: BaseRemote) => {
-      value.dispose();
-    });
-    this.components.clear();
-  }
-
-  // Remote
-
-  send(data: BroadcastData) {
-    if (this._mode !== data.target) {
-      if (this.useBC) {
-        this.broadcastChannel?.postMessage(data);
-      } else if (this._connected) {
-        this.webSocket?.send(JSON.stringify(data));
-      }
-    }
-  }
-
-  private messageHandler = (evt: MessageEvent) => {
-    if (this.listen !== undefined) {
-      if (this.useBC) {
-        this.listen(evt.data);
-      } else {
-        this.listen(JSON.parse(evt.data));
-      }
-    }
-  };
-
-  private openHandler = () => {
-    this._connected = true;
-  };
-
-  private closeHandler = () => {
-    this._connected = false;
-  };
-
-  // Getters / Setters
-
-  get connected(): boolean {
-    return this._connected;
-  }
-
-  get debugEnabled(): boolean {
-    return this._debugEnabled;
-  }
-
-  get mode(): ApplicationMode {
-    return this._mode;
-  }
-
-  get isApp(): boolean {
-    return this._mode === 'app';
-  }
-
-  get editor(): boolean {
-    return this._mode === 'editor';
-  }
-
-  set editor(value: boolean) {
-    if (value) {
-      this._mode = 'editor';
-      document.title += ' - Editor';
-    }
-  }
-}

package/src/core/RemoteController.ts

@@ -1,60 +0,0 @@
-// Core
-import Application from './Application';
-import { ToolEvents, debugDispatcher } from '@/editor/global';
-import { BroadcastData } from './types';
-import BaseRemote from './remote/BaseRemote';
-import RemoteComponents, { HandleAppRemoteComponents } from './remote/RemoteComponents';
-import RemoteTheatre, { HandleAppRemoteTheatre, HandleEditorRemoteTheatre, UpdateRemoteTheatre } from './remote/RemoteTheatre';
-import RemoteThree, { HandleAppRemoteThree, HandleEditorRemoteThree } from './remote/RemoteThree';
-import RemoteTweakpane, { HandleAppRemoteTweakpane } from './remote/RemoteTweakpane';
-
-export default function RemoteController(app: Application) {
-  const appHandlers: any[] = [];
-  const editorHandlers: any[] = [];
-
-  // Correct handlers based on the App's components
-  app.components.forEach((value: BaseRemote) => {
-    if (value instanceof RemoteComponents) {
-      appHandlers.push(HandleAppRemoteComponents);
-    } else if (value instanceof RemoteTheatre) {
-      appHandlers.push(HandleAppRemoteTheatre);
-      editorHandlers.push(HandleEditorRemoteTheatre);
-      UpdateRemoteTheatre(app);
-    }  else if (value instanceof RemoteThree) {
-      appHandlers.push(HandleAppRemoteThree);
-      editorHandlers.push(HandleEditorRemoteThree);
-    } else if (value instanceof RemoteTweakpane) {
-      appHandlers.push(HandleAppRemoteTweakpane);
-    }
-  });
-
-  function handleAppBroadcast(msg: BroadcastData) {
-    appHandlers.forEach((handler: any) => handler(app, msg));
-    switch (msg.event) {
-      case 'custom':
-        // @ts-ignore
-        debugDispatcher.dispatchEvent({ type: ToolEvents.CUSTOM, value: msg.data });
-        break;
-    }
-  }
-
-  function handleEditorBroadcast(msg: BroadcastData) {
-    editorHandlers.forEach((handler: any) => handler(app, msg));
-    switch (msg.event) {
-      case 'custom':
-        // @ts-ignore
-        debugDispatcher.dispatchEvent({ type: ToolEvents.CUSTOM, value: msg.data });
-        break;
-    }
-  }
-
-  // Begin app
-
-  app.listen = (msg: BroadcastData) => {
-    if (msg.target === 'editor') {
-      handleEditorBroadcast(msg);
-    } else {
-      handleAppBroadcast(msg);
-    }
-  };
-}

package/src/core/remote/BaseRemote.ts

@@ -1,16 +0,0 @@
-import Application from '../Application';
-
-/**
- * Base class for remote-related extensions
- */
-export default class BaseRemote {
-  protected app: Application;
-
-  constructor(app: Application) {
-    this.app = app;
-  }
-
-  dispose() {
-    //
-  }
-}

package/src/core/remote/RemoteComponents.ts

@@ -1,45 +0,0 @@
-// Core
-import { ToolEvents, debugDispatcher } from '@/editor/global';
-import Application from '../Application';
-import BaseRemote from './BaseRemote';
-import { BroadcastData } from '../types';
-
-/**
- * Communicates between custom React Components
- */
-export default class RemoteComponents extends BaseRemote {
-  selectDropdown(dropdown: string, value: any) {
-    this.app.send({
-      event: 'selectComponent',
-      target: 'app',
-      data: {
-        dropdown,
-        value
-      }
-    });
-  }
-
-  updateDropdown(dropdown: string, list: string[]) {
-    this.app.send({
-      event: 'draggableListUpdate',
-      target: 'app',
-      data: {
-        dropdown,
-        value: list
-      }
-    });
-  }
-}
-
-export function HandleAppRemoteComponents(_: Application, msg: BroadcastData) {
-  switch (msg.event) {
-    case 'selectComponent':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.SELECT_DROPDOWN, value: msg.data });
-      break;
-    case 'draggableListUpdate':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.DRAG_UPDATE, value: msg.data });
-      break;
-  }
-}

package/src/core/remote/RemoteTheatre.ts

@@ -1,300 +0,0 @@
-// Libs
-import { createRafDriver, getProject } from '@theatre/core';
-import { IProject, IProjectConfig, IRafDriver, ISheet, ISheetObject } from '@theatre/core';
-import studio from '@theatre/studio';
-// Core
-import Application from '../Application';
-import BaseRemote from './BaseRemote';
-import { isColor } from '@/editor/utils';
-import { BroadcastData, DataUpdateCallback, EditorEvent, VoidCallback, noop } from '../types';
-
-export default class RemoteTheatre extends BaseRemote {
-  project: IProject | undefined;
-  sheets: Map<string, ISheet> = new Map();
-  sheetObjects: Map<string, ISheetObject> = new Map();
-  sheetObjectCBs: Map<string, DataUpdateCallback> = new Map();
-  sheetObjectUnsubscribe: Map<string, VoidCallback> = new Map();
-
-  private static rafDriver: IRafDriver | null = null;
-
-  init(projectName: string, projectConfig?: IProjectConfig | undefined): Promise<void> {
-    this.project = getProject(projectName, projectConfig);
-    return this.project.ready;
-  }
-
-  override dispose(): void {
-    this.project = undefined;
-    this.sheets = new Map();
-    this.sheetObjects = new Map();
-    this.sheetObjectCBs = new Map();
-    this.sheetObjectUnsubscribe = new Map();
-  }
-
-  sheet(name: string): ISheet | undefined {
-    if (this.project === undefined) {
-      console.error('Theatre Project hasn\'t been created yet.');
-      return undefined;
-    }
-
-    let sheet = this.sheets.get(name);
-    if (sheet !== undefined) return sheet;
-
-    sheet = this.project?.sheet(name);
-    this.sheets.set(name, sheet);
-    return sheet;
-  }
-
-  playSheet(name: string, params?: any) {
-    this.sheet(name)?.sequence.play(params);
-
-    this.app.send({
-      event: 'playSheet',
-      target: 'editor',
-      data: {
-        sheet: name,
-        value: params,
-      },
-    });
-  }
-
-  pauseSheet(name: string) {
-    this.sheet(name)?.sequence.pause();
-
-    this.app.send({
-      event: 'pauseSheet',
-      target: 'editor',
-      data: {
-        sheet: name,
-      },
-    });
-  }
-
-  clearSheetObjects(sheetName: string) {
-    this.sheetObjects.forEach((value: ISheetObject, key: string) => {
-      const sameSheet = key.search(`${sheetName}_`) > -1;
-      if (sameSheet) this.unsubscribe(value);
-    });
-  }
-
-  sheetObject(
-    sheetName: string,
-    key: string,
-    props: any,
-    onUpdate?: DataUpdateCallback,
-  ): ISheetObject | undefined {
-    if (this.project === undefined) {
-      console.error('Theatre Project hasn\'t been created yet.');
-      return undefined;
-    }
-    const sheet = this.sheet(sheetName);
-    if (sheet === undefined) return undefined;
-
-    const objName = `${sheetName}_${key}`;
-    let obj = this.sheetObjects.get(objName);
-    if (obj !== undefined) {
-      obj = sheet.object(key, {...props, ...obj.value}, {reconfigure: true});
-    } else {
-      obj = sheet.object(key, props);
-    }
-
-    this.sheetObjects.set(objName, obj);
-    this.sheetObjectCBs.set(objName, onUpdate !== undefined ? onUpdate : noop);
-
-    const unsubscribe = obj.onValuesChange((values: any) => {
-      if (this.app.editor) {
-        for (const i in values) {
-          const value = values[i];
-          if (typeof value === 'object') {
-            if (isColor(value)) {
-              values[i] = {
-                r: value.r,
-                g: value.g,
-                b: value.b,
-                a: value.a,
-              };
-            }
-          }
-        }
-        this.app.send({
-          event: 'updateSheetObject',
-          target: 'app',
-          data: {
-            sheet: sheetName,
-            sheetObject: objName,
-            values: values,
-          },
-        });
-      }
-
-      const callback = this.sheetObjectCBs.get(objName);
-      if (callback !== undefined) callback(values);
-    });
-    this.sheetObjectUnsubscribe.set(objName, unsubscribe);
-
-    return obj;
-  }
-
-  unsubscribe(sheetObject: ISheetObject) {
-    if (this.project === undefined) {
-      console.error('Theatre Project hasn\'t been created yet.');
-      return undefined;
-    }
-
-    const sheetName = sheetObject.address.sheetId;
-    const sheetObjectName = sheetObject.address.objectKey;
-    const sheet = this.sheets.get(sheetName);
-    sheet?.detachObject(sheetObjectName);
-    
-    const id = `${sheetName}_${sheetObjectName}`;
-    const unsubscribe = this.sheetObjectUnsubscribe.get(id);
-    if (unsubscribe !== undefined) {
-      this.sheetObjects.delete(id);
-      this.sheetObjectCBs.delete(id);
-      this.sheetObjectUnsubscribe.delete(id);
-      unsubscribe();
-    }
-  }
-
-  public static getRafDriver(): IRafDriver {
-    if (!RemoteTheatre.rafDriver) {
-      RemoteTheatre.rafDriver = createRafDriver();
-    }
-    return RemoteTheatre.rafDriver;
-  }
-}
-
-let activeSheet: ISheet | undefined;
-
-export function HandleAppRemoteTheatre(app: Application, msg: BroadcastData) {
-  app.components.forEach((component: any) => {
-    if (component instanceof RemoteTheatre) {
-      let value = undefined;
-      const theatre = component as RemoteTheatre;
-      switch (msg.event) {
-        case 'setSheet':
-          // @ts-ignore
-          value = theatre.sheets.get(msg.data.sheet);
-          if (value !== undefined) {
-            activeSheet = value as ISheet;
-            studio.setSelection([value]);
-          }
-          break;
-        case 'setSheetObject':
-          // @ts-ignore
-          value = theatre.sheetObjects.get(`${msg.data.sheet}_${msg.data.key}`);
-          if (value !== undefined) {
-            studio.setSelection([value]);
-          }
-          break;
-        case 'updateSheetObject':
-          // @ts-ignore
-          value = theatre.sheets.get(msg.data.sheet); // pause current animation
-          // @ts-ignore
-          if (value !== undefined) value.sequence.pause();
-          // @ts-ignore
-          value = theatre.sheetObjectCBs.get(msg.data.sheetObject);
-          // @ts-ignore
-          if (value !== undefined) value(msg.data.values);
-          break;
-        case 'updateTimeline':
-          // @ts-ignore
-          value = theatre.sheets.get(msg.data.sheet);
-          if (activeSheet !== undefined) {
-            (activeSheet as ISheet).sequence.position = msg.data.position;
-          }
-          break;
-      }
-    }
-  });
-}
-
-export function UpdateRemoteTheatre(app: Application) {
-  if (app.editor) {
-    let theatre: RemoteTheatre;
-    app.components.forEach((component: any) => {
-      if (component instanceof RemoteTheatre) {
-        theatre = component;
-      }
-    });
-    
-    studio.ui.restore();
-    studio.onSelectionChange((value: any[]) => {
-      if (value.length < 1) return;
-
-      value.forEach((obj: any) => {
-        let id = obj.address.sheetId;
-        let type: EditorEvent = 'setSheet';
-        let data = {};
-        switch (obj.type) {
-          case 'Theatre_Sheet_PublicAPI':
-            type = 'setSheet';
-            data = {
-              sheet: obj.address.sheetId,
-            };
-            activeSheet = theatre.sheets.get(obj.address.sheetId);
-            break;
-
-          case 'Theatre_SheetObject_PublicAPI':
-            type = 'setSheetObject';
-            id += `_${obj.address.objectKey}`;
-            data = {
-              id: id,
-              sheet: obj.address.sheetId,
-              key: obj.address.objectKey,
-            };
-            break;
-        }
-        app.send({ event: type, target: 'app', data: data });
-      });
-    });
-
-    // Timeline
-    let position = 0;
-    const onRafUpdate = () => {
-      // RemoteTheatre.getRafDriver().tick(performance.now());
-
-      if (
-        activeSheet !== undefined &&
-        position !== activeSheet.sequence.position
-      ) {
-        position = activeSheet.sequence.position;
-        const t = activeSheet as ISheet;
-        app.send({
-          event: 'updateTimeline',
-          target: 'app',
-          data: {
-            position: position,
-            sheet: t.address.sheetId,
-          },
-        });
-      }
-    };
-    const onRaf = () => {
-      onRafUpdate();
-      requestAnimationFrame(onRaf);
-    };
-    onRafUpdate(); // Initial position
-    onRaf();
-  } else {
-    studio.ui.hide();
-  }
-}
-
-export function HandleEditorRemoteTheatre(app: Application, msg: BroadcastData) {
-  if (app.editor) {
-    app.components.forEach((component: any) => {
-      if (component instanceof RemoteTheatre) {
-        const theatre = component;
-        switch (msg.event) {
-          case 'playSheet':
-            theatre.sheet(msg.data.sheet)?.sequence.play(msg.data.value);
-            break;
-          case 'pauseSheet':
-            theatre.sheet(msg.data.sheet)?.sequence.pause();
-            break;
-        }
-        return;
-      }
-    });
-  }
-}

package/src/core/remote/RemoteThree.ts

@@ -1,143 +0,0 @@
-import { Camera, Scene } from 'three';
-import BaseRemote from './BaseRemote';
-import { stripObject, stripScene } from '@/editor/sidePanel/utils';
-import { hierarchyUUID, resetThreeObjects } from '@/editor/utils';
-import Application from '../Application';
-import { BroadcastData } from '../types';
-import { ToolEvents, debugDispatcher } from '@/editor/global';
-
-export default class RemoteThree extends BaseRemote {
-  scene?: Scene = undefined;
-
-  getObject(uuid: string) {
-    if (!this.app.debugEnabled) return;
-    this.app.send({
-      event: 'getObject',
-      target: 'app',
-      data: uuid,
-    });
-  }
-
-  setObject(value: any) {
-    const stripped = stripObject(value);
-    this.app.send({
-      event: 'setObject',
-      target: 'editor',
-      data: stripped,
-    });
-  }
-
-  requestMethod(uuid: string, key: string, value?: any, subitem?: string) {
-    this.app.send({
-      event: 'requestMethod',
-      target: 'app',
-      data: {
-        uuid,
-        key,
-        value,
-        subitem,
-      },
-    });
-  }
-
-  updateObject(uuid: string, key: string, value: any) {
-    this.app.send({
-      event: 'updateObject',
-      target: 'app',
-      data: {
-        uuid,
-        key,
-        value
-      },
-    });
-  }
-
-  createTexture(uuid: string, key: string, value: any) {
-    this.app.send({
-      event: 'createTexture',
-      target: 'app',
-      data: {
-        uuid,
-        key,
-        value
-      },
-    });
-  }
-
-  setScene(value: Scene) {
-    if (value === undefined) return;
-    this.scene = value;
-
-    if (!this.app.debugEnabled) return;
-    resetThreeObjects();
-    hierarchyUUID(this.scene);
-    const stripped = stripScene(this.scene);
-    this.app.send({
-      event: 'setScene',
-      target: 'editor',
-      data: stripped,
-    });
-  }
-
-  addCamera(camera: Camera) {
-    if (!this.app.debugEnabled) return;
-    const stripped = stripObject(camera);
-    this.app.send({
-      event: 'addCamera',
-      target: 'editor',
-      data: stripped,
-    });
-  }
-
-  removeCamera(camera: Camera) {
-    if (!this.app.debugEnabled) return;
-    const stripped = stripObject(camera);
-    this.app.send({
-      event: 'removeCamera',
-      target: 'editor',
-      data: stripped,
-    });
-  }
-}
-
-export function HandleAppRemoteThree(_: Application, msg: BroadcastData) {
-  switch (msg.event) {
-    case 'getObject':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.GET_OBJECT, value: msg.data });
-      break;
-    case 'updateObject':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.UPDATE_OBJECT, value: msg.data });
-      break;
-    case 'createTexture':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.CREATE_TEXTURE, value: msg.data });
-      break;
-    case 'requestMethod':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.REQUEST_METHOD, value: msg.data });
-      break;
-  }
-}
-
-export function HandleEditorRemoteThree(_: Application, msg: BroadcastData) {
-  switch (msg.event) {
-    case 'setObject':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.SET_OBJECT, value: msg.data });
-      break;
-    case 'setScene':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.SET_SCENE, value: msg.data });
-      break;
-    case 'addCamera':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.ADD_CAMERA, value: msg.data });
-      break;
-    case 'removeCamera':
-      // @ts-ignore
-      debugDispatcher.dispatchEvent({ type: ToolEvents.REMOVE_CAMERA, value: msg.data });
-      break;
-  }
-}