@firebase/messaging - npm Package Compare versions

Comparing version 0.2.3-canary.1608edb to 0.2.3-canary.1e3254d

dist/cjs/index.d.ts

@@ -0,3 +1,4 @@
+import { _FirebaseNamespace } from '@firebase/app-types/private';
 import * as types from '@firebase/messaging-types';
-export declare function registerMessaging(instance: any): void;
+export declare function registerMessaging(instance: _FirebaseNamespace): void;
 /**
@@ -4,0 +5,0 @@ * Define extension behavior of `registerMessaging`

dist/cjs/index.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,7 +17,6 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+var app_1 = require("@firebase/app");
+var sw_controller_1 = require("./src/controllers/sw-controller");
 var window_controller_1 = require("./src/controllers/window-controller");
-var sw_controller_1 = require("./src/controllers/sw-controller");
-var app_1 = require("@firebase/app");
 function registerMessaging(instance) {
@@ -26,10 +26,10 @@ var messagingName = 'messaging';
         if (self && 'ServiceWorkerGlobalScope' in self) {
-            return new sw_controller_1.default(app);
+            return new sw_controller_1.SWController(app);
         }
         // Assume we are in the window context.
-        return new window_controller_1.default(app);
+        return new window_controller_1.WindowController(app);
     };
     var namespaceExports = {
         // no-inline
-        Messaging: window_controller_1.default
+        Messaging: window_controller_1.WindowController
     };
@@ -36,0 +36,0 @@ instance.INTERNAL.registerService(messagingName, factoryMethod, namespaceExports);

dist/cjs/src/controllers/controller-interface.d.ts

@@ -1,18 +0,34 @@
-import TokenDetailsModel from '../models/token-details-model';
-import VapidDetailsModel from '../models/vapid-details-model';
-import IIDModel from '../models/iid-model';
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { FirebaseApp } from '@firebase/app-types';
+import { ErrorFactory, NextFn, PartialObserver } from '@firebase/util';
+import { IIDModel } from '../models/iid-model';
+import { TokenDetailsModel } from '../models/token-details-model';
+import { VapidDetailsModel } from '../models/vapid-details-model';
 export declare const TOKEN_EXPIRATION_MILLIS: number;
-export default class ControllerInterface {
-    app: any;
+export declare abstract class ControllerInterface {
+    app: FirebaseApp;
     INTERNAL: any;
-    protected errorFactory_: any;
-    private messagingSenderId_;
-    private tokenDetailsModel_;
-    private vapidDetailsModel_;
-    private iidModel_;
+    protected errorFactory_: ErrorFactory<string>;
+    private readonly messagingSenderId_;
+    private readonly tokenDetailsModel_;
+    private readonly vapidDetailsModel_;
+    private readonly iidModel_;
     /**
      * An interface of the Messaging Service API
-     * @param {!firebase.app.App} app
      */
-    constructor(app: any);
+    constructor(app: FirebaseApp);
     /**
@@ -32,3 +48,2 @@ * @export
     private manageExistingToken(swReg, pushSubscription, publicVapidKey, tokenDetails);
-    private isTokenStillValid(pushSubscription, publicVapidKey, tokenDetails);
     private updateToken(swReg, pushSubscription, publicVapidKey, tokenDetails);
@@ -43,45 +58,22 @@ private getNewToken(swReg, pushSubscription, publicVapidKey);
      */
-    deleteToken(token: string): Promise<Boolean>;
-    getSWRegistration_(): Promise<ServiceWorkerRegistration>;
-    getPublicVapidKey_(): Promise<Uint8Array>;
-    requestPermission(): void;
+    deleteToken(token: string): Promise<boolean>;
     /**
+     * This method will delete the token from the client database, and make a
+     * call to FCM to remove it from the server DB. Does not temper with the
+     * push subscription.
+     */
+    private deleteTokenFromDB(token);
+    abstract getSWRegistration_(): Promise<ServiceWorkerRegistration>;
+    abstract getPublicVapidKey_(): Promise<Uint8Array>;
+    /**
      * Gets a PushSubscription for the current user.
      */
     getPushSubscription(swRegistration: ServiceWorkerRegistration, publicVapidKey: Uint8Array): Promise<PushSubscription>;
+    requestPermission(): void;
+    useServiceWorker(registration: ServiceWorkerRegistration): void;
+    usePublicVapidKey(b64PublicKey: string): void;
+    onMessage(nextOrObserver: NextFn<{}> | PartialObserver<{}>, error?: (e: Error) => void, completed?: () => void): void;
+    onTokenRefresh(nextOrObserver: NextFn<{}> | PartialObserver<{}>, error?: (e: Error) => void, completed?: () => void): void;
+    setBackgroundMessageHandler(callback: (a: any) => any): void;
     /**
-     * @export
-     * @param {!ServiceWorkerRegistration} registration
-     */
-    useServiceWorker(registration: any): void;
-    /**
-     * @export
-     * @param {!string} b64PublicKey
-     */
-    usePublicVapidKey(b64PublicKey: any): void;
-    /**
-     * @export
-     * @param {!firebase.Observer|function(*)} nextOrObserver
-     * @param {function(!Error)=} optError
-     * @param {function()=} optCompleted
-     * @return {!function()}
-     */
-    onMessage(nextOrObserver: any, optError: any, optCompleted: any): void;
-    /**
-     * @export
-     * @param {!firebase.Observer|function()} nextOrObserver An observer object
-     * or a function triggered on token refresh.
-     * @param {function(!Error)=} optError Optional A function
-     * triggered on token refresh error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
-     */
-    onTokenRefresh(nextOrObserver: any, optError: any, optCompleted: any): void;
-    /**
-     * @export
-     * @param {function(Object)} callback
-     */
-    setBackgroundMessageHandler(callback: any): void;
-    /**
      * This method is required to adhere to the Firebase interface.
@@ -96,3 +88,3 @@ * It closes any currently open indexdb database connections.
      */
-    getNotificationPermission_(): any;
+    getNotificationPermission_(): NotificationPermission;
     getTokenDetailsModel(): TokenDetailsModel;
@@ -102,5 +94,4 @@ getVapidDetailsModel(): VapidDetailsModel;
      * @protected
-     * @returns {IIDModel}
      */
     getIIDModel(): IIDModel;
 }

dist/cjs/src/controllers/controller-interface.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,12 +17,10 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var util_1 = require("@firebase/util");
+var array_buffer_to_base64_1 = require("../helpers/array-buffer-to-base64");
 var errors_1 = require("../models/errors");
+var iid_model_1 = require("../models/iid-model");
 var token_details_model_1 = require("../models/token-details-model");
 var vapid_details_model_1 = require("../models/vapid-details-model");
-var notification_permission_1 = require("../models/notification-permission");
-var iid_model_1 = require("../models/iid-model");
-var array_buffer_to_base64_1 = require("../helpers/array-buffer-to-base64");
 var SENDER_ID_OPTION_NAME = 'messagingSenderId';
@@ -33,15 +32,14 @@ // Database cache should be invalidated once a week.
      * An interface of the Messaging Service API
-     * @param {!firebase.app.App} app
      */
     function ControllerInterface(app) {
         var _this = this;
-        this.errorFactory_ = new util_1.ErrorFactory('messaging', 'Messaging', errors_1.default.map);
+        this.errorFactory_ = new util_1.ErrorFactory('messaging', 'Messaging', errors_1.ERROR_MAP);
         if (!app.options[SENDER_ID_OPTION_NAME] ||
             typeof app.options[SENDER_ID_OPTION_NAME] !== 'string') {
-            throw this.errorFactory_.create(errors_1.default.codes.BAD_SENDER_ID);
+            throw this.errorFactory_.create(errors_1.ERROR_CODES.BAD_SENDER_ID);
         }
         this.messagingSenderId_ = app.options[SENDER_ID_OPTION_NAME];
-        this.tokenDetailsModel_ = new token_details_model_1.default();
-        this.vapidDetailsModel_ = new vapid_details_model_1.default();
-        this.iidModel_ = new iid_model_1.default();
+        this.tokenDetailsModel_ = new token_details_model_1.TokenDetailsModel();
+        this.vapidDetailsModel_ = new vapid_details_model_1.VapidDetailsModel();
+        this.iidModel_ = new iid_model_1.IIDModel();
         this.app = app;
@@ -61,5 +59,5 @@ this.INTERNAL = {};
                         currentPermission = this.getNotificationPermission_();
-                        if (currentPermission !== notification_permission_1.default.granted) {
-                            if (currentPermission === notification_permission_1.default.denied) {
-                                return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.default.codes.NOTIFICATIONS_BLOCKED))];
+                        if (currentPermission !== 'granted') {
+                            if (currentPermission === 'denied') {
+                                return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.ERROR_CODES.NOTIFICATIONS_BLOCKED))];
                             }
@@ -104,7 +102,7 @@ // We must wait for permission to be granted
                     case 0:
-                        isTokenValid = this.isTokenStillValid(pushSubscription, publicVapidKey, tokenDetails);
+                        isTokenValid = isTokenStillValid(pushSubscription, publicVapidKey, tokenDetails);
                         if (isTokenValid) {
                             now = Date.now();
-                            if (now < tokenDetails['createTime'] + exports.TOKEN_EXPIRATION_MILLIS) {
-                                return [2 /*return*/, tokenDetails['fcmToken']];
+                            if (now < tokenDetails.createTime + exports.TOKEN_EXPIRATION_MILLIS) {
+                                return [2 /*return*/, tokenDetails.fcmToken];
                             }
@@ -116,7 +114,11 @@ else {
                         // If the token is no longer valid (for example if the VAPID details
-                        // have changed), delete the existing token, and create a new one.
-                        return [4 /*yield*/, this.deleteToken(tokenDetails['fcmToken'])];
+                        // have changed), delete the existing token from the FCM client and server
+                        // database. No need to unsubscribe from the Service Worker as we have a
+                        // good push subscription that we'd like to use in getNewToken.
+                        return [4 /*yield*/, this.deleteTokenFromDB(tokenDetails.fcmToken)];
                     case 1:
                         // If the token is no longer valid (for example if the VAPID details
-                        // have changed), delete the existing token, and create a new one.
+                        // have changed), delete the existing token from the FCM client and server
+                        // database. No need to unsubscribe from the Service Worker as we have a
+                        // good push subscription that we'd like to use in getNewToken.
                         _a.sent();
@@ -128,17 +130,2 @@ return [2 /*return*/, this.getNewToken(swReg, pushSubscription, publicVapidKey)];
     };
-    /*
-     * Checks if the tokenDetails match the details provided in the clients.
-     */
-    ControllerInterface.prototype.isTokenStillValid = function (pushSubscription, publicVapidKey, tokenDetails) {
-        if (array_buffer_to_base64_1.default(publicVapidKey) !== tokenDetails['vapidKey']) {
-            return false;
-        }
-        // getKey() isn't defined in the PushSubscription externs file, hence
-        // subscription['getKey']('<key name>').
-        return (pushSubscription.endpoint === tokenDetails['endpoint'] &&
-            array_buffer_to_base64_1.default(pushSubscription['getKey']('auth')) ===
-                tokenDetails['auth'] &&
-            array_buffer_to_base64_1.default(pushSubscription['getKey']('p256dh')) ===
-                tokenDetails['p256dh']);
-    };
     ControllerInterface.prototype.updateToken = function (swReg, pushSubscription, publicVapidKey, tokenDetails) {
@@ -151,3 +138,3 @@ return tslib_1.__awaiter(this, void 0, void 0, function () {
                         _a.trys.push([0, 4, , 6]);
-                        return [4 /*yield*/, this.iidModel_.updateToken(this.messagingSenderId_, tokenDetails['fcmToken'], tokenDetails['fcmPushSet'], pushSubscription, publicVapidKey)];
+                        return [4 /*yield*/, this.iidModel_.updateToken(this.messagingSenderId_, tokenDetails.fcmToken, tokenDetails.fcmPushSet, pushSubscription, publicVapidKey)];
                     case 1:
@@ -161,3 +148,3 @@ updatedToken = _a.sent();
                             fcmToken: updatedToken,
-                            fcmPushSet: tokenDetails['fcmPushSet']
+                            fcmPushSet: tokenDetails.fcmPushSet
                         };
@@ -173,3 +160,3 @@ return [4 /*yield*/, this.tokenDetailsModel_.saveTokenDetails(allDetails)];
                         e_1 = _a.sent();
-                        return [4 /*yield*/, this.deleteToken(tokenDetails['fcmToken'])];
+                        return [4 /*yield*/, this.deleteToken(tokenDetails.fcmToken)];
                     case 5:
@@ -196,4 +183,4 @@ _a.sent();
                             fcmSenderId: this.messagingSenderId_,
-                            fcmToken: tokenDetails['token'],
-                            fcmPushSet: tokenDetails['pushSet']
+                            fcmToken: tokenDetails.token,
+                            fcmPushSet: tokenDetails.pushSet
                         };
@@ -206,3 +193,3 @@ return [4 /*yield*/, this.tokenDetailsModel_.saveTokenDetails(allDetails)];
                         _a.sent();
-                        return [2 /*return*/, tokenDetails['token']];
+                        return [2 /*return*/, tokenDetails.token];
                 }
@@ -220,18 +207,47 @@ });
     ControllerInterface.prototype.deleteToken = function (token) {
-        var _this = this;
-        return this.tokenDetailsModel_
-            .deleteToken(token)
-            .then(function (details) {
-            return _this.iidModel_.deleteToken(details['fcmSenderId'], details['fcmToken'], details['fcmPushSet']);
-        })
-            .then(function () {
-            return _this.getSWRegistration_()
-                .then(function (registration) {
-                if (registration) {
-                    return registration.pushManager.getSubscription();
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var registration, pushSubscription;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: 
+                    // Delete the token details from the database.
+                    return [4 /*yield*/, this.deleteTokenFromDB(token)];
+                    case 1:
+                        // Delete the token details from the database.
+                        _a.sent();
+                        return [4 /*yield*/, this.getSWRegistration_()];
+                    case 2:
+                        registration = _a.sent();
+                        if (!registration) return [3 /*break*/, 4];
+                        return [4 /*yield*/, registration.pushManager.getSubscription()];
+                    case 3:
+                        pushSubscription = _a.sent();
+                        if (pushSubscription) {
+                            return [2 /*return*/, pushSubscription.unsubscribe()];
+                        }
+                        _a.label = 4;
+                    case 4: 
+                    // If there's no SW, consider it a success.
+                    return [2 /*return*/, true];
                 }
-            })
-                .then(function (subscription) {
-                if (subscription) {
-                    return subscription.unsubscribe();
+            });
+        });
+    };
+    /**
+     * This method will delete the token from the client database, and make a
+     * call to FCM to remove it from the server DB. Does not temper with the
+     * push subscription.
+     */
+    ControllerInterface.prototype.deleteTokenFromDB = function (token) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var details;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.tokenDetailsModel_.deleteToken(token)];
+                    case 1:
+                        details = _a.sent();
+                        return [4 /*yield*/, this.iidModel_.deleteToken(details.fcmSenderId, details.fcmToken, details.fcmPushSet)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/];
                 }
@@ -241,14 +257,2 @@ });
     };
-    ControllerInterface.prototype.getSWRegistration_ = function () {
-        throw this.errorFactory_.create(errors_1.default.codes.SHOULD_BE_INHERITED);
-    };
-    ControllerInterface.prototype.getPublicVapidKey_ = function () {
-        throw this.errorFactory_.create(errors_1.default.codes.SHOULD_BE_INHERITED);
-    };
-    //
-    // The following methods should only be available in the window.
-    //
-    ControllerInterface.prototype.requestPermission = function () {
-        throw this.errorFactory_.create(errors_1.default.codes.AVAILABLE_IN_WINDOW);
-    };
     /**
@@ -268,38 +272,19 @@ * Gets a PushSubscription for the current user.
     };
-    /**
-     * @export
-     * @param {!ServiceWorkerRegistration} registration
-     */
+    //
+    // The following methods should only be available in the window.
+    //
+    ControllerInterface.prototype.requestPermission = function () {
+        throw this.errorFactory_.create(errors_1.ERROR_CODES.AVAILABLE_IN_WINDOW);
+    };
     ControllerInterface.prototype.useServiceWorker = function (registration) {
-        throw this.errorFactory_.create(errors_1.default.codes.AVAILABLE_IN_WINDOW);
+        throw this.errorFactory_.create(errors_1.ERROR_CODES.AVAILABLE_IN_WINDOW);
     };
-    /**
-     * @export
-     * @param {!string} b64PublicKey
-     */
     ControllerInterface.prototype.usePublicVapidKey = function (b64PublicKey) {
-        throw this.errorFactory_.create(errors_1.default.codes.AVAILABLE_IN_WINDOW);
+        throw this.errorFactory_.create(errors_1.ERROR_CODES.AVAILABLE_IN_WINDOW);
     };
