Support wasmJs target #771

IlyaGulya · 2024-01-04T07:27:51Z

Fixes #767

In this PR:

I've shared most of js sources with wasmJs by introducing the jsWasmJsCommon sourceSets.
Enabled gradle configuration cache
Upgraded Kotlin Coroutines to 1.8.0-RC2

...adleConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt

arkivanov · 2024-01-04T07:59:02Z

Thanks! I've been working on this, and been waiting for stable coroutines version. Could you please sync with my branch? master...arkivanov:Reaktive:wasm

IlyaGulya · 2024-01-04T08:16:43Z

Sure =)

IlyaGulya · 2024-01-04T12:30:08Z

@arkivanov I've cherry-picked changes from your branch which were relevant:

Migration to kotlin-stdlib and kotlin-test dependencies from sourceSet-specific ones
RepeatWhenTest changes
Introduction of AsyncTestResult and relevant changes to testAwait extension as well as TestAwaitTest.

…n argument

gradle/libs.versions.toml

...adleConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt

includedBuild/gradleConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/Target.kt

…chronizedCompat`. cleanup.

reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/scheduler/JsFunctions.kt

reaktive/src/jsCommonTest/kotlin/com/badoo/reaktive/scheduler/MainSchedulerTest.kt

arkivanov · 2024-01-05T17:44:52Z

Detekt seems failing.

> Task :sample-mpp-module:detekt FAILED
/home/runner/work/Reaktive/Reaktive/sample-mpp-module/src/commonMain/kotlin/com/badoo/reaktive/samplemppmodule/Counter.kt:40:1: Needless blank line(s) [NoConsecutiveBlankLines]
/home/runner/work/Reaktive/Reaktive/sample-mpp-module/src/commonMain/kotlin/com/badoo/reaktive/samplemppmodule/Feature.kt:7:1: Unused import [NoUnusedImports]
/home/runner/work/Reaktive/Reaktive/sample-mpp-module/src/commonMain/kotlin/com/badoo/reaktive/samplemppmodule/Counter.kt:42:78: This expression contains a magic number. Consider defining it to a well named constant. [MagicNumber]

CherryPerry · 2024-01-06T12:30:42Z

@arkivanov WDYT about merging/releasing? Merge now or later when coroutines are not RC? The same for the release process.

arkivanov · 2024-01-06T12:35:53Z

@arkivanov WDYT about merging/releasing? Merge now or later when coroutines are not RC? The same for the release process.

I think we could merge now and release 2.1.0-beta01.

CherryPerry · 2024-01-07T23:11:58Z

wasmJsBrowserTest task hangs on my system (macOS). Looks like the same is happening on CI.

jsBrowserTest at least says Please make sure that you have installed browsers..

Should we also enable nodejs() for WASM too? wasmJsNodeTest does not hang but throws CompileError: WebAssembly.Module(): invalid value type 0x71 @+389.

You can debug CI by creating sub-bracnch from yours and opening PR to master of your fork.

arkivanov · 2024-01-07T23:17:47Z

wasmJsBrowserTest task hangs on my system (macOS). Looks like the same is happening on CI.

jsBrowserTest at least says Please make sure that you have installed browsers..

Should we also enable nodejs() for WASM too? wasmJsNodeTest does not hang but throws CompileError: WebAssembly.Module(): invalid value type 0x71 @+389.

You can debug CI by creating sub-bracnch from yours and opening PR to master of your fork.

I think for now we don't need nodejs, Wasm with nodejs is trickier. There must be an issue with tests, as I have Wasm browser running on CI successfully in other projects.

IlyaGulya · 2024-01-08T05:45:43Z

I will take a look soon

IlyaGulya · 2024-01-10T06:16:29Z

Follow up: I'm still fixing this. Linux build hangs on jsNodeTest task and I haven't figured out why yet. 🙂
UPD: Seems that it's an issue with MainScheduler periodic task test

…ly removes timeout and interval ids on first task execution.

…test.

arkivanov · 2024-01-10T09:31:33Z

I'm able to reproduce it locally, I can take a look.

IlyaGulya · 2024-01-10T09:37:55Z

@arkivanov I've fixed all issues

IlyaGulya · 2024-01-10T09:39:26Z

@arkivanov Please take a look at my changes inside of MainScheduler.

There was a bug (as far as I can tell, maybe I'm wrong 🙂 ) - interval and timeout ids were removed from list of interval ids/timeout ids immediately after task is executed first time. That's a strange logic, I've removed it.

arkivanov · 2024-01-10T10:23:18Z

@arkivanov Please take a look at my changes inside of MainScheduler.

There was a bug (as far as I can tell, maybe I'm wrong 🙂 ) - interval and timeout ids were removed from list of interval ids/timeout ids immediately after task is executed first time. That's a strange logic, I've removed it.

It appears that a Node test hangs if there are any pending task (that are not executed yet). I was able to fix the test by just removing this line. Looks like this is an actual bug, as we are removing the interval (periodic) task id after the first execution, and so later it can't be cancelled. What do you think?

arkivanov · 2024-01-10T10:24:44Z

I think we can revert the rest of the unrelated changes after the commit f37282e?

IlyaGulya · 2024-01-10T10:37:43Z

I think we can revert the rest of the unrelated changes after the commit f37282e?

Are you sure it's unrelated?

MainScheduler implementation for JS and WASM has different timeout id types. WASM does not support dynamic type, so I have to use JsAny instead. Int is not correct and works only because of dynamic nature of JS. On NodeJS setTimeout and setInterval returns Timeout object instead of Int.
For me test still hangs if I don't cancel the executor after equality check (

Reaktive/reaktive/src/jsCommonTest/kotlin/com/badoo/reaktive/scheduler/MainSchedulerTest.kt

Line 74 in e39b45f

executor.cancel()

)

I can squash some commits to make history cleaner, if you want

IlyaGulya · 2024-01-10T11:05:06Z

Hmm, I will refactor the MainThreadExecutor once again in a moment

IlyaGulya · 2024-01-10T11:13:29Z

@arkivanov I once again refactored a bit.
Now there's only platform-specific TimeoutId class and js functions implementations. MainThreadExecutor is now common as before.

IlyaGulya · 2024-01-10T11:50:05Z

Sorry, I will fix detekt complaints in a moment

arkivanov · 2024-01-10T12:06:04Z

reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/scheduler/JsFunctions.kt

@@ -0,0 +1,33 @@
+package com.badoo.reaktive.scheduler
+
+internal actual fun jsSetTimeout(task: () -> Unit, delayMillis: Int): TimeoutId =


I think we can still return Int and avoid TimeoutId. This actual function could be as follows:

internal actual fun jsSetTimeout(task: () -> Unit, delayMillis: Int): Int = window.setTimeout( handler = { task().toJsReference() }, timeout = delayMillis, )

What about NodeJS runtime where setTimeout returns Timeout object instead of Int?

Yes, you are correct. Let's use the current approach with expect/actual TimeoutId.

arkivanov · 2024-01-10T12:08:42Z

reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/MainScheduler.kt

-            id =
-                globalThis.setTimeout(
-                    {
-                        timeoutIds.remove(id)


I think we still need to remove this id. The task is only executed once. Otherwise ids will accumulate and consume memory.

I think this is the root of the bug 🙂
Someone wanted to remove id only for timeout, but somehow managed to do the same for interval =)

arkivanov · 2024-01-10T12:10:01Z

reaktive/src/jsCommonTest/kotlin/com/badoo/reaktive/scheduler/MainSchedulerTest.kt

+            assertEquals(expectedResults, results)
+            // Required to pass test on NodeJS environment since runtime waits
+            // for all tasks to cancel or finish their work.
+            executor.cancel()


This callback is only called on success. It's better to dispose the executor as follows:

return checkTicks.toList() .doOnBeforeFinally(executor::dispose) .testAwait { ... }

arkivanov · 2024-01-10T13:55:01Z

reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/scheduler/JsFunctions.kt

@@ -0,0 +1,33 @@
+package com.badoo.reaktive.scheduler
+
+internal actual fun jsSetTimeout(task: () -> Unit, delayMillis: Int): TimeoutId =


Yes, you are correct. Let's use the current approach with expect/actual TimeoutId.

IlyaGulya commented Jan 4, 2024

View reviewed changes

...adleConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt Outdated Show resolved Hide resolved

Support wasmJs target

9f1534c

IlyaGulya force-pushed the feature/add-wasmJs-target-support branch from 650e174 to 9f1534c Compare January 4, 2024 12:26

IlyaGulya added 2 commits January 4, 2024 18:36

Suppress wrong detekt assumption on js() call not using the functio…

9d3b0a3

…n argument

Fix missing JsName import

7bd804d

arkivanov suggested changes Jan 4, 2024

View reviewed changes

rename jsWasmJsCommon sourceSets to jsCommon ones. commonize `syn…

