@intuitionrobotics/firebase 0.43.1 → 0.43.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/app-backend/FirebaseModule.d.ts +11 -1
  2. package/app-backend/FirebaseModule.js +3 -3
  3. package/app-backend/FirebaseModule.js.map +1 -1
  4. package/app-backend/auth/FirebaseSession_Admin.d.ts +1 -1
  5. package/app-backend/auth/FirebaseSession_Admin.js.map +1 -1
  6. package/app-backend/firestore/FirestoreCollection.d.ts +15 -6
  7. package/app-backend/firestore/FirestoreCollection.js +36 -13
  8. package/app-backend/firestore/FirestoreCollection.js.map +1 -1
  9. package/app-backend/firestore/FirestoreInterface.d.ts +4 -4
  10. package/app-backend/firestore/FirestoreInterface.js +2 -2
  11. package/app-backend/firestore/FirestoreInterface.js.map +1 -1
  12. package/app-backend/firestore/FirestoreTransaction.d.ts +17 -8
  13. package/app-backend/firestore/FirestoreTransaction.js +29 -22
  14. package/app-backend/firestore/FirestoreTransaction.js.map +1 -1
  15. package/app-backend/firestore/FirestoreV2Collection.d.ts +7 -0
  16. package/app-backend/firestore/FirestoreV2Collection.js +30 -0
  17. package/app-backend/firestore/FirestoreV2Collection.js.map +1 -0
  18. package/app-backend/firestore/FirestoreWrapper.d.ts +3 -2
  19. package/app-backend/firestore/FirestoreWrapper.js +8 -21
  20. package/app-backend/firestore/FirestoreWrapper.js.map +1 -1
  21. package/app-backend/firestore/types.d.ts +4 -2
  22. package/app-backend/firestore/types.js.map +1 -1
  23. package/app-backend/functions/firebase-function.d.ts +20 -22
  24. package/app-backend/functions/firebase-function.js +36 -23
  25. package/app-backend/functions/firebase-function.js.map +1 -1
  26. package/app-backend/push/PushMessagesWrapper.js +2 -2
  27. package/app-backend/push/PushMessagesWrapper.js.map +1 -1
  28. package/app-backend/storage/types.d.ts +1 -2
  29. package/app-frontend/FirebaseModule.js +1 -1
  30. package/app-frontend/FirebaseModule.js.map +1 -1
  31. package/app-frontend/analytics/AnalyticsModule.d.ts +1 -0
  32. package/app-frontend/analytics/AnalyticsModule.js +1 -1
  33. package/app-frontend/analytics/AnalyticsModule.js.map +1 -1
  34. package/package.json +7 -11
@@ -3,9 +3,19 @@
3
3
  */
4
4
  import { Module } from "@intuitionrobotics/ts-common";
5
5
  import { FirebaseSession_Admin } from "./auth/FirebaseSession_Admin";
6
- import { JWTInput } from "google-auth-library";
7
6
  import { Firebase_UserCredential } from "./auth/firebase-session";
8
7
  import { FirebaseProjectCollections } from "../shared/types";
8
+ export declare type JWTInput = {
9
+ type?: string;
10
+ client_email?: string;
11
+ private_key?: string;
12
+ private_key_id?: string;
13
+ project_id?: string;
14
+ client_id?: string;
15
+ client_secret?: string;
16
+ refresh_token?: string;
17
+ quota_project_id?: string;
18
+ };
9
19
  declare type ConfigType = {
10
20
  [s: string]: string | JWTInput | Firebase_UserCredential;
11
21
  };
@@ -26,7 +26,7 @@ const FirebaseSession_Admin_1 = require("./auth/FirebaseSession_Admin");
26
26
  const fs_1 = require("fs");
