Skip to content

Commit 2eae02b

Browse files
committed
Merge branch 'presentaton-api-messages' of https://github.com/webscreens/openscreenprotocol into presentaton-api-messages
2 parents 5c26f20 + 730d226 commit 2eae02b

File tree

1 file changed

+43
-42
lines changed

1 file changed

+43
-42
lines changed

index.bs

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -274,32 +274,33 @@ To learn which receivers are [=available presentation display=]s for a
274274
particular URL or set of URLs, the controller may send a
275275
presentation-url-availability-request message with the following values:
276276

277-
- urls: A list of presentation URLs
277+
- urls: A list of presentation URLs
278278

279-
- watch-duration: The period of time that the controller is interested in
280-
receiving updates about the URLs, should the availability change.
279+
- watch-duration: The period of time that the controller is interested in
280+
receiving updates about the URLs, should the availability change.
281281

282-
- watch-id: An identifier the receiver may use when sending updates about URL
283-
availability so that controller knows which URLs the receiver is referring to.
282+
- watch-id: An identifier the receiver may use when sending updates about URL
283+
availability so that controller knows which URLs the receiver is referring
284+
to.
284285

285286
In response, the receiver should send one presentation-url-availability-response
286287
message with the following values:
287288

288-
- url-availabilities: A list of URL availability states (available, unavailable,
289-
or invalid). Each state must correspond to the matching URL from the request by
290-
list index.
289+
- url-availabilities: A list of URL availability states (available,
290+
unavailable, or invalid). Each state must correspond to the matching URL
291+
from the request by list index.
291292

292293

293294
The receivers should later (up to the current time plus request
294295
watch-duration) send presentation-url-availability-event messages if
295296
URL availabilities change. Such events contain the following values:
296297

297-
- watch-id: The watch-id given in the presentation-url-availability-response,
298-
used to refer to the presentation URLs whose availability has changed.
298+
- watch-id: The watch-id given in the presentation-url-availability-response,
299+
used to refer to the presentation URLs whose availability has changed.
299300

300-
- url-availabilities: A list of URL availability states (available, unavailable,
301-
or invalid). Each state must correspond to the URLs from the request referred
302-
to by the watch-id.
301+
- url-availabilities: A list of URL availability states (available,
302+
unavailable, or invalid). Each state must correspond to the URLs from the
303+
request referred to by the watch-id.
303304

304305
Note that these messages are not broadcasted to all controllers. They are sent
305306
individually to controllers that have requested availability for the URLs that
@@ -316,14 +317,14 @@ To start a presentation, the controller may send a
316317
presentation-start-request message to the receiver with the following
317318
values:
318319

319-
- presentation-id: the presentation identifier
320+
- presentation-id: the presentation identifier
320321

321-
- url: the selected presentation URL
322+
- url: the selected presentation URL
322323

323-
- headers: headers that the receiver should use to fetch the
324-
presentationUrl. For example, section 6.6.1 of
325-
[[PRESENTATION-API|Presentation API]] says that the Accept-Language
326-
header should be provided.
324+
- headers: headers that the receiver should use to fetch the
325+
presentationUrl. For example, section 6.6.1 of
326+
[[PRESENTATION-API|Presentation API]] says that the Accept-Language
327+
header should be provided.
327328

328329
The presentation ID must follow the restrictions defined by
329330
[[PRESENTATION-API|Presentation API]] section 6.1, in that it must
@@ -337,28 +338,28 @@ must respond with the appropriate result (such as invalid-url or timeout). If
337338
it has succeeded, it must reply with a success result. Additionally, the
338339
response must include the following:
339340

340-
- connection-id: An ID that both agents can use to send connection messages
341-
to each other. It is chosen by the receiver for ease of implementation: if the
342-
message receiver chooses the connection-id, it may keep the ID unique across
343-
connections, thus making message demuxing/routing easier.
341+
- connection-id: An ID that both agents can use to send connection messages
342+
to each other. It is chosen by the receiver for ease of implementation: if
343+
the message receiver chooses the connection-id, it may keep the ID unique
344+
across connections, thus making message demuxing/routing easier.
344345

