Skip to content

Fix #592: allow multiple readers but no multiple scans on any reader #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 28, 2020
Merged

Fix #592: allow multiple readers but no multiple scans on any reader #611

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6dc7be8
Fix #592: scan rejects prior scan
zolkis Dec 8, 2020
5125762
Fix ReSpec linking errors
zolkis Dec 8, 2020
59b4268
Reword the abort scan and write algorithms
zolkis Dec 8, 2020
3e5d134
Fix the release NFC steps
zolkis Dec 8, 2020
bf7a613
New scans don't preempt pending scans
zolkis Dec 17, 2020
aa2c2f8
Revert to the 'activated reader objects' internal slot and allow mult…
zolkis Dec 21, 2020
ea613a0
Fail successive scan() invocations on readers
zolkis Dec 21, 2020
4540659
Remove the scan cleanup step on promise fulfillment: bug in the spec
zolkis Dec 23, 2020
341f824
Update a with an
zolkis Dec 28, 2020
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
94 changes: 48 additions & 46 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2079,11 +2079,10 @@ <h2>The <dfn>record type</dfn> string</h2>
</td>
</tr>
<tr>
<td><dfn>[[\PendingRead]]</dfn></td>
<td><dfn>[[\ActivatedReaderList]]</dfn></td>
<td>empty <a>set</a></td>
<td>
A &lt;|promise:Promise|, |reader:NDEFReader|&gt; tuple where |promise|
holds a {{Promise}} and |reader| holds an {{NDEFReader}}.
A <a>set</a> of {{NDEFReader}} instances.
</td>
</tr>
<tr>
Expand All @@ -2097,8 +2096,8 @@ <h2>The <dfn>record type</dfn> string</h2>
</tbody>
</table>
<p>
The <dfn>pending read tuple</dfn> is the value of the
<a>[[\PendingRead]]</a> internal slot.
The <dfn>activated reader objects</dfn> is the value of the
<a>[[\ActivatedReaderList]]</a> internal slot.
</p>
<p>
The <dfn>pending write tuple</dfn> is the value of the
Expand Down Expand Up @@ -2204,8 +2203,8 @@ <h2>The <dfn>record type</dfn> string</h2>

<section><h3>Aborting pending write operation</h3>
<div>
To attempt to <dfn>abort a pending write operation</dfn> on an
<a>environment settings object</a>, perform the following steps:
To attempt to <dfn>abort a pending write operation</dfn>,
run the following steps:
<ol class=algorithm>
<li>
If there is no <a>pending write tuple</a> |tuple|, abort these steps.
Expand Down Expand Up @@ -2238,14 +2237,10 @@ <h2>The <dfn>record type</dfn> string</h2>
Attempt to <a>abort a pending write operation</a>.
</li>
<li>
Stop the <a>dispatch NFC content</a> steps.
Clear the <a>activated reader objects</a>.
</li>
<li>
Clear the <a>pending read tuple</a>.
</li>
<li>
Release the NFC resources associated with |nfc| on the
underlying platform.
Release the NFC resources on the underlying platform.
</li>
</ol>
<p>
Expand Down Expand Up @@ -2510,7 +2505,7 @@ <h3><dfn>Writing content</dfn></h3>
Let |records| be the list « |textRecord| ».
</li>
<li>
Set |source|'s <a>records</a> to |records|.
Set |source|'s records to |records|.
</li>
</ul>
<dt>{{BufferSource}}</dt>
Expand All @@ -2524,13 +2519,13 @@ <h3><dfn>Writing content</dfn></h3>
Let |records| be the list « |mimeRecord| ».
</li>
<li>
Set |source|'s <a>records</a> to |records|.
Set |source|'s records to |records|.
</li>
</ul>
<dt>{{NDEFMessageInit}}</dt>
<ul>
<li>
If |source|'s <a>records</a> [= list/is empty =], [= exception/throw =]
If |source|'s records [= list/is empty =], [= exception/throw =]
a {{TypeError}} and abort these steps.
</li>
</ul>
Expand All @@ -2548,7 +2543,7 @@ <h3><dfn>Writing content</dfn></h3>
</li>
<li>
[= list/For each =] |record:NDEFRecordInit| in the <a>list</a>
|source|'s <a>records</a>, run the following steps:
|source|'s records, run the following steps:
<ol>
<li>
Let |ndef| be the result of running <a>create NDEF record</a>
Expand Down Expand Up @@ -3397,9 +3392,9 @@ <h3><dfn>Writing content</dfn></h3>
accessible to the client.
</p>
<p>
If there is a <a>pending read tuple</a> whose |reader| is an
{{NDEFReader}} instance, then the <a>UA</a> MUST listen to
<a>NDEF message</a>s on all connected NFC adapters.
If there are any {{NDEFReader}} instances in <a>activated reader objects</a>
then the <a>UA</a> MUST listen to <a>NDEF message</a>s on all connected
NFC adapters.
</p>