-    /**
-     * @export
-     * @param {!firebase.Observer|function(*)} nextOrObserver
-     * @param {function(!Error)=} optError
-     * @param {function()=} optCompleted
-     * @return {!function()}
-     */
-    ControllerInterface.prototype.onMessage = function (nextOrObserver, optError, optCompleted) {
-        throw this.errorFactory_.create(errors_1.default.codes.AVAILABLE_IN_WINDOW);
+    ControllerInterface.prototype.onMessage = function (nextOrObserver, error, completed) {
+        throw this.errorFactory_.create(errors_1.ERROR_CODES.AVAILABLE_IN_WINDOW);
     };
-    /**
-     * @export
-     * @param {!firebase.Observer|function()} nextOrObserver An observer object
-     * or a function triggered on token refresh.
-     * @param {function(!Error)=} optError Optional A function
-     * triggered on token refresh error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
-     */
-    ControllerInterface.prototype.onTokenRefresh = function (nextOrObserver, optError, optCompleted) {
-        throw this.errorFactory_.create(errors_1.default.codes.AVAILABLE_IN_WINDOW);
+    ControllerInterface.prototype.onTokenRefresh = function (nextOrObserver, error, completed) {
+        throw this.errorFactory_.create(errors_1.ERROR_CODES.AVAILABLE_IN_WINDOW);
     };
@@ -309,8 +294,4 @@ //
     //
-    /**
-     * @export
-     * @param {function(Object)} callback
-     */
     ControllerInterface.prototype.setBackgroundMessageHandler = function (callback) {
-        throw this.errorFactory_.create(errors_1.default.codes.AVAILABLE_IN_SW);
+        throw this.errorFactory_.create(errors_1.ERROR_CODES.AVAILABLE_IN_SW);
     };
@@ -347,3 +328,2 @@ //
      * @protected
-     * @returns {IIDModel}
      */
@@ -355,4 +335,19 @@ ControllerInterface.prototype.getIIDModel = function () {
 }());
-exports.default = ControllerInterface;
+exports.ControllerInterface = ControllerInterface;
+/**
+ * Checks if the tokenDetails match the details provided in the clients.
+ */
+function isTokenStillValid(pushSubscription, publicVapidKey, tokenDetails) {
+    if (array_buffer_to_base64_1.arrayBufferToBase64(publicVapidKey) !== tokenDetails.vapidKey) {
+        return false;
+    }
+    // getKey() isn't defined in the PushSubscription externs file, hence
+    // subscription.getKey('<key name>').
+    return (pushSubscription.endpoint === tokenDetails.endpoint &&
+        array_buffer_to_base64_1.arrayBufferToBase64(pushSubscription.getKey('auth')) ===
+            tokenDetails.auth &&
+        array_buffer_to_base64_1.arrayBufferToBase64(pushSubscription.getKey('p256dh')) ===
+            tokenDetails.p256dh);
+}
 
 //# sourceMappingURL=controller-interface.js.map

dist/cjs/src/controllers/sw-controller.d.ts

@@ -1,5 +0,22 @@
-import ControllerInterface from './controller-interface';
-export default class SWController extends ControllerInterface {
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { FirebaseApp } from '@firebase/app-types';
+import { ControllerInterface } from './controller-interface';
+export declare type BgMessageHandler = (input: any) => Promise<any>;
+export declare class SWController extends ControllerInterface {
     private bgMessageHandler_;
-    constructor(app: any);
+    constructor(app: FirebaseApp);
     /**
@@ -16,20 +33,8 @@ * A handler for push events that shows notifications based on the content of
      * shown.
-     * @private
      */
     onPush_(event: any): void;
-    /**
-     * @private
-     */
     onSubChange_(event: any): void;
-    /**
-     * @private
-     */
     onNotificationClick_(event: any): void;
+    getNotificationData_(msgPayload: any): NotificationOptions | undefined;
     /**
-     * @private
-     * @param {Object} msgPayload
-     * @return {NotificationOptions|undefined}
-     */
-    getNotificationData_(msgPayload: any): any;
-    /**
      * Calling setBackgroundMessageHandler will opt in to some specific
@@ -44,46 +49,38 @@ * behaviours.
      * developer can handle them in a their own 'push' event callback
-     * @export
-     * @param {function(Object)} callback The callback to be called when a push
-     * message is received and a notification must be shown. The callback will
-     * be given the data from the push message.
+     *
+     * @param callback The callback to be called when a push message is received
+     * and a notification must be shown. The callback will be given the data from
+     * the push message.
      */
-    setBackgroundMessageHandler(callback: any): void;
+    setBackgroundMessageHandler(callback: BgMessageHandler): void;
     /**
-     * @private
-     * @param {string} url The URL to look for when focusing a client.
-     * @return {Object} Returns an existing window client or a newly opened
-     * WindowClient.
+     * @param url The URL to look for when focusing a client.
+     * @return Returns an existing window client or a newly opened WindowClient.
      */
-    getWindowClient_(url: any): any;
+    getWindowClient_(url: string): Promise<any>;
     /**
      * This message will attempt to send the message to a window client.
-     * @private
-     * @param {Object} client The WindowClient to send the message to.
-     * @param {Object} message The message to send to the client.
-     * @returns {Promise} Returns a promise that resolves after sending the
-     * message. This does not guarantee that the message was successfully
-     * received.
+     * @param client The WindowClient to send the message to.
+     * @param message The message to send to the client.
+     * @returns Returns a promise that resolves after sending the message. This
+     * does not guarantee that the message was successfully received.
      */
-    attemptToMessageClient_(client: any, message: any): Promise<never>;
+    attemptToMessageClient_(client: any, message: any): Promise<void>;
     /**
-     * @private
-     * @returns {Promise<boolean>} If there is currently a visible WindowClient,
-     * this method will resolve to true, otherwise false.
+     * @returns If there is currently a visible WindowClient, this method will
+     * resolve to true, otherwise false.
      */
-    hasVisibleClients_(): any;
+    hasVisibleClients_(): Promise<boolean>;
     /**
-     * @private
-     * @param {Object} msgPayload The data from the push event that should be sent
-     * to all available pages.
-     * @returns {Promise} Returns a promise that resolves once the message
-     * has been sent to all WindowClients.
+     * @param msgPayload The data from the push event that should be sent to all
+     * available pages.
+     * @returns Returns a promise that resolves once the message has been sent to
+     * all WindowClients.
      */
-    sendMessageToWindowClients_(msgPayload: any): any;
+    sendMessageToWindowClients_(msgPayload: any): Promise<void>;
     /**
      * This will register the default service worker and return the registration.
-     * @private
-     * @return {Promise<!ServiceWorkerRegistration>} The service worker
-     * registration to be used for the push service.
+     * @return he service worker registration to be used for the push service.
      */
-    getSWRegistration_(): Promise<any>;
+    getSWRegistration_(): Promise<ServiceWorkerRegistration>;
     /**
@@ -90,0 +87,0 @@ * This will return the default VAPID key or the uint8array version of the

dist/cjs/src/controllers/sw-controller.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,9 +17,8 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var controller_interface_1 = require("./controller-interface");
 var errors_1 = require("../models/errors");
 var fcm_details_1 = require("../models/fcm-details");
-var worker_page_message_1 = require("../models/worker-page-message");
+var WorkerPageMessage = require("../models/worker-page-message");
+var controller_interface_1 = require("./controller-interface");
 var FCM_MSG = 'FCM_MSG';
@@ -29,10 +29,12 @@ var SWController = /** @class */ (function (_super) {
         var _this = _super.call(this, app) || this;
-        self.addEventListener('push', function (e) { return _this.onPush_(e); }, false);
-        self.addEventListener('pushsubscriptionchange', function (e) { return _this.onSubChange_(e); }, false);
-        self.addEventListener('notificationclick', function (e) { return _this.onNotificationClick_(e); }, false);
-        /**
-         * @private
-         * @type {function(Object)|null}
-         */
         _this.bgMessageHandler_ = null;
+        self.addEventListener('push', function (e) {
+            _this.onPush_(e);
+        }, false);
+        self.addEventListener('pushsubscriptionchange', function (e) {
+            _this.onSubChange_(e);
+        }, false);
+        self.addEventListener('notificationclick', function (e) {
+            _this.onNotificationClick_(e);
+        }, false);
         return _this;
@@ -51,4 +53,5 @@ }
      * shown.
-     * @private
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.onPush_ = function (event) {
@@ -86,5 +89,4 @@ var _this = this;
     };
-    /**
-     * @private
-     */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.onSubChange_ = function (event) {
@@ -120,3 +122,3 @@ var _this = this;
             .catch(function (err) {
-            throw _this.errorFactory_.create(errors_1.default.codes.UNABLE_TO_RESUBSCRIBE, {
+            throw _this.errorFactory_.create(errors_1.ERROR_CODES.UNABLE_TO_RESUBSCRIBE, {
                 message: err
@@ -127,5 +129,4 @@ });
     };
-    /**
-     * @private
-     */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.onNotificationClick_ = function (event) {
@@ -168,3 +169,3 @@ var _this = this;
             delete msgPayload['notification'];
-            var internalMsg = worker_page_message_1.default.createNewMsg(worker_page_message_1.default.TYPES_OF_MSG.NOTIFICATION_CLICKED, msgPayload);
+            var internalMsg = WorkerPageMessage.createNewMsg(WorkerPageMessage.TYPES_OF_MSG.NOTIFICATION_CLICKED, msgPayload);
             // Attempt to send a message to the client to handle the data
@@ -176,7 +177,4 @@ // Is affected by: https://github.com/slightlyoff/ServiceWorker/issues/728
     };
-    /**
-     * @private
-     * @param {Object} msgPayload
-     * @return {NotificationOptions|undefined}
-     */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.getNotificationData_ = function (msgPayload) {
@@ -189,3 +187,3 @@ if (!msgPayload) {
         }
-        var notificationInformation = Object.assign({}, msgPayload.notification);
+        var notificationInformation = tslib_1.__assign({}, msgPayload.notification);
         // Put the message payload under FCM_MSG name so we can identify the
@@ -211,10 +209,10 @@ // notification as being an FCM notification vs a notification from
      * developer can handle them in a their own 'push' event callback
-     * @export
-     * @param {function(Object)} callback The callback to be called when a push
-     * message is received and a notification must be shown. The callback will
-     * be given the data from the push message.
+     *
+     * @param callback The callback to be called when a push message is received
+     * and a notification must be shown. The callback will be given the data from
+     * the push message.
      */
     SWController.prototype.setBackgroundMessageHandler = function (callback) {
         if (!callback || typeof callback !== 'function') {
-            throw this.errorFactory_.create(errors_1.default.codes.BG_HANDLER_FUNCTION_EXPECTED);
+            throw this.errorFactory_.create(errors_1.ERROR_CODES.BG_HANDLER_FUNCTION_EXPECTED);
         }
@@ -224,7 +222,7 @@ this.bgMessageHandler_ = callback;
     /**
-     * @private
-     * @param {string} url The URL to look for when focusing a client.
-     * @return {Object} Returns an existing window client or a newly opened
-     * WindowClient.
+     * @param url The URL to look for when focusing a client.
+     * @return Returns an existing window client or a newly opened WindowClient.
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.getWindowClient_ = function (url) {
@@ -256,9 +254,9 @@ // Use URL to normalize the URL when comparing to windowClients.
      * This message will attempt to send the message to a window client.
-     * @private
-     * @param {Object} client The WindowClient to send the message to.
-     * @param {Object} message The message to send to the client.
-     * @returns {Promise} Returns a promise that resolves after sending the
-     * message. This does not guarantee that the message was successfully
-     * received.
+     * @param client The WindowClient to send the message to.
+     * @param message The message to send to the client.
+     * @returns Returns a promise that resolves after sending the message. This
+     * does not guarantee that the message was successfully received.
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.attemptToMessageClient_ = function (client, message) {
@@ -270,3 +268,3 @@ return tslib_1.__awaiter(this, void 0, void 0, function () {
                 if (!client) {
-                    return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.default.codes.NO_WINDOW_CLIENT_TO_MSG))];
+                    return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.ERROR_CODES.NO_WINDOW_CLIENT_TO_MSG))];
                 }
@@ -279,6 +277,7 @@ client.postMessage(message);
     /**
-     * @private
-     * @returns {Promise<boolean>} If there is currently a visible WindowClient,
-     * this method will resolve to true, otherwise false.
+     * @returns If there is currently a visible WindowClient, this method will
+     * resolve to true, otherwise false.
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.hasVisibleClients_ = function () {
@@ -295,8 +294,9 @@ return self.clients
     /**
-     * @private
-     * @param {Object} msgPayload The data from the push event that should be sent
-     * to all available pages.
-     * @returns {Promise} Returns a promise that resolves once the message
-     * has been sent to all WindowClients.
+     * @param msgPayload The data from the push event that should be sent to all
+     * available pages.
+     * @returns Returns a promise that resolves once the message has been sent to
+     * all WindowClients.
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.sendMessageToWindowClients_ = function (msgPayload) {
@@ -310,3 +310,3 @@ var _this = this;
             .then(function (clientList) {
-            var internalMsg = worker_page_message_1.default.createNewMsg(worker_page_message_1.default.TYPES_OF_MSG.PUSH_MSG_RECEIVED, msgPayload);
+            var internalMsg = WorkerPageMessage.createNewMsg(WorkerPageMessage.TYPES_OF_MSG.PUSH_MSG_RECEIVED, msgPayload);
             return Promise.all(clientList.map(function (client) {
@@ -319,5 +319,3 @@ return _this.attemptToMessageClient_(client, internalMsg);
      * This will register the default service worker and return the registration.
-     * @private
-     * @return {Promise<!ServiceWorkerRegistration>} The service worker
-     * registration to be used for the push service.
+     * @return he service worker registration to be used for the push service.
      */
@@ -332,18 +330,27 @@ SWController.prototype.getSWRegistration_ = function () {
     SWController.prototype.getPublicVapidKey_ = function () {
-        var _this = this;
-        return this.getSWRegistration_()
-            .then(function (swReg) {
-            return _this.getVapidDetailsModel().getVapidFromSWScope(swReg.scope);
-        })
-            .then(function (vapidKeyFromDatabase) {
-            if (vapidKeyFromDatabase === null) {
-                return fcm_details_1.default.DEFAULT_PUBLIC_VAPID_KEY;
-            }
-            return vapidKeyFromDatabase;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var swReg, vapidKeyFromDatabase;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getSWRegistration_()];
+                    case 1:
+                        swReg = _a.sent();
+                        if (!swReg) {
+                            throw this.errorFactory_.create(errors_1.ERROR_CODES.SW_REGISTRATION_EXPECTED);
+                        }
+                        return [4 /*yield*/, this.getVapidDetailsModel().getVapidFromSWScope(swReg.scope)];
+                    case 2:
+                        vapidKeyFromDatabase = _a.sent();
+                        if (vapidKeyFromDatabase == null) {
+                            return [2 /*return*/, fcm_details_1.DEFAULT_PUBLIC_VAPID_KEY];
+                        }
+                        return [2 /*return*/, vapidKeyFromDatabase];
+                }
+            });
         });
     };
     return SWController;
-}(controller_interface_1.default));
-exports.default = SWController;
+}(controller_interface_1.ControllerInterface));
+exports.SWController = SWController;
 
 //# sourceMappingURL=sw-controller.js.map

dist/cjs/src/controllers/window-controller.d.ts

@@ -0,4 +1,21 @@
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { FirebaseApp } from '@firebase/app-types';
 import { FirebaseMessaging } from '@firebase/messaging-types';
-import ControllerInterface from './controller-interface';
-export default class WindowController extends ControllerInterface implements FirebaseMessaging {
+import { NextFn, PartialObserver, Unsubscribe } from '@firebase/util';
+import { ControllerInterface } from './controller-interface';
+export declare class WindowController extends ControllerInterface implements FirebaseMessaging {
     private registrationToUse_;
@@ -8,10 +25,9 @@ private publicVapidKeyToUse_;
     private messageObserver_;
-    private onMessage_;
+    private readonly onMessage_;
     private tokenRefreshObserver_;
-    private onTokenRefresh_;
+    private readonly onTokenRefresh_;
     /**
      * A service that provides a MessagingService instance.
-     * @param {!firebase.app.App} app
      */
-    constructor(app: any);
+    constructor(app: FirebaseApp);
     /**
@@ -22,7 +38,7 @@ * This method returns an FCM token if it can be generated.
      * possible to generate a token.
-     * @export
-     * @return {Promise<string> | Promise<null>} Returns a promise the
-     * resolves to an FCM token or null if permission isn't granted.
+     *
+     * @return Returns a promise that resolves to an FCM token or null if
+     * permission isn't granted.
      */
-    getToken(): any;
+    getToken(): Promise<string | null>;
     /**
@@ -35,62 +51,51 @@ * The method checks that a manifest is defined and has the correct GCM
      */
-    manifestCheck_(): any;
+    manifestCheck_(): Promise<void>;
     /**
      * Request permission if it is not currently granted
-     * @export
-     * @returns {Promise} Resolves if the permission was granted, otherwise
-     * rejects
+     *
+     * @return Resolves if the permission was granted, otherwise rejects
      */
-    requestPermission(): Promise<{}>;
+    requestPermission(): Promise<void>;
     /**
      * This method allows a developer to override the default service worker and
      * instead use a custom service worker.
-     * @export
-     * @param {!ServiceWorkerRegistration} registration The service worker
-     * registration that should be used to receive the push messages.
+     *
+     * @param registration The service worker registration that should be used to
+     * receive the push messages.
      */
-    useServiceWorker(registration: any): void;
+    useServiceWorker(registration: ServiceWorkerRegistration): void;
     /**
      * This method allows a developer to override the default vapid key
      * and instead use a custom VAPID public key.
-     * @export
-     * @param {!string} publicKey A URL safe base64 encoded string.
+     *
+     * @param publicKey A URL safe base64 encoded string.
      */
-    usePublicVapidKey(publicKey: any): void;
+    usePublicVapidKey(publicKey: string): void;
     /**
      * @export
-     * @param {!firebase.Observer|function(*)} nextOrObserver An observer object
-     * or a function triggered on message.
-     * @param {function(!Error)=} optError Optional A function triggered on
-     * message error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
+     * @param nextOrObserver An observer object or a function triggered on
+     * message.
+     * @param error A function triggered on message error.
+     * @param completed function triggered when the observer is removed.
+     * @return The unsubscribe function for the observer.
      */
-    onMessage(nextOrObserver: any, optError?: any, optCompleted?: any): () => void;
+    onMessage(nextOrObserver: NextFn<{}> | PartialObserver<{}>, error?: (e: Error) => void, completed?: () => void): Unsubscribe;
     /**
-     * @export
-     * @param {!firebase.Observer|function()} nextOrObserver An observer object
-     * or a function triggered on token refresh.
-     * @param {function(!Error)=} optError Optional A function
-     * triggered on token refresh error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
+     * @param nextOrObserver An observer object or a function triggered on token
+     * refresh.
+     * @param error A function triggered on token refresh error.
+     * @param completed function triggered when the observer is removed.
+     * @return The unsubscribe function for the observer.
      */
-    onTokenRefresh(nextOrObserver: any, optError: any, optCompleted: any): () => void;
+    onTokenRefresh(nextOrObserver: NextFn<{}> | PartialObserver<{}>, error?: (e: Error) => void, completed?: () => void): Unsubscribe;
     /**
      * Given a registration, wait for the service worker it relates to
      * become activer
-     * @private
-     * @param  {ServiceWorkerRegistration} registration Registration to wait
-     * for service worker to become active
-     * @return {Promise<!ServiceWorkerRegistration>} Wait for service worker
-     * registration to become active
+     * @param registration Registration to wait for service worker to become active
+     * @return Wait for service worker registration to become active
      */
-    waitForRegistrationToActivate_(registration: any): Promise<ServiceWorkerRegistration>;
+    waitForRegistrationToActivate_(registration: ServiceWorkerRegistration): Promise<ServiceWorkerRegistration>;
     /**
-     * This will regiater the default service worker and return the registration
-     * @private
-     * @return {Promise<!ServiceWorkerRegistration>} The service worker
-     * registration to be used for the push service.
+     * This will register the default service worker and return the registration
+     * @return The service worker registration to be used for the push service.
      */
@@ -101,3 +106,2 @@ getSWRegistration_(): Promise<ServiceWorkerRegistration>;
      * provided by the developer.
-     * @private
      */
@@ -109,4 +113,2 @@ getPublicVapidKey_(): Promise<Uint8Array>;
      * events in the page.
-     *
-     * @private
      */
@@ -116,6 +118,5 @@ setupSWMessageListener_(): void;
      * Checks to see if the required API's are valid or not.
-     * @private
-     * @return {boolean} Returns true if the desired APIs are available.
+     * @return Returns true if the desired APIs are available.
      */
     isSupported_(): boolean;
 }

dist/cjs/src/controllers/window-controller.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,13 +17,11 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var controller_interface_1 = require("./controller-interface");
+var util_1 = require("@firebase/util");
+var base64_to_array_buffer_1 = require("../helpers/base64-to-array-buffer");
+var default_sw_1 = require("../models/default-sw");
 var errors_1 = require("../models/errors");
-var worker_page_message_1 = require("../models/worker-page-message");
-var default_sw_1 = require("../models/default-sw");
-var notification_permission_1 = require("../models/notification-permission");
 var fcm_details_1 = require("../models/fcm-details");
-var base64_to_array_buffer_1 = require("../helpers/base64-to-array-buffer");
-var util_1 = require("@firebase/util");
+var WorkerPageMessage = require("../models/worker-page-message");
+var controller_interface_1 = require("./controller-interface");
 var WindowController = /** @class */ (function (_super) {
@@ -32,6 +31,8 @@ tslib_1.__extends(WindowController, _super);
      * A service that provides a MessagingService instance.
-     * @param {!firebase.app.App} app
      */
     function WindowController(app) {
         var _this = _super.call(this, app) || this;
+        _this.registrationToUse_ = null;
+        _this.publicVapidKeyToUse_ = null;
+        _this.manifestCheckPromise_ = null;
         _this.messageObserver_ = null;
@@ -45,32 +46,2 @@ _this.onMessage_ = util_1.createSubscribe(function (observer) {
         });
-        /**
-         * @private
-         * @type {ServiceWorkerRegistration}
-         */
-        _this.registrationToUse_;
-        /**
-         * @private
-         * @type {Promise}
-         */
-        _this.manifestCheckPromise_;
-        /**
-         * @private
-         * @type {firebase.Observer}
-         */
-        _this.messageObserver_ = null;
-        /**
-         * @private {!firebase.Subscribe} The subscribe function to the onMessage
-         * observer.
-         */
-        _this.onMessage_ = util_1.createSubscribe(function (observer) {
-            _this.messageObserver_ = observer;
-        });
-        /**
-         * @private
-         * @type {firebase.Observer}
-         */
-        _this.tokenRefreshObserver_ = null;
-        _this.onTokenRefresh_ = util_1.createSubscribe(function (observer) {
-            _this.tokenRefreshObserver_ = observer;
-        });
         _this.setupSWMessageListener_();
@@ -84,5 +55,5 @@ return _this;
      * possible to generate a token.
-     * @export
-     * @return {Promise<string> | Promise<null>} Returns a promise the
-     * resolves to an FCM token or null if permission isn't granted.
+     *
+     * @return Returns a promise that resolves to an FCM token or null if
+     * permission isn't granted.
      */
@@ -93,3 +64,3 @@ WindowController.prototype.getToken = function () {
         if (!this.isSupported_()) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.UNSUPPORTED_BROWSER));
+            return Promise.reject(this.errorFactory_.create(errors_1.ERROR_CODES.UNSUPPORTED_BROWSER));
         }
@@ -133,3 +104,3 @@ return this.manifestCheck_().then(function () {
                 if (manifestContent['gcm_sender_id'] !== '103953800507') {
-                    throw _this.errorFactory_.create(errors_1.default.codes.INCORRECT_GCM_SENDER_ID);
+                    throw _this.errorFactory_.create(errors_1.ERROR_CODES.INCORRECT_GCM_SENDER_ID);
                 }
@@ -142,5 +113,4 @@ });
      * Request permission if it is not currently granted
-     * @export
-     * @returns {Promise} Resolves if the permission was granted, otherwise
-     * rejects
+     *
+     * @return Resolves if the permission was granted, otherwise rejects
      */
@@ -151,3 +121,3 @@ WindowController.prototype.requestPermission = function () {
             return tslib_1.__generator(this, function (_a) {
-                if (Notification.permission === notification_permission_1.default.granted) {
+                if (Notification.permission === 'granted') {
                     return [2 /*return*/];
@@ -157,10 +127,10 @@ }
                         var managePermissionResult = function (result) {
-                            if (result === notification_permission_1.default.granted) {
+                            if (result === 'granted') {
                                 return resolve();
                             }
-                            else if (result === notification_permission_1.default.denied) {
-                                return reject(_this.errorFactory_.create(errors_1.default.codes.PERMISSION_BLOCKED));
+                            else if (result === 'denied') {
+                                return reject(_this.errorFactory_.create(errors_1.ERROR_CODES.PERMISSION_BLOCKED));
                             }
                             else {
-                                return reject(_this.errorFactory_.create(errors_1.default.codes.PERMISSION_DEFAULT));
+                                return reject(_this.errorFactory_.create(errors_1.ERROR_CODES.PERMISSION_DEFAULT));
                             }
@@ -183,12 +153,12 @@ };
      * instead use a custom service worker.
-     * @export
-     * @param {!ServiceWorkerRegistration} registration The service worker
-     * registration that should be used to receive the push messages.
+     *
+     * @param registration The service worker registration that should be used to
+     * receive the push messages.
      */
     WindowController.prototype.useServiceWorker = function (registration) {
         if (!(registration instanceof ServiceWorkerRegistration)) {
-            throw this.errorFactory_.create(errors_1.default.codes.SW_REGISTRATION_EXPECTED);
+            throw this.errorFactory_.create(errors_1.ERROR_CODES.SW_REGISTRATION_EXPECTED);
         }
-        if (typeof this.registrationToUse_ !== 'undefined') {
-            throw this.errorFactory_.create(errors_1.default.codes.USE_SW_BEFORE_GET_TOKEN);
+        if (this.registrationToUse_ != null) {
+            throw this.errorFactory_.create(errors_1.ERROR_CODES.USE_SW_BEFORE_GET_TOKEN);
         }
@@ -200,15 +170,15 @@ this.registrationToUse_ = registration;
      * and instead use a custom VAPID public key.
-     * @export
-     * @param {!string} publicKey A URL safe base64 encoded string.
+     *
+     * @param publicKey A URL safe base64 encoded string.
      */
     WindowController.prototype.usePublicVapidKey = function (publicKey) {
         if (typeof publicKey !== 'string') {
-            throw this.errorFactory_.create(errors_1.default.codes.INVALID_PUBLIC_VAPID_KEY);
+            throw this.errorFactory_.create(errors_1.ERROR_CODES.INVALID_PUBLIC_VAPID_KEY);
         }
-        if (typeof this.publicVapidKeyToUse_ !== 'undefined') {
-            throw this.errorFactory_.create(errors_1.default.codes.USE_PUBLIC_KEY_BEFORE_GET_TOKEN);
+        if (this.publicVapidKeyToUse_ != null) {
+            throw this.errorFactory_.create(errors_1.ERROR_CODES.USE_PUBLIC_KEY_BEFORE_GET_TOKEN);
         }
-        var parsedKey = base64_to_array_buffer_1.default(publicKey);
+        var parsedKey = base64_to_array_buffer_1.base64ToArrayBuffer(publicKey);
         if (parsedKey.length !== 65) {
-            throw this.errorFactory_.create(errors_1.default.codes.PUBLIC_KEY_DECRYPTION_FAILED);
+            throw this.errorFactory_.create(errors_1.ERROR_CODES.PUBLIC_KEY_DECRYPTION_FAILED);
         }
@@ -219,25 +189,30 @@ this.publicVapidKeyToUse_ = parsedKey;
      * @export
-     * @param {!firebase.Observer|function(*)} nextOrObserver An observer object
-     * or a function triggered on message.
-     * @param {function(!Error)=} optError Optional A function triggered on
-     * message error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
+     * @param nextOrObserver An observer object or a function triggered on
+     * message.
+     * @param error A function triggered on message error.
+     * @param completed function triggered when the observer is removed.
+     * @return The unsubscribe function for the observer.
      */
-    WindowController.prototype.onMessage = function (nextOrObserver, optError, optCompleted) {
-        return this.onMessage_(nextOrObserver, optError, optCompleted);
+    WindowController.prototype.onMessage = function (nextOrObserver, error, completed) {
+        if (typeof nextOrObserver === 'function') {
+            return this.onMessage_(nextOrObserver, error, completed);
+        }
+        else {
+            return this.onMessage_(nextOrObserver);
+        }
     };
     /**
-     * @export
-     * @param {!firebase.Observer|function()} nextOrObserver An observer object
-     * or a function triggered on token refresh.
-     * @param {function(!Error)=} optError Optional A function
-     * triggered on token refresh error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
+     * @param nextOrObserver An observer object or a function triggered on token
+     * refresh.
+     * @param error A function triggered on token refresh error.
+     * @param completed function triggered when the observer is removed.
+     * @return The unsubscribe function for the observer.
      */
-    WindowController.prototype.onTokenRefresh = function (nextOrObserver, optError, optCompleted) {
-        return this.onTokenRefresh_(nextOrObserver, optError, optCompleted);
+    WindowController.prototype.onTokenRefresh = function (nextOrObserver, error, completed) {
+        if (typeof nextOrObserver === 'function') {
+            return this.onTokenRefresh_(nextOrObserver, error, completed);
+        }
+        else {
+            return this.onTokenRefresh_(nextOrObserver);
+        }
     };
@@ -247,8 +222,7 @@ /**
      * become activer
-     * @private
-     * @param  {ServiceWorkerRegistration} registration Registration to wait
-     * for service worker to become active
-     * @return {Promise<!ServiceWorkerRegistration>} Wait for service worker
-     * registration to become active
+     * @param registration Registration to wait for service worker to become active
+     * @return Wait for service worker registration to become active
      */
+    // Visible for testing
+    // TODO: Make private
     WindowController.prototype.waitForRegistrationToActivate_ = function (registration) {
@@ -260,3 +234,3 @@ var _this = this;
                 // This is a rare scenario but has occured in firefox
-                reject(_this.errorFactory_.create(errors_1.default.codes.NO_SW_IN_REG));
+                reject(_this.errorFactory_.create(errors_1.ERROR_CODES.NO_SW_IN_REG));
                 return;
@@ -271,3 +245,3 @@ }
             if (serviceWorker.state === 'redundant') {
-                reject(_this.errorFactory_.create(errors_1.default.codes.SW_REG_REDUNDANT));
+                reject(_this.errorFactory_.create(errors_1.ERROR_CODES.SW_REG_REDUNDANT));
                 return;
@@ -280,3 +254,3 @@ }
                 else if (serviceWorker.state === 'redundant') {
-                    reject(_this.errorFactory_.create(errors_1.default.codes.SW_REG_REDUNDANT));
+                    reject(_this.errorFactory_.create(errors_1.ERROR_CODES.SW_REG_REDUNDANT));
                 }
@@ -293,6 +267,4 @@ else {
     /**
-     * This will regiater the default service worker and return the registration
-     * @private
-     * @return {Promise<!ServiceWorkerRegistration>} The service worker
-     * registration to be used for the push service.
+     * This will register the default service worker and return the registration
+     * @return The service worker registration to be used for the push service.
      */
@@ -308,7 +280,7 @@ WindowController.prototype.getSWRegistration_ = function () {
         return navigator.serviceWorker
-            .register(default_sw_1.default.path, {
-            scope: default_sw_1.default.scope
+            .register(default_sw_1.DEFAULT_SW_PATH, {
+            scope: default_sw_1.DEFAULT_SW_SCOPE
         })
             .catch(function (err) {
-            throw _this.errorFactory_.create(errors_1.default.codes.FAILED_DEFAULT_REGISTRATION, {
+            throw _this.errorFactory_.create(errors_1.ERROR_CODES.FAILED_DEFAULT_REGISTRATION, {
                 browserErrorMessage: err.message
@@ -331,3 +303,2 @@ });
      * provided by the developer.
-     * @private
      */
@@ -338,3 +309,3 @@ WindowController.prototype.getPublicVapidKey_ = function () {
         }
-        return Promise.resolve(fcm_details_1.default.DEFAULT_PUBLIC_VAPID_KEY);
+        return Promise.resolve(fcm_details_1.DEFAULT_PUBLIC_VAPID_KEY);
     };
@@ -345,5 +316,5 @@ /**
      * events in the page.
-     *
-     * @private
      */
+    // Visible for testing
+    // TODO: Make private
     WindowController.prototype.setupSWMessageListener_ = function () {
@@ -355,3 +326,3 @@ var _this = this;
         navigator.serviceWorker.addEventListener('message', function (event) {
-            if (!event.data || !event.data[worker_page_message_1.default.PARAMS.TYPE_OF_MSG]) {
+            if (!event.data || !event.data[WorkerPageMessage.PARAMS.TYPE_OF_MSG]) {
                 // Not a message from FCM
@@ -361,6 +332,6 @@ return;
             var workerPageMessage = event.data;
-            switch (workerPageMessage[worker_page_message_1.default.PARAMS.TYPE_OF_MSG]) {
-                case worker_page_message_1.default.TYPES_OF_MSG.PUSH_MSG_RECEIVED:
-                case worker_page_message_1.default.TYPES_OF_MSG.NOTIFICATION_CLICKED:
-                    var pushMessage = workerPageMessage[worker_page_message_1.default.PARAMS.DATA];
+            switch (workerPageMessage[WorkerPageMessage.PARAMS.TYPE_OF_MSG]) {
+                case WorkerPageMessage.TYPES_OF_MSG.PUSH_MSG_RECEIVED:
+                case WorkerPageMessage.TYPES_OF_MSG.NOTIFICATION_CLICKED:
+                    var pushMessage = workerPageMessage[WorkerPageMessage.PARAMS.DATA];
                     if (_this.messageObserver_) {
@@ -378,5 +349,6 @@ _this.messageObserver_.next(pushMessage);
      * Checks to see if the required API's are valid or not.
-     * @private
-     * @return {boolean} Returns true if the desired APIs are available.
+     * @return Returns true if the desired APIs are available.
      */
+    // Visible for testing
+    // TODO: Make private
     WindowController.prototype.isSupported_ = function () {
@@ -391,5 +363,5 @@ return ('serviceWorker' in navigator &&
     return WindowController;
-}(controller_interface_1.default));
-exports.default = WindowController;
+}(controller_interface_1.ControllerInterface));
+exports.WindowController = WindowController;
 
 //# sourceMappingURL=window-controller.js.map

dist/cjs/src/helpers/array-buffer-to-base64.d.ts

@@ -1,2 +0,1 @@
-declare const _default: (arrayBuffer: any) => string;
-export default _default;
+export declare function arrayBufferToBase64(arrayBuffer: ArrayBuffer | Uint8Array): string;

dist/cjs/src/helpers/array-buffer-to-base64.js

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
@@ -18,7 +17,8 @@ * Copyright 2017 Google Inc.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
 function toBase64(arrayBuffer) {
     var uint8Version = new Uint8Array(arrayBuffer);
-    return window.btoa(String.fromCharCode.apply(null, uint8Version));
+    return btoa(String.fromCharCode.apply(null, uint8Version));
 }
-exports.default = (function (arrayBuffer) {
+function arrayBufferToBase64(arrayBuffer) {
     var base64String = toBase64(arrayBuffer);
@@ -29,4 +29,5 @@ return base64String
         .replace(/\//g, '_');
-});
+}
+exports.arrayBufferToBase64 = arrayBufferToBase64;
 
 //# sourceMappingURL=array-buffer-to-base64.js.map

dist/cjs/src/helpers/base64-to-array-buffer.d.ts

@@ -1,2 +0,16 @@
-declare const _default: (base64String: any) => Uint8Array;
-export default _default;
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare function base64ToArrayBuffer(base64String: string): Uint8Array;

dist/cjs/src/helpers/base64-to-array-buffer.js

@@ -18,3 +18,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (function (base64String) {
+function base64ToArrayBuffer(base64String) {
     var padding = '='.repeat((4 - base64String.length % 4) % 4);
@@ -30,4 +30,5 @@ var base64 = (base64String + padding)
     return outputArray;
-});
+}
+exports.base64ToArrayBuffer = base64ToArrayBuffer;
 
 //# sourceMappingURL=base64-to-array-buffer.js.map

dist/cjs/src/models/clean-v1-undefined.d.ts

@@ -1,2 +0,1 @@
-declare function cleanV1(): void;
-export { cleanV1 };
+export declare function cleanV1(): void;

dist/cjs/src/models/clean-v1-undefined.js

@@ -40,3 +40,3 @@ "use strict";
     var objectStore = transaction.objectStore(OLD_OBJECT_STORE_NAME);
-    var iidModel = new iid_model_1.default();
+    var iidModel = new iid_model_1.IIDModel();
     var openCursorRequest = objectStore.openCursor();
@@ -43,0 +43,0 @@ openCursorRequest.onerror = function (event) {

dist/cjs/src/models/db-interface.d.ts

@@ -0,29 +1,50 @@
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { ErrorFactory } from '@firebase/util';
-export default class DBInterface {
-    private DB_NAME_;
-    private dbVersion_;
-    private openDbPromise_;
-    protected errorFactory_: ErrorFactory<string>;
-    protected TRANSACTION_READ_WRITE: IDBTransactionMode;
+export declare abstract class DBInterface {
+    private dbPromise;
+    protected readonly abstract dbName: string;
+    protected readonly abstract dbVersion: number;
+    protected readonly abstract objectStoreName: string;
+    protected readonly errorFactory: ErrorFactory<string>;
     /**
-     * @param {string} dbName
-     * @param {number} dbVersion
+     * Database initialization.
+     *
+     * This function should create and update object stores.
      */
-    constructor(dbName: any, dbVersion: any);
+    protected abstract onDbUpgrade(db: IDBDatabase, event: IDBVersionChangeEvent): void;
+    /** Gets record(s) from the objectStore that match the given key. */
+    get<T>(key: IDBValidKey): Promise<T | undefined>;
+    /** Gets record(s) from the objectStore that match the given index. */
+    getIndex<T>(index: string, key: IDBValidKey): Promise<T | undefined>;
+    /** Assigns or overwrites the record for the given value. */
+    put(value: any): Promise<void>;
+    /** Deletes record(s) from the objectStore that match the given key. */
+    delete(key: IDBValidKey | IDBKeyRange): Promise<void>;
     /**
-     * Get the indexedDB as a promsie.
-     * @protected
-     * @return {!Promise<!IDBDatabase>} The IndexedDB database
-     */
-    openDatabase(): Promise<IDBDatabase>;
-    /**
      * Close the currently open database.
-     * @return {!Promise} Returns the result of the promise chain.
      */
     closeDatabase(): Promise<void>;
     /**
-     * @protected
-     * @param {!IDBDatabase} db
+     * Creates an IndexedDB Transaction and passes its objectStore to the
+     * runRequest function, which runs the database request.
+     *
+     * @return Promise that resolves with the result of the runRequest function
      */
-    onDBUpgrade(db: IDBDatabase, event: IDBVersionChangeEvent): void;
+    private createTransaction<T>(runRequest, mode?);
+    /** Gets the cached db connection or opens a new one. */
+    private getDb();
 }

dist/cjs/src/models/db-interface.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,76 +17,119 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
 var util_1 = require("@firebase/util");
 var errors_1 = require("./errors");
 var DBInterface = /** @class */ (function () {
-    /**
-     * @param {string} dbName
-     * @param {number} dbVersion
-     */
-    function DBInterface(dbName, dbVersion) {
-        this.errorFactory_ = new util_1.ErrorFactory('messaging', 'Messaging', errors_1.default.map);
-        this.DB_NAME_ = dbName;
-        this.dbVersion_ = dbVersion;
-        this.openDbPromise_ = null;
-        this.TRANSACTION_READ_WRITE = 'readwrite';
+    function DBInterface() {
+        this.dbPromise = null;
+        this.errorFactory = new util_1.ErrorFactory('messaging', 'Messaging', errors_1.ERROR_MAP);
     }
-    /**
-     * Get the indexedDB as a promsie.
-     * @protected
-     * @return {!Promise<!IDBDatabase>} The IndexedDB database
-     */
-    DBInterface.prototype.openDatabase = function () {
-        var _this = this;
-        if (this.openDbPromise_) {
-            return this.openDbPromise_;
+    /** Gets record(s) from the objectStore that match the given key. */
+    DBInterface.prototype.get = function (key) {
+        return this.createTransaction(function (objectStore) { return objectStore.get(key); });
+    };
+    /** Gets record(s) from the objectStore that match the given index. */
+    DBInterface.prototype.getIndex = function (index, key) {
+        function runRequest(objectStore) {
+            var idbIndex = objectStore.index(index);
+            return idbIndex.get(key);
         }
-        this.openDbPromise_ = new Promise(function (resolve, reject) {
-            var request = indexedDB.open(_this.DB_NAME_, _this.dbVersion_);
-            request.onerror = function (event) {
-                reject(event.target.error);
-            };
-            request.onsuccess = function (event) {
-                resolve(event.target.result);
-            };
-            request.onupgradeneeded = function (event) {
-                try {
-                    var db = event.target.result;
-                    _this.onDBUpgrade(db, event);
-                }
-                catch (err) {
-                    // close the database as it can't be used.
-                    db.close();
-                    reject(err);
-                }
-            };
-        });
-        return this.openDbPromise_;
+        return this.createTransaction(runRequest);
     };
+    /** Assigns or overwrites the record for the given value. */
+    // tslint:disable-next-line:no-any IndexedDB values are of type "any"
+    DBInterface.prototype.put = function (value) {
+        return this.createTransaction(function (objectStore) { return objectStore.put(value); }, 'readwrite');
+    };
+    /** Deletes record(s) from the objectStore that match the given key. */
+    DBInterface.prototype.delete = function (key) {
+        return this.createTransaction(function (objectStore) { return objectStore.delete(key); }, 'readwrite');
+    };
     /**
      * Close the currently open database.
-     * @return {!Promise} Returns the result of the promise chain.
      */
     DBInterface.prototype.closeDatabase = function () {
-        var _this = this;
-        return Promise.resolve().then(function () {
-            if (_this.openDbPromise_) {
-                return _this.openDbPromise_.then(function (db) {
-                    db.close();
-                    _this.openDbPromise_ = null;
-                });
-            }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var db;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.dbPromise) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.dbPromise];
+                    case 1:
+                        db = _a.sent();
+                        db.close();
+                        this.dbPromise = null;
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
         });
     };
     /**
-     * @protected
-     * @param {!IDBDatabase} db
+     * Creates an IndexedDB Transaction and passes its objectStore to the
+     * runRequest function, which runs the database request.
+     *
+     * @return Promise that resolves with the result of the runRequest function
      */
-    DBInterface.prototype.onDBUpgrade = function (db, event) {
-        throw this.errorFactory_.create(errors_1.default.codes.SHOULD_BE_INHERITED);
+    DBInterface.prototype.createTransaction = function (runRequest, mode) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var db, transaction, request, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getDb()];
+                    case 1:
+                        db = _a.sent();
+                        transaction = db.transaction(this.objectStoreName, mode);
+                        request = transaction.objectStore(this.objectStoreName);
+                        return [4 /*yield*/, promisify(runRequest(request))];
+                    case 2:
+                        result = _a.sent();
+                        return [2 /*return*/, new Promise(function (resolve, reject) {
+                                transaction.oncomplete = function () {
+                                    resolve(result);
+                                };
+                                transaction.onerror = function () {
+                                    reject(transaction.error);
+                                };
+                            })];
+                }
+            });
+        });
     };
+    /** Gets the cached db connection or opens a new one. */
+    DBInterface.prototype.getDb = function () {
+        var _this = this;
+        if (!this.dbPromise) {
+            this.dbPromise = new Promise(function (resolve, reject) {
+                var request = indexedDB.open(_this.dbName, _this.dbVersion);
+                request.onsuccess = function () {
+                    resolve(request.result);
+                };
+                request.onerror = function () {
+                    _this.dbPromise = null;
+                    reject(request.error);
+                };
+                request.onupgradeneeded = function (event) {
+                    return _this.onDbUpgrade(request.result, event);
+                };
+            });
+        }
+        return this.dbPromise;
+    };
     return DBInterface;
 }());
-exports.default = DBInterface;
+exports.DBInterface = DBInterface;
+/** Promisifies an IDBRequest. Resolves with the IDBRequest's result. */
+function promisify(request) {
+    return new Promise(function (resolve, reject) {
+        request.onsuccess = function () {
+            resolve(request.result);
+        };
+        request.onerror = function () {
+            reject(request.error);
+        };
+    });
+}
 
 //# sourceMappingURL=db-interface.js.map

dist/cjs/src/models/default-sw.d.ts

@@ -1,5 +0,17 @@
-declare const _default: {
-    path: string;
-    scope: string;
-};
-export default _default;
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const DEFAULT_SW_PATH = "/firebase-messaging-sw.js";
+export declare const DEFAULT_SW_SCOPE = "/firebase-cloud-messaging-push-scope";

dist/cjs/src/models/default-sw.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,9 +17,6 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    path: '/firebase-messaging-sw.js',
-    scope: '/firebase-cloud-messaging-push-scope'
-};
+exports.DEFAULT_SW_PATH = '/firebase-messaging-sw.js';
+exports.DEFAULT_SW_SCOPE = '/firebase-cloud-messaging-push-scope';
 
 //# sourceMappingURL=default-sw.js.map

dist/cjs/src/models/errors.d.ts

@@ -1,47 +0,59 @@
-declare const _default: {
-    codes: {
-        AVAILABLE_IN_WINDOW: string;
-        AVAILABLE_IN_SW: string;
-        SHOULD_BE_INHERITED: string;
-        BAD_SENDER_ID: string;
-        INCORRECT_GCM_SENDER_ID: string;
-        PERMISSION_DEFAULT: string;
-        PERMISSION_BLOCKED: string;
-        UNSUPPORTED_BROWSER: string;
-        NOTIFICATIONS_BLOCKED: string;
-        FAILED_DEFAULT_REGISTRATION: string;
-        SW_REGISTRATION_EXPECTED: string;
-        GET_SUBSCRIPTION_FAILED: string;
-        INVALID_SAVED_TOKEN: string;
-        SW_REG_REDUNDANT: string;
-        TOKEN_SUBSCRIBE_FAILED: string;
-        TOKEN_SUBSCRIBE_NO_TOKEN: string;
-        TOKEN_SUBSCRIBE_NO_PUSH_SET: string;
-        TOKEN_UNSUBSCRIBE_FAILED: string;
-        TOKEN_UPDATE_FAILED: string;
-        TOKEN_UPDATE_NO_TOKEN: string;
-        USE_SW_BEFORE_GET_TOKEN: string;
-        INVALID_DELETE_TOKEN: string;
-        DELETE_TOKEN_NOT_FOUND: string;
-        DELETE_SCOPE_NOT_FOUND: string;
-        BG_HANDLER_FUNCTION_EXPECTED: string;
-        NO_WINDOW_CLIENT_TO_MSG: string;
-        UNABLE_TO_RESUBSCRIBE: string;
-        NO_FCM_TOKEN_FOR_RESUBSCRIBE: string;
-        FAILED_TO_DELETE_TOKEN: string;
-        NO_SW_IN_REG: string;
-        BAD_SCOPE: string;
-        BAD_VAPID_KEY: string;
-        BAD_SUBSCRIPTION: string;
-        BAD_TOKEN: string;
-        BAD_PUSH_SET: string;
-        FAILED_DELETE_VAPID_KEY: string;
-        INVALID_PUBLIC_VAPID_KEY: string;
-        USE_PUBLIC_KEY_BEFORE_GET_TOKEN: string;
-        PUBLIC_KEY_DECRYPTION_FAILED: string;
-    };
-    map: {
-        [x: string]: string;
-    };
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const ERROR_CODES: {
+    AVAILABLE_IN_WINDOW: string;
+    AVAILABLE_IN_SW: string;
+    SHOULD_BE_INHERITED: string;
+    BAD_SENDER_ID: string;
+    INCORRECT_GCM_SENDER_ID: string;
+    PERMISSION_DEFAULT: string;
+    PERMISSION_BLOCKED: string;
+    UNSUPPORTED_BROWSER: string;
+    NOTIFICATIONS_BLOCKED: string;
+    FAILED_DEFAULT_REGISTRATION: string;
+    SW_REGISTRATION_EXPECTED: string;
+    GET_SUBSCRIPTION_FAILED: string;
+    INVALID_SAVED_TOKEN: string;
+    SW_REG_REDUNDANT: string;
+    TOKEN_SUBSCRIBE_FAILED: string;
+    TOKEN_SUBSCRIBE_NO_TOKEN: string;
+    TOKEN_SUBSCRIBE_NO_PUSH_SET: string;
+    TOKEN_UNSUBSCRIBE_FAILED: string;
+    TOKEN_UPDATE_FAILED: string;
+    TOKEN_UPDATE_NO_TOKEN: string;
+    USE_SW_BEFORE_GET_TOKEN: string;
+    INVALID_DELETE_TOKEN: string;
+    DELETE_TOKEN_NOT_FOUND: string;
+    DELETE_SCOPE_NOT_FOUND: string;
+    BG_HANDLER_FUNCTION_EXPECTED: string;
+    NO_WINDOW_CLIENT_TO_MSG: string;
+    UNABLE_TO_RESUBSCRIBE: string;
+    NO_FCM_TOKEN_FOR_RESUBSCRIBE: string;
+    FAILED_TO_DELETE_TOKEN: string;
+    NO_SW_IN_REG: string;
+    BAD_SCOPE: string;
+    BAD_VAPID_KEY: string;
+    BAD_SUBSCRIPTION: string;
+    BAD_TOKEN: string;
+    BAD_PUSH_SET: string;
+    FAILED_DELETE_VAPID_KEY: string;
+    INVALID_PUBLIC_VAPID_KEY: string;
+    USE_PUBLIC_KEY_BEFORE_GET_TOKEN: string;
+    PUBLIC_KEY_DECRYPTION_FAILED: string;
 };
-export default _default;
+export declare const ERROR_MAP: {
+    [x: string]: string;
+};

dist/cjs/src/models/errors.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,5 +17,4 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-var CODES = {
+exports.ERROR_CODES = {
     AVAILABLE_IN_WINDOW: 'only-available-in-window',
@@ -60,65 +60,61 @@ AVAILABLE_IN_SW: 'only-available-in-sw',
 };
-var ERROR_MAP = (_a = {},
-    _a[CODES.AVAILABLE_IN_WINDOW] = 'This method is available in a Window context.',
-    _a[CODES.AVAILABLE_IN_SW] = 'This method is available in a service worker ' + 'context.',
-    _a[CODES.SHOULD_BE_INHERITED] = 'This method should be overriden by ' + 'extended classes.',
-    _a[CODES.BAD_SENDER_ID] = "Please ensure that 'messagingSenderId' is set " +
+exports.ERROR_MAP = (_a = {},
+    _a[exports.ERROR_CODES.AVAILABLE_IN_WINDOW] = 'This method is available in a Window context.',
+    _a[exports.ERROR_CODES.AVAILABLE_IN_SW] = 'This method is available in a service worker ' + 'context.',
+    _a[exports.ERROR_CODES.SHOULD_BE_INHERITED] = 'This method should be overriden by ' + 'extended classes.',
+    _a[exports.ERROR_CODES.BAD_SENDER_ID] = "Please ensure that 'messagingSenderId' is set " +
         'correctly in the options passed into firebase.initializeApp().',
-    _a[CODES.PERMISSION_DEFAULT] = 'The required permissions were not granted and ' + 'dismissed instead.',
-    _a[CODES.PERMISSION_BLOCKED] = 'The required permissions were not granted and ' + 'blocked instead.',
-    _a[CODES.UNSUPPORTED_BROWSER] = "This browser doesn't support the API's " +
+    _a[exports.ERROR_CODES.PERMISSION_DEFAULT] = 'The required permissions were not granted and ' + 'dismissed instead.',
+    _a[exports.ERROR_CODES.PERMISSION_BLOCKED] = 'The required permissions were not granted and ' + 'blocked instead.',
+    _a[exports.ERROR_CODES.UNSUPPORTED_BROWSER] = "This browser doesn't support the API's " +
         'required to use the firebase SDK.',
-    _a[CODES.NOTIFICATIONS_BLOCKED] = 'Notifications have been blocked.',
-    _a[CODES.FAILED_DEFAULT_REGISTRATION] = 'We are unable to register the ' +
+    _a[exports.ERROR_CODES.NOTIFICATIONS_BLOCKED] = 'Notifications have been blocked.',
+    _a[exports.ERROR_CODES.FAILED_DEFAULT_REGISTRATION] = 'We are unable to register the ' +
         'default service worker. {$browserErrorMessage}',
-    _a[CODES.SW_REGISTRATION_EXPECTED] = 'A service worker registration was the ' + 'expected input.',
-    _a[CODES.GET_SUBSCRIPTION_FAILED] = 'There was an error when trying to get ' +
+    _a[exports.ERROR_CODES.SW_REGISTRATION_EXPECTED] = 'A service worker registration was the ' + 'expected input.',
+    _a[exports.ERROR_CODES.GET_SUBSCRIPTION_FAILED] = 'There was an error when trying to get ' +
         'any existing Push Subscriptions.',
-    _a[CODES.INVALID_SAVED_TOKEN] = 'Unable to access details of the saved token.',
-    _a[CODES.SW_REG_REDUNDANT] = 'The service worker being used for push was made ' + 'redundant.',
-    _a[CODES.TOKEN_SUBSCRIBE_FAILED] = 'A problem occured while subscribing the ' + 'user to FCM: {$message}',
-    _a[CODES.TOKEN_SUBSCRIBE_NO_TOKEN] = 'FCM returned no token when subscribing ' + 'the user to push.',
-    _a[CODES.TOKEN_SUBSCRIBE_NO_PUSH_SET] = 'FCM returned an invalid response ' + 'when getting an FCM token.',
-    _a[CODES.TOKEN_UNSUBSCRIBE_FAILED] = 'A problem occured while unsubscribing the ' + 'user from FCM: {$message}',
-    _a[CODES.TOKEN_UPDATE_FAILED] = 'A problem occured while updating the ' + 'user from FCM: {$message}',
-    _a[CODES.TOKEN_UPDATE_NO_TOKEN] = 'FCM returned no token when updating ' + 'the user to push.',
-    _a[CODES.USE_SW_BEFORE_GET_TOKEN] = 'The useServiceWorker() method may only be called once and must be ' +
+    _a[exports.ERROR_CODES.INVALID_SAVED_TOKEN] = 'Unable to access details of the saved token.',
+    _a[exports.ERROR_CODES.SW_REG_REDUNDANT] = 'The service worker being used for push was made ' + 'redundant.',
+    _a[exports.ERROR_CODES.TOKEN_SUBSCRIBE_FAILED] = 'A problem occured while subscribing the ' + 'user to FCM: {$message}',
+    _a[exports.ERROR_CODES.TOKEN_SUBSCRIBE_NO_TOKEN] = 'FCM returned no token when subscribing ' + 'the user to push.',
+    _a[exports.ERROR_CODES.TOKEN_SUBSCRIBE_NO_PUSH_SET] = 'FCM returned an invalid response ' + 'when getting an FCM token.',
+    _a[exports.ERROR_CODES.TOKEN_UNSUBSCRIBE_FAILED] = 'A problem occured while unsubscribing the ' + 'user from FCM: {$message}',
+    _a[exports.ERROR_CODES.TOKEN_UPDATE_FAILED] = 'A problem occured while updating the ' + 'user from FCM: {$message}',
+    _a[exports.ERROR_CODES.TOKEN_UPDATE_NO_TOKEN] = 'FCM returned no token when updating ' + 'the user to push.',
+    _a[exports.ERROR_CODES.USE_SW_BEFORE_GET_TOKEN] = 'The useServiceWorker() method may only be called once and must be ' +
         'called before calling getToken() to ensure your service worker is used.',
-    _a[CODES.INVALID_DELETE_TOKEN] = 'You must pass a valid token into ' +
+    _a[exports.ERROR_CODES.INVALID_DELETE_TOKEN] = 'You must pass a valid token into ' +
         'deleteToken(), i.e. the token from getToken().',
-    _a[CODES.DELETE_TOKEN_NOT_FOUND] = 'The deletion attempt for token could not ' +
+    _a[exports.ERROR_CODES.DELETE_TOKEN_NOT_FOUND] = 'The deletion attempt for token could not ' +
         'be performed as the token was not found.',
-    _a[CODES.DELETE_SCOPE_NOT_FOUND] = 'The deletion attempt for service worker ' +
+    _a[exports.ERROR_CODES.DELETE_SCOPE_NOT_FOUND] = 'The deletion attempt for service worker ' +
         'scope could not be performed as the scope was not found.',
-    _a[CODES.BG_HANDLER_FUNCTION_EXPECTED] = 'The input to ' + 'setBackgroundMessageHandler() must be a function.',
-    _a[CODES.NO_WINDOW_CLIENT_TO_MSG] = 'An attempt was made to message a ' + 'non-existant window client.',
-    _a[CODES.UNABLE_TO_RESUBSCRIBE] = 'There was an error while re-subscribing ' +
+    _a[exports.ERROR_CODES.BG_HANDLER_FUNCTION_EXPECTED] = 'The input to ' + 'setBackgroundMessageHandler() must be a function.',
+    _a[exports.ERROR_CODES.NO_WINDOW_CLIENT_TO_MSG] = 'An attempt was made to message a ' + 'non-existant window client.',
+    _a[exports.ERROR_CODES.UNABLE_TO_RESUBSCRIBE] = 'There was an error while re-subscribing ' +
         'the FCM token for push messaging. Will have to resubscribe the ' +
         'user on next visit. {$message}',
-    _a[CODES.NO_FCM_TOKEN_FOR_RESUBSCRIBE] = 'Could not find an FCM token ' +
+    _a[exports.ERROR_CODES.NO_FCM_TOKEN_FOR_RESUBSCRIBE] = 'Could not find an FCM token ' +
         'and as a result, unable to resubscribe. Will have to resubscribe the ' +
         'user on next visit.',
-    _a[CODES.FAILED_TO_DELETE_TOKEN] = 'Unable to delete the currently saved token.',
-    _a[CODES.NO_SW_IN_REG] = 'Even though the service worker registration was ' +
+    _a[exports.ERROR_CODES.FAILED_TO_DELETE_TOKEN] = 'Unable to delete the currently saved token.',
+    _a[exports.ERROR_CODES.NO_SW_IN_REG] = 'Even though the service worker registration was ' +
         'successful, there was a problem accessing the service worker itself.',
-    _a[CODES.INCORRECT_GCM_SENDER_ID] = "Please change your web app manifest's " +
+    _a[exports.ERROR_CODES.INCORRECT_GCM_SENDER_ID] = "Please change your web app manifest's " +
         "'gcm_sender_id' value to '103953800507' to use Firebase messaging.",
-    _a[CODES.BAD_SCOPE] = 'The service worker scope must be a string with at ' +
+    _a[exports.ERROR_CODES.BAD_SCOPE] = 'The service worker scope must be a string with at ' +
         'least one character.',
-    _a[CODES.BAD_VAPID_KEY] = 'The public VAPID key is not a Uint8Array with 65 bytes.',
-    _a[CODES.BAD_SUBSCRIPTION] = 'The subscription must be a valid ' + 'PushSubscription.',
-    _a[CODES.BAD_TOKEN] = 'The FCM Token used for storage / lookup was not ' +
+    _a[exports.ERROR_CODES.BAD_VAPID_KEY] = 'The public VAPID key is not a Uint8Array with 65 bytes.',
+    _a[exports.ERROR_CODES.BAD_SUBSCRIPTION] = 'The subscription must be a valid ' + 'PushSubscription.',
+    _a[exports.ERROR_CODES.BAD_TOKEN] = 'The FCM Token used for storage / lookup was not ' +
         'a valid token string.',
-    _a[CODES.BAD_PUSH_SET] = 'The FCM push set used for storage / lookup was not ' +
+    _a[exports.ERROR_CODES.BAD_PUSH_SET] = 'The FCM push set used for storage / lookup was not ' +
         'not a valid push set string.',
-    _a[CODES.FAILED_DELETE_VAPID_KEY] = 'The VAPID key could not be deleted.',
-    _a[CODES.INVALID_PUBLIC_VAPID_KEY] = 'The public VAPID key must be a string.',
-    _a[CODES.PUBLIC_KEY_DECRYPTION_FAILED] = 'The public VAPID key did not equal ' + '65 bytes when decrypted.',
+    _a[exports.ERROR_CODES.FAILED_DELETE_VAPID_KEY] = 'The VAPID key could not be deleted.',
+    _a[exports.ERROR_CODES.INVALID_PUBLIC_VAPID_KEY] = 'The public VAPID key must be a string.',
+    _a[exports.ERROR_CODES.PUBLIC_KEY_DECRYPTION_FAILED] = 'The public VAPID key did not equal ' + '65 bytes when decrypted.',
     _a);
-exports.default = {
-    codes: CODES,
-    map: ERROR_MAP
-};
 var _a;
 
 //# sourceMappingURL=errors.js.map

dist/cjs/src/models/fcm-details.d.ts

@@ -1,9 +0,21 @@
-declare const _default: {
-    DEFAULT_PUBLIC_VAPID_KEY: Uint8Array;
-    SUBSCRIPTION_DETAILS: {
-        userVisibleOnly: boolean;
-        applicationServerKey: Uint8Array;
-    };
-    ENDPOINT: string;
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const DEFAULT_PUBLIC_VAPID_KEY: Uint8Array;
+export declare const SUBSCRIPTION_DETAILS: {
+    userVisibleOnly: boolean;
+    applicationServerKey: Uint8Array;
 };
-export default _default;
+export declare const ENDPOINT = "https://fcm.googleapis.com";

dist/cjs/src/models/fcm-details.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,5 +17,4 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-var DEFAULT_PUBLIC_VAPID_KEY = new Uint8Array([
+exports.DEFAULT_PUBLIC_VAPID_KEY = new Uint8Array([
     0x04,
@@ -86,13 +86,8 @@ 0x33,
 ]);
-var SUBSCRIPTION_DETAILS = {
+exports.SUBSCRIPTION_DETAILS = {
     userVisibleOnly: true,
-    applicationServerKey: DEFAULT_PUBLIC_VAPID_KEY
+    applicationServerKey: exports.DEFAULT_PUBLIC_VAPID_KEY
 };
-exports.default = {
-    DEFAULT_PUBLIC_VAPID_KEY: DEFAULT_PUBLIC_VAPID_KEY,
-    SUBSCRIPTION_DETAILS: SUBSCRIPTION_DETAILS,
-    ENDPOINT: 'https://fcm.googleapis.com'
-    // ENDPOINT: 'https://jmt17.google.com'
-};
+exports.ENDPOINT = 'https://fcm.googleapis.com';
 
 //# sourceMappingURL=fcm-details.js.map

dist/cjs/src/models/iid-model.d.ts

@@ -1,15 +0,10 @@
-export default class IIDModel {
-    private errorFactory_;
+export interface IIDDetails {
+    token: string;
+    pushSet: string;
+}
+export declare class IIDModel {
+    private readonly errorFactory_;
     constructor();
+    getToken(senderId: string, subscription: PushSubscription, publicVapidKey: Uint8Array): Promise<IIDDetails>;
     /**
-     * Given a PushSubscription and messagingSenderId, get an FCM token.
-     * @public
-     * @param  {string} senderId The 'messagingSenderId' to tie the token to.
-     * @param  {PushSubscription} subscription The PushSusbcription to "federate".
-     * @param  {Uint8Array} publicVapidKey The public VAPID key.
-     * @return {Promise<!Object>} Returns the FCM token to be used in place
-     * of the PushSubscription.
-     */
-    getToken(senderId: any, subscription: any, publicVapidKey: any): Promise<Object>;
-    /**
      * Update the underlying token details for fcmToken.
@@ -16,0 +11,0 @@ */

dist/cjs/src/models/iid-model.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,63 +17,69 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
 var util_1 = require("@firebase/util");
+var array_buffer_to_base64_1 = require("../helpers/array-buffer-to-base64");
 var errors_1 = require("./errors");
-var array_buffer_to_base64_1 = require("../helpers/array-buffer-to-base64");
 var fcm_details_1 = require("./fcm-details");
+// tslint:enable interface-name
 var IIDModel = /** @class */ (function () {
     function IIDModel() {
-        this.errorFactory_ = new util_1.ErrorFactory('messaging', 'Messaging', errors_1.default.map);
+        this.errorFactory_ = new util_1.ErrorFactory('messaging', 'Messaging', errors_1.ERROR_MAP);
     }
-    /**
-     * Given a PushSubscription and messagingSenderId, get an FCM token.
-     * @public
-     * @param  {string} senderId The 'messagingSenderId' to tie the token to.
-     * @param  {PushSubscription} subscription The PushSusbcription to "federate".
-     * @param  {Uint8Array} publicVapidKey The public VAPID key.
-     * @return {Promise<!Object>} Returns the FCM token to be used in place
-     * of the PushSubscription.
-     */
     IIDModel.prototype.getToken = function (senderId, subscription, publicVapidKey) {
-        var _this = this;
-        var p256dh = array_buffer_to_base64_1.default(subscription['getKey']('p256dh'));
-        var auth = array_buffer_to_base64_1.default(subscription['getKey']('auth'));
-        var fcmSubscribeBody = "authorized_entity=" + senderId + "&" +
-            ("endpoint=" + subscription.endpoint + "&") +
-            ("encryption_key=" + p256dh + "&") +
-            ("encryption_auth=" + auth);
-        if (publicVapidKey !== fcm_details_1.default.DEFAULT_PUBLIC_VAPID_KEY) {
-            var applicationPubKey = array_buffer_to_base64_1.default(publicVapidKey);
-            fcmSubscribeBody += "&application_pub_key=" + applicationPubKey;
-        }
-        var headers = new Headers();
-        headers.append('Content-Type', 'application/x-www-form-urlencoded');
-        var subscribeOptions = {
-            method: 'POST',
-            headers: headers,
-            body: fcmSubscribeBody
-        };
-        return fetch(fcm_details_1.default.ENDPOINT + '/fcm/connect/subscribe', subscribeOptions)
-            .then(function (response) { return response.json(); })
-            .catch(function () {
-            throw _this.errorFactory_.create(errors_1.default.codes.TOKEN_SUBSCRIBE_FAILED);
-        })
-            .then(function (response) {
-            var fcmTokenResponse = response;
-            if (fcmTokenResponse['error']) {
-                var message = fcmTokenResponse['error']['message'];
-                throw _this.errorFactory_.create(errors_1.default.codes.TOKEN_SUBSCRIBE_FAILED, {
-                    message: message
-                });
-            }
-            if (!fcmTokenResponse['token']) {
-                throw _this.errorFactory_.create(errors_1.default.codes.TOKEN_SUBSCRIBE_NO_TOKEN);
-            }
-            if (!fcmTokenResponse['pushSet']) {
-                throw _this.errorFactory_.create(errors_1.default.codes.TOKEN_SUBSCRIBE_NO_PUSH_SET);
-            }
-            return {
-                token: fcmTokenResponse['token'],
-                pushSet: fcmTokenResponse['pushSet']
-            };
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var p256dh, auth, fcmSubscribeBody, applicationPubKey, headers, subscribeOptions, responseData, response, err_1, message;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        p256dh = array_buffer_to_base64_1.arrayBufferToBase64(subscription.getKey('p256dh'));
+                        auth = array_buffer_to_base64_1.arrayBufferToBase64(subscription.getKey('auth'));
+                        fcmSubscribeBody = "authorized_entity=" + senderId + "&" +
+                            ("endpoint=" + subscription.endpoint + "&") +
+                            ("encryption_key=" + p256dh + "&") +
+                            ("encryption_auth=" + auth);
+                        if (publicVapidKey !== fcm_details_1.DEFAULT_PUBLIC_VAPID_KEY) {
+                            applicationPubKey = array_buffer_to_base64_1.arrayBufferToBase64(publicVapidKey);
+                            fcmSubscribeBody += "&application_pub_key=" + applicationPubKey;
+                        }
+                        headers = new Headers();
+                        headers.append('Content-Type', 'application/x-www-form-urlencoded');
+                        subscribeOptions = {
+                            method: 'POST',
+                            headers: headers,
+                            body: fcmSubscribeBody
+                        };
+                        responseData = null;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        return [4 /*yield*/, fetch(fcm_details_1.ENDPOINT + '/fcm/connect/subscribe', subscribeOptions)];
+                    case 2:
+                        response = _a.sent();
+                        return [4 /*yield*/, response.json()];
+                    case 3:
+                        responseData = _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_1 = _a.sent();
+                        throw this.errorFactory_.create(errors_1.ERROR_CODES.TOKEN_SUBSCRIBE_FAILED);
+                    case 5:
+                        if (responseData['error']) {
+                            message = responseData['error']['message'];
+                            throw this.errorFactory_.create(errors_1.ERROR_CODES.TOKEN_SUBSCRIBE_FAILED, {
+                                message: message
+                            });
+                        }
+                        if (!responseData['token']) {
+                            throw this.errorFactory_.create(errors_1.ERROR_CODES.TOKEN_SUBSCRIBE_NO_TOKEN);
+                        }
+                        if (!responseData['pushSet']) {
+                            throw this.errorFactory_.create(errors_1.ERROR_CODES.TOKEN_SUBSCRIBE_NO_PUSH_SET);
+                        }
+                        return [2 /*return*/, {
+                                token: responseData['token'],
+                                pushSet: responseData['pushSet']
+                            }];
+                }
+            });
         });
@@ -84,42 +91,53 @@ };
     IIDModel.prototype.updateToken = function (senderId, fcmToken, fcmPushSet, subscription, publicVapidKey) {
-        var _this = this;
-        var p256dh = array_buffer_to_base64_1.default(subscription['getKey']('p256dh'));
-        var auth = array_buffer_to_base64_1.default(subscription['getKey']('auth'));
-        var fcmUpdateBody = "push_set=" + fcmPushSet + "&" +
-            ("token=" + fcmToken + "&") +
-            ("authorized_entity=" + senderId + "&") +
-            ("endpoint=" + subscription.endpoint + "&") +
-            ("encryption_key=" + p256dh + "&") +
-            ("encryption_auth=" + auth);
-        if (publicVapidKey !== fcm_details_1.default.DEFAULT_PUBLIC_VAPID_KEY) {
-            var applicationPubKey = array_buffer_to_base64_1.default(publicVapidKey);
-            fcmUpdateBody += "&application_pub_key=" + applicationPubKey;
-        }
-        var headers = new Headers();
-        headers.append('Content-Type', 'application/x-www-form-urlencoded');
-        var updateOptions = {
-            method: 'POST',
-            headers: headers,
-            body: fcmUpdateBody
-        };
-        var updateFetchRes;
-        return fetch(fcm_details_1.default.ENDPOINT + '/fcm/connect/subscribe', updateOptions)
-            .then(function (fetchResponse) {
-            updateFetchRes = fetchResponse;
-            return fetchResponse.json();
-        })
-            .catch(function () {
-            throw _this.errorFactory_.create(errors_1.default.codes.TOKEN_UPDATE_FAILED);
-        })
-            .then(function (fcmTokenResponse) {
-            if (!updateFetchRes.ok) {
-                var message = fcmTokenResponse['error']['message'];
-                throw _this.errorFactory_.create(errors_1.default.codes.TOKEN_UPDATE_FAILED, {
-                    message: message
-                });
-            }
-            if (!fcmTokenResponse['token']) {
-                throw _this.errorFactory_.create(errors_1.default.codes.TOKEN_UPDATE_NO_TOKEN);
-            }
-            return fcmTokenResponse['token'];
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var p256dh, auth, fcmUpdateBody, applicationPubKey, headers, updateOptions, responseData, response, err_2, message;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        p256dh = array_buffer_to_base64_1.arrayBufferToBase64(subscription.getKey('p256dh'));
+                        auth = array_buffer_to_base64_1.arrayBufferToBase64(subscription.getKey('auth'));
+                        fcmUpdateBody = "push_set=" + fcmPushSet + "&" +
+                            ("token=" + fcmToken + "&") +
+                            ("authorized_entity=" + senderId + "&") +
+                            ("endpoint=" + subscription.endpoint + "&") +
+                            ("encryption_key=" + p256dh + "&") +
+                            ("encryption_auth=" + auth);
+                        if (publicVapidKey !== fcm_details_1.DEFAULT_PUBLIC_VAPID_KEY) {
+                            applicationPubKey = array_buffer_to_base64_1.arrayBufferToBase64(publicVapidKey);
+                            fcmUpdateBody += "&application_pub_key=" + applicationPubKey;
+                        }
+                        headers = new Headers();
+                        headers.append('Content-Type', 'application/x-www-form-urlencoded');
+                        updateOptions = {
+                            method: 'POST',
+                            headers: headers,
+                            body: fcmUpdateBody
+                        };
+                        responseData = null;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        return [4 /*yield*/, fetch(fcm_details_1.ENDPOINT + '/fcm/connect/subscribe', updateOptions)];
+                    case 2:
+                        response = _a.sent();
+                        return [4 /*yield*/, response.json()];
+                    case 3:
+                        responseData = _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_2 = _a.sent();
+                        throw this.errorFactory_.create(errors_1.ERROR_CODES.TOKEN_UPDATE_FAILED);
+                    case 5:
+                        if (responseData['error']) {
+                            message = responseData['error']['message'];
+                            throw this.errorFactory_.create(errors_1.ERROR_CODES.TOKEN_UPDATE_FAILED, {
+                                message: message
+                            });
+                        }
+                        if (!responseData['token']) {
+                            throw this.errorFactory_.create(errors_1.ERROR_CODES.TOKEN_UPDATE_NO_TOKEN);
+                        }
+                        return [2 /*return*/, responseData['token']];
+                }
+            });
         });
@@ -131,26 +149,39 @@ };
     IIDModel.prototype.deleteToken = function (senderId, fcmToken, fcmPushSet) {
-        var _this = this;
-        var fcmUnsubscribeBody = "authorized_entity=" + senderId + "&" +
-            ("token=" + fcmToken + "&") +
-            ("pushSet=" + fcmPushSet);
-        var headers = new Headers();
-        headers.append('Content-Type', 'application/x-www-form-urlencoded');
-        var unsubscribeOptions = {
-            method: 'POST',
-            headers: headers,
-            body: fcmUnsubscribeBody
-        };
-        return fetch(fcm_details_1.default.ENDPOINT + '/fcm/connect/unsubscribe', unsubscribeOptions).then(function (fetchResponse) {
-            if (!fetchResponse.ok) {
-                return fetchResponse.json().then(function (fcmTokenResponse) {
-                    if (fcmTokenResponse['error']) {
-                        var message = fcmTokenResponse['error']['message'];
-                        throw _this.errorFactory_.create(errors_1.default.codes.TOKEN_UNSUBSCRIBE_FAILED, {
-                            message: message
-                        });
-                    }
-                }, function (err) {
-                    throw _this.errorFactory_.create(errors_1.default.codes.TOKEN_UNSUBSCRIBE_FAILED);
-                });
-            }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var fcmUnsubscribeBody, headers, unsubscribeOptions, response, responseData, message, err_3;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        fcmUnsubscribeBody = "authorized_entity=" + senderId + "&" +
+                            ("token=" + fcmToken + "&") +
+                            ("pushSet=" + fcmPushSet);
+                        headers = new Headers();
+                        headers.append('Content-Type', 'application/x-www-form-urlencoded');
+                        unsubscribeOptions = {
+                            method: 'POST',
+                            headers: headers,
+                            body: fcmUnsubscribeBody
+                        };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        return [4 /*yield*/, fetch(fcm_details_1.ENDPOINT + '/fcm/connect/unsubscribe', unsubscribeOptions)];
+                    case 2:
+                        response = _a.sent();
+                        return [4 /*yield*/, response.json()];
+                    case 3:
+                        responseData = _a.sent();
+                        if (responseData['error']) {
+                            message = responseData['error']['message'];
+                            throw this.errorFactory_.create(errors_1.ERROR_CODES.TOKEN_UNSUBSCRIBE_FAILED, {
+                                message: message
+                            });
+                        }
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_3 = _a.sent();
+                        throw this.errorFactory_.create(errors_1.ERROR_CODES.TOKEN_UNSUBSCRIBE_FAILED);
+                    case 5: return [2 /*return*/];
+                }
+            });
         });
@@ -160,4 +191,4 @@ };
 }());
-exports.default = IIDModel;
+exports.IIDModel = IIDModel;
 
 //# sourceMappingURL=iid-model.js.map

dist/cjs/src/models/token-details-model.d.ts

@@ -1,43 +0,31 @@
-import DBInterface from './db-interface';
-export default class TokenDetailsModel extends DBInterface {
-    constructor();
-    onDBUpgrade(db: IDBDatabase, evt: IDBVersionChangeEvent): void;
+import { TokenDetails } from '../interfaces/token-details';
+import { DBInterface } from './db-interface';
+export declare class TokenDetailsModel extends DBInterface {
+    protected readonly dbName: string;
+    protected readonly dbVersion: number;
+    protected readonly objectStoreName: string;
+    protected onDbUpgrade(db: IDBDatabase, evt: IDBVersionChangeEvent): void;
     /**
      * This method takes an object and will check for known arguments and
      * validate the input.
-     * @private
-     * @param {!ValidateInput} input
-     * @return {!Promise} Returns promise that resolves if input is valid,
-     * rejects otherwise.
+     * @return Promise that resolves if input is valid, rejects otherwise.
      */
-    validateInputs_(input: any): Promise<never>;
+    private validateInputs(input);
     /**
      * Given a token, this method will look up the details in indexedDB.
      * @param {string} fcmToken
-     * @return {Promise<Object>} The details associated with that token.
+     * @return {Promise<TokenDetails>} The details associated with that token.
      */
-    getTokenDetailsFromToken(fcmToken: any): Promise<{}>;
+    getTokenDetailsFromToken(fcmToken: string): Promise<TokenDetails | undefined>;
     /**
      * Given a service worker scope, this method will look up the details in
      * indexedDB.
-     * @public
-     * @param {string} swScope
-     * @return {Promise<Object>} The details associated with that token.
+     * @return The details associated with that token.
      */
-    getTokenDetailsFromSWScope(swScope: any): Promise<{}>;
+    getTokenDetailsFromSWScope(swScope: string): Promise<TokenDetails | undefined>;
     /**
      * Save the details for the fcm token for re-use at a later date.
-     * @param {{swScope: !string, vapidKey: !string,
-     * subscription: !PushSubscription, fcmSenderId: !string, fcmToken: !string,
-     * fcmPushSet: !string}} input A plain js object containing args to save.
-     * @return {Promise<void>}
+     * @param input A plain js object containing args to save.
      */
-    saveTokenDetails({swScope, vapidKey, subscription, fcmSenderId, fcmToken, fcmPushSet}: {
-        swScope: any;
-        vapidKey: any;
-        subscription: any;
-        fcmSenderId: any;
-        fcmToken: any;
-        fcmPushSet: any;
-    }): Promise<{}>;
+    saveTokenDetails(tokenDetails: TokenDetails): Promise<void>;
     /**
@@ -47,6 +35,7 @@ * This method deletes details of the current FCM token.
      * method for deleting at a later date.
-     * @return {Promise<Object>} Resolves once the FCM token details have been
-     * deleted and returns the deleted details.
+     *
+     * @return Resolves once the FCM token details have been deleted and returns
+     * the deleted details.
      */
-    deleteToken(token: string): Promise<{}>;
+    deleteToken(token: string): Promise<TokenDetails>;
 }

dist/cjs/src/models/token-details-model.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,35 +17,21 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
+var array_buffer_to_base64_1 = require("../helpers/array-buffer-to-base64");
+var clean_v1_undefined_1 = require("./clean-v1-undefined");
 var db_interface_1 = require("./db-interface");
 var errors_1 = require("./errors");
-var array_buffer_to_base64_1 = require("../helpers/array-buffer-to-base64");
-var clean_v1_undefined_1 = require("./clean-v1-undefined");
-var FCM_TOKEN_OBJ_STORE = 'fcm_token_object_Store';
-var DB_NAME = 'fcm_token_details_db';
-var DB_VERSION = 2;
-/** @record */
-function ValidateInput() { }
-/** @type {string|undefined} */
-ValidateInput.prototype.fcmToken;
-/** @type {string|undefined} */
-ValidateInput.prototype.swScope;
-/** @type {string|undefined} */
-ValidateInput.prototype.vapidKey;
-/** @type {PushSubscription|undefined} */
-ValidateInput.prototype.subscription;
-/** @type {string|undefined} */
-ValidateInput.prototype.fcmSenderId;
-/** @type {string|undefined} */
-ValidateInput.prototype.fcmPushSet;
 var TokenDetailsModel = /** @class */ (function (_super) {
     tslib_1.__extends(TokenDetailsModel, _super);
     function TokenDetailsModel() {
-        return _super.call(this, DB_NAME, DB_VERSION) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.dbName = 'fcm_token_details_db';
+        _this.dbVersion = 2;
+        _this.objectStoreName = 'fcm_token_object_Store';
+        return _this;
     }
-    TokenDetailsModel.prototype.onDBUpgrade = function (db, evt) {
+    TokenDetailsModel.prototype.onDbUpgrade = function (db, evt) {
         if (evt.oldVersion < 1) {
             // New IDB instance
-            var objectStore = db.createObjectStore(FCM_TOKEN_OBJ_STORE, {
+            var objectStore = db.createObjectStore(this.objectStoreName, {
                 keyPath: 'swScope'
@@ -70,46 +57,38 @@ });
      * validate the input.
-     * @private
-     * @param {!ValidateInput} input
-     * @return {!Promise} Returns promise that resolves if input is valid,
-     * rejects otherwise.
+     * @return Promise that resolves if input is valid, rejects otherwise.
      */
-    TokenDetailsModel.prototype.validateInputs_ = function (input) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                if (input.fcmToken) {
-                    if (typeof input.fcmToken !== 'string' || input.fcmToken.length === 0) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_TOKEN))];
-                    }
-                }
-                if (input.swScope) {
-                    if (typeof input.swScope !== 'string' || input.swScope.length === 0) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_SCOPE))];
-                    }
-                }
-                if (input.vapidKey) {
-                    if (!(input.vapidKey instanceof Uint8Array) ||
-                        input.vapidKey.length !== 65) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_VAPID_KEY))];
-                    }
-                }
-                if (input.subscription) {
-                    if (!(input.subscription instanceof PushSubscription)) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_SUBSCRIPTION))];
-                    }
-                }
-                if (input.fcmSenderId) {
-                    if (typeof input.fcmSenderId !== 'string' ||
-                        input.fcmSenderId.length === 0) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_SENDER_ID))];
-                    }
-                }
-                if (input.fcmPushSet) {
-                    if (typeof input.fcmPushSet !== 'string' ||
-                        input.fcmPushSet.length === 0) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_PUSH_SET))];
-                    }
-                }
-                return [2 /*return*/];
-            });
-        });
+    TokenDetailsModel.prototype.validateInputs = function (input) {
+        if (input.fcmToken) {
+            if (typeof input.fcmToken !== 'string' || input.fcmToken.length === 0) {
+                throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_TOKEN);
+            }
+        }
+        if (input.swScope) {
+            if (typeof input.swScope !== 'string' || input.swScope.length === 0) {
+                throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_SCOPE);
+            }
+        }
+        if (input.vapidKey) {
+            if (!(input.vapidKey instanceof Uint8Array) ||
+                input.vapidKey.length !== 65) {
+                throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_VAPID_KEY);
+            }
+        }
+        if (input.subscription) {
+            if (!(input.subscription instanceof PushSubscription)) {
+                throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_SUBSCRIPTION);
+            }
+        }
+        if (input.fcmSenderId) {
+            if (typeof input.fcmSenderId !== 'string' ||
+                input.fcmSenderId.length === 0) {
+                throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_SENDER_ID);
+            }
+        }
+        if (input.fcmPushSet) {
+            if (typeof input.fcmPushSet !== 'string' ||
+                input.fcmPushSet.length === 0) {
+                throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_PUSH_SET);
+            }
+        }
     };
@@ -119,28 +98,12 @@ /**
      * @param {string} fcmToken
-     * @return {Promise<Object>} The details associated with that token.
+     * @return {Promise<TokenDetails>} The details associated with that token.
      */
     TokenDetailsModel.prototype.getTokenDetailsFromToken = function (fcmToken) {
-        var _this = this;
-        if (!fcmToken) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_TOKEN));
-        }
-        return this.validateInputs_({ fcmToken: fcmToken })
-            .then(function () {
-            return _this.openDatabase();
-        })
-            .then(function (db) {
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_TOKEN_OBJ_STORE]);
-                var objectStore = transaction.objectStore(FCM_TOKEN_OBJ_STORE);
-                var index = objectStore.index('fcmToken');
-                var request = index.get(fcmToken);
-                request.onerror = function (event) {
-                    reject(event.target.error);
-                };
-                request.onsuccess = function (event) {
-                    var result = event.target.result
-                        ? event.target.result
-                        : null;
-                    resolve(result);
-                };
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                if (!fcmToken) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_TOKEN);
+                }
+                this.validateInputs({ fcmToken: fcmToken });
+                return [2 /*return*/, this.getIndex('fcmToken', fcmToken)];
             });
