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

package/dist/node-esm/index.node.esm.js

@@ -25,7 +25,8 @@ const 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. */
 class DataConnectError extends FirebaseError {
@@ -122,12 +123,20 @@ let connectFetch = globalThis.fetch;
 function initializeFetch(fetchImpl) {
     connectFetch = fetchImpl;
 }
-function dcFetch(url, body, { signal }, accessToken) {
+function getGoogApiClientValue(_isUsingGen) {
+    let str = 'gl-js/ fire/' + SDK_VERSION;
+    if (_isUsingGen) {
+        str += ' web/gen';
+    }
+    return str;
+}
+function dcFetch(url, body, { signal }, accessToken, _isUsingGen) {
     if (!connectFetch) {
         throw new DataConnectError(Code.OTHER, 'No Fetch Implementation detected!');
     }
     const headers = {
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
+        'X-Goog-Api-Client': getGoogApiClientValue(_isUsingGen)
     };
     if (accessToken) {
         headers['X-Firebase-Auth-Token'] = accessToken;
@@ -139,8 +148,9 @@ function dcFetch(url, body, { signal }, accessToken) {
         method: 'POST',
         headers,
         signal
-    }).catch(err => {
-        throw new DataConnectError(Code.OTHER, "Failed to fetch: " + JSON.stringify(err));
+    })
+        .catch(err => {
+        throw new DataConnectError(Code.OTHER, 'Failed to fetch: ' + JSON.stringify(err));
     })
         .then(async (response) => {
         let jsonResponse = null;
@@ -150,9 +160,13 @@ function dcFetch(url, body, { signal }, accessToken) {
         catch (e) {
             throw new DataConnectError(Code.OTHER, JSON.stringify(e));
         }
+        const 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 jsonResponse;
     })
@@ -164,10 +178,16 @@ function dcFetch(url, body, { signal }, accessToken) {
         }
         return res;
     });
+}
+function getMessage(obj) {
+    if ('message' in obj) {
+        return obj.message;
+    }
+    return JSON.stringify(obj);
 }
 
 const name = "@firebase/data-connect";
-const version = "0.0.2-dataconnect-preview.388b61c7e";
+const version = "0.0.3-dataconnect-preview.d986d4bf2";
 
 /**
  * @license
@@ -227,7 +247,8 @@ class FirebaseAuthProvider {
     removeTokenChangeListener(listener) {
         this._authProvider
             .get()
-            .then(auth => auth.removeAuthTokenListener(listener));
+            .then(auth => auth.removeAuthTokenListener(listener))
+            .catch(err => logError(err));
     }
 }
 
@@ -495,10 +516,11 @@ function addToken(url, apiKey) {
  * limitations under the License.
  */
 class RESTTransport {
-    constructor(options, apiKey, authProvider, transportOptions) {
+    constructor(options, apiKey, authProvider, transportOptions, _isUsingGen = false) {
         var _a;
         this.apiKey = apiKey;
         this.authProvider = authProvider;
+        this._isUsingGen = _isUsingGen;
         this._host = '';
         this._location = 'l';
         this._connectorName = '';
@@ -506,30 +528,30 @@ class RESTTransport {
         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 = (queryName, body) => {
             const abortController = new AbortController();
             // TODO(mtewani): Update to proper value
-            const withAuth = this.getWithAuth().then(() => {
-                return dcFetch(addToken(`${this.endpointUrl}:executeQuery`, this.apiKey), {
-                    name: `projects/${this._project}/locations/${this._location}/services/${this._serviceName}/connectors/${this._connectorName}`,
-                    operationName: queryName,
-                    variables: body
-                }, // TODO(mtewani): This is a patch, fix this.
-                abortController, this._accessToken);
-            });
+            const withAuth = this.withRetry(() => dcFetch(addToken(`${this.endpointUrl}:executeQuery`, this.apiKey), {
+                name: `projects/${this._project}/locations/${this._location}/services/${this._serviceName}/connectors/${this._connectorName}`,
+                operationName: queryName,
+                variables: body
+            }, // TODO(mtewani): This is a patch, fix this.
+            abortController, this._accessToken, this._isUsingGen));
             return {
-                then: withAuth.then.bind(withAuth)
+                then: withAuth.then.bind(withAuth),
+                catch: withAuth.catch.bind(withAuth)
             };
         };
         this.invokeMutation = (mutationName, body) => {
             const abortController = new AbortController();
-            const taskResult = this.getWithAuth().then(() => {
+            const taskResult = this.withRetry(() => {
                 return dcFetch(addToken(`${this.endpointUrl}:executeMutation`, this.apiKey), {
                     name: `projects/${this._project}/locations/${this._location}/services/${this._serviceName}/connectors/${this._connectorName}`,
                     operationName: mutationName,
                     variables: body
-                }, abortController, this._accessToken);
+                }, abortController, this._accessToken, this._isUsingGen);
             });
             return {
                 then: taskResult.then.bind(taskResult),
@@ -584,12 +606,12 @@ class RESTTransport {
     onTokenChanged(newToken) {
         this._accessToken = newToken;
     }
-    getWithAuth() {
+    getWithAuth(forceToken = false) {
         let starterPromise = new Promise(resolve => resolve(this._accessToken));
         if (!this._authInitialized) {
             if (this.authProvider) {
                 starterPromise = this.authProvider
-                    .getToken(/*forceToken=*/ false)
+                    .getToken(/*forceToken=*/ forceToken)
                     .then(data => {
                     if (!data) {
                         return null;
@@ -604,6 +626,30 @@ class RESTTransport {
         }
         return starterPromise;
     }
+    _setLastToken(lastToken) {
+        this._lastToken = lastToken;
+    }
+    withRetry(promiseFactory, retry = false) {
+        let isNewToken = false;
+        return this.getWithAuth(retry)
+            .then(res => {
+            isNewToken = this._lastToken !== res;
+            this._lastToken = res;
+            return res;
+        })
+            .then(promiseFactory)
+            .catch(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;
+        });
+    }
 }
 
 /**
@@ -710,6 +756,7 @@ class DataConnect {
         this._authProvider = _authProvider;
         this.isEmulator = false;
         this.initialized = false;
+        this._isUsingGeneratedSdk = false;
         if (typeof process !== 'undefined' && process.env) {
             const host = process.env[FIREBASE_DATA_CONNECT_EMULATOR_HOST_VAR];
             if (host) {
@@ -719,6 +766,14 @@ class DataConnect {
             }
         }
     }
+    /*
+      @internal
+    */
+    _useGeneratedSdk() {
+        if (!this._isUsingGeneratedSdk) {
+            this._isUsingGeneratedSdk = true;
+        }
+    }
     _delete() {
         _removeServiceInstance(this.app, 'data-connect', JSON.stringify(this.getSettings()));
         return Promise.resolve();
@@ -740,7 +795,7 @@ class DataConnect {
             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);
         }
@@ -777,7 +832,7 @@ function getDataConnect(appOrOptions, optionalOptions) {
         dcOptions = optionalOptions;
         app = appOrOptions;
     }
-    if (!app) {
+    if (!app || Object.keys(app).length === 0) {
         app = getApp();
     }
     const provider = _getProvider(app, 'data-connect');
@@ -791,9 +846,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({
@@ -801,6 +854,24 @@ function getDataConnect(appOrOptions, optionalOptions) {
         options: dcOptions
     });
 }
+/**
+ *
+ * @param dcOptions
+ * @returns {void}
+ * @internal
+ */
+function validateDCOptions(dcOptions) {
+    const fields = ['connector', 'location', 'service'];
+    if (!dcOptions) {
+        throw new DataConnectError(Code.INVALID_ARGUMENT, 'DC Option Required');
+    }
+    fields.forEach(field => {
+        if (dcOptions[field] === null || dcOptions[field] === undefined) {
+            throw new DataConnectError(Code.INVALID_ARGUMENT, `${field} Required`);
+        }
+    });
+    return true;
+}
 /**
  * Delete DataConnect instance
  * @param dataConnect DataConnect instance
@@ -836,6 +907,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, Object.assign(Object.assign({}, newOpts), { projectId: app.options.projectId }), authProvider);
     }, "PUBLIC" /* ComponentType.PUBLIC */).setMultipleInstances(true));
     registerVersion(name, version, variant);
@@ -895,6 +969,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) {
+    let dcInstance;
+    let 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
@@ -969,5 +1086,5 @@ function subscribe(queryRefOrSerializedResult, observerOrOnNext, onError, onComp
 initializeFetch(fetch);
 registerDataConnect('node');
 
-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.node.esm.js.map