@intuitionrobotics/firebase 0.40.25 → 0.41.0

package/app-frontend/auth/FirebaseSession.js

@@ -71,13 +71,17 @@ exports.FirebaseSession = void 0;
 /**
  * Created by tacb0ss on 19/09/2018.
  */
-var app_1 = require("firebase/app");
 // tslint:disable:no-import-side-effect
 require("firebase/auth");
+var auth_1 = require("firebase/auth");
+var app_1 = require("firebase/app");
 var ts_common_1 = require("@intuitionrobotics/ts-common");
 var MessagingWrapper_1 = require("../messaging/MessagingWrapper");
 var AnalyticsWrapper_1 = require("../analytics/AnalyticsWrapper");
 var DatabaseWrapper_1 = require("../database/DatabaseWrapper");
+var messaging_1 = require("firebase/messaging");
+var analytics_1 = require("firebase/analytics");
+var database_1 = require("firebase/database");
 var FirebaseSession = /** @class */ (function (_super) {
     __extends(FirebaseSession, _super);
     function FirebaseSession(sessionName, config) {
@@ -87,27 +91,27 @@ var FirebaseSession = /** @class */ (function (_super) {
         return _this;
     }
     FirebaseSession.prototype.connect = function () {
-        this.app = app_1.default.initializeApp(this.config, this.sessionName);
+        this.app = app_1.initializeApp(this.config, this.sessionName);
     };
     FirebaseSession.prototype.getMessaging = function () {
         if (this.messaging)
             return this.messaging;
-        return this.messaging = new MessagingWrapper_1.MessagingWrapper(this.app.messaging());
+        return this.messaging = new MessagingWrapper_1.MessagingWrapper(messaging_1.getMessaging(this.app));
     };
     FirebaseSession.prototype.getAnalytics = function () {
         if (this.analytics)
             return this.analytics;
-        return this.analytics = new AnalyticsWrapper_1.AnalyticsWrapper(this.app.analytics());
+        return this.analytics = new AnalyticsWrapper_1.AnalyticsWrapper(analytics_1.getAnalytics(this.app));
     };
     FirebaseSession.prototype.getDatabase = function () {
         if (this.database)
             return this.database;
-        return this.database = new DatabaseWrapper_1.DatabaseWrapper(this.app.database());
+        return this.database = new DatabaseWrapper_1.DatabaseWrapper(database_1.getDatabase(this.app));
     };
     FirebaseSession.prototype.signInWithToken = function (token) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.app.auth().signInWithCustomToken(token)];
+                return [2 /*return*/, auth_1.signInWithCustomToken(auth_1.getAuth(this.app), token)];
             });
         });
     };
@@ -115,7 +119,7 @@ var FirebaseSession = /** @class */ (function (_super) {
     FirebaseSession.prototype.signOut = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.app.auth().signOut()];
+                return [2 /*return*/, auth_1.signOut(auth_1.getAuth(this.app))];
             });
         });
     };

