Skip to content

Fix WebSocket test flake and update UrlLib/AndroidExtensions #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bghgary merged 9 commits into from
Apr 13, 2026
+60 −35
Merged

Fix WebSocket test flake and update UrlLib/AndroidExtensions #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2972c95
Fix WebSocket test double-done flake
bghgary Apr 8, 2026
0310406
Fix inconsistent WebSocket capitalization in error messages
bghgary Apr 9, 2026
a516b5d
Retrigger CI
bghgary Apr 10, 2026
981dbe9
Bump UrlLib/AndroidExtensions and update WebSocket tests
bghgary Apr 10, 2026
70af8a0
Merge remote-tracking branch 'origin/main' into fix/websocket-test-flake
bghgary Apr 13, 2026
751ca89
Simplify WebSocket tests: remove try/catch and expect
bghgary Apr 13, 2026
c04de55
Restore expect assertions with ws.close() in catch blocks
bghgary Apr 13, 2026
0965b31
Revert accidental package-lock.json change
bghgary Apr 13, 2026
bd5dcff
Retrigger CI
bghgary Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include(FetchContent)
# --------------------------------------------------
FetchContent_Declare(AndroidExtensions
GIT_REPOSITORY https://github.com/BabylonJS/AndroidExtensions.git
GIT_TAG 2d5af72259cc73e5f249d3c99bee2010be9cb042
GIT_TAG 2e85a8d43b89246c460112c9e5546ad54b6e87b4
EXCLUDE_FROM_ALL)
FetchContent_Declare(arcana.cpp
GIT_REPOSITORY https://github.com/microsoft/arcana.cpp.git
Expand All @@ -37,7 +37,7 @@ FetchContent_Declare(llhttp
EXCLUDE_FROM_ALL)
FetchContent_Declare(UrlLib
GIT_REPOSITORY https://github.com/BabylonJS/UrlLib.git
GIT_TAG d53beb958b1cccafd5411260ace6d32b68b56a83
GIT_TAG 880c2575e57ca0b59068ecc4860f185b9970e0ce
EXCLUDE_FROM_ALL)
# --------------------------------------------------

Expand Down
91 changes: 58 additions & 33 deletions Tests/UnitTests/Scripts/tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Mocha from "mocha";
import * as Mocha from "mocha";
import { expect } from "chai";

Mocha.setup('bdd');
Expand Down Expand Up @@ -407,45 +407,51 @@ if (hostPlatform !== "Unix") {
it("should connect correctly with one websocket connection", function (done) {
const ws = new WebSocket("wss://ws.postman-echo.com/raw");
const testMessage = "testMessage";
let error: unknown;

ws.onopen = () => {
try {
expect(ws).to.have.property("readyState", 1);
expect(ws).to.have.property("url", "wss://ws.postman-echo.com/raw");
ws.send(testMessage);
}
catch (e) {
done(e);
error = e;
ws.close();
}
};

ws.onmessage = (msg) => {
try {
expect(msg.data).to.equal(testMessage);
ws.close();
}
catch (e) {
done(e);
error = e;
}
ws.close();
};

ws.onclose = () => {
try {
expect(ws).to.have.property("readyState", 3);
done();
}
catch (e) {
done(e);
if (!error) {
try {
expect(ws).to.have.property("readyState", 3);
}
catch (e) {
error = e;
}
}
done(error);
};

ws.onerror = (ev) => {
done(new Error("WebSocket failed"));
ws.onerror = () => {
error = new Error("WebSocket failed");
};
});

it("should connect correctly with multiple websocket connections", function (done) {
const testMessage1 = "testMessage1";
const testMessage2 = "testMessage2";
let error: unknown;

const ws1 = new WebSocket("wss://ws.postman-echo.com/raw");
ws1.onopen = () => {
Expand All @@ -457,57 +463,66 @@ if (hostPlatform !== "Unix") {
ws2.send(testMessage2);
}
catch (e) {
done(e);
error = e;
ws2.close();
}
};

ws2.onmessage = (msg) => {
try {
expect(msg.data).to.equal(testMessage2);
ws2.close();
}
catch (e) {
done(e);
error = e;
}
ws2.close();
};

ws2.onclose = () => {
try {
expect(ws2).to.have.property("readyState", 3);
ws1.send(testMessage1);
if (!error) {
try {
expect(ws2).to.have.property("readyState", 3);
ws1.send(testMessage1);
}
catch (e) {
error = e;
ws1.close();
}
}
catch (e) {
done(e);
else {
ws1.close();
}
};

ws2.onerror = (ev) => {
done(new Error("Websocket failed"));
ws2.onerror = () => {
error = new Error("WebSocket failed");
};
}

ws1.onmessage = (msg) => {
try {
expect(msg.data).to.equal(testMessage1);
ws1.close();
}
catch (e) {
done(e);
error = e;
}
ws1.close();
}

ws1.onclose = () => {
try {
expect(ws1).to.have.property("readyState", 3);
done();
}
catch (e) {
done(e);
if (!error) {
try {
expect(ws1).to.have.property("readyState", 3);
}
catch (e) {
error = e;
}
}
done(error);
}

ws1.onerror = (ev) => {
done(new Error("Websocket failed"));
ws1.onerror = () => {
error = new Error("WebSocket failed");
};
});

Expand All @@ -522,8 +537,18 @@ if (hostPlatform !== "Unix") {
it("should trigger error callback with invalid domain", function (done) {
this.timeout(10000);
const ws = new WebSocket("wss://example");
let errorFired = false;
ws.onerror = () => {
done();
errorFired = true;
};
ws.onclose = () => {
try {
expect(errorFired).to.be.true;
done();
}
catch (e) {
done(e);
}
};
});
})
Expand Down