Compare commits

..

4 Commits

Author SHA1 Message Date
d1f3117376 3.0.7 2022-05-29 21:29:43 +02:00
14cca11c55 fix(core): update 2022-05-29 21:29:42 +02:00
f4374942ad 3.0.6 2022-05-29 20:53:16 +02:00
12dc003226 fix(core): update 2022-05-29 20:53:16 +02:00
4 changed files with 14 additions and 9 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "@pushrocks/webrequest",
"version": "3.0.5",
"version": "3.0.7",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@pushrocks/webrequest",
"version": "3.0.5",
"version": "3.0.7",
"license": "MIT",
"dependencies": {
"@pushrocks/smartdelay": "^2.0.13",

View File

@ -1,6 +1,6 @@
{
"name": "@pushrocks/webrequest",
"version": "3.0.5",
"version": "3.0.7",
"private": false,
"description": "securely request from browsers",
"main": "dist_ts/index.js",

View File

@ -3,6 +3,6 @@
*/
export const commitinfo = {
name: '@pushrocks/webrequest',
version: '3.0.5',
version: '3.0.7',
description: 'securely request from browsers'
}

View File

@ -44,11 +44,12 @@ export class WebRequest {
/**
* postJson
*/
public async postJson(urlArg: string, requestBody?: any, useStoreAsFallback: boolean = false) {
public async postJson(urlArg: string, requestBody?: any, useCacheArg: boolean = false) {
await WebRequest.neededPolyfillsLoadedDeferred.promise;
const response: Response = await this.request(urlArg, {
body: plugins.smartjson.stringify(requestBody),
method: 'POST',
useCache: useCacheArg,
});
const responseText = await response.text();
const responseResult = plugins.smartjson.parse(responseText);
@ -102,12 +103,12 @@ export class WebRequest {
let cachedResponseDeferred = plugins.smartpromise.defer<Response>();
let cacheUsed = false;
if (optionsArg.useCache && this.cacheStore.check(urlArg)) {
const responseBuffer: ArrayBuffer = await this.cacheStore.get(urlArg)
const responseBuffer: ArrayBuffer = await this.cacheStore.get(urlArg);
cachedResponseDeferred.resolve(new Response(responseBuffer, {}));
} else {
cachedResponseDeferred.resolve(null);
}
const response: Response = await fetch(urlArg, {
let response: Response = await fetch(urlArg, {
signal: controller.signal,
method: optionsArg.method,
headers: {
@ -115,8 +116,8 @@ export class WebRequest {
...(optionsArg.headers || {}),
},
body: optionsArg.body,
}).catch(async err => {
if (optionsArg.useCache && await cachedResponseDeferred.promise) {
}).catch(async (err) => {
if (optionsArg.useCache && (await cachedResponseDeferred.promise)) {
cacheUsed = true;
const cachedResponse = cachedResponseDeferred.promise;
return cachedResponse;
@ -124,6 +125,10 @@ export class WebRequest {
return err;
}
});
if (optionsArg.useCache && (await cachedResponseDeferred.promise) && response.status === 500) {
cacheUsed = true;
response = await cachedResponseDeferred.promise;
}
if (!cacheUsed && optionsArg.useCache && response.status < 300) {
const buffer = await response.clone().arrayBuffer();
await this.cacheStore.set(urlArg, buffer);