-
-
Notifications
You must be signed in to change notification settings - Fork 19
feat: redundant storage #13
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.
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
Open
Le0Developer
wants to merge
8
commits into
WalshyDev:main
Choose a base branch
from
Le0Developer:feat/redundant-storage
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
935e01c
do the thing
Le0Developer 8dad621
tabs
Le0Developer 34e54f5
remove last KV references
Le0Developer 7c7dd97
WRONG ORDER WHOOPS
Le0Developer ac38e19
add error if all stores are corrupted
Le0Developer a523fa3
add to README
Le0Developer f4cbf05
fix query
Le0Developer 6da3451
Update README.md
Le0Developer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,50 @@ | ||||||
| export async function saveToStorage(env: Env, key: string, value: any) { | ||||||
| const now = new Date().getTime(); | ||||||
| const data = JSON.stringify({ ts: now, value }); | ||||||
|
|
||||||
| await Promise.allSettled([ | ||||||
| env.KV && env.KV.put(key, data), | ||||||
| env.D1 && | ||||||
| env.D1.prepare( | ||||||
| `INSERT INTO KV(key, value) VALUES(?1, ?2) ON CONFLICT(key) DO UPDATE SET value = ?2`, | ||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| ) | ||||||
| .bind(key, data) | ||||||
| .run(), | ||||||
| env.R2 && env.R2.put(key, data), | ||||||
| ]); | ||||||
| } | ||||||
|
|
||||||
| export async function retrieveFromStorage<T>( | ||||||
| env: Env, | ||||||
| key: string, | ||||||
| ): Promise<T | null> { | ||||||
| const rawValues = await Promise.allSettled([ | ||||||
| env.KV && env.KV.get(key), | ||||||
| env.D1 && | ||||||
| env.D1.prepare(`SELECT value FROM KV WHERE key = ?`).bind(key).first("value"), | ||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| env.R2 && env.R2.get(key).then((object) => object && object.text()), | ||||||
| ]); | ||||||
| const values = rawValues.filter( | ||||||
| (x) => x.status === "fulfilled" && x.value, | ||||||
| ) as Array<PromiseFulfilledResult<string>>; | ||||||
| // none of our storage providers had the value in stock, so either all of them are | ||||||
| // broken, or its just a new key | ||||||
| if (!values.length) return null; | ||||||
|
|
||||||
| const parsed: Array<{ ts: number; value: T }> = []; | ||||||
| for (const value of values) { | ||||||
| // lets make sure we handle data corruption cases | ||||||
| try { | ||||||
| parsed.push(JSON.parse(value.value)); | ||||||
| } catch {} | ||||||
| } | ||||||
| if (!parsed.length) { | ||||||
| console.error("all data stores hold corrupted data, somehow...", values); | ||||||
| return null; | ||||||
| } | ||||||
|
|
||||||
| // to account for cases where a write failed, we have the timestamp! | ||||||
| // so we use whatever has the newest timestamp | ||||||
| const freshness = parsed.sort((a, b) => b.ts - a.ts); | ||||||
| return freshness[0].value; | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is SQLite, JSON will actually be mapped to NUMERIC.
See datatype3 3.1: