@comunica/actor-http-proxy 3.3.0 → 4.0.1
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/README.md +1 -1
- package/components/ActorHttpProxy.jsonld +44 -12
- package/components/ProxyHandlerStatic.jsonld +2 -2
- package/components/components.jsonld +1 -1
- package/components/context.jsonld +7 -1
- package/lib/ActorHttpProxy.d.ts +2 -1
- package/lib/ActorHttpProxy.js +4 -3
- package/lib/ActorHttpProxy.js.map +1 -1
- package/package.json +11 -6
package/README.md
CHANGED
|
@@ -23,7 +23,7 @@ After installing, this package can be added to your engine's configuration as fo
|
|
|
23
23
|
{
|
|
24
24
|
"@context": [
|
|
25
25
|
...
|
|
26
|
-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^
|
|
26
|
+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^4.0.0/components/context.jsonld"
|
|
27
27
|
],
|
|
28
28
|
"actors": [
|
|
29
29
|
...
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"@context": [
|
|
3
|
-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^
|
|
4
|
-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/core/^
|
|
5
|
-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-http/^
|
|
3
|
+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^4.0.0/components/context.jsonld",
|
|
4
|
+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/core/^4.0.0/components/context.jsonld",
|
|
5
|
+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-http/^4.0.0/components/context.jsonld"
|
|
6
6
|
],
|
|
7
7
|
"@id": "npmd:@comunica/actor-http-proxy",
|
|
8
8
|
"components": [
|
|
@@ -40,29 +40,37 @@
|
|
|
40
40
|
"genericTypeInstances": [
|
|
41
41
|
{
|
|
42
42
|
"@type": "ParameterRangeGenericTypeReference",
|
|
43
|
-
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^
|
|
43
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
|
|
44
44
|
},
|
|
45
45
|
{
|
|
46
46
|
"@type": "ParameterRangeGenericTypeReference",
|
|
47
|
-
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^
|
|
47
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
|
|
48
48
|
},
|
|
49
49
|
{
|
|
50
50
|
"@type": "ParameterRangeGenericTypeReference",
|
|
51
|
-
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^
|
|
51
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
"@type": "ParameterRangeGenericTypeReference",
|
|
55
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
|
|
52
56
|
}
|
|
53
57
|
]
|
|
54
58
|
},
|
|
55
59
|
{
|
|
56
60
|
"@type": "ParameterRangeGenericTypeReference",
|
|
57
|
-
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^
|
|
61
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
"@type": "ParameterRangeGenericTypeReference",
|
|
65
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
|
|
58
66
|
},
|
|
59
67
|
{
|
|
60
68
|
"@type": "ParameterRangeGenericTypeReference",
|
|
61
|
-
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^
|
|
69
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
|
|
62
70
|
},
|
|
63
71
|
{
|
|
64
72
|
"@type": "ParameterRangeGenericTypeReference",
|
|
65
|
-
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^
|
|
73
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
|
|
66
74
|
}
|
|
67
75
|
]
|
|
68
76
|
},
|
|
@@ -72,6 +80,20 @@
|
|
|
72
80
|
},
|
|
73
81
|
"comment": "The bus this actor subscribes to."
|
|
74
82
|
},
|
|
83
|
+
{
|
|
84
|
+
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_busFailMessage",
|
|
85
|
+
"range": {
|
|
86
|
+
"@type": "ParameterRangeUnion",
|
|
87
|
+
"parameterRangeElements": [
|
|
88
|
+
"xsd:string",
|
|
89
|
+
{
|
|
90
|
+
"@type": "ParameterRangeUndefined"
|
|
91
|
+
}
|
|
92
|
+
]
|
|
93
|
+
},
|
|
94
|
+
"default": "HTTP request failed: none of the configured actors were able to handle ${action.input}",
|
|
95
|
+
"comment": "The message that will be configured in the bus for reporting failures. This message may be a template string that contains references to the executed `action`. For example, the following templated string is allowed: \"RDF dereferencing failed: no actors could handle ${action.handle.mediaType}\""
|
|
96
|
+
},
|
|
75
97
|
{
|
|
76
98
|
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_beforeActors",
|
|
77
99
|
"range": {
|
|
@@ -85,15 +107,19 @@
|
|
|
85
107
|
"genericTypeInstances": [
|
|
86
108
|
{
|
|
87
109
|
"@type": "ParameterRangeGenericTypeReference",
|
|
88
|
-
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^
|
|
110
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
|
|
89
111
|
},
|
|
90
112
|
{
|
|
91
113
|
"@type": "ParameterRangeGenericTypeReference",
|
|
92
|
-
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^
|
|
114
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
|
|
93
115
|
},
|
|
94
116
|
{
|
|
95
117
|
"@type": "ParameterRangeGenericTypeReference",
|
|
96
|
-
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^
|
|
118
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
"@type": "ParameterRangeGenericTypeReference",
|
|
122
|
+
"parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
|
|
97
123
|
}
|
|
98
124
|
]
|
|
99
125
|
}
|
|
@@ -147,6 +173,12 @@
|
|
|
147
173
|
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_bus"
|
|
148
174
|
}
|
|
149
175
|
},
|
|
176
|
+
{
|
|
177
|
+
"keyRaw": "busFailMessage",
|
|
178
|
+
"value": {
|
|
179
|
+
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_busFailMessage"
|
|
180
|
+
}
|
|
181
|
+
},
|
|
150
182
|
{
|
|
151
183
|
"keyRaw": "beforeActors",
|
|
152
184
|
"value": {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"@context": [
|
|
3
|
-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^
|
|
4
|
-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/types/^
|
|
3
|
+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^4.0.0/components/context.jsonld",
|
|
4
|
+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/types/^4.0.0/components/context.jsonld"
|
|
5
5
|
],
|
|
6
6
|
"@id": "npmd:@comunica/actor-http-proxy",
|
|
7
7
|
"components": [
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"@context": [
|
|
3
|
-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^
|
|
3
|
+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^4.0.0/components/context.jsonld"
|
|
4
4
|
],
|
|
5
5
|
"@id": "npmd:@comunica/actor-http-proxy",
|
|
6
6
|
"@type": "Module",
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^6.0.0/components/context.jsonld",
|
|
4
4
|
{
|
|
5
5
|
"npmd": "https://linkedsoftwaredependencies.org/bundles/npm/",
|
|
6
|
-
"cahp": "npmd:@comunica/actor-http-proxy/^
|
|
6
|
+
"cahp": "npmd:@comunica/actor-http-proxy/^4.0.0/",
|
|
7
7
|
"ActorHttpProxy": {
|
|
8
8
|
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy",
|
|
9
9
|
"@prefix": true,
|
|
@@ -17,6 +17,9 @@
|
|
|
17
17
|
"args_bus": {
|
|
18
18
|
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_bus"
|
|
19
19
|
},
|
|
20
|
+
"args_busFailMessage": {
|
|
21
|
+
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_busFailMessage"
|
|
22
|
+
},
|
|
20
23
|
"args_beforeActors": {
|
|
21
24
|
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_beforeActors",
|
|
22
25
|
"@container": "@list"
|
|
@@ -30,6 +33,9 @@
|
|
|
30
33
|
"bus": {
|
|
31
34
|
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_bus"
|
|
32
35
|
},
|
|
36
|
+
"busFailMessage": {
|
|
37
|
+
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_busFailMessage"
|
|
38
|
+
},
|
|
33
39
|
"beforeActors": {
|
|
34
40
|
"@id": "cahp:components/ActorHttpProxy.jsonld#ActorHttpProxy_args_beforeActors",
|
|
35
41
|
"@container": "@list"
|
package/lib/ActorHttpProxy.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IActionHttp, IActorHttpOutput, MediatorHttp, IActorHttpArgs } from '@comunica/bus-http';
|
|
2
2
|
import { ActorHttp } from '@comunica/bus-http';
|
|
3
|
+
import type { TestResult } from '@comunica/core';
|
|
3
4
|
import type { IMediatorTypeTime } from '@comunica/mediatortype-time';
|
|
4
5
|
/**
|
|
5
6
|
* A comunica Proxy Http Actor.
|
|
@@ -7,7 +8,7 @@ import type { IMediatorTypeTime } from '@comunica/mediatortype-time';
|
|
|
7
8
|
export declare class ActorHttpProxy extends ActorHttp {
|
|
8
9
|
readonly mediatorHttp: MediatorHttp;
|
|
9
10
|
constructor(args: IActorHttpProxyArgs);
|
|
10
|
-
test(action: IActionHttp): Promise<IMediatorTypeTime
|
|
11
|
+
test(action: IActionHttp): Promise<TestResult<IMediatorTypeTime>>;
|
|
11
12
|
run(action: IActionHttp): Promise<IActorHttpOutput>;
|
|
12
13
|
}
|
|
13
14
|
export interface IActorHttpProxyArgs extends IActorHttpArgs {
|
package/lib/ActorHttpProxy.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ActorHttpProxy = void 0;
|
|
4
4
|
const bus_http_1 = require("@comunica/bus-http");
|
|
5
5
|
const context_entries_1 = require("@comunica/context-entries");
|
|
6
|
+
const core_1 = require("@comunica/core");
|
|
6
7
|
/**
|
|
7
8
|
* A comunica Proxy Http Actor.
|
|
8
9
|
*/
|
|
@@ -13,12 +14,12 @@ class ActorHttpProxy extends bus_http_1.ActorHttp {
|
|
|
13
14
|
async test(action) {
|
|
14
15
|
const proxyHandler = action.context.get(context_entries_1.KeysHttpProxy.httpProxyHandler);
|
|
15
16
|
if (!proxyHandler) {
|
|
16
|
-
|
|
17
|
+
return (0, core_1.failTest)(`Actor ${this.name} could not find a proxy handler in the context.`);
|
|
17
18
|
}
|
|
18
19
|
if (!await proxyHandler.getProxy(action)) {
|
|
19
|
-
|
|
20
|
+
return (0, core_1.failTest)(`Actor ${this.name} could not determine a proxy for the given request.`);
|
|
20
21
|
}
|
|
21
|
-
return { time: Number.POSITIVE_INFINITY };
|
|
22
|
+
return (0, core_1.passTest)({ time: Number.POSITIVE_INFINITY });
|
|
22
23
|
}
|
|
23
24
|
async run(action) {
|
|
24
25
|
const requestedUrl = typeof action.input === 'string' ? action.input : action.input.url;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorHttpProxy.js","sourceRoot":"","sources":["ActorHttpProxy.ts"],"names":[],"mappings":";;;AACA,iDAA+C;AAC/C,+DAA0D;
|
|
1
|
+
{"version":3,"file":"ActorHttpProxy.js","sourceRoot":"","sources":["ActorHttpProxy.ts"],"names":[],"mappings":";;;AACA,iDAA+C;AAC/C,+DAA0D;AAE1D,yCAAoD;AAIpD;;GAEG;AACH,MAAa,cAAe,SAAQ,oBAAS;IAG3C,YAAmB,IAAyB;QAC1C,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAmB;QACnC,MAAM,YAAY,GAA8B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,+BAAa,CAAC,gBAAgB,CAAC,CAAC;QACnG,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,IAAA,eAAQ,EAAC,SAAS,IAAI,CAAC,IAAI,iDAAiD,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACzC,OAAO,IAAA,eAAQ,EAAC,SAAS,IAAI,CAAC,IAAI,qDAAqD,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,IAAA,eAAQ,EAAC,EAAE,IAAI,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,MAAmB;QAClC,MAAM,YAAY,GAAG,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;QACxF,MAAM,YAAY,GAAkB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,+BAAa,CAAC,gBAAgB,CAAE,CAAC;QAExF,0CAA0C;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;YAC7C,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC;SAC/D,CAAC,CAAC;QAEH,0BAA0B;QAC1B,mEAAmE;QACnE,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE;YACnC,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,YAAY;SAC7D,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AArCD,wCAqCC","sourcesContent":["import type { IActionHttp, IActorHttpOutput, MediatorHttp, IActorHttpArgs } from '@comunica/bus-http';\nimport { ActorHttp } from '@comunica/bus-http';\nimport { KeysHttpProxy } from '@comunica/context-entries';\nimport type { TestResult } from '@comunica/core';\nimport { failTest, passTest } from '@comunica/core';\nimport type { IMediatorTypeTime } from '@comunica/mediatortype-time';\nimport type { IProxyHandler } from '@comunica/types';\n\n/**\n * A comunica Proxy Http Actor.\n */\nexport class ActorHttpProxy extends ActorHttp {\n public readonly mediatorHttp: MediatorHttp;\n\n public constructor(args: IActorHttpProxyArgs) {\n super(args);\n }\n\n public async test(action: IActionHttp): Promise<TestResult<IMediatorTypeTime>> {\n const proxyHandler: IProxyHandler | undefined = action.context.get(KeysHttpProxy.httpProxyHandler);\n if (!proxyHandler) {\n return failTest(`Actor ${this.name} could not find a proxy handler in the context.`);\n }\n if (!await proxyHandler.getProxy(action)) {\n return failTest(`Actor ${this.name} could not determine a proxy for the given request.`);\n }\n return passTest({ time: Number.POSITIVE_INFINITY });\n }\n\n public async run(action: IActionHttp): Promise<IActorHttpOutput> {\n const requestedUrl = typeof action.input === 'string' ? action.input : action.input.url;\n const proxyHandler: IProxyHandler = action.context.get(KeysHttpProxy.httpProxyHandler)!;\n\n // Send a request for the modified request\n const output = await this.mediatorHttp.mediate({\n ...await proxyHandler.getProxy(action),\n context: action.context.delete(KeysHttpProxy.httpProxyHandler),\n });\n\n // Modify the response URL\n // use defineProperty to allow modification of unmodifiable objects\n Object.defineProperty(output, 'url', {\n configurable: true,\n enumerable: true,\n get: () => output.headers.get('x-final-url') ?? requestedUrl,\n });\n return output;\n }\n}\n\nexport interface IActorHttpProxyArgs extends IActorHttpArgs {\n /**\n * The HTTP mediator\n */\n mediatorHttp: MediatorHttp;\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@comunica/actor-http-proxy",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.1",
|
|
4
4
|
"description": "A proxy http actor",
|
|
5
5
|
"lsd:module": true,
|
|
6
6
|
"license": "MIT",
|
|
7
|
+
"funding": {
|
|
8
|
+
"type": "opencollective",
|
|
9
|
+
"url": "https://opencollective.com/comunica-association"
|
|
10
|
+
},
|
|
7
11
|
"homepage": "https://comunica.dev/",
|
|
8
12
|
"repository": {
|
|
9
13
|
"type": "git",
|
|
@@ -37,10 +41,11 @@
|
|
|
37
41
|
"build:components": "componentsjs-generator"
|
|
38
42
|
},
|
|
39
43
|
"dependencies": {
|
|
40
|
-
"@comunica/bus-http": "^
|
|
41
|
-
"@comunica/context-entries": "^
|
|
42
|
-
"@comunica/
|
|
43
|
-
"@comunica/
|
|
44
|
+
"@comunica/bus-http": "^4.0.1",
|
|
45
|
+
"@comunica/context-entries": "^4.0.1",
|
|
46
|
+
"@comunica/core": "^4.0.1",
|
|
47
|
+
"@comunica/mediatortype-time": "^4.0.1",
|
|
48
|
+
"@comunica/types": "^4.0.1"
|
|
44
49
|
},
|
|
45
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "67831ba79e45ea1ced41fe3f83c5d6e8802dbeaa"
|
|
46
51
|
}
|