Skip to content
This repository was archived by the owner on May 11, 2021. It is now read-only.

Commit d83c851

Browse files
akanassakanass
committed
release(version): v3.3.0
1 parent b55bf51 commit d83c851

File tree

4 files changed

+100
-95
lines changed

4 files changed

+100
-95
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,10 @@ To set up your development environment:
493493

494494
## Change History
495495

496+
* v3.3.0 (2019-07-15)
497+
* Merge [PR #30](https://github.com/akanass/rx-http-request/pull/30)
498+
* Upgrade all packages' versions
499+
* Documentation
496500
* v3.2.0 (2019-07-08)
497501
* Upgrade all packages' versions
498502
* Fix tests

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@akanass/rx-http-request",
3-
"version": "3.2.0",
3+
"version": "3.3.0",
44
"description": "The world-famous HTTP client Request now RxJS compliant, wrote in Typescript | ES6 for client and server side.",
55
"main": "commonjs/index.js",
66
"module": "esm5/index.js",
@@ -50,15 +50,15 @@
5050
},
5151
"homepage": "https://github.com/akanass/rx-http-request#readme",
5252
"dependencies": {
53-
"@types/node": "^12.0.12",
54-
"@types/request": "^2.48.1",
53+
"@types/node": "^12.6.2",
54+
"@types/request": "^2.48.2",
5555
"request": "^2.88.0"
5656
},
5757
"devDependencies": {
5858
"@types/fs-extra": "^8.0.0",
5959
"@types/jest": "^24.0.15",
6060
"browserify": "^16.3.0",
61-
"coveralls": "^3.0.4",
61+
"coveralls": "^3.0.5",
6262
"exorcist": "^1.0.1",
6363
"fs-extra": "^8.1.0",
6464
"jest": "^24.8.0",
@@ -67,7 +67,7 @@
6767
"ts-jest": "^24.0.2",
6868
"ts-node": "^8.3.0",
6969
"tslint": "^5.18.0",
70-
"typescript": "^3.5.2"
70+
"typescript": "^3.5.3"
7171
},
7272
"peerDependencies": {
7373
"rxjs": "^6.5.2"

‎src/lib/rx-http-request.ts‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
import * as request from 'request';
33
import { Buffer } from 'buffer';
44

5+
import { merge, Observable, of, throwError } from 'rxjs';
6+
import { filter, flatMap, map, tap } from 'rxjs/operators';
7+
8+
9+
import { Cookie, RxCookieJar } from './rx-cookie-jar';
510
import RequestAPI = request.RequestAPI;
611
import Request = request.Request;
712
import CoreOptions = request.CoreOptions;
813
import RequiredUriUrl = request.RequiredUriUrl;
914
import RequestResponse = request.RequestResponse;
1015
import RequestCallback = request.RequestCallback;
1116

12-
import { Observable , of , merge, throwError } from 'rxjs';
13-
import { filter, tap, flatMap, map } from 'rxjs/operators';
14-
15-
16-
import { RxCookieJar, Cookie } from './rx-cookie-jar';
17-
1817
// native javascript's objects typings
1918
declare const Object: any;
2019

@@ -85,8 +84,8 @@ export class RxHttpRequest {
8584
* @return {Observable<RxHttpRequestResponse<R>>}
8685
*/
8786
get<R = any>(uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<R>> {
88-
return <Observable<RxHttpRequestResponse<R>>> this._call<R>('get', <string> uri,
89-
<CoreOptions> Object.assign({}, options || {}));
87+
return <Observable<RxHttpRequestResponse<R>>>this._call<R>('get', <string>uri,
88+
<CoreOptions>Object.assign({}, options || {}));
9089
}
9190

9291
/**
@@ -95,19 +94,19 @@ export class RxHttpRequest {
9594
* @param uri
9695
* @param options
9796
*
98-
* @return {Observable<RxHttpRequestResponse<R>>}
97+
* @return {Observable<RxHttpRequestResponse<Buffer>>}
9998
*/
100-
getBuffer<R = Buffer>(uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<R>> {
101-
return <Observable<RxHttpRequestResponse<R>>> Observable.create((observer) => {
99+
getBuffer<R = Buffer>(uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<Buffer>> {
100+
return <Observable<RxHttpRequestResponse<Buffer>>>new Observable((observer) => {
102101
try {
103-
this._request.get(<string> uri, <CoreOptions> Object.assign({}, options || {}))
102+
this._request.get(<string>uri, <CoreOptions>Object.assign({}, options || {}))
104103
.on('response', (response: RequestResponse) => {
105104
let res: Buffer;
106105
response.on('data', (data: Buffer) => res = res ? Buffer.concat([].concat(res, data)) : data);
107-
response.on('end', _ => {
108-
observer.next(<RxHttpRequestResponse<Buffer>> Object.assign({}, {
109-
response: <RequestResponse> response,
110-
body: <Buffer> res
106+
response.on('end', () => {
107+
observer.next(<RxHttpRequestResponse<Buffer>>Object.assign({}, {
108+
response: <RequestResponse>response,
109+
body: <Buffer>res
111110
}));
112111
observer.complete();
113112
});
@@ -128,8 +127,8 @@ export class RxHttpRequest {
128127
* @return {Observable<RxHttpRequestResponse<R>>}
129128
*/
130129
post<R = any>(uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<R>> {
131-
return <Observable<RxHttpRequestResponse<R>>> this._call<R>('post', <string> uri,
132-
<CoreOptions> Object.assign({}, options || {}));
130+
return <Observable<RxHttpRequestResponse<R>>>this._call<R>('post', <string>uri,
131+
<CoreOptions>Object.assign({}, options || {}));
133132
}
134133

135134
/**
@@ -141,8 +140,8 @@ export class RxHttpRequest {
141140
* @return {Observable<RxHttpRequestResponse<R>>}
142141
*/
143142
put<R = any>(uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<R>> {
144-
return <Observable<RxHttpRequestResponse<R>>> this._call<R>('put', <string> uri,
145-
<CoreOptions> Object.assign({}, options || {}));
143+
return <Observable<RxHttpRequestResponse<R>>>this._call<R>('put', <string>uri,
144+
<CoreOptions>Object.assign({}, options || {}));
146145
}
147146

148147
/**
@@ -154,8 +153,8 @@ export class RxHttpRequest {
154153
* @return {Observable<RxHttpRequestResponse<R>>}
155154
*/
156155
patch<R = any>(uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<R>> {
157-
return <Observable<RxHttpRequestResponse<R>>> this._call<R>('patch', <string> uri,
158-
<CoreOptions> Object.assign({}, options || {}));
156+
return <Observable<RxHttpRequestResponse<R>>>this._call<R>('patch', <string>uri,
157+
<CoreOptions>Object.assign({}, options || {}));
159158
}
160159

161160
/**
@@ -167,8 +166,8 @@ export class RxHttpRequest {
167166
* @return {Observable<RxHttpRequestResponse<R>>}
168167
*/
169168
delete<R = any>(uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<R>> {
170-
return <Observable<RxHttpRequestResponse<R>>> this._call<R>('del', <string> uri,
171-
<CoreOptions> Object.assign({}, options || {}));
169+
return <Observable<RxHttpRequestResponse<R>>>this._call<R>('del', <string>uri,
170+
<CoreOptions>Object.assign({}, options || {}));
172171
}
173172

174173
/**
@@ -180,8 +179,8 @@ export class RxHttpRequest {
180179
* @return {Observable<RxHttpRequestResponse<R>>}
181180
*/
182181
head<R = any>(uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<R>> {
183-
return <Observable<RxHttpRequestResponse<R>>> this._call<R>('head', <string> uri,
184-
<CoreOptions> Object.assign({}, options || {}));
182+
return <Observable<RxHttpRequestResponse<R>>>this._call<R>('head', <string>uri,
183+
<CoreOptions>Object.assign({}, options || {}));
185184
}
186185

187186
/**
@@ -193,8 +192,8 @@ export class RxHttpRequest {
193192
* @return {Observable<RxHttpRequestResponse<R>>}
194193
*/
195194
options<R = any>(uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<R>> {
196-
return <Observable<RxHttpRequestResponse<R>>> this._call<R>('options', <string> uri,
197-
<CoreOptions> Object.assign({}, options || {}));
195+
return <Observable<RxHttpRequestResponse<R>>>this._call<R>('options', <string>uri,
196+
<CoreOptions>Object.assign({}, options || {}));
198197
}
199198

200199
/**
@@ -203,7 +202,7 @@ export class RxHttpRequest {
203202
* @return {Observable<RxCookieJar>}
204203
*/
205204
jar(): Observable<RxCookieJar> {
206-
return <Observable<RxCookieJar>> of(new RxCookieJar(this._request.jar()));
205+
return <Observable<RxCookieJar>>of(new RxCookieJar(this._request.jar()));
207206
}
208207

209208
/**
@@ -214,7 +213,7 @@ export class RxHttpRequest {
214213
* @return {Observable<Cookie>}
215214
*/
216215
cookie(str: string): Observable<Cookie> {
217-
return <Observable<Cookie>> of(this._request.cookie(<string> str));
216+
return <Observable<Cookie>>of(this._request.cookie(<string>str));
218217
}
219218

220219
/**
@@ -229,9 +228,9 @@ export class RxHttpRequest {
229228
* @private
230229
*/
231230
private _call<R = any>(method: string, uri: string, options?: CoreOptions): Observable<RxHttpRequestResponse<R>> {
232-
return <Observable<RxHttpRequestResponse<R>>> Observable.create((observer) => {
233-
of([].concat(<string> uri, <CoreOptions> Object.assign({}, options || {}),
234-
<RequestCallback> ((error: any, response: RequestResponse, body: R) => {
231+
return <Observable<RxHttpRequestResponse<R>>>new Observable((observer) => {
232+
of([].concat(<string>uri, <CoreOptions>Object.assign({}, options || {}),
233+
<RequestCallback>((error: any, response: RequestResponse, body: R) => {
235234
of(of(error))
236235
.pipe(
237236
flatMap(obsError =>
@@ -244,29 +243,29 @@ export class RxHttpRequest {
244243
obsError
245244
.pipe(
246245
filter(_ => !_),
247-
flatMap(_ =>
246+
flatMap(() =>
248247
!!response ?
249-
<Observable<RequestResponse>> of(response) :
248+
<Observable<RequestResponse>>of(response) :
250249
throwError(new Error('No response found'))
251250
),
252251
flatMap(_ =>
253252
of({
254-
response: <RequestResponse> _,
255-
body: <R> body
253+
response: <RequestResponse>_,
254+
body: <R>body
256255
})
257256
),
258257
tap(_ => observer.next(_)),
259-
tap(_ => observer.complete())
258+
tap(() => observer.complete())
260259
)
261260
)
262261
)
263262
)
264-
.subscribe(undefined, err => observer.error(err));
263+
.subscribe(() => undefined, err => observer.error(err));
265264
})))
266265
.pipe(
267-
map(_ => this._request[<string> method].apply(<RequestAPI<Request, CoreOptions, RequiredUriUrl>> this._request, _)),
266+
map(_ => this._request[<string>method].apply(<RequestAPI<Request, CoreOptions, RequiredUriUrl>>this._request, _)),
268267
)
269-
.subscribe(undefined, err => observer.error(err));
268+
.subscribe(() => undefined, err => observer.error(err));
270269
});
271270
}
272271

0 commit comments

Comments
 (0)