networkwm-js 0.2.2 → 0.2.4

package/dist/bytemanip.js

@@ -1,59 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeUint32 = exports.writeUint16 = exports.writeUint8 = exports.align = exports.readString = exports.readBytes = exports.getUint16 = exports.getUint32 = exports.readUint32 = exports.readUint16 = exports.readUint8 = void 0;
+exports.readUint8 = readUint8;
+exports.readUint16 = readUint16;
+exports.readUint32 = readUint32;
+exports.getUint32 = getUint32;
+exports.getUint16 = getUint16;
+exports.readBytes = readBytes;
+exports.readString = readString;
+exports.align = align;
+exports.writeUint8 = writeUint8;
+exports.writeUint16 = writeUint16;
+exports.writeUint32 = writeUint32;
 const textDecoder = new TextDecoder();
 const textEncoder = new TextEncoder();
 function readUint8(data, offset) {
     const value = data.getUint8(offset);
     return [value, offset + 1];
 }
-exports.readUint8 = readUint8;
 ;
 function readUint16(data, offset) {
     const value = data.getUint16(offset);
     return [value, offset + 2];
 }
-exports.readUint16 = readUint16;
 ;
 function readUint32(data, offset) {
     const value = data.getUint32(offset);
     return [value, offset + 4];
 }
-exports.readUint32 = readUint32;
 ;
 function getUint32(data, offset = 0) {
     if (offset < 0)
         offset += data.length;
     return (data[offset + 0] << 24) | (data[offset + 1] << 16) | (data[offset + 2] << 8) | data[offset + 3];
 }
-exports.getUint32 = getUint32;
 function getUint16(data, offset = 0) {
     if (offset < 0)
         offset += data.length;
     return (data[offset + 0] << 8) | data[offset + 1];
 }
-exports.getUint16 = getUint16;
 function readBytes(data, offset, length) {
     const value = new Uint8Array(data.buffer.slice(offset, offset + length));
     return [value, offset + length];
 }
-exports.readBytes = readBytes;
 ;
 function readString(data, offset, length) {
     const bytes = readBytes(data, offset, length);
     return [textDecoder.decode(bytes[0]), bytes[1]];
 }
-exports.readString = readString;
 function align(offset, to) {
     if (offset % to === 0)
         return offset;
     return (Math.floor(offset / to) + 1) * to;
 }
-exports.align = align;
 function writeUint8(value) {
     return new Uint8Array([value]);
 }
