@luvio/environments 0.57.0 → 0.59.1

package/dist/es/es2018/environments.js

@@ -425,7 +425,8 @@ function copy(source) {
     return { ...source };
 }
 function flushStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler) {
-    const durableRecords = create({});
+    const durableRecords = create(null);
+    const evictedRecords = create(null);
     const { records, metadata: storeMetadata, visitedIds, refreshedIds } = store;
     // 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
@@ -434,8 +435,9 @@ function flushStoreValuesToDurableStore(store, durableStore, durableStoreErrorHa
     for (let i = 0, len = keys$1.length; i < len; i += 1) {
         const key = keys$1[i];
         const record = records[key];
-        // this record has been evicted, do not write undefined to durable store
+        // this record has been evicted, evict from DS
         if (record === undefined) {
+            evictedRecords[key] = true;
             continue;
         }
         const metadata = storeMetadata[key];
@@ -448,11 +450,27 @@ function flushStoreValuesToDurableStore(store, durableStore, durableStoreErrorHa
             durableRecords[key].metadata = copy(metadata);
         }
     }
+    const durableStoreOperations = [];
+    // publishes
     const recordKeys = keys(durableRecords);
     if (recordKeys.length > 0) {
-        return durableStore
-            .setEntries(durableRecords, DefaultDurableSegment)
-            .catch(durableStoreErrorHandler);
+        durableStoreOperations.push({
+            type: DurableStoreOperationType.SetEntries,
+            entries: durableRecords,
+            segment: DefaultDurableSegment,
+        });
+    }
+    // evicts
+    const evictedKeys = keys(evictedRecords);
+    if (evictedKeys.length > 0) {
+        durableStoreOperations.push({
+            type: DurableStoreOperationType.EvictEntries,
+            ids: evictedKeys,
+            segment: DefaultDurableSegment,
+        });
+    }
+    if (durableStoreOperations.length > 0) {
+        return durableStore.batchOperations(durableStoreOperations).catch(durableStoreErrorHandler);
     }
     return Promise.resolve();
 }
@@ -631,13 +649,10 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     };
     const storeEvict = function (key) {
         validateNotDisposed();
-        // if the staging store is defined we remove it from there as well
-        if (ingestStagingStore !== null) {
-            ingestStagingStore.evict(key);
+        if (ingestStagingStore === null) {
+            ingestStagingStore = new Store();
         }
-        environment.storeEvict(key);
-        // do not await
-        durableStore.evictEntries([key], DefaultDurableSegment).catch(durableStoreErrorHandler);
+        ingestStagingStore.evict(key);
     };
     const getNode = function (key) {
         validateNotDisposed();
@@ -749,7 +764,7 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                 return buildStaleWhileRevalidateImplementation({
                     validateNotDisposed,
                     reviveSnapshotWithCachePolicy,
-                }, cachePolicy.staleDuration);
+                }, cachePolicy.staleDurationSeconds);
             default: {
                 if (process.env.NODE_ENV !== 'production') {
                     throw new Error(`unrecognized cache policy: ${JSON.stringify(cachePolicy)}`);

package/dist/umd/es2018/environments.js

@@ -428,7 +428,8 @@
         return { ...source };
     }
     function flushStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler) {
-        const durableRecords = create({});
+        const durableRecords = create(null);
+        const evictedRecords = create(null);
         const { records, metadata: storeMetadata, visitedIds, refreshedIds } = store;
         // 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
@@ -437,8 +438,9 @@
         for (let i = 0, len = keys$1.length; i < len; i += 1) {
             const key = keys$1[i];
             const record = records[key];
-            // this record has been evicted, do not write undefined to durable store
+            // this record has been evicted, evict from DS
             if (record === undefined) {
+                evictedRecords[key] = true;
                 continue;
             }
             const metadata = storeMetadata[key];
@@ -451,11 +453,27 @@
                 durableRecords[key].metadata = copy(metadata);
             }
         }
+        const durableStoreOperations = [];
+        // publishes
         const recordKeys = keys(durableRecords);
         if (recordKeys.length > 0) {
-            return durableStore
-                .setEntries(durableRecords, DefaultDurableSegment)
-                .catch(durableStoreErrorHandler);
+            durableStoreOperations.push({
+                type: exports.DurableStoreOperationType.SetEntries,
+                entries: durableRecords,
+                segment: DefaultDurableSegment,
+            });
+        }
+        // evicts
+        const evictedKeys = keys(evictedRecords);
+        if (evictedKeys.length > 0) {
+            durableStoreOperations.push({
+                type: exports.DurableStoreOperationType.EvictEntries,
+                ids: evictedKeys,
+                segment: DefaultDurableSegment,
+            });
+        }
+        if (durableStoreOperations.length > 0) {
+            return durableStore.batchOperations(durableStoreOperations).catch(durableStoreErrorHandler);
         }
         return Promise.resolve();
     }
