diff --git a/Cargo.lock b/Cargo.lock index d404585..981172d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -798,6 +798,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "http" version = "0.2.12" @@ -1485,6 +1491,7 @@ dependencies = [ "chrono", "derive_more 1.0.0", "fern", + "hex", "log", "prost", "rand", diff --git a/examples/simple_producer/src/main.rs b/examples/simple_producer/src/main.rs index 4eb4e3e..82784ea 100644 --- a/examples/simple_producer/src/main.rs +++ b/examples/simple_producer/src/main.rs @@ -22,7 +22,7 @@ struct Telemetry { } struct TelemetryItemHandle { - uuid: Vec, + uuid: String, tx: Sender, } diff --git a/frontend/.editorconfig b/frontend/.editorconfig new file mode 100644 index 0000000..ecea360 --- /dev/null +++ b/frontend/.editorconfig @@ -0,0 +1,6 @@ +[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue}] +charset = utf-8 +indent_size = 2 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/frontend/.gitignore b/frontend/.gitignore new file mode 100644 index 0000000..8ee54e8 --- /dev/null +++ b/frontend/.gitignore @@ -0,0 +1,30 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +.DS_Store +dist +dist-ssr +coverage +*.local + +/cypress/videos/ +/cypress/screenshots/ + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + +*.tsbuildinfo diff --git a/frontend/.prettierrc.json b/frontend/.prettierrc.json new file mode 100644 index 0000000..effc164 --- /dev/null +++ b/frontend/.prettierrc.json @@ -0,0 +1,7 @@ + +{ + "$schema": "https://json.schemastore.org/prettierrc", + "semi": false, + "singleQuote": true, + "arrowParens": "avoid" +} diff --git a/frontend/.vscode/extensions.json b/frontend/.vscode/extensions.json new file mode 100644 index 0000000..93ea3e7 --- /dev/null +++ b/frontend/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + "recommendations": [ + "Vue.volar", + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode" + ] +} diff --git a/frontend/README.md b/frontend/README.md new file mode 100644 index 0000000..5f1b01c --- /dev/null +++ b/frontend/README.md @@ -0,0 +1,39 @@ +# frontend + +This template should help get you started developing with Vue 3 in Vite. + +## Recommended IDE Setup + +[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur). + +## Type Support for `.vue` Imports in TS + +TypeScript cannot handle type information for `.vue` imports by default, so we replace the `tsc` CLI with `vue-tsc` for type checking. In editors, we need [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) to make the TypeScript language service aware of `.vue` types. + +## Customize configuration + +See [Vite Configuration Reference](https://vite.dev/config/). + +## Project Setup + +```sh +bun install +``` + +### Compile and Hot-Reload for Development + +```sh +bun dev +``` + +### Type-Check, Compile and Minify for Production + +```sh +bun build +``` + +### Lint with [ESLint](https://eslint.org/) + +```sh +bun lint +``` diff --git a/frontend/bun.lockb b/frontend/bun.lockb new file mode 100755 index 0000000..c2e3a1f Binary files /dev/null and b/frontend/bun.lockb differ diff --git a/frontend/env.d.ts b/frontend/env.d.ts new file mode 100644 index 0000000..11f02fe --- /dev/null +++ b/frontend/env.d.ts @@ -0,0 +1 @@ +/// diff --git a/frontend/eslint.config.js b/frontend/eslint.config.js new file mode 100644 index 0000000..3009bb4 --- /dev/null +++ b/frontend/eslint.config.js @@ -0,0 +1,19 @@ +import pluginVue from 'eslint-plugin-vue' +import vueTsEslintConfig from '@vue/eslint-config-typescript' +import skipFormatting from '@vue/eslint-config-prettier/skip-formatting' + +export default [ + { + name: 'app/files-to-lint', + files: ['**/*.{ts,mts,tsx,vue}'], + }, + + { + name: 'app/files-to-ignore', + ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**'], + }, + + ...pluginVue.configs['flat/essential'], + ...vueTsEslintConfig(), + skipFormatting, +] diff --git a/frontend/index.html b/frontend/index.html new file mode 100644 index 0000000..a888544 --- /dev/null +++ b/frontend/index.html @@ -0,0 +1,13 @@ + + + + + + + Vite App + + +
+ + + diff --git a/frontend/package.json b/frontend/package.json new file mode 100644 index 0000000..1365661 --- /dev/null +++ b/frontend/package.json @@ -0,0 +1,37 @@ +{ + "name": "frontend", + "version": "0.1.0", + "private": true, + "type": "module", + "scripts": { + "dev": "vite", + "build": "run-p type-check \"build-only {@}\" --", + "preview": "vite preview", + "build-only": "vite build", + "type-check": "vue-tsc --build --force", + "lint": "eslint . --fix", + "format": "prettier --write src/" + }, + "dependencies": { + "sass": "^1.80.3", + "sass-loader": "^16.0.2", + "vue": "^3.5.12", + "vue-router": "^4.4.5" + }, + "devDependencies": { + "@tsconfig/node20": "^20.1.4", + "@types/node": "^20.16.11", + "@vitejs/plugin-vue": "^5.1.4", + "@vitejs/plugin-vue-jsx": "^4.0.1", + "@vue/eslint-config-prettier": "^10.0.0", + "@vue/eslint-config-typescript": "^14.0.1", + "@vue/tsconfig": "^0.5.1", + "eslint": "^9.12.0", + "eslint-plugin-vue": "^9.29.0", + "npm-run-all2": "^6.2.3", + "prettier": "^3.3.3", + "typescript": "~5.5.4", + "vite": "^5.4.8", + "vue-tsc": "^2.1.6" + } +} diff --git a/frontend/src/App.vue b/frontend/src/App.vue new file mode 100644 index 0000000..14949a0 --- /dev/null +++ b/frontend/src/App.vue @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/frontend/src/assets/main.scss b/frontend/src/assets/main.scss new file mode 100644 index 0000000..9162fa4 --- /dev/null +++ b/frontend/src/assets/main.scss @@ -0,0 +1,17 @@ + +$light-gray: #d0d1d0; +$dark-gray: #303031; + +$text-color: $light-gray; +$background-color: $dark-gray; + +body { + color: $text-color; + background-color: $background-color; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + align-content: center; + min-height: 100vh; +} diff --git a/frontend/src/composables/telemetry.ts b/frontend/src/composables/telemetry.ts new file mode 100644 index 0000000..227bf6d --- /dev/null +++ b/frontend/src/composables/telemetry.ts @@ -0,0 +1,13 @@ +import { ref } from 'vue' + +export function useTelemetry(name: string) { + const data = ref(null); + const error = ref(null); + + fetch(`/api/tlm/${name}`) + .then((res) => res.json()) + .then((json) => (data.value = json)) + .catch((err) => (error.value = err)); + + return { data, error }; +} diff --git a/frontend/src/main.ts b/frontend/src/main.ts new file mode 100644 index 0000000..df6d8ba --- /dev/null +++ b/frontend/src/main.ts @@ -0,0 +1,11 @@ +import './assets/main.scss' + +import { createApp } from 'vue' +import App from './App.vue' +import router from './router' + +const app = createApp(App) + +app.use(router) + +app.mount('#app') diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts new file mode 100644 index 0000000..a9a0761 --- /dev/null +++ b/frontend/src/router/index.ts @@ -0,0 +1,14 @@ +import { createRouter, createWebHistory } from 'vue-router' + +const router = createRouter({ + history: createWebHistory(import.meta.env.BASE_URL), + routes: [ + { + path: '/', + name: 'home', + component: () => import('../views/HomeView.vue'), + }, + ], +}) + +export default router diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue new file mode 100644 index 0000000..18a387a --- /dev/null +++ b/frontend/src/views/HomeView.vue @@ -0,0 +1,23 @@ + + + diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json new file mode 100644 index 0000000..e14c754 --- /dev/null +++ b/frontend/tsconfig.app.json @@ -0,0 +1,14 @@ +{ + "extends": "@vue/tsconfig/tsconfig.dom.json", + "include": ["env.d.ts", "src/**/*", "src/**/*.vue"], + "exclude": ["src/**/__tests__/*"], + "compilerOptions": { + "composite": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", + + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"] + } + } +} diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json new file mode 100644 index 0000000..66b5e57 --- /dev/null +++ b/frontend/tsconfig.json @@ -0,0 +1,11 @@ +{ + "files": [], + "references": [ + { + "path": "./tsconfig.node.json" + }, + { + "path": "./tsconfig.app.json" + } + ] +} diff --git a/frontend/tsconfig.node.json b/frontend/tsconfig.node.json new file mode 100644 index 0000000..f094063 --- /dev/null +++ b/frontend/tsconfig.node.json @@ -0,0 +1,19 @@ +{ + "extends": "@tsconfig/node20/tsconfig.json", + "include": [ + "vite.config.*", + "vitest.config.*", + "cypress.config.*", + "nightwatch.conf.*", + "playwright.config.*" + ], + "compilerOptions": { + "composite": true, + "noEmit": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", + + "module": "ESNext", + "moduleResolution": "Bundler", + "types": ["node"] + } +} diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts new file mode 100644 index 0000000..6573007 --- /dev/null +++ b/frontend/vite.config.ts @@ -0,0 +1,24 @@ +import { fileURLToPath, URL } from 'node:url' + +import { defineConfig } from 'vite' +import vue from '@vitejs/plugin-vue' +import vueJsx from '@vitejs/plugin-vue-jsx' + +// https://vite.dev/config/ +export default defineConfig({ + plugins: [ + vue(), + vueJsx(), + ], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)) + } + }, + server: { + port: 9000, + proxy: { + '/api': 'http://localhost:8080' + } + } +}) diff --git a/server/Cargo.toml b/server/Cargo.toml index 6b3db72..cca4f66 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -19,6 +19,7 @@ tokio-util = "0.7.12" serde = { version = "1.0.210", features = ["derive"] } serde_json = "1.0.132" derive_more = { version = "1.0.0", features = ["full"] } +hex = "0.4.3" [build-dependencies] tonic-build = "0.12.3" diff --git a/server/proto/core.proto b/server/proto/core.proto index fad7a20..83dc410 100644 --- a/server/proto/core.proto +++ b/server/proto/core.proto @@ -15,7 +15,7 @@ message TelemetryValue { } message UUID { - bytes value = 1; + string value = 1; } // UTC since UNIX diff --git a/server/src/grpc.rs b/server/src/grpc.rs index 938a3a1..639764e 100644 --- a/server/src/grpc.rs +++ b/server/src/grpc.rs @@ -102,6 +102,7 @@ pub fn setup(token: CancellationToken, telemetry_definitions: Arc>>>, name: web::Path) -> Result { let string = name.to_string(); + trace!("get_tlm_definition {}", string); let data = data.lock().await; let tlm_def = data.get(&string); + trace!("tlm_def {:?}", tlm_def.clone()); if let Some(tlm_def) = tlm_def { Ok(web::Json(tlm_def.clone())) @@ -39,13 +42,19 @@ async fn get_tlm_definition(data: web::Data>>) -> Result<(), Box> { let data = web::Data::new(telemetry_definitions); + trace!("Starting HTTP Server"); HttpServer::new(move || { App::new() .app_data(data.clone()) - .service(get_tlm_definition) + .service(web::scope("/api").configure(setup_api)) }) .bind("localhost:8080")? .run().await?; diff --git a/server/src/lib.rs b/server/src/lib.rs index 4d3da90..ac32594 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -43,7 +43,7 @@ fn tlm_data_type_deserialzier<'de, D>(deserializer: D) -> Result, + uuid: String, name: String, #[serde(serialize_with = "tlm_data_type_serialzier")] #[serde(deserialize_with = "tlm_data_type_deserialzier")] diff --git a/server/src/main.rs b/server/src/main.rs index 3e4634d..17724e8 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -20,7 +20,8 @@ async fn main() -> Result<(), Box> { message )) }) - .level(log_level) + .level(log::LevelFilter::Warn) + .level_for("server", log_level) .chain(std::io::stdout()); if let Ok(log_file) = log_file { log_config = log_config.chain(fern::log_file(log_file)?) diff --git a/server/src/uuid.rs b/server/src/uuid.rs index 270ce31..c6abaa7 100644 --- a/server/src/uuid.rs +++ b/server/src/uuid.rs @@ -3,10 +3,10 @@ use crate::core::{Uuid}; impl Uuid { pub fn random() -> Self { - let mut uuid = vec![0u8; 16]; + let mut uuid =[0u8; 16]; rand::thread_rng().fill_bytes(&mut uuid); Self { - value: uuid, + value: hex::encode(uuid), } } }