package/app-frontend/auth/FirebaseSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"FirebaseSession.js","sourceRoot":"","sources":["../../../src/main/app-frontend/auth/FirebaseSession.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH;;GAEG;AACH,oCAAoC;AACpC,uCAAuC;AACvC,yBAAuB;AACvB,0DAGsC;AAGtC,kEAA+D;AAC/D,kEAA+D;AAC/D,+DAA4D;AAE5D;IACS,mCAAM;IASd,yBAAY,WAAmB,EAAE,MAAsB;QAAvD,YACC,kBAAM,eAAa,WAAa,CAAC,SAGjC;QAFA,KAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,KAAI,CAAC,MAAM,GAAG,MAAM,CAAC;;IACtB,CAAC;IAEM,iCAAO,GAAd;QACC,IAAI,CAAC,GAAG,GAAG,aAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAClE,CAAC;IAED,sCAAY,GAAZ;QACC,IAAI,IAAI,CAAC,SAAS;YACjB,OAAO,IAAI,CAAC,SAAS,CAAC;QAEvB,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,sCAAY,GAAZ;QACC,IAAI,IAAI,CAAC,SAAS;YACjB,OAAO,IAAI,CAAC,SAAS,CAAC;QAEvB,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,qCAAW,GAAX;QACC,IAAI,IAAI,CAAC,QAAQ;YAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;QAEtB,OAAO,IAAI,CAAC,QAAQ,GAAG,IAAI,iCAAe,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;IAEK,yCAAe,GAArB,UAAsB,KAAa;;;gBAClC,sBAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAA;;;KACnD;IAAA,CAAC;IAEI,iCAAO,GAAb;;;gBACC,sBAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,EAAA;;;KAChC;IAED,sCAAY,GAAZ;QACC,IAAI,CAAC,IAAI,CAAC,MAAM;YACf,MAAM,IAAI,wCAA4B,CAAC,iDAAiD,CAAC,CAAA;QAE1F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS;YACzB,MAAM,IAAI,wCAA4B,CAAC,0GAA0G,CAAC,CAAA;QAEnJ,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;IAC9B,CAAC;IACF,sBAAC;AAAD,CAAC,AA1DD,CACS,kBAAM,GAyDd;AA1DY,0CAAe"}
+{"version":3,"file":"FirebaseSession.js","sourceRoot":"","sources":["../../../src/main/app-frontend/auth/FirebaseSession.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH;;GAEG;AAEH,uCAAuC;AACvC,yBAAuB;AACvB,sCAAoE;AACpE,oCAGsB;AACtB,0DAGsC;AAGtC,kEAA+D;AAC/D,kEAA+D;AAC/D,+DAA4D;AAC5D,gDAAgD;AAChD,gDAAgD;AAChD,8CAA8C;AAE9C;IACS,mCAAM;IASd,yBAAY,WAAmB,EAAE,MAAsB;QAAvD,YACC,kBAAM,eAAa,WAAa,CAAC,SAGjC;QAFA,KAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,KAAI,CAAC,MAAM,GAAG,MAAM,CAAC;;IACtB,CAAC;IAEM,iCAAO,GAAd;QACC,IAAI,CAAC,GAAG,GAAG,mBAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACzD,CAAC;IAED,sCAAY,GAAZ;QACC,IAAI,IAAI,CAAC,SAAS;YACjB,OAAO,IAAI,CAAC,SAAS,CAAC;QAEvB,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,mCAAgB,CAAC,wBAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,sCAAY,GAAZ;QACC,IAAI,IAAI,CAAC,SAAS;YACjB,OAAO,IAAI,CAAC,SAAS,CAAC;QAEvB,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,mCAAgB,CAAC,wBAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,qCAAW,GAAX;QACC,IAAI,IAAI,CAAC,QAAQ;YAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;QAEtB,OAAO,IAAI,CAAC,QAAQ,GAAG,IAAI,iCAAe,CAAC,sBAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;IAEK,yCAAe,GAArB,UAAsB,KAAa;;;gBAClC,sBAAO,4BAAqB,CAAC,cAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAC,KAAK,CAAC,EAAA;;;KACrD;IAAA,CAAC;IAEI,iCAAO,GAAb;;;gBACC,sBAAO,cAAO,CAAC,cAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAA;;;KACjC;IAED,sCAAY,GAAZ;QACC,IAAI,CAAC,IAAI,CAAC,MAAM;YACf,MAAM,IAAI,wCAA4B,CAAC,iDAAiD,CAAC,CAAC;QAE3F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS;YACzB,MAAM,IAAI,wCAA4B,CAAC,0GAA0G,CAAC,CAAC;QAEpJ,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;IAC9B,CAAC;IACF,sBAAC;AAAD,CAAC,AA1DD,CACS,kBAAM,GAyDd;AA1DY,0CAAe"}

package/app-frontend/auth/SwFirebaseSession.d.ts

@@ -1,14 +1,14 @@
 /**
  * Created by tacb0ss on 19/09/2018.
  */
-import firebase from 'firebase/app';
-import 'firebase/auth';
+import { FirebaseApp } from "firebase/app";
+import "firebase/auth";
 import { Logger } from "@intuitionrobotics/ts-common";
 import { SwMessagingWrapper } from "../messaging/SwMessagingWrapper";
 export declare class SwFirebaseSession extends Logger {
-    app: firebase.app.App;
+    app: FirebaseApp;
     protected sessionName: string;
     protected messaging?: SwMessagingWrapper;
-    constructor(sessionName: string, app: firebase.app.App);
+    constructor(sessionName: string, app: FirebaseApp);
     getMessaging(): SwMessagingWrapper;
 }

package/app-frontend/auth/SwFirebaseSession.js

@@ -37,6 +37,7 @@ require("firebase/auth");
 var ts_common_1 = require("@intuitionrobotics/ts-common");
 // noinspection TypeScriptPreferShortImport
 var SwMessagingWrapper_1 = require("../messaging/SwMessagingWrapper");
+var messaging_1 = require("firebase/messaging");
 var SwFirebaseSession = /** @class */ (function (_super) {
     __extends(SwFirebaseSession, _super);
     function SwFirebaseSession(sessionName, app) {
@@ -48,7 +49,7 @@ var SwFirebaseSession = /** @class */ (function (_super) {
     SwFirebaseSession.prototype.getMessaging = function () {
         if (this.messaging)
             return this.messaging;
-        return this.messaging = new SwMessagingWrapper_1.SwMessagingWrapper(this.app.messaging());
+        return this.messaging = new SwMessagingWrapper_1.SwMessagingWrapper(messaging_1.getMessaging(this.app));
     };
     return SwFirebaseSession;
 }(ts_common_1.Logger));

package/app-frontend/auth/SwFirebaseSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwFirebaseSession.js","sourceRoot":"","sources":["../../../src/main/app-frontend/auth/SwFirebaseSession.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;AAMH,uCAAuC;AACvC,yBAAuB;AACvB,0DAAoD;AACpD,2CAA2C;AAC3C,sEAAmE;AAEnE;IACS,qCAAM;IAMd,2BAAY,WAAmB,EAAE,GAAqB;QAAtD,YACC,kBAAM,8BAA4B,WAAa,CAAC,SAIhD;QAFA,KAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,KAAI,CAAC,GAAG,GAAG,GAAG,CAAC;;IAChB,CAAC;IAED,wCAAY,GAAZ;QACC,IAAI,IAAI,CAAC,SAAS;YACjB,OAAO,IAAI,CAAC,SAAS,CAAC;QAEvB,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,uCAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;IACtE,CAAC;IACF,wBAAC;AAAD,CAAC,AApBD,CACS,kBAAM,GAmBd;AApBY,8CAAiB"}
+{"version":3,"file":"SwFirebaseSession.js","sourceRoot":"","sources":["../../../src/main/app-frontend/auth/SwFirebaseSession.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;AAMH,uCAAuC;AACvC,yBAAuB;AACvB,0DAAoD;AACpD,2CAA2C;AAC3C,sEAAmE;AACnE,gDAAgD;AAGhD;IACS,qCAAM;IAMd,2BAAY,WAAmB,EAAE,GAAgB;QAAjD,YACC,kBAAM,8BAA4B,WAAa,CAAC,SAIhD;QAFA,KAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,KAAI,CAAC,GAAG,GAAG,GAAG,CAAC;;IAChB,CAAC;IAED,wCAAY,GAAZ;QACC,IAAI,IAAI,CAAC,SAAS;YACjB,OAAO,IAAI,CAAC,SAAS,CAAC;QAEvB,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,uCAAkB,CAAC,wBAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,CAAC;IACF,wBAAC;AAAD,CAAC,AApBD,CACS,kBAAM,GAmBd;AApBY,8CAAiB"}

package/app-frontend/database/DatabaseWrapper.d.ts

@@ -1,14 +1,16 @@
 import { Logger } from "@intuitionrobotics/ts-common";
 import { FirebaseType_DB } from "./types";
-import 'firebase/database';
 export declare class DatabaseWrapper extends Logger {
     private readonly database;
     constructor(database: FirebaseType_DB);
-    get<T>(path: string): Promise<T>;
-    listen<T>(path: string, callback: (value: T) => void): void;
-    set<T>(path: string, value: T): Promise<any>;
-    update<T>(path: string, value: T): Promise<any>;
-    patch<T>(path: string, value: T): Promise<any>;
-    remove<T>(path: string, assertionRegexp?: string): Promise<any>;
-    delete<T>(path: string, assertionRegexp?: string): Promise<any>;
+    get<T>(path: string): Promise<T | null>;
+    listen<T>(path: string, callback: (value: T) => void): import("@firebase/database").Unsubscribe;
+    private getRef;
+    set<T>(path: string, value: T): Promise<void>;
+    /** @deprecated */
+    update<T extends object>(path: string, value: T): Promise<void>;
+    patch<T extends object>(path: string, value: T): Promise<void>;
+    /** @deprecated */
+    remove<T>(path: string, assertionRegexp?: string): Promise<void>;
+    delete<T>(path: string, assertionRegexp?: string): Promise<void>;
 }

package/app-frontend/database/DatabaseWrapper.js

@@ -69,48 +69,59 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseWrapper = void 0;
 var ts_common_1 = require("@intuitionrobotics/ts-common");
 // tslint:disable:no-import-side-effect
-require("firebase/database");
+var database_1 = require("firebase/database");
 var DatabaseWrapper = /** @class */ (function (_super) {
     __extends(DatabaseWrapper, _super);
     function DatabaseWrapper(database) {
         var _this = _super.call(this) || this;
+        _this.getRef = function (path) { return database_1.ref(_this.database, path); };
         _this.database = database;
         return _this;
     }
     DatabaseWrapper.prototype.get = function (path) {
         return __awaiter(this, void 0, void 0, function () {
-            var snapshot;
+            var _this = this;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.database.ref(path).once("value")];
-                    case 1:
-                        snapshot = _a.sent();
-                        return [2 /*return*/, snapshot.val()];
-                }
+                return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            database_1.onValue(this.getRef(path), function (snapshot) {
+                                resolve(snapshot.val());
+                            }, function (error) {
+                                reject(error);
+                            }, { onlyOnce: true });
+                            return [2 /*return*/];
+                        });
+                    }); })];
             });
         });
     };
     DatabaseWrapper.prototype.listen = function (path, callback) {
-        try {
-            this.database.ref(path).on("value", function (snapshot) { return callback(!snapshot || snapshot.val()); });
-        }
-        catch (e) {
-            throw new ts_common_1.BadImplementationException("Error while getting value from path: " + path);
-        }
+        return database_1.onValue(this.getRef(path), function (snapshot) {
+            callback(!snapshot || snapshot.val());
+        }, function (error) {
+            throw new ts_common_1.BadImplementationException("Error while getting value from path: " + path, error);
+        }, { onlyOnce: false });
     };
     DatabaseWrapper.prototype.set = function (path, value) {
         return __awaiter(this, void 0, void 0, function () {
+            var e_1;
             return __generator(this, function (_a) {
-                try {
-                    return [2 /*return*/, this.database.ref(path).set(value)];
-                }
-                catch (e) {
-                    throw new ts_common_1.BadImplementationException("Error while setting value to path: " + path);
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, database_1.set(this.getRef(path), value)];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        e_1 = _a.sent();
+                        throw new ts_common_1.BadImplementationException("Error while setting value to path: " + path);
+                    case 3: return [2 /*return*/];
                 }
-                return [2 /*return*/];
             });
         });
     };
