From 21fe64f4bfa9f4fe88c9289388339eba8b806c68 Mon Sep 17 00:00:00 2001 From: Ari Date: Tue, 31 May 2022 12:19:58 -0400 Subject: [PATCH] added supervisor token + snackbar for errors --- Dockerfile | 4 +- Makefile | 5 +- config.yaml | 1 + docker-compose.build.yaml | 2 +- docker/bin/run.sh | 11 +++ run.sh | 4 -- .../NodeEditor/OptionManager/ActionDevice.tsx | 1 - webapp/src/components/Page/index.tsx | 69 ++++++++++++++++--- webapp/src/haService/connection.ts | 12 +++- 9 files changed, 88 insertions(+), 21 deletions(-) create mode 100755 docker/bin/run.sh delete mode 100755 run.sh diff --git a/Dockerfile b/Dockerfile index 643c1f9..a9a693f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,8 +39,6 @@ RUN /app/bin/build.sh /app /app/web-builder # <--- Api Code --> COPY api/src /app/src -COPY run.sh /app/run.sh -RUN chmod +x /app/run.sh # <--- Ports --> EXPOSE 8000 @@ -50,5 +48,5 @@ LABEL \ io.hass.type="addon" \ io.hass.arch="armhf|aarch64|i386|amd64" -CMD [ "/app/run.sh" ] +CMD [ "/app/bin/run.sh", "/app" ] diff --git a/Makefile b/Makefile index 2a6dbf5..1e60a7c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml build: - $(DC) build + $(DC) build\ + +push: + $(DC) push run: $(MAKE) build diff --git a/config.yaml b/config.yaml index 0e370ce..28dbf10 100644 --- a/config.yaml +++ b/config.yaml @@ -16,6 +16,7 @@ init: false ingress: true ingress_port: 8000 ingress_entry: "web/" +homeassistant_api: true panel_icon: mdi:home-automation hassio_role: manager privileged: diff --git a/docker-compose.build.yaml b/docker-compose.build.yaml index b32355d..1aba94d 100644 --- a/docker-compose.build.yaml +++ b/docker-compose.build.yaml @@ -1,7 +1,7 @@ version: '3' services: addon: - image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}" + image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}" build: context: "./" dockerfile: "./Dockerfile" diff --git a/docker/bin/run.sh b/docker/bin/run.sh new file mode 100755 index 0000000..5fc6e82 --- /dev/null +++ b/docker/bin/run.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +api_location=${1} + +pushd $api_location +echo "--------------------" +echo $BUILD_VERSION +echo $SUPERVISOR_TOKEN +echo $(python --version) +echo "--------------------" +python -m uvicorn src.app:app --host "0.0.0.0" --port 8000 diff --git a/run.sh b/run.sh deleted file mode 100755 index 21da9d1..0000000 --- a/run.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -echo $(python --version) -python -m uvicorn src.app:app --host "0.0.0.0" --port 8000 diff --git a/webapp/src/components/NodeEditor/OptionManager/ActionDevice.tsx b/webapp/src/components/NodeEditor/OptionManager/ActionDevice.tsx index d6ba4fe..44721ea 100644 --- a/webapp/src/components/NodeEditor/OptionManager/ActionDevice.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/ActionDevice.tsx @@ -12,7 +12,6 @@ export const ActionDeviceState: OptionManager = { }), isReady: () => true, renderOptionList: (state, setState, entities) => { - console.log(entities.collection?.state) const update = updateActionData(state, setState); return <> = ({ children }) => { + const conn = useHAConnection(); + const theme = useTheme(); + const snackbar = useSnackbar(); + const snackbarKeyHAConKey = useRef(null); + + useEffect(() => { + if (conn.status === 'error') { + if (snackbarKeyHAConKey.current) { + snackbar.closeSnackbar(snackbarKeyHAConKey.current) + } + snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Failed to connect to homeassistant due to "${JSON.stringify(conn.error)}"`, { + "variant": "error", + "persist": true, + }) + } else if (conn.status === 'loading') { + if (snackbarKeyHAConKey.current) { + snackbar.closeSnackbar(snackbarKeyHAConKey.current) + } + snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Connecting to websocket...`, { + "variant": "info", + }) + } else if (conn.status === "loaded") { + if (snackbarKeyHAConKey.current) { + snackbar.closeSnackbar(snackbarKeyHAConKey.current) + } + } + }, [conn.status]) + + return
+ + {children} +
+} export const Page: FC<{ children: ReactNode }> = ({ children }) => { + const notistackRef = createRef(); + const onClickDismiss = (key: SnackbarKey) => () => { + notistackRef.current.closeSnackbar(key); + } return - -
- + } + dense preventDuplicate + > + {children} -
+
} \ No newline at end of file diff --git a/webapp/src/haService/connection.ts b/webapp/src/haService/connection.ts index 9d8bcc5..711daf0 100644 --- a/webapp/src/haService/connection.ts +++ b/webapp/src/haService/connection.ts @@ -14,6 +14,7 @@ import { const HASS_URL = process.env.REACT_APP_HASS_URL as string; const HASS_TOKEN = process.env.REACT_APP_HASS_TOKEN; +const HASS_SUPERVISOR_TOKEN = process.env.REACT_APP_SUPERVISOR_TOKEN as string; export type HAConnection = { status: 'loading' } | { @@ -51,6 +52,9 @@ const createAuth = async () => { if (HASS_TOKEN) { return createLongLivedTokenAuth(HASS_URL, HASS_TOKEN); } + if (HASS_SUPERVISOR_TOKEN) { + return await getAuth({ hassUrl: HASS_URL, authCode: HASS_SUPERVISOR_TOKEN }); + } try { auth = await getAuth(); return auth @@ -79,7 +83,13 @@ async function startHAConnection() { } catch (error) { haConnection = { status: 'error', - error: translateErrorCodes(error as any), + error: { + originalError: JSON.stringify(error), + message: translateErrorCodes(error as any), + hassToken: !HASS_TOKEN ? "no" : "yes", + hasSuperToken: HASS_SUPERVISOR_TOKEN, + url: HASS_URL, + }, } throw error }