@fluidframework/driver-web-cache 2.0.0-internal.3.0.2 → 2.0.0-internal.3.0.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.
@@ -1,7 +1,3 @@
1
- /*!
2
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
3
- * Licensed under the MIT License.
4
- */
5
1
  import { IPersistedCache, ICacheEntry, IFileEntry } from "@fluidframework/odsp-driver-definitions";
6
2
  import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
7
3
  export interface FluidCacheConfig {
@@ -1 +1 @@
1
- {"version":3,"file":"FluidCache.d.ts","sourceRoot":"","sources":["../src/FluidCache.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACH,eAAe,EACf,WAAW,EACX,UAAU,EACb,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACH,oBAAoB,EAEvB,MAAM,oCAAoC,CAAC;AAoB5C,MAAM,WAAW,gBAAgB;IAC7B;;;;;;OAMG;IAEH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAE9B;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,qBAAa,UAAW,YAAW,eAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;gBAE7B,MAAM,EAAE,gBAAgB;IAiEvB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B9C,GAAG,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;YAiBzC,gBAAgB;IAsEjB,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CA8BlE"}
1
+ {"version":3,"file":"FluidCache.d.ts","sourceRoot":"","sources":["../src/FluidCache.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACnG,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAqB5F,MAAM,WAAW,gBAAgB;IAC7B;;;;;;OAMG;IAEH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAE9B;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,qBAAa,UAAW,YAAW,eAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;gBAE7B,MAAM,EAAE,gBAAgB;IAkEvB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B9C,GAAG,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;YAiB5C,gBAAgB;IA8EjB,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAiC/D"}
@@ -1,8 +1,4 @@
1
1
  "use strict";
2
- /*!
3
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
4
- * Licensed under the MIT License.
5
- */
6
2
  Object.defineProperty(exports, "__esModule", { value: true });
7
3
  exports.FluidCache = void 0;
8
4
  const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
@@ -40,9 +36,10 @@ class FluidCache {
40
36
  }
41
37
  });
42
38
  (0, scheduleIdleTask_1.scheduleIdleTask)(async () => {
39
+ let db;
43
40
  // Delete entries that have not been accessed recently to clean up space
44
41
  try {
45
- const db = await (0, FluidCacheIndexedDb_1.getFluidCacheIndexedDbInstance)(this.logger);
42
+ db = await (0, FluidCacheIndexedDb_1.getFluidCacheIndexedDbInstance)(this.logger);
46
43
  const transaction = db.transaction(FluidCacheIndexedDb_1.FluidDriverObjectStoreName, "readwrite");
47
44
  const index = transaction.store.index("lastAccessTimeMs");
48
45
  // Get items that have not been accessed in 4 weeks
@@ -55,11 +52,15 @@ class FluidCache {
55
52
  eventName: "FluidCacheDeleteOldEntriesError" /* FluidCacheDeleteOldEntriesError */,
56
53
  }, error);
57
54
  }
55
+ finally {
56
+ db === null || db === void 0 ? void 0 : db.close();
57
+ }
58
58
  });
59
59
  }
60
60
  async removeEntries(file) {
61
+ let db;
61
62
  try {
62
- const db = await (0, FluidCacheIndexedDb_1.getFluidCacheIndexedDbInstance)(this.logger);
63
+ db = await (0, FluidCacheIndexedDb_1.getFluidCacheIndexedDbInstance)(this.logger);
63
64
  const transaction = db.transaction(FluidCacheIndexedDb_1.FluidDriverObjectStoreName, "readwrite");
64
65
  const index = transaction.store.index("fileId");
65
66
  const keysToDelete = await index.getAllKeys(file.docId);
@@ -71,6 +72,9 @@ class FluidCache {
71
72
  eventName: "FluidCacheDeleteOldEntriesError" /* FluidCacheDeleteOldEntriesError */,
72
73
  }, error);
73
74
  }
75
+ finally {
76
+ db === null || db === void 0 ? void 0 : db.close();
77
+ }
74
78
  }
75
79
  async get(cacheEntry) {
76
80
  const startTime = performance.now();
@@ -86,11 +90,13 @@ class FluidCache {
86
90
  return cachedItem === null || cachedItem === void 0 ? void 0 : cachedItem.cachedObject;
87
91
  }
88
92
  async getItemFromCache(cacheEntry) {
93
+ let db;
89
94
  try {
90
95
  const key = (0, FluidCacheIndexedDb_1.getKeyForCacheEntry)(cacheEntry);
91
- const db = await (0, FluidCacheIndexedDb_1.getFluidCacheIndexedDbInstance)(this.logger);
96
+ db = await (0, FluidCacheIndexedDb_1.getFluidCacheIndexedDbInstance)(this.logger);
92
97
  const value = await db.get(FluidCacheIndexedDb_1.FluidDriverObjectStoreName, key);
93
98
  if (!value) {
99
+ db.close();
94
100
  return undefined;
95
101
  }
96
102
  // If the data does not come from the same partition, don't return it
@@ -99,11 +105,13 @@ class FluidCache {
99
105
  eventName: "FluidCachePartitionKeyMismatch" /* FluidCachePartitionKeyMismatch */,
100
106
  subCategory: "FluidCache" /* FluidCache */,
101
107
  });
108
+ db.close();
102
109
  return undefined;
103
110
  }
104
111
  const currentTime = new Date().getTime();
105
112
  // If too much time has passed since this cache entry was used, we will also return undefined
106
113
  if (currentTime - value.createdTimeMs > this.maxCacheItemAge) {
114
+ db.close();
107
115
  return undefined;
108
116
  }
109
117
  const transaction = db.transaction(FluidCacheIndexedDb_1.FluidDriverObjectStoreName, "readwrite");
@@ -122,9 +130,11 @@ class FluidCache {
122
130
  await transaction.store.put(Object.assign(Object.assign({}, valueToUpdate), { lastAccessTimeMs: currentTime }), key);
123
131
  }
124
132
  await transaction.done;
125
- db.close();
133
+ db === null || db === void 0 ? void 0 : db.close();
126
134
  })
127
- .catch(() => { });
135
+ .catch(() => {
136
+ db === null || db === void 0 ? void 0 : db.close();
137
+ });
128
138
  return value;
129
139
  }
130
140
  catch (error) {
@@ -133,10 +143,14 @@ class FluidCache {
133
143
  this.logger.sendErrorEvent({ eventName: "FluidCacheGetError" /* FluidCacheGetError */ }, error);
134
144
  return undefined;
135
145
  }
146
+ finally {
147
+ db === null || db === void 0 ? void 0 : db.close();
148
+ }
136
149
  }
