@firebase/installations 0.5.5-canary.ff2f7d4c8 → 0.5.6

package/dist/index.cjs.js

@@ -6,10 +6,9 @@ var app = require('@firebase/app');
 var component = require('@firebase/component');
 var tslib = require('tslib');
 var util = require('@firebase/util');
-var idb = require('idb');
 
 var name = "@firebase/installations";
-var version = "0.5.5-canary.ff2f7d4c8";
+var version = "0.5.6";
 
 /**
  * @license
@@ -174,15 +173,28 @@ function getAuthorizationHeader(refreshToken) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function createInstallationRequest(appConfig, _a) {
-    var fid = _a.fid;
+function createInstallationRequest(_a, _b) {
+    var appConfig = _a.appConfig, heartbeatServiceProvider = _a.heartbeatServiceProvider;
+    var fid = _b.fid;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var endpoint, headers, body, request, response, responseValue, registeredInstallationEntry;
-        return tslib.__generator(this, function (_b) {
-            switch (_b.label) {
+        var endpoint, headers, heartbeatService, heartbeatsHeader, body, request, response, responseValue, registeredInstallationEntry;
+        return tslib.__generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     endpoint = getInstallationsEndpoint(appConfig);
                     headers = getHeaders(appConfig);
+                    heartbeatService = heartbeatServiceProvider.getImmediate({
+                        optional: true
+                    });
+                    if (!heartbeatService) return [3 /*break*/, 2];
+                    return [4 /*yield*/, heartbeatService.getHeartbeatsHeader()];
+                case 1:
+                    heartbeatsHeader = _c.sent();
+                    if (heartbeatsHeader) {
+                        headers.append('x-firebase-client', heartbeatsHeader);
+                    }
+                    _c.label = 2;
+                case 2:
                     body = {
                         fid: fid,
                         authVersion: INTERNAL_AUTH_VERSION,
@@ -195,12 +207,12 @@ function createInstallationRequest(appConfig, _a) {
                         body: JSON.stringify(body)
                     };
                     return [4 /*yield*/, retryIfServerError(function () { return fetch(endpoint, request); })];
-                case 1:
-                    response = _b.sent();
-                    if (!response.ok) return [3 /*break*/, 3];
+                case 3:
+                    response = _c.sent();
+                    if (!response.ok) return [3 /*break*/, 5];
                     return [4 /*yield*/, response.json()];
-                case 2:
-                    responseValue = _b.sent();
+                case 4:
+                    responseValue = _c.sent();
                     registeredInstallationEntry = {
                         fid: responseValue.fid || fid,
                         registrationStatus: 2 /* COMPLETED */,
@@ -208,8 +220,8 @@ function createInstallationRequest(appConfig, _a) {
                         authToken: extractAuthTokenInfoFromResponse(responseValue.authToken)
                     };
                     return [2 /*return*/, registeredInstallationEntry];
-                case 3: return [4 /*yield*/, getErrorFromResponse('Create Installation', response)];
-                case 4: throw _b.sent();
+                case 5: return [4 /*yield*/, getErrorFromResponse('Create Installation', response)];
+                case 6: throw _c.sent();
             }
         });
     });
