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

Add tests for MoonrakerSocketManager, some UI changes in front-end

Browse Source
This commit is contained in:
Madeline Pace 2023-05-24 13:35:51 -04:00
parent 0f0d0c0628
commit e04a6bc31f
8 changed files with 146 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Soyuz.xcodeproj/project.pbxproj
View File

@ -9,7 +9,7 @@
/* Begin PBXBuildFile section */
E124B9D929941A4D00C0D2D2 /* PrinterConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E124B9D829941A4D00C0D2D2 /* PrinterConfigView.swift */; };
E16378B229A43CE1002F05E9 /* SoyuzScratchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16378B129A43CE1002F05E9 /* SoyuzScratchTests.swift */; };
E16378B429A491E6002F05E9 /* MoonrakerSocketManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16378B329A491E6002F05E9 /* MoonrakerSocketManager.swift */; };
E16378B429A491E6002F05E9 /* MoonrakerSocketManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16378B329A491E6002F05E9 /* MoonrakerSocketManagerTests.swift */; };
E180B5E92992CD9100425DB0 /* SoyuzApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B5E82992CD9100425DB0 /* SoyuzApp.swift */; };
E180B5ED2992CD9200425DB0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E180B5EC2992CD9200425DB0 /* Assets.xcassets */; };
E180B5F02992CD9200425DB0 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E180B5EF2992CD9200425DB0 /* Preview Assets.xcassets */; };
@ -47,7 +47,7 @@
E124B9D72993FE5500C0D2D2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
E124B9D829941A4D00C0D2D2 /* PrinterConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrinterConfigView.swift; sourceTree = "<group>"; };
E16378B129A43CE1002F05E9 /* SoyuzScratchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoyuzScratchTests.swift; sourceTree = "<group>"; };
E16378B329A491E6002F05E9 /* MoonrakerSocketManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoonrakerSocketManager.swift; sourceTree = "<group>"; };
E16378B329A491E6002F05E9 /* MoonrakerSocketManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoonrakerSocketManagerTests.swift; sourceTree = "<group>"; };
E180B5E52992CD9100425DB0 /* Soyuz.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Soyuz.app; sourceTree = BUILT_PRODUCTS_DIR; };
E180B5E82992CD9100425DB0 /* SoyuzApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoyuzApp.swift; sourceTree = "<group>"; };
E180B5EC2992CD9200425DB0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@ -143,7 +143,7 @@
E180B5FF2992CD9300425DB0 /* SoyuzTests.swift */,
E16378B129A43CE1002F05E9 /* SoyuzScratchTests.swift */,
E1A93C6829CD627100BAE750 /* BonjourBrowserTests.swift */,
E16378B329A491E6002F05E9 /* MoonrakerSocketManager.swift */,
E16378B329A491E6002F05E9 /* MoonrakerSocketManagerTests.swift */,
);
path = SoyuzTests;
sourceTree = "<group>";
@ -328,7 +328,7 @@
buildActionMask = 2147483647;
files = (
E180B6002992CD9300425DB0 /* SoyuzTests.swift in Sources */,
E16378B429A491E6002F05E9 /* MoonrakerSocketManager.swift in Sources */,
E16378B429A491E6002F05E9 /* MoonrakerSocketManagerTests.swift in Sources */,
E1A93C6929CD627100BAE750 /* BonjourBrowserTests.swift in Sources */,
E16378B229A43CE1002F05E9 /* SoyuzScratchTests.swift in Sources */,
);

38
Soyuz/Assets.xcassets/ButtonForegroundColor.colorset/Contents.json Normal file
View File

@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.300",
"green" : "0.300",
"red" : "0.300"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

7
Soyuz/Info.plist
View File

@ -2,6 +2,11 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>CFBundleURLTypes</key>
<array>
<dict>
@ -21,7 +26,5 @@
<string>_moonraker._tcp.</string>
<string>_http._tcp.</string>
</array>
<key>NSServices</key>
<array/>
</dict>
</plist>

17
Soyuz/ViewModels/MoonrakerSocketManager.swift
View File

