scanoss 0.31.2 → 0.32.0-beta.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/CHANGELOG.md +6 -0
- package/build/main/cli/commands/scan.js +8 -2
- package/build/main/sdk/Decompress/DecompressionManager.d.ts +11 -2
- package/build/main/sdk/Decompress/DecompressionManager.js +23 -13
- package/build/main/sdk/Decompress/Decompressor/DecompressLibarchive.js +27 -2
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/cli/commands/scan.js +8 -2
- package/build/module/sdk/Decompress/DecompressionManager.d.ts +11 -2
- package/build/module/sdk/Decompress/DecompressionManager.js +23 -13
- package/build/module/sdk/Decompress/Decompressor/DecompressLibarchive.js +27 -2
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
- Upcoming changes...
|
|
7
7
|
|
|
8
|
+
## [0.32.0] (2026-02-04)
|
|
9
|
+
### Changed
|
|
10
|
+
- Improved decompression error handling: extraction failures are now collected and reported rather than stopping the entire process
|
|
11
|
+
- CLI scan command displays warnings for archives that failed to extract while continuing with successful extractions
|
|
12
|
+
|
|
8
13
|
## [0.31.2] (2026-02-03)
|
|
9
14
|
### Fixed
|
|
10
15
|
- Fixed CryptographyScanner hang when processing empty file list
|
|
@@ -235,3 +240,4 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
235
240
|
### [0.31.0](https://github.com/scanoss/scanoss.js/compare/v0.30.1...v0.31.0) (2026-02-02)
|
|
236
241
|
### [0.31.1](https://github.com/scanoss/scanoss.js/compare/v0.31.0...v0.31.1) (2026-02-02)
|
|
237
242
|
### [0.31.2](https://github.com/scanoss/scanoss.js/compare/v0.31.1...v0.31.2) (2026-02-03)
|
|
243
|
+
### [0.32.0](https://github.com/scanoss/scanoss.js/compare/v0.31.2...v0.32.0) (2026-02-04)
|
|
@@ -200,7 +200,13 @@ async function scanHandler(rootPath, options) {
|
|
|
200
200
|
if (archives.length) {
|
|
201
201
|
console.error("Extracting archives...");
|
|
202
202
|
const decompressionManager = new DecompressionManager_1.DecompressionManager(options.extractDeep, options.extractSuffix, options.extractOverwrite);
|
|
203
|
-
await decompressionManager.decompress(archives);
|
|
203
|
+
const { failedFiles } = await decompressionManager.decompress(archives);
|
|
204
|
+
if (failedFiles.length > 0) {
|
|
205
|
+
console.error(`Warning: ${failedFiles.length} archive(s) failed to extract:`);
|
|
206
|
+
for (const { path, error } of failedFiles) {
|
|
207
|
+
console.error(` - ${path}: ${error}`);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
204
210
|
console.error("Reindexing files...");
|
|
205
211
|
tree.build();
|
|
206
212
|
}
|
|
@@ -337,4 +343,4 @@ async function scanHandler(rootPath, options) {
|
|
|
337
343
|
await streamAndTransformResults(scannerResultPath, results.dependencies, results.cryptography.files, results.cryptography.components, options.output);
|
|
338
344
|
}
|
|
339
345
|
}
|
|
340
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/cli/commands/scan.ts"],"names":[],"mappings":"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"}
|
|
346
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/cli/commands/scan.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,15 @@ export declare class DecompressionManager {
|
|
|
7
7
|
constructor(decompressionLevel?: number, suffix?: string, decompressOverride?: boolean);
|
|
8
8
|
addDecompressor(d: Decompressor): void;
|
|
9
9
|
getSupportedFormats(): Array<string>;
|
|
10
|
-
decompress(archivesPaths: Array<string>): Promise<
|
|
11
|
-
|
|
10
|
+
decompress(archivesPaths: Array<string>): Promise<{
|
|
11
|
+
parentFolders: Array<string>;
|
|
12
|
+
failedFiles: Array<{
|
|
13
|
+
path: string;
|
|
14
|
+
error: string;
|
|
15
|
+
}>;
|
|
16
|
+
}>;
|
|
17
|
+
decompressRecursive(archivePath: string, level: number): Promise<Array<{
|
|
18
|
+
path: string;
|
|
19
|
+
error: string;
|
|
20
|
+
}>>;
|
|
12
21
|
}
|
|
@@ -36,14 +36,18 @@ class DecompressionManager {
|
|
|
36
36
|
return supportedFormats;
|
|
37
37
|
}
|
|
38
38
|
async decompress(archivesPaths) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
const failedFiles = [];
|
|
40
|
+
for (const archivePath of archivesPaths) {
|
|
41
|
+
const failed = await this.decompressRecursive(archivePath, 0);
|
|
42
|
+
failedFiles.push(...failed);
|
|
43
|
+
}
|
|
44
|
+
const parentFolders = archivesPaths.map(archivePath => `${archivePath}${this.suffix}`);
|
|
45
|
+
return { parentFolders, failedFiles };
|
|
43
46
|
}
|
|
44
47
|
async decompressRecursive(archivePath, level) {
|
|
48
|
+
const failedFiles = [];
|
|
45
49
|
if (level >= this.decompressionLevel)
|
|
46
|
-
return;
|
|
50
|
+
return failedFiles;
|
|
47
51
|
const archiveRootPath = path_1.default.dirname(archivePath);
|
|
48
52
|
const archiveName = path_1.default.basename(archivePath);
|
|
49
53
|
let newFolderPath = `${archiveRootPath}${path_1.default.sep}${archiveName}${this.suffix}`;
|
|
@@ -58,6 +62,7 @@ class DecompressionManager {
|
|
|
58
62
|
}
|
|
59
63
|
await fs_1.default.promises.mkdir(newFolderPath, { recursive: true });
|
|
60
64
|
//Search for decompressor and extract archive
|
|
65
|
+
let extractionFailed = false;
|
|
61
66
|
for (const d of this.decompressorList) {
|
|
62
67
|
if (d.isSupported(archiveName)) {
|
|
63
68
|
try {
|
|
@@ -66,20 +71,25 @@ class DecompressionManager {
|
|
|
66
71
|
catch (e) {
|
|
67
72
|
await fs_1.default.promises.rm(newFolderPath, { recursive: true, force: true });
|
|
68
73
|
const message = e instanceof Error ? e.message : String(e);
|
|
69
|
-
|
|
74
|
+
failedFiles.push({ path: archivePath, error: message });
|
|
75
|
+
extractionFailed = true;
|
|
70
76
|
}
|
|
71
77
|
break;
|
|
72
78
|
}
|
|
73
79
|
}
|
|
74
|
-
//Search for new archives
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
+
//Search for new archives (only if extraction succeeded)
|
|
81
|
+
if (!extractionFailed) {
|
|
82
|
+
const tree = new Tree_1.Tree(newFolderPath);
|
|
83
|
+
tree.build();
|
|
84
|
+
const newFilesPath = tree.getFileList(new DecompressionFilter_1.DecompressionFilter(""));
|
|
85
|
+
for (const newFilePath of newFilesPath) {
|
|
86
|
+
const nestedFailed = await this.decompressRecursive(newFilePath, level + 1);
|
|
87
|
+
failedFiles.push(...nestedFailed);
|
|
88
|
+
}
|
|
80
89
|
}
|
|
81
90
|
}
|
|
91
|
+
return failedFiles;
|
|
82
92
|
}
|
|
83
93
|
}
|
|
84
94
|
exports.DecompressionManager = DecompressionManager;
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVjb21wcmVzc2lvbk1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL0RlY29tcHJlc3MvRGVjb21wcmVzc2lvbk1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsZ0RBQXdCO0FBQ3hCLDRDQUFvQjtBQUNwQix1Q0FBb0M7QUFDcEMsNkVBQTBFO0FBRTFFLGtFQUE4RDtBQUM5RCxnRUFBNkQ7QUFDN0QsOEVBQTJFO0FBQzNFLDhEQUEyRDtBQUUzRCxNQUFhLG9CQUFvQjtJQVNPLGlIQUFpSDtJQUV2SixZQUFZLHFCQUE2QixDQUFDLEVBQUUsU0FBaUIsV0FBVyxFQUFFLHFCQUE4QixLQUFLO1FBQzNHLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztRQUM3QyxJQUFJLENBQUMsa0JBQWtCLEdBQUcsa0JBQWtCLENBQUM7UUFDN0MsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLGdCQUFnQixHQUFHO1lBQ3RCLElBQUksNkJBQWEsRUFBRTtZQUNuQixJQUFJLDhCQUFhLEVBQUU7WUFDbkIsSUFBSSwyQ0FBb0IsRUFBRTtZQUMxQixJQUFJLDJCQUFZLEVBQUU7U0FDbkIsQ0FBQztJQUVKLENBQUM7SUFFTSxlQUFlLENBQUMsQ0FBZTtRQUNwQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2hDLENBQUM7SUFFTSxtQkFBbUI7UUFDeEIsTUFBTSxnQkFBZ0IsR0FBRyxFQUFFLENBQUM7UUFDNUIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQ2xDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBQUE7UUFDbkQsQ0FBQyxDQUFDLENBQUM7UUFDSCxPQUFPLGdCQUFnQixDQUFDO0lB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
|
|
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
exports.DecompressLibarchive = void 0;
|
|
40
40
|
const fs_1 = __importDefault(require("fs"));
|
|
41
41
|
const path_1 = __importDefault(require("path"));
|
|
42
|
+
const worker_threads_1 = require("worker_threads");
|
|
42
43
|
const Decompressor_1 = require("./Decompressor");
|
|
43
44
|
const node_buffer_1 = require("node:buffer");
|
|
44
45
|
if (typeof globalThis.File === 'undefined') {
|
|
@@ -47,11 +48,35 @@ if (typeof globalThis.File === 'undefined') {
|
|
|
47
48
|
let _Archive;
|
|
48
49
|
async function getArchive() {
|
|
49
50
|
if (!_Archive) {
|
|
50
|
-
const mod = await Promise.resolve().then(() => __importStar(require('libarchive.js/dist/libarchive-node.mjs')));
|
|
51
|
+
const mod = await Promise.resolve().then(() => __importStar(require(/* webpackIgnore: true */ 'libarchive.js/dist/libarchive-node.mjs')));
|
|
51
52
|
_Archive = mod.Archive;
|
|
53
|
+
patchLibarchiveForElectron(_Archive);
|
|
52
54
|
}
|
|
53
55
|
return _Archive;
|
|
54
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* In packaged Electron apps, native files (WASM, worker scripts) live under
|
|
59
|
+
* app.asar.unpacked instead of app.asar. libarchive.js resolves its worker
|
|
60
|
+
* path via import.meta.url which points inside app.asar, so we re-initialise
|
|
61
|
+
* Archive with the corrected path while preserving the existing createClient
|
|
62
|
+
* (Node.js Comlink adapter set by libarchive-node.mjs).
|
|
63
|
+
*/
|
|
64
|
+
function patchLibarchiveForElectron(Archive) {
|
|
65
|
+
try {
|
|
66
|
+
const workerPath = require.resolve('libarchive.js/dist/worker-bundle-node.mjs');
|
|
67
|
+
if (!workerPath.includes('app.asar'))
|
|
68
|
+
return;
|
|
69
|
+
const unpackedWorkerPath = workerPath.replace('app.asar', 'app.asar.unpacked');
|
|
70
|
+
const currentOptions = Archive._options || {};
|
|
71
|
+
Archive.init({
|
|
72
|
+
...currentOptions,
|
|
73
|
+
getWorker: () => new worker_threads_1.Worker(unpackedWorkerPath),
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
catch (_a) {
|
|
77
|
+
// Not in an Electron asar context or resolve failed — nothing to patch
|
|
78
|
+
}
|
|
79
|
+
}
|
|
55
80
|
/**
|
|
56
81
|
* Decompressor for multi-file archive formats supported by libarchive.js (WASM-based).
|
|
57
82
|
* Handles .rar, .rpm, .7z, .tar.bz2, .tar.lzma, .tar.xz, .tbz2, and .txz.
|
|
@@ -100,4 +125,4 @@ class DecompressLibarchive extends Decompressor_1.Decompressor {
|
|
|
100
125
|
}
|
|
101
126
|
}
|
|
102
127
|
exports.DecompressLibarchive = DecompressLibarchive;
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVjb21wcmVzc0xpYmFyY2hpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlY29tcHJlc3MvRGVjb21wcmVzc29yL0RlY29tcHJlc3NMaWJhcmNoaXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDRDQUFvQjtBQUNwQixnREFBd0I7QUFDeEIsbURBQXdDO0FBQ3hDLGlEQUE4QztBQUM5Qyw2Q0FBK0M7QUFFL0MsSUFBSSxPQUFPLFVBQVUsQ0FBQyxJQUFJLEtBQUssV0FBVyxFQUFFLENBQUM7SUFDMUMsVUFBa0IsQ0FBQyxJQUFJLEdBQUcsa0JBQVEsQ0FBQztBQUN0QyxDQUFDO0FBRUQsSUFBSSxRQUFhLENBQUM7QUFDbEIsS0FBSyxVQUFVLFVBQVU7SUFDdkIsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2QsTUFBTSxHQUFHLEdBQUcsd0RBQWEseUJBQXlCLENBQUMsd0NBQXdDLEdBQUMsQ0FBQztRQUM3RixRQUFRLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQztRQUN2QiwwQkFBMEIsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBQ0QsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILFNBQVMsMEJBQTBCLENBQUMsT0FBWTtJQUM5QyxJQUFJLENBQUM7UUFDSCxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLDJDQUEyQyxDQUFDLENBQUM7UUFDaEYsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDO1lBQUUsT0FBTztRQUU3QyxNQUFNLGtCQUFrQixHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDLENBQUM7UUFDL0UsTUFBTSxjQUFjLEdBQUcsT0FBTyxDQUFDLFFBQVEsSUFBSSxFQUFFLENBQUM7UUFDOUMsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLEdBQUcsY0FBYztZQUNqQixTQUFTLEVBQUUsR0FBRyxFQUFFLENBQUMsSUFBSSx1QkFBTSxDQUFDLGtCQUFrQixDQUFDO1NBQ2hELENBQUMsQ0FBQztJQUNMLENBQUM7SUFBQyxXQUFNLENBQUM7UUFDUCx1RUFBdUU7SUFDekUsQ0FBQztBQUNILENBQUM7QUFHRDs7O0dBR0c7QUFDSCxNQUFhLG9CQUFxQixTQUFRLDJCQUFZO0lBQ3BEO1FBQ0UsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsZ0JBQWdCLEdBQUc7WUFDdEIsTUFBTTtZQUNOLE1BQU07WUFDTixVQUFVO1lBQ1YsV0FBVztZQUNYLFNBQVM7WUFDVCxPQUFPO1lBQ1AsTUFBTTtZQUNOLEtBQUs7U0FDTixDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUssQ0FBQyxHQUFHLENBQUMsV0FBbUIsRUFBRSxRQUFnQjtRQUNwRCxNQUFNLE1BQU0sR0FBRyxZQUFFLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQzVDLE1BQU0sSUFBSSxHQUFHLElBQUksa0JBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLGNBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztRQUNoRSxNQUFNLE9BQU8sR0FBRyxNQUFNLFVBQVUsRUFBRSxDQUFDO1FBQ25DLE1BQU0sT0FBTyxHQUFHLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUM7WUFDSCxNQUFNLFdBQVcsR0FBRyxNQUFNLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUNqRCxNQUFNLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDeEQsQ0FBQztnQkFBUyxDQUFDO1lBQ1QsTUFBTSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDeEIsQ0FBQztJQUNILENBQUM7SUFFTyxLQUFLLENBQUMsbUJBQW1CLENBQUMsR0FBUSxFQUFFLFFBQWdCO1FBQzFELEtBQUssTUFBTSxHQUFHLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ25DLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUN2QixNQUFNLFFBQVEsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztZQUMxQyxJQUFJLEtBQUssWUFBWSxJQUFJLEVBQUUsQ0FBQztnQkFDMUIsWUFBRSxDQUFDLFNBQVMsQ0FBQyxjQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7Z0JBQzFELE1BQU0sV0FBVyxHQUFHLE1BQU0sS0FBSyxDQUFDLFdBQVcsRUFBRSxDQUFDO2dCQUM5QyxZQUFFLENBQUMsYUFBYSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDdkQsQ0FBQztpQkFBTSxJQUFJLEtBQUssS0FBSyxJQUFJLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxFQUFFLENBQUM7Z0JBQ3ZELFlBQUUsQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7Z0JBQzVDLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQztZQUNsRCxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7Q0FDRjtBQTFDRCxvREEwQ0MifQ==
|