Support for ld+json replies

merge-requests/30/head
Bob Mottram 2022-09-11 10:31:11 +01:00
parent 8fea2e2981
commit ac72c6da26
1 changed files with 113 additions and 81 deletions

View File

@ -1280,6 +1280,7 @@ class PubServer(BaseHTTPRequestHandler):
msglen = len(msg)
if self._has_accept(calling_domain):
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -1473,11 +1474,11 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
if self._has_accept(calling_domain):
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
self._set_headers('application/ld+json', msglen,
None, calling_domain, True)
else:
self._set_headers('application/json', msglen,
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
None, calling_domain, True)
else:
self._set_headers('application/ld+json', msglen,
@ -1552,11 +1553,11 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
if self._has_accept(calling_domain):
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
self._set_headers('application/ld+json', msglen,
None, calling_domain, True)
else:
self._set_headers('application/json', msglen,
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
None, calling_domain, True)
else:
self._set_headers('application/ld+json', msglen,
@ -7464,11 +7465,11 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
self._set_headers('application/ld+json', msglen,
None, calling_domain, False)
else:
self._set_headers('application/json', msglen,
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
None, calling_domain, False)
self._write(msg)
if self.server.debug:
@ -7604,11 +7605,11 @@ class PubServer(BaseHTTPRequestHandler):
msg_str)
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
self._set_headers('application/ld+json', msglen,
None, calling_domain, False)
else:
self._set_headers('application/json', msglen,
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
None, calling_domain, False)
self._write(msg)
@ -10820,6 +10821,7 @@ class PubServer(BaseHTTPRequestHandler):
msg_str)
msg = msg_str.encode('utf-8')
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
msglen = len(msg)
@ -10927,6 +10929,7 @@ class PubServer(BaseHTTPRequestHandler):
msg_str)
msg = msg_str.encode('utf-8')
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
msglen = len(msg)
@ -11049,6 +11052,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -11534,6 +11538,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -11852,6 +11857,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -12012,6 +12018,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -12174,6 +12181,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -12331,7 +12339,11 @@ class PubServer(BaseHTTPRequestHandler):
msg_str)
msg = msg_str.encode('utf-8')
msglen = len(msg)
self._set_headers('application/json', msglen,
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
None, calling_domain, False)
self._write(msg)
fitness_performance(getreq_start_time,
@ -12487,6 +12499,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -12653,6 +12666,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -12821,6 +12835,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -13171,6 +13186,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -13323,6 +13339,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -13472,6 +13489,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -13615,6 +13633,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -13753,6 +13772,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -13892,6 +13912,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -13927,6 +13948,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -13958,6 +13980,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -15054,6 +15077,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -15208,6 +15232,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -15466,6 +15491,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -15568,6 +15594,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -15925,6 +15952,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -15997,6 +16025,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -16083,6 +16112,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -18493,6 +18523,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,
@ -19846,6 +19877,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = 'application/json'
if self.headers.get('Accept'):
if 'application/ld+json' in self.headers['Accept']:
protocol_str = 'application/ld+json'
self._set_headers(protocol_str, msglen,