Safeguard webview message predicates.

cognitive-engineering-lab · May 11, 2024 · 396bfaa · 396bfaa
1 parent c1200f0
commit 396bfaa
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/ide/packages/common/src/lib.ts b/ide/packages/common/src/lib.ts
@@ -180,6 +180,12 @@ export type CallArgus = <T extends ArgusCliOptions>(
 
 // Type predicates (these shouldn't really exist ...)
 
+export function isSysMsg(
+  obj: any
+): obj is SystemToPanoptesMsg<SystemToPanoptesCmds> {
+  return typeof obj === "object" && "command" in obj;
+}
+
 export function isSysMsgOpenError(
   msg: SystemToPanoptesMsg<SystemToPanoptesCmds>
 ): msg is SystemToPanoptesMsg<"open-error"> {

diff --git a/ide/packages/panoptes/package.json b/ide/packages/panoptes/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@argus/panoptes",
   "version": "0.0.1",
+  "main": "dist/panoptes.iife.js",
   "depot": {
     "platform": "browser"
   },
@@ -31,4 +32,4 @@
     "react-json-view": "^1.21.3",
     "vite": "^4.4.9"
   }
-}
+}
diff --git a/ide/packages/panoptes/src/App.tsx b/ide/packages/panoptes/src/App.tsx
@@ -3,8 +3,7 @@ import {
   EvaluationMode,
   PanoptesConfig,
   SystemSpec,
-  SystemToPanoptesCmds,
-  SystemToPanoptesMsg,
+  isSysMsg,
   isSysMsgOpenError,
   isSysMsgOpenFile,
   isSysMsgReset,
@@ -53,9 +52,10 @@ const App = observer(({ config }: { config: PanoptesConfig }) => {
     const {
       payload,
     }: {
-      payload: SystemToPanoptesMsg<SystemToPanoptesCmds>;
+      payload: any;
     } = e.data;
 
+    if (!isSysMsg(payload)) return;
     console.debug("Received message from system", payload);
 
     if (isSysMsgOpenError(payload)) {

diff --git a/ide/packages/panoptes/src/TreeView/TreeInfo.ts b/ide/packages/panoptes/src/TreeView/TreeInfo.ts
@@ -10,8 +10,6 @@ import {
 } from "@argus/common/bindings";
 import _ from "lodash";
 
-import { isHiddenObl, isTraitClause } from "../utilities/func";
-
 type MultiRecord<K extends number, T> = Record<K, T[]>;
 
 type Direction = "to-root" | "from-root";

diff --git a/ide/packages/panoptes/src/main.tsx b/ide/packages/panoptes/src/main.tsx
@@ -1,8 +1,4 @@
-import {
-  ConfigConsts,
-  PanoptesConfig,
-  maybeStringToConfig,
-} from "@argus/common/lib";
+import { ConfigConsts, maybeStringToConfig } from "@argus/common/lib";
 import * as React from "react";
 import * as ReactDOM from "react-dom/client";
 
@@ -29,6 +25,6 @@ window.initializeArgusBlocks = (root: HTMLElement) => {
 
 window.addEventListener(
   "load",
-  () => initializeArgusBlocks(document.body),
+  () => window.initializeArgusBlocks(document.body),
   false
 );
diff --git a/ide/packages/panoptes/src/print/private/ty.tsx b/ide/packages/panoptes/src/print/private/ty.tsx
@@ -38,7 +38,6 @@ import { PrintConst } from "./const";
 import { PrintDefPath } from "./path";
 import {
   Angled,
-  CBraced,
   CommaSeparated,
   DBraced,
   Parenthesized,