add support for "specs" message

microsoft · Feb 21, 2023 · c5574e6 · c5574e6
1 parent 729f98f
commit c5574e6
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 13 deletions.
diff --git a/jacdac-ts b/jacdac-ts
diff --git a/pxt-jacdac b/pxt-jacdac
diff --git a/src/components/ServiceManagerContext.tsx b/src/components/ServiceManagerContext.tsx
@@ -3,9 +3,13 @@ import { JSONTryParse } from "../../jacdac-ts/src/jdom/utils"
 import {
     BrowserFileStorage,
     HostedFileStorage,
-    IFileStorage,
+    FileStorage,
 } from "../../jacdac-ts/src/embed/filestorage"
-import { IThemeMessage } from "../../jacdac-ts/src/embed/protocol"
+import {
+    EmbedMessage,
+    EmbedSpecsMessage,
+    EmbedThemeMessage,
+} from "../../jacdac-ts/src/embed/protocol"
 import {
     ModelStore,
     HostedModelStore,
@@ -50,7 +54,7 @@ export class LocalStorageSettings implements ISettings {
 
 export interface ServiceManagerContextProps {
     isHosted: boolean
-    fileStorage: IFileStorage
+    fileStorage: FileStorage
     modelStore: ModelStore
 }
 
@@ -71,15 +75,21 @@ export const ServiceManagerProvider = ({ children }) => {
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const handleMessage = useCallback(
-        (ev: MessageEvent<any>) => {
+        (ev: MessageEvent<EmbedMessage>) => {
             const msg = ev.data
             if (msg?.source !== "jacdac") return
             switch (msg.type) {
                 case "theme": {
-                    const themeMsg = msg as IThemeMessage
+                    const themeMsg = msg as EmbedThemeMessage
                     toggleDarkMode(themeMsg.data.type)
                     break
                 }
+                case "specs": {
+                    const specMsg = msg as EmbedSpecsMessage
+                    const { services } = specMsg.data
+                    bus.setCustomServiceSpecifications(services)
+                    break
+                }
             }
         },
         [toggleDarkMode]
@@ -94,7 +104,7 @@ export const ServiceManagerProvider = ({ children }) => {
 
     function createProps(): ServiceManagerContextProps {
         const isHosted = UIFlags.hosted
-        let fileStorage: IFileStorage = new BrowserFileStorage()
+        let fileStorage: FileStorage = new BrowserFileStorage()
         let modelStore: ModelStore = undefined
         if (isHosted) {
             console.log(`starting hosted services`)

diff --git a/src/components/tools/ServiceSpecificationEditor.tsx b/src/components/tools/ServiceSpecificationEditor.tsx
@@ -1,12 +1,12 @@
-import React, { useMemo } from "react"
+import React, { useEffect, useMemo } from "react"
 import { Grid } from "@mui/material"
 import { parseServiceSpecificationMarkdownToJSON } from "../../../jacdac-ts/jacdac-spec/spectool/jdspec"
 import { serviceMap } from "../../../jacdac-ts/src/jdom/spec"
 import RandomGenerator from "../RandomGenerator"
 import useLocalStorage from "../hooks/useLocalStorage"
 import HighlightTextField from "../ui/HighlightTextField"
-import ServiceSpecification from "../specification/ServiceSpecification"
 import ServiceSpecificationSource from "../specification/ServiceSpecificationSource"
+import { EmbedSpecsMessage } from "../../../jacdac-ts/src/embed/protocol"
 
 const SERVICE_SPECIFICATION_STORAGE_KEY =
     "jacdac:servicespecificationeditorsource"
@@ -27,6 +27,19 @@ export default function ServiceSpecificationEditor() {
             json.shortId ||
             `0x${json.classIdentifier.toString(16)}`
         ).toLowerCase()}`
+
+    useEffect(() => {
+        const services: jdspec.ServiceSpec[] =
+            json && !json.errors?.length ? [json] : []
+        window.postMessage({
+            source: "jacdac",
+            type: "specs",
+            data: {
+                services,
+            },
+        } as EmbedSpecsMessage)
+    }, [json])
+
     return (
         <Grid spacing={2} container>
             <Grid item xs={12}>

diff --git a/src/pages/tools/model-uploader.tsx b/src/pages/tools/model-uploader.tsx
@@ -21,7 +21,7 @@ import {
 import SensorAggregatorConfigView from "../../components/SensorAggregatorConfigView"
 import ServiceManagerContext from "../../components/ServiceManagerContext"
 import useChange from "../../jacdac/useChange"
-import { IFile } from "../../../jacdac-ts/src/embed/protocol"
+import { EmbedFile } from "../../../jacdac-ts/src/embed/protocol"
 import { prettySize } from "../../../jacdac-ts/src/jdom/pretty"
 import RegisterTrend from "../../components/RegisterTrend"
 import { useRegisterUnpackedValue } from "../../jacdac/useRegisterValue"
@@ -149,7 +149,7 @@ export default function ModelUploader() {
             setImporting(false)
         }
     }
-    const handleLoadModel = (model: IFile) => async () => {
+    const handleLoadModel = (model: EmbedFile) => async () => {
         try {
             setImporting(true)
             console.log(`loading model`, model)
@@ -162,7 +162,7 @@ export default function ModelUploader() {
             setImporting(false)
         }
     }
-    const handleLoadInputConfiguration = (model: IFile) => async () => {
+    const handleLoadInputConfiguration = (model: EmbedFile) => async () => {
         try {
             setImporting(true)
             console.log(`loading model`, model)