fix: Fix linting issues
This commit is contained in:
+3
-2
@@ -1,13 +1,14 @@
|
||||
import { NetworkStatus } from "./types";
|
||||
|
||||
export const MANAGEMENT_URL = 'https://vpn.vyntehome.com';
|
||||
export const GATEWAY_HOST = new URL(MANAGEMENT_URL).host;
|
||||
export const APP_NAME = "Vynte Connect";
|
||||
export const POLL_INTERVAL_MS = 5000;
|
||||
export const WINDOW_WIDTH = 384;
|
||||
export const WINDOW_HEIGHT = 420;
|
||||
export const DEFAULT_STATUS = {
|
||||
export const DEFAULT_STATUS: NetworkStatus = {
|
||||
state: "checking",
|
||||
title: `Checking ${GATEWAY_HOST}`,
|
||||
message: "Preparing the Vynte access client.",
|
||||
connectedSince: null,
|
||||
gatewayHost: GATEWAY_HOST
|
||||
};
|
||||
+4
-3
@@ -4,6 +4,7 @@ import started from 'electron-squirrel-startup';
|
||||
import { APP_NAME, DEFAULT_STATUS, GATEWAY_HOST, MANAGEMENT_URL, POLL_INTERVAL_MS, WINDOW_HEIGHT, WINDOW_WIDTH } from './config';
|
||||
import { NetBirdClient } from './netbird';
|
||||
import { baseStatus, normalizeStatus } from './status';
|
||||
import { NetworkStatus, UIStatus } from './types';
|
||||
|
||||
// Handle creating/removing shortcuts on Windows when installing/uninstalling.
|
||||
if (started) {
|
||||
@@ -57,7 +58,7 @@ let tray: Tray;
|
||||
let window: BrowserWindow;
|
||||
let pollTimer: NodeJS.Timeout;
|
||||
let autoConnect = false;
|
||||
let cachedStatus = { ...DEFAULT_STATUS };
|
||||
let cachedStatus = DEFAULT_STATUS;
|
||||
|
||||
function resourcePath(name: string) {
|
||||
if (app.isPackaged) {
|
||||
@@ -70,7 +71,7 @@ function netbirdClient() {
|
||||
return new NetBirdClient(resourcePath(process.platform === "win32" ? 'netbird.exe' : 'netbird'));
|
||||
}
|
||||
|
||||
function withAutoConnect(status: Record<string, any>) {
|
||||
function withAutoConnect(status: NetworkStatus): UIStatus {
|
||||
return { ...status, autoConnect };
|
||||
}
|
||||
|
||||
@@ -105,7 +106,7 @@ function updateTray() {
|
||||
tray.setContextMenu(Menu.buildFromTemplate(template));
|
||||
}
|
||||
|
||||
function setStatus(status: Record<string, any>) {
|
||||
function setStatus(status: NetworkStatus) {
|
||||
cachedStatus = {
|
||||
...cachedStatus,
|
||||
...status,
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
// https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts
|
||||
|
||||
import { contextBridge, ipcRenderer } from "electron";
|
||||
import { UIStatus } from "./types";
|
||||
|
||||
contextBridge.exposeInMainWorld('vynte', {
|
||||
getStatus: () => ipcRenderer.invoke('status:get'),
|
||||
@@ -12,5 +13,5 @@ contextBridge.exposeInMainWorld('vynte', {
|
||||
toggleAuto: () => ipcRenderer.invoke('auto:toggle'),
|
||||
quit: () => ipcRenderer.invoke('app:quit'),
|
||||
openGateway: () => ipcRenderer.invoke('external:openGateway'),
|
||||
onStatus: (callback: Function) => ipcRenderer.on('status', (_, status) => callback(status))
|
||||
onStatus: (callback: (status: UIStatus) => void) => ipcRenderer.on('status', (_, status) => callback(status))
|
||||
})
|
||||
+1
-5
@@ -27,7 +27,7 @@
|
||||
*/
|
||||
|
||||
import './index.css'
|
||||
import type { NetworkStatus } from './status';
|
||||
import { UIStatus } from './types';
|
||||
|
||||
const body = document.body;
|
||||
|
||||
@@ -40,10 +40,6 @@ const auto = document.getElementById('auto') as HTMLElement;
|
||||
const logout = document.getElementById('logout') as HTMLElement;
|
||||
const quit = document.getElementById('quit') as HTMLElement;
|
||||
|
||||
interface UIStatus extends NetworkStatus {
|
||||
autoConnect?: boolean;
|
||||
}
|
||||
|
||||
let currentStatus: Partial<UIStatus> = {
|
||||
state: 'checking',
|
||||
};
|
||||
|
||||
+2
-12
@@ -1,12 +1,5 @@
|
||||
import { GATEWAY_HOST } from './config';
|
||||
|
||||
export interface NetworkStatus {
|
||||
state?: string;
|
||||
title?: string;
|
||||
message?: string;
|
||||
connectedSince: number | null;
|
||||
gatewayHost: string;
|
||||
}
|
||||
import { NetworkStatus } from './types';
|
||||
|
||||
interface NetBirdStatusResponse {
|
||||
daemonStatus?: string;
|
||||
@@ -22,11 +15,8 @@ interface NetBirdStatusResponse {
|
||||
};
|
||||
}
|
||||
|
||||
export function baseStatus(
|
||||
overrides: Partial<NetworkStatus> = {}
|
||||
): NetworkStatus {
|
||||
export function baseStatus(overrides: NetworkStatus): NetworkStatus {
|
||||
return {
|
||||
connectedSince: null,
|
||||
gatewayHost: GATEWAY_HOST,
|
||||
...overrides,
|
||||
};
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
export interface NetworkStatus {
|
||||
state: string;
|
||||
title: string;
|
||||
message: string;
|
||||
connectedSince?: number;
|
||||
gatewayHost?: string;
|
||||
}
|
||||
|
||||
export interface UIStatus extends NetworkStatus {
|
||||
autoConnect?: boolean;
|
||||
}
|
||||
Reference in New Issue
Block a user