maddiefuzz/SoyuzCapsule
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Merge commit 'f778b97'

Browse Source
This commit is contained in:
maddiebaka
2023-07-10 14:14:24 -04:00
parent 78450a85bb f778b97260
commit ec8845ebc6
20 changed files with 456 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Soyuz/Persistence.swift
View File

@@ -1,9 +1,8 @@
//
// Persistence.swift
// KlipperMon
//
// Created by maddiefuzz on 2/7/23.
//
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import CoreData

2
Soyuz/Soyuz.entitlements
View File

@@ -8,7 +8,5 @@
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.network.server</key>
<true/>
</dict>
</plist>

16
Soyuz/SoyuzApp.swift
View File

@@ -1,9 +1,8 @@
//
// KlipperMonApp.swift
// KlipperMon
//
// Created by maddiefuzz on 2/7/23.
//
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import SwiftUI
@@ -16,11 +15,6 @@ struct SoyuzApp: App {
@ObservedObject static var printerManager = MoonrakerSocketManager()
var body: some Scene {
// WindowGroup(id: "floating-stats") {
// KlipperMonMenuBarExtraView(currentMenuBarIcon: $currentIcon)
// .environment(\.managedObjectContext, persistenceController.container.viewContext)
// }
WindowGroup("Configuration", id: "soyuz_cfg", content: {
PrinterConfigView(printerManager: SoyuzApp.printerManager)
//.frame(minWidth: 300, maxWidth: 600, minHeight: 60, maxHeight: 100)

58
Soyuz/ViewModels/BonjourBrowser.swift
View File

@@ -1,9 +1,8 @@
//
// BonjourBrowser.swift
// Soyuz
//
// Created by maddiefuzz on 3/20/23.
//
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import Foundation
import Network
@@ -89,50 +88,3 @@ class BonjourBrowser: ObservableObject {
}
}
}
//class BonjourBrowser: ObservableObject {
// @Published var NDEngineResults: [NWBrowser.Result] = []
//
// private let nwBrowser: NetworkDiscoveryEngine
// var connection: NWConnection!
//
// // TEMPORARY
//// var bonjourListener: NWListener?
//
// init(browser: NetworkDiscoveryEngine = NWBrowser(for: .bonjourWithTXTRecord(type: "_moonraker._tcp", domain: "local."), using: .tcp)) {
// nwBrowser = browser
// // Bonjour browser results changed handler
// nwBrowser.setBrowseResultsChangedHandler({ (newResults, changes) in
// print("[update] Results changed.")
// self.NDEngineResults.removeAll()
// newResults.forEach { result in
// print(result)
// self.NDEngineResults.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
// }
// })
//
// nwBrowser.startScan(queue: DispatchQueue.main)
// }
//
// func startScanning(queue: DispatchQueue.main) {
// if(self.nwBrowser.state == NWBrowser.State.cancelled) {
//
// }
// self.nwBrowser.startScan(queue)
// }
//
//}

16
Soyuz/ViewModels/MoonrakerSocketManager.swift
View File

@@ -1,9 +1,8 @@
//
// MoonrakerSocketManager.swift
// KlipperMon
//
// Created by maddiefuzz on 2/7/23.
//
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import Foundation
import Network
@@ -69,11 +68,6 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate {
print("\(key): \(value)")
})
// if isConnected == true {
// connection?.cancel()
// socket?.disconnect()
// }
//
if connection == nil || connection?.state == .cancelled {
connection = NWConnection(to: endpoint, using: .tcp)
}

207
Soyuz/ViewModels/MoonrakerSocketManagerNative.swift
View File

@@ -1,207 +0,0 @@
//
// MoonrakerSocketManagerNative.swift
// Soyuz
//
// Created by Madeline Pace on 6/27/23.
//
import Foundation
import Foundation
import Network
import AppKit
//import Starscream
class MoonrakerSocketManagerNative: ObservableObject {
let WEBSOCKET_TIMEOUT_INTERVAL: TimeInterval = 60.0
// 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
// Published NWConnection for listing connection information
@Published var connection: NWConnection?
@Published var friendlyHostname: String = ""
var notification = UserNotificationHandler.shared
private var socket: NWConnection?
private var lastPingDate = Date()
// MARK: PRM init()
init() {
state = ""
progress = 0.0
extruderTemperature = 0.0
bedTemperature = 0.0
socketHost = ""
socketPort = ""
// Set up sleep/wake notification observers
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)
}
}
// 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 connectToBonjourEndpoint(_ endpoint: NWEndpoint) {
// Debug stuff
endpoint.txtRecord?.forEach({ (key: String, value: NWTXTRecord.Entry) in
print("\(key): \(value)")
})
print("About to connect to endpoint \(endpoint.debugDescription)")
if connection == nil || connection?.state == .cancelled {
// //let parameters = NWParameters.tcp
// //let options = NWProtocolWebSocket.Options()
// //parameters.defaultProtocolStack.applicationProtocols.insert(options, at: 0)
// let paramet
connection = NWConnection(to: endpoint, using: .tcp)
}
//
// connection!.stateUpdateHandler = { [self] state in
// switch state {
// case .setup:
// break
// case .ready:
// self.isConnected = true
// case .failed(let error):
// self.isConnected = false
// print("[NWConnection websocket] connection failed: \(error)")
// case .cancelled:
// self.isConnected = false
// print("Connection cancelled.")
// default:
// break
// }
// }
//
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)
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)")
connection?.cancel()
DispatchQueue.main.async {
self.friendlyHostname = endpoint.toFriendlyString()
self.socketHost = sanitizedHost
self.socketPort = "\(port)"
self.openWebsocket()
}
}
default:
break
}
}
connection?.start(queue: .global())
}
func disconnect() {
print("disconnect() called")
self.isConnected = false
//socket?.disconnect()
//socket = nil
}
func openWebsocket() {
let parameters = NWParameters.tcp
let socketUrl = URL(string: "ws://\(socketHost):\(socketPort)/websocket")
let options = NWProtocolWebSocket.Options()
parameters.defaultProtocolStack.applicationProtocols.insert(options, at: 0)
socket = NWConnection(to: .url(socketUrl!), using: parameters)
socket?.stateUpdateHandler = { state in
switch state {
case .setup:
print("[websocket] Connection setup.")
case .ready:
print("[websocket] Connection ready.")
case .failed(let error):
print("[websocket] Connection failed: \(error)")
case .cancelled:
print("[websocket] Connection cancelled.")
default:
break
}
}
socket?.start(queue: .global())
}
func socketConnectionChangedState() {
}
// TODO: This may not work properly when already connected to the socket
private func reconnectWebsocket() {
if socket == nil {
print("Socket doesn't exist. Fail-safe triggered.")
return
}
//socket!.disconnect()
//self.openWebsocket()
}
// MARK: Callbacks
func screenChangedSleepState(_ notification: Notification) {
switch(notification.name) {
case NSWorkspace.screensDidSleepNotification:
print("Screen slept. Disconnecting..")
self.disconnect()
//socket?.disconnect()
case NSWorkspace.screensDidWakeNotification:
print("Screen awoke. Opening websocket..")
//self.openWebsocket()
default:
return
}
}
}
// Properly formatted JSON-RPC Request for use with Starscream
// MARK: JSON-RPC Request Codable
//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)
// }
//}