@ -1,5 +1,5 @@
//
// PrinterRequestManager.swift
// MoonrakerSocketManager.swift
// KlipperMon
//
// Created by maddiefuzz on 2/7/23.
@ -11,8 +11,6 @@ import AppKit
import Starscream
// MARK: PrinterRequestManager
//@MainActor
class MoonrakerSocketManager: ObservableObject, WebSocketDelegate {
let WEBSOCKET_TIMEOUT_INTERVAL: TimeInterval = 60.0
@ -32,10 +30,11 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate {
private var socket: WebSocket?
private var lastPingDate = Date()
private var starscreamEngine: Engine
// MARK: PRM init()
init() {
init(starscreamEngine: Engine = WSEngine(transport: TCPTransport())) {
state = ""
progress = 0.0
extruderTemperature = 0.0
@ -43,6 +42,8 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate {
socketHost = ""
socketPort = ""
self.starscreamEngine = starscreamEngine
// Set up sleep/wake notification observers
let center = NSWorkspace.shared.notificationCenter;
let mainQueue = OperationQueue.main
@ -80,7 +81,8 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate {
let hostString = "\(host)"
let regex = try! Regex("%(.+)")
let match = hostString.firstMatch(of: regex)
let sanitizedHost = hostString.replacingOccurrences(of: match!.0, with: "")
let sanitizedHost = hostString.replacingOccurrences(of: match?.0 ?? "", with: "")
print("[sanitized] Resolved \(sanitizedHost):\(port)")
@ -111,8 +113,9 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate {
//let fullUrlString = "http://\(socketHost):\(socketPort)/websocket"
var request = URLRequest(url: URL(string: "http://\(socketHost):\(socketPort)/websocket")!)
request.timeoutInterval = 5
socket = WebSocket(request: request)
socket = WebSocket(request: request, engine: starscreamEngine)
socket!.delegate = self
print("About to connect to WebSocket at: \(request.debugDescription)")
socket!.connect()
}
@ -125,7 +128,7 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate {
self.openWebsocket()
}
// MARK: Callsbacks
// MARK: Callbacks
func screenChangedSleepState(_ notification: Notification) {
switch(notification.name) {
case NSWorkspace.screensDidSleepNotification:

2
Soyuz/Views/PrinterConfigView.swift
View File

@ -38,7 +38,7 @@ struct PrinterConfigView: View {
printerManager.connectToBonjourEndpoint(result.endpoint)
} label: {
Text("Connect")
.foregroundColor(.white)
//.foregroundColor(.white)
.padding()
}
}

2
Soyuz/Views/SoyuzMenuBarExtraView.swift
View File

@ -83,7 +83,7 @@ struct SoyuzMenuBarExtraView: View {
openWindow(id: "soyuz_cfg")
} label: {
Text("Printers")
.foregroundColor(.white)
.foregroundColor(Color("ButtonForegroundColor"))
}
Spacer()
if(printerManager.isConnected) {

60
SoyuzTests/MoonrakerSocketManager.swift
View File

@ -1,60 +0,0 @@
//
// PrinterRequestsManagerTests.swift
// SoyuzTests
//
// Created by maddiefuzz on 2/21/23.
//
import XCTest
import Starscream
import Network
@testable import Soyuz
class PrinterRequestManagerTests: XCTestCase {
var socketManager: MoonrakerSocketManager?
// Server-side test variables
let server = WebSocketServer()
let address = "localhost"
let port: UInt16 = 80
override func setUp() {
let server = WebSocketServer()
let error = server.start(address: address, port: port)
if let err = error {
print("Error starting WebSocket server: \(err)")
}
socketManager = MoonrakerSocketManager()
}
func testBlah() {
guard let url = URL(string: "\(address):\(port)") else {
return
}
print("Success")
let endpoint = NWEndpoint.url(url)
print(endpoint.debugDescription)
socketManager?.connectToBonjourEndpoint(endpoint)
return
}
// override func setUp() {
// printerRequestManager = PrinterRequestManager(browser: NWBrowser(for: .bonjour(type: "_http._tcp", domain: "local."), using: .tcp))
//
// // Set up test bonjour server
// //let parameters = NWParameters(tls: .none, tcp: NWListener.)
// do {
// testBonjourListener = try NWListener(using: .tcp, on: .http)
// testBonjourListener!.start(queue: DispatchQueue.main)
// } catch {
// print("Error: \(error)")
// }
// }
//
// func testBonjourDiscoveredItemsNotNil() {
// XCTAssertNotNil(printerRequestManager?.nwBrowserDiscoveredItems)
// }
}

87
SoyuzTests/MoonrakerSocketManagerTests.swift Executable file
View File

@ -0,0 +1,87 @@
//
// MoonrakerSocketManagerTests.swift
// SoyuzTests
//
// Created by maddiefuzz on 2/21/23.
//
import XCTest
import Starscream
import Combine
import Network
@testable import Soyuz
class DummyEngine: Engine {
var delegate: Starscream.EngineDelegate?
@Published var startCalled = false
func register(delegate: Starscream.EngineDelegate) {
self.delegate = delegate
}
func start(request: URLRequest) {
startCalled = true
}
func stop(closeCode: UInt16) {
return
}
func forceStop() {
return
}
func write(data: Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) {
return
}
func write(string: String, completion: (() -> ())?) {
return
}
}
class MoonrakerSocketManagerTests: XCTestCase {
var socketManager: MoonrakerSocketManager?
var bonjourListener: NWListener?
var engine: DummyEngine!
var cancellable: AnyCancellable?
override func setUp() {
engine = DummyEngine()
socketManager = MoonrakerSocketManager(starscreamEngine: engine!)
do {
bonjourListener = try NWListener(using: .tcp, on: .http)
bonjourListener!.newConnectionHandler = { newConnection in
return
}
bonjourListener!.start(queue: DispatchQueue.main)
} catch {
print("Error: \(error)")
}
}
func testConnectToBonjourEndpoint() {
let endpoint = NWEndpoint.hostPort(host: "localhost", port: .http)
print("Trying to connect to bonjour endpoint \(endpoint)")
let expectation = XCTestExpectation(description: "MoonrakerSocketManager.connectToBonjourEndpoint opens Starscream socket")
cancellable = engine.$startCalled
.sink(receiveValue: { newValue in
if newValue == true {
expectation.fulfill()
}
})
socketManager?.connectToBonjourEndpoint(endpoint)
wait(for: [expectation], timeout: 2)
XCTAssertTrue(engine.startCalled)
}
}