Merge pull request #125 from pacholoamit/feat/implement-ts-rs

feat(types): implement ts-rs

src-tauri/Cargo.toml

@@ -25,7 +25,9 @@ tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", br
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 log = "^0.4"
-
+tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] }
+ts-rs = "8.1"
+# surrealdb = { version = "1.5.0" }
 
 
 

src-tauri/src/models.rs

@@ -1,15 +1,22 @@
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
+use ts_rs::TS;
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, TS)]
+#[ts(export, export_to = "../../src/lib/bindings/")]
 pub struct Timestamp(pub i64);
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "../../src/lib/bindings/")]
 pub struct Memory {
+    #[ts(type = "number")]
     pub free: u64,
+    #[ts(type = "number")]
     pub total: u64,
+    #[ts(type = "number")]
     pub used: u64,
+    #[ts(type = "number")]
     pub used_percentage: f64,
     pub timestamp: Timestamp,
 }
@@ -18,8 +25,9 @@ pub trait MemoryTrait {
     fn get_memory(&mut self) -> Memory;
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "../../src/lib/bindings/")]
 pub struct GlobalCpu {
     pub usage: f32,
     pub brand: String,
@@ -33,8 +41,9 @@ pub trait GlobalCpuTrait {
     fn get_global_cpu(&mut self) -> GlobalCpu;
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "../../src/lib/bindings/")]
 pub struct Cpu {
     pub name: String,
     pub usage: f64,
@@ -45,12 +54,17 @@ pub trait CpuTrait {
     fn get_cpus(&mut self) -> Vec<Cpu>;
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "../../src/lib/bindings/")]
 pub struct Swap {
+    #[ts(type = "number")]
     pub free: u64,
+    #[ts(type = "number")]
     pub total: u64,
+    #[ts(type = "number")]
     pub used: u64,
+    #[ts(type = "number")]
     pub used_percentage: f64,
     pub timestamp: Timestamp,
 }
@@ -59,8 +73,9 @@ pub trait SwapTrait {
     fn get_swap(&mut self) -> Swap;
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "../../src/lib/bindings/")]
 pub struct SysInfo {
     pub kernel_version: String,
     pub os_version: String,
@@ -73,11 +88,14 @@ pub trait SystemInformationTrait {
     fn get_system_information(&mut self) -> SysInfo;
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "../../src/lib/bindings/")]
 pub struct Network {
     pub name: String,
+    #[ts(type = "number")]
     pub received: u64,
+    #[ts(type = "number")]
     pub transmitted: u64,
     pub timestamp: Timestamp,
 }
@@ -86,12 +104,16 @@ pub trait NetworkTrait {
     fn get_networks(&mut self) -> Vec<Network>;
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "../../src/lib/bindings/")]
 pub struct Disk {
     pub name: String,
+    #[ts(type = "number")]
     pub free: u64,
+    #[ts(type = "number")]
     pub total: u64,
+    #[ts(type = "number")]
     pub used: u64,
     pub mount_point: PathBuf,
     pub file_system: String,
@@ -104,12 +126,15 @@ pub trait DisksTrait {
     fn get_disks(&mut self) -> Vec<Disk>;
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "../../src/lib/bindings/")]
 pub struct Process {
     pub name: String,
     pub pid: String,
+    #[ts(type = "number")]
     pub cpu_usage: f32,
+    #[ts(type = "number")]
     pub memory_usage: u64,
     pub status: String,
 }
@@ -118,17 +143,3 @@ pub trait ProcessesTrait {
     fn get_processes(&mut self) -> Vec<Process>;
     fn kill_process(&mut self, pid: &str) -> bool;
 }
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct Config {
-    pub user: User,
-}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct User {
-    pub email: String,
-    pub first_name: String,
-    pub last_name: String,
-    pub skipped_setup: bool,
-    pub user_hash: String,
-}

src/features/metrics/components/disks/disk.area-chart.tsx

@@ -1,6 +1,6 @@
 import formatBytes from "@/features/metrics/utils/format-bytes";
 import { Enumerable } from "@/hooks/useServerEventsEnumerableStore";
-import { Disk } from "@/lib/types";
+import { Disk } from "@/lib";
 import AreaChart, { useAreaChartState } from "@/components/area-chart";
 import { useEffect } from "react";
 

src/features/processes/components/processes.kill-verification.tsx

@@ -1,4 +1,4 @@
-import { Process } from "@/lib/types";
+import { Process } from "@/lib";
 import { Button, Modal, Text, Group, Space } from "@mantine/core";
 import useKillProcess from "@/features/processes/hooks/useKillProcess";
 