@@ -152,29 +115,12 @@ });
      * indexedDB.
-     * @public
-     * @param {string} swScope
-     * @return {Promise<Object>} The details associated with that token.
+     * @return The details associated with that token.
      */
     TokenDetailsModel.prototype.getTokenDetailsFromSWScope = function (swScope) {
-        var _this = this;
-        if (!swScope) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_SCOPE));
-        }
-        return this.validateInputs_({ swScope: swScope })
-            .then(function () {
-            return _this.openDatabase();
-        })
-            .then(function (db) {
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_TOKEN_OBJ_STORE]);
-                var objectStore = transaction.objectStore(FCM_TOKEN_OBJ_STORE);
-                var scopeRequest = objectStore.get(swScope);
-                scopeRequest.onerror = function (event) {
-                    reject(event.target.error);
-                };
-                scopeRequest.onsuccess = function (event) {
-                    var result = event.target.result
-                        ? event.target.result
-                        : null;
-                    resolve(result);
-                };
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                if (!swScope) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_SCOPE);
+                }
+                this.validateInputs({ swScope: swScope });
+                return [2 /*return*/, this.get(swScope)];
             });
@@ -185,64 +131,39 @@ });
      * Save the details for the fcm token for re-use at a later date.
-     * @param {{swScope: !string, vapidKey: !string,
-     * subscription: !PushSubscription, fcmSenderId: !string, fcmToken: !string,
-     * fcmPushSet: !string}} input A plain js object containing args to save.
-     * @return {Promise<void>}
+     * @param input A plain js object containing args to save.
      */
