Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix responseCode in Request

Browse source
This commit is contained in:
RMidhunSuresh 2022-02-04 15:41:37 +05:30
parent b6e1d4a7d5
commit 3d8b9cce41
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/matrix/net/RequestScheduler.ts
View file

@ -25,25 +25,33 @@ import type {IHomeServerRequest} from "./HomeServerRequest.js";
class Request implements IHomeServerRequest { class Request implements IHomeServerRequest {
public readonly methodName: string; public readonly methodName: string;
public readonly args: any[]; public readonly args: any[];
public resolve: (result: any) => void; private responseResolve: (result: any) => void;
public reject: (error: Error) => void; public responseReject: (error: Error) => void;
public requestResult?: IHomeServerRequest; private responseCodeResolve: (result: any) => void;
private responseCodeReject: (result: any) => void;
private _requestResult?: IHomeServerRequest;
private readonly _responsePromise: Promise<any>; private readonly _responsePromise: Promise<any>;
private readonly _responseCodePromise: Promise<any>;
constructor(methodName: string, args: any[]) { constructor(methodName: string, args: any[]) {
this.methodName = methodName; this.methodName = methodName;
this.args = args; this.args = args;
this._responsePromise = new Promise((resolve, reject) => { this._responsePromise = new Promise((resolve, reject) => {
this.resolve = resolve; this.responseResolve = resolve;
this.reject = reject; this.responseReject = reject;
});
this._responseCodePromise = new Promise((resolve, reject) => {
this.responseCodeResolve = resolve;
this.responseCodeReject = reject;
}); });
} }
abort(): void { abort(): void {
if (this.requestResult) { if (this._requestResult) {
this.requestResult.abort(); this._requestResult.abort();
} else { } else {
this.reject(new AbortError()); this.responseReject(new AbortError());
this.responseCodeReject(new AbortError());
} }
} }
@ -51,11 +59,18 @@ class Request implements IHomeServerRequest {
return this._responsePromise; return this._responsePromise;
} }
async responseCode(): Promise<number> { responseCode(): Promise<number> {
let resolve; return this._responseCodePromise;
const promise: Promise<number> = new Promise(r => resolve = r); }
this.requestResult?.responseCode().then(code => resolve(code));
return promise; set requestResult(result) {
this._requestResult = result;
this._requestResult?.response().then(response => this.responseResolve(response));
this._requestResult?.responseCode().then(response => this.responseCodeResolve(response));
}
get requestResult() {
return this._requestResult;
} }
} }
@ -121,8 +136,6 @@ export class RequestScheduler {
].apply(this._hsApi, request.args); ].apply(this._hsApi, request.args);
// so the request can be aborted // so the request can be aborted
request.requestResult = requestResult; request.requestResult = requestResult;
const response = await requestResult.response();
request.resolve(response);
return; return;
} catch (err) { } catch (err) {
if ( if (
@ -142,7 +155,7 @@ export class RequestScheduler {
await retryDelay.waitForRetry(); await retryDelay.waitForRetry();
} }
} else { } else {
request.reject(err); request.responseReject(err);
return; return;
} }
} }