-exports.writeUint8 = writeUint8;
 ;
 function writeUint16(value) {
     const array = new Uint8Array(2);
@@ -61,7 +62,6 @@ function writeUint16(value) {
     array[1] = value & 0xff;
     return array;
 }
-exports.writeUint16 = writeUint16;
 ;
 function writeUint32(value) {
     const array = new Uint8Array(4);
@@ -71,5 +71,4 @@ function writeUint32(value) {
     array[3] = value & 0xff;
     return array;
 }
-exports.writeUint32 = writeUint32;
 ;

package/dist/cli/decrypt-mp3.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = exports.mainDeriveKey = void 0;
+exports.mainDeriveKey = mainDeriveKey;
+exports.main = main;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const derive_mp3_key_1 = require("../derive-mp3-key");
@@ -37,7 +38,6 @@ function mainDeriveKey(invocation, args) {
     const leafId = (0, encryption_1.getMP3EncryptionKey)(trackKey, id);
     console.log(`Device MP3 key: ${leafId.toString(16).padStart(8, '0')}`);
 }
-exports.mainDeriveKey = mainDeriveKey;
 function main(invocation, args) {
     if (args.length < 3) {
         console.log(`Usage: ${invocation} <device key> <OMA-encapsulated-MP3> <output MP3>`);
@@ -56,4 +56,3 @@ function main(invocation, args) {
     }
     fs_1.default.writeFileSync(dest, (0, derive_mp3_key_1.decryptMP3)(new Uint8Array(fs_1.default.readFileSync(source)), fileId, deviceKey));
 }
-exports.main = main;

package/dist/cli/decrypt-oma.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = void 0;
+exports.main = main;
 const fs_1 = __importDefault(require("fs"));
 const tagged_oma_1 = require("../tagged-oma");
 function main(invocation, args) {
@@ -22,4 +22,3 @@ function main(invocation, args) {
     }
     fs_1.default.writeFileSync(dest, (0, tagged_oma_1.decryptOMA)(new Uint8Array(fs_1.default.readFileSync(source))));
 }
-exports.main = main;

package/dist/cli/encrypt-oma.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = void 0;
+exports.main = main;
 const fs_1 = __importDefault(require("fs"));
 const tagged_oma_1 = require("../tagged-oma");
 const himd_js_1 = require("himd-js");
@@ -80,4 +80,3 @@ async function main(invocation, args) {
     console.log("Duration is: ", encrypted.duration, " seconds");
     fs_1.default.writeFileSync(dest, encrypted.data);
 }
-exports.main = main;

package/dist/cli/sign-device.js

@@ -3,21 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = void 0;
+exports.main = main;
 const encryption_1 = require("../encryption");
 const filesystem_1 = require("../filesystem");
-const helpers_1 = require("../helpers");
+const node_helpers_1 = require("../node-helpers");
 const path_1 = require("path");
 const fs_1 = __importDefault(require("fs"));
 async function main() {
     await (0, encryption_1.initCrypto)();
     (0, encryption_1.importKeys)(new Uint8Array(fs_1.default.readFileSync((0, path_1.join)(__dirname, "..", "..", "EKBROOTS.DES"))));
-    const device = await (0, helpers_1.openNewDeviceNode)();
+    const device = await (0, node_helpers_1.openNewDeviceNode)();
     if (!device) {
         console.log("No device found!");
         return;
     }
-    const fs = await (0, helpers_1.createNWJSFS)(device);
+    const fs = await (0, node_helpers_1.createNWJSFS)(device);
     console.log(`Connected to ${device.definition.name}`);
     console.log("Opening session...");
     const session = new filesystem_1.UMSCNWJSSession(fs.driver, fs);
@@ -27,4 +27,3 @@ async function main() {
     await session.finalizeSession();
     console.log("Done.");
 }
-exports.main = main;

package/dist/cli/table-file-info.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = void 0;
+exports.main = main;
 const tables_1 = require("../tables");
 const utils_1 = require("../utils");
 const fs_1 = __importDefault(require("fs"));
@@ -43,4 +43,3 @@ function main(invocation, args) {
     }
     bumpIndent(-1);
 }
-exports.main = main;

package/dist/cli/tagged-oma-info.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = void 0;
+exports.main = main;
 const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("../utils");
 const id3_1 = require("../id3");
@@ -189,4 +189,3 @@ function main(invocation, args) {
         }
     }
 }
-exports.main = main;

package/dist/codecs.d.ts

@@ -7,7 +7,7 @@ export interface NWCodecInfo {
     codecInfo: Uint8Array;
     complete?: boolean;
 }
-export declare function createEA3Header({ codecId, codecInfo, complete }: NWCodecInfo, encrypted?: number, version?: number): Uint8Array;
+export declare function createEA3Header({ codecId, codecInfo, complete }: NWCodecInfo, encrypted?: number, version?: number): Uint8Array<ArrayBuffer>;
 export declare function getCodecName(codecInfo: NWCodecInfo): import("himd-js").HiMDCodecName;
 export declare function getKBPS(codecInfo: NWCodecInfo): number;
 //# sourceMappingURL=codecs.d.ts.map

package/dist/codecs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codecs.d.ts","sourceRoot":"","sources":["../src/codecs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAsD,MAAM,SAAS,CAAC;AAGnG,oBAAY,OAAO;IACf,GAAG,IAAO;CACb;AAED,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC;IAC7B,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,SAAS,SAAS,EAAE,OAAO,SAAI,cAO7G;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,WAAW,mCAMlD;AAED,wBAAgB,OAAO,CAAC,SAAS,EAAE,WAAW,UAa7C"}
+{"version":3,"file":"codecs.d.ts","sourceRoot":"","sources":["../src/codecs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAsD,MAAM,SAAS,CAAC;AAGnG,oBAAY,OAAO;IACf,GAAG,IAAO;CACb;AAED,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC;IAC7B,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,SAAS,SAAS,EAAE,OAAO,SAAI,2BAO7G;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,WAAW,mCAMlD;AAED,wBAAgB,OAAO,CAAC,SAAS,EAAE,WAAW,UAa7C"}

package/dist/codecs.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getKBPS = exports.getCodecName = exports.createEA3Header = exports.NWCodec = void 0;
+exports.NWCodec = void 0;
+exports.createEA3Header = createEA3Header;
+exports.getCodecName = getCodecName;
+exports.getKBPS = getKBPS;
 const himd_js_1 = require("himd-js");
 const bytemanip_1 = require("./bytemanip");
 var NWCodec;
 (function (NWCodec) {
     NWCodec[NWCodec["MP3"] = 3] = "MP3";
-})(NWCodec = exports.NWCodec || (exports.NWCodec = {}));
+})(NWCodec || (exports.NWCodec = NWCodec = {}));
 function createEA3Header({ codecId, codecInfo, complete }, encrypted = 0xFFFF, version = 1) {
     const headerSize = 96;
     const header = new Uint8Array(headerSize);
@@ -15,14 +18,12 @@ function createEA3Header({ codecId, codecInfo, complete }, encrypted = 0xFFFF, v
     header.set(complete ? codecInfo : codecInfo.slice(0, 3), 33);
     return header;
 }
-exports.createEA3Header = createEA3Header;
 function getCodecName(codecInfo) {
     if (codecInfo.codecId === NWCodec.MP3) {
         return "MP3";
     }
     return (0, himd_js_1.getCodecName)(codecInfo);
 }
-exports.getCodecName = getCodecName;
 function getKBPS(codecInfo) {
     if (codecInfo.codecId === NWCodec.MP3) {
         // Make it compatible with HiMD codec definitions
@@ -37,4 +38,3 @@ function getKBPS(codecInfo) {
     }
     return (0, himd_js_1.getKBPS)(codecInfo);
 }
-exports.getKBPS = getKBPS;

package/dist/database-abstraction.d.ts

@@ -3,7 +3,7 @@ import { DatabaseManager, InboundTrackMetadata, TrackMetadata } from "./database
 import { UMSCNWJSSession } from "./filesystem";
 import { DeviceDefinition } from "./devices";
 import { NWCodecInfo } from "./codecs";
-export declare type AbstractedTrack = TrackMetadata & {
+export type AbstractedTrack = TrackMetadata & {
     encryptionState: Uint8Array;
     codecInfo: Uint8Array;
     oneElementLength: number;
@@ -26,8 +26,8 @@ export declare class DatabaseAbstraction {
     addNewTrack(trackInfo: TrackMetadata, codecInfo: NWCodecInfo, encryptionState: number): number;
     private reassignTrackNumber;
     private copyToFilesystem;
-    uploadMP3Track(trackInfo: InboundTrackMetadata, rawData: Uint8Array, callback?: (done: number, outOf: number) => void): Promise<void>;
-    uploadTrack(trackInfo: InboundTrackMetadata, codec: CodecInfo, rawData: Uint8Array, session?: UMSCNWJSSession, callback?: (done: number, outOf: number) => void): Promise<void>;
+    uploadMP3Track(trackInfo: InboundTrackMetadata, rawData: Uint8Array, callback?: (done: number, outOf: number) => void, chunkSize?: number): Promise<void>;
+    uploadTrack(trackInfo: InboundTrackMetadata, codec: CodecInfo, rawData: Uint8Array<ArrayBuffer>, session?: UMSCNWJSSession, callback?: (done: number, outOf: number) => void, chunkSize?: number): Promise<void>;
     flushUpdates(): Promise<void>;
     deleteTrack(systemIndex: number): Promise<void>;
     reserializeDatabase(): void;

package/dist/database-abstraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database-abstraction.d.ts","sourceRoot":"","sources":["../src/database-abstraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,EAAE,eAAe,EAAc,oBAAoB,EAAE,aAAa,EAAY,MAAM,aAAa,CAAC;AAGzG,OAAO,EAAsB,eAAe,EAAE,MAAM,cAAc,CAAC;AAGnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAyB,MAAM,UAAU,CAAC;AAK9D,oBAAY,eAAe,GAAG,aAAa,GAAG;IAC1C,eAAe,EAAE,UAAU,CAAC;IAC5B,SAAS,EAAE,UAAU,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,aAAa,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,qBAAa,mBAAmB;IAOR,OAAO,CAAC,UAAU;IAAyB,UAAU,EAAE,gBAAgB;IAN3F,OAAO,CAAC,wBAAwB,CAAC,CAAyB;IAC1D,OAAO,CAAC,iBAAiB,CAAa;IACtC,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,aAAa,CAAgB;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,eAAe,CAAC;IACjC,OAAO;WAIa,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB;IAiCnF,OAAO,CAAC,OAAO;IAkCR,WAAW,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM;IAyB5F,OAAO,CAAC,mBAAmB;YAWb,gBAAgB;IAsBxB,cAAc,CAChB,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI;IAe9C,WAAW,CACb,SAAS,EAAE,oBAAoB,EAC/B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,UAAU,EACnB,OAAO,CAAC,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI;IAmB9C,YAAY;IAMZ,WAAW,CAAC,WAAW,EAAE,MAAM;IAcrC,mBAAmB;IA6EnB,0BAA0B,IAAK;QAC3B,0BAA0B,EAAE,CAAC,CAAC;QAC9B,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE;YACN,0BAA0B,EAAE,CAAC,CAAC;YAC9B,IAAI,EAAE,MAAM,CAAC;YACb,QAAQ,EAAE,eAAe,EAAE,CAAA;SAC9B,EAAE,CAAA;KACN,EAAE;IAIG,QAAQ;IA6BR,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa;CAoBjE"}
+{"version":3,"file":"database-abstraction.d.ts","sourceRoot":"","sources":["../src/database-abstraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,EAAE,eAAe,EAAc,oBAAoB,EAAE,aAAa,EAAY,MAAM,aAAa,CAAC;AAGzG,OAAO,EAAsB,eAAe,EAAE,MAAM,cAAc,CAAC;AAGnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAyB,MAAM,UAAU,CAAC;AAK9D,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG;IAC1C,eAAe,EAAE,UAAU,CAAC;IAC5B,SAAS,EAAE,UAAU,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,aAAa,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,qBAAa,mBAAmB;IAOR,OAAO,CAAC,UAAU;IAAyB,UAAU,EAAE,gBAAgB;IAN3F,OAAO,CAAC,wBAAwB,CAAC,CAAyB;IAC1D,OAAO,CAAC,iBAAiB,CAAa;IACtC,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,aAAa,CAAgB;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,eAAe,CAAC;IACjC,OAAO;WAIa,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB;IAiCnF,OAAO,CAAC,OAAO;IAkCR,WAAW,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM;IAyB5F,OAAO,CAAC,mBAAmB;YAWb,gBAAgB;IAsBxB,cAAc,CAChB,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,EAChD,SAAS,CAAC,EAAE,MAAM;IAehB,WAAW,CACb,SAAS,EAAE,oBAAoB,EAC/B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,EAChC,OAAO,CAAC,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,EAChD,SAAS,CAAC,EAAE,MAAM;IAmBhB,YAAY;IAMZ,WAAW,CAAC,WAAW,EAAE,MAAM;IAgBrC,mBAAmB;IA6EnB,0BAA0B,IAAK;QAC3B,0BAA0B,EAAE,CAAC,CAAC;QAC9B,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE;YACN,0BAA0B,EAAE,CAAC,CAAC;YAC9B,IAAI,EAAE,MAAM,CAAC;YACb,QAAQ,EAAE,eAAe,EAAE,CAAA;SAC9B,EAAE,CAAA;KACN,EAAE;IAIG,QAAQ;IA6BR,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa;CAoBjE"}

package/dist/database-abstraction.js

@@ -6,7 +6,7 @@ const sort_1 = require("./sort");
 const initialization_1 = require("./initialization");
 const filesystem_1 = require("./filesystem");
 const tagged_oma_1 = require("./tagged-oma");
-const helpers_1 = require("./helpers");
+const utils_1 = require("./utils");
 const mp3_1 = require("./mp3");
 const codecs_1 = require("./codecs");
 const bytemanip_1 = require("./bytemanip");
@@ -118,19 +118,19 @@ class DatabaseAbstraction {
         }
         return trackNumber;
     }
-    async copyToFilesystem(data, globalTrackIndex, callback) {
+    async copyToFilesystem(data, globalTrackIndex, callback, chunkSize = 2048) {
         // Make sure the audio store directory appropriate for this file exists
         const audioStore = `/OMGAUDIO/10F${(globalTrackIndex >> 8).toString(16).padStart(2, '0')}`;
         if (!(await this.filesystem.list("/OMGAUDIO")).some(e => e.name === audioStore)) {
             // The audio store for this file doesn't yet exist - create it.
             await this.filesystem.mkdir(audioStore);
         }
-        const fh = await this.database.filesystem.open((0, helpers_1.resolvePathFromGlobalIndex)(globalTrackIndex), 'rw');
+        const fh = await this.database.filesystem.open((0, utils_1.resolvePathFromGlobalIndex)(globalTrackIndex), 'rw');
         let remaining = data.length;
         let i = 0;
         callback === null || callback === void 0 ? void 0 : callback(i, data.length);
         while (remaining) {
-            const toWrite = Math.min(2048, remaining);
+            const toWrite = Math.min(chunkSize, remaining);
             await fh.write(data.slice(i, i + toWrite));
             i += toWrite;
             remaining -= toWrite;
@@ -138,7 +138,7 @@ class DatabaseAbstraction {
         }
         await fh.close();
     }
-    async uploadMP3Track(trackInfo, rawData, callback) {
+    async uploadMP3Track(trackInfo, rawData, callback, chunkSize) {
         if (this.mp3DeviceKey === undefined && !this.deviceInfo.disableDRM)
             throw new Error("Please load the device key first!");
         const { codec, duration } = (0, mp3_1.generateMP3CodecField)(rawData);
@@ -149,9 +149,9 @@ class DatabaseAbstraction {
             trackNumber,
         }, codec, this.deviceInfo.disableDRM ? 0xFFFF : 0xFFFE);
         const mp3Data = (0, mp3_1.createMP3OMAFile)(globalTrackIndex, trackInfo, rawData, this.deviceInfo.disableDRM ? null : this.mp3DeviceKey, codec);
-        await this.copyToFilesystem(mp3Data, globalTrackIndex, callback);
+        await this.copyToFilesystem(mp3Data, globalTrackIndex, callback, chunkSize);
     }
-    async uploadTrack(trackInfo, codec, rawData, session, callback) {
+    async uploadTrack(trackInfo, codec, rawData, session, callback, chunkSize) {
         const trackNumber = this.reassignTrackNumber(trackInfo);
         // Step 1 - Create the encrypted OMA which will later be written to the device's storage
         const omaFile = (this.deviceInfo.disableDRM ? tagged_oma_1.createTaggedOMA : tagged_oma_1.createTaggedEncryptedOMA)(rawData, trackInfo, codec);
@@ -162,7 +162,7 @@ class DatabaseAbstraction {
             trackNumber,
         }, codec, this.deviceInfo.disableDRM ? 0xFFFF : 0x0001);
         // Step 3 - write track to the filesystem
-        await this.copyToFilesystem(omaFile.data, globalTrackIndex, callback);
+        await this.copyToFilesystem(omaFile.data, globalTrackIndex, callback, chunkSize);
         // Step 4 - write MAC
         if (!this.deviceInfo.disableDRM)
             session === null || session === void 0 ? void 0 : session.writeTrackMac(globalTrackIndex - 1, omaFile.maclistValue);
@@ -183,7 +183,10 @@ class DatabaseAbstraction {
         // Sort
         this.deletedTracks.sort((a, b) => a - b);
         // Delete the file.
-        await this.filesystem.delete((0, helpers_1.resolvePathFromGlobalIndex)(systemIndex));
+        try {
+            await this.filesystem.delete((0, utils_1.resolvePathFromGlobalIndex)(systemIndex));
+        }
+        catch (ex) { } // Might fail.
     }
     reserializeDatabase() {
         const instrs = [
@@ -286,7 +289,7 @@ class DatabaseAbstraction {
     }
     async renameTrack(systemIndex, metadata) {
         // Update the metadata within the OMA file
-        const handle = await this.database.filesystem.open((0, helpers_1.resolvePathFromGlobalIndex)(systemIndex), 'rw');
+        const handle = await this.database.filesystem.open((0, utils_1.resolvePathFromGlobalIndex)(systemIndex), 'rw');
         if (handle) {
             try {
                 if (this.allTracks[systemIndex - 1].codecName === "MP3") {

package/dist/databases.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"databases.d.ts","sourceRoot":"","sources":["../src/databases.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAyB,aAAa,EAAE,MAAM,SAAS,CAAC;AAI/E,OAAO,EAAc,SAAS,EAAkB,MAAM,UAAU,CAAC;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AA2D/C,MAAM,WAAW,QAAQ;IAAE,cAAc,EAAE;QAAE,0BAA0B,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAC;AAC3I,MAAM,WAAW,YAAY;IAAG,eAAe,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAA;CAAC;AACvK,MAAM,WAAW,UAAU;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAA;CAAC;AAChH,MAAM,WAAW,aAAa;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC;AACxI,MAAM,WAAW,oBAAoB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE;AAC1H,qBAAa,eAAe;IAML,UAAU,EAAE,cAAc;IAAE,OAAO,CAAC,kBAAkB,CAAC;IAL1E,UAAU,EAAE;QAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC,CAAK;IAChD,eAAe,EAAE;QAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAC,CAAM;IACrD,oBAAoB,EAAE;QAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,EAAE,CAAA;KAAC,CAAM;IAC9D,qBAAqB,EAAE,YAAY,EAAE,CAAM;gBAExB,UAAU,EAAE,cAAc,EAAU,kBAAkB,CAAC,gCAAoB;IAExF,IAAI;IAoFH,iBAAiB;IAsEX,aAAa;IAU1B,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM;;;;;;;;;IAkB/B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAYvD,iBAAiB,IAAI;QAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,aAAa,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KAAC,EAAE;IAkC9L,kBAAkB,IAAI;QAAC,CAAC,MAAM,EAAE,MAAM,GAAG;YAAC,CAAC,KAAK,EAAE,MAAM,GAAG;gBAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAAC,QAAQ,EAAE,MAAM,CAAC;gBAAC,SAAS,EAAE,aAAa,CAAC;gBAAC,SAAS,EAAE,MAAM,CAAA;aAAE,EAAE,CAAA;SAAC,CAAA;KAAC;CAwBnK"}
+{"version":3,"file":"databases.d.ts","sourceRoot":"","sources":["../src/databases.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAyB,aAAa,EAAE,MAAM,SAAS,CAAC;AAI/E,OAAO,EAAc,SAAS,EAAkB,MAAM,UAAU,CAAC;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AA2D/C,MAAM,WAAW,QAAQ;IAAE,cAAc,EAAE;QAAE,0BAA0B,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAC;AAC3I,MAAM,WAAW,YAAY;IAAG,eAAe,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAA;CAAC;AACvK,MAAM,WAAW,UAAU;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAA;CAAC;AAChH,MAAM,WAAW,aAAa;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC;AACxI,MAAM,WAAW,oBAAoB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE;AAC1H,qBAAa,eAAe;IAML,UAAU,EAAE,cAAc;IAAE,OAAO,CAAC,kBAAkB,CAAC;IAL1E,UAAU,EAAE;QAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC,CAAK;IAChD,eAAe,EAAE;QAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAC,CAAM;IACrD,oBAAoB,EAAE;QAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,EAAE,CAAA;KAAC,CAAM;IAC9D,qBAAqB,EAAE,YAAY,EAAE,CAAM;gBAExB,UAAU,EAAE,cAAc,EAAU,kBAAkB,CAAC,EAAE,kBAAkB,YAAA;IAExF,IAAI;IAoFH,iBAAiB;IAsEX,aAAa;IAU1B,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM;;;;;;;;;IAkB/B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAYvD,iBAAiB,IAAI;QAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,aAAa,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KAAC,EAAE;IAkC9L,kBAAkB,IAAI;QAAC,CAAC,MAAM,EAAE,MAAM,GAAG;YAAC,CAAC,KAAK,EAAE,MAAM,GAAG;gBAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAAC,QAAQ,EAAE,MAAM,CAAC;gBAAC,SAAS,EAAE,aAAa,CAAC;gBAAC,SAAS,EAAE,MAAM,CAAA;aAAE,EAAE,CAAA;SAAC,CAAA;KAAC;CAwBnK"}

package/dist/derive-mp3-key.d.ts

@@ -8,5 +8,5 @@ export declare function deriveMP3ParametersFromOMA(mp3CodecInfo: Uint8Array): {
     flags: number;
 };
 export declare function deriveMP3TrackKey(rawFile: Uint8Array, callback?: (state: 'genFrames' | 'genKeys' | 'commonness', progress: number, outOf: number) => void): number;
-export declare function decryptMP3(fullFile: Uint8Array, fileId: number, deviceKey?: number, callback?: (state: 'genFrames' | 'genKeys' | 'commonness' | 'decrypt', progress: number, of: number) => void): Uint8Array;
+export declare function decryptMP3(fullFile: Uint8Array<ArrayBuffer>, fileId: number, deviceKey?: number, callback?: (state: 'genFrames' | 'genKeys' | 'commonness' | 'decrypt', progress: number, of: number) => void): Uint8Array<ArrayBuffer>;
 //# sourceMappingURL=derive-mp3-key.d.ts.map

package/dist/derive-mp3-key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derive-mp3-key.d.ts","sourceRoot":"","sources":["../src/derive-mp3-key.ts"],"names":[],"mappings":"AAUA,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,UAAU;;;;;;;;EAclE;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,CA6DlK;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,cAyBhM"}
+{"version":3,"file":"derive-mp3-key.d.ts","sourceRoot":"","sources":["../src/derive-mp3-key.ts"],"names":[],"mappings":"AAUA,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,UAAU;;;;;;;;EAclE;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,CA6DlK;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,CAyBvO"}

package/dist/derive-mp3-key.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptMP3 = exports.deriveMP3TrackKey = exports.deriveMP3ParametersFromOMA = void 0;
+exports.deriveMP3ParametersFromOMA = deriveMP3ParametersFromOMA;
+exports.deriveMP3TrackKey = deriveMP3TrackKey;
+exports.decryptMP3 = decryptMP3;
 const bytemanip_1 = require("./bytemanip");
 const encryption_1 = require("./encryption");
 const id3_1 = require("./id3");
@@ -22,7 +24,6 @@ function deriveMP3ParametersFromOMA(mp3CodecInfo) {
     const preemp = (cmb1 >> 2) & 3;
     return { version, layer, bitrate, sample, chmod, preemp, flags };
 }
-exports.deriveMP3ParametersFromOMA = deriveMP3ParametersFromOMA;
 function deriveMP3TrackKey(rawFile, callback) {
     // Make sure we're dealing with an MP3 OMA file
     let offset = 0;
@@ -82,7 +83,6 @@ function deriveMP3TrackKey(rawFile, callback) {
     const matchedKey = allKeys[commonness.indexOf(Math.max(...commonness))];
     return matchedKey;
 }
-exports.deriveMP3TrackKey = deriveMP3TrackKey;
 function decryptMP3(fullFile, fileId, deviceKey, callback) {
     const trackKey = (deviceKey ? (0, encryption_1.getMP3EncryptionKey)(deviceKey, fileId) : deriveMP3TrackKey(fullFile, callback ? (s, p) => callback(s, p, 127) : undefined)) >>> 0;
     // Make sure we're dealing with an MP3 OMA file
@@ -106,4 +106,3 @@ function decryptMP3(fullFile, fileId, deviceKey, callback) {
     }
     return data;
 }
-exports.decryptMP3 = decryptMP3;

package/dist/devices.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findDevice = exports.DeviceIds = void 0;
+exports.DeviceIds = void 0;
+exports.findDevice = findDevice;
 exports.DeviceIds = [
     { vendorId: 0x054c, productId: 0x01ad, name: 'Sony NW-HD1 / NW-HD2' },
     { vendorId: 0x054c, productId: 0x0210, name: 'Sony NW-HD3' },
@@ -118,4 +119,3 @@ function findDevice(vid, pid) {
     var _a;
     return (_a = exports.DeviceIds.find(e => e.vendorId === vid && e.productId === pid)) !== null && _a !== void 0 ? _a : null;
 }
-exports.findDevice = findDevice;

package/dist/encryption.d.ts

@@ -5,12 +5,12 @@ export declare const EKBROOTS: {
 };
 export declare function importKeys(rawKeysContents: Uint8Array): void;
 export declare function getMP3EncryptionKey(discId: number, trackNumber: number): number;
-export declare function createTrackKeyForKeyring(ekbNum: number, verificationKey: Uint8Array, trackKey: Uint8Array): Uint8Array;
-export declare function createTrackKeyFromKeyring(ekbNum: number, encryptedVerificationKey: Uint8Array, encryptedTrackKey: Uint8Array): Uint8Array;
-export declare function createMaclistValue(ekbNum: number, verificationKey: Uint8Array, contents: Uint8Array): Uint8Array;
-export declare function retailMac(message: Uint8Array, key: Uint8Array): Uint8Array;
-export declare function createIcvMac(icvAndHeader: Uint8Array, sessionKey: Uint8Array): Uint8Array;
-export declare function createTrackMac2(trackKeyWa: Crypto.lib.WordArray, trackEntry: Uint8Array): Uint8Array;
-export declare function createTrackMac(trackKey: Uint8Array, trackEntry: Uint8Array): Uint8Array;
-export declare function desDecrypt(data: Uint8Array, key: Uint8Array): Uint8Array;
+export declare function createTrackKeyForKeyring(ekbNum: number, verificationKey: Uint8Array, trackKey: Uint8Array): Uint8Array<ArrayBuffer>;
+export declare function createTrackKeyFromKeyring(ekbNum: number, encryptedVerificationKey: Uint8Array, encryptedTrackKey: Uint8Array): Uint8Array<ArrayBuffer>;
+export declare function createMaclistValue(ekbNum: number, verificationKey: Uint8Array, contents: Uint8Array): Uint8Array<ArrayBuffer>;
+export declare function retailMac(message: Uint8Array, key: Uint8Array): Uint8Array<ArrayBuffer>;
+export declare function createIcvMac(icvAndHeader: Uint8Array, sessionKey: Uint8Array): Uint8Array<ArrayBuffer>;
+export declare function createTrackMac2(trackKeyWa: Crypto.lib.WordArray, trackEntry: Uint8Array): Uint8Array<ArrayBuffer>;
+export declare function createTrackMac(trackKey: Uint8Array, trackEntry: Uint8Array): Uint8Array<ArrayBuffer>;
+export declare function desDecrypt(data: Uint8Array, key: Uint8Array): Uint8Array<ArrayBuffer>;
 //# sourceMappingURL=encryption.d.ts.map

package/dist/encryption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encryption.d.ts","sourceRoot":"","sources":["../src/encryption.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAK9C,wBAAsB,UAAU,kBAG/B;AAGD,eAAO,MAAM,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAExC,CAAC;AAEX,wBAAgB,UAAU,CAAC,eAAe,EAAE,UAAU,QAQrD;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAEtE;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,cAsBzG;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,wBAAwB,EAAE,UAAU,EAAE,iBAAiB,EAAE,UAAU,cAsB5H;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,cAenG;AAID,wBAAgB,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,cAgB7D;AAED,wBAAgB,YAAY,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,cAM5E;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,cAQvF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,cAG1E;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,cAE3D"}
+{"version":3,"file":"encryption.d.ts","sourceRoot":"","sources":["../src/encryption.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAK9C,wBAAsB,UAAU,kBAG/B;AAGD,eAAO,MAAM,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAExC,CAAC;AAEX,wBAAgB,UAAU,CAAC,eAAe,EAAE,UAAU,QAQrD;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAEtE;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,2BAsBzG;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,wBAAwB,EAAE,UAAU,EAAE,iBAAiB,EAAE,UAAU,2BAsB5H;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,2BAenG;AAID,wBAAgB,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,2BAgB7D;AAED,wBAAgB,YAAY,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,2BAM5E;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,2BAQvF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,2BAG1E;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,2BAE3D"}

package/dist/encryption.js

@@ -3,7 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.desDecrypt = exports.createTrackMac = exports.createTrackMac2 = exports.createIcvMac = exports.retailMac = exports.createMaclistValue = exports.createTrackKeyFromKeyring = exports.createTrackKeyForKeyring = exports.getMP3EncryptionKey = exports.importKeys = exports.EKBROOTS = exports.initCrypto = void 0;
+exports.EKBROOTS = void 0;
+exports.initCrypto = initCrypto;
+exports.importKeys = importKeys;
+exports.getMP3EncryptionKey = getMP3EncryptionKey;
+exports.createTrackKeyForKeyring = createTrackKeyForKeyring;
+exports.createTrackKeyFromKeyring = createTrackKeyFromKeyring;
+exports.createMaclistValue = createMaclistValue;
+exports.retailMac = retailMac;
+exports.createIcvMac = createIcvMac;
+exports.createTrackMac2 = createTrackMac2;
+exports.createTrackMac = createTrackMac;
+exports.desDecrypt = desDecrypt;
 const crypto_js_wasm_1 = __importDefault(require("@originjs/crypto-js-wasm"));
 const bytemanip_1 = require("./bytemanip");
 const errors_1 = require("./errors");
@@ -12,7 +23,6 @@ async function initCrypto() {
     await crypto_js_wasm_1.default.TripleDES.loadWasm();
     await crypto_js_wasm_1.default.DES.loadWasm();
 }
-exports.initCrypto = initCrypto;
 // prettier-ignore
 exports.EKBROOTS = {
 // <Redacted>
@@ -26,11 +36,9 @@ function importKeys(rawKeysContents) {
         exports.EKBROOTS[ekbid] = rawKeysContents.slice(offset, offset += 3 * 8);
     }
 }
-exports.importKeys = importKeys;
 function getMP3EncryptionKey(discId, trackNumber) {
     return ((trackNumber * 0x5296E435 + 0x2465) ^ discId) >>> 0;
 }
-exports.getMP3EncryptionKey = getMP3EncryptionKey;
 function createTrackKeyForKeyring(ekbNum, verificationKey, trackKey) {
     if (!(ekbNum in exports.EKBROOTS)) {
         throw new errors_1.NWJSError('Requested decryption with an unknown EKB');
@@ -52,7 +60,6 @@ function createTrackKeyForKeyring(ekbNum, verificationKey, trackKey) {
     });
     return (0, utils_1.wordArrayToByteArray)(decryptedTrackKey, 8);
 }
-exports.createTrackKeyForKeyring = createTrackKeyForKeyring;
 function createTrackKeyFromKeyring(ekbNum, encryptedVerificationKey, encryptedTrackKey) {
     if (!(ekbNum in exports.EKBROOTS)) {
         throw new errors_1.NWJSError('Requested decryption with an unknown EKB');
@@ -73,7 +80,6 @@ function createTrackKeyFromKeyring(ekbNum, encryptedVerificationKey, encryptedTr
     }).ciphertext;
     return (0, utils_1.wordArrayToByteArray)(decryptedTrackKey, 8);
 }
-exports.createTrackKeyFromKeyring = createTrackKeyFromKeyring;
 function createMaclistValue(ekbNum, verificationKey, contents) {
     if (!(ekbNum in exports.EKBROOTS)) {
         throw new errors_1.NWJSError('Requested decryption with an unknown EKB');
@@ -88,7 +94,6 @@ function createMaclistValue(ekbNum, verificationKey, contents) {
     });
     return createTrackMac2(decryptedVerificationKey, contents);
 }
-exports.createMaclistValue = createMaclistValue;
 const NO_PADDING = { pad: (a) => a, unpad: (a) => a };
 function retailMac(message, key) {
     const keyA = key.subarray(0, 8);
@@ -107,7 +112,6 @@ function retailMac(message, key) {
     const final = crypto_js_wasm_1.default.DES.encrypt(encB, keyAWa, { padding: NO_PADDING, mode: crypto_js_wasm_1.default.mode.ECB }).ciphertext;
     return (0, utils_1.wordArrayToByteArray)(final);
 }
-exports.retailMac = retailMac;
 function createIcvMac(icvAndHeader, sessionKey) {
     const icvWa = crypto_js_wasm_1.default.lib.WordArray.create(icvAndHeader);
     const sessionKeyWa = crypto_js_wasm_1.default.lib.WordArray.create(sessionKey);
@@ -115,7 +119,6 @@ function createIcvMac(icvAndHeader, sessionKey) {
     const result = crypto_js_wasm_1.default.DES.encrypt(icvWa, sessionKeyWa, { mode: crypto_js_wasm_1.default.mode.CBC, iv: zeroWa, padding: NO_PADDING });
     return (0, utils_1.wordArrayToByteArray)(result.ciphertext).subarray(-8);
 }
-exports.createIcvMac = createIcvMac;
 function createTrackMac2(trackKeyWa, trackEntry) {
     const trackEntryWa = crypto_js_wasm_1.default.lib.WordArray.create(trackEntry);
     const macKeySourceWa = crypto_js_wasm_1.default.lib.WordArray.create(new Uint8Array(8).fill(0));
@@ -124,13 +127,10 @@ function createTrackMac2(trackKeyWa, trackEntry) {
     const mac = crypto_js_wasm_1.default.DES.encrypt(trackEntryWa, macKey, { mode: crypto_js_wasm_1.default.mode.CBC, iv: zeroWa, padding: NO_PADDING });
     return (0, utils_1.wordArrayToByteArray)(mac.ciphertext).subarray(-8);
 }
-exports.createTrackMac2 = createTrackMac2;
 function createTrackMac(trackKey, trackEntry) {
     const trackKeyWa = crypto_js_wasm_1.default.lib.WordArray.create(trackKey);
     return createTrackMac2(trackKeyWa, trackEntry);
 }
-exports.createTrackMac = createTrackMac;
 function desDecrypt(data, key) {
     return (0, utils_1.wordArrayToByteArray)(crypto_js_wasm_1.default.TripleDES.decrypt(crypto_js_wasm_1.default.lib.CipherParams.create({ ciphertext: crypto_js_wasm_1.default.lib.WordArray.create(data) }), crypto_js_wasm_1.default.lib.WordArray.create(key), { mode: crypto_js_wasm_1.default.mode.ECB, iv: crypto_js_wasm_1.default.lib.WordArray.create(new Uint8Array(8).fill(0)) }), data.length);
 }
-exports.desDecrypt = desDecrypt;

package/dist/filesystem/usb-mass-storage-webusb-filesystem.d.ts

@@ -2,37 +2,38 @@ import { HiMDFile, HiMDFilesystem, SonyVendorUSMCDriver, UMSCHiMDFilesystem } fr
 import { WebUSBDevice } from 'usb';
 export declare class SonyVendorNWJSUSMCDriver extends SonyVendorUSMCDriver {
     constructor(webUSB: WebUSBDevice);
-    protected drmRead(param: number, length: number): Promise<Uint8Array>;
+    protected drmRead(param: number, length: number): Promise<Uint8Array<ArrayBuffer>>;
     protected drmWrite(param: number, data: Uint8Array): Promise<void>;
     getDiscID(): Promise<Uint8Array>;
     writeHostLeafID(leafID: Uint8Array, hostNonce: Uint8Array): Promise<void>;
     getAuthenticationStage2Info(): Promise<{
-        discId: Uint8Array;
-        mac: Uint8Array;
-        deviceLeafId: Uint8Array;
-        deviceNonce: Uint8Array;
+        discId: Uint8Array<ArrayBuffer>;
+        mac: Uint8Array<ArrayBuffer>;
+        deviceLeafId: Uint8Array<ArrayBuffer>;
+        deviceNonce: Uint8Array<ArrayBuffer>;
     }>;
     writeAuthenticationStage3Info(hostMac: Uint8Array): Promise<void>;
     readMasterKey(): Promise<{
-        header: Uint8Array;
-        masterKey: Uint8Array;
+        header: Uint8Array<ArrayBuffer>;
+        masterKey: Uint8Array<ArrayBuffer>;
     }>;
     writeMasterKeyAndMac(generation: number, masterKey: Uint8Array, mac: Uint8Array, sessionKey: Uint8Array): Promise<void>;
 }
+type _Uint8Array = Uint8Array<ArrayBuffer>;
 export declare class UMSCNWJSSession {
     protected driver: SonyVendorNWJSUSMCDriver;
     protected fs: HiMDFilesystem;
-    hostNonce: Uint8Array;
-    hostLeafId: Uint8Array;
-    deviceNonce?: Uint8Array;
-    discId?: Uint8Array;
-    deviceLeafId?: Uint8Array;
-    currentIcv?: Uint8Array;
-    currentIcvHeader?: Uint8Array;
-    sessionKey?: Uint8Array;
+    hostNonce: Uint8Array<ArrayBuffer>;
+    hostLeafId: Uint8Array<ArrayBuffer>;
+    deviceNonce?: _Uint8Array;
+    discId?: _Uint8Array;
+    deviceLeafId?: _Uint8Array;
+    currentIcv?: _Uint8Array;
+    currentIcvHeader?: _Uint8Array;
+    sessionKey?: _Uint8Array;
     mclistHandle?: HiMDFile;
     currentGeneration?: number;
-    allMacs?: Uint8Array;
+    allMacs?: _Uint8Array;
     constructor(driver: SonyVendorNWJSUSMCDriver, fs: HiMDFilesystem);
     performAuthorization(): Promise<void>;
     finalizeSession(): Promise<void>;
@@ -44,4 +45,5 @@ export declare class UMSCNWJSFilesystem extends UMSCHiMDFilesystem {
     constructor(webUSB: WebUSBDevice, partition?: number | null);
     protected initFS(bypassCoherencyChecks?: boolean | undefined): Promise<void>;
 }
+export {};
 //# sourceMappingURL=usb-mass-storage-webusb-filesystem.d.ts.map

package/dist/filesystem/usb-mass-storage-webusb-filesystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usb-mass-storage-webusb-filesystem.d.ts","sourceRoot":"","sources":["../../src/filesystem/usb-mass-storage-webusb-filesystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI7F,OAAO,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAKnC,qBAAa,wBAAyB,SAAQ,oBAAoB;gBAClD,MAAM,EAAE,YAAY;cAIhB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;cAuBrC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IA2BlD,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;IAIhC,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU;IASzD,2BAA2B;;;;;;IAoB3B,6BAA6B,CAAC,OAAO,EAAE,UAAU;IAyBjD,aAAa;;;;IAWb,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;CAuBhH;AAED,qBAAa,eAAe;IAgBZ,SAAS,CAAC,MAAM,EAAE,wBAAwB;IAAE,SAAS,CAAC,EAAE,EAAE,cAAc;IAfpF,SAAS,aAAuB;IAChC,UAAU,aAAoE;IAE9E,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,gBAAgB,CAAC,EAAE,UAAU,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB,YAAY,CAAC,EAAE,QAAQ,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,OAAO,CAAC,EAAE,UAAU,CAAC;gBAEC,MAAM,EAAE,wBAAwB,EAAY,EAAE,EAAE,cAAc;IAEvE,oBAAoB;IAkBpB,eAAe;IAYrB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU;CAG5D;AAED,qBAAa,kBAAmB,SAAQ,kBAAkB;IAEpB,OAAO,CAAC,SAAS;IADnD,MAAM,EAAE,wBAAwB,CAAC;gBACrB,MAAM,EAAE,YAAY,EAAU,SAAS,GAAE,MAAM,GAAG,IAAQ;cAKtD,MAAM,CAAC,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAYrF"}
+{"version":3,"file":"usb-mass-storage-webusb-filesystem.d.ts","sourceRoot":"","sources":["../../src/filesystem/usb-mass-storage-webusb-filesystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI7F,OAAO,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAKnC,qBAAa,wBAAyB,SAAQ,oBAAoB;gBAClD,MAAM,EAAE,YAAY;cAIhB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;cAuBxE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IA2BlD,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;IAIhC,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU;IASzD,2BAA2B;;;;;;IAoB3B,6BAA6B,CAAC,OAAO,EAAE,UAAU;IAyBjD,aAAa;;;;IAWb,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;CAuBhH;AACD,KAAK,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AAE3C,qBAAa,eAAe;IAgBZ,SAAS,CAAC,MAAM,EAAE,wBAAwB;IAAE,SAAS,CAAC,EAAE,EAAE,cAAc;IAfpF,SAAS,0BAAuB;IAChC,UAAU,0BAAoE;IAE9E,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,UAAU,CAAC,EAAE,WAAW,CAAC;IAEzB,YAAY,CAAC,EAAE,QAAQ,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,OAAO,CAAC,EAAE,WAAW,CAAC;gBAEA,MAAM,EAAE,wBAAwB,EAAY,EAAE,EAAE,cAAc;IAEvE,oBAAoB;IAkBpB,eAAe;IAYrB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU;CAG5D;AAED,qBAAa,kBAAmB,SAAQ,kBAAkB;IAEpB,OAAO,CAAC,SAAS;IADnD,MAAM,EAAE,wBAAwB,CAAC;gBACrB,MAAM,EAAE,YAAY,EAAU,SAAS,GAAE,MAAM,GAAG,IAAQ;cAKtD,MAAM,CAAC,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAYrF"}