+    /** @deprecated */
     DatabaseWrapper.prototype.update = function (path, value) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -121,17 +132,24 @@ var DatabaseWrapper = /** @class */ (function (_super) {
     };
     DatabaseWrapper.prototype.patch = function (path, value) {
         return __awaiter(this, void 0, void 0, function () {
+            var e_2;
             return __generator(this, function (_a) {
-                try {
-                    return [2 /*return*/, this.database.ref(path).update(value)];
-                }
-                catch (e) {
-                    throw new ts_common_1.BadImplementationException("Error while updating value to path: " + path);
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, database_1.update(this.getRef(path), value)];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        e_2 = _a.sent();
+                        throw new ts_common_1.BadImplementationException("Error while updating value to path: " + path);
+                    case 3: return [2 /*return*/];
                 }
-                return [2 /*return*/];
             });
         });
     };
+    /** @deprecated */
     DatabaseWrapper.prototype.remove = function (path, assertionRegexp) {
         if (assertionRegexp === void 0) { assertionRegexp = "^/.*?/.*"; }
         return __awaiter(this, void 0, void 0, function () {
@@ -144,18 +162,26 @@ var DatabaseWrapper = /** @class */ (function (_super) {
     DatabaseWrapper.prototype.delete = function (path, assertionRegexp) {
         if (assertionRegexp === void 0) { assertionRegexp = "^/.*?/.*"; }
         return __awaiter(this, void 0, void 0, function () {
+            var e_3;
             return __generator(this, function (_a) {
-                if (!path)
-                    throw new ts_common_1.BadImplementationException("Falsy value, path: '" + path + "'");
-                if (!path.match(new RegExp(assertionRegexp)))
-                    throw new ts_common_1.BadImplementationException("path: '" + path + "'  does not match assertion: '" + assertionRegexp + "'");
-                try {
-                    return [2 /*return*/, this.database.ref(path).remove()];
-                }
-                catch (e) {
-                    throw new ts_common_1.BadImplementationException("Error while removing path: " + path);
+                switch (_a.label) {
+                    case 0:
+                        if (!path)
+                            throw new ts_common_1.BadImplementationException("Falsy value, path: '" + path + "'");
+                        if (!path.match(new RegExp(assertionRegexp)))
+                            throw new ts_common_1.BadImplementationException("path: '" + path + "'  does not match assertion: '" + assertionRegexp + "'");
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, database_1.remove(this.getRef(path))];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_3 = _a.sent();
+                        throw new ts_common_1.BadImplementationException("Error while removing path: " + path);
+                    case 4: return [2 /*return*/];
                 }
-                return [2 /*return*/];
             });
         });
     };

package/app-frontend/database/DatabaseWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseWrapper.js","sourceRoot":"","sources":["../../../src/main/app-frontend/database/DatabaseWrapper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0DAGsC;AAEtC,uCAAuC;AACvC,6BAA2B;AAE3B;IACS,mCAAM;IAId,yBAAY,QAAyB;QAArC,YACC,iBAAO,SAEP;QADA,KAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;;IAC1B,CAAC;IAGY,6BAAG,GAAhB,UAAoB,IAAY;;;;;4BACd,qBAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAA;;wBAAtD,QAAQ,GAAG,SAA2C;wBAC5D,sBAAO,QAAQ,CAAC,GAAG,EAAO,EAAC;;;;KAC3B;IAEM,gCAAM,GAAb,UAAiB,IAAY,EAAE,QAA4B;QAC1D,IAAI;YACH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,QAAQ,IAAK,OAAA,QAAQ,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC,EAArC,CAAqC,CAAC,CAAC;SACzF;QAAC,OAAO,CAAC,EAAE;YACX,MAAM,IAAI,sCAA0B,CAAC,0CAAwC,IAAM,CAAC,CAAC;SACrF;IACF,CAAC;IAEY,6BAAG,GAAhB,UAAoB,IAAY,EAAE,KAAQ;;;gBACzC,IAAI;oBACH,sBAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAC;iBAC1C;gBAAC,OAAO,CAAC,EAAE;oBACX,MAAM,IAAI,sCAA0B,CAAC,wCAAsC,IAAM,CAAC,CAAC;iBACnF;;;;KACD;IAEY,gCAAM,GAAnB,UAAuB,IAAY,EAAE,KAAQ;;;gBAC5C,IAAI,CAAC,UAAU,CAAC,8CAA8C,CAAC,CAAC;gBAChE,sBAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAC;;;KAC/B;IAEY,+BAAK,GAAlB,UAAsB,IAAY,EAAE,KAAQ;;;gBAC3C,IAAI;oBACH,sBAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC;iBAC7C;gBAAC,OAAO,CAAC,EAAE;oBACX,MAAM,IAAI,sCAA0B,CAAC,yCAAuC,IAAM,CAAC,CAAC;iBACpF;;;;KACD;IAEY,gCAAM,GAAnB,UAAuB,IAAY,EAAE,eAAoC;QAApC,gCAAA,EAAA,4BAAoC;;;gBACxE,IAAI,CAAC,UAAU,CAAC,+CAA+C,CAAC,CAAC;gBACjE,sBAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,EAAC;;;KAC1C;IAEY,gCAAM,GAAnB,UAAuB,IAAY,EAAE,eAAoC;QAApC,gCAAA,EAAA,4BAAoC;;;gBACxE,IAAI,CAAC,IAAI;oBACR,MAAM,IAAI,sCAA0B,CAAC,yBAAuB,IAAI,MAAG,CAAC,CAAC;gBAEtE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC;oBAC3C,MAAM,IAAI,sCAA0B,CAAC,YAAU,IAAI,sCAAiC,eAAe,MAAG,CAAC,CAAC;gBAEzG,IAAI;oBACH,sBAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAC;iBACxC;gBAAC,OAAO,CAAC,EAAE;oBACX,MAAM,IAAI,sCAA0B,CAAC,gCAA8B,IAAM,CAAC,CAAC;iBAC3E;;;;KACD;IACF,sBAAC;AAAD,CAAC,AA/DD,CACS,kBAAM,GA8Dd;AA/DY,0CAAe"}
+{"version":3,"file":"DatabaseWrapper.js","sourceRoot":"","sources":["../../../src/main/app-frontend/database/DatabaseWrapper.ts"],"names":[],"mappings":"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"}

package/app-frontend/database/types.d.ts

@@ -1,17 +1,2 @@
-import firebase from 'firebase/app';
-import { EventType } from "../../shared/types";
-export declare type FirebaseType_DB = firebase.database.Database;
-export interface Firebase_DB {
-    ref(path: string): Firebase_Reference;
-}
-export interface Firebase_DataSnapshot {
-    toJSON(): Object | null;
-    val(): any;
-}
-export interface Firebase_Reference {
-    on(eventType: EventType, callback: (snapshot: Firebase_DataSnapshot | null) => void): void;
-    remove(): Promise<void>;
-    set(value: any): Promise<void>;
-    update(values: any): Promise<void>;
-    once(eventType: EventType): Promise<Firebase_DataSnapshot>;
-}
+import { Database } from "firebase/database";
+export declare type FirebaseType_DB = Database;

package/app-frontend/messaging/MessagingWrapper.d.ts

@@ -1,20 +1,11 @@
 import { Logger } from "@intuitionrobotics/ts-common";
 import { FirebaseType_Messaging, FirebaseType_Unsubscribe } from "./types";
-import 'firebase/messaging';
+import { GetTokenOptions, MessagePayload, NextFn, Observer } from "firebase/messaging";
 export declare class MessagingWrapper extends Logger {
     private readonly messaging;
     private callback?;
     private token?;
     constructor(messaging: FirebaseType_Messaging);
-    /** @deprecated */
-    usePublicVapidKey(vapidKey: string): void;
-    getToken(options?: {
-        vapidKey?: string;
-        serviceWorkerRegistration?: ServiceWorkerRegistration;
-    }): Promise<string>;
-    /** @deprecated */
-    useServiceWorker(registration: ServiceWorkerRegistration): void;
-    /** @deprecated */
-    onTokenRefresh(callback: () => void): FirebaseType_Unsubscribe;
-    onMessage(callback: (payload: any) => void): FirebaseType_Unsubscribe | void;
+    getToken(options?: GetTokenOptions): Promise<string>;
+    onMessage(callback: NextFn<MessagePayload> | Observer<MessagePayload>): FirebaseType_Unsubscribe | void;
 }

package/app-frontend/messaging/MessagingWrapper.js

@@ -68,8 +68,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessagingWrapper = void 0;
 var ts_common_1 = require("@intuitionrobotics/ts-common");
-// tslint:disable:no-import-side-effect
-require("firebase/messaging");
+var messaging_1 = require("firebase/messaging");
 var MessagingWrapper = /** @class */ (function (_super) {
     __extends(MessagingWrapper, _super);
     function MessagingWrapper(messaging) {
@@ -77,10 +76,6 @@ var MessagingWrapper = /** @class */ (function (_super) {
         _this.messaging = messaging;
         return _this;
     }
-    /** @deprecated */
-    MessagingWrapper.prototype.usePublicVapidKey = function (vapidKey) {
-        this.messaging.usePublicVapidKey(vapidKey);
-    };
     MessagingWrapper.prototype.getToken = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var _a;
@@ -88,31 +83,21 @@ var MessagingWrapper = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         _a = this;
-                        return [4 /*yield*/, this.messaging.getToken(options)];
+                        return [4 /*yield*/, messaging_1.getToken(this.messaging, options)];
                     case 1:
                         _a.token = _b.sent();
                         if (this.callback)
-                            this.messaging.onMessage(this.callback);
+                            this.onMessage(this.callback);
                         return [2 /*return*/, this.token];
                 }
             });
         });
     };
-    /** @deprecated */
-    MessagingWrapper.prototype.useServiceWorker = function (registration) {
-        this.messaging.useServiceWorker(registration);
-    };
-    /** @deprecated */
-    MessagingWrapper.prototype.onTokenRefresh = function (callback) {
-        return this.messaging.onTokenRefresh(callback);
-    };
     MessagingWrapper.prototype.onMessage = function (callback) {
         this.callback = callback;
         if (!this.token)
             return;
-        return this.messaging.onMessage(function (callbackPayload) {
-            return callback(callbackPayload);
-        });
+        return messaging_1.onMessage(this.messaging, callback);
     };
     return MessagingWrapper;
 }(ts_common_1.Logger));

package/app-frontend/messaging/MessagingWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"MessagingWrapper.js","sourceRoot":"","sources":["../../../src/main/app-frontend/messaging/MessagingWrapper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0DAAoD;AAKpD,uCAAuC;AACvC,8BAA4B;AAE5B;IACS,oCAAM;IAMd,0BAAY,SAAiC;QAA7C,YACC,iBAAO,SAEP;QADA,KAAI,CAAC,SAAS,GAAG,SAAS,CAAC;;IAC5B,CAAC;IAED,kBAAkB;IAClB,4CAAiB,GAAjB,UAAkB,QAAgB;QACjC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEK,mCAAQ,GAAd,UAAe,OAGd;;;;;;wBACA,KAAA,IAAI,CAAA;wBAAS,qBAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAA;;wBAAnD,GAAK,KAAK,GAAG,SAAsC,CAAC;wBACpD,IAAI,IAAI,CAAC,QAAQ;4BAChB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBAEzC,sBAAO,IAAI,CAAC,KAAK,EAAC;;;;KAClB;IAED,kBAAkB;IAClB,2CAAgB,GAAhB,UAAiB,YAAuC;QACvD,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC/C,CAAC;IAED,kBAAkB;IAClB,yCAAc,GAAd,UAAe,QAAoB;QAClC,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,oCAAS,GAAT,UAAU,QAAgC;QACzC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,KAAK;YACd,OAAO;QAER,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAC,eAAe;YAC/C,OAAO,QAAQ,CAAC,eAAe,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACJ,CAAC;IACF,uBAAC;AAAD,CAAC,AA/CD,CACS,kBAAM,GA8Cd;AA/CY,4CAAgB"}
+{"version":3,"file":"MessagingWrapper.js","sourceRoot":"","sources":["../../../src/main/app-frontend/messaging/MessagingWrapper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0DAAoD;AAEpD,gDAA0G;AAE1G;IACS,oCAAM;IAMd,0BAAY,SAAiC;QAA7C,YACC,iBAAO,SAEP;QADA,KAAI,CAAC,SAAS,GAAG,SAAS,CAAC;;IAC5B,CAAC;IAEK,mCAAQ,GAAd,UAAe,OAAyB;;;;;;wBACvC,KAAA,IAAI,CAAA;wBAAS,qBAAM,oBAAQ,CAAC,IAAI,CAAC,SAAS,EAAC,OAAO,CAAC,EAAA;;wBAAnD,GAAK,KAAK,GAAG,SAAsC,CAAC;wBACpD,IAAI,IAAI,CAAC,QAAQ;4BAChB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBAE/B,sBAAO,IAAI,CAAC,KAAK,EAAC;;;;KAClB;IAED,oCAAS,GAAT,UAAU,QAA2D;QACpE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,KAAK;YACd,OAAO;QAER,OAAO,qBAAS,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IACF,uBAAC;AAAD,CAAC,AA3BD,CACS,kBAAM,GA0Bd;AA3BY,4CAAgB"}

package/app-frontend/messaging/SwMessagingWrapper.d.ts

@@ -1,8 +1,7 @@
 import { Logger } from "@intuitionrobotics/ts-common";
 import { FirebaseType_Messaging } from "./types";
-import 'firebase/messaging';
 export declare class SwMessagingWrapper extends Logger {
     private readonly messaging;
     constructor(messaging: FirebaseType_Messaging);
-    onBackgroundMessage(callback: (payload: any) => void): void;
+    onBackgroundMessage(callback: (payload: any) => void): void | import("@firebase/util").Unsubscribe;
 }

package/app-frontend/messaging/SwMessagingWrapper.js

@@ -33,8 +33,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SwMessagingWrapper = void 0;
 var ts_common_1 = require("@intuitionrobotics/ts-common");
-// tslint:disable:no-import-side-effect
-require("firebase/messaging");
+var sw_1 = require("firebase/messaging/sw");
 var SwMessagingWrapper = /** @class */ (function (_super) {
     __extends(SwMessagingWrapper, _super);
     function SwMessagingWrapper(messaging) {
@@ -46,10 +45,14 @@ var SwMessagingWrapper = /** @class */ (function (_super) {
         var _this = this;
         // This means that the bundle is being evaluated in the main thread to register the service worker so there is no need to run the rest
         // Also because it would fail since firebase would initialize the messaging controller as the main thread one instead of the sw one...
-        if (!self || !('ServiceWorkerGlobalScope' in self))
-            return this.logWarning('Not a service worker context');
-        this.logInfo('This is a service worker context');
-        this.messaging.onBackgroundMessage(callback, function (error) { return _this.logWarning(error); }, function () { return _this.logInfo('Successfully set on background messaging'); });
+        if (!self || !("ServiceWorkerGlobalScope" in self))
+            return this.logWarning("Not a service worker context");
+        this.logInfo("This is a service worker context");
+        return sw_1.onBackgroundMessage(this.messaging, {
+            next: callback,
+            error: function (error) { return _this.logWarning(error); },
+            complete: function () { return _this.logInfo("Successfully set on background messaging"); }
+        });
     };
     return SwMessagingWrapper;
 }(ts_common_1.Logger));

package/app-frontend/messaging/SwMessagingWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwMessagingWrapper.js","sourceRoot":"","sources":["../../../src/main/app-frontend/messaging/SwMessagingWrapper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;AAEH,0DAGsC;AAEtC,uCAAuC;AACvC,8BAA4B;AAG5B;IACS,sCAAM;IAId,4BAAY,SAAiC;QAA7C,YACC,iBAAO,SAEP;QADA,KAAI,CAAC,SAAS,GAAG,SAAS,CAAC;;IAC5B,CAAC;IAED,gDAAmB,GAAnB,UAAoB,QAAgC;QAApD,iBAQC;QAPA,sIAAsI;QACtI,sIAAsI;QACtI,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,0BAA0B,IAAI,IAAI,CAAC;YACjD,OAAO,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC;QAExD,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAC,UAAA,KAAK,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAtB,CAAsB,EAAE,cAAM,OAAA,KAAI,CAAC,OAAO,CAAC,0CAA0C,CAAC,EAAxD,CAAwD,CAAC,CAAA;IAC7I,CAAC;IAEF,yBAAC;AAAD,CAAC,AApBD,CACS,kBAAM,GAmBd;AApBY,gDAAkB"}
+{"version":3,"file":"SwMessagingWrapper.js","sourceRoot":"","sources":["../../../src/main/app-frontend/messaging/SwMessagingWrapper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;AAEH,0DAAoD;AAEpD,4CAA0D;AAE1D;IACS,sCAAM;IAId,4BAAY,SAAiC;QAA7C,YACC,iBAAO,SAEP;QADA,KAAI,CAAC,SAAS,GAAG,SAAS,CAAC;;IAC5B,CAAC;IAED,gDAAmB,GAAnB,UAAoB,QAAgC;QAApD,iBAYC;QAXA,sIAAsI;QACtI,sIAAsI;QACtI,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,0BAA0B,IAAI,IAAI,CAAC;YACjD,OAAO,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC;QAExD,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;QACjD,OAAO,wBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE;YAC1C,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,UAAA,KAAK,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAtB,CAAsB;YACtC,QAAQ,EAAE,cAAM,OAAA,KAAI,CAAC,OAAO,CAAC,0CAA0C,CAAC,EAAxD,CAAwD;SACxE,CAAC,CAAC;IACJ,CAAC;IAEF,yBAAC;AAAD,CAAC,AAxBD,CACS,kBAAM,GAuBd;AAxBY,gDAAkB"}

package/app-frontend/messaging/types.d.ts

@@ -1,3 +1,3 @@
-import firebase from 'firebase/app';
-export declare type FirebaseType_Messaging = firebase.messaging.Messaging;
-export declare type FirebaseType_Unsubscribe = firebase.Unsubscribe;
+import { Messaging, Unsubscribe } from "firebase/messaging";
+export declare type FirebaseType_Messaging = Messaging;
+export declare type FirebaseType_Unsubscribe = Unsubscribe;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@intuitionrobotics/firebase",
-  "version": "0.40.25",
+  "version": "0.41.0",
   "description": "Storm - Express & Typescript based backend framework",
   "keywords": [
-    "TacB0sS",
+    "IR",
     "infra",
     "nu-art",
     "storm",
@@ -19,7 +19,7 @@
     "url": "git+ssh://git@github.com:intuition-robotics/firebase.git"
   },
   "license": "Apache-2.0",
-  "author": "TacB0sS",
+  "author": "IR",
   "main": "main/index.js",
   "types": "main/index.d.ts",
   "files": [
@@ -29,25 +29,22 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@intuitionrobotics/ts-common": "~0.40.0"
+    "@intuitionrobotics/ts-common": "~0.41.0",
+    "@google-cloud/common": "^3.0.0",
+    "@google-cloud/storage": "^5.0.0",
+    "@grpc/proto-loader": "0.6.9",
+    "express": "^4.17.1",
+    "firebase": "^9.6.1",
+    "firebase-admin": "^10.0.1",
+    "firebase-functions": "^3.16.0",
+    "google-auth-library": "7.12.0"
   },
   "devDependencies": {
-    "@google-cloud/common": "^3.0.0",
-    "@google-cloud/firestore": "^4.8.1",
-    "@google-cloud/storage": "^2.5.0",
-    "@intuitionrobotics/testelot": "~0.40.0",
+    "@intuitionrobotics/testelot": "~0.41.0",
     "@types/compression": "^1.0.1",
     "@types/express": "^4.17.2",
-    "express": "^4.17.1",
-    "firebase": "^8.0.0",
-    "firebase-admin": "^9.3.0",
-    "firebase-functions": "^3.11.0",
     "fs": "0.0.1-security",
-    "google-auth-library": "^3.1.0",
     "ts-node": "^8.6.2",
     "typescript": "~4.1.0"
-  },
-  "engines": {
-    "node": "10"
   }
 }

package/shared/types.d.ts

@@ -25,6 +25,8 @@ export declare type QueryComparator<T> = {
     $ac: T extends (infer I)[] ? I : never;
 } | {
     $aca: T extends (infer I)[] ? I[] : never;
+} | {
+    $nin: T extends (infer I)[] ? never : T[];
 } | {
     $in: T extends (infer I)[] ? never : T[];
 } | {
@@ -36,7 +38,9 @@ export declare type QueryComparator<T> = {
 } | {
     $lte: number;
 } | {
-    $eq: number;
+    $eq: T;
+} | {
+    $neq: T;
 };
 export declare const ComparatorMap: {
     [k in keyof QueryComparator<any>]: Comparator;
@@ -59,14 +63,6 @@ export declare type FirestoreQueryImpl<T extends object> = {
     where?: Clause_Where<T>;
     limit?: number;
 };
-export declare type EventType = 'value' | 'child_added' | 'child_changed' | 'child_moved' | 'child_removed';
-export declare enum Firebase_EventType {
-    Value = "value",
-    ChildAdded = "child_added",
-    ChildChanged = "child_changed",
-    ChildMoved = "child_moved",
-    ChildRemoved = "child_removed"
-}
 export declare type FirebaseProjectCollections = {
     projectId: string;
     collections: string[];

package/shared/types.js

@@ -17,8 +17,9 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Firebase_EventType = exports.ComparatorMap = void 0;
+exports.ComparatorMap = void 0;
 exports.ComparatorMap = {
+    $nin: "not-in",
     $in: "in",
     $ac: "array-contains",
     $aca: "array-contains-any",
@@ -27,13 +28,6 @@ exports.ComparatorMap = {
     $lt: "<",
     $lte: "<=",
     $eq: "==",
+    $neq: "!=",
 };
-var Firebase_EventType;
-(function (Firebase_EventType) {
-    Firebase_EventType["Value"] = "value";
-    Firebase_EventType["ChildAdded"] = "child_added";
-    Firebase_EventType["ChildChanged"] = "child_changed";
-    Firebase_EventType["ChildMoved"] = "child_moved";
-    Firebase_EventType["ChildRemoved"] = "child_removed";
-})(Firebase_EventType = exports.Firebase_EventType || (exports.Firebase_EventType = {}));
 //# sourceMappingURL=types.js.map

package/shared/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/main/shared/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AA4CU,QAAA,aAAa,GAAsD;IAC/E,GAAG,EAAE,IAAI;IACT,GAAG,EAAE,gBAAgB;IACrB,IAAI,EAAE,oBAAoB;IAC1B,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,IAAI;IACV,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,IAAI;IACV,GAAG,EAAE,IAAI;CACT,CAAC;AAmBF,IAAY,kBAOX;AAPD,WAAY,kBAAkB;IAC7B,qCAAsB,CAAA;IACtB,gDAA4B,CAAA;IAC5B,oDAA8B,CAAA;IAC9B,gDAA4B,CAAA;IAC5B,oDAA8B,CAAA;AAE/B,CAAC,EAPW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAO7B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/main/shared/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AA8CU,QAAA,aAAa,GAAsD;IAC/E,IAAI,EAAE,QAAQ;IACd,GAAG,EAAE,IAAI;IACT,GAAG,EAAE,gBAAgB;IACrB,IAAI,EAAE,oBAAoB;IAC1B,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,IAAI;IACV,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,IAAI;IACV,GAAG,EAAE,IAAI;IACT,IAAI,EAAE,IAAI;CACV,CAAC"}

package/app-backend/firestore/ProjectBackupScheduler.d.ts

@@ -1,10 +0,0 @@
-import { FirebaseScheduledFunction } from "../functions/firebase-function";
-declare type Config = {
-    backupIntervalMs: number;
-};
-export declare class ProjectBackupScheduler_Class extends FirebaseScheduledFunction<Config> {
-    constructor();
-    onScheduledEvent: () => Promise<any>;
-}
-export declare const ProjectBackupScheduler: ProjectBackupScheduler_Class;
-export {};