mirror of
https://github.com/microsoft/vscode.git
synced 2026-07-10 16:58:55 -05:00
crypto - asyncify checkum method and add tests
This commit is contained in:
@@ -7,8 +7,8 @@ import * as fs from 'fs';
|
||||
import * as crypto from 'crypto';
|
||||
import { once } from 'vs/base/common/functional';
|
||||
|
||||
export function checksum(path: string, sha1hash: string | undefined): Promise<void> {
|
||||
const promise = new Promise<string | undefined>((c, e) => {
|
||||
export async function checksum(path: string, sha1hash: string | undefined): Promise<void> {
|
||||
const checksumPromise = new Promise<string | undefined>((resolve, reject) => {
|
||||
const input = fs.createReadStream(path);
|
||||
const hash = crypto.createHash('sha1');
|
||||
input.pipe(hash);
|
||||
@@ -18,9 +18,9 @@ export function checksum(path: string, sha1hash: string | undefined): Promise<vo
|
||||
hash.removeAllListeners();
|
||||
|
||||
if (err) {
|
||||
e(err);
|
||||
reject(err);
|
||||
} else {
|
||||
c(result);
|
||||
resolve(result);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -30,11 +30,9 @@ export function checksum(path: string, sha1hash: string | undefined): Promise<vo
|
||||
hash.once('data', (data: Buffer) => done(undefined, data.toString('hex')));
|
||||
});
|
||||
|
||||
return promise.then(hash => {
|
||||
if (hash !== sha1hash) {
|
||||
return Promise.reject(new Error('Hash mismatch'));
|
||||
}
|
||||
const hash = await checksumPromise;
|
||||
|
||||
return Promise.resolve();
|
||||
});
|
||||
if (hash !== sha1hash) {
|
||||
throw new Error('Hash mismatch');
|
||||
}
|
||||
}
|
||||
|
||||
27
src/vs/base/test/node/crypto.test.ts
Normal file
27
src/vs/base/test/node/crypto.test.ts
Normal file
@@ -0,0 +1,27 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { checksum } from 'vs/base/node/crypto';
|
||||
import { generateUuid } from 'vs/base/common/uuid';
|
||||
import { join } from 'vs/base/common/path';
|
||||
import { tmpdir } from 'os';
|
||||
import { mkdirp, rimraf, RimRafMode, writeFile } from 'vs/base/node/pfs';
|
||||
|
||||
suite('Crypto', () => {
|
||||
|
||||
test('checksum', async () => {
|
||||
const id = generateUuid();
|
||||
const testDir = join(tmpdir(), 'vsctests', id);
|
||||
const testFile = join(testDir, 'checksum.txt');
|
||||
|
||||
await mkdirp(testDir);
|
||||
|
||||
await writeFile(testFile, 'Hello World');
|
||||
|
||||
await checksum(testFile, '0a4d55a8d778e5022fab701977c5d840bbc486d0');
|
||||
|
||||
await rimraf(testDir, RimRafMode.MOVE);
|
||||
});
|
||||
});
|
||||
@@ -1,28 +0,0 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { generateUuid } from 'vs/base/common/uuid';
|
||||
import { join } from 'vs/base/common/path';
|
||||
import { tmpdir } from 'os';
|
||||
import { mkdirp, rimraf, RimRafMode } from 'vs/base/node/pfs';
|
||||
|
||||
export interface ITestFileResult {
|
||||
testFile: string;
|
||||
cleanUp: () => Promise<void>;
|
||||
}
|
||||
|
||||
export function testFile(folder: string, file: string): Promise<ITestFileResult> {
|
||||
const id = generateUuid();
|
||||
const parentDir = join(tmpdir(), 'vsctests', id);
|
||||
const newDir = join(parentDir, folder, id);
|
||||
const testFile = join(newDir, file);
|
||||
|
||||
return mkdirp(newDir, 493).then(() => {
|
||||
return {
|
||||
testFile,
|
||||
cleanUp: () => rimraf(parentDir, RimRafMode.MOVE)
|
||||
};
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user