<section> <h3>The <strong>scan()</strong> method</h3>
Expand All @@ -3416,7 +3411,7 @@ <h3><dfn>Writing content</dfn></h3>
</li>
<li>
If not currently executing in the currently active <a>top-level
browsing context</a>, then reject |p| with and
browsing context</a>, then reject |p| with an
{{"InvalidStateError"}} {{DOMException}} and return |p|.
</li>
<li>
Expand All @@ -3436,23 +3431,16 @@ <h3><dfn>Writing content</dfn></h3>
<li>
If |signal| is not `null`, then
<a data-cite="dom#abortsignal-abort-algorithms">
add the following abort steps</a> to |signal|:
<ol>
<li>
Clear the <a>pending read tuple</a> .
</li>
<li>
Make a request to stop listening to <a>NDEF message</a>s
on all <a>NFC adapter</a>s.
</li>
</ol>
</li>
<li>
[=promise/React=] to |p|:
add the following <dfn>clean up the pending scan</dfn> steps</a>
to |signal|:
<ol>
<li>
If |p| was settled (fulfilled or rejected), then clear the
<a>pending read tuple</a>.
Remove |reader| from the <a>activated reader objects</a>.
</li>
<li>
If the <a>activated reader objects</a> [= list/is empty =],
then make a request to stop listening to <a>NDEF message</a>s
on all <a>NFC adapter</a>s.
</li>
</ol>
</li>
Expand All @@ -3477,7 +3465,12 @@ <h3><dfn>Writing content</dfn></h3>
and abort these steps.
</li>
<li>
Set the <a>pending read tuple</a> to (|p|, |reader|).
If |reader| is already in the <a>activated reader objects</a>,
then reject |p| with an {{"InvalidStateError"}} {{DOMException}}
and abort these steps.
</li>
<li>
Add |reader| to the <a>activated reader objects</a>.
</li>
<li>
Resolve |p|.
Expand All @@ -3502,10 +3495,14 @@ <h3><dfn>Writing content</dfn></h3>
If the <a>NFC tag</a> in proximity range does not expose <a>NDEF</a>
technology for reading or formatting, run the following sub-steps:
<ol>
<li>
If there is a <a>pending read tuple</a> whose |reader| is an
{{NDEFReader}} instance, fire an event</a> named "`readingerror`" at
|reader|.
<li>[= list/For each =]
{{NDEFReader}} instance |reader:NDEFReader| in the
<a>activated reader objects</a>, run the following sub-steps:
<ol>
<li>
<a>Fire an event</a> named "`error`" at |reader|.
</li>
</ol>
</li>
<li>
Abort these steps.
Expand Down Expand Up @@ -3572,11 +3569,16 @@ <h3><dfn>Writing content</dfn></h3>
</p>
<ol class=algorithm>
<li>
If there is a <a>pending read tuple</a> whose |reader| is an
{{NDEFReader}} instance, <a>fire an event</a> named "`reading`" at
|reader| using <a>NDEFReadingEvent</a> with its <a>serialNumber</a>
attribute initialized to |serialNumber| and <a>message</a> attribute
initialized to |message|.
[= list/For each =] {{NDEFReader}} instance |reader:NDEFReader| in
the <a>activated reader objects</a>,
<ol>
<li>
<a>fire an event</a> named "`reading`" at |reader| using
<a>NDEFReadingEvent</a> with its <a>serialNumber</a> attribute
initialized to |serialNumber| and its <a>message</a> attribute
initialized to |message|.
</li>
</ol>
</li>
</ol>
</section>
Expand Down