Downgrade bitjs to es5 branch

pull/911/head
subdiox 5 years ago
parent c0d136ccd8
commit 7982ed877c

@ -11,21 +11,65 @@
var bitjs = bitjs || {}; var bitjs = bitjs || {};
bitjs.archive = bitjs.archive || {}; bitjs.archive = bitjs.archive || {};
(function() {
// ===========================================================================
// Stolen from Closure because it's the best way to do Java-like inheritance.
bitjs.base = function(me, opt_methodName, var_args) {
var caller = arguments.callee.caller;
if (caller.superClass_) {
// This is a constructor. Call the superclass constructor.
return caller.superClass_.constructor.apply(
me, Array.prototype.slice.call(arguments, 1));
}
var args = Array.prototype.slice.call(arguments, 2);
var foundCaller = false;
for (var ctor = me.constructor;
ctor; ctor = ctor.superClass_ && ctor.superClass_.constructor) {
if (ctor.prototype[opt_methodName] === caller) {
foundCaller = true;
} else if (foundCaller) {
return ctor.prototype[opt_methodName].apply(me, args);
}
}
// If we did not find the caller in the prototype chain,
// then one of two things happened:
// 1) The caller is an instance method.
// 2) This method was not called by the right caller.
if (me[opt_methodName] === caller) {
return me.constructor.prototype[opt_methodName].apply(me, args);
} else {
throw Error(
'goog.base called from a method of one name ' +
'to a method of a different name');
}
};
bitjs.inherits = function(childCtor, parentCtor) {
/** @constructor */
function tempCtor() {};
tempCtor.prototype = parentCtor.prototype;
childCtor.superClass_ = parentCtor.prototype;
childCtor.prototype = new tempCtor();
childCtor.prototype.constructor = childCtor;
};
// ===========================================================================
/** /**
* An unarchive event. * An unarchive event.
*/ *
bitjs.archive.UnarchiveEvent = class {
/**
* @param {string} type The event type. * @param {string} type The event type.
* @constructor
*/ */
constructor(type) { bitjs.archive.UnarchiveEvent = function(type) {
/** /**
* The event type. * The event type.
*
* @type {string} * @type {string}
*/ */
this.type = type; this.type = type;
} };
}
/** /**
* The UnarchiveEvent types. * The UnarchiveEvent types.
@ -41,75 +85,69 @@ bitjs.archive.UnarchiveEvent.Type = {
/** /**
* Useful for passing info up to the client (for debugging). * Useful for passing info up to the client (for debugging).
*/ *
bitjs.archive.UnarchiveInfoEvent = class extends bitjs.archive.UnarchiveEvent {
/**
* @param {string} msg The info message. * @param {string} msg The info message.
*/ */
constructor(msg) { bitjs.archive.UnarchiveInfoEvent = function(msg) {
super(bitjs.archive.UnarchiveEvent.Type.INFO); bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.INFO);
/** /**
* The information message. * The information message.
*
* @type {string} * @type {string}
*/ */
this.msg = msg; this.msg = msg;
} };
} bitjs.inherits(bitjs.archive.UnarchiveInfoEvent, bitjs.archive.UnarchiveEvent);
/** /**
* An unrecoverable error has occured. * An unrecoverable error has occured.
*/ *
bitjs.archive.UnarchiveErrorEvent = class extends bitjs.archive.UnarchiveEvent {
/**
* @param {string} msg The error message. * @param {string} msg The error message.
*/ */
constructor(msg) { bitjs.archive.UnarchiveErrorEvent = function(msg) {
super(bitjs.archive.UnarchiveEvent.Type.ERROR); bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.ERROR);
/** /**
* The information message. * The information message.
*
* @type {string} * @type {string}
*/ */
this.msg = msg; this.msg = msg;
} };
} bitjs.inherits(bitjs.archive.UnarchiveErrorEvent, bitjs.archive.UnarchiveEvent);
/** /**
* Start event. * Start event.
*
* @param {string} msg The info message.
*/ */
bitjs.archive.UnarchiveStartEvent = class extends bitjs.archive.UnarchiveEvent { bitjs.archive.UnarchiveStartEvent = function() {
constructor() { bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.START);
super(bitjs.archive.UnarchiveEvent.Type.START); };
} bitjs.inherits(bitjs.archive.UnarchiveStartEvent, bitjs.archive.UnarchiveEvent);
}
/** /**
* Finish event. * Finish event.
*
* @param {string} msg The info message.
*/ */
bitjs.archive.UnarchiveFinishEvent = class extends bitjs.archive.UnarchiveEvent { bitjs.archive.UnarchiveFinishEvent = function() {
constructor() { bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.FINISH);
super(bitjs.archive.UnarchiveEvent.Type.FINISH); };
} bitjs.inherits(bitjs.archive.UnarchiveFinishEvent, bitjs.archive.UnarchiveEvent);
}
/** /**
* Progress event. * Progress event.
*/ */
bitjs.archive.UnarchiveProgressEvent = class extends bitjs.archive.UnarchiveEvent { bitjs.archive.UnarchiveProgressEvent = function(
/** currentFilename,
* @param {string} currentFilename currentFileNumber,
* @param {number} currentFileNumber currentBytesUnarchivedInFile,
* @param {number} currentBytesUnarchivedInFile currentBytesUnarchived,
* @param {number} currentBytesUnarchived totalUncompressedBytesInArchive,
* @param {number} totalUncompressedBytesInArchive totalFilesInArchive) {
* @param {number} totalFilesInArchive bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.PROGRESS);
* @param {number} totalCompressedBytesRead
*/
constructor(currentFilename, currentFileNumber, currentBytesUnarchivedInFile,
currentBytesUnarchived, totalUncompressedBytesInArchive, totalFilesInArchive,
totalCompressedBytesRead) {
super(bitjs.archive.UnarchiveEvent.Type.PROGRESS);
this.currentFilename = currentFilename; this.currentFilename = currentFilename;
this.currentFileNumber = currentFileNumber; this.currentFileNumber = currentFileNumber;
@ -117,26 +155,8 @@ bitjs.archive.UnarchiveProgressEvent = class extends bitjs.archive.UnarchiveEven
this.totalFilesInArchive = totalFilesInArchive; this.totalFilesInArchive = totalFilesInArchive;
this.currentBytesUnarchived = currentBytesUnarchived; this.currentBytesUnarchived = currentBytesUnarchived;
this.totalUncompressedBytesInArchive = totalUncompressedBytesInArchive; this.totalUncompressedBytesInArchive = totalUncompressedBytesInArchive;
this.totalCompressedBytesRead = totalCompressedBytesRead; };
} bitjs.inherits(bitjs.archive.UnarchiveProgressEvent, bitjs.archive.UnarchiveEvent);
}
/**
* Extract event.
*/
bitjs.archive.UnarchiveExtractEvent = class extends bitjs.archive.UnarchiveEvent {
/**
* @param {UnarchivedFile} unarchivedFile
*/
constructor(unarchivedFile) {
super(bitjs.archive.UnarchiveEvent.Type.EXTRACT);
/**
* @type {UnarchivedFile}
*/
this.unarchivedFile = unarchivedFile;
}
}
/** /**
* All extracted files returned by an Unarchiver will implement * All extracted files returned by an Unarchiver will implement
@ -150,14 +170,27 @@ bitjs.archive.UnarchiveExtractEvent = class extends bitjs.archive.UnarchiveEvent
*/ */
/** /**
* Base class for all Unarchivers. * Extract event.
*/ */
bitjs.archive.Unarchiver = class { bitjs.archive.UnarchiveExtractEvent = function(unarchivedFile) {
bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.EXTRACT);
/**
* @type {UnarchivedFile}
*/
this.unarchivedFile = unarchivedFile;
};
bitjs.inherits(bitjs.archive.UnarchiveExtractEvent, bitjs.archive.UnarchiveEvent);
/** /**
* Base class for all Unarchivers.
*
* @param {ArrayBuffer} arrayBuffer The Array Buffer. * @param {ArrayBuffer} arrayBuffer The Array Buffer.
* @param {string} opt_pathToBitJS Optional string for where the BitJS files are located. * @param {string} opt_pathToBitJS Optional string for where the BitJS files are located.
* @constructor
*/ */
constructor(arrayBuffer, opt_pathToBitJS) { bitjs.archive.Unarchiver = function(arrayBuffer, opt_pathToBitJS) {
/** /**
* The ArrayBuffer object. * The ArrayBuffer object.
* @type {ArrayBuffer} * @type {ArrayBuffer}
@ -177,26 +210,26 @@ bitjs.archive.Unarchiver = class {
* @type {Map.<string, Array>} * @type {Map.<string, Array>}
*/ */
this.listeners_ = {}; this.listeners_ = {};
for (let type in bitjs.archive.UnarchiveEvent.Type) { for (var type in bitjs.archive.UnarchiveEvent.Type) {
this.listeners_[bitjs.archive.UnarchiveEvent.Type[type]] = []; this.listeners_[bitjs.archive.UnarchiveEvent.Type[type]] = [];
} }
};
/** /**
* Private web worker initialized during start(). * Private web worker initialized during start().
* @type {Worker} * @type {Worker}
* @private * @private
*/ */
this.worker_ = null; bitjs.archive.Unarchiver.prototype.worker_ = null;
}
/** /**
* This method must be overridden by the subclass to return the script filename. * This method must be overridden by the subclass to return the script filename.
* @return {string} The script filename. * @return {string} The script filename.
* @protected. * @protected.
*/ */
getScriptFileName() { bitjs.archive.Unarchiver.prototype.getScriptFileName = function() {
throw 'Subclasses of AbstractUnarchiver must overload getScriptFileName()'; throw 'Subclasses of AbstractUnarchiver must overload getScriptFileName()';
} };
/** /**
* Adds an event listener for UnarchiveEvents. * Adds an event listener for UnarchiveEvents.
@ -204,13 +237,13 @@ bitjs.archive.Unarchiver = class {
* @param {string} Event type. * @param {string} Event type.
* @param {function} An event handler function. * @param {function} An event handler function.
*/ */
addEventListener(type, listener) { bitjs.archive.Unarchiver.prototype.addEventListener = function(type, listener) {
if (type in this.listeners_) { if (type in this.listeners_) {
if (this.listeners_[type].indexOf(listener) == -1) { if (this.listeners_[type].indexOf(listener) == -1) {
this.listeners_[type].push(listener); this.listeners_[type].push(listener);
} }
} }
} };
/** /**
* Removes an event listener. * Removes an event listener.
@ -218,14 +251,14 @@ bitjs.archive.Unarchiver = class {
* @param {string} Event type. * @param {string} Event type.
* @param {EventListener|function} An event listener or handler function. * @param {EventListener|function} An event listener or handler function.
*/ */
removeEventListener(type, listener) { bitjs.archive.Unarchiver.prototype.removeEventListener = function(type, listener) {
if (type in this.listeners_) { if (type in this.listeners_) {
const index = this.listeners_[type].indexOf(listener); var index = this.listeners_[type].indexOf(listener);
if (index != -1) { if (index != -1) {
this.listeners_[type].splice(index, 1); this.listeners_[type].splice(index, 1);
} }
} }
} };
/** /**
* Receive an event and pass it to the listener functions. * Receive an event and pass it to the listener functions.
@ -233,7 +266,7 @@ bitjs.archive.Unarchiver = class {
* @param {bitjs.archive.UnarchiveEvent} e * @param {bitjs.archive.UnarchiveEvent} e
* @private * @private
*/ */
handleWorkerEvent_(e) { bitjs.archive.Unarchiver.prototype.handleWorkerEvent_ = function(e) {
if ((e instanceof bitjs.archive.UnarchiveEvent || e.type) && if ((e instanceof bitjs.archive.UnarchiveEvent || e.type) &&
this.listeners_[e.type] instanceof Array) { this.listeners_[e.type] instanceof Array) {
this.listeners_[e.type].forEach(function (listener) { listener(e) }); this.listeners_[e.type].forEach(function (listener) { listener(e) });
@ -243,14 +276,14 @@ bitjs.archive.Unarchiver = class {
} else { } else {
console.log(e); console.log(e);
} }
} };
/** /**
* Starts the unarchive in a separate Web Worker thread and returns immediately. * Starts the unarchive in a separate Web Worker thread and returns immediately.
*/ */
start() { bitjs.archive.Unarchiver.prototype.start = function() {
const me = this; var me = this;
const scriptFileName = this.pathToBitJS_ + this.getScriptFileName(); var scriptFileName = this.pathToBitJS_ + this.getScriptFileName();
if (scriptFileName) { if (scriptFileName) {
this.worker_ = new Worker(scriptFileName); this.worker_ = new Worker(scriptFileName);
@ -270,70 +303,52 @@ bitjs.archive.Unarchiver = class {
} }
}; };
const ab = this.ab; this.worker_.postMessage({file: this.ab});
this.worker_.postMessage({
file: ab,
logToConsole: false,
});
this.ab = null;
}
}
/**
* Adds more bytes to the unarchiver's Worker thread.
*/
update(ab) {
if (this.worker_) {
this.worker_.postMessage({bytes: ab});
}
} }
};
/** /**
* Terminates the Web Worker for this Unarchiver and returns immediately. * Terminates the Web Worker for this Unarchiver and returns immediately.
*/ */
stop() { bitjs.archive.Unarchiver.prototype.stop = function() {
if (this.worker_) { if (this.worker_) {
this.worker_.terminate(); this.worker_.terminate();
} }
} };
}
/** /**
* Unzipper * Unzipper
* @extends {bitjs.archive.Unarchiver}
* @constructor
*/ */
bitjs.archive.Unzipper = class extends bitjs.archive.Unarchiver { bitjs.archive.Unzipper = function(arrayBuffer, opt_pathToBitJS) {
constructor(arrayBuffer, opt_pathToBitJS) { bitjs.base(this, arrayBuffer, opt_pathToBitJS);
super(arrayBuffer, opt_pathToBitJS); };
} bitjs.inherits(bitjs.archive.Unzipper, bitjs.archive.Unarchiver);
bitjs.archive.Unzipper.prototype.getScriptFileName = function() { return 'unzip.js' };
getScriptFileName() { return 'archive/unzip.js'; }
}
/** /**
* Unrarrer * Unrarrer
* @extends {bitjs.archive.Unarchiver}
* @constructor
*/ */
bitjs.archive.Unrarrer = class extends bitjs.archive.Unarchiver { bitjs.archive.Unrarrer = function(arrayBuffer, opt_pathToBitJS) {
constructor(arrayBuffer, opt_pathToBitJS) { bitjs.base(this, arrayBuffer, opt_pathToBitJS);
super(arrayBuffer, opt_pathToBitJS); };
} bitjs.inherits(bitjs.archive.Unrarrer, bitjs.archive.Unarchiver);
bitjs.archive.Unrarrer.prototype.getScriptFileName = function() { return 'unrar.js' };
getScriptFileName() { return 'archive/unrar.js'; }
}
/** /**
* Untarrer * Untarrer
* @extends {bitjs.archive.Unarchiver} * @extends {bitjs.archive.Unarchiver}
* @constructor * @constructor
*/ */
bitjs.archive.Untarrer = class extends bitjs.archive.Unarchiver { bitjs.archive.Untarrer = function(arrayBuffer, opt_pathToBitJS) {
constructor(arrayBuffer, opt_pathToBitJS) { bitjs.base(this, arrayBuffer, opt_pathToBitJS);
super(arrayBuffer, opt_pathToBitJS); };
} bitjs.inherits(bitjs.archive.Untarrer, bitjs.archive.Unarchiver);
bitjs.archive.Untarrer.prototype.getScriptFileName = function() { return 'untar.js' };
getScriptFileName() { return 'archive/untar.js'; };
}
/** /**
* Factory method that creates an unarchiver based on the byte signature found * Factory method that creates an unarchiver based on the byte signature found
@ -343,20 +358,18 @@ bitjs.archive.Untarrer = class extends bitjs.archive.Unarchiver {
* @return {bitjs.archive.Unarchiver} * @return {bitjs.archive.Unarchiver}
*/ */
bitjs.archive.GetUnarchiver = function(ab, opt_pathToBitJS) { bitjs.archive.GetUnarchiver = function(ab, opt_pathToBitJS) {
if (ab.byteLength < 10) { var unarchiver = null;
return null; var pathToBitJS = opt_pathToBitJS || '';
} var h = new Uint8Array(ab, 0, 10);
let unarchiver = null;
const pathToBitJS = opt_pathToBitJS || '';
const h = new Uint8Array(ab, 0, 10);
if (h[0] == 0x52 && h[1] == 0x61 && h[2] == 0x72 && h[3] == 0x21) { // Rar! if (h[0] == 0x52 && h[1] == 0x61 && h[2] == 0x72 && h[3] == 0x21) { // Rar!
unarchiver = new bitjs.archive.Unrarrer(ab, pathToBitJS); unarchiver = new bitjs.archive.Unrarrer(ab, pathToBitJS);
} else if (h[0] == 0x50 && h[1] == 0x4B) { // PK (Zip) } else if (h[0] == 80 && h[1] == 75) { // PK (Zip)
unarchiver = new bitjs.archive.Unzipper(ab, pathToBitJS); unarchiver = new bitjs.archive.Unzipper(ab, pathToBitJS);
} else { // Try with tar } else { // Try with tar
unarchiver = new bitjs.archive.Untarrer(ab, pathToBitJS); unarchiver = new bitjs.archive.Untarrer(ab, pathToBitJS);
} }
return unarchiver; return unarchiver;
}; };
})();

