@firebaseextensions/firestore-bigquery-change-tracker 1.1.15 → 1.1.16

package/lib/bigquery/index.js

@@ -42,7 +42,7 @@ Object.defineProperty(exports, "RawChangelogViewSchema", { enumerable: true, get
 class FirestoreBigQueryEventHistoryTracker {
     constructor(config) {
         this.config = config;
-        this.initialized = false;
+        this._initialized = false;
         this.bq = new bigquery.BigQuery();
         this.bq.projectId = config.bqProjectId || process.env.PROJECT_ID;
         if (!this.config.datasetLocation) {
@@ -138,16 +138,25 @@ class FirestoreBigQueryEventHistoryTracker {
      * A half a second delay is added per check while the function
      * continually re-checks until the referenced dataset and table become available.
      */
-    async waitForInitialization(dataset, table) {
+    async waitForInitialization() {
         return new Promise((resolve) => {
             let handle = setInterval(async () => {
-                const [datasetExists] = await dataset.exists();
-                const [tableExists] = await table.exists();
-                if (datasetExists && tableExists) {
+                try {
+                    const dataset = this.bigqueryDataset();
+                    const changelogName = this.rawChangeLogTableName();
+                    const table = dataset.table(changelogName);
+                    const [datasetExists] = await dataset.exists();
+                    const [tableExists] = await table.exists();
+                    if (datasetExists && tableExists) {
+                        clearInterval(handle);
+                        return resolve(table);
+                    }
+                }
+                catch (ex) {
                     clearInterval(handle);
-                    return resolve(table);
+                    logs.failedToInitializeWait(ex.message);
                 }
-            }, 500);
+            }, 5000);
         });
     }
     /**
@@ -163,7 +172,6 @@ class FirestoreBigQueryEventHistoryTracker {
         try {
             const dataset = this.bigqueryDataset();
             const table = dataset.table(this.rawChangeLogTableName());
-            await this.waitForInitialization(dataset, table);
             logs.dataInserting(rows.length);
             await table.insert(rows, options);
             logs.dataInserted(rows.length);
@@ -179,7 +187,7 @@ class FirestoreBigQueryEventHistoryTracker {
                 await handleFailedTransactions_1.default(rows, this.config, e);
             }
             // Reinitializing in case the destintation table is modified.
-            this.initialized = false;
+            this._initialized = false;
             logs.bigQueryTableInsertErrors(e.errors);
             throw e;
         }
@@ -189,13 +197,19 @@ class FirestoreBigQueryEventHistoryTracker {
      * After the first invokation, it skips initialization assuming these resources are still there.
      */
     async initialize() {
-        if (this.initialized) {
-            return;
+        try {
+            if (this._initialized) {
+                return;
+            }
+            await this.initializeDataset();
+            await this.initializeRawChangeLogTable();
+            await this.initializeLatestView();
+            this._initialized = true;
+        }
+        catch (ex) {
+            await this.waitForInitialization();
+            this._initialized = true;
         }
-        await this.initializeDataset();
-        await this.initializeRawChangeLogTable();
-        await this.initializeLatestView();
-        this.initialized = true;
     }
     /**
      * Creates the specified dataset if it doesn't already exists.

package/lib/logs.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableCreationError = exports.invalidClustering = exports.hourAndDatePartitioningWarning = exports.invalidTableReference = exports.invalidProjectIdWarning = exports.cannotPartitionExistingTable = exports.removedClustering = exports.updatedClustering = exports.bigQueryTableInsertErrors = exports.firestoreTimePartitioningParametersWarning = exports.firestoreTimePartitionFieldError = exports.addPartitionFieldColumn = exports.addNewColumn = exports.timestampMissingValue = exports.error = exports.dataTypeInvalid = exports.dataInserting = exports.dataInsertRetried = exports.dataInserted = exports.complete = exports.bigQueryViewValidating = exports.bigQueryViewValidated = exports.bigQueryViewUpToDate = exports.bigQueryViewUpdating = exports.bigQueryViewUpdated = exports.bigQueryViewAlreadyExists = exports.bigQueryViewCreating = exports.bigQueryViewCreated = exports.bigQueryUserDefinedFunctionCreated = exports.bigQueryUserDefinedFunctionCreating = exports.bigQueryTableValidating = exports.bigQueryTableValidated = exports.bigQueryTableUpToDate = exports.bigQueryTableUpdating = exports.bigQueryTableUpdated = exports.bigQueryTableCreating = exports.bigQueryTableCreated = exports.bigQueryTableAlreadyExists = exports.bigQuerySchemaViewCreated = exports.bigQueryLatestSnapshotViewQueryCreated = exports.bigQueryErrorRecordingDocumentChange = exports.bigQueryDatasetExists = exports.bigQueryDatasetCreating = exports.bigQueryDatasetCreated = exports.arrayFieldInvalid = void 0;
+exports.failedToInitializeWait = exports.tableCreationError = exports.invalidClustering = exports.hourAndDatePartitioningWarning = exports.invalidTableReference = exports.invalidProjectIdWarning = exports.cannotPartitionExistingTable = exports.removedClustering = exports.updatedClustering = exports.bigQueryTableInsertErrors = exports.firestoreTimePartitioningParametersWarning = exports.firestoreTimePartitionFieldError = exports.addPartitionFieldColumn = exports.addNewColumn = exports.timestampMissingValue = exports.error = exports.dataTypeInvalid = exports.dataInserting = exports.dataInsertRetried = exports.dataInserted = exports.complete = exports.bigQueryViewValidating = exports.bigQueryViewValidated = exports.bigQueryViewUpToDate = exports.bigQueryViewUpdating = exports.bigQueryViewUpdated = exports.bigQueryViewAlreadyExists = exports.bigQueryViewCreating = exports.bigQueryViewCreated = exports.bigQueryUserDefinedFunctionCreated = exports.bigQueryUserDefinedFunctionCreating = exports.bigQueryTableValidating = exports.bigQueryTableValidated = exports.bigQueryTableUpToDate = exports.bigQueryTableUpdating = exports.bigQueryTableUpdated = exports.bigQueryTableCreating = exports.bigQueryTableCreated = exports.bigQueryTableAlreadyExists = exports.bigQuerySchemaViewCreated = exports.bigQueryLatestSnapshotViewQueryCreated = exports.bigQueryErrorRecordingDocumentChange = exports.bigQueryDatasetExists = exports.bigQueryDatasetCreating = exports.bigQueryDatasetCreated = exports.arrayFieldInvalid = void 0;
 const firebase_functions_1 = require("firebase-functions");
 exports.arrayFieldInvalid = (fieldName) => {
     firebase_functions_1.logger.warn(`Array field '${fieldName}' does not contain an array, skipping`);
@@ -137,7 +137,9 @@ exports.bigQueryTableInsertErrors = (insertErrors) => {
     insertErrors.forEach((error) => {
         firebase_functions_1.logger.warn("ROW DATA JSON:");
         firebase_functions_1.logger.warn(error.row);
-        error.errors.forEach((error) => firebase_functions_1.logger.warn(`ROW ERROR MESSAGE: ${error.message}`));
+        if (error && error.errors) {
+            error.errors.forEach((error) => firebase_functions_1.logger.warn(`ROW ERROR MESSAGE: ${error.message}`));
+        }
     });
 };
 exports.updatedClustering = (fields) => {
@@ -168,3 +170,6 @@ exports.invalidClustering = invalidClustering;
 exports.tableCreationError = (table, message) => {
     firebase_functions_1.logger.warn(`Error caught creating table`, message);
 };
+exports.failedToInitializeWait = (message) => {
+    firebase_functions_1.logger.warn(`Failed while waiting to initialize.`, message);
+};

package/package.json

@@ -5,7 +5,7 @@
     "url": "github.com/firebase/extensions.git",
     "directory": "firestore-bigquery-export/firestore-bigquery-change-tracker"
   },
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "Core change-tracker library for Cloud Firestore Collection BigQuery Exports",
   "main": "./lib/index.js",
   "scripts": {