-    TokenDetailsModel.prototype.saveTokenDetails = function (_a) {
-        var _this = this;
-        var swScope = _a.swScope, vapidKey = _a.vapidKey, subscription = _a.subscription, fcmSenderId = _a.fcmSenderId, fcmToken = _a.fcmToken, fcmPushSet = _a.fcmPushSet;
-        if (!swScope) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_SCOPE));
-        }
-        if (!vapidKey) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_VAPID_KEY));
-        }
-        if (!subscription) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_SUBSCRIPTION));
-        }
-        if (!fcmSenderId) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_SENDER_ID));
-        }
-        if (!fcmToken) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_TOKEN));
-        }
-        if (!fcmPushSet) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_PUSH_SET));
-        }
-        return this.validateInputs_({
-            swScope: swScope,
-            vapidKey: vapidKey,
-            subscription: subscription,
-            fcmSenderId: fcmSenderId,
-            fcmToken: fcmToken,
-            fcmPushSet: fcmPushSet
-        })
-            .then(function () {
-            return _this.openDatabase();
-        })
-            .then(function (db) {
-            /**
-             * @dict
-             */
-            var details = {
-                swScope: swScope,
-                vapidKey: array_buffer_to_base64_1.default(vapidKey),
-                endpoint: subscription.endpoint,
-                auth: array_buffer_to_base64_1.default(subscription['getKey']('auth')),
-                p256dh: array_buffer_to_base64_1.default(subscription['getKey']('p256dh')),
-                fcmSenderId: fcmSenderId,
-                fcmToken: fcmToken,
-                fcmPushSet: fcmPushSet,
-                createTime: Date.now()
-            };
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_TOKEN_OBJ_STORE], _this.TRANSACTION_READ_WRITE);
-                var objectStore = transaction.objectStore(FCM_TOKEN_OBJ_STORE);
-                var request = objectStore.put(details);
-                request.onerror = function (event) {
-                    reject(event.target.error);
+    TokenDetailsModel.prototype.saveTokenDetails = function (tokenDetails) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var details;
+            return tslib_1.__generator(this, function (_a) {
+                if (!tokenDetails.swScope) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_SCOPE);
+                }
+                if (!tokenDetails.vapidKey) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_VAPID_KEY);
+                }
+                if (!tokenDetails.subscription) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_SUBSCRIPTION);
+                }
+                if (!tokenDetails.fcmSenderId) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_SENDER_ID);
+                }
+                if (!tokenDetails.fcmToken) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_TOKEN);
+                }
+                if (!tokenDetails.fcmPushSet) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_PUSH_SET);
+                }
+                this.validateInputs(tokenDetails);
+                details = {
+                    swScope: tokenDetails.swScope,
+                    vapidKey: array_buffer_to_base64_1.arrayBufferToBase64(tokenDetails.vapidKey),
+                    endpoint: tokenDetails.subscription.endpoint,
+                    auth: array_buffer_to_base64_1.arrayBufferToBase64(tokenDetails.subscription.getKey('auth')),
+                    p256dh: array_buffer_to_base64_1.arrayBufferToBase64(tokenDetails.subscription.getKey('p256dh')),
+                    fcmSenderId: tokenDetails.fcmSenderId,
+                    fcmToken: tokenDetails.fcmToken,
+                    fcmPushSet: tokenDetails.fcmPushSet,
+                    createTime: Date.now()
                 };
-                request.onsuccess = function (event) {
-                    resolve();
-                };
+                return [2 /*return*/, this.put(details)];
             });
@@ -255,30 +176,26 @@ });
      * method for deleting at a later date.
-     * @return {Promise<Object>} Resolves once the FCM token details have been
-     * deleted and returns the deleted details.
+     *
+     * @return Resolves once the FCM token details have been deleted and returns
+     * the deleted details.
      */
     TokenDetailsModel.prototype.deleteToken = function (token) {
-        var _this = this;
-        if (typeof token !== 'string' || token.length === 0) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.INVALID_DELETE_TOKEN));
-        }
-        return this.getTokenDetailsFromToken(token).then(function (details) {
-            if (!details) {
-                throw _this.errorFactory_.create(errors_1.default.codes.DELETE_TOKEN_NOT_FOUND);
-            }
-            return _this.openDatabase().then(function (db) {
-                return new Promise(function (resolve, reject) {
-                    var transaction = db.transaction([FCM_TOKEN_OBJ_STORE], _this.TRANSACTION_READ_WRITE);
-                    var objectStore = transaction.objectStore(FCM_TOKEN_OBJ_STORE);
-                    var request = objectStore.delete(details['swScope']);
-                    request.onerror = function (event) {
-                        reject(event.target.error);
-                    };
-                    request.onsuccess = function (event) {
-                        if (event.target.result === 0) {
-                            reject(_this.errorFactory_.create(errors_1.default.codes.FAILED_TO_DELETE_TOKEN));
-                            return;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var details;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (typeof token !== 'string' || token.length === 0) {
+                            return [2 /*return*/, Promise.reject(this.errorFactory.create(errors_1.ERROR_CODES.INVALID_DELETE_TOKEN))];
                         }
-                        resolve(details);
-                    };
-                });
+                        return [4 /*yield*/, this.getTokenDetailsFromToken(token)];
+                    case 1:
+                        details = _a.sent();
+                        if (!details) {
+                            throw this.errorFactory.create(errors_1.ERROR_CODES.DELETE_TOKEN_NOT_FOUND);
+                        }
+                        return [4 /*yield*/, this.delete(details.swScope)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, details];
+                }
             });
@@ -288,5 +205,16 @@ });
     return TokenDetailsModel;
-}(db_interface_1.default));
-exports.default = TokenDetailsModel;
+}(db_interface_1.DBInterface));
+exports.TokenDetailsModel = TokenDetailsModel;
+/** Promisifies an IDBRequest. Resolves with the IDBRequest's result. */
+function promisify(request) {
+    return new Promise(function (resolve, reject) {
+        request.onsuccess = function () {
+            resolve(request.result);
+        };
+        request.onerror = function () {
+            reject(request.error);
+        };
+    });
+}
 
 //# sourceMappingURL=token-details-model.js.map

dist/cjs/src/models/vapid-details-model.d.ts

@@ -1,14 +0,12 @@
-import DBInterface from './db-interface';
-export default class VapidDetailsModel extends DBInterface {
-    constructor();
+import { DBInterface } from './db-interface';
+export declare class VapidDetailsModel extends DBInterface {
+    protected readonly dbName: string;
+    protected readonly dbVersion: number;
+    protected readonly objectStoreName: string;
+    protected onDbUpgrade(db: IDBDatabase): void;
     /**
-     * @override
-     * @param {IDBDatabase} db
-     */
-    onDBUpgrade(db: any): void;
-    /**
      * Given a service worker scope, this method will look up the vapid key
      * in indexedDB.
      */
-    getVapidFromSWScope(swScope: string): Promise<Uint8Array>;
+    getVapidFromSWScope(swScope: string): Promise<Uint8Array | undefined>;
     /**
@@ -15,0 +13,0 @@ * Save a vapid key against a swScope for later date.

dist/cjs/src/models/vapid-details-model.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,3 +17,2 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -22,5 +22,2 @@ var tslib_1 = require("tslib");
 var errors_1 = require("./errors");
-var FCM_VAPID_OBJ_STORE = 'fcm_vapid_object_Store';
-var DB_NAME = 'fcm_vapid_details_db';
-var DB_VERSION = 1;
 var UNCOMPRESSED_PUBLIC_KEY_SIZE = 65;
@@ -30,12 +27,10 @@ var VapidDetailsModel = /** @class */ (function (_super) {
     function VapidDetailsModel() {
-        return _super.call(this, DB_NAME, DB_VERSION) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.dbName = 'fcm_vapid_details_db';
+        _this.dbVersion = 1;
+        _this.objectStoreName = 'fcm_vapid_object_Store';
+        return _this;
     }
-    /**
-     * @override
-     * @param {IDBDatabase} db
-     */
-    VapidDetailsModel.prototype.onDBUpgrade = function (db) {
-        db.createObjectStore(FCM_VAPID_OBJ_STORE, {
-            keyPath: 'swScope'
-        });
+    VapidDetailsModel.prototype.onDbUpgrade = function (db) {
+        db.createObjectStore(this.objectStoreName, { keyPath: 'swScope' });
     };
@@ -47,21 +42,15 @@ /**
     VapidDetailsModel.prototype.getVapidFromSWScope = function (swScope) {
-        if (typeof swScope !== 'string' || swScope.length === 0) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_SCOPE));
-        }
-        return this.openDatabase().then(function (db) {
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_VAPID_OBJ_STORE]);
-                var objectStore = transaction.objectStore(FCM_VAPID_OBJ_STORE);
-                var scopeRequest = objectStore.get(swScope);
-                scopeRequest.onerror = function () {
-                    reject(scopeRequest.error);
-                };
-                scopeRequest.onsuccess = function () {
-                    var result = scopeRequest.result;
-                    var vapidKey = null;
-                    if (result) {
-                        vapidKey = result.vapidKey;
-                    }
-                    resolve(vapidKey);
-                };
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (typeof swScope !== 'string' || swScope.length === 0) {
+                            throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_SCOPE);
+                        }
+                        return [4 /*yield*/, this.get(swScope)];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, result ? result.vapidKey : undefined];
+                }
             });
@@ -74,24 +63,16 @@ });
     VapidDetailsModel.prototype.saveVapidDetails = function (swScope, vapidKey) {
-        var _this = this;
-        if (typeof swScope !== 'string' || swScope.length === 0) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_SCOPE));
-        }
-        if (vapidKey === null || vapidKey.length !== UNCOMPRESSED_PUBLIC_KEY_SIZE) {
-            return Promise.reject(this.errorFactory_.create(errors_1.default.codes.BAD_VAPID_KEY));
-        }
-        var details = {
-            swScope: swScope,
-            vapidKey: vapidKey
-        };
-        return this.openDatabase().then(function (db) {
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_VAPID_OBJ_STORE], _this.TRANSACTION_READ_WRITE);
-                var objectStore = transaction.objectStore(FCM_VAPID_OBJ_STORE);
-                var request = objectStore.put(details);
-                request.onerror = function () {
-                    reject(request.error);
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var details;
+            return tslib_1.__generator(this, function (_a) {
+                if (typeof swScope !== 'string' || swScope.length === 0) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_SCOPE);
+                }
+                if (vapidKey === null || vapidKey.length !== UNCOMPRESSED_PUBLIC_KEY_SIZE) {
+                    throw this.errorFactory.create(errors_1.ERROR_CODES.BAD_VAPID_KEY);
+                }
+                details = {
+                    swScope: swScope,
+                    vapidKey: vapidKey
                 };
-                request.onsuccess = function () {
-                    resolve();
-                };
+                return [2 /*return*/, this.put(details)];
             });
@@ -106,23 +87,17 @@ });
     VapidDetailsModel.prototype.deleteVapidDetails = function (swScope) {
-        var _this = this;
-        return this.getVapidFromSWScope(swScope).then(function (vapidKey) {
-            if (!vapidKey) {
-                throw _this.errorFactory_.create(errors_1.default.codes.DELETE_SCOPE_NOT_FOUND);
-            }
-            return _this.openDatabase().then(function (db) {
-                return new Promise(function (resolve, reject) {
-                    var transaction = db.transaction([FCM_VAPID_OBJ_STORE], _this.TRANSACTION_READ_WRITE);
-                    var objectStore = transaction.objectStore(FCM_VAPID_OBJ_STORE);
-                    var request = objectStore.delete(swScope);
-                    request.onerror = function () {
-                        reject(request.error);
-                    };
-                    request.onsuccess = function () {
-                        if (request.result === 0) {
-                            reject(_this.errorFactory_.create(errors_1.default.codes.FAILED_DELETE_VAPID_KEY));
-                            return;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var vapidKey;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getVapidFromSWScope(swScope)];
+                    case 1:
+                        vapidKey = _a.sent();
+                        if (!vapidKey) {
+                            throw this.errorFactory.create(errors_1.ERROR_CODES.DELETE_SCOPE_NOT_FOUND);
                         }
-                        resolve(vapidKey);
-                    };
-                });
+                        return [4 /*yield*/, this.delete(swScope)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, vapidKey];
+                }
             });
@@ -132,5 +107,5 @@ });
     return VapidDetailsModel;
-}(db_interface_1.default));
-exports.default = VapidDetailsModel;
+}(db_interface_1.DBInterface));
+exports.VapidDetailsModel = VapidDetailsModel;
 
 //# sourceMappingURL=vapid-details-model.js.map

dist/cjs/src/models/worker-page-message.d.ts

