push.rocks/webrequest
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2022-08-05 11:53:42 +02:00
parent d410517c8b
commit 8e079cfdfd
4 changed files with 1541 additions and 1619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3114
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@ -13,22 +13,20 @@
"build": "(tsbuild --web --allowimplicitany && tsbundle npm)" "build": "(tsbuild --web --allowimplicitany && tsbundle npm)"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.63", "@gitzone/tsbuild": "^2.1.65",
"@gitzone/tsbundle": "^2.0.6", "@gitzone/tsbundle": "^2.0.7",
"@gitzone/tstest": "^1.0.72", "@gitzone/tstest": "^1.0.73",
"@pushrocks/smartexpress": "^4.0.5", "@pushrocks/smartexpress": "^4.0.21",
"@pushrocks/tapbundle": "^5.0.4", "@pushrocks/tapbundle": "^5.0.4",
"@types/node": "^18.6.2", "@types/node": "^18.6.4"
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0"
}, },
"dependencies": { "dependencies": {
"@adobe/helix-fetch": "^3.1.1",
"@pushrocks/smartdelay": "^2.0.13", "@pushrocks/smartdelay": "^2.0.13",
"@pushrocks/smartenv": "^5.0.2", "@pushrocks/smartenv": "^5.0.2",
"@pushrocks/smartjson": "^5.0.1", "@pushrocks/smartjson": "^5.0.1",
"@pushrocks/smartpromise": "^3.1.7", "@pushrocks/smartpromise": "^3.1.7",
"@pushrocks/webstore": "^2.0.4", "@pushrocks/webstore": "^2.0.5"
"node-fetch": "^2.6.7"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",

2
ts/00_commitinfo_data.ts
View File

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

28
ts/index.ts
View File

@ -9,7 +9,11 @@ export interface IWebrequestContructorOptions {
*/ */
export class WebRequest { export class WebRequest {
private static polyfillStatusEvaluated = false; private static polyfillStatusEvaluated = false;
private static neededPolyfillsLoadedDeferred = plugins.smartpromise.defer(); private static neededPolyfillsLoadedDeferred = plugins.smartpromise.defer<{
fetch: typeof fetch,
Response: typeof Response,
AbortController: typeof AbortController
}>();
public static async loadNeededPolyfills() { public static async loadNeededPolyfills() {
if (this.polyfillStatusEvaluated) { if (this.polyfillStatusEvaluated) {
return this.neededPolyfillsLoadedDeferred.promise; return this.neededPolyfillsLoadedDeferred.promise;
@ -18,11 +22,19 @@ export class WebRequest {
const smartenv = new plugins.smartenv.Smartenv(); const smartenv = new plugins.smartenv.Smartenv();
if (!smartenv.isBrowser) { if (!smartenv.isBrowser) {
this.polyfillStatusEvaluated = true; this.polyfillStatusEvaluated = true;
const fetchMod = await smartenv.getSafeNodeModule('node-fetch'); const fetchMod = await smartenv.getSafeNodeModule('@adobe/helix-fetch');
globalThis.Response = fetchMod.Response; this.neededPolyfillsLoadedDeferred.resolve({
globalThis.fetch = fetchMod.default; fetch: fetchMod.fetch,
Response: fetchMod.Response,
AbortController: fetchMod.AbortSignal
});
} else {
this.neededPolyfillsLoadedDeferred.resolve({
fetch: globalThis.fetch,
Response: globalThis.Response,
AbortController: globalThis.AbortController
});
} }
this.neededPolyfillsLoadedDeferred.resolve();
} }
public cacheStore = new plugins.webstore.WebStore({ public cacheStore = new plugins.webstore.WebStore({
@ -103,8 +115,8 @@ export class WebRequest {
timeoutMs?: number; timeoutMs?: number;
} }
) { ) {
await WebRequest.neededPolyfillsLoadedDeferred.promise; const fetchObject = await WebRequest.neededPolyfillsLoadedDeferred.promise;
const controller = new AbortController(); const controller = new fetchObject.AbortController();
if (optionsArg.timeoutMs) { if (optionsArg.timeoutMs) {
plugins.smartdelay.delayFor(optionsArg.timeoutMs).then(() => { plugins.smartdelay.delayFor(optionsArg.timeoutMs).then(() => {
controller.abort(); controller.abort();
@ -118,7 +130,7 @@ export class WebRequest {
} else { } else {
cachedResponseDeferred.resolve(null); cachedResponseDeferred.resolve(null);
} }
let response: Response = await fetch(urlArg, { let response: Response = await fetchObject.fetch(urlArg, {
signal: controller.signal, signal: controller.signal,
method: optionsArg.method, method: optionsArg.method,
headers: { headers: {