Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved api for sending messages.

Browse source
This commit is contained in:
Martin Edenhofer 2015-05-12 13:31:32 +02:00
parent 0192318219
commit 5cd3ca79bd
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
script/websocket-server.rb
View file

@ -150,13 +150,12 @@ EventMachine.run {
spool.each { |item| spool.each { |item|
# create new msg to push to client # create new msg to push to client
msg = JSON.generate( item[:message] )
if item[:type] == 'direct' if item[:type] == 'direct'
log 'notice', "send spool to (user_id=#{ @clients[client_id][:session]['id'] })", client_id log 'notice', "send spool to (user_id=#{ @clients[client_id][:session]['id'] })", client_id
websocket_send(msg, client_id) websocket_send(client_id, item[:message])
else else
log 'notice', 'send spool', client_id log 'notice', 'send spool', client_id
websocket_send(msg, client_id) websocket_send(client_id, item[:message])
end end
} }
else else
@ -168,10 +167,10 @@ EventMachine.run {
message = { message = {
event: 'spool:sent', event: 'spool:sent',
data: { data: {
timestamp: Time.now.utc.iso8601.to_i.to_s, timestamp: Time.now.utc.to_i,
}, },
} }
websocket_send(message.to_json, client_id) websocket_send(client_id, message)
end end
# get session # get session
@ -186,7 +185,7 @@ EventMachine.run {
message = { message = {
action: 'pong', action: 'pong',
} }
websocket_send(message.to_json, client_id) websocket_send(client_id, message)
# broadcast # broadcast
elsif data['action'] == 'broadcast' elsif data['action'] == 'broadcast'
@ -213,7 +212,7 @@ EventMachine.run {
log 'notice', "send broadcast from (#{client_id}) to (user_id=#{user_id})", local_client_id log 'notice', "send broadcast from (#{client_id}) to (user_id=#{user_id})", local_client_id
if local_client[:meta][:type] == 'websocket' && @clients[ local_client_id ] if local_client[:meta][:type] == 'websocket' && @clients[ local_client_id ]
websocket_send(msg, local_client_id) websocket_send(local_client_id, data)
else else
Sessions.send(local_client_id, data) Sessions.send(local_client_id, data)
end end
@ -226,7 +225,7 @@ EventMachine.run {
else else
log 'notice', "send broadcast from (#{client_id})", local_client_id log 'notice', "send broadcast from (#{client_id})", local_client_id
if local_client[:meta][:type] == 'websocket' && @clients[ local_client_id ] if local_client[:meta][:type] == 'websocket' && @clients[ local_client_id ]
websocket_send(msg, local_client_id) websocket_send(local_client_id, data)
else else
Sessions.send(local_client_id, data) Sessions.send(local_client_id, data)
end end
@ -282,7 +281,7 @@ EventMachine.run {
queue = Sessions.queue( client_id ) queue = Sessions.queue( client_id )
if queue && queue[0] if queue && queue[0]
log 'notice', 'send data to client', client_id log 'notice', 'send data to client', client_id
websocket_send(queue.to_json, client_id) websocket_send(client_id, queue)
end end
rescue => e rescue => e
@ -299,13 +298,18 @@ EventMachine.run {
} }
} }
def websocket_send(msg, client_id) def websocket_send(client_id, data)
if data.class != Array
msg = "[#{data.to_json}]"
else
msg = data.to_json
end
log 'debug', "send #{msg}", client_id log 'debug', "send #{msg}", client_id
if !@clients[client_id] if !@clients[client_id]
log 'error', "no such @clients for #{client_id}", client_id log 'error', "no such @clients for #{client_id}", client_id
return return
end end
@clients[client_id][:websocket].send( "[#{ msg }]" ) @clients[client_id][:websocket].send(msg)
end end
def check_unused_connections def check_unused_connections