|
|
|
@ -18,63 +18,40 @@ importScripts('../io/bytebuffer.js');
|
|
|
|
importScripts('../io/bytestream.js');
|
|
|
|
importScripts('../io/bytestream.js');
|
|
|
|
importScripts('archive.js');
|
|
|
|
importScripts('archive.js');
|
|
|
|
|
|
|
|
|
|
|
|
const UnarchiveState = {
|
|
|
|
|
|
|
|
NOT_STARTED: 0,
|
|
|
|
|
|
|
|
UNARCHIVING: 1,
|
|
|
|
|
|
|
|
WAITING: 2,
|
|
|
|
|
|
|
|
FINISHED: 3,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// State - consider putting these into a class.
|
|
|
|
|
|
|
|
let unarchiveState = UnarchiveState.NOT_STARTED;
|
|
|
|
|
|
|
|
let bytestream = null;
|
|
|
|
|
|
|
|
let allLocalFiles = null;
|
|
|
|
|
|
|
|
let logToConsole = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Progress variables.
|
|
|
|
// Progress variables.
|
|
|
|
let currentFilename = "";
|
|
|
|
var currentFilename = "";
|
|
|
|
let currentFileNumber = 0;
|
|
|
|
var currentFileNumber = 0;
|
|
|
|
let currentBytesUnarchivedInFile = 0;
|
|
|
|
var currentBytesUnarchivedInFile = 0;
|
|
|
|
let currentBytesUnarchived = 0;
|
|
|
|
var currentBytesUnarchived = 0;
|
|
|
|
let totalUncompressedBytesInArchive = 0;
|
|
|
|
var totalUncompressedBytesInArchive = 0;
|
|
|
|
let totalFilesInArchive = 0;
|
|
|
|
var totalFilesInArchive = 0;
|
|
|
|
|
|
|
|
|
|
|
|
// Helper functions.
|
|
|
|
// Helper functions.
|
|
|
|
const info = function(str) {
|
|
|
|
var info = function(str) {
|
|
|
|
postMessage(new bitjs.archive.UnarchiveInfoEvent(str));
|
|
|
|
postMessage(new bitjs.archive.UnarchiveInfoEvent(str));
|
|
|
|
};
|
|
|
|
};
|
|
|
|
const err = function(str) {
|
|
|
|
var err = function(str) {
|
|
|
|
postMessage(new bitjs.archive.UnarchiveErrorEvent(str));
|
|
|
|
postMessage(new bitjs.archive.UnarchiveErrorEvent(str));
|
|
|
|
};
|
|
|
|
};
|
|
|
|
const postProgress = function() {
|
|
|
|
var postProgress = function() {
|
|
|
|
postMessage(new bitjs.archive.UnarchiveProgressEvent(
|
|
|
|
postMessage(new bitjs.archive.UnarchiveProgressEvent(
|
|
|
|
currentFilename,
|
|
|
|
currentFilename,
|
|
|
|
currentFileNumber,
|
|
|
|
currentFileNumber,
|
|
|
|
currentBytesUnarchivedInFile,
|
|
|
|
currentBytesUnarchivedInFile,
|
|
|
|
currentBytesUnarchived,
|
|
|
|
currentBytesUnarchived,
|
|
|
|
totalUncompressedBytesInArchive,
|
|
|
|
totalUncompressedBytesInArchive,
|
|
|
|
totalFilesInArchive,
|
|
|
|
totalFilesInArchive));
|
|
|
|
bytestream.getNumBytesRead(),
|
|
|
|
|
|
|
|
));
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
const zLocalFileHeaderSignature = 0x04034b50;
|
|
|
|
var zLocalFileHeaderSignature = 0x04034b50;
|
|
|
|
const zArchiveExtraDataSignature = 0x08064b50;
|
|
|
|
var zArchiveExtraDataSignature = 0x08064b50;
|
|
|
|
const zCentralFileHeaderSignature = 0x02014b50;
|
|
|
|
var zCentralFileHeaderSignature = 0x02014b50;
|
|
|
|
const zDigitalSignatureSignature = 0x05054b50;
|
|
|
|
var zDigitalSignatureSignature = 0x05054b50;
|
|
|
|
const zEndOfCentralDirSignature = 0x06064b50;
|
|
|
|
var zEndOfCentralDirSignature = 0x06064b50;
|
|
|
|
const zEndOfCentralDirLocatorSignature = 0x07064b50;
|
|
|
|
var zEndOfCentralDirLocatorSignature = 0x07064b50;
|
|
|
|
|
|
|
|
|
|
|
|
// mask for getting the Nth bit (zero-based)
|
|
|
|
|
|
|
|
const BIT = [ 0x01, 0x02, 0x04, 0x08,
|
|
|
|
|
|
|
|
0x10, 0x20, 0x40, 0x80,
|
|
|
|
|
|
|
|
0x100, 0x200, 0x400, 0x800,
|
|
|
|
|
|
|
|
0x1000, 0x2000, 0x4000, 0x8000];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class ZipLocalFile {
|
|
|
|
|
|
|
|
// takes a ByteStream and parses out the local file information
|
|
|
|
// takes a ByteStream and parses out the local file information
|
|
|
|
constructor(bstream) {
|
|
|
|
var ZipLocalFile = function(bstream) {
|
|
|
|
if (typeof bstream != typeof {} || !bstream.readNumber || typeof bstream.readNumber != typeof function(){}) {
|
|
|
|
if (typeof bstream != typeof {} || !bstream.readNumber || typeof bstream.readNumber != typeof function(){}) {
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -96,66 +73,194 @@ class ZipLocalFile {
|
|
|
|
this.filename = bstream.readString(this.fileNameLength);
|
|
|
|
this.filename = bstream.readString(this.fileNameLength);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
info("Zip Local File Header:");
|
|
|
|
|
|
|
|
info(" version=" + this.version);
|
|
|
|
|
|
|
|
info(" general purpose=" + this.generalPurpose);
|
|
|
|
|
|
|
|
info(" compression method=" + this.compressionMethod);
|
|
|
|
|
|
|
|
info(" last mod file time=" + this.lastModFileTime);
|
|
|
|
|
|
|
|
info(" last mod file date=" + this.lastModFileDate);
|
|
|
|
|
|
|
|
info(" crc32=" + this.crc32);
|
|
|
|
|
|
|
|
info(" compressed size=" + this.compressedSize);
|
|
|
|
|
|
|
|
info(" uncompressed size=" + this.uncompressedSize);
|
|
|
|
|
|
|
|
info(" file name length=" + this.fileNameLength);
|
|
|
|
|
|
|
|
info(" extra field length=" + this.extraFieldLength);
|
|
|
|
|
|
|
|
info(" filename = '" + this.filename + "'");
|
|
|
|
|
|
|
|
|
|
|
|
this.extraField = null;
|
|
|
|
this.extraField = null;
|
|
|
|
if (this.extraFieldLength > 0) {
|
|
|
|
if (this.extraFieldLength > 0) {
|
|
|
|
this.extraField = bstream.readString(this.extraFieldLength);
|
|
|
|
this.extraField = bstream.readString(this.extraFieldLength);
|
|
|
|
//info(" extra field=" + this.extraField);
|
|
|
|
info(" extra field=" + this.extraField);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// read in the compressed data
|
|
|
|
// read in the compressed data
|
|
|
|
this.fileData = null;
|
|
|
|
this.fileData = null;
|
|
|
|
if (this.compressedSize > 0) {
|
|
|
|
if (this.compressedSize > 0) {
|
|
|
|
this.fileData = new Uint8Array(bstream.readBytes(this.compressedSize));
|
|
|
|
this.fileData = new Uint8Array(bstream.bytes.buffer, bstream.ptr, this.compressedSize);
|
|
|
|
|
|
|
|
bstream.ptr += this.compressedSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: deal with data descriptor if present (we currently assume no data descriptor!)
|
|
|
|
// TODO: deal with data descriptor if present (we currently assume no data descriptor!)
|
|
|
|
// "This descriptor exists only if bit 3 of the general purpose bit flag is set"
|
|
|
|
// "This descriptor exists only if bit 3 of the general purpose bit flag is set"
|
|
|
|
// But how do you figure out how big the file data is if you don't know the compressedSize
|
|
|
|
// But how do you figure out how big the file data is if you don't know the compressedSize
|
|
|
|
// from the header?!?
|
|
|
|
// from the header?!?
|
|
|
|
if ((this.generalPurpose & BIT[3]) != 0) {
|
|
|
|
if ((this.generalPurpose & bitjs.BIT[3]) != 0) {
|
|
|
|
this.crc32 = bstream.readNumber(4);
|
|
|
|
this.crc32 = bstream.readNumber(4);
|
|
|
|
this.compressedSize = bstream.readNumber(4);
|
|
|
|
this.compressedSize = bstream.readNumber(4);
|
|
|
|
this.uncompressedSize = bstream.readNumber(4);
|
|
|
|
this.uncompressedSize = bstream.readNumber(4);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
// Now that we have all the bytes for this file, we can print out some information.
|
|
|
|
|
|
|
|
if (logToConsole) {
|
|
|
|
|
|
|
|
info("Zip Local File Header:");
|
|
|
|
|
|
|
|
info(" version=" + this.version);
|
|
|
|
|
|
|
|
info(" general purpose=" + this.generalPurpose);
|
|
|
|
|
|
|
|
info(" compression method=" + this.compressionMethod);
|
|
|
|
|
|
|
|
info(" last mod file time=" + this.lastModFileTime);
|
|
|
|
|
|
|
|
info(" last mod file date=" + this.lastModFileDate);
|
|
|
|
|
|
|
|
info(" crc32=" + this.crc32);
|
|
|
|
|
|
|
|
info(" compressed size=" + this.compressedSize);
|
|
|
|
|
|
|
|
info(" uncompressed size=" + this.uncompressedSize);
|
|
|
|
|
|
|
|
info(" file name length=" + this.fileNameLength);
|
|
|
|
|
|
|
|
info(" extra field length=" + this.extraFieldLength);
|
|
|
|
|
|
|
|
info(" filename = '" + this.filename + "'");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// determine what kind of compressed data we have and decompress
|
|
|
|
// determine what kind of compressed data we have and decompress
|
|
|
|
unzip() {
|
|
|
|
ZipLocalFile.prototype.unzip = function() {
|
|
|
|
|
|
|
|
|
|
|
|
// Zip Version 1.0, no compression (store only)
|
|
|
|
// Zip Version 1.0, no compression (store only)
|
|
|
|
if (this.compressionMethod == 0 ) {
|
|
|
|
if (this.compressionMethod == 0 ) {
|
|
|
|
if (logToConsole) {
|
|
|
|
|
|
|
|
info("ZIP v"+this.version+", store only: " + this.filename + " (" + this.compressedSize + " bytes)");
|
|
|
|
info("ZIP v"+this.version+", store only: " + this.filename + " (" + this.compressedSize + " bytes)");
|
|
|
|
}
|
|
|
|
|
|
|
|
currentBytesUnarchivedInFile = this.compressedSize;
|
|
|
|
currentBytesUnarchivedInFile = this.compressedSize;
|
|
|
|
currentBytesUnarchived += this.compressedSize;
|
|
|
|
currentBytesUnarchived += this.compressedSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// version == 20, compression method == 8 (DEFLATE)
|
|
|
|
// version == 20, compression method == 8 (DEFLATE)
|
|
|
|
else if (this.compressionMethod == 8) {
|
|
|
|
else if (this.compressionMethod == 8) {
|
|
|
|
if (logToConsole) {
|
|
|
|
|
|
|
|
info("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)");
|
|
|
|
info("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)");
|
|
|
|
}
|
|
|
|
|
|
|
|
this.fileData = inflate(this.fileData, this.uncompressedSize);
|
|
|
|
this.fileData = inflate(this.fileData, this.uncompressedSize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
err("UNSUPPORTED VERSION/FORMAT: ZIP v" + this.version + ", compression method=" + this.compressionMethod + ": " + this.filename + " (" + this.compressedSize + " bytes)");
|
|
|
|
err("UNSUPPORTED VERSION/FORMAT: ZIP v" + this.version + ", compression method=" + this.compressionMethod + ": " + this.filename + " (" + this.compressedSize + " bytes)");
|
|
|
|
this.fileData = null;
|
|
|
|
this.fileData = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Takes an ArrayBuffer of a zip file in
|
|
|
|
|
|
|
|
// returns null on error
|
|
|
|
|
|
|
|
// returns an array of DecompressedFile objects on success
|
|
|
|
|
|
|
|
var unzip = function(arrayBuffer) {
|
|
|
|
|
|
|
|
postMessage(new bitjs.archive.UnarchiveStartEvent());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
currentFilename = "";
|
|
|
|
|
|
|
|
currentFileNumber = 0;
|
|
|
|
|
|
|
|
currentBytesUnarchivedInFile = 0;
|
|
|
|
|
|
|
|
currentBytesUnarchived = 0;
|
|
|
|
|
|
|
|
totalUncompressedBytesInArchive = 0;
|
|
|
|
|
|
|
|
totalFilesInArchive = 0;
|
|
|
|
|
|
|
|
currentBytesUnarchived = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var bstream = new bitjs.io.ByteStream(arrayBuffer);
|
|
|
|
|
|
|
|
// detect local file header signature or return null
|
|
|
|
|
|
|
|
if (bstream.peekNumber(4) == zLocalFileHeaderSignature) {
|
|
|
|
|
|
|
|
var localFiles = [];
|
|
|
|
|
|
|
|
// loop until we don't see any more local files
|
|
|
|
|
|
|
|
while (bstream.peekNumber(4) == zLocalFileHeaderSignature) {
|
|
|
|
|
|
|
|
var oneLocalFile = new ZipLocalFile(bstream);
|
|
|
|
|
|
|
|
// this should strip out directories/folders
|
|
|
|
|
|
|
|
if (oneLocalFile && oneLocalFile.uncompressedSize > 0 && oneLocalFile.fileData) {
|
|
|
|
|
|
|
|
localFiles.push(oneLocalFile);
|
|
|
|
|
|
|
|
totalUncompressedBytesInArchive += oneLocalFile.uncompressedSize;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
totalFilesInArchive = localFiles.length;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// got all local files, now sort them
|
|
|
|
|
|
|
|
localFiles.sort(function(a,b) {
|
|
|
|
|
|
|
|
var aname = a.filename;
|
|
|
|
|
|
|
|
var bname = b.filename;
|
|
|
|
|
|
|
|
return aname > bname ? 1 : -1;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// extract the number at the end of both filenames
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
var aname = a.filename;
|
|
|
|
|
|
|
|
var bname = b.filename;
|
|
|
|
|
|
|
|
var aindex = aname.length, bindex = bname.length;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Find the last number character from the back of the filename.
|
|
|
|
|
|
|
|
while (aname[aindex-1] < '0' || aname[aindex-1] > '9') --aindex;
|
|
|
|
|
|
|
|
while (bname[bindex-1] < '0' || bname[bindex-1] > '9') --bindex;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Find the first number character from the back of the filename
|
|
|
|
|
|
|
|
while (aname[aindex-1] >= '0' && aname[aindex-1] <= '9') --aindex;
|
|
|
|
|
|
|
|
while (bname[bindex-1] >= '0' && bname[bindex-1] <= '9') --bindex;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// parse them into numbers and return comparison
|
|
|
|
|
|
|
|
var anum = parseInt(aname.substr(aindex), 10),
|
|
|
|
|
|
|
|
bnum = parseInt(bname.substr(bindex), 10);
|
|
|
|
|
|
|
|
return anum - bnum;
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// archive extra data record
|
|
|
|
|
|
|
|
if (bstream.peekNumber(4) == zArchiveExtraDataSignature) {
|
|
|
|
|
|
|
|
info(" Found an Archive Extra Data Signature");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// skipping this record for now
|
|
|
|
|
|
|
|
bstream.readNumber(4);
|
|
|
|
|
|
|
|
var archiveExtraFieldLength = bstream.readNumber(4);
|
|
|
|
|
|
|
|
bstream.readString(archiveExtraFieldLength);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// central directory structure
|
|
|
|
|
|
|
|
// TODO: handle the rest of the structures (Zip64 stuff)
|
|
|
|
|
|
|
|
if (bstream.peekNumber(4) == zCentralFileHeaderSignature) {
|
|
|
|
|
|
|
|
info(" Found a Central File Header");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// read all file headers
|
|
|
|
|
|
|
|
while (bstream.peekNumber(4) == zCentralFileHeaderSignature) {
|
|
|
|
|
|
|
|
bstream.readNumber(4); // signature
|
|
|
|
|
|
|
|
bstream.readNumber(2); // version made by
|
|
|
|
|
|
|
|
bstream.readNumber(2); // version needed to extract
|
|
|
|
|
|
|
|
bstream.readNumber(2); // general purpose bit flag
|
|
|
|
|
|
|
|
bstream.readNumber(2); // compression method
|
|
|
|
|
|
|
|
bstream.readNumber(2); // last mod file time
|
|
|
|
|
|
|
|
bstream.readNumber(2); // last mod file date
|
|
|
|
|
|
|
|
bstream.readNumber(4); // crc32
|
|
|
|
|
|
|
|
bstream.readNumber(4); // compressed size
|
|
|
|
|
|
|
|
bstream.readNumber(4); // uncompressed size
|
|
|
|
|
|
|
|
var fileNameLength = bstream.readNumber(2); // file name length
|
|
|
|
|
|
|
|
var extraFieldLength = bstream.readNumber(2); // extra field length
|
|
|
|
|
|
|
|
var fileCommentLength = bstream.readNumber(2); // file comment length
|
|
|
|
|
|
|
|
bstream.readNumber(2); // disk number start
|
|
|
|
|
|
|
|
bstream.readNumber(2); // internal file attributes
|
|
|
|
|
|
|
|
bstream.readNumber(4); // external file attributes
|
|
|
|
|
|
|
|
bstream.readNumber(4); // relative offset of local header
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bstream.readString(fileNameLength); // file name
|
|
|
|
|
|
|
|
bstream.readString(extraFieldLength); // extra field
|
|
|
|
|
|
|
|
bstream.readString(fileCommentLength); // file comment
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// digital signature
|
|
|
|
|
|
|
|
if (bstream.peekNumber(4) == zDigitalSignatureSignature) {
|
|
|
|
|
|
|
|
info(" Found a Digital Signature");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bstream.readNumber(4);
|
|
|
|
|
|
|
|
var sizeOfSignature = bstream.readNumber(2);
|
|
|
|
|
|
|
|
bstream.readString(sizeOfSignature); // digital signature data
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// report # files and total length
|
|
|
|
|
|
|
|
if (localFiles.length > 0) {
|
|
|
|
|
|
|
|
postProgress();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// now do the unzipping of each file
|
|
|
|
|
|
|
|
for (var i = 0; i < localFiles.length; ++i) {
|
|
|
|
|
|
|
|
var localfile = localFiles[i];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// update progress
|
|
|
|
|
|
|
|
currentFilename = localfile.filename;
|
|
|
|
|
|
|
|
currentFileNumber = i;
|
|
|
|
|
|
|
|
currentBytesUnarchivedInFile = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// actually do the unzipping
|
|
|
|
|
|
|
|
localfile.unzip();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (localfile.fileData != null) {
|
|
|
|
|
|
|
|
postMessage(new bitjs.archive.UnarchiveExtractEvent(localfile));
|
|
|
|
|
|
|
|
postProgress();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
postProgress();
|
|
|
|
|
|
|
|
postMessage(new bitjs.archive.UnarchiveFinishEvent());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -170,13 +275,13 @@ function getHuffmanCodes(bitLengths) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Reference: http://tools.ietf.org/html/rfc1951#page-8
|
|
|
|
// Reference: http://tools.ietf.org/html/rfc1951#page-8
|
|
|
|
const numLengths = bitLengths.length;
|
|
|
|
var numLengths = bitLengths.length,
|
|
|
|
const bl_count = [];
|
|
|
|
bl_count = [],
|
|
|
|
let MAX_BITS = 1;
|
|
|
|
MAX_BITS = 1;
|
|
|
|
|
|
|
|
|
|
|
|
// Step 1: count up how many codes of each length we have
|
|
|
|
// Step 1: count up how many codes of each length we have
|
|
|
|
for (let i = 0; i < numLengths; ++i) {
|
|
|
|
for (var i = 0; i < numLengths; ++i) {
|
|
|
|
const length = bitLengths[i];
|
|
|
|
var length = bitLengths[i];
|
|
|
|
// test to ensure each bit length is a positive, non-zero number
|
|
|
|
// test to ensure each bit length is a positive, non-zero number
|
|
|
|
if (typeof length != typeof 1 || length < 0) {
|
|
|
|
if (typeof length != typeof 1 || length < 0) {
|
|
|
|
err("bitLengths contained an invalid number in getHuffmanCodes(): " + length + " of type " + (typeof length));
|
|
|
|
err("bitLengths contained an invalid number in getHuffmanCodes(): " + length + " of type " + (typeof length));
|
|
|
|
@ -186,14 +291,15 @@ function getHuffmanCodes(bitLengths) {
|
|
|
|
if (bl_count[length] == undefined) bl_count[length] = 0;
|
|
|
|
if (bl_count[length] == undefined) bl_count[length] = 0;
|
|
|
|
// a length of zero means this symbol is not participating in the huffman coding
|
|
|
|
// a length of zero means this symbol is not participating in the huffman coding
|
|
|
|
if (length > 0) bl_count[length]++;
|
|
|
|
if (length > 0) bl_count[length]++;
|
|
|
|
|
|
|
|
|
|
|
|
if (length > MAX_BITS) MAX_BITS = length;
|
|
|
|
if (length > MAX_BITS) MAX_BITS = length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Step 2: Find the numerical value of the smallest code for each code length
|
|
|
|
// Step 2: Find the numerical value of the smallest code for each code length
|
|
|
|
const next_code = [];
|
|
|
|
var next_code = [],
|
|
|
|
let code = 0;
|
|
|
|
code = 0;
|
|
|
|
for (let bits = 1; bits <= MAX_BITS; ++bits) {
|
|
|
|
for (var bits = 1; bits <= MAX_BITS; ++bits) {
|
|
|
|
const length = bits-1;
|
|
|
|
var length = bits-1;
|
|
|
|
// ensure undefined lengths are zero
|
|
|
|
// ensure undefined lengths are zero
|
|
|
|
if (bl_count[length] == undefined) bl_count[length] = 0;
|
|
|
|
if (bl_count[length] == undefined) bl_count[length] = 0;
|
|
|
|
code = (code + bl_count[bits-1]) << 1;
|
|
|
|
code = (code + bl_count[bits-1]) << 1;
|
|
|
|
@ -201,10 +307,9 @@ function getHuffmanCodes(bitLengths) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Step 3: Assign numerical values to all codes
|
|
|
|
// Step 3: Assign numerical values to all codes
|
|
|
|
const table = {};
|
|
|
|
var table = {}, tableLength = 0;
|
|
|
|
let tableLength = 0;
|
|
|
|
for (var n = 0; n < numLengths; ++n) {
|
|
|
|
for (let n = 0; n < numLengths; ++n) {
|
|
|
|
var len = bitLengths[n];
|
|
|
|
const len = bitLengths[n];
|
|
|
|
|
|
|
|
if (len != 0) {
|
|
|
|
if (len != 0) {
|
|
|
|
table[next_code[len]] = { length: len, symbol: n }; //, bitstring: binaryValueToString(next_code[len],len) };
|
|
|
|
table[next_code[len]] = { length: len, symbol: n }; //, bitstring: binaryValueToString(next_code[len],len) };
|
|
|
|
tableLength++;
|
|
|
|
tableLength++;
|
|
|
|
@ -233,16 +338,16 @@ function getHuffmanCodes(bitLengths) {
|
|
|
|
11000111
|
|
|
|
11000111
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
// fixed Huffman codes go from 7-9 bits, so we need an array whose index can hold up to 9 bits
|
|
|
|
// fixed Huffman codes go from 7-9 bits, so we need an array whose index can hold up to 9 bits
|
|
|
|
let fixedHCtoLiteral = null;
|
|
|
|
var fixedHCtoLiteral = null;
|
|
|
|
let fixedHCtoDistance = null;
|
|
|
|
var fixedHCtoDistance = null;
|
|
|
|
function getFixedLiteralTable() {
|
|
|
|
function getFixedLiteralTable() {
|
|
|
|
// create once
|
|
|
|
// create once
|
|
|
|
if (!fixedHCtoLiteral) {
|
|
|
|
if (!fixedHCtoLiteral) {
|
|
|
|
const bitlengths = new Array(288);
|
|
|
|
var bitlengths = new Array(288);
|
|
|
|
for (let i = 0; i <= 143; ++i) bitlengths[i] = 8;
|
|
|
|
for (var i = 0; i <= 143; ++i) bitlengths[i] = 8;
|
|
|
|
for (let i = 144; i <= 255; ++i) bitlengths[i] = 9;
|
|
|
|
for (i = 144; i <= 255; ++i) bitlengths[i] = 9;
|
|
|
|
for (let i = 256; i <= 279; ++i) bitlengths[i] = 7;
|
|
|
|
for (i = 256; i <= 279; ++i) bitlengths[i] = 7;
|
|
|
|
for (let i = 280; i <= 287; ++i) bitlengths[i] = 8;
|
|
|
|
for (i = 280; i <= 287; ++i) bitlengths[i] = 8;
|
|
|
|
|
|
|
|
|
|
|
|
// get huffman code table
|
|
|
|
// get huffman code table
|
|
|
|
fixedHCtoLiteral = getHuffmanCodes(bitlengths);
|
|
|
|
fixedHCtoLiteral = getHuffmanCodes(bitlengths);
|
|
|
|
@ -253,8 +358,8 @@ function getFixedLiteralTable() {
|
|
|
|
function getFixedDistanceTable() {
|
|
|
|
function getFixedDistanceTable() {
|
|
|
|
// create once
|
|
|
|
// create once
|
|
|
|
if (!fixedHCtoDistance) {
|
|
|
|
if (!fixedHCtoDistance) {
|
|
|
|
const bitlengths = new Array(32);
|
|
|
|
var bitlengths = new Array(32);
|
|
|
|
for (let i = 0; i < 32; ++i) { bitlengths[i] = 5; }
|
|
|
|
for (var i = 0; i < 32; ++i) { bitlengths[i] = 5; }
|
|
|
|
|
|
|
|
|
|
|
|
// get huffman code table
|
|
|
|
// get huffman code table
|
|
|
|
fixedHCtoDistance = getHuffmanCodes(bitlengths);
|
|
|
|
fixedHCtoDistance = getHuffmanCodes(bitlengths);
|
|
|
|
@ -265,14 +370,13 @@ function getFixedDistanceTable() {
|
|
|
|
// extract one bit at a time until we find a matching Huffman Code
|
|
|
|
// extract one bit at a time until we find a matching Huffman Code
|
|
|
|
// then return that symbol
|
|
|
|
// then return that symbol
|
|
|
|
function decodeSymbol(bstream, hcTable) {
|
|
|
|
function decodeSymbol(bstream, hcTable) {
|
|
|
|
let code = 0;
|
|
|
|
var code = 0, len = 0;
|
|
|
|
let len = 0;
|
|
|
|
var match = false;
|
|
|
|
let match = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// loop until we match
|
|
|
|
// loop until we match
|
|
|
|
for (;;) {
|
|
|
|
for (;;) {
|
|
|
|
// read in next bit
|
|
|
|
// read in next bit
|
|
|
|
const bit = bstream.readBits(1);
|
|
|
|
var bit = bstream.readBits(1);
|
|
|
|
code = (code<<1) | bit;
|
|
|
|
code = (code<<1) | bit;
|
|
|
|
++len;
|
|
|
|
++len;
|
|
|
|
|
|
|
|
|
|
|
|
@ -290,8 +394,7 @@ function decodeSymbol(bstream, hcTable) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const CodeLengthCodeOrder = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15];
|
|
|
|
var CodeLengthCodeOrder = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15];
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
Extra Extra Extra
|
|
|
|
Extra Extra Extra
|
|
|
|
Code Bits Length(s) Code Bits Lengths Code Bits Length(s)
|
|
|
|
Code Bits Length(s) Code Bits Lengths Code Bits Length(s)
|
|
|
|
@ -307,7 +410,7 @@ Code Bits Length(s) Code Bits Lengths Code Bits Length(s)
|
|
|
|
265 1 11,12 275 3 51-58 285 0 258
|
|
|
|
265 1 11,12 275 3 51-58 285 0 258
|
|
|
|
266 1 13,14 276 3 59-66
|
|
|
|
266 1 13,14 276 3 59-66
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
const LengthLookupTable = [
|
|
|
|
var LengthLookupTable = [
|
|
|
|
[0,3], [0,4], [0,5], [0,6],
|
|
|
|
[0,3], [0,4], [0,5], [0,6],
|
|
|
|
[0,7], [0,8], [0,9], [0,10],
|
|
|
|
[0,7], [0,8], [0,9], [0,10],
|
|
|
|
[1,11], [1,13], [1,15], [1,17],
|
|
|
|
[1,11], [1,13], [1,15], [1,17],
|
|
|
|
@ -317,7 +420,6 @@ const LengthLookupTable = [
|
|
|
|
[5,131], [5,163], [5,195], [5,227],
|
|
|
|
[5,131], [5,163], [5,195], [5,227],
|
|
|
|
[0,258]
|
|
|
|
[0,258]
|
|
|
|
];
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
Extra Extra Extra
|
|
|
|
Extra Extra Extra
|
|
|
|
Code Bits Dist Code Bits Dist Code Bits Distance
|
|
|
|
Code Bits Dist Code Bits Dist Code Bits Distance
|
|
|
|
@ -333,7 +435,7 @@ const LengthLookupTable = [
|
|
|
|
8 3 17-24 18 8 513-768 28 13 16385-24576
|
|
|
|
8 3 17-24 18 8 513-768 28 13 16385-24576
|
|
|
|
9 3 25-32 19 8 769-1024 29 13 24577-32768
|
|
|
|
9 3 25-32 19 8 769-1024 29 13 24577-32768
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
const DistLookupTable = [
|
|
|
|
var DistLookupTable = [
|
|
|
|
[0,1], [0,2], [0,3], [0,4],
|
|
|
|
[0,1], [0,2], [0,3], [0,4],
|
|
|
|
[1,5], [1,7],
|
|
|
|
[1,5], [1,7],
|
|
|
|
[2,9], [2,13],
|
|
|
|
[2,9], [2,13],
|
|
|
|
@ -366,24 +468,25 @@ function inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer) {
|
|
|
|
stream, and copy length bytes from this
|
|
|
|
stream, and copy length bytes from this
|
|
|
|
position to the output stream.
|
|
|
|
position to the output stream.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
let numSymbols = 0;
|
|
|
|
var numSymbols = 0, blockSize = 0;
|
|
|
|
let blockSize = 0;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
for (;;) {
|
|
|
|
const symbol = decodeSymbol(bstream, hcLiteralTable);
|
|
|
|
var symbol = decodeSymbol(bstream, hcLiteralTable);
|
|
|
|
++numSymbols;
|
|
|
|
++numSymbols;
|
|
|
|
if (symbol < 256) {
|
|
|
|
if (symbol < 256) {
|
|
|
|
// copy literal byte to output
|
|
|
|
// copy literal byte to output
|
|
|
|
buffer.insertByte(symbol);
|
|
|
|
buffer.insertByte(symbol);
|
|
|
|
blockSize++;
|
|
|
|
blockSize++;
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
// end of block reached
|
|
|
|
// end of block reached
|
|
|
|
if (symbol == 256) {
|
|
|
|
if (symbol == 256) {
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
const lengthLookup = LengthLookupTable[symbol - 257];
|
|
|
|
else {
|
|
|
|
let length = lengthLookup[1] + bstream.readBits(lengthLookup[0]);
|
|
|
|
var lengthLookup = LengthLookupTable[symbol-257],
|
|
|
|
const distLookup = DistLookupTable[decodeSymbol(bstream, hcDistanceTable)];
|
|
|
|
length = lengthLookup[1] + bstream.readBits(lengthLookup[0]),
|
|
|
|
let distance = distLookup[1] + bstream.readBits(distLookup[0]);
|
|
|
|
distLookup = DistLookupTable[decodeSymbol(bstream, hcDistanceTable)],
|
|
|
|
|
|
|
|
distance = distLookup[1] + bstream.readBits(distLookup[0]);
|
|
|
|
|
|
|
|
|
|
|
|
// now apply length and distance appropriately and copy to output
|
|
|
|
// now apply length and distance appropriately and copy to output
|
|
|
|
|
|
|
|
|
|
|
|
@ -396,10 +499,10 @@ function inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer) {
|
|
|
|
// adds X,Y,X,Y,X to the output stream."
|
|
|
|
// adds X,Y,X,Y,X to the output stream."
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// loop for each character
|
|
|
|
// loop for each character
|
|
|
|
let ch = buffer.ptr - distance;
|
|
|
|
var ch = buffer.ptr - distance;
|
|
|
|
blockSize += length;
|
|
|
|
blockSize += length;
|
|
|
|
if(length > distance) {
|
|
|
|
if(length > distance) {
|
|
|
|
const data = buffer.data;
|
|
|
|
var data = buffer.data;
|
|
|
|
while (length--) {
|
|
|
|
while (length--) {
|
|
|
|
buffer.insertByte(data[ch++]);
|
|
|
|
buffer.insertByte(data[ch++]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -417,25 +520,25 @@ function inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer) {
|
|
|
|
// deflate: http://tools.ietf.org/html/rfc1951
|
|
|
|
// deflate: http://tools.ietf.org/html/rfc1951
|
|
|
|
function inflate(compressedData, numDecompressedBytes) {
|
|
|
|
function inflate(compressedData, numDecompressedBytes) {
|
|
|
|
// Bit stream representing the compressed data.
|
|
|
|
// Bit stream representing the compressed data.
|
|
|
|
const bstream = new bitjs.io.BitStream(compressedData.buffer,
|
|
|
|
var bstream = new bitjs.io.BitStream(compressedData.buffer,
|
|
|
|
false /* rtl */,
|
|
|
|
false /* rtl */,
|
|
|
|
compressedData.byteOffset,
|
|
|
|
compressedData.byteOffset,
|
|
|
|
compressedData.byteLength);
|
|
|
|
compressedData.byteLength);
|
|
|
|
const buffer = new bitjs.io.ByteBuffer(numDecompressedBytes);
|
|
|
|
var buffer = new bitjs.io.ByteBuffer(numDecompressedBytes);
|
|
|
|
let blockSize = 0;
|
|
|
|
var numBlocks = 0, blockSize = 0;
|
|
|
|
|
|
|
|
|
|
|
|
// block format: http://tools.ietf.org/html/rfc1951#page-9
|
|
|
|
// block format: http://tools.ietf.org/html/rfc1951#page-9
|
|
|
|
let bFinal = 0;
|
|
|
|
|
|
|
|
do {
|
|
|
|
do {
|
|
|
|
bFinal = bstream.readBits(1);
|
|
|
|
var bFinal = bstream.readBits(1),
|
|
|
|
let bType = bstream.readBits(2);
|
|
|
|
bType = bstream.readBits(2);
|
|
|
|
blockSize = 0;
|
|
|
|
blockSize = 0;
|
|
|
|
|
|
|
|
++numBlocks;
|
|
|
|
// no compression
|
|
|
|
// no compression
|
|
|
|
if (bType == 0) {
|
|
|
|
if (bType == 0) {
|
|
|
|
// skip remaining bits in this byte
|
|
|
|
// skip remaining bits in this byte
|
|
|
|
while (bstream.bitPtr != 0) bstream.readBits(1);
|
|
|
|
while (bstream.bitPtr != 0) bstream.readBits(1);
|
|
|
|
const len = bstream.readBits(16);
|
|
|
|
var len = bstream.readBits(16),
|
|
|
|
const nlen = bstream.readBits(16);
|
|
|
|
nlen = bstream.readBits(16);
|
|
|
|
// TODO: check if nlen is the ones-complement of len?
|
|
|
|
// TODO: check if nlen is the ones-complement of len?
|
|
|
|
if(len > 0) buffer.insertBytes(bstream.readBytes(len));
|
|
|
|
if(len > 0) buffer.insertBytes(bstream.readBytes(len));
|
|
|
|
blockSize = len;
|
|
|
|
blockSize = len;
|
|
|
|
@ -446,18 +549,18 @@ function inflate(compressedData, numDecompressedBytes) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// dynamic Huffman codes
|
|
|
|
// dynamic Huffman codes
|
|
|
|
else if(bType == 2) {
|
|
|
|
else if(bType == 2) {
|
|
|
|
const numLiteralLengthCodes = bstream.readBits(5) + 257;
|
|
|
|
var numLiteralLengthCodes = bstream.readBits(5) + 257;
|
|
|
|
const numDistanceCodes = bstream.readBits(5) + 1;
|
|
|
|
var numDistanceCodes = bstream.readBits(5) + 1,
|
|
|
|
const numCodeLengthCodes = bstream.readBits(4) + 4;
|
|
|
|
numCodeLengthCodes = bstream.readBits(4) + 4;
|
|
|
|
|
|
|
|
|
|
|
|
// populate the array of code length codes (first de-compaction)
|
|
|
|
// populate the array of code length codes (first de-compaction)
|
|
|
|
const codeLengthsCodeLengths = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
|
|
|
|
var codeLengthsCodeLengths = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
|
|
|
|
for (let i = 0; i < numCodeLengthCodes; ++i) {
|
|
|
|
for (var i = 0; i < numCodeLengthCodes; ++i) {
|
|
|
|
codeLengthsCodeLengths[ CodeLengthCodeOrder[i] ] = bstream.readBits(3);
|
|
|
|
codeLengthsCodeLengths[ CodeLengthCodeOrder[i] ] = bstream.readBits(3);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// get the Huffman Codes for the code lengths
|
|
|
|
// get the Huffman Codes for the code lengths
|
|
|
|
const codeLengthsCodes = getHuffmanCodes(codeLengthsCodeLengths);
|
|
|
|
var codeLengthsCodes = getHuffmanCodes(codeLengthsCodeLengths);
|
|
|
|
|
|
|
|
|
|
|
|
// now follow this mapping
|
|
|
|
// now follow this mapping
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
@ -475,25 +578,28 @@ function inflate(compressedData, numDecompressedBytes) {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
// to generate the true code lengths of the Huffman Codes for the literal
|
|
|
|
// to generate the true code lengths of the Huffman Codes for the literal
|
|
|
|
// and distance tables together
|
|
|
|
// and distance tables together
|
|
|
|
const literalCodeLengths = [];
|
|
|
|
var literalCodeLengths = [];
|
|
|
|
let prevCodeLength = 0;
|
|
|
|
var prevCodeLength = 0;
|
|
|
|
while (literalCodeLengths.length < numLiteralLengthCodes + numDistanceCodes) {
|
|
|
|
while (literalCodeLengths.length < numLiteralLengthCodes + numDistanceCodes) {
|
|
|
|
const symbol = decodeSymbol(bstream, codeLengthsCodes);
|
|
|
|
var symbol = decodeSymbol(bstream, codeLengthsCodes);
|
|
|
|
if (symbol <= 15) {
|
|
|
|
if (symbol <= 15) {
|
|
|
|
literalCodeLengths.push(symbol);
|
|
|
|
literalCodeLengths.push(symbol);
|
|
|
|
prevCodeLength = symbol;
|
|
|
|
prevCodeLength = symbol;
|
|
|
|
} else if (symbol == 16) {
|
|
|
|
}
|
|
|
|
let repeat = bstream.readBits(2) + 3;
|
|
|
|
else if (symbol == 16) {
|
|
|
|
|
|
|
|
var repeat = bstream.readBits(2) + 3;
|
|
|
|
while (repeat--) {
|
|
|
|
while (repeat--) {
|
|
|
|
literalCodeLengths.push(prevCodeLength);
|
|
|
|
literalCodeLengths.push(prevCodeLength);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (symbol == 17) {
|
|
|
|
}
|
|
|
|
let repeat = bstream.readBits(3) + 3;
|
|
|
|
else if (symbol == 17) {
|
|
|
|
|
|
|
|
var repeat = bstream.readBits(3) + 3;
|
|
|
|
while (repeat--) {
|
|
|
|
while (repeat--) {
|
|
|
|
literalCodeLengths.push(0);
|
|
|
|
literalCodeLengths.push(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (symbol == 18) {
|
|
|
|
}
|
|
|
|
let repeat = bstream.readBits(7) + 11;
|
|
|
|
else if (symbol == 18) {
|
|
|
|
|
|
|
|
var repeat = bstream.readBits(7) + 11;
|
|
|
|
while (repeat--) {
|
|
|
|
while (repeat--) {
|
|
|
|
literalCodeLengths.push(0);
|
|
|
|
literalCodeLengths.push(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -501,13 +607,15 @@ function inflate(compressedData, numDecompressedBytes) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// now split the distance code lengths out of the literal code array
|
|
|
|
// now split the distance code lengths out of the literal code array
|
|
|
|
const distanceCodeLengths = literalCodeLengths.splice(numLiteralLengthCodes, numDistanceCodes);
|
|
|
|
var distanceCodeLengths = literalCodeLengths.splice(numLiteralLengthCodes, numDistanceCodes);
|
|
|
|
|
|
|
|
|
|
|
|
// now generate the true Huffman Code tables using these code lengths
|
|
|
|
// now generate the true Huffman Code tables using these code lengths
|
|
|
|
const hcLiteralTable = getHuffmanCodes(literalCodeLengths);
|
|
|
|
var hcLiteralTable = getHuffmanCodes(literalCodeLengths),
|
|
|
|
const hcDistanceTable = getHuffmanCodes(distanceCodeLengths);
|
|
|
|
hcDistanceTable = getHuffmanCodes(distanceCodeLengths);
|
|
|
|
blockSize = inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer);
|
|
|
|
blockSize = inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer);
|
|
|
|
} else { // error
|
|
|
|
}
|
|
|
|
|
|
|
|
// error
|
|
|
|
|
|
|
|
else {
|
|
|
|
err("Error! Encountered deflate block of type 3");
|
|
|
|
err("Error! Encountered deflate block of type 3");
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -523,143 +631,7 @@ function inflate(compressedData, numDecompressedBytes) {
|
|
|
|
return buffer.data;
|
|
|
|
return buffer.data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function unzip() {
|
|
|
|
// event.data.file has the ArrayBuffer.
|
|
|
|
let bstream = bytestream.tee();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// loop until we don't see any more local files
|
|
|
|
|
|
|
|
while (bstream.peekNumber(4) == zLocalFileHeaderSignature) {
|
|
|
|
|
|
|
|
const oneLocalFile = new ZipLocalFile(bstream);
|
|
|
|
|
|
|
|
// this should strip out directories/folders
|
|
|
|
|
|
|
|
if (oneLocalFile && oneLocalFile.uncompressedSize > 0 && oneLocalFile.fileData) {
|
|
|
|
|
|
|
|
// If we make it to this point and haven't thrown an error, we have successfully
|
|
|
|
|
|
|
|
// read in the data for a local file, so we can update the actual bytestream.
|
|
|
|
|
|
|
|
bytestream = bstream.tee();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
allLocalFiles.push(oneLocalFile);
|
|
|
|
|
|
|
|
totalUncompressedBytesInArchive += oneLocalFile.uncompressedSize;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// update progress
|
|
|
|
|
|
|
|
currentFilename = oneLocalFile.filename;
|
|
|
|
|
|
|
|
currentFileNumber = allLocalFiles.length - 1;
|
|
|
|
|
|
|
|
currentBytesUnarchivedInFile = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Actually do the unzipping.
|
|
|
|
|
|
|
|
oneLocalFile.unzip();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (oneLocalFile.fileData != null) {
|
|
|
|
|
|
|
|
postMessage(new bitjs.archive.UnarchiveExtractEvent(oneLocalFile));
|
|
|
|
|
|
|
|
postProgress();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
totalFilesInArchive = allLocalFiles.length;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// archive extra data record
|
|
|
|
|
|
|
|
if (bstream.peekNumber(4) == zArchiveExtraDataSignature) {
|
|
|
|
|
|
|
|
if (logToConsole) {
|
|
|
|
|
|
|
|
info(" Found an Archive Extra Data Signature");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// skipping this record for now
|
|
|
|
|
|
|
|
bstream.readNumber(4);
|
|
|
|
|
|
|
|
const archiveExtraFieldLength = bstream.readNumber(4);
|
|
|
|
|
|
|
|
bstream.readString(archiveExtraFieldLength);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// central directory structure
|
|
|
|
|
|
|
|
// TODO: handle the rest of the structures (Zip64 stuff)
|
|
|
|
|
|
|
|
if (bytestream.peekNumber(4) == zCentralFileHeaderSignature) {
|
|
|
|
|
|
|
|
if (logToConsole) {
|
|
|
|
|
|
|
|
info(" Found a Central File Header");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// read all file headers
|
|
|
|
|
|
|
|
while (bstream.peekNumber(4) == zCentralFileHeaderSignature) {
|
|
|
|
|
|
|
|
bstream.readNumber(4); // signature
|
|
|
|
|
|
|
|
bstream.readNumber(2); // version made by
|
|
|
|
|
|
|
|
bstream.readNumber(2); // version needed to extract
|
|
|
|
|
|
|
|
bstream.readNumber(2); // general purpose bit flag
|
|
|
|
|
|
|
|
bstream.readNumber(2); // compression method
|
|
|
|
|
|
|
|
bstream.readNumber(2); // last mod file time
|
|
|
|
|
|
|
|
bstream.readNumber(2); // last mod file date
|
|
|
|
|
|
|
|
bstream.readNumber(4); // crc32
|
|
|
|
|
|
|
|
bstream.readNumber(4); // compressed size
|
|
|
|
|
|
|
|
bstream.readNumber(4); // uncompressed size
|
|
|
|
|
|
|
|
const fileNameLength = bstream.readNumber(2); // file name length
|
|
|
|
|
|
|
|
const extraFieldLength = bstream.readNumber(2); // extra field length
|
|
|
|
|
|
|
|
const fileCommentLength = bstream.readNumber(2); // file comment length
|
|
|
|
|
|
|
|
bstream.readNumber(2); // disk number start
|
|
|
|
|
|
|
|
bstream.readNumber(2); // internal file attributes
|
|
|
|
|
|
|
|
bstream.readNumber(4); // external file attributes
|
|
|
|
|
|
|
|
bstream.readNumber(4); // relative offset of local header
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bstream.readString(fileNameLength); // file name
|
|
|
|
|
|
|
|
bstream.readString(extraFieldLength); // extra field
|
|
|
|
|
|
|
|
bstream.readString(fileCommentLength); // file comment
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// digital signature
|
|
|
|
|
|
|
|
if (bstream.peekNumber(4) == zDigitalSignatureSignature) {
|
|
|
|
|
|
|
|
if (logToConsole) {
|
|
|
|
|
|
|
|
info(" Found a Digital Signature");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bstream.readNumber(4);
|
|
|
|
|
|
|
|
const sizeOfSignature = bstream.readNumber(2);
|
|
|
|
|
|
|
|
bstream.readString(sizeOfSignature); // digital signature data
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
postProgress();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bytestream = bstream.tee();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// event.data.file has the first ArrayBuffer.
|
|
|
|
|
|
|
|
// event.data.bytes has all subsequent ArrayBuffers.
|
|
|
|
|
|
|
|
onmessage = function(event) {
|
|
|
|
onmessage = function(event) {
|
|
|
|
const bytes = event.data.file || event.data.bytes;
|
|
|
|
unzip(event.data.file, true);
|
|
|
|
logToConsole = !!event.data.logToConsole;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// This is the very first time we have been called. Initialize the bytestream.
|
|
|
|
|
|
|
|
if (!bytestream) {
|
|
|
|
|
|
|
|
bytestream = new bitjs.io.ByteStream(bytes);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
bytestream.push(bytes);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (unarchiveState === UnarchiveState.NOT_STARTED) {
|
|
|
|
|
|
|
|
currentFilename = "";
|
|
|
|
|
|
|
|
currentFileNumber = 0;
|
|
|
|
|
|
|
|
currentBytesUnarchivedInFile = 0;
|
|
|
|
|
|
|
|
currentBytesUnarchived = 0;
|
|
|
|
|
|
|
|
totalUncompressedBytesInArchive = 0;
|
|
|
|
|
|
|
|
totalFilesInArchive = 0;
|
|
|
|
|
|
|
|
currentBytesUnarchived = 0;
|
|
|
|
|
|
|
|
allLocalFiles = [];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
postMessage(new bitjs.archive.UnarchiveStartEvent());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
unarchiveState = UnarchiveState.UNARCHIVING;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
postProgress();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (unarchiveState === UnarchiveState.UNARCHIVING ||
|
|
|
|
|
|
|
|
unarchiveState === UnarchiveState.WAITING) {
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
unzip();
|
|
|
|
|
|
|
|
unarchiveState = UnarchiveState.FINISHED;
|
|
|
|
|
|
|
|
postMessage(new bitjs.archive.UnarchiveFinishEvent());
|
|
|
|
|
|
|
|
} catch (e) {
|
|
|
|
|
|
|
|
if (typeof e === 'string' && e.startsWith('Error! Overflowed')) {
|
|
|
|
|
|
|
|
// Overrun the buffer.
|
|
|
|
|
|
|
|
unarchiveState = UnarchiveState.WAITING;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
console.error('Found an error while unzipping');
|
|
|
|
|
|
|
|
console.dir(e);
|
|
|
|
|
|
|
|
throw e;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
subdiox
6 years ago