@@ -1,14 +0,26 @@
-declare const _default: {
-    PARAMS: {
-        TYPE_OF_MSG: string;
-        DATA: string;
-    };
-    TYPES_OF_MSG: {
-        PUSH_MSG_RECEIVED: string;
-        NOTIFICATION_CLICKED: string;
-    };
-    createNewMsg: (msgType: any, msgData: any) => {
-        [x: string]: any;
-    };
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const PARAMS: {
+    TYPE_OF_MSG: string;
+    DATA: string;
 };
-export default _default;
+export declare const TYPES_OF_MSG: {
+    PUSH_MSG_RECEIVED: string;
+    NOTIFICATION_CLICKED: string;
+};
+export declare function createNewMsg(msgType: any, msgData: any): {
+    [key: string]: any;
+};

dist/cjs/src/models/worker-page-message.js

@@ -0,1 +1,2 @@
+"use strict";
 /**
@@ -16,7 +17,6 @@ * Copyright 2017 Google Inc.
  */
-'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 // These fields are strings to prevent closure from thinking goog.getMsg
 // should be used to initialise the values
-var PARAMS = {
+exports.PARAMS = {
     TYPE_OF_MSG: 'firebase-messaging-msg-type',
@@ -27,20 +27,15 @@ DATA: 'firebase-messaging-msg-data'
 // expects the variable to be defined via goog.getMsg
-var msgType = {
+exports.TYPES_OF_MSG = {
     PUSH_MSG_RECEIVED: 'push-msg-received',
     NOTIFICATION_CLICKED: 'notification-clicked'
 };
-var createNewMsg = function (msgType, msgData) {
-    var message = (_a = {},
-        _a[PARAMS.TYPE_OF_MSG] = msgType,
-        _a[PARAMS.DATA] = msgData,
-        _a);
-    return message;
+function createNewMsg(msgType, msgData) {
+    return _a = {},
+        _a[exports.PARAMS.TYPE_OF_MSG] = msgType,
+        _a[exports.PARAMS.DATA] = msgData,
+        _a;
     var _a;
-};
-exports.default = {
-    PARAMS: PARAMS,
-    TYPES_OF_MSG: msgType,
-    createNewMsg: createNewMsg
-};
+}
+exports.createNewMsg = createNewMsg;
 
 //# sourceMappingURL=worker-page-message.js.map

dist/esm/index.d.ts

@@ -0,3 +1,4 @@
+import { _FirebaseNamespace } from '@firebase/app-types/private';
 import * as types from '@firebase/messaging-types';
-export declare function registerMessaging(instance: any): void;
+export declare function registerMessaging(instance: _FirebaseNamespace): void;
 /**
@@ -4,0 +5,0 @@ * Define extension behavior of `registerMessaging`

dist/esm/index.js

@@ -16,6 +16,5 @@ /**
  */
-'use strict';
-import WindowController from './src/controllers/window-controller';
-import SWController from './src/controllers/sw-controller';
 import { firebase } from '@firebase/app';
+import { SWController } from './src/controllers/sw-controller';
+import { WindowController } from './src/controllers/window-controller';
 export function registerMessaging(instance) {
@@ -22,0 +21,0 @@ var messagingName = 'messaging';

dist/esm/src/controllers/controller-interface.d.ts

@@ -1,18 +0,34 @@
-import TokenDetailsModel from '../models/token-details-model';
-import VapidDetailsModel from '../models/vapid-details-model';
-import IIDModel from '../models/iid-model';
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { FirebaseApp } from '@firebase/app-types';
+import { ErrorFactory, NextFn, PartialObserver } from '@firebase/util';
+import { IIDModel } from '../models/iid-model';
+import { TokenDetailsModel } from '../models/token-details-model';
+import { VapidDetailsModel } from '../models/vapid-details-model';
 export declare const TOKEN_EXPIRATION_MILLIS: number;
-export default class ControllerInterface {
-    app: any;
+export declare abstract class ControllerInterface {
+    app: FirebaseApp;
     INTERNAL: any;
-    protected errorFactory_: any;
-    private messagingSenderId_;
-    private tokenDetailsModel_;
-    private vapidDetailsModel_;
-    private iidModel_;
+    protected errorFactory_: ErrorFactory<string>;
+    private readonly messagingSenderId_;
+    private readonly tokenDetailsModel_;
+    private readonly vapidDetailsModel_;
+    private readonly iidModel_;
     /**
      * An interface of the Messaging Service API
-     * @param {!firebase.app.App} app
      */
-    constructor(app: any);
+    constructor(app: FirebaseApp);
     /**
@@ -32,3 +48,2 @@ * @export
     private manageExistingToken(swReg, pushSubscription, publicVapidKey, tokenDetails);
-    private isTokenStillValid(pushSubscription, publicVapidKey, tokenDetails);
     private updateToken(swReg, pushSubscription, publicVapidKey, tokenDetails);
@@ -43,45 +58,22 @@ private getNewToken(swReg, pushSubscription, publicVapidKey);
      */
-    deleteToken(token: string): Promise<Boolean>;
-    getSWRegistration_(): Promise<ServiceWorkerRegistration>;
-    getPublicVapidKey_(): Promise<Uint8Array>;
-    requestPermission(): void;
+    deleteToken(token: string): Promise<boolean>;
     /**
+     * This method will delete the token from the client database, and make a
+     * call to FCM to remove it from the server DB. Does not temper with the
+     * push subscription.
+     */
+    private deleteTokenFromDB(token);
+    abstract getSWRegistration_(): Promise<ServiceWorkerRegistration>;
+    abstract getPublicVapidKey_(): Promise<Uint8Array>;
+    /**
      * Gets a PushSubscription for the current user.
      */
     getPushSubscription(swRegistration: ServiceWorkerRegistration, publicVapidKey: Uint8Array): Promise<PushSubscription>;
+    requestPermission(): void;
+    useServiceWorker(registration: ServiceWorkerRegistration): void;
+    usePublicVapidKey(b64PublicKey: string): void;
+    onMessage(nextOrObserver: NextFn<{}> | PartialObserver<{}>, error?: (e: Error) => void, completed?: () => void): void;
+    onTokenRefresh(nextOrObserver: NextFn<{}> | PartialObserver<{}>, error?: (e: Error) => void, completed?: () => void): void;
+    setBackgroundMessageHandler(callback: (a: any) => any): void;
     /**
-     * @export
-     * @param {!ServiceWorkerRegistration} registration
-     */
-    useServiceWorker(registration: any): void;
-    /**
-     * @export
-     * @param {!string} b64PublicKey
-     */
-    usePublicVapidKey(b64PublicKey: any): void;
-    /**
-     * @export
-     * @param {!firebase.Observer|function(*)} nextOrObserver
-     * @param {function(!Error)=} optError
-     * @param {function()=} optCompleted
-     * @return {!function()}
-     */
-    onMessage(nextOrObserver: any, optError: any, optCompleted: any): void;
-    /**
-     * @export
-     * @param {!firebase.Observer|function()} nextOrObserver An observer object
-     * or a function triggered on token refresh.
-     * @param {function(!Error)=} optError Optional A function
-     * triggered on token refresh error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
-     */
-    onTokenRefresh(nextOrObserver: any, optError: any, optCompleted: any): void;
-    /**
-     * @export
-     * @param {function(Object)} callback
-     */
-    setBackgroundMessageHandler(callback: any): void;
-    /**
      * This method is required to adhere to the Firebase interface.
@@ -96,3 +88,3 @@ * It closes any currently open indexdb database connections.
      */
-    getNotificationPermission_(): any;
+    getNotificationPermission_(): NotificationPermission;
     getTokenDetailsModel(): TokenDetailsModel;
@@ -102,5 +94,4 @@ getVapidDetailsModel(): VapidDetailsModel;
      * @protected
-     * @returns {IIDModel}
      */
     getIIDModel(): IIDModel;
 }

dist/esm/src/controllers/controller-interface.js

@@ -16,11 +16,9 @@ /**
  */
-'use strict';
 import * as tslib_1 from "tslib";
 import { ErrorFactory } from '@firebase/util';
-import Errors from '../models/errors';
-import TokenDetailsModel from '../models/token-details-model';
-import VapidDetailsModel from '../models/vapid-details-model';
-import NOTIFICATION_PERMISSION from '../models/notification-permission';
-import IIDModel from '../models/iid-model';
-import arrayBufferToBase64 from '../helpers/array-buffer-to-base64';
+import { arrayBufferToBase64 } from '../helpers/array-buffer-to-base64';
+import { ERROR_CODES, ERROR_MAP } from '../models/errors';
+import { IIDModel } from '../models/iid-model';
+import { TokenDetailsModel } from '../models/token-details-model';
+import { VapidDetailsModel } from '../models/vapid-details-model';
 var SENDER_ID_OPTION_NAME = 'messagingSenderId';
@@ -32,10 +30,9 @@ // Database cache should be invalidated once a week.
      * An interface of the Messaging Service API
-     * @param {!firebase.app.App} app
      */
     function ControllerInterface(app) {
         var _this = this;
-        this.errorFactory_ = new ErrorFactory('messaging', 'Messaging', Errors.map);
+        this.errorFactory_ = new ErrorFactory('messaging', 'Messaging', ERROR_MAP);
         if (!app.options[SENDER_ID_OPTION_NAME] ||
             typeof app.options[SENDER_ID_OPTION_NAME] !== 'string') {
-            throw this.errorFactory_.create(Errors.codes.BAD_SENDER_ID);
+            throw this.errorFactory_.create(ERROR_CODES.BAD_SENDER_ID);
         }
@@ -60,5 +57,5 @@ this.messagingSenderId_ = app.options[SENDER_ID_OPTION_NAME];
                         currentPermission = this.getNotificationPermission_();
-                        if (currentPermission !== NOTIFICATION_PERMISSION.granted) {
-                            if (currentPermission === NOTIFICATION_PERMISSION.denied) {
-                                return [2 /*return*/, Promise.reject(this.errorFactory_.create(Errors.codes.NOTIFICATIONS_BLOCKED))];
+                        if (currentPermission !== 'granted') {
+                            if (currentPermission === 'denied') {
+                                return [2 /*return*/, Promise.reject(this.errorFactory_.create(ERROR_CODES.NOTIFICATIONS_BLOCKED))];
                             }
@@ -103,7 +100,7 @@ // We must wait for permission to be granted
                     case 0:
-                        isTokenValid = this.isTokenStillValid(pushSubscription, publicVapidKey, tokenDetails);
+                        isTokenValid = isTokenStillValid(pushSubscription, publicVapidKey, tokenDetails);
                         if (isTokenValid) {
                             now = Date.now();
-                            if (now < tokenDetails['createTime'] + TOKEN_EXPIRATION_MILLIS) {
-                                return [2 /*return*/, tokenDetails['fcmToken']];
+                            if (now < tokenDetails.createTime + TOKEN_EXPIRATION_MILLIS) {
+                                return [2 /*return*/, tokenDetails.fcmToken];
                             }
@@ -115,7 +112,11 @@ else {
                         // If the token is no longer valid (for example if the VAPID details
-                        // have changed), delete the existing token, and create a new one.
-                        return [4 /*yield*/, this.deleteToken(tokenDetails['fcmToken'])];
+                        // have changed), delete the existing token from the FCM client and server
+                        // database. No need to unsubscribe from the Service Worker as we have a
+                        // good push subscription that we'd like to use in getNewToken.
+                        return [4 /*yield*/, this.deleteTokenFromDB(tokenDetails.fcmToken)];
                     case 1:
                         // If the token is no longer valid (for example if the VAPID details
-                        // have changed), delete the existing token, and create a new one.
+                        // have changed), delete the existing token from the FCM client and server
+                        // database. No need to unsubscribe from the Service Worker as we have a
+                        // good push subscription that we'd like to use in getNewToken.
                         _a.sent();
@@ -127,17 +128,2 @@ return [2 /*return*/, this.getNewToken(swReg, pushSubscription, publicVapidKey)];
     };
-    /*
-     * Checks if the tokenDetails match the details provided in the clients.
-     */
-    ControllerInterface.prototype.isTokenStillValid = function (pushSubscription, publicVapidKey, tokenDetails) {
-        if (arrayBufferToBase64(publicVapidKey) !== tokenDetails['vapidKey']) {
-            return false;
-        }
-        // getKey() isn't defined in the PushSubscription externs file, hence
-        // subscription['getKey']('<key name>').
-        return (pushSubscription.endpoint === tokenDetails['endpoint'] &&
-            arrayBufferToBase64(pushSubscription['getKey']('auth')) ===
-                tokenDetails['auth'] &&
-            arrayBufferToBase64(pushSubscription['getKey']('p256dh')) ===
-                tokenDetails['p256dh']);
-    };
     ControllerInterface.prototype.updateToken = function (swReg, pushSubscription, publicVapidKey, tokenDetails) {
@@ -150,3 +136,3 @@ return tslib_1.__awaiter(this, void 0, void 0, function () {
                         _a.trys.push([0, 4, , 6]);
-                        return [4 /*yield*/, this.iidModel_.updateToken(this.messagingSenderId_, tokenDetails['fcmToken'], tokenDetails['fcmPushSet'], pushSubscription, publicVapidKey)];
+                        return [4 /*yield*/, this.iidModel_.updateToken(this.messagingSenderId_, tokenDetails.fcmToken, tokenDetails.fcmPushSet, pushSubscription, publicVapidKey)];
                     case 1:
@@ -160,3 +146,3 @@ updatedToken = _a.sent();
                             fcmToken: updatedToken,
-                            fcmPushSet: tokenDetails['fcmPushSet']
+                            fcmPushSet: tokenDetails.fcmPushSet
                         };
@@ -172,3 +158,3 @@ return [4 /*yield*/, this.tokenDetailsModel_.saveTokenDetails(allDetails)];
                         e_1 = _a.sent();
-                        return [4 /*yield*/, this.deleteToken(tokenDetails['fcmToken'])];
+                        return [4 /*yield*/, this.deleteToken(tokenDetails.fcmToken)];
                     case 5:
@@ -195,4 +181,4 @@ _a.sent();
                             fcmSenderId: this.messagingSenderId_,
-                            fcmToken: tokenDetails['token'],
-                            fcmPushSet: tokenDetails['pushSet']
+                            fcmToken: tokenDetails.token,
+                            fcmPushSet: tokenDetails.pushSet
                         };
@@ -205,3 +191,3 @@ return [4 /*yield*/, this.tokenDetailsModel_.saveTokenDetails(allDetails)];
                         _a.sent();
-                        return [2 /*return*/, tokenDetails['token']];
+                        return [2 /*return*/, tokenDetails.token];
                 }
@@ -219,18 +205,47 @@ });
     ControllerInterface.prototype.deleteToken = function (token) {
-        var _this = this;
-        return this.tokenDetailsModel_
-            .deleteToken(token)
-            .then(function (details) {
-            return _this.iidModel_.deleteToken(details['fcmSenderId'], details['fcmToken'], details['fcmPushSet']);
-        })
-            .then(function () {
-            return _this.getSWRegistration_()
-                .then(function (registration) {
-                if (registration) {
-                    return registration.pushManager.getSubscription();
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var registration, pushSubscription;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: 
+                    // Delete the token details from the database.
+                    return [4 /*yield*/, this.deleteTokenFromDB(token)];
+                    case 1:
+                        // Delete the token details from the database.
+                        _a.sent();
+                        return [4 /*yield*/, this.getSWRegistration_()];
+                    case 2:
+                        registration = _a.sent();
+                        if (!registration) return [3 /*break*/, 4];
+                        return [4 /*yield*/, registration.pushManager.getSubscription()];
+                    case 3:
+                        pushSubscription = _a.sent();
+                        if (pushSubscription) {
+                            return [2 /*return*/, pushSubscription.unsubscribe()];
+                        }
+                        _a.label = 4;
+                    case 4: 
+                    // If there's no SW, consider it a success.
+                    return [2 /*return*/, true];
                 }
-            })
-                .then(function (subscription) {
-                if (subscription) {
-                    return subscription.unsubscribe();
+            });
+        });
+    };
+    /**
+     * This method will delete the token from the client database, and make a
+     * call to FCM to remove it from the server DB. Does not temper with the
+     * push subscription.
+     */
+    ControllerInterface.prototype.deleteTokenFromDB = function (token) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var details;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.tokenDetailsModel_.deleteToken(token)];
+                    case 1:
+                        details = _a.sent();
+                        return [4 /*yield*/, this.iidModel_.deleteToken(details.fcmSenderId, details.fcmToken, details.fcmPushSet)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/];
                 }
@@ -240,14 +255,2 @@ });
     };
-    ControllerInterface.prototype.getSWRegistration_ = function () {
-        throw this.errorFactory_.create(Errors.codes.SHOULD_BE_INHERITED);
-    };
-    ControllerInterface.prototype.getPublicVapidKey_ = function () {
-        throw this.errorFactory_.create(Errors.codes.SHOULD_BE_INHERITED);
-    };
-    //
-    // The following methods should only be available in the window.
-    //
-    ControllerInterface.prototype.requestPermission = function () {
-        throw this.errorFactory_.create(Errors.codes.AVAILABLE_IN_WINDOW);
-    };
     /**
@@ -267,38 +270,19 @@ * Gets a PushSubscription for the current user.
     };
-    /**
-     * @export
-     * @param {!ServiceWorkerRegistration} registration
-     */
+    //
+    // The following methods should only be available in the window.
+    //
+    ControllerInterface.prototype.requestPermission = function () {
+        throw this.errorFactory_.create(ERROR_CODES.AVAILABLE_IN_WINDOW);
+    };
     ControllerInterface.prototype.useServiceWorker = function (registration) {
-        throw this.errorFactory_.create(Errors.codes.AVAILABLE_IN_WINDOW);
+        throw this.errorFactory_.create(ERROR_CODES.AVAILABLE_IN_WINDOW);
     };
-    /**
-     * @export
-     * @param {!string} b64PublicKey
-     */
     ControllerInterface.prototype.usePublicVapidKey = function (b64PublicKey) {
-        throw this.errorFactory_.create(Errors.codes.AVAILABLE_IN_WINDOW);
+        throw this.errorFactory_.create(ERROR_CODES.AVAILABLE_IN_WINDOW);
     };
-    /**
-     * @export
-     * @param {!firebase.Observer|function(*)} nextOrObserver
-     * @param {function(!Error)=} optError
-     * @param {function()=} optCompleted
-     * @return {!function()}
-     */
-    ControllerInterface.prototype.onMessage = function (nextOrObserver, optError, optCompleted) {
-        throw this.errorFactory_.create(Errors.codes.AVAILABLE_IN_WINDOW);
+    ControllerInterface.prototype.onMessage = function (nextOrObserver, error, completed) {
+        throw this.errorFactory_.create(ERROR_CODES.AVAILABLE_IN_WINDOW);
     };
-    /**
-     * @export
-     * @param {!firebase.Observer|function()} nextOrObserver An observer object
-     * or a function triggered on token refresh.
-     * @param {function(!Error)=} optError Optional A function
-     * triggered on token refresh error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
-     */
-    ControllerInterface.prototype.onTokenRefresh = function (nextOrObserver, optError, optCompleted) {
-        throw this.errorFactory_.create(Errors.codes.AVAILABLE_IN_WINDOW);
+    ControllerInterface.prototype.onTokenRefresh = function (nextOrObserver, error, completed) {
+        throw this.errorFactory_.create(ERROR_CODES.AVAILABLE_IN_WINDOW);
     };
@@ -308,8 +292,4 @@ //
     //
-    /**
-     * @export
-     * @param {function(Object)} callback
-     */
     ControllerInterface.prototype.setBackgroundMessageHandler = function (callback) {
-        throw this.errorFactory_.create(Errors.codes.AVAILABLE_IN_SW);
+        throw this.errorFactory_.create(ERROR_CODES.AVAILABLE_IN_SW);
     };
@@ -346,3 +326,2 @@ //
      * @protected
-     * @returns {IIDModel}
      */
@@ -354,4 +333,19 @@ ControllerInterface.prototype.getIIDModel = function () {
 }());
-export default ControllerInterface;
+export { ControllerInterface };
+/**
+ * Checks if the tokenDetails match the details provided in the clients.
+ */
+function isTokenStillValid(pushSubscription, publicVapidKey, tokenDetails) {
+    if (arrayBufferToBase64(publicVapidKey) !== tokenDetails.vapidKey) {
+        return false;
+    }
+    // getKey() isn't defined in the PushSubscription externs file, hence
+    // subscription.getKey('<key name>').
+    return (pushSubscription.endpoint === tokenDetails.endpoint &&
+        arrayBufferToBase64(pushSubscription.getKey('auth')) ===
+            tokenDetails.auth &&
+        arrayBufferToBase64(pushSubscription.getKey('p256dh')) ===
+            tokenDetails.p256dh);
+}
 
 //# sourceMappingURL=controller-interface.js.map

dist/esm/src/controllers/sw-controller.d.ts

@@ -1,5 +0,22 @@
-import ControllerInterface from './controller-interface';
-export default class SWController extends ControllerInterface {
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { FirebaseApp } from '@firebase/app-types';
+import { ControllerInterface } from './controller-interface';
+export declare type BgMessageHandler = (input: any) => Promise<any>;
+export declare class SWController extends ControllerInterface {
     private bgMessageHandler_;
-    constructor(app: any);
+    constructor(app: FirebaseApp);
     /**
@@ -16,20 +33,8 @@ * A handler for push events that shows notifications based on the content of
      * shown.
-     * @private
      */
     onPush_(event: any): void;
-    /**
-     * @private
-     */
     onSubChange_(event: any): void;
-    /**
-     * @private
-     */
     onNotificationClick_(event: any): void;
+    getNotificationData_(msgPayload: any): NotificationOptions | undefined;
     /**
-     * @private
-     * @param {Object} msgPayload
-     * @return {NotificationOptions|undefined}
-     */
-    getNotificationData_(msgPayload: any): any;
-    /**
      * Calling setBackgroundMessageHandler will opt in to some specific
@@ -44,46 +49,38 @@ * behaviours.
      * developer can handle them in a their own 'push' event callback
-     * @export
-     * @param {function(Object)} callback The callback to be called when a push
-     * message is received and a notification must be shown. The callback will
-     * be given the data from the push message.
+     *
+     * @param callback The callback to be called when a push message is received
+     * and a notification must be shown. The callback will be given the data from
+     * the push message.
      */
-    setBackgroundMessageHandler(callback: any): void;
+    setBackgroundMessageHandler(callback: BgMessageHandler): void;
     /**
-     * @private
-     * @param {string} url The URL to look for when focusing a client.
-     * @return {Object} Returns an existing window client or a newly opened
-     * WindowClient.
+     * @param url The URL to look for when focusing a client.
+     * @return Returns an existing window client or a newly opened WindowClient.
      */
-    getWindowClient_(url: any): any;
+    getWindowClient_(url: string): Promise<any>;
     /**
      * This message will attempt to send the message to a window client.
-     * @private
-     * @param {Object} client The WindowClient to send the message to.
-     * @param {Object} message The message to send to the client.
-     * @returns {Promise} Returns a promise that resolves after sending the
-     * message. This does not guarantee that the message was successfully
-     * received.
+     * @param client The WindowClient to send the message to.
+     * @param message The message to send to the client.
+     * @returns Returns a promise that resolves after sending the message. This
+     * does not guarantee that the message was successfully received.
      */
-    attemptToMessageClient_(client: any, message: any): Promise<never>;
+    attemptToMessageClient_(client: any, message: any): Promise<void>;
     /**
-     * @private
-     * @returns {Promise<boolean>} If there is currently a visible WindowClient,
-     * this method will resolve to true, otherwise false.
+     * @returns If there is currently a visible WindowClient, this method will
+     * resolve to true, otherwise false.
      */
-    hasVisibleClients_(): any;
+    hasVisibleClients_(): Promise<boolean>;
     /**
-     * @private
-     * @param {Object} msgPayload The data from the push event that should be sent
-     * to all available pages.
-     * @returns {Promise} Returns a promise that resolves once the message
-     * has been sent to all WindowClients.
+     * @param msgPayload The data from the push event that should be sent to all
+     * available pages.
+     * @returns Returns a promise that resolves once the message has been sent to
+     * all WindowClients.
      */
-    sendMessageToWindowClients_(msgPayload: any): any;
+    sendMessageToWindowClients_(msgPayload: any): Promise<void>;
     /**
      * This will register the default service worker and return the registration.
-     * @private
-     * @return {Promise<!ServiceWorkerRegistration>} The service worker
-     * registration to be used for the push service.
+     * @return he service worker registration to be used for the push service.
      */
-    getSWRegistration_(): Promise<any>;
+    getSWRegistration_(): Promise<ServiceWorkerRegistration>;
     /**
@@ -90,0 +87,0 @@ * This will return the default VAPID key or the uint8array version of the

dist/esm/src/controllers/sw-controller.js

@@ -16,8 +16,7 @@ /**
  */
-'use strict';
 import * as tslib_1 from "tslib";
-import ControllerInterface from './controller-interface';
-import Errors from '../models/errors';
-import FCMDetails from '../models/fcm-details';
-import WorkerPageMessage from '../models/worker-page-message';
+import { ERROR_CODES } from '../models/errors';
+import { DEFAULT_PUBLIC_VAPID_KEY } from '../models/fcm-details';
+import * as WorkerPageMessage from '../models/worker-page-message';
+import { ControllerInterface } from './controller-interface';
 var FCM_MSG = 'FCM_MSG';
@@ -28,10 +27,12 @@ var SWController = /** @class */ (function (_super) {
         var _this = _super.call(this, app) || this;
-        self.addEventListener('push', function (e) { return _this.onPush_(e); }, false);
-        self.addEventListener('pushsubscriptionchange', function (e) { return _this.onSubChange_(e); }, false);
-        self.addEventListener('notificationclick', function (e) { return _this.onNotificationClick_(e); }, false);
-        /**
-         * @private
-         * @type {function(Object)|null}
-         */
         _this.bgMessageHandler_ = null;
+        self.addEventListener('push', function (e) {
+            _this.onPush_(e);
+        }, false);
+        self.addEventListener('pushsubscriptionchange', function (e) {
+            _this.onSubChange_(e);
+        }, false);
+        self.addEventListener('notificationclick', function (e) {
+            _this.onNotificationClick_(e);
+        }, false);
         return _this;
@@ -50,4 +51,5 @@ }
      * shown.
-     * @private
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.onPush_ = function (event) {
@@ -85,5 +87,4 @@ var _this = this;
     };
-    /**
-     * @private
-     */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.onSubChange_ = function (event) {
@@ -119,3 +120,3 @@ var _this = this;
             .catch(function (err) {
-            throw _this.errorFactory_.create(Errors.codes.UNABLE_TO_RESUBSCRIBE, {
+            throw _this.errorFactory_.create(ERROR_CODES.UNABLE_TO_RESUBSCRIBE, {
                 message: err
@@ -126,5 +127,4 @@ });
     };
-    /**
-     * @private
-     */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.onNotificationClick_ = function (event) {
@@ -174,7 +174,4 @@ var _this = this;
     };
-    /**
-     * @private
-     * @param {Object} msgPayload
-     * @return {NotificationOptions|undefined}
-     */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.getNotificationData_ = function (msgPayload) {
@@ -187,3 +184,3 @@ if (!msgPayload) {
         }
-        var notificationInformation = Object.assign({}, msgPayload.notification);
+        var notificationInformation = tslib_1.__assign({}, msgPayload.notification);
         // Put the message payload under FCM_MSG name so we can identify the
@@ -209,10 +206,10 @@ // notification as being an FCM notification vs a notification from
      * developer can handle them in a their own 'push' event callback
-     * @export
-     * @param {function(Object)} callback The callback to be called when a push
-     * message is received and a notification must be shown. The callback will
-     * be given the data from the push message.
+     *
+     * @param callback The callback to be called when a push message is received
+     * and a notification must be shown. The callback will be given the data from
+     * the push message.
      */
     SWController.prototype.setBackgroundMessageHandler = function (callback) {
         if (!callback || typeof callback !== 'function') {
-            throw this.errorFactory_.create(Errors.codes.BG_HANDLER_FUNCTION_EXPECTED);
+            throw this.errorFactory_.create(ERROR_CODES.BG_HANDLER_FUNCTION_EXPECTED);
         }
@@ -222,7 +219,7 @@ this.bgMessageHandler_ = callback;
     /**
-     * @private
-     * @param {string} url The URL to look for when focusing a client.
-     * @return {Object} Returns an existing window client or a newly opened
-     * WindowClient.
+     * @param url The URL to look for when focusing a client.
+     * @return Returns an existing window client or a newly opened WindowClient.
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.getWindowClient_ = function (url) {
@@ -254,9 +251,9 @@ // Use URL to normalize the URL when comparing to windowClients.
      * This message will attempt to send the message to a window client.
-     * @private
-     * @param {Object} client The WindowClient to send the message to.
-     * @param {Object} message The message to send to the client.
-     * @returns {Promise} Returns a promise that resolves after sending the
-     * message. This does not guarantee that the message was successfully
-     * received.
+     * @param client The WindowClient to send the message to.
+     * @param message The message to send to the client.
+     * @returns Returns a promise that resolves after sending the message. This
+     * does not guarantee that the message was successfully received.
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.attemptToMessageClient_ = function (client, message) {
@@ -268,3 +265,3 @@ return tslib_1.__awaiter(this, void 0, void 0, function () {
                 if (!client) {
-                    return [2 /*return*/, Promise.reject(this.errorFactory_.create(Errors.codes.NO_WINDOW_CLIENT_TO_MSG))];
+                    return [2 /*return*/, Promise.reject(this.errorFactory_.create(ERROR_CODES.NO_WINDOW_CLIENT_TO_MSG))];
                 }
@@ -277,6 +274,7 @@ client.postMessage(message);
     /**
-     * @private
-     * @returns {Promise<boolean>} If there is currently a visible WindowClient,
-     * this method will resolve to true, otherwise false.
+     * @returns If there is currently a visible WindowClient, this method will
+     * resolve to true, otherwise false.
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.hasVisibleClients_ = function () {
@@ -293,8 +291,9 @@ return self.clients
     /**
-     * @private
-     * @param {Object} msgPayload The data from the push event that should be sent
-     * to all available pages.
-     * @returns {Promise} Returns a promise that resolves once the message
-     * has been sent to all WindowClients.
+     * @param msgPayload The data from the push event that should be sent to all
+     * available pages.
+     * @returns Returns a promise that resolves once the message has been sent to
+     * all WindowClients.
      */
+    // Visible for testing
+    // TODO: Make private
     SWController.prototype.sendMessageToWindowClients_ = function (msgPayload) {
@@ -316,5 +315,3 @@ var _this = this;
      * This will register the default service worker and return the registration.
-     * @private
-     * @return {Promise<!ServiceWorkerRegistration>} The service worker
-     * registration to be used for the push service.
+     * @return he service worker registration to be used for the push service.
      */
@@ -329,12 +326,21 @@ SWController.prototype.getSWRegistration_ = function () {
     SWController.prototype.getPublicVapidKey_ = function () {
-        var _this = this;
-        return this.getSWRegistration_()
-            .then(function (swReg) {
-            return _this.getVapidDetailsModel().getVapidFromSWScope(swReg.scope);
-        })
-            .then(function (vapidKeyFromDatabase) {
-            if (vapidKeyFromDatabase === null) {
-                return FCMDetails.DEFAULT_PUBLIC_VAPID_KEY;
-            }
-            return vapidKeyFromDatabase;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var swReg, vapidKeyFromDatabase;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getSWRegistration_()];
+                    case 1:
+                        swReg = _a.sent();
+                        if (!swReg) {
+                            throw this.errorFactory_.create(ERROR_CODES.SW_REGISTRATION_EXPECTED);
+                        }
+                        return [4 /*yield*/, this.getVapidDetailsModel().getVapidFromSWScope(swReg.scope)];
+                    case 2:
+                        vapidKeyFromDatabase = _a.sent();
+                        if (vapidKeyFromDatabase == null) {
+                            return [2 /*return*/, DEFAULT_PUBLIC_VAPID_KEY];
+                        }
+                        return [2 /*return*/, vapidKeyFromDatabase];
+                }
+            });
         });
@@ -344,4 +350,4 @@ };
 }(ControllerInterface));
-export default SWController;
+export { SWController };
 
 //# sourceMappingURL=sw-controller.js.map

dist/esm/src/controllers/window-controller.d.ts

@@ -0,4 +1,21 @@
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { FirebaseApp } from '@firebase/app-types';
 import { FirebaseMessaging } from '@firebase/messaging-types';
-import ControllerInterface from './controller-interface';
-export default class WindowController extends ControllerInterface implements FirebaseMessaging {
+import { NextFn, PartialObserver, Unsubscribe } from '@firebase/util';
+import { ControllerInterface } from './controller-interface';
+export declare class WindowController extends ControllerInterface implements FirebaseMessaging {
     private registrationToUse_;
@@ -8,10 +25,9 @@ private publicVapidKeyToUse_;
     private messageObserver_;
-    private onMessage_;
+    private readonly onMessage_;
     private tokenRefreshObserver_;
-    private onTokenRefresh_;
+    private readonly onTokenRefresh_;
     /**
      * A service that provides a MessagingService instance.
-     * @param {!firebase.app.App} app
      */
-    constructor(app: any);
+    constructor(app: FirebaseApp);
     /**
@@ -22,7 +38,7 @@ * This method returns an FCM token if it can be generated.
      * possible to generate a token.
-     * @export
-     * @return {Promise<string> | Promise<null>} Returns a promise the
-     * resolves to an FCM token or null if permission isn't granted.
+     *
+     * @return Returns a promise that resolves to an FCM token or null if
+     * permission isn't granted.
      */
-    getToken(): any;
+    getToken(): Promise<string | null>;
     /**
@@ -35,62 +51,51 @@ * The method checks that a manifest is defined and has the correct GCM
      */
-    manifestCheck_(): any;
+    manifestCheck_(): Promise<void>;
     /**
      * Request permission if it is not currently granted
-     * @export
-     * @returns {Promise} Resolves if the permission was granted, otherwise
-     * rejects
+     *
+     * @return Resolves if the permission was granted, otherwise rejects
      */
-    requestPermission(): Promise<{}>;
+    requestPermission(): Promise<void>;
     /**
      * This method allows a developer to override the default service worker and
      * instead use a custom service worker.
-     * @export
-     * @param {!ServiceWorkerRegistration} registration The service worker
-     * registration that should be used to receive the push messages.
+     *
+     * @param registration The service worker registration that should be used to
+     * receive the push messages.
      */
-    useServiceWorker(registration: any): void;
+    useServiceWorker(registration: ServiceWorkerRegistration): void;
     /**
      * This method allows a developer to override the default vapid key
      * and instead use a custom VAPID public key.
-     * @export
-     * @param {!string} publicKey A URL safe base64 encoded string.
+     *
+     * @param publicKey A URL safe base64 encoded string.
      */
-    usePublicVapidKey(publicKey: any): void;
+    usePublicVapidKey(publicKey: string): void;
     /**
      * @export
-     * @param {!firebase.Observer|function(*)} nextOrObserver An observer object
-     * or a function triggered on message.
-     * @param {function(!Error)=} optError Optional A function triggered on
-     * message error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
+     * @param nextOrObserver An observer object or a function triggered on
+     * message.
+     * @param error A function triggered on message error.
+     * @param completed function triggered when the observer is removed.
+     * @return The unsubscribe function for the observer.
      */
-    onMessage(nextOrObserver: any, optError?: any, optCompleted?: any): () => void;
+    onMessage(nextOrObserver: NextFn<{}> | PartialObserver<{}>, error?: (e: Error) => void, completed?: () => void): Unsubscribe;
     /**
-     * @export
-     * @param {!firebase.Observer|function()} nextOrObserver An observer object
-     * or a function triggered on token refresh.
-     * @param {function(!Error)=} optError Optional A function
-     * triggered on token refresh error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
+     * @param nextOrObserver An observer object or a function triggered on token
+     * refresh.
+     * @param error A function triggered on token refresh error.
+     * @param completed function triggered when the observer is removed.
+     * @return The unsubscribe function for the observer.
      */
-    onTokenRefresh(nextOrObserver: any, optError: any, optCompleted: any): () => void;
+    onTokenRefresh(nextOrObserver: NextFn<{}> | PartialObserver<{}>, error?: (e: Error) => void, completed?: () => void): Unsubscribe;
     /**
      * Given a registration, wait for the service worker it relates to
      * become activer
-     * @private
-     * @param  {ServiceWorkerRegistration} registration Registration to wait
-     * for service worker to become active
-     * @return {Promise<!ServiceWorkerRegistration>} Wait for service worker
-     * registration to become active
+     * @param registration Registration to wait for service worker to become active
+     * @return Wait for service worker registration to become active
      */
-    waitForRegistrationToActivate_(registration: any): Promise<ServiceWorkerRegistration>;
+    waitForRegistrationToActivate_(registration: ServiceWorkerRegistration): Promise<ServiceWorkerRegistration>;
     /**
-     * This will regiater the default service worker and return the registration
-     * @private
-     * @return {Promise<!ServiceWorkerRegistration>} The service worker
-     * registration to be used for the push service.
+     * This will register the default service worker and return the registration
+     * @return The service worker registration to be used for the push service.
      */
@@ -101,3 +106,2 @@ getSWRegistration_(): Promise<ServiceWorkerRegistration>;
      * provided by the developer.
-     * @private
      */
@@ -109,4 +113,2 @@ getPublicVapidKey_(): Promise<Uint8Array>;
      * events in the page.
-     *
-     * @private
      */
@@ -116,6 +118,5 @@ setupSWMessageListener_(): void;
      * Checks to see if the required API's are valid or not.
-     * @private
-     * @return {boolean} Returns true if the desired APIs are available.
+     * @return Returns true if the desired APIs are available.
      */
     isSupported_(): boolean;
 }

dist/esm/src/controllers/window-controller.js

@@ -16,12 +16,10 @@ /**
  */
-'use strict';
 import * as tslib_1 from "tslib";
-import ControllerInterface from './controller-interface';
-import Errors from '../models/errors';
-import WorkerPageMessage from '../models/worker-page-message';
-import DefaultSW from '../models/default-sw';
-import NOTIFICATION_PERMISSION from '../models/notification-permission';
-import FCMDetails from '../models/fcm-details';
-import base64ToArrayBuffer from '../helpers/base64-to-array-buffer';
 import { createSubscribe } from '@firebase/util';
+import { base64ToArrayBuffer } from '../helpers/base64-to-array-buffer';
+import { DEFAULT_SW_PATH, DEFAULT_SW_SCOPE } from '../models/default-sw';
+import { ERROR_CODES } from '../models/errors';
+import { DEFAULT_PUBLIC_VAPID_KEY } from '../models/fcm-details';
+import * as WorkerPageMessage from '../models/worker-page-message';
+import { ControllerInterface } from './controller-interface';
 var WindowController = /** @class */ (function (_super) {
@@ -31,6 +29,8 @@ tslib_1.__extends(WindowController, _super);
      * A service that provides a MessagingService instance.
-     * @param {!firebase.app.App} app
      */
     function WindowController(app) {
         var _this = _super.call(this, app) || this;
+        _this.registrationToUse_ = null;
+        _this.publicVapidKeyToUse_ = null;
+        _this.manifestCheckPromise_ = null;
         _this.messageObserver_ = null;
@@ -44,32 +44,2 @@ _this.onMessage_ = createSubscribe(function (observer) {
         });
-        /**
-         * @private
-         * @type {ServiceWorkerRegistration}
-         */
-        _this.registrationToUse_;
-        /**
-         * @private
-         * @type {Promise}
-         */
-        _this.manifestCheckPromise_;
-        /**
-         * @private
-         * @type {firebase.Observer}
-         */
-        _this.messageObserver_ = null;
-        /**
-         * @private {!firebase.Subscribe} The subscribe function to the onMessage
-         * observer.
-         */
-        _this.onMessage_ = createSubscribe(function (observer) {
-            _this.messageObserver_ = observer;
-        });
-        /**
-         * @private
-         * @type {firebase.Observer}
-         */
-        _this.tokenRefreshObserver_ = null;
-        _this.onTokenRefresh_ = createSubscribe(function (observer) {
-            _this.tokenRefreshObserver_ = observer;
-        });
         _this.setupSWMessageListener_();
@@ -83,5 +53,5 @@ return _this;
      * possible to generate a token.
-     * @export
-     * @return {Promise<string> | Promise<null>} Returns a promise the
-     * resolves to an FCM token or null if permission isn't granted.
+     *
+     * @return Returns a promise that resolves to an FCM token or null if
+     * permission isn't granted.
      */
@@ -92,3 +62,3 @@ WindowController.prototype.getToken = function () {
         if (!this.isSupported_()) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.UNSUPPORTED_BROWSER));
+            return Promise.reject(this.errorFactory_.create(ERROR_CODES.UNSUPPORTED_BROWSER));
         }
@@ -132,3 +102,3 @@ return this.manifestCheck_().then(function () {
                 if (manifestContent['gcm_sender_id'] !== '103953800507') {
-                    throw _this.errorFactory_.create(Errors.codes.INCORRECT_GCM_SENDER_ID);
+                    throw _this.errorFactory_.create(ERROR_CODES.INCORRECT_GCM_SENDER_ID);
                 }
@@ -141,5 +111,4 @@ });
      * Request permission if it is not currently granted
-     * @export
-     * @returns {Promise} Resolves if the permission was granted, otherwise
-     * rejects
+     *
+     * @return Resolves if the permission was granted, otherwise rejects
      */
@@ -150,3 +119,3 @@ WindowController.prototype.requestPermission = function () {
             return tslib_1.__generator(this, function (_a) {
-                if (Notification.permission === NOTIFICATION_PERMISSION.granted) {
+                if (Notification.permission === 'granted') {
                     return [2 /*return*/];
@@ -156,10 +125,10 @@ }
                         var managePermissionResult = function (result) {
-                            if (result === NOTIFICATION_PERMISSION.granted) {
+                            if (result === 'granted') {
                                 return resolve();
                             }
-                            else if (result === NOTIFICATION_PERMISSION.denied) {
-                                return reject(_this.errorFactory_.create(Errors.codes.PERMISSION_BLOCKED));
+                            else if (result === 'denied') {
+                                return reject(_this.errorFactory_.create(ERROR_CODES.PERMISSION_BLOCKED));
                             }
                             else {
-                                return reject(_this.errorFactory_.create(Errors.codes.PERMISSION_DEFAULT));
+                                return reject(_this.errorFactory_.create(ERROR_CODES.PERMISSION_DEFAULT));
                             }
@@ -182,12 +151,12 @@ };
      * instead use a custom service worker.
-     * @export
-     * @param {!ServiceWorkerRegistration} registration The service worker
-     * registration that should be used to receive the push messages.
+     *
+     * @param registration The service worker registration that should be used to
+     * receive the push messages.
      */
     WindowController.prototype.useServiceWorker = function (registration) {
         if (!(registration instanceof ServiceWorkerRegistration)) {
-            throw this.errorFactory_.create(Errors.codes.SW_REGISTRATION_EXPECTED);
+            throw this.errorFactory_.create(ERROR_CODES.SW_REGISTRATION_EXPECTED);
         }
-        if (typeof this.registrationToUse_ !== 'undefined') {
-            throw this.errorFactory_.create(Errors.codes.USE_SW_BEFORE_GET_TOKEN);
+        if (this.registrationToUse_ != null) {
+            throw this.errorFactory_.create(ERROR_CODES.USE_SW_BEFORE_GET_TOKEN);
         }
@@ -199,15 +168,15 @@ this.registrationToUse_ = registration;
      * and instead use a custom VAPID public key.
-     * @export
-     * @param {!string} publicKey A URL safe base64 encoded string.
+     *
+     * @param publicKey A URL safe base64 encoded string.
      */
     WindowController.prototype.usePublicVapidKey = function (publicKey) {
         if (typeof publicKey !== 'string') {
-            throw this.errorFactory_.create(Errors.codes.INVALID_PUBLIC_VAPID_KEY);
+            throw this.errorFactory_.create(ERROR_CODES.INVALID_PUBLIC_VAPID_KEY);
         }
-        if (typeof this.publicVapidKeyToUse_ !== 'undefined') {
-            throw this.errorFactory_.create(Errors.codes.USE_PUBLIC_KEY_BEFORE_GET_TOKEN);
+        if (this.publicVapidKeyToUse_ != null) {
+            throw this.errorFactory_.create(ERROR_CODES.USE_PUBLIC_KEY_BEFORE_GET_TOKEN);
         }
         var parsedKey = base64ToArrayBuffer(publicKey);
         if (parsedKey.length !== 65) {
-            throw this.errorFactory_.create(Errors.codes.PUBLIC_KEY_DECRYPTION_FAILED);
+            throw this.errorFactory_.create(ERROR_CODES.PUBLIC_KEY_DECRYPTION_FAILED);
         }
@@ -218,25 +187,30 @@ this.publicVapidKeyToUse_ = parsedKey;
      * @export
-     * @param {!firebase.Observer|function(*)} nextOrObserver An observer object
-     * or a function triggered on message.
-     * @param {function(!Error)=} optError Optional A function triggered on
-     * message error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
+     * @param nextOrObserver An observer object or a function triggered on
+     * message.
+     * @param error A function triggered on message error.
+     * @param completed function triggered when the observer is removed.
+     * @return The unsubscribe function for the observer.
      */
-    WindowController.prototype.onMessage = function (nextOrObserver, optError, optCompleted) {
-        return this.onMessage_(nextOrObserver, optError, optCompleted);
+    WindowController.prototype.onMessage = function (nextOrObserver, error, completed) {
+        if (typeof nextOrObserver === 'function') {
+            return this.onMessage_(nextOrObserver, error, completed);
+        }
+        else {
+            return this.onMessage_(nextOrObserver);
+        }
     };
     /**
-     * @export
-     * @param {!firebase.Observer|function()} nextOrObserver An observer object
-     * or a function triggered on token refresh.
-     * @param {function(!Error)=} optError Optional A function
-     * triggered on token refresh error.
-     * @param {function()=} optCompleted Optional function triggered when the
-     * observer is removed.
-     * @return {!function()} The unsubscribe function for the observer.
+     * @param nextOrObserver An observer object or a function triggered on token
+     * refresh.
+     * @param error A function triggered on token refresh error.
+     * @param completed function triggered when the observer is removed.
+     * @return The unsubscribe function for the observer.
      */
-    WindowController.prototype.onTokenRefresh = function (nextOrObserver, optError, optCompleted) {
-        return this.onTokenRefresh_(nextOrObserver, optError, optCompleted);
+    WindowController.prototype.onTokenRefresh = function (nextOrObserver, error, completed) {
+        if (typeof nextOrObserver === 'function') {
+            return this.onTokenRefresh_(nextOrObserver, error, completed);
+        }
+        else {
+            return this.onTokenRefresh_(nextOrObserver);
+        }
     };
@@ -246,8 +220,7 @@ /**
      * become activer
-     * @private
-     * @param  {ServiceWorkerRegistration} registration Registration to wait
-     * for service worker to become active
-     * @return {Promise<!ServiceWorkerRegistration>} Wait for service worker
-     * registration to become active
+     * @param registration Registration to wait for service worker to become active
+     * @return Wait for service worker registration to become active
      */
+    // Visible for testing
+    // TODO: Make private
     WindowController.prototype.waitForRegistrationToActivate_ = function (registration) {
@@ -259,3 +232,3 @@ var _this = this;
                 // This is a rare scenario but has occured in firefox
-                reject(_this.errorFactory_.create(Errors.codes.NO_SW_IN_REG));
+                reject(_this.errorFactory_.create(ERROR_CODES.NO_SW_IN_REG));
                 return;
@@ -270,3 +243,3 @@ }
             if (serviceWorker.state === 'redundant') {
-                reject(_this.errorFactory_.create(Errors.codes.SW_REG_REDUNDANT));
+                reject(_this.errorFactory_.create(ERROR_CODES.SW_REG_REDUNDANT));
                 return;
@@ -279,3 +252,3 @@ }
                 else if (serviceWorker.state === 'redundant') {
-                    reject(_this.errorFactory_.create(Errors.codes.SW_REG_REDUNDANT));
+                    reject(_this.errorFactory_.create(ERROR_CODES.SW_REG_REDUNDANT));
                 }
@@ -292,6 +265,4 @@ else {
     /**
-     * This will regiater the default service worker and return the registration
-     * @private
-     * @return {Promise<!ServiceWorkerRegistration>} The service worker
-     * registration to be used for the push service.
+     * This will register the default service worker and return the registration
+     * @return The service worker registration to be used for the push service.
      */
@@ -307,7 +278,7 @@ WindowController.prototype.getSWRegistration_ = function () {
         return navigator.serviceWorker
-            .register(DefaultSW.path, {
-            scope: DefaultSW.scope
+            .register(DEFAULT_SW_PATH, {
+            scope: DEFAULT_SW_SCOPE
         })
             .catch(function (err) {
-            throw _this.errorFactory_.create(Errors.codes.FAILED_DEFAULT_REGISTRATION, {
+            throw _this.errorFactory_.create(ERROR_CODES.FAILED_DEFAULT_REGISTRATION, {
                 browserErrorMessage: err.message
@@ -330,3 +301,2 @@ });
      * provided by the developer.
-     * @private
      */
@@ -337,3 +307,3 @@ WindowController.prototype.getPublicVapidKey_ = function () {
         }
-        return Promise.resolve(FCMDetails.DEFAULT_PUBLIC_VAPID_KEY);
+        return Promise.resolve(DEFAULT_PUBLIC_VAPID_KEY);
     };
@@ -344,5 +314,5 @@ /**
      * events in the page.
-     *
-     * @private
      */
+    // Visible for testing
+    // TODO: Make private
     WindowController.prototype.setupSWMessageListener_ = function () {
@@ -375,5 +345,6 @@ var _this = this;
      * Checks to see if the required API's are valid or not.
-     * @private
-     * @return {boolean} Returns true if the desired APIs are available.
+     * @return Returns true if the desired APIs are available.
      */
+    // Visible for testing
+    // TODO: Make private
     WindowController.prototype.isSupported_ = function () {
@@ -389,4 +360,4 @@ return ('serviceWorker' in navigator &&
 }(ControllerInterface));
-export default WindowController;
+export { WindowController };
 
 //# sourceMappingURL=window-controller.js.map

dist/esm/src/helpers/array-buffer-to-base64.d.ts

@@ -1,2 +0,1 @@
-declare const _default: (arrayBuffer: any) => string;
-export default _default;
+export declare function arrayBufferToBase64(arrayBuffer: ArrayBuffer | Uint8Array): string;

dist/esm/src/helpers/array-buffer-to-base64.js

@@ -18,5 +18,5 @@ /**
     var uint8Version = new Uint8Array(arrayBuffer);
-    return window.btoa(String.fromCharCode.apply(null, uint8Version));
+    return btoa(String.fromCharCode.apply(null, uint8Version));
 }
-export default (function (arrayBuffer) {
+export function arrayBufferToBase64(arrayBuffer) {
     var base64String = toBase64(arrayBuffer);
@@ -27,4 +27,4 @@ return base64String
         .replace(/\//g, '_');
-});
+}
 
 //# sourceMappingURL=array-buffer-to-base64.js.map

dist/esm/src/helpers/base64-to-array-buffer.d.ts

@@ -1,2 +0,16 @@
-declare const _default: (base64String: any) => Uint8Array;
-export default _default;
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare function base64ToArrayBuffer(base64String: string): Uint8Array;

dist/esm/src/helpers/base64-to-array-buffer.js

@@ -16,3 +16,3 @@ /**
  */
-export default (function (base64String) {
+export function base64ToArrayBuffer(base64String) {
     var padding = '='.repeat((4 - base64String.length % 4) % 4);
@@ -28,4 +28,4 @@ var base64 = (base64String + padding)
     return outputArray;
-});
+}
 
 //# sourceMappingURL=base64-to-array-buffer.js.map

dist/esm/src/models/clean-v1-undefined.d.ts

@@ -1,2 +0,1 @@
-declare function cleanV1(): void;
-export { cleanV1 };
+export declare function cleanV1(): void;

dist/esm/src/models/clean-v1-undefined.js

@@ -27,3 +27,3 @@ /**
  */
-import IIDModel from '../models/iid-model';
+import { IIDModel } from '../models/iid-model';
 var OLD_DB_NAME = 'undefined';
@@ -60,3 +60,3 @@ var OLD_OBJECT_STORE_NAME = 'fcm_token_object_Store';
 }
-function cleanV1() {
+export function cleanV1() {
     var request = indexedDB.open(OLD_DB_NAME);
@@ -71,4 +71,3 @@ request.onerror = function (event) {
 }
-export { cleanV1 };
 
 //# sourceMappingURL=clean-v1-undefined.js.map

dist/esm/src/models/db-interface.d.ts

@@ -0,29 +1,50 @@
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { ErrorFactory } from '@firebase/util';
-export default class DBInterface {
-    private DB_NAME_;
-    private dbVersion_;
-    private openDbPromise_;
-    protected errorFactory_: ErrorFactory<string>;
-    protected TRANSACTION_READ_WRITE: IDBTransactionMode;
+export declare abstract class DBInterface {
+    private dbPromise;
+    protected readonly abstract dbName: string;
+    protected readonly abstract dbVersion: number;
+    protected readonly abstract objectStoreName: string;
+    protected readonly errorFactory: ErrorFactory<string>;
     /**
-     * @param {string} dbName
-     * @param {number} dbVersion
+     * Database initialization.
+     *
+     * This function should create and update object stores.
      */
-    constructor(dbName: any, dbVersion: any);
+    protected abstract onDbUpgrade(db: IDBDatabase, event: IDBVersionChangeEvent): void;
+    /** Gets record(s) from the objectStore that match the given key. */
+    get<T>(key: IDBValidKey): Promise<T | undefined>;
+    /** Gets record(s) from the objectStore that match the given index. */
+    getIndex<T>(index: string, key: IDBValidKey): Promise<T | undefined>;
+    /** Assigns or overwrites the record for the given value. */
+    put(value: any): Promise<void>;
+    /** Deletes record(s) from the objectStore that match the given key. */
+    delete(key: IDBValidKey | IDBKeyRange): Promise<void>;
     /**
-     * Get the indexedDB as a promsie.
-     * @protected
-     * @return {!Promise<!IDBDatabase>} The IndexedDB database
-     */
-    openDatabase(): Promise<IDBDatabase>;
-    /**
      * Close the currently open database.
-     * @return {!Promise} Returns the result of the promise chain.
      */
     closeDatabase(): Promise<void>;
     /**
-     * @protected
-     * @param {!IDBDatabase} db
+     * Creates an IndexedDB Transaction and passes its objectStore to the
+     * runRequest function, which runs the database request.
+     *
+     * @return Promise that resolves with the result of the runRequest function
      */
-    onDBUpgrade(db: IDBDatabase, event: IDBVersionChangeEvent): void;
+    private createTransaction<T>(runRequest, mode?);
+    /** Gets the cached db connection or opens a new one. */
+    private getDb();
 }

dist/esm/src/models/db-interface.js

@@ -16,75 +16,118 @@ /**
  */
-'use strict';
+import * as tslib_1 from "tslib";
 import { ErrorFactory } from '@firebase/util';
-import Errors from './errors';
+import { ERROR_MAP } from './errors';
 var DBInterface = /** @class */ (function () {
-    /**
-     * @param {string} dbName
-     * @param {number} dbVersion
-     */
-    function DBInterface(dbName, dbVersion) {
-        this.errorFactory_ = new ErrorFactory('messaging', 'Messaging', Errors.map);
-        this.DB_NAME_ = dbName;
-        this.dbVersion_ = dbVersion;
-        this.openDbPromise_ = null;
-        this.TRANSACTION_READ_WRITE = 'readwrite';
+    function DBInterface() {
+        this.dbPromise = null;
+        this.errorFactory = new ErrorFactory('messaging', 'Messaging', ERROR_MAP);
     }
-    /**
-     * Get the indexedDB as a promsie.
-     * @protected
-     * @return {!Promise<!IDBDatabase>} The IndexedDB database
-     */
-    DBInterface.prototype.openDatabase = function () {
-        var _this = this;
-        if (this.openDbPromise_) {
-            return this.openDbPromise_;
+    /** Gets record(s) from the objectStore that match the given key. */
+    DBInterface.prototype.get = function (key) {
+        return this.createTransaction(function (objectStore) { return objectStore.get(key); });
+    };
+    /** Gets record(s) from the objectStore that match the given index. */
+    DBInterface.prototype.getIndex = function (index, key) {
+        function runRequest(objectStore) {
+            var idbIndex = objectStore.index(index);
+            return idbIndex.get(key);
         }
-        this.openDbPromise_ = new Promise(function (resolve, reject) {
-            var request = indexedDB.open(_this.DB_NAME_, _this.dbVersion_);
-            request.onerror = function (event) {
-                reject(event.target.error);
-            };
-            request.onsuccess = function (event) {
-                resolve(event.target.result);
-            };
-            request.onupgradeneeded = function (event) {
-                try {
-                    var db = event.target.result;
-                    _this.onDBUpgrade(db, event);
-                }
-                catch (err) {
-                    // close the database as it can't be used.
-                    db.close();
-                    reject(err);
-                }
-            };
-        });
-        return this.openDbPromise_;
+        return this.createTransaction(runRequest);
     };
+    /** Assigns or overwrites the record for the given value. */
+    // tslint:disable-next-line:no-any IndexedDB values are of type "any"
+    DBInterface.prototype.put = function (value) {
+        return this.createTransaction(function (objectStore) { return objectStore.put(value); }, 'readwrite');
+    };
+    /** Deletes record(s) from the objectStore that match the given key. */
+    DBInterface.prototype.delete = function (key) {
+        return this.createTransaction(function (objectStore) { return objectStore.delete(key); }, 'readwrite');
+    };
     /**
      * Close the currently open database.
-     * @return {!Promise} Returns the result of the promise chain.
      */
     DBInterface.prototype.closeDatabase = function () {
-        var _this = this;
-        return Promise.resolve().then(function () {
-            if (_this.openDbPromise_) {
-                return _this.openDbPromise_.then(function (db) {
-                    db.close();
-                    _this.openDbPromise_ = null;
-                });
-            }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var db;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.dbPromise) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.dbPromise];
+                    case 1:
+                        db = _a.sent();
+                        db.close();
+                        this.dbPromise = null;
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
         });
     };
     /**
-     * @protected
-     * @param {!IDBDatabase} db
+     * Creates an IndexedDB Transaction and passes its objectStore to the
+     * runRequest function, which runs the database request.
+     *
+     * @return Promise that resolves with the result of the runRequest function
      */
-    DBInterface.prototype.onDBUpgrade = function (db, event) {
-        throw this.errorFactory_.create(Errors.codes.SHOULD_BE_INHERITED);
+    DBInterface.prototype.createTransaction = function (runRequest, mode) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var db, transaction, request, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getDb()];
+                    case 1:
+                        db = _a.sent();
+                        transaction = db.transaction(this.objectStoreName, mode);
+                        request = transaction.objectStore(this.objectStoreName);
+                        return [4 /*yield*/, promisify(runRequest(request))];
+                    case 2:
+                        result = _a.sent();
+                        return [2 /*return*/, new Promise(function (resolve, reject) {
+                                transaction.oncomplete = function () {
+                                    resolve(result);
+                                };
+                                transaction.onerror = function () {
+                                    reject(transaction.error);
+                                };
+                            })];
+                }
+            });
+        });
     };
+    /** Gets the cached db connection or opens a new one. */
+    DBInterface.prototype.getDb = function () {
+        var _this = this;
+        if (!this.dbPromise) {
+            this.dbPromise = new Promise(function (resolve, reject) {
+                var request = indexedDB.open(_this.dbName, _this.dbVersion);
+                request.onsuccess = function () {
+                    resolve(request.result);
+                };
+                request.onerror = function () {
+                    _this.dbPromise = null;
+                    reject(request.error);
+                };
+                request.onupgradeneeded = function (event) {
+                    return _this.onDbUpgrade(request.result, event);
+                };
+            });
+        }
+        return this.dbPromise;
+    };
     return DBInterface;
 }());
-export default DBInterface;
+export { DBInterface };
+/** Promisifies an IDBRequest. Resolves with the IDBRequest's result. */
+function promisify(request) {
+    return new Promise(function (resolve, reject) {
+        request.onsuccess = function () {
+            resolve(request.result);
+        };
+        request.onerror = function () {
+            reject(request.error);
+        };
+    });
+}
 
 //# sourceMappingURL=db-interface.js.map

dist/esm/src/models/default-sw.d.ts

@@ -1,5 +0,17 @@
-declare const _default: {
-    path: string;
-    scope: string;
-};
-export default _default;
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const DEFAULT_SW_PATH = "/firebase-messaging-sw.js";
+export declare const DEFAULT_SW_SCOPE = "/firebase-cloud-messaging-push-scope";

dist/esm/src/models/default-sw.js

@@ -16,8 +16,5 @@ /**
  */
-'use strict';
-export default {
-    path: '/firebase-messaging-sw.js',
-    scope: '/firebase-cloud-messaging-push-scope'
-};
+export var DEFAULT_SW_PATH = '/firebase-messaging-sw.js';
+export var DEFAULT_SW_SCOPE = '/firebase-cloud-messaging-push-scope';
 
 //# sourceMappingURL=default-sw.js.map

dist/esm/src/models/errors.d.ts

@@ -1,47 +0,59 @@
-declare const _default: {
-    codes: {
-        AVAILABLE_IN_WINDOW: string;
-        AVAILABLE_IN_SW: string;
-        SHOULD_BE_INHERITED: string;
-        BAD_SENDER_ID: string;
-        INCORRECT_GCM_SENDER_ID: string;
-        PERMISSION_DEFAULT: string;
-        PERMISSION_BLOCKED: string;
-        UNSUPPORTED_BROWSER: string;
-        NOTIFICATIONS_BLOCKED: string;
-        FAILED_DEFAULT_REGISTRATION: string;
-        SW_REGISTRATION_EXPECTED: string;
-        GET_SUBSCRIPTION_FAILED: string;
-        INVALID_SAVED_TOKEN: string;
-        SW_REG_REDUNDANT: string;
-        TOKEN_SUBSCRIBE_FAILED: string;
-        TOKEN_SUBSCRIBE_NO_TOKEN: string;
-        TOKEN_SUBSCRIBE_NO_PUSH_SET: string;
-        TOKEN_UNSUBSCRIBE_FAILED: string;
-        TOKEN_UPDATE_FAILED: string;
-        TOKEN_UPDATE_NO_TOKEN: string;
-        USE_SW_BEFORE_GET_TOKEN: string;
-        INVALID_DELETE_TOKEN: string;
-        DELETE_TOKEN_NOT_FOUND: string;
-        DELETE_SCOPE_NOT_FOUND: string;
-        BG_HANDLER_FUNCTION_EXPECTED: string;
-        NO_WINDOW_CLIENT_TO_MSG: string;
-        UNABLE_TO_RESUBSCRIBE: string;
-        NO_FCM_TOKEN_FOR_RESUBSCRIBE: string;
-        FAILED_TO_DELETE_TOKEN: string;
-        NO_SW_IN_REG: string;
-        BAD_SCOPE: string;
-        BAD_VAPID_KEY: string;
-        BAD_SUBSCRIPTION: string;
-        BAD_TOKEN: string;
-        BAD_PUSH_SET: string;
-        FAILED_DELETE_VAPID_KEY: string;
-        INVALID_PUBLIC_VAPID_KEY: string;
-        USE_PUBLIC_KEY_BEFORE_GET_TOKEN: string;
-        PUBLIC_KEY_DECRYPTION_FAILED: string;
-    };
-    map: {
-        [x: string]: string;
-    };
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const ERROR_CODES: {
+    AVAILABLE_IN_WINDOW: string;
+    AVAILABLE_IN_SW: string;
+    SHOULD_BE_INHERITED: string;
+    BAD_SENDER_ID: string;
+    INCORRECT_GCM_SENDER_ID: string;
+    PERMISSION_DEFAULT: string;
+    PERMISSION_BLOCKED: string;
+    UNSUPPORTED_BROWSER: string;
+    NOTIFICATIONS_BLOCKED: string;
+    FAILED_DEFAULT_REGISTRATION: string;
+    SW_REGISTRATION_EXPECTED: string;
+    GET_SUBSCRIPTION_FAILED: string;
+    INVALID_SAVED_TOKEN: string;
+    SW_REG_REDUNDANT: string;
+    TOKEN_SUBSCRIBE_FAILED: string;
+    TOKEN_SUBSCRIBE_NO_TOKEN: string;
+    TOKEN_SUBSCRIBE_NO_PUSH_SET: string;
+    TOKEN_UNSUBSCRIBE_FAILED: string;
+    TOKEN_UPDATE_FAILED: string;
+    TOKEN_UPDATE_NO_TOKEN: string;
+    USE_SW_BEFORE_GET_TOKEN: string;
+    INVALID_DELETE_TOKEN: string;
+    DELETE_TOKEN_NOT_FOUND: string;
+    DELETE_SCOPE_NOT_FOUND: string;
+    BG_HANDLER_FUNCTION_EXPECTED: string;
+    NO_WINDOW_CLIENT_TO_MSG: string;
+    UNABLE_TO_RESUBSCRIBE: string;
+    NO_FCM_TOKEN_FOR_RESUBSCRIBE: string;
+    FAILED_TO_DELETE_TOKEN: string;
+    NO_SW_IN_REG: string;
+    BAD_SCOPE: string;
+    BAD_VAPID_KEY: string;
+    BAD_SUBSCRIPTION: string;
+    BAD_TOKEN: string;
+    BAD_PUSH_SET: string;
+    FAILED_DELETE_VAPID_KEY: string;
+    INVALID_PUBLIC_VAPID_KEY: string;
+    USE_PUBLIC_KEY_BEFORE_GET_TOKEN: string;
+    PUBLIC_KEY_DECRYPTION_FAILED: string;
 };
-export default _default;
+export declare const ERROR_MAP: {
+    [x: string]: string;
+};

dist/esm/src/models/errors.js

@@ -16,4 +16,3 @@ /**
  */
-'use strict';
-var CODES = {
+export var ERROR_CODES = {
     AVAILABLE_IN_WINDOW: 'only-available-in-window',
@@ -59,65 +58,61 @@ AVAILABLE_IN_SW: 'only-available-in-sw',
 };
-var ERROR_MAP = (_a = {},
-    _a[CODES.AVAILABLE_IN_WINDOW] = 'This method is available in a Window context.',
-    _a[CODES.AVAILABLE_IN_SW] = 'This method is available in a service worker ' + 'context.',
-    _a[CODES.SHOULD_BE_INHERITED] = 'This method should be overriden by ' + 'extended classes.',
-    _a[CODES.BAD_SENDER_ID] = "Please ensure that 'messagingSenderId' is set " +
+export var ERROR_MAP = (_a = {},
+    _a[ERROR_CODES.AVAILABLE_IN_WINDOW] = 'This method is available in a Window context.',
+    _a[ERROR_CODES.AVAILABLE_IN_SW] = 'This method is available in a service worker ' + 'context.',
+    _a[ERROR_CODES.SHOULD_BE_INHERITED] = 'This method should be overriden by ' + 'extended classes.',
+    _a[ERROR_CODES.BAD_SENDER_ID] = "Please ensure that 'messagingSenderId' is set " +
         'correctly in the options passed into firebase.initializeApp().',
-    _a[CODES.PERMISSION_DEFAULT] = 'The required permissions were not granted and ' + 'dismissed instead.',
-    _a[CODES.PERMISSION_BLOCKED] = 'The required permissions were not granted and ' + 'blocked instead.',
-    _a[CODES.UNSUPPORTED_BROWSER] = "This browser doesn't support the API's " +
+    _a[ERROR_CODES.PERMISSION_DEFAULT] = 'The required permissions were not granted and ' + 'dismissed instead.',
+    _a[ERROR_CODES.PERMISSION_BLOCKED] = 'The required permissions were not granted and ' + 'blocked instead.',
+    _a[ERROR_CODES.UNSUPPORTED_BROWSER] = "This browser doesn't support the API's " +
         'required to use the firebase SDK.',
-    _a[CODES.NOTIFICATIONS_BLOCKED] = 'Notifications have been blocked.',
-    _a[CODES.FAILED_DEFAULT_REGISTRATION] = 'We are unable to register the ' +
+    _a[ERROR_CODES.NOTIFICATIONS_BLOCKED] = 'Notifications have been blocked.',
+    _a[ERROR_CODES.FAILED_DEFAULT_REGISTRATION] = 'We are unable to register the ' +
         'default service worker. {$browserErrorMessage}',
-    _a[CODES.SW_REGISTRATION_EXPECTED] = 'A service worker registration was the ' + 'expected input.',
-    _a[CODES.GET_SUBSCRIPTION_FAILED] = 'There was an error when trying to get ' +
+    _a[ERROR_CODES.SW_REGISTRATION_EXPECTED] = 'A service worker registration was the ' + 'expected input.',
+    _a[ERROR_CODES.GET_SUBSCRIPTION_FAILED] = 'There was an error when trying to get ' +
         'any existing Push Subscriptions.',
-    _a[CODES.INVALID_SAVED_TOKEN] = 'Unable to access details of the saved token.',
-    _a[CODES.SW_REG_REDUNDANT] = 'The service worker being used for push was made ' + 'redundant.',
-    _a[CODES.TOKEN_SUBSCRIBE_FAILED] = 'A problem occured while subscribing the ' + 'user to FCM: {$message}',
-    _a[CODES.TOKEN_SUBSCRIBE_NO_TOKEN] = 'FCM returned no token when subscribing ' + 'the user to push.',
-    _a[CODES.TOKEN_SUBSCRIBE_NO_PUSH_SET] = 'FCM returned an invalid response ' + 'when getting an FCM token.',
-    _a[CODES.TOKEN_UNSUBSCRIBE_FAILED] = 'A problem occured while unsubscribing the ' + 'user from FCM: {$message}',
-    _a[CODES.TOKEN_UPDATE_FAILED] = 'A problem occured while updating the ' + 'user from FCM: {$message}',
-    _a[CODES.TOKEN_UPDATE_NO_TOKEN] = 'FCM returned no token when updating ' + 'the user to push.',
-    _a[CODES.USE_SW_BEFORE_GET_TOKEN] = 'The useServiceWorker() method may only be called once and must be ' +
+    _a[ERROR_CODES.INVALID_SAVED_TOKEN] = 'Unable to access details of the saved token.',
+    _a[ERROR_CODES.SW_REG_REDUNDANT] = 'The service worker being used for push was made ' + 'redundant.',
+    _a[ERROR_CODES.TOKEN_SUBSCRIBE_FAILED] = 'A problem occured while subscribing the ' + 'user to FCM: {$message}',
+    _a[ERROR_CODES.TOKEN_SUBSCRIBE_NO_TOKEN] = 'FCM returned no token when subscribing ' + 'the user to push.',
+    _a[ERROR_CODES.TOKEN_SUBSCRIBE_NO_PUSH_SET] = 'FCM returned an invalid response ' + 'when getting an FCM token.',
+    _a[ERROR_CODES.TOKEN_UNSUBSCRIBE_FAILED] = 'A problem occured while unsubscribing the ' + 'user from FCM: {$message}',
+    _a[ERROR_CODES.TOKEN_UPDATE_FAILED] = 'A problem occured while updating the ' + 'user from FCM: {$message}',
+    _a[ERROR_CODES.TOKEN_UPDATE_NO_TOKEN] = 'FCM returned no token when updating ' + 'the user to push.',
+    _a[ERROR_CODES.USE_SW_BEFORE_GET_TOKEN] = 'The useServiceWorker() method may only be called once and must be ' +
         'called before calling getToken() to ensure your service worker is used.',
-    _a[CODES.INVALID_DELETE_TOKEN] = 'You must pass a valid token into ' +
+    _a[ERROR_CODES.INVALID_DELETE_TOKEN] = 'You must pass a valid token into ' +
         'deleteToken(), i.e. the token from getToken().',
-    _a[CODES.DELETE_TOKEN_NOT_FOUND] = 'The deletion attempt for token could not ' +
+    _a[ERROR_CODES.DELETE_TOKEN_NOT_FOUND] = 'The deletion attempt for token could not ' +
         'be performed as the token was not found.',
-    _a[CODES.DELETE_SCOPE_NOT_FOUND] = 'The deletion attempt for service worker ' +
+    _a[ERROR_CODES.DELETE_SCOPE_NOT_FOUND] = 'The deletion attempt for service worker ' +
         'scope could not be performed as the scope was not found.',
-    _a[CODES.BG_HANDLER_FUNCTION_EXPECTED] = 'The input to ' + 'setBackgroundMessageHandler() must be a function.',
-    _a[CODES.NO_WINDOW_CLIENT_TO_MSG] = 'An attempt was made to message a ' + 'non-existant window client.',
-    _a[CODES.UNABLE_TO_RESUBSCRIBE] = 'There was an error while re-subscribing ' +
+    _a[ERROR_CODES.BG_HANDLER_FUNCTION_EXPECTED] = 'The input to ' + 'setBackgroundMessageHandler() must be a function.',
+    _a[ERROR_CODES.NO_WINDOW_CLIENT_TO_MSG] = 'An attempt was made to message a ' + 'non-existant window client.',
+    _a[ERROR_CODES.UNABLE_TO_RESUBSCRIBE] = 'There was an error while re-subscribing ' +
         'the FCM token for push messaging. Will have to resubscribe the ' +
         'user on next visit. {$message}',
-    _a[CODES.NO_FCM_TOKEN_FOR_RESUBSCRIBE] = 'Could not find an FCM token ' +
+    _a[ERROR_CODES.NO_FCM_TOKEN_FOR_RESUBSCRIBE] = 'Could not find an FCM token ' +
         'and as a result, unable to resubscribe. Will have to resubscribe the ' +
         'user on next visit.',
-    _a[CODES.FAILED_TO_DELETE_TOKEN] = 'Unable to delete the currently saved token.',
-    _a[CODES.NO_SW_IN_REG] = 'Even though the service worker registration was ' +
+    _a[ERROR_CODES.FAILED_TO_DELETE_TOKEN] = 'Unable to delete the currently saved token.',
+    _a[ERROR_CODES.NO_SW_IN_REG] = 'Even though the service worker registration was ' +
         'successful, there was a problem accessing the service worker itself.',
-    _a[CODES.INCORRECT_GCM_SENDER_ID] = "Please change your web app manifest's " +
+    _a[ERROR_CODES.INCORRECT_GCM_SENDER_ID] = "Please change your web app manifest's " +
         "'gcm_sender_id' value to '103953800507' to use Firebase messaging.",
-    _a[CODES.BAD_SCOPE] = 'The service worker scope must be a string with at ' +
+    _a[ERROR_CODES.BAD_SCOPE] = 'The service worker scope must be a string with at ' +
         'least one character.',
-    _a[CODES.BAD_VAPID_KEY] = 'The public VAPID key is not a Uint8Array with 65 bytes.',
-    _a[CODES.BAD_SUBSCRIPTION] = 'The subscription must be a valid ' + 'PushSubscription.',
-    _a[CODES.BAD_TOKEN] = 'The FCM Token used for storage / lookup was not ' +
+    _a[ERROR_CODES.BAD_VAPID_KEY] = 'The public VAPID key is not a Uint8Array with 65 bytes.',
+    _a[ERROR_CODES.BAD_SUBSCRIPTION] = 'The subscription must be a valid ' + 'PushSubscription.',
+    _a[ERROR_CODES.BAD_TOKEN] = 'The FCM Token used for storage / lookup was not ' +
         'a valid token string.',
-    _a[CODES.BAD_PUSH_SET] = 'The FCM push set used for storage / lookup was not ' +
+    _a[ERROR_CODES.BAD_PUSH_SET] = 'The FCM push set used for storage / lookup was not ' +
         'not a valid push set string.',
-    _a[CODES.FAILED_DELETE_VAPID_KEY] = 'The VAPID key could not be deleted.',
-    _a[CODES.INVALID_PUBLIC_VAPID_KEY] = 'The public VAPID key must be a string.',
-    _a[CODES.PUBLIC_KEY_DECRYPTION_FAILED] = 'The public VAPID key did not equal ' + '65 bytes when decrypted.',
+    _a[ERROR_CODES.FAILED_DELETE_VAPID_KEY] = 'The VAPID key could not be deleted.',
+    _a[ERROR_CODES.INVALID_PUBLIC_VAPID_KEY] = 'The public VAPID key must be a string.',
+    _a[ERROR_CODES.PUBLIC_KEY_DECRYPTION_FAILED] = 'The public VAPID key did not equal ' + '65 bytes when decrypted.',
     _a);
-export default {
-    codes: CODES,
-    map: ERROR_MAP
-};
 var _a;
 
 //# sourceMappingURL=errors.js.map

dist/esm/src/models/fcm-details.d.ts

@@ -1,9 +0,21 @@
-declare const _default: {
-    DEFAULT_PUBLIC_VAPID_KEY: Uint8Array;
-    SUBSCRIPTION_DETAILS: {
-        userVisibleOnly: boolean;
-        applicationServerKey: Uint8Array;
-    };
-    ENDPOINT: string;
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const DEFAULT_PUBLIC_VAPID_KEY: Uint8Array;
+export declare const SUBSCRIPTION_DETAILS: {
+    userVisibleOnly: boolean;
+    applicationServerKey: Uint8Array;
 };
-export default _default;
+export declare const ENDPOINT = "https://fcm.googleapis.com";

dist/esm/src/models/fcm-details.js

@@ -16,4 +16,3 @@ /**
  */
-'use strict';
-var DEFAULT_PUBLIC_VAPID_KEY = new Uint8Array([
+export var DEFAULT_PUBLIC_VAPID_KEY = new Uint8Array([
     0x04,
@@ -85,13 +84,8 @@ 0x33,
 ]);
-var SUBSCRIPTION_DETAILS = {
+export var SUBSCRIPTION_DETAILS = {
     userVisibleOnly: true,
     applicationServerKey: DEFAULT_PUBLIC_VAPID_KEY
 };
-export default {
-    DEFAULT_PUBLIC_VAPID_KEY: DEFAULT_PUBLIC_VAPID_KEY,
-    SUBSCRIPTION_DETAILS: SUBSCRIPTION_DETAILS,
-    ENDPOINT: 'https://fcm.googleapis.com'
-    // ENDPOINT: 'https://jmt17.google.com'
-};
+export var ENDPOINT = 'https://fcm.googleapis.com';
 
 //# sourceMappingURL=fcm-details.js.map

dist/esm/src/models/iid-model.d.ts

@@ -1,15 +0,10 @@
-export default class IIDModel {
-    private errorFactory_;
+export interface IIDDetails {
+    token: string;
+    pushSet: string;
+}
+export declare class IIDModel {
+    private readonly errorFactory_;
     constructor();
+    getToken(senderId: string, subscription: PushSubscription, publicVapidKey: Uint8Array): Promise<IIDDetails>;
     /**
-     * Given a PushSubscription and messagingSenderId, get an FCM token.
-     * @public
-     * @param  {string} senderId The 'messagingSenderId' to tie the token to.
-     * @param  {PushSubscription} subscription The PushSusbcription to "federate".
-     * @param  {Uint8Array} publicVapidKey The public VAPID key.
-     * @return {Promise<!Object>} Returns the FCM token to be used in place
-     * of the PushSubscription.
-     */
-    getToken(senderId: any, subscription: any, publicVapidKey: any): Promise<Object>;
-    /**
      * Update the underlying token details for fcmToken.
@@ -16,0 +11,0 @@ */

dist/esm/src/models/iid-model.js

@@ -16,62 +16,68 @@ /**
  */
-'use strict';
+import * as tslib_1 from "tslib";
 import { ErrorFactory } from '@firebase/util';
-import Errors from './errors';
-import arrayBufferToBase64 from '../helpers/array-buffer-to-base64';
-import FCMDetails from './fcm-details';
+import { arrayBufferToBase64 } from '../helpers/array-buffer-to-base64';
+import { ERROR_CODES, ERROR_MAP } from './errors';
+import { DEFAULT_PUBLIC_VAPID_KEY, ENDPOINT } from './fcm-details';
+// tslint:enable interface-name
 var IIDModel = /** @class */ (function () {
     function IIDModel() {
-        this.errorFactory_ = new ErrorFactory('messaging', 'Messaging', Errors.map);
+        this.errorFactory_ = new ErrorFactory('messaging', 'Messaging', ERROR_MAP);
     }
-    /**
-     * Given a PushSubscription and messagingSenderId, get an FCM token.
-     * @public
-     * @param  {string} senderId The 'messagingSenderId' to tie the token to.
-     * @param  {PushSubscription} subscription The PushSusbcription to "federate".
-     * @param  {Uint8Array} publicVapidKey The public VAPID key.
-     * @return {Promise<!Object>} Returns the FCM token to be used in place
-     * of the PushSubscription.
-     */
     IIDModel.prototype.getToken = function (senderId, subscription, publicVapidKey) {
-        var _this = this;
-        var p256dh = arrayBufferToBase64(subscription['getKey']('p256dh'));
-        var auth = arrayBufferToBase64(subscription['getKey']('auth'));
-        var fcmSubscribeBody = "authorized_entity=" + senderId + "&" +
-            ("endpoint=" + subscription.endpoint + "&") +
-            ("encryption_key=" + p256dh + "&") +
-            ("encryption_auth=" + auth);
-        if (publicVapidKey !== FCMDetails.DEFAULT_PUBLIC_VAPID_KEY) {
-            var applicationPubKey = arrayBufferToBase64(publicVapidKey);
-            fcmSubscribeBody += "&application_pub_key=" + applicationPubKey;
-        }
-        var headers = new Headers();
-        headers.append('Content-Type', 'application/x-www-form-urlencoded');
-        var subscribeOptions = {
-            method: 'POST',
-            headers: headers,
-            body: fcmSubscribeBody
-        };
-        return fetch(FCMDetails.ENDPOINT + '/fcm/connect/subscribe', subscribeOptions)
-            .then(function (response) { return response.json(); })
-            .catch(function () {
-            throw _this.errorFactory_.create(Errors.codes.TOKEN_SUBSCRIBE_FAILED);
-        })
-            .then(function (response) {
-            var fcmTokenResponse = response;
-            if (fcmTokenResponse['error']) {
-                var message = fcmTokenResponse['error']['message'];
-                throw _this.errorFactory_.create(Errors.codes.TOKEN_SUBSCRIBE_FAILED, {
-                    message: message
-                });
-            }
-            if (!fcmTokenResponse['token']) {
-                throw _this.errorFactory_.create(Errors.codes.TOKEN_SUBSCRIBE_NO_TOKEN);
-            }
-            if (!fcmTokenResponse['pushSet']) {
-                throw _this.errorFactory_.create(Errors.codes.TOKEN_SUBSCRIBE_NO_PUSH_SET);
-            }
-            return {
-                token: fcmTokenResponse['token'],
-                pushSet: fcmTokenResponse['pushSet']
-            };
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var p256dh, auth, fcmSubscribeBody, applicationPubKey, headers, subscribeOptions, responseData, response, err_1, message;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        p256dh = arrayBufferToBase64(subscription.getKey('p256dh'));
+                        auth = arrayBufferToBase64(subscription.getKey('auth'));
+                        fcmSubscribeBody = "authorized_entity=" + senderId + "&" +
+                            ("endpoint=" + subscription.endpoint + "&") +
+                            ("encryption_key=" + p256dh + "&") +
+                            ("encryption_auth=" + auth);
+                        if (publicVapidKey !== DEFAULT_PUBLIC_VAPID_KEY) {
+                            applicationPubKey = arrayBufferToBase64(publicVapidKey);
+                            fcmSubscribeBody += "&application_pub_key=" + applicationPubKey;
+                        }
+                        headers = new Headers();
+                        headers.append('Content-Type', 'application/x-www-form-urlencoded');
+                        subscribeOptions = {
+                            method: 'POST',
+                            headers: headers,
+                            body: fcmSubscribeBody
+                        };
+                        responseData = null;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        return [4 /*yield*/, fetch(ENDPOINT + '/fcm/connect/subscribe', subscribeOptions)];
+                    case 2:
+                        response = _a.sent();
+                        return [4 /*yield*/, response.json()];
+                    case 3:
+                        responseData = _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_1 = _a.sent();
+                        throw this.errorFactory_.create(ERROR_CODES.TOKEN_SUBSCRIBE_FAILED);
+                    case 5:
+                        if (responseData['error']) {
+                            message = responseData['error']['message'];
+                            throw this.errorFactory_.create(ERROR_CODES.TOKEN_SUBSCRIBE_FAILED, {
+                                message: message
+                            });
+                        }
+                        if (!responseData['token']) {
+                            throw this.errorFactory_.create(ERROR_CODES.TOKEN_SUBSCRIBE_NO_TOKEN);
+                        }
+                        if (!responseData['pushSet']) {
+                            throw this.errorFactory_.create(ERROR_CODES.TOKEN_SUBSCRIBE_NO_PUSH_SET);
+                        }
+                        return [2 /*return*/, {
+                                token: responseData['token'],
+                                pushSet: responseData['pushSet']
+                            }];
+                }
+            });
         });
@@ -83,42 +89,53 @@ };
     IIDModel.prototype.updateToken = function (senderId, fcmToken, fcmPushSet, subscription, publicVapidKey) {
-        var _this = this;
-        var p256dh = arrayBufferToBase64(subscription['getKey']('p256dh'));
-        var auth = arrayBufferToBase64(subscription['getKey']('auth'));
-        var fcmUpdateBody = "push_set=" + fcmPushSet + "&" +
-            ("token=" + fcmToken + "&") +
-            ("authorized_entity=" + senderId + "&") +
-            ("endpoint=" + subscription.endpoint + "&") +
-            ("encryption_key=" + p256dh + "&") +
-            ("encryption_auth=" + auth);
-        if (publicVapidKey !== FCMDetails.DEFAULT_PUBLIC_VAPID_KEY) {
-            var applicationPubKey = arrayBufferToBase64(publicVapidKey);
-            fcmUpdateBody += "&application_pub_key=" + applicationPubKey;
-        }
-        var headers = new Headers();
-        headers.append('Content-Type', 'application/x-www-form-urlencoded');
-        var updateOptions = {
-            method: 'POST',
-            headers: headers,
-            body: fcmUpdateBody
-        };
-        var updateFetchRes;
-        return fetch(FCMDetails.ENDPOINT + '/fcm/connect/subscribe', updateOptions)
-            .then(function (fetchResponse) {
-            updateFetchRes = fetchResponse;
-            return fetchResponse.json();
-        })
-            .catch(function () {
-            throw _this.errorFactory_.create(Errors.codes.TOKEN_UPDATE_FAILED);
-        })
-            .then(function (fcmTokenResponse) {
-            if (!updateFetchRes.ok) {
-                var message = fcmTokenResponse['error']['message'];
-                throw _this.errorFactory_.create(Errors.codes.TOKEN_UPDATE_FAILED, {
-                    message: message
-                });
-            }
-            if (!fcmTokenResponse['token']) {
-                throw _this.errorFactory_.create(Errors.codes.TOKEN_UPDATE_NO_TOKEN);
-            }
-            return fcmTokenResponse['token'];
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var p256dh, auth, fcmUpdateBody, applicationPubKey, headers, updateOptions, responseData, response, err_2, message;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        p256dh = arrayBufferToBase64(subscription.getKey('p256dh'));
+                        auth = arrayBufferToBase64(subscription.getKey('auth'));
+                        fcmUpdateBody = "push_set=" + fcmPushSet + "&" +
+                            ("token=" + fcmToken + "&") +
+                            ("authorized_entity=" + senderId + "&") +
+                            ("endpoint=" + subscription.endpoint + "&") +
+                            ("encryption_key=" + p256dh + "&") +
+                            ("encryption_auth=" + auth);
+                        if (publicVapidKey !== DEFAULT_PUBLIC_VAPID_KEY) {
+                            applicationPubKey = arrayBufferToBase64(publicVapidKey);
+                            fcmUpdateBody += "&application_pub_key=" + applicationPubKey;
+                        }
+                        headers = new Headers();
+                        headers.append('Content-Type', 'application/x-www-form-urlencoded');
+                        updateOptions = {
+                            method: 'POST',
+                            headers: headers,
+                            body: fcmUpdateBody
+                        };
+                        responseData = null;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        return [4 /*yield*/, fetch(ENDPOINT + '/fcm/connect/subscribe', updateOptions)];
+                    case 2:
+                        response = _a.sent();
+                        return [4 /*yield*/, response.json()];
+                    case 3:
+                        responseData = _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_2 = _a.sent();
+                        throw this.errorFactory_.create(ERROR_CODES.TOKEN_UPDATE_FAILED);
+                    case 5:
+                        if (responseData['error']) {
+                            message = responseData['error']['message'];
+                            throw this.errorFactory_.create(ERROR_CODES.TOKEN_UPDATE_FAILED, {
+                                message: message
+                            });
+                        }
+                        if (!responseData['token']) {
+                            throw this.errorFactory_.create(ERROR_CODES.TOKEN_UPDATE_NO_TOKEN);
+                        }
+                        return [2 /*return*/, responseData['token']];
+                }
+            });
         });
@@ -130,26 +147,39 @@ };
     IIDModel.prototype.deleteToken = function (senderId, fcmToken, fcmPushSet) {
-        var _this = this;
-        var fcmUnsubscribeBody = "authorized_entity=" + senderId + "&" +
-            ("token=" + fcmToken + "&") +
-            ("pushSet=" + fcmPushSet);
-        var headers = new Headers();
-        headers.append('Content-Type', 'application/x-www-form-urlencoded');
-        var unsubscribeOptions = {
-            method: 'POST',
-            headers: headers,
-            body: fcmUnsubscribeBody
-        };
-        return fetch(FCMDetails.ENDPOINT + '/fcm/connect/unsubscribe', unsubscribeOptions).then(function (fetchResponse) {
-            if (!fetchResponse.ok) {
-                return fetchResponse.json().then(function (fcmTokenResponse) {
-                    if (fcmTokenResponse['error']) {
-                        var message = fcmTokenResponse['error']['message'];
-                        throw _this.errorFactory_.create(Errors.codes.TOKEN_UNSUBSCRIBE_FAILED, {
-                            message: message
-                        });
-                    }
-                }, function (err) {
-                    throw _this.errorFactory_.create(Errors.codes.TOKEN_UNSUBSCRIBE_FAILED);
-                });
-            }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var fcmUnsubscribeBody, headers, unsubscribeOptions, response, responseData, message, err_3;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        fcmUnsubscribeBody = "authorized_entity=" + senderId + "&" +
+                            ("token=" + fcmToken + "&") +
+                            ("pushSet=" + fcmPushSet);
+                        headers = new Headers();
+                        headers.append('Content-Type', 'application/x-www-form-urlencoded');
+                        unsubscribeOptions = {
+                            method: 'POST',
+                            headers: headers,
+                            body: fcmUnsubscribeBody
+                        };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        return [4 /*yield*/, fetch(ENDPOINT + '/fcm/connect/unsubscribe', unsubscribeOptions)];
+                    case 2:
+                        response = _a.sent();
+                        return [4 /*yield*/, response.json()];
+                    case 3:
+                        responseData = _a.sent();
+                        if (responseData['error']) {
+                            message = responseData['error']['message'];
+                            throw this.errorFactory_.create(ERROR_CODES.TOKEN_UNSUBSCRIBE_FAILED, {
+                                message: message
+                            });
+                        }
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_3 = _a.sent();
+                        throw this.errorFactory_.create(ERROR_CODES.TOKEN_UNSUBSCRIBE_FAILED);
+                    case 5: return [2 /*return*/];
+                }
+            });
         });
@@ -159,4 +189,4 @@ };
 }());
-export default IIDModel;
+export { IIDModel };
 
 //# sourceMappingURL=iid-model.js.map

dist/esm/src/models/token-details-model.d.ts

@@ -1,43 +0,31 @@
-import DBInterface from './db-interface';
-export default class TokenDetailsModel extends DBInterface {
-    constructor();
-    onDBUpgrade(db: IDBDatabase, evt: IDBVersionChangeEvent): void;
+import { TokenDetails } from '../interfaces/token-details';
+import { DBInterface } from './db-interface';
+export declare class TokenDetailsModel extends DBInterface {
+    protected readonly dbName: string;
+    protected readonly dbVersion: number;
+    protected readonly objectStoreName: string;
+    protected onDbUpgrade(db: IDBDatabase, evt: IDBVersionChangeEvent): void;
     /**
      * This method takes an object and will check for known arguments and
      * validate the input.
-     * @private
-     * @param {!ValidateInput} input
-     * @return {!Promise} Returns promise that resolves if input is valid,
-     * rejects otherwise.
+     * @return Promise that resolves if input is valid, rejects otherwise.
      */
-    validateInputs_(input: any): Promise<never>;
+    private validateInputs(input);
     /**
      * Given a token, this method will look up the details in indexedDB.
      * @param {string} fcmToken
-     * @return {Promise<Object>} The details associated with that token.
+     * @return {Promise<TokenDetails>} The details associated with that token.
      */
-    getTokenDetailsFromToken(fcmToken: any): Promise<{}>;
+    getTokenDetailsFromToken(fcmToken: string): Promise<TokenDetails | undefined>;
     /**
      * Given a service worker scope, this method will look up the details in
      * indexedDB.
-     * @public
-     * @param {string} swScope
-     * @return {Promise<Object>} The details associated with that token.
+     * @return The details associated with that token.
      */
-    getTokenDetailsFromSWScope(swScope: any): Promise<{}>;
+    getTokenDetailsFromSWScope(swScope: string): Promise<TokenDetails | undefined>;
     /**
      * Save the details for the fcm token for re-use at a later date.
-     * @param {{swScope: !string, vapidKey: !string,
-     * subscription: !PushSubscription, fcmSenderId: !string, fcmToken: !string,
-     * fcmPushSet: !string}} input A plain js object containing args to save.
-     * @return {Promise<void>}
+     * @param input A plain js object containing args to save.
      */
-    saveTokenDetails({swScope, vapidKey, subscription, fcmSenderId, fcmToken, fcmPushSet}: {
-        swScope: any;
-        vapidKey: any;
-        subscription: any;
-        fcmSenderId: any;
-        fcmToken: any;
-        fcmPushSet: any;
-    }): Promise<{}>;
+    saveTokenDetails(tokenDetails: TokenDetails): Promise<void>;
     /**
@@ -47,6 +35,7 @@ * This method deletes details of the current FCM token.
      * method for deleting at a later date.
-     * @return {Promise<Object>} Resolves once the FCM token details have been
-     * deleted and returns the deleted details.
+     *
+     * @return Resolves once the FCM token details have been deleted and returns
+     * the deleted details.
      */
-    deleteToken(token: string): Promise<{}>;
+    deleteToken(token: string): Promise<TokenDetails>;
 }

dist/esm/src/models/token-details-model.js

@@ -16,34 +16,20 @@ /**
  */
-'use strict';
 import * as tslib_1 from "tslib";
-import DBInterface from './db-interface';
-import Errors from './errors';
-import arrayBufferToBase64 from '../helpers/array-buffer-to-base64';
+import { arrayBufferToBase64 } from '../helpers/array-buffer-to-base64';
 import { cleanV1 } from './clean-v1-undefined';
-var FCM_TOKEN_OBJ_STORE = 'fcm_token_object_Store';
-var DB_NAME = 'fcm_token_details_db';
-var DB_VERSION = 2;
-/** @record */
-function ValidateInput() { }
-/** @type {string|undefined} */
-ValidateInput.prototype.fcmToken;
-/** @type {string|undefined} */
-ValidateInput.prototype.swScope;
-/** @type {string|undefined} */
-ValidateInput.prototype.vapidKey;
-/** @type {PushSubscription|undefined} */
-ValidateInput.prototype.subscription;
-/** @type {string|undefined} */
-ValidateInput.prototype.fcmSenderId;
-/** @type {string|undefined} */
-ValidateInput.prototype.fcmPushSet;
+import { DBInterface } from './db-interface';
+import { ERROR_CODES } from './errors';
 var TokenDetailsModel = /** @class */ (function (_super) {
     tslib_1.__extends(TokenDetailsModel, _super);
     function TokenDetailsModel() {
-        return _super.call(this, DB_NAME, DB_VERSION) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.dbName = 'fcm_token_details_db';
+        _this.dbVersion = 2;
+        _this.objectStoreName = 'fcm_token_object_Store';
+        return _this;
     }
-    TokenDetailsModel.prototype.onDBUpgrade = function (db, evt) {
+    TokenDetailsModel.prototype.onDbUpgrade = function (db, evt) {
         if (evt.oldVersion < 1) {
             // New IDB instance
-            var objectStore = db.createObjectStore(FCM_TOKEN_OBJ_STORE, {
+            var objectStore = db.createObjectStore(this.objectStoreName, {
                 keyPath: 'swScope'
@@ -69,46 +55,38 @@ });
      * validate the input.
-     * @private
-     * @param {!ValidateInput} input
-     * @return {!Promise} Returns promise that resolves if input is valid,
-     * rejects otherwise.
+     * @return Promise that resolves if input is valid, rejects otherwise.
      */
-    TokenDetailsModel.prototype.validateInputs_ = function (input) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                if (input.fcmToken) {
-                    if (typeof input.fcmToken !== 'string' || input.fcmToken.length === 0) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(Errors.codes.BAD_TOKEN))];
-                    }
-                }
-                if (input.swScope) {
-                    if (typeof input.swScope !== 'string' || input.swScope.length === 0) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(Errors.codes.BAD_SCOPE))];
-                    }
-                }
-                if (input.vapidKey) {
-                    if (!(input.vapidKey instanceof Uint8Array) ||
-                        input.vapidKey.length !== 65) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(Errors.codes.BAD_VAPID_KEY))];
-                    }
-                }
-                if (input.subscription) {
-                    if (!(input.subscription instanceof PushSubscription)) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(Errors.codes.BAD_SUBSCRIPTION))];
-                    }
-                }
-                if (input.fcmSenderId) {
-                    if (typeof input.fcmSenderId !== 'string' ||
-                        input.fcmSenderId.length === 0) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(Errors.codes.BAD_SENDER_ID))];
-                    }
-                }
-                if (input.fcmPushSet) {
-                    if (typeof input.fcmPushSet !== 'string' ||
-                        input.fcmPushSet.length === 0) {
-                        return [2 /*return*/, Promise.reject(this.errorFactory_.create(Errors.codes.BAD_PUSH_SET))];
-                    }
-                }
-                return [2 /*return*/];
-            });
-        });
+    TokenDetailsModel.prototype.validateInputs = function (input) {
+        if (input.fcmToken) {
+            if (typeof input.fcmToken !== 'string' || input.fcmToken.length === 0) {
+                throw this.errorFactory.create(ERROR_CODES.BAD_TOKEN);
+            }
+        }
+        if (input.swScope) {
+            if (typeof input.swScope !== 'string' || input.swScope.length === 0) {
+                throw this.errorFactory.create(ERROR_CODES.BAD_SCOPE);
+            }
+        }
+        if (input.vapidKey) {
+            if (!(input.vapidKey instanceof Uint8Array) ||
+                input.vapidKey.length !== 65) {
+                throw this.errorFactory.create(ERROR_CODES.BAD_VAPID_KEY);
+            }
+        }
+        if (input.subscription) {
+            if (!(input.subscription instanceof PushSubscription)) {
+                throw this.errorFactory.create(ERROR_CODES.BAD_SUBSCRIPTION);
+            }
+        }
+        if (input.fcmSenderId) {
+            if (typeof input.fcmSenderId !== 'string' ||
+                input.fcmSenderId.length === 0) {
+                throw this.errorFactory.create(ERROR_CODES.BAD_SENDER_ID);
+            }
+        }
+        if (input.fcmPushSet) {
+            if (typeof input.fcmPushSet !== 'string' ||
+                input.fcmPushSet.length === 0) {
+                throw this.errorFactory.create(ERROR_CODES.BAD_PUSH_SET);
+            }
+        }
     };
@@ -118,28 +96,12 @@ /**
      * @param {string} fcmToken
-     * @return {Promise<Object>} The details associated with that token.
+     * @return {Promise<TokenDetails>} The details associated with that token.
      */
     TokenDetailsModel.prototype.getTokenDetailsFromToken = function (fcmToken) {
-        var _this = this;
-        if (!fcmToken) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_TOKEN));
-        }
-        return this.validateInputs_({ fcmToken: fcmToken })
-            .then(function () {
-            return _this.openDatabase();
-        })
-            .then(function (db) {
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_TOKEN_OBJ_STORE]);
-                var objectStore = transaction.objectStore(FCM_TOKEN_OBJ_STORE);
-                var index = objectStore.index('fcmToken');
-                var request = index.get(fcmToken);
-                request.onerror = function (event) {
-                    reject(event.target.error);
-                };
-                request.onsuccess = function (event) {
-                    var result = event.target.result
-                        ? event.target.result
-                        : null;
-                    resolve(result);
-                };
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                if (!fcmToken) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_TOKEN);
+                }
+                this.validateInputs({ fcmToken: fcmToken });
+                return [2 /*return*/, this.getIndex('fcmToken', fcmToken)];
             });
@@ -151,29 +113,12 @@ });
      * indexedDB.
-     * @public
-     * @param {string} swScope
-     * @return {Promise<Object>} The details associated with that token.
+     * @return The details associated with that token.
      */
     TokenDetailsModel.prototype.getTokenDetailsFromSWScope = function (swScope) {
-        var _this = this;
-        if (!swScope) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_SCOPE));
-        }
-        return this.validateInputs_({ swScope: swScope })
-            .then(function () {
-            return _this.openDatabase();
-        })
-            .then(function (db) {
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_TOKEN_OBJ_STORE]);
-                var objectStore = transaction.objectStore(FCM_TOKEN_OBJ_STORE);
-                var scopeRequest = objectStore.get(swScope);
-                scopeRequest.onerror = function (event) {
-                    reject(event.target.error);
-                };
-                scopeRequest.onsuccess = function (event) {
-                    var result = event.target.result
-                        ? event.target.result
-                        : null;
-                    resolve(result);
-                };
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                if (!swScope) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_SCOPE);
+                }
+                this.validateInputs({ swScope: swScope });
+                return [2 /*return*/, this.get(swScope)];
             });
@@ -184,64 +129,39 @@ });
      * Save the details for the fcm token for re-use at a later date.
-     * @param {{swScope: !string, vapidKey: !string,
-     * subscription: !PushSubscription, fcmSenderId: !string, fcmToken: !string,
-     * fcmPushSet: !string}} input A plain js object containing args to save.
-     * @return {Promise<void>}
+     * @param input A plain js object containing args to save.
      */
-    TokenDetailsModel.prototype.saveTokenDetails = function (_a) {
-        var _this = this;
-        var swScope = _a.swScope, vapidKey = _a.vapidKey, subscription = _a.subscription, fcmSenderId = _a.fcmSenderId, fcmToken = _a.fcmToken, fcmPushSet = _a.fcmPushSet;
-        if (!swScope) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_SCOPE));
-        }
-        if (!vapidKey) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_VAPID_KEY));
-        }
-        if (!subscription) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_SUBSCRIPTION));
-        }
-        if (!fcmSenderId) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_SENDER_ID));
-        }
-        if (!fcmToken) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_TOKEN));
-        }
-        if (!fcmPushSet) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_PUSH_SET));
-        }
-        return this.validateInputs_({
-            swScope: swScope,
-            vapidKey: vapidKey,
-            subscription: subscription,
-            fcmSenderId: fcmSenderId,
-            fcmToken: fcmToken,
-            fcmPushSet: fcmPushSet
-        })
-            .then(function () {
-            return _this.openDatabase();
-        })
-            .then(function (db) {
-            /**
-             * @dict
-             */
-            var details = {
-                swScope: swScope,
-                vapidKey: arrayBufferToBase64(vapidKey),
-                endpoint: subscription.endpoint,
-                auth: arrayBufferToBase64(subscription['getKey']('auth')),
-                p256dh: arrayBufferToBase64(subscription['getKey']('p256dh')),
-                fcmSenderId: fcmSenderId,
-                fcmToken: fcmToken,
-                fcmPushSet: fcmPushSet,
-                createTime: Date.now()
-            };
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_TOKEN_OBJ_STORE], _this.TRANSACTION_READ_WRITE);
-                var objectStore = transaction.objectStore(FCM_TOKEN_OBJ_STORE);
-                var request = objectStore.put(details);
-                request.onerror = function (event) {
-                    reject(event.target.error);
+    TokenDetailsModel.prototype.saveTokenDetails = function (tokenDetails) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var details;
+            return tslib_1.__generator(this, function (_a) {
+                if (!tokenDetails.swScope) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_SCOPE);
+                }
+                if (!tokenDetails.vapidKey) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_VAPID_KEY);
+                }
+                if (!tokenDetails.subscription) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_SUBSCRIPTION);
+                }
+                if (!tokenDetails.fcmSenderId) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_SENDER_ID);
+                }
+                if (!tokenDetails.fcmToken) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_TOKEN);
+                }
+                if (!tokenDetails.fcmPushSet) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_PUSH_SET);
+                }
+                this.validateInputs(tokenDetails);
+                details = {
+                    swScope: tokenDetails.swScope,
+                    vapidKey: arrayBufferToBase64(tokenDetails.vapidKey),
+                    endpoint: tokenDetails.subscription.endpoint,
+                    auth: arrayBufferToBase64(tokenDetails.subscription.getKey('auth')),
+                    p256dh: arrayBufferToBase64(tokenDetails.subscription.getKey('p256dh')),
+                    fcmSenderId: tokenDetails.fcmSenderId,
+                    fcmToken: tokenDetails.fcmToken,
+                    fcmPushSet: tokenDetails.fcmPushSet,
+                    createTime: Date.now()
                 };
