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.

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

ResponseStream to extend Stream<response> #548

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions http/src/http-driver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
RequestOptions,
RequestInput,
Response,
ResponseMemoryStream,
} from './interfaces';

function preprocessReqOptions(reqOptions: RequestOptions): RequestOptions {
Expand Down Expand Up @@ -130,8 +131,6 @@ function normalizeRequestInput(reqInput: RequestInput): RequestOptions {
}
}

export type ResponseMemoryStream = MemoryStream<Response> & ResponseStream;

function requestInputToResponse$(reqInput: RequestInput): ResponseMemoryStream {
let response$ = createResponse$(reqInput).remember();
const reqOptions = softNormalizeRequestInput(reqInput);
Expand Down
7 changes: 5 additions & 2 deletions http/src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,13 @@ export interface RequestOptions {

export type RequestInput = RequestOptions | string;

export interface ResponseStream {
export interface RequestBearing {
request: RequestOptions;
}

export type ResponseStream = Stream<Response> & RequestBearing;
export type ResponseMemoryStream = MemoryStream<Response> & RequestBearing;

export interface Response {
text?: string;
body?: Object;
Expand All @@ -51,7 +54,7 @@ export interface Response {

export interface HTTPSource {
filter<S extends HTTPSource>(predicate: (request: RequestOptions) => boolean): S;
select(category?: string): Stream<MemoryStream<Response> & ResponseStream>;
select(category?: string): Stream<ResponseMemoryStream>;
isolateSource(source: HTTPSource, scope: string): HTTPSource;
isolateSink(sink: Stream<RequestInput>, scope: string): Stream<RequestInput>;
}