diff --git a/index.html b/index.html index 603265b..9b0d7f1 100644 --- a/index.html +++ b/index.html @@ -721,12 +721,8 @@

creating the push subscription.

- If the user agent has to change the keys for any reason, it MUST fire the - "`pushsubscriptionchange`" event with the service worker registration - associated with the push subscription as |registration|, a {{PushSubscription}} - instance representing the push subscription having the old keys as - |oldSubscription| and a {{PushSubscription}} instance representing the push - subscription having the new keys as |newSubscription|. + If the [=user agent=] has to change the keys for any reason, it MUST [=refresh=] the + [=push subscription=].

To create a push subscription, given an {{PushSubscriptionOptionsInit}} @@ -771,7 +767,7 @@

- Subscription Refreshes + Subscription refreshes

A user agent or push service MAY choose to refresh a push @@ -808,7 +804,7 @@

- Subscription Deactivation + Subscription deactivation

When a push subscription is deactivated, both @@ -1100,14 +1096,14 @@

`subscribe()` method

- The subscribe() method when invoked MUST run the following steps: + The subscribe() method steps are:

  1. Let |promise| be [=a new promise=].
    2. -
  2. Let |global| be [=this=]' [=relevant global object=]. +
  3. Let |global| be [=this=]'s [=relevant global object=].
    4. -
  4. Return |promise| and continue [=in parallel=]. +
  5. Run these steps [=in parallel=]: -
    6. -
  6. If the |options| argument has a {{PushSubscriptionOptionsInit/userVisibleOnly}} value - set to `false` and the user agent requires it to be `true`, [=queue a global task=] on the - [=networking task source=] using |global| to [=reject=] |promise| {{"NotAllowedError"}} - {{DOMException}} -
    7. -
  7. If the |options| argument does not include a non-null value for the - {{PushSubscriptionOptionsInit/applicationServerKey}} member, and the push service - requires one to be given, [=queue a global task=] on the [=networking task source=] using - |global| to [=reject=] |promise| with a {{"NotSupportedError"}} {{DOMException}}. -
    8. -
  8. If the |options| argument includes a non-null value for the - {{PushSubscriptionOptions/applicationServerKey}} attribute, run the following sub-steps:
      -
    1. If |options|'s {{PushSubscriptionOptionsInit/applicationServerKey}} is a - {{DOMString}}, set its value to an {{ArrayBuffer}} containing the sequence of octets - that result from decoding |options|'s - {{PushSubscriptionOptionsInit/applicationServerKey}} using the base64url encoding - [[RFC7515]]. +
    2. If the |options| argument has a {{PushSubscriptionOptionsInit/userVisibleOnly}} + value set to `false` and the user agent requires it to be `true`, [=queue a global + task=] on the [=networking task source=] using |global| to [=reject=] |promise| + {{"NotAllowedError"}} {{DOMException}}
      3. -
    3. If decoding fails, [=queue a global task=] on the [=networking task source=] using - |global| to [=reject=] |promise| with an {{"InvalidCharacterError"}} {{DOMException}} - and terminate these steps. +
    4. If the |options| argument does not include a non-null value for the + {{PushSubscriptionOptionsInit/applicationServerKey}} member, and the push service + requires one to be given, [=queue a global task=] on the [=networking task source=] + using |global| to [=reject=] |promise| with a {{"NotSupportedError"}} {{DOMException}}.
      5. -
    5. Ensure that |options|'s {{PushSubscriptionOptionsInit/applicationServerKey}} - describes a valid point on the P-256 curve. If its value is invalid, [=queue a global - task=] on the [=networking task source=] using |global| to [=reject=] |promise| with an - {{"InvalidAccessError"}} {{DOMException}} and terminate these steps. +
    6. If the |options| argument includes a non-null value for the + {{PushSubscriptionOptions/applicationServerKey}} attribute: +
        +
      1. If |options|'s {{PushSubscriptionOptionsInit/applicationServerKey}} is a + {{DOMString}}, set its value to an {{ArrayBuffer}} containing the sequence of octets + that result from decoding |options|'s + {{PushSubscriptionOptionsInit/applicationServerKey}} using the base64url encoding + [[RFC7515]]. +
        2. +
      2. If decoding fails, [=queue a global task=] on the [=networking task source=] + using |global| to [=reject=] |promise| with an {{"InvalidCharacterError"}} + {{DOMException}} and terminate these steps. +
        3. +
      3. Ensure that |options|'s {{PushSubscriptionOptionsInit/applicationServerKey}} + describes a valid point on the P-256 curve. If its value is invalid, [=queue a + global task=] on the [=networking task source=] using |global| to [=reject=] + |promise| with an {{"InvalidAccessError"}} {{DOMException}} and terminate these + steps. +
        4. +
      7. -
    -
    9. -
  9. Let |registration:ServiceWorkerRegistration| be [=this=]'s associated service worker - registration. -
    10. -
  10. If |registration|'s [=service worker registration/active worker=] is null, [=queue a - global task=] on the [=networking task source=] using |global| to [=reject=] |promise| with - an {{"InvalidStateError"}} {{DOMException}} and terminate these steps. -
    11. -
  11. Let |permission| be [=request permission to use=] "push". -
    12. -
  12. If |permission| is {{PermissionState/"denied"}}, [=queue a global task=] on the [=user - interaction task source=] using |global| to [=reject=] |promise| with a - {{"NotAllowedError"}} {{DOMException}} and terminate these steps. -
    13. -
  13. If |registration| has a push subscription: -
      -
    1. Let |subscription| be the result of obtaining |registration|'s push - subscription. If there is an error, [=queue a global task=] on the [=networking - task source=] using |global| to [=reject=] |promise| with an {{"AbortError"}} - {{DOMException}} and terminate these steps. +
    2. Let |registration:ServiceWorkerRegistration| be [=this=]'s associated service + worker registration. +
      3. +
    3. If |registration|'s [=service worker registration/active worker=] is null, [=queue a + global task=] on the [=networking task source=] using |global| to [=reject=] |promise| + with an {{"InvalidStateError"}} {{DOMException}} and terminate these steps. +
      4. +
    4. Let |permission| be [=request permission to use=] "push". +
      5. +
    5. If |permission| is {{PermissionState/"denied"}}, [=queue a global task=] on the + [=user interaction task source=] using |global| to [=reject=] |promise| with a + {{"NotAllowedError"}} {{DOMException}} and terminate these steps.
      6. -
    6. Compare the |options| argument with the `options` attribute of |subscription|. The - contents of {{BufferSource}} values are compared for equality rather than - [=ECMAScript/reference record|reference=]. +
    7. If |registration| has a push subscription: +
        +
      1. Let |subscription| be the result of obtaining |registration|'s push + subscription. If there is an error, [=queue a global task=] on the [=networking + task source=] using |global| to [=reject=] |promise| with an {{"AbortError"}} + {{DOMException}} and terminate these steps. +
        2. +
      2. Compare the |options| argument with the `options` attribute of |subscription|. + The contents of {{BufferSource}} values are compared for equality rather than + [=ECMAScript/reference record|reference=]. +
        3. +
      3. If any attribute on |options| contains a different value to that stored for + |subscription|, then [=queue a global task=] on the [=networking task source=] using + |global| to [=reject=] |promise| with an {{"InvalidStateError"}} {{DOMException}} + and terminate these steps. +
        4. +
      4. When the request has been completed, [=queue a global task=] on the [=networking + task source=] using |global| to [=resolve=] |promise| with |subscription| and + terminate these steps. +
        5. +
      8. -
    8. If any attribute on |options| contains a different value to that stored for - |subscription|, then [=queue a global task=] on the [=networking task source=] using - |global| to [=reject=] |promise| with an {{"InvalidStateError"}} {{DOMException}} and - terminate these steps. +
    9. Let |subscription| be the result of trying to [=create a push subscription=] with + |options|. If creating the subscription [=exception/throws=] an [=exception=], [=queue a + global task=] on the [=networking task source=] using |global| to [=reject=] |promise| + with a that [=exception=] and terminate these these steps.
      10. -
    10. When the request has been completed, [=queue a global task=] on the [=networking - task source=] using |global| to [=resolve=] |promise| with |subscription| and terminate - these steps. +
    11. Otherwise, [=queue a global task=] on the [=networking task source=] using |global| + to [=resolve=] |promise| with a {{PushSubscription}} providing the details of the new + |subscription|.
    14. -
  14. Let |subscription| be the result of trying to [=create a push subscription=] with - |options|. If creating the subscription [=exception/throws=] an [=exception=], [=queue a - global task=] on the [=networking task source=] using |global| to [=reject=] |promise| with - a that [=exception=] and terminate these these steps. -
    15. -
  15. Otherwise, [=queue a global task=] on the [=networking task source=] using |global| to - [=resolve=] |promise| with a {{PushSubscription}} providing the details of the new - |subscription|. +
  16. Return |promise|.

- The getSubscription method when invoked MUST run the - following steps: + The getSubscription() method steps are:

  1. Let |promise| be a new promise.
    2. -
  2. Return |promise| and continue the following steps asynchronously. -
    3. -
  3. If the Service Worker is not subscribed, resolve |promise| with null. -
    4. -
  4. Retrieve the push subscription associated with the Service Worker. -
    5. -
  5. If there is an error, reject |promise| with a {{DOMException}} whose name is - {{"AbortError"}} and terminate these steps. +
  6. Run these steps [=in parallel=]: +
      +
    1. If the Service Worker is not subscribed, resolve |promise| with null. +
      2. +
    2. Retrieve the push subscription associated with the Service Worker. +
      3. +
    3. If there is an error, reject |promise| with a {{DOMException}} whose name is + {{"AbortError"}} and terminate these steps. +
      4. +
    4. When the request has been completed, resolve |promise| with a {{PushSubscription}} + providing the details of the retrieved push subscription. +
      5. +
    7. -
  7. When the request has been completed, resolve |promise| with a {{PushSubscription}} - providing the details of the retrieved push subscription. +
  8. Return |promise|.