Commit9da59a0

committed

update VPN protocol version; fmt & lint

1 parentfdcf9c3 commit9da59a0Copy full SHA for 9da59a0

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,9 @@ public actor Speaker<SendMsg: RPCMessage & Message, RecvMsg: RPCMessage & Messag`
`89`	`89`	`/// Does the VPN Protocol handshake and validates the result`
`90`	`90`	`publicfunc handshake()asyncthrows(HandshakeError){`
`91`	`91`	`lethndsh=Handshaker(writeFD: writeFD, dispatch: dispatch, queue: queue, role: role)`
`92`		`- // ignore the version for now because we know it can only be 1.0`
	`92`	`+ // ignore the version for now because we know it can only be 1.0 or 1.1.`
	`93`	`+ // 1.1 adds support for telemetry to StartRequest, but since setting these`
	`94`	`+ // fields won't adversely affect a 1.0 speaker, we set them regardless.`
`93`	`95`	`try _=await hndsh.handshake()`
`94`	`96`	`}`
`95`	`97`
`@@ -178,7 +180,7 @@ actor Handshaker {`
`178`	`180`
`179`	`181`	`init(writeFD: FileHandle, dispatch: DispatchIO, queue: DispatchQueue,`
`180`	`182`	`role: ProtoRole,`
`181`		`- versions:[ProtoVersion]=[.init(1,0)])`
	`183`	`+ versions:[ProtoVersion]=[.init(1,1)])`
`182`	`184`	`{`
`183`	`185`	`self.writeFD= writeFD`
`184`	`186`	`self.dispatch= dispatch`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ public struct TelemetryEnricher {`
`23`	`23`	`varreq= original`
`24`	`24`	`req.deviceOs="macOS"`
`25`	`25`	`req.deviceID= deviceID`
`26`		`-ifversion!=nil{`
`27`		`- req.coderDesktopVersion= version!`
	`26`	`+iflet version{`
	`27`	`+ req.coderDesktopVersion= version`
`28`	`28`	`}`
`29`	`29`	`return req`
`30`	`30`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ struct SpeakerTests: Sendable {`
`36`	`36`	`@Testfunc handshake()asyncthrows{`
`37`	`37`	`asyncletv= handshaker.handshake()`
`38`	`38`	`tryawait uut.handshake()`
`39`		`- #expect(tryawait v==ProtoVersion(1,0))`
	`39`	`+ #expect(tryawait v==ProtoVersion(1,1))`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Testfunc handleSingleMessage()asyncthrows{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ struct TelemetryEnricherTests {`
`16`	`16`	`#expect(try enriched.coderDesktopVersion.contains(Regex(#"^\d+\.\d+\.\d+$"#)))`
`17`	`17`	`letdeviceID= enriched.deviceID`
`18`	`18`	`#expect(!deviceID.isEmpty)`
`19`		`-`
	`19`	`+`
`20`	`20`	`// check we get the same deviceID from a new enricher`
`21`	`21`	`letenricher1=TelemetryEnricher()`
`22`	`22`	`enriched= enricher1.enrich(original)`

Comments

(0)