@firebase/data-connect 0.0.2-dataconnect-preview.388b61c7e → 0.0.3-dataconnect-preview.d986d4bf2

package/dist/index.esm5.js

@@ -5,7 +5,7 @@ import { FirebaseError } from '@firebase/util';
 import { Logger } from '@firebase/logger';
 
 var name = "@firebase/data-connect";
-var version = "0.0.2-dataconnect-preview.388b61c7e";
+var version = "0.0.3-dataconnect-preview.d986d4bf2";
 
 /**
  * @license
@@ -55,7 +55,8 @@ var Code = {
     NOT_INITIALIZED: 'not-initialized',
     NOT_SUPPORTED: 'not-supported',
     INVALID_ARGUMENT: 'invalid-argument',
-    PARTIAL_ERROR: 'partial-error'
+    PARTIAL_ERROR: 'partial-error',
+    UNAUTHORIZED: 'unauthorized'
 };
 /** An error returned by a DataConnect operation. */
 var DataConnectError = /** @class */ (function (_super) {
@@ -169,7 +170,8 @@ var FirebaseAuthProvider = /** @class */ (function () {
     FirebaseAuthProvider.prototype.removeTokenChangeListener = function (listener) {
         this._authProvider
             .get()
-            .then(function (auth) { return auth.removeAuthTokenListener(listener); });
+            .then(function (auth) { return auth.removeAuthTokenListener(listener); })
+            .catch(function (err) { return logError(err); });
     };
     return FirebaseAuthProvider;
 }());
@@ -440,14 +442,22 @@ function addToken(url, apiKey) {
  * limitations under the License.
  */
 var connectFetch = globalThis.fetch;
-function dcFetch(url, body, _a, accessToken) {
+function getGoogApiClientValue(_isUsingGen) {
+    var str = 'gl-js/ fire/' + SDK_VERSION;
+    if (_isUsingGen) {
+        str += ' web/gen';
+    }
+    return str;
+}
+function dcFetch(url, body, _a, accessToken, _isUsingGen) {
     var _this = this;
     var signal = _a.signal;
     if (!connectFetch) {
         throw new DataConnectError(Code.OTHER, 'No Fetch Implementation detected!');
     }
     var headers = {
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
+        'X-Goog-Api-Client': getGoogApiClientValue(_isUsingGen)
     };
     if (accessToken) {
         headers['X-Firebase-Auth-Token'] = accessToken;
@@ -459,11 +469,12 @@ function dcFetch(url, body, _a, accessToken) {
         method: 'POST',
         headers: headers,
         signal: signal
-    }).catch(function (err) {
-        throw new DataConnectError(Code.OTHER, "Failed to fetch: " + JSON.stringify(err));
+    })
+        .catch(function (err) {
+        throw new DataConnectError(Code.OTHER, 'Failed to fetch: ' + JSON.stringify(err));
     })
         .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
-        var jsonResponse, e_1;
+        var jsonResponse, e_1, message;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -479,9 +490,13 @@ function dcFetch(url, body, _a, accessToken) {
                     e_1 = _a.sent();
                     throw new DataConnectError(Code.OTHER, JSON.stringify(e_1));
                 case 4:
+                    message = getMessage(jsonResponse);
                     if (response.status >= 400) {
                         logError('Error while performing request: ' + JSON.stringify(jsonResponse));
-                        throw new DataConnectError(Code.OTHER, JSON.stringify(jsonResponse));
+                        if (response.status === 401) {
+                            throw new DataConnectError(Code.UNAUTHORIZED, message);
+                        }
+                        throw new DataConnectError(Code.OTHER, message);
                     }
                     return [2 /*return*/, jsonResponse];
             }
@@ -495,6 +510,12 @@ function dcFetch(url, body, _a, accessToken) {
         }
         return res;
     });
+}
+function getMessage(obj) {
+    if ('message' in obj) {
+        return obj.message;
+    }
+    return JSON.stringify(obj);
 }
 
 /**
@@ -514,11 +535,13 @@ function dcFetch(url, body, _a, accessToken) {
  * limitations under the License.
  */
 var RESTTransport = /** @class */ (function () {
-    function RESTTransport(options, apiKey, authProvider, transportOptions) {
+    function RESTTransport(options, apiKey, authProvider, transportOptions, _isUsingGen) {
+        if (_isUsingGen === void 0) { _isUsingGen = false; }
         var _this = this;
         var _a;
         this.apiKey = apiKey;
         this.authProvider = authProvider;
+        this._isUsingGen = _isUsingGen;
         this._host = '';
         this._location = 'l';
         this._connectorName = '';
@@ -526,30 +549,32 @@ var RESTTransport = /** @class */ (function () {
         this._project = 'p';
         this._accessToken = null;
         this._authInitialized = false;
+        this._lastToken = null;
         // TODO(mtewani): Update U to include shape of body defined in line 13.
         this.invokeQuery = function (queryName, body) {
             var abortController = new AbortController();
             // TODO(mtewani): Update to proper value
-            var withAuth = _this.getWithAuth().then(function () {
+            var withAuth = _this.withRetry(function () {
                 return dcFetch(addToken("".concat(_this.endpointUrl, ":executeQuery"), _this.apiKey), {
                     name: "projects/".concat(_this._project, "/locations/").concat(_this._location, "/services/").concat(_this._serviceName, "/connectors/").concat(_this._connectorName),
                     operationName: queryName,
                     variables: body
                 }, // TODO(mtewani): This is a patch, fix this.
-                abortController, _this._accessToken);
+                abortController, _this._accessToken, _this._isUsingGen);
             });
             return {
-                then: withAuth.then.bind(withAuth)
+                then: withAuth.then.bind(withAuth),
+                catch: withAuth.catch.bind(withAuth)
             };
         };
         this.invokeMutation = function (mutationName, body) {
             var abortController = new AbortController();
-            var taskResult = _this.getWithAuth().then(function () {
+            var taskResult = _this.withRetry(function () {
                 return dcFetch(addToken("".concat(_this.endpointUrl, ":executeMutation"), _this.apiKey), {
                     name: "projects/".concat(_this._project, "/locations/").concat(_this._location, "/services/").concat(_this._serviceName, "/connectors/").concat(_this._connectorName),
                     operationName: mutationName,
                     variables: body
-                }, abortController, _this._accessToken);
+                }, abortController, _this._accessToken, _this._isUsingGen);
             });
             return {
                 then: taskResult.then.bind(taskResult),
@@ -608,15 +633,16 @@ var RESTTransport = /** @class */ (function () {
     RESTTransport.prototype.onTokenChanged = function (newToken) {
         this._accessToken = newToken;
     };
-    RESTTransport.prototype.getWithAuth = function () {
+    RESTTransport.prototype.getWithAuth = function (forceToken) {
         var _this = this;
+        if (forceToken === void 0) { forceToken = false; }
         var starterPromise = new Promise(function (resolve) {
             return resolve(_this._accessToken);
         });
         if (!this._authInitialized) {
             if (this.authProvider) {
                 starterPromise = this.authProvider
-                    .getToken(/*forceToken=*/ false)
+                    .getToken(/*forceToken=*/ forceToken)
                     .then(function (data) {
                     if (!data) {
                         return null;
@@ -631,6 +657,32 @@ var RESTTransport = /** @class */ (function () {
         }
         return starterPromise;
     };
+    RESTTransport.prototype._setLastToken = function (lastToken) {
+        this._lastToken = lastToken;
+    };
+    RESTTransport.prototype.withRetry = function (promiseFactory, retry) {
+        var _this = this;
+        if (retry === void 0) { retry = false; }
+        var isNewToken = false;
+        return this.getWithAuth(retry)
+            .then(function (res) {
+            isNewToken = _this._lastToken !== res;
+            _this._lastToken = res;
+            return res;
+        })
+            .then(promiseFactory)
+            .catch(function (err) {
+            // Only retry if the result is unauthorized and the last token isn't the same as the new one.
+            if ('code' in err &&
+                err.code === Code.UNAUTHORIZED &&
+                !retry &&
+                isNewToken) {
+                logDebug('Retrying due to unauthorized');
+                return _this.withRetry(promiseFactory, true);
+            }
+            throw err;
+        });
+    };
     return RESTTransport;
 }());
 
@@ -742,6 +794,7 @@ var DataConnect = /** @class */ (function () {
         this._authProvider = _authProvider;
         this.isEmulator = false;
         this.initialized = false;
+        this._isUsingGeneratedSdk = false;
         if (typeof process !== 'undefined' && process.env) {
             var host = process.env[FIREBASE_DATA_CONNECT_EMULATOR_HOST_VAR];
             if (host) {
@@ -751,6 +804,14 @@ var DataConnect = /** @class */ (function () {
             }
         }
     }
+    /*
+      @internal
+    */
+    DataConnect.prototype._useGeneratedSdk = function () {
+        if (!this._isUsingGeneratedSdk) {
+            this._isUsingGeneratedSdk = true;
+        }
+    };
     DataConnect.prototype._delete = function () {
         _removeServiceInstance(this.app, 'data-connect', JSON.stringify(this.getSettings()));
         return Promise.resolve();
@@ -772,7 +833,7 @@ var DataConnect = /** @class */ (function () {
             this._authTokenProvider = new FirebaseAuthProvider(this.app.name, this.app.options, this._authProvider);
         }
         this.initialized = true;
-        this._transport = new this._transportClass(this.dataConnectOptions, this.app.options.apiKey, this._authTokenProvider);
+        this._transport = new this._transportClass(this.dataConnectOptions, this.app.options.apiKey, this._authTokenProvider, undefined, this._isUsingGeneratedSdk);
         if (this._transportOptions) {
             this._transport.useEmulator(this._transportOptions.host, this._transportOptions.port, this._transportOptions.sslEnabled);
         }
@@ -811,7 +872,7 @@ function getDataConnect(appOrOptions, optionalOptions) {
         dcOptions = optionalOptions;
         app = appOrOptions;
     }
-    if (!app) {
+    if (!app || Object.keys(app).length === 0) {
         app = getApp();
     }
     var provider = _getProvider(app, 'data-connect');
@@ -825,9 +886,7 @@ function getDataConnect(appOrOptions, optionalOptions) {
             return dcInstance;
         }
     }
-    if (!dcOptions) {
-        throw new DataConnectError(Code.INVALID_ARGUMENT, 'DC Option Required');
-    }
+    validateDCOptions(dcOptions);
     logDebug('Creating new DataConnect instance');
     // Initialize with options.
     return provider.initialize({
@@ -835,6 +894,24 @@ function getDataConnect(appOrOptions, optionalOptions) {
         options: dcOptions
     });
 }
+/**
+ *
+ * @param dcOptions
+ * @returns {void}
+ * @internal
+ */
+function validateDCOptions(dcOptions) {
+    var fields = ['connector', 'location', 'service'];
+    if (!dcOptions) {
+        throw new DataConnectError(Code.INVALID_ARGUMENT, 'DC Option Required');
+    }
+    fields.forEach(function (field) {
+        if (dcOptions[field] === null || dcOptions[field] === undefined) {
+            throw new DataConnectError(Code.INVALID_ARGUMENT, "".concat(field, " Required"));
+        }
+    });
+    return true;
+}
 /**
  * Delete DataConnect instance
  * @param dataConnect DataConnect instance
@@ -855,6 +932,9 @@ function registerDataConnect(variant) {
         if (settings) {
             newOpts = JSON.parse(settings);
         }
+        if (!app.options.projectId) {
+            throw new DataConnectError(Code.INVALID_ARGUMENT, 'Project ID must be provided. Did you pass in a proper projectId to initializeApp?');
+        }
         return new DataConnect(app, __assign(__assign({}, newOpts), { projectId: app.options.projectId }), authProvider);
     }, "PUBLIC" /* ComponentType.PUBLIC */).setMultipleInstances(true));
     registerVersion(name, version, variant);
@@ -914,6 +994,49 @@ function toQueryRef(serializedRef) {
     return queryRef(getDataConnect(connectorConfig), name, variables);
 }
 
+/**
+ * @license
+ * Copyright 2024 Google LLC
+ *
+ * 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.
+ */
+/**
+ * The generated SDK will allow the user to pass in either the variable or the data connect instance with the variable,
+ * and this function validates the variables and returns back the DataConnect instance and variables based on the arguments passed in.
+ * @param connectorConfig
+ * @param dcOrVars
+ * @param vars
+ * @param validateVars
+ * @returns {DataConnect} and {Variables} instance
+ * @internal
+ */
+function validateArgs(connectorConfig, dcOrVars, vars, validateVars) {
+    var dcInstance;
+    var realVars;
+    if (dcOrVars && 'enableEmulator' in dcOrVars) {
+        dcInstance = dcOrVars;
+        realVars = vars;
+    }
+    else {
+        dcInstance = getDataConnect(connectorConfig);
+        realVars = dcOrVars;
+    }
+    if (!dcInstance || (!realVars && validateVars)) {
+        throw new DataConnectError(Code.INVALID_ARGUMENT, 'Variables required.');
+    }
+    return { dc: dcInstance, vars: realVars };
+}
+
 /**
  * @license
  * Copyright 2024 Google LLC
@@ -976,5 +1099,5 @@ function subscribe(queryRefOrSerializedResult, observerOrOnNext, onError, onComp
  */
 registerDataConnect();
 
-export { DataConnect, FIREBASE_DATA_CONNECT_EMULATOR_HOST_VAR, FirebaseAuthProvider, MUTATION_STR, MutationManager, QUERY_STR, SOURCE_CACHE, SOURCE_SERVER, connectDataConnectEmulator, executeMutation, executeQuery, getDataConnect, mutationRef, parseOptions, queryRef, setLogLevel, subscribe, terminate, toQueryRef };
+export { DataConnect, FIREBASE_DATA_CONNECT_EMULATOR_HOST_VAR, FirebaseAuthProvider, MUTATION_STR, MutationManager, QUERY_STR, SOURCE_CACHE, SOURCE_SERVER, connectDataConnectEmulator, executeMutation, executeQuery, getDataConnect, mutationRef, parseOptions, queryRef, setLogLevel, subscribe, terminate, toQueryRef, validateArgs, validateDCOptions };
 //# sourceMappingURL=index.esm5.js.map