Skip to content

Commit 0f42c18

Browse files
miguelgrinbergmiguelgrinberg
committed
Various simplifications to examples
1 parent 70ebfdb commit 0f42c18

File tree

24 files changed

+248
-274
lines changed

24 files changed

+248
-274
lines changed

‎examples/client/asyncio/latency_client.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ async def send_ping():
1313
await sio.emit('ping_from_client')
1414

1515

16-
@sio.on('connect')
17-
async def on_connect():
16+
@sio.event
17+
async def connect():
1818
print('connected to server')
1919
await send_ping()
2020

2121

22-
@sio.on('pong_from_server')
23-
async def on_pong(data):
22+
@sio.event
23+
async def pong_from_server(data):
2424
global start_timer
2525
latency = time.time() - start_timer
2626
print('latency is {0:.2f} ms'.format(latency * 1000))

‎examples/client/threads/latency_client.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ def send_ping():
1111
sio.emit('ping_from_client')
1212

1313

14-
@sio.on('connect')
15-
def on_connect():
14+
@sio.event
15+
def connect():
1616
print('connected to server')
1717
send_ping()
1818

1919

20-
@sio.on('pong_from_server')
21-
def on_pong(data):
20+
@sio.event
21+
def pong_from_server(data):
2222
global start_timer
2323
latency = time.time() - start_timer
2424
print('latency is {0:.2f} ms'.format(latency * 1000))

