Skip to content

prioritize session file path over local storage #553

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 2 commits into from
Dec 23, 2021
Merged

prioritize session file path over local storage #553

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
445abf5
prioritize session file path over local storage
ShMcK Dec 23, 2021
e69b03d
move local storage lookup later
ShMcK Dec 23, 2021
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
17 changes: 12 additions & 5 deletions src/services/storage/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,9 @@ class Storage<T> {
this.defaultValue = defaultValue
}
public get = async (): Promise<T> => {
const value: string | undefined = await this.storage.get(this.key)
if (value) {
return JSON.parse(value)
} else if (SESSION_STORAGE_PATH) {
if (SESSION_STORAGE_PATH) {
try {
// optionally read from file as a fallback to local storage
// 1. read from file instead of local storage if specified
const sessionFile = await readFile(SESSION_STORAGE_PATH, `${this.filePath}.json`)
if (!sessionFile) {
throw new Error('No session file found')
Expand All @@ -53,6 +50,16 @@ class Storage<T> {
console.warn(`Failed to read or parse session file: ${SESSION_STORAGE_PATH}/${this.filePath}.json`)
}
}
const value: string | undefined = await this.storage.get(this.key)
if (value) {
// 2. read from local storage
try {
return JSON.parse(value)
} catch (err) {
console.warn(`Failed to parse session state from local storage: ${value}`)
}
}
// 3. fallback to the default
return this.defaultValue
}
public set = (value: T): void => {
Expand Down