Remove unnecessary timer from obeservable
This commit is contained in:
parent
2545f3a050
commit
858a508190
6
.editorconfig
Normal file
6
.editorconfig
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
root=true
|
||||||
|
[*]
|
||||||
|
charset = utf-8
|
||||||
|
indent_size = 3
|
||||||
|
indent_style = space
|
||||||
|
insert_final_newline = true
|
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@hibas123/utils",
|
"name": "@hibas123/utils",
|
||||||
"version": "2.2.2",
|
"version": "2.2.3",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@hibas123/utils",
|
"name": "@hibas123/utils",
|
||||||
"version": "2.2.3",
|
"version": "2.2.4",
|
||||||
"description": "Different Utilities, that are not worth own packages",
|
"description": "Different Utilities, that are not worth own packages",
|
||||||
"main": "lib/index.js",
|
"main": "lib/index.js",
|
||||||
"types": "lib/index.d.ts",
|
"types": "lib/index.d.ts",
|
||||||
|
@ -48,17 +48,21 @@ export default class AwaitStore<T = any> {
|
|||||||
*
|
*
|
||||||
* @param val Value to await
|
* @param val Value to await
|
||||||
*/
|
*/
|
||||||
awaitValue(val: T): PromiseLike<void> & { catch: (cb: (err: any) => PromiseLike<void>) => PromiseLike<void>, ignore: () => void } {
|
awaitValue(
|
||||||
|
val: T
|
||||||
|
): PromiseLike<void> & {
|
||||||
|
catch: (cb: (err: any) => PromiseLike<void>) => PromiseLike<void>;
|
||||||
|
ignore: () => void;
|
||||||
|
} {
|
||||||
let ignore: () => void = () => undefined;
|
let ignore: () => void = () => undefined;
|
||||||
|
|
||||||
let prms = new Promise<void>(yes => {
|
let prms = new Promise<void>((yes) => {
|
||||||
const cb = () => {
|
const cb = () => {
|
||||||
if (this._value === val) {
|
if (this._value === val) {
|
||||||
yes();
|
yes();
|
||||||
this.unsubscribe(cb);
|
this.unsubscribe(cb);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
this.subscribe(cb);
|
this.subscribe(cb);
|
||||||
});
|
});
|
||||||
@ -66,8 +70,8 @@ export default class AwaitStore<T = any> {
|
|||||||
return {
|
return {
|
||||||
then: prms.then.bind(prms),
|
then: prms.then.bind(prms),
|
||||||
catch: prms.catch.bind(prms),
|
catch: prms.catch.bind(prms),
|
||||||
ignore: () => ignore()
|
ignore: () => ignore(),
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -76,13 +80,13 @@ export default class AwaitStore<T = any> {
|
|||||||
* @returns {object}
|
* @returns {object}
|
||||||
*/
|
*/
|
||||||
getPublicApi() {
|
getPublicApi() {
|
||||||
if (this.observable.closed)
|
if (this.observable.closed) throw new Error("Observable is closed!");
|
||||||
throw new Error("Observable is closed!");
|
|
||||||
return {
|
return {
|
||||||
subscribe: (callback: ObserverCallback<T>) => this.subscribe(callback),
|
subscribe: (callback: ObserverCallback<T>) => this.subscribe(callback),
|
||||||
unsubscribe: (callback: ObserverCallback<T>) => this.unsubscribe(callback),
|
unsubscribe: (callback: ObserverCallback<T>) =>
|
||||||
awaitValue: (value: T) => this.awaitValue(value)
|
this.unsubscribe(callback),
|
||||||
}
|
awaitValue: (value: T) => this.awaitValue(value),
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
10
src/index.ts
10
src/index.ts
@ -1,5 +1,9 @@
|
|||||||
import Lock, { Release } from "./lock";
|
import Lock, { Release } from "./lock";
|
||||||
import Observable, { ObserverCallback, ObserverCallbackCollect, ObservableInterface } from "./observable";
|
import Observable, {
|
||||||
|
ObserverCallback,
|
||||||
|
ObserverCallbackCollect,
|
||||||
|
ObservableInterface,
|
||||||
|
} from "./observable";
|
||||||
import AwaitStore from "./awaiter";
|
import AwaitStore from "./awaiter";
|
||||||
|
|
||||||
export {
|
export {
|
||||||
@ -9,5 +13,5 @@ export {
|
|||||||
ObserverCallback,
|
ObserverCallback,
|
||||||
ObserverCallbackCollect,
|
ObserverCallbackCollect,
|
||||||
ObservableInterface,
|
ObservableInterface,
|
||||||
AwaitStore
|
AwaitStore,
|
||||||
}
|
};
|
||||||
|
@ -32,8 +32,8 @@ export default class Lock {
|
|||||||
return new Promise<Release>((resolve) => {
|
return new Promise<Release>((resolve) => {
|
||||||
this.toCome.push(() => {
|
this.toCome.push(() => {
|
||||||
resolve({ release: this.lock() });
|
resolve({ release: this.lock() });
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,37 +37,31 @@ export default class Observable<T = any> {
|
|||||||
constructor(private collect_intervall: number = 100) {}
|
constructor(private collect_intervall: number = 100) {}
|
||||||
|
|
||||||
subscribe(callback: ObserverCallback<T>) {
|
subscribe(callback: ObserverCallback<T>) {
|
||||||
if (this[ClosedSymbol])
|
if (this[ClosedSymbol]) throw new Error("Observable is closed!");
|
||||||
throw new Error("Observable is closed!");
|
|
||||||
|
|
||||||
let oldcb = this.subscriber.find(e => e === callback);
|
let oldcb = this.subscriber.find((e) => e === callback);
|
||||||
if (!oldcb)
|
if (!oldcb) this.subscriber.push(callback);
|
||||||
this.subscriber.push(callback)
|
|
||||||
|
|
||||||
return () => this.unsubscribe(callback);
|
return () => this.unsubscribe(callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsubscribe(callback: ObserverCallback<T> | ObserverCallbackCollect<T>) {
|
unsubscribe(callback: ObserverCallback<T> | ObserverCallbackCollect<T>) {
|
||||||
if (this[ClosedSymbol])
|
if (this[ClosedSymbol]) return;
|
||||||
return;
|
|
||||||
|
|
||||||
let idx = this.subscriber.findIndex(e => e === callback);
|
let idx = this.subscriber.findIndex((e) => e === callback);
|
||||||
if (idx >= 0) {
|
if (idx >= 0) {
|
||||||
this.subscriber.splice(idx, 1);
|
this.subscriber.splice(idx, 1);
|
||||||
} else {
|
} else {
|
||||||
idx = this.subscriberCollect.findIndex(e => e === callback);
|
idx = this.subscriberCollect.findIndex((e) => e === callback);
|
||||||
if (idx >= 0)
|
if (idx >= 0) this.subscriberCollect.splice(idx, 1);
|
||||||
this.subscriberCollect.splice(idx, 1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
subscribeCollect(callback: ObserverCallbackCollect<T>) {
|
subscribeCollect(callback: ObserverCallbackCollect<T>) {
|
||||||
if (this[ClosedSymbol])
|
if (this[ClosedSymbol]) throw new Error("Observable is closed!");
|
||||||
throw new Error("Observable is closed!");
|
|
||||||
|
|
||||||
let oldcb = this.subscriberCollect.find(e => e === callback);
|
let oldcb = this.subscriberCollect.find((e) => e === callback);
|
||||||
if (!oldcb)
|
if (!oldcb) this.subscriberCollect.push(callback);
|
||||||
this.subscriberCollect.push(callback)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -76,13 +70,15 @@ export default class Observable<T = any> {
|
|||||||
* @returns {object}
|
* @returns {object}
|
||||||
*/
|
*/
|
||||||
getPublicApi(): ObservableInterface<T> {
|
getPublicApi(): ObservableInterface<T> {
|
||||||
if (this[ClosedSymbol])
|
if (this[ClosedSymbol]) throw new Error("Observable is closed!");
|
||||||
throw new Error("Observable is closed!");
|
|
||||||
return {
|
return {
|
||||||
subscribe: (callback: ObserverCallback<T>) => this.subscribe(callback),
|
subscribe: (callback: ObserverCallback<T>) => this.subscribe(callback),
|
||||||
unsubscribe: (callback: ObserverCallback<T> | ObserverCallbackCollect<T>) => this.unsubscribe(callback),
|
unsubscribe: (
|
||||||
subscribeCollect: (callback: ObserverCallbackCollect<T>) => this.subscribeCollect(callback)
|
callback: ObserverCallback<T> | ObserverCallbackCollect<T>
|
||||||
}
|
) => this.unsubscribe(callback),
|
||||||
|
subscribeCollect: (callback: ObserverCallbackCollect<T>) =>
|
||||||
|
this.subscribeCollect(callback),
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -90,22 +86,21 @@ export default class Observable<T = any> {
|
|||||||
* @param data data to be sent
|
* @param data data to be sent
|
||||||
*/
|
*/
|
||||||
send(data: T) {
|
send(data: T) {
|
||||||
if (this[ClosedSymbol])
|
if (this[ClosedSymbol]) throw new Error("Observable is closed!");
|
||||||
throw new Error("Observable is closed!")
|
|
||||||
|
|
||||||
Array.from(this.subscriber.values()).forEach(e => {
|
Array.from(this.subscriber.values()).forEach((e) => {
|
||||||
try {
|
try {
|
||||||
e(data)
|
e(data);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
// Catch error, so it doesn't affect other subscribers
|
// Catch error, so it doesn't affect other subscribers
|
||||||
console.error(err)
|
console.error(err);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.events.push(data);
|
this.events.push(data);
|
||||||
if (!this.timeout) {
|
if (!this.timeout && this.subscriberCollect.length > 0) {
|
||||||
this.timeout = setTimeout(() => {
|
this.timeout = setTimeout(() => {
|
||||||
this.subscriberCollect.forEach(cb => {
|
this.subscriberCollect.forEach((cb) => {
|
||||||
cb(this.events)
|
cb(this.events);
|
||||||
});
|
});
|
||||||
this.events = [];
|
this.events = [];
|
||||||
this.timeout = undefined;
|
this.timeout = undefined;
|
||||||
@ -122,7 +117,6 @@ export default class Observable<T = any> {
|
|||||||
this.subscriber = [];
|
this.subscriber = [];
|
||||||
this.subscriberCollect = [];
|
this.subscriberCollect = [];
|
||||||
this.events = [];
|
this.events = [];
|
||||||
if (this.timeout)
|
if (this.timeout) clearTimeout(this.timeout);
|
||||||
clearTimeout(this.timeout)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user