Skip to content

Commit 019488a

Browse files
PiasyPiasy
committed
fix JS test and update xlog
1 parent 375b829 commit 019488a

File tree

10 files changed

+40
-60
lines changed

10 files changed

+40
-60
lines changed

‎buildSrc/src/main/kotlin/Constants.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Consts {
22
const val releaseGroup = "com.piasy"
33
const val releaseName = "kmp-socketio"
4-
const val releaseVersion = "1.2.0"
4+
const val releaseVersion = "1.3.0"
55

66
val androidNS = "$releaseGroup.${releaseName.replace('-', '.')}"
77
}

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ktor-client-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktor" }
3333
ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
3434
ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
3535
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
36-
kmpXlog = "com.piasy:kmp-xlog-api:1.4.1"
36+
kmpXlog = "com.piasy:kmp-xlog-api:1.4.2"
3737

3838
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
3939
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }

‎kmp-socketio/src/commonMain/kotlin/com/piasy/kmp/socketio/engineio/EngineSocket.kt‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,7 @@ class EngineSocket(
252252
subs.add(On.on(transport, Transport.EVENT_PACKET, object : Listener {
253253
override fun call(vararg args: Any) {
254254
val packet = args.firstOrNull() ?: return
255-
if (Logging.debug()) {
256-
Logging.debug(TAG, "transport on packet $packet")
257-
}
255+
Logging.debug(TAG) { "transport on packet $packet" }
258256
if (packet is EngineIOPacket<*>) {
259257
onPacket(packet)
260258
}
@@ -277,18 +275,14 @@ class EngineSocket(
277275

278276
@WorkThread
279277
private fun onDrain(len: Int) {
280-
if (Logging.debug()) {
281-
Logging.debug(TAG, "onDrain: prevBufferLen $prevBufferLen, writeBuffer.size ${writeBuffer.size}, len $len")
282-
}
278+
Logging.debug(TAG) { "onDrain: prevBufferLen $prevBufferLen, writeBuffer.size ${writeBuffer.size}, len $len" }
283279
for (i in 1..len) {
284280
writeBuffer.removeFirst()
285281
}
286282
prevBufferLen -= len
287283

288284
if (writeBuffer.isEmpty()) {
289-
if (Logging.debug()) {
290-
Logging.debug(TAG, "onDrain fire socket drain event")
291-
}
285+
Logging.debug(TAG) { "onDrain fire socket drain event" }
292286
emit(EVENT_DRAIN)
293287
} else if (writeBuffer.size > prevBufferLen) {
294288
flush()
@@ -297,9 +291,7 @@ class EngineSocket(
297291

298292
@WorkThread
299293
private fun sendPackets(packets: List<EngineIOPacket<*>>) {
300-
if (Logging.debug()) {
301-
Logging.debug(TAG, "sendPackets: state $state, $packets")
302-
}
294+
Logging.debug(TAG) { "sendPackets: state $state, $packets" }
303295
if (state != State.OPENING && state != State.OPEN) {
304296
Logging.error(TAG, "sendPackets at wrong state: $state")
305297
return
@@ -312,9 +304,7 @@ class EngineSocket(
312304

313305
@WorkThread
314306
private fun onPacket(packet: EngineIOPacket<*>) {
315-
if (Logging.debug()) {
316-
Logging.debug(TAG, "onPacket $packet")
317-
}
307+
Logging.debug(TAG) { "onPacket $packet" }
318308
if (inactive()) {
319309
Logging.error(TAG, "packet received at wrong state: $state")
320310
return
@@ -386,12 +376,10 @@ class EngineSocket(
386376

387377
@WorkThread
388378
private fun flush() {
389-
if (Logging.debug()) {
390-
Logging.debug(
391-
TAG, "flush: state $state, writable ${transport?.writable}, " +
392-
"upgrading $upgrading, prevBufferLen $prevBufferLen, " +
393-
"writeBuffer.size ${writeBuffer.size}"
394-
)
379+
Logging.debug(TAG) {
380+
"flush: state $state, writable ${transport?.writable}, " +
381+
"upgrading $upgrading, prevBufferLen $prevBufferLen, " +
382+
"writeBuffer.size ${writeBuffer.size}"
395383
}
396384
if (state != State.CLOSED
397385
&& transport?.writable == true

‎kmp-socketio/src/commonMain/kotlin/com/piasy/kmp/socketio/engineio/Transport.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ abstract class Transport(
4949

5050
@WorkThread
5151
fun open(): Transport {
52-
logD("open")
52+
logD { "open" }
5353
if (state == State.CLOSED || state == State.INIT) {
5454
state = State.OPENING
5555
doOpen()
@@ -59,7 +59,7 @@ abstract class Transport(
5959

6060
@WorkThread
6161
fun send(packets: List<EngineIOPacket<*>>) {
62-
logD("send: state $state, ${packets.size} packets")
62+
logD { "send: state $state, ${packets.size} packets" }
6363
if (state == State.OPEN) {
6464
doSend(packets)
6565
} else {
@@ -93,7 +93,7 @@ abstract class Transport(
9393

9494
@WorkThread
9595
protected fun onPacket(packet: EngineIOPacket<*>) {
96-
logD("onPacket $packet")
96+
logD { "onPacket $packet" }
9797
emit(EVENT_PACKET, packet)
9898
}
9999

@@ -150,9 +150,9 @@ abstract class Transport(
150150
return "$schema://$hostname$port${opt.path}$derivedQuery"
151151
}
152152

153-
protected fun logD(log: String) {
153+
protected fun logD(block: () -> String) {
154154
if (Logging.debug()) {
155-
Logging.debug(TAG, "$name@${hashCode()} $log")
155+
Logging.debug(TAG, "$name@${hashCode()} ${block()}")
156156
}
157157
}
158158

‎kmp-socketio/src/commonMain/kotlin/com/piasy/kmp/socketio/engineio/transports/PollingXHR.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ open class PollingXHR(
6666

6767
@WorkThread
6868
private fun poll() {
69-
logD("poll start")
69+
logD { "poll start" }
7070
polling = true
7171

7272
val method = HttpMethod.Get
@@ -98,7 +98,7 @@ open class PollingXHR(
9898
onResponse: (String) -> Unit = {},
9999
onSuccess: () -> Unit = {},
100100
) {
101-
logD("doRequest ${method.value} $uri, data $data, headers $requestHeaders")
101+
logD { "doRequest ${method.value} $uri, data $data, headers $requestHeaders" }
102102
val resp = try {
103103
factory.httpRequest(uri) {
104104
this.method = method
@@ -116,7 +116,7 @@ open class PollingXHR(
116116
return
117117
}
118118

119-
logD("doRequest response: ${resp.status}")
119+
logD { "doRequest response: ${resp.status}" }
120120
scope.launch {
121121
emit(EVENT_RESPONSE_HEADERS, resp.headers.toMap())
122122
}
@@ -135,7 +135,7 @@ open class PollingXHR(
135135

136136
@WorkThread
137137
private fun onPollComplete(data: String) {
138-
logD("onPollComplete: state $state, `$data`")
138+
logD { "onPollComplete: state $state, `$data`" }
139139
val packets = try {
140140
if (rawMessage) {
141141
EngineIO.decodeHttpBatch(data, deserializePayload = { it })

‎kmp-socketio/src/commonMain/kotlin/com/piasy/kmp/socketio/engineio/transports/WebSocket.kt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import kotlinx.io.bytestring.unsafe.UnsafeByteStringOperations
1616
import org.hildan.socketio.EngineIO
1717
import org.hildan.socketio.EngineIOPacket
1818
import org.hildan.socketio.InvalidEngineIOPacketException
19-
import org.hildan.socketio.InvalidSocketIOPacketException
2019
import org.hildan.socketio.SocketIOPacket
2120

2221
open class WebSocket(
@@ -72,7 +71,7 @@ open class WebSocket(
7271
while (true) {
7372
try {
7473
val frame = ws?.incoming?.receive() ?: break
75-
logD("Receive frame: $frame")
74+
logD { "Receive frame: $frame" }
7675
when (frame) {
7776
is Frame.Text -> {
7877
onWsText(frame.readText())
@@ -88,7 +87,8 @@ open class WebSocket(
8887
}
8988

9089
else -> {
91-
logI("Received unknown frame")
90+
// ignore
91+
//logI("Received unknown frame")
9292
}
9393
}
9494
} catch (e: Exception) {
@@ -102,7 +102,7 @@ open class WebSocket(
102102
@IoThread
103103
private fun onWsText(data: String) {
104104
scope.launch {
105-
logD("onWsText: `$data`")
105+
logD { "onWsText: `$data`" }
106106
val packet = try {
107107
if (rawMessage) {
108108
EngineIO.decodeWsFrame(data, deserializePayload = { it })
@@ -123,15 +123,15 @@ open class WebSocket(
123123
@IoThread
124124
private fun onWsBinary(data: ByteArray) {
125125
scope.launch {
126-
logD("onWsBinary ${data.size} bytes")
126+
logD { "onWsBinary ${data.size} bytes" }
127127
onPacket(EngineIO.decodeWsFrame(UnsafeByteStringOperations.wrapUnsafe(data)))
128128
}
129129
}
130130

131131
@OptIn(UnsafeByteStringApi::class)
132132
@WorkThread
133133
override fun doSend(packets: List<EngineIOPacket<*>>) {
134-
logD("doSend ${packets.size} packets start")
134+
logD { "doSend ${packets.size} packets start" }
135135
writable = false
136136

137137
ioScope.launch {
@@ -144,7 +144,7 @@ open class WebSocket(
144144
try {
145145
if (pkt is EngineIOPacket.BinaryData) {
146146
UnsafeByteStringOperations.withByteArrayUnsafe(pkt.payload) {
147-
logD("doSend binary: ${it.size} bytes")
147+
logD { "doSend binary: ${it.size} bytes" }
148148
ws?.send(it)
149149
}
150150
} else {
@@ -154,17 +154,18 @@ open class WebSocket(
154154
@Suppress("UNCHECKED_CAST")
155155
EngineIO.encodeSocketIO(pkt as EngineIOPacket<SocketIOPacket>)
156156
}
157-
logD("doSend: $pkt, `$data`")
157+
logD { "doSend: $pkt, `$data`" }
158158
ws?.send(data)
159159
}
160160
} catch (e: Exception) {
161161
logE("doSend error: `${e.message}`")
162162
//break
163+
// TODO: send error is ignored, should we handle it?
163164
}
164165
}
165166

166167
scope.launch {
167-
logD("doSend ${packets.size} packets finish")
168+
logD { "doSend ${packets.size} packets finish" }
168169
writable = true
169170
emit(EVENT_DRAIN, packets.size)
170171
}

‎kmp-socketio/src/commonMain/kotlin/com/piasy/kmp/socketio/socketio/Manager.kt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,7 @@ class Manager(
169169
subs.add(On.on(socket, EngineSocket.EVENT_DATA, object : Listener {
170170
override fun call(vararg args: Any) {
171171
if (args.isNotEmpty()) {
172-
if (Logging.debug()) {
173-
Logging.debug(TAG, "on EngineSocket data ${args[0]::class}")
174-
}
172+
Logging.debug(TAG) { "on EngineSocket data ${args[0]::class}" }
175173
emit(EVENT_PACKET, args[0])
176174
}
177175
}
@@ -317,9 +315,7 @@ class Manager(
317315

318316
@WorkThread
319317
internal fun packets(packets: List<EngineIOPacket<*>>) {
320-
if (Logging.debug()) {
321-
Logging.debug(TAG, "send packets $packets")
322-
}
318+
Logging.debug(TAG) { "send packets $packets" }
323319
engine?.send(packets)
324320
}
325321

‎kmp-socketio/src/commonMain/kotlin/com/piasy/kmp/socketio/socketio/Socket.kt‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ class Socket(
9999

100100
@WorkThread
101101
private fun emitWithAck(event: String, args: Array<out Any>, ack: Ack?) {
102-
if (Logging.debug()) {
103-
Logging.debug(TAG, "emitWithAck: $event, ${args.joinToString()}, ack $ack")
104-
}
102+
Logging.debug(TAG) { "emitWithAck: $event, ${args.joinToString()}, ack $ack" }
105103
val ackId = if (ack != null) this.ackId else null
106104
if (ack != null && ackId != null) {
107105
Logging.info(TAG, "emit with ack id $ackId")
@@ -241,9 +239,7 @@ class Socket(
241239

242240
@WorkThread
243241
private fun onPacket(packet: SocketIOPacket) {
244-
if (Logging.debug()) {
245-
Logging.debug(TAG, "onPacket: nsp $nsp, $packet")
246-
}
242+
Logging.debug(TAG) { "onPacket: nsp $nsp, $packet" }
247243
if (nsp != packet.namespace) {
248244
return
249245
}
@@ -264,9 +260,7 @@ class Socket(
264260
}
265261

266262
is SocketIOPacket.Event -> {
267-
if (Logging.debug()) {
268-
Logging.debug(TAG, "onEvent $packet")
269-
}
263+
Logging.debug(TAG) { "onEvent $packet" }
270264
onEvent(packet.ackId, ArrayList(packet.payload))
271265
}
272266

@@ -325,9 +319,7 @@ class Socket(
325319
@WorkThread
326320
private fun onEvent(eventId: Int?, data: ArrayList<Any>) {
327321
if (eventId != null) {
328-
if (Logging.debug()) {
329-
Logging.debug(TAG, "attaching ack callback to event")
330-
}
322+
Logging.debug(TAG) { "attaching ack callback to event" }
331323
data.add(createAck(eventId))
332324
}
333325
if (data.isEmpty()) {

‎kmp-socketio/src/commonTest/kotlin/com/piasy/kmp/socketio/socketio/ConnectionTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ abstract class ConnectionTest {
7777
}
7878

7979
@Test
80-
fun shouldConnectUntrusted() = doTest {
80+
open fun shouldConnectUntrusted() = doTest {
8181
val trustAllCertsHttpClientFactory = DefaultHttpClientFactory(
8282
trustAllCerts = true,
8383
)

‎kmp-socketio/src/jsTest/kotlin/com/piasy/kmp/socketio/socketio/ConnectionTestJs.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ class ConnectionTestJs : ConnectionTest() {
44
override fun startServer() {}
55

66
override fun stopServer() {}
7+
8+
// JS doesn't implement trustAllCerts, so skip this test
9+
override fun shouldConnectUntrusted() = doTest { }
710
}

0 commit comments

Comments
 (0)