Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
normandy
pleroma
Commits
414c5250
Commit
414c5250
authored
7 years ago
by
lain
Browse files
Options
Downloads
Patches
Plain Diff
MastoAPI: Websocket streaming for federated timeline.
parent
bd5bdc4c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/pleroma/web/mastodon_api/mastodon_socket.ex
+13
-6
13 additions, 6 deletions
lib/pleroma/web/mastodon_api/mastodon_socket.ex
lib/pleroma/web/streamer.ex
+31
-0
31 additions, 0 deletions
lib/pleroma/web/streamer.ex
with
44 additions
and
6 deletions
lib/pleroma/web/mastodon_api/mastodon_socket.ex
+
13
−
6
View file @
414c5250
defmodule
Pleroma
.
Web
.
MastodonAPI
.
MastodonSocket
do
use
Phoenix
.
Socket
transport
:streaming
,
Phoenix
.
Transports
.
WebSocket
.
Raw
transport
:streaming
,
Phoenix
.
Transports
.
WebSocket
.
Raw
,
timeout:
:infinity
# We never receive data.
def
connect
(
params
,
socket
)
do
IO
.
inspect
(
params
)
Pleroma
.
Web
.
Streamer
.
add_socket
(
params
[
"stream"
],
socket
)
{
:ok
,
socket
}
if
params
[
"stream"
]
==
"public"
do
socket
=
socket
|>
assign
(
:topic
,
params
[
"stream"
])
Pleroma
.
Web
.
Streamer
.
add_socket
(
params
[
"stream"
],
socket
)
{
:ok
,
socket
}
else
:error
end
end
def
id
(
socket
),
do
:
nil
...
...
@@ -21,7 +27,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
{
:text
,
message
}
end
def
handle
(
:closed
,
reason
,
_state
)
do
IO
.
inspect
reason
def
handle
(
:closed
,
reason
,
%{
socket:
socket
})
do
topic
=
socket
.
assigns
[
:topic
]
Pleroma
.
Web
.
Streamer
.
remove_socket
(
topic
,
socket
)
end
end
This diff is collapsed.
Click to expand it.
lib/pleroma/web/streamer.ex
+
31
−
0
View file @
414c5250
...
...
@@ -4,6 +4,10 @@ defmodule Pleroma.Web.Streamer do
import
Plug
.
Conn
def
start_link
do
spawn
(
fn
->
Process
.
sleep
(
1000
*
30
)
# 30 seconds
GenServer
.
cast
(
__MODULE__
,
%{
action:
:ping
})
end
)
GenServer
.
start_link
(
__MODULE__
,
%{},
name:
__MODULE__
)
end
...
...
@@ -11,10 +15,28 @@ defmodule Pleroma.Web.Streamer do
GenServer
.
cast
(
__MODULE__
,
%{
action:
:add
,
socket:
socket
,
topic:
topic
})
end
def
remove_socket
(
topic
,
socket
)
do
GenServer
.
cast
(
__MODULE__
,
%{
action:
:remove
,
socket:
socket
,
topic:
topic
})
end
def
stream
(
topic
,
item
)
do
GenServer
.
cast
(
__MODULE__
,
%{
action:
:stream
,
topic:
topic
,
item:
item
})
end
def
handle_cast
(%{
action:
:ping
},
topics
)
do
Map
.
values
(
topics
)
|>
List
.
flatten
|>
Enum
.
each
(
fn
(
socket
)
->
Logger
.
debug
(
"Sending keepalive ping"
)
send
socket
.
transport_pid
,
{
:text
,
""
}
end
)
spawn
(
fn
->
Process
.
sleep
(
1000
*
30
)
# 30 seconds
GenServer
.
cast
(
__MODULE__
,
%{
action:
:ping
})
end
)
{
:noreply
,
topics
}
end
def
handle_cast
(%{
action:
:stream
,
topic:
topic
,
item:
item
},
topics
)
do
Logger
.
debug
(
"Trying to push to
#{
topic
}
"
)
Logger
.
debug
(
"Pushing item to
#{
topic
}
"
)
...
...
@@ -38,6 +60,15 @@ defmodule Pleroma.Web.Streamer do
{
:noreply
,
sockets
}
end
def
handle_cast
(%{
action:
:remove
,
topic:
topic
,
socket:
socket
},
sockets
)
do
sockets_for_topic
=
sockets
[
topic
]
||
[]
sockets_for_topic
=
List
.
delete
(
sockets_for_topic
,
socket
)
sockets
=
Map
.
put
(
sockets
,
topic
,
sockets_for_topic
)
Logger
.
debug
(
"Removed conn for
#{
topic
}
"
)
IO
.
inspect
(
sockets
)
{
:noreply
,
sockets
}
end
def
handle_cast
(
m
,
state
)
do
IO
.
inspect
(
"Unknown:
#{
inspect
(
m
)
}
,
#{
inspect
(
state
)
}
"
)
{
:noreply
,
state
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment