@theia/scanoss 1.73.0-next.3 → 1.73.0-next.31
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.
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { ScanOSSResult, ScanOSSService } from '../common';
|
|
2
|
+
import { ILogger } from '@theia/core';
|
|
2
3
|
export declare class ScanOSSServiceImpl implements ScanOSSService {
|
|
4
|
+
protected readonly logger: ILogger;
|
|
3
5
|
private readonly processor;
|
|
4
6
|
scanContent(content: string, apiKey?: string): Promise<ScanOSSResult>;
|
|
5
7
|
doScanContent(content: string, apiKey?: string): Promise<ScanOSSResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanoss-service-impl.d.ts","sourceRoot":"","sources":["../../src/node/scanoss-service-impl.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"scanoss-service-impl.d.ts","sourceRoot":"","sources":["../../src/node/scanoss-service-impl.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAiBtC,qBACa,kBAAmB,YAAW,cAAc;IAGrD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4C;IAEhE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAIrE,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;CA4EhF"}
|
|
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.ScanOSSServiceImpl = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
+
const core_1 = require("@theia/core");
|
|
21
22
|
const scanoss_1 = require("scanoss");
|
|
22
23
|
// Helper class to perform scans sequentially
|
|
23
24
|
class SequentialProcessor {
|
|
@@ -51,7 +52,7 @@ let ScanOSSServiceImpl = class ScanOSSServiceImpl {
|
|
|
51
52
|
});
|
|
52
53
|
}
|
|
53
54
|
catch (e) {
|
|
54
|
-
|
|
55
|
+
this.logger.debug('SCANOSS error', e);
|
|
55
56
|
// map known errors to a more user-friendly message
|
|
56
57
|
// Invalid API key message
|
|
57
58
|
if (e.message?.includes('Forbidden')) {
|
|
@@ -82,7 +83,7 @@ let ScanOSSServiceImpl = class ScanOSSServiceImpl {
|
|
|
82
83
|
message: 'Scan request unsuccessful'
|
|
83
84
|
};
|
|
84
85
|
}
|
|
85
|
-
|
|
86
|
+
this.logger.debug('SCANOSS results', JSON.stringify(results, undefined, 2));
|
|
86
87
|
let contentScanning = results['/content_scanning'];
|
|
87
88
|
if (!contentScanning) {
|
|
88
89
|
// #14648: The scanoss library prefixes the property with the path of a temporary file on Windows, so we need to search for it
|
|
@@ -110,6 +111,11 @@ let ScanOSSServiceImpl = class ScanOSSServiceImpl {
|
|
|
110
111
|
}
|
|
111
112
|
};
|
|
112
113
|
exports.ScanOSSServiceImpl = ScanOSSServiceImpl;
|
|
114
|
+
tslib_1.__decorate([
|
|
115
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
116
|
+
(0, inversify_1.named)('scanoss:ScanOSSServiceImpl'),
|
|
117
|
+
tslib_1.__metadata("design:type", Object)
|
|
118
|
+
], ScanOSSServiceImpl.prototype, "logger", void 0);
|
|
113
119
|
exports.ScanOSSServiceImpl = ScanOSSServiceImpl = tslib_1.__decorate([
|
|
114
120
|
(0, inversify_1.injectable)()
|
|
115
121
|
], ScanOSSServiceImpl);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanoss-service-impl.js","sourceRoot":"","sources":["../../src/node/scanoss-service-impl.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"scanoss-service-impl.js","sourceRoot":"","sources":["../../src/node/scanoss-service-impl.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/scanoss",
|
|
3
|
-
"version": "1.73.0-next.
|
|
3
|
+
"version": "1.73.0-next.31+f888a90fa",
|
|
4
4
|
"description": "Theia - SCANOSS Integration",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.73.0-next.
|
|
6
|
+
"@theia/core": "1.73.0-next.31+f888a90fa",
|
|
7
7
|
"scanoss": "^0.15.7"
|
|
8
8
|
},
|
|
9
9
|
"publishConfig": {
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"nyc": {
|
|
47
47
|
"extends": "../../configs/nyc.json"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "f888a90fa9ccf8c0468fcb567369625c51ede3ee"
|
|
50
50
|
}
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { injectable } from '@theia/core/shared/inversify';
|
|
17
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { ScanOSSResult, ScanOSSService } from '../common';
|
|
19
|
-
|
|
19
|
+
import { ILogger } from '@theia/core';
|
|
20
20
|
import { Scanner, ScannerCfg, ScannerComponent } from 'scanoss';
|
|
21
21
|
|
|
22
22
|
// Define our own type of what is actually returned by the scanner
|
|
@@ -36,6 +36,9 @@ class SequentialProcessor<T> {
|
|
|
36
36
|
@injectable()
|
|
37
37
|
export class ScanOSSServiceImpl implements ScanOSSService {
|
|
38
38
|
|
|
39
|
+
@inject(ILogger) @named('scanoss:ScanOSSServiceImpl')
|
|
40
|
+
protected readonly logger: ILogger;
|
|
41
|
+
|
|
39
42
|
private readonly processor = new SequentialProcessor<ScanOSSResult>();
|
|
40
43
|
|
|
41
44
|
async scanContent(content: string, apiKey?: string): Promise<ScanOSSResult> {
|
|
@@ -56,7 +59,7 @@ export class ScanOSSServiceImpl implements ScanOSSService {
|
|
|
56
59
|
key: 'content_scanning',
|
|
57
60
|
});
|
|
58
61
|
} catch (e) {
|
|
59
|
-
|
|
62
|
+
this.logger.debug('SCANOSS error', e);
|
|
60
63
|
|
|
61
64
|
// map known errors to a more user-friendly message
|
|
62
65
|
|
|
@@ -90,7 +93,7 @@ export class ScanOSSServiceImpl implements ScanOSSService {
|
|
|
90
93
|
};
|
|
91
94
|
}
|
|
92
95
|
|
|
93
|
-
|
|
96
|
+
this.logger.debug('SCANOSS results', JSON.stringify(results, undefined, 2));
|
|
94
97
|
|
|
95
98
|
let contentScanning: ScannerComponent[] | undefined = results['/content_scanning'];
|
|
96
99
|
if (!contentScanning) {
|