Skip to content

Close open file descriptors and update to fs' promise API #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndreasWJ wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Close open file descriptors and update to fs' promise API #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 19 additions & 16 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

var crc = require('crc');
var fs = require('fs');
var fs = require('fs/promises');
var jBinary = require('jbinary');
var path = require('path');

Expand Down Expand Up @@ -112,24 +112,25 @@ class VPK {
this.directoryPath = path;
}

isValid() {
let header = new Buffer(HEADER_2_LENGTH);
let directoryFile = fs.openSync(this.directoryPath, 'r');
fs.readSync(directoryFile, header, 0, HEADER_2_LENGTH, 0);
async isValid() {
let header = Buffer.alloc(HEADER_2_LENGTH);
const directoryPathHandle = await fs.open(this.directoryPath);
await directoryPathHandle.read(header, 0, HEADER_2_LENGTH, 0);
await directoryPathHandle.close();
let binary = new jBinary(header, TYPESET);

try {
binary.read('vpkHeader');

return true;
}
catch (e) {
return false;
}
}

load() {
let binary = new jBinary(fs.readFileSync(this.directoryPath), TYPESET);
async load() {
const directoryFileBuffer = await fs.readFile(this.directoryPath);
let binary = new jBinary(directoryFileBuffer, TYPESET);

this.header = binary.read('vpkHeader');
this.tree = binary.read('vpkTree');
Expand All @@ -139,18 +140,18 @@ class VPK {
return Object.keys(this.tree);
}

getFile(path) {
async getFile(path) {
let entry = this.tree[path];

if (!entry) {
return null;
}

let file = new Buffer(entry.preloadBytes + entry.entryLength);
let file = Buffer.alloc(entry.preloadBytes + entry.entryLength);
const directoryPathHandle = await fs.open(this.directoryPath);

if (entry.preloadBytes > 0) {
let directoryFile = fs.openSync(this.directoryPath, 'r');
fs.readSync(directoryFile, file, 0, entry.preloadBytes, entry.preloadOffset);
await directoryPathHandle.read(file, 0, entry.preloadBytes, entry.preloadOffset);
}

if (entry.entryLength > 0) {
Expand All @@ -164,18 +165,20 @@ class VPK {
offset += HEADER_2_LENGTH;
}

let directoryFile = fs.openSync(this.directoryPath, 'r');
fs.readSync(directoryFile, file, entry.preloadBytes, entry.entryLength, offset + entry.entryOffset);
await directoryPathHandle.read(file, entry.preloadBytes, entry.entryLength, (offset + entry.entryOffset));
}
else {
let fileIndex = ('000' + entry.archiveIndex).slice(-3);
let archivePath = this.directoryPath.replace(/_dir\.vpk$/, '_' + fileIndex + '.vpk');

let archiveFile = fs.openSync(archivePath, 'r');
fs.readSync(archiveFile, file, entry.preloadBytes, entry.entryLength, entry.entryOffset);
const archivePathHandle = await fs.open(archivePath);
await archivePathHandle.read(file, entry.preloadBytes, entry.entryLength, entry.entryOffset);
await archivePathHandle.close();
}
}

await directoryPathHandle.close();

if (crc.crc32(file) !== entry.crc) {
throw new Error('CRC does not match');
}
Expand Down