345346
<!-- TODO: Add optional HTTP response code to the response? -->
346347

347348
To send a presentation message, the controller or receiver may send a
348349
presentation-connection-message with the following values:
349350

350-
- connection-id: The ID from the presentation-start-response or
351-
presentation-connection-open-response messages.
351+
- connection-id: The ID from the presentation-start-response or
352+
presentation-connection-open-response messages.
352353

353-
- message: the presentation message data.
354+
- message: the presentation message data.
354355

355356

356357
To terminate a presentation, the controller may send a
357358
presentation-termination-request message with the following values:
358359

359-
- presentation-id: The ID of the presentation to terminate.
360+
- presentation-id: The ID of the presentation to terminate.
360361

361-
- reason: The reason the presentation is being terminated.
362+
- reason: The reason the presentation is being terminated.
362363

363364

364365
When a receiving agent receives a presentation-termination-request, it should
@@ -368,9 +369,9 @@ a presentation-termination-event message. And it can send the same message if
368369
it terminates a presentation without a request from a controller to do so. This
369370
message contains the following values:
370371

371-
- presentation-id: The ID of the presentation that was terminated.
372+
- presentation-id: The ID of the presentation that was terminated.
372373

373-
- reason: The reason the presentation was terminated.
374+
- reason: The reason the presentation was terminated.
374375

375376
<!-- TODO: Split up reason into reason and whether it was triggered by the user
376377
or not? -->
@@ -380,7 +381,7 @@ To accept incoming connections requests from controller, a receiver
380381
must receive and process the presentation-connection-open-request
381382
message which contains the following values:
382383

383-
- presentation-id: The ID of the presentation to connect to.
384+
- presentation-id: The ID of the presentation to connect to.
384385

385386
- url: The URL of the presentation to connect to.
386387

@@ -390,38 +391,38 @@ presentation-connection-open-request message, send back a
390391
presentation-connection-open-response message which contains the
391392
following values:
392393

393-
- result: a code indicating success or failure, and the reason for the failure
394+
- result: a code indicating success or failure, and the reason for the failure
394395

395-
- connection-id: An ID that both agents can use to send connection messages
396-
to each other. It is chosen by the receiver for ease of implementation (if the
397-
message receiver chooses the connection-id, it may keep the ID unique across
398-
connections, thus making message demuxing/routing easier).
396+
- connection-id: An ID that both agents can use to send connection messages
397+
to each other. It is chosen by the receiver for ease of implementation (if
398+
the message receiver chooses the connection-id, it may keep the ID unique
399+
across connections, thus making message demuxing/routing easier).
399400

400401

401402
A controller may terminate a connection without terminating the presentation by
402403
sending a presentation-connection-close-request message with the following
403404
values:
404405

405-
- connection-id: The ID of the connection to close.
406+
- connection-id: The ID of the connection to close.
406407

407408

408409
The receiver should, upon receipt of a presentation-connection-close-request,
409410
send back a presentation-connection-close-response message with the following
410411
values:
411412

412-
- result: If the close succeed or failed, and if it failed why it failed.
413+
- result: If the close succeed or failed, and if it failed why it failed.
413414

414415
The receiver may also close a connection without a request from the controller
415416
to do so and without terminating a presentation. If it does so, it should send
416417
a presentation-connection-close-event to the controller with the following
417418
values:
418419

419-
- connection-id: The ID of the connection that was closed
420+
- connection-id: The ID of the connection that was closed
420421

421-
- reason: The reason the connection was closed
422+
- reason: The reason the connection was closed
422423

423-
- error-message: A debug message suitable for a log or perhaps presented to the
424-
user with more explanation as to why it was closed.
424+
- error-message: A debug message suitable for a log or perhaps presented to
425+
the user with more explanation as to why it was closed.
425426

426427
<!-- TODO: Why does the Presentation API spec not mention the use of the close
427428
message? -->

0 commit comments

Comments
 (0)