Reorganize project, remove some dead code
This commit is contained in:
Madeline
79
Soyuz/ViewModels/PrinterObjectsQuery.swift
Normal file
79
Soyuz/ViewModels/PrinterObjectsQuery.swift
Normal file
@@ -0,0 +1,79 @@
|
||||
//
|
||||
// PrinterObjectsQuery.swift
|
||||
// KlipperMon
|
||||
//
|
||||
// Created by maddiefuzz on 2/7/23.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
// Root struct to decode for REST response
|
||||
struct PrinterObjectsQuery: Decodable {
|
||||
let result: ResultsData
|
||||
}
|
||||
|
||||
struct ResultsData: Decodable {
|
||||
let eventtime: Double
|
||||
let status: StatusData
|
||||
}
|
||||
|
||||
// Individual update replies for JSON-RPC
|
||||
struct jsonRpcUpdate: Decodable {
|
||||
let method: String?
|
||||
let params: jsonRpcParams
|
||||
}
|
||||
|
||||
struct jsonRpcParams: Decodable {
|
||||
let status: StatusData?
|
||||
let timestamp: Double?
|
||||
|
||||
init(from decoder: Decoder) throws {
|
||||
var container = try decoder.unkeyedContainer()
|
||||
self.status = try container.decode(StatusData.self)
|
||||
self.timestamp = try container.decode(Double.self)
|
||||
}
|
||||
}
|
||||
|
||||
// Root structs to decode for JSON-RPC response
|
||||
struct jsonRpcResponse: Decodable {
|
||||
let result: jsonRpcResult
|
||||
|
||||
}
|
||||
|
||||
struct jsonRpcResult: Decodable {
|
||||
let eventtime: Double
|
||||
let status: StatusData
|
||||
}
|
||||
|
||||
// Shared data sub-structs
|
||||
struct StatusData: Decodable {
|
||||
let virtual_sdcard: VirtualSDCardData?
|
||||
let extruder: ExtruderData?
|
||||
let print_stats: PrintStatsData?
|
||||
let heater_bed: HeaterBedData?
|
||||
}
|
||||
|
||||
struct VirtualSDCardData: Decodable {
|
||||
let file_path: String?
|
||||
let progress: Double?
|
||||
let is_active: Bool?
|
||||
}
|
||||
|
||||
struct ExtruderData: Decodable {
|
||||
let temperature: Double?
|
||||
let target: Double?
|
||||
let power: Double?
|
||||
}
|
||||
|
||||
struct PrintStatsData: Decodable {
|
||||
let filename: String?
|
||||
let print_duration: Double?
|
||||
let filament_used: Double?
|
||||
let state: String?
|
||||
}
|
||||
|
||||
struct HeaterBedData: Decodable {
|
||||
let temperature: Double?
|
||||
let target: Double?
|
||||
let power: Double?
|
||||
}
|
||||
328
Soyuz/ViewModels/PrinterRequestManager.swift
Normal file
328
Soyuz/ViewModels/PrinterRequestManager.swift
Normal file
@@ -0,0 +1,328 @@
|
||||
//
|
||||
// PrinterRequestManager.swift
|
||||
// KlipperMon
|
||||
//
|
||||
// Created by maddiefuzz on 2/7/23.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Network
|
||||
import AppKit
|
||||
import Starscream
|
||||
|
||||
// MARK: Bonjour Protocol
|
||||
|
||||
protocol NetworkDiscoveryEngine {
|
||||
func startScan(queue: DispatchQueue)
|
||||
func setBrowseResultsChangedHandler(_ handler: @escaping ((Set<NWBrowser.Result>, Set<NWBrowser.Result.Change>) -> Void))
|
||||
func setStateUpdateHandler(_ handler: @escaping ((NWBrowser.State) -> Void))
|
||||
}
|
||||
|
||||
extension NWBrowser: NetworkDiscoveryEngine {
|
||||
func startScan(queue: DispatchQueue) {
|
||||
start(queue: queue)
|
||||
}
|
||||
|
||||
func setBrowseResultsChangedHandler(_ handler: @escaping ((Set<NWBrowser.Result>, Set<NWBrowser.Result.Change>) -> Void)) {
|
||||
self.browseResultsChangedHandler = handler
|
||||
}
|
||||
|
||||
func setStateUpdateHandler(_ handler: @escaping ((State) -> Void)) {
|
||||
self.stateUpdateHandler = handler
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: Starscream Protocol
|
||||
|
||||
struct JsonRpcRequest: Codable {
|
||||
var jsonrpc = "2.0"
|
||||
let method: String
|
||||
let params: [String: [String: String?]]
|
||||
var id = 1
|
||||
|
||||
func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(jsonrpc, forKey: .jsonrpc)
|
||||
try container.encode(method, forKey: .method)
|
||||
try container.encode(params, forKey: .params)
|
||||
try container.encode(id, forKey: .id)
|
||||
}
|
||||
}
|
||||
|
||||
//@MainActor
|
||||
class PrinterRequestManager: ObservableObject, WebSocketDelegate {
|
||||
let WEBSOCKET_TIMEOUT_INTERVAL: TimeInterval = 60.0
|
||||
|
||||
// Debug stuff
|
||||
let startDate = Date()
|
||||
let startDateString: String
|
||||
let filename: URL
|
||||
|
||||
func writeToDebugLog(_ output: String) {
|
||||
do {
|
||||
let fileHandle = try FileHandle(forWritingTo: filename)
|
||||
defer {
|
||||
fileHandle.closeFile()
|
||||
}
|
||||
fileHandle.seekToEndOfFile()
|
||||
let dateFormatter = DateFormatter()
|
||||
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SS"
|
||||
|
||||
let debugOutput = String("\(dateFormatter.string(from: Date())) - \(output)\n")
|
||||
fileHandle.write(debugOutput.data(using: .utf8)!)
|
||||
} catch {
|
||||
print("[error] writeToDebugLog - \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
// Websocket JSON-RPC endpoints discovered via bonjour
|
||||
@Published var nwBrowserDiscoveredItems: [NWBrowser.Result] = []
|
||||
|
||||
|
||||
// Websocket JSON-RPC published data
|
||||
@Published var state: String
|
||||
@Published var progress: Double
|
||||
@Published var extruderTemperature: Double
|
||||
@Published var bedTemperature: Double
|
||||
|
||||
// Active connection published data
|
||||
@Published var isConnected = false
|
||||
@Published var socketHost: String
|
||||
@Published var socketPort: String
|
||||
|
||||
let nwBrowser: NetworkDiscoveryEngine
|
||||
//let nwBrowser = NWBrowser(for: .bonjourWithTXTRecord(type: "_moonraker._tcp", domain: "local."), using: .tcp)
|
||||
var connection: NWConnection!
|
||||
|
||||
var socket: WebSocket?
|
||||
var lastPingDate = Date()
|
||||
|
||||
// Parse a JSON-RPC query-response message
|
||||
func parse_response(_ response: jsonRpcResponse) {
|
||||
state = response.result.status.print_stats?.state ?? ""
|
||||
progress = response.result.status.virtual_sdcard?.progress ?? 0.0
|
||||
extruderTemperature = response.result.status.extruder?.temperature ?? 0.0
|
||||
bedTemperature = response.result.status.heater_bed?.temperature ?? 0.0
|
||||
|
||||
print(response)
|
||||
}
|
||||
|
||||
// Parse a JSON-RPC update message
|
||||
func parse_update(_ update: jsonRpcUpdate) {
|
||||
if let newState = update.params.status?.print_stats?.state {
|
||||
state = newState
|
||||
}
|
||||
if let newProgress = update.params.status?.virtual_sdcard?.progress {
|
||||
progress = newProgress
|
||||
}
|
||||
if let newExtruderTemp = update.params.status?.extruder?.temperature {
|
||||
extruderTemperature = newExtruderTemp
|
||||
}
|
||||
if let newBedTemp = update.params.status?.heater_bed?.temperature {
|
||||
bedTemperature = newBedTemp
|
||||
}
|
||||
}
|
||||
|
||||
init(browser: NetworkDiscoveryEngine = NWBrowser(for: .bonjourWithTXTRecord(type: "_moonraker._tcp", domain: "local."), using: .tcp)) {
|
||||
state = ""
|
||||
progress = 0.0
|
||||
extruderTemperature = 0.0
|
||||
bedTemperature = 0.0
|
||||
socketHost = ""
|
||||
socketPort = ""
|
||||
nwBrowser = browser
|
||||
//reconnectionTimer = nil
|
||||
|
||||
// MARK: Debug stuff
|
||||
startDateString = "\(startDate)\n\n"
|
||||
filename = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0].appendingPathComponent("klippermon-debug-\(startDateString).txt")
|
||||
|
||||
do {
|
||||
try startDateString.write(to: filename, atomically: true, encoding: .utf8)
|
||||
} catch {
|
||||
print("[error] Couldn't write to \(filename) - \(error)")
|
||||
}
|
||||
|
||||
// MARK: Bonjour browser initialization at instantiation
|
||||
nwBrowser.setBrowseResultsChangedHandler({ (newResults, changes) in
|
||||
print("[update] Results changed.")
|
||||
newResults.forEach { result in
|
||||
print(result)
|
||||
self.nwBrowserDiscoveredItems.append(result)
|
||||
}
|
||||
})
|
||||
// Bonjour browser state update handler
|
||||
nwBrowser.setStateUpdateHandler({ newState in
|
||||
switch newState {
|
||||
case .failed(let error):
|
||||
print("[error] nwbrowser: \(error)")
|
||||
case .ready:
|
||||
print("[ready] nwbrowser")
|
||||
case .setup:
|
||||
print("[setup] nwbrowser")
|
||||
default:
|
||||
break
|
||||
}
|
||||
})
|
||||
// Start up the bonjour browser, get results and process them in the update handler
|
||||
nwBrowser.startScan(queue: DispatchQueue.main)
|
||||
|
||||
// Screen sleep functionality
|
||||
// NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(screenDidSleep(_:)), name: NSWorkspace.screensDidSleepNotification, object: nil)
|
||||
// NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(screenDidWake(_:)), name: NSWorkspace.screensDidWakeNotification, object: nil)
|
||||
let center = NSWorkspace.shared.notificationCenter;
|
||||
let mainQueue = OperationQueue.main
|
||||
|
||||
center.addObserver(forName: NSWorkspace.screensDidWakeNotification, object: nil, queue: mainQueue) { notification in
|
||||
self.screenChangedSleepState(notification)
|
||||
}
|
||||
|
||||
center.addObserver(forName: NSWorkspace.screensDidSleepNotification, object: nil, queue: mainQueue) { notification in
|
||||
self.screenChangedSleepState(notification)
|
||||
}
|
||||
}
|
||||
|
||||
func screenChangedSleepState(_ notification: Notification) {
|
||||
switch(notification.name) {
|
||||
case NSWorkspace.screensDidSleepNotification:
|
||||
socket?.disconnect()
|
||||
case NSWorkspace.screensDidWakeNotification:
|
||||
self.openWebsocket()
|
||||
default:
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func screenDidWake(_ notification: Notification) {
|
||||
print("Screen woke: \(notification.name)")
|
||||
if socket != nil {
|
||||
self.openWebsocket()
|
||||
}
|
||||
}
|
||||
|
||||
// Called from the UI with an endpoint.
|
||||
// Momentarily connect/disconnects from the endpoint to retrieve the host/port
|
||||
// calls private function openWebsocket to process the host/port
|
||||
func resolveBonjourHost(_ endpoint: NWEndpoint) {
|
||||
// Debug stuff
|
||||
endpoint.txtRecord?.forEach({ (key: String, value: NWTXTRecord.Entry) in
|
||||
print("\(key): \(value)")
|
||||
})
|
||||
|
||||
connection = NWConnection(to: endpoint, using: .tcp)
|
||||
connection.stateUpdateHandler = { [self] state in
|
||||
switch state {
|
||||
case .ready:
|
||||
if let innerEndpoint = connection.currentPath?.remoteEndpoint, case .hostPort(let host, let port) = innerEndpoint {
|
||||
let hostPortDebugOutput = "Connected to \(host):\(port)"
|
||||
|
||||
print(hostPortDebugOutput)
|
||||
writeToDebugLog(hostPortDebugOutput)
|
||||
|
||||
let hostString = "\(host)"
|
||||
let regex = try! Regex("%(.+)")
|
||||
let match = hostString.firstMatch(of: regex)
|
||||
let sanitizedHost = hostString.replacingOccurrences(of: match!.0, with: "")
|
||||
|
||||
print("[sanitized] Resolved \(sanitizedHost):\(port)")
|
||||
|
||||
socketHost = sanitizedHost
|
||||
socketPort = "\(port)"
|
||||
connection.cancel()
|
||||
self.openWebsocket()
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
connection.start(queue: .global())
|
||||
}
|
||||
|
||||
func reconnectWebsocket() {
|
||||
if socket == nil {
|
||||
return
|
||||
}
|
||||
|
||||
socket!.disconnect()
|
||||
self.openWebsocket()
|
||||
//socket!.write(ping: "PING!".data(using: .utf8)!)
|
||||
}
|
||||
|
||||
// Opens the websocket connection
|
||||
// TODO: host and port should be function arguments probably maybe
|
||||
private func openWebsocket() {
|
||||
//let fullUrlString = "http://\(socketHost):\(socketPort)/websocket"
|
||||
var request = URLRequest(url: URL(string: "http://\(socketHost):\(socketPort)/websocket")!)
|
||||
request.timeoutInterval = 5
|
||||
socket = WebSocket(request: request)
|
||||
socket!.delegate = self
|
||||
socket!.connect()
|
||||
|
||||
// TODO: Check that this keeps the connection alive properly
|
||||
Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) { [self] timer in
|
||||
//self.checkWebsocketIsAlive()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: delegate callback for Starscream WebSocketClient
|
||||
func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) {
|
||||
switch event {
|
||||
case .connected(let headers):
|
||||
isConnected = true
|
||||
print("websocket is connected: \(headers)")
|
||||
writeToDebugLog("Connected to WebSocket")
|
||||
let jsonRpcRequest = JsonRpcRequest(method: "printer.objects.subscribe",
|
||||
params: ["objects":
|
||||
["extruder": nil,
|
||||
"virtual_sdcard": nil,
|
||||
"heater_bed": nil,
|
||||
"print_stats": nil]
|
||||
])
|
||||
|
||||
print(String(data: try! JSONEncoder().encode(jsonRpcRequest), encoding: .utf8)!)
|
||||
socket?.write(data: try! JSONEncoder().encode(jsonRpcRequest), completion: {
|
||||
print("[send] json-rpc printer.objects.subscribe query")
|
||||
})
|
||||
case .disconnected(let reason, let code):
|
||||
isConnected = false
|
||||
print("websocket is disconnected: \(reason) with code: \(code)")
|
||||
writeToDebugLog("Websocket is disconnected: \(reason) with code: \(code)")
|
||||
case .text(let string):
|
||||
self.writeToDebugLog(string)
|
||||
// Check for initial RPC response
|
||||
let statusResponse = try? JSONDecoder().decode(jsonRpcResponse.self, from: Data(string.utf8))
|
||||
if let statusResponseSafe = statusResponse {
|
||||
self.parse_response(statusResponseSafe)
|
||||
}
|
||||
// Check for RPC updates
|
||||
if let updateResponse = try? JSONDecoder().decode(jsonRpcUpdate.self, from: Data(string.utf8)) {
|
||||
self.parse_update(updateResponse)
|
||||
}
|
||||
case .binary(let data):
|
||||
self.writeToDebugLog(String(data: data, encoding: .utf8)!)
|
||||
print("Received data: \(data.count)")
|
||||
case .ping(_):
|
||||
print("PING! \(Date())")
|
||||
// TODO: There's probably a better way to do this
|
||||
if(lastPingDate.addingTimeInterval(WEBSOCKET_TIMEOUT_INTERVAL) < Date.now) {
|
||||
print("Forcing reconnection of websocket..")
|
||||
self.reconnectWebsocket()
|
||||
}
|
||||
lastPingDate = Date()
|
||||
break
|
||||
case .pong(_):
|
||||
print("PONG!")
|
||||
break
|
||||
case .viabilityChanged(_):
|
||||
break
|
||||
case .reconnectSuggested(_):
|
||||
break
|
||||
case .cancelled:
|
||||
isConnected = false
|
||||
case .error(let error):
|
||||
isConnected = false
|
||||
print("[error] Starscream: \(error.debugDescription)")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user