From 2f02ccc36278e3779b93592f33f7ee7e66b0d2d7 Mon Sep 17 00:00:00 2001 From: Aarnav Tale Date: Wed, 15 May 2024 21:54:40 -0400 Subject: [PATCH] style: eslint changes --- app/utils/config.ts | 198 ++++++++++++++++++++++---------------------- tailwind.config.ts | 33 ++++---- 2 files changed, 114 insertions(+), 117 deletions(-) diff --git a/app/utils/config.ts b/app/utils/config.ts index bbc8093..ed7d52e 100644 --- a/app/utils/config.ts +++ b/app/utils/config.ts @@ -1,122 +1,121 @@ +import { type Document, parse, parseDocument } from 'yaml' import { type FSWatcher, watch } from 'node:fs' import { access, constants, readFile, writeFile } from 'node:fs/promises' import { resolve } from 'node:path' -import { type Document, parse, parseDocument } from 'yaml' - type Duration = `${string}s` | `${string}h` | `${string}m` | `${string}d` | `${string}y` -type Config = { - server_url: string; - listen_addr: string; - metrics_listen_addr: string; - grpc_listen_addr: string; - grpc_allow_insecure: boolean; +interface Config { + server_url: string + listen_addr: string + metrics_listen_addr: string + grpc_listen_addr: string + grpc_allow_insecure: boolean - private_key_path: string; + private_key_path: string noise: { - private_key_path: string; - }; + private_key_path: string + } prefixes: { - v4: string; - v6: string; - }; + v4: string + v6: string + } derp: { server: { - enabled: boolean; - region_id: number; - region_code: string; - region_name: string; - stun_listen_addr: string; - }; + enabled: boolean + region_id: number + region_code: string + region_name: string + stun_listen_addr: string + } - urls: string[]; - paths: string[]; - auto_update_enabled: boolean; - update_frequency: Duration; - }; + urls: string[] + paths: string[] + auto_update_enabled: boolean + update_frequency: Duration + } - disable_check_updates: boolean; - epheremal_node_inactivity_timeout: Duration; - node_update_check_interval: Duration; + disable_check_updates: boolean + epheremal_node_inactivity_timeout: Duration + node_update_check_interval: Duration // Database is probably dangerous database: { - type: 'sqlite3' | 'sqlite' | 'postgres'; + type: 'sqlite3' | 'sqlite' | 'postgres' sqlite?: { - path: string; - }; + path: string + } postgres?: { - host: string; - port: number; - name: string; - user: string; - pass: string; - max_open_conns: number; - max_idle_conns: number; - conn_max_idle_time_secs: number; - ssl: boolean; - }; - }; + host: string + port: number + name: string + user: string + pass: string + max_open_conns: number + max_idle_conns: number + conn_max_idle_time_secs: number + ssl: boolean + } + } - acme_url: string; - acme_email: string; - tls_letsencrypt_hostname: string; - tls_letsencrypt_cache_dir: string; - tls_letsencrypt_challenge_type: string; - tls_letsencrypt_listen: string; - tls_cert_path: string; - tls_key_path: string; + acme_url: string + acme_email: string + tls_letsencrypt_hostname: string + tls_letsencrypt_cache_dir: string + tls_letsencrypt_challenge_type: string + tls_letsencrypt_listen: string + tls_cert_path: string + tls_key_path: string log: { - format: 'text' | 'json'; - level: string; - }; + format: 'text' | 'json' + level: string + } - acl_policy_path: string; + acl_policy_path: string dns_config: { - override_local_dns: boolean; - nameservers: string[]; - restricted_nameservers: Record; // Split DNS - domains: string[]; - extra_records: Array<{ - name: string; - type: 'A'; - value: string; - }>; + override_local_dns: boolean + nameservers: string[] + restricted_nameservers: Record // Split DNS + domains: string[] + extra_records: { + name: string + type: 'A' + value: string + }[] - magic_dns: boolean; - base_domain: string; - }; + magic_dns: boolean + base_domain: string + } - unix_socket: string; - unix_socket_permission: string; + unix_socket: string + unix_socket_permission: string oidc: { - only_start_if_oidc_is_available: boolean; - issuer: string; - client_id: string; - client_secret: string; - expiry: Duration; - use_expiry_from_token: boolean; - scope: string[]; - extra_params: Record; + only_start_if_oidc_is_available: boolean + issuer: string + client_id: string + client_secret: string + expiry: Duration + use_expiry_from_token: boolean + scope: string[] + extra_params: Record - allowed_domains: string[]; - allowed_groups: string[]; - allowed_users: string[]; + allowed_domains: string[] + allowed_groups: string[] + allowed_users: string[] - strip_email_domain: boolean; - }; + strip_email_domain: boolean + } logtail: { - enabled: boolean; - }; + enabled: boolean + } - randomize_client_port: boolean; + randomize_client_port: boolean } let config: Document @@ -196,18 +195,18 @@ export function registerConfigWatcher() { }) } -export type Context = { - hasDockerSock: boolean; - hasConfig: boolean; - hasConfigWrite: boolean; - hasAcl: boolean; - hasAclWrite: boolean; - headscaleUrl: string; +export interface Context { + hasDockerSock: boolean + hasConfig: boolean + hasConfigWrite: boolean + hasAcl: boolean + hasAclWrite: boolean + headscaleUrl: string oidcConfig?: { - issuer: string; - client: string; - secret: string; - }; + issuer: string + client: string + secret: string + } } export let context: Context @@ -221,7 +220,7 @@ export async function getContext() { hasAcl: await hasAcl(), hasAclWrite: await hasAclW(), headscaleUrl: await getHeadscaleUrl(), - oidcConfig: await getOidcConfig() + oidcConfig: await getOidcConfig(), } } @@ -237,9 +236,9 @@ async function getOidcConfig() { if (!issuer || !client || !secret) { const config = await getConfig() - issuer = config.oidc?.issuer - client = config.oidc?.client_id - secret = config.oidc?.client_secret + issuer = config.oidc.issuer + client = config.oidc.client_id + secret = config.oidc.client_secret } // If atleast one is defined but not all 3, throw an error @@ -352,4 +351,3 @@ async function hasAclW() { return false } - diff --git a/tailwind.config.ts b/tailwind.config.ts index e07946d..9b56ff1 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -10,36 +10,35 @@ export default { container: { center: true, padding: { - DEFAULT: '1rem', - sm: '2rem', - lg: '4rem', - xl: '5rem', - '2xl': '6rem' - } + 'DEFAULT': '1rem', + 'sm': '2rem', + 'lg': '4rem', + 'xl': '5rem', + '2xl': '6rem', + }, }, extend: { height: { - editor: 'calc(100vh - 20rem)' + editor: 'calc(100vh - 20rem)', }, colors: { main: colors.slate, - ui: colors.neutral + ui: colors.neutral, }, keyframes: { loader: { from: { - transform: 'translateX(-100%)' + transform: 'translateX(-100%)', }, to: { - transform: 'translateX(100%)' - } - } + transform: 'translateX(100%)', + }, + }, }, animation: { - loading: 'loader 0.8s infinite ease-in-out' - } - } + loading: 'loader 0.8s infinite ease-in-out', + }, + }, }, - plugins: [animate, aria] + plugins: [animate, aria], } satisfies Config -