472241c

…chronizedCompat`. cleanup.

arkivanov reviewed Jan 5, 2024

View reviewed changes

reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/scheduler/JsFunctions.kt Outdated Show resolved Hide resolved

IlyaGulya added 2 commits January 5, 2024 19:59

add js/wasmJs MainScheduler tests for single and periodic tasks

0ac05f9

Add buttons allowing to test timers to browser sample.

64df02a

arkivanov reviewed Jan 5, 2024

View reviewed changes

Make periodic task test more verbose

f37282e

IlyaGulya force-pushed the feature/add-wasmJs-target-support branch from 479aff3 to f37282e Compare January 6, 2024 08:24

arkivanov approved these changes Jan 6, 2024

View reviewed changes

CherryPerry previously approved these changes Jan 6, 2024

View reviewed changes

CherryPerry self-requested a review January 7, 2024 23:12

IlyaGulya dismissed CherryPerry’s stale review via 4a055f7 January 10, 2024 05:05

IlyaGulya added 2 commits January 10, 2024 14:26

Fix MainScheduler timeout and interval types. Fix MainScheduler wrong…

f685041

…ly removes timeout and interval ids on first task execution.

Make MainSchedulerTest to cancel task after successful periodic task …

d32fd31

…test.

IlyaGulya force-pushed the feature/add-wasmJs-target-support branch from e87de8c to d32fd31 Compare January 10, 2024 08:26

IlyaGulya force-pushed the feature/add-wasmJs-target-support branch from 5d97800 to e39b45f Compare January 10, 2024 08:56

IlyaGulya force-pushed the feature/add-wasmJs-target-support branch from e39b45f to 1af5326 Compare January 10, 2024 11:11

IlyaGulya force-pushed the feature/add-wasmJs-target-support branch from 1af5326 to 11174af Compare January 10, 2024 11:54

arkivanov suggested changes Jan 10, 2024

View reviewed changes

Make TimeoutId platform-specific type

a4fe69f

IlyaGulya force-pushed the feature/add-wasmJs-target-support branch from 11174af to a4fe69f Compare January 10, 2024 13:32

CherryPerry approved these changes Jan 10, 2024

View reviewed changes

arkivanov approved these changes Jan 10, 2024

View reviewed changes

CherryPerry merged commit 61cc293 into badoo:master Jan 11, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support wasmJs target #771

Support wasmJs target #771

IlyaGulya commented Jan 4, 2024 •

edited

Loading

arkivanov commented Jan 4, 2024

IlyaGulya commented Jan 4, 2024

IlyaGulya commented Jan 4, 2024 •

edited

Loading

arkivanov commented Jan 5, 2024

CherryPerry commented Jan 6, 2024

arkivanov commented Jan 6, 2024

CherryPerry commented Jan 7, 2024

arkivanov commented Jan 7, 2024

IlyaGulya commented Jan 8, 2024

IlyaGulya commented Jan 10, 2024 •

edited

Loading

arkivanov commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024 •

edited

Loading

arkivanov commented Jan 10, 2024

arkivanov commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024 •

edited

Loading

IlyaGulya commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024

arkivanov Jan 10, 2024

IlyaGulya Jan 10, 2024

arkivanov Jan 10, 2024

arkivanov Jan 10, 2024

IlyaGulya Jan 10, 2024

IlyaGulya Jan 10, 2024

arkivanov Jan 10, 2024

arkivanov Jan 10, 2024

		@@ -0,0 +1,33 @@
		package com.badoo.reaktive.scheduler

		internal actual fun jsSetTimeout(task: () -> Unit, delayMillis: Int): TimeoutId =

Support wasmJs target #771

Support wasmJs target #771

Conversation

IlyaGulya commented Jan 4, 2024 • edited Loading

arkivanov commented Jan 4, 2024

IlyaGulya commented Jan 4, 2024

IlyaGulya commented Jan 4, 2024 • edited Loading

arkivanov commented Jan 5, 2024

CherryPerry commented Jan 6, 2024

arkivanov commented Jan 6, 2024

CherryPerry commented Jan 7, 2024

arkivanov commented Jan 7, 2024

IlyaGulya commented Jan 8, 2024

IlyaGulya commented Jan 10, 2024 • edited Loading

arkivanov commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024 • edited Loading

arkivanov commented Jan 10, 2024

arkivanov commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024 • edited Loading

IlyaGulya commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024

IlyaGulya commented Jan 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

IlyaGulya commented Jan 4, 2024 •

edited

Loading

IlyaGulya commented Jan 4, 2024 •

edited

Loading

IlyaGulya commented Jan 10, 2024 •

edited

Loading

IlyaGulya commented Jan 10, 2024 •

edited

Loading

IlyaGulya commented Jan 10, 2024 •

edited

Loading