27
27
  class FirebaseModule_Class extends ts_common_1.Module {
28
28
  constructor() {
29
- super("firebase");
29
+ super("FirebaseModule");
30
30
  // private readonly tokenSessions: { [s: string]: FirebaseSession_UserPassword; } = {};
31
31
  this.adminSessions = {};
32
32
  }
@@ -86,8 +86,8 @@ class FirebaseModule_Class extends ts_common_1.Module {
86
86
  return session;
87
87
  this.logInfo(`Creating Firebase session for project id: ${projectId}`);
88
88
  let config = this.getProjectAuth(projectId);
89
- // if (!config)
90
- // return this.createLocalAdminSession();
89
+ if (!config && _projectId && this.localProjectId && this.localProjectId !== _projectId)
90
+ throw new ts_common_1.BadImplementationException(`Config for key ${_projectId} is not defined`);
91
91
  if (typeof config === "string")
92
92
  config = JSON.parse(fs_1.readFileSync(config, "utf8"));
93
93
  if (config && (!config.client_email || !config.private_key))
@@ -1 +1 @@
1
- {"version":3,"file":"FirebaseModule.js","sourceRoot":"","sources":["../../src/main/app-backend/FirebaseModule.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH;;GAEG;AAEH,4DAOsC;AACtC,wEAAmE;AAGnE,2BAAgC;AAShC,MAAa,oBACZ,SAAQ,kBAAkB;IAO1B;QACC,KAAK,CAAC,UAAU,CAAC,CAAC;QANnB,uFAAuF;QACtE,kBAAa,GAA4C,EAAE,CAAC;IAM7E,CAAC;IAES,IAAI;QACb,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACnD,CAAC;IAED,iBAAiB;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAEO,oBAAoB;QAC3B,IAAI,SAAS,CAAC;QACd,IAAI,oBAAoB,CAAC,kBAAkB;YAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,kBAAkB,CAAC;gBACxD,MAAM,IAAI,0CAA8B,CAAC,sDAAsD,oBAAoB,CAAC,kBAAkB,EAAE,CAAC,CAAC;;gBAE1I,SAAS,GAAG,oBAAoB,CAAC,kBAAkB,CAAC;QAEtD,IAAI,CAAC,SAAS;YACb,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QAErC,IAAI,CAAC,SAAS;YACb,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;QAExC,IAAI,CAAC,SAAS;YACb,MAAM,IAAI,wCAA4B,CAAC,iCAAiC,CAAC,CAAC;QAE3E,OAAO,SAAS,CAAC;IAClB,CAAC;IAES,OAAO;QAChB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACpC,OAAO,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;IACJ,CAAC;IAES,UAAU;QACnB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACpC,OAAO,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,wEAAwE;IACxE,+CAA+C;IAC/C,gBAAgB;IAChB,oBAAoB;IACpB,EAAE;IACF,4EAA4E;IAC5E,qHAAqH;IACrH,qHAAqH;IACrH,EAAE;IACF,iEAAiE;IACjE,2CAA2C;IAC3C,EAAE;IACF,4BAA4B;IAC5B,mBAAmB;IACnB,IAAI;IAEG,kBAAkB,CAAC,UAAmB,EAAE,YAAqB;QACnE,IAAI,SAAS,GAAG,UAAU,CAAC;QAC3B,IAAI,CAAC,SAAS;YACb,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC;QAEjC,MAAM,WAAW,GAAG,YAAY,IAAI,SAAS,IAAI,aAAa,CAAC;QAC/D,IAAI,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC9C,IAAI,OAAO;YACV,OAAO,OAAO,CAAC;QAEhB,IAAI,CAAC,OAAO,CAAC,6CAA6C,SAAS,EAAE,CAAC,CAAC;QACvE,IAAI,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAkC,CAAC;QAC7E,eAAe;QACf,0CAA0C;QAE1C,IAAI,OAAO,MAAM,KAAK,QAAQ;YAC7B,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa,CAAC;QAE/D,IAAI,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;YAC1D,MAAM,IAAI,sCAA0B,CAAC,kBAAkB,SAAS,sCAAsC,CAAC,CAAC;QAEzG,OAAO,GAAG,IAAI,6CAAqB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;QAE1C,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,SAAiB;;QAC/B,aAAO,IAAI,CAAC,MAAM,0CAAG,SAAS,EAAE;IACjC,CAAC;IAED,wBAAwB;QACvB,MAAM,OAAO,GAAa,0BAAc,EAAE,CAAC;QAC3C,MAAM,0BAA0B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACnE,MAAM,IAAI,GAAG,iBAAK,CAAC,MAAM,CAAC,CAAC;YAC3B,MAAM,YAAY,GAA+B,IAAI;iBACnD,MAAM,CAAC,GAAG,CAAC,EAAE,WAAC,OAAA,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,WAAI,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,0CAAG,MAAM,EAAE,UAAU,CAAC,qBAAqB,EAAC,CAAA,EAAA,CAAC;iBACrH,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAwC,CAAC;iBAC9D,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YAErD,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE;gBACtC,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC;gBACpE,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;gBACvC,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAC,CAAC,CAAC;gBACjG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACzC;YAED,OAAO,KAAK,CAAC;QACd,CAAC,EAAE,EAAiD,CAAC,CAAC;QACtD,OAAO,MAAM,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAClD,CAAC;CAED;AAzHD,oDAyHC;AAEY,QAAA,cAAc,GAAG,IAAI,oBAAoB,EAAE,CAAC"}
1
+ {"version":3,"file":"FirebaseModule.js","sourceRoot":"","sources":["../../src/main/app-backend/FirebaseModule.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
- import { JWTInput } from "google-auth-library";
2
1
  import { FirebaseSession } from "./firebase-session";
3
2
  import { Auth } from "firebase-admin/auth";
4
3
  import { App } from "firebase-admin/app";
4
+ import { JWTInput } from "../FirebaseModule";
5
5
  export declare class FirebaseSession_Admin extends FirebaseSession<JWTInput & {
6
6
  databaseURL?: string;
7
7
  } | undefined, App> {
@@ -1 +1 @@
1
- {"version":3,"file":"FirebaseSession_Admin.js","sourceRoot":"","sources":["../../../src/main/app-backend/auth/FirebaseSession_Admin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH,mDAGwB;AAExB,yDAAmD;AACnD,4DAA0E;AAC1E,8CAG6B;AAC7B,4CAG4B;AAE5B,MAAa,qBACZ,SAAQ,kCAAqE;IAE7E,YAAY,WAAmB,EAAE,MAAiB;QACjD,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5B,CAAC;IAEM,OAAO;QACb,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IAC7B,CAAC;IAED,YAAY;QACX,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc;gBAC9B,MAAM,IAAI,wCAA4B,CAAC,mDAAmD,CAAC,CAAA;YAE5F,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAClC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU;YAC1B,MAAM,IAAI,wCAA4B,CAAC,0GAA0G,CAAC,CAAA;QAEnJ,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IAC/B,CAAC;IAEO,SAAS;QAChB,IAAI,CAAC,IAAI,CAAC,MAAM;YACf,OAAO,mBAAa,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,UAAU,iBAAiB,CAAC;QAClG,OAAO,mBAAa,CAAC;YACC,UAAU,EAAE,2BAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAwB,CAAC;YAC1D,WAAW,EAAE,WAAW;SACxB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;IAEM,OAAO;QACb,OAAO,cAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAvCD,sDAuCC"}
1
+ {"version":3,"file":"FirebaseSession_Admin.js","sourceRoot":"","sources":["../../../src/main/app-backend/auth/FirebaseSession_Admin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH,mDAGwB;AACxB,yDAAmD;AACnD,4DAA0E;AAC1E,8CAG6B;AAC7B,4CAG4B;AAG5B,MAAa,qBACZ,SAAQ,kCAAqE;IAE7E,YAAY,WAAmB,EAAE,MAAiB;QACjD,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5B,CAAC;IAEM,OAAO;QACb,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IAC7B,CAAC;IAED,YAAY;QACX,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc;gBAC9B,MAAM,IAAI,wCAA4B,CAAC,mDAAmD,CAAC,CAAA;YAE5F,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAClC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU;YAC1B,MAAM,IAAI,wCAA4B,CAAC,0GAA0G,CAAC,CAAA;QAEnJ,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IAC/B,CAAC;IAEO,SAAS;QAChB,IAAI,CAAC,IAAI,CAAC,MAAM;YACf,OAAO,mBAAa,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,UAAU,iBAAiB,CAAC;QAClG,OAAO,mBAAa,CAAC;YACC,UAAU,EAAE,2BAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAwB,CAAC;YAC1D,WAAW,EAAE,WAAW;SACxB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;IAEM,OAAO;QACb,OAAO,cAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAvCD,sDAuCC"}
@@ -1,34 +1,43 @@
1
1
  import { Subset } from "@intuitionrobotics/ts-common";
2
- import { FirestoreType_Collection } from "./types";
2
+ import { FirestoreType_Collection, FirestoreType_DocumentSnapshot, FirestoreType_QuerySnapshot } from "./types";
3
3
  import { Clause_Select, Clause_Where, FilterKeys, FirestoreQuery } from "../../shared/types";
4
4
  import { FirestoreWrapper } from "./FirestoreWrapper";
5
5
  import { FirestoreTransaction } from "./FirestoreTransaction";
6
- import admin = require("firebase-admin");
6
+ import { firestore } from "firebase-admin";
7
+ import { SetOptions } from "firebase-admin/lib/firestore";
8
+ import WriteResult = firestore.WriteResult;
7
9
  export declare class FirestoreCollection<Type extends object> {
8
10
  readonly name: string;
9
11
  readonly wrapper: FirestoreWrapper;
10
- readonly collection: FirestoreType_Collection;
12
+ readonly collection: FirestoreType_Collection<Type>;
11
13
  /**
12
14
  * External unique as in there must never ever be two that answer the same query
13
15
  */
14
16
  readonly externalUniqueFilter: ((object: Subset<Type>) => Clause_Where<Type>);
15
17
  constructor(name: string, wrapper: FirestoreWrapper, externalFilterKeys?: FilterKeys<Type>);
16
18
  private _query;
19
+ getDoc(id: string): Promise<FirestoreType_DocumentSnapshot<Type>>;
20
+ get(ourQuery?: FirestoreQuery<Type>): Promise<FirestoreType_QuerySnapshot<Type>>;
17
21
  private _queryUnique;
18
22
  queryUnique(ourQuery: FirestoreQuery<Type>): Promise<Type | undefined>;
19
- insert(instance: Type): Promise<Type>;
23
+ insert(instance: Type, id?: string): Promise<Type>;
20
24
  insertAll(instances: Type[]): Promise<Type[]>;
21
25
  query(ourQuery: FirestoreQuery<Type>): Promise<Type[]>;
22
26
  upsert(instance: Type): Promise<Type>;
23
27
  upsertAll(instances: Type[]): Promise<Type[]>;
24
28
  patch(instance: Subset<Type>): Promise<Type>;
25
29
  deleteItem(instance: Type): Promise<Type | undefined>;
26
- deleteUnique(query: FirestoreQuery<Type>): Promise<Type | undefined>;
30
+ deleteUnique(id: string): Promise<WriteResult>;
31
+ /** @deprecated */
32
+ deleteUnique(ourQuery: FirestoreQuery<Type>): Promise<Type | undefined>;
27
33
  delete(query: FirestoreQuery<Type>): Promise<Type[]>;
28
34
  private deleteBatch;
29
35
  deleteAll(): Promise<Type[]>;
30
36
  getAll(select?: Clause_Select<Type>): Promise<Type[]>;
31
37
  runInTransaction<ReturnType>(processor: (transaction: FirestoreTransaction) => Promise<ReturnType>): Promise<ReturnType>;
32
- createDocumentReference(): admin.firestore.DocumentReference<admin.firestore.DocumentData>;
38
+ createDocumentReference(id?: string): firestore.DocumentReference<Type>;
39
+ set(instance: Type, id: string): Promise<WriteResult>;
40
+ set(instance: Partial<Type>, id: string, options: SetOptions): Promise<WriteResult>;
41
+ create(instance: Type, id: string): Promise<firestore.WriteResult>;
33
42
  getUniqueFilter: () => (object: Subset<Type>) => Clause_Where<Type>;
34
43
  }
@@ -50,10 +50,21 @@ class FirestoreCollection {
50
50
  }
51
51
  _query(ourQuery) {
52
52
  return __awaiter(this, void 0, void 0, function* () {
53
- const myQuery = FirestoreInterface_1.FirestoreInterface.buildQuery(this, ourQuery);
53
+ const myQuery = FirestoreInterface_1.FirestoreInterface.buildQuery(this.collection, ourQuery);
54
54
  return (yield myQuery.get()).docs;
55
55
  });
56
56
  }
57
+ getDoc(id) {
58
+ return __awaiter(this, void 0, void 0, function* () {
59
+ return this.collection.doc(id).get();
60
+ });
61
+ }
62
+ get(ourQuery) {
63
+ return __awaiter(this, void 0, void 0, function* () {
64
+ const myQuery = FirestoreInterface_1.FirestoreInterface.buildQuery(this.collection, ourQuery);
65
+ return myQuery.get();
66
+ });
67
+ }
57
68
  _queryUnique(ourQuery) {
58
69
  return __awaiter(this, void 0, void 0, function* () {
59
70
  const results = yield this._query(ourQuery);
@@ -68,9 +79,10 @@ class FirestoreCollection {
68
79
  return doc.data();
69
80
  });
70
81
  }
71
- insert(instance) {
82
+ insert(instance, id) {
72
83
  return __awaiter(this, void 0, void 0, function* () {
73
- yield this.collection.add(instance);
84
+ const ref = this.createDocumentReference(id);
85
+ yield ref.set(instance);
74
86
  return instance;
75
87
  });
76
88
  }
@@ -104,9 +116,11 @@ class FirestoreCollection {
104
116
  return this.runInTransaction((transaction) => transaction.deleteItem(this, instance));
105
117
  });
106
118
  }
107
- deleteUnique(query) {
119
+ deleteUnique(param) {
108
120
  return __awaiter(this, void 0, void 0, function* () {
109
- return this.runInTransaction((transaction) => transaction.deleteUnique(this, query));
121
+ if (typeof param === 'string')
122
+ return this.collection.doc(param).delete();
123
+ return this.runInTransaction((transaction) => __awaiter(this, void 0, void 0, function* () { return transaction.deleteUnique(this, param); }));
110
124
  });
111
125
  }
112
126
  delete(query) {
@@ -117,9 +131,10 @@ class FirestoreCollection {
117
131
  }
118
132
  deleteBatch(docRefs) {
119
133
  return __awaiter(this, void 0, void 0, function* () {
120
- yield ts_common_1.batchAction(docRefs, 200, (temp) => __awaiter(this, void 0, void 0, function* () {
121
- const initialValue = this.wrapper.firestore.batch();
122
- yield temp.reduce((batch, val) => batch.delete(val.ref), initialValue).commit();
134
+ yield ts_common_1.batchAction(docRefs, 500, (elements) => __awaiter(this, void 0, void 0, function* () {
135
+ const batch = this.collection.firestore.batch();
136
+ elements.forEach(doc => batch.delete(doc.ref));
137
+ yield batch.commit();
123
138
  }));
124
139
  return docRefs.map(d => d.data());
125
140
  });
@@ -137,15 +152,23 @@ class FirestoreCollection {
137
152
  }
138
153
  runInTransaction(processor) {
139
154
  return __awaiter(this, void 0, void 0, function* () {
140
- const firestore = this.wrapper.firestore;
141
- return firestore.runTransaction((transaction) => __awaiter(this, void 0, void 0, function* () {
155
+ return this.collection.firestore.runTransaction((transaction) => __awaiter(this, void 0, void 0, function* () {
142
156
  return processor(new FirestoreTransaction_1.FirestoreTransaction(transaction));
143
157
  }));
144
158
  });
145
159
  }
146
- createDocumentReference() {
147
- const id = ts_common_1.generateHex(16);
148
- return this.wrapper.firestore.doc(`${this.name}/${id}`);
160
+ createDocumentReference(id = ts_common_1.generateHex(16)) {
161
+ return this.collection.doc(id);
162
+ }
163
+ set(instance, id, options) {
164
+ return __awaiter(this, void 0, void 0, function* () {
165
+ return this.collection.doc(id).set(instance, options);
166
+ });
167
+ }
168
+ create(instance, id) {
169
+ return __awaiter(this, void 0, void 0, function* () {
170
+ return this.collection.doc(id).create(instance);
171
+ });
149
172
  }
150
173
  }
151
174
  exports.FirestoreCollection = FirestoreCollection;
@@ -1 +1 @@
1
- {"version":3,"file":"FirestoreCollection.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/FirestoreCollection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FirestoreCollection.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/FirestoreCollection.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,10 @@
1
1
  import { FirestoreQuery } from "../..";
2
- import { FirestoreType_DocumentSnapshot } from "./types";
2
+ import { FirestoreType_QueryDocumentSnapshot } from "./types";
3
3
  import { FirestoreCollection } from "./FirestoreCollection";
4
- import * as admin from "firebase-admin";
4
+ import { CollectionReference, Query } from "firebase-admin/firestore";
5
5
  export declare class FirestoreInterface {
6
- static buildQuery<Type extends object>(collection: FirestoreCollection<Type>, query?: FirestoreQuery<Type>): admin.firestore.Query;
6
+ static buildQuery<Type extends object>(collection: CollectionReference<Type>, query?: FirestoreQuery<Type>): Query<Type>;
7
7
  private static isQueryObject;
8
- static assertUniqueDocument(results: FirestoreType_DocumentSnapshot[], query: FirestoreQuery<any>, collectionName: string): (FirestoreType_DocumentSnapshot | undefined);
8
+ static assertUniqueDocument(results: FirestoreType_QueryDocumentSnapshot[], query: FirestoreQuery<any>, collectionName: string): (FirestoreType_QueryDocumentSnapshot | undefined);
9
9
  static buildUniqueQuery<Type extends object>(collection: FirestoreCollection<Type>, instance: Type): FirestoreQuery<Type>;
10
10
  }
@@ -22,9 +22,9 @@ const __1 = require("../..");
22
22
  const ts_common_1 = require("@intuitionrobotics/ts-common");
23
23
  class FirestoreInterface {
24
24
  static buildQuery(collection, query) {
25
- let myQuery = collection.collection;
25
+ let myQuery = collection;
26
26
  if (query && query.select)
27
- myQuery = myQuery.select ? myQuery.select(...query.select) : myQuery;
27
+ myQuery = myQuery.select(...query.select);
28
28
  if (query && query.where) {
29
29
  const whereClause = query.where;
30
30
  myQuery = Object.keys(whereClause).reduce((_query, _whereField) => {
@@ -1 +1 @@
1
- {"version":3,"file":"FirestoreInterface.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/FirestoreInterface.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FirestoreInterface.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/FirestoreInterface.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,10 @@
1
1
  import * as admin from "firebase-admin";
2
+ import { firestore } from "firebase-admin";
2
3
  import { FirestoreCollection } from "./FirestoreCollection";
3
4
  import { Subset } from "@intuitionrobotics/ts-common";
4
5
  import { FirestoreQuery } from "../../shared/types";
6
+ import { SetOptions } from "firebase-admin/firestore";
7
+ import Transaction = firestore.Transaction;
5
8
  export declare class FirestoreTransaction {
6
9
  private transaction;
7
10
  constructor(transaction: admin.firestore.Transaction);
@@ -11,19 +14,25 @@ export declare class FirestoreTransaction {
11
14
  query<Type extends object>(collection: FirestoreCollection<Type>, ourQuery: FirestoreQuery<Type>): Promise<Type[]>;
12
15
  queryItem<Type extends object>(collection: FirestoreCollection<Type>, instance: Type): Promise<Type | undefined>;
13
16
  queryUnique<Type extends object>(collection: FirestoreCollection<Type>, ourQuery: FirestoreQuery<Type>): Promise<Type | undefined>;
14
- insert<Type extends object>(collection: FirestoreCollection<Type>, instance: Type): Promise<Type>;
15
- insertAll<Type extends object>(collection: FirestoreCollection<Type>, instances: Type[]): Promise<Type[]>;
17
+ insert<Type extends object>(collection: FirestoreCollection<Type>, instance: Type, id?: string): Type;
18
+ insertAll<Type extends object>(collection: FirestoreCollection<Type>, instances: Type[]): Type[];
16
19
  upsert<Type extends object>(collection: FirestoreCollection<Type>, instance: Type): Promise<Type>;
17
- upsert_Read<Type extends object>(collection: FirestoreCollection<Type>, instance: Type): Promise<() => Promise<Type>>;
20
+ upsert_Read<Type extends object>(collection: FirestoreCollection<Type>, instance: Type): Promise<() => Type>;
18
21
  private getOrCreateDocument;
19
22
  upsertAll<Type extends object>(collection: FirestoreCollection<Type>, instances: Type[]): Promise<Type[]>;
20
- upsertAll_Read<Type extends object>(collection: FirestoreCollection<Type>, instances: Type[]): Promise<() => Promise<Type[]>>;
23
+ upsertAll_Read<Type extends object>(collection: FirestoreCollection<Type>, instances: Type[]): Promise<() => Type[]>;
21
24
  patch<Type extends object>(collection: FirestoreCollection<Type>, instance: Subset<Type>): Promise<any>;
22
- patch_Read<Type extends object>(collection: FirestoreCollection<Type>, instance: Subset<Type>): Promise<() => Promise<any>>;
25
+ patch_Read<Type extends object>(collection: FirestoreCollection<Type>, instance: Subset<Type>): Promise<() => any>;
23
26
  delete<Type extends object>(collection: FirestoreCollection<Type>, ourQuery: FirestoreQuery<Type>): Promise<Type[]>;
24
- delete_Read<Type extends object>(collection: FirestoreCollection<Type>, ourQuery: FirestoreQuery<Type>): Promise<() => Promise<Type[]>>;
27
+ delete_Read<Type extends object>(collection: FirestoreCollection<Type>, ourQuery: FirestoreQuery<Type>): Promise<() => Type[]>;
25
28
  deleteItem<Type extends object>(collection: FirestoreCollection<Type>, instance: Type): Promise<Type | undefined>;
29
+ deleteUnique<Type extends object>(collection: FirestoreCollection<Type>, id: string): Transaction;
30
+ /** @deprecated */
26
31
  deleteUnique<Type extends object>(collection: FirestoreCollection<Type>, ourQuery: FirestoreQuery<Type>): Promise<Type | undefined>;
27
- deleteUnique_Read<Type extends object>(collection: FirestoreCollection<Type>, ourQuery: FirestoreQuery<Type>): Promise<undefined | (() => Promise<Type>)>;
28
- getSdkInstance(): admin.firestore.Transaction;
32
+ private deleteUniqueImpl;
33
+ deleteUnique_Read<Type extends object>(collection: FirestoreCollection<Type>, ourQuery: FirestoreQuery<Type>): Promise<undefined | (() => Type)>;
34
+ set<Type extends object>(collection: FirestoreCollection<Type>, instance: Type, id: string): Transaction;
35
+ set<Type extends object>(collection: FirestoreCollection<Type>, instance: Partial<Type>, id: string, options: SetOptions): Transaction;
36
+ create<Type extends object>(collection: FirestoreCollection<Type>, instance: Type, id: string): firestore.Transaction;
37
+ getSdkInstance(): firestore.Transaction;
29
38
  }
@@ -35,7 +35,7 @@ class FirestoreTransaction {
35
35
  }
36
36
  _query(collection, ourQuery) {
37
37
  return __awaiter(this, void 0, void 0, function* () {
38
- const query = FirestoreInterface_1.FirestoreInterface.buildQuery(collection, ourQuery);
38
+ const query = FirestoreInterface_1.FirestoreInterface.buildQuery(collection.collection, ourQuery);
39
39
  return (yield this.transaction.get(query)).docs;
40
40
  });
41
41
  }
@@ -71,17 +71,13 @@ class FirestoreTransaction {
71
71
  return doc.data();
72
72
  });
73
73
  }
74
- insert(collection, instance) {
75
- return __awaiter(this, void 0, void 0, function* () {
76
- const doc = collection.createDocumentReference();
77
- yield this.transaction.set(doc, instance);
78
- return instance;
79
- });
74
+ insert(collection, instance, id) {
75
+ const doc = collection.createDocumentReference(id);
76
+ this.transaction.set(doc, instance);
77
+ return instance;
80
78
  }
81
79
  insertAll(collection, instances) {
82
- return __awaiter(this, void 0, void 0, function* () {
83
- return Promise.all(instances.map(instance => this.insert(collection, instance)));
84
- });
80
+ return instances.map(instance => this.insert(collection, instance));
85
81
  }
86
82
  //------------------------
87
83
  upsert(collection, instance) {
@@ -92,10 +88,10 @@ class FirestoreTransaction {
92
88
  upsert_Read(collection, instance) {
93
89
  return __awaiter(this, void 0, void 0, function* () {
94
90
  const ref = yield this.getOrCreateDocument(collection, instance);
95
- return () => __awaiter(this, void 0, void 0, function* () {
96
- yield this.transaction.set(ref, instance);
91
+ return () => {
92
+ this.transaction.set(ref, instance);
97
93
  return instance;
98
- });
94
+ };
99
95
  });
100
96
  }
101
97
  getOrCreateDocument(collection, instance) {
@@ -117,7 +113,7 @@ class FirestoreTransaction {
117
113
  upsertAll_Read(collection, instances) {
118
114
  return __awaiter(this, void 0, void 0, function* () {
119
115
  const writes = yield Promise.all(instances.map((instance) => __awaiter(this, void 0, void 0, function* () { return this.upsert_Read(collection, instance); })));
120
- return () => __awaiter(this, void 0, void 0, function* () { return Promise.all(writes.map((_write) => __awaiter(this, void 0, void 0, function* () { return _write(); }))); });
116
+ return () => writes.map(_write => _write());
121
117
  });
122
118
  }
123
119
  patch(collection, instance) {
@@ -130,11 +126,11 @@ class FirestoreTransaction {
130
126
  const doc = yield this._queryItem(collection, instance);
131
127
  if (!doc)
132
128
  throw new ts_common_1.BadImplementationException(`Patching a non existent doc for query ${FirestoreInterface_1.FirestoreInterface.buildUniqueQuery(collection, instance)}`);
133
- return () => __awaiter(this, void 0, void 0, function* () {
129
+ return () => {
134
130
  const patchedInstance = ts_common_1.merge(doc.data(), instance);
135
131
  this.transaction.set(doc.ref, patchedInstance);
136
132
  return patchedInstance;
137
- });
133
+ };
138
134
  });
139
135
  }
140
136
  delete(collection, ourQuery) {
@@ -147,11 +143,11 @@ class FirestoreTransaction {
147
143
  const docs = yield this._query(collection, ourQuery);
148
144
  if (docs.length > 500)
149
145
  throw new ts_common_1.BadImplementationException(`Trying to delete ${docs.length} documents. Not allowed more then 5oo in a single transaction`);
150
- return () => __awaiter(this, void 0, void 0, function* () {
146
+ return () => {
151
147
  const toReturn = docs.map(doc => doc.data());
152
- yield Promise.all(docs.map((doc) => __awaiter(this, void 0, void 0, function* () { return this.transaction.delete(doc.ref); })));
148
+ docs.forEach((doc) => this.transaction.delete(doc.ref));
153
149
  return toReturn;
154
- });
150
+ };
155
151
  });
156
152
  }
157
153
  deleteItem(collection, instance) {
@@ -160,6 +156,11 @@ class FirestoreTransaction {
160
156
  });
161
157
  }
162
158
  deleteUnique(collection, ourQuery) {
159
+ if (typeof ourQuery === 'string')
160
+ return this.transaction.delete(collection.collection.doc(ourQuery));
161
+ return this.deleteUniqueImpl(collection, ourQuery);
162
+ }
163
+ deleteUniqueImpl(collection, ourQuery) {
163
164
  return __awaiter(this, void 0, void 0, function* () {
164
165
  const write = yield this.deleteUnique_Read(collection, ourQuery);
165
166
  if (!write)
@@ -172,13 +173,19 @@ class FirestoreTransaction {
172
173
  const doc = (yield this._queryUnique(collection, ourQuery));
173
174
  if (!doc)
174
175
  return;
175
- return () => __awaiter(this, void 0, void 0, function* () {
176
+ return () => {
176
177
  const result = doc.data();
177
- yield this.transaction.delete(doc.ref);
178
+ this.transaction.delete(doc.ref);
178
179
  return result;
179
- });
180
+ };
180
181
  });
181
182
  }
183
+ set(collection, instance, id, options) {
184
+ return this.transaction.set(collection.collection.doc(id), instance, options);
185
+ }
186
+ create(collection, instance, id) {
187
+ return this.transaction.create(collection.collection.doc(id), instance);
188
+ }
182
189
  getSdkInstance() {
183
190
  return this.transaction;
184
191
  }
@@ -1 +1 @@
1
- {"version":3,"file":"FirestoreTransaction.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/FirestoreTransaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FirestoreTransaction.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/FirestoreTransaction.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ import { FirestoreQuery } from "../../shared/types";
2
+ import { CollectionReference } from "firebase-admin/firestore";
3
+ import { Query } from "firebase-admin/lib/firestore";
4
+ export declare type FirestoreV2Collection<Type extends object> = CollectionReference<Type> & {
5
+ buildQuery: (query?: FirestoreQuery<Type>) => Query<Type>;
6
+ };
7
+ export declare const enhanceCollection: <Type extends object>(collection: CollectionReference<Type>) => FirestoreV2Collection<Type>;
@@ -0,0 +1,30 @@
1
+ "use strict";
2
+ /*
3
+ * Firebase is a simpler Typescript wrapper to all of firebase services.
4
+ *
5
+ * Copyright (C) 2020 Intuition Robotics
6
+ *
7
+ * Licensed under the Apache License, Version 2.0 (the "License");
8
+ * you may not use this file except in compliance with the License.
9
+ * You may obtain a copy of the License at
10
+ *
11
+ * http://www.apache.org/licenses/LICENSE-2.0
12
+ *
13
+ * Unless required by applicable law or agreed to in writing, software
14
+ * distributed under the License is distributed on an "AS IS" BASIS,
15
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ * See the License for the specific language governing permissions and
17
+ * limitations under the License.
18
+ */
19
+ Object.defineProperty(exports, "__esModule", { value: true });
20
+ exports.enhanceCollection = void 0;
21
+ const FirestoreInterface_1 = require("./FirestoreInterface");
22
+ const enhanceCollection = (collection) => {
23
+ const collectionRef = collection;
24
+ collectionRef.buildQuery = (ourQuery) => {
25
+ return FirestoreInterface_1.FirestoreInterface.buildQuery(collection, ourQuery);
26
+ };
27
+ return collectionRef;
28
+ };
29
+ exports.enhanceCollection = enhanceCollection;
30
+ //# sourceMappingURL=FirestoreV2Collection.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FirestoreV2Collection.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/FirestoreV2Collection.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAGH,6DAAwD;AAQjD,MAAM,iBAAiB,GAAG,CAAsB,UAAqC,EAA+B,EAAE;IACzH,MAAM,aAAa,GAAG,UAAyC,CAAC;IAChE,aAAa,CAAC,UAAU,GAAG,CAAC,QAA+B,EAAe,EAAE;QACxE,OAAO,uCAAkB,CAAC,UAAU,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC,CAAC;IAEF,OAAO,aAAa,CAAC;AACzB,CAAC,CAAC;AAPW,QAAA,iBAAiB,qBAO5B"}
@@ -3,13 +3,14 @@ import { FirestoreType, FirestoreType_Collection } from "./types";
3
3
  import { FilterKeys } from "../../shared/types";
4
4
  import { FirebaseSession } from "../auth/firebase-session";
5
5
  import { FirebaseBaseWrapper } from "../auth/FirebaseBaseWrapper";
6
- import { DB_Object } from "@intuitionrobotics/ts-common";
6
+ import { FirestoreV2Collection } from "./FirestoreV2Collection";
7
7
  export declare class FirestoreWrapper extends FirebaseBaseWrapper {
8
8
  readonly firestore: FirestoreType;
9
9
  private readonly collections;
10
+ private readonly collectionsV2;
10
11
  constructor(firebaseSession: FirebaseSession<any, any>);
11
12
  getCollection<Type extends object>(name: string, externalFilterKeys?: FilterKeys<Type>): FirestoreCollection<Type>;
12
- listen<Type extends DB_Object>(collection: FirestoreCollection<Type>, doc: string): void;
13
+ getCollectionV2<Type extends object>(name: string): FirestoreV2Collection<Type>;
13
14
  getSdkInstance(): FirebaseFirestore.Firestore;
14
15
  deleteCollection(name: string): Promise<object[]>;
15
16
  listCollections(): Promise<FirestoreType_Collection[]>;
@@ -1,21 +1,4 @@
1
1
  "use strict";
2
- /*
3
- * Firebase is a simpler Typescript wrapper to all of firebase services.
4
- *
5
- * Copyright (C) 2020 Intuition Robotics
6
- *
7
- * Licensed under the Apache License, Version 2.0 (the "License");
8
- * you may not use this file except in compliance with the License.
9
- * You may obtain a copy of the License at
10
- *
11
- * http://www.apache.org/licenses/LICENSE-2.0
12
- *
13
- * Unless required by applicable law or agreed to in writing, software
14
- * distributed under the License is distributed on an "AS IS" BASIS,
15
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
- * See the License for the specific language governing permissions and
17
- * limitations under the License.
18
- */
19
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
20
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
21
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -30,10 +13,12 @@ exports.FirestoreWrapper = void 0;
30
13
  const FirestoreCollection_1 = require("./FirestoreCollection");
31
14
  const FirebaseBaseWrapper_1 = require("../auth/FirebaseBaseWrapper");
32
15
  const firestore_1 = require("firebase-admin/firestore");
16
+ const FirestoreV2Collection_1 = require("./FirestoreV2Collection");
33
17
  class FirestoreWrapper extends FirebaseBaseWrapper_1.FirebaseBaseWrapper {
34
18
  constructor(firebaseSession) {
35
19
  super(firebaseSession);
36
20
  this.collections = {};
21
+ this.collectionsV2 = {};
37
22
  this.firestore = firestore_1.getFirestore(firebaseSession.app);
38
23
  }
39
24
  getCollection(name, externalFilterKeys) {
@@ -42,10 +27,12 @@ class FirestoreWrapper extends FirebaseBaseWrapper_1.FirebaseBaseWrapper {
42
27
  return collection;
43
28
  return this.collections[name] = new FirestoreCollection_1.FirestoreCollection(name, this, externalFilterKeys);
44
29
  }
45
- listen(collection, doc) {
46
- collection.wrapper.firestore.doc(`${collection.name}/${doc}`).onSnapshot(_snapshot => {
47
- console.log('recieved snapshot!');
48
- });
30
+ getCollectionV2(name) {
31
+ const collection = this.collectionsV2[name];
32
+ if (collection)
33
+ return collection;
34
+ const enchanceCollection1 = FirestoreV2Collection_1.enhanceCollection(this.firestore.collection(name));
35
+ return this.collectionsV2[name] = enchanceCollection1;
49
36
  }
50
37
  getSdkInstance() {
51
38
  return this.firestore;
@@ -1 +1 @@
1
- {"version":3,"file":"FirestoreWrapper.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/FirestoreWrapper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,+DAA2D;AAI3D,qEAAgE;AAEhE,wDAAsD;AAEtD,MAAa,gBACZ,SAAQ,yCAAmB;IAK3B,YAAY,eAA0C;QACrD,KAAK,CAAC,eAAe,CAAC,CAAC;QAHP,gBAAW,GAA2D,EAAE,CAAC;QAIzF,IAAI,CAAC,SAAS,GAAG,wBAAY,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;IACnD,CAAC;IAEM,aAAa,CAAsB,IAAY,EAAE,kBAAqC;QAC5F,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,UAAU;YACb,OAAO,UAAU,CAAC;QAEnB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,yCAAmB,CAAO,IAAI,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAC/F,CAAC;IAEM,MAAM,CAAyB,UAAqC,EAAE,GAAW;QACvF,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YACpF,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;IACH,CAAC;IAED,cAAc;QACb,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAEY,gBAAgB,CAAC,IAAY;;YACzC,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;QAC7C,CAAC;KAAA;IAEY,eAAe;;YAC3B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe;gBAClC,OAAO,EAAE,CAAC;YAEX,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;QACzC,CAAC;KAAA;CACD;AAvCD,4CAuCC"}
1
+ {"version":3,"file":"FirestoreWrapper.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/FirestoreWrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA0D;AAI1D,qEAAgE;AAChE,wDAA2E;AAC3E,mEAAiF;AAGjF,MAAa,gBACT,SAAQ,yCAAmB;IAM3B,YAAY,eAA0C;QAClD,KAAK,CAAC,eAAe,CAAC,CAAC;QAJV,gBAAW,GAA2D,EAAE,CAAC;QACzE,kBAAa,GAA6D,EAAE,CAAC;QAI1F,IAAI,CAAC,SAAS,GAAG,wBAAY,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;IACtD,CAAC;IAEM,aAAa,CAAsB,IAAY,EAAE,kBAAqC;QACzF,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,UAAU;YACV,OAAO,UAAU,CAAC;QAEtB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,yCAAmB,CAAO,IAAI,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAClG,CAAC;IAEM,eAAe,CAAsB,IAAY;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,UAAU;YACV,OAAO,UAAU,CAAC;QAEtB,MAAM,mBAAmB,GAAG,yCAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAA8B,CAA+B,CAAC;QAC1I,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC;IAC1D,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAEY,gBAAgB,CAAC,IAAY;;YACtC,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;QAChD,CAAC;KAAA;IAEY,eAAe;;YACxB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe;gBAC/B,OAAO,EAAE,CAAC;YAEd,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;QAC5C,CAAC;KAAA;CACJ;AA3CD,4CA2CC"}
@@ -1,6 +1,8 @@
1
1
  import * as admin from "firebase-admin";
2
- export declare type FirestoreType_Collection = admin.firestore.CollectionReference;
3
- export declare type FirestoreType_DocumentSnapshot = admin.firestore.QueryDocumentSnapshot;
2
+ export declare type FirestoreType_Collection<T extends any = any> = admin.firestore.CollectionReference<T>;
3
+ export declare type FirestoreType_QueryDocumentSnapshot<T extends any = any> = admin.firestore.QueryDocumentSnapshot<T>;
4
+ export declare type FirestoreType_DocumentSnapshot<T extends any = any> = admin.firestore.DocumentSnapshot<T>;
5
+ export declare type FirestoreType_QuerySnapshot<T> = admin.firestore.QuerySnapshot<T>;
4
6
  export declare type FirestoreType_Query = admin.firestore.Query;
5
7
  export declare type FirestoreType_DocumentReference = admin.firestore.DocumentReference;
6
8
  export declare type FirestoreType = admin.firestore.Firestore;
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;AAWH,uHAAuH;AACvH,iIAAiI;AACjI,mJAAmJ;AACnJ,0HAA0H;AAC1H,8JAA8J;AAC9J,wGAAwG;AACxG,EAAE"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/main/app-backend/firestore/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;AAaH,uHAAuH;AACvH,iIAAiI;AACjI,mJAAmJ;AACnJ,0HAA0H;AAC1H,8JAA8J;AAC9J,wGAAwG;AACxG,EAAE"}
@@ -1,13 +1,12 @@
1
+ import * as functions from "firebase-functions";
1
2
  import { EventContext, HttpsFunction, RuntimeOptions } from "firebase-functions";
2
- import * as express from "express";
3
- import { Request, Response } from "express";
3
+ import { Request, Response, Express } from "express";
4
4
  import { Module, StringMap } from "@intuitionrobotics/ts-common";
5
- import { ObjectMetadata } from "firebase-functions/lib/providers/storage";
5
+ import { ObjectMetadata } from "firebase-functions/lib/v1/providers/storage";
6
6
  export interface FirebaseFunctionInterface {
7
7
  getFunction(): HttpsFunction;
8
8
  }
9
9
  export declare abstract class FirebaseFunction<Config = any> extends Module<Config> implements FirebaseFunctionInterface {
10
- protected constructor(tag?: string, name?: string);
11
10
  abstract getFunction(): HttpsFunction;
12
11
  }
13
12
  export declare class Firebase_ExpressFunction implements FirebaseFunctionInterface {
@@ -15,26 +14,25 @@ export declare class Firebase_ExpressFunction implements FirebaseFunctionInterfa
15
14
  private function;
16
15
  private readonly name;
17
16
  static config: RuntimeOptions;
18
- constructor(_express: express.Express, name?: string);
17
+ constructor(_express: Express, name?: string);
19
18
  static setConfig(config: RuntimeOptions): void;
20
19
  getName(): string;
21
- getFunction: () => any;
20
+ getFunction: () => functions.HttpsFunction;
22
21
  }
23
22
  export declare abstract class Firebase_HttpsFunction<Config = any> extends FirebaseFunction<Config> {
24
23
  private function;
25
- protected constructor(name: string);
26
24
  abstract process(req: Request, res: Response): Promise<any>;
27
- getFunction: () => any;
25
+ getFunction: () => functions.HttpsFunction;
28
26
  onFunctionReady: () => Promise<void>;
29
27
  }
30
- export declare abstract class FirebaseFunctionModule<DataType = any, Config = any> extends FirebaseFunction<Config> {
28
+ export declare abstract class FirebaseFunctionModule<DataType = any, Config extends RuntimeOptsConfigs = any> extends FirebaseFunction<Config> {
31
29
  private readonly listeningPath;
32
30
  private function;
33
- protected constructor(listeningPath: string, name?: string);
31
+ protected constructor(listeningPath: string, name: string);
34
32
  abstract processChanges(before: DataType, after: DataType, params: {
35
33
  [param: string]: any;
36
34
  }): Promise<any>;
37
- getFunction: () => any;
35
+ getFunction: () => functions.CloudFunction<functions.Change<functions.database.DataSnapshot>>;
38
36
  }
39
37
  export declare type FirestoreConfigs = {
40
38
  runTimeOptions?: RuntimeOptions;
@@ -43,43 +41,43 @@ export declare type FirestoreConfigs = {
43
41
  export declare abstract class FirestoreFunctionModule<DataType extends object, Config extends FirestoreConfigs = FirestoreConfigs> extends FirebaseFunction<Config> {
44
42
  private readonly collectionName;
45
43
  private function;
46
- protected constructor(collectionName: string, name?: string, tag?: string);
44
+ protected constructor(collectionName: string, name: string);
47
45
  abstract processChanges(params: {
48
46
  [param: string]: any;
49
47
  }, before?: DataType, after?: DataType): Promise<any>;
50
- getFunction: () => any;
48
+ getFunction: () => functions.CloudFunction<functions.Change<functions.firestore.DocumentSnapshot>>;
51
49
  }
52
- export declare abstract class FirebaseScheduledFunction<Config extends any = any> extends FirebaseFunction<Config> {
50
+ export declare abstract class FirebaseScheduledFunction<Config extends RuntimeOptsConfigs = any> extends FirebaseFunction<Config> {
53
51
  private function;
54
52
  private schedule?;
55
53
  private runningCondition;
56
- protected constructor(name?: string, tag?: string);
57
54
  addRunningCondition(runningCondition: () => Promise<boolean>): this;
58
55
  setSchedule(schedule: string): this;
59
56
  abstract onScheduledEvent(): Promise<any>;
60
- getFunction: () => any;
57
+ getFunction: () => functions.CloudFunction<functions.Change<functions.database.DataSnapshot>>;
61
58
  }
62
- export declare type BucketConfigs = {
59
+ export declare type RuntimeOptsConfigs = {
63
60
  runtimeOpts?: RuntimeOptions;
61
+ };
62
+ export declare type BucketConfigs = RuntimeOptsConfigs & {
64
63
  bucketName?: string;
65
64
  };
66
65
  export declare abstract class Firebase_StorageFunction<Config extends BucketConfigs = BucketConfigs> extends FirebaseFunction<Config> {
67
66
  private function;
68
67
  private runtimeOpts;
69
- protected constructor(name?: string);
70
68
  abstract onFinalize(object: ObjectMetadata, context: EventContext): Promise<any>;
71
- getFunction: () => any;
69
+ getFunction: () => functions.CloudFunction<functions.storage.ObjectMetadata>;
72
70
  }
73
71
  export declare type FirebaseEventContext = EventContext;
74
72
  export declare type TopicMessage = {
75
73
  data: string;
76
74
  attributes: StringMap;
77
75
  };
78
- export declare abstract class Firebase_PubSubFunction<T, Config = any> extends FirebaseFunction<Config> {
76
+ export declare abstract class Firebase_PubSubFunction<T, Config extends RuntimeOptsConfigs = any> extends FirebaseFunction<Config> {
79
77
  private function;
80
78
  private readonly topic;
81
- protected constructor(topic: string, tag?: string);
79
+ protected constructor(topic: string, name: string);
82
80
  abstract onPublish(object: T | undefined, originalMessage: TopicMessage, context: FirebaseEventContext): Promise<any>;
83
81
  private _onPublish;
84
- getFunction: () => any;
82
+ getFunction: () => functions.CloudFunction<functions.pubsub.Message>;
85
83
  }
@@ -10,12 +10,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.Firebase_PubSubFunction = exports.Firebase_StorageFunction = exports.FirebaseScheduledFunction = exports.FirestoreFunctionModule = exports.FirebaseFunctionModule = exports.Firebase_HttpsFunction = exports.Firebase_ExpressFunction = exports.FirebaseFunction = void 0;
13
- const ts_common_1 = require("@intuitionrobotics/ts-common");
13
+ /*
14
+ * Firebase is a simpler Typescript wrapper to all of firebase services.
15
+ *
16
+ * Copyright (C) 2020 Intuition Robotics
17
+ *
18
+ * Licensed under the Apache License, Version 2.0 (the "License");
19
+ * you may not use this file except in compliance with the License.
20
+ * You may obtain a copy of the License at
21
+ *
22
+ * http://www.apache.org/licenses/LICENSE-2.0
23
+ *
24
+ * Unless required by applicable law or agreed to in writing, software
25
+ * distributed under the License is distributed on an "AS IS" BASIS,
26
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
27
+ * See the License for the specific language governing permissions and
28
+ * limitations under the License.
29
+ */
14
30
  const functions = require("firebase-functions");
31
+ const ts_common_1 = require("@intuitionrobotics/ts-common");
15
32
  class FirebaseFunction extends ts_common_1.Module {
16
- constructor(tag, name) {
17
- super(tag, name);
18
- }
19
33
  }
20
34
  exports.FirebaseFunction = FirebaseFunction;
21
35
  class Firebase_ExpressFunction {
@@ -38,8 +52,8 @@ class Firebase_ExpressFunction {
38
52
  exports.Firebase_ExpressFunction = Firebase_ExpressFunction;
39
53
  Firebase_ExpressFunction.config = {};
40
54
  class Firebase_HttpsFunction extends FirebaseFunction {
41
- constructor(name) {
42
- super(name, name.toLowerCase());
55
+ constructor() {
56
+ super(...arguments);
43
57
  this.getFunction = () => {
44
58
  if (this.function)
45
59
  return this.function;
@@ -54,26 +68,26 @@ exports.Firebase_HttpsFunction = Firebase_HttpsFunction;
54
68
  //TODO: I would like to add a type for the params..
55
69
  class FirebaseFunctionModule extends FirebaseFunction {
56
70
  constructor(listeningPath, name) {
57
- super();
71
+ super(name);
58
72
  this.getFunction = () => {
73
+ var _a;
59
74
  if (this.function)
60
75
  return this.function;
61
- return this.function = functions.database.ref(this.listeningPath).onWrite((change, context) => {
76
+ return this.function = functions.runWith(((_a = this.config) === null || _a === void 0 ? void 0 : _a.runtimeOpts) || {}).database.ref(this.listeningPath).onWrite((change, context) => {
62
77
  const before = change.before && change.before.val();
63
78
  const after = change.after && change.after.val();
64
79
  const params = ts_common_1.deepClone(context.params);
65
80
  return this.processChanges(before, after, params);
66
81
  });
67
82
  };
68
- name && this.setName(name);
69
83
  this.listeningPath = listeningPath;
70
84
  }
71
85
  }
72
86
  exports.FirebaseFunctionModule = FirebaseFunctionModule;
73
87
  //TODO: I would like to add a type for the params..
74
88
  class FirestoreFunctionModule extends FirebaseFunction {
75
- constructor(collectionName, name, tag) {
76
- super(tag);
89
+ constructor(collectionName, name) {
90
+ super(name);
77
91
  this.getFunction = () => {
78
92
  var _a;
79
93
  if (this.function)
@@ -85,21 +99,21 @@ class FirestoreFunctionModule extends FirebaseFunction {
85
99
  return this.processChanges(params, before, after);
86
100
  });
87
101
  };
88
- name && this.setName(name);
89
102
  this.collectionName = collectionName;
90
103
  }
91
104
  }
92
105
  exports.FirestoreFunctionModule = FirestoreFunctionModule;
93
106
  class FirebaseScheduledFunction extends FirebaseFunction {
94
- constructor(name, tag) {
95
- super(tag);
107
+ constructor() {
108
+ super(...arguments);
96
109
  this.runningCondition = [];
97
110
  this.getFunction = () => {
111
+ var _a;
98
112
  if (!this.schedule)
99
113
  throw new ts_common_1.ImplementationMissingException("MUST set schedule !!");
100
114
  if (this.function)
101
115
  return this.function;
102
- return this.function = functions.pubsub.schedule(this.schedule).onRun(() => __awaiter(this, void 0, void 0, function* () {
116
+ return this.function = functions.runWith(((_a = this.config) === null || _a === void 0 ? void 0 : _a.runtimeOpts) || {}).pubsub.schedule(this.schedule).onRun(() => __awaiter(this, void 0, void 0, function* () {
103
117
  const results = yield Promise.all(this.runningCondition.map(condition => condition()));
104
118
  if (results.includes(false)) {
105
119
  this.logDebug("will not execute backup.. running conditions didn't pass: ", results);
@@ -108,7 +122,6 @@ class FirebaseScheduledFunction extends FirebaseFunction {
108
122
  return this.onScheduledEvent();
109
123
  }));
110
124
  };
111
- name && this.setName(name);
112
125
  }
113
126
  addRunningCondition(runningCondition) {
114
127
  ts_common_1.addItemToArray(this.runningCondition, runningCondition);
@@ -121,14 +134,14 @@ class FirebaseScheduledFunction extends FirebaseFunction {
121
134
  }
122
135
  exports.FirebaseScheduledFunction = FirebaseScheduledFunction;
123
136
  class Firebase_StorageFunction extends FirebaseFunction {
124
- constructor(name) {
125
- super();
137
+ constructor() {
138
+ super(...arguments);
126
139
  this.runtimeOpts = {};
127
140
  this.getFunction = () => {
128
141
  var _a, _b, _c, _d;
129
142
  if (this.function)
130
143
  return this.function;
131
- console.log(`Initializing ${this.getName()} with configs ${JSON.stringify(this.config)}`);
144
+ this.logInfo(`Initializing ${this.getName()} with configs ${JSON.stringify(this.config)}`);
132
145
  this.runtimeOpts = {
133
146
  timeoutSeconds: ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.runtimeOpts) === null || _b === void 0 ? void 0 : _b.timeoutSeconds) || 300,
134
147
  memory: ((_d = (_c = this.config) === null || _c === void 0 ? void 0 : _c.runtimeOpts) === null || _d === void 0 ? void 0 : _d.memory) || "2GB"
@@ -150,13 +163,12 @@ class Firebase_StorageFunction extends FirebaseFunction {
150
163
  }
151
164
  }));
152
165
  };
153
- name && this.setName(name);
154
166
  }
155
167
  }
156
168
  exports.Firebase_StorageFunction = Firebase_StorageFunction;
157
169
  class Firebase_PubSubFunction extends FirebaseFunction {
158
- constructor(topic, tag) {
159
- super(tag);
170
+ constructor(topic, name) {
171
+ super(name);
160
172
  this._onPublish = (object, originalMessage, context) => __awaiter(this, void 0, void 0, function* () {
161
173
  try {
162
174
  return yield this.onPublish(object, originalMessage, context);
@@ -174,9 +186,10 @@ class Firebase_PubSubFunction extends FirebaseFunction {
174
186
  }
175
187
  });
176
188
  this.getFunction = () => {
189
+ var _a;
177
190
  if (this.function)
178
191
  return this.function;
179
- return this.function = functions.pubsub.topic(this.topic).onPublish((message, context) => __awaiter(this, void 0, void 0, function* () {
192
+ return this.function = functions.runWith(((_a = this.config) === null || _a === void 0 ? void 0 : _a.runtimeOpts) || {}).pubsub.topic(this.topic).onPublish((message, context) => __awaiter(this, void 0, void 0, function* () {
180
193
  // need to validate etc...
181
194
  const originalMessage = message.toJSON();
182
195
  let data;
@@ -1 +1 @@
1
- {"version":3,"file":"firebase-function.js","sourceRoot":"","sources":["../../../src/main/app-backend/functions/firebase-function.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"firebase-function.js","sourceRoot":"","sources":["../../../src/main/app-backend/functions/firebase-function.ts"],"names":[],"mappings":"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"}
@@ -41,12 +41,12 @@ class PushMessagesWrapper extends FirebaseBaseWrapper_1.FirebaseBaseWrapper {
41
41
  }
42
42
  sendAll(messages) {
43
43
  return __awaiter(this, void 0, void 0, function* () {
44
- return this.messaging.sendAll(messages);
44
+ return this.messaging.sendEach(messages);
45
45
  });
46
46
  }
47
47
  sendMultiCast(tokens, data) {
48
48
  return __awaiter(this, void 0, void 0, function* () {
49
- return this.messaging.sendMulticast({ data, tokens });
49
+ return this.messaging.sendEachForMulticast({ data, tokens });
50
50
  });
51
51
  }
52
52
  sendToTopic(topic, data, dryRun) {
@@ -1 +1 @@
1
- {"version":3,"file":"PushMessagesWrapper.js","sourceRoot":"","sources":["../../../src/main/app-backend/push/PushMessagesWrapper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AASH,qEAAgE;AAGhE,wDAAsD;AAEtD,MAAa,mBACZ,SAAQ,yCAAmB;IAI3B,YAAY,eAA0C;QACrD,KAAK,CAAC,eAAe,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,wBAAY,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;IACnD,CAAC;IAEK,IAAI,CAAC,OAA6B,EAAE,MAAgB;;YACzD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7C,CAAC;KAAA;IAEK,OAAO,CAAC,QAAgC;;YAC7C,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;KAAA;IAEK,aAAa,CAAC,MAAgB,EAAE,IAAe;;YACpD,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC;QACrD,CAAC;KAAA;IAEK,WAAW,CAAC,KAAa,EAAE,IAAe,EAAE,MAAgB;;YACjE,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,EAAC,IAAI,EAAC,EAAE,EAAC,MAAM,EAAC,CAAC,CAAA;QAC3D,CAAC;KAAA;IAEK,gBAAgB,CAAC,MAAgB,EAAE,KAAa;;YACrD,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACtD,CAAC;KAAA;IAEK,oBAAoB,CAAC,MAAgB,EAAE,KAAa;;YACzD,OAAO,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QAC1D,CAAC;KAAA;CACD;AAjCD,kDAiCC"}
1
+ {"version":3,"file":"PushMessagesWrapper.js","sourceRoot":"","sources":["../../../src/main/app-backend/push/PushMessagesWrapper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AASH,qEAAgE;AAGhE,wDAAsD;AAEtD,MAAa,mBACZ,SAAQ,yCAAmB;IAI3B,YAAY,eAA0C;QACrD,KAAK,CAAC,eAAe,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,wBAAY,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;IACnD,CAAC;IAEK,IAAI,CAAC,OAA6B,EAAE,MAAgB;;YACzD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7C,CAAC;KAAA;IAEK,OAAO,CAAC,QAAgC;;YAC7C,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;KAAA;IAEK,aAAa,CAAC,MAAgB,EAAE,IAAe;;YACpD,OAAO,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC;QAC5D,CAAC;KAAA;IAEK,WAAW,CAAC,KAAa,EAAE,IAAe,EAAE,MAAgB;;YACjE,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,EAAC,IAAI,EAAC,EAAE,EAAC,MAAM,EAAC,CAAC,CAAA;QAC3D,CAAC;KAAA;IAEK,gBAAgB,CAAC,MAAgB,EAAE,KAAa;;YACrD,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACtD,CAAC;KAAA;IAEK,oBAAoB,CAAC,MAAgB,EAAE,KAAa;;YACzD,OAAO,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QAC1D,CAAC;KAAA;CACD;AAjCD,kDAiCC"}
@@ -1,8 +1,7 @@
1
- import { Metadata } from "@google-cloud/common";
2
1
  import { CopyResponse } from "@google-cloud/storage";
3
2
  import { Storage } from "firebase-admin/storage";
4
3
  export declare type FirebaseType_Storage = Storage;
5
- export declare type FirebaseType_Metadata = Metadata;
4
+ export declare type FirebaseType_Metadata = any;
6
5
  export declare type ReturnType_Metadata = {
7
6
  metadata?: FirebaseType_Metadata;
8
7
  };
@@ -36,7 +36,7 @@ const SwFirebaseSession_1 = require("./auth/SwFirebaseSession");
36
36
  const localSessionId = 'local';
37
37
  class FirebaseModule_Class extends ts_common_1.Module {
38
38
  constructor() {
39
- super("firebase fe");
39
+ super("FirebaseModule");
40
40
  this.sessions = {};
41
41
  this.fetchLocalConfig = () => __awaiter(this, void 0, void 0, function* () {
42
42
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"FirebaseModule.js","sourceRoot":"","sources":["../../src/main/app-frontend/FirebaseModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FirebaseModule.js","sourceRoot":"","sources":["../../src/main/app-frontend/FirebaseModule.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { Module } from "@intuitionrobotics/ts-common";
2
2
  declare class FirebaseAnalyticsModule_Class extends Module {
3
+ constructor();
3
4
  private analytics?;
4
5
  protected init(): void;
5
6
  private _init;
@@ -31,7 +31,7 @@ const ts_common_1 = require("@intuitionrobotics/ts-common");
31
31
  const FirebaseModule_1 = require("../FirebaseModule");
32
32
  class FirebaseAnalyticsModule_Class extends ts_common_1.Module {
33
33
  constructor() {
34
- super(...arguments);
34
+ super("FirebaseAnalyticsModule");
35
35
  this._init = () => __awaiter(this, void 0, void 0, function* () {
36
36
  const session = yield FirebaseModule_1.FirebaseModule.createSession();
37
37
  this.analytics = session.getAnalytics();
@@ -1 +1 @@
1
- {"version":3,"file":"AnalyticsModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/analytics/AnalyticsModule.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,4DAGsC;AACtC,sDAAiD;AAGjD,MAAM,6BACL,SAAQ,kBAAM;IADf;;QASS,UAAK,GAAG,GAAS,EAAE;YAC1B,MAAM,OAAO,GAAG,MAAM,+BAAc,CAAC,aAAa,EAAE,CAAC;YAErD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,CAAC,SAAS,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC,CAAA,CAAC;IAeH,CAAC;IAxBU,IAAI;QACb,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IASD,QAAQ,CAAC,SAAiB,EAAE,WAAoC;QAC/D,IAAI,CAAC,IAAI,CAAC,SAAS;YAClB,MAAM,IAAI,0CAA8B,CAAC,2BAA2B,CAAC,CAAC;QAEvE,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACxD,CAAC;IAED,gBAAgB,CAAC,UAAkB;QAClC,IAAI,CAAC,IAAI,CAAC,SAAS;YAClB,MAAM,IAAI,0CAA8B,CAAC,2BAA2B,CAAC,CAAC;QAEvE,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC;CACD;AAEY,QAAA,uBAAuB,GAAG,IAAI,6BAA6B,EAAE,CAAC"}
1
+ {"version":3,"file":"AnalyticsModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/analytics/AnalyticsModule.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,4DAAoF;AACpF,sDAAiD;AAGjD,MAAM,6BACF,SAAQ,kBAAM;IAEd;QACI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAS7B,UAAK,GAAG,GAAS,EAAE;YACvB,MAAM,OAAO,GAAG,MAAM,+BAAc,CAAC,aAAa,EAAE,CAAC;YAErD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,CAAC,SAAS,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC,CAAA,CAAC;IAbF,CAAC;IAIS,IAAI;QACV,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IASD,QAAQ,CAAC,SAAiB,EAAE,WAAoC;QAC5D,IAAI,CAAC,IAAI,CAAC,SAAS;YACf,MAAM,IAAI,0CAA8B,CAAC,2BAA2B,CAAC,CAAC;QAE1E,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC3D,CAAC;IAED,gBAAgB,CAAC,UAAkB;QAC/B,IAAI,CAAC,IAAI,CAAC,SAAS;YACf,MAAM,IAAI,0CAA8B,CAAC,2BAA2B,CAAC,CAAC;QAE1E,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;CACJ;AAEY,QAAA,uBAAuB,GAAG,IAAI,6BAA6B,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@intuitionrobotics/firebase",
3
- "version": "0.43.1",
3
+ "version": "0.43.3",
4
4
  "description": "Storm - Express & Typescript based backend framework",
5
5
  "keywords": [
6
6
  "IR",
@@ -29,22 +29,18 @@
29
29
  "build": "tsc"
30
30
  },
31
31
  "dependencies": {
32
- "@google-cloud/common": "^3.0.0",
33
- "@google-cloud/storage": "^6.0.0",
34
- "@grpc/proto-loader": "0.6.9",
32
+ "@google-cloud/storage": "^6.10.1",
35
33
  "@intuitionrobotics/ts-common": "~0.43.0",
36
- "express": "^4.17.1",
37
- "firebase": "^9.9.1",
38
- "firebase-admin": "^11.0.0",
39
- "firebase-functions": "^3.22.0",
40
- "google-auth-library": "7.12.0"
34
+ "express": "^4.16.4",
35
+ "firebase": "^10.0.0",
36
+ "firebase-admin": "^11.10.1",
37
+ "firebase-functions": "^4.4.1",
38
+ "fs": "0.0.1-security"
41
39
  },
42
40
  "devDependencies": {
43
41
  "@intuitionrobotics/testelot": "~0.43.0",
44
- "@types/compression": "^1.0.1",
45
42
  "@types/express": "^4.17.2",
46
43
  "@types/node": "^16.0.0",
47
- "fs": "0.0.1-security",
48
44
  "ts-node": "^8.6.2",
49
45
  "typescript": "~4.1.0"
50
46
  }