[couchdb] branch changes-websocket updated (b18a9ef3b -> a65ca9265)

[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 b18a9ef3b support Websocket protocol for continuous response
     new a65ca9265 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   (b18a9ef3b)
            \
             N -- N -- N   refs/heads/changes-websocket (a65ca9265)

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 | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 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 a65ca9265fd0777e60a8c81ca788cd1b36b7d36b
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..044a18e 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, Payload, hybi) ->
         Prefix = <<1:1, 0:3, 1:4,
                   (payload_length(iolist_size(Payload)))/binary>>,
---
 src/chttpd/src/chttpd_db.erl | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl
index 791ee86f3..7e5ecaaa3 100644
--- a/src/chttpd/src/chttpd_db.erl
+++ b/src/chttpd/src/chttpd_db.erl
@@ -163,18 +163,29 @@ 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(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)),
+    ws_close(Acc#cacc.mochi#httpd.mochi_req);
 changes_callback({stop, EndSeq, Pending}, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = Acc) ->
     Row =
         {[
@@ -182,7 +193,7 @@ changes_callback({stop, EndSeq, Pending}, #cacc{websocket = {ws, _ReentryWs, Rep
             {<<"pending">>, Pending}
         ]},
     ReplyChannel(?JSON_ENCODE(Row)),
-    {stop, Acc};
+    ws_close(Acc#cacc.mochi#httpd.mochi_req);
 
 % callbacks for continuous feed (newline-delimited JSON Objects)
 changes_callback(start, #cacc{feed = continuous} = Acc) ->
@@ -2584,8 +2595,11 @@ 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.
+
+ws_close({ReqM, _} = Req) ->
+    mochiweb_socket:close(ReqM:get(socket, Req)).
 
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").