@deltares/fews-web-oc-utils 0.2.0 → 0.2.1-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/fews-web-oc-utils.umd.js +1 -1
- package/lib/cjs/restservice/piRestService.js +13 -18
- package/lib/cjs/restservice/piRestService.js.map +1 -1
- package/lib/esm/restservice/piRestService.js +13 -18
- package/lib/esm/restservice/piRestService.js.map +1 -1
- package/lib/types/restservice/piRestService.d.ts +5 -4
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["fews-web-oc-utils"]=t():e["fews-web-oc-utils"]=t()}(self,(function(){return(()=>{"use strict";var e={d:(t,r)=>{for(var s in r)e.o(r,s)&&!e.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:r[s]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};e.r(t),e.d(t,{DefaultParser:()=>r,PiRestService:()=>o,RequestOptions:()=>s});class r{async parse(e){return await e.json()}}class s{_mode="cors";_relativeUrl=!0;get relativeUrl(){return this._relativeUrl}set relativeUrl(e){this._relativeUrl=e}get mode(){return this._mode}set mode(e){this._mode=e}}class o{webserviceUrl;
|
|
1
|
+
!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["fews-web-oc-utils"]=t():e["fews-web-oc-utils"]=t()}(self,(function(){return(()=>{"use strict";var e={d:(t,r)=>{for(var s in r)e.o(r,s)&&!e.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:r[s]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};e.r(t),e.d(t,{DefaultParser:()=>r,PiRestService:()=>o,RequestOptions:()=>s});class r{async parse(e){return await e.json()}}class s{_mode="cors";_relativeUrl=!0;get relativeUrl(){return this._relativeUrl}set relativeUrl(e){this._relativeUrl=e}get mode(){return this._mode}set mode(e){this._mode=e}}class o{webserviceUrl;transformRequest;constructor(e,t){if(this.webserviceUrl=e,void 0!==t)this.transformRequest=t;else{async function r(e){return e}this.transformRequest=r}}async getDataWithParser(e,t,r){const s=t.relativeUrl?this.webserviceUrl+e:e,o=new Request(s,{method:"GET"}),a=await fetch(await this.transformRequest(o));return await this.processResponse({},a,s,r)}async getData(e){const t=new s;return t.relativeUrl=!e.startsWith("http"),this.getDataWithParser(e,t,new r)}async processResponse(e,t,r,s){if(e.responseCode=t.status,200!=t.status)return e.errorMessage=t.statusText,e;try{e.data=await s.parse(t)}catch(e){throw e.message+=`\n When loading ${r}.`,e}return e}}return t})()}));
|
|
@@ -5,22 +5,26 @@ const defaultParser_js_1 = require("../parser/defaultParser.js");
|
|
|
5
5
|
const requestOptions_js_1 = require("./requestOptions.js");
|
|
6
6
|
class PiRestService {
|
|
7
7
|
webserviceUrl;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
this._oauth2Token = value;
|
|
11
|
-
}
|
|
12
|
-
constructor(webserviceUrl) {
|
|
8
|
+
transformRequest;
|
|
9
|
+
constructor(webserviceUrl, transformRequestFn) {
|
|
13
10
|
this.webserviceUrl = webserviceUrl;
|
|
11
|
+
if (transformRequestFn !== undefined) {
|
|
12
|
+
this.transformRequest = transformRequestFn;
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
async function transformRequestFn(request) {
|
|
16
|
+
return request;
|
|
17
|
+
}
|
|
18
|
+
this.transformRequest = transformRequestFn;
|
|
19
|
+
}
|
|
14
20
|
}
|
|
15
21
|
async getDataWithParser(url, requestOption, parser) {
|
|
16
22
|
const requestUrl = requestOption.relativeUrl ? this.webserviceUrl + url : url;
|
|
17
23
|
const dataRequestResult = {};
|
|
18
24
|
const requestParameters = {};
|
|
19
25
|
requestParameters.method = "GET";
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
const res = await fetch(requestUrl, requestParameters);
|
|
26
|
+
const request = new Request(requestUrl, requestParameters);
|
|
27
|
+
const res = await fetch(await this.transformRequest(request));
|
|
24
28
|
return await this.processResponse(dataRequestResult, res, requestUrl, parser);
|
|
25
29
|
}
|
|
26
30
|
async getData(url) {
|
|
@@ -43,15 +47,6 @@ class PiRestService {
|
|
|
43
47
|
}
|
|
44
48
|
return dataRequestResult;
|
|
45
49
|
}
|
|
46
|
-
async getDataWithRequestInit(url, requestInit) {
|
|
47
|
-
const dataRequestResult = {};
|
|
48
|
-
if (this._oauth2Token !== undefined) {
|
|
49
|
-
const authorizationHeader = { "Authorization": "Bearer " + this._oauth2Token };
|
|
50
|
-
requestInit.headers = { ...authorizationHeader, ...requestInit.headers };
|
|
51
|
-
}
|
|
52
|
-
const res = await fetch(url, requestInit);
|
|
53
|
-
return await this.processResponse(dataRequestResult, res, url, new defaultParser_js_1.DefaultParser());
|
|
54
|
-
}
|
|
55
50
|
}
|
|
56
51
|
exports.PiRestService = PiRestService;
|
|
57
52
|
//# sourceMappingURL=piRestService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":";;;AAEA,iEAAyD;AACzD,2DAAmD;
|
|
1
|
+
{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":";;;AAEA,iEAAyD;AACzD,2DAAmD;AAMnD,MAAa,aAAa;IACL,aAAa,CAAS;IAC/B,gBAAgB,CAA2B;IAEnD,YAAY,aAAqB,EAAE,kBAA6C;QAC5E,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAClC,IAAI,CAAC,gBAAgB,GAAG,kBAAkB,CAAA;SAC7C;aAAM;YACH,KAAK,UAAU,kBAAkB,CAAC,OAAgB;gBAC9C,OAAO,OAAO,CAAA;YAClB,CAAC;YACD,IAAI,CAAC,gBAAgB,GAAG,kBAAkB,CAAA;SAC7C;IACL,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAI,GAAW,EAAE,aAA6B,EAAE,MAAyB;QACnG,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC9E,MAAM,iBAAiB,GAAG,EAA0B,CAAC;QACrD,MAAM,iBAAiB,GAAG,EAAiB,CAAC;QAC5C,iBAAiB,CAAC,MAAM,GAAG,KAAK,CAAC;QACjC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAC3D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAClF,CAAC;IAEM,KAAK,CAAC,OAAO,CAAI,GAAW;QAC/B,MAAM,aAAa,GAAG,IAAI,kCAAc,EAAE,CAAA;QAC1C,aAAa,CAAC,WAAW,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACnD,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,gCAAa,EAAE,CAAC,CAAC;IAC3E,CAAC;IAEO,KAAK,CAAC,eAAe,CAAI,iBAAuC,EAAE,GAAa,EAAE,GAAW,EAAE,MAAyB;QAC3H,iBAAiB,CAAC,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5C,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;YACnB,iBAAiB,CAAC,YAAY,GAAG,GAAG,CAAC,UAAU,CAAC;YAChD,OAAO,iBAAiB,CAAC;SAC5B;QACD,IAAI;YACA,iBAAiB,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpD;QAAC,OAAO,CAAM,EAAE;YACb,CAAC,CAAC,OAAO,IAAI,mBAAmB,GAAG,GAAG,CAAA;YACtC,MAAM,CAAC,CAAC;SACX;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;CACJ;AA9CD,sCA8CC"}
|
|
@@ -2,22 +2,26 @@ import { DefaultParser } from "../parser/defaultParser.js";
|
|
|
2
2
|
import { RequestOptions } from "./requestOptions.js";
|
|
3
3
|
export class PiRestService {
|
|
4
4
|
webserviceUrl;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
this._oauth2Token = value;
|
|
8
|
-
}
|
|
9
|
-
constructor(webserviceUrl) {
|
|
5
|
+
transformRequest;
|
|
6
|
+
constructor(webserviceUrl, transformRequestFn) {
|
|
10
7
|
this.webserviceUrl = webserviceUrl;
|
|
8
|
+
if (transformRequestFn !== undefined) {
|
|
9
|
+
this.transformRequest = transformRequestFn;
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
async function transformRequestFn(request) {
|
|
13
|
+
return request;
|
|
14
|
+
}
|
|
15
|
+
this.transformRequest = transformRequestFn;
|
|
16
|
+
}
|
|
11
17
|
}
|
|
12
18
|
async getDataWithParser(url, requestOption, parser) {
|
|
13
19
|
const requestUrl = requestOption.relativeUrl ? this.webserviceUrl + url : url;
|
|
14
20
|
const dataRequestResult = {};
|
|
15
21
|
const requestParameters = {};
|
|
16
22
|
requestParameters.method = "GET";
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
}
|
|
20
|
-
const res = await fetch(requestUrl, requestParameters);
|
|
23
|
+
const request = new Request(requestUrl, requestParameters);
|
|
24
|
+
const res = await fetch(await this.transformRequest(request));
|
|
21
25
|
return await this.processResponse(dataRequestResult, res, requestUrl, parser);
|
|
22
26
|
}
|
|
23
27
|
async getData(url) {
|
|
@@ -40,14 +44,5 @@ export class PiRestService {
|
|
|
40
44
|
}
|
|
41
45
|
return dataRequestResult;
|
|
42
46
|
}
|
|
43
|
-
async getDataWithRequestInit(url, requestInit) {
|
|
44
|
-
const dataRequestResult = {};
|
|
45
|
-
if (this._oauth2Token !== undefined) {
|
|
46
|
-
const authorizationHeader = { "Authorization": "Bearer " + this._oauth2Token };
|
|
47
|
-
requestInit.headers = { ...authorizationHeader, ...requestInit.headers };
|
|
48
|
-
}
|
|
49
|
-
const res = await fetch(url, requestInit);
|
|
50
|
-
return await this.processResponse(dataRequestResult, res, url, new DefaultParser());
|
|
51
|
-
}
|
|
52
47
|
}
|
|
53
48
|
//# sourceMappingURL=piRestService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAMnD,MAAM,OAAO,aAAa;IACL,aAAa,CAAS;IAC/B,gBAAgB,CAA2B;IAEnD,YAAY,aAAqB,EAAE,kBAA6C;QAC5E,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAClC,IAAI,CAAC,gBAAgB,GAAG,kBAAkB,CAAA;SAC7C;aAAM;YACH,KAAK,UAAU,kBAAkB,CAAC,OAAgB;gBAC9C,OAAO,OAAO,CAAA;YAClB,CAAC;YACD,IAAI,CAAC,gBAAgB,GAAG,kBAAkB,CAAA;SAC7C;IACL,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAI,GAAW,EAAE,aAA6B,EAAE,MAAyB;QACnG,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC9E,MAAM,iBAAiB,GAAG,EAA0B,CAAC;QACrD,MAAM,iBAAiB,GAAG,EAAiB,CAAC;QAC5C,iBAAiB,CAAC,MAAM,GAAG,KAAK,CAAC;QACjC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAC3D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAClF,CAAC;IAEM,KAAK,CAAC,OAAO,CAAI,GAAW;QAC/B,MAAM,aAAa,GAAG,IAAI,cAAc,EAAE,CAAA;QAC1C,aAAa,CAAC,WAAW,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACnD,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,aAAa,EAAE,CAAC,CAAC;IAC3E,CAAC;IAEO,KAAK,CAAC,eAAe,CAAI,iBAAuC,EAAE,GAAa,EAAE,GAAW,EAAE,MAAyB;QAC3H,iBAAiB,CAAC,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5C,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;YACnB,iBAAiB,CAAC,YAAY,GAAG,GAAG,CAAC,UAAU,CAAC;YAChD,OAAO,iBAAiB,CAAC;SAC5B;QACD,IAAI;YACA,iBAAiB,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpD;QAAC,OAAO,CAAM,EAAE;YACb,CAAC,CAAC,OAAO,IAAI,mBAAmB,GAAG,GAAG,CAAA;YACtC,MAAM,CAAC,CAAC;SACX;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;CACJ"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import DataRequestResult from "./dataRequestResult.js";
|
|
2
2
|
import { ResponseParser } from "../parser/responseParser.js";
|
|
3
3
|
import { RequestOptions } from "./requestOptions.js";
|
|
4
|
+
export interface TransformRequestFunction {
|
|
5
|
+
(request: Request): Promise<Request>;
|
|
6
|
+
}
|
|
4
7
|
export declare class PiRestService {
|
|
5
8
|
private readonly webserviceUrl;
|
|
6
|
-
private
|
|
7
|
-
|
|
8
|
-
constructor(webserviceUrl: string);
|
|
9
|
+
private transformRequest;
|
|
10
|
+
constructor(webserviceUrl: string, transformRequestFn?: TransformRequestFunction);
|
|
9
11
|
getDataWithParser<T>(url: string, requestOption: RequestOptions, parser: ResponseParser<T>): Promise<DataRequestResult<T>>;
|
|
10
12
|
getData<T>(url: string): Promise<DataRequestResult<T>>;
|
|
11
13
|
private processResponse;
|
|
12
|
-
getDataWithRequestInit<T>(url: string, requestInit: RequestInit): Promise<DataRequestResult<T>>;
|
|
13
14
|
}
|