137
150
  async put(entry, value) {
151
+ let db;
138
152
  try {
139
- const db = await (0, FluidCacheIndexedDb_1.getFluidCacheIndexedDbInstance)(this.logger);
153
+ db = await (0, FluidCacheIndexedDb_1.getFluidCacheIndexedDbInstance)(this.logger);
140
154
  const currentTime = new Date().getTime();
141
155
  await db.put(FluidCacheIndexedDb_1.FluidDriverObjectStoreName, {
142
156
  cachedObject: value,
@@ -154,6 +168,9 @@ class FluidCache {
154
168
  // such as the database version having upgraded underneath us
155
169
  this.logger.sendErrorEvent({ eventName: "FluidCachePutError" /* FluidCachePutError */ }, error);
156
170
  }
171
+ finally {
172
+ db === null || db === void 0 ? void 0 : db.close();
173
+ }
157
174
  }
158
175
  }
159
176
  exports.FluidCache = FluidCache;
@@ -1 +1 @@
1
- {"version":3,"file":"FluidCache.js","sourceRoot":"","sources":["../src/FluidCache.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n IPersistedCache,\n ICacheEntry,\n IFileEntry,\n} from \"@fluidframework/odsp-driver-definitions\";\nimport {\n ITelemetryBaseLogger,\n ITelemetryLogger,\n} from \"@fluidframework/common-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\nimport { scheduleIdleTask } from \"./scheduleIdleTask\";\nimport {\n getFluidCacheIndexedDbInstance,\n FluidDriverObjectStoreName,\n getKeyForCacheEntry,\n} from \"./FluidCacheIndexedDb\";\nimport {\n FluidCacheErrorEvent,\n FluidCacheEventSubCategories,\n FluidCacheGenericEvent,\n} from \"./fluidCacheTelemetry\";\n\n// Some browsers have a usageDetails property that will tell you more detailed information\n// on how the storage is being used\ninterface StorageQuotaUsageDetails {\n indexedDB: number | undefined;\n}\n\nexport interface FluidCacheConfig {\n /**\n * A string to specify what partition of the cache you wish to use (e.g. a user id).\n * Null can be used to explicity indicate no partitioning, and has been chosen\n * vs undefined so that it is clear this is an intentional choice by the caller.\n * A null value should only be used when the host can ensure that the cache is not able\n * to be shared with multiple users.\n */\n // eslint-disable-next-line @rushstack/no-new-null\n partitionKey: string | null;\n\n /**\n * A logger that can be used to get insight into cache performance and errors\n */\n logger?: ITelemetryBaseLogger;\n\n /**\n * A value in milliseconds that determines the maximum age of a cache entry to return.\n * If an entry exists in the cache, but is older than this value, the cached value will not be returned.\n */\n maxCacheItemAge: number;\n}\n\n/**\n * A cache that can be used by the Fluid ODSP driver to cache data for faster performance\n */\nexport class FluidCache implements IPersistedCache {\n private readonly logger: ITelemetryLogger;\n\n private readonly partitionKey: string | null;\n\n private readonly maxCacheItemAge: number;\n\n constructor(config: FluidCacheConfig) {\n this.logger = ChildLogger.create(config.logger);\n this.partitionKey = config.partitionKey;\n this.maxCacheItemAge = config.maxCacheItemAge;\n\n scheduleIdleTask(async () => {\n // Log how much storage space is currently being used by indexed db.\n // NOTE: This API is not supported in all browsers and it doesn't let you see the size of a specific DB.\n // Exception added when eslint rule was added, this should be revisited when modifying this code\n if (navigator.storage?.estimate) {\n const estimate = await navigator.storage.estimate();\n\n // Some browsers have a usageDetails property that will tell you\n // more detailed information on how the storage is being used\n let indexedDBSize: number | undefined;\n if (\"usageDetails\" in estimate) {\n indexedDBSize = (\n (estimate as any)\n .usageDetails as StorageQuotaUsageDetails\n ).indexedDB;\n }\n\n this.logger.sendTelemetryEvent({\n eventName: FluidCacheGenericEvent.FluidCacheStorageInfo,\n subCategory: FluidCacheEventSubCategories.FluidCache,\n quota: estimate.quota,\n usage: estimate.usage,\n indexedDBSize,\n });\n }\n });\n\n scheduleIdleTask(async () => {\n // Delete entries that have not been accessed recently to clean up space\n try {\n const db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n const index = transaction.store.index(\"lastAccessTimeMs\");\n // Get items that have not been accessed in 4 weeks\n const keysToDelete = await index.getAllKeys(\n IDBKeyRange.upperBound(\n new Date().getTime() - 4 * 7 * 24 * 60 * 60 * 1000,\n ),\n );\n\n await Promise.all(\n keysToDelete.map((key) => transaction.store.delete(key)),\n );\n await transaction.done;\n } catch (error: any) {\n this.logger.sendErrorEvent(\n {\n eventName:\n FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,\n },\n error,\n );\n }\n });\n }\n\n public async removeEntries(file: IFileEntry): Promise<void> {\n try {\n const db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n const index = transaction.store.index(\"fileId\");\n\n const keysToDelete = await index.getAllKeys(file.docId);\n\n await Promise.all(\n keysToDelete.map((key) => transaction.store.delete(key)),\n );\n await transaction.done;\n } catch (error: any) {\n this.logger.sendErrorEvent(\n {\n eventName:\n FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,\n },\n error,\n );\n }\n }\n\n public async get(cacheEntry: ICacheEntry): Promise<any> {\n const startTime = performance.now();\n\n const cachedItem = await this.getItemFromCache(cacheEntry);\n\n this.logger.sendPerformanceEvent({\n eventName: \"FluidCacheAccess\",\n cacheHit: cachedItem !== undefined,\n type: cacheEntry.type,\n duration: performance.now() - startTime,\n });\n\n // Value will contain metadata like the expiry time, we just want to return the object we were asked to cache\n // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n return cachedItem?.cachedObject;\n }\n\n private async getItemFromCache(cacheEntry: ICacheEntry) {\n try {\n const key = getKeyForCacheEntry(cacheEntry);\n\n const db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const value = await db.get(FluidDriverObjectStoreName, key);\n\n if (!value) {\n return undefined;\n }\n\n // If the data does not come from the same partition, don't return it\n if (value.partitionKey !== this.partitionKey) {\n this.logger.sendTelemetryEvent({\n eventName:\n FluidCacheGenericEvent.FluidCachePartitionKeyMismatch,\n subCategory: FluidCacheEventSubCategories.FluidCache,\n });\n\n return undefined;\n }\n\n const currentTime = new Date().getTime();\n\n // If too much time has passed since this cache entry was used, we will also return undefined\n if (currentTime - value.createdTimeMs > this.maxCacheItemAge) {\n return undefined;\n }\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n // We don't want to block the get return of this function on updating the last accessed time\n // We catch this promise because there is no user bad if this is rejected.\n transaction.store\n .get(key)\n .then(async (valueToUpdate) => {\n // This value in the database could have been updated concurrently by other tabs/iframes\n // since we first read it. Only update the last accessed time if the current value in the\n // DB was the same one we returned.\n if (\n valueToUpdate !== undefined &&\n valueToUpdate.createdTimeMs === value.createdTimeMs &&\n (valueToUpdate.lastAccessTimeMs === undefined ||\n valueToUpdate.lastAccessTimeMs < currentTime)\n ) {\n await transaction.store.put(\n { ...valueToUpdate, lastAccessTimeMs: currentTime },\n key,\n );\n }\n await transaction.done;\n\n db.close();\n })\n .catch(() => { });\n return value;\n } catch (error: any) {\n // We can fail to open the db for a variety of reasons,\n // such as the database version having upgraded underneath us. Return undefined in this case\n this.logger.sendErrorEvent(\n { eventName: FluidCacheErrorEvent.FluidCacheGetError },\n error,\n );\n return undefined;\n }\n }\n\n public async put(entry: ICacheEntry, value: any): Promise<void> {\n try {\n const db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const currentTime = new Date().getTime();\n\n await db.put(\n FluidDriverObjectStoreName,\n {\n cachedObject: value,\n fileId: entry.file.docId,\n type: entry.type,\n cacheItemId: entry.key,\n partitionKey: this.partitionKey,\n createdTimeMs: currentTime,\n lastAccessTimeMs: currentTime,\n },\n getKeyForCacheEntry(entry),\n );\n\n db.close();\n } catch (error: any) {\n // We can fail to open the db for a variety of reasons,\n // such as the database version having upgraded underneath us\n this.logger.sendErrorEvent(\n { eventName: FluidCacheErrorEvent.FluidCachePutError },\n error,\n );\n }\n }\n}\n"]}
1
+ {"version":3,"file":"FluidCache.js","sourceRoot":"","sources":["../src/FluidCache.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nimport { IDBPDatabase } from \"idb\";\nimport { IPersistedCache, ICacheEntry, IFileEntry } from \"@fluidframework/odsp-driver-definitions\";\nimport { ITelemetryBaseLogger, ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\nimport { scheduleIdleTask } from \"./scheduleIdleTask\";\nimport {\n\tgetFluidCacheIndexedDbInstance,\n\tFluidCacheDBSchema,\n\tFluidDriverObjectStoreName,\n\tgetKeyForCacheEntry,\n} from \"./FluidCacheIndexedDb\";\nimport {\n FluidCacheErrorEvent,\n FluidCacheEventSubCategories,\n FluidCacheGenericEvent,\n} from \"./fluidCacheTelemetry\";\n\n// Some browsers have a usageDetails property that will tell you more detailed information\n// on how the storage is being used\ninterface StorageQuotaUsageDetails {\n indexedDB: number | undefined;\n}\n\nexport interface FluidCacheConfig {\n /**\n * A string to specify what partition of the cache you wish to use (e.g. a user id).\n * Null can be used to explicity indicate no partitioning, and has been chosen\n * vs undefined so that it is clear this is an intentional choice by the caller.\n * A null value should only be used when the host can ensure that the cache is not able\n * to be shared with multiple users.\n */\n // eslint-disable-next-line @rushstack/no-new-null\n partitionKey: string | null;\n\n /**\n * A logger that can be used to get insight into cache performance and errors\n */\n logger?: ITelemetryBaseLogger;\n\n /**\n * A value in milliseconds that determines the maximum age of a cache entry to return.\n * If an entry exists in the cache, but is older than this value, the cached value will not be returned.\n */\n maxCacheItemAge: number;\n}\n\n/**\n * A cache that can be used by the Fluid ODSP driver to cache data for faster performance\n */\nexport class FluidCache implements IPersistedCache {\n private readonly logger: ITelemetryLogger;\n\n private readonly partitionKey: string | null;\n\n private readonly maxCacheItemAge: number;\n\n constructor(config: FluidCacheConfig) {\n this.logger = ChildLogger.create(config.logger);\n this.partitionKey = config.partitionKey;\n this.maxCacheItemAge = config.maxCacheItemAge;\n\n scheduleIdleTask(async () => {\n // Log how much storage space is currently being used by indexed db.\n // NOTE: This API is not supported in all browsers and it doesn't let you see the size of a specific DB.\n // Exception added when eslint rule was added, this should be revisited when modifying this code\n if (navigator.storage?.estimate) {\n const estimate = await navigator.storage.estimate();\n\n // Some browsers have a usageDetails property that will tell you\n // more detailed information on how the storage is being used\n let indexedDBSize: number | undefined;\n if (\"usageDetails\" in estimate) {\n indexedDBSize = (\n (estimate as any)\n .usageDetails as StorageQuotaUsageDetails\n ).indexedDB;\n }\n\n this.logger.sendTelemetryEvent({\n eventName: FluidCacheGenericEvent.FluidCacheStorageInfo,\n subCategory: FluidCacheEventSubCategories.FluidCache,\n quota: estimate.quota,\n usage: estimate.usage,\n indexedDBSize,\n });\n }\n });\n\n\t\tscheduleIdleTask(async () => {\n\t\t\tlet db: IDBPDatabase<FluidCacheDBSchema> | undefined;\n\n\t\t\t// Delete entries that have not been accessed recently to clean up space\n\t\t\ttry {\n\t\t\t\tdb = await getFluidCacheIndexedDbInstance(this.logger);\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n const index = transaction.store.index(\"lastAccessTimeMs\");\n // Get items that have not been accessed in 4 weeks\n const keysToDelete = await index.getAllKeys(\n IDBKeyRange.upperBound(\n new Date().getTime() - 4 * 7 * 24 * 60 * 60 * 1000,\n ),\n );\n\n await Promise.all(keysToDelete.map((key) => transaction.store.delete(key)));\n await transaction.done;\n } catch (error: any) {\n this.logger.sendErrorEvent(\n {\n eventName: FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,\n },\n error,\n );\n } finally {\n db?.close();\n }\n });\n }\n\n public async removeEntries(file: IFileEntry): Promise<void> {\n let db: IDBPDatabase<FluidCacheDBSchema> | undefined;\n try {\n db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n const index = transaction.store.index(\"fileId\");\n\n const keysToDelete = await index.getAllKeys(file.docId);\n\n\t\t\tawait Promise.all(keysToDelete.map((key) => transaction.store.delete(key)));\n\t\t\tawait transaction.done;\n\t\t} catch (error: any) {\n\t\t\tthis.logger.sendErrorEvent(\n\t\t\t\t{\n\t\t\t\t\teventName: FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,\n\t\t\t\t},\n\t\t\t\terror,\n\t\t\t);\n\t\t} finally {\n\t\t\tdb?.close();\n\t\t}\n\t}\n\n public async get(cacheEntry: ICacheEntry): Promise<any> {\n const startTime = performance.now();\n\n const cachedItem = await this.getItemFromCache(cacheEntry);\n\n this.logger.sendPerformanceEvent({\n eventName: \"FluidCacheAccess\",\n cacheHit: cachedItem !== undefined,\n type: cacheEntry.type,\n duration: performance.now() - startTime,\n });\n\n // Value will contain metadata like the expiry time, we just want to return the object we were asked to cache\n // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n return cachedItem?.cachedObject;\n }\n\n\tprivate async getItemFromCache(cacheEntry: ICacheEntry) {\n\t\tlet db: IDBPDatabase<FluidCacheDBSchema> | undefined;\n\t\ttry {\n\t\t\tconst key = getKeyForCacheEntry(cacheEntry);\n\n db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const value = await db.get(FluidDriverObjectStoreName, key);\n\n\t\t\tif (!value) {\n\t\t\t\tdb.close();\n\t\t\t\treturn undefined;\n\t\t\t}\n\n // If the data does not come from the same partition, don't return it\n if (value.partitionKey !== this.partitionKey) {\n this.logger.sendTelemetryEvent({\n eventName:\n FluidCacheGenericEvent.FluidCachePartitionKeyMismatch,\n subCategory: FluidCacheEventSubCategories.FluidCache,\n });\n\n\t\t\t\tdb.close();\n\t\t\t\treturn undefined;\n\t\t\t}\n\n const currentTime = new Date().getTime();\n\n\t\t\t// If too much time has passed since this cache entry was used, we will also return undefined\n\t\t\tif (currentTime - value.createdTimeMs > this.maxCacheItemAge) {\n\t\t\t\tdb.close();\n\t\t\t\treturn undefined;\n\t\t\t}\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n // We don't want to block the get return of this function on updating the last accessed time\n // We catch this promise because there is no user bad if this is rejected.\n transaction.store\n .get(key)\n .then(async (valueToUpdate) => {\n // This value in the database could have been updated concurrently by other tabs/iframes\n // since we first read it. Only update the last accessed time if the current value in the\n // DB was the same one we returned.\n if (\n valueToUpdate !== undefined &&\n valueToUpdate.createdTimeMs === value.createdTimeMs &&\n (valueToUpdate.lastAccessTimeMs === undefined ||\n valueToUpdate.lastAccessTimeMs < currentTime)\n ) {\n await transaction.store.put(\n { ...valueToUpdate, lastAccessTimeMs: currentTime },\n key,\n );\n }\n await transaction.done;\n\n\t\t\t\t\tdb?.close();\n\t\t\t\t})\n\t\t\t\t.catch(() => {\n\t\t\t\t\tdb?.close();\n\t\t\t\t});\n\t\t\treturn value;\n\t\t} catch (error: any) {\n\t\t\t// We can fail to open the db for a variety of reasons,\n\t\t\t// such as the database version having upgraded underneath us. Return undefined in this case\n\t\t\tthis.logger.sendErrorEvent(\n\t\t\t\t{ eventName: FluidCacheErrorEvent.FluidCacheGetError },\n\t\t\t\terror,\n\t\t\t);\n\t\t\treturn undefined;\n\t\t} finally {\n\t\t\tdb?.close();\n\t\t}\n\t}\n\n\tpublic async put(entry: ICacheEntry, value: any): Promise<void> {\n\t\tlet db: IDBPDatabase<FluidCacheDBSchema> | undefined;\n\t\ttry {\n\t\t\tdb = await getFluidCacheIndexedDbInstance(this.logger);\n\n const currentTime = new Date().getTime();\n\n await db.put(\n FluidDriverObjectStoreName,\n {\n cachedObject: value,\n fileId: entry.file.docId,\n type: entry.type,\n cacheItemId: entry.key,\n partitionKey: this.partitionKey,\n createdTimeMs: currentTime,\n lastAccessTimeMs: currentTime,\n },\n getKeyForCacheEntry(entry),\n );\n\n\t\t\tdb.close();\n\t\t} catch (error: any) {\n\t\t\t// We can fail to open the db for a variety of reasons,\n\t\t\t// such as the database version having upgraded underneath us\n\t\t\tthis.logger.sendErrorEvent(\n\t\t\t\t{ eventName: FluidCacheErrorEvent.FluidCachePutError },\n\t\t\t\terror,\n\t\t\t);\n\t\t} finally {\n\t\t\tdb?.close();\n\t\t}\n\t}\n}\n"]}
@@ -2,7 +2,7 @@
2
2
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
3
3
  * Licensed under the MIT License.
4
4
  */
5
- import { DBSchema, IDBPDatabase } from "idb";
5
+ import { DBSchema, DeleteDBCallbacks, IDBPDatabase } from "idb";
6
6
  import { ICacheEntry } from "@fluidframework/odsp-driver-definitions";
7
7
  import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
8
8
  export declare const FluidDriverCacheDBName = "fluidDriverCache";
@@ -13,7 +13,7 @@ export declare const oldVersionNameMapping: Partial<{
13
13
  }>;
14
14
  export declare function getKeyForCacheEntry(entry: ICacheEntry): string;
15
15
  export declare function getFluidCacheIndexedDbInstance(logger?: ITelemetryBaseLogger): Promise<IDBPDatabase<FluidCacheDBSchema>>;
16
- export declare function deleteFluidCacheIndexDbInstance(): Promise<void>;
16
+ export declare function deleteFluidCacheIndexDbInstance(deleteDBCallbacks?: DeleteDBCallbacks): Promise<void>;
17
17
  /**
18
18
  * Schema for the object store used to cache driver information
19
19
  */
@@ -1 +1 @@
1
- {"version":3,"file":"FluidCacheIndexedDb.d.ts","sourceRoot":"","sources":["../src/FluidCacheIndexedDb.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAU,QAAQ,EAAE,YAAY,EAAY,MAAM,KAAK,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAK1E,eAAO,MAAM,sBAAsB,qBAAqB,CAAC;AAGzD,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAGrC,eAAO,MAAM,qBAAqB,EAAE,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAAE,CAGrE,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,WAAW,UAErD;AAED,wBAAgB,8BAA8B,CAC1C,MAAM,CAAC,EAAE,oBAAoB,GAC9B,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAwD3C;AAID,wBAAgB,+BAA+B,IAAI,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,QAAQ;IAChD,CAAC,0BAA0B,CAAC,EAAE;QAC1B;;WAEG;QACH,GAAG,EAAE,MAAM,CAAC;QAEZ,KAAK,EAAE;YACH;;eAEG;YACH,MAAM,EAAE,MAAM,CAAC;YAEf;;eAEG;YACH,IAAI,EAAE,MAAM,CAAC;YAEb;;;;eAIG;YACH,WAAW,EAAE,MAAM,CAAC;YAKpB,YAAY,EAAE,GAAG,CAAC;YAElB;;;eAGG;YAEH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;YAE5B;;eAEG;YACH,aAAa,EAAE,MAAM,CAAC;YAEtB;;;eAGG;YACH,gBAAgB,EAAE,MAAM,CAAC;SAC5B,CAAC;QAEF,OAAO,EAAE;YACL,aAAa,EAAE,MAAM,CAAC;YACtB,YAAY,EAAE,MAAM,CAAC;YACrB,gBAAgB,EAAE,MAAM,CAAC;YACzB,MAAM,EAAE,MAAM,CAAC;SAClB,CAAC;KACL,CAAC;CACL"}
1
+ {"version":3,"file":"FluidCacheIndexedDb.d.ts","sourceRoot":"","sources":["../src/FluidCacheIndexedDb.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAU,QAAQ,EAAE,iBAAiB,EAAE,YAAY,EAAY,MAAM,KAAK,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAK1E,eAAO,MAAM,sBAAsB,qBAAqB,CAAC;AAGzD,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAGrC,eAAO,MAAM,qBAAqB,EAAE,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAAE,CAGrE,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,WAAW,UAErD;AAED,wBAAgB,8BAA8B,CAC1C,MAAM,CAAC,EAAE,oBAAoB,GAC9B,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAwD3C;AAID,wBAAgB,+BAA+B,CAC9C,iBAAiB,CAAC,EAAE,iBAAiB,GACnC,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,QAAQ;IAChD,CAAC,0BAA0B,CAAC,EAAE;QAC1B;;WAEG;QACH,GAAG,EAAE,MAAM,CAAC;QAEZ,KAAK,EAAE;YACH;;eAEG;YACH,MAAM,EAAE,MAAM,CAAC;YAEf;;eAEG;YACH,IAAI,EAAE,MAAM,CAAC;YAEb;;;;eAIG;YACH,WAAW,EAAE,MAAM,CAAC;YAKpB,YAAY,EAAE,GAAG,CAAC;YAElB;;;eAGG;YAEH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;YAE5B;;eAEG;YACH,aAAa,EAAE,MAAM,CAAC;YAEtB;;;eAGG;YACH,gBAAgB,EAAE,MAAM,CAAC;SAC5B,CAAC;QAEF,OAAO,EAAE;YACL,aAAa,EAAE,MAAM,CAAC;YACtB,YAAY,EAAE,MAAM,CAAC;YACrB,gBAAgB,EAAE,MAAM,CAAC;YACzB,MAAM,EAAE,MAAM,CAAC;SAClB,CAAC;KACL,CAAC;CACL"}
@@ -58,8 +58,8 @@ function getFluidCacheIndexedDbInstance(logger) {
58
58
  exports.getFluidCacheIndexedDbInstance = getFluidCacheIndexedDbInstance;
59
59
  // Deletes the indexed DB instance.
60
60
  // Warning this can throw an error in Firefox incognito, where accessing storage is prohibited.
61
- function deleteFluidCacheIndexDbInstance() {
62
- return (0, idb_1.deleteDB)(exports.FluidDriverCacheDBName);
61
+ function deleteFluidCacheIndexDbInstance(deleteDBCallbacks) {
62
+ return (0, idb_1.deleteDB)(exports.FluidDriverCacheDBName, deleteDBCallbacks);
63
63
  }
64
64
  exports.deleteFluidCacheIndexDbInstance = deleteFluidCacheIndexDbInstance;
65
65
  //# sourceMappingURL=FluidCacheIndexedDb.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"FluidCacheIndexedDb.js","sourceRoot":"","sources":["../src/FluidCacheIndexedDb.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,6BAA+D;AAG/D,qEAA8D;AAG9D,+DAA+D;AAClD,QAAA,sBAAsB,GAAG,kBAAkB,CAAC;AAEzD,+GAA+G;AAClG,QAAA,0BAA0B,GAAG,kBAAkB,CAAC;AAEhD,QAAA,mBAAmB,GAAG,CAAC,CAAC;AAErC,kGAAkG;AACrF,QAAA,qBAAqB,GAAwC;IACtE,CAAC,EAAE,cAAc;IACjB,CAAC,EAAE,iBAAiB;CACvB,CAAC;AAEF,SAAgB,mBAAmB,CAAC,KAAkB;IAClD,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;AAC5D,CAAC;AAFD,kDAEC;AAED,SAAgB,8BAA8B,CAC1C,MAA6B;IAE7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAA,YAAM,EACF,8BAAsB,EACtB,2BAAmB,EACnB;YACI,OAAO,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE;gBACxB,IAAI;oBACA,wDAAwD;oBACxD,kDAAkD;oBAClD,MAAM,aAAa,GAAG,6BAAqB,CAAC,UAAU,CAAC,CAAC;oBACxD,IAAI,aAAa,EAAE;wBACf,sEAAsE;wBACtE,sDAAsD;wBACtD,EAAE,CAAC,iBAAiB,CAAC,aAAoB,CAAC,CAAC;qBAC9C;iBACJ;gBAAC,OAAO,KAAU,EAAE;oBACjB,oEAAoE;oBACpE,8CAA8C;oBAC9C,wEAAwE;oBACxE,6BAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CACrC;wBACI,SAAS,+DAC0C;qBACtD,EACD,KAAK,CACR,CAAC;iBACL;gBAED,MAAM,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,CACzC,kCAA0B,CAC7B,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,eAAe,EACf,eAAe,CAClB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,kBAAkB,EAClB,kBAAkB,CACrB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,cAAc,EACd,cAAc,CACjB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACrD,CAAC;YACD,OAAO,EAAE,GAAG,EAAE;gBACV,MAAM,CACF,IAAI,KAAK,CACL,+EAA+E,CAClF,CACJ,CAAC;YACN,CAAC;SACJ,CACJ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACP,CAAC;AA1DD,wEA0DC;AAED,mCAAmC;AACnC,+FAA+F;AAC/F,SAAgB,+BAA+B;IAC3C,OAAO,IAAA,cAAQ,EAAC,8BAAsB,CAAC,CAAC;AAC5C,CAAC;AAFD,0EAEC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { openDB, DBSchema, IDBPDatabase, deleteDB } from \"idb\";\nimport { ICacheEntry } from \"@fluidframework/odsp-driver-definitions\";\nimport { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\nimport { FluidCacheErrorEvent } from \"./fluidCacheTelemetry\";\n\n// The name of the database that we use for caching Fluid info.\nexport const FluidDriverCacheDBName = \"fluidDriverCache\";\n\n// The name of the object store within the indexed db instance that the driver will use to cache Fluid content.\nexport const FluidDriverObjectStoreName = \"driverStorage.V3\";\n\nexport const CurrentCacheVersion = 3;\n\n// Note that V1 and V2 were misspelled as \"diver\", and we need to keep using the misspelling here.\nexport const oldVersionNameMapping: Partial<{ [key: number]: string; }> = {\n 1: \"diverStorage\",\n 2: \"diverStorage.V2\",\n};\n\nexport function getKeyForCacheEntry(entry: ICacheEntry) {\n return `${entry.file.docId}_${entry.type}_${entry.key}`;\n}\n\nexport function getFluidCacheIndexedDbInstance(\n logger?: ITelemetryBaseLogger,\n): Promise<IDBPDatabase<FluidCacheDBSchema>> {\n return new Promise((resolve, reject) => {\n openDB<FluidCacheDBSchema>(\n FluidDriverCacheDBName,\n CurrentCacheVersion,\n {\n upgrade: (db, oldVersion) => {\n try {\n // We changed the format of the object store, so we must\n // delete the old stores to create a new one in V3\n const cacheToDelete = oldVersionNameMapping[oldVersion];\n if (cacheToDelete) {\n // We don't include the old object stores in the schema, so we need to\n // use a typecast here to prevent IDB from complaining\n db.deleteObjectStore(cacheToDelete as any);\n }\n } catch (error: any) {\n // Catch any error done when attempting to delete the older version.\n // If the object does not exist db will throw.\n // We can now assume that the old version is no longer there regardless.\n ChildLogger.create(logger).sendErrorEvent(\n {\n eventName:\n FluidCacheErrorEvent.FluidCacheDeleteOldDbError,\n },\n error,\n );\n }\n\n const cacheObjectStore = db.createObjectStore(\n FluidDriverObjectStoreName,\n );\n cacheObjectStore.createIndex(\n \"createdTimeMs\",\n \"createdTimeMs\",\n );\n cacheObjectStore.createIndex(\n \"lastAccessTimeMs\",\n \"lastAccessTimeMs\",\n );\n cacheObjectStore.createIndex(\n \"partitionKey\",\n \"partitionKey\",\n );\n cacheObjectStore.createIndex(\"fileId\", \"fileId\");\n },\n blocked: () => {\n reject(\n new Error(\n \"Could not open DB since it is blocked by an older client that has the DB open\",\n ),\n );\n },\n },\n ).then(resolve, reject);\n });\n}\n\n// Deletes the indexed DB instance.\n// Warning this can throw an error in Firefox incognito, where accessing storage is prohibited.\nexport function deleteFluidCacheIndexDbInstance(): Promise<void> {\n return deleteDB(FluidDriverCacheDBName);\n}\n\n/**\n * Schema for the object store used to cache driver information\n */\nexport interface FluidCacheDBSchema extends DBSchema {\n [FluidDriverObjectStoreName]: {\n /**\n * A unique identifier for an item in the cache. It is a combination of file, type, and cacheItemId\n */\n key: string;\n\n value: {\n /**\n * The identifier of the file associated with the cache entry\n */\n fileId: string;\n\n /**\n * Describes the type of content being cached, such as snapshot\n */\n type: string;\n\n /**\n * Files may have multiple cached items associated with them,\n * this property uniquely identifies a specific cache entry for a file.\n * This is not globally unique, but rather a unique id for this file\n */\n cacheItemId: string;\n\n /*\n * Opaque object that the driver asks us to store in a cache for performance reasons\n */\n cachedObject: any;\n\n /**\n * A string to specify what partition of the cache you wish to use (e.g. a user id).\n * Null can be used to explicity indicate no partitioning.\n */\n // eslint-disable-next-line @rushstack/no-new-null\n partitionKey: string | null;\n\n /**\n * The time when the cache entry was put into the cache\n */\n createdTimeMs: number;\n\n /**\n * The last time the cache entry was used.\n * This is initially set to the time the cache entry was created Measured as ms since unix epoch.\n */\n lastAccessTimeMs: number;\n };\n\n indexes: {\n createdTimeMs: number;\n partitionKey: string;\n lastAccessTimeMs: number;\n fileId: string;\n };\n };\n}\n"]}
1
+ {"version":3,"file":"FluidCacheIndexedDb.js","sourceRoot":"","sources":["../src/FluidCacheIndexedDb.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,6BAAkF;AAGlF,qEAA8D;AAG9D,+DAA+D;AAClD,QAAA,sBAAsB,GAAG,kBAAkB,CAAC;AAEzD,+GAA+G;AAClG,QAAA,0BAA0B,GAAG,kBAAkB,CAAC;AAEhD,QAAA,mBAAmB,GAAG,CAAC,CAAC;AAErC,kGAAkG;AACrF,QAAA,qBAAqB,GAAwC;IACtE,CAAC,EAAE,cAAc;IACjB,CAAC,EAAE,iBAAiB;CACvB,CAAC;AAEF,SAAgB,mBAAmB,CAAC,KAAkB;IAClD,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;AAC5D,CAAC;AAFD,kDAEC;AAED,SAAgB,8BAA8B,CAC1C,MAA6B;IAE7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAA,YAAM,EACF,8BAAsB,EACtB,2BAAmB,EACnB;YACI,OAAO,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE;gBACxB,IAAI;oBACA,wDAAwD;oBACxD,kDAAkD;oBAClD,MAAM,aAAa,GAAG,6BAAqB,CAAC,UAAU,CAAC,CAAC;oBACxD,IAAI,aAAa,EAAE;wBACf,sEAAsE;wBACtE,sDAAsD;wBACtD,EAAE,CAAC,iBAAiB,CAAC,aAAoB,CAAC,CAAC;qBAC9C;iBACJ;gBAAC,OAAO,KAAU,EAAE;oBACjB,oEAAoE;oBACpE,8CAA8C;oBAC9C,wEAAwE;oBACxE,6BAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CACrC;wBACI,SAAS,+DAC0C;qBACtD,EACD,KAAK,CACR,CAAC;iBACL;gBAED,MAAM,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,CACzC,kCAA0B,CAC7B,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,eAAe,EACf,eAAe,CAClB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,kBAAkB,EAClB,kBAAkB,CACrB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,cAAc,EACd,cAAc,CACjB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACrD,CAAC;YACD,OAAO,EAAE,GAAG,EAAE;gBACV,MAAM,CACF,IAAI,KAAK,CACL,+EAA+E,CAClF,CACJ,CAAC;YACN,CAAC;SACJ,CACJ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACP,CAAC;AA1DD,wEA0DC;AAED,mCAAmC;AACnC,+FAA+F;AAC/F,SAAgB,+BAA+B,CAC9C,iBAAqC;IAErC,OAAO,IAAA,cAAQ,EAAC,8BAAsB,EAAE,iBAAiB,CAAC,CAAC;AAC5D,CAAC;AAJD,0EAIC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { openDB, DBSchema, DeleteDBCallbacks, IDBPDatabase, deleteDB } from \"idb\";\nimport { ICacheEntry } from \"@fluidframework/odsp-driver-definitions\";\nimport { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\nimport { FluidCacheErrorEvent } from \"./fluidCacheTelemetry\";\n\n// The name of the database that we use for caching Fluid info.\nexport const FluidDriverCacheDBName = \"fluidDriverCache\";\n\n// The name of the object store within the indexed db instance that the driver will use to cache Fluid content.\nexport const FluidDriverObjectStoreName = \"driverStorage.V3\";\n\nexport const CurrentCacheVersion = 3;\n\n// Note that V1 and V2 were misspelled as \"diver\", and we need to keep using the misspelling here.\nexport const oldVersionNameMapping: Partial<{ [key: number]: string; }> = {\n 1: \"diverStorage\",\n 2: \"diverStorage.V2\",\n};\n\nexport function getKeyForCacheEntry(entry: ICacheEntry) {\n return `${entry.file.docId}_${entry.type}_${entry.key}`;\n}\n\nexport function getFluidCacheIndexedDbInstance(\n logger?: ITelemetryBaseLogger,\n): Promise<IDBPDatabase<FluidCacheDBSchema>> {\n return new Promise((resolve, reject) => {\n openDB<FluidCacheDBSchema>(\n FluidDriverCacheDBName,\n CurrentCacheVersion,\n {\n upgrade: (db, oldVersion) => {\n try {\n // We changed the format of the object store, so we must\n // delete the old stores to create a new one in V3\n const cacheToDelete = oldVersionNameMapping[oldVersion];\n if (cacheToDelete) {\n // We don't include the old object stores in the schema, so we need to\n // use a typecast here to prevent IDB from complaining\n db.deleteObjectStore(cacheToDelete as any);\n }\n } catch (error: any) {\n // Catch any error done when attempting to delete the older version.\n // If the object does not exist db will throw.\n // We can now assume that the old version is no longer there regardless.\n ChildLogger.create(logger).sendErrorEvent(\n {\n eventName:\n FluidCacheErrorEvent.FluidCacheDeleteOldDbError,\n },\n error,\n );\n }\n\n const cacheObjectStore = db.createObjectStore(\n FluidDriverObjectStoreName,\n );\n cacheObjectStore.createIndex(\n \"createdTimeMs\",\n \"createdTimeMs\",\n );\n cacheObjectStore.createIndex(\n \"lastAccessTimeMs\",\n \"lastAccessTimeMs\",\n );\n cacheObjectStore.createIndex(\n \"partitionKey\",\n \"partitionKey\",\n );\n cacheObjectStore.createIndex(\"fileId\", \"fileId\");\n },\n blocked: () => {\n reject(\n new Error(\n \"Could not open DB since it is blocked by an older client that has the DB open\",\n ),\n );\n },\n },\n ).then(resolve, reject);\n });\n}\n\n// Deletes the indexed DB instance.\n// Warning this can throw an error in Firefox incognito, where accessing storage is prohibited.\nexport function deleteFluidCacheIndexDbInstance(\n\tdeleteDBCallbacks?: DeleteDBCallbacks,\n): Promise<void> {\n\treturn deleteDB(FluidDriverCacheDBName, deleteDBCallbacks);\n}\n\n/**\n * Schema for the object store used to cache driver information\n */\nexport interface FluidCacheDBSchema extends DBSchema {\n [FluidDriverObjectStoreName]: {\n /**\n * A unique identifier for an item in the cache. It is a combination of file, type, and cacheItemId\n */\n key: string;\n\n value: {\n /**\n * The identifier of the file associated with the cache entry\n */\n fileId: string;\n\n /**\n * Describes the type of content being cached, such as snapshot\n */\n type: string;\n\n /**\n * Files may have multiple cached items associated with them,\n * this property uniquely identifies a specific cache entry for a file.\n * This is not globally unique, but rather a unique id for this file\n */\n cacheItemId: string;\n\n /*\n * Opaque object that the driver asks us to store in a cache for performance reasons\n */\n cachedObject: any;\n\n /**\n * A string to specify what partition of the cache you wish to use (e.g. a user id).\n * Null can be used to explicity indicate no partitioning.\n */\n // eslint-disable-next-line @rushstack/no-new-null\n partitionKey: string | null;\n\n /**\n * The time when the cache entry was put into the cache\n */\n createdTimeMs: number;\n\n /**\n * The last time the cache entry was used.\n * This is initially set to the time the cache entry was created Measured as ms since unix epoch.\n */\n lastAccessTimeMs: number;\n };\n\n indexes: {\n createdTimeMs: number;\n partitionKey: string;\n lastAccessTimeMs: number;\n fileId: string;\n };\n };\n}\n"]}
@@ -5,5 +5,5 @@
5
5
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
6
6
  */
7
7
  export declare const pkgName = "@fluidframework/driver-web-cache";
8
- export declare const pkgVersion = "2.0.0-internal.3.0.2";
8
+ export declare const pkgVersion = "2.0.0-internal.3.0.3";
9
9
  //# sourceMappingURL=packageVersion.d.ts.map
@@ -8,5 +8,5 @@
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.pkgVersion = exports.pkgName = void 0;
10
10
  exports.pkgName = "@fluidframework/driver-web-cache";
11
- exports.pkgVersion = "2.0.0-internal.3.0.2";
11
+ exports.pkgVersion = "2.0.0-internal.3.0.3";
12
12
  //# sourceMappingURL=packageVersion.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,kCAAkC,CAAC;AAC7C,QAAA,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/driver-web-cache\";\nexport const pkgVersion = \"2.0.0-internal.3.0.2\";\n"]}
1
+ {"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,kCAAkC,CAAC;AAC7C,QAAA,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/driver-web-cache\";\nexport const pkgVersion = \"2.0.0-internal.3.0.3\";\n"]}
@@ -1,7 +1,3 @@
1
- /*!
2
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
3
- * Licensed under the MIT License.
4
- */
5
1
  import { IPersistedCache, ICacheEntry, IFileEntry } from "@fluidframework/odsp-driver-definitions";
6
2
  import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
7
3
  export interface FluidCacheConfig {
@@ -1 +1 @@
1
- {"version":3,"file":"FluidCache.d.ts","sourceRoot":"","sources":["../src/FluidCache.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACH,eAAe,EACf,WAAW,EACX,UAAU,EACb,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACH,oBAAoB,EAEvB,MAAM,oCAAoC,CAAC;AAoB5C,MAAM,WAAW,gBAAgB;IAC7B;;;;;;OAMG;IAEH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAE9B;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,qBAAa,UAAW,YAAW,eAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;gBAE7B,MAAM,EAAE,gBAAgB;IAiEvB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B9C,GAAG,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;YAiBzC,gBAAgB;IAsEjB,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CA8BlE"}
1
+ {"version":3,"file":"FluidCache.d.ts","sourceRoot":"","sources":["../src/FluidCache.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACnG,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAqB5F,MAAM,WAAW,gBAAgB;IAC7B;;;;;;OAMG;IAEH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAE9B;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,qBAAa,UAAW,YAAW,eAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;gBAE7B,MAAM,EAAE,gBAAgB;IAkEvB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B9C,GAAG,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;YAiB5C,gBAAgB;IA8EjB,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAiC/D"}
package/lib/FluidCache.js CHANGED
@@ -1,7 +1,3 @@
1
- /*!
2
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
3
- * Licensed under the MIT License.
4
- */
5
1
  import { ChildLogger } from "@fluidframework/telemetry-utils";
6
2
  import { scheduleIdleTask } from "./scheduleIdleTask";
7
3
  import { getFluidCacheIndexedDbInstance, FluidDriverObjectStoreName, getKeyForCacheEntry, } from "./FluidCacheIndexedDb";
@@ -37,9 +33,10 @@ export class FluidCache {
37
33
  }
38
34
  });
39
35
  scheduleIdleTask(async () => {
36
+ let db;
40
37
  // Delete entries that have not been accessed recently to clean up space
41
38
  try {
42
- const db = await getFluidCacheIndexedDbInstance(this.logger);
39
+ db = await getFluidCacheIndexedDbInstance(this.logger);
43
40
  const transaction = db.transaction(FluidDriverObjectStoreName, "readwrite");
44
41
  const index = transaction.store.index("lastAccessTimeMs");
45
42
  // Get items that have not been accessed in 4 weeks
@@ -52,11 +49,15 @@ export class FluidCache {
52
49
  eventName: "FluidCacheDeleteOldEntriesError" /* FluidCacheDeleteOldEntriesError */,
53
50
  }, error);
54
51
  }
52
+ finally {
53
+ db === null || db === void 0 ? void 0 : db.close();
54
+ }
55
55
  });
56
56
  }
57
57
  async removeEntries(file) {
58
+ let db;
58
59
  try {
59
- const db = await getFluidCacheIndexedDbInstance(this.logger);
60
+ db = await getFluidCacheIndexedDbInstance(this.logger);
60
61
  const transaction = db.transaction(FluidDriverObjectStoreName, "readwrite");
61
62
  const index = transaction.store.index("fileId");
62
63
  const keysToDelete = await index.getAllKeys(file.docId);
@@ -68,6 +69,9 @@ export class FluidCache {
68
69
  eventName: "FluidCacheDeleteOldEntriesError" /* FluidCacheDeleteOldEntriesError */,
69
70
  }, error);
70
71
  }
72
+ finally {
73
+ db === null || db === void 0 ? void 0 : db.close();
74
+ }
71
75
  }
72
76
  async get(cacheEntry) {
73
77
  const startTime = performance.now();
@@ -83,11 +87,13 @@ export class FluidCache {
83
87
  return cachedItem === null || cachedItem === void 0 ? void 0 : cachedItem.cachedObject;
84
88
  }
85
89
  async getItemFromCache(cacheEntry) {
90
+ let db;
86
91
  try {
87
92
  const key = getKeyForCacheEntry(cacheEntry);
88
- const db = await getFluidCacheIndexedDbInstance(this.logger);
93
+ db = await getFluidCacheIndexedDbInstance(this.logger);
89
94
  const value = await db.get(FluidDriverObjectStoreName, key);
90
95
  if (!value) {
96
+ db.close();
91
97
  return undefined;
92
98
  }
93
99
  // If the data does not come from the same partition, don't return it
@@ -96,11 +102,13 @@ export class FluidCache {
96
102
  eventName: "FluidCachePartitionKeyMismatch" /* FluidCachePartitionKeyMismatch */,
97
103
  subCategory: "FluidCache" /* FluidCache */,
98
104
  });
105
+ db.close();
99
106
  return undefined;
100
107
  }
101
108
  const currentTime = new Date().getTime();
102
109
  // If too much time has passed since this cache entry was used, we will also return undefined
103
110
  if (currentTime - value.createdTimeMs > this.maxCacheItemAge) {
111
+ db.close();
104
112
  return undefined;
105
113
  }
106
114
  const transaction = db.transaction(FluidDriverObjectStoreName, "readwrite");
@@ -119,9 +127,11 @@ export class FluidCache {
119
127
  await transaction.store.put(Object.assign(Object.assign({}, valueToUpdate), { lastAccessTimeMs: currentTime }), key);
120
128
  }
121
129
  await transaction.done;
122
- db.close();
130
+ db === null || db === void 0 ? void 0 : db.close();
123
131
  })
124
- .catch(() => { });
132
+ .catch(() => {
133
+ db === null || db === void 0 ? void 0 : db.close();
134
+ });
125
135
  return value;
126
136
  }
127
137
  catch (error) {
@@ -130,10 +140,14 @@ export class FluidCache {
130
140
  this.logger.sendErrorEvent({ eventName: "FluidCacheGetError" /* FluidCacheGetError */ }, error);
131
141
  return undefined;
132
142
  }
143
+ finally {
144
+ db === null || db === void 0 ? void 0 : db.close();
145
+ }
133
146
  }
134
147
  async put(entry, value) {
148
+ let db;
135
149
  try {
136
- const db = await getFluidCacheIndexedDbInstance(this.logger);
150
+ db = await getFluidCacheIndexedDbInstance(this.logger);
137
151
  const currentTime = new Date().getTime();
138
152
  await db.put(FluidDriverObjectStoreName, {
139
153
  cachedObject: value,
@@ -151,6 +165,9 @@ export class FluidCache {
151
165
  // such as the database version having upgraded underneath us
152
166
  this.logger.sendErrorEvent({ eventName: "FluidCachePutError" /* FluidCachePutError */ }, error);
153
167
  }
168
+ finally {
169
+ db === null || db === void 0 ? void 0 : db.close();
170
+ }
154
171
  }
155
172
  }
156
173
  //# sourceMappingURL=FluidCache.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"FluidCache.js","sourceRoot":"","sources":["../src/FluidCache.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n IPersistedCache,\n ICacheEntry,\n IFileEntry,\n} from \"@fluidframework/odsp-driver-definitions\";\nimport {\n ITelemetryBaseLogger,\n ITelemetryLogger,\n} from \"@fluidframework/common-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\nimport { scheduleIdleTask } from \"./scheduleIdleTask\";\nimport {\n getFluidCacheIndexedDbInstance,\n FluidDriverObjectStoreName,\n getKeyForCacheEntry,\n} from \"./FluidCacheIndexedDb\";\nimport {\n FluidCacheErrorEvent,\n FluidCacheEventSubCategories,\n FluidCacheGenericEvent,\n} from \"./fluidCacheTelemetry\";\n\n// Some browsers have a usageDetails property that will tell you more detailed information\n// on how the storage is being used\ninterface StorageQuotaUsageDetails {\n indexedDB: number | undefined;\n}\n\nexport interface FluidCacheConfig {\n /**\n * A string to specify what partition of the cache you wish to use (e.g. a user id).\n * Null can be used to explicity indicate no partitioning, and has been chosen\n * vs undefined so that it is clear this is an intentional choice by the caller.\n * A null value should only be used when the host can ensure that the cache is not able\n * to be shared with multiple users.\n */\n // eslint-disable-next-line @rushstack/no-new-null\n partitionKey: string | null;\n\n /**\n * A logger that can be used to get insight into cache performance and errors\n */\n logger?: ITelemetryBaseLogger;\n\n /**\n * A value in milliseconds that determines the maximum age of a cache entry to return.\n * If an entry exists in the cache, but is older than this value, the cached value will not be returned.\n */\n maxCacheItemAge: number;\n}\n\n/**\n * A cache that can be used by the Fluid ODSP driver to cache data for faster performance\n */\nexport class FluidCache implements IPersistedCache {\n private readonly logger: ITelemetryLogger;\n\n private readonly partitionKey: string | null;\n\n private readonly maxCacheItemAge: number;\n\n constructor(config: FluidCacheConfig) {\n this.logger = ChildLogger.create(config.logger);\n this.partitionKey = config.partitionKey;\n this.maxCacheItemAge = config.maxCacheItemAge;\n\n scheduleIdleTask(async () => {\n // Log how much storage space is currently being used by indexed db.\n // NOTE: This API is not supported in all browsers and it doesn't let you see the size of a specific DB.\n // Exception added when eslint rule was added, this should be revisited when modifying this code\n if (navigator.storage?.estimate) {\n const estimate = await navigator.storage.estimate();\n\n // Some browsers have a usageDetails property that will tell you\n // more detailed information on how the storage is being used\n let indexedDBSize: number | undefined;\n if (\"usageDetails\" in estimate) {\n indexedDBSize = (\n (estimate as any)\n .usageDetails as StorageQuotaUsageDetails\n ).indexedDB;\n }\n\n this.logger.sendTelemetryEvent({\n eventName: FluidCacheGenericEvent.FluidCacheStorageInfo,\n subCategory: FluidCacheEventSubCategories.FluidCache,\n quota: estimate.quota,\n usage: estimate.usage,\n indexedDBSize,\n });\n }\n });\n\n scheduleIdleTask(async () => {\n // Delete entries that have not been accessed recently to clean up space\n try {\n const db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n const index = transaction.store.index(\"lastAccessTimeMs\");\n // Get items that have not been accessed in 4 weeks\n const keysToDelete = await index.getAllKeys(\n IDBKeyRange.upperBound(\n new Date().getTime() - 4 * 7 * 24 * 60 * 60 * 1000,\n ),\n );\n\n await Promise.all(\n keysToDelete.map((key) => transaction.store.delete(key)),\n );\n await transaction.done;\n } catch (error: any) {\n this.logger.sendErrorEvent(\n {\n eventName:\n FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,\n },\n error,\n );\n }\n });\n }\n\n public async removeEntries(file: IFileEntry): Promise<void> {\n try {\n const db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n const index = transaction.store.index(\"fileId\");\n\n const keysToDelete = await index.getAllKeys(file.docId);\n\n await Promise.all(\n keysToDelete.map((key) => transaction.store.delete(key)),\n );\n await transaction.done;\n } catch (error: any) {\n this.logger.sendErrorEvent(\n {\n eventName:\n FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,\n },\n error,\n );\n }\n }\n\n public async get(cacheEntry: ICacheEntry): Promise<any> {\n const startTime = performance.now();\n\n const cachedItem = await this.getItemFromCache(cacheEntry);\n\n this.logger.sendPerformanceEvent({\n eventName: \"FluidCacheAccess\",\n cacheHit: cachedItem !== undefined,\n type: cacheEntry.type,\n duration: performance.now() - startTime,\n });\n\n // Value will contain metadata like the expiry time, we just want to return the object we were asked to cache\n // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n return cachedItem?.cachedObject;\n }\n\n private async getItemFromCache(cacheEntry: ICacheEntry) {\n try {\n const key = getKeyForCacheEntry(cacheEntry);\n\n const db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const value = await db.get(FluidDriverObjectStoreName, key);\n\n if (!value) {\n return undefined;\n }\n\n // If the data does not come from the same partition, don't return it\n if (value.partitionKey !== this.partitionKey) {\n this.logger.sendTelemetryEvent({\n eventName:\n FluidCacheGenericEvent.FluidCachePartitionKeyMismatch,\n subCategory: FluidCacheEventSubCategories.FluidCache,\n });\n\n return undefined;\n }\n\n const currentTime = new Date().getTime();\n\n // If too much time has passed since this cache entry was used, we will also return undefined\n if (currentTime - value.createdTimeMs > this.maxCacheItemAge) {\n return undefined;\n }\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n // We don't want to block the get return of this function on updating the last accessed time\n // We catch this promise because there is no user bad if this is rejected.\n transaction.store\n .get(key)\n .then(async (valueToUpdate) => {\n // This value in the database could have been updated concurrently by other tabs/iframes\n // since we first read it. Only update the last accessed time if the current value in the\n // DB was the same one we returned.\n if (\n valueToUpdate !== undefined &&\n valueToUpdate.createdTimeMs === value.createdTimeMs &&\n (valueToUpdate.lastAccessTimeMs === undefined ||\n valueToUpdate.lastAccessTimeMs < currentTime)\n ) {\n await transaction.store.put(\n { ...valueToUpdate, lastAccessTimeMs: currentTime },\n key,\n );\n }\n await transaction.done;\n\n db.close();\n })\n .catch(() => { });\n return value;\n } catch (error: any) {\n // We can fail to open the db for a variety of reasons,\n // such as the database version having upgraded underneath us. Return undefined in this case\n this.logger.sendErrorEvent(\n { eventName: FluidCacheErrorEvent.FluidCacheGetError },\n error,\n );\n return undefined;\n }\n }\n\n public async put(entry: ICacheEntry, value: any): Promise<void> {\n try {\n const db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const currentTime = new Date().getTime();\n\n await db.put(\n FluidDriverObjectStoreName,\n {\n cachedObject: value,\n fileId: entry.file.docId,\n type: entry.type,\n cacheItemId: entry.key,\n partitionKey: this.partitionKey,\n createdTimeMs: currentTime,\n lastAccessTimeMs: currentTime,\n },\n getKeyForCacheEntry(entry),\n );\n\n db.close();\n } catch (error: any) {\n // We can fail to open the db for a variety of reasons,\n // such as the database version having upgraded underneath us\n this.logger.sendErrorEvent(\n { eventName: FluidCacheErrorEvent.FluidCachePutError },\n error,\n );\n }\n }\n}\n"]}
1
+ {"version":3,"file":"FluidCache.js","sourceRoot":"","sources":["../src/FluidCache.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nimport { IDBPDatabase } from \"idb\";\nimport { IPersistedCache, ICacheEntry, IFileEntry } from \"@fluidframework/odsp-driver-definitions\";\nimport { ITelemetryBaseLogger, ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\nimport { scheduleIdleTask } from \"./scheduleIdleTask\";\nimport {\n\tgetFluidCacheIndexedDbInstance,\n\tFluidCacheDBSchema,\n\tFluidDriverObjectStoreName,\n\tgetKeyForCacheEntry,\n} from \"./FluidCacheIndexedDb\";\nimport {\n FluidCacheErrorEvent,\n FluidCacheEventSubCategories,\n FluidCacheGenericEvent,\n} from \"./fluidCacheTelemetry\";\n\n// Some browsers have a usageDetails property that will tell you more detailed information\n// on how the storage is being used\ninterface StorageQuotaUsageDetails {\n indexedDB: number | undefined;\n}\n\nexport interface FluidCacheConfig {\n /**\n * A string to specify what partition of the cache you wish to use (e.g. a user id).\n * Null can be used to explicity indicate no partitioning, and has been chosen\n * vs undefined so that it is clear this is an intentional choice by the caller.\n * A null value should only be used when the host can ensure that the cache is not able\n * to be shared with multiple users.\n */\n // eslint-disable-next-line @rushstack/no-new-null\n partitionKey: string | null;\n\n /**\n * A logger that can be used to get insight into cache performance and errors\n */\n logger?: ITelemetryBaseLogger;\n\n /**\n * A value in milliseconds that determines the maximum age of a cache entry to return.\n * If an entry exists in the cache, but is older than this value, the cached value will not be returned.\n */\n maxCacheItemAge: number;\n}\n\n/**\n * A cache that can be used by the Fluid ODSP driver to cache data for faster performance\n */\nexport class FluidCache implements IPersistedCache {\n private readonly logger: ITelemetryLogger;\n\n private readonly partitionKey: string | null;\n\n private readonly maxCacheItemAge: number;\n\n constructor(config: FluidCacheConfig) {\n this.logger = ChildLogger.create(config.logger);\n this.partitionKey = config.partitionKey;\n this.maxCacheItemAge = config.maxCacheItemAge;\n\n scheduleIdleTask(async () => {\n // Log how much storage space is currently being used by indexed db.\n // NOTE: This API is not supported in all browsers and it doesn't let you see the size of a specific DB.\n // Exception added when eslint rule was added, this should be revisited when modifying this code\n if (navigator.storage?.estimate) {\n const estimate = await navigator.storage.estimate();\n\n // Some browsers have a usageDetails property that will tell you\n // more detailed information on how the storage is being used\n let indexedDBSize: number | undefined;\n if (\"usageDetails\" in estimate) {\n indexedDBSize = (\n (estimate as any)\n .usageDetails as StorageQuotaUsageDetails\n ).indexedDB;\n }\n\n this.logger.sendTelemetryEvent({\n eventName: FluidCacheGenericEvent.FluidCacheStorageInfo,\n subCategory: FluidCacheEventSubCategories.FluidCache,\n quota: estimate.quota,\n usage: estimate.usage,\n indexedDBSize,\n });\n }\n });\n\n\t\tscheduleIdleTask(async () => {\n\t\t\tlet db: IDBPDatabase<FluidCacheDBSchema> | undefined;\n\n\t\t\t// Delete entries that have not been accessed recently to clean up space\n\t\t\ttry {\n\t\t\t\tdb = await getFluidCacheIndexedDbInstance(this.logger);\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n const index = transaction.store.index(\"lastAccessTimeMs\");\n // Get items that have not been accessed in 4 weeks\n const keysToDelete = await index.getAllKeys(\n IDBKeyRange.upperBound(\n new Date().getTime() - 4 * 7 * 24 * 60 * 60 * 1000,\n ),\n );\n\n await Promise.all(keysToDelete.map((key) => transaction.store.delete(key)));\n await transaction.done;\n } catch (error: any) {\n this.logger.sendErrorEvent(\n {\n eventName: FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,\n },\n error,\n );\n } finally {\n db?.close();\n }\n });\n }\n\n public async removeEntries(file: IFileEntry): Promise<void> {\n let db: IDBPDatabase<FluidCacheDBSchema> | undefined;\n try {\n db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n const index = transaction.store.index(\"fileId\");\n\n const keysToDelete = await index.getAllKeys(file.docId);\n\n\t\t\tawait Promise.all(keysToDelete.map((key) => transaction.store.delete(key)));\n\t\t\tawait transaction.done;\n\t\t} catch (error: any) {\n\t\t\tthis.logger.sendErrorEvent(\n\t\t\t\t{\n\t\t\t\t\teventName: FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,\n\t\t\t\t},\n\t\t\t\terror,\n\t\t\t);\n\t\t} finally {\n\t\t\tdb?.close();\n\t\t}\n\t}\n\n public async get(cacheEntry: ICacheEntry): Promise<any> {\n const startTime = performance.now();\n\n const cachedItem = await this.getItemFromCache(cacheEntry);\n\n this.logger.sendPerformanceEvent({\n eventName: \"FluidCacheAccess\",\n cacheHit: cachedItem !== undefined,\n type: cacheEntry.type,\n duration: performance.now() - startTime,\n });\n\n // Value will contain metadata like the expiry time, we just want to return the object we were asked to cache\n // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n return cachedItem?.cachedObject;\n }\n\n\tprivate async getItemFromCache(cacheEntry: ICacheEntry) {\n\t\tlet db: IDBPDatabase<FluidCacheDBSchema> | undefined;\n\t\ttry {\n\t\t\tconst key = getKeyForCacheEntry(cacheEntry);\n\n db = await getFluidCacheIndexedDbInstance(this.logger);\n\n const value = await db.get(FluidDriverObjectStoreName, key);\n\n\t\t\tif (!value) {\n\t\t\t\tdb.close();\n\t\t\t\treturn undefined;\n\t\t\t}\n\n // If the data does not come from the same partition, don't return it\n if (value.partitionKey !== this.partitionKey) {\n this.logger.sendTelemetryEvent({\n eventName:\n FluidCacheGenericEvent.FluidCachePartitionKeyMismatch,\n subCategory: FluidCacheEventSubCategories.FluidCache,\n });\n\n\t\t\t\tdb.close();\n\t\t\t\treturn undefined;\n\t\t\t}\n\n const currentTime = new Date().getTime();\n\n\t\t\t// If too much time has passed since this cache entry was used, we will also return undefined\n\t\t\tif (currentTime - value.createdTimeMs > this.maxCacheItemAge) {\n\t\t\t\tdb.close();\n\t\t\t\treturn undefined;\n\t\t\t}\n\n const transaction = db.transaction(\n FluidDriverObjectStoreName,\n \"readwrite\",\n );\n // We don't want to block the get return of this function on updating the last accessed time\n // We catch this promise because there is no user bad if this is rejected.\n transaction.store\n .get(key)\n .then(async (valueToUpdate) => {\n // This value in the database could have been updated concurrently by other tabs/iframes\n // since we first read it. Only update the last accessed time if the current value in the\n // DB was the same one we returned.\n if (\n valueToUpdate !== undefined &&\n valueToUpdate.createdTimeMs === value.createdTimeMs &&\n (valueToUpdate.lastAccessTimeMs === undefined ||\n valueToUpdate.lastAccessTimeMs < currentTime)\n ) {\n await transaction.store.put(\n { ...valueToUpdate, lastAccessTimeMs: currentTime },\n key,\n );\n }\n await transaction.done;\n\n\t\t\t\t\tdb?.close();\n\t\t\t\t})\n\t\t\t\t.catch(() => {\n\t\t\t\t\tdb?.close();\n\t\t\t\t});\n\t\t\treturn value;\n\t\t} catch (error: any) {\n\t\t\t// We can fail to open the db for a variety of reasons,\n\t\t\t// such as the database version having upgraded underneath us. Return undefined in this case\n\t\t\tthis.logger.sendErrorEvent(\n\t\t\t\t{ eventName: FluidCacheErrorEvent.FluidCacheGetError },\n\t\t\t\terror,\n\t\t\t);\n\t\t\treturn undefined;\n\t\t} finally {\n\t\t\tdb?.close();\n\t\t}\n\t}\n\n\tpublic async put(entry: ICacheEntry, value: any): Promise<void> {\n\t\tlet db: IDBPDatabase<FluidCacheDBSchema> | undefined;\n\t\ttry {\n\t\t\tdb = await getFluidCacheIndexedDbInstance(this.logger);\n\n const currentTime = new Date().getTime();\n\n await db.put(\n FluidDriverObjectStoreName,\n {\n cachedObject: value,\n fileId: entry.file.docId,\n type: entry.type,\n cacheItemId: entry.key,\n partitionKey: this.partitionKey,\n createdTimeMs: currentTime,\n lastAccessTimeMs: currentTime,\n },\n getKeyForCacheEntry(entry),\n );\n\n\t\t\tdb.close();\n\t\t} catch (error: any) {\n\t\t\t// We can fail to open the db for a variety of reasons,\n\t\t\t// such as the database version having upgraded underneath us\n\t\t\tthis.logger.sendErrorEvent(\n\t\t\t\t{ eventName: FluidCacheErrorEvent.FluidCachePutError },\n\t\t\t\terror,\n\t\t\t);\n\t\t} finally {\n\t\t\tdb?.close();\n\t\t}\n\t}\n}\n"]}
@@ -2,7 +2,7 @@
2
2
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
3
3
  * Licensed under the MIT License.
4
4
  */
5
- import { DBSchema, IDBPDatabase } from "idb";
5
+ import { DBSchema, DeleteDBCallbacks, IDBPDatabase } from "idb";
6
6
  import { ICacheEntry } from "@fluidframework/odsp-driver-definitions";
7
7
  import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
8
8
  export declare const FluidDriverCacheDBName = "fluidDriverCache";
@@ -13,7 +13,7 @@ export declare const oldVersionNameMapping: Partial<{
13
13
  }>;
14
14
  export declare function getKeyForCacheEntry(entry: ICacheEntry): string;
15
15
  export declare function getFluidCacheIndexedDbInstance(logger?: ITelemetryBaseLogger): Promise<IDBPDatabase<FluidCacheDBSchema>>;
16
- export declare function deleteFluidCacheIndexDbInstance(): Promise<void>;
16
+ export declare function deleteFluidCacheIndexDbInstance(deleteDBCallbacks?: DeleteDBCallbacks): Promise<void>;
17
17
  /**
18
18
  * Schema for the object store used to cache driver information
19
19
  */
@@ -1 +1 @@
1
- {"version":3,"file":"FluidCacheIndexedDb.d.ts","sourceRoot":"","sources":["../src/FluidCacheIndexedDb.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAU,QAAQ,EAAE,YAAY,EAAY,MAAM,KAAK,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAK1E,eAAO,MAAM,sBAAsB,qBAAqB,CAAC;AAGzD,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAGrC,eAAO,MAAM,qBAAqB,EAAE,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAAE,CAGrE,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,WAAW,UAErD;AAED,wBAAgB,8BAA8B,CAC1C,MAAM,CAAC,EAAE,oBAAoB,GAC9B,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAwD3C;AAID,wBAAgB,+BAA+B,IAAI,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,QAAQ;IAChD,CAAC,0BAA0B,CAAC,EAAE;QAC1B;;WAEG;QACH,GAAG,EAAE,MAAM,CAAC;QAEZ,KAAK,EAAE;YACH;;eAEG;YACH,MAAM,EAAE,MAAM,CAAC;YAEf;;eAEG;YACH,IAAI,EAAE,MAAM,CAAC;YAEb;;;;eAIG;YACH,WAAW,EAAE,MAAM,CAAC;YAKpB,YAAY,EAAE,GAAG,CAAC;YAElB;;;eAGG;YAEH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;YAE5B;;eAEG;YACH,aAAa,EAAE,MAAM,CAAC;YAEtB;;;eAGG;YACH,gBAAgB,EAAE,MAAM,CAAC;SAC5B,CAAC;QAEF,OAAO,EAAE;YACL,aAAa,EAAE,MAAM,CAAC;YACtB,YAAY,EAAE,MAAM,CAAC;YACrB,gBAAgB,EAAE,MAAM,CAAC;YACzB,MAAM,EAAE,MAAM,CAAC;SAClB,CAAC;KACL,CAAC;CACL"}
1
+ {"version":3,"file":"FluidCacheIndexedDb.d.ts","sourceRoot":"","sources":["../src/FluidCacheIndexedDb.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAU,QAAQ,EAAE,iBAAiB,EAAE,YAAY,EAAY,MAAM,KAAK,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAK1E,eAAO,MAAM,sBAAsB,qBAAqB,CAAC;AAGzD,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAGrC,eAAO,MAAM,qBAAqB,EAAE,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAAE,CAGrE,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,WAAW,UAErD;AAED,wBAAgB,8BAA8B,CAC1C,MAAM,CAAC,EAAE,oBAAoB,GAC9B,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAwD3C;AAID,wBAAgB,+BAA+B,CAC9C,iBAAiB,CAAC,EAAE,iBAAiB,GACnC,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,QAAQ;IAChD,CAAC,0BAA0B,CAAC,EAAE;QAC1B;;WAEG;QACH,GAAG,EAAE,MAAM,CAAC;QAEZ,KAAK,EAAE;YACH;;eAEG;YACH,MAAM,EAAE,MAAM,CAAC;YAEf;;eAEG;YACH,IAAI,EAAE,MAAM,CAAC;YAEb;;;;eAIG;YACH,WAAW,EAAE,MAAM,CAAC;YAKpB,YAAY,EAAE,GAAG,CAAC;YAElB;;;eAGG;YAEH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;YAE5B;;eAEG;YACH,aAAa,EAAE,MAAM,CAAC;YAEtB;;;eAGG;YACH,gBAAgB,EAAE,MAAM,CAAC;SAC5B,CAAC;QAEF,OAAO,EAAE;YACL,aAAa,EAAE,MAAM,CAAC;YACtB,YAAY,EAAE,MAAM,CAAC;YACrB,gBAAgB,EAAE,MAAM,CAAC;YACzB,MAAM,EAAE,MAAM,CAAC;SAClB,CAAC;KACL,CAAC;CACL"}
@@ -53,7 +53,7 @@ export function getFluidCacheIndexedDbInstance(logger) {
53
53
  }
54
54
  // Deletes the indexed DB instance.
55
55
  // Warning this can throw an error in Firefox incognito, where accessing storage is prohibited.
56
- export function deleteFluidCacheIndexDbInstance() {
57
- return deleteDB(FluidDriverCacheDBName);
56
+ export function deleteFluidCacheIndexDbInstance(deleteDBCallbacks) {
57
+ return deleteDB(FluidDriverCacheDBName, deleteDBCallbacks);
58
58
  }
59
59
  //# sourceMappingURL=FluidCacheIndexedDb.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"FluidCacheIndexedDb.js","sourceRoot":"","sources":["../src/FluidCacheIndexedDb.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAA0B,QAAQ,EAAE,MAAM,KAAK,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,+DAA+D;AAC/D,MAAM,CAAC,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AAEzD,+GAA+G;AAC/G,MAAM,CAAC,MAAM,0BAA0B,GAAG,kBAAkB,CAAC;AAE7D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAErC,kGAAkG;AAClG,MAAM,CAAC,MAAM,qBAAqB,GAAwC;IACtE,CAAC,EAAE,cAAc;IACjB,CAAC,EAAE,iBAAiB;CACvB,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,KAAkB;IAClD,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC1C,MAA6B;IAE7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,CACF,sBAAsB,EACtB,mBAAmB,EACnB;YACI,OAAO,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE;gBACxB,IAAI;oBACA,wDAAwD;oBACxD,kDAAkD;oBAClD,MAAM,aAAa,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;oBACxD,IAAI,aAAa,EAAE;wBACf,sEAAsE;wBACtE,sDAAsD;wBACtD,EAAE,CAAC,iBAAiB,CAAC,aAAoB,CAAC,CAAC;qBAC9C;iBACJ;gBAAC,OAAO,KAAU,EAAE;oBACjB,oEAAoE;oBACpE,8CAA8C;oBAC9C,wEAAwE;oBACxE,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CACrC;wBACI,SAAS,+DAC0C;qBACtD,EACD,KAAK,CACR,CAAC;iBACL;gBAED,MAAM,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,CACzC,0BAA0B,CAC7B,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,eAAe,EACf,eAAe,CAClB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,kBAAkB,EAClB,kBAAkB,CACrB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,cAAc,EACd,cAAc,CACjB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACrD,CAAC;YACD,OAAO,EAAE,GAAG,EAAE;gBACV,MAAM,CACF,IAAI,KAAK,CACL,+EAA+E,CAClF,CACJ,CAAC;YACN,CAAC;SACJ,CACJ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACP,CAAC;AAED,mCAAmC;AACnC,+FAA+F;AAC/F,MAAM,UAAU,+BAA+B;IAC3C,OAAO,QAAQ,CAAC,sBAAsB,CAAC,CAAC;AAC5C,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { openDB, DBSchema, IDBPDatabase, deleteDB } from \"idb\";\nimport { ICacheEntry } from \"@fluidframework/odsp-driver-definitions\";\nimport { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\nimport { FluidCacheErrorEvent } from \"./fluidCacheTelemetry\";\n\n// The name of the database that we use for caching Fluid info.\nexport const FluidDriverCacheDBName = \"fluidDriverCache\";\n\n// The name of the object store within the indexed db instance that the driver will use to cache Fluid content.\nexport const FluidDriverObjectStoreName = \"driverStorage.V3\";\n\nexport const CurrentCacheVersion = 3;\n\n// Note that V1 and V2 were misspelled as \"diver\", and we need to keep using the misspelling here.\nexport const oldVersionNameMapping: Partial<{ [key: number]: string; }> = {\n 1: \"diverStorage\",\n 2: \"diverStorage.V2\",\n};\n\nexport function getKeyForCacheEntry(entry: ICacheEntry) {\n return `${entry.file.docId}_${entry.type}_${entry.key}`;\n}\n\nexport function getFluidCacheIndexedDbInstance(\n logger?: ITelemetryBaseLogger,\n): Promise<IDBPDatabase<FluidCacheDBSchema>> {\n return new Promise((resolve, reject) => {\n openDB<FluidCacheDBSchema>(\n FluidDriverCacheDBName,\n CurrentCacheVersion,\n {\n upgrade: (db, oldVersion) => {\n try {\n // We changed the format of the object store, so we must\n // delete the old stores to create a new one in V3\n const cacheToDelete = oldVersionNameMapping[oldVersion];\n if (cacheToDelete) {\n // We don't include the old object stores in the schema, so we need to\n // use a typecast here to prevent IDB from complaining\n db.deleteObjectStore(cacheToDelete as any);\n }\n } catch (error: any) {\n // Catch any error done when attempting to delete the older version.\n // If the object does not exist db will throw.\n // We can now assume that the old version is no longer there regardless.\n ChildLogger.create(logger).sendErrorEvent(\n {\n eventName:\n FluidCacheErrorEvent.FluidCacheDeleteOldDbError,\n },\n error,\n );\n }\n\n const cacheObjectStore = db.createObjectStore(\n FluidDriverObjectStoreName,\n );\n cacheObjectStore.createIndex(\n \"createdTimeMs\",\n \"createdTimeMs\",\n );\n cacheObjectStore.createIndex(\n \"lastAccessTimeMs\",\n \"lastAccessTimeMs\",\n );\n cacheObjectStore.createIndex(\n \"partitionKey\",\n \"partitionKey\",\n );\n cacheObjectStore.createIndex(\"fileId\", \"fileId\");\n },\n blocked: () => {\n reject(\n new Error(\n \"Could not open DB since it is blocked by an older client that has the DB open\",\n ),\n );\n },\n },\n ).then(resolve, reject);\n });\n}\n\n// Deletes the indexed DB instance.\n// Warning this can throw an error in Firefox incognito, where accessing storage is prohibited.\nexport function deleteFluidCacheIndexDbInstance(): Promise<void> {\n return deleteDB(FluidDriverCacheDBName);\n}\n\n/**\n * Schema for the object store used to cache driver information\n */\nexport interface FluidCacheDBSchema extends DBSchema {\n [FluidDriverObjectStoreName]: {\n /**\n * A unique identifier for an item in the cache. It is a combination of file, type, and cacheItemId\n */\n key: string;\n\n value: {\n /**\n * The identifier of the file associated with the cache entry\n */\n fileId: string;\n\n /**\n * Describes the type of content being cached, such as snapshot\n */\n type: string;\n\n /**\n * Files may have multiple cached items associated with them,\n * this property uniquely identifies a specific cache entry for a file.\n * This is not globally unique, but rather a unique id for this file\n */\n cacheItemId: string;\n\n /*\n * Opaque object that the driver asks us to store in a cache for performance reasons\n */\n cachedObject: any;\n\n /**\n * A string to specify what partition of the cache you wish to use (e.g. a user id).\n * Null can be used to explicity indicate no partitioning.\n */\n // eslint-disable-next-line @rushstack/no-new-null\n partitionKey: string | null;\n\n /**\n * The time when the cache entry was put into the cache\n */\n createdTimeMs: number;\n\n /**\n * The last time the cache entry was used.\n * This is initially set to the time the cache entry was created Measured as ms since unix epoch.\n */\n lastAccessTimeMs: number;\n };\n\n indexes: {\n createdTimeMs: number;\n partitionKey: string;\n lastAccessTimeMs: number;\n fileId: string;\n };\n };\n}\n"]}
1
+ {"version":3,"file":"FluidCacheIndexedDb.js","sourceRoot":"","sources":["../src/FluidCacheIndexedDb.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAA6C,QAAQ,EAAE,MAAM,KAAK,CAAC;AAGlF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,+DAA+D;AAC/D,MAAM,CAAC,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AAEzD,+GAA+G;AAC/G,MAAM,CAAC,MAAM,0BAA0B,GAAG,kBAAkB,CAAC;AAE7D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAErC,kGAAkG;AAClG,MAAM,CAAC,MAAM,qBAAqB,GAAwC;IACtE,CAAC,EAAE,cAAc;IACjB,CAAC,EAAE,iBAAiB;CACvB,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,KAAkB;IAClD,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC1C,MAA6B;IAE7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,CACF,sBAAsB,EACtB,mBAAmB,EACnB;YACI,OAAO,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE;gBACxB,IAAI;oBACA,wDAAwD;oBACxD,kDAAkD;oBAClD,MAAM,aAAa,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;oBACxD,IAAI,aAAa,EAAE;wBACf,sEAAsE;wBACtE,sDAAsD;wBACtD,EAAE,CAAC,iBAAiB,CAAC,aAAoB,CAAC,CAAC;qBAC9C;iBACJ;gBAAC,OAAO,KAAU,EAAE;oBACjB,oEAAoE;oBACpE,8CAA8C;oBAC9C,wEAAwE;oBACxE,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CACrC;wBACI,SAAS,+DAC0C;qBACtD,EACD,KAAK,CACR,CAAC;iBACL;gBAED,MAAM,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,CACzC,0BAA0B,CAC7B,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,eAAe,EACf,eAAe,CAClB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,kBAAkB,EAClB,kBAAkB,CACrB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CACxB,cAAc,EACd,cAAc,CACjB,CAAC;gBACF,gBAAgB,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACrD,CAAC;YACD,OAAO,EAAE,GAAG,EAAE;gBACV,MAAM,CACF,IAAI,KAAK,CACL,+EAA+E,CAClF,CACJ,CAAC;YACN,CAAC;SACJ,CACJ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACP,CAAC;AAED,mCAAmC;AACnC,+FAA+F;AAC/F,MAAM,UAAU,+BAA+B,CAC9C,iBAAqC;IAErC,OAAO,QAAQ,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;AAC5D,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { openDB, DBSchema, DeleteDBCallbacks, IDBPDatabase, deleteDB } from \"idb\";\nimport { ICacheEntry } from \"@fluidframework/odsp-driver-definitions\";\nimport { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\nimport { FluidCacheErrorEvent } from \"./fluidCacheTelemetry\";\n\n// The name of the database that we use for caching Fluid info.\nexport const FluidDriverCacheDBName = \"fluidDriverCache\";\n\n// The name of the object store within the indexed db instance that the driver will use to cache Fluid content.\nexport const FluidDriverObjectStoreName = \"driverStorage.V3\";\n\nexport const CurrentCacheVersion = 3;\n\n// Note that V1 and V2 were misspelled as \"diver\", and we need to keep using the misspelling here.\nexport const oldVersionNameMapping: Partial<{ [key: number]: string; }> = {\n 1: \"diverStorage\",\n 2: \"diverStorage.V2\",\n};\n\nexport function getKeyForCacheEntry(entry: ICacheEntry) {\n return `${entry.file.docId}_${entry.type}_${entry.key}`;\n}\n\nexport function getFluidCacheIndexedDbInstance(\n logger?: ITelemetryBaseLogger,\n): Promise<IDBPDatabase<FluidCacheDBSchema>> {\n return new Promise((resolve, reject) => {\n openDB<FluidCacheDBSchema>(\n FluidDriverCacheDBName,\n CurrentCacheVersion,\n {\n upgrade: (db, oldVersion) => {\n try {\n // We changed the format of the object store, so we must\n // delete the old stores to create a new one in V3\n const cacheToDelete = oldVersionNameMapping[oldVersion];\n if (cacheToDelete) {\n // We don't include the old object stores in the schema, so we need to\n // use a typecast here to prevent IDB from complaining\n db.deleteObjectStore(cacheToDelete as any);\n }\n } catch (error: any) {\n // Catch any error done when attempting to delete the older version.\n // If the object does not exist db will throw.\n // We can now assume that the old version is no longer there regardless.\n ChildLogger.create(logger).sendErrorEvent(\n {\n eventName:\n FluidCacheErrorEvent.FluidCacheDeleteOldDbError,\n },\n error,\n );\n }\n\n const cacheObjectStore = db.createObjectStore(\n FluidDriverObjectStoreName,\n );\n cacheObjectStore.createIndex(\n \"createdTimeMs\",\n \"createdTimeMs\",\n );\n cacheObjectStore.createIndex(\n \"lastAccessTimeMs\",\n \"lastAccessTimeMs\",\n );\n cacheObjectStore.createIndex(\n \"partitionKey\",\n \"partitionKey\",\n );\n cacheObjectStore.createIndex(\"fileId\", \"fileId\");\n },\n blocked: () => {\n reject(\n new Error(\n \"Could not open DB since it is blocked by an older client that has the DB open\",\n ),\n );\n },\n },\n ).then(resolve, reject);\n });\n}\n\n// Deletes the indexed DB instance.\n// Warning this can throw an error in Firefox incognito, where accessing storage is prohibited.\nexport function deleteFluidCacheIndexDbInstance(\n\tdeleteDBCallbacks?: DeleteDBCallbacks,\n): Promise<void> {\n\treturn deleteDB(FluidDriverCacheDBName, deleteDBCallbacks);\n}\n\n/**\n * Schema for the object store used to cache driver information\n */\nexport interface FluidCacheDBSchema extends DBSchema {\n [FluidDriverObjectStoreName]: {\n /**\n * A unique identifier for an item in the cache. It is a combination of file, type, and cacheItemId\n */\n key: string;\n\n value: {\n /**\n * The identifier of the file associated with the cache entry\n */\n fileId: string;\n\n /**\n * Describes the type of content being cached, such as snapshot\n */\n type: string;\n\n /**\n * Files may have multiple cached items associated with them,\n * this property uniquely identifies a specific cache entry for a file.\n * This is not globally unique, but rather a unique id for this file\n */\n cacheItemId: string;\n\n /*\n * Opaque object that the driver asks us to store in a cache for performance reasons\n */\n cachedObject: any;\n\n /**\n * A string to specify what partition of the cache you wish to use (e.g. a user id).\n * Null can be used to explicity indicate no partitioning.\n */\n // eslint-disable-next-line @rushstack/no-new-null\n partitionKey: string | null;\n\n /**\n * The time when the cache entry was put into the cache\n */\n createdTimeMs: number;\n\n /**\n * The last time the cache entry was used.\n * This is initially set to the time the cache entry was created Measured as ms since unix epoch.\n */\n lastAccessTimeMs: number;\n };\n\n indexes: {\n createdTimeMs: number;\n partitionKey: string;\n lastAccessTimeMs: number;\n fileId: string;\n };\n };\n}\n"]}
@@ -5,5 +5,5 @@
5
5
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
6
6
  */
7
7
  export declare const pkgName = "@fluidframework/driver-web-cache";
8
- export declare const pkgVersion = "2.0.0-internal.3.0.2";
8
+ export declare const pkgVersion = "2.0.0-internal.3.0.3";
9
9
  //# sourceMappingURL=packageVersion.d.ts.map
@@ -5,5 +5,5 @@
5
5
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
6
6
  */
7
7
  export const pkgName = "@fluidframework/driver-web-cache";
8
- export const pkgVersion = "2.0.0-internal.3.0.2";
8
+ export const pkgVersion = "2.0.0-internal.3.0.3";
9
9
  //# sourceMappingURL=packageVersion.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,kCAAkC,CAAC;AAC1D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/driver-web-cache\";\nexport const pkgVersion = \"2.0.0-internal.3.0.2\";\n"]}
1
+ {"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,kCAAkC,CAAC;AAC1D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/driver-web-cache\";\nexport const pkgVersion = \"2.0.0-internal.3.0.3\";\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluidframework/driver-web-cache",
3
- "version": "2.0.0-internal.3.0.2",
3
+ "version": "2.0.0-internal.3.0.3",
4
4
  "description": "Implementation of the driver caching API for a web browser",
5
5
  "homepage": "https://fluidframework.com",
6
6
  "repository": {
@@ -40,8 +40,8 @@
40
40
  },
41
41
  "dependencies": {
42
42
  "@fluidframework/common-definitions": "^0.20.1",
43
- "@fluidframework/odsp-driver-definitions": ">=2.0.0-internal.3.0.2 <2.0.0-internal.4.0.0",
44
- "@fluidframework/telemetry-utils": ">=2.0.0-internal.3.0.2 <2.0.0-internal.4.0.0",
43
+ "@fluidframework/odsp-driver-definitions": ">=2.0.0-internal.3.0.3 <2.0.0-internal.4.0.0",
44
+ "@fluidframework/telemetry-utils": ">=2.0.0-internal.3.0.3 <2.0.0-internal.4.0.0",
45
45
  "idb": "^6.1.2"
46
46
  },
47
47
  "devDependencies": {
package/src/FluidCache.ts CHANGED
@@ -2,22 +2,16 @@
2
2
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
3
3
  * Licensed under the MIT License.
4
4
  */
5
-
6
- import {
7
- IPersistedCache,
8
- ICacheEntry,
9
- IFileEntry,
10
- } from "@fluidframework/odsp-driver-definitions";
11
- import {
12
- ITelemetryBaseLogger,
13
- ITelemetryLogger,
14
- } from "@fluidframework/common-definitions";
5
+ import { IDBPDatabase } from "idb";
6
+ import { IPersistedCache, ICacheEntry, IFileEntry } from "@fluidframework/odsp-driver-definitions";
7
+ import { ITelemetryBaseLogger, ITelemetryLogger } from "@fluidframework/common-definitions";
15
8
  import { ChildLogger } from "@fluidframework/telemetry-utils";
16
9
  import { scheduleIdleTask } from "./scheduleIdleTask";
17
10
  import {
18
- getFluidCacheIndexedDbInstance,
19
- FluidDriverObjectStoreName,
20
- getKeyForCacheEntry,
11
+ getFluidCacheIndexedDbInstance,
12
+ FluidCacheDBSchema,
13
+ FluidDriverObjectStoreName,
14
+ getKeyForCacheEntry,
21
15
  } from "./FluidCacheIndexedDb";
22
16
  import {
23
17
  FluidCacheErrorEvent,
@@ -96,10 +90,12 @@ export class FluidCache implements IPersistedCache {
96
90
  }
97
91
  });
98
92
 
99
- scheduleIdleTask(async () => {
100
- // Delete entries that have not been accessed recently to clean up space
101
- try {
102
- const db = await getFluidCacheIndexedDbInstance(this.logger);
93
+ scheduleIdleTask(async () => {
94
+ let db: IDBPDatabase<FluidCacheDBSchema> | undefined;
95
+
96
+ // Delete entries that have not been accessed recently to clean up space
97
+ try {
98
+ db = await getFluidCacheIndexedDbInstance(this.logger);
103
99
 
104
100
  const transaction = db.transaction(
105
101
  FluidDriverObjectStoreName,
@@ -113,25 +109,25 @@ export class FluidCache implements IPersistedCache {
113
109
  ),
114
110
  );
115
111
 
116
- await Promise.all(
117
- keysToDelete.map((key) => transaction.store.delete(key)),
118
- );
112
+ await Promise.all(keysToDelete.map((key) => transaction.store.delete(key)));
119
113
  await transaction.done;
120
114
  } catch (error: any) {
121
115
  this.logger.sendErrorEvent(
122
116
  {
123
- eventName:
124
- FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,
117
+ eventName: FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,
125
118
  },
126
119
  error,
127
120
  );
121
+ } finally {
122
+ db?.close();
128
123
  }
129
124
  });
130
125
  }
131
126
 
132
127
  public async removeEntries(file: IFileEntry): Promise<void> {
128
+ let db: IDBPDatabase<FluidCacheDBSchema> | undefined;
133
129
  try {
134
- const db = await getFluidCacheIndexedDbInstance(this.logger);
130
+ db = await getFluidCacheIndexedDbInstance(this.logger);
135
131
 
136
132
  const transaction = db.transaction(
137
133
  FluidDriverObjectStoreName,
@@ -141,20 +137,19 @@ export class FluidCache implements IPersistedCache {
141
137
 
142
138
  const keysToDelete = await index.getAllKeys(file.docId);
143
139
 
144
- await Promise.all(
145
- keysToDelete.map((key) => transaction.store.delete(key)),
146
- );
147
- await transaction.done;
148
- } catch (error: any) {
149
- this.logger.sendErrorEvent(
150
- {
151
- eventName:
152
- FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,
153
- },
154
- error,
155
- );
156
- }
157
- }
140
+ await Promise.all(keysToDelete.map((key) => transaction.store.delete(key)));
141
+ await transaction.done;
142
+ } catch (error: any) {
143
+ this.logger.sendErrorEvent(
144
+ {
145
+ eventName: FluidCacheErrorEvent.FluidCacheDeleteOldEntriesError,
146
+ },
147
+ error,
148
+ );
149
+ } finally {
150
+ db?.close();
151
+ }
152
+ }
158
153
 
159
154
  public async get(cacheEntry: ICacheEntry): Promise<any> {
160
155
  const startTime = performance.now();
@@ -173,17 +168,19 @@ export class FluidCache implements IPersistedCache {
173
168
  return cachedItem?.cachedObject;
174
169
  }
175
170
 
176
- private async getItemFromCache(cacheEntry: ICacheEntry) {
177
- try {
178
- const key = getKeyForCacheEntry(cacheEntry);
171
+ private async getItemFromCache(cacheEntry: ICacheEntry) {
172
+ let db: IDBPDatabase<FluidCacheDBSchema> | undefined;
173
+ try {
174
+ const key = getKeyForCacheEntry(cacheEntry);
179
175
 
180
- const db = await getFluidCacheIndexedDbInstance(this.logger);
176
+ db = await getFluidCacheIndexedDbInstance(this.logger);
181
177
 
182
178
  const value = await db.get(FluidDriverObjectStoreName, key);
183
179
 
184
- if (!value) {
185
- return undefined;
186
- }
180
+ if (!value) {
181
+ db.close();
182
+ return undefined;
183
+ }
187
184
 
188
185
  // If the data does not come from the same partition, don't return it
189
186
  if (value.partitionKey !== this.partitionKey) {
@@ -193,15 +190,17 @@ export class FluidCache implements IPersistedCache {
193
190
  subCategory: FluidCacheEventSubCategories.FluidCache,
194
191
  });
195
192
 
196
- return undefined;
197
- }
193
+ db.close();
194
+ return undefined;
195
+ }
198
196
 
199
197
  const currentTime = new Date().getTime();
200
198
 
201
- // If too much time has passed since this cache entry was used, we will also return undefined
202
- if (currentTime - value.createdTimeMs > this.maxCacheItemAge) {
203
- return undefined;
204
- }
199
+ // If too much time has passed since this cache entry was used, we will also return undefined
200
+ if (currentTime - value.createdTimeMs > this.maxCacheItemAge) {
201
+ db.close();
202
+ return undefined;
203
+ }
205
204
 
206
205
  const transaction = db.transaction(
207
206
  FluidDriverObjectStoreName,
@@ -228,24 +227,29 @@ export class FluidCache implements IPersistedCache {
228
227
  }
229
228
  await transaction.done;
230
229
 
231
- db.close();
232
- })
233
- .catch(() => { });
234
- return value;
235
- } catch (error: any) {
236
- // We can fail to open the db for a variety of reasons,
237
- // such as the database version having upgraded underneath us. Return undefined in this case
238
- this.logger.sendErrorEvent(
239
- { eventName: FluidCacheErrorEvent.FluidCacheGetError },
240
- error,
241
- );
242
- return undefined;
243
- }
244
- }
245
-
246
- public async put(entry: ICacheEntry, value: any): Promise<void> {
247
- try {
248
- const db = await getFluidCacheIndexedDbInstance(this.logger);
230
+ db?.close();
231
+ })
232
+ .catch(() => {
233
+ db?.close();
234
+ });
235
+ return value;
236
+ } catch (error: any) {
237
+ // We can fail to open the db for a variety of reasons,
238
+ // such as the database version having upgraded underneath us. Return undefined in this case
239
+ this.logger.sendErrorEvent(
240
+ { eventName: FluidCacheErrorEvent.FluidCacheGetError },
241
+ error,
242
+ );
243
+ return undefined;
244
+ } finally {
245
+ db?.close();
246
+ }
247
+ }
248
+
249
+ public async put(entry: ICacheEntry, value: any): Promise<void> {
250
+ let db: IDBPDatabase<FluidCacheDBSchema> | undefined;
251
+ try {
252
+ db = await getFluidCacheIndexedDbInstance(this.logger);
249
253
 
250
254
  const currentTime = new Date().getTime();
251
255
 
@@ -263,14 +267,16 @@ export class FluidCache implements IPersistedCache {
263
267
  getKeyForCacheEntry(entry),
264
268
  );
265
269
 
266
- db.close();
267
- } catch (error: any) {
268
- // We can fail to open the db for a variety of reasons,
269
- // such as the database version having upgraded underneath us
270
- this.logger.sendErrorEvent(
271
- { eventName: FluidCacheErrorEvent.FluidCachePutError },
272
- error,
273
- );
274
- }
275
- }
270
+ db.close();
271
+ } catch (error: any) {
272
+ // We can fail to open the db for a variety of reasons,
273
+ // such as the database version having upgraded underneath us
274
+ this.logger.sendErrorEvent(
275
+ { eventName: FluidCacheErrorEvent.FluidCachePutError },
276
+ error,
277
+ );
278
+ } finally {
279
+ db?.close();
280
+ }
281
+ }
276
282
  }
@@ -3,7 +3,7 @@
3
3
  * Licensed under the MIT License.
4
4
  */
5
5
 
6
- import { openDB, DBSchema, IDBPDatabase, deleteDB } from "idb";
6
+ import { openDB, DBSchema, DeleteDBCallbacks, IDBPDatabase, deleteDB } from "idb";
7
7
  import { ICacheEntry } from "@fluidframework/odsp-driver-definitions";
8
8
  import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
9
9
  import { ChildLogger } from "@fluidframework/telemetry-utils";
@@ -89,8 +89,10 @@ export function getFluidCacheIndexedDbInstance(
89
89
 
90
90
  // Deletes the indexed DB instance.
91
91
  // Warning this can throw an error in Firefox incognito, where accessing storage is prohibited.
92
- export function deleteFluidCacheIndexDbInstance(): Promise<void> {
93
- return deleteDB(FluidDriverCacheDBName);
92
+ export function deleteFluidCacheIndexDbInstance(
93
+ deleteDBCallbacks?: DeleteDBCallbacks,
94
+ ): Promise<void> {
95
+ return deleteDB(FluidDriverCacheDBName, deleteDBCallbacks);
94
96
  }
95
97
 
96
98
  /**
@@ -6,4 +6,4 @@
6
6
  */
7
7
 
8
8
  export const pkgName = "@fluidframework/driver-web-cache";
9
- export const pkgVersion = "2.0.0-internal.3.0.2";
9
+ export const pkgVersion = "2.0.0-internal.3.0.3";