@@ -634,13 +652,10 @@
         };
         const storeEvict = function (key) {
             validateNotDisposed();
-            // if the staging store is defined we remove it from there as well
-            if (ingestStagingStore !== null) {
-                ingestStagingStore.evict(key);
+            if (ingestStagingStore === null) {
+                ingestStagingStore = new engine.Store();
             }
-            environment.storeEvict(key);
-            // do not await
-            durableStore.evictEntries([key], DefaultDurableSegment).catch(durableStoreErrorHandler);
+            ingestStagingStore.evict(key);
         };
         const getNode = function (key) {
             validateNotDisposed();
@@ -752,7 +767,7 @@
                     return buildStaleWhileRevalidateImplementation({
                         validateNotDisposed,
                         reviveSnapshotWithCachePolicy,
-                    }, cachePolicy.staleDuration);
+                    }, cachePolicy.staleDurationSeconds);
                 default: {
                     if (process.env.NODE_ENV !== 'production') {
                         throw new Error(`unrecognized cache policy: ${JSON.stringify(cachePolicy)}`);

package/dist/umd/es5/environments.js

@@ -465,7 +465,8 @@
         return __assign({}, source);
     }
     function flushStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler) {
-        var durableRecords = create({});
+        var durableRecords = create(null);
+        var evictedRecords = create(null);
         var records = store.records, storeMetadata = store.metadata, visitedIds = store.visitedIds, refreshedIds = store.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
@@ -474,8 +475,9 @@
         for (var i = 0, len = keys$1.length; i < len; i += 1) {
             var key = keys$1[i];
             var record = records[key];
-            // this record has been evicted, do not write undefined to durable store
+            // this record has been evicted, evict from DS
             if (record === undefined) {
+                evictedRecords[key] = true;
                 continue;
             }
             var metadata = storeMetadata[key];
@@ -488,11 +490,27 @@
                 durableRecords[key].metadata = copy(metadata);
             }
         }
+        var durableStoreOperations = [];
+        // publishes
         var recordKeys = keys(durableRecords);
         if (recordKeys.length > 0) {
-            return durableStore
-                .setEntries(durableRecords, DefaultDurableSegment)
-                .catch(durableStoreErrorHandler);
+            durableStoreOperations.push({
+                type: exports.DurableStoreOperationType.SetEntries,
+                entries: durableRecords,
+                segment: DefaultDurableSegment,
+            });
+        }
+        // evicts
+        var evictedKeys = keys(evictedRecords);
+        if (evictedKeys.length > 0) {
+            durableStoreOperations.push({
+                type: exports.DurableStoreOperationType.EvictEntries,
+                ids: evictedKeys,
+                segment: DefaultDurableSegment,
+            });
+        }
+        if (durableStoreOperations.length > 0) {
+            return durableStore.batchOperations(durableStoreOperations).catch(durableStoreErrorHandler);
         }
         return Promise.resolve();
     }
@@ -673,13 +691,10 @@
         };
         var storeEvict = function (key) {
             validateNotDisposed();
-            // if the staging store is defined we remove it from there as well
-            if (ingestStagingStore !== null) {
-                ingestStagingStore.evict(key);
+            if (ingestStagingStore === null) {
+                ingestStagingStore = new engine.Store();
             }
-            environment.storeEvict(key);
-            // do not await
-            durableStore.evictEntries([key], DefaultDurableSegment).catch(durableStoreErrorHandler);
+            ingestStagingStore.evict(key);
         };
         var getNode = function (key) {
             validateNotDisposed();
@@ -794,7 +809,7 @@
                     return buildStaleWhileRevalidateImplementation({
                         validateNotDisposed: validateNotDisposed,
                         reviveSnapshotWithCachePolicy: reviveSnapshotWithCachePolicy,
-                    }, cachePolicy.staleDuration);
+                    }, cachePolicy.staleDurationSeconds);
                 default: {
                     if (process.env.NODE_ENV !== 'production') {
                         throw new Error("unrecognized cache policy: " + JSON.stringify(cachePolicy));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/environments",
-    "version": "0.57.0",
+    "version": "0.59.1",
     "description": "Luvio Environments",
     "main": "dist/umd/es2018/environments.js",
     "module": "dist/es/es2018/environments.js",
@@ -16,6 +16,6 @@
         "dist/"
     ],
     "dependencies": {
-        "@luvio/engine": "0.57.0"
+        "@luvio/engine": "0.59.1"
     }
 }