📐 Adds socket-service

app/src/lib/services/index.ts

@@ -1 +1,2 @@
 export * from './file-service'
+export * from './socket-service'

app/src/lib/services/socket-service.ts

@@ -0,0 +1,89 @@
+import { Result, Ok } from '$lib/utilities';
+import { writable, type Writable } from 'svelte/store';
+
+type WebsocketData = string | ArrayBufferLike | Blob | ArrayBufferView
+
+class SocketService {
+
+    public isConnected = writable(false);
+    public angles = writable(new Int16Array(12).fill(0));
+    public log = writable([] as string[]);
+    public battery = writable({});
+    public mpu = writable({ heading: 0 });
+    public distances = writable({});
+    public settings = writable({});
+    public systemInfo = writable({} as number);
+    public dataBuffer = writable(new Float32Array(13));
+    public servoBuffer: Writable<Int16Array | number[]> = writable(new Int16Array(12));
+    public data = writable();
+    private socket!: WebSocket;
+
+    constructor() {}
+
+    public connect(url: string): void {
+        this.socket = new WebSocket(url);
+        this.socket.binaryType = "arraybuffer";
+        this.socket.onopen = () => this.handleConnected();
+        this.socket.onclose = () => this.handleDisconnected();
+        this.socket.onmessage = (event: unknown) => this.handleMessage(event);
+    }
+
+    public send(data: WebsocketData): Result<void, string> {
+        if (this.socket.readyState === WebSocket.OPEN){
+            this.socket.send(data)
+            return Ok.void()
+        }
+        return Result.err("The connection is not open")
+    }
+
+    private handleConnected(): void {
+        this.isConnected.set(true);
+    }
+
+    private handleDisconnected(): void {
+        this.isConnected.set(false);
+    }
+
+    private handleMessage(event: any): void {
+        if (event.data instanceof ArrayBuffer) {
+            let buffer = new Int8Array(event.data);
+            if (buffer.length === 44) {
+                this.dataBuffer.set(new Float32Array(buffer.buffer));
+            }
+        } else {
+            let data = event.data;
+            try {
+                data = JSON.parse(event.data);
+            } catch (error) {
+                console.warn(error);
+            }
+            switch (data.type) {
+                case "angles":
+                    this.angles.set(data.angles);
+                    break;
+                case "logs":
+                    this.log.set(data.logs);
+                    break;
+                case "log":
+                    this.log.update(entries => { entries.push(data.log); return entries; });
+                    break;
+                case "settings":
+                    this.settings.set(data.settings);
+                case "info":
+                    this.systemInfo.set(data.info);
+                    break;
+                case "mpu":
+                    this.mpu.set(data.mpu);
+                    break;
+                case "distances":
+                    this.distances.set(data.distances);
+                    break;
+                case "battery":
+                    this.battery.set(data.battery);
+                    break;
+            }
+        }
+    }
+}
+
+export default new SocketService();

app/src/lib/socket.ts

@@ -1,92 +0,0 @@
-import { writable, type Writable } from 'svelte/store';
-
-export type WebSocketStatus = 'OPEN' | 'CONNECTING' | 'CLOSED'
-
-export const isConnected = writable(false)
-
-export const angles = writable(new Int16Array(12).fill(0))
-export const log = writable([])
-export const battery = writable({})
-export const mpu = writable({heading:0})
-export const distances = writable({})
-export const settings = writable({})
-export const systemInfo = writable({} as number)
-
-export const dataBuffer = writable(new Float32Array(13))
-
-export const servoBuffer:Writable<Int16Array|number[]> = writable(new Int16Array(12))
-
-export const data = writable();
-
-export const status:Writable<WebSocketStatus> = writable('CLOSED')
-
-export const socket:Writable<WebSocket> = writable()
-
-export const connect = (url:string) => {
-    status.set('CONNECTING')
-    let _socket = new WebSocket(url);
-    _socket.binaryType = "arraybuffer";
-    _socket.onopen = _connected;
-    _socket.onclose = _disconnected;
-    _socket.onmessage = _message;
-    socket.set(_socket)
-
-    servoBuffer.subscribe(data => {
-        if(_socket.readyState !== 1) return
-        const buffer = []
-        buffer[0] = 1
-        buffer.push(...data)
-        _socket.send(new Int16Array(buffer))
-    })
-}
-
-const _connected = () => {
-    status.set('OPEN')
-    isConnected.set(true)
-}
-
-const _disconnected = () => {
-    status.set('CLOSED')
-    isConnected.set(false)
-}
-
-const _message = (event:any) => {    
-    if (event.data instanceof ArrayBuffer) {
-        let buffer = new Int8Array(event.data);
-        if(buffer.length === 44) {
-            dataBuffer.set(new Float32Array(buffer.buffer) )
-        }
-    } else {
-        let data = event.data
-        try {
-            data = JSON.parse(event.data)
-        } catch (error) {
-            console.warn(error)
-        }
-        switch (data.type) {
-            case "angles":
-                angles.set(data.angles)
-                break
-            case "logs":
-                log.set(data.logs)
-                break
-            case "log":
-                log.update(entries => {entries.push(data.log); return entries})
-                break
-            case "settings":
-                settings.set(data.settings)
-            case "info":
-                systemInfo.set(data.info)
-                break
-            case "mpu":
-                mpu.set(data.mpu)
-                break
-            case "distances":
-                distances.set(data.distances)
-                break
-             case "battery":
-                battery.set(data.battery)
-                break    
-        }
-    }
-}

app/src/lib/utilities/result/ok.ts

@@ -33,4 +33,12 @@ export class Ok<T> {
   static new<T>(inner: T): Ok<T> {
     return new Ok<T>(inner)
   }
+
+  /**
+   * Create an empty `Ok`
+   * @returns `Ok(void)` 
+   */
+  static void(): Ok<void> {
+    return new Ok(undefined)
+  }
 }