Skip to content
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

Jump to bottom

Enhancements to KeyValueStore #62

Merged
merged 1 commit into from
Mar 16, 2024
Merged

Enhancements to KeyValueStore #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [v0.3.4] - 2024-03-15

### Added
- Add `keys()` & `entries()` to `KeyValueStore`

## [v0.3.3] - 2024-03-15

### Added
Expand Down
118 changes: 112 additions & 6 deletions KeyValueStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,13 @@ export class KeyValueStore {
return this.#name;
}

async toObject() {
return Object.fromEntries(await this.entries());
}


async get(key, { signal } = {}) {
const { resolve, reject, promise } = Promise.withResolvers();
const { resolve, reject, promise } = Promise.withResolvers();
const controller = new AbortController();

controller.signal.addEventListener('abort', ({ target }) => reject(target.reason), { once: true });
Expand Down Expand Up @@ -150,7 +155,7 @@ export class KeyValueStore {
}

async getAll(count, { signal} = {}) {
const { resolve, reject, promise } = Promise.withResolvers();
const { resolve, reject, promise } = Promise.withResolvers();
const controller = new AbortController();

controller.signal.addEventListener('abort', ({ target }) => reject(target.reason), { once: true });
Expand All @@ -171,21 +176,122 @@ export class KeyValueStore {

request.addEventListener('success', ({ target }) => {
if (Array.isArray(target.result)) {
resolve(Object.fromEntries(target.result.map(({ key, value }) => [key, value])));
resolve(Object.fromEntries(target.result.map(({ key, value }) => [key, value])));
} else {
resolve({});
}

controller.abort();
}, { once: true, signal: controller.signal });

request.addEventListener('error', ({ target }) => {
controller.abort(new Error(target.error));
}, { once: true, signal: controller.signal });
}

return await promise;
}

async keys() {
const { resolve, reject, promise } = Promise.withResolvers();
const controller = new AbortController();

try {
await this.#whenConnected;

const transaction = this.#db.transaction([this.#name], 'readonly');
const store = transaction.objectStore(this.#name);
const request = store.getAllKeys();

request.addEventListener('success', ({ target }) => {
resolve(target.result);
controller.abort();
}, { once: true, signal: controller.signal });

request.addEventListener('error', ({ target }) => {
reject(new Error(target.error));
controller.abort(target.error);
}, { once: true, signal: controller.signal });
} catch (error) {
reject(error);
}

return await promise;
}

async values() {
const { resolve, reject, promise } = Promise.withResolvers();
const controller = new AbortController();

controller.signal.addEventListener('abort', ({ target }) => reject(target.reason), { once: true });

try {
await this.ready;
const transaction = this.#db.transaction([this.#name], 'readonly');
const store = transaction.objectStore(this.#name);
const request = store.getAll();

request.addEventListener('success', ({ target }) => {
if (Array.isArray(target.result)) {
resolve(target.result.map(({ value }) => value));
} else {
resolve({});
}

controller.abort();
}, { once: true, signal: controller.signal });

request.addEventListener('error', ({ target }) => {
controller.abort(new Error(target.error));
}, { once: true, signal: controller.signal });
} catch(err) {
controller.abort(err);
}

return await promise;
}

async entries() {
return await Array.fromAsync(this);
}

async add(key, value, { signal } = {}) {
const { resolve, reject, promise } = Promise.withResolvers();
const controller = new AbortController();

controller.signal.addEventListener('abort', ({ target }) => reject(target.reason), { once: true });

if (typeof key !== 'string' || key.length === 0) {
controller.abort(new TypeError('Key is not a string.'));
}

if (signal instanceof AbortSignal && signal.aborted) {
controller.abort(signal.reason);
} else if (signal instanceof AbortSignal) {
signal.addEventListener('abort', ({ target }) => {
controller.abort(target.reason);
}, { once: true, signal: controller.signal });
}

if (! controller.signal.aborted) {
await this.ready;
const transaction = this.#db.transaction([this.#name], 'readwrite');
const store = transaction.objectStore(this.#name);
const request = store.add({ key, value, modified: Date.now() });

request.addEventListener('success', () => {
resolve();
controller.abort();
}, { once: true, signal: controller.signal });

request.addEventListener('error', ({ target }) => {
controller.abort(new Error(target.error));
}, { once: true, signal: controller.signal });
}

return promise;
}

async set(key, value, { signal } = {}) {
const { resolve, reject, promise } = Promise.withResolvers();
const controller = new AbortController();
Expand Down Expand Up @@ -273,7 +379,7 @@ export class KeyValueStore {
}

async has(key, { signal}= {}) {
const { resolve, reject, promise } = Promise.withResolvers();
const { resolve, reject, promise } = Promise.withResolvers();
const controller = new AbortController();

controller.signal.addEventListener('abort', ({ target }) => reject(target.reason), { once: true });
Expand Down Expand Up @@ -306,7 +412,7 @@ export class KeyValueStore {
}

async delete(key, { signal } = {}) {
const { resolve, reject, promise } = Promise.withResolvers();
const { resolve, reject, promise } = Promise.withResolvers();
const controller = new AbortController();

controller.signal.addEventListener('abort', ({ target }) => reject(target.reason), { once: true });
Expand Down Expand Up @@ -343,7 +449,7 @@ export class KeyValueStore {
}

async clear({ signal } = {}) {
const { resolve, reject, promise } = Promise.withResolvers();
const { resolve, reject, promise } = Promise.withResolvers();
const controller = new AbortController();

controller.signal.addEventListener('abort', ({ target }) => reject(target.reason), { once: true });
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shgysk8zer0/kazoo",
"version": "0.3.3",
"version": "0.3.4",
"private": false,
"type": "module",
"description": "A JavaScript monorepo for all the things!",
Expand Down
Loading