[couchdb] branch changes-websocket updated (c58526587 -> 1f9a761a7)

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a change to branch changes-websocket
in repository https://gitbox.apache.org/repos/asf/couchdb.git


 discard c58526587 support Websocket protocol for continuous response
     new 1f9a761a7 support Websocket protocol for continuous response

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c58526587)
            \
             N -- N -- N   refs/heads/changes-websocket (1f9a761a7)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/chttpd/src/chttpd_db.erl | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

[couchdb] 01/01: support Websocket protocol for continuous response

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch changes-websocket
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 1f9a761a71d174fd05aa9f04314883443983e250
Author: Robert Newson <rn...@apache.org>
AuthorDate: Mon Jun 26 21:29:08 2023 +0100

    support Websocket protocol for continuous response
    
    needs mochiweb tweak;
    
    diff --git a/src/mochiweb_websocket.erl b/src/mochiweb_websocket.erl
    index 22ef924..d0658f4 100644
    --- a/src/mochiweb_websocket.erl
    +++ b/src/mochiweb_websocket.erl
    @@ -74,6 +74,12 @@ call_body({M, F}, Payload, State, ReplyChannel) ->
     call_body(Body, Payload, State, ReplyChannel) ->
         Body(Payload, State, ReplyChannel).
    
    +send(Socket, pong, hybi) ->
    +    mochiweb_socket:send(Socket, <<1:1, 0:3, 10:4, 0:8>>);
    +send(Socket, close, hybi) ->
    +    mochiweb_socket:send(Socket, <<1:1, 0:3, 8:4, 0:8>>),
    +    mochiweb_socket:close(Socket),
    +    exit({shutdown, websocket_close});
     send(Socket, Payload, hybi) ->
         Prefix = <<1:1, 0:3, 1:4,
                   (payload_length(iolist_size(Payload)))/binary>>,
---
 src/chttpd/src/chttpd_db.erl | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl
index 791ee86f3..47e5f57b8 100644
--- a/src/chttpd/src/chttpd_db.erl
+++ b/src/chttpd/src/chttpd_db.erl
@@ -163,26 +163,37 @@ handle_changes_req1(#httpd{} = Req, Db) ->
             throw({bad_request, Msg})
     end.
 
-% websocket goop
+% websocket callbacks
 changes_callback(start, #cacc{feed = continuous, websocket = true} = Acc) ->
     {ReentryWs, ReplyChannel} = mochiweb_websocket:upgrade_connection(
-        Acc#cacc.mochi, fun client_ws_loop/3),
-    {ok, Acc#cacc{mochi = undefined, websocket = {ws, ReentryWs, ReplyChannel}}};
+        Acc#cacc.mochi#httpd.mochi_req, fun client_ws_loop/3),
+    {ok, Acc#cacc{websocket = {ws, ReentryWs, ReplyChannel}}};
 changes_callback({change, Change}, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = Acc) ->
     chttpd_stats:incr_rows(),
     ReplyChannel(?JSON_ENCODE(Change)),
     {ok, Acc};
 changes_callback(timeout, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = Acc) ->
-    ReplyChannel("\n"),
+    ReplyChannel(pong),
     {ok, Acc};
-changes_callback({stop, EndSeq, Pending}, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = Acc) ->
+changes_callback(waiting_for_updates, #cacc{websocket = {ws, _ReentryWs, _ReplyChannel}} = Acc) ->
+    {ok, Acc};
+changes_callback({error, Reason}, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = _Acc) ->
+    {_Code, ErrorStr, ReasonStr} = chttpd:error_info(Reason),
+    Row =
+        {[
+            {<<"error">>, ErrorStr},
+            {<<"reason">>, ReasonStr}
+         ]},
+    ReplyChannel(?JSON_ENCODE(Row)),
+    ReplyChannel(close);
+changes_callback({stop, EndSeq, Pending}, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = _Acc) ->
     Row =
         {[
             {<<"last_seq">>, EndSeq},
             {<<"pending">>, Pending}
         ]},
     ReplyChannel(?JSON_ENCODE(Row)),
-    {stop, Acc};
+    ReplyChannel(close);
 
 % callbacks for continuous feed (newline-delimited JSON Objects)
 changes_callback(start, #cacc{feed = continuous} = Acc) ->
@@ -2584,8 +2595,8 @@ websocket_upgrade_requested(#httpd{} = Req) ->
     Upgrade = chttpd:header_value(Req, "Upgrade"),
     Upgrade =/= undefined andalso string:to_lower(Upgrade) =:= "websocket".
 
-client_ws_loop(_Payload, Broadcaster, _ReplyChannel) ->
-    Broadcaster.
+client_ws_loop(_Payload, State, _ReplyChannel) ->
+    State.
 
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").