[vim/vim] Port socketserver to use channels and JSON based protocol (PR #19782)
Foxe Chen
This is not backwards compatible with the old protocol, but I think it is worth it. Using JSON is much simpler instead of trying to understand a custom binary protocol.
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/19782
Commit Summary
- 400c2bd port socketserver to use channels and JSON based protocol
File Changes
(11 files)
- M src/channel.c (224)
- M src/clientserver.c (10)
- M src/gc.c (3)
- M src/getchar.c (3)
- M src/json.c (2)
- M src/main.c (3)
- M src/proto.h (3)
- M src/proto/channel.pro (4)
- A src/proto/socketserver.pro (6)
- A src/socketserver.c (328)
- M src/structs.h (7)
Patch Links:
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 27dc4d8 port socketserver to use channels and JSON based protocol
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 3 commits.
- acebaf2 port socketserver to use channels and JSON based protocol
- 2f05b7d remove old socketserver code
- 674f15a update makefile
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 2 commits.
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 2 commits.
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- fbe5e5f pass test_clientserver
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- b4fca02 pass test_clientserver
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 7 commits.
- ce61b89 port socketserver to use channels and JSON based protocol
- e18ea9a remove old socketserver code
- 1df670b update makefile
- 0beb98f support poll
- 5d5c9c0 implement reply interface
- d7bc081 change ifdefs for clientserver code
- 7c78864 pass test_clientserver
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 7 commits.
- 15c629f port socketserver to use channels and JSON based protocol
- efc78cc remove old socketserver code
- 7a16a7c update makefile
- dc3c971 support poll
- d78e5a3 implement reply interface
- 8e41afe change ifdefs for clientserver code
- 26d9b72 pass test_clientserver
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 2 commits.
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 7eaf454 update address parsing
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 3b74962 update address parsing
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 602d848 fix build errors
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman commented on this pull request.
> + if (mch_access((char *)buf, F_OK) != 0)
+ got = true;
+ else
+ {
+ emsg_silent++;
+ channel = channel_open_unix((char *)buf, NULL);
+ emsg_silent--;
+
+ if (channel != NULL)
+ {
+ channel_close(channel, false);
+ channel_clear(channel);
+ }
+ else
+ {
+ mch_remove(buf);
Fixed
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- a203698 fix build errors
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 2 commits.
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
64-bitman left a comment (vim/vim#19782)@pemensik Can you test if this PR fixes your issue? Thanks
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 26a7fc8 update makefiles
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 2 commits.
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- a4ee703 fix bugs
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Petr Menšík
pemensik left a comment (vim/vim#19782)Note: JSON has a binary alternative in standardized CBOR protocol. It might be better suited for some binary blobs exchange. It can even represent JSON.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 2 commits.
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
64-bitman left a comment (vim/vim#19782)Note: JSON has a binary alternative in standardized CBOR protocol. It might be better suited for some binary blobs exchange. It can even represent JSON.
Well there is no need to exchange binary blobs so JSON works fine
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 66bef2c fix windows test
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 318a66a fix windows test
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- b64f04e fix windows test
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 16 commits.
- 1e14484 port socketserver to use channels and JSON based protocol
- 841ba66 remove old socketserver code
- 7f9be1b update makefile
- 4288e02 support poll
- 47f9bb4 implement reply interface
- 7903444 change ifdefs for clientserver code
- 5d3a149 pass test_clientserver
- 2c6f43e update address parsing
- 084e929 fix build errors
- df2c279 fix tests
- 9c696ed update feature flags
- 5835d0c update makefiles
- b338cac update errors
- 4e89200 update makefile
- 2c63d69 fix bugs
- cdfd587 fix windows test
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 16 commits.
- 4bc4377 port socketserver to use channels and JSON based protocol
- 9d816e5 remove old socketserver code
- 5d82170 update makefile
- b9716e8 support poll
- 65c9104 implement reply interface
- 839d9bd change ifdefs for clientserver code
- bf76e61 pass test_clientserver
- 043acd2 update address parsing
- e02b6e6 fix build errors
- ef8c3d4 fix tests
- 5ce8d20 update feature flags
- b0bb53e update makefiles
- 57d25a7 update errors
- 6929ad5 update makefile
- 56cfeef fix bugs
- b620090 fix windows test
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- e5ea406 fix windows test
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 2 commits.
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- aa879a6 Fix preprocessor directive for MSWIN
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- f13dbd0 fix
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
64-bitman left a comment (vim/vim#19782)@chrisbra Would this PR be accepted/OK? Thanks
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 20 commits.
- c6ec16d port socketserver to use channels and JSON based protocol
- ecc654a remove old socketserver code
- b1a277c update makefile
- 8e044f2 support poll
- 97c3ae3 implement reply interface
- b2378c0 change ifdefs for clientserver code
- 210d428 pass test_clientserver
- 12d8e57 update address parsing
- dabe47a fix build errors
- 6a74eae fix tests
- 7344b53 update feature flags
- d873b8e update makefiles
- 1214962 update errors
- 93bfec2 update makefile
- 046ca4a fix bugs
- a514668 fix windows test
- acb88e4 update ifdefs
- e13014d update tests
- 3e1d56b Fix preprocessor directive for MSWIN
- 0d54a1b fix
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- cfa1c20 fix
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 7e7c435 remove encoding entry in messages
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 632bf6b remove encoding entry in messages
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 6b76d92 fix gui test
—
View it on GitHub.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 22 commits.
- bdbe370 port socketserver to use channels and JSON based protocol
- a336834 remove old socketserver code
- 99a7a40 update makefile
- 72343ff support poll
- fde8279 implement reply interface
- 49b8871 change ifdefs for clientserver code
- 87d3c86 pass test_clientserver
- 84731cc update address parsing
- 24dec79 fix build errors
- 9264104 fix tests
- 449c923 update feature flags
- bc74065 update makefiles
- 09fdc0f update errors
- 2296916 update makefile
- 9388b34 fix bugs
- 8a17149 fix windows test
- 98075f7 update ifdefs
- c577d07 update tests
- 7b56a11 Fix preprocessor directive for MSWIN
- 632d05c fix
- 1eabcd6 remove encoding entry in messages
- bbd2afd fix gui test
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
64-bitman left a comment (vim/vim#19782)@chrisbra just checking if you didn't see the previous comment
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 23 commits.
- 23990ec port socketserver to use channels and JSON based protocol
- f360665 remove old socketserver code
- be0a8c1 update makefile
- 0c18275 support poll
- 9b176c8 implement reply interface
- 682db28 change ifdefs for clientserver code
- 58c5f19 pass test_clientserver
- 85f9d7a update address parsing
- 6dc54dc fix build errors
- 77a45b1 fix tests
- 7c77477 update feature flags
- f81dbef update makefiles
- 8ef6966 update errors
- fe89122 update makefile
- df878ef fix bugs
- ee7d880 fix windows test
- 9c32f8b update ifdefs
- cc1d6ac update tests
- 397275a Fix preprocessor directive for MSWIN
- 0075b21 fix
- 717410a remove encoding entry in messages
- 3748c01 fix gui test
- 0c00bfc properly create name for socketserver
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 2 commits.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- e01b83b update docs
You are receiving this because you are subscribed to this thread.
Christian Brabandt
chrisbra left a comment (vim/vim#19782)Yes I think this makes sense, even so this would be slightly backwards compatible. But I doubt this is a problem in practice as I have mentioned before
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 27 commits.
- 899627a port socketserver to use channels and JSON based protocol
- ae15514 remove old socketserver code
- cb17377 update makefile
- 650e16c support poll
- 704a4de implement reply interface
- d9baa0a change ifdefs for clientserver code
- dc3d8ec pass test_clientserver
- a5001d6 update address parsing
- 97ed5c2 fix build errors
- 706480b fix tests
- e687410 update feature flags
- bf8eb70 update makefiles
- 142b871 update errors
- 1db3b50 update makefile
- af07974 fix bugs
- 0c346d2 fix windows test
- 3e6f196 update ifdefs
- 4bd76a1 update tests
- 7babe7b Fix preprocessor directive for MSWIN
- 6d578d5 fix
- d98fcf0 remove encoding entry in messages
- 9f1a1dd fix gui test
- 8741dd8 properly create name for socketserver
- fe370e6 update docs
- bdb5485 fix --remote-wait
- 716ca61 refactor
- b70c8ca actually fix --remote-wait
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 0ec8fe7 actually fix --remote-wait
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 908f361 actually fix --remote-wait
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- af11642 actually fix --remote-wait
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- aa87a7c use channels and JSOn for socketserver
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Foxe Chen
64-bitman left a comment (vim/vim#19782)I think this is ready
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman commented on this pull request.
> @@ -237,45 +241,51 @@ absolute or relative path. If the server id starts with either a "/" Otherwise the server id will be the filename of the socket which will be placed in the above common directories. Note that a server id/name can only contain slashes "/" if it is taken as a path, so names such as "abc/dir" will -be invalid. +be invalid. This feature is only available on Unix. + + *socketserver-address* +In addition, the socketserver can also be created as a |channel-address|. To +do this, prefix the address with "a/" (which will be ignored). This is
Any other way? Ths is the only I could think of while preserving support for the uppercase style server names
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman commented on this pull request.
> + }
+ else
+ {
+ vim_snprintf((char *)buf, MAXPATHL, "%s/vim", dir);
+ if (vim_mkdir(buf, 0700) == -1 && errno != EEXIST)
+ continue;
+
+ vim_snprintf((char *)buf, MAXPATHL, "%s/vim/%s", dir, name);
+ }
+
+ // If looking for a new socket path, and "buf" currently exists, check
+ // if it is a dead socket, if it is then remove it.
+ if (new)
+ {
+ emsg_silent++;
+ channel = channel_open_unix((char *)buf, NULL);
Im not sure how to catch it, without creating a bunch of code to speak the old protocol, which I don't think is worth it. Also it seems that this new protocol actually makes the Vim using old socketserver crash (segfault) when it tries to communicate with it.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- f52d7fe use channels and JSON for socketserver
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman commented on this pull request.
In src/main.c:
> else if (STRICMP(arg, "x11") == 0) clientserver_method = CLIENTSERVER_METHOD_X11; +# endif +# ifdef MSWIN + else if (STRICMP(arg, "mswin") == 0)
I've updated the manpages
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Foxe Chen
@64-bitman pushed 1 commit.
- 8c7522a use channels and JSON for socketserver
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
@chrisbra commented on this pull request.
> @@ -237,45 +241,51 @@ absolute or relative path. If the server id starts with either a "/" Otherwise the server id will be the filename of the socket which will be placed in the above common directories. Note that a server id/name can only contain slashes "/" if it is taken as a path, so names such as "abc/dir" will -be invalid. +be invalid. This feature is only available on Unix. + + *socketserver-address* +In addition, the socketserver can also be created as a |channel-address|. To +do this, prefix the address with "a/" (which will be ignored). This is
How about we build on your suggestions and introduce the concept of a type: like this: servername [type:]server where type by default is the old legacy name, but we can also use channel to explicitly define a channel address?
vim --servername MYVIM # implicit: name:MYVIM
vim --servername name:MYVIM # explicit legacy mode
vim --servername channel:unix:/tmp/vim.sock
vim --servername channel:127.0.0.1:12345
That should be backwards compatible and makes the intent clearer.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.