Merge pull request #58 from rescript-lang/notifications

Specify pushSubscriptionJSONKeys

Author: nojaf

src/EventAPI.res

@@ -226,5 +226,5 @@ The ExtendableEvent interface extends the lifetime of the install and activate e
  */
 @editor.completeFrom(ExtendableEvent)
 type extendableEvent = {
-  ...event
-}
+  ...event,
+}

src/NotificationAPI.res

@@ -73,7 +73,7 @@ type notification = {
 type notificationAction = {
   action: string,
   title: string,
-  icon?: string
+  icon?: string,
 }
 
 type notificationOptions = {
@@ -86,7 +86,7 @@ type notificationOptions = {
   mutable silent?: Null.t<bool>,
   mutable requireInteraction?: bool,
   mutable data?: JSON.t,
-  mutable actions?: array<notificationAction>
+  mutable actions?: array<notificationAction>,
 }
 
 type getNotificationOptions = {mutable tag?: string}

src/PushAPI.res

@@ -65,10 +65,17 @@ type pushSubscriptionOptionsInit = {
   mutable applicationServerKey?: applicationServerKey,
 }
 
+type pushSubscriptionJSONKeys = {
+  /** Base64URL-encoded ArrayBuffer value */
+  p256dh: string,
+  /** Base64URL-encoded ArrayBuffer value */
+  auth: string,
+}
+
 type pushSubscriptionJSON = {
   mutable endpoint?: string,
   mutable expirationTime?: Null.t<int>,
-  mutable keys?: any,
+  mutable keys?: pushSubscriptionJSONKeys,
 }
 
 @editor.completeFrom(PushMessageData)
@@ -81,4 +88,4 @@ type pushEvent = {
    [Read more on MDN](https://developer.mozilla.org/docs/Web/API/PushEvent/data)
    */
   data?: pushMessageData,
-}
+}

src/PushAPI/PushEvent.res

@@ -1,5 +1,5 @@
 open PushAPI
 
 include ExtendableEvent.Impl({
-  type t = pushEvent;
-});
+  type t = pushEvent
+})

src/PushAPI/PushMessageData.res

@@ -12,4 +12,4 @@ The text() method of the PushMessageData interface extracts push message data as
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/PushMessageData/text)
 */
 @send
-external text: pushMessageData => string = "text"
+external text: pushMessageData => string = "text"

src/ServiceWorkerAPI.res

@@ -155,4 +155,4 @@ The WindowClient interface of the ServiceWorker API represents the scope of a se
 */
 type windowClient = {
   ...client,
-}
+}

src/ServiceWorkerAPI/ServiceWorkerGlobalScope.res

@@ -2,4 +2,4 @@ open ServiceWorkerAPI
 
 include WorkerGlobalScope.Impl({
   type t = serviceWorkerGlobalScope
-})
+})

src/WebWorkersAPI/WorkerGlobalScope.res

@@ -22,7 +22,7 @@ let response = await self->WorkerGlobalScope.fetch("https://rescript-lang.org")
 
 [Read more on MDN](https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope/fetch)
 */
-@send
+  @send
   external fetch: (T.t, string, ~init: requestInit=?) => promise<response> = "fetch"
 
   /**

tests/Global__test.js

@@ -37,3 +37,10 @@ let subscription = await registrationResult.pushManager->PushManager.subscribe(
     applicationServerKey: ApplicationServerKey.fromString("MyPublicKey"),
   },
 )
+
+let pushSubscriptionJSON = subscription->PushSubscription.toJSON
+let (auth, p256dh) = switch pushSubscriptionJSON.keys {
+| None => ("?", "?")
+| Some(keys) => (keys.auth, keys.p256dh)
+}
+Console.log(`For subscription ${subscription.endpoint}, auth is ${auth} and p256dh is ${p256dh}`)