[couchdb] branch changes-websocket updated (63df98f83 -> c58526587)

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

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:

[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 c58526587d175e636d54b1e56c94914d3a7f3b83
Author: Robert Newson <rn...@apache.org>
AuthorDate: Mon Jun 26 21:29:08 2023 +0100

    support Websocket protocol for continuous response
    
    I currently send a data frame as the heartbeat but we should
    tweak mochiweb_websocket so we can send pong messages which looks
    like this;
    
    diff --git a/src/mochiweb_websocket.erl b/src/mochiweb_websocket.erl
    index 22ef924..396db82 100644
    --- a/src/mochiweb_websocket.erl
    +++ b/src/mochiweb_websocket.erl
    @@ -74,6 +74,9 @@ call_body({M, F}, Payload, State, ReplyChannel) ->
     call_body(Body, Payload, State, ReplyChannel) ->
         Body(Payload, State, ReplyChannel).
    
    +send(Socket, pong, hybi) ->
    +    Payload = <<1:1, 0:3, 10:4, 0:8>>,
    +    mochiweb_socket:send(Socket, Payload);
     send(Socket, Payload, hybi) ->
         Prefix = <<1:1, 0:3, 1:4,
                   (payload_length(iolist_size(Payload)))/binary>>,
    
    and then change;
    
    ReplyChannel("\n"),
    
    to
    
    ReplyChannel(pong),
---
 src/chttpd/src/chttpd_db.erl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl
index 791ee86f3..05ca6d95a 100644
--- a/src/chttpd/src/chttpd_db.erl
+++ b/src/chttpd/src/chttpd_db.erl
@@ -166,7 +166,7 @@ handle_changes_req1(#httpd{} = Req, Db) ->
 % websocket goop
 changes_callback(start, #cacc{feed = continuous, websocket = true} = Acc) ->
     {ReentryWs, ReplyChannel} = mochiweb_websocket:upgrade_connection(
-        Acc#cacc.mochi, fun client_ws_loop/3),
+        Acc#cacc.mochi#httpd.mochi_req, fun client_ws_loop/3),
     {ok, Acc#cacc{mochi = undefined, websocket = {ws, ReentryWs, ReplyChannel}}};
 changes_callback({change, Change}, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = Acc) ->
     chttpd_stats:incr_rows(),
@@ -175,6 +175,8 @@ changes_callback({change, Change}, #cacc{websocket = {ws, _ReentryWs, ReplyChann
 changes_callback(timeout, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = Acc) ->
     ReplyChannel("\n"),
     {ok, Acc};
+changes_callback(waiting_for_updates, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = Acc) ->
+    {ok, Acc};
 changes_callback({stop, EndSeq, Pending}, #cacc{websocket = {ws, _ReentryWs, ReplyChannel}} = Acc) ->
     Row =
         {[
@@ -182,7 +184,7 @@ changes_callback({stop, EndSeq, Pending}, #cacc{websocket = {ws, _ReentryWs, Rep
             {<<"pending">>, Pending}
         ]},
     ReplyChannel(?JSON_ENCODE(Row)),
-    {stop, Acc};
+    {ok, Acc};
 
 % callbacks for continuous feed (newline-delimited JSON Objects)
 changes_callback(start, #cacc{feed = continuous} = Acc) ->