diff --git a/dist/error.d.ts b/dist/error.d.ts index 09f03e6..dce0d99 100644 --- a/dist/error.d.ts +++ b/dist/error.d.ts @@ -1,2 +1,2 @@ export declare const ERR_NOT_READY = "NOT_READY"; -//# sourceMappingURL=error.d.ts.map \ No newline at end of file +//# sourceMappingURL=error.d.ts.map diff --git a/dist/index.d.ts b/dist/index.d.ts index 5597d5d..944f13c 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -2,4 +2,4 @@ import RpcNetwork from "./rpcNetwork.js"; import RpcQuery from "./rpcNetwork.js"; export * from "./types.js"; export { RpcNetwork, RpcQuery }; -//# sourceMappingURL=index.d.ts.map \ No newline at end of file +//# sourceMappingURL=index.d.ts.map diff --git a/dist/rpcNetwork.d.ts b/dist/rpcNetwork.d.ts index 89ef86a..e8fbc3e 100644 --- a/dist/rpcNetwork.d.ts +++ b/dist/rpcNetwork.d.ts @@ -1,30 +1,35 @@ import RpcQuery from "./rpcQuery.js"; export default class RpcNetwork { - constructor(dht?: any); - private _dht; - get dht(): any; - private _majorityThreshold; - get majorityThreshold(): number; - set majorityThreshold(value: number); - private _maxTtl; - get maxTtl(): number; - set maxTtl(value: number); - private _queryTimeout; - get queryTimeout(): number; - set queryTimeout(value: number); - private _relayTimeout; - get relayTimeout(): number; - set relayTimeout(value: number); - private _relays; - get relays(): string[]; - private _ready?; - get ready(): Promise; - private _force; - get force(): boolean; - set force(value: boolean); - addRelay(pubkey: string): void; - removeRelay(pubkey: string): boolean; - clearRelays(): void; - query(query: string, chain: string, data?: object | any[], force?: boolean): RpcQuery; + constructor(dht?: any); + private _dht; + get dht(): any; + private _majorityThreshold; + get majorityThreshold(): number; + set majorityThreshold(value: number); + private _maxTtl; + get maxTtl(): number; + set maxTtl(value: number); + private _queryTimeout; + get queryTimeout(): number; + set queryTimeout(value: number); + private _relayTimeout; + get relayTimeout(): number; + set relayTimeout(value: number); + private _relays; + get relays(): string[]; + private _ready?; + get ready(): Promise; + private _bypassCache; + get bypassCache(): boolean; + set bypassCache(value: boolean); + addRelay(pubkey: string): void; + removeRelay(pubkey: string): boolean; + clearRelays(): void; + query( + query: string, + chain: string, + data?: object | any[], + bypassCache?: boolean + ): RpcQuery; } -//# sourceMappingURL=rpcNetwork.d.ts.map \ No newline at end of file +//# sourceMappingURL=rpcNetwork.d.ts.map diff --git a/dist/rpcNetwork.d.ts.map b/dist/rpcNetwork.d.ts.map index c518f70..746b1f7 100644 --- a/dist/rpcNetwork.d.ts.map +++ b/dist/rpcNetwork.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"rpcNetwork.d.ts","sourceRoot":"","sources":["../src/rpcNetwork.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAIrC,MAAM,CAAC,OAAO,OAAO,UAAU;gBACjB,GAAG,MAAY;IAI3B,OAAO,CAAC,IAAI,CAAa;IAEzB,IAAI,GAAG,QAEN;IAED,OAAO,CAAC,kBAAkB,CAAQ;IAElC,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAElC;IAED,OAAO,CAAC,OAAO,CAAgB;IAE/B,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAEvB;IAED,OAAO,CAAC,aAAa,CAAM;IAE3B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,OAAO,CAAC,aAAa,CAAK;IAE1B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,OAAO,CAAC,OAAO,CAAgB;IAE/B,IAAI,MAAM,IAAI,MAAM,EAAE,CAErB;IAED,OAAO,CAAC,MAAM,CAAC,CAAgB;IAE/B,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAKzB;IAED,OAAO,CAAC,MAAM,CAAkB;IAEhC,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,EAEvB;IAEM,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK9B,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAWpC,WAAW,IAAI,IAAI;IAInB,KAAK,CACV,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAAM,GAAG,GAAG,EAAO,EACzB,KAAK,GAAE,OAAe,GACrB,QAAQ;CAQZ"} \ No newline at end of file +{"version":3,"file":"rpcNetwork.d.ts","sourceRoot":"","sources":["../src/rpcNetwork.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAIrC,MAAM,CAAC,OAAO,OAAO,UAAU;gBACjB,GAAG,MAAY;IAI3B,OAAO,CAAC,IAAI,CAAa;IAEzB,IAAI,GAAG,QAEN;IAED,OAAO,CAAC,kBAAkB,CAAQ;IAElC,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAElC;IAED,OAAO,CAAC,OAAO,CAAgB;IAE/B,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAEvB;IAED,OAAO,CAAC,aAAa,CAAM;IAE3B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,OAAO,CAAC,aAAa,CAAK;IAE1B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,OAAO,CAAC,OAAO,CAAgB;IAE/B,IAAI,MAAM,IAAI,MAAM,EAAE,CAErB;IAED,OAAO,CAAC,MAAM,CAAC,CAAgB;IAE/B,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAKzB;IAED,OAAO,CAAC,YAAY,CAAkB;IAEtC,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,EAE7B;IAEM,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK9B,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAWpC,WAAW,IAAI,IAAI;IAInB,KAAK,CACV,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAAM,GAAG,GAAG,EAAO,EACzB,WAAW,GAAE,OAAe,GAC3B,QAAQ;CAQZ"} \ No newline at end of file diff --git a/dist/rpcNetwork.js b/dist/rpcNetwork.js index 08b7f0d..84ee115 100644 --- a/dist/rpcNetwork.js +++ b/dist/rpcNetwork.js @@ -48,12 +48,12 @@ export default class RpcNetwork { } return this._ready; } - _force = false; - get force() { - return this._force; + _bypassCache = false; + get bypassCache() { + return this._bypassCache; } - set force(value) { - this._force = value; + set bypassCache(value) { + this._bypassCache = value; } addRelay(pubkey) { this._relays.push(pubkey); @@ -70,12 +70,12 @@ export default class RpcNetwork { clearRelays() { this._relays = []; } - query(query, chain, data = {}, force = false) { + query(query, chain, data = {}, bypassCache = false) { return new RpcQuery(this, { query, chain, data, - force: force || this._force, + bypassCache: bypassCache || this._bypassCache, }); } } diff --git a/dist/rpcQuery.d.ts b/dist/rpcQuery.d.ts index 1845c44..acc57b6 100644 --- a/dist/rpcQuery.d.ts +++ b/dist/rpcQuery.d.ts @@ -1,23 +1,23 @@ import RpcNetwork from "./rpcNetwork.js"; -import { RPCRequest } from "./types"; +import { RPCRequest } from "./types.js"; export default class RpcQuery { - private _network; - private _query; - private _promise?; - private _timeoutTimer?; - private _timeout; - private _completed; - private _responses; - private _promiseResolve?; - private _maxTries; - private _tries; - constructor(network: RpcNetwork, query: RPCRequest); - get result(): Promise; - private handeTimeout; - private resolve; - private init; - private queryRelay; - private checkResponses; - private retry; + private _network; + private _query; + private _promise?; + private _timeoutTimer?; + private _timeout; + private _completed; + private _responses; + private _promiseResolve?; + private _maxTries; + private _tries; + constructor(network: RpcNetwork, query: RPCRequest); + get result(): Promise; + private handeTimeout; + private resolve; + private init; + private queryRelay; + private checkResponses; + private retry; } -//# sourceMappingURL=rpcQuery.d.ts.map \ No newline at end of file +//# sourceMappingURL=rpcQuery.d.ts.map diff --git a/dist/rpcQuery.d.ts.map b/dist/rpcQuery.d.ts.map index 9020a6d..d7be119 100644 --- a/dist/rpcQuery.d.ts.map +++ b/dist/rpcQuery.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"rpcQuery.d.ts","sourceRoot":"","sources":["../src/rpcQuery.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAe,MAAM,SAAS,CAAC;AAKlD,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAe;IAChC,OAAO,CAAC,aAAa,CAAC,CAAM;IAC5B,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,UAAU,CAAwC;IAC1D,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,MAAM,CAAK;gBAEP,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU;IAMlD,IAAI,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,CAEzB;IAED,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,OAAO;YAQD,IAAI;YA2BJ,UAAU;IAgCxB,OAAO,CAAC,cAAc;IAqDtB,OAAO,CAAC,KAAK;CASd"} \ No newline at end of file +{"version":3,"file":"rpcQuery.d.ts","sourceRoot":"","sources":["../src/rpcQuery.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAe,MAAM,YAAY,CAAC;AAKrD,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAe;IAChC,OAAO,CAAC,aAAa,CAAC,CAAM;IAC5B,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,UAAU,CAAwC;IAC1D,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,MAAM,CAAK;gBAEP,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU;IAMlD,IAAI,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,CAEzB;IAED,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,OAAO;YAQD,IAAI;YA2BJ,UAAU;IAkCxB,OAAO,CAAC,cAAc;IAqDtB,OAAO,CAAC,KAAK;CASd"} \ No newline at end of file diff --git a/dist/rpcQuery.js b/dist/rpcQuery.js index 6644a4b..509388c 100644 --- a/dist/rpcQuery.js +++ b/dist/rpcQuery.js @@ -64,7 +64,9 @@ export default class RpcQuery { return new Promise((resolve, reject) => { let timer; socket.on("data", (res) => { - clearTimeout(timer); + if (timer && timer.close) { + clearTimeout(timer); + } socket.end(); const response = unpack(res); if (response && response.error) { diff --git a/dist/types.d.ts b/dist/types.d.ts index 70bf4c7..0a98375 100644 --- a/dist/types.d.ts +++ b/dist/types.d.ts @@ -1,13 +1,12 @@ export interface RPCRequest { - force: boolean; - chain: string; - query: string; - data: any; + bypassCache: boolean; + chain: string; + query: string; + data: any; } export interface RPCResponse { - updated: number; - data: any | { - error: string | boolean; - }; + updated: number; + data: any; + error?: string; } -//# sourceMappingURL=types.d.ts.map \ No newline at end of file +//# sourceMappingURL=types.d.ts.map diff --git a/dist/types.d.ts.map b/dist/types.d.ts.map index 55dbfb1..70f9a46 100644 --- a/dist/types.d.ts.map +++ b/dist/types.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;CACX;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EACA,GAAG,GACH;QACE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;KACzB,CAAC;CACP"} \ No newline at end of file +{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;CACX;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;CACf"} \ No newline at end of file diff --git a/dist/util.d.ts b/dist/util.d.ts index 79a76b8..a8a14da 100644 --- a/dist/util.d.ts +++ b/dist/util.d.ts @@ -1,2 +1,2 @@ export declare function flatten(target: any, opts?: any): any[]; -//# sourceMappingURL=util.d.ts.map \ No newline at end of file +//# sourceMappingURL=util.d.ts.map