@ -9,42 +9,12 @@
/** /**
* CRC Implementation. * CRC Implementation.
*/ */
const CRCTab = new Array(256).fill(0); var CRCTab = new Array(256).fill(0);
// Helper functions between signed and unsigned integers.
/**
* -1 becomes 0xffffffff
*/
function fromSigned32ToUnsigned32(val) {
return (val < 0) ? (val += 0x100000000) : val;
}
/**
* 0xffffffff becomes -1
*/
function fromUnsigned32ToSigned32(val) {
return (val >= 0x80000000) ? (val -= 0x100000000) : val;
}
/**
* -1 becomes 0xff
*/
function fromSigned8ToUnsigned8(val) {
return (val < 0) ? (val += 0x100) : val;
}
/**
* 0xff becomes -1
*/
function fromUnsigned8ToSigned8(val) {
return (val >= 0x80) ? (val -= 0x100) : val;
}
function InitCRC() { function InitCRC() {
for (let i = 0; i < 256; ++i) { for (var i = 0; i < 256; ++i) {
let c = i; var c = i;
for (let j = 0; j < 8; ++j) { for (var j = 0; j < 8; ++j) {
// Read http://stackoverflow.com/questions/6798111/bitwise-operations-on-32-bit-unsigned-ints // Read http://stackoverflow.com/questions/6798111/bitwise-operations-on-32-bit-unsigned-ints
// for the bitwise operator issue (JS interprets operands as 32-bit signed // for the bitwise operator issue (JS interprets operands as 32-bit signed
// integers and we need to deal with unsigned ones here). // integers and we need to deal with unsigned ones here).
@ -90,8 +60,8 @@ function CRC(startCRC, arr) {
#endif #endif
*/ */
for (let i = 0; i < arr.length; ++i) { for (var i = 0; i < arr.length; ++i) {
const byte = ((startCRC ^ arr[i]) >>> 0) & 0xff; var byte = ((startCRC ^ arr[i]) >>> 0) & 0xff;
startCRC = (CRCTab[byte] ^ (startCRC >>> 8)) >>> 0; startCRC = (CRCTab[byte] ^ (startCRC >>> 8)) >>> 0;
} }
@ -104,17 +74,17 @@ function CRC(startCRC, arr) {
/** /**
* RarVM Implementation. * RarVM Implementation.
*/ */
const VM_MEMSIZE = 0x40000; var VM_MEMSIZE = 0x40000;
const VM_MEMMASK = (VM_MEMSIZE - 1); var VM_MEMMASK = (VM_MEMSIZE - 1);
const VM_GLOBALMEMADDR = 0x3C000; var VM_GLOBALMEMADDR = 0x3C000;
const VM_GLOBALMEMSIZE = 0x2000; var VM_GLOBALMEMSIZE = 0x2000;
const VM_FIXEDGLOBALSIZE = 64; var VM_FIXEDGLOBALSIZE = 64;
const MAXWINSIZE = 0x400000; var MAXWINSIZE = 0x400000;
const MAXWINMASK = (MAXWINSIZE - 1); var MAXWINMASK = (MAXWINSIZE - 1);
/** /**
*/ */
const VM_Commands = { var VM_Commands = {
VM_MOV: 0, VM_MOV: 0,
VM_CMP: 1, VM_CMP: 1,
VM_ADD: 2, VM_ADD: 2,
@ -171,7 +141,7 @@ const VM_Commands = {
/** /**
*/ */
const VM_StandardFilters = { var VM_StandardFilters = {
VMSF_NONE: 0, VMSF_NONE: 0,
VMSF_E8: 1, VMSF_E8: 1,
VMSF_E8E9: 2, VMSF_E8E9: 2,
@ -184,7 +154,7 @@ const VM_StandardFilters = {
/** /**
*/ */
const VM_Flags = { var VM_Flags = {
VM_FC: 1, VM_FC: 1,
VM_FZ: 2, VM_FZ: 2,
VM_FS: 0x80000000, VM_FS: 0x80000000,
@ -192,7 +162,7 @@ const VM_Flags = {
/** /**
*/ */
const VM_OpType = { var VM_OpType = {
VM_OPREG: 0, VM_OPREG: 0,
VM_OPINT: 1, VM_OPINT: 1,
VM_OPREGMEM: 2, VM_OPREGMEM: 2,
@ -207,7 +177,7 @@ const VM_OpType = {
* @return {string} The key/enum value as a string. * @return {string} The key/enum value as a string.
*/ */
function findKeyForValue(obj, val) { function findKeyForValue(obj, val) {
for (let key in obj) { for (var key in obj) {
if (obj[key] === val) { if (obj[key] === val) {
return key; return key;
} }
@ -216,7 +186,7 @@ function findKeyForValue(obj, val) {
} }
function getDebugString(obj, val) { function getDebugString(obj, val) {
let s = 'Unknown.'; var s = 'Unknown.';
if (obj === VM_Commands) { if (obj === VM_Commands) {
s = 'VM_Commands.'; s = 'VM_Commands.';
} else if (obj === VM_StandardFilters) { } else if (obj === VM_StandardFilters) {
@ -231,9 +201,10 @@ function getDebugString(obj, val) {
} }
/** /**
* @struct
* @constructor
*/ */
class VM_PreparedOperand { var VM_PreparedOperand = function() {
constructor() {
/** @type {VM_OpType} */ /** @type {VM_OpType} */
this.Type; this.Type;
@ -249,7 +220,7 @@ class VM_PreparedOperand {
}; };
/** @return {string} */ /** @return {string} */
toString() { VM_PreparedOperand.prototype.toString = function() {
if (this.Type === null) { if (this.Type === null) {
return 'Error: Type was null in VM_PreparedOperand'; return 'Error: Type was null in VM_PreparedOperand';
} }
@ -258,13 +229,13 @@ class VM_PreparedOperand {
+ ', Data: ' + this.Data + ', Data: ' + this.Data
+ ', Base: ' + this.Base + ', Base: ' + this.Base
+ ' }'; + ' }';
} };
}
/** /**
* @struct
* @constructor
*/ */
class VM_PreparedCommand { var VM_PreparedCommand = function() {
constructor() {
/** @type {VM_Commands} */ /** @type {VM_Commands} */
this.OpCode; this.OpCode;
@ -276,10 +247,10 @@ class VM_PreparedCommand {
/** @type {VM_PreparedOperand} */ /** @type {VM_PreparedOperand} */
this.Op2 = new VM_PreparedOperand(); this.Op2 = new VM_PreparedOperand();
} };
/** @return {string} */ /** @return {string} */
toString(indent) { VM_PreparedCommand.prototype.toString = function(indent) {
if (this.OpCode === null) { if (this.OpCode === null) {
return 'Error: OpCode was null in VM_PreparedCommand'; return 'Error: OpCode was null in VM_PreparedCommand';
} }
@ -290,13 +261,13 @@ class VM_PreparedCommand {
+ indent + ' Op1: ' + this.Op1.toString() + ',\n' + indent + ' Op1: ' + this.Op1.toString() + ',\n'
+ indent + ' Op2: ' + this.Op2.toString() + ',\n' + indent + ' Op2: ' + this.Op2.toString() + ',\n'
+ indent + '}'; + indent + '}';
} };
}
/** /**
* @struct
* @constructor
*/ */
class VM_PreparedProgram { var VM_PreparedProgram = function() {
constructor() {
/** @type {Array<VM_PreparedCommand>} */ /** @type {Array<VM_PreparedCommand>} */
this.Cmd = []; this.Cmd = [];
@ -317,25 +288,25 @@ class VM_PreparedProgram {
* @type {Uint8Array} * @type {Uint8Array}
*/ */
this.FilteredData = null; this.FilteredData = null;
} };
/** @return {string} */ /** @return {string} */
toString() { VM_PreparedProgram.prototype.toString = function() {
let s = '{\n Cmd: [\n'; var s = '{\n Cmd: [\n';
for (let i = 0; i < this.Cmd.length; ++i) { for (var i = 0; i < this.Cmd.length; ++i) {
s += this.Cmd[i].toString(' ') + ',\n'; s += this.Cmd[i].toString(' ') + ',\n';
} }
s += '],\n'; s += '],\n';
// TODO: Dump GlobalData, StaticData, InitR? // TODO: Dump GlobalData, StaticData, InitR?
s += ' }\n'; s += ' }\n';
return s; return s;
} };
}
/** /**
* @struct
* @constructor
*/ */
class UnpackFilter { var UnpackFilter = function() {
constructor() {
/** @type {number} */ /** @type {number} */
this.BlockStart = 0; this.BlockStart = 0;
@ -355,20 +326,19 @@ class UnpackFilter {
/** @type {VM_PreparedProgram} */ /** @type {VM_PreparedProgram} */
this.Prg = new VM_PreparedProgram(); this.Prg = new VM_PreparedProgram();
} };
}
const VMCF_OP0 = 0;
const VMCF_OP1 = 1;
const VMCF_OP2 = 2;
const VMCF_OPMASK = 3;
const VMCF_BYTEMODE = 4;
const VMCF_JUMP = 8;
const VMCF_PROC = 16;
const VMCF_USEFLAGS = 32;
const VMCF_CHFLAGS = 64;
const VM_CmdFlags = [ var VMCF_OP0 = 0;
var VMCF_OP1 = 1;
var VMCF_OP2 = 2;
var VMCF_OPMASK = 3;
var VMCF_BYTEMODE = 4;
var VMCF_JUMP = 8;
var VMCF_PROC = 16;
var VMCF_USEFLAGS = 32;
var VMCF_CHFLAGS = 64;
var VM_CmdFlags = [
/* VM_MOV */ VMCF_OP2 | VMCF_BYTEMODE , /* VM_MOV */ VMCF_OP2 | VMCF_BYTEMODE ,
/* VM_CMP */ VMCF_OP2 | VMCF_BYTEMODE | VMCF_CHFLAGS , /* VM_CMP */ VMCF_OP2 | VMCF_BYTEMODE | VMCF_CHFLAGS ,
/* VM_ADD */ VMCF_OP2 | VMCF_BYTEMODE | VMCF_CHFLAGS , /* VM_ADD */ VMCF_OP2 | VMCF_BYTEMODE | VMCF_CHFLAGS ,
@ -412,15 +382,14 @@ const VM_CmdFlags = [
]; ];
/**
*/
class StandardFilterSignature {
/** /**
* @param {number} length * @param {number} length
* @param {number} crc * @param {number} crc
* @param {VM_StandardFilters} type * @param {VM_StandardFilters} type
* @struct
* @constructor
*/ */
constructor(length, crc, type) { var StandardFilterSignature = function(length, crc, type) {
/** @type {number} */ /** @type {number} */
this.Length = length; this.Length = length;
@ -429,13 +398,12 @@ class StandardFilterSignature {
/** @type {VM_StandardFilters} */ /** @type {VM_StandardFilters} */
this.Type = type; this.Type = type;
} };
}
/** /**
* @type {Array<StandardFilterSignature>} * @type {Array<StandardFilterSignature>}
*/ */
const StdList = [ var StdList = [
new StandardFilterSignature(53, 0xad576887, VM_StandardFilters.VMSF_E8), new StandardFilterSignature(53, 0xad576887, VM_StandardFilters.VMSF_E8),
new StandardFilterSignature(57, 0x3cd7e57e, VM_StandardFilters.VMSF_E8E9), new StandardFilterSignature(57, 0x3cd7e57e, VM_StandardFilters.VMSF_E8E9),
new StandardFilterSignature(120, 0x3769893f, VM_StandardFilters.VMSF_ITANIUM), new StandardFilterSignature(120, 0x3769893f, VM_StandardFilters.VMSF_ITANIUM),
@ -448,8 +416,7 @@ const StdList = [
/** /**
* @constructor * @constructor
*/ */
class RarVM { var RarVM = function() {
constructor() {
/** @private {Uint8Array} */ /** @private {Uint8Array} */
this.mem_ = null; this.mem_ = null;
@ -458,38 +425,38 @@ class RarVM {
/** @private {number} */ /** @private {number} */
this.flags_ = 0; this.flags_ = 0;
} };
/** /**
* Initializes the memory of the VM. * Initializes the memory of the VM.
*/ */
init() { RarVM.prototype.init = function() {
if (!this.mem_) { if (!this.mem_) {
this.mem_ = new Uint8Array(VM_MEMSIZE); this.mem_ = new Uint8Array(VM_MEMSIZE);
} }
} };
/** /**
* @param {Uint8Array} code * @param {Uint8Array} code
* @return {VM_StandardFilters} * @return {VM_StandardFilters}
*/ */
isStandardFilter(code) { RarVM.prototype.isStandardFilter = function(code) {
const codeCRC = (CRC(0xffffffff, code, code.length) ^ 0xffffffff) >>> 0; var codeCRC = (CRC(0xffffffff, code, code.length) ^ 0xffffffff) >>> 0;
for (let i = 0; i < StdList.length; ++i) { for (var i = 0; i < StdList.length; ++i) {
if (StdList[i].CRC == codeCRC && StdList[i].Length == code.length) if (StdList[i].CRC == codeCRC && StdList[i].Length == code.length)
return StdList[i].Type; return StdList[i].Type;
} }
return VM_StandardFilters.VMSF_NONE; return VM_StandardFilters.VMSF_NONE;
} };
/** /**
* @param {VM_PreparedOperand} op * @param {VM_PreparedOperand} op
* @param {boolean} byteMode * @param {boolean} byteMode
* @param {bitjs.io.BitStream} bstream A rtl bit stream. * @param {bitjs.io.BitStream} bstream A rtl bit stream.
*/ */
decodeArg(op, byteMode, bstream) { RarVM.prototype.decodeArg = function(op, byteMode, bstream) {
const data = bstream.peekBits(16); var data = bstream.peekBits(16);
if (data & 0x8000) { if (data & 0x8000) {
op.Type = VM_OpType.VM_OPREG; // Operand is register (R[0]..R[7]) op.Type = VM_OpType.VM_OPREG; // Operand is register (R[0]..R[7])
bstream.readBits(1); // 1 flag bit and... bstream.readBits(1); // 1 flag bit and...
@ -527,20 +494,20 @@ class RarVM {
} }
} }
} }
} };
/** /**
* @param {VM_PreparedProgram} prg * @param {VM_PreparedProgram} prg
*/ */
execute(prg) { RarVM.prototype.execute = function(prg) {
this.R_.set(prg.InitR); this.R_.set(prg.InitR);
const globalSize = Math.min(prg.GlobalData.length, VM_GLOBALMEMSIZE); var globalSize = Math.min(prg.GlobalData.length, VM_GLOBALMEMSIZE);
if (globalSize) { if (globalSize) {
this.mem_.set(prg.GlobalData.subarray(0, globalSize), VM_GLOBALMEMADDR); this.mem_.set(prg.GlobalData.subarray(0, globalSize), VM_GLOBALMEMADDR);
} }
const staticSize = Math.min(prg.StaticData.length, VM_GLOBALMEMSIZE - globalSize); var staticSize = Math.min(prg.StaticData.length, VM_GLOBALMEMSIZE - globalSize);
if (staticSize) { if (staticSize) {
this.mem_.set(prg.StaticData.subarray(0, staticSize), VM_GLOBALMEMADDR + globalSize); this.mem_.set(prg.StaticData.subarray(0, staticSize), VM_GLOBALMEMADDR + globalSize);
} }
@ -548,15 +515,15 @@ class RarVM {
this.R_[7] = VM_MEMSIZE; this.R_[7] = VM_MEMSIZE;
this.flags_ = 0; this.flags_ = 0;
const preparedCodes = prg.AltCmd ? prg.AltCmd : prg.Cmd; var preparedCodes = prg.AltCmd ? prg.AltCmd : prg.Cmd;
if (prg.Cmd.length > 0 && !this.executeCode(preparedCodes)) { if (prg.Cmd.length > 0 && !this.executeCode(preparedCodes)) {
// Invalid VM program. Let's replace it with 'return' command. // Invalid VM program. Let's replace it with 'return' command.
preparedCode.OpCode = VM_Commands.VM_RET; preparedCode.OpCode = VM_Commands.VM_RET;
} }
const dataView = new DataView(this.mem_.buffer, VM_GLOBALMEMADDR); var dataView = new DataView(this.mem_.buffer, VM_GLOBALMEMADDR);
let newBlockPos = dataView.getUint32(0x20, true /* little endian */) & VM_MEMMASK; var newBlockPos = dataView.getUint32(0x20, true /* little endian */) & VM_MEMMASK;
const newBlockSize = dataView.getUint32(0x1c, true /* little endian */) & VM_MEMMASK; var newBlockSize = dataView.getUint32(0x1c, true /* little endian */) & VM_MEMMASK;
if (newBlockPos + newBlockSize >= VM_MEMSIZE) { if (newBlockPos + newBlockSize >= VM_MEMSIZE) {
newBlockPos = newBlockSize = 0; newBlockPos = newBlockSize = 0;
} }
@ -564,21 +531,22 @@ class RarVM {
prg.GlobalData = new Uint8Array(0); prg.GlobalData = new Uint8Array(0);
const dataSize = Math.min(dataView.getUint32(0x30), (VM_GLOBALMEMSIZE - VM_FIXEDGLOBALSIZE)); var dataSize = Math.min(dataView.getUint32(0x30),
(VM_GLOBALMEMSIZE - VM_FIXEDGLOBALSIZE));
if (dataSize != 0) { if (dataSize != 0) {
const len = dataSize + VM_FIXEDGLOBALSIZE; var len = dataSize + VM_FIXEDGLOBALSIZE;
prg.GlobalData = new Uint8Array(len); prg.GlobalData = new Uint8Array(len);
prg.GlobalData.set(mem.subarray(VM_GLOBALMEMADDR, VM_GLOBALMEMADDR + len)); prg.GlobalData.set(mem.subarray(VM_GLOBALMEMADDR, VM_GLOBALMEMADDR + len));
} }
} };
/** /**
* @param {Array<VM_PreparedCommand>} preparedCodes * @param {Array<VM_PreparedCommand>} preparedCodes
* @return {boolean} * @return {boolean}
*/ */
executeCode(preparedCodes) { RarVM.prototype.executeCode = function(preparedCodes) {
let codeIndex = 0; var codeIndex = 0;
let cmd = preparedCodes[codeIndex]; var cmd = preparedCodes[codeIndex];
// TODO: Why is this an infinite loop instead of just returning // TODO: Why is this an infinite loop instead of just returning
// when a VM_RET is hit? // when a VM_RET is hit?
while (1) { while (1) {
@ -602,179 +570,22 @@ class RarVM {
codeIndex++; codeIndex++;
cmd = preparedCodes[codeIndex]; cmd = preparedCodes[codeIndex];
} }
} };
/** /**
* @param {number} filterType * @param {number} filterType
*/ */
executeStandardFilter(filterType) { RarVM.prototype.executeStandardFilter = function(filterType) {
switch (filterType) { switch (filterType) {
case VM_StandardFilters.VMSF_RGB: { case VM_StandardFilters.VMSF_DELTA:
const dataSize = this.R_[4]; var dataSize = this.R_[4];
const width = this.R_[0] - 3; var channels = this.R_[0];
const posR = this.R_[1]; var srcPos = 0;
const Channels = 3; var border = dataSize * 2;
let srcOffset = 0;
let destOffset = dataSize;
// byte *SrcData=Mem,*DestData=SrcData+DataSize;
// SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize);
const dataView = new DataView(this.mem_.buffer, VM_GLOBALMEMADDR /* offset */);
dataView.setUint32(0x20 /* byte offset */,
dataSize /* value */,
true /* little endian */);
if (dataSize >= (VM_GLOBALMEMADDR / 2) || posR < 0) {
break;
}
for (let curChannel = 0; curChannel < Channels; ++curChannel) {
let prevByte=0;
for (let i = curChannel; i < dataSize; i += Channels) {
let predicted;
const upperPos = i - width;
if (upperPos >= 3) {
const upperByte = this.mem_[destOffset + upperPos];
const upperLeftByte = this.mem_[destOffset + upperPos - 3];
predicted = prevByte + upperByte - upperLeftByte;
const pa = Math.abs(predicted - prevByte);
const pb = Math.abs(predicted - upperByte);
const pc = Math.abs(predicted - upperLeftByte);
if (pa <= pb && pa <= pc) {
predicted = prevByte;
} else if (pb <= pc) {
predicted = upperByte;
} else {
predicted = upperLeftByte;
}
} else {
predicted = prevByte;
}
//DestData[I]=PrevByte=(byte)(Predicted-*(SrcData++));
prevByte = (predicted - this.mem_[srcOffset++]) & 0xff;
this.mem_[destOffset + i] = prevByte;
}
}
for (let i = posR, border = dataSize - 2; i < border; i += 3) {
const g = this.mem_[destOffset + i + 1];
this.mem_[destOffset + i] += g;
this.mem_[destOffset + i + 2] += g;
}
break;
}
// The C++ version of this standard filter uses an odd mixture of
// signed and unsigned integers, bytes and various casts. Careful!
case VM_StandardFilters.VMSF_AUDIO: {
const dataSize = this.R_[4];
const channels = this.R_[0];
let srcOffset = 0;
let destOffset = dataSize;
//SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize); //SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize);
const dataView = new DataView(this.mem_.buffer, VM_GLOBALMEMADDR); var dataView = new DataView(this.mem_.buffer, VM_GLOBALMEMADDR);
dataView.setUint32(0x20 /* byte offset */, dataView.setUint32(0x20, dataSize, true /* little endian */);
dataSize /* value */,
true /* little endian */);
if (dataSize >= VM_GLOBALMEMADDR / 2) {
break;
}
for (let curChannel = 0; curChannel < channels; ++curChannel) {
let prevByte = 0; // uint
let prevDelta = 0; // uint
let dif = [0, 0, 0, 0, 0, 0, 0];
let d1 = 0, d2 = 0, d3; // ints
let k1 = 0, k2 = 0, k3 = 0; // ints
for (var i = curChannel, byteCount = 0;
i < dataSize;
i += channels, ++byteCount) {
d3 = d2;
d2 = fromUnsigned32ToSigned32(prevDelta - d1);
d1 = fromUnsigned32ToSigned32(prevDelta);
let predicted = fromSigned32ToUnsigned32(8*prevByte + k1*d1 + k2*d2 + k3*d3); // uint
predicted = (predicted >>> 3) & 0xff;
let curByte = this.mem_[srcOffset++]; // uint
// Predicted-=CurByte;
predicted = fromSigned32ToUnsigned32(predicted - curByte);
this.mem_[destOffset + i] = (predicted & 0xff);
// PrevDelta=(signed char)(Predicted-PrevByte);
// where Predicted, PrevByte, PrevDelta are all unsigned int (32)
// casting this subtraction to a (signed char) is kind of invalid
// but it does the following:
// - do the subtraction
// - get the bottom 8 bits of the result
// - if it was >= 0x80, then the value is negative (subtract 0x100)
// - if the value is now negative, add 0x100000000 to make unsigned
//
// Example:
// predicted = 101
// prevByte = 4294967158
// (predicted - prevByte) = -4294967057
// take lower 8 bits: 1110 1111 = 239
// since > 127, subtract 256 = -17
// since < 0, add 0x100000000 = 4294967279
prevDelta = fromSigned32ToUnsigned32(
fromUnsigned8ToSigned8((predicted - prevByte) & 0xff));
prevByte = predicted;
// int D=((signed char)CurByte)<<3;
let curByteAsSignedChar = fromUnsigned8ToSigned8(curByte); // signed char
let d = (curByteAsSignedChar << 3);
dif[0] += Math.abs(d);
dif[1] += Math.abs(d-d1);
dif[2] += Math.abs(d+d1);
dif[3] += Math.abs(d-d2);
dif[4] += Math.abs(d+d2);
dif[5] += Math.abs(d-d3);
dif[6] += Math.abs(d+d3);
if ((byteCount & 0x1f) == 0) {
let minDif = dif[0], numMinDif = 0;
dif[0] = 0;
for (let j = 1; j < 7; ++j) {
if (dif[j] < minDif) {
minDif = dif[j];
numMinDif = j;
}
dif[j] = 0;
}
switch (numMinDif) {
case 1: if (k1>=-16) k1--; break;
case 2: if (k1 < 16) k1++; break;
case 3: if (k2>=-16) k2--; break;
case 4: if (k2 < 16) k2++; break;
case 5: if (k3>=-16) k3--; break;
case 6: if (k3 < 16) k3++; break;
}
}
}
}
break;
}
case VM_StandardFilters.VMSF_DELTA: {
const dataSize = this.R_[4];
const channels = this.R_[0];
let srcPos = 0;
const border = dataSize * 2;
//SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize);
const dataView = new DataView(this.mem_.buffer, VM_GLOBALMEMADDR);
dataView.setUint32(0x20 /* byte offset */,
dataSize /* value */,
true /* little endian */);
if (dataSize >= VM_GLOBALMEMADDR / 2) { if (dataSize >= VM_GLOBALMEMADDR / 2) {
break; break;
@ -782,37 +593,36 @@ class RarVM {
// Bytes from same channels are grouped to continual data blocks, // Bytes from same channels are grouped to continual data blocks,
// so we need to place them back to their interleaving positions. // so we need to place them back to their interleaving positions.
for (let curChannel = 0; curChannel < channels; ++curChannel) { for (var curChannel = 0; curChannel < channels; ++curChannel) {
let prevByte = 0; var prevByte = 0;
for (let destPos = dataSize + curChannel; destPos < border; destPos += channels) { for (var destPos = dataSize + curChannel; destPos < border; destPos += channels) {
prevByte = (prevByte - this.mem_[srcPos++]) & 0xff; prevByte = (prevByte - this.mem_[srcPos++]) & 0xff;
this.mem_[destPos] = prevByte; this.mem_[destPos] = prevByte;
} }
} }
break; break;
}
default: default:
console.error('RarVM Standard Filter not supported: ' + getDebugString(VM_StandardFilters, filterType)); console.error('RarVM Standard Filter not supported: ' + getDebugString(VM_StandardFilters, filterType));
break; break;
} }
} };
/** /**
* @param {Uint8Array} code * @param {Uint8Array} code
* @param {VM_PreparedProgram} prg * @param {VM_PreparedProgram} prg
*/ */
prepare(code, prg) { RarVM.prototype.prepare = function(code, prg) {
let codeSize = code.length; var codeSize = code.length;
//InitBitInput(); //InitBitInput();
//memcpy(InBuf,Code,Min(CodeSize,BitInput::MAX_SIZE)); //memcpy(InBuf,Code,Min(CodeSize,BitInput::MAX_SIZE));
const bstream = new bitjs.io.BitStream(code.buffer, true /* rtl */); var bstream = new bitjs.io.BitStream(code.buffer, true /* rtl */);
// Calculate the single byte XOR checksum to check validity of VM code. // Calculate the single byte XOR checksum to check validity of VM code.
let xorSum = 0; var xorSum=0;
for (let i = 1; i < codeSize; ++i) { for (var i = 1; i < codeSize; ++i) {
xorSum ^= code[i]; xorSum ^= code[i];
} }
@ -822,10 +632,10 @@ class RarVM {
// VM code is valid if equal. // VM code is valid if equal.
if (xorSum == code[0]) { if (xorSum == code[0]) {
const filterType = this.isStandardFilter(code); var filterType = this.isStandardFilter(code);
if (filterType != VM_StandardFilters.VMSF_NONE) { if (filterType != VM_StandardFilters.VMSF_NONE) {
// VM code is found among standard filters. // VM code is found among standard filters.
const curCmd = new VM_PreparedCommand(); var curCmd = new VM_PreparedCommand();
prg.Cmd.push(curCmd); prg.Cmd.push(curCmd);
curCmd.OpCode = VM_Commands.VM_STANDARD; curCmd.OpCode = VM_Commands.VM_STANDARD;
@ -838,17 +648,17 @@ class RarVM {
codeSize = 0; codeSize = 0;
} }
const dataFlag = bstream.readBits(1); var dataFlag = bstream.readBits(1);
// Read static data contained in DB operators. This data cannot be // Read static data contained in DB operators. This data cannot be
// changed, it is a part of VM code, not a filter parameter. // changed, it is a part of VM code, not a filter parameter.
if (dataFlag & 0x8000) { if (dataFlag & 0x8000) {
const dataSize = RarVM.readData(bstream) + 1; var dataSize = RarVM.readData(bstream) + 1;
// TODO: This accesses the byte pointer of the bstream directly. Is that ok? // TODO: This accesses the byte pointer of the bstream directly. Is that ok?
for (let i = 0; i < bstream.bytePtr < codeSize && i < dataSize; ++i) { for (var i = 0; i < bstream.bytePtr < codeSize && i < dataSize; ++i) {
// Append a byte to the program's static data. // Append a byte to the program's static data.
const newStaticData = new Uint8Array(prg.StaticData.length + 1); var newStaticData = new Uint8Array(prg.StaticData.length + 1);
newStaticData.set(prg.StaticData); newStaticData.set(prg.StaticData);
newStaticData[newStaticData.length - 1] = bstream.readBits(8); newStaticData[newStaticData.length - 1] = bstream.readBits(8);
prg.StaticData = newStaticData; prg.StaticData = newStaticData;
@ -856,9 +666,9 @@ class RarVM {
} }
while (bstream.bytePtr < codeSize) { while (bstream.bytePtr < codeSize) {
const curCmd = new VM_PreparedCommand(); var curCmd = new VM_PreparedCommand();
prg.Cmd.push(curCmd); // Prg->Cmd.Add(1) prg.Cmd.push(curCmd); // Prg->Cmd.Add(1)
const flag = bstream.peekBits(1); var flag = bstream.peekBits(1);
if (!flag) { // (Data&0x8000)==0 if (!flag) { // (Data&0x8000)==0
curCmd.OpCode = bstream.readBits(4); curCmd.OpCode = bstream.readBits(4);
} else { } else {
@ -872,7 +682,7 @@ class RarVM {
} }
curCmd.Op1.Type = VM_OpType.VM_OPNONE; curCmd.Op1.Type = VM_OpType.VM_OPNONE;
curCmd.Op2.Type = VM_OpType.VM_OPNONE; curCmd.Op2.Type = VM_OpType.VM_OPNONE;
const opNum = (VM_CmdFlags[curCmd.OpCode] & VMCF_OPMASK); var opNum = (VM_CmdFlags[curCmd.OpCode] & VMCF_OPMASK);
curCmd.Op1.Addr = null; curCmd.Op1.Addr = null;
curCmd.Op2.Addr = null; curCmd.Op2.Addr = null;
if (opNum > 0) { if (opNum > 0) {
@ -882,7 +692,7 @@ class RarVM {
} else { } else {
if (curCmd.Op1.Type == VM_OpType.VM_OPINT && (VM_CmdFlags[curCmd.OpCode] & (VMCF_JUMP|VMCF_PROC))) { if (curCmd.Op1.Type == VM_OpType.VM_OPINT && (VM_CmdFlags[curCmd.OpCode] & (VMCF_JUMP|VMCF_PROC))) {
// Calculating jump distance. // Calculating jump distance.
let distance = curCmd.Op1.Data; var distance = curCmd.Op1.Data;
if (distance >= 256) { if (distance >= 256) {
distance -= 256; distance -= 256;
} else { } else {
@ -906,7 +716,7 @@ class RarVM {
} // while ((uint)InAddr<CodeSize) } // while ((uint)InAddr<CodeSize)
} // if (XorSum==Code[0]) } // if (XorSum==Code[0])
const curCmd = new VM_PreparedCommand(); var curCmd = new VM_PreparedCommand();
prg.Cmd.push(curCmd); prg.Cmd.push(curCmd);
curCmd.OpCode = VM_Commands.VM_RET; curCmd.OpCode = VM_Commands.VM_RET;
// TODO: Addr=&CurCmd->Op1.Data // TODO: Addr=&CurCmd->Op1.Data
@ -920,8 +730,8 @@ class RarVM {
// VM_OPINT type operands (usual integers) or maybe if something was // VM_OPINT type operands (usual integers) or maybe if something was
// not set properly for other operands. 'Addr' field is required // not set properly for other operands. 'Addr' field is required
// for quicker addressing of operand data. // for quicker addressing of operand data.
for (let i = 0; i < prg.Cmd.length; ++i) { for (var i = 0; i < prg.Cmd.length; ++i) {
const cmd = prg.Cmd[i]; var cmd = prg.Cmd[i];
if (cmd.Op1.Addr == null) { if (cmd.Op1.Addr == null) {
cmd.Op1.Addr = [cmd.Op1.Data]; cmd.Op1.Addr = [cmd.Op1.Data];
} }
@ -936,20 +746,20 @@ class RarVM {
Optimize(Prg); Optimize(Prg);
#endif #endif
*/ */
} };
/** /**
* @param {Uint8Array} arr The byte array to set a value in. * @param {Uint8Array} arr The byte array to set a value in.
* @param {number} value The unsigned 32-bit value to set. * @param {number} value The unsigned 32-bit value to set.
* @param {number} offset Offset into arr to start setting the value, defaults to 0. * @param {number} offset Offset into arr to start setting the value, defaults to 0.
*/ */
setLowEndianValue(arr, value, offset) { RarVM.prototype.setLowEndianValue = function(arr, value, offset) {
const i = offset || 0; var i = offset || 0;
arr[i] = value & 0xff; arr[i] = value & 0xff;
arr[i + 1] = (value >>> 8) & 0xff; arr[i + 1] = (value >>> 8) & 0xff;
arr[i + 2] = (value >>> 16) & 0xff; arr[i + 2] = (value >>> 16) & 0xff;
arr[i + 3] = (value >>> 24) & 0xff; arr[i + 3] = (value >>> 24) & 0xff;
} };
/** /**
* Sets a number of bytes of the VM memory at the given position from a * Sets a number of bytes of the VM memory at the given position from a
@ -958,14 +768,14 @@ class RarVM {
* @param {Uint8Array} buffer The source buffer of bytes. * @param {Uint8Array} buffer The source buffer of bytes.
* @param {number} dataSize The number of bytes to set. * @param {number} dataSize The number of bytes to set.
*/ */
setMemory(pos, buffer, dataSize) { RarVM.prototype.setMemory = function(pos, buffer, dataSize) {
if (pos < VM_MEMSIZE) { if (pos < VM_MEMSIZE) {
const numBytes = Math.min(dataSize, VM_MEMSIZE - pos); var numBytes = Math.min(dataSize, VM_MEMSIZE - pos);
for (let i = 0; i < numBytes; ++i) { for (var i = 0; i < numBytes; ++i) {
this.mem_[pos + i] = buffer[i]; this.mem_[pos + i] = buffer[i];
} }
} }
} };
/** /**
* Static function that reads in the next set of bits for the VM * Static function that reads in the next set of bits for the VM
@ -973,9 +783,9 @@ class RarVM {
* @param {bitjs.io.BitStream} bstream A RTL bit stream. * @param {bitjs.io.BitStream} bstream A RTL bit stream.
* @return {number} The value of the bits read. * @return {number} The value of the bits read.
*/ */
static readData(bstream) { RarVM.readData = function(bstream) {
// Read in the first 2 bits. // Read in the first 2 bits.
const flags = bstream.readBits(2); var flags = bstream.readBits(2);
switch (flags) { // Data&0xc000 switch (flags) { // Data&0xc000
// Return the next 4 bits. // Return the next 4 bits.
case 0: case 0:
@ -995,7 +805,7 @@ class RarVM {
// Read in the next 16. // Read in the next 16.
case 2: // 0x8000 case 2: // 0x8000
const val = bstream.getBits(); var val = bstream.getBits();
bstream.readBits(16); bstream.readBits(16);
return val; //bstream.readBits(16); return val; //bstream.readBits(16);
@ -1003,7 +813,6 @@ class RarVM {
default: default:
return (bstream.readBits(16) << 16) | bstream.readBits(16); return (bstream.readBits(16) << 16) | bstream.readBits(16);
} }
} };
}
// ============================================================================================== // // ============================================================================================== //

File diff suppressed because it is too large Load Diff

@ -14,60 +14,42 @@
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(),
));
}; };
// Removes all characters from the first zero-byte in the string onwards. // Removes all characters from the first zero-byte in the string onwards.
const readCleanString = function(bstr, numBytes) { var readCleanString = function(bstr, numBytes) {
const str = bstr.readString(numBytes); var str = bstr.readString(numBytes);
const zIndex = str.indexOf(String.fromCharCode(0)); var zIndex = str.indexOf(String.fromCharCode(0));
return zIndex != -1 ? str.substr(0, zIndex) : str; return zIndex != -1 ? str.substr(0, zIndex) : str;
}; };
class TarLocalFile {
// takes a ByteStream and parses out the local file information // takes a ByteStream and parses out the local file information
constructor(bstream) { var TarLocalFile = function(bstream) {
this.isValid = false; this.isValid = false;
let bytesRead = 0;
// Read in the header block // Read in the header block
this.name = readCleanString(bstream, 100); this.name = readCleanString(bstream, 100);
this.mode = readCleanString(bstream, 8); this.mode = readCleanString(bstream, 8);
@ -96,8 +78,6 @@ class TarLocalFile {
bstream.readBytes(255); // 512 - 257 bstream.readBytes(255); // 512 - 257
} }
bytesRead += 512;
// Done header, now rest of blocks are the file contents. // Done header, now rest of blocks are the file contents.
this.filename = this.name; this.filename = this.name;
this.fileData = null; this.fileData = null;
@ -109,98 +89,102 @@ class TarLocalFile {
// A regular file. // A regular file.
if (this.typeflag == 0) { if (this.typeflag == 0) {
info(" This is a regular file."); info(" This is a regular file.");
const sizeInBytes = parseInt(this.size); var sizeInBytes = parseInt(this.size);
this.fileData = new Uint8Array(bstream.readBytes(sizeInBytes)); this.fileData = new Uint8Array(bstream.bytes.buffer, bstream.ptr, this.size);
bytesRead += sizeInBytes;
if (this.name.length > 0 && this.size > 0 && this.fileData && this.fileData.buffer) { if (this.name.length > 0 && this.size > 0 && this.fileData && this.fileData.buffer) {
this.isValid = true; this.isValid = true;
} }
bstream.readBytes(this.size);
// Round up to 512-byte blocks. // Round up to 512-byte blocks.
const remaining = 512 - bytesRead % 512; var remaining = 512 - bstream.ptr % 512;
if (remaining > 0 && remaining < 512) { if (remaining > 0 && remaining < 512) {
bstream.readBytes(remaining); bstream.readBytes(remaining);
} }
} else if (this.typeflag == 5) { } else if (this.typeflag == 5) {
info(" This is a directory.") info(" This is a directory.")
} }
} };
}
// Takes an ArrayBuffer of a tar file in
// returns null on error
// returns an array of DecompressedFile objects on success
var untar = function(arrayBuffer) {
currentFilename = "";
currentFileNumber = 0;
currentBytesUnarchivedInFile = 0;
currentBytesUnarchived = 0;
totalUncompressedBytesInArchive = 0;
totalFilesInArchive = 0;
const untar = function() { postMessage(new bitjs.archive.UnarchiveStartEvent());
let bstream = bytestream.tee(); var bstream = new bitjs.io.ByteStream(arrayBuffer);
var localFiles = [];
// While we don't encounter an empty block, keep making TarLocalFiles. // While we don't encounter an empty block, keep making TarLocalFiles.
while (bstream.peekNumber(4) != 0) { while (bstream.peekNumber(4) != 0) {
const oneLocalFile = new TarLocalFile(bstream); var oneLocalFile = new TarLocalFile(bstream);
if (oneLocalFile && oneLocalFile.isValid) { if (oneLocalFile && oneLocalFile.isValid) {
// If we make it to this point and haven't thrown an error, we have successfully localFiles.push(oneLocalFile);
// read in the data for a local file, so we can update the actual bytestream.
bytestream = bstream.tee();
allLocalFiles.push(oneLocalFile);
totalUncompressedBytesInArchive += oneLocalFile.size; totalUncompressedBytesInArchive += oneLocalFile.size;
// update progress
currentFilename = oneLocalFile.filename;
currentFileNumber = totalFilesInArchive++;
currentBytesUnarchivedInFile = oneLocalFile.size;
currentBytesUnarchived += oneLocalFile.size;
postMessage(new bitjs.archive.UnarchiveExtractEvent(oneLocalFile));
postProgress();
} }
} }
totalFilesInArchive = allLocalFiles.length; 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;
*/
});
// report # files and total length
if (localFiles.length > 0) {
postProgress(); postProgress();
bytestream = bstream.tee();
};
// event.data.file has the first ArrayBuffer.
// event.data.bytes has all subsequent ArrayBuffers.
onmessage = function(event) {
const bytes = event.data.file || event.data.bytes;
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) { // now do the shipping of each file
currentFilename = ""; for (var i = 0; i < localFiles.length; ++i) {
currentFileNumber = 0; var localfile = localFiles[i];
currentBytesUnarchivedInFile = 0; info("Sending file '" + localfile.filename + "' up");
currentBytesUnarchived = 0;
totalUncompressedBytesInArchive = 0;
totalFilesInArchive = 0;
allLocalFiles = [];
postMessage(new bitjs.archive.UnarchiveStartEvent());
unarchiveState = UnarchiveState.UNARCHIVING;
// update progress
currentFilename = localfile.filename;
currentFileNumber = i;
currentBytesUnarchivedInFile = localfile.size;
currentBytesUnarchived += localfile.size;
postMessage(new bitjs.archive.UnarchiveExtractEvent(localfile));
postProgress(); postProgress();
} }
if (unarchiveState === UnarchiveState.UNARCHIVING || postProgress();
unarchiveState === UnarchiveState.WAITING) {
try {
untar();
unarchiveState = UnarchiveState.FINISHED;
postMessage(new bitjs.archive.UnarchiveFinishEvent()); postMessage(new bitjs.archive.UnarchiveFinishEvent());
} catch (e) { };
if (typeof e === 'string' && e.startsWith('Error! Overflowed')) {
// Overrun the buffer. // event.data.file has the ArrayBuffer.
unarchiveState = UnarchiveState.WAITING; onmessage = function(event) {
} else { var ab = event.data.file;
console.error('Found an error while untarring'); untar(ab);
console.dir(e);
throw e;
}
}
}
}; };

@ -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;
}
}
}
}; };

@ -12,74 +12,40 @@
var bitjs = bitjs || {}; var bitjs = bitjs || {};
bitjs.io = bitjs.io || {}; bitjs.io = bitjs.io || {};
(function() {
// mask for getting the Nth bit (zero-based)
bitjs.BIT = [ 0x01, 0x02, 0x04, 0x08,
0x10, 0x20, 0x40, 0x80,
0x100, 0x200, 0x400, 0x800,
0x1000, 0x2000, 0x4000, 0x8000];
// mask for getting N number of bits (0-8)
var BITMASK = [0, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF ];
/** /**
* This object allows you to peek and consume bits and bytes out of a stream. * This bit stream peeks and consumes bits out of a binary stream.
* Note that this stream is optimized, and thus, will *NOT* throw an error if *
* the end of the stream is reached. Only use this in scenarios where you
* already have all the bits you need.
*/
bitjs.io.BitStream = class {
/**
* @param {ArrayBuffer} ab An ArrayBuffer object or a Uint8Array. * @param {ArrayBuffer} ab An ArrayBuffer object or a Uint8Array.
* @param {boolean} rtl Whether the stream reads bits from the byte starting * @param {boolean} rtl Whether the stream reads bits from the byte starting
* from bit 7 to 0 (true) or bit 0 to 7 (false). * from bit 7 to 0 (true) or bit 0 to 7 (false).
* @param {Number} opt_offset The offset into the ArrayBuffer * @param {Number} opt_offset The offset into the ArrayBuffer
* @param {Number} opt_length The length of this BitStream * @param {Number} opt_length The length of this BitStream
*/ */
constructor(ab, rtl, opt_offset, opt_length) { bitjs.io.BitStream = function(ab, rtl, opt_offset, opt_length) {
if (!(ab instanceof ArrayBuffer)) { if (!ab || !ab.toString || ab.toString() !== "[object ArrayBuffer]") {
throw 'Error! BitArray constructed with an invalid ArrayBuffer object'; throw "Error! BitArray constructed with an invalid ArrayBuffer object";
} }
const offset = opt_offset || 0; var offset = opt_offset || 0;
const length = opt_length || ab.byteLength; var length = opt_length || ab.byteLength;
/**
* The bytes in the stream.
* @type {Uint8Array}
* @private
*/
this.bytes = new Uint8Array(ab, offset, length); this.bytes = new Uint8Array(ab, offset, length);
this.bytePtr = 0; // tracks which byte we are on
/**
* The byte in the stream that we are currently on.
* @type {Number}
* @private
*/
this.bytePtr = 0;
/**
* The bit in the current byte that we will read next (can have values 0 through 7).
* @type {Number}
* @private
*/
this.bitPtr = 0; // tracks which bit we are on (can have values 0 through 7) this.bitPtr = 0; // tracks which bit we are on (can have values 0 through 7)
/**
* An ever-increasing number.
* @type {Number}
* @private
*/
this.bitsRead_ = 0;
this.peekBits = rtl ? this.peekBits_rtl : this.peekBits_ltr; this.peekBits = rtl ? this.peekBits_rtl : this.peekBits_ltr;
} };
/**
* Returns how many bites have been read in the stream since the beginning of time.
*/
getNumBitsRead() {
return this.bitsRead_;
}
/**
* Returns how many bits are currently in the stream left to be read.
*/
getNumBitsLeft() {
const bitsLeftInByte = 8 - this.bitPtr;
return (this.bytes.byteLength - this.bytePtr - 1) * 8 + bitsLeftInByte;
}
/** /**
* byte0 byte1 byte2 byte3 * byte0 byte1 byte2 byte3
@ -87,58 +53,61 @@ bitjs.io.BitStream = class {
* *
* The bit pointer starts at bit0 of byte0 and moves left until it reaches * The bit pointer starts at bit0 of byte0 and moves left until it reaches
* bit7 of byte0, then jumps to bit0 of byte1, etc. * bit7 of byte0, then jumps to bit0 of byte1, etc.
* @param {number} n The number of bits to peek, must be a positive integer. * @param {number} n The number of bits to peek.
* @param {boolean=} movePointers Whether to move the pointer, defaults false. * @param {boolean=} movePointers Whether to move the pointer, defaults false.
* @return {number} The peeked bits, as an unsigned number. * @return {number} The peeked bits, as an unsigned number.
*/ */
peekBits_ltr(n, opt_movePointers) { bitjs.io.BitStream.prototype.peekBits_ltr = function(n, movePointers) {
const NUM = parseInt(n, 10); if (n <= 0 || typeof n != typeof 1) {
let num = NUM;
if (n !== num || num <= 0) {
return 0; return 0;
} }
const BITMASK = bitjs.io.BitStream.BITMASK; var movePointers = movePointers || false,
const movePointers = opt_movePointers || false; bytePtr = this.bytePtr,
let bytes = this.bytes; bitPtr = this.bitPtr,
let bytePtr = this.bytePtr; result = 0,
let bitPtr = this.bitPtr; bitsIn = 0,
let result = 0; bytes = this.bytes;
let bitsIn = 0;
// keep going until we have no more bits left to peek at // keep going until we have no more bits left to peek at
while (num > 0) { // TODO: Consider putting all bits from bytes we will need into a variable and then
// We overflowed the stream, so just return what we got. // shifting/masking it to just extract the bits we want.
// This could be considerably faster when reading more than 3 or 4 bits at a time.
while (n > 0) {
if (bytePtr >= bytes.length) { if (bytePtr >= bytes.length) {
break; throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" +
bytes.length + ", bitPtr=" + bitPtr;
return -1;
} }
const numBitsLeftInThisByte = (8 - bitPtr); var numBitsLeftInThisByte = (8 - bitPtr);
if (num >= numBitsLeftInThisByte) { if (n >= numBitsLeftInThisByte) {
const mask = (BITMASK[numBitsLeftInThisByte] << bitPtr); var mask = (BITMASK[numBitsLeftInThisByte] << bitPtr);
result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn); result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn);
bytePtr++; bytePtr++;
bitPtr = 0; bitPtr = 0;
bitsIn += numBitsLeftInThisByte; bitsIn += numBitsLeftInThisByte;
num -= numBitsLeftInThisByte; n -= numBitsLeftInThisByte;
} else { }
const mask = (BITMASK[num] << bitPtr); else {
var mask = (BITMASK[n] << bitPtr);
result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn); result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn);
bitPtr += num; bitPtr += n;
break; bitsIn += n;
n = 0;
} }
} }
if (movePointers) { if (movePointers) {
this.bitPtr = bitPtr; this.bitPtr = bitPtr;
this.bytePtr = bytePtr; this.bytePtr = bytePtr;
this.bitsRead_ += NUM;
} }
return result; return result;
} };
/** /**
* byte0 byte1 byte2 byte3 * byte0 byte1 byte2 byte3
@ -146,56 +115,58 @@ bitjs.io.BitStream = class {
* *
* The bit pointer starts at bit7 of byte0 and moves right until it reaches * The bit pointer starts at bit7 of byte0 and moves right until it reaches
* bit0 of byte0, then goes to bit7 of byte1, etc. * bit0 of byte0, then goes to bit7 of byte1, etc.
* @param {number} n The number of bits to peek. Must be a positive integer. * @param {number} n The number of bits to peek.
* @param {boolean=} movePointers Whether to move the pointer, defaults false. * @param {boolean=} movePointers Whether to move the pointer, defaults false.
* @return {number} The peeked bits, as an unsigned number. * @return {number} The peeked bits, as an unsigned number.
*/ */
peekBits_rtl(n, opt_movePointers) { bitjs.io.BitStream.prototype.peekBits_rtl = function(n, movePointers) {
const NUM = parseInt(n, 10); if (n <= 0 || typeof n != typeof 1) {
let num = NUM;
if (n !== num || num <= 0) {
return 0; return 0;
} }
const BITMASK = bitjs.io.BitStream.BITMASK; var movePointers = movePointers || false,
const movePointers = opt_movePointers || false; bytePtr = this.bytePtr,
let bytes = this.bytes; bitPtr = this.bitPtr,
let bytePtr = this.bytePtr; result = 0,
let bitPtr = this.bitPtr; bytes = this.bytes;
let result = 0;
// keep going until we have no more bits left to peek at // keep going until we have no more bits left to peek at
while (num > 0) { // TODO: Consider putting all bits from bytes we will need into a variable and then
// We overflowed the stream, so just return the bits we got. // shifting/masking it to just extract the bits we want.
// This could be considerably faster when reading more than 3 or 4 bits at a time.
while (n > 0) {
if (bytePtr >= bytes.length) { if (bytePtr >= bytes.length) {
break; throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" +
bytes.length + ", bitPtr=" + bitPtr;
return -1;
} }
const numBitsLeftInThisByte = (8 - bitPtr); var numBitsLeftInThisByte = (8 - bitPtr);
if (num >= numBitsLeftInThisByte) { if (n >= numBitsLeftInThisByte) {
result <<= numBitsLeftInThisByte; result <<= numBitsLeftInThisByte;
result |= (BITMASK[numBitsLeftInThisByte] & bytes[bytePtr]); result |= (BITMASK[numBitsLeftInThisByte] & bytes[bytePtr]);
bytePtr++; bytePtr++;
bitPtr = 0; bitPtr = 0;
num -= numBitsLeftInThisByte; n -= numBitsLeftInThisByte;
} else { }
result <<= num; else {
const numBits = 8 - num - bitPtr; result <<= n;
result |= ((bytes[bytePtr] & (BITMASK[num] << numBits)) >> numBits); result |= ((bytes[bytePtr] & (BITMASK[n] << (8 - n - bitPtr))) >> (8 - n - bitPtr));
bitPtr += num; bitPtr += n;
break; n = 0;
} }
} }
if (movePointers) { if (movePointers) {
this.bitPtr = bitPtr; this.bitPtr = bitPtr;
this.bytePtr = bytePtr; this.bytePtr = bytePtr;
this.bitsRead_ += NUM;
} }
return result; return result;
} };
/** /**
* Peek at 16 bits from current position in the buffer. * Peek at 16 bits from current position in the buffer.
@ -203,86 +174,62 @@ bitjs.io.BitStream = class {
* Taken from getbits.hpp in unrar. * Taken from getbits.hpp in unrar.
* TODO: Move this out of BitStream and into unrar. * TODO: Move this out of BitStream and into unrar.
*/ */
getBits() { bitjs.io.BitStream.prototype.getBits = function() {
return (((((this.bytes[this.bytePtr] & 0xff) << 16) + return (((((this.bytes[this.bytePtr] & 0xff) << 16) +
((this.bytes[this.bytePtr+1] & 0xff) << 8) + ((this.bytes[this.bytePtr+1] & 0xff) << 8) +
((this.bytes[this.bytePtr+2] & 0xff))) >>> (8-this.bitPtr)) & 0xffff); ((this.bytes[this.bytePtr+2] & 0xff))) >>> (8-this.bitPtr)) & 0xffff);
} };
/** /**
* Reads n bits out of the stream, consuming them (moving the bit pointer). * Reads n bits out of the stream, consuming them (moving the bit pointer).
* @param {number} n The number of bits to read. Must be a positive integer. * @param {number} n The number of bits to read.
* @return {number} The read bits, as an unsigned number. * @return {number} The read bits, as an unsigned number.
*/ */
readBits(n) { bitjs.io.BitStream.prototype.readBits = function(n) {
return this.peekBits(n, true); return this.peekBits(n, true);
} };
/** /**
* This returns n bytes as a sub-array, advancing the pointer if movePointers * This returns n bytes as a sub-array, advancing the pointer if movePointers
* is true. Only use this for uncompressed blocks as this throws away remaining * is true. Only use this for uncompressed blocks as this throws away remaining
* bits in the current byte. * bits in the current byte.
* @param {number} n The number of bytes to peek. Must be a positive integer. * @param {number} n The number of bytes to peek.
* @param {boolean=} movePointers Whether to move the pointer, defaults false. * @param {boolean=} movePointers Whether to move the pointer, defaults false.
* @return {Uint8Array} The subarray. * @return {Uint8Array} The subarray.
*/ */
peekBytes(n, opt_movePointers) { bitjs.io.BitStream.prototype.peekBytes = function(n, movePointers) {
const num = parseInt(n, 10); if (n <= 0 || typeof n != typeof 1) {
if (n !== num || num < 0) { return 0;
throw 'Error! Called peekBytes() with a non-positive integer: ' + n;
} else if (num === 0) {
return new Uint8Array();
} }
// Flush bits until we are byte-aligned.
// from http://tools.ietf.org/html/rfc1951#page-11 // from http://tools.ietf.org/html/rfc1951#page-11
// "Any bits of input up to the next byte boundary are ignored." // "Any bits of input up to the next byte boundary are ignored."
while (this.bitPtr != 0) { while (this.bitPtr != 0) {
this.readBits(1); this.readBits(1);
} }
const numBytesLeft = this.getNumBitsLeft() / 8; var movePointers = movePointers || false;
if (num > numBytesLeft) { var bytePtr = this.bytePtr,
throw 'Error! Overflowed the bit stream! n=' + num + ', bytePtr=' + this.bytePtr + bitPtr = this.bitPtr;
', bytes.length=' + this.bytes.length + ', bitPtr=' + this.bitPtr;
}
const movePointers = opt_movePointers || false;
const result = new Uint8Array(num);
let bytes = this.bytes;
let ptr = this.bytePtr;
let bytesLeftToCopy = num;
while (bytesLeftToCopy > 0) {
const bytesLeftInStream = bytes.length - ptr;
const sourceLength = Math.min(bytesLeftToCopy, bytesLeftInStream);
result.set(bytes.subarray(ptr, ptr + sourceLength), num - bytesLeftToCopy);
ptr += sourceLength;
// Overflowed the stream, just return what we got.
if (ptr >= bytes.length) {
break;
}
bytesLeftToCopy -= sourceLength; var result = this.bytes.subarray(bytePtr, bytePtr + n);
}
if (movePointers) { if (movePointers) {
this.bytePtr += num; this.bytePtr += n;
this.bitsRead_ += (num * 8);
} }
return result; return result;
} };
/** /**
* @param {number} n The number of bytes to read. * @param {number} n The number of bytes to read.
* @return {Uint8Array} The subarray. * @return {Uint8Array} The subarray.
*/ */
readBytes(n) { bitjs.io.BitStream.prototype.readBytes = function(n) {
return this.peekBytes(n, true); return this.peekBytes(n, true);
} };
}
// mask for getting N number of bits (0-8) })();
bitjs.io.BitStream.BITMASK = [0, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF ];

@ -12,39 +12,41 @@
var bitjs = bitjs || {}; var bitjs = bitjs || {};
bitjs.io = bitjs.io || {}; bitjs.io = bitjs.io || {};
(function() {
/** /**
* A write-only Byte buffer which uses a Uint8 Typed Array as a backing store. * A write-only Byte buffer which uses a Uint8 Typed Array as a backing store.
*/
bitjs.io.ByteBuffer = class {
/**
* @param {number} numBytes The number of bytes to allocate. * @param {number} numBytes The number of bytes to allocate.
* @constructor
*/ */
constructor(numBytes) { bitjs.io.ByteBuffer = function(numBytes) {
if (typeof numBytes != typeof 1 || numBytes <= 0) { if (typeof numBytes != typeof 1 || numBytes <= 0) {
throw "Error! ByteBuffer initialized with '" + numBytes + "'"; throw "Error! ByteBuffer initialized with '" + numBytes + "'";
} }
this.data = new Uint8Array(numBytes); this.data = new Uint8Array(numBytes);
this.ptr = 0; this.ptr = 0;
} };
/** /**
* @param {number} b The byte to insert. * @param {number} b The byte to insert.
*/ */
insertByte(b) { bitjs.io.ByteBuffer.prototype.insertByte = function(b) {
// TODO: throw if byte is invalid? // TODO: throw if byte is invalid?
this.data[this.ptr++] = b; this.data[this.ptr++] = b;
} };
/** /**
* @param {Array.<number>|Uint8Array|Int8Array} bytes The bytes to insert. * @param {Array.<number>|Uint8Array|Int8Array} bytes The bytes to insert.
*/ */
insertBytes(bytes) { bitjs.io.ByteBuffer.prototype.insertBytes = function(bytes) {
// TODO: throw if bytes is invalid? // TODO: throw if bytes is invalid?
this.data.set(bytes, this.ptr); this.data.set(bytes, this.ptr);
this.ptr += bytes.length; this.ptr += bytes.length;
} };
/** /**
* Writes an unsigned number into the next n bytes. If the number is too large * Writes an unsigned number into the next n bytes. If the number is too large
@ -52,8 +54,8 @@ bitjs.io.ByteBuffer = class {
* @param {number} num The unsigned number to write. * @param {number} num The unsigned number to write.
* @param {number} numBytes The number of bytes to write the number into. * @param {number} numBytes The number of bytes to write the number into.
*/ */
writeNumber(num, numBytes) { bitjs.io.ByteBuffer.prototype.writeNumber = function(num, numBytes) {
if (numBytes < 1 || !numBytes) { if (numBytes < 1) {
throw 'Trying to write into too few bytes: ' + numBytes; throw 'Trying to write into too few bytes: ' + numBytes;
} }
if (num < 0) { if (num < 0) {
@ -65,15 +67,16 @@ bitjs.io.ByteBuffer = class {
} }
// Roll 8-bits at a time into an array of bytes. // Roll 8-bits at a time into an array of bytes.
const bytes = []; var bytes = [];
while (numBytes-- > 0) { while (numBytes-- > 0) {
const eightBits = num & 255; var eightBits = num & 255;
bytes.push(eightBits); bytes.push(eightBits);
num >>= 8; num >>= 8;
} }
this.insertBytes(bytes); this.insertBytes(bytes);
} };
/** /**
* Writes a signed number into the next n bytes. If the number is too large * Writes a signed number into the next n bytes. If the number is too large
@ -81,37 +84,39 @@ bitjs.io.ByteBuffer = class {
* @param {number} num The signed number to write. * @param {number} num The signed number to write.
* @param {number} numBytes The number of bytes to write the number into. * @param {number} numBytes The number of bytes to write the number into.
*/ */
writeSignedNumber(num, numBytes) { bitjs.io.ByteBuffer.prototype.writeSignedNumber = function(num, numBytes) {
if (numBytes < 1) { if (numBytes < 1) {
throw 'Trying to write into too few bytes: ' + numBytes; throw 'Trying to write into too few bytes: ' + numBytes;
} }
const HALF = Math.pow(2, (numBytes * 8) - 1); var HALF = Math.pow(2, (numBytes * 8) - 1);
if (num >= HALF || num < -HALF) { if (num >= HALF || num < -HALF) {
throw 'Trying to write ' + num + ' into only ' + numBytes + ' bytes'; throw 'Trying to write ' + num + ' into only ' + numBytes + ' bytes';
} }
// Roll 8-bits at a time into an array of bytes. // Roll 8-bits at a time into an array of bytes.
const bytes = []; var bytes = [];
while (numBytes-- > 0) { while (numBytes-- > 0) {
const eightBits = num & 255; var eightBits = num & 255;
bytes.push(eightBits); bytes.push(eightBits);
num >>= 8; num >>= 8;
} }
this.insertBytes(bytes); this.insertBytes(bytes);
} };
/** /**
* @param {string} str The ASCII string to write. * @param {string} str The ASCII string to write.
*/ */
writeASCIIString(str) { bitjs.io.ByteBuffer.prototype.writeASCIIString = function(str) {
for (let i = 0; i < str.length; ++i) { for (var i = 0; i < str.length; ++i) {
const curByte = str.charCodeAt(i); var curByte = str.charCodeAt(i);
if (curByte < 0 || curByte > 255) { if (curByte < 0 || curByte > 255) {
throw 'Trying to write a non-ASCII string!'; throw 'Trying to write a non-ASCII string!';
} }
this.insertByte(curByte); this.insertByte(curByte);
} }
}; };
}
})();

@ -12,297 +12,153 @@
var bitjs = bitjs || {}; var bitjs = bitjs || {};
bitjs.io = bitjs.io || {}; bitjs.io = bitjs.io || {};
(function() {
/** /**
* This object allows you to peek and consume bytes as numbers and strings out * This object allows you to peek and consume bytes as numbers and strings
* of a stream. More bytes can be pushed into the back of the stream via the * out of an ArrayBuffer. In this buffer, everything must be byte-aligned.
* push() method. *
*/
bitjs.io.ByteStream = class {
/**
* @param {ArrayBuffer} ab The ArrayBuffer object. * @param {ArrayBuffer} ab The ArrayBuffer object.
* @param {number=} opt_offset The offset into the ArrayBuffer * @param {number=} opt_offset The offset into the ArrayBuffer
* @param {number=} opt_length The length of this BitStream * @param {number=} opt_length The length of this BitStream
* @constructor
*/ */
constructor(ab, opt_offset, opt_length) { bitjs.io.ByteStream = function(ab, opt_offset, opt_length) {
if (!(ab instanceof ArrayBuffer)) { var offset = opt_offset || 0;
throw 'Error! BitArray constructed with an invalid ArrayBuffer object'; var length = opt_length || ab.byteLength;
}
const offset = opt_offset || 0;
const length = opt_length || ab.byteLength;
/**
* The current page of bytes in the stream.
* @type {Uint8Array}
* @private
*/
this.bytes = new Uint8Array(ab, offset, length); this.bytes = new Uint8Array(ab, offset, length);
/**
* The next pages of bytes in the stream.
* @type {Array<Uint8Array>}
* @private
*/
this.pages_ = [];
/**
* The byte in the current page that we will read next.
* @type {Number}
* @private
*/
this.ptr = 0; this.ptr = 0;
};
/**
* An ever-increasing number.
* @type {Number}
* @private
*/
this.bytesRead_ = 0;
}
/**
* Returns how many bytes have been read in the stream since the beginning of time.
*/
getNumBytesRead() {
return this.bytesRead_;
}
/**
* Returns how many bytes are currently in the stream left to be read.
*/
getNumBytesLeft() {
const bytesInCurrentPage = (this.bytes.byteLength - this.ptr);
return this.pages_.reduce((acc, arr) => acc + arr.length, bytesInCurrentPage);
}
/**
* Move the pointer ahead n bytes. If the pointer is at the end of the current array
* of bytes and we have another page of bytes, point at the new page. This is a private
* method, no validation is done.
* @param {number} n Number of bytes to increment.
* @private
*/
movePointer_(n) {
this.ptr += n;
this.bytesRead_ += n;
while (this.ptr >= this.bytes.length && this.pages_.length > 0) {
this.ptr -= this.bytes.length;
this.bytes = this.pages_.shift();
}
}
/** /**
* Peeks at the next n bytes as an unsigned number but does not advance the * Peeks at the next n bytes as an unsigned number but does not advance the
* pointer. * pointer
* @param {number} n The number of bytes to peek at. Must be a positive integer. * TODO: This apparently cannot read more than 4 bytes as a number?
* @param {number} n The number of bytes to peek at.
* @return {number} The n bytes interpreted as an unsigned number. * @return {number} The n bytes interpreted as an unsigned number.
*/ */
peekNumber(n) { bitjs.io.ByteStream.prototype.peekNumber = function(n) {
const num = parseInt(n, 10); // TODO: return error if n would go past the end of the stream?
if (n !== num || num < 0) { if (n <= 0 || typeof n != typeof 1)
throw 'Error! Called peekNumber() with a non-positive integer'; return -1;
} else if (num === 0) {
return 0;
}
if (n > 4) { var result = 0;
throw 'Error! Called peekNumber(' + n + // read from last byte to first byte and roll them in
') but this method can only reliably read numbers up to 4 bytes long'; var curByte = this.ptr + n - 1;
while (curByte >= this.ptr) {
result <<= 8;
result |= this.bytes[curByte];
--curByte;
} }
if (this.getNumBytesLeft() < num) {
throw 'Error! Overflowed the byte stream while peekNumber()! n=' + num +
', ptr=' + this.ptr + ', bytes.length=' + this.getNumBytesLeft();
}
let result = 0;
let curPage = this.bytes;
let pageIndex = 0;
let ptr = this.ptr;
for (let i = 0; i < num; ++i) {
result |= (curPage[ptr++] << (i * 8));
if (ptr >= curPage.length) {
curPage = this.pages_[pageIndex++];
ptr = 0;
}
}
return result; return result;
} };
/** /**
* Returns the next n bytes as an unsigned number (or -1 on error) * Returns the next n bytes as an unsigned number (or -1 on error)
* and advances the stream pointer n bytes. * and advances the stream pointer n bytes.
* @param {number} n The number of bytes to read. Must be a positive integer. * @param {number} n The number of bytes to read.
* @return {number} The n bytes interpreted as an unsigned number. * @return {number} The n bytes interpreted as an unsigned number.
*/ */
readNumber(n) { bitjs.io.ByteStream.prototype.readNumber = function(n) {
const num = this.peekNumber(n); var num = this.peekNumber( n );
this.movePointer_(n); this.ptr += n;
return num; return num;
} };
/** /**
* Returns the next n bytes as a signed number but does not advance the * Returns the next n bytes as a signed number but does not advance the
* pointer. * pointer.
* @param {number} n The number of bytes to read. Must be a positive integer. * @param {number} n The number of bytes to read.
* @return {number} The bytes interpreted as a signed number. * @return {number} The bytes interpreted as a signed number.
*/ */
peekSignedNumber(n) { bitjs.io.ByteStream.prototype.peekSignedNumber = function(n) {
let num = this.peekNumber(n); var num = this.peekNumber(n);
const HALF = Math.pow(2, (n * 8) - 1); var HALF = Math.pow(2, (n * 8) - 1);
const FULL = HALF * 2; var FULL = HALF * 2;
if (num >= HALF) num -= FULL; if (num >= HALF) num -= FULL;
return num; return num;
} };
/** /**
* Returns the next n bytes as a signed number and advances the stream pointer. * Returns the next n bytes as a signed number and advances the stream pointer.
* @param {number} n The number of bytes to read. Must be a positive integer. * @param {number} n The number of bytes to read.
* @return {number} The bytes interpreted as a signed number. * @return {number} The bytes interpreted as a signed number.
*/ */
readSignedNumber(n) { bitjs.io.ByteStream.prototype.readSignedNumber = function(n) {
const num = this.peekSignedNumber(n); var num = this.peekSignedNumber(n);
this.movePointer_(n); this.ptr += n;
return num; return num;
} };
/** /**
* This returns n bytes as a sub-array, advancing the pointer if movePointers * This returns n bytes as a sub-array, advancing the pointer if movePointers
* is true. * is true.
* @param {number} n The number of bytes to read. Must be a positive integer. * @param {number} n The number of bytes to read.
* @param {boolean} movePointers Whether to move the pointers. * @param {boolean} movePointers Whether to move the pointers.
* @return {Uint8Array} The subarray. * @return {Uint8Array} The subarray.
*/ */
peekBytes(n, movePointers) { bitjs.io.ByteStream.prototype.peekBytes = function(n, movePointers) {
const num = parseInt(n, 10); if (n <= 0 || typeof n != typeof 1) {
if (n !== num || num < 0) { return null;
throw 'Error! Called peekBytes() with a non-positive integer';
} else if (num === 0) {
return new Uint8Array();
} }
const totalBytesLeft = this.getNumBytesLeft(); var result = this.bytes.subarray(this.ptr, this.ptr + n);
if (num > totalBytesLeft) {
throw 'Error! Overflowed the byte stream during peekBytes! n=' + num +
', ptr=' + this.ptr + ', bytes.length=' + this.getNumBytesLeft();
}
const result = new Uint8Array(num);
let curPage = this.bytes;
let ptr = this.ptr;
let bytesLeftToCopy = num;
let pageIndex = 0;
while (bytesLeftToCopy > 0) {
const bytesLeftInPage = curPage.length - ptr;
const sourceLength = Math.min(bytesLeftToCopy, bytesLeftInPage);
result.set(curPage.subarray(ptr, ptr + sourceLength), num - bytesLeftToCopy);
ptr += sourceLength;
if (ptr >= curPage.length) {
curPage = this.pages_[pageIndex++];
ptr = 0;
}
bytesLeftToCopy -= sourceLength;
}
if (movePointers) { if (movePointers) {
this.movePointer_(num); this.ptr += n;
} }
return result; return result;
} };
/** /**
* Reads the next n bytes as a sub-array. * Reads the next n bytes as a sub-array.
* @param {number} n The number of bytes to read. Must be a positive integer. * @param {number} n The number of bytes to read.
* @return {Uint8Array} The subarray. * @return {Uint8Array} The subarray.
*/ */
readBytes(n) { bitjs.io.ByteStream.prototype.readBytes = function(n) {
return this.peekBytes(n, true); return this.peekBytes(n, true);
} };
/** /**
* Peeks at the next n bytes as an ASCII string but does not advance the pointer. * Peeks at the next n bytes as a string but does not advance the pointer.
* @param {number} n The number of bytes to peek at. Must be a positive integer. * @param {number} n The number of bytes to peek at.
* @return {string} The next n bytes as a string. * @return {string} The next n bytes as a string.
*/ */
peekString(n) { bitjs.io.ByteStream.prototype.peekString = function(n) {
const num = parseInt(n, 10); if (n <= 0 || typeof n != typeof 1) {
if (n !== num || num < 0) { return "";
throw 'Error! Called peekString() with a non-positive integer';
} else if (num === 0) {
return '';
} }
const totalBytesLeft = this.getNumBytesLeft(); var result = "";
if (num > totalBytesLeft) { for (var p = this.ptr, end = this.ptr + n; p < end; ++p) {
throw 'Error! Overflowed the byte stream while peekString()! n=' + num + result += String.fromCharCode(this.bytes[p]);
', ptr=' + this.ptr + ', bytes.length=' + this.getNumBytesLeft();
}
let result = new Array(num);
let curPage = this.bytes;
let pageIndex = 0;
let ptr = this.ptr;
for (let i = 0; i < num; ++i) {
result[i] = String.fromCharCode(curPage[ptr++]);
if (ptr >= curPage.length) {
curPage = this.pages_[pageIndex++];
ptr = 0;
}
} }
return result;
};
return result.join('');
}
/** /**
* Returns the next n bytes as an ASCII string and advances the stream pointer * Returns the next n bytes as an ASCII string and advances the stream pointer
* n bytes. * n bytes.
* @param {number} n The number of bytes to read. Must be a positive integer. * @param {number} n The number of bytes to read.
* @return {string} The next n bytes as a string. * @return {string} The next n bytes as a string.
*/ */
readString(n) { bitjs.io.ByteStream.prototype.readString = function(n) {
const strToReturn = this.peekString(n); var strToReturn = this.peekString(n);
this.movePointer_(n); this.ptr += n;
return strToReturn; return strToReturn;
} };
/**
* Feeds more bytes into the back of the stream.
* @param {ArrayBuffer} ab
*/
push(ab) {
if (!(ab instanceof ArrayBuffer)) {
throw 'Error! ByteStream.push() called with an invalid ArrayBuffer object';
}
this.pages_.push(new Uint8Array(ab));
// If the pointer is at the end of the current page of bytes, this will advance
// to the next page.
this.movePointer_(0);
}
/** })();
* Creates a new ByteStream from this ByteStream that can be read / peeked.
* @return {bitjs.io.ByteStream} A clone of this ByteStream.
*/
tee() {
const clone = new bitjs.io.ByteStream(this.bytes.buffer);
clone.bytes = this.bytes;
clone.ptr = this.ptr;
clone.pages_ = this.pages_.slice();
clone.bytesRead_ = this.bytesRead_;
return clone;
}
}

@ -160,7 +160,7 @@ function initProgressClick() {
function loadFromArrayBuffer(ab) { function loadFromArrayBuffer(ab) {
var start = (new Date).getTime(); var start = (new Date).getTime();
var h = new Uint8Array(ab, 0, 10); var h = new Uint8Array(ab, 0, 10);
var pathToBitJS = "../../static/js/"; var pathToBitJS = "../../static/js/archive/";
if (h[0] === 0x52 && h[1] === 0x61 && h[2] === 0x72 && h[3] === 0x21) { //Rar! if (h[0] === 0x52 && h[1] === 0x61 && h[2] === 0x72 && h[3] === 0x21) { //Rar!
unarchiver = new bitjs.archive.Unrarrer(ab, pathToBitJS); unarchiver = new bitjs.archive.Unrarrer(ab, pathToBitJS);
} else if (h[0] === 80 && h[1] === 75) { //PK (Zip) } else if (h[0] === 80 && h[1] === 75) { //PK (Zip)

Loading…
Cancel
Save