-                request.onsuccess = function (event) {
-                    resolve();
-                };
+                return [2 /*return*/, this.put(details)];
             });
@@ -254,30 +174,26 @@ });
      * method for deleting at a later date.
-     * @return {Promise<Object>} Resolves once the FCM token details have been
-     * deleted and returns the deleted details.
+     *
+     * @return Resolves once the FCM token details have been deleted and returns
+     * the deleted details.
      */
     TokenDetailsModel.prototype.deleteToken = function (token) {
-        var _this = this;
-        if (typeof token !== 'string' || token.length === 0) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.INVALID_DELETE_TOKEN));
-        }
-        return this.getTokenDetailsFromToken(token).then(function (details) {
-            if (!details) {
-                throw _this.errorFactory_.create(Errors.codes.DELETE_TOKEN_NOT_FOUND);
-            }
-            return _this.openDatabase().then(function (db) {
-                return new Promise(function (resolve, reject) {
-                    var transaction = db.transaction([FCM_TOKEN_OBJ_STORE], _this.TRANSACTION_READ_WRITE);
-                    var objectStore = transaction.objectStore(FCM_TOKEN_OBJ_STORE);
-                    var request = objectStore.delete(details['swScope']);
-                    request.onerror = function (event) {
-                        reject(event.target.error);
-                    };
-                    request.onsuccess = function (event) {
-                        if (event.target.result === 0) {
-                            reject(_this.errorFactory_.create(Errors.codes.FAILED_TO_DELETE_TOKEN));
-                            return;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var details;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (typeof token !== 'string' || token.length === 0) {
+                            return [2 /*return*/, Promise.reject(this.errorFactory.create(ERROR_CODES.INVALID_DELETE_TOKEN))];
                         }
-                        resolve(details);
-                    };
-                });
+                        return [4 /*yield*/, this.getTokenDetailsFromToken(token)];
+                    case 1:
+                        details = _a.sent();
+                        if (!details) {
+                            throw this.errorFactory.create(ERROR_CODES.DELETE_TOKEN_NOT_FOUND);
+                        }
+                        return [4 /*yield*/, this.delete(details.swScope)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, details];
+                }
             });
@@ -288,4 +204,15 @@ });
 }(DBInterface));
