Compare commits

..

5 Commits

Author SHA1 Message Date
1ab8e6424b handle cache cleanup in db
Some checks failed
Build / Build NPM Project (push) Successful in 40s
Build / Publish Documentation (push) Failing after 5s
Build / Tag Version (push) Successful in 8s
2025-07-14 01:00:34 -04:00
035a1d35cb PathEventEmitter handles wildcards while prefixed
Some checks failed
Build / Build NPM Project (push) Successful in 52s
Build / Publish Documentation (push) Failing after 5s
Build / Tag Version (push) Successful in 8s
2025-07-14 00:31:11 -04:00
e78120b067 Trying to do a better job of detecting persistent caching strategy
Some checks failed
Build / Build NPM Project (push) Successful in 51s
Build / Publish Documentation (push) Failing after 5s
Build / Tag Version (push) Successful in 8s
2025-07-08 01:46:06 -04:00
71552aa243 Fixed cache save to db
Some checks failed
Build / Build NPM Project (push) Successful in 43s
Build / Publish Documentation (push) Failing after 5s
Build / Tag Version (push) Successful in 8s
2025-07-07 15:27:07 -04:00
ce3878e18b Added db safe guards
Some checks failed
Build / Build NPM Project (push) Successful in 44s
Build / Publish Documentation (push) Failing after 5s
Build / Tag Version (push) Successful in 9s
2025-07-07 14:53:14 -04:00
5 changed files with 25 additions and 18 deletions

View File

@ -1,11 +1,9 @@
<html> <html>
<body> <body>
<script type="module"> <script type="module">
import {PathEventEmitter} from './dist/index.mjs'; import {PE} from './dist/index.mjs';
const emitter = new PathEventEmitter('data'); console.log('data/Ts:n', PE`${'data/Ts'}:n`.methods);
emitter.on('*', console.log);
emitter.emit('data/asd', {});
</script> </script>
</body> </body>
</html> </html>

View File

@ -1,6 +1,6 @@
{ {
"name": "@ztimson/utils", "name": "@ztimson/utils",
"version": "0.26.2", "version": "0.26.7",
"description": "Utility library", "description": "Utility library",
"author": "Zak Timson", "author": "Zak Timson",
"license": "MIT", "license": "MIT",

View File

@ -39,7 +39,7 @@ export class Cache<K extends string | number | symbol, T> {
if(typeof this.options.persistentStorage == 'string') if(typeof this.options.persistentStorage == 'string')
this.options.persistentStorage = {storage: localStorage, key: this.options.persistentStorage}; this.options.persistentStorage = {storage: localStorage, key: this.options.persistentStorage};
if(this.options.persistentStorage?.storage?.constructor.name == 'Database') { if(this.options.persistentStorage?.storage?.database != undefined) {
(async () => { (async () => {
const persists: any = this.options.persistentStorage; const persists: any = this.options.persistentStorage;
const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key}); const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key});
@ -47,7 +47,7 @@ export class Cache<K extends string | number | symbol, T> {
Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {})); Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {}));
done(); done();
})(); })();
} else if(this.options.persistentStorage?.storage?.constructor.name == 'Storage') { } else if((<any>this.options.persistentStorage?.storage)?.getItem != undefined) {
const stored = (<Storage>this.options.persistentStorage.storage).getItem(this.options.persistentStorage.key); const stored = (<Storage>this.options.persistentStorage.storage).getItem(this.options.persistentStorage.key);
if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { } if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
done(); done();
@ -77,16 +77,18 @@ export class Cache<K extends string | number | symbol, T> {
private save(key?: K) { private save(key?: K) {
const persists: {storage: any, key: string} = <any>this.options.persistentStorage; const persists: {storage: any, key: string} = <any>this.options.persistentStorage;
if(!!persists?.storage) { if(!!persists?.storage) {
if(persists.storage?.constructor.name == 'Database') { if(persists.storage?.database != undefined) {
(<Database>persists.storage).createTable({name: persists.key, key: <string>this.key}).then(table => { (<Database>persists.storage).createTable({name: persists.key, key: <string>this.key}).then(table => {
if(key) { if(key) {
table.set(key, this.get(key)); const value = this.get(key);
if(value != null) table.set(value, key);
else table.delete(key);
} else { } else {
table.clear(); table.clear();
this.all().forEach(row => table.add(row)); this.all().forEach(row => table.add(row));
} }
}); });
} else if(persists.storage?.constructor.name == 'Storage') { } else if(persists.storage?.setItem != undefined) {
persists.storage.setItem(persists.storage.key, JSONSanitize(this.all(true))); persists.storage.setItem(persists.storage.key, JSONSanitize(this.all(true)));
} }
} }

View File

@ -166,8 +166,11 @@ export class Table<K extends IDBValidKey = any, T = any> {
return this.tx(this.name, store => store.getAllKeys(), true); return this.tx(this.name, store => store.getAllKeys(), true);
} }
put(key: K, value: T): Promise<void> { put(value: T, key?: string): Promise<void> {
return this.tx(this.name, store => store.put(value, key)); return this.tx(this.name, store => {
if (store.keyPath) return store.put(value);
return store.put(value, key);
});
} }
read(): Promise<T[]>; read(): Promise<T[]>;
@ -177,8 +180,9 @@ export class Table<K extends IDBValidKey = any, T = any> {
} }
set(value: T, key?: K): Promise<void> { set(value: T, key?: K): Promise<void> {
if(!key && !(<any>value)[this.key]) return this.add(value); if(key) (<any>value)[this.key] = key;
return this.put(key || (<any>value)[this.key], value); if(!(<any>value)[this.key]) return this.add(value);
return this.put(value);
} }
update = this.set; update = this.set;

View File

@ -325,10 +325,13 @@ export class PathEventEmitter implements IPathEventEmitter{
} }
on(event: Event | Event[], listener: PathListener): PathUnsubscribe { on(event: Event | Event[], listener: PathListener): PathUnsubscribe {
makeArray(event).forEach(e => this.listeners.push([ makeArray(event).forEach(e => {
e instanceof PathEvent ? e : new PathEvent(`${this.prefix}/${e}`), if(typeof e == 'string' && e[0] == '*' && this.prefix) e = e.slice(1);
listener this.listeners.push([
])); e instanceof PathEvent ? e : new PathEvent(`${this.prefix}/${e}`),
listener
])
});
return () => this.off(listener); return () => this.off(listener);
} }