Commit2ee9471

committed

remove buffer

1 parentdef029c commit2ee9471Copy full SHA for 2ee9471

File tree

2 files changed

+23

-52

lines changed

Coder Desktop
- Proto
  - Speaker.swift
- ProtoTests
  - SpeakerTests.swift

2 files changed

+23

-52

lines changed

`‎Coder Desktop/Proto/Speaker.swift`

Lines changed: 19 additions & 43 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,48 +95,6 @@ actor Speaker<SendMsg: RPCMessage & Message, RecvMsg: RPCMessage & Message> {`
`95`	`95`	`try _=await hndsh.handshake()`
`96`	`96`	`}`
`97`	`97`
`98`		`-publicfunc start(){`
`99`		`-guard readLoopTask==nilelse{`
`100`		`- logger.error("speaker is already running")`
`101`		`-return`
`102`		`-}`
`103`		`- readLoopTask=Task{`
`104`		`-dothrows(ReceiveError){`
`105`		`-fortryawaitmsgintryawaitself.receiver.messages(){`
`106`		`-guard msg.hasRpcelse{`
`107`		`-await messageBuffer.push(.message(msg))`
`108`		`-continue`
`109`		`-}`
`110`		`-guard msg.rpc.msgID==0else{`
`111`		`-letreq=RPCRequest<SendMsg,RecvMsg>(req: msg, sender:self.sender)`
`112`		`-await messageBuffer.push(.RPC(req))`
`113`		`-continue`
`114`		`-}`
`115`		`-guard msg.rpc.responseTo==0else{`
`116`		`-self.logger.debug("got RPC reply for msgID\(msg.rpc.responseTo)")`
`117`		`-dothrows(RPCError){`
`118`		`-tryawaitself.secretary.route(reply: msg)`
`119`		`-} catch{`
`120`		`-self.logger.error(`
`121`		`-"couldn't route RPC reply for\(msg.rpc.responseTo):\(error)")`
`122`		`-}`
`123`		`-continue`
`124`		`-}`
`125`		`-}`
`126`		`-}catch{`
`127`		`-self.logger.error("failed to receive messages:\(error)")`
`128`		`-throw error`
`129`		`-}`
`130`		`-}`
`131`		`-}`
`132`		`-`
`133`		`-func wait()asyncthrows{`
`134`		`-guardlet task= readLoopTaskelse{`
`135`		`-return`
`136`		`-}`
`137`		`-tryawait task.value`
`138`		`-}`
`139`		`-`
`140`	`98`	`/// Send a unary RPC message and handle the response`
`141`	`99`	`func unaryRPC(_ req:SendMsg)asyncthrows->RecvMsg{`
`142`	`100`	`returntryawaitwithCheckedThrowingContinuation{ continuationin`
`@@ -212,7 +170,25 @@ extension Speaker: AsyncSequence, AsyncIteratorProtocol {`
`212`	`170`	`}`
`213`	`171`
`214`	`172`	`func next()asyncthrows->IncomingMessage?{`
`215`		`-returnawait messageBuffer.next()`
	`173`	`+fortryawaitmsgintryawait receiver.messages(){`
	`174`	`+guard msg.hasRpcelse{`
	`175`	`+return.message(msg)`
	`176`	`+}`
	`177`	`+guard msg.rpc.msgID==0else{`
	`178`	`+return.RPC(RPCRequest<SendMsg,RecvMsg>(req: msg, sender: sender))`
	`179`	`+}`
	`180`	`+guard msg.rpc.responseTo==0else{`
	`181`	`+ logger.debug("got RPC reply for msgID\(msg.rpc.responseTo)")`
	`182`	`+dothrows(RPCError){`
	`183`	`+tryawaitself.secretary.route(reply: msg)`
	`184`	`+} catch{`
	`185`	`+ logger.error(`
	`186`	`+"couldn't route RPC reply for\(msg.rpc.responseTo):\(error)")`
	`187`	`+}`
	`188`	`+continue`
	`189`	`+}`
	`190`	`+}`
	`191`	`+ return nil`
`216`	`192`	`}`
`217`	`193`	`}`
`218`	`194`

`‎Coder Desktop/ProtoTests/SpeakerTests.swift`

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ struct SpeakerTests {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Testfunc handleSingleMessage()asyncthrows{`
`43`		`-await uut.start()`
`44`		`-`
`45`	`43`	`vars=Vpn_ManagerMessage()`
`46`	`44`	`s.start=Vpn_StartRequest()`
`47`	`45`	`await #expect(throws:Never.self){`
`@@ -54,12 +52,9 @@ struct SpeakerTests {`
`54`	`52`	`}`
`55`	`53`	`#expect(msg.msg==.start(Vpn_StartRequest()))`
`56`	`54`	`tryawait sender.close()`
`57`		`-tryawait uut.wait()`
`58`	`55`	`}`
`59`	`56`
`60`	`57`	`@Testfunc handleRPC()asyncthrows{`
`61`		`-await uut.start()`
`62`		`-`
`63`	`58`	`vars=Vpn_ManagerMessage()`
`64`	`59`	`s.start=Vpn_StartRequest()`
`65`	`60`	`s.rpc=Vpn_RPC()`
`@@ -89,12 +84,13 @@ struct SpeakerTests {`
`89`	`84`	`#expect(count==1)`
`90`	`85`	`}`
`91`	`86`	`tryawait sender.close()`
`92`		`-tryawait uut.wait()`
`93`	`87`	`}`
`94`	`88`
`95`	`89`	`@Testfunc sendRPCs()async throws{`
`96`		`-await uut.start()`
`97`		`-`
	`90`	+ // Speaker must be reading from the receiver for `unaryRPC` to return
	`91`	`+Task{`
	`92`	`+fortryawait_in uut{}`
	`93`	`+}`
`98`	`94`	`asyncletmanagerDone=Task{`
`99`	`95`	`varcount=0`
`100`	`96`	`fortryawaitreqintryawait receiver.messages(){`
`@@ -118,6 +114,5 @@ struct SpeakerTests {`
`118`	`114`	`await uut.closeWrite()`
`119`	`115`	`_=await managerDone`
`120`	`116`	`tryawait sender.close()`
`121`		`-tryawait uut.wait()`
`122`	`117`	`}`
`123`	`118`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2ee9471

File tree

2 files changed

2 files changed

`‎Coder Desktop/Proto/Speaker.swift`

`‎Coder Desktop/ProtoTests/SpeakerTests.swift`

0 commit comments