-export default TokenDetailsModel;
+export { TokenDetailsModel };
+/** Promisifies an IDBRequest. Resolves with the IDBRequest's result. */
+function promisify(request) {
+    return new Promise(function (resolve, reject) {
+        request.onsuccess = function () {
+            resolve(request.result);
+        };
+        request.onerror = function () {
+            reject(request.error);
+        };
+    });
+}
 
 //# sourceMappingURL=token-details-model.js.map

dist/esm/src/models/vapid-details-model.d.ts

@@ -1,14 +0,12 @@
-import DBInterface from './db-interface';
-export default class VapidDetailsModel extends DBInterface {
-    constructor();
+import { DBInterface } from './db-interface';
+export declare class VapidDetailsModel extends DBInterface {
+    protected readonly dbName: string;
+    protected readonly dbVersion: number;
+    protected readonly objectStoreName: string;
+    protected onDbUpgrade(db: IDBDatabase): void;
     /**
-     * @override
-     * @param {IDBDatabase} db
-     */
-    onDBUpgrade(db: any): void;
-    /**
      * Given a service worker scope, this method will look up the vapid key
      * in indexedDB.
      */
-    getVapidFromSWScope(swScope: string): Promise<Uint8Array>;
+    getVapidFromSWScope(swScope: string): Promise<Uint8Array | undefined>;
     /**
@@ -15,0 +13,0 @@ * Save a vapid key against a swScope for later date.

dist/esm/src/models/vapid-details-model.js

@@ -16,9 +16,5 @@ /**
  */
-'use strict';
 import * as tslib_1 from "tslib";
-import DBInterface from './db-interface';
-import Errors from './errors';
-var FCM_VAPID_OBJ_STORE = 'fcm_vapid_object_Store';
-var DB_NAME = 'fcm_vapid_details_db';
-var DB_VERSION = 1;
+import { DBInterface } from './db-interface';
+import { ERROR_CODES } from './errors';
 var UNCOMPRESSED_PUBLIC_KEY_SIZE = 65;
@@ -28,12 +24,10 @@ var VapidDetailsModel = /** @class */ (function (_super) {
     function VapidDetailsModel() {
-        return _super.call(this, DB_NAME, DB_VERSION) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.dbName = 'fcm_vapid_details_db';
+        _this.dbVersion = 1;
+        _this.objectStoreName = 'fcm_vapid_object_Store';
+        return _this;
     }
-    /**
-     * @override
-     * @param {IDBDatabase} db
-     */
-    VapidDetailsModel.prototype.onDBUpgrade = function (db) {
-        db.createObjectStore(FCM_VAPID_OBJ_STORE, {
-            keyPath: 'swScope'
-        });
+    VapidDetailsModel.prototype.onDbUpgrade = function (db) {
+        db.createObjectStore(this.objectStoreName, { keyPath: 'swScope' });
     };
@@ -45,21 +39,15 @@ /**
     VapidDetailsModel.prototype.getVapidFromSWScope = function (swScope) {
-        if (typeof swScope !== 'string' || swScope.length === 0) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_SCOPE));
-        }
-        return this.openDatabase().then(function (db) {
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_VAPID_OBJ_STORE]);
-                var objectStore = transaction.objectStore(FCM_VAPID_OBJ_STORE);
-                var scopeRequest = objectStore.get(swScope);
-                scopeRequest.onerror = function () {
-                    reject(scopeRequest.error);
-                };
-                scopeRequest.onsuccess = function () {
-                    var result = scopeRequest.result;
-                    var vapidKey = null;
-                    if (result) {
-                        vapidKey = result.vapidKey;
-                    }
-                    resolve(vapidKey);
-                };
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (typeof swScope !== 'string' || swScope.length === 0) {
+                            throw this.errorFactory.create(ERROR_CODES.BAD_SCOPE);
+                        }
+                        return [4 /*yield*/, this.get(swScope)];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, result ? result.vapidKey : undefined];
+                }
             });
