@verdant-web/store 4.1.2 → 4.1.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.
- package/dist/bundle/index.js +5 -5
- package/dist/bundle/index.js.map +4 -4
- package/dist/esm/__tests__/queries.test.js +51 -2
- package/dist/esm/__tests__/queries.test.js.map +1 -1
- package/dist/esm/client/Client.d.ts +3 -1
- package/dist/esm/client/Client.js +8 -1
- package/dist/esm/client/Client.js.map +1 -1
- package/dist/esm/client/ClientDescriptor.d.ts +6 -2
- package/dist/esm/client/ClientDescriptor.js +7 -6
- package/dist/esm/client/ClientDescriptor.js.map +1 -1
- package/dist/esm/context/context.d.ts +17 -3
- package/dist/esm/entities/Entity.d.ts +2 -2
- package/dist/esm/entities/Entity.js +5 -1
- package/dist/esm/entities/Entity.js.map +1 -1
- package/dist/esm/entities/types.d.ts +41 -0
- package/dist/esm/files/FileManager.d.ts +3 -1
- package/dist/esm/files/FileManager.js +9 -2
- package/dist/esm/files/FileManager.js.map +1 -1
- package/dist/esm/persistence/PersistenceFiles.js +3 -2
- package/dist/esm/persistence/PersistenceFiles.js.map +1 -1
- package/dist/esm/persistence/idb/files/IdbPersistenceFileDb.d.ts +2 -2
- package/dist/esm/persistence/idb/files/IdbPersistenceFileDb.js +12 -4
- package/dist/esm/persistence/idb/files/IdbPersistenceFileDb.js.map +1 -1
- package/dist/esm/persistence/persistence.js +3 -3
- package/dist/esm/persistence/persistence.js.map +1 -1
- package/dist/esm/queries/BaseQuery.js +2 -1
- package/dist/esm/queries/BaseQuery.js.map +1 -1
- package/dist/esm/queries/QueryCache.d.ts +8 -1
- package/dist/esm/queries/QueryCache.js +33 -2
- package/dist/esm/queries/QueryCache.js.map +1 -1
- package/dist/esm/sync/FileSync.d.ts +1 -1
- package/dist/esm/sync/FileSync.js +2 -1
- package/dist/esm/sync/FileSync.js.map +1 -1
- package/package.json +1 -1
- package/src/__tests__/queries.test.ts +70 -3
- package/src/client/Client.ts +13 -7
- package/src/client/ClientDescriptor.ts +14 -8
- package/src/context/context.ts +18 -3
- package/src/entities/Entity.ts +8 -4
- package/src/entities/types.ts +57 -24
- package/src/files/FileManager.ts +15 -2
- package/src/persistence/PersistenceFiles.ts +11 -6
- package/src/persistence/idb/files/IdbPersistenceFileDb.ts +22 -9
- package/src/persistence/persistence.ts +4 -2
- package/src/queries/BaseQuery.ts +3 -1
- package/src/queries/QueryCache.ts +56 -2
- package/src/sync/FileSync.ts +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../../src/files/FileManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../../src/files/FileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,10 +27,10 @@ export class PersistenceFiles {
|
|
|
27
27
|
// always reset remote status to false, this is a new file just created
|
|
28
28
|
// and must be uploaded, even if it is cloned from an uploaded file.
|
|
29
29
|
file.remote = false;
|
|
30
|
-
// fire event for processing immediately
|
|
31
|
-
this.context.internalEvents.emit('fileAdded', file);
|
|
32
30
|
// store in persistence db
|
|
33
31
|
await this.db.add(file);
|
|
32
|
+
// fire event for sync to pick up and upload the file
|
|
33
|
+
this.context.internalEvents.emit('fileAdded', file);
|
|
34
34
|
this.context.globalEvents.emit('fileSaved', file);
|
|
35
35
|
this.context.log('debug', 'File added', file.id, file.name, file.type, file.file
|
|
36
36
|
? 'with binary file'
|
|
@@ -125,6 +125,7 @@ export class PersistenceFiles {
|
|
|
125
125
|
});
|
|
126
126
|
}
|
|
127
127
|
else {
|
|
128
|
+
this.context.log('error', `Failed to download file after ${maxRetries} retries`, err);
|
|
128
129
|
throw new Error(`Failed to download file after ${maxRetries} retries`, {
|
|
129
130
|
cause: err,
|
|
130
131
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersistenceFiles.js","sourceRoot":"","sources":["../../../src/persistence/PersistenceFiles.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,gBAAgB;IAC5B,YACS,EAAqB,EACrB,OAAiC;QADjC,OAAE,GAAF,EAAE,CAAmB;QACrB,YAAO,GAAP,OAAO,CAA0B;QAmB1C,kBAAa,GAAG,CAAC,KAAoB,EAAE,EAAE,CACxC,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACvC,QAAG,GAAG,KAAK,EAAE,IAAc,EAAE,EAAE;YAC9B,0DAA0D;YAC1D,8DAA8D;YAC9D,iEAAiE;YACjE,+DAA+D;YAC/D,6DAA6D;YAC7D,kEAAkE;YAClE,+CAA+C;YAC/C,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,OAAO,EACP,qGAAqG,EACrG,IAAI,CAAC,EAAE,CACP,CAAC;gBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrD,0CAA0C;gBAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7D,6EAA6E;gBAC7E,2BAA2B;gBAC3B,OAAO,IAAI,CAAC,GAAG,CAAC;gBAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,OAAO,EACP,wBAAwB,EACxB,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,IAAI,EACT,2BAA2B,CAC3B,CAAC;YACH,CAAC;iBAAM,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACvD,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,MAAM,EACN,4EAA4E,EAC5E,IAAI,CAAC,EAAE,CACP,CAAC;YACH,CAAC;YAED,uEAAuE;YACvE,oEAAoE;YACpE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YAEpB,
|
|
1
|
+
{"version":3,"file":"PersistenceFiles.js","sourceRoot":"","sources":["../../../src/persistence/PersistenceFiles.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,gBAAgB;IAC5B,YACS,EAAqB,EACrB,OAAiC;QADjC,OAAE,GAAF,EAAE,CAAmB;QACrB,YAAO,GAAP,OAAO,CAA0B;QAmB1C,kBAAa,GAAG,CAAC,KAAoB,EAAE,EAAE,CACxC,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACvC,QAAG,GAAG,KAAK,EAAE,IAAc,EAAE,EAAE;YAC9B,0DAA0D;YAC1D,8DAA8D;YAC9D,iEAAiE;YACjE,+DAA+D;YAC/D,6DAA6D;YAC7D,kEAAkE;YAClE,+CAA+C;YAC/C,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,OAAO,EACP,qGAAqG,EACrG,IAAI,CAAC,EAAE,CACP,CAAC;gBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrD,0CAA0C;gBAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7D,6EAA6E;gBAC7E,2BAA2B;gBAC3B,OAAO,IAAI,CAAC,GAAG,CAAC;gBAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,OAAO,EACP,wBAAwB,EACxB,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,IAAI,EACT,2BAA2B,CAC3B,CAAC;YACH,CAAC;iBAAM,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACvD,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,MAAM,EACN,4EAA4E,EAC5E,IAAI,CAAC,EAAE,CACP,CAAC;YACH,CAAC;YAED,uEAAuE;YACvE,oEAAoE;YACpE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YAEpB,0BAA0B;YAC1B,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACxB,qDAAqD;YACrD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YACpD,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAClD,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,OAAO,EACP,YAAY,EACZ,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI;gBACR,CAAC,CAAC,kBAAkB;gBACpB,CAAC,CAAC,IAAI,CAAC,GAAG;oBACT,CAAC,CAAC,UAAU;oBACZ,CAAC,CAAC,IAAI,CAAC,SAAS;wBACf,CAAC,CAAC,iBAAiB;wBACnB,CAAC,CAAC,cAAc,CACnB,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;QACF,eAAU,GAAG,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChD,QAAG,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,WAAM,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtC,iBAAY,GAAG,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClD,6BAAwB,GAAG,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1E,UAAK,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5B,sBAAiB,GAAG,CAAC,gBAAwB,EAAE,EAAU,EAAE,EAAE;YACpE,OAAO,GAAG,EAAE,MAAM,gBAAgB,EAAE,CAAC;QACtC,CAAC,CAAC;QACF,WAAM,GAAG,KAAK,EAAE,cAAc,GAAG,IAAI,EAAE,EAAE;YACxC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACxC,IAAI,cAAc,EAAE,CAAC;gBACpB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;oBACtC,mEAAmE;oBACnE,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;wBAClE,IAAI,CAAC;4BACJ,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;4BACrD,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;wBACxB,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACd,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,OAAO,EACP,0IAA0I,EAC1I,UAAU,EACV,GAAG,CACH,CAAC;wBACH,CAAC;oBACF,CAAC;yBAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;wBAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,MAAM,EACN,QAAQ,UAAU,CAAC,EAAE,wDAAwD,EAC7E,UAAU,CACV,CAAC;oBACH,CAAC;gBACF,CAAC;YACF,CAAC;YACD,kCAAkC;YAClC,MAAM,QAAQ,GAA2C,EAAE,CAAC;YAC5D,MAAM,KAAK,GAAgB,EAAE,CAAC;YAE9B,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACtC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;gBAC7B,OAAO,UAAU,CAAC,IAAI,CAAC;gBACvB,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC1B,IAAI,IAAI,EAAE,CAAC;oBACV,iBAAiB;oBACjB,MAAM,MAAM,GAAG,IAAI,IAAI,CACtB,CAAC,IAAI,CAAC,EACN,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,EACtD;wBACC,IAAI,EAAE,UAAU,CAAC,IAAI;qBACrB,CACD,CAAC;oBACF,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACP,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,MAAM,EACN,QAAQ,UAAU,CAAC,EAAE,wFAAwF,CAC7G,CAAC;gBACH,CAAC;YACF,CAAC;YACD,OAAO;gBACN,QAAQ;gBACR,KAAK;aACL,CAAC;QACH,CAAC,CAAC;QAEF,WAAM,GAAG,KAAK,EAAE,EACf,QAAQ,EACR,KAAK,GAIL,EAAE,EAAE;YACJ,gDAAgD;YAChD,MAAM,WAAW,GAAG,IAAI,GAAG,CAC1B,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAClB,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnD,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YACnB,CAAC,CAAC,CACF,CAAC;YACF,MAAM,aAAa,GAAwB,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACpE,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAE1C,IAAI,CAAC,IAAI,EAAE,CAAC;oBACX,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,EAAE,0BAA0B,CAAC,CAAC;oBACxE,OAAO,QAAQ,CAAC;gBACjB,CAAC;gBAED,uCACI,QAAQ,KACX,IAAI,IACH;YACH,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC;QAEM,wBAAmB,GAAG,CAAC,IAAY,EAAE,EAAE;YAC9C,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjD,OAAO,EAAE,EAAE,EAAE,gBAAgB,EAAE,CAAC;QACjC,CAAC,CAAC;QAEM,qBAAgB,GAAG,KAAK,EAC/B,IAAc,EACd,OAAO,GAAG,CAAC,EACX,UAAU,GAAG,CAAC,EACb,EAAE;YACH,IAAI,CAAC;gBACJ,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3D,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,IAAI,OAAO,GAAG,UAAU,EAAE,CAAC;oBAC1B,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;wBAC5C,UAAU,CAAC,GAAG,EAAE;4BACf,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC,IAAI,CACxD,OAAO,EACP,MAAM,CACN,CAAC;wBACH,CAAC,EAAE,IAAI,CAAC,CAAC;oBACV,CAAC,CAAC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACP,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,OAAO,EACP,iCAAiC,UAAU,UAAU,EACrD,GAAG,CACH,CAAC;oBACF,MAAM,IAAI,KAAK,CAAC,iCAAiC,UAAU,UAAU,EAAE;wBACtE,KAAK,EAAE,GAAG;qBACV,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;QACF,CAAC,CAAC;QAEF,wBAAmB,GAAG,KAAK,IAAI,EAAE;YAChC,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,IAAI,SAAS,GAAG,CAAC,CAAC;YAClB,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,wBAAwB,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAChD,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACjD,KAAK,EAAE,CAAC;oBACR,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC7B,CAAC;qBAAM,CAAC;oBACP,SAAS,EAAE,CAAC;gBACb,CAAC;YACF,CAAC,CAAC,CAAC;YACH,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;gBAC5B,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1B,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,MAAM,EACN,cAAc,KAAK,mBAAmB,SAAS,QAAQ,CACvD,CAAC;QACH,CAAC,CAAC;QAEM,sBAAiB,GAAG,KAAK,EAAE,QAAmB,EAAE,EAAE;YACzD,MAAM,OAAO,CAAC,GAAG,CAChB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC9B,IAAI,CAAC;oBACJ,MAAM,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC7C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,kCAAkC,EAAE,GAAG,CAAC,CAAC;gBACpE,CAAC;YACF,CAAC,CAAC,CACF,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,MAAM,EACN,UAAU,QAAQ,CAAC,MAAM,0BAA0B,CACnD,CAAC;QACH,CAAC,CAAC;QAvPD,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACzE,sCAAsC;QACtC,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC5B,CAAC;IAED,IAAY,MAAM;QACjB,uBACC,qBAAqB,CAAC,QAAQ;gBAC7B,OAAO,CACN,QAAQ,CAAC,SAAS,KAAK,IAAI;oBAC3B,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CACpD,CAAC;YACH,CAAC,IACE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAC3B;IACH,CAAC;CAyOD"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FileData } from '@verdant-web/common';
|
|
2
|
+
import { Context } from '../../../internal.js';
|
|
2
3
|
import { AbstractTransaction, PersistedFileData, PersistenceFileDb } from '../../interfaces.js';
|
|
3
4
|
import { IdbService } from '../IdbService.js';
|
|
4
|
-
import { Context } from '../../../internal.js';
|
|
5
5
|
/**
|
|
6
6
|
* When stored in IDB, replace the file blob with an array buffer
|
|
7
7
|
* since it's more compatible, and replace remote boolean with
|
|
@@ -35,4 +35,4 @@ export declare class IdbPersistenceFileDb extends IdbService implements Persiste
|
|
|
35
35
|
private hydrateFileData;
|
|
36
36
|
private getFileRaw;
|
|
37
37
|
}
|
|
38
|
-
export declare function arrayBufferToBlob(buffer: ArrayBuffer, type: string):
|
|
38
|
+
export declare function arrayBufferToBlob(buffer: ArrayBuffer, type: string, name?: string): File;
|
|
@@ -22,6 +22,9 @@ export class IdbPersistenceFileDb extends IdbService {
|
|
|
22
22
|
});
|
|
23
23
|
};
|
|
24
24
|
this.markUploaded = async (id) => {
|
|
25
|
+
if (this.disposed) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
25
28
|
const current = await this.getFileRaw(id);
|
|
26
29
|
if (!current) {
|
|
27
30
|
throw new Error('File is not in local database');
|
|
@@ -106,7 +109,7 @@ export class IdbPersistenceFileDb extends IdbService {
|
|
|
106
109
|
if (file.url) {
|
|
107
110
|
const response = await ctx.environment.fetch(file.url);
|
|
108
111
|
if (!response.ok) {
|
|
109
|
-
throw new Error(`Failed to download file: ${response.statusText}`);
|
|
112
|
+
throw new Error(`Failed to download file ${file.url}: ${response.statusText}`);
|
|
110
113
|
}
|
|
111
114
|
return response.blob();
|
|
112
115
|
}
|
|
@@ -117,11 +120,14 @@ export class IdbPersistenceFileDb extends IdbService {
|
|
|
117
120
|
const buffer = raw.buffer;
|
|
118
121
|
delete raw.buffer;
|
|
119
122
|
raw.file = buffer
|
|
120
|
-
? arrayBufferToBlob(buffer, raw.type)
|
|
123
|
+
? arrayBufferToBlob(buffer, raw.type, raw.name)
|
|
121
124
|
: undefined;
|
|
122
125
|
return raw;
|
|
123
126
|
};
|
|
124
127
|
this.getFileRaw = async (id, { transaction } = {}) => {
|
|
128
|
+
if (this.disposed) {
|
|
129
|
+
return undefined;
|
|
130
|
+
}
|
|
125
131
|
const raw = await this.run('files', (store) => {
|
|
126
132
|
return store.get(id);
|
|
127
133
|
}, { mode: 'readonly', transaction: transaction });
|
|
@@ -132,8 +138,10 @@ export class IdbPersistenceFileDb extends IdbService {
|
|
|
132
138
|
};
|
|
133
139
|
}
|
|
134
140
|
}
|
|
135
|
-
export function arrayBufferToBlob(buffer, type) {
|
|
136
|
-
return new Blob([buffer], { type })
|
|
141
|
+
export function arrayBufferToBlob(buffer, type, name) {
|
|
142
|
+
return new File([new Blob([buffer], { type })], name !== null && name !== void 0 ? name : 'blob', {
|
|
143
|
+
type,
|
|
144
|
+
});
|
|
137
145
|
}
|
|
138
146
|
function fileToArrayBuffer(file) {
|
|
139
147
|
// special case for testing...
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IdbPersistenceFileDb.js","sourceRoot":"","sources":["../../../../../src/persistence/idb/files/IdbPersistenceFileDb.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"IdbPersistenceFileDb.js","sourceRoot":"","sources":["../../../../../src/persistence/idb/files/IdbPersistenceFileDb.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { EventSubscriber, getOidRoot, VerdantError } from '@verdant-web/common';
|
|
2
|
+
import { ShutdownHandler } from '../context/ShutdownHandler.js';
|
|
2
3
|
import { getWipNamespace } from '../utils/wip.js';
|
|
4
|
+
import { migrate } from './migration/migrate.js';
|
|
3
5
|
import { PersistenceFiles } from './PersistenceFiles.js';
|
|
4
6
|
import { PersistenceMetadata } from './PersistenceMetadata.js';
|
|
5
7
|
import { PersistenceDocuments } from './PersistenceQueries.js';
|
|
6
|
-
import { migrate } from './migration/migrate.js';
|
|
7
|
-
import { ShutdownHandler } from '../context/ShutdownHandler.js';
|
|
8
8
|
export async function initializePersistence(ctx) {
|
|
9
9
|
var _a;
|
|
10
10
|
let context = ctx;
|
|
@@ -71,7 +71,7 @@ export async function importPersistence(ctx, exportedData) {
|
|
|
71
71
|
const importedNamespace = `@@import_${Date.now()}`;
|
|
72
72
|
const importedContext = await initializePersistence(Object.assign(Object.assign({}, ctx), { schema: exportedSchema, namespace: importedNamespace, originalNamespace: importedNamespace,
|
|
73
73
|
// no-op entity events -- don't need to inform queries of changes.
|
|
74
|
-
entityEvents: new EventSubscriber(), config: Object.assign(Object.assign({}, ctx.config), { persistence: Object.assign(Object.assign({}, ctx.config.persistence), { disableRebasing: true }) }), persistenceShutdownHandler: new ShutdownHandler() }));
|
|
74
|
+
entityEvents: new EventSubscriber(), internalEvents: new EventSubscriber(), globalEvents: new EventSubscriber(), config: Object.assign(Object.assign({}, ctx.config), { persistence: Object.assign(Object.assign({}, ctx.config.persistence), { disableRebasing: true }) }), persistenceShutdownHandler: new ShutdownHandler() }));
|
|
75
75
|
// load imported data into persistence
|
|
76
76
|
await importedContext.meta.resetFrom(exportedData.data);
|
|
77
77
|
// need to write indexes here!
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../src/persistence/persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEhF,OAAO,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../src/persistence/persistence.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,8 +107,9 @@ export class BaseQuery extends Disposable {
|
|
|
107
107
|
this.isListQuery = Array.isArray(initial);
|
|
108
108
|
this._events = new EventSubscriber((event) => {
|
|
109
109
|
var _b;
|
|
110
|
-
if (event === 'change')
|
|
110
|
+
if (event === 'change') {
|
|
111
111
|
(_b = this._allUnsubscribedHandler) === null || _b === void 0 ? void 0 : _b.call(this, this);
|
|
112
|
+
}
|
|
112
113
|
});
|
|
113
114
|
this.context = context;
|
|
114
115
|
this.key = key;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseQuery.js","sourceRoot":"","sources":["../../../src/queries/BaseQuery.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAiB7C,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AACjE,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEvC,kCAAkC;AAClC,yEAAyE;AACzE,0FAA0F;AAC1F,wDAAwD;AACxD,IAAI;AAEJ,MAAM,OAAgB,SAAa,SAAQ,UAAU;IAgBpD,YAAY,EACX,OAAO,EACP,OAAO,EACP,UAAU,EACV,GAAG,EACH,YAAY,GACS;QACrB,KAAK,EAAE,CAAC;QAlBD,0BAAqB,GAAmB,EAAE,CAAC;QAE3C,YAAO,GAAgB,SAAS,CAAC;QACjC,sBAAiB,GAAsB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseQuery.js","sourceRoot":"","sources":["../../../src/queries/BaseQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,14 +5,21 @@ export declare class QueryCache extends Disposable {
|
|
|
5
5
|
private _cache;
|
|
6
6
|
private _evictionTime;
|
|
7
7
|
private context;
|
|
8
|
+
/** A set of query keys to keep alive even if they unsubscribe */
|
|
9
|
+
private _holds;
|
|
8
10
|
constructor({ evictionTime, context, }: {
|
|
9
11
|
evictionTime?: number;
|
|
10
12
|
context: Context;
|
|
11
13
|
});
|
|
14
|
+
get activeKeys(): string[];
|
|
12
15
|
get<T extends BaseQuery<any>>(key: string): T | null;
|
|
13
16
|
set<V extends BaseQuery<any>>(value: V): V;
|
|
14
17
|
getOrSet<V extends BaseQuery<any>>(key: string, create: () => V, update?: (query: V) => void): V;
|
|
15
|
-
private
|
|
18
|
+
private enqueueQueryEviction;
|
|
16
19
|
dropAll: () => void;
|
|
17
20
|
forceRefreshAll: () => void;
|
|
21
|
+
keepAlive(key: string): void;
|
|
22
|
+
dropKeepAlive(key: string): void;
|
|
23
|
+
get keepAlives(): Set<string>;
|
|
18
24
|
}
|
|
25
|
+
export type PublicQueryCacheAPI = Pick<QueryCache, 'keepAlive' | 'dropKeepAlive' | 'keepAlives' | 'forceRefreshAll' | 'activeKeys'>;
|
|
@@ -4,14 +4,21 @@ export class QueryCache extends Disposable {
|
|
|
4
4
|
constructor({ evictionTime = 5 * 1000, context, }) {
|
|
5
5
|
super();
|
|
6
6
|
this._cache = new Map();
|
|
7
|
-
|
|
7
|
+
/** A set of query keys to keep alive even if they unsubscribe */
|
|
8
|
+
this._holds = new Set();
|
|
9
|
+
this.enqueueQueryEviction = (query) => {
|
|
8
10
|
setTimeout(() => {
|
|
9
11
|
if (query.subscribed)
|
|
10
12
|
return;
|
|
13
|
+
if (this._holds.has(query.key)) {
|
|
14
|
+
this.context.log('debug', 'QueryCache: keepAlive hold on query preserves after unsubscribe', query.key);
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
11
17
|
// double check before evicting... possible the cache
|
|
12
18
|
// got a different version of this query.
|
|
13
19
|
if (this._cache.get(query.key) === query) {
|
|
14
20
|
this._cache.delete(query.key);
|
|
21
|
+
this.context.log('debug', 'QueryCache: evicted query', query.key);
|
|
15
22
|
}
|
|
16
23
|
}, this._evictionTime);
|
|
17
24
|
};
|
|
@@ -28,12 +35,19 @@ export class QueryCache extends Disposable {
|
|
|
28
35
|
this.context = context;
|
|
29
36
|
this.addDispose(this.context.internalEvents.subscribe('persistenceReset', this.forceRefreshAll));
|
|
30
37
|
}
|
|
38
|
+
get activeKeys() {
|
|
39
|
+
return Array.from(this._cache.keys());
|
|
40
|
+
}
|
|
31
41
|
get(key) {
|
|
32
42
|
return this._cache.get(key) || null;
|
|
33
43
|
}
|
|
34
44
|
set(value) {
|
|
35
45
|
this._cache.set(value.key, value);
|
|
36
|
-
value[ON_ALL_UNSUBSCRIBED](this.
|
|
46
|
+
value[ON_ALL_UNSUBSCRIBED](this.enqueueQueryEviction);
|
|
47
|
+
// immediately enqueue a check to see if this query should be evicted --
|
|
48
|
+
// this basically gives code X seconds to subscribe to the query before
|
|
49
|
+
// it gets evicted.
|
|
50
|
+
this.enqueueQueryEviction(value);
|
|
37
51
|
return value;
|
|
38
52
|
}
|
|
39
53
|
getOrSet(key, create, update) {
|
|
@@ -45,5 +59,22 @@ export class QueryCache extends Disposable {
|
|
|
45
59
|
this.context.log('debug', 'QueryCache: creating new query', key);
|
|
46
60
|
return this.set(create());
|
|
47
61
|
}
|
|
62
|
+
keepAlive(key) {
|
|
63
|
+
this._holds.add(key);
|
|
64
|
+
this.context.log('debug', 'QueryCache: keepAlive', key);
|
|
65
|
+
}
|
|
66
|
+
dropKeepAlive(key) {
|
|
67
|
+
this._holds.delete(key);
|
|
68
|
+
const cached = this.get(key);
|
|
69
|
+
if (!cached)
|
|
70
|
+
return;
|
|
71
|
+
if (!cached.subscribed) {
|
|
72
|
+
this.context.log('debug', 'QueryCache: dropKeepAlive on unsubscribed query; queuing eviction', key);
|
|
73
|
+
this.enqueueQueryEviction(cached);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
get keepAlives() {
|
|
77
|
+
return this._holds;
|
|
78
|
+
}
|
|
48
79
|
}
|
|
49
80
|
//# sourceMappingURL=QueryCache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryCache.js","sourceRoot":"","sources":["../../../src/queries/QueryCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAa,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,MAAM,OAAO,UAAW,SAAQ,UAAU;
|
|
1
|
+
{"version":3,"file":"QueryCache.js","sourceRoot":"","sources":["../../../src/queries/QueryCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FileData } from '@verdant-web/common';
|
|
2
|
-
import { ServerSyncEndpointProvider } from './ServerSyncEndpointProvider.js';
|
|
3
2
|
import { Context } from '../context/context.js';
|
|
4
3
|
import { Disposable } from '../utils/Disposable.js';
|
|
4
|
+
import { ServerSyncEndpointProvider } from './ServerSyncEndpointProvider.js';
|
|
5
5
|
export interface FileUploadResult {
|
|
6
6
|
success: boolean;
|
|
7
7
|
error?: string;
|
|
@@ -8,7 +8,6 @@ export class FileSync extends Disposable {
|
|
|
8
8
|
this.ctx.log('debug', 'Uploading file', data.id, data.name);
|
|
9
9
|
try {
|
|
10
10
|
await this.uploadFile(data);
|
|
11
|
-
this.ctx.internalEvents.emit(`fileUploaded:${data.id}`, data);
|
|
12
11
|
}
|
|
13
12
|
catch (e) {
|
|
14
13
|
this.ctx.log('error', 'File upload failed', e);
|
|
@@ -37,6 +36,8 @@ export class FileSync extends Disposable {
|
|
|
37
36
|
},
|
|
38
37
|
});
|
|
39
38
|
if (response.ok) {
|
|
39
|
+
this.ctx.internalEvents.emit(`fileUploaded:${data.id}`, data);
|
|
40
|
+
this.ctx.internalEvents.emit('fileUploaded', data);
|
|
40
41
|
this.ctx.log('info', 'File upload successful');
|
|
41
42
|
return {
|
|
42
43
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileSync.js","sourceRoot":"","sources":["../../../src/sync/FileSync.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FileSync.js","sourceRoot":"","sources":["../../../src/sync/FileSync.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { describe, it, expect } from 'vitest';
|
|
2
|
-
import { createTestStorage } from './fixtures/testStorage.js';
|
|
3
|
-
import type { ClientWithCollections } from '../index.js';
|
|
4
1
|
import { assert } from '@verdant-web/common';
|
|
2
|
+
import { afterEach, describe, expect, it, vi } from 'vitest';
|
|
3
|
+
import type { ClientWithCollections } from '../index.js';
|
|
4
|
+
import { createTestStorage } from './fixtures/testStorage.js';
|
|
5
5
|
|
|
6
6
|
async function addTestingItems(storage: ClientWithCollections) {
|
|
7
7
|
let items = [];
|
|
@@ -55,6 +55,10 @@ async function addTestingItems(storage: ClientWithCollections) {
|
|
|
55
55
|
return items;
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
+
afterEach(() => {
|
|
59
|
+
vi.useRealTimers();
|
|
60
|
+
});
|
|
61
|
+
|
|
58
62
|
describe('storage queries', () => {
|
|
59
63
|
it('can query synthetic indexes', async () => {
|
|
60
64
|
const storage = await createTestStorage();
|
|
@@ -255,6 +259,69 @@ describe('storage queries', () => {
|
|
|
255
259
|
items[5].get('id'),
|
|
256
260
|
]);
|
|
257
261
|
});
|
|
262
|
+
|
|
263
|
+
it('disposes of unsubscribed queries after a period', async () => {
|
|
264
|
+
const storage = await createTestStorage();
|
|
265
|
+
const items = await addTestingItems(storage);
|
|
266
|
+
|
|
267
|
+
vi.useFakeTimers();
|
|
268
|
+
|
|
269
|
+
const query = storage.todos.findAll({
|
|
270
|
+
index: {
|
|
271
|
+
where: 'categorySortedByDone',
|
|
272
|
+
match: {
|
|
273
|
+
category: 'general',
|
|
274
|
+
},
|
|
275
|
+
order: 'asc',
|
|
276
|
+
},
|
|
277
|
+
});
|
|
278
|
+
|
|
279
|
+
expect(storage.queries.activeKeys).toContain(query.key);
|
|
280
|
+
|
|
281
|
+
// since the query is not subscribed, it should be disposed after a period (defaults 5s)
|
|
282
|
+
vi.advanceTimersByTime(5001);
|
|
283
|
+
|
|
284
|
+
expect(storage.queries.activeKeys).not.toContain(query.key);
|
|
285
|
+
|
|
286
|
+
vi.useRealTimers();
|
|
287
|
+
});
|
|
288
|
+
|
|
289
|
+
it('keeps unsubscribed queries alive when told to', async () => {
|
|
290
|
+
const storage = await createTestStorage();
|
|
291
|
+
const items = await addTestingItems(storage);
|
|
292
|
+
|
|
293
|
+
vi.useFakeTimers();
|
|
294
|
+
|
|
295
|
+
const query = storage.todos.findAll({
|
|
296
|
+
index: {
|
|
297
|
+
where: 'categorySortedByDone',
|
|
298
|
+
match: {
|
|
299
|
+
category: 'general',
|
|
300
|
+
},
|
|
301
|
+
order: 'asc',
|
|
302
|
+
},
|
|
303
|
+
});
|
|
304
|
+
|
|
305
|
+
expect(storage.queries.activeKeys).toContain(query.key);
|
|
306
|
+
storage.queries.keepAlive(query.key);
|
|
307
|
+
|
|
308
|
+
// since the query is not subscribed, it should be disposed after a period (defaults 5s)
|
|
309
|
+
// overshoot that to be sure
|
|
310
|
+
vi.advanceTimersByTime(10 * 1000);
|
|
311
|
+
|
|
312
|
+
expect(storage.queries.activeKeys).toContain(query.key);
|
|
313
|
+
|
|
314
|
+
// remove hold
|
|
315
|
+
storage.queries.dropKeepAlive(query.key);
|
|
316
|
+
|
|
317
|
+
// doesn't get disposed immediately
|
|
318
|
+
expect(storage.queries.activeKeys).toContain(query.key);
|
|
319
|
+
|
|
320
|
+
// should be disposed after the normal period
|
|
321
|
+
vi.advanceTimersByTime(5001);
|
|
322
|
+
|
|
323
|
+
expect(storage.queries.activeKeys).not.toContain(query.key);
|
|
324
|
+
});
|
|
258
325
|
});
|
|
259
326
|
|
|
260
327
|
describe('query reactivity', () => {
|
package/src/client/Client.ts
CHANGED
|
@@ -10,12 +10,12 @@ import { DocumentManager } from '../entities/DocumentManager.js';
|
|
|
10
10
|
import { EntityStore } from '../entities/EntityStore.js';
|
|
11
11
|
import { FileManager } from '../files/FileManager.js';
|
|
12
12
|
import { deleteAllDatabases } from '../persistence/idb/util.js';
|
|
13
|
+
import { ExportedData } from '../persistence/interfaces.js';
|
|
14
|
+
import { importPersistence } from '../persistence/persistence.js';
|
|
13
15
|
import { CollectionQueries } from '../queries/CollectionQueries.js';
|
|
14
|
-
import { QueryCache } from '../queries/QueryCache.js';
|
|
16
|
+
import { PublicQueryCacheAPI, QueryCache } from '../queries/QueryCache.js';
|
|
15
17
|
import { NoSync, ServerSync, Sync } from '../sync/Sync.js';
|
|
16
18
|
import { getLatestVersion } from '../utils/versions.js';
|
|
17
|
-
import { ExportedData } from '../persistence/interfaces.js';
|
|
18
|
-
import { importPersistence } from '../persistence/persistence.js';
|
|
19
19
|
|
|
20
20
|
// not actually used below, but helpful for internal code which
|
|
21
21
|
// might rely on this stuff...
|
|
@@ -91,7 +91,7 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
|
|
|
91
91
|
? new ServerSync<Presence, Profile>(this.context.config.sync, {
|
|
92
92
|
onData: this.addData,
|
|
93
93
|
ctx: this.context,
|
|
94
|
-
|
|
94
|
+
})
|
|
95
95
|
: new NoSync<Presence, Profile>(this.context);
|
|
96
96
|
if (context.schema.wip && this.context.config.sync) {
|
|
97
97
|
context.log(
|
|
@@ -114,6 +114,7 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
|
|
|
114
114
|
// FIXME: make this less fragile
|
|
115
115
|
this._queryCache = new QueryCache({
|
|
116
116
|
context,
|
|
117
|
+
evictionTime: context.config.queries?.evictionTime,
|
|
117
118
|
});
|
|
118
119
|
this._documentManager = new DocumentManager(this.schema, this._entities);
|
|
119
120
|
|
|
@@ -226,6 +227,10 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
|
|
|
226
227
|
return this.context.undoHistory;
|
|
227
228
|
}
|
|
228
229
|
|
|
230
|
+
get queries(): PublicQueryCacheAPI {
|
|
231
|
+
return this._queryCache;
|
|
232
|
+
}
|
|
233
|
+
|
|
229
234
|
/**
|
|
230
235
|
* Batch multiple operations together to be executed in a single transaction.
|
|
231
236
|
* The changes made will not be included in the same undo history step as
|
|
@@ -294,6 +299,8 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
|
|
|
294
299
|
await this._entities.destroy();
|
|
295
300
|
|
|
296
301
|
this.context.persistenceShutdownHandler.shutdown();
|
|
302
|
+
this.context.internalEvents.disable();
|
|
303
|
+
this.context.entityEvents.disable();
|
|
297
304
|
|
|
298
305
|
// the idea here is to flush the microtask queue -
|
|
299
306
|
// we may have queued tasks related to queries that
|
|
@@ -318,9 +325,8 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
|
|
|
318
325
|
): Promise<ExportedData> => {
|
|
319
326
|
this.context.log('info', 'Exporting data...');
|
|
320
327
|
const metaExport = await this.context.meta.export();
|
|
321
|
-
const { fileData, files } =
|
|
322
|
-
downloadRemoteFiles
|
|
323
|
-
);
|
|
328
|
+
const { fileData, files } =
|
|
329
|
+
await this.context.files.export(downloadRemoteFiles);
|
|
324
330
|
return {
|
|
325
331
|
data: metaExport,
|
|
326
332
|
fileData,
|