Merge pull request #1 from JdeRobot/update-tools

Update to include the tools

Author: javizqh

.gitignore

@@ -1 +1,2 @@
-dist/
+dist/
+node_modules/

node_modules/.package-lock.json

@@ -1,14 +1,17 @@
 {
   "name": "jderobot-commsmanager",
-  "version": "0.1.6",
+  "version": "1.0.0",
   "main": "dist/main.js",
   "typings": "dist/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\"",
     "build": "webpack --mode development --config webpack.config.js",
-    "postbuild": "cp package.json dist"
+    "postbuild": "cp package.json dist",
+    "format": "prettier --write src/**/*.{ts,tsx}"
   },
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -17,8 +20,9 @@
     "uuid": "^11.1.0"
   },
   "devDependencies": {
+    "prettier": "^3.6.1",
     "ts-loader": "^9.5.2",
     "typescript": "^5.8.3",
     "webpack-cli": "^5.1.4"
   }
-}
+}

package-lock.json

@@ -1,7 +1,12 @@
 import { v4 as uuidv4 } from "uuid";
 import { publish } from "../utils";
-import { Events, events, ManagerMsg, PromiseHandlers, UniverseConfig } from "../types";
-
+import {
+  Events,
+  events,
+  ManagerMsg,
+  PromiseHandlers,
+  UniverseConfig,
+} from "../types";
 
 export default class CommsManager {
   private static instance: CommsManager | undefined;
@@ -53,7 +58,7 @@ export default class CommsManager {
     this.ws.onclose = (e) => {
       if (e.wasClean) {
         console.log(
-          `Connection with ${address} closed, all suscribers cleared`
+          `Connection with ${address} closed, all suscribers cleared`,
         );
       } else {
         console.log(`Connection with ${address} interrupted`);
@@ -100,7 +105,7 @@ export default class CommsManager {
     for (let i = 0, length = events.length; i < length; i++) {
       this.observers[events[i]] = this.observers[events[i]] || [];
       this.observers[events[i]].splice(
-        this.observers[events[i]].indexOf(callback)
+        this.observers[events[i]].indexOf(callback),
       );
     }
   };
@@ -136,10 +141,10 @@ export default class CommsManager {
   }
 
   private setManagerState(msg: ManagerMsg) {
-    publish("CommsManagerStateChange", {state: msg.data.state})
+    publish("CommsManagerStateChange", { state: msg.data.state });
     CommsManager.state = msg.data.state;
     if (msg.data.state === "connected") {
-      CommsManager.universe = undefined
+      CommsManager.universe = undefined;
     }
   }
 
@@ -165,25 +170,22 @@ export default class CommsManager {
   }
 
   public launchWorld(cfg: UniverseConfig) {
-    CommsManager.universe = cfg.name
+    CommsManager.universe = cfg.name;
     return this.send("launch_world", cfg);
   }
 
-  public prepareVisualization(
-    visualization_type: string,
-    visualization_config: string | null
-  ) {
-    if (visualization_config === null || visualization_config === undefined) {
-      visualization_config = "None";
+  public prepareTools(tools: string[], tools_config: Object) {
+    if (tools_config === null || tools_config === undefined) {
+      tools_config = "None";
     }
-    return this.send("prepare_visualization", {
-      type: visualization_type,
-      file: visualization_config,
+    return this.send("prepare_tools", {
+      tools: tools,
+      config: tools_config,
     });
   }
 
-  public run(cfg: Object) {
-    return this.send("run_application", cfg);
+  public run(entrypoint: string, code: string) {
+    return this.send("run_application", { entrypoint: entrypoint, code: code });
   }
 
   public stop() {
@@ -236,4 +238,4 @@ export default class CommsManager {
   public code_autocomplete(code: string, line: number, col: number) {
     return this.send("code_autocomplete", { code: code, line: line, col: col });
   }
-}
+}

package.json

@@ -1 +1 @@
-export {default as CommsManager} from './CommsManager'
+export { default as CommsManager } from "./CommsManager";

src/components/CommsManager.ts

@@ -1,2 +1,2 @@
-export * from './components'
-export * from './types'
+export * from "./components";
+export * from "./types";

src/components/index.ts

@@ -6,4 +6,4 @@ export type {
   UniverseConfig,
   Events,
 } from "./types";
-export {events, states} from './types'
+export { events, states } from "./types";

src/index.ts

@@ -1,4 +1,3 @@
-
 export type PromiseHandlers = {
   resolve: (value?: any) => void;
   reject: (reason?: any) => void;
@@ -22,7 +21,6 @@ export interface RobotConfig {
   name: string | null;
   launch_file_path: string | null;
   ros_version: string | null;
-  visualization: string | null;
   world: string | null;
   start_pose: string | null;
 }
@@ -49,7 +47,7 @@ export const states = {
   IDLE: "idle",
   CONNECTED: "connected",
   WORLD_READY: "world_ready",
-  VISUALIZATION_READY: "visualization_ready",
+  TOOLS_READY: "tools_ready",
   RUNNING: "application_running",
   PAUSED: "paused",
-};
+};

src/types/index.ts

@@ -1,12 +1,12 @@
-export function subscribe(eventName: string, listener: (e:any) => void) {
+export function subscribe(eventName: string, listener: (e: any) => void) {
   document.addEventListener(eventName, listener);
 }
 
 export function unsubscribe(eventName: string, listener: () => void) {
   document.removeEventListener(eventName, listener);
 }
 
-export function publish(eventName:string, extra: any = undefined) {
-  const event = new CustomEvent(eventName, {detail: extra});
+export function publish(eventName: string, extra: any = undefined) {
+  const event = new CustomEvent(eventName, { detail: extra });
   document.dispatchEvent(event);
 }