@@ -72,24 +60,16 @@ });
     VapidDetailsModel.prototype.saveVapidDetails = function (swScope, vapidKey) {
-        var _this = this;
-        if (typeof swScope !== 'string' || swScope.length === 0) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_SCOPE));
-        }
-        if (vapidKey === null || vapidKey.length !== UNCOMPRESSED_PUBLIC_KEY_SIZE) {
-            return Promise.reject(this.errorFactory_.create(Errors.codes.BAD_VAPID_KEY));
-        }
-        var details = {
-            swScope: swScope,
-            vapidKey: vapidKey
-        };
-        return this.openDatabase().then(function (db) {
-            return new Promise(function (resolve, reject) {
-                var transaction = db.transaction([FCM_VAPID_OBJ_STORE], _this.TRANSACTION_READ_WRITE);
-                var objectStore = transaction.objectStore(FCM_VAPID_OBJ_STORE);
-                var request = objectStore.put(details);
-                request.onerror = function () {
-                    reject(request.error);
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var details;
+            return tslib_1.__generator(this, function (_a) {
+                if (typeof swScope !== 'string' || swScope.length === 0) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_SCOPE);
+                }
+                if (vapidKey === null || vapidKey.length !== UNCOMPRESSED_PUBLIC_KEY_SIZE) {
+                    throw this.errorFactory.create(ERROR_CODES.BAD_VAPID_KEY);
+                }
+                details = {
+                    swScope: swScope,
+                    vapidKey: vapidKey
                 };
-                request.onsuccess = function () {
-                    resolve();
-                };
+                return [2 /*return*/, this.put(details)];
             });
@@ -104,23 +84,17 @@ });
     VapidDetailsModel.prototype.deleteVapidDetails = function (swScope) {
-        var _this = this;
-        return this.getVapidFromSWScope(swScope).then(function (vapidKey) {
-            if (!vapidKey) {
-                throw _this.errorFactory_.create(Errors.codes.DELETE_SCOPE_NOT_FOUND);
-            }
-            return _this.openDatabase().then(function (db) {
-                return new Promise(function (resolve, reject) {
-                    var transaction = db.transaction([FCM_VAPID_OBJ_STORE], _this.TRANSACTION_READ_WRITE);
-                    var objectStore = transaction.objectStore(FCM_VAPID_OBJ_STORE);
-                    var request = objectStore.delete(swScope);
-                    request.onerror = function () {
-                        reject(request.error);
-                    };
-                    request.onsuccess = function () {
-                        if (request.result === 0) {
-                            reject(_this.errorFactory_.create(Errors.codes.FAILED_DELETE_VAPID_KEY));
-                            return;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var vapidKey;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getVapidFromSWScope(swScope)];
+                    case 1:
+                        vapidKey = _a.sent();
+                        if (!vapidKey) {
+                            throw this.errorFactory.create(ERROR_CODES.DELETE_SCOPE_NOT_FOUND);
                         }
-                        resolve(vapidKey);
-                    };
-                });
+                        return [4 /*yield*/, this.delete(swScope)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, vapidKey];
+                }
             });
@@ -131,4 +105,4 @@ });
 }(DBInterface));
-export default VapidDetailsModel;
+export { VapidDetailsModel };
 
 //# sourceMappingURL=vapid-details-model.js.map

dist/esm/src/models/worker-page-message.d.ts

@@ -1,14 +0,26 @@
-declare const _default: {
-    PARAMS: {
-        TYPE_OF_MSG: string;
-        DATA: string;
-    };
-    TYPES_OF_MSG: {
-        PUSH_MSG_RECEIVED: string;
-        NOTIFICATION_CLICKED: string;
-    };
-    createNewMsg: (msgType: any, msgData: any) => {
-        [x: string]: any;
-    };
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const PARAMS: {
+    TYPE_OF_MSG: string;
+    DATA: string;
 };
-export default _default;
+export declare const TYPES_OF_MSG: {
+    PUSH_MSG_RECEIVED: string;
+    NOTIFICATION_CLICKED: string;
+};
+export declare function createNewMsg(msgType: any, msgData: any): {
+    [key: string]: any;
+};

dist/esm/src/models/worker-page-message.js

@@ -16,6 +16,5 @@ /**
  */
-'use strict';
 // These fields are strings to prevent closure from thinking goog.getMsg
 // should be used to initialise the values
-var PARAMS = {
+export var PARAMS = {
     TYPE_OF_MSG: 'firebase-messaging-msg-type',
@@ -26,20 +25,14 @@ DATA: 'firebase-messaging-msg-data'
 // expects the variable to be defined via goog.getMsg
-var msgType = {
+export var TYPES_OF_MSG = {
     PUSH_MSG_RECEIVED: 'push-msg-received',
     NOTIFICATION_CLICKED: 'notification-clicked'
 };
-var createNewMsg = function (msgType, msgData) {
-    var message = (_a = {},
+export function createNewMsg(msgType, msgData) {
+    return _a = {},
         _a[PARAMS.TYPE_OF_MSG] = msgType,
         _a[PARAMS.DATA] = msgData,
-        _a);
-    return message;
+        _a;
     var _a;
-};
-export default {
-    PARAMS: PARAMS,
-    TYPES_OF_MSG: msgType,
-    createNewMsg: createNewMsg
-};
+}
 
 //# sourceMappingURL=worker-page-message.js.map

package.json

 {
   "name": "@firebase/messaging",
-  "version": "0.2.3-canary.1608edb",
+  "version": "0.2.3-canary.1e3254d",
   "description": "",
@@ -10,13 +10,18 @@ "author": "Firebase <[e-mail]> (https://firebase.google.com/)",
     "dev": "gulp dev",
-    "test": "karma start --single-run",
+    "test": "run-p test:karma type-check lint",
+    "test:karma": "karma start --single-run",
     "test:debug": "karma start --browsers=Chrome --auto-watch",
-    "prepare": "gulp build"
+    "prepare": "gulp build",
+    "type-check": "tsc --noEmit",
+    "lint": "tslint -p .",
+    "lint:fix": "yarn lint --fix"
   },
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@firebase/app": "0.1.10-canary.1608edb"
+    "@firebase/app": "0.1.10-canary.1e3254d",
+    "@firebase/app-types": "0.1.2-canary.1e3254d"
   },
   "dependencies": {
-    "@firebase/messaging-types": "0.1.2-canary.1608edb",
-    "@firebase/util": "0.1.10-canary.1608edb",
+    "@firebase/messaging-types": "0.1.2-canary.1e3254d",
+    "@firebase/util": "0.1.10-canary.1e3254d",
     "tslib": "^1.9.0"
@@ -42,2 +47,3 @@ },
     "ts-loader": "^3.5.0",
+    "tslint": "^5.9.1",
     "typescript": "^2.7.2",
@@ -44,0 +50,0 @@ "webpack": "^3.11.0"

New alerts

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 4 instances in 1 package

Fixed alerts

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 2 instances in 1 package

Improved metrics

Total package byte prevSize

484500

increased by0.24%

Number of package files

105

increased by7.14%

Lines of code

5519

increased by2.24%

Worsened metrics

Dependency count

5

increased by25%

Dev dependency count

20

increased by5.26%

Number of low license alerts

16

increased by14.29%

Dependency changes

• + Added@firebase/app@0.1.10-canary.1e3254d(transitive)

• + Added@firebase/app-types@0.1.2-canary.1e3254d(transitive)

• + Added@firebase/messaging-types@0.1.2-canary.1e3254d(transitive)

• + Added@firebase/util@0.1.10-canary.1e3254d(transitive)

• - Removed@firebase/app@0.1.10-canary.1608edb(transitive)

• - Removed@firebase/app-types@0.1.2-canary.1608edb(transitive)

• - Removed@firebase/messaging-types@0.1.2-canary.1608edb(transitive)

• - Removed@firebase/util@0.1.10-canary.1608edb(transitive)

• Updated@firebase/messaging-types@0.1.2-canary.1e3254d

• Updated@firebase/util@0.1.10-canary.1e3254d