Commit Graph
392 Commits
Author SHA1 Message Date
Antonio Scandurra 87843fee2e Merge pull request #1843 from zed-industries/call-randomized-test
Model calls in randomized collaboration test
2022-11-02 13:03:34 +00:00
Antonio Scandurra 5ab83b6deb Ensure declining call doesn't accidentally leave a room 2022-11-01 18:48:08 +01:00
Antonio Scandurra 0c0e7c7bef Introduce calls to randomized collaboration test 2022-11-01 15:44:00 +01:00
Antonio Scandurra c02617e394 Don't drop fake LSP adapter's receiver before simulate ends 2022-11-01 14:28:01 +01:00
Antonio Scandurra c5c1287f39 Don't return an error when failing to send AddProjectCollaborator
This can happen when a peer has disconnected but we haven't yet been
able to acquire a lock to the store to clean up the state associated
with it.
2022-11-01 11:21:40 +01:00
Antonio Scandurra e49aaa1f46 Honor MAX_PEERS env variable in randomized test 2022-11-01 10:24:26 +01:00
Antonio Scandurra f5c4414586 Fix hang due to acquiring rng lock twice 2022-11-01 09:35:53 +01:00
Antonio Scandurra 332f4f0e75 Prevent randomized test from failing if another guest disconnects 2022-11-01 09:27:51 +01:00
Antonio Scandurra 5c4df52bc2 Fix outstanding compiler errors in randomized collaboration test 2022-11-01 08:40:31 +01:00
Antonio Scandurra dc17421e1d Start removing distinction between host and guest in random collab test 2022-11-01 08:40:08 +01:00
JuliaandKay Simmons 412c77460e Add action to go to next/previous git diff in editor
Co-Authored-By: Kay Simmons <kay@zed.dev>
2022-10-28 15:08:13 -04:00
Antonio Scandurra e99e4a84d6 Assign a new language when remote buffer is renamed 2022-10-26 17:52:39 +02:00
Joseph T LyonsandMax Brunsfeld 7457224094 Fix duplicate key error that occurs when a user joins that is already in the db
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2022-10-25 16:09:36 -04:00
Max Brunsfeld ace5b792ce Merge branch 'main' into auto-deploy-collab 2022-10-24 12:01:32 -07:00
Antonio Scandurra d3d4e4b1de Add test for screen-sharing 2022-10-24 15:17:25 +02:00
Antonio Scandurra a63f6b99d8 Set location on ActiveCall even before there's a room
We will automatically call `Room::set_location` once a room has been
assigned.
2022-10-24 15:07:25 +02:00
Antonio Scandurra 493bc28cc6 Simplify room events 2022-10-24 10:53:44 +02:00
Antonio Scandurra 8325be5b10 Show shared screen as a pane item 2022-10-24 10:04:08 +02:00
Max Brunsfeld 459cf41b9c Run migrations via a collab subcommand 2022-10-21 14:28:55 -07:00
Max Brunsfeld 2885c26b68 Publish collab docker images on CI, deploy pre-built images 2022-10-21 14:24:43 -07:00
Antonio Scandurra 231fc0f698 Merge branch 'main' into screen-sharing
# Conflicts:
#	crates/collab/src/integration_tests.rs
#	crates/collab/src/main.rs
#	styles/src/styleTree/workspace.ts
2022-10-21 14:29:45 +02:00
Antonio Scandurra 03b5a26fd6 Leave Zed room when LiveKit room disconnects 2022-10-21 14:21:45 +02:00
3700985491 Return an optional response when creating users via invites
If the user already exists, we return none. This will allow the web frontend
to avoid reporting a "join alpha" user event but also not error.

Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
2022-10-20 10:52:34 -06:00
Antonio Scandurra aece1d4b9a Delete all live-kit rooms when server is shut down 2022-10-20 14:34:05 +02:00
Nathan Sobo 6589a1c448 Ensure we can send a second frame 2022-10-19 19:21:09 -06:00
Nathan Sobo ede148827a Use fake LiveKit server to test we can send frames when screen sharing 2022-10-19 19:14:55 -06:00
Max Brunsfeld 9dd8f970f1 Allow setting ZED_SERVER_URL to URL of a collab server 2022-10-19 13:27:14 -07:00
Antonio ScandurraandNathan Sobo df546c2fc0 Use live_kit_client::TestServer in integration tests
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-19 16:35:34 +02:00
Antonio Scandurra 5126184bfb Merge remote-tracking branch 'origin/main' into screen-sharing 2022-10-19 10:04:56 +02:00
Max Brunsfeld 40d380a300 Allow impersonating users via the api token, bypassing oauth 2022-10-18 17:36:54 -07:00
Max Brunsfeld 800e91de9f Store entire Config struct on collab AppState 2022-10-18 13:58:03 -07:00
Max Brunsfeld 423de858f7 Remove unused env vars from collab k8s manifest 2022-10-18 13:58:03 -07:00
Antonio ScandurraandNathan Sobo a1ed37743e Clear out incoming call when removing last connection for a user
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-18 19:15:14 +02:00
Antonio ScandurraandNathan Sobo 0630eacbdb Use PeerId in TestServer::disconnect_client
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-18 19:05:37 +02:00
Antonio ScandurraandNathan Sobo 3ceace48fb WIP: Start on test to ensure incoming calls cancel upon recipient disconnection
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-18 18:45:50 +02:00
Antonio ScandurraandNathan Sobo 05d7ed8c59 Tell clients their peer id on connection in Hello message
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-18 18:42:55 +02:00
Antonio ScandurraandNathan Sobo 815bf905df Only leave room on connections that are associated with the active call
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-18 17:42:10 +02:00
Antonio Scandurra e7b474d9b4 Delete room when no participants are left 2022-10-18 14:59:12 +02:00
Mikayla Maki 38ea470734 Added absolute path info to remote worktrees (updated protocol version) 2022-10-17 15:27:46 -07:00
Mikayla Maki e02528e8c0 Fixed tests 2022-10-17 14:53:52 -07:00
Antonio Scandurra 186219322f WIP 2022-10-17 18:00:54 +02:00
Antonio Scandurra d8a5dae23b WIP: Start integrating screen-sharing 2022-10-17 14:50:05 +02:00
Antonio Scandurra b828646c8b Remove participants from live-kit rooms when they leave zed rooms 2022-10-17 14:03:44 +02:00
Antonio Scandurra f665daba66 WIP: Start integrating with LiveKit when creating/joining rooms 2022-10-17 12:20:55 +02:00
Max Brunsfeld a841af67c3 Revert unnecessary logic for fetching invites' platform_unknown flag 2022-10-14 16:13:38 -07:00
Max Brunsfeld f03687bfcd Include waitlist entries w/ unknown platform when summarizing and sending invites 2022-10-14 15:20:23 -07:00
b8f6ec852b Clear project's shared state upon every disconnection
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <as-cii@zed.dev>
2022-10-14 10:17:59 -07:00
7165bc1606 Allow inviting users to a project that was shared by someone else
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-13 18:48:14 +02:00
Antonio Scandurra 42e2594058 Log view name alongside error in ChildView 2022-10-13 15:44:01 +02:00
Max Brunsfeld a2c9a67558 Re-export basic text types from text and language crates
Also avoid production dependencies on fs and rope in collab
2022-10-12 15:48:19 -07:00