networkwm-js 0.2.1 → 0.2.3

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;
@@ -27,7 +27,7 @@ export declare class DatabaseAbstraction {
     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>;
+    uploadTrack(trackInfo: InboundTrackMetadata, codec: CodecInfo, rawData: Uint8Array<ArrayBuffer>, session?: UMSCNWJSSession, callback?: (done: number, outOf: number) => void): 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;IAe9C,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;IAmB9C,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");
@@ -125,7 +125,7 @@ class DatabaseAbstraction {
             // 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);
@@ -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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devices.d.ts","sourceRoot":"","sources":["../src/devices.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,kBAAkB;IAC/B,UAAU,EAAE,CAAC,MAAM,OAAO,MAAM,CAAC,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,SAAS,EAAE,gBAAgB,EA+GvC,CAAC;AAEF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAE5E"}
+{"version":3,"file":"devices.d.ts","sourceRoot":"","sources":["../src/devices.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,kBAAkB;IAC/B,UAAU,EAAE,CAAC,MAAM,OAAO,MAAM,CAAC,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,SAAS,EAAE,gBAAgB,EAgHvC,CAAC;AAEF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAE5E"}

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' },
@@ -48,7 +49,8 @@ exports.DeviceIds = [
     {
         vendorId: 0x054c,
         productId: 0x01FB,
-        name: 'Sony NW-E305',
+        name: 'Sony NW-E305 / NW-E507',
+        disableDRM: true,
         databaseParameters: {
             initLayers: ['stick_gtrlst'],
         }
@@ -117,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"}

package/dist/filesystem/usb-mass-storage-webusb-filesystem.js

@@ -119,12 +119,12 @@ class SonyVendorNWJSUSMCDriver extends himd_js_1.SonyVendorUSMCDriver {
         // mac = 0x9e, 0x29, 0xe4, 0xa3, 0x4f, 0x8d, 0x43, 0xc7
         const generationBytes = (0, bytemanip_1.writeUint32)(generation);
         const theSonySoup = new Uint8Array([
-            0x00, 0x20, 0x00, 0x98,
-            ...generationBytes,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x01, 0x00, 0x21,
-            ...masterKey,
-            ...mac,
+            0x00, 0x20, 0x00, 0x98, // Rewrite
+            ...generationBytes, // Generation data
+            0x00, 0x00, 0x00, 0x00, // ???
+            0x00, 0x01, 0x00, 0x21, // Authenticate using ekb 00010021
+            ...masterKey, // The key
+            ...mac, // MAC over the MACLIST, bound to device
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         ]);
         theSonySoup.set((0, bytemanip_1.writeUint32)(generation), 4);

package/dist/id3.d.ts

@@ -22,12 +22,12 @@ export declare function readInitialID3Header(buffer: Uint8Array): {
 export declare function parse(buffer: Uint8Array): ID3Tags & {
     size: number;
 };
-export declare function serialize(tags: ID3Tags, constSize?: number): Uint8Array;
-export declare function encodeUTF16BEStringEA3(source: string, includeType?: boolean): Uint8Array;
-export declare function encodeSonyWeirdString(type: string, data: string): Uint8Array;
+export declare function serialize(tags: ID3Tags, constSize?: number): Uint8Array<ArrayBuffer>;
+export declare function encodeUTF16BEStringEA3(source: string, includeType?: boolean): Uint8Array<ArrayBuffer>;
+export declare function encodeSonyWeirdString(type: string, data: string): Uint8Array<ArrayBuffer>;
 export declare function createCommonID3Tags(titleInfo: InboundTrackMetadata): {
     id: string;
-    contents: Uint8Array;
+    contents: Uint8Array<ArrayBuffer>;
     flags: number;
 }[];
 //# sourceMappingURL=id3.d.ts.map

package/dist/id3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"id3.d.ts","sourceRoot":"","sources":["../src/id3.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAiB,MAAM,aAAa,CAAC;AAGlE,MAAM,WAAW,MAAM;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,UAAU,CAAC;CACxB;AAED,MAAM,WAAW,OAAO;IACpB,OAAO,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAYnF;AAKD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAiBtH;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAgDpE;AAWD,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,UAAU,CA8CvE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,UAAO,cAgCxE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,cAM/D;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,oBAAoB;;;;IAYlE"}
+{"version":3,"file":"id3.d.ts","sourceRoot":"","sources":["../src/id3.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAiB,MAAM,aAAa,CAAC;AAGlE,MAAM,WAAW,MAAM;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,UAAU,CAAC;CACxB;AAED,MAAM,WAAW,OAAO;IACpB,OAAO,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAYnF;AAKD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAiBtH;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAgDpE;AAWD,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,CA8CpF;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,UAAO,2BAgCxE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,2BAM/D;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,oBAAoB;;;;IAYlE"}

package/dist/id3.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCommonID3Tags = exports.encodeSonyWeirdString = exports.encodeUTF16BEStringEA3 = exports.serialize = exports.parse = exports.readInitialID3Header = exports.readSynchsafeInt32 = void 0;
+exports.readSynchsafeInt32 = readSynchsafeInt32;
+exports.readInitialID3Header = readInitialID3Header;
+exports.parse = parse;
+exports.serialize = serialize;
+exports.encodeUTF16BEStringEA3 = encodeUTF16BEStringEA3;
+exports.encodeSonyWeirdString = encodeSonyWeirdString;
+exports.createCommonID3Tags = createCommonID3Tags;
 const bytemanip_1 = require("./bytemanip");
 const utils_1 = require("./utils");
 function readSynchsafeInt32(data, offset) {
@@ -16,7 +22,6 @@ function readSynchsafeInt32(data, offset) {
     value |= byte & 0x7F;
     return [value, offset];
 }
-exports.readSynchsafeInt32 = readSynchsafeInt32;
 ;
 const textDecoder = new TextDecoder();
 const textEncoder = new TextEncoder();
@@ -36,7 +41,6 @@ function readInitialID3Header(buffer) {
     [size, offset] = readSynchsafeInt32(data, offset);
     return { major, minor, size, flags };
 }
-exports.readInitialID3Header = readInitialID3Header;
 function parse(buffer) {
     const data = new DataView(buffer.buffer);
     let offset = 0;
@@ -79,7 +83,6 @@ function parse(buffer) {
         size,
     };
 }
-exports.parse = parse;
 ;
 function writeSynchsafeInt32(value) {
     const array = new Uint8Array(4);
@@ -129,7 +132,6 @@ function serialize(tags, constSize) {
     }
     return result;
 }
-exports.serialize = serialize;
 ;
 function encodeUTF16BEStringEA3(source, includeType = true) {
     const rawArr = includeType ? [2] : []; // 2 - marker - UTF16BE
@@ -159,7 +161,6 @@ function encodeUTF16BEStringEA3(source, includeType = true) {
     }
     return new Uint8Array(rawArr);
 }
-exports.encodeUTF16BEStringEA3 = encodeUTF16BEStringEA3;
 function encodeSonyWeirdString(type, data) {
     return (0, utils_1.concatUint8Arrays)([
         encodeUTF16BEStringEA3(type),
@@ -167,7 +168,6 @@ function encodeSonyWeirdString(type, data) {
         encodeUTF16BEStringEA3(data, false),
     ]);
 }
-exports.encodeSonyWeirdString = encodeSonyWeirdString;
 function createCommonID3Tags(titleInfo) {
     var _a;
     return [
@@ -182,4 +182,3 @@ function createCommonID3Tags(titleInfo) {
         { id: "TXXX", contents: encodeSonyWeirdString("OMG_TIT2S", titleInfo.title), flags: 0 },
     ];
 }
-exports.createCommonID3Tags = createCommonID3Tags;

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export * from './filesystem';
-export * from './helpers';
 export * from './bytemanip';
 export * from './databases';
 export * from './database-abstraction';
@@ -7,5 +6,6 @@ export * from './sort';
 export * from './tagged-oma';
 export * from './devices';
 export * from './derive-mp3-key';
+export { resolvePathFromGlobalIndex } from './utils';
 export { importKeys, initCrypto } from './encryption';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}

package/dist/index.js

@@ -14,9 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initCrypto = exports.importKeys = void 0;
+exports.initCrypto = exports.importKeys = exports.resolvePathFromGlobalIndex = void 0;
 __exportStar(require("./filesystem"), exports);
-__exportStar(require("./helpers"), exports);
 __exportStar(require("./bytemanip"), exports);
 __exportStar(require("./databases"), exports);
 __exportStar(require("./database-abstraction"), exports);
@@ -24,6 +23,8 @@ __exportStar(require("./sort"), exports);
 __exportStar(require("./tagged-oma"), exports);
 __exportStar(require("./devices"), exports);
 __exportStar(require("./derive-mp3-key"), exports);
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "resolvePathFromGlobalIndex", { enumerable: true, get: function () { return utils_1.resolvePathFromGlobalIndex; } });
 var encryption_1 = require("./encryption");
 Object.defineProperty(exports, "importKeys", { enumerable: true, get: function () { return encryption_1.importKeys; } });
 Object.defineProperty(exports, "initCrypto", { enumerable: true, get: function () { return encryption_1.initCrypto; } });

package/dist/init-data.d.ts

@@ -1,27 +1,27 @@
-export declare type InitializationLayer = {
+export type InitializationLayer = {
     [fileName: string]: Uint8Array;
 };
 export declare const LAYERS: {
     root: {
-        "00010021.DAT": Uint8Array;
-        "00GTRLST.DAT": Uint8Array;
-        "01TREE01.DAT": Uint8Array;
-        "01TREE02.DAT": Uint8Array;
-        "01TREE03.DAT": Uint8Array;
-        "01TREE04.DAT": Uint8Array;
-        "02TREINF.DAT": Uint8Array;
-        "03GINF01.DAT": Uint8Array;
-        "03GINF02.DAT": Uint8Array;
-        "03GINF03.DAT": Uint8Array;
-        "03GINF04.DAT": Uint8Array;
-        "04CNTINF.DAT": Uint8Array;
-        "05CHINDC.DAT": Uint8Array;
+        "00010021.DAT": Uint8Array<ArrayBuffer>;
+        "00GTRLST.DAT": Uint8Array<ArrayBuffer>;
+        "01TREE01.DAT": Uint8Array<ArrayBuffer>;
+        "01TREE02.DAT": Uint8Array<ArrayBuffer>;
+        "01TREE03.DAT": Uint8Array<ArrayBuffer>;
+        "01TREE04.DAT": Uint8Array<ArrayBuffer>;
+        "02TREINF.DAT": Uint8Array<ArrayBuffer>;
+        "03GINF01.DAT": Uint8Array<ArrayBuffer>;
+        "03GINF02.DAT": Uint8Array<ArrayBuffer>;
+        "03GINF03.DAT": Uint8Array<ArrayBuffer>;
+        "03GINF04.DAT": Uint8Array<ArrayBuffer>;
+        "04CNTINF.DAT": Uint8Array<ArrayBuffer>;
+        "05CHINDC.DAT": Uint8Array<ArrayBuffer>;
     };
     stick_gtrlst: {
-        "00GTRLST.DAT": Uint8Array;
+        "00GTRLST.DAT": Uint8Array<ArrayBuffer>;
     };
     needs_cid: {
-        "05CIDLST.DAT": Uint8Array;
+        "05CIDLST.DAT": Uint8Array<ArrayBuffer>;
     };
 };
 //# sourceMappingURL=init-data.d.ts.map

package/dist/init-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-data.d.ts","sourceRoot":"","sources":["../src/init-data.ts"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAC;AAErE,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;CAsBlB,CAAC"}
+{"version":3,"file":"init-data.d.ts","sourceRoot":"","sources":["../src/init-data.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAC;AAErE,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;CAsBlB,CAAC"}

package/dist/initialization.js

@@ -2,7 +2,8 @@
 // This file's job is to create the initial structures required to get a brand new (or formatted)
 // Sony NW to work.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeIfNeeded = exports.initializeNW = void 0;
+exports.initializeNW = initializeNW;
+exports.initializeIfNeeded = initializeIfNeeded;
 const init_data_1 = require("./init-data");
 function constructFinalContents(layerNames) {
     const currentOverlayed = { ...init_data_1.LAYERS.root };
@@ -31,7 +32,6 @@ async function initializeNW(filesystem, initLayers) {
     await maclist.close();
     console.log(`Initializing complete!`);
 }
-exports.initializeNW = initializeNW;
 async function initializeIfNeeded(filesystem, initLayers) {
     const rootContents = await filesystem.list("/");
     if (!rootContents.find(e => e.type === 'directory' && e.name === '/OMGAUDIO')) {
@@ -39,4 +39,3 @@ async function initializeIfNeeded(filesystem, initLayers) {
         await initializeNW(filesystem, initLayers);
     }
 }
-exports.initializeIfNeeded = initializeIfNeeded;

package/dist/mp3.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateMP3Metadata = exports.createMP3OMAFile = exports.generateMP3CodecField = void 0;
+exports.generateMP3CodecField = generateMP3CodecField;
+exports.createMP3OMAFile = createMP3OMAFile;
+exports.updateMP3Metadata = updateMP3Metadata;
 const mp3_parser_1 = require("mp3-parser");
 const bytemanip_1 = require("./bytemanip");
 const codecs_1 = require("./codecs");
@@ -98,7 +100,6 @@ function generateMP3CodecField(mp3Data) {
         frames: frameCount,
     };
 }
-exports.generateMP3CodecField = generateMP3CodecField;
 const METADATA_BLOCK_SIZE = 0x1000;
 function createMP3OMAFile(index, metadata, rawFile, deviceKey, codec) {
     // Strip all ID3 tags from the source MP3 file
@@ -141,7 +142,6 @@ function createMP3OMAFile(index, metadata, rawFile, deviceKey, codec) {
     }
     return finalFileBuffer;
 }
-exports.createMP3OMAFile = createMP3OMAFile;
 async function updateMP3Metadata(file, titleInfo) {
     // Check if this is a valid file.
     await file.seek(0);
@@ -162,4 +162,3 @@ async function updateMP3Metadata(file, titleInfo) {
     await file.seek(0);
     await file.write(newEA3);
 }
-exports.updateMP3Metadata = updateMP3Metadata;

package/dist/{helpers.d.ts → node-helpers.d.ts}

@@ -1,7 +1,6 @@
 import { WebUSBDevice } from "usb";
 import { UMSCNWJSFilesystem } from "./filesystem";
 import { DeviceDefinition } from "./devices";
-export declare function resolvePathFromGlobalIndex(globalTrackIndex: number): string;
 export declare function createNWJSFS(device: {
     dev: WebUSBDevice;
     definition: DeviceDefinition;
@@ -10,4 +9,4 @@ export declare function openNewDeviceNode(): Promise<{
     dev: WebUSBDevice;
     definition: DeviceDefinition;
 } | null>;
-//# sourceMappingURL=helpers.d.ts.map
+//# sourceMappingURL=node-helpers.d.ts.map

package/dist/node-helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../src/node-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAkB,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAa,MAAM,WAAW,CAAC;AAGxD,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,gBAAgB,CAAA;CAAE,+BAO7F;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC;IAAE,GAAG,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,gBAAgB,CAAA;CAAE,GAAG,IAAI,CAAC,CA2B7G"}

package/dist/{helpers.js → node-helpers.js}

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openNewDeviceNode = exports.createNWJSFS = exports.resolvePathFromGlobalIndex = void 0;
+exports.createNWJSFS = createNWJSFS;
+exports.openNewDeviceNode = openNewDeviceNode;
 const usb_1 = require("usb");
 const filesystem_1 = require("./filesystem");
-const utils_1 = require("./utils");
 const devices_1 = require("./devices");
 const initialization_1 = require("./initialization");
-function resolvePathFromGlobalIndex(globalTrackIndex) {
-    return (0, utils_1.join)('OMGAUDIO', `10F${(globalTrackIndex >> 8).toString(16).padStart(2, '0')}`, '1000' + globalTrackIndex.toString(16).padStart(4, '0').toUpperCase() + '.OMA');
-}
-exports.resolvePathFromGlobalIndex = resolvePathFromGlobalIndex;
 async function createNWJSFS(device) {
     var _a, _b;
     // Connect into the HiMD codebase
@@ -18,7 +14,6 @@ async function createNWJSFS(device) {
     await (0, initialization_1.initializeIfNeeded)(fs, (_b = (_a = device.definition.databaseParameters) === null || _a === void 0 ? void 0 : _a.initLayers) !== null && _b !== void 0 ? _b : []);
     return fs;
 }
-exports.createNWJSFS = createNWJSFS;
 async function openNewDeviceNode() {
     let legacyDevice, definition = null;
     for (let dev of devices_1.DeviceIds) {
@@ -45,4 +40,3 @@ async function openNewDeviceNode() {
     await webUsbDevice.open();
     return { dev: webUsbDevice, definition };
 }
-exports.openNewDeviceNode = openNewDeviceNode;

package/dist/sort.d.ts

@@ -1,9 +1,9 @@
-export declare type ComplexSortGroupedResult<T> = T[] | {
+export type ComplexSortGroupedResult<T> = T[] | {
     name: string;
     contents: ComplexSortGroupedResult<T>;
     __complexSortGroupedResult: 1;
 }[];
-export declare type ComplexSortFormatPart = {
+export type ComplexSortFormatPart = {
     var: string;
 } | {
     literal: string;

package/dist/sort.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"AAAA,oBAAY,wBAAwB,CAAC,CAAC,IAClC,CAAC,EAAE,GACH;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAAC,0BAA0B,EAAE,CAAC,CAAA;CAAE,EAAE,CAAC;AAE7F,oBAAY,qBAAqB,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1E,wBAAgB,WAAW,CAAC,CAAC,EACzB,MAAM,EAAE,qBAAqB,EAAE,EAAE,EACjC,IAAI,EAAE,CAAC,EAAE,GACV,wBAAwB,CAAC,CAAC,CAAC,CAwC7B;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAcjE"}
+{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,wBAAwB,CAAC,CAAC,IAClC,CAAC,EAAE,GACH;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAAC,0BAA0B,EAAE,CAAC,CAAA;CAAE,EAAE,CAAC;AAE7F,MAAM,MAAM,qBAAqB,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1E,wBAAgB,WAAW,CAAC,CAAC,EACzB,MAAM,EAAE,qBAAqB,EAAE,EAAE,EACjC,IAAI,EAAE,CAAC,EAAE,GACV,wBAAwB,CAAC,CAAC,CAAC,CAwC7B;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAcjE"}

package/dist/sort.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flatten = exports.complexSort = void 0;
+exports.complexSort = complexSort;
+exports.flatten = flatten;
 function complexSort(format, data) {
     function createFieldForFormat(format, entry) {
         let str = "";
@@ -42,7 +43,6 @@ function complexSort(format, data) {
         }));
     }
 }
-exports.complexSort = complexSort;
 function flatten(data) {
     let finalArray = [];
     if (!data.length)
@@ -59,4 +59,3 @@ function flatten(data) {
     }
     return finalArray;
 }
-exports.flatten = flatten;

package/dist/tables.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeTable = exports.parseTable = void 0;
+exports.parseTable = parseTable;
+exports.serializeTable = serializeTable;
 const bytemanip_1 = require("./bytemanip");
 const utils_1 = require("./utils");
 function parseTable(tableFileContents) {
@@ -45,7 +46,6 @@ function parseTable(tableFileContents) {
     }
     return { classes: classDefinitions, contents: classContents, name: tableName };
 }
-exports.parseTable = parseTable;
 function serializeTable(tableFile, writeSecondLength = true) {
     const textEncoder = new TextEncoder();
     // Recalculate lengths and starting addresses.
@@ -101,4 +101,3 @@ function serializeTable(tableFile, writeSecondLength = true) {
     }
     return data;
 }
-exports.serializeTable = serializeTable;

package/dist/tagged-oma.d.ts

@@ -1,18 +1,20 @@
 import { HiMDCodec, HiMDFile } from "himd-js";
 import { InboundTrackMetadata, TrackMetadata } from './databases';
+type _Uint8Array = Uint8Array<ArrayBuffer>;
 export interface OmaFile {
     data: Uint8Array;
     duration: number;
     maclistValue?: Uint8Array;
 }
-export declare function createTaggedEncryptedOMA(rawData: Uint8Array, titleInfo: InboundTrackMetadata, codec: {
+export declare function createTaggedEncryptedOMA(rawData: _Uint8Array, titleInfo: InboundTrackMetadata, codec: {
     codecId: HiMDCodec;
     codecInfo: Uint8Array;
 }): OmaFile;
-export declare function createTaggedOMA(rawData: Uint8Array, titleInfo: InboundTrackMetadata, codec: {
+export declare function createTaggedOMA(rawData: _Uint8Array, titleInfo: InboundTrackMetadata, codec: {
     codecId: HiMDCodec;
     codecInfo: Uint8Array;
 }): OmaFile;
 export declare function updateMetadata(file: HiMDFile, titleInfo: TrackMetadata): Promise<void>;
 export declare function decryptOMA(omaFile: Uint8Array): Uint8Array;
+export {};
 //# sourceMappingURL=tagged-oma.d.ts.map

package/dist/tagged-oma.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tagged-oma.d.ts","sourceRoot":"","sources":["../src/tagged-oma.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgC,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAkHlE,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,UAAU,CAAC;CAC7B;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,KAAK,EAAE;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,UAAU,CAAA;CAAC,GAAG,OAAO,CAc1J;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,KAAK,EAAE;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,UAAU,CAAA;CAAC,GAAG,OAAO,CAKjJ;AAeD,wBAAsB,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,iBA+B5E;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,CAyD1D"}
+{"version":3,"file":"tagged-oma.d.ts","sourceRoot":"","sources":["../src/tagged-oma.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgC,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGlE,KAAK,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AAiH3C,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,UAAU,CAAC;CAC7B;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,oBAAoB,EAAE,KAAK,EAAE;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,UAAU,CAAA;CAAC,GAAG,OAAO,CAc3J;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,oBAAoB,EAAE,KAAK,EAAE;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,UAAU,CAAA;CAAC,GAAG,OAAO,CAKlJ;AAeD,wBAAsB,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,iBA+B5E;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,CAyD1D"}

package/dist/tagged-oma.js

@@ -3,7 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptOMA = exports.updateMetadata = exports.createTaggedOMA = exports.createTaggedEncryptedOMA = void 0;
+exports.createTaggedEncryptedOMA = createTaggedEncryptedOMA;
+exports.createTaggedOMA = createTaggedOMA;
+exports.updateMetadata = updateMetadata;
+exports.decryptOMA = decryptOMA;
 const crypto_js_wasm_1 = __importDefault(require("@originjs/crypto-js-wasm"));
 const himd_js_1 = require("himd-js");
 const utils_1 = require("./utils");
@@ -53,7 +56,7 @@ function createEncryptionHeader(titleInfo, milliseconds) {
     // In every KEYRING section, the track key is stored as decrypted by the verification key decrypted by the ekbroot
     const padding = (0, utils_1.createRandomBytes)(8); // What's this???
     const keyringDataA = (0, utils_1.concatUint8Arrays)([
-        ULINF_KEYRING_HEADER,
+        ULINF_KEYRING_HEADER, // Use EKB 00010021
         verificationKey, (0, encryption_1.createTrackKeyForKeyring)(0x00010021, verificationKey, actualTrackKey), padding,
         new Uint8Array(8).fill(0),
     ]);
@@ -70,7 +73,7 @@ function createEncryptionHeader(titleInfo, milliseconds) {
     const maclistVerifiedData = firstGEOBContents.slice(94); // Offset to '!CID'
     const maclistValue = (0, encryption_1.createTrackMac2)(decryptedVerificationKeyWaA, maclistVerifiedData);
     const keyringDataB = (0, utils_1.concatUint8Arrays)([
-        new Uint8Array([0x00, 0x28, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1D]),
+        new Uint8Array([0x00, 0x28, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1D]), // Use EKB 0001001D
         verificationKey, (0, encryption_1.createTrackKeyForKeyring)(0x0001001D, verificationKey, actualTrackKey), padding,
         new Uint8Array(8).fill(0),
         EKB1001D_CONTENTS,
@@ -92,7 +95,7 @@ function createEncryptionHeader(titleInfo, milliseconds) {
         flags: 0,
         version: { major: 3, minor: 0 },
         tags: [
-            { id: "GEOB", contents: firstGEOBContents, flags: 0 },
+            { id: "GEOB", contents: firstGEOBContents, flags: 0 }, // OMG_ULINF
             ...(0, id3_1.createCommonID3Tags)(titleInfo),
             { id: "TLEN", contents: (0, id3_1.encodeUTF16BEStringEA3)(milliseconds.toString()), flags: 0 },
             { id: "GEOB", contents: secondGEOBContents, flags: 0 }, // OMG_BKLSI
@@ -114,14 +117,12 @@ function createTaggedEncryptedOMA(rawData, titleInfo, codec) {
     rawData = (0, utils_1.wordArrayToByteArray)(allData.ciphertext, rawData.length);
     return { data: (0, utils_1.concatUint8Arrays)([encHeader, formatHeader, rawData]), maclistValue, duration: milliseconds };
 }
-exports.createTaggedEncryptedOMA = createTaggedEncryptedOMA;
 function createTaggedOMA(rawData, titleInfo, codec) {
     const milliseconds = Math.floor(1000 * (0, himd_js_1.getSeconds)(codec, Math.ceil(rawData.length / (0, himd_js_1.getBytesPerFrame)(codec))));
     const primaryHeader = createPrimaryHeader(titleInfo, milliseconds);
     const formatHeader = (0, codecs_1.createEA3Header)(codec, 0xFFFF);
     return { data: (0, utils_1.concatUint8Arrays)([primaryHeader, formatHeader, rawData]), duration: milliseconds };
 }
-exports.createTaggedOMA = createTaggedOMA;
 function findInMetadata(metadata, id, asGeob) {
     if (!asGeob)
         return metadata.tags.find(e => e.id === id);
@@ -169,7 +170,6 @@ async function updateMetadata(file, titleInfo) {
     await file.write(subsequentData);
     await file.write(new Uint8Array(zeroOutDifference).fill(0));
 }
-exports.updateMetadata = updateMetadata;
 function decryptOMA(omaFile) {
     var _a;
     const OMA_METADATA_HEADER = textEncoder.encode("ea3");
@@ -229,4 +229,3 @@ function decryptOMA(omaFile) {
     // And merge all into the final OMA.
     return (0, utils_1.concatUint8Arrays)([newMetaHeader, newFormatHeader, decryptedAudio]);
 }
-exports.decryptOMA = decryptOMA;

package/dist/utils.d.ts

@@ -1,8 +1,8 @@
 export declare function assert(condition: boolean, message?: string): void;
 export declare function join(...paths: string[]): string;
-export declare function concatUint8Arrays(args: Uint8Array[]): Uint8Array;
-export declare function wordArrayToByteArray(wordArray: any, length?: number): Uint8Array;
-export declare function createRandomBytes(length?: number): Uint8Array;
+export declare function concatUint8Arrays(args: Uint8Array<ArrayBuffer>[]): Uint8Array<ArrayBuffer>;
+export declare function wordArrayToByteArray(wordArray: any, length?: number): Uint8Array<ArrayBuffer>;
+export declare function createRandomBytes(length?: number): Uint8Array<ArrayBuffer>;
 export declare function arrayEq<T>(a: ArrayLike<T>, b: ArrayLike<T>): boolean;
 export declare function hexDump(logger: (e: string) => void, data: Uint8Array, truncate?: boolean): void;
 export declare class Logger {
@@ -10,5 +10,6 @@ export declare class Logger {
     bumpIndent(i: number): void;
     log(...data: string[]): void;
 }
-export declare function getAudioDataFromWave(waveFile: Uint8Array): Uint8Array | null;
+export declare function getAudioDataFromWave(waveFile: Uint8Array): Uint8Array<ArrayBuffer> | null;
+export declare function resolvePathFromGlobalIndex(globalTrackIndex: number): string;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,QAM1D;AAED,wBAAgB,IAAI,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,UAEtC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,cAcnD;AAmBD,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,GAAE,MAA2B,cAavF;AAED,wBAAgB,iBAAiB,CAAC,MAAM,SAAI,cAM3C;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,WAM1D;AAGD,wBAAgB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,UAAO,QAarF;AAED,qBAAa,MAAM;IACf,OAAO,SAAM;IACb,UAAU,CAAC,CAAC,EAAE,MAAM;IAQpB,GAAG,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE;CAGxB;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,UAAU,qBAgBxD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,QAM1D;AAED,wBAAgB,IAAI,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,UAEtC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,2BAchE;AAmBD,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,GAAE,MAA2B,2BAavF;AAED,wBAAgB,iBAAiB,CAAC,MAAM,SAAI,2BAM3C;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,WAM1D;AAGD,wBAAgB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,UAAO,QAarF;AAED,qBAAa,MAAM;IACf,OAAO,SAAM;IACb,UAAU,CAAC,CAAC,EAAE,MAAM;IAQpB,GAAG,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE;CAGxB;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,UAAU,kCAgBxD;AAED,wBAAgB,0BAA0B,CAAC,gBAAgB,EAAE,MAAM,UAElE"}

package/dist/utils.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAudioDataFromWave = exports.Logger = exports.hexDump = exports.arrayEq = exports.createRandomBytes = exports.wordArrayToByteArray = exports.concatUint8Arrays = exports.join = exports.assert = void 0;
+exports.Logger = void 0;
+exports.assert = assert;
+exports.join = join;
+exports.concatUint8Arrays = concatUint8Arrays;
+exports.wordArrayToByteArray = wordArrayToByteArray;
+exports.createRandomBytes = createRandomBytes;
+exports.arrayEq = arrayEq;
+exports.hexDump = hexDump;
+exports.getAudioDataFromWave = getAudioDataFromWave;
+exports.resolvePathFromGlobalIndex = resolvePathFromGlobalIndex;
 function assert(condition, message) {
     if (condition) {
         return;
@@ -8,11 +17,9 @@ function assert(condition, message) {
     message = message || 'no message provided';
     throw new Error(`Assertion failed: ${message}`);
 }
-exports.assert = assert;
 function join(...paths) {
     return paths.join("/").replace(/\/*/, '/');
 }
-exports.join = join;
 function concatUint8Arrays(args) {
     let totalLength = 0;
     for (let a of args) {
@@ -26,7 +33,6 @@ function concatUint8Arrays(args) {
     }
     return res;
 }
-exports.concatUint8Arrays = concatUint8Arrays;
 function wordToByteArray(word, length, littleEndian = false) {
     let ba = [], xFF = 0xff;
     let actualLength = length;
@@ -60,13 +66,11 @@ function wordArrayToByteArray(wordArray, length = wordArray.sigBytes) {
     }
     return res;
 }
-exports.wordArrayToByteArray = wordArrayToByteArray;
 function createRandomBytes(length = 8) {
     return new Uint8Array(Array(length)
         .fill(0)
         .map(() => Math.floor(Math.random() * 256)));
 }
-exports.createRandomBytes = createRandomBytes;
 function arrayEq(a, b) {
     if (a.length !== b.length)
         return false;
@@ -76,7 +80,6 @@ function arrayEq(a, b) {
     }
     return true;
 }
-exports.arrayEq = arrayEq;
 const textDecoder = new TextDecoder();
 function hexDump(logger, data, truncate = true) {
     if (data.length === 0)
@@ -93,7 +96,6 @@ function hexDump(logger, data, truncate = true) {
     if (truncated)
         logger("<truncated>");
 }
-exports.hexDump = hexDump;
 class Logger {
     constructor() {
         this.preffix = "";
@@ -130,4 +132,6 @@ function getAudioDataFromWave(waveFile) {
     }
     return null;
 }
-exports.getAudioDataFromWave = getAudioDataFromWave;
+function resolvePathFromGlobalIndex(globalTrackIndex) {
+    return join('OMGAUDIO', `10F${(globalTrackIndex >> 8).toString(16).padStart(2, '0')}`, '1000' + globalTrackIndex.toString(16).padStart(4, '0').toUpperCase() + '.OMA');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "networkwm-js",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "A library which lets you manage tracks and metadata on Sony Network Walkmen.",
   "main": "dist/index.js",
   "scripts": {
@@ -32,12 +32,12 @@
     "@types/node": "^18.11.9",
     "prettier": "^2.8.8",
     "ts-node": "^10.9.2",
-    "typescript": "^4.8.4"
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "@originjs/crypto-js-wasm": "github:asivery/crypto-js-wasm",
     "async-mutex": "^0.4.0",
-    "himd-js": "^0.2.7",
+    "himd-js": "^0.2.9",
     "mp3-parser": "^0.3.0",
     "node-id3": "^0.2.5",
     "node-mass-storage": "^0.2.4",

package/dist/helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAkB,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAa,MAAM,WAAW,CAAC;AAGxD,wBAAgB,0BAA0B,CAAC,gBAAgB,EAAE,MAAM,UAElE;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,gBAAgB,CAAA;CAAE,+BAO7F;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC;IAAE,GAAG,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,gBAAgB,CAAA;CAAE,GAAG,IAAI,CAAC,CA2B7G"}