@@ -445,15 +457,15 @@ var OBJECT_STORE_NAME = 'firebase-installations-store';
 var dbPromise = null;
 function getDbPromise() {
     if (!dbPromise) {
-        dbPromise = idb.openDb(DATABASE_NAME, DATABASE_VERSION, function (upgradeDB) {
+        dbPromise = util.openDB(DATABASE_NAME, DATABASE_VERSION, function (db, oldVersion) {
             // We don't use 'break' in this switch statement, the fall-through
             // behavior is what we want, because if there are multiple versions between
             // the old version and the current version, we want ALL the migrations
             // that correspond to those versions to run, not only the last one.
             // eslint-disable-next-line default-case
-            switch (upgradeDB.oldVersion) {
+            switch (oldVersion) {
                 case 0:
-                    upgradeDB.createObjectStore(OBJECT_STORE_NAME);
+                    db.createObjectStore(OBJECT_STORE_NAME);
             }
         });
     }
@@ -474,7 +486,7 @@ function set(appConfig, value) {
                     objectStore = tx.objectStore(OBJECT_STORE_NAME);
                     return [4 /*yield*/, objectStore.get(key)];
                 case 2:
-                    oldValue = _a.sent();
+                    oldValue = (_a.sent());
                     return [4 /*yield*/, objectStore.put(value, key)];
                 case 3:
                     _a.sent();
@@ -532,7 +544,7 @@ function update(appConfig, updateFn) {
                     store = tx.objectStore(OBJECT_STORE_NAME);
                     return [4 /*yield*/, store.get(key)];
                 case 2:
-                    oldValue = _a.sent();
+                    oldValue = (_a.sent());
                     newValue = updateFn(oldValue);
                     if (!(newValue === undefined)) return [3 /*break*/, 4];
                     return [4 /*yield*/, store.delete(key)];
@@ -575,15 +587,15 @@ function update(appConfig, updateFn) {
  * Updates and returns the InstallationEntry from the database.
  * Also triggers a registration request if it is necessary and possible.
  */
-function getInstallationEntry(appConfig) {
+function getInstallationEntry(installations) {
     return tslib.__awaiter(this, void 0, void 0, function () {
         var registrationPromise, installationEntry;
         var _a;
         return tslib.__generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, update(appConfig, function (oldEntry) {
+                case 0: return [4 /*yield*/, update(installations.appConfig, function (oldEntry) {
                         var installationEntry = updateOrCreateInstallationEntry(oldEntry);
-                        var entryWithPromise = triggerRegistrationIfNecessary(appConfig, installationEntry);
+                        var entryWithPromise = triggerRegistrationIfNecessary(installations, installationEntry);
                         registrationPromise = entryWithPromise.registrationPromise;
                         return entryWithPromise.installationEntry;
                     })];
@@ -621,7 +633,7 @@ function updateOrCreateInstallationEntry(oldEntry) {
  * If registrationPromise does not exist, the installationEntry is guaranteed
  * to be registered.
  */
-function triggerRegistrationIfNecessary(appConfig, installationEntry) {
+function triggerRegistrationIfNecessary(installations, installationEntry) {
     if (installationEntry.registrationStatus === 0 /* NOT_STARTED */) {
         if (!navigator.onLine) {
             // Registration required but app is offline.
@@ -637,13 +649,13 @@ function triggerRegistrationIfNecessary(appConfig, installationEntry) {
             registrationStatus: 1 /* IN_PROGRESS */,
             registrationTime: Date.now()
         };
-        var registrationPromise = registerInstallation(appConfig, inProgressEntry);
+        var registrationPromise = registerInstallation(installations, inProgressEntry);
         return { installationEntry: inProgressEntry, registrationPromise: registrationPromise };
     }
     else if (installationEntry.registrationStatus === 1 /* IN_PROGRESS */) {
         return {
             installationEntry: installationEntry,
-            registrationPromise: waitUntilFidRegistration(appConfig)
+            registrationPromise: waitUntilFidRegistration(installations)
         };
     }
     else {
@@ -651,23 +663,23 @@ function triggerRegistrationIfNecessary(appConfig, installationEntry) {
     }
 }
 /** This will be executed only once for each new Firebase Installation. */
-function registerInstallation(appConfig, installationEntry) {
+function registerInstallation(installations, installationEntry) {
     return tslib.__awaiter(this, void 0, void 0, function () {
         var registeredInstallationEntry, e_1;
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 2, , 7]);
-                    return [4 /*yield*/, createInstallationRequest(appConfig, installationEntry)];
+                    return [4 /*yield*/, createInstallationRequest(installations, installationEntry)];
                 case 1:
                     registeredInstallationEntry = _a.sent();
-                    return [2 /*return*/, set(appConfig, registeredInstallationEntry)];
+                    return [2 /*return*/, set(installations.appConfig, registeredInstallationEntry)];
                 case 2:
                     e_1 = _a.sent();
                     if (!(isServerError(e_1) && e_1.customData.serverCode === 409)) return [3 /*break*/, 4];
                     // Server returned a "FID can not be used" error.
                     // Generate a new ID next time.
-                    return [4 /*yield*/, remove(appConfig)];
+                    return [4 /*yield*/, remove(installations.appConfig)];
                 case 3:
                     // Server returned a "FID can not be used" error.
                     // Generate a new ID next time.
@@ -675,7 +687,7 @@ function registerInstallation(appConfig, installationEntry) {
                     return [3 /*break*/, 6];
                 case 4: 
                 // Registration failed. Set FID as not registered.
-                return [4 /*yield*/, set(appConfig, {
+                return [4 /*yield*/, set(installations.appConfig, {
                         fid: installationEntry.fid,
                         registrationStatus: 0 /* NOT_STARTED */
                     })];
@@ -690,12 +702,12 @@ function registerInstallation(appConfig, installationEntry) {
     });
 }
 /** Call if FID registration is pending in another request. */
-function waitUntilFidRegistration(appConfig) {
+function waitUntilFidRegistration(installations) {
     return tslib.__awaiter(this, void 0, void 0, function () {
         var entry, _a, installationEntry, registrationPromise;
         return tslib.__generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, updateInstallationRequest(appConfig)];
+                case 0: return [4 /*yield*/, updateInstallationRequest(installations.appConfig)];
                 case 1:
                     entry = _b.sent();
                     _b.label = 2;
@@ -706,13 +718,13 @@ function waitUntilFidRegistration(appConfig) {
                 case 3:
                     // createInstallation request still in progress.
                     _b.sent();
-                    return [4 /*yield*/, updateInstallationRequest(appConfig)];
+                    return [4 /*yield*/, updateInstallationRequest(installations.appConfig)];
                 case 4:
                     entry = _b.sent();
                     return [3 /*break*/, 2];
                 case 5:
                     if (!(entry.registrationStatus === 0 /* NOT_STARTED */)) return [3 /*break*/, 7];
-                    return [4 /*yield*/, getInstallationEntry(appConfig)];
+                    return [4 /*yield*/, getInstallationEntry(installations)];
                 case 6:
                     _a = _b.sent(), installationEntry = _a.installationEntry, registrationPromise = _a.registrationPromise;
                     if (registrationPromise) {
@@ -774,23 +786,30 @@ function hasInstallationRequestTimedOut(installationEntry) {
  * limitations under the License.
  */
 function generateAuthTokenRequest(_a, installationEntry) {
-    var appConfig = _a.appConfig, platformLoggerProvider = _a.platformLoggerProvider;
+    var appConfig = _a.appConfig, heartbeatServiceProvider = _a.heartbeatServiceProvider;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var endpoint, headers, platformLogger, body, request, response, responseValue, completedAuthToken;
+        var endpoint, headers, heartbeatService, heartbeatsHeader, body, request, response, responseValue, completedAuthToken;
         return tslib.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     endpoint = getGenerateAuthTokenEndpoint(appConfig, installationEntry);
                     headers = getHeadersWithAuth(appConfig, installationEntry);
-                    platformLogger = platformLoggerProvider.getImmediate({
+                    heartbeatService = heartbeatServiceProvider.getImmediate({
                         optional: true
                     });
-                    if (platformLogger) {
-                        headers.append('x-firebase-client', platformLogger.getPlatformInfoString());
+                    if (!heartbeatService) return [3 /*break*/, 2];
+                    return [4 /*yield*/, heartbeatService.getHeartbeatsHeader()];
+                case 1:
+                    heartbeatsHeader = _b.sent();
+                    if (heartbeatsHeader) {
+                        headers.append('x-firebase-client', heartbeatsHeader);
                     }
+                    _b.label = 2;
+                case 2:
                     body = {
                         installation: {
-                            sdkVersion: PACKAGE_VERSION
+                            sdkVersion: PACKAGE_VERSION,
+                            appId: appConfig.appId
                         }
                     };
                     request = {
@@ -799,16 +818,16 @@ function generateAuthTokenRequest(_a, installationEntry) {
                         body: JSON.stringify(body)
                     };
                     return [4 /*yield*/, retryIfServerError(function () { return fetch(endpoint, request); })];
-                case 1:
+                case 3:
                     response = _b.sent();
-                    if (!response.ok) return [3 /*break*/, 3];
+                    if (!response.ok) return [3 /*break*/, 5];
                     return [4 /*yield*/, response.json()];
-                case 2:
+                case 4:
                     responseValue = _b.sent();
                     completedAuthToken = extractAuthTokenInfoFromResponse(responseValue);
                     return [2 /*return*/, completedAuthToken];
-                case 3: return [4 /*yield*/, getErrorFromResponse('Generate Auth Token', response)];
-                case 4: throw _b.sent();
+                case 5: return [4 /*yield*/, getErrorFromResponse('Generate Auth Token', response)];
+                case 6: throw _b.sent();
             }
         });
     });
@@ -1041,7 +1060,7 @@ function getId(installations) {
             switch (_b.label) {
                 case 0:
                     installationsImpl = installations;
-                    return [4 /*yield*/, getInstallationEntry(installationsImpl.appConfig)];
+                    return [4 /*yield*/, getInstallationEntry(installationsImpl)];
                 case 1:
                     _a = _b.sent(), installationEntry = _a.installationEntry, registrationPromise = _a.registrationPromise;
                     if (registrationPromise) {
@@ -1090,7 +1109,7 @@ function getToken(installations, forceRefresh) {
             switch (_a.label) {
                 case 0:
                     installationsImpl = installations;
-                    return [4 /*yield*/, completeInstallationRegistration(installationsImpl.appConfig)];
+                    return [4 /*yield*/, completeInstallationRegistration(installationsImpl)];
                 case 1:
                     _a.sent();
                     return [4 /*yield*/, refreshAuthToken(installationsImpl, forceRefresh)];
@@ -1101,12 +1120,12 @@ function getToken(installations, forceRefresh) {
         });
     });
 }
-function completeInstallationRegistration(appConfig) {
+function completeInstallationRegistration(installations) {
     return tslib.__awaiter(this, void 0, void 0, function () {
         var registrationPromise;
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, getInstallationEntry(appConfig)];
+                case 0: return [4 /*yield*/, getInstallationEntry(installations)];
                 case 1:
                     registrationPromise = (_a.sent()).registrationPromise;
                     if (!registrationPromise) return [3 /*break*/, 3];
@@ -1367,11 +1386,11 @@ var publicFactory = function (container) {
     var app$1 = container.getProvider('app').getImmediate();
     // Throws if app isn't configured properly.
     var appConfig = extractAppConfig(app$1);
-    var platformLoggerProvider = app._getProvider(app$1, 'platform-logger');
+    var heartbeatServiceProvider = app._getProvider(app$1, 'heartbeat');
     var installationsImpl = {
         app: app$1,
         appConfig: appConfig,
-        platformLoggerProvider: platformLoggerProvider,
+        heartbeatServiceProvider: heartbeatServiceProvider,
         _delete: function () { return Promise.resolve(); }
     };
     return installationsImpl;