mirror of
https://github.com/codedread/bitjs
synced 2025-10-04 18:19:15 +02:00
Convert to ES6 classes
This commit is contained in:
codedread
parent
639a23e69b
commit
14abef20d6
8 changed files with 1385 additions and 1415 deletions
|
|
@ -11,65 +11,22 @@
|
||||||
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) {
|
|
||||||
const 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));
|
|
||||||
}
|
|
||||||
|
|
||||||
const args = Array.prototype.slice.call(arguments, 2);
|
|
||||||
let foundCaller = false;
|
|
||||||
for (let 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.
|
||||||
*
|
|
||||||
* @param {string} type The event type.
|
|
||||||
* @constructor
|
|
||||||
*/
|
*/
|
||||||
bitjs.archive.UnarchiveEvent = function(type) {
|
bitjs.archive.UnarchiveEvent = class {
|
||||||
/**
|
/**
|
||||||
* The event type.
|
* @param {string} type The event type.
|
||||||
*
|
|
||||||
* @type {string}
|
|
||||||
*/
|
*/
|
||||||
this.type = type;
|
constructor(type) {
|
||||||
};
|
/**
|
||||||
|
* The event type.
|
||||||
|
*
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The UnarchiveEvent types.
|
* The UnarchiveEvent types.
|
||||||
|
|
@ -85,78 +42,101 @@ bitjs.archive.UnarchiveEvent.Type = {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Useful for passing info up to the client (for debugging).
|
* Useful for passing info up to the client (for debugging).
|
||||||
*
|
|
||||||
* @param {string} msg The info message.
|
|
||||||
*/
|
*/
|
||||||
bitjs.archive.UnarchiveInfoEvent = function(msg) {
|
bitjs.archive.UnarchiveInfoEvent = class extends bitjs.archive.UnarchiveEvent {
|
||||||
bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.INFO);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The information message.
|
* @param {string} msg The info message.
|
||||||
*
|
|
||||||
* @type {string}
|
|
||||||
*/
|
*/
|
||||||
this.msg = msg;
|
constructor(msg) {
|
||||||
};
|
super(bitjs.archive.UnarchiveEvent.Type.INFO);
|
||||||
bitjs.inherits(bitjs.archive.UnarchiveInfoEvent, bitjs.archive.UnarchiveEvent);
|
|
||||||
|
/**
|
||||||
|
* The information message.
|
||||||
|
*
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
this.msg = msg;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An unrecoverable error has occured.
|
* An unrecoverable error has occured.
|
||||||
*
|
|
||||||
* @param {string} msg The error message.
|
|
||||||
*/
|
*/
|
||||||
bitjs.archive.UnarchiveErrorEvent = function(msg) {
|
bitjs.archive.UnarchiveErrorEvent = class extends bitjs.archive.UnarchiveEvent {
|
||||||
bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.ERROR);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The information message.
|
* @param {string} msg The error message.
|
||||||
*
|
|
||||||
* @type {string}
|
|
||||||
*/
|
*/
|
||||||
this.msg = msg;
|
constructor(msg) {
|
||||||
};
|
super(bitjs.archive.UnarchiveEvent.Type.ERROR);
|
||||||
bitjs.inherits(bitjs.archive.UnarchiveErrorEvent, bitjs.archive.UnarchiveEvent);
|
|
||||||
|
/**
|
||||||
|
* The information message.
|
||||||
|
*
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
this.msg = msg;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start event.
|
* Start event.
|
||||||
*
|
|
||||||
* @param {string} msg The info message.
|
|
||||||
*/
|
*/
|
||||||
bitjs.archive.UnarchiveStartEvent = function() {
|
bitjs.archive.UnarchiveStartEvent = class extends bitjs.archive.UnarchiveEvent {
|
||||||
bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.START);
|
constructor() {
|
||||||
};
|
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 = function() {
|
bitjs.archive.UnarchiveFinishEvent = class extends bitjs.archive.UnarchiveEvent {
|
||||||
bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.FINISH);
|
constructor() {
|
||||||
};
|
super(bitjs.archive.UnarchiveEvent.Type.FINISH);
|
||||||
bitjs.inherits(bitjs.archive.UnarchiveFinishEvent, bitjs.archive.UnarchiveEvent);
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Progress event.
|
* Progress event.
|
||||||
*/
|
*/
|
||||||
bitjs.archive.UnarchiveProgressEvent = function(
|
bitjs.archive.UnarchiveProgressEvent = class extends bitjs.archive.UnarchiveEvent {
|
||||||
currentFilename,
|
/**
|
||||||
currentFileNumber,
|
* @param {string} currentFilename
|
||||||
currentBytesUnarchivedInFile,
|
* @param {number} currentFileNumber
|
||||||
currentBytesUnarchived,
|
* @param {number} currentBytesUnarchivedInFile
|
||||||
totalUncompressedBytesInArchive,
|
* @param {number} currentBytesUnarchived
|
||||||
totalFilesInArchive) {
|
* @param {number} totalUncompressedBytesInArchive
|
||||||
bitjs.base(this, bitjs.archive.UnarchiveEvent.Type.PROGRESS);
|
* @param {number} totalFilesInArchive
|
||||||
|
*/
|
||||||
|
constructor(currentFilename, currentFileNumber, currentBytesUnarchivedInFile,
|
||||||
|
currentBytesUnarchived, totalUncompressedBytesInArchive, totalFilesInArchive) {
|
||||||
|
super(bitjs.archive.UnarchiveEvent.Type.PROGRESS);
|
||||||
|
|
||||||
this.currentFilename = currentFilename;
|
this.currentFilename = currentFilename;
|
||||||
this.currentFileNumber = currentFileNumber;
|
this.currentFileNumber = currentFileNumber;
|
||||||
this.currentBytesUnarchivedInFile = currentBytesUnarchivedInFile;
|
this.currentBytesUnarchivedInFile = currentBytesUnarchivedInFile;
|
||||||
this.totalFilesInArchive = totalFilesInArchive;
|
this.totalFilesInArchive = totalFilesInArchive;
|
||||||
this.currentBytesUnarchived = currentBytesUnarchived;
|
this.currentBytesUnarchived = currentBytesUnarchived;
|
||||||
this.totalUncompressedBytesInArchive = totalUncompressedBytesInArchive;
|
this.totalUncompressedBytesInArchive = totalUncompressedBytesInArchive;
|
||||||
};
|
}
|
||||||
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
|
||||||
|
|
@ -169,186 +149,177 @@ bitjs.inherits(bitjs.archive.UnarchiveProgressEvent, bitjs.archive.UnarchiveEven
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* Extract event.
|
|
||||||
*/
|
|
||||||
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.
|
* Base class for all Unarchivers.
|
||||||
*
|
|
||||||
* @param {ArrayBuffer} arrayBuffer The Array Buffer.
|
|
||||||
* @param {string} opt_pathToBitJS Optional string for where the BitJS files are located.
|
|
||||||
* @constructor
|
|
||||||
*/
|
*/
|
||||||
bitjs.archive.Unarchiver = function(arrayBuffer, opt_pathToBitJS) {
|
bitjs.archive.Unarchiver = class {
|
||||||
/**
|
/**
|
||||||
* The ArrayBuffer object.
|
* @param {ArrayBuffer} arrayBuffer The Array Buffer.
|
||||||
* @type {ArrayBuffer}
|
* @param {string} opt_pathToBitJS Optional string for where the BitJS files are located.
|
||||||
* @protected
|
|
||||||
*/
|
*/
|
||||||
this.ab = arrayBuffer;
|
constructor(arrayBuffer, opt_pathToBitJS) {
|
||||||
|
/**
|
||||||
|
* The ArrayBuffer object.
|
||||||
|
* @type {ArrayBuffer}
|
||||||
|
* @protected
|
||||||
|
*/
|
||||||
|
this.ab = arrayBuffer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The path to the BitJS files.
|
||||||
|
* @type {string}
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
this.pathToBitJS_ = opt_pathToBitJS || '/';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A map from event type to an array of listeners.
|
||||||
|
* @type {Map.<string, Array>}
|
||||||
|
*/
|
||||||
|
this.listeners_ = {};
|
||||||
|
for (let type in bitjs.archive.UnarchiveEvent.Type) {
|
||||||
|
this.listeners_[bitjs.archive.UnarchiveEvent.Type[type]] = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Private web worker initialized during start().
|
||||||
|
* @type {Worker}
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
this.worker_ = null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The path to the BitJS files.
|
* This method must be overridden by the subclass to return the script filename.
|
||||||
* @type {string}
|
* @return {string} The script filename.
|
||||||
|
* @protected.
|
||||||
|
*/
|
||||||
|
getScriptFileName() {
|
||||||
|
throw 'Subclasses of AbstractUnarchiver must overload getScriptFileName()';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds an event listener for UnarchiveEvents.
|
||||||
|
*
|
||||||
|
* @param {string} Event type.
|
||||||
|
* @param {function} An event handler function.
|
||||||
|
*/
|
||||||
|
addEventListener(type, listener) {
|
||||||
|
if (type in this.listeners_) {
|
||||||
|
if (this.listeners_[type].indexOf(listener) == -1) {
|
||||||
|
this.listeners_[type].push(listener);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes an event listener.
|
||||||
|
*
|
||||||
|
* @param {string} Event type.
|
||||||
|
* @param {EventListener|function} An event listener or handler function.
|
||||||
|
*/
|
||||||
|
removeEventListener(type, listener) {
|
||||||
|
if (type in this.listeners_) {
|
||||||
|
const index = this.listeners_[type].indexOf(listener);
|
||||||
|
if (index != -1) {
|
||||||
|
this.listeners_[type].splice(index, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Receive an event and pass it to the listener functions.
|
||||||
|
*
|
||||||
|
* @param {bitjs.archive.UnarchiveEvent} e
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
this.pathToBitJS_ = opt_pathToBitJS || '/';
|
handleWorkerEvent_(e) {
|
||||||
|
if ((e instanceof bitjs.archive.UnarchiveEvent || e.type) &&
|
||||||
|
this.listeners_[e.type] instanceof Array) {
|
||||||
|
this.listeners_[e.type].forEach(function (listener) { listener(e) });
|
||||||
|
if (e.type == bitjs.archive.UnarchiveEvent.Type.FINISH) {
|
||||||
|
this.worker_.terminate();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A map from event type to an array of listeners.
|
* Starts the unarchive in a separate Web Worker thread and returns immediately.
|
||||||
* @type {Map.<string, Array>}
|
|
||||||
*/
|
*/
|
||||||
this.listeners_ = {};
|
start() {
|
||||||
for (let type in bitjs.archive.UnarchiveEvent.Type) {
|
const me = this;
|
||||||
this.listeners_[bitjs.archive.UnarchiveEvent.Type[type]] = [];
|
const scriptFileName = this.pathToBitJS_ + this.getScriptFileName();
|
||||||
}
|
if (scriptFileName) {
|
||||||
};
|
this.worker_ = new Worker(scriptFileName);
|
||||||
|
|
||||||
/**
|
this.worker_.onerror = function(e) {
|
||||||
* Private web worker initialized during start().
|
console.log('Worker error: message = ' + e.message);
|
||||||
* @type {Worker}
|
throw e;
|
||||||
* @private
|
};
|
||||||
*/
|
|
||||||
bitjs.archive.Unarchiver.prototype.worker_ = null;
|
|
||||||
|
|
||||||
/**
|
this.worker_.onmessage = function(e) {
|
||||||
* This method must be overridden by the subclass to return the script filename.
|
if (typeof e.data == 'string') {
|
||||||
* @return {string} The script filename.
|
// Just log any strings the workers pump our way.
|
||||||
* @protected.
|
console.log(e.data);
|
||||||
*/
|
} else {
|
||||||
bitjs.archive.Unarchiver.prototype.getScriptFileName = function() {
|
// Assume that it is an UnarchiveEvent. Some browsers preserve the 'type'
|
||||||
throw 'Subclasses of AbstractUnarchiver must overload getScriptFileName()';
|
// so that instanceof UnarchiveEvent returns true, but others do not.
|
||||||
};
|
me.handleWorkerEvent_(e.data);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
this.worker_.postMessage({file: this.ab});
|
||||||
* Adds an event listener for UnarchiveEvents.
|
|
||||||
*
|
|
||||||
* @param {string} Event type.
|
|
||||||
* @param {function} An event handler function.
|
|
||||||
*/
|
|
||||||
bitjs.archive.Unarchiver.prototype.addEventListener = function(type, listener) {
|
|
||||||
if (type in this.listeners_) {
|
|
||||||
if (this.listeners_[type].indexOf(listener) == -1) {
|
|
||||||
this.listeners_[type].push(listener);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Removes an event listener.
|
* Terminates the Web Worker for this Unarchiver and returns immediately.
|
||||||
*
|
*/
|
||||||
* @param {string} Event type.
|
stop() {
|
||||||
* @param {EventListener|function} An event listener or handler function.
|
if (this.worker_) {
|
||||||
*/
|
this.worker_.terminate();
|
||||||
bitjs.archive.Unarchiver.prototype.removeEventListener = function(type, listener) {
|
|
||||||
if (type in this.listeners_) {
|
|
||||||
const index = this.listeners_[type].indexOf(listener);
|
|
||||||
if (index != -1) {
|
|
||||||
this.listeners_[type].splice(index, 1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Receive an event and pass it to the listener functions.
|
|
||||||
*
|
|
||||||
* @param {bitjs.archive.UnarchiveEvent} e
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
bitjs.archive.Unarchiver.prototype.handleWorkerEvent_ = function(e) {
|
|
||||||
if ((e instanceof bitjs.archive.UnarchiveEvent || e.type) &&
|
|
||||||
this.listeners_[e.type] instanceof Array) {
|
|
||||||
this.listeners_[e.type].forEach(function (listener) { listener(e) });
|
|
||||||
if (e.type == bitjs.archive.UnarchiveEvent.Type.FINISH) {
|
|
||||||
this.worker_.terminate();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.log(e);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Starts the unarchive in a separate Web Worker thread and returns immediately.
|
|
||||||
*/
|
|
||||||
bitjs.archive.Unarchiver.prototype.start = function() {
|
|
||||||
const me = this;
|
|
||||||
const scriptFileName = this.pathToBitJS_ + this.getScriptFileName();
|
|
||||||
if (scriptFileName) {
|
|
||||||
this.worker_ = new Worker(scriptFileName);
|
|
||||||
|
|
||||||
this.worker_.onerror = function(e) {
|
|
||||||
console.log('Worker error: message = ' + e.message);
|
|
||||||
throw e;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.worker_.onmessage = function(e) {
|
|
||||||
if (typeof e.data == 'string') {
|
|
||||||
// Just log any strings the workers pump our way.
|
|
||||||
console.log(e.data);
|
|
||||||
} else {
|
|
||||||
// Assume that it is an UnarchiveEvent. Some browsers preserve the 'type'
|
|
||||||
// so that instanceof UnarchiveEvent returns true, but others do not.
|
|
||||||
me.handleWorkerEvent_(e.data);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.worker_.postMessage({file: this.ab});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Terminates the Web Worker for this Unarchiver and returns immediately.
|
|
||||||
*/
|
|
||||||
bitjs.archive.Unarchiver.prototype.stop = function() {
|
|
||||||
if (this.worker_) {
|
|
||||||
this.worker_.terminate();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unzipper
|
* Unzipper
|
||||||
* @extends {bitjs.archive.Unarchiver}
|
|
||||||
* @constructor
|
|
||||||
*/
|
*/
|
||||||
bitjs.archive.Unzipper = function(arrayBuffer, opt_pathToBitJS) {
|
bitjs.archive.Unzipper = class extends bitjs.archive.Unarchiver {
|
||||||
bitjs.base(this, arrayBuffer, opt_pathToBitJS);
|
constructor(arrayBuffer, opt_pathToBitJS) {
|
||||||
};
|
super(arrayBuffer, opt_pathToBitJS);
|
||||||
bitjs.inherits(bitjs.archive.Unzipper, bitjs.archive.Unarchiver);
|
}
|
||||||
bitjs.archive.Unzipper.prototype.getScriptFileName = function() { return 'archive/unzip.js' };
|
|
||||||
|
getScriptFileName() { return 'archive/unzip.js'; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unrarrer
|
* Unrarrer
|
||||||
* @extends {bitjs.archive.Unarchiver}
|
|
||||||
* @constructor
|
|
||||||
*/
|
*/
|
||||||
bitjs.archive.Unrarrer = function(arrayBuffer, opt_pathToBitJS) {
|
bitjs.archive.Unrarrer = class extends bitjs.archive.Unarchiver {
|
||||||
bitjs.base(this, arrayBuffer, opt_pathToBitJS);
|
constructor(arrayBuffer, opt_pathToBitJS) {
|
||||||
};
|
super(arrayBuffer, opt_pathToBitJS);
|
||||||
bitjs.inherits(bitjs.archive.Unrarrer, bitjs.archive.Unarchiver);
|
}
|
||||||
bitjs.archive.Unrarrer.prototype.getScriptFileName = function() { return 'archive/unrar.js' };
|
|
||||||
|
getScriptFileName() { return 'archive/unrar.js'; }
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Untarrer
|
* Untarrer
|
||||||
* @extends {bitjs.archive.Unarchiver}
|
* @extends {bitjs.archive.Unarchiver}
|
||||||
* @constructor
|
* @constructor
|
||||||
*/
|
*/
|
||||||
bitjs.archive.Untarrer = function(arrayBuffer, opt_pathToBitJS) {
|
bitjs.archive.Untarrer = class extends bitjs.archive.Unarchiver {
|
||||||
bitjs.base(this, arrayBuffer, opt_pathToBitJS);
|
constructor(arrayBuffer, opt_pathToBitJS) {
|
||||||
};
|
super(arrayBuffer, opt_pathToBitJS);
|
||||||
bitjs.inherits(bitjs.archive.Untarrer, bitjs.archive.Unarchiver);
|
}
|
||||||
bitjs.archive.Untarrer.prototype.getScriptFileName = function() { return 'archive/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
|
||||||
|
|
@ -371,5 +342,3 @@ bitjs.archive.GetUnarchiver = function(ab, opt_pathToBitJS) {
|
||||||
}
|
}
|
||||||
return unarchiver;
|
return unarchiver;
|
||||||
};
|
};
|
||||||
|
|
||||||
})();
|
|
||||||
922
archive/rarvm.js
922
archive/rarvm.js
File diff suppressed because it is too large
Load diff
344
archive/unrar.js
344
archive/unrar.js
|
|
@ -63,156 +63,158 @@ const ENDARC_HEAD = 0x7b;
|
||||||
// ============================================================================================== //
|
// ============================================================================================== //
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {bitjs.io.BitStream} bstream
|
|
||||||
* @constructor
|
|
||||||
*/
|
*/
|
||||||
const RarVolumeHeader = function(bstream) {
|
class RarVolumeHeader {
|
||||||
const headPos = bstream.bytePtr;
|
/**
|
||||||
// byte 1,2
|
* @param {bitjs.io.BitStream} bstream
|
||||||
info("Rar Volume Header @"+bstream.bytePtr);
|
*/
|
||||||
|
constructor(bstream) {
|
||||||
|
const headPos = bstream.bytePtr;
|
||||||
|
// byte 1,2
|
||||||
|
info("Rar Volume Header @"+bstream.bytePtr);
|
||||||
|
|
||||||
this.crc = bstream.readBits(16);
|
this.crc = bstream.readBits(16);
|
||||||
info(" crc=" + this.crc);
|
info(" crc=" + this.crc);
|
||||||
|
|
||||||
// byte 3
|
// byte 3
|
||||||
this.headType = bstream.readBits(8);
|
this.headType = bstream.readBits(8);
|
||||||
info(" headType=" + this.headType);
|
info(" headType=" + this.headType);
|
||||||
|
|
||||||
// Get flags
|
// Get flags
|
||||||
// bytes 4,5
|
// bytes 4,5
|
||||||
this.flags = {};
|
this.flags = {};
|
||||||
this.flags.value = bstream.peekBits(16);
|
this.flags.value = bstream.peekBits(16);
|
||||||
|
|
||||||
info(" flags=" + twoByteValueToHexString(this.flags.value));
|
info(" flags=" + twoByteValueToHexString(this.flags.value));
|
||||||
switch (this.headType) {
|
switch (this.headType) {
|
||||||
case MAIN_HEAD:
|
case MAIN_HEAD:
|
||||||
this.flags.MHD_VOLUME = !!bstream.readBits(1);
|
this.flags.MHD_VOLUME = !!bstream.readBits(1);
|
||||||
this.flags.MHD_COMMENT = !!bstream.readBits(1);
|
this.flags.MHD_COMMENT = !!bstream.readBits(1);
|
||||||
this.flags.MHD_LOCK = !!bstream.readBits(1);
|
this.flags.MHD_LOCK = !!bstream.readBits(1);
|
||||||
this.flags.MHD_SOLID = !!bstream.readBits(1);
|
this.flags.MHD_SOLID = !!bstream.readBits(1);
|
||||||
this.flags.MHD_PACK_COMMENT = !!bstream.readBits(1);
|
this.flags.MHD_PACK_COMMENT = !!bstream.readBits(1);
|
||||||
this.flags.MHD_NEWNUMBERING = this.flags.MHD_PACK_COMMENT;
|
this.flags.MHD_NEWNUMBERING = this.flags.MHD_PACK_COMMENT;
|
||||||
this.flags.MHD_AV = !!bstream.readBits(1);
|
this.flags.MHD_AV = !!bstream.readBits(1);
|
||||||
this.flags.MHD_PROTECT = !!bstream.readBits(1);
|
this.flags.MHD_PROTECT = !!bstream.readBits(1);
|
||||||
this.flags.MHD_PASSWORD = !!bstream.readBits(1);
|
this.flags.MHD_PASSWORD = !!bstream.readBits(1);
|
||||||
this.flags.MHD_FIRSTVOLUME = !!bstream.readBits(1);
|
this.flags.MHD_FIRSTVOLUME = !!bstream.readBits(1);
|
||||||
this.flags.MHD_ENCRYPTVER = !!bstream.readBits(1);
|
this.flags.MHD_ENCRYPTVER = !!bstream.readBits(1);
|
||||||
bstream.readBits(6); // unused
|
bstream.readBits(6); // unused
|
||||||
break;
|
break;
|
||||||
case FILE_HEAD:
|
case FILE_HEAD:
|
||||||
this.flags.LHD_SPLIT_BEFORE = !!bstream.readBits(1); // 0x0001
|
this.flags.LHD_SPLIT_BEFORE = !!bstream.readBits(1); // 0x0001
|
||||||
this.flags.LHD_SPLIT_AFTER = !!bstream.readBits(1); // 0x0002
|
this.flags.LHD_SPLIT_AFTER = !!bstream.readBits(1); // 0x0002
|
||||||
this.flags.LHD_PASSWORD = !!bstream.readBits(1); // 0x0004
|
this.flags.LHD_PASSWORD = !!bstream.readBits(1); // 0x0004
|
||||||
this.flags.LHD_COMMENT = !!bstream.readBits(1); // 0x0008
|
this.flags.LHD_COMMENT = !!bstream.readBits(1); // 0x0008
|
||||||
this.flags.LHD_SOLID = !!bstream.readBits(1); // 0x0010
|
this.flags.LHD_SOLID = !!bstream.readBits(1); // 0x0010
|
||||||
bstream.readBits(3); // unused
|
bstream.readBits(3); // unused
|
||||||
this.flags.LHD_LARGE = !!bstream.readBits(1); // 0x0100
|
this.flags.LHD_LARGE = !!bstream.readBits(1); // 0x0100
|
||||||
this.flags.LHD_UNICODE = !!bstream.readBits(1); // 0x0200
|
this.flags.LHD_UNICODE = !!bstream.readBits(1); // 0x0200
|
||||||
this.flags.LHD_SALT = !!bstream.readBits(1); // 0x0400
|
this.flags.LHD_SALT = !!bstream.readBits(1); // 0x0400
|
||||||
this.flags.LHD_VERSION = !!bstream.readBits(1); // 0x0800
|
this.flags.LHD_VERSION = !!bstream.readBits(1); // 0x0800
|
||||||
this.flags.LHD_EXTTIME = !!bstream.readBits(1); // 0x1000
|
this.flags.LHD_EXTTIME = !!bstream.readBits(1); // 0x1000
|
||||||
this.flags.LHD_EXTFLAGS = !!bstream.readBits(1); // 0x2000
|
this.flags.LHD_EXTFLAGS = !!bstream.readBits(1); // 0x2000
|
||||||
bstream.readBits(2); // unused
|
bstream.readBits(2); // unused
|
||||||
info(" LHD_SPLIT_BEFORE = " + this.flags.LHD_SPLIT_BEFORE);
|
info(" LHD_SPLIT_BEFORE = " + this.flags.LHD_SPLIT_BEFORE);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
bstream.readBits(16);
|
bstream.readBits(16);
|
||||||
}
|
|
||||||
|
|
||||||
// byte 6,7
|
|
||||||
this.headSize = bstream.readBits(16);
|
|
||||||
info(" headSize=" + this.headSize);
|
|
||||||
switch (this.headType) {
|
|
||||||
case MAIN_HEAD:
|
|
||||||
this.highPosAv = bstream.readBits(16);
|
|
||||||
this.posAv = bstream.readBits(32);
|
|
||||||
if (this.flags.MHD_ENCRYPTVER) {
|
|
||||||
this.encryptVer = bstream.readBits(8);
|
|
||||||
}
|
}
|
||||||
info("Found MAIN_HEAD with highPosAv=" + this.highPosAv + ", posAv=" + this.posAv);
|
|
||||||
break;
|
|
||||||
case FILE_HEAD:
|
|
||||||
this.packSize = bstream.readBits(32);
|
|
||||||
this.unpackedSize = bstream.readBits(32);
|
|
||||||
this.hostOS = bstream.readBits(8);
|
|
||||||
this.fileCRC = bstream.readBits(32);
|
|
||||||
this.fileTime = bstream.readBits(32);
|
|
||||||
this.unpVer = bstream.readBits(8);
|
|
||||||
this.method = bstream.readBits(8);
|
|
||||||
this.nameSize = bstream.readBits(16);
|
|
||||||
this.fileAttr = bstream.readBits(32);
|
|
||||||
|
|
||||||
if (this.flags.LHD_LARGE) {
|
// byte 6,7
|
||||||
info("Warning: Reading in LHD_LARGE 64-bit size values");
|
this.headSize = bstream.readBits(16);
|
||||||
this.HighPackSize = bstream.readBits(32);
|
info(" headSize=" + this.headSize);
|
||||||
this.HighUnpSize = bstream.readBits(32);
|
switch (this.headType) {
|
||||||
} else {
|
case MAIN_HEAD:
|
||||||
this.HighPackSize = 0;
|
this.highPosAv = bstream.readBits(16);
|
||||||
this.HighUnpSize = 0;
|
this.posAv = bstream.readBits(32);
|
||||||
if (this.unpackedSize == 0xffffffff) {
|
if (this.flags.MHD_ENCRYPTVER) {
|
||||||
this.HighUnpSize = 0x7fffffff
|
this.encryptVer = bstream.readBits(8);
|
||||||
this.unpackedSize = 0xffffffff;
|
|
||||||
}
|
}
|
||||||
}
|
info("Found MAIN_HEAD with highPosAv=" + this.highPosAv + ", posAv=" + this.posAv);
|
||||||
this.fullPackSize = 0;
|
break;
|
||||||
this.fullUnpackSize = 0;
|
case FILE_HEAD:
|
||||||
this.fullPackSize |= this.HighPackSize;
|
this.packSize = bstream.readBits(32);
|
||||||
this.fullPackSize <<= 32;
|
this.unpackedSize = bstream.readBits(32);
|
||||||
this.fullPackSize |= this.packSize;
|
this.hostOS = bstream.readBits(8);
|
||||||
|
this.fileCRC = bstream.readBits(32);
|
||||||
|
this.fileTime = bstream.readBits(32);
|
||||||
|
this.unpVer = bstream.readBits(8);
|
||||||
|
this.method = bstream.readBits(8);
|
||||||
|
this.nameSize = bstream.readBits(16);
|
||||||
|
this.fileAttr = bstream.readBits(32);
|
||||||
|
|
||||||
// read in filename
|
if (this.flags.LHD_LARGE) {
|
||||||
|
info("Warning: Reading in LHD_LARGE 64-bit size values");
|
||||||
this.filename = bstream.readBytes(this.nameSize);
|
this.HighPackSize = bstream.readBits(32);
|
||||||
let _s = '';
|
this.HighUnpSize = bstream.readBits(32);
|
||||||
for (let _i = 0; _i < this.filename.length; _i++) {
|
} else {
|
||||||
_s += String.fromCharCode(this.filename[_i]);
|
this.HighPackSize = 0;
|
||||||
}
|
this.HighUnpSize = 0;
|
||||||
|
if (this.unpackedSize == 0xffffffff) {
|
||||||
this.filename = _s;
|
this.HighUnpSize = 0x7fffffff
|
||||||
|
this.unpackedSize = 0xffffffff;
|
||||||
if (this.flags.LHD_SALT) {
|
|
||||||
info("Warning: Reading in 64-bit salt value");
|
|
||||||
this.salt = bstream.readBits(64); // 8 bytes
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.flags.LHD_EXTTIME) {
|
|
||||||
// 16-bit flags
|
|
||||||
const extTimeFlags = bstream.readBits(16);
|
|
||||||
|
|
||||||
// this is adapted straight out of arcread.cpp, Archive::ReadHeader()
|
|
||||||
for (let I = 0; I < 4; ++I) {
|
|
||||||
const rmode = extTimeFlags >> ((3 - I) * 4);
|
|
||||||
if ((rmode & 8) == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
if (I != 0)
|
|
||||||
bstream.readBits(16);
|
|
||||||
const count = (rmode & 3);
|
|
||||||
for (let J = 0; J < count; ++J) {
|
|
||||||
bstream.readBits(8);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
this.fullPackSize = 0;
|
||||||
|
this.fullUnpackSize = 0;
|
||||||
|
this.fullPackSize |= this.HighPackSize;
|
||||||
|
this.fullPackSize <<= 32;
|
||||||
|
this.fullPackSize |= this.packSize;
|
||||||
|
|
||||||
|
// read in filename
|
||||||
|
|
||||||
|
this.filename = bstream.readBytes(this.nameSize);
|
||||||
|
let _s = '';
|
||||||
|
for (let _i = 0; _i < this.filename.length; _i++) {
|
||||||
|
_s += String.fromCharCode(this.filename[_i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.filename = _s;
|
||||||
|
|
||||||
|
if (this.flags.LHD_SALT) {
|
||||||
|
info("Warning: Reading in 64-bit salt value");
|
||||||
|
this.salt = bstream.readBits(64); // 8 bytes
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.flags.LHD_EXTTIME) {
|
||||||
|
// 16-bit flags
|
||||||
|
const extTimeFlags = bstream.readBits(16);
|
||||||
|
|
||||||
|
// this is adapted straight out of arcread.cpp, Archive::ReadHeader()
|
||||||
|
for (let I = 0; I < 4; ++I) {
|
||||||
|
const rmode = extTimeFlags >> ((3 - I) * 4);
|
||||||
|
if ((rmode & 8) == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (I != 0)
|
||||||
|
bstream.readBits(16);
|
||||||
|
const count = (rmode & 3);
|
||||||
|
for (let J = 0; J < count; ++J) {
|
||||||
|
bstream.readBits(8);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.flags.LHD_COMMENT) {
|
||||||
|
info("Found a LHD_COMMENT");
|
||||||
|
}
|
||||||
|
|
||||||
|
while (headPos + this.headSize > bstream.bytePtr) {
|
||||||
|
bstream.readBits(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
info("Found FILE_HEAD with packSize=" + this.packSize + ", unpackedSize= " + this.unpackedSize + ", hostOS=" + this.hostOS + ", unpVer=" + this.unpVer + ", method=" + this.method + ", filename=" + this.filename);
|
||||||
|
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
info("Found a header of type 0x" + byteValueToHexString(this.headType));
|
||||||
|
// skip the rest of the header bytes (for now)
|
||||||
|
bstream.readBytes(this.headSize - 7);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.flags.LHD_COMMENT) {
|
|
||||||
info("Found a LHD_COMMENT");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
while (headPos + this.headSize > bstream.bytePtr) {
|
|
||||||
bstream.readBits(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
info("Found FILE_HEAD with packSize=" + this.packSize + ", unpackedSize= " + this.unpackedSize + ", hostOS=" + this.hostOS + ", unpVer=" + this.unpVer + ", method=" + this.method + ", filename=" + this.filename);
|
|
||||||
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
info("Found a header of type 0x" + byteValueToHexString(this.headType));
|
|
||||||
// skip the rest of the header bytes (for now)
|
|
||||||
bstream.readBytes(this.headSize - 7);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
const BLOCK_LZ = 0;
|
const BLOCK_LZ = 0;
|
||||||
const BLOCK_PPM = 1;
|
const BLOCK_PPM = 1;
|
||||||
|
|
@ -1237,43 +1239,49 @@ function unpack(v) {
|
||||||
return rBuffer.data;
|
return rBuffer.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
// bstream is a bit stream
|
/**
|
||||||
const RarLocalFile = function(bstream) {
|
*/
|
||||||
this.header = new RarVolumeHeader(bstream);
|
class RarLocalFile {
|
||||||
this.filename = this.header.filename;
|
/**
|
||||||
|
* @param {bitjs.io.BitStream} bstream
|
||||||
|
*/
|
||||||
|
constructor(bstream) {
|
||||||
|
this.header = new RarVolumeHeader(bstream);
|
||||||
|
this.filename = this.header.filename;
|
||||||
|
|
||||||
if (this.header.headType != FILE_HEAD && this.header.headType != ENDARC_HEAD) {
|
if (this.header.headType != FILE_HEAD && this.header.headType != ENDARC_HEAD) {
|
||||||
this.isValid = false;
|
this.isValid = false;
|
||||||
info("Error! RAR Volume did not include a FILE_HEAD header ");
|
info("Error! RAR Volume did not include a FILE_HEAD header ");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// read in the compressed data
|
// read in the compressed data
|
||||||
this.fileData = null;
|
this.fileData = null;
|
||||||
if (this.header.packSize > 0) {
|
if (this.header.packSize > 0) {
|
||||||
this.fileData = bstream.readBytes(this.header.packSize);
|
this.fileData = bstream.readBytes(this.header.packSize);
|
||||||
this.isValid = true;
|
this.isValid = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
RarLocalFile.prototype.unrar = function() {
|
unrar() {
|
||||||
if (!this.header.flags.LHD_SPLIT_BEFORE) {
|
if (!this.header.flags.LHD_SPLIT_BEFORE) {
|
||||||
// unstore file
|
// unstore file
|
||||||
if (this.header.method == 0x30) {
|
if (this.header.method == 0x30) {
|
||||||
info("Unstore "+this.filename);
|
info("Unstore "+this.filename);
|
||||||
this.isValid = true;
|
this.isValid = true;
|
||||||
|
|
||||||
currentBytesUnarchivedInFile += this.fileData.length;
|
currentBytesUnarchivedInFile += this.fileData.length;
|
||||||
currentBytesUnarchived += this.fileData.length;
|
currentBytesUnarchived += this.fileData.length;
|
||||||
|
|
||||||
// Create a new buffer and copy it over.
|
// Create a new buffer and copy it over.
|
||||||
const len = this.header.packSize;
|
const len = this.header.packSize;
|
||||||
const newBuffer = new bitjs.io.ByteBuffer(len);
|
const newBuffer = new bitjs.io.ByteBuffer(len);
|
||||||
newBuffer.insertBytes(this.fileData);
|
newBuffer.insertBytes(this.fileData);
|
||||||
this.fileData = newBuffer.data;
|
this.fileData = newBuffer.data;
|
||||||
} else {
|
} else {
|
||||||
this.isValid = true;
|
this.isValid = true;
|
||||||
this.fileData = unpack(this);
|
this.fileData = unpack(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
112
archive/untar.js
112
archive/untar.js
|
|
@ -46,66 +46,68 @@ const readCleanString = function(bstr, numBytes) {
|
||||||
return zIndex != -1 ? str.substr(0, zIndex) : str;
|
return zIndex != -1 ? str.substr(0, zIndex) : str;
|
||||||
};
|
};
|
||||||
|
|
||||||
// takes a ByteStream and parses out the local file information
|
class TarLocalFile {
|
||||||
const TarLocalFile = function(bstream) {
|
// takes a ByteStream and parses out the local file information
|
||||||
this.isValid = false;
|
constructor(bstream) {
|
||||||
|
this.isValid = false;
|
||||||
|
|
||||||
// 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);
|
||||||
this.uid = readCleanString(bstream, 8);
|
this.uid = readCleanString(bstream, 8);
|
||||||
this.gid = readCleanString(bstream, 8);
|
this.gid = readCleanString(bstream, 8);
|
||||||
this.size = parseInt(readCleanString(bstream, 12), 8);
|
this.size = parseInt(readCleanString(bstream, 12), 8);
|
||||||
this.mtime = readCleanString(bstream, 12);
|
this.mtime = readCleanString(bstream, 12);
|
||||||
this.chksum = readCleanString(bstream, 8);
|
this.chksum = readCleanString(bstream, 8);
|
||||||
this.typeflag = readCleanString(bstream, 1);
|
this.typeflag = readCleanString(bstream, 1);
|
||||||
this.linkname = readCleanString(bstream, 100);
|
this.linkname = readCleanString(bstream, 100);
|
||||||
this.maybeMagic = readCleanString(bstream, 6);
|
this.maybeMagic = readCleanString(bstream, 6);
|
||||||
|
|
||||||
if (this.maybeMagic == "ustar") {
|
if (this.maybeMagic == "ustar") {
|
||||||
this.version = readCleanString(bstream, 2);
|
this.version = readCleanString(bstream, 2);
|
||||||
this.uname = readCleanString(bstream, 32);
|
this.uname = readCleanString(bstream, 32);
|
||||||
this.gname = readCleanString(bstream, 32);
|
this.gname = readCleanString(bstream, 32);
|
||||||
this.devmajor = readCleanString(bstream, 8);
|
this.devmajor = readCleanString(bstream, 8);
|
||||||
this.devminor = readCleanString(bstream, 8);
|
this.devminor = readCleanString(bstream, 8);
|
||||||
this.prefix = readCleanString(bstream, 155);
|
this.prefix = readCleanString(bstream, 155);
|
||||||
|
|
||||||
if (this.prefix.length) {
|
if (this.prefix.length) {
|
||||||
this.name = this.prefix + this.name;
|
this.name = this.prefix + this.name;
|
||||||
|
}
|
||||||
|
bstream.readBytes(12); // 512 - 500
|
||||||
|
} else {
|
||||||
|
bstream.readBytes(255); // 512 - 257
|
||||||
|
}
|
||||||
|
|
||||||
|
// Done header, now rest of blocks are the file contents.
|
||||||
|
this.filename = this.name;
|
||||||
|
this.fileData = null;
|
||||||
|
|
||||||
|
info("Untarring file '" + this.filename + "'");
|
||||||
|
info(" size = " + this.size);
|
||||||
|
info(" typeflag = " + this.typeflag);
|
||||||
|
|
||||||
|
// A regular file.
|
||||||
|
if (this.typeflag == 0) {
|
||||||
|
info(" This is a regular file.");
|
||||||
|
const sizeInBytes = parseInt(this.size);
|
||||||
|
this.fileData = new Uint8Array(bstream.bytes.buffer, bstream.ptr, this.size);
|
||||||
|
if (this.name.length > 0 && this.size > 0 && this.fileData && this.fileData.buffer) {
|
||||||
|
this.isValid = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bstream.readBytes(this.size);
|
||||||
|
|
||||||
|
// Round up to 512-byte blocks.
|
||||||
|
const remaining = 512 - bstream.ptr % 512;
|
||||||
|
if (remaining > 0 && remaining < 512) {
|
||||||
|
bstream.readBytes(remaining);
|
||||||
|
}
|
||||||
|
} else if (this.typeflag == 5) {
|
||||||
|
info(" This is a directory.")
|
||||||
}
|
}
|
||||||
bstream.readBytes(12); // 512 - 500
|
|
||||||
} else {
|
|
||||||
bstream.readBytes(255); // 512 - 257
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Done header, now rest of blocks are the file contents.
|
|
||||||
this.filename = this.name;
|
|
||||||
this.fileData = null;
|
|
||||||
|
|
||||||
info("Untarring file '" + this.filename + "'");
|
|
||||||
info(" size = " + this.size);
|
|
||||||
info(" typeflag = " + this.typeflag);
|
|
||||||
|
|
||||||
// A regular file.
|
|
||||||
if (this.typeflag == 0) {
|
|
||||||
info(" This is a regular file.");
|
|
||||||
const sizeInBytes = parseInt(this.size);
|
|
||||||
this.fileData = new Uint8Array(bstream.bytes.buffer, bstream.ptr, this.size);
|
|
||||||
if (this.name.length > 0 && this.size > 0 && this.fileData && this.fileData.buffer) {
|
|
||||||
this.isValid = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bstream.readBytes(this.size);
|
|
||||||
|
|
||||||
// Round up to 512-byte blocks.
|
|
||||||
const remaining = 512 - bstream.ptr % 512;
|
|
||||||
if (remaining > 0 && remaining < 512) {
|
|
||||||
bstream.readBytes(remaining);
|
|
||||||
}
|
|
||||||
} else if (this.typeflag == 5) {
|
|
||||||
info(" This is a directory.")
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Takes an ArrayBuffer of a tar file in
|
// Takes an ArrayBuffer of a tar file in
|
||||||
// returns null on error
|
// returns null on error
|
||||||
|
|
|
||||||
114
archive/unzip.js
114
archive/unzip.js
|
|
@ -50,8 +50,16 @@ const zDigitalSignatureSignature = 0x05054b50;
|
||||||
const zEndOfCentralDirSignature = 0x06064b50;
|
const zEndOfCentralDirSignature = 0x06064b50;
|
||||||
const zEndOfCentralDirLocatorSignature = 0x07064b50;
|
const zEndOfCentralDirLocatorSignature = 0x07064b50;
|
||||||
|
|
||||||
// takes a ByteStream and parses out the local file information
|
// mask for getting the Nth bit (zero-based)
|
||||||
const ZipLocalFile = function(bstream) {
|
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
|
||||||
|
constructor(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;
|
||||||
}
|
}
|
||||||
|
|
@ -103,32 +111,32 @@ const ZipLocalFile = function(bstream) {
|
||||||
// "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 & bitjs.BIT[3]) != 0) {
|
if ((this.generalPurpose & 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);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
// determine what kind of compressed data we have and decompress
|
// determine what kind of compressed data we have and decompress
|
||||||
ZipLocalFile.prototype.unzip = function() {
|
unzip() {
|
||||||
// Zip Version 1.0, no compression (store only)
|
// Zip Version 1.0, no compression (store only)
|
||||||
if (this.compressionMethod == 0 ) {
|
if (this.compressionMethod == 0 ) {
|
||||||
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)
|
||||||
|
else if (this.compressionMethod == 8) {
|
||||||
|
info("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)");
|
||||||
|
this.fileData = inflate(this.fileData, this.uncompressedSize);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
err("UNSUPPORTED VERSION/FORMAT: ZIP v" + this.version + ", compression method=" + this.compressionMethod + ": " + this.filename + " (" + this.compressedSize + " bytes)");
|
||||||
|
this.fileData = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// version == 20, compression method == 8 (DEFLATE)
|
}
|
||||||
else if (this.compressionMethod == 8) {
|
|
||||||
info("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)");
|
|
||||||
this.fileData = inflate(this.fileData, this.uncompressedSize);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
err("UNSUPPORTED VERSION/FORMAT: ZIP v" + this.version + ", compression method=" + this.compressionMethod + ": " + this.filename + " (" + this.compressedSize + " bytes)");
|
|
||||||
this.fileData = null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// Takes an ArrayBuffer of a zip file in
|
// Takes an ArrayBuffer of a zip file in
|
||||||
// returns null on error
|
// returns null on error
|
||||||
|
|
@ -374,21 +382,22 @@ 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];
|
const CodeLengthCodeOrder = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15];
|
||||||
/*
|
|
||||||
Extra Extra Extra
|
/*
|
||||||
Code Bits Length(s) Code Bits Lengths Code Bits Length(s)
|
Extra Extra Extra
|
||||||
---- ---- ------ ---- ---- ------- ---- ---- -------
|
Code Bits Length(s) Code Bits Lengths Code Bits Length(s)
|
||||||
257 0 3 267 1 15,16 277 4 67-82
|
---- ---- ------ ---- ---- ------- ---- ---- -------
|
||||||
258 0 4 268 1 17,18 278 4 83-98
|
257 0 3 267 1 15,16 277 4 67-82
|
||||||
259 0 5 269 2 19-22 279 4 99-114
|
258 0 4 268 1 17,18 278 4 83-98
|
||||||
260 0 6 270 2 23-26 280 4 115-130
|
259 0 5 269 2 19-22 279 4 99-114
|
||||||
261 0 7 271 2 27-30 281 5 131-162
|
260 0 6 270 2 23-26 280 4 115-130
|
||||||
262 0 8 272 2 31-34 282 5 163-194
|
261 0 7 271 2 27-30 281 5 131-162
|
||||||
263 0 9 273 3 35-42 283 5 195-226
|
262 0 8 272 2 31-34 282 5 163-194
|
||||||
264 0 10 274 3 43-50 284 5 227-257
|
263 0 9 273 3 35-42 283 5 195-226
|
||||||
265 1 11,12 275 3 51-58 285 0 258
|
264 0 10 274 3 43-50 284 5 227-257
|
||||||
266 1 13,14 276 3 59-66
|
265 1 11,12 275 3 51-58 285 0 258
|
||||||
*/
|
266 1 13,14 276 3 59-66
|
||||||
|
*/
|
||||||
const LengthLookupTable = [
|
const 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],
|
||||||
|
|
@ -399,21 +408,22 @@ 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
|
/*
|
||||||
Code Bits Dist Code Bits Dist Code Bits Distance
|
Extra Extra Extra
|
||||||
---- ---- ---- ---- ---- ------ ---- ---- --------
|
Code Bits Dist Code Bits Dist Code Bits Distance
|
||||||
0 0 1 10 4 33-48 20 9 1025-1536
|
---- ---- ---- ---- ---- ------ ---- ---- --------
|
||||||
1 0 2 11 4 49-64 21 9 1537-2048
|
0 0 1 10 4 33-48 20 9 1025-1536
|
||||||
2 0 3 12 5 65-96 22 10 2049-3072
|
1 0 2 11 4 49-64 21 9 1537-2048
|
||||||
3 0 4 13 5 97-128 23 10 3073-4096
|
2 0 3 12 5 65-96 22 10 2049-3072
|
||||||
4 1 5,6 14 6 129-192 24 11 4097-6144
|
3 0 4 13 5 97-128 23 10 3073-4096
|
||||||
5 1 7,8 15 6 193-256 25 11 6145-8192
|
4 1 5,6 14 6 129-192 24 11 4097-6144
|
||||||
6 2 9-12 16 7 257-384 26 12 8193-12288
|
5 1 7,8 15 6 193-256 25 11 6145-8192
|
||||||
7 2 13-16 17 7 385-512 27 12 12289-16384
|
6 2 9-12 16 7 257-384 26 12 8193-12288
|
||||||
8 3 17-24 18 8 513-768 28 13 16385-24576
|
7 2 13-16 17 7 385-512 27 12 12289-16384
|
||||||
9 3 25-32 19 8 769-1024 29 13 24577-32768
|
8 3 17-24 18 8 513-768 28 13 16385-24576
|
||||||
*/
|
9 3 25-32 19 8 769-1024 29 13 24577-32768
|
||||||
|
*/
|
||||||
const DistLookupTable = [
|
const 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],
|
||||||
|
|
|
||||||
376
io/bitstream.js
376
io/bitstream.js
|
|
@ -12,224 +12,212 @@
|
||||||
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)
|
|
||||||
const BITMASK = [0, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF ];
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This bit stream peeks and consumes bits out of a binary stream.
|
* This bit stream peeks and consumes bits out of a binary stream.
|
||||||
*
|
|
||||||
* @param {ArrayBuffer} ab An ArrayBuffer object or a Uint8Array.
|
|
||||||
* @param {boolean} rtl Whether the stream reads bits from the byte starting
|
|
||||||
* from bit 7 to 0 (true) or bit 0 to 7 (false).
|
|
||||||
* @param {Number} opt_offset The offset into the ArrayBuffer
|
|
||||||
* @param {Number} opt_length The length of this BitStream
|
|
||||||
*/
|
*/
|
||||||
bitjs.io.BitStream = function(ab, rtl, opt_offset, opt_length) {
|
bitjs.io.BitStream = class {
|
||||||
if (!ab || !ab.toString || ab.toString() !== "[object ArrayBuffer]") {
|
/**
|
||||||
throw "Error! BitArray constructed with an invalid ArrayBuffer object";
|
* @param {ArrayBuffer} ab An ArrayBuffer object or a Uint8Array.
|
||||||
}
|
* @param {boolean} rtl Whether the stream reads bits from the byte starting
|
||||||
|
* from bit 7 to 0 (true) or bit 0 to 7 (false).
|
||||||
const offset = opt_offset || 0;
|
* @param {Number} opt_offset The offset into the ArrayBuffer
|
||||||
const length = opt_length || ab.byteLength;
|
* @param {Number} opt_length The length of this BitStream
|
||||||
this.bytes = new Uint8Array(ab, offset, length);
|
*/
|
||||||
this.bytePtr = 0; // tracks which byte we are on
|
constructor(ab, rtl, opt_offset, opt_length) {
|
||||||
this.bitPtr = 0; // tracks which bit we are on (can have values 0 through 7)
|
if (!ab || !ab.toString || ab.toString() !== "[object ArrayBuffer]") {
|
||||||
this.peekBits = rtl ? this.peekBits_rtl : this.peekBits_ltr;
|
throw "Error! BitArray constructed with an invalid ArrayBuffer object";
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* byte0 byte1 byte2 byte3
|
|
||||||
* 7......0 | 7......0 | 7......0 | 7......0
|
|
||||||
*
|
|
||||||
* The bit pointer starts at bit0 of byte0 and moves left until it reaches
|
|
||||||
* bit7 of byte0, then jumps to bit0 of byte1, etc.
|
|
||||||
* @param {number} n The number of bits to peek.
|
|
||||||
* @param {boolean=} movePointers Whether to move the pointer, defaults false.
|
|
||||||
* @return {number} The peeked bits, as an unsigned number.
|
|
||||||
*/
|
|
||||||
bitjs.io.BitStream.prototype.peekBits_ltr = function(n, opt_movePointers) {
|
|
||||||
if (n <= 0 || typeof n != typeof 1) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
const movePointers = opt_movePointers || false;
|
|
||||||
const bytes = this.bytes;
|
|
||||||
let bytePtr = this.bytePtr;
|
|
||||||
let bitPtr = this.bitPtr;
|
|
||||||
let result = 0;
|
|
||||||
let bitsIn = 0;
|
|
||||||
|
|
||||||
// keep going until we have no more bits left to peek at
|
|
||||||
// TODO: Consider putting all bits from bytes we will need into a variable and then
|
|
||||||
// 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) {
|
|
||||||
throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" +
|
|
||||||
bytes.length + ", bitPtr=" + bitPtr;
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const numBitsLeftInThisByte = (8 - bitPtr);
|
const offset = opt_offset || 0;
|
||||||
if (n >= numBitsLeftInThisByte) {
|
const length = opt_length || ab.byteLength;
|
||||||
const mask = (BITMASK[numBitsLeftInThisByte] << bitPtr);
|
this.bytes = new Uint8Array(ab, offset, length);
|
||||||
result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn);
|
this.bytePtr = 0; // tracks which byte we are on
|
||||||
|
this.bitPtr = 0; // tracks which bit we are on (can have values 0 through 7)
|
||||||
bytePtr++;
|
this.peekBits = rtl ? this.peekBits_rtl : this.peekBits_ltr;
|
||||||
bitPtr = 0;
|
|
||||||
bitsIn += numBitsLeftInThisByte;
|
|
||||||
n -= numBitsLeftInThisByte;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
const mask = (BITMASK[n] << bitPtr);
|
|
||||||
result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn);
|
|
||||||
|
|
||||||
bitPtr += n;
|
|
||||||
bitsIn += n;
|
|
||||||
n = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (movePointers) {
|
/**
|
||||||
this.bitPtr = bitPtr;
|
* byte0 byte1 byte2 byte3
|
||||||
this.bytePtr = bytePtr;
|
* 7......0 | 7......0 | 7......0 | 7......0
|
||||||
}
|
*
|
||||||
|
* The bit pointer starts at bit0 of byte0 and moves left until it reaches
|
||||||
return result;
|
* bit7 of byte0, then jumps to bit0 of byte1, etc.
|
||||||
};
|
* @param {number} n The number of bits to peek.
|
||||||
|
* @param {boolean=} movePointers Whether to move the pointer, defaults false.
|
||||||
|
* @return {number} The peeked bits, as an unsigned number.
|
||||||
/**
|
*/
|
||||||
* byte0 byte1 byte2 byte3
|
peekBits_ltr(n, opt_movePointers) {
|
||||||
* 7......0 | 7......0 | 7......0 | 7......0
|
if (n <= 0 || typeof n != typeof 1) {
|
||||||
*
|
return 0;
|
||||||
* The bit pointer starts at bit7 of byte0 and moves right until it reaches
|
|
||||||
* bit0 of byte0, then goes to bit7 of byte1, etc.
|
|
||||||
* @param {number} n The number of bits to peek.
|
|
||||||
* @param {boolean=} movePointers Whether to move the pointer, defaults false.
|
|
||||||
* @return {number} The peeked bits, as an unsigned number.
|
|
||||||
*/
|
|
||||||
bitjs.io.BitStream.prototype.peekBits_rtl = function(n, opt_movePointers) {
|
|
||||||
if (n <= 0 || typeof n != typeof 1) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
const movePointers = opt_movePointers || false;
|
|
||||||
const bytes = this.bytes;
|
|
||||||
let bytePtr = this.bytePtr;
|
|
||||||
let bitPtr = this.bitPtr;
|
|
||||||
let result = 0;
|
|
||||||
|
|
||||||
// keep going until we have no more bits left to peek at
|
|
||||||
// TODO: Consider putting all bits from bytes we will need into a variable and then
|
|
||||||
// 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) {
|
|
||||||
throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" +
|
|
||||||
bytes.length + ", bitPtr=" + bitPtr;
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const numBitsLeftInThisByte = (8 - bitPtr);
|
const movePointers = opt_movePointers || false;
|
||||||
if (n >= numBitsLeftInThisByte) {
|
const bytes = this.bytes;
|
||||||
result <<= numBitsLeftInThisByte;
|
let bytePtr = this.bytePtr;
|
||||||
result |= (BITMASK[numBitsLeftInThisByte] & bytes[bytePtr]);
|
let bitPtr = this.bitPtr;
|
||||||
bytePtr++;
|
let result = 0;
|
||||||
bitPtr = 0;
|
let bitsIn = 0;
|
||||||
n -= numBitsLeftInThisByte;
|
|
||||||
|
// keep going until we have no more bits left to peek at
|
||||||
|
// TODO: Consider putting all bits from bytes we will need into a variable and then
|
||||||
|
// 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) {
|
||||||
|
throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" +
|
||||||
|
bytes.length + ", bitPtr=" + bitPtr;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const numBitsLeftInThisByte = (8 - bitPtr);
|
||||||
|
if (n >= numBitsLeftInThisByte) {
|
||||||
|
const mask = (bitjs.io.BitStream.BITMASK[numBitsLeftInThisByte] << bitPtr);
|
||||||
|
result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn);
|
||||||
|
|
||||||
|
bytePtr++;
|
||||||
|
bitPtr = 0;
|
||||||
|
bitsIn += numBitsLeftInThisByte;
|
||||||
|
n -= numBitsLeftInThisByte;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
const mask = (bitjs.io.BitStream.BITMASK[n] << bitPtr);
|
||||||
|
result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn);
|
||||||
|
|
||||||
|
bitPtr += n;
|
||||||
|
bitsIn += n;
|
||||||
|
n = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
result <<= n;
|
|
||||||
result |= ((bytes[bytePtr] & (BITMASK[n] << (8 - n - bitPtr))) >> (8 - n - bitPtr));
|
|
||||||
|
|
||||||
bitPtr += n;
|
if (movePointers) {
|
||||||
n = 0;
|
this.bitPtr = bitPtr;
|
||||||
|
this.bytePtr = bytePtr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (movePointers) {
|
/**
|
||||||
this.bitPtr = bitPtr;
|
* byte0 byte1 byte2 byte3
|
||||||
this.bytePtr = bytePtr;
|
* 7......0 | 7......0 | 7......0 | 7......0
|
||||||
|
*
|
||||||
|
* The bit pointer starts at bit7 of byte0 and moves right until it reaches
|
||||||
|
* bit0 of byte0, then goes to bit7 of byte1, etc.
|
||||||
|
* @param {number} n The number of bits to peek.
|
||||||
|
* @param {boolean=} movePointers Whether to move the pointer, defaults false.
|
||||||
|
* @return {number} The peeked bits, as an unsigned number.
|
||||||
|
*/
|
||||||
|
peekBits_rtl(n, opt_movePointers) {
|
||||||
|
if (n <= 0 || typeof n != typeof 1) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const movePointers = opt_movePointers || false;
|
||||||
|
const bytes = this.bytes;
|
||||||
|
let bytePtr = this.bytePtr;
|
||||||
|
let bitPtr = this.bitPtr;
|
||||||
|
let result = 0;
|
||||||
|
|
||||||
|
// keep going until we have no more bits left to peek at
|
||||||
|
// TODO: Consider putting all bits from bytes we will need into a variable and then
|
||||||
|
// 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) {
|
||||||
|
throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" +
|
||||||
|
bytes.length + ", bitPtr=" + bitPtr;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const numBitsLeftInThisByte = (8 - bitPtr);
|
||||||
|
if (n >= numBitsLeftInThisByte) {
|
||||||
|
result <<= numBitsLeftInThisByte;
|
||||||
|
result |= (bitjs.io.BitStream.BITMASK[numBitsLeftInThisByte] & bytes[bytePtr]);
|
||||||
|
bytePtr++;
|
||||||
|
bitPtr = 0;
|
||||||
|
n -= numBitsLeftInThisByte;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
result <<= n;
|
||||||
|
result |= ((bytes[bytePtr] & (bitjs.io.BitStream.BITMASK[n] << (8 - n - bitPtr))) >> (8 - n - bitPtr));
|
||||||
|
|
||||||
|
bitPtr += n;
|
||||||
|
n = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (movePointers) {
|
||||||
|
this.bitPtr = bitPtr;
|
||||||
|
this.bytePtr = bytePtr;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
/**
|
||||||
};
|
* Peek at 16 bits from current position in the buffer.
|
||||||
|
* Bit at (bytePtr,bitPtr) has the highest position in returning data.
|
||||||
|
* Taken from getbits.hpp in unrar.
|
||||||
/**
|
* TODO: Move this out of BitStream and into unrar.
|
||||||
* Peek at 16 bits from current position in the buffer.
|
*/
|
||||||
* Bit at (bytePtr,bitPtr) has the highest position in returning data.
|
getBits() {
|
||||||
* Taken from getbits.hpp in unrar.
|
return (((((this.bytes[this.bytePtr] & 0xff) << 16) +
|
||||||
* TODO: Move this out of BitStream and into unrar.
|
((this.bytes[this.bytePtr+1] & 0xff) << 8) +
|
||||||
*/
|
((this.bytes[this.bytePtr+2] & 0xff))) >>> (8-this.bitPtr)) & 0xffff);
|
||||||
bitjs.io.BitStream.prototype.getBits = function() {
|
|
||||||
return (((((this.bytes[this.bytePtr] & 0xff) << 16) +
|
|
||||||
((this.bytes[this.bytePtr+1] & 0xff) << 8) +
|
|
||||||
((this.bytes[this.bytePtr+2] & 0xff))) >>> (8-this.bitPtr)) & 0xffff);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reads n bits out of the stream, consuming them (moving the bit pointer).
|
|
||||||
* @param {number} n The number of bits to read.
|
|
||||||
* @return {number} The read bits, as an unsigned number.
|
|
||||||
*/
|
|
||||||
bitjs.io.BitStream.prototype.readBits = function(n) {
|
|
||||||
return this.peekBits(n, true);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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
|
|
||||||
* bits in the current byte.
|
|
||||||
* @param {number} n The number of bytes to peek.
|
|
||||||
* @param {boolean=} movePointers Whether to move the pointer, defaults false.
|
|
||||||
* @return {Uint8Array} The subarray.
|
|
||||||
*/
|
|
||||||
bitjs.io.BitStream.prototype.peekBytes = function(n, opt_movePointers) {
|
|
||||||
if (n <= 0 || typeof n != typeof 1) {
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// from http://tools.ietf.org/html/rfc1951#page-11
|
/**
|
||||||
// "Any bits of input up to the next byte boundary are ignored."
|
* Reads n bits out of the stream, consuming them (moving the bit pointer).
|
||||||
while (this.bitPtr != 0) {
|
* @param {number} n The number of bits to read.
|
||||||
this.readBits(1);
|
* @return {number} The read bits, as an unsigned number.
|
||||||
|
*/
|
||||||
|
readBits(n) {
|
||||||
|
return this.peekBits(n, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
const movePointers = opt_movePointers || false;
|
/**
|
||||||
let bytePtr = this.bytePtr;
|
* This returns n bytes as a sub-array, advancing the pointer if movePointers
|
||||||
let bitPtr = this.bitPtr;
|
* is true. Only use this for uncompressed blocks as this throws away remaining
|
||||||
|
* bits in the current byte.
|
||||||
|
* @param {number} n The number of bytes to peek.
|
||||||
|
* @param {boolean=} movePointers Whether to move the pointer, defaults false.
|
||||||
|
* @return {Uint8Array} The subarray.
|
||||||
|
*/
|
||||||
|
peekBytes(n, opt_movePointers) {
|
||||||
|
if (n <= 0 || typeof n != typeof 1) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
const result = this.bytes.subarray(bytePtr, bytePtr + n);
|
// from http://tools.ietf.org/html/rfc1951#page-11
|
||||||
|
// "Any bits of input up to the next byte boundary are ignored."
|
||||||
|
while (this.bitPtr != 0) {
|
||||||
|
this.readBits(1);
|
||||||
|
}
|
||||||
|
|
||||||
if (movePointers) {
|
const movePointers = opt_movePointers || false;
|
||||||
this.bytePtr += n;
|
let bytePtr = this.bytePtr;
|
||||||
|
let bitPtr = this.bitPtr;
|
||||||
|
|
||||||
|
const result = this.bytes.subarray(bytePtr, bytePtr + n);
|
||||||
|
|
||||||
|
if (movePointers) {
|
||||||
|
this.bytePtr += n;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
/**
|
||||||
};
|
* @param {number} n The number of bytes to read.
|
||||||
|
* @return {Uint8Array} The subarray.
|
||||||
|
*/
|
||||||
|
readBytes(n) {
|
||||||
|
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 ];
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {number} n The number of bytes to read.
|
|
||||||
* @return {Uint8Array} The subarray.
|
|
||||||
*/
|
|
||||||
bitjs.io.BitStream.prototype.readBytes = function(n) {
|
|
||||||
return this.peekBytes(n, true);
|
|
||||||
};
|
|
||||||
|
|
||||||
})();
|
|
||||||
|
|
|
||||||
197
io/bytebuffer.js
197
io/bytebuffer.js
|
|
@ -12,111 +12,106 @@
|
||||||
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.
|
||||||
* @param {number} numBytes The number of bytes to allocate.
|
|
||||||
* @constructor
|
|
||||||
*/
|
*/
|
||||||
bitjs.io.ByteBuffer = function(numBytes) {
|
bitjs.io.ByteBuffer = class {
|
||||||
if (typeof numBytes != typeof 1 || numBytes <= 0) {
|
/**
|
||||||
throw "Error! ByteBuffer initialized with '" + numBytes + "'";
|
* @param {number} numBytes The number of bytes to allocate.
|
||||||
}
|
*/
|
||||||
this.data = new Uint8Array(numBytes);
|
constructor(numBytes) {
|
||||||
this.ptr = 0;
|
if (typeof numBytes != typeof 1 || numBytes <= 0) {
|
||||||
};
|
throw "Error! ByteBuffer initialized with '" + numBytes + "'";
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {number} b The byte to insert.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteBuffer.prototype.insertByte = function(b) {
|
|
||||||
// TODO: throw if byte is invalid?
|
|
||||||
this.data[this.ptr++] = b;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {Array.<number>|Uint8Array|Int8Array} bytes The bytes to insert.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteBuffer.prototype.insertBytes = function(bytes) {
|
|
||||||
// TODO: throw if bytes is invalid?
|
|
||||||
this.data.set(bytes, this.ptr);
|
|
||||||
this.ptr += bytes.length;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Writes an unsigned number into the next n bytes. If the number is too large
|
|
||||||
* to fit into n bytes or is negative, an error is thrown.
|
|
||||||
* @param {number} num The unsigned number to write.
|
|
||||||
* @param {number} numBytes The number of bytes to write the number into.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteBuffer.prototype.writeNumber = function(num, numBytes) {
|
|
||||||
if (numBytes < 1) {
|
|
||||||
throw 'Trying to write into too few bytes: ' + numBytes;
|
|
||||||
}
|
|
||||||
if (num < 0) {
|
|
||||||
throw 'Trying to write a negative number (' + num +
|
|
||||||
') as an unsigned number to an ArrayBuffer';
|
|
||||||
}
|
|
||||||
if (num > (Math.pow(2, numBytes * 8) - 1)) {
|
|
||||||
throw 'Trying to write ' + num + ' into only ' + numBytes + ' bytes';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Roll 8-bits at a time into an array of bytes.
|
|
||||||
const bytes = [];
|
|
||||||
while (numBytes-- > 0) {
|
|
||||||
const eightBits = num & 255;
|
|
||||||
bytes.push(eightBits);
|
|
||||||
num >>= 8;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.insertBytes(bytes);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Writes a signed number into the next n bytes. If the number is too large
|
|
||||||
* to fit into n bytes, an error is thrown.
|
|
||||||
* @param {number} num The signed number to write.
|
|
||||||
* @param {number} numBytes The number of bytes to write the number into.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteBuffer.prototype.writeSignedNumber = function(num, numBytes) {
|
|
||||||
if (numBytes < 1) {
|
|
||||||
throw 'Trying to write into too few bytes: ' + numBytes;
|
|
||||||
}
|
|
||||||
|
|
||||||
const HALF = Math.pow(2, (numBytes * 8) - 1);
|
|
||||||
if (num >= HALF || num < -HALF) {
|
|
||||||
throw 'Trying to write ' + num + ' into only ' + numBytes + ' bytes';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Roll 8-bits at a time into an array of bytes.
|
|
||||||
const bytes = [];
|
|
||||||
while (numBytes-- > 0) {
|
|
||||||
const eightBits = num & 255;
|
|
||||||
bytes.push(eightBits);
|
|
||||||
num >>= 8;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.insertBytes(bytes);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {string} str The ASCII string to write.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteBuffer.prototype.writeASCIIString = function(str) {
|
|
||||||
for (let i = 0; i < str.length; ++i) {
|
|
||||||
const curByte = str.charCodeAt(i);
|
|
||||||
if (curByte < 0 || curByte > 255) {
|
|
||||||
throw 'Trying to write a non-ASCII string!';
|
|
||||||
}
|
}
|
||||||
this.insertByte(curByte);
|
this.data = new Uint8Array(numBytes);
|
||||||
|
this.ptr = 0;
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
})();
|
|
||||||
|
/**
|
||||||
|
* @param {number} b The byte to insert.
|
||||||
|
*/
|
||||||
|
insertByte(b) {
|
||||||
|
// TODO: throw if byte is invalid?
|
||||||
|
this.data[this.ptr++] = b;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {Array.<number>|Uint8Array|Int8Array} bytes The bytes to insert.
|
||||||
|
*/
|
||||||
|
insertBytes(bytes) {
|
||||||
|
// TODO: throw if bytes is invalid?
|
||||||
|
this.data.set(bytes, this.ptr);
|
||||||
|
this.ptr += bytes.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes an unsigned number into the next n bytes. If the number is too large
|
||||||
|
* to fit into n bytes or is negative, an error is thrown.
|
||||||
|
* @param {number} num The unsigned number to write.
|
||||||
|
* @param {number} numBytes The number of bytes to write the number into.
|
||||||
|
*/
|
||||||
|
writeNumber(num, numBytes) {
|
||||||
|
if (numBytes < 1) {
|
||||||
|
throw 'Trying to write into too few bytes: ' + numBytes;
|
||||||
|
}
|
||||||
|
if (num < 0) {
|
||||||
|
throw 'Trying to write a negative number (' + num +
|
||||||
|
') as an unsigned number to an ArrayBuffer';
|
||||||
|
}
|
||||||
|
if (num > (Math.pow(2, numBytes * 8) - 1)) {
|
||||||
|
throw 'Trying to write ' + num + ' into only ' + numBytes + ' bytes';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Roll 8-bits at a time into an array of bytes.
|
||||||
|
const bytes = [];
|
||||||
|
while (numBytes-- > 0) {
|
||||||
|
const eightBits = num & 255;
|
||||||
|
bytes.push(eightBits);
|
||||||
|
num >>= 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.insertBytes(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes a signed number into the next n bytes. If the number is too large
|
||||||
|
* to fit into n bytes, an error is thrown.
|
||||||
|
* @param {number} num The signed number to write.
|
||||||
|
* @param {number} numBytes The number of bytes to write the number into.
|
||||||
|
*/
|
||||||
|
writeSignedNumber(num, numBytes) {
|
||||||
|
if (numBytes < 1) {
|
||||||
|
throw 'Trying to write into too few bytes: ' + numBytes;
|
||||||
|
}
|
||||||
|
|
||||||
|
const HALF = Math.pow(2, (numBytes * 8) - 1);
|
||||||
|
if (num >= HALF || num < -HALF) {
|
||||||
|
throw 'Trying to write ' + num + ' into only ' + numBytes + ' bytes';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Roll 8-bits at a time into an array of bytes.
|
||||||
|
const bytes = [];
|
||||||
|
while (numBytes-- > 0) {
|
||||||
|
const eightBits = num & 255;
|
||||||
|
bytes.push(eightBits);
|
||||||
|
num >>= 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.insertBytes(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string} str The ASCII string to write.
|
||||||
|
*/
|
||||||
|
writeASCIIString(str) {
|
||||||
|
for (let i = 0; i < str.length; ++i) {
|
||||||
|
const curByte = str.charCodeAt(i);
|
||||||
|
if (curByte < 0 || curByte > 255) {
|
||||||
|
throw 'Trying to write a non-ASCII string!';
|
||||||
|
}
|
||||||
|
this.insertByte(curByte);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
|
||||||
252
io/bytestream.js
252
io/bytestream.js
|
|
@ -12,153 +12,147 @@
|
||||||
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
|
* This object allows you to peek and consume bytes as numbers and strings
|
||||||
* out of an ArrayBuffer. In this buffer, everything must be byte-aligned.
|
* out of an ArrayBuffer. In this buffer, everything must be byte-aligned.
|
||||||
*
|
|
||||||
* @param {ArrayBuffer} ab The ArrayBuffer object.
|
|
||||||
* @param {number=} opt_offset The offset into the ArrayBuffer
|
|
||||||
* @param {number=} opt_length The length of this BitStream
|
|
||||||
* @constructor
|
|
||||||
*/
|
*/
|
||||||
bitjs.io.ByteStream = function(ab, opt_offset, opt_length) {
|
bitjs.io.ByteStream = class {
|
||||||
const offset = opt_offset || 0;
|
/**
|
||||||
const length = opt_length || ab.byteLength;
|
* @param {ArrayBuffer} ab The ArrayBuffer object.
|
||||||
this.bytes = new Uint8Array(ab, offset, length);
|
* @param {number=} opt_offset The offset into the ArrayBuffer
|
||||||
this.ptr = 0;
|
* @param {number=} opt_length The length of this BitStream
|
||||||
};
|
*/
|
||||||
|
constructor(ab, opt_offset, opt_length) {
|
||||||
|
const offset = opt_offset || 0;
|
||||||
/**
|
const length = opt_length || ab.byteLength;
|
||||||
* Peeks at the next n bytes as an unsigned number but does not advance the
|
this.bytes = new Uint8Array(ab, offset, length);
|
||||||
* pointer
|
this.ptr = 0;
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteStream.prototype.peekNumber = function(n) {
|
|
||||||
// TODO: return error if n would go past the end of the stream?
|
|
||||||
if (n <= 0 || typeof n != typeof 1)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
let result = 0;
|
|
||||||
// read from last byte to first byte and roll them in
|
|
||||||
let curByte = this.ptr + n - 1;
|
|
||||||
while (curByte >= this.ptr) {
|
|
||||||
result <<= 8;
|
|
||||||
result |= this.bytes[curByte];
|
|
||||||
--curByte;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the next n bytes as an unsigned number (or -1 on error)
|
|
||||||
* and advances the stream pointer n bytes.
|
|
||||||
* @param {number} n The number of bytes to read.
|
|
||||||
* @return {number} The n bytes interpreted as an unsigned number.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteStream.prototype.readNumber = function(n) {
|
|
||||||
const num = this.peekNumber( n );
|
|
||||||
this.ptr += n;
|
|
||||||
return num;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the next n bytes as a signed number but does not advance the
|
|
||||||
* pointer.
|
|
||||||
* @param {number} n The number of bytes to read.
|
|
||||||
* @return {number} The bytes interpreted as a signed number.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteStream.prototype.peekSignedNumber = function(n) {
|
|
||||||
let num = this.peekNumber(n);
|
|
||||||
const HALF = Math.pow(2, (n * 8) - 1);
|
|
||||||
const FULL = HALF * 2;
|
|
||||||
|
|
||||||
if (num >= HALF) num -= FULL;
|
|
||||||
|
|
||||||
return num;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the next n bytes as a signed number and advances the stream pointer.
|
|
||||||
* @param {number} n The number of bytes to read.
|
|
||||||
* @return {number} The bytes interpreted as a signed number.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteStream.prototype.readSignedNumber = function(n) {
|
|
||||||
const num = this.peekSignedNumber(n);
|
|
||||||
this.ptr += n;
|
|
||||||
return num;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This returns n bytes as a sub-array, advancing the pointer if movePointers
|
|
||||||
* is true.
|
|
||||||
* @param {number} n The number of bytes to read.
|
|
||||||
* @param {boolean} movePointers Whether to move the pointers.
|
|
||||||
* @return {Uint8Array} The subarray.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteStream.prototype.peekBytes = function(n, movePointers) {
|
|
||||||
if (n <= 0 || typeof n != typeof 1) {
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = this.bytes.subarray(this.ptr, this.ptr + n);
|
|
||||||
|
|
||||||
if (movePointers) {
|
/**
|
||||||
|
* Peeks at the next n bytes as an unsigned number but does not advance the
|
||||||
|
* pointer
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
peekNumber(n) {
|
||||||
|
// TODO: return error if n would go past the end of the stream?
|
||||||
|
if (n <= 0 || typeof n != typeof 1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
let result = 0;
|
||||||
|
// read from last byte to first byte and roll them in
|
||||||
|
let curByte = this.ptr + n - 1;
|
||||||
|
while (curByte >= this.ptr) {
|
||||||
|
result <<= 8;
|
||||||
|
result |= this.bytes[curByte];
|
||||||
|
--curByte;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the next n bytes as an unsigned number (or -1 on error)
|
||||||
|
* and advances the stream pointer n bytes.
|
||||||
|
* @param {number} n The number of bytes to read.
|
||||||
|
* @return {number} The n bytes interpreted as an unsigned number.
|
||||||
|
*/
|
||||||
|
readNumber(n) {
|
||||||
|
const num = this.peekNumber( n );
|
||||||
this.ptr += n;
|
this.ptr += n;
|
||||||
|
return num;
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the next n bytes as a signed number but does not advance the
|
||||||
|
* pointer.
|
||||||
|
* @param {number} n The number of bytes to read.
|
||||||
|
* @return {number} The bytes interpreted as a signed number.
|
||||||
|
*/
|
||||||
|
peekSignedNumber(n) {
|
||||||
|
let num = this.peekNumber(n);
|
||||||
|
const HALF = Math.pow(2, (n * 8) - 1);
|
||||||
|
const FULL = HALF * 2;
|
||||||
|
|
||||||
/**
|
if (num >= HALF) num -= FULL;
|
||||||
* Reads the next n bytes as a sub-array.
|
|
||||||
* @param {number} n The number of bytes to read.
|
|
||||||
* @return {Uint8Array} The subarray.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteStream.prototype.readBytes = function(n) {
|
|
||||||
return this.peekBytes(n, true);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
return num;
|
||||||
/**
|
|
||||||
* 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.
|
|
||||||
* @return {string} The next n bytes as a string.
|
|
||||||
*/
|
|
||||||
bitjs.io.ByteStream.prototype.peekString = function(n) {
|
|
||||||
if (n <= 0 || typeof n != typeof 1) {
|
|
||||||
return "";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let result = "";
|
|
||||||
for (let p = this.ptr, end = this.ptr + n; p < end; ++p) {
|
/**
|
||||||
result += String.fromCharCode(this.bytes[p]);
|
* Returns the next n bytes as a signed number and advances the stream pointer.
|
||||||
|
* @param {number} n The number of bytes to read.
|
||||||
|
* @return {number} The bytes interpreted as a signed number.
|
||||||
|
*/
|
||||||
|
readSignedNumber(n) {
|
||||||
|
const num = this.peekSignedNumber(n);
|
||||||
|
this.ptr += n;
|
||||||
|
return num;
|
||||||
}
|
}
|
||||||
return result;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the next n bytes as an ASCII string and advances the stream pointer
|
* This returns n bytes as a sub-array, advancing the pointer if movePointers
|
||||||
* n bytes.
|
* is true.
|
||||||
* @param {number} n The number of bytes to read.
|
* @param {number} n The number of bytes to read.
|
||||||
* @return {string} The next n bytes as a string.
|
* @param {boolean} movePointers Whether to move the pointers.
|
||||||
*/
|
* @return {Uint8Array} The subarray.
|
||||||
bitjs.io.ByteStream.prototype.readString = function(n) {
|
*/
|
||||||
const strToReturn = this.peekString(n);
|
peekBytes(n, movePointers) {
|
||||||
this.ptr += n;
|
if (n <= 0 || typeof n != typeof 1) {
|
||||||
return strToReturn;
|
return null;
|
||||||
};
|
}
|
||||||
|
|
||||||
|
const result = this.bytes.subarray(this.ptr, this.ptr + n);
|
||||||
|
|
||||||
})();
|
if (movePointers) {
|
||||||
|
this.ptr += n;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads the next n bytes as a sub-array.
|
||||||
|
* @param {number} n The number of bytes to read.
|
||||||
|
* @return {Uint8Array} The subarray.
|
||||||
|
*/
|
||||||
|
readBytes(n) {
|
||||||
|
return this.peekBytes(n, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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.
|
||||||
|
* @return {string} The next n bytes as a string.
|
||||||
|
*/
|
||||||
|
peekString(n) {
|
||||||
|
if (n <= 0 || typeof n != typeof 1) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
let result = "";
|
||||||
|
for (let p = this.ptr, end = this.ptr + n; p < end; ++p) {
|
||||||
|
result += String.fromCharCode(this.bytes[p]);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the next n bytes as an ASCII string and advances the stream pointer
|
||||||
|
* n bytes.
|
||||||
|
* @param {number} n The number of bytes to read.
|
||||||
|
* @return {string} The next n bytes as a string.
|
||||||
|
*/
|
||||||
|
readString(n) {
|
||||||
|
const strToReturn = this.peekString(n);
|
||||||
|
this.ptr += n;
|
||||||
|
return strToReturn;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue