Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/cute-ghosts-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nodesecure/scanner": minor
---

feat(scanner): depWalker add stats on tarball.scanDirOrArchive
15 changes: 10 additions & 5 deletions workspaces/scanner/src/depWalker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ export async function depWalker(
ref: dependency.versions[version] as any,
location,
isRootNode: scanRootNode && name === manifest.name,
registry
registry,
statsCollector
};
operationsQueue.push(
scanDirOrArchiveEx(name, version, locker, tempDir, logger, scanDirOptions)
Expand Down Expand Up @@ -392,31 +393,35 @@ async function scanDirOrArchiveEx(
isRootNode: boolean;
location: string | undefined;
ref: any;
statsCollector: StatsCollector;
}
) {
using _ = await locker.acquire();

const spec = `${name}@${version}`;

try {
const {
registry,
location = process.cwd(),
isRootNode,
ref
ref,
statsCollector
} = options;

const mama = await (isRootNode ?
ManifestManager.fromPackageJSON(location) :
extractAndResolve(tempDir.location, {
spec: `${name}@${version}`,
spec,
registry
})
);

await scanDirOrArchive(mama, ref, {
await statsCollector.track(`tarball.scanDirOrArchive ${spec}`, () => scanDirOrArchive(mama, ref, {
astAnalyserOptions: {
optionalWarnings: typeof location !== "undefined"
}
});
}));
}
catch (error: any) {
logger.emit(ScannerLoggerEvents.error, error, "tarball-scan");
Expand Down
2 changes: 1 addition & 1 deletion workspaces/scanner/test/depWalker.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ test("execute depWalker on pkg.gitdeps", async(test) => {
assert.strictEqual(typeof metadata.startedAt, "number");
assert.strictEqual(typeof metadata.executionTime, "number");
assert.strictEqual(Array.isArray(metadata.apiCalls), true);
assert.strictEqual(metadata.apiCallsCount, 25);
assert.strictEqual(metadata.apiCallsCount, 37);
});

test("execute depWalker on typo-squatting (with location)", async(test) => {
Expand Down