scanoss 0.5.0 → 0.5.2
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/.idea/workspace.xml +6 -1
- package/build/main/cli/bin/cli-bin.js +1 -1
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.d.ts +1 -0
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.js +9 -1
- package/build/main/tsconfig.tsbuildinfo +82 -42
- package/build/module/cli/bin/cli-bin.js +1 -1
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.d.ts +1 -0
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.js +9 -1
- package/build/module/tsconfig.module.tsbuildinfo +82 -42
- package/package.json +3 -2
- package/src/cli/bin/cli-bin.ts +1 -1
- package/src/sdk/scanner/Dispatcher/Dispatcher.ts +12 -0
- package/yarn.lock +221 -191
package/.idea/workspace.xml
CHANGED
|
@@ -178,7 +178,12 @@
|
|
|
178
178
|
<workItem from="1668583216157" duration="14668000" />
|
|
179
179
|
<workItem from="1668680809359" duration="1101000" />
|
|
180
180
|
<workItem from="1668684545211" duration="2237000" />
|
|
181
|
-
<workItem from="1668766262950" duration="
|
|
181
|
+
<workItem from="1668766262950" duration="13679000" />
|
|
182
|
+
<workItem from="1668790704367" duration="630000" />
|
|
183
|
+
<workItem from="1669645987865" duration="3396000" />
|
|
184
|
+
<workItem from="1669750011257" duration="2129000" />
|
|
185
|
+
<workItem from="1669803899082" duration="6855000" />
|
|
186
|
+
<workItem from="1669884325141" duration="8998000" />
|
|
182
187
|
</task>
|
|
183
188
|
<servers />
|
|
184
189
|
</component>
|
|
@@ -11,7 +11,7 @@ function CLIErrorHandler(e) {
|
|
|
11
11
|
}
|
|
12
12
|
async function main() {
|
|
13
13
|
commander_1.program
|
|
14
|
-
.version("0.5.
|
|
14
|
+
.version("0.5.2")
|
|
15
15
|
.description('The SCANOSS JS package provides a simple, easy to consume module for interacting with SCANOSS APIs/Engine.');
|
|
16
16
|
commander_1.program
|
|
17
17
|
.command('scan <source>')
|
|
@@ -12,6 +12,7 @@ const ScannerTypes_1 = require("../ScannerTypes");
|
|
|
12
12
|
const DispatcherResponse_1 = require("./DispatcherResponse");
|
|
13
13
|
const ScannerCfg_1 = require("../ScannerCfg");
|
|
14
14
|
const GlobalControllerAborter_1 = require("./GlobalControllerAborter");
|
|
15
|
+
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
15
16
|
const MAX_CONCURRENT_REQUEST = 30;
|
|
16
17
|
class Dispatcher extends eventemitter3_1.default {
|
|
17
18
|
constructor(scannerCfg = new ScannerCfg_1.ScannerCfg()) {
|
|
@@ -22,6 +23,11 @@ class Dispatcher extends eventemitter3_1.default {
|
|
|
22
23
|
this.init();
|
|
23
24
|
}
|
|
24
25
|
init() {
|
|
26
|
+
this.proxy = null;
|
|
27
|
+
const proxy = process.env.https_proxy || process.env.HTTPS_PROXY || process.env.http_proxy || process.env.HTTP_PROXY || '';
|
|
28
|
+
if (proxy) {
|
|
29
|
+
this.proxy = new https_proxy_agent_1.HttpsProxyAgent(proxy);
|
|
30
|
+
}
|
|
25
31
|
this.pQueue = new p_queue_1.default({
|
|
26
32
|
concurrency: this.scannerCfg.CONCURRENCY_LIMIT,
|
|
27
33
|
});
|
|
@@ -89,6 +95,7 @@ class Dispatcher extends eventemitter3_1.default {
|
|
|
89
95
|
try {
|
|
90
96
|
this.emit(ScannerTypes_1.ScannerEvents.DISPATCHER_WFP_SENDED);
|
|
91
97
|
const response = await node_fetch_1.default(this.scannerCfg.API_URL, {
|
|
98
|
+
agent: this.proxy,
|
|
92
99
|
method: 'post',
|
|
93
100
|
body: item.getForm(),
|
|
94
101
|
headers: { 'User-Agent': this.scannerCfg.CLIENT_TIMESTAMP, 'X-Session': this.scannerCfg.API_KEY },
|
|
@@ -110,6 +117,7 @@ class Dispatcher extends eventemitter3_1.default {
|
|
|
110
117
|
return Promise.resolve();
|
|
111
118
|
}
|
|
112
119
|
catch (e) {
|
|
120
|
+
console.log(e);
|
|
113
121
|
clearTimeout(timeoutId);
|
|
114
122
|
this.globalAbortController.removeAbortController(timeoutController);
|
|
115
123
|
this.errorHandler(e, item);
|
|
@@ -118,4 +126,4 @@ class Dispatcher extends eventemitter3_1.default {
|
|
|
118
126
|
}
|
|
119
127
|
}
|
|
120
128
|
exports.Dispatcher = Dispatcher;
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzcGF0Y2hlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9EaXNwYXRjaGVyL0Rpc3BhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxpQ0FBaUM7QUFDakMseUNBQXlDO0FBQ3pDLGtFQUF5QztBQUN6Qyw0REFBK0I7QUFDL0Isc0RBQTZCO0FBRzdCLGtEQUFnRDtBQUNoRCw2REFBMEQ7QUFDMUQsOENBQTJDO0FBQzNDLHVFQUFvRTtBQUVwRSx5REFBb0Q7QUFFcEQsTUFBTSxzQkFBc0IsR0FBRyxFQUFFLENBQUM7QUFFbEMsTUFBYSxVQUFXLFNBQVEsdUJBQVk7SUFlMUMsWUFBWSxVQUFVLEdBQUcsSUFBSSx1QkFBVSxFQUFFO1FBQ3ZDLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7UUFDN0IsSUFBRyxJQUFJLENBQUMsVUFBVSxDQUFDLGlCQUFpQixHQUFHLHNCQUFzQjtZQUMzRCxJQUFJLENBQUMsVUFBVSxDQUFDLGlCQUFpQixHQUFHLHNCQUFzQixDQUFDO1FBRTdELElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNkLENBQUM7SUFFRCxJQUFJO1FBRUYsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUM7UUFDbEIsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLElBQUssT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLElBQUksRUFBRSxDQUFDO1FBQzVILElBQUksS0FBSyxFQUFFO1lBQ1QsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLG1DQUFlLENBQUMsS0FBSyxDQUFDLENBQUE7U0FDeEM7UUFFRCxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksaUJBQU0sQ0FBQztZQUN2QixX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
|
|
@@ -511,9 +511,24 @@
|
|
|
511
511
|
"signature": "13968c2bbfe0002d18d806c22d01584d9a30e22d5991ff606645921efa12afac",
|
|
512
512
|
"affectsGlobalScope": false
|
|
513
513
|
},
|
|
514
|
+
"../../node_modules/agent-base/dist/src/index.d.ts": {
|
|
515
|
+
"version": "27dddbe3a7e8f45bc30547499461c74851580b74556570a4d7daa90ba90e2af0",
|
|
516
|
+
"signature": "27dddbe3a7e8f45bc30547499461c74851580b74556570a4d7daa90ba90e2af0",
|
|
517
|
+
"affectsGlobalScope": false
|
|
518
|
+
},
|
|
519
|
+
"../../node_modules/https-proxy-agent/dist/agent.d.ts": {
|
|
520
|
+
"version": "ce0c414305ae2797f220adcd5e83079802d0b9879e62ca476f000b56a5d31adf",
|
|
521
|
+
"signature": "ce0c414305ae2797f220adcd5e83079802d0b9879e62ca476f000b56a5d31adf",
|
|
522
|
+
"affectsGlobalScope": false
|
|
523
|
+
},
|
|
524
|
+
"../../node_modules/https-proxy-agent/dist/index.d.ts": {
|
|
525
|
+
"version": "67918f0ddd6271a88574dfe495942f4a6e982b9c3c1a2ce14c273f103691394d",
|
|
526
|
+
"signature": "67918f0ddd6271a88574dfe495942f4a6e982b9c3c1a2ce14c273f103691394d",
|
|
527
|
+
"affectsGlobalScope": false
|
|
528
|
+
},
|
|
514
529
|
"../../src/sdk/scanner/Dispatcher/Dispatcher.ts": {
|
|
515
|
-
"version": "
|
|
516
|
-
"signature": "
|
|
530
|
+
"version": "9fb684a6359938718c6a5615accba87ef9977bc7001f5b9a6103dade4c71d05f",
|
|
531
|
+
"signature": "060f7710dc3ecddc5678e67a21cdfdb67bb3a7ca2632a0f4d3305e20fb71595c",
|
|
517
532
|
"affectsGlobalScope": false
|
|
518
533
|
},
|
|
519
534
|
"../../src/sdk/scanner/WfpProvider/WfpProvider.ts": {
|
|
@@ -827,8 +842,8 @@
|
|
|
827
842
|
"affectsGlobalScope": false
|
|
828
843
|
},
|
|
829
844
|
"../../node_modules/@grpc/grpc-js/build/src/server.d.ts": {
|
|
830
|
-
"version": "
|
|
831
|
-
"signature": "
|
|
845
|
+
"version": "b311c564d4d32223f6e2af84f9f976be2673260b2c114b3e444278fd113caf57",
|
|
846
|
+
"signature": "b311c564d4d32223f6e2af84f9f976be2673260b2c114b3e444278fd113caf57",
|
|
832
847
|
"affectsGlobalScope": false
|
|
833
848
|
},
|
|
834
849
|
"../../node_modules/@grpc/grpc-js/build/src/make-client.d.ts": {
|
|
@@ -847,8 +862,8 @@
|
|
|
847
862
|
"affectsGlobalScope": false
|
|
848
863
|
},
|
|
849
864
|
"../../node_modules/@grpc/grpc-js/build/src/server-call.d.ts": {
|
|
850
|
-
"version": "
|
|
851
|
-
"signature": "
|
|
865
|
+
"version": "9dbe26721d8606c14c6297084b97764e56f69c1b5061f9a1eafcc4d4b7482614",
|
|
866
|
+
"signature": "9dbe26721d8606c14c6297084b97764e56f69c1b5061f9a1eafcc4d4b7482614",
|
|
852
867
|
"affectsGlobalScope": false
|
|
853
868
|
},
|
|
854
869
|
"../../node_modules/@grpc/grpc-js/build/src/channel.d.ts": {
|
|
@@ -872,8 +887,8 @@
|
|
|
872
887
|
"affectsGlobalScope": false
|
|
873
888
|
},
|
|
874
889
|
"../../node_modules/@grpc/grpc-js/build/src/call-stream.d.ts": {
|
|
875
|
-
"version": "
|
|
876
|
-
"signature": "
|
|
890
|
+
"version": "c1f141466db628f30aa72bd55796d7b131cd53c10a6727f39aa10d7492ce8b3d",
|
|
891
|
+
"signature": "c1f141466db628f30aa72bd55796d7b131cd53c10a6727f39aa10d7492ce8b3d",
|
|
877
892
|
"affectsGlobalScope": false
|
|
878
893
|
},
|
|
879
894
|
"../../node_modules/@grpc/grpc-js/build/src/call.d.ts": {
|
|
@@ -1091,24 +1106,14 @@
|
|
|
1091
1106
|
"signature": "b1a91e7ffd2617110a43763afa7c6a2baf80523364c0015669718b44b2559057",
|
|
1092
1107
|
"affectsGlobalScope": false
|
|
1093
1108
|
},
|
|
1094
|
-
"../../node_modules/@types/adm-zip/util.d.ts": {
|
|
1095
|
-
"version": "0e0b0baaf6e3845418c2741c9b47478cf6fc086ef8dd5ad4b9ab91499e51de28",
|
|
1096
|
-
"signature": "0e0b0baaf6e3845418c2741c9b47478cf6fc086ef8dd5ad4b9ab91499e51de28",
|
|
1097
|
-
"affectsGlobalScope": false
|
|
1098
|
-
},
|
|
1099
|
-
"../../node_modules/@types/adm-zip/index.d.ts": {
|
|
1100
|
-
"version": "ca6e8a62a3e4f5cc3fea6ab45c2e5e128db4d90d81d70547a65047e3f13996f1",
|
|
1101
|
-
"signature": "ca6e8a62a3e4f5cc3fea6ab45c2e5e128db4d90d81d70547a65047e3f13996f1",
|
|
1102
|
-
"affectsGlobalScope": false
|
|
1103
|
-
},
|
|
1104
1109
|
"../../src/sdk/Decompress/Decompressor/DecompressZips.ts": {
|
|
1105
1110
|
"version": "f8ca132a9438eba3e7e85f7784ae193614a39689674c722f358490f6bc30b4e3",
|
|
1106
1111
|
"signature": "b080b271c2282d50faf836cf5b2574f1c01be4b8915f485152b52d2aad89575f",
|
|
1107
1112
|
"affectsGlobalScope": false
|
|
1108
1113
|
},
|
|
1109
1114
|
"../../node_modules/minipass/index.d.ts": {
|
|
1110
|
-
"version": "
|
|
1111
|
-
"signature": "
|
|
1115
|
+
"version": "14bedd2e5282438e6062b4eaa08d00f20aabe5f0377edd2e54b4b83cc41dee63",
|
|
1116
|
+
"signature": "14bedd2e5282438e6062b4eaa08d00f20aabe5f0377edd2e54b4b83cc41dee63",
|
|
1112
1117
|
"affectsGlobalScope": false
|
|
1113
1118
|
},
|
|
1114
1119
|
"../../node_modules/@types/tar/index.d.ts": {
|
|
@@ -1182,7 +1187,7 @@
|
|
|
1182
1187
|
"affectsGlobalScope": false
|
|
1183
1188
|
},
|
|
1184
1189
|
"../../src/cli/bin/cli-bin.ts": {
|
|
1185
|
-
"version": "
|
|
1190
|
+
"version": "4dd23960b0aa8bb18f969c315c2a01971975fd18539a578b16aedce7c2a8d061",
|
|
1186
1191
|
"signature": "43e818adf60173644896298637f47b01d5819b17eda46eaa32d0c7d64724d012",
|
|
1187
1192
|
"affectsGlobalScope": false
|
|
1188
1193
|
},
|
|
@@ -1743,15 +1748,6 @@
|
|
|
1743
1748
|
"../../node_modules/@types/node/util.d.ts",
|
|
1744
1749
|
"../../node_modules/protobufjs/index.d.ts"
|
|
1745
1750
|
],
|
|
1746
|
-
"../../node_modules/@types/adm-zip/index.d.ts": [
|
|
1747
|
-
"../../node_modules/@types/adm-zip/util.d.ts",
|
|
1748
|
-
"../../node_modules/@types/node/fs.d.ts",
|
|
1749
|
-
"../../node_modules/@types/node/index.d.ts",
|
|
1750
|
-
"../../node_modules/@types/node/util.d.ts"
|
|
1751
|
-
],
|
|
1752
|
-
"../../node_modules/@types/adm-zip/util.d.ts": [
|
|
1753
|
-
"../../node_modules/@types/node/util.d.ts"
|
|
1754
|
-
],
|
|
1755
1751
|
"../../node_modules/@types/long/index.d.ts": [
|
|
1756
1752
|
"../../node_modules/@types/node/util.d.ts"
|
|
1757
1753
|
],
|
|
@@ -2098,6 +2094,15 @@
|
|
|
2098
2094
|
"../../node_modules/@types/node/util.d.ts",
|
|
2099
2095
|
"../../node_modules/event-target-shim/index.d.ts"
|
|
2100
2096
|
],
|
|
2097
|
+
"../../node_modules/agent-base/dist/src/index.d.ts": [
|
|
2098
|
+
"../../node_modules/@types/node/events.d.ts",
|
|
2099
|
+
"../../node_modules/@types/node/http.d.ts",
|
|
2100
|
+
"../../node_modules/@types/node/https.d.ts",
|
|
2101
|
+
"../../node_modules/@types/node/index.d.ts",
|
|
2102
|
+
"../../node_modules/@types/node/net.d.ts",
|
|
2103
|
+
"../../node_modules/@types/node/stream.d.ts",
|
|
2104
|
+
"../../node_modules/@types/node/util.d.ts"
|
|
2105
|
+
],
|
|
2101
2106
|
"../../node_modules/commander/typings/index.d.ts": [
|
|
2102
2107
|
"../../node_modules/@types/node/util.d.ts"
|
|
2103
2108
|
],
|
|
@@ -2113,6 +2118,23 @@
|
|
|
2113
2118
|
"../../node_modules/@types/node/stream.d.ts",
|
|
2114
2119
|
"../../node_modules/@types/node/util.d.ts"
|
|
2115
2120
|
],
|
|
2121
|
+
"../../node_modules/https-proxy-agent/dist/agent.d.ts": [
|
|
2122
|
+
"../../node_modules/@types/node/index.d.ts",
|
|
2123
|
+
"../../node_modules/@types/node/net.d.ts",
|
|
2124
|
+
"../../node_modules/@types/node/util.d.ts",
|
|
2125
|
+
"../../node_modules/agent-base/dist/src/index.d.ts",
|
|
2126
|
+
"../../node_modules/https-proxy-agent/dist/index.d.ts"
|
|
2127
|
+
],
|
|
2128
|
+
"../../node_modules/https-proxy-agent/dist/index.d.ts": [
|
|
2129
|
+
"../../node_modules/@types/node/http.d.ts",
|
|
2130
|
+
"../../node_modules/@types/node/index.d.ts",
|
|
2131
|
+
"../../node_modules/@types/node/net.d.ts",
|
|
2132
|
+
"../../node_modules/@types/node/tls.d.ts",
|
|
2133
|
+
"../../node_modules/@types/node/url.d.ts",
|
|
2134
|
+
"../../node_modules/@types/node/util.d.ts",
|
|
2135
|
+
"../../node_modules/agent-base/dist/src/index.d.ts",
|
|
2136
|
+
"../../node_modules/https-proxy-agent/dist/agent.d.ts"
|
|
2137
|
+
],
|
|
2116
2138
|
"../../node_modules/isbinaryfile/lib/index.d.ts": [
|
|
2117
2139
|
"../../node_modules/@types/node/index.d.ts",
|
|
2118
2140
|
"../../node_modules/@types/node/util.d.ts"
|
|
@@ -2386,7 +2408,6 @@
|
|
|
2386
2408
|
"../../src/sdk/Decompress/Decompressor/Decompressor.ts"
|
|
2387
2409
|
],
|
|
2388
2410
|
"../../src/sdk/Decompress/Decompressor/DecompressZips.ts": [
|
|
2389
|
-
"../../node_modules/@types/adm-zip/index.d.ts",
|
|
2390
2411
|
"../../node_modules/@types/node/util.d.ts",
|
|
2391
2412
|
"../../src/sdk/Decompress/Decompressor/Decompressor.ts"
|
|
2392
2413
|
],
|
|
@@ -2547,6 +2568,7 @@
|
|
|
2547
2568
|
"../../node_modules/@types/node/util.d.ts",
|
|
2548
2569
|
"../../node_modules/eventemitter3/index.d.ts",
|
|
2549
2570
|
"../../node_modules/form-data/index.d.ts",
|
|
2571
|
+
"../../node_modules/https-proxy-agent/dist/index.d.ts",
|
|
2550
2572
|
"../../node_modules/p-queue/dist/index.d.ts",
|
|
2551
2573
|
"../../src/sdk/scanner/Dispatcher/DispatchableItem.ts",
|
|
2552
2574
|
"../../src/sdk/scanner/Dispatcher/DispatcherResponse.ts",
|
|
@@ -3142,15 +3164,6 @@
|
|
|
3142
3164
|
"../../node_modules/@types/node/util.d.ts",
|
|
3143
3165
|
"../../node_modules/protobufjs/index.d.ts"
|
|
3144
3166
|
],
|
|
3145
|
-
"../../node_modules/@types/adm-zip/index.d.ts": [
|
|
3146
|
-
"../../node_modules/@types/adm-zip/util.d.ts",
|
|
3147
|
-
"../../node_modules/@types/node/fs.d.ts",
|
|
3148
|
-
"../../node_modules/@types/node/index.d.ts",
|
|
3149
|
-
"../../node_modules/@types/node/util.d.ts"
|
|
3150
|
-
],
|
|
3151
|
-
"../../node_modules/@types/adm-zip/util.d.ts": [
|
|
3152
|
-
"../../node_modules/@types/node/util.d.ts"
|
|
3153
|
-
],
|
|
3154
3167
|
"../../node_modules/@types/long/index.d.ts": [
|
|
3155
3168
|
"../../node_modules/@types/node/util.d.ts"
|
|
3156
3169
|
],
|
|
@@ -3497,6 +3510,15 @@
|
|
|
3497
3510
|
"../../node_modules/@types/node/util.d.ts",
|
|
3498
3511
|
"../../node_modules/event-target-shim/index.d.ts"
|
|
3499
3512
|
],
|
|
3513
|
+
"../../node_modules/agent-base/dist/src/index.d.ts": [
|
|
3514
|
+
"../../node_modules/@types/node/events.d.ts",
|
|
3515
|
+
"../../node_modules/@types/node/http.d.ts",
|
|
3516
|
+
"../../node_modules/@types/node/https.d.ts",
|
|
3517
|
+
"../../node_modules/@types/node/index.d.ts",
|
|
3518
|
+
"../../node_modules/@types/node/net.d.ts",
|
|
3519
|
+
"../../node_modules/@types/node/stream.d.ts",
|
|
3520
|
+
"../../node_modules/@types/node/util.d.ts"
|
|
3521
|
+
],
|
|
3500
3522
|
"../../node_modules/commander/typings/index.d.ts": [
|
|
3501
3523
|
"../../node_modules/@types/node/util.d.ts"
|
|
3502
3524
|
],
|
|
@@ -3512,6 +3534,23 @@
|
|
|
3512
3534
|
"../../node_modules/@types/node/stream.d.ts",
|
|
3513
3535
|
"../../node_modules/@types/node/util.d.ts"
|
|
3514
3536
|
],
|
|
3537
|
+
"../../node_modules/https-proxy-agent/dist/agent.d.ts": [
|
|
3538
|
+
"../../node_modules/@types/node/index.d.ts",
|
|
3539
|
+
"../../node_modules/@types/node/net.d.ts",
|
|
3540
|
+
"../../node_modules/@types/node/util.d.ts",
|
|
3541
|
+
"../../node_modules/agent-base/dist/src/index.d.ts",
|
|
3542
|
+
"../../node_modules/https-proxy-agent/dist/index.d.ts"
|
|
3543
|
+
],
|
|
3544
|
+
"../../node_modules/https-proxy-agent/dist/index.d.ts": [
|
|
3545
|
+
"../../node_modules/@types/node/http.d.ts",
|
|
3546
|
+
"../../node_modules/@types/node/index.d.ts",
|
|
3547
|
+
"../../node_modules/@types/node/net.d.ts",
|
|
3548
|
+
"../../node_modules/@types/node/tls.d.ts",
|
|
3549
|
+
"../../node_modules/@types/node/url.d.ts",
|
|
3550
|
+
"../../node_modules/@types/node/util.d.ts",
|
|
3551
|
+
"../../node_modules/agent-base/dist/src/index.d.ts",
|
|
3552
|
+
"../../node_modules/https-proxy-agent/dist/agent.d.ts"
|
|
3553
|
+
],
|
|
3515
3554
|
"../../node_modules/isbinaryfile/lib/index.d.ts": [
|
|
3516
3555
|
"../../node_modules/@types/node/index.d.ts",
|
|
3517
3556
|
"../../node_modules/@types/node/util.d.ts"
|
|
@@ -3928,8 +3967,6 @@
|
|
|
3928
3967
|
"../../node_modules/@grpc/grpc-js/build/src/uri-parser.d.ts",
|
|
3929
3968
|
"../../node_modules/@grpc/proto-loader/build/src/index.d.ts",
|
|
3930
3969
|
"../../node_modules/@grpc/proto-loader/build/src/util.d.ts",
|
|
3931
|
-
"../../node_modules/@types/adm-zip/index.d.ts",
|
|
3932
|
-
"../../node_modules/@types/adm-zip/util.d.ts",
|
|
3933
3970
|
"../../node_modules/@types/long/index.d.ts",
|
|
3934
3971
|
"../../node_modules/@types/mocha/index.d.ts",
|
|
3935
3972
|
"../../node_modules/@types/node/assert.d.ts",
|
|
@@ -3985,10 +4022,13 @@
|
|
|
3985
4022
|
"../../node_modules/@types/node/zlib.d.ts",
|
|
3986
4023
|
"../../node_modules/@types/tar/index.d.ts",
|
|
3987
4024
|
"../../node_modules/abort-controller/dist/abort-controller.d.ts",
|
|
4025
|
+
"../../node_modules/agent-base/dist/src/index.d.ts",
|
|
3988
4026
|
"../../node_modules/commander/typings/index.d.ts",
|
|
3989
4027
|
"../../node_modules/event-target-shim/index.d.ts",
|
|
3990
4028
|
"../../node_modules/eventemitter3/index.d.ts",
|
|
3991
4029
|
"../../node_modules/form-data/index.d.ts",
|
|
4030
|
+
"../../node_modules/https-proxy-agent/dist/agent.d.ts",
|
|
4031
|
+
"../../node_modules/https-proxy-agent/dist/index.d.ts",
|
|
3992
4032
|
"../../node_modules/isbinaryfile/lib/index.d.ts",
|
|
3993
4033
|
"../../node_modules/minipass/index.d.ts",
|
|
3994
4034
|
"../../node_modules/p-queue/dist/index.d.ts",
|
|
@@ -10,7 +10,7 @@ function CLIErrorHandler(e) {
|
|
|
10
10
|
}
|
|
11
11
|
async function main() {
|
|
12
12
|
program
|
|
13
|
-
.version("0.5.
|
|
13
|
+
.version("0.5.2")
|
|
14
14
|
.description('The SCANOSS JS package provides a simple, easy to consume module for interacting with SCANOSS APIs/Engine.');
|
|
15
15
|
program
|
|
16
16
|
.command('scan <source>')
|
|
@@ -7,6 +7,7 @@ import { ScannerEvents } from "../ScannerTypes";
|
|
|
7
7
|
import { DispatcherResponse } from "./DispatcherResponse";
|
|
8
8
|
import { ScannerCfg } from "../ScannerCfg";
|
|
9
9
|
import { GlobalControllerAborter } from "./GlobalControllerAborter";
|
|
10
|
+
import { HttpsProxyAgent } from 'https-proxy-agent';
|
|
10
11
|
const MAX_CONCURRENT_REQUEST = 30;
|
|
11
12
|
export class Dispatcher extends EventEmitter {
|
|
12
13
|
constructor(scannerCfg = new ScannerCfg()) {
|
|
@@ -17,6 +18,11 @@ export class Dispatcher extends EventEmitter {
|
|
|
17
18
|
this.init();
|
|
18
19
|
}
|
|
19
20
|
init() {
|
|
21
|
+
this.proxy = null;
|
|
22
|
+
const proxy = process.env.https_proxy || process.env.HTTPS_PROXY || process.env.http_proxy || process.env.HTTP_PROXY || '';
|
|
23
|
+
if (proxy) {
|
|
24
|
+
this.proxy = new HttpsProxyAgent(proxy);
|
|
25
|
+
}
|
|
20
26
|
this.pQueue = new PQueue({
|
|
21
27
|
concurrency: this.scannerCfg.CONCURRENCY_LIMIT,
|
|
22
28
|
});
|
|
@@ -84,6 +90,7 @@ export class Dispatcher extends EventEmitter {
|
|
|
84
90
|
try {
|
|
85
91
|
this.emit(ScannerEvents.DISPATCHER_WFP_SENDED);
|
|
86
92
|
const response = await fetch(this.scannerCfg.API_URL, {
|
|
93
|
+
agent: this.proxy,
|
|
87
94
|
method: 'post',
|
|
88
95
|
body: item.getForm(),
|
|
89
96
|
headers: { 'User-Agent': this.scannerCfg.CLIENT_TIMESTAMP, 'X-Session': this.scannerCfg.API_KEY },
|
|
@@ -105,6 +112,7 @@ export class Dispatcher extends EventEmitter {
|
|
|
105
112
|
return Promise.resolve();
|
|
106
113
|
}
|
|
107
114
|
catch (e) {
|
|
115
|
+
console.log(e);
|
|
108
116
|
clearTimeout(timeoutId);
|
|
109
117
|
this.globalAbortController.removeAbortController(timeoutController);
|
|
110
118
|
this.errorHandler(e, item);
|
|
@@ -112,4 +120,4 @@ export class Dispatcher extends EventEmitter {
|
|
|
112
120
|
}
|
|
113
121
|
}
|
|
114
122
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzcGF0Y2hlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9EaXNwYXRjaGVyL0Rpc3BhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsaUNBQWlDO0FBQ2pDLHlDQUF5QztBQUN6QyxPQUFPLFlBQVksTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxLQUFLLE1BQU0sWUFBWSxDQUFDO0FBQy9CLE9BQU8sTUFBTSxNQUFNLFNBQVMsQ0FBQztBQUc3QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDaEQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDMUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVwRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFcEQsTUFBTSxzQkFBc0IsR0FBRyxFQUFFLENBQUM7QUFFbEMsTUFBTSxPQUFPLFVBQVcsU0FBUSxZQUFZO0lBZTFDLFlBQVksVUFBVSxHQUFHLElBQUksVUFBVSxFQUFFO1FBQ3ZDLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7UUFDN0IsSUFBRyxJQUFJLENBQUMsVUFBVSxDQUFDLGlCQUFpQixHQUFHLHNCQUFzQjtZQUMzRCxJQUFJLENBQUMsVUFBVSxDQUFDLGlCQUFpQixHQUFHLHNCQUFzQixDQUFDO1FBRTdELElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNkLENBQUM7SUFFRCxJQUFJO1FBRUYsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUM7UUFDbEIsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLElB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
|