‎examples/server/aiohttp/app.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js"></script>
77
<script type="text/javascript" charset="utf-8">
88
$(document).ready(function(){
9-
namespace = '/test';
10-
var socket = io.connect('http://' + document.domain + ':' + location.port + namespace);
9+
var socket = io.connect();
1110

1211
socket.on('connect', function() {
13-
socket.emit('my event', {data: 'I\'m connected!'});
12+
socket.emit('my_event', {data: 'I\'m connected!'});
1413
});
1514
socket.on('disconnect', function() {
1615
$('#log').append('<br>Disconnected');
1716
});
18-
socket.on('my response', function(msg) {
17+
socket.on('my_response', function(msg) {
1918
$('#log').append('<br>Received: ' + msg.data);
2019
});
2120

@@ -24,11 +23,11 @@
2423
// handlers for the different forms in the page
2524
// these send data to the server in a variety of ways
2625
$('form#emit').submit(function(event) {
27-
socket.emit('my event', {data: $('#emit_data').val()});
26+
socket.emit('my_event', {data: $('#emit_data').val()});
2827
return false;
2928
});
3029
$('form#broadcast').submit(function(event) {
31-
socket.emit('my broadcast event', {data: $('#broadcast_data').val()});
30+
socket.emit('my_broadcast_event', {data: $('#broadcast_data').val()});
3231
return false;
3332
});
3433
$('form#join').submit(function(event) {
@@ -40,15 +39,15 @@
4039
return false;
4140
});
4241
$('form#send_room').submit(function(event) {
43-
socket.emit('my room event', {room: $('#room_name').val(), data: $('#room_data').val()});
42+
socket.emit('my_room_event', {room: $('#room_name').val(), data: $('#room_data').val()});
4443
return false;
4544
});
4645
$('form#close').submit(function(event) {
47-
socket.emit('close room', {room: $('#close_room').val()});
46+
socket.emit('close_room', {room: $('#close_room').val()});
4847
return false;
4948
});
5049
$('form#disconnect').submit(function(event) {
51-
socket.emit('disconnect request');
50+
socket.emit('disconnect_request');
5251
return false;
5352
});
5453
});

‎examples/server/aiohttp/app.py‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,67 +15,64 @@ async def background_task():
1515
while True:
1616
await sio.sleep(10)
1717
count += 1
18-
await sio.emit('my response', {'data': 'Server generated event'},
19-
namespace='/test')
18+
await sio.emit('my_response', {'data': 'Server generated event'})
2019

2120

2221
async def index(request):
2322
with open('app.html') as f:
2423
return web.Response(text=f.read(), content_type='text/html')
2524

2625

27-
@sio.on('my event', namespace='/test')
28-
async def test_message(sid, message):
29-
await sio.emit('my response', {'data': message['data']}, room=sid,
30-
namespace='/test')
26+
@sio.event
27+
async def my_event(sid, message):
28+
await sio.emit('my_response', {'data': message['data']}, room=sid)
3129

3230

33-
@sio.on('my broadcast event', namespace='/test')
34-
async def test_broadcast_message(sid, message):
35-
await sio.emit('my response', {'data': message['data']}, namespace='/test')
31+
@sio.event
32+
async def my_broadcast_event(sid, message):
33+
await sio.emit('my_response', {'data': message['data']})
3634

3735

38-
@sio.on('join', namespace='/test')
36+
@sio.event
3937
async def join(sid, message):
40-
sio.enter_room(sid, message['room'], namespace='/test')
41-
await sio.emit('my response', {'data': 'Entered room: ' + message['room']},
42-
room=sid, namespace='/test')
38+
sio.enter_room(sid, message['room'])
39+
await sio.emit('my_response', {'data': 'Entered room: ' + message['room']},
40+
room=sid)
4341

4442

45-
@sio.on('leave', namespace='/test')
43+
@sio.event
4644
async def leave(sid, message):
47-
sio.leave_room(sid, message['room'], namespace='/test')
48-
await sio.emit('my response', {'data': 'Left room: ' + message['room']},
49-
room=sid, namespace='/test')
45+
sio.leave_room(sid, message['room'])
46+
await sio.emit('my_response', {'data': 'Left room: ' + message['room']},
47+
room=sid)
5048

5149

52-
@sio.on('close room', namespace='/test')
53-
async def close(sid, message):
54-
await sio.emit('my response',
50+
@sio.event
51+
async def close_room(sid, message):
52+
await sio.emit('my_response',
5553
{'data': 'Room ' + message['room'] + ' is closing.'},
56-
room=message['room'], namespace='/test')
57-
await sio.close_room(message['room'], namespace='/test')
54+
room=message['room'])
55+
await sio.close_room(message['room'])
5856

5957

60-
@sio.on('my room event', namespace='/test')
61-
async def send_room_message(sid, message):
62-
await sio.emit('my response', {'data': message['data']},
63-
room=message['room'], namespace='/test')
58+
@sio.event
59+
async def my_room_event(sid, message):
60+
await sio.emit('my_response', {'data': message['data']},
61+
room=message['room'])
6462

6563

66-
@sio.on('disconnect request', namespace='/test')
64+
@sio.event
6765
async def disconnect_request(sid):
68-
await sio.disconnect(sid, namespace='/test')
66+
await sio.disconnect(sid)
6967

7068

71-
@sio.on('connect', namespace='/test')
72-
async def test_connect(sid, environ):
73-
await sio.emit('my response', {'data': 'Connected', 'count': 0}, room=sid,
74-
namespace='/test')
69+
@sio.event
70+
async def connect(sid, environ):
71+
await sio.emit('my_response', {'data': 'Connected', 'count': 0}, room=sid)
7572

7673

77-
@sio.on('disconnect', namespace='/test')
78-
def test_disconnect(sid):
74+
@sio.event
75+
def disconnect(sid):
7976
print('Client disconnected')
8077

8178

‎examples/server/aiohttp/latency.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h2 id="transport">(connecting)</h2>
1414
<script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js"></script>
1515
<script>
1616
// socket
17-
var socket = io.connect('http://' + document.domain + ':' + location.port);
17+
var socket = io.connect();
1818
var char = $('chart').get(0);
1919
socket.on('connect', function() {
2020
if (chart.getContext) {

‎examples/server/aiohttp/latency.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ async def index(request):
1212
return web.Response(text=f.read(), content_type='text/html')
1313

1414

15-
@sio.on('ping_from_client')
16-
async def ping(sid):
15+
@sio.event
16+
async def ping_from_client(sid):
1717
await sio.emit('pong_from_server', room=sid)
1818

1919

‎examples/server/asgi/app.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js"></script>
77
<script type="text/javascript" charset="utf-8">
88
$(document).ready(function(){
9-
namespace = '/test';
10-
var socket = io.connect('http://' + document.domain + ':' + location.port + namespace);
9+
var socket = io.connect();
1110

1211
socket.on('connect', function() {
13-
socket.emit('my event', {data: 'I\'m connected!'});
12+
socket.emit('my_event', {data: 'I\'m connected!'});
1413
});
1514
socket.on('disconnect', function() {
1615
$('#log').append('<br>Disconnected');
1716
});
18-
socket.on('my response', function(msg) {
17+
socket.on('my_response', function(msg) {
1918
$('#log').append('<br>Received: ' + msg.data);
2019
});
2120

@@ -24,11 +23,11 @@
2423
// handlers for the different forms in the page
2524
// these send data to the server in a variety of ways
2625
$('form#emit').submit(function(event) {
27-
socket.emit('my event', {data: $('#emit_data').val()});
26+
socket.emit('my_event', {data: $('#emit_data').val()});
2827
return false;
2928
});
3029
$('form#broadcast').submit(function(event) {
31-
socket.emit('my broadcast event', {data: $('#broadcast_data').val()});
30+
socket.emit('my_broadcast_event', {data: $('#broadcast_data').val()});
3231
return false;
3332
});
3433
$('form#join').submit(function(event) {
@@ -40,7 +39,7 @@
4039
return false;
4140
});
4241
$('form#send_room').submit(function(event) {
43-
socket.emit('my room event', {room: $('#room_name').val(), data: $('#room_data').val()});
42+
socket.emit('my_room_event', {room: $('#room_name').val(), data: $('#room_data').val()});
4443
return false;
4544
});
4645
$('form#close').submit(function(event) {

‎examples/server/asgi/app.py‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,65 +18,62 @@ async def background_task():
1818
while True:
1919
await sio.sleep(10)
2020
count += 1
21-
await sio.emit('my response', {'data': 'Server generated event'},
22-
namespace='/test')
21+
await sio.emit('my_response', {'data': 'Server generated event'})
2322

2423

25-
@sio.on('my event', namespace='/test')
24+
@sio.on('my_event')
2625
async def test_message(sid, message):
27-
await sio.emit('my response', {'data': message['data']}, room=sid,
28-
namespace='/test')
26+
await sio.emit('my_response', {'data': message['data']}, room=sid)
2927

3028

31-
@sio.on('my broadcast event', namespace='/test')
29+
@sio.on('my_broadcast_event')
3230
async def test_broadcast_message(sid, message):
33-
await sio.emit('my response', {'data': message['data']}, namespace='/test')
31+
await sio.emit('my_response', {'data': message['data']})
3432

3533

36-
@sio.on('join', namespace='/test')
34+
@sio.on('join')
3735
async def join(sid, message):
38-
sio.enter_room(sid, message['room'], namespace='/test')
39-
await sio.emit('my response', {'data': 'Entered room: ' + message['room']},
40-
room=sid, namespace='/test')
36+
sio.enter_room(sid, message['room'])
37+
await sio.emit('my_response', {'data': 'Entered room: ' + message['room']},
38+
room=sid)
4139

4240

43-
@sio.on('leave', namespace='/test')
41+
@sio.on('leave')
4442
async def leave(sid, message):
45-
sio.leave_room(sid, message['room'], namespace='/test')
46-
await sio.emit('my response', {'data': 'Left room: ' + message['room']},
47-
room=sid, namespace='/test')
43+
sio.leave_room(sid, message['room'])
44+
await sio.emit('my_response', {'data': 'Left room: ' + message['room']},
45+
room=sid)
4846

4947

50-
@sio.on('close room', namespace='/test')
48+
@sio.on('close room')
5149
async def close(sid, message):
52-
await sio.emit('my response',
50+
await sio.emit('my_response',
5351
{'data': 'Room ' + message['room'] + ' is closing.'},
54-
room=message['room'], namespace='/test')
55-
await sio.close_room(message['room'], namespace='/test')
52+
room=message['room'])
53+
await sio.close_room(message['room'])
5654

5755

58-
@sio.on('my room event', namespace='/test')
56+
@sio.on('my_room_event')
5957
async def send_room_message(sid, message):
60-
await sio.emit('my response', {'data': message['data']},
61-
room=message['room'], namespace='/test')
58+
await sio.emit('my_response', {'data': message['data']},
59+
room=message['room'])
6260

6361

64-
@sio.on('disconnect request', namespace='/test')
62+
@sio.on('disconnect request')
6563
async def disconnect_request(sid):
66-
await sio.disconnect(sid, namespace='/test')
64+
await sio.disconnect(sid)
6765

6866

69-
@sio.on('connect', namespace='/test')
67+
@sio.on('connect')
7068
async def test_connect(sid, environ):
7169
global background_task_started
7270
if not background_task_started:
7371
sio.start_background_task(background_task)
7472
background_task_started = True
75-
await sio.emit('my response', {'data': 'Connected', 'count': 0}, room=sid,
76-
namespace='/test')
73+
await sio.emit('my_response', {'data': 'Connected', 'count': 0}, room=sid)
7774

7875

79-
@sio.on('disconnect', namespace='/test')
76+
@sio.on('disconnect')
8077
def test_disconnect(sid):
8178
print('Client disconnected')
8279

‎examples/server/asgi/latency.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h2 id="transport">(connecting)</h2>
1414
<script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js"></script>
1515
<script>
1616
// socket
17-
var socket = io.connect('http://' + document.domain + ':' + location.port);
17+
var socket = io.connect();
1818
var char = $('chart').get(0);
1919
socket.on('connect', function() {
2020
if (chart.getContext) {

‎examples/server/asgi/latency.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
})
1111

1212

13-
@sio.on('ping_from_client')
14-
async def ping(sid):
13+
@sio.event
14+
async def ping_from_client(sid):
1515
await sio.emit('pong_from_server', room=sid)
1616

1717

0 commit comments

Comments
 (0)