@@ -14,9 +14,7 @@ const KillProcessVerification: React.FC<KillProcessVerificationProps> = ({
 }) => {
   const [kill] = useKillProcess({
     onKill() {
-      setRecords((records) =>
-        records.filter((r) => r.pid !== selectedProcess?.pid)
-      );
+      setRecords((records) => records.filter((r) => r.pid !== selectedProcess?.pid));
     },
   });
 
@@ -29,12 +27,7 @@ const KillProcessVerification: React.FC<KillProcessVerificationProps> = ({
   };
 
   return (
-    <Modal
-      title="Are you sure?"
-      onClose={onCancel}
-      opened={!!selectedProcess}
-      centered
-    >
+    <Modal title="Are you sure?" onClose={onCancel} opened={!!selectedProcess} centered>
       <Space h="md" />
       <Text> Are you sure you want to kill {selectedProcess?.name}? </Text>
       <Space h="xl" />

src/features/processes/components/processes.table.tsx

@@ -1,5 +1,5 @@
 import { DataTable, DataTableSortStatus } from "mantine-datatable";
-import { Process } from "@/lib/types";
+import { Process } from "@/lib";
 import { memo } from "react";
 import { Button } from "@mantine/core";
 

src/features/processes/hooks/useKillProcess.tsx

@@ -1,5 +1,5 @@
 import { Command, invoke } from "@/lib";
-import { KillProcessOpts, Process } from "@/lib/types";
+import { KillProcessOpts, Process } from "@/lib";
 import notification from "@/utils/notification";
 import { useCallback } from "react";
 
@@ -8,11 +8,7 @@ interface UseKillProcessOpts {
   onFailure?: () => void;
 }
 
-const killProcess = async (
-  process: Process,
-  onKill?: () => void,
-  onFailure?: () => void
-) => {
+const killProcess = async (process: Process, onKill?: () => void, onFailure?: () => void) => {
   const cmd = Command.KillProcess;
   const isKilled = await invoke<KillProcessOpts, boolean>(cmd, {
     pid: process.pid,
@@ -36,10 +32,7 @@ const killProcess = async (
 const useKillProcess = (opts: UseKillProcessOpts) => {
   const { onKill, onFailure } = opts;
 
-  const kill = useCallback(
-    (process: Process) => killProcess(process, onKill, onFailure),
-    [onKill, onFailure]
-  );
+  const kill = useCallback((process: Process) => killProcess(process, onKill, onFailure), [onKill, onFailure]);
 
   return [kill] as const;
 };

src/features/processes/pages/processes.page.tsx

@@ -1,7 +1,7 @@
 import { DataTableSortStatus } from "mantine-datatable";
 import { TextInput } from "@mantine/core";
 import { IconSearch } from "@tabler/icons-react";
-import { Process } from "@/lib/types";
+import { Process } from "@/lib";
 import { useState, useEffect, useMemo } from "react";
 
 import sortBy from "lodash.sortby";

src/lib/bindings/Cpu.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Timestamp } from "./Timestamp";
+
+export type Cpu = { name: string, usage: number, timestamp: Timestamp, };

src/lib/bindings/Disk.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Timestamp } from "./Timestamp";
+
+export type Disk = { name: string, free: number, total: number, used: number, mountPoint: string, fileSystem: string, diskType: string, isRemovable: boolean, timestamp: Timestamp, };

src/lib/bindings/GlobalCpu.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Timestamp } from "./Timestamp";
+
+export type GlobalCpu = { usage: number, brand: string, frequency: bigint, name: string, vendor: string, timestamp: Timestamp, };

src/lib/bindings/Memory.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Timestamp } from "./Timestamp";
+
+export type Memory = { free: number, total: number, used: number, usedPercentage: number, timestamp: Timestamp, };

src/lib/bindings/Network.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Timestamp } from "./Timestamp";
+
+export type Network = { name: string, received: number, transmitted: number, timestamp: Timestamp, };

src/lib/bindings/Process.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Process = { name: string, pid: string, cpuUsage: number, memoryUsage: number, status: string, };

src/lib/bindings/Swap.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Timestamp } from "./Timestamp";
+
+export type Swap = { free: number, total: number, used: number, usedPercentage: number, timestamp: Timestamp, };

src/lib/bindings/SysInfo.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Timestamp } from "./Timestamp";
+
+export type SysInfo = { kernelVersion: string, osVersion: string, hostname: string, coreCount: string, timestamp: Timestamp, };

src/lib/bindings/Timestamp.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Timestamp = bigint;

src/lib/index.ts

@@ -3,3 +3,4 @@ export * from "@/lib/types";
 export * from "@/lib/store";
 export * from "@/lib/autostart";
 export * from "@/lib/commands";
+