11
Soyuz/ViewModels/PrinterObjectsQuery.swift
View File

@@ -1,9 +1,8 @@
//
// PrinterObjectsQuery.swift
// KlipperMon
//
// Created by maddiefuzz on 2/7/23.
//
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import Foundation

11
Soyuz/ViewModels/UserNotificationHandler.swift
View File

@@ -1,9 +1,8 @@
//
// UserNotificationProtocol.swift
// Soyuz
//
// Created by Madeline Pace on 5/28/23.
//
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import UserNotifications

14
Soyuz/Views/PrinterConfigView.swift
View File

@@ -1,9 +1,8 @@
//
// PrinterConfigView.swift
// KlipperMon
//
// Created by maddiefuzz on 2/8/23.
//
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import SwiftUI
import Network
@@ -13,11 +12,8 @@ struct PrinterConfigView: View {
@ObservedObject var printerManager: MoonrakerSocketManager
@ObservedObject var bonjourBrowser = BonjourBrowser()
//@State var bonjourBrowser = NWBrowser(for: .bonjourWithTXTRecord(type: "_moonraker._tcp", domain: "local."), using: .tcp)
@Environment(\.openURL) private var openURL
var body: some View {
VStack {
if(printerManager.isConnected) {

12
Soyuz/Views/SoyuzMenuBarExtraView.swift
View File

@@ -1,9 +1,8 @@
//
// KlipperMonMenuBarExtraView.swift
// KlipperMon
//
// Created by maddiefuzz on 2/7/23.
//
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import SwiftUI
import UserNotifications
@@ -77,7 +76,6 @@ struct SoyuzMenuBarExtraView: View {
}
}
}
//.frame(minWidth: 220, minHeight: 100)
// Footer information
HStack {
Button {