trying to just redirect ws

This commit is contained in:
ari committed 2022-06-04 15:45:14 -04:00
1 parent e6e51be5a5
commit 079f353dbf
8 files changed
+114 -60

No files matched your search

+7 -7
View File
@@ -5,15 +5,15 @@ import { useAPIService } from './core';
import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
const baseURL = process.env.NODE_ENV === 'development' ?
"http://localhost:8000" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]);
export const remoteDetailsAPI = makeRemoteAPI(
baseURL + "/details"
const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
"http://localhost:8000" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
console.log({ baseURL, wsURL })
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "/automations"
baseURL + "automations"
);
export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(remoteAutoAPI)
+4 -46
View File
@@ -9,7 +9,7 @@ import {
ERR_INVALID_HTTPS_TO_HTTP,
createConnection as _createConnection,
} from "home-assistant-js-websocket";
import { remoteDetailsAPI } from 'apiService';
import { wsURL } from 'apiService';
export type HAConnection = {
status: 'loading'
@@ -43,60 +43,18 @@ const translateErrorCodes = (errorCode: number) => {
return errorCode;
}
type ReturnedToken = {
hassURL: string;
longToken: string
} | {
hassURL: string;
hassioToken: string
} | {
error: any;
}
const getToken = async (): Promise<ReturnedToken> => {
const data = await remoteDetailsAPI.makeCall({
"path": "/",
"method": "GET",
});
if (!data.ok) {
return {
error: {
message: "Failed to get token from api.",
originalError: data.error,
}
}
}
const hassURL = data.data.hass_url;
const hassioToken = data.data.hassio_token;
if (!hassioToken) {
return {
error: {
message: [
"Missing HASSIO Token, Please make sure the token is correctly passing to the container!",
"Make sure the token `HASSIO_TOKEN` and `HASS_URL` are set properly."
].join('\n'),
}
}
}
return { hassioToken, hassURL }
}
const createConnection = async () => {
const tokens = await getToken();
try {
if ('hassioToken' in tokens) {
return _createConnection({
auth: createLongLivedTokenAuth(tokens.hassURL, tokens.hassioToken),
});
}
return _createConnection({
auth: createLongLivedTokenAuth(wsURL, 'xxx'),
});
} catch (error) {
// eslint-disable-next-line
throw {
originalError: JSON.stringify(error),
message: translateErrorCodes(error as any),
tokens,
}
}
throw tokens
}
async function startHAConnection() {