@luvio/environments 0.131.0 → 0.132.0

package/dist/es/es2018/environments.js

@@ -1,4 +1,4 @@
-import { emitAdapterEvent, buildStaleWhileRevalidateImplementation, Reader } from '@luvio/engine';
+import { emitAdapterEvent, StoreKeyMap, buildStaleWhileRevalidateImplementation, Reader, StoreKeySet } from '@luvio/engine';
 
 // the last version the metadata shape was altered
 const DURABLE_METADATA_VERSION = '0.111.0';
@@ -290,7 +290,7 @@ function copy(source) {
 function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler) {
     const durableRecords = create(null);
     const evictedRecords = create(null);
-    const { records, metadata: storeMetadata, visitedIds, refreshedIds } = store;
+    const { records, metadata: storeMetadata, visitedIds, refreshedIds, } = store.fallbackStringKeyInMemoryStore;
     // TODO: W-8909393 Once metadata is stored in its own segment we need to
     // call setEntries for the visitedIds on default segment and call setEntries
     // on the metadata segment for the refreshedIds
@@ -431,7 +431,7 @@ function isUnfulfilledSnapshot(cachedSnapshotResult) {
 function makeDurable(environment, { durableStore, instrumentation }) {
     let ingestStagingStore = null;
     const durableTTLStore = new DurableTTLStore(durableStore);
-    const mergeKeysPromiseMap = new Map();
+    const mergeKeysPromiseMap = new StoreKeyMap();
     // When a context store is mutated we write it to L2, which causes DS on change
     // event. If this instance of makeDurable caused that L2 write we can ignore that
     // on change event. This Set helps us do that.
@@ -723,37 +723,38 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     const getIngestStagingStoreRecords = function () {
         validateNotDisposed();
         if (ingestStagingStore !== null) {
-            return ingestStagingStore.records;
+            return ingestStagingStore.fallbackStringKeyInMemoryStore.records;
         }
         return {};
     };
     const getIngestStagingStoreMetadata = function () {
         validateNotDisposed();
         if (ingestStagingStore !== null) {
-            return ingestStagingStore.metadata;
+            return ingestStagingStore.fallbackStringKeyInMemoryStore.metadata;
         }
         return {};
     };
     const handleSuccessResponse = async function (ingestAndBroadcastFunc, getResponseCacheKeysFunc) {
         validateNotDisposed();
-        const cacheKeySet = getResponseCacheKeysFunc();
-        const cacheKeySetKeys = keys(cacheKeySet);
-        const keysToRevive = {};
-        for (const cacheKeySetKey of cacheKeySetKeys) {
-            const cacheKey = cacheKeySet[cacheKeySetKey];
+        const cacheKeyMap = getResponseCacheKeysFunc();
+        const cacheKeyMapKeys = Array.from(cacheKeyMap.keys());
+        const keysToRevive = new StoreKeySet();
+        for (const cacheKeyMapKey of cacheKeyMapKeys) {
+            const cacheKey = cacheKeyMap.get(cacheKeyMapKey);
             if (cacheKey.mergeable === true) {
-                keysToRevive[cacheKeySetKey] = true;
+                keysToRevive.add(cacheKeyMapKey);
             }
         }
         let snapshotFromMemoryIngest = undefined;
-        const keysAsArray = keys(keysToRevive);
-        if (keysAsArray.length > 0) {
+        // Once these are structured keys, we will call the serializeStructuredKey() utility method
+        const keysToReviveAsArray = Array.from(keysToRevive.keysAsStrings());
+        if (keysToReviveAsArray.length > 0) {
             // if we need to do an L2 read then L2 write then we need to synchronize
             // our read/merge/ingest/write Promise based on the keys so we don't
             // stomp over any data
             const readWritePromise = (async () => {
                 const pendingPromises = [];
-                for (const key of keysAsArray) {
+                for (const key of keysToReviveAsArray) {
                     const pendingPromise = mergeKeysPromiseMap.get(key);
                     if (pendingPromise !== undefined) {
                         // IMPORTANT: while on the synchronous code path we get a
@@ -766,17 +767,17 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                     }
                 }
                 await Promise.all(pendingPromises);
-                const entries = await durableStore.getEntries(keysAsArray, DefaultDurableSegment);
+                const entries = await durableStore.getEntries(keysToReviveAsArray, DefaultDurableSegment);
                 ingestStagingStore = buildIngestStagingStore(environment);
                 publishDurableStoreEntries(entries, (key, record) => {
-                    ingestStagingStore.records[key] = record;
+                    ingestStagingStore.fallbackStringKeyInMemoryStore.records[key] = record;
                 }, 
                 // we don't need to prime metadata
                 () => { });
                 snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
                 await publishChangesToDurableStore();
             })();
-            for (const key of keysAsArray) {
+            for (const key of keysToReviveAsArray) {
                 // we are overwriting the previous promise at this key, but that
                 // is ok because we got a handle to it earlier (see the IMPORTANT
                 // comment about 35 lines up)
@@ -786,7 +787,7 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                 await readWritePromise;
             }
             finally {
-                for (const key of keysAsArray) {
+                for (const key of keysToReviveAsArray) {
                     const pendingPromise = mergeKeysPromiseMap.get(key);
                     // cleanup the entry from the map if this is the last promise
                     // for that key

package/dist/es/es2018/makeDurable.d.ts

@@ -24,7 +24,7 @@ export interface DurableEnvironment extends Environment {
      * Gets the ingest staging store metadata if called during the ingestion
      * flow, otherwise returns an empty object.
      */
-    getIngestStagingStoreMetadata(): InMemoryStore['metadata'];
+    getIngestStagingStoreMetadata(): InMemoryStore['fallbackStringKeyInMemoryStore']['metadata'];
 }
 export declare const AdapterContextSegment = "ADAPTER-CONTEXT";
 export declare const ADAPTER_CONTEXT_ID_SUFFIX = "__NAMED_CONTEXT";

package/dist/umd/es2018/environments.js

@@ -294,7 +294,7 @@
     function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler) {
         const durableRecords = create(null);
         const evictedRecords = create(null);
-        const { records, metadata: storeMetadata, visitedIds, refreshedIds } = store;
+        const { records, metadata: storeMetadata, visitedIds, refreshedIds, } = store.fallbackStringKeyInMemoryStore;
         // TODO: W-8909393 Once metadata is stored in its own segment we need to
         // call setEntries for the visitedIds on default segment and call setEntries
         // on the metadata segment for the refreshedIds
@@ -435,7 +435,7 @@
     function makeDurable(environment, { durableStore, instrumentation }) {
         let ingestStagingStore = null;
         const durableTTLStore = new DurableTTLStore(durableStore);
-        const mergeKeysPromiseMap = new Map();
+        const mergeKeysPromiseMap = new engine.StoreKeyMap();
         // When a context store is mutated we write it to L2, which causes DS on change
         // event. If this instance of makeDurable caused that L2 write we can ignore that
         // on change event. This Set helps us do that.
@@ -727,37 +727,38 @@
         const getIngestStagingStoreRecords = function () {
             validateNotDisposed();
             if (ingestStagingStore !== null) {
-                return ingestStagingStore.records;
+                return ingestStagingStore.fallbackStringKeyInMemoryStore.records;
             }
             return {};
         };
         const getIngestStagingStoreMetadata = function () {
             validateNotDisposed();
             if (ingestStagingStore !== null) {
-                return ingestStagingStore.metadata;
+                return ingestStagingStore.fallbackStringKeyInMemoryStore.metadata;
             }
             return {};
         };
         const handleSuccessResponse = async function (ingestAndBroadcastFunc, getResponseCacheKeysFunc) {
             validateNotDisposed();
-            const cacheKeySet = getResponseCacheKeysFunc();
-            const cacheKeySetKeys = keys(cacheKeySet);
-            const keysToRevive = {};
-            for (const cacheKeySetKey of cacheKeySetKeys) {
-                const cacheKey = cacheKeySet[cacheKeySetKey];
+            const cacheKeyMap = getResponseCacheKeysFunc();
+            const cacheKeyMapKeys = Array.from(cacheKeyMap.keys());
+            const keysToRevive = new engine.StoreKeySet();
+            for (const cacheKeyMapKey of cacheKeyMapKeys) {
+                const cacheKey = cacheKeyMap.get(cacheKeyMapKey);
                 if (cacheKey.mergeable === true) {
-                    keysToRevive[cacheKeySetKey] = true;
+                    keysToRevive.add(cacheKeyMapKey);
                 }
             }
             let snapshotFromMemoryIngest = undefined;
-            const keysAsArray = keys(keysToRevive);
-            if (keysAsArray.length > 0) {
+            // Once these are structured keys, we will call the serializeStructuredKey() utility method
+            const keysToReviveAsArray = Array.from(keysToRevive.keysAsStrings());
+            if (keysToReviveAsArray.length > 0) {
                 // if we need to do an L2 read then L2 write then we need to synchronize
                 // our read/merge/ingest/write Promise based on the keys so we don't
                 // stomp over any data
                 const readWritePromise = (async () => {
                     const pendingPromises = [];
-                    for (const key of keysAsArray) {
+                    for (const key of keysToReviveAsArray) {
                         const pendingPromise = mergeKeysPromiseMap.get(key);
                         if (pendingPromise !== undefined) {
                             // IMPORTANT: while on the synchronous code path we get a
@@ -770,17 +771,17 @@
                         }
                     }
                     await Promise.all(pendingPromises);
-                    const entries = await durableStore.getEntries(keysAsArray, DefaultDurableSegment);
+                    const entries = await durableStore.getEntries(keysToReviveAsArray, DefaultDurableSegment);
                     ingestStagingStore = buildIngestStagingStore(environment);
                     publishDurableStoreEntries(entries, (key, record) => {
-                        ingestStagingStore.records[key] = record;
+                        ingestStagingStore.fallbackStringKeyInMemoryStore.records[key] = record;
                     }, 
                     // we don't need to prime metadata
                     () => { });
                     snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
                     await publishChangesToDurableStore();
                 })();
-                for (const key of keysAsArray) {
+                for (const key of keysToReviveAsArray) {
                     // we are overwriting the previous promise at this key, but that
                     // is ok because we got a handle to it earlier (see the IMPORTANT
                     // comment about 35 lines up)
@@ -790,7 +791,7 @@
                     await readWritePromise;
                 }
                 finally {
-                    for (const key of keysAsArray) {
+                    for (const key of keysToReviveAsArray) {
                         const pendingPromise = mergeKeysPromiseMap.get(key);
                         // cleanup the entry from the map if this is the last promise
                         // for that key

package/dist/umd/es2018/makeDurable.d.ts

@@ -24,7 +24,7 @@ export interface DurableEnvironment extends Environment {
      * Gets the ingest staging store metadata if called during the ingestion
      * flow, otherwise returns an empty object.
      */
-    getIngestStagingStoreMetadata(): InMemoryStore['metadata'];
+    getIngestStagingStoreMetadata(): InMemoryStore['fallbackStringKeyInMemoryStore']['metadata'];
 }
 export declare const AdapterContextSegment = "ADAPTER-CONTEXT";
 export declare const ADAPTER_CONTEXT_ID_SUFFIX = "__NAMED_CONTEXT";

package/dist/umd/es5/environments.js

@@ -23,7 +23,7 @@
     }
     var DefaultDurableSegment = 'DEFAULT';
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -65,7 +65,7 @@
         function verb(n) { return function (v) { return step([n, v]); }; }
         function step(op) {
             if (f) throw new TypeError("Generator is already executing.");
-            while (_) try {
+            while (g && (g = 0, op[0] && (_ = 0)), _) try {
                 if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
                 if (y = 0, t) op = [op[0] & 2, t.value];
                 switch (op[0]) {
@@ -375,7 +375,7 @@
     function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler) {
         var durableRecords = create(null);
         var evictedRecords = create(null);
-        var records = store.records, storeMetadata = store.metadata, visitedIds = store.visitedIds, refreshedIds = store.refreshedIds;
+        var _a = store.fallbackStringKeyInMemoryStore, records = _a.records, storeMetadata = _a.metadata, visitedIds = _a.visitedIds, refreshedIds = _a.refreshedIds;
         // TODO: W-8909393 Once metadata is stored in its own segment we need to
         // call setEntries for the visitedIds on default segment and call setEntries
         // on the metadata segment for the refreshedIds
@@ -539,7 +539,7 @@
         var durableStore = _a.durableStore, instrumentation = _a.instrumentation;
         var ingestStagingStore = null;
         var durableTTLStore = new DurableTTLStore(durableStore);
-        var mergeKeysPromiseMap = new Map();
+        var mergeKeysPromiseMap = new engine.StoreKeyMap();
         // When a context store is mutated we write it to L2, which causes DS on change
         // event. If this instance of makeDurable caused that L2 write we can ignore that
         // on change event. This Set helps us do that.
@@ -851,46 +851,46 @@
         var getIngestStagingStoreRecords = function () {
             validateNotDisposed();
             if (ingestStagingStore !== null) {
-                return ingestStagingStore.records;
+                return ingestStagingStore.fallbackStringKeyInMemoryStore.records;
             }
             return {};
         };
         var getIngestStagingStoreMetadata = function () {
             validateNotDisposed();
             if (ingestStagingStore !== null) {
-                return ingestStagingStore.metadata;
+                return ingestStagingStore.fallbackStringKeyInMemoryStore.metadata;
             }
             return {};
         };
         var handleSuccessResponse = function (ingestAndBroadcastFunc, getResponseCacheKeysFunc) {
             return __awaiter(this, void 0, void 0, function () {
-                var cacheKeySet, cacheKeySetKeys, keysToRevive, _i, cacheKeySetKeys_1, cacheKeySetKey, cacheKey, snapshotFromMemoryIngest, keysAsArray, readWritePromise, _a, keysAsArray_1, key, _b, keysAsArray_2, key, pendingPromise, _c, select, refresh, result;
+                var cacheKeyMap, cacheKeyMapKeys, keysToRevive, _i, cacheKeyMapKeys_1, cacheKeyMapKey, cacheKey, snapshotFromMemoryIngest, keysToReviveAsArray, readWritePromise, _a, keysToReviveAsArray_1, key, _b, keysToReviveAsArray_2, key, pendingPromise, _c, select, refresh, result;
                 var _this = this;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
                             validateNotDisposed();
-                            cacheKeySet = getResponseCacheKeysFunc();
-                            cacheKeySetKeys = keys(cacheKeySet);
-                            keysToRevive = {};
-                            for (_i = 0, cacheKeySetKeys_1 = cacheKeySetKeys; _i < cacheKeySetKeys_1.length; _i++) {
-                                cacheKeySetKey = cacheKeySetKeys_1[_i];
-                                cacheKey = cacheKeySet[cacheKeySetKey];
+                            cacheKeyMap = getResponseCacheKeysFunc();
+                            cacheKeyMapKeys = Array.from(cacheKeyMap.keys());
+                            keysToRevive = new engine.StoreKeySet();
+                            for (_i = 0, cacheKeyMapKeys_1 = cacheKeyMapKeys; _i < cacheKeyMapKeys_1.length; _i++) {
+                                cacheKeyMapKey = cacheKeyMapKeys_1[_i];
+                                cacheKey = cacheKeyMap.get(cacheKeyMapKey);
                                 if (cacheKey.mergeable === true) {
-                                    keysToRevive[cacheKeySetKey] = true;
+                                    keysToRevive.add(cacheKeyMapKey);
                                 }
                             }
                             snapshotFromMemoryIngest = undefined;
-                            keysAsArray = keys(keysToRevive);
-                            if (!(keysAsArray.length > 0)) return [3 /*break*/, 5];
+                            keysToReviveAsArray = Array.from(keysToRevive.keysAsStrings());
+                            if (!(keysToReviveAsArray.length > 0)) return [3 /*break*/, 5];
                             readWritePromise = (function () { return __awaiter(_this, void 0, void 0, function () {
-                                var pendingPromises, _i, keysAsArray_3, key, pendingPromise, entries;
+                                var pendingPromises, _i, keysToReviveAsArray_3, key, pendingPromise, entries;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
                                             pendingPromises = [];
-                                            for (_i = 0, keysAsArray_3 = keysAsArray; _i < keysAsArray_3.length; _i++) {
-                                                key = keysAsArray_3[_i];
+                                            for (_i = 0, keysToReviveAsArray_3 = keysToReviveAsArray; _i < keysToReviveAsArray_3.length; _i++) {
+                                                key = keysToReviveAsArray_3[_i];
                                                 pendingPromise = mergeKeysPromiseMap.get(key);
                                                 if (pendingPromise !== undefined) {
                                                     // IMPORTANT: while on the synchronous code path we get a
@@ -905,12 +905,12 @@
                                             return [4 /*yield*/, Promise.all(pendingPromises)];
                                         case 1:
                                             _a.sent();
-                                            return [4 /*yield*/, durableStore.getEntries(keysAsArray, DefaultDurableSegment)];
+                                            return [4 /*yield*/, durableStore.getEntries(keysToReviveAsArray, DefaultDurableSegment)];
                                         case 2:
                                             entries = _a.sent();
                                             ingestStagingStore = buildIngestStagingStore(environment);
                                             publishDurableStoreEntries(entries, function (key, record) {
-                                                ingestStagingStore.records[key] = record;
+                                                ingestStagingStore.fallbackStringKeyInMemoryStore.records[key] = record;
                                             }, 
                                             // we don't need to prime metadata
                                             function () { });
@@ -924,8 +924,8 @@
                                     }
                                 });
                             }); })();
-                            for (_a = 0, keysAsArray_1 = keysAsArray; _a < keysAsArray_1.length; _a++) {
-                                key = keysAsArray_1[_a];
+                            for (_a = 0, keysToReviveAsArray_1 = keysToReviveAsArray; _a < keysToReviveAsArray_1.length; _a++) {
+                                key = keysToReviveAsArray_1[_a];
                                 // we are overwriting the previous promise at this key, but that
                                 // is ok because we got a handle to it earlier (see the IMPORTANT
                                 // comment about 35 lines up)
@@ -939,8 +939,8 @@
                             _d.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            for (_b = 0, keysAsArray_2 = keysAsArray; _b < keysAsArray_2.length; _b++) {
-                                key = keysAsArray_2[_b];
+                            for (_b = 0, keysToReviveAsArray_2 = keysToReviveAsArray; _b < keysToReviveAsArray_2.length; _b++) {
+                                key = keysToReviveAsArray_2[_b];
                                 pendingPromise = mergeKeysPromiseMap.get(key);
                                 // cleanup the entry from the map if this is the last promise
                                 // for that key

package/dist/umd/es5/makeDurable.d.ts

@@ -24,7 +24,7 @@ export interface DurableEnvironment extends Environment {
      * Gets the ingest staging store metadata if called during the ingestion
      * flow, otherwise returns an empty object.
      */
-    getIngestStagingStoreMetadata(): InMemoryStore['metadata'];
+    getIngestStagingStoreMetadata(): InMemoryStore['fallbackStringKeyInMemoryStore']['metadata'];
 }
 export declare const AdapterContextSegment = "ADAPTER-CONTEXT";
 export declare const ADAPTER_CONTEXT_ID_SUFFIX = "__NAMED_CONTEXT";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/environments",
-    "version": "0.131.0",
+    "version": "0.132.0",
     "description": "Luvio Environments",
     "repository": {
         "type": "git",
@@ -23,7 +23,7 @@
         "watch": "yarn build --watch"
     },
     "dependencies": {
-        "@luvio/engine": "0.131.0"
+        "@luvio/engine": "0.132.0"
     },
     "bundlesize": [
         {