Skip to content

fix: Dispatch change events after ready event. #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 24, 2023
Merged

fix: Dispatch change events after ready event. #252

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07138a1
fix: Client cannot become un-initialized.
kinyoklion Aug 24, 2023
18a602f
fix: Dispatch change events after ready event.
kinyoklion Aug 24, 2023
ed90231
Merge branch 'main' into rlamb/handle-init-failure-better
kinyoklion Aug 24, 2023
a62e2ec
Merge branch 'rlamb/handle-init-failure-better' into rlamb/dispatch-c…
kinyoklion Aug 24, 2023
70c6ff8
Merge branch 'main' into rlamb/dispatch-changes-after-ready
kinyoklion Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 41 additions & 35 deletions packages/shared/sdk-server/src/data_sources/DataSourceUpdates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,38 +70,40 @@ export default class DataSourceUpdates implements LDDataSourceUpdates {
const checkForChanges = this.hasEventListeners();
const doInit = (oldData?: LDFeatureStoreDataStorage) => {
this.featureStore.init(allData, () => {
this.dependencyTracker.reset();
// Defer change events so they execute after the callback.
Promise.resolve().then(() => {
this.dependencyTracker.reset();

Object.entries(allData).forEach(([namespace, items]) => {
Object.keys(items || {}).forEach((key) => {
const item = items[key];
this.dependencyTracker.updateDependenciesFrom(
namespace,
key,
computeDependencies(namespace, item),
);
});
});

if (checkForChanges) {
const updatedItems = new NamespacedDataSet<boolean>();
Object.keys(allData).forEach((namespace) => {
const oldDataForKind = oldData?.[namespace] || {};
const newDataForKind = allData[namespace];
const mergedData = { ...oldDataForKind, ...newDataForKind };
Object.keys(mergedData).forEach((key) => {
this.addIfModified(
Object.entries(allData).forEach(([namespace, items]) => {
Object.keys(items || {}).forEach((key) => {
const item = items[key];
this.dependencyTracker.updateDependenciesFrom(
namespace,
key,
oldDataForKind && oldDataForKind[key],
newDataForKind && newDataForKind[key],
updatedItems,
computeDependencies(namespace, item),
);
});
});
this.sendChangeEvents(updatedItems);
}

if (checkForChanges) {
const updatedItems = new NamespacedDataSet<boolean>();
Object.keys(allData).forEach((namespace) => {
const oldDataForKind = oldData?.[namespace] || {};
const newDataForKind = allData[namespace];
const mergedData = { ...oldDataForKind, ...newDataForKind };
Object.keys(mergedData).forEach((key) => {
this.addIfModified(
namespace,
key,
oldDataForKind && oldDataForKind[key],
newDataForKind && newDataForKind[key],
updatedItems,
);
});
});
this.sendChangeEvents(updatedItems);
}
});
callback?.();
});
};
Expand All @@ -126,16 +128,20 @@ export default class DataSourceUpdates implements LDDataSourceUpdates {
const checkForChanges = this.hasEventListeners();
const doUpsert = (oldItem?: LDFeatureStoreItem | null) => {
this.featureStore.upsert(kind, data, () => {
this.dependencyTracker.updateDependenciesFrom(
kind.namespace,
key,
computeDependencies(kind.namespace, data),
);
if (checkForChanges) {
const updatedItems = new NamespacedDataSet<boolean>();
this.addIfModified(kind.namespace, key, oldItem, data, updatedItems);
this.sendChangeEvents(updatedItems);
}
// Defer change events so they execute after the callback.
Promise.resolve().then(() => {
this.dependencyTracker.updateDependenciesFrom(
kind.namespace,
key,
computeDependencies(kind.namespace, data),
);
if (checkForChanges) {
const updatedItems = new NamespacedDataSet<boolean>();
this.addIfModified(kind.namespace, key, oldItem, data, updatedItems);
this.sendChangeEvents(updatedItems);
}
});

callback?.();
});
};
Expand Down