Skip to content
This repository was archived by the owner on Mar 18, 2019. It is now read-only.

Websockets support #69

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion coreapi/commandline.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ def get_client():
credentials = get_credentials()
headers = get_headers()
http_transport = coreapi.transports.HTTPTransport(credentials, headers)
return coreapi.Client(transports=[http_transport])
websocket_transport = coreapi.transports.WebSocketsTransport()
return coreapi.Client(transports=[http_transport, websocket_transport])


def get_document():
Expand Down Expand Up @@ -134,6 +135,28 @@ def get(url):
set_history(history)


@click.command(help='Watch a document at the given URL.')
@click.argument('url')
def watch(url):
client = get_client()
history = get_history()
heading = click.style('Watching %s' % url, bold=True)
watched = client.get(url)
try:
for doc in watched:
click.clear()
click.echo(heading)
click.echo(display(doc))
if isinstance(doc, coreapi.Document):
history = history.add(doc)
set_document(doc)
set_history(history)
except coreapi.exceptions.ErrorMessage as exc:
click.echo(display(exc.error))
sys.exit(1)



@click.command(help='Load a document from disk.')
@click.argument('input_file', type=click.File('rb'))
@click.option('--format', default='corejson', type=click.Choice(['corejson', 'hal', 'hyperschema']))
Expand Down Expand Up @@ -546,6 +569,7 @@ def history_forward():


client.add_command(get)
client.add_command(watch)
client.add_command(show)
client.add_command(action)
client.add_command(reload_document, name='reload')
Expand Down
5 changes: 3 additions & 2 deletions coreapi/transports/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
from coreapi.exceptions import TransportError
from coreapi.transports.base import BaseTransport
from coreapi.transports.http import HTTPTransport
from coreapi.transports.websockets import WebSocketsTransport
import itypes


__all__ = [
'BaseTransport', 'HTTPTransport'
'BaseTransport', 'HTTPTransport', 'WebSocketsTransport'
]

default_transports = itypes.List([HTTPTransport()])
default_transports = itypes.List([HTTPTransport(), WebSocketsTransport()])


def determine_transport(url, transports=default_transports):
Expand Down
2 changes: 1 addition & 1 deletion coreapi/transports/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def transition(self, link, params=None, decoders=None, link_ancestors=None):
response = _make_http_request(url, method, headers, query_params, form_params)
result = _decode_result(response, decoders)

if isinstance(result, Document) and link_ancestors:
if (isinstance(result, Document) or result is None) and link_ancestors:
result = _handle_inplace_replacements(result, link, link_ancestors)

if isinstance(result, Error):
Expand Down
60 changes: 60 additions & 0 deletions coreapi/transports/websockets.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
from coreapi.codecs import negotiate_decoder, default_decoders
from coreapi.compat import force_bytes
from coreapi.transports.base import BaseTransport
from websocket import create_connection
from websocket._exceptions import WebSocketConnectionClosedException
import json
import jsonpatch


def _get_headers_and_body(content):
head, body = content.split('\n\n', 1)
key_value_pairs = [line.split(':', 1) for line in head.splitlines()]
headers = dict([
(key.strip().lower(), value.strip())
for key, value in key_value_pairs
])
return (headers, body)


def _decode_content(headers, content, decoders=None, base_url=None):
content_type = headers.get('content-type')
codec = negotiate_decoder(content_type, decoders=decoders)
return codec.load(content, base_url=base_url)


def _diff_content(headers, body, diff):
patch = jsonpatch.JsonPatch.from_string(diff)
previous_data = json.loads(body)
next_data = jsonpatch.apply_patch(previous_data, patch)
return json.dumps(next_data)


def _generate_request(decoders=None):
# TODO: Include User-Agent, X-Accept-Diff
if decoders is None:
decoders = default_decoders

accept = ', '.join([decoder.media_type for decoder in decoders])
return 'Accept: %s\n\n' % accept


class WebSocketsTransport(BaseTransport):
schemes = ['ws', 'wss']

def transition(self, link, params=None, decoders=None, link_ancestors=None):
url = link.url
base_url = url.replace('wss:', 'https:').replace('ws:', 'http:')
connection = create_connection(url)
request = _generate_request(decoders)
connection.send(request)
content = connection.recv()
headers, body = _get_headers_and_body(content)
yield _decode_content(headers, body, decoders=decoders, base_url=base_url)
while True:
try:
diff = connection.recv()
except WebSocketConnectionClosedException:
return
body = _diff_content(headers, body, diff)
yield _decode_content(headers, body, decoders=decoders, base_url=base_url)