networkwm-js 0.1.0 → 0.1.1

package/dist/database-abstraction.js

@@ -1,25 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseAbstraction = void 0;
-const himd_js_1 = require("himd-js");
 const databases_1 = require("./databases");
 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 mp3_1 = require("./mp3");
+const codecs_1 = require("./codecs");
+const bytemanip_1 = require("./bytemanip");
+const DEVICE_ID_CACHE_FILE = "/OMGAUDIO/DevID.DAT";
 class DatabaseAbstraction {
-    constructor(filesystem) {
+    constructor(filesystem, deviceInfo) {
         this.filesystem = filesystem;
+        this.deviceInfo = deviceInfo;
         this.lastTotalDuration = 0;
         this.allTracks = [];
         this.deletedTracks = [];
-        this.database = new databases_1.DatabaseManager(filesystem);
+        this.database = new databases_1.DatabaseManager(filesystem, deviceInfo.databaseParameters);
     }
-    static async create(filesystem) {
-        const db = new DatabaseAbstraction(filesystem);
+    static async create(filesystem, deviceInfo) {
+        const db = new DatabaseAbstraction(filesystem, deviceInfo);
         await db.database.init();
         db._create();
+        // Get the MP3 device key (device ID)
+        let deviceId = null;
+        if (filesystem instanceof filesystem_1.UMSCNWJSFilesystem) {
+            deviceId = await filesystem.driver.getDiscID();
+            // Cache, if this file doesn't exist already
+            if ((await filesystem.getSize(DEVICE_ID_CACHE_FILE)) === null) {
+                // Not cached. Create it.
+                const handle = await filesystem.open(DEVICE_ID_CACHE_FILE, 'rw');
+                await handle.write(deviceId);
+                await handle.close();
+            }
+        }
+        else {
+            // Cannot retrieve directly.
+            // Check if there is a cache file.
+            const rawDeviceIDFile = await filesystem.open(DEVICE_ID_CACHE_FILE, 'ro');
+            if (rawDeviceIDFile) {
+                // Yes, it's been cached.
+                deviceId = await rawDeviceIDFile.read();
+                await rawDeviceIDFile.close();
+            }
+        }
+        if (deviceId) {
+            db.mp3DeviceKey = (0, bytemanip_1.getUint32)(deviceId.slice(-4));
+        }
         return db;
     }
     _create() {
@@ -35,8 +64,8 @@ class DatabaseAbstraction {
             const codecId = globalEntry.codecInfo[0];
             const codecParams = globalEntry.codecInfo.slice(1);
             const codecInfo = { codecId, codecInfo: codecParams };
-            const codecName = (0, himd_js_1.getCodecName)(codecInfo);
-            const codecKBPS = (0, himd_js_1.getKBPS)(codecInfo);
+            const codecName = (0, codecs_1.getCodecName)(codecInfo);
+            const codecKBPS = (0, codecs_1.getKBPS)(codecInfo);
             if (globalEntry.trackDuration === 0)
                 this.deletedTracks.push(systemIndex + 1);
             return {
@@ -54,13 +83,13 @@ class DatabaseAbstraction {
             };
         });
     }
-    addNewTrack(trackInfo, codecInfo) {
-        const codecName = (0, himd_js_1.getCodecName)(codecInfo);
-        const codecKBPS = (0, himd_js_1.getKBPS)(codecInfo);
+    addNewTrack(trackInfo, codecInfo, encryptionState) {
+        const codecName = (0, codecs_1.getCodecName)(codecInfo);
+        const codecKBPS = (0, codecs_1.getKBPS)(codecInfo);
         const newObject = {
             ...trackInfo,
             codecInfo: new Uint8Array([codecInfo.codecId, ...codecInfo.codecInfo.subarray(0, 3)]),
-            encryptionState: new Uint8Array([0, 1]),
+            encryptionState: (0, bytemanip_1.writeUint16)(encryptionState),
             oneElementLength: 128,
             systemIndex: -1,
             codecName, codecKBPS
@@ -77,23 +106,24 @@ class DatabaseAbstraction {
         newObject.systemIndex = idx;
         return newObject.systemIndex;
     }
-    async uploadTrack(trackInfo, codec, rawData, session, callback) {
+    reassignTrackNumber(trackInfo) {
+        let trackNumber = trackInfo.trackNumber;
         // If trackInfo.trackNumber == -1, it's the next one of this particular album
-        if (trackInfo.trackNumber == -1) {
-            trackInfo.trackNumber = this.allTracks
+        if (trackNumber == -1 || trackNumber === undefined) {
+            trackNumber = this.allTracks
                 .filter(e => e.album === trackInfo.album && e.artist === trackInfo.artist)
                 .reduce((prev, c) => Math.max(prev, c.trackNumber), -1) + 1;
         }
-        // Step 1 - Create the encrypted OMA which will later be written to the device's storage
-        const encryptedOMA = (0, tagged_oma_1.createTaggedEncryptedOMA)(rawData, trackInfo, codec);
-        // Step 2 - write track to the database
-        const globalTrackIndex = this.addNewTrack({
-            ...trackInfo,
-            trackDuration: encryptedOMA.duration,
-        }, codec);
-        // Step 3 - write track to the filesystem
+        return trackNumber;
+    }
+    async copyToFilesystem(data, globalTrackIndex, callback) {
+        // 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 data = encryptedOMA.data;
         let remaining = data.length;
         let i = 0;
         callback === null || callback === void 0 ? void 0 : callback(i, data.length);
@@ -105,6 +135,32 @@ class DatabaseAbstraction {
             callback === null || callback === void 0 ? void 0 : callback(i, data.length);
         }
         await fh.close();
+    }
+    async uploadMP3Track(trackInfo, rawData, callback) {
+        if (this.mp3DeviceKey === undefined)
+            throw new Error("Please load the device key first!");
+        const { codec, duration } = (0, mp3_1.generateMP3CodecField)(rawData);
+        const trackNumber = trackInfo.trackNumber = this.reassignTrackNumber(trackInfo);
+        const globalTrackIndex = this.addNewTrack({
+            ...trackInfo,
+            trackDuration: duration,
+            trackNumber,
+        }, codec, 0xFFFE);
+        const mp3Data = (0, mp3_1.createMP3OMAFile)(globalTrackIndex, trackInfo, rawData, this.mp3DeviceKey, codec);
+        await this.copyToFilesystem(mp3Data, globalTrackIndex, callback);
+    }
+    async uploadTrack(trackInfo, codec, rawData, session, callback) {
+        const trackNumber = this.reassignTrackNumber(trackInfo);
+        // Step 1 - Create the encrypted OMA which will later be written to the device's storage
+        const encryptedOMA = (0, tagged_oma_1.createTaggedEncryptedOMA)(rawData, trackInfo, codec);
+        // Step 2 - write track to the database
+        const globalTrackIndex = this.addNewTrack({
+            ...trackInfo,
+            trackDuration: encryptedOMA.duration,
+            trackNumber,
+        }, codec, 0x0001);
+        // Step 3 - write track to the filesystem
+        await this.copyToFilesystem(encryptedOMA.data, globalTrackIndex, callback);
         // Step 4 - write MAC
         session === null || session === void 0 ? void 0 : session.writeTrackMac(globalTrackIndex - 1, encryptedOMA.maclistValue);
     }
@@ -198,6 +254,7 @@ class DatabaseAbstraction {
         return (0, sort_1.complexSort)([[{ var: 'artist' }], [{ var: 'album' }], [{ var: 'trackNumber' }]], this.allTracks.filter(e => e.trackDuration > 0));
     }
     async eraseAll() {
+        var _a, _b;
         // Essentially reinitialize the filesystem.
         // Destroy all audio files
         const fs = this.database.filesystem;
@@ -219,7 +276,7 @@ class DatabaseAbstraction {
         if (fs instanceof filesystem_1.UMSCNWJSFilesystem) {
             await fs.fatfs.flushMetadataChanges();
         }
-        await (0, initialization_1.initializeNW)(fs);
+        await (0, initialization_1.initializeNW)(fs, (_b = (_a = this.deviceInfo.databaseParameters) === null || _a === void 0 ? void 0 : _a.initLayers) !== null && _b !== void 0 ? _b : []);
         this.database = new databases_1.DatabaseManager(this.filesystem);
         await this.database.init();
         this._create();
@@ -232,9 +289,9 @@ class DatabaseAbstraction {
         // TODO: Is this necessary??
         // Update the metadata within the OMA file
         const handle = await this.database.filesystem.open((0, helpers_1.resolvePathFromGlobalIndex)(systemIndex), 'rw');
-        if (!handle)
-            return;
-        await (0, tagged_oma_1.updateMetadata)(handle, metadata);
+        if (handle) {
+            await (0, tagged_oma_1.updateMetadata)(handle, metadata);
+        }
     }
 }
 exports.DatabaseAbstraction = DatabaseAbstraction;

package/dist/databases.d.ts

@@ -1,5 +1,6 @@
 import { HiMDFilesystem, HiMDCodecName } from "himd-js";
 import { TableFile } from "./tables";
+import { DatabaseParameters } from "./devices";
 export interface TreeFile {
     mapStartBounds: {
         firstTrackApplicableInTPLB: number;
@@ -32,8 +33,16 @@ export interface TrackMetadata {
     trackDuration: number;
     trackNumber: number;
 }
+export interface InboundTrackMetadata {
+    album: string;
+    artist: string;
+    title: string;
+    genre: string;
+    trackNumber?: number;
+}
 export declare class DatabaseManager {
     filesystem: HiMDFilesystem;
+    private databaseParameters?;
     tableFiles: {
         [fileName: string]: TableFile;
     };
@@ -44,7 +53,7 @@ export declare class DatabaseManager {
         [fileName: string]: GroupEntry[];
     };
     globalContentInfoFile: ContentEntry[];
-    constructor(filesystem: HiMDFilesystem);
+    constructor(filesystem: HiMDFilesystem, databaseParameters?: DatabaseParameters | undefined);
     init(): Promise<void>;
     reserializeTables(): void;
     rewriteTables(): Promise<void>;

package/dist/databases.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"databases.d.ts","sourceRoot":"","sources":["../src/databases.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,cAAc,EAAyB,aAAa,EAAE,MAAM,SAAS,CAAC;AAI1F,OAAO,EAAc,SAAS,EAAkB,MAAM,UAAU,CAAC;AA4DjE,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,qBAAa,eAAe;IAML,UAAU,EAAE,cAAc;IAL7C,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;IAEvC,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,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"}

package/dist/databases.js

@@ -60,8 +60,9 @@ function writePackedTags(tags, elementLength) {
 }
 ;
 class DatabaseManager {
-    constructor(filesystem) {
+    constructor(filesystem, databaseParameters) {
         this.filesystem = filesystem;
+        this.databaseParameters = databaseParameters;
         this.tableFiles = {};
         this.parsedTreeFiles = {};
         this.parsedGroupInfoFiles = {};

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

@@ -0,0 +1,12 @@
+export declare function deriveMP3ParametersFromOMA(mp3CodecInfo: Uint8Array): {
+    version: number;
+    layer: number;
+    bitrate: number;
+    sample: number;
+    chmod: number;
+    preemp: number;
+    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;
+//# sourceMappingURL=derive-mp3-key.d.ts.map

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

@@ -0,0 +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"}

package/dist/derive-mp3-key.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decryptMP3 = exports.deriveMP3TrackKey = exports.deriveMP3ParametersFromOMA = void 0;
+const bytemanip_1 = require("./bytemanip");
+const encryption_1 = require("./encryption");
+const id3_1 = require("./id3");
+const utils_1 = require("./utils");
+const textEncoder = new TextEncoder();
+const ENCRYPTION_HEADER_START = textEncoder.encode("ea3");
+const FORMAT_HEADER_START = textEncoder.encode("EA3");
+function deriveMP3ParametersFromOMA(mp3CodecInfo) {
+    if (mp3CodecInfo[0] !== 3)
+        throw new Error("Not an MP3 format tag");
+    const flags = mp3CodecInfo[1];
+    const cmb0 = mp3CodecInfo[2];
+    const cmb1 = mp3CodecInfo[3];
+    const version = (cmb0 >> 6) & 3;
+    const layer = (cmb0 >> 4) & 3;
+    const bitrate = cmb0 & 15;
+    const sample = (cmb1 >> 6) & 3;
+    const chmod = (cmb1 >> 4) & 3;
+    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;
+    let headerStart = rawFile.subarray(offset, offset + 3);
+    // Assume first is the tag header
+    if (!(0, utils_1.arrayEq)(headerStart, ENCRYPTION_HEADER_START))
+        throw new Error("Expected metadata header");
+    const headerSizeRemaining = (0, id3_1.readSynchsafeInt32)(new DataView(rawFile.buffer), 6)[0];
+    offset = 10 + headerSizeRemaining;
+    headerStart = rawFile.subarray(offset, offset + 3);
+    const rawDataView = new DataView(rawFile.buffer);
+    if (!(0, utils_1.arrayEq)(headerStart, FORMAT_HEADER_START))
+        throw new Error("Expected format header");
+    const mp3CodecInfo = rawFile.subarray(offset + 32, offset + 32 + 5);
+    if (rawFile[offset + 6] !== 0xFF || rawFile[offset + 7] !== 0xFE)
+        throw new Error("OMA is not LeafID-XOR encoded!");
+    const { version, layer, bitrate, sample, chmod, preemp } = deriveMP3ParametersFromOMA(mp3CodecInfo);
+    const audioStartOffset = offset + 96;
+    const fourByteChunks = [];
+    for (let i = audioStartOffset; i < rawFile.length - 3; i += 4) {
+        fourByteChunks.push(rawDataView.getUint32(i) >>> 0);
+    }
+    function formHeader(variantIteration) {
+        const assumeCrc = !!(variantIteration & 64);
+        const assumePadding = !!(variantIteration & 32);
+        const assumePrivate = !!(variantIteration & 16);
+        const assumeOriginalMedia = !!(variantIteration & 8);
+        const assumeCopyright = !!(variantIteration & 4);
+        const assumeJointstereoExtinfo = variantIteration & 3;
+        const int = (e) => e ? 1 : 0;
+        const rootFrameHeader = new Uint8Array([
+            0xFF,
+            (7 << 5) | (version << 3) | (layer << 1) | int(assumeCrc),
+            (bitrate << 4) | (sample << 2) | (int(assumePadding) << 1) | int(assumePrivate),
+            (chmod << 6) | (assumeJointstereoExtinfo << 4) | (int(assumeCopyright) << 3) | (int(assumeOriginalMedia) << 2) | (preemp)
+        ]);
+        return rootFrameHeader;
+    }
+    const firstXoredHeader = fourByteChunks[0];
+    const allFirstFrames = Array(128).fill(0).map((_, i) => (0, bytemanip_1.getUint32)(formHeader(i)));
+    callback === null || callback === void 0 ? void 0 : callback('genFrames', -1, -1);
+    const allKeys = allFirstFrames.map(r => (firstXoredHeader ^ r) >>> 0);
+    callback === null || callback === void 0 ? void 0 : callback('genKeys', -1, -1);
+    const commonness = [];
+    for (let keyI = 0; keyI < allKeys.length; keyI++) {
+        const key = allKeys[keyI];
+        // Zero should be dominant in the MP3 file => The most common key present as plaintext in the file will be valid
+        let z = 0;
+        for (let chunk of fourByteChunks) {
+            if (chunk === key)
+                ++z;
+        }
+        commonness.push(z);
+        callback === null || callback === void 0 ? void 0 : callback('commonness', keyI, allKeys.length);
+    }
+    // Find the most common key
+    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
+    let offset = 0;
+    let headerStart = fullFile.subarray(offset, offset + 3);
+    // Assume first is the tag header
+    if (!(0, utils_1.arrayEq)(headerStart, ENCRYPTION_HEADER_START))
+        throw new Error("Expected metadata header");
+    const headerSizeRemaining = (0, id3_1.readSynchsafeInt32)(new DataView(fullFile.buffer), 6)[0];
+    offset = 10 + headerSizeRemaining;
+    // Reconstruct the ID3 header and decrypt the audio - it starts 96 bytes after the end of the ID3 header
+    const data = (0, utils_1.concatUint8Arrays)([fullFile.subarray(0, offset), fullFile.subarray(offset + 96, fullFile.length)]);
+    data.set(textEncoder.encode("ID3"), 0);
+    const dataView = new DataView(data.buffer);
+    for (offset; offset < data.length - 7; offset += 8) {
+        // 8-byte-long block processing on 4-byte-long key
+        // Ok Sony.
+        dataView.setUint32(offset, (dataView.getUint32(offset) ^ trackKey) >>> 0);
+        dataView.setUint32(offset + 4, (dataView.getUint32(offset + 4) ^ trackKey) >>> 0);
+        callback === null || callback === void 0 ? void 0 : callback('decrypt', offset, data.length);
+    }
+    return data;
+}
+exports.decryptMP3 = decryptMP3;

package/dist/devices.d.ts

@@ -1,6 +1,13 @@
-export declare const DeviceIds: {
+import type { LAYERS } from "./init-data";
+export interface DatabaseParameters {
+    initLayers: (keyof typeof LAYERS)[];
+}
+export interface DeviceDefinition {
     vendorId: number;
     productId: number;
     name: string;
-}[];
+    databaseParameters?: DatabaseParameters;
+}
+export declare const DeviceIds: DeviceDefinition[];
+export declare function findDevice(vid: number, pid: number): DeviceDefinition | null;
 //# sourceMappingURL=devices.d.ts.map

package/dist/devices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devices.d.ts","sourceRoot":"","sources":["../src/devices.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,EAK3E,CAAC"}
+{"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;CAC3C;AAED,eAAO,MAAM,SAAS,EAAE,gBAAgB,EAoEvC,CAAC;AAEF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAE5E"}

package/dist/devices.js

@@ -1,9 +1,77 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeviceIds = void 0;
+exports.findDevice = exports.DeviceIds = void 0;
 exports.DeviceIds = [
     { vendorId: 0x054c, productId: 0x01ad, name: 'Sony NW-HD1 / NW-HD2' },
     { vendorId: 0x054c, productId: 0x0210, name: 'Sony NW-HD3' },
     { vendorId: 0x054c, productId: 0x0233, name: 'Sony NW-HD5' },
-    { vendorId: 0x054c, productId: 0x0269, name: 'Sony NW-A3000' },
+    {
+        vendorId: 0x054c,
+        productId: 0x0269,
+        name: 'Sony NW-A3000',
+        databaseParameters: {
+            initLayers: ['needs_cid'],
+        }
+    },
+    {
+        vendorId: 0x054c,
+        productId: 0x0358,
+        name: 'Sony NW-E026F',
+        databaseParameters: {
+            initLayers: ['stick_gtrlst'],
+        }
+    },
+    {
+        vendorId: 0x054c,
+        productId: 0x03c6,
+        name: 'Sony NW-E043',
+        databaseParameters: {
+            initLayers: ['stick_gtrlst'],
+        }
+    },
+    {
+        vendorId: 0x054c,
+        productId: 0x02E4,
+        name: 'Sony NW-S203F',
+        databaseParameters: {
+            initLayers: ['stick_gtrlst'],
+        }
+    },
+    {
+        vendorId: 0x054c,
+        productId: 0x01FB,
+        name: 'Sony NW-E305',
+        databaseParameters: {
+            initLayers: ['stick_gtrlst'],
+        }
+    },
+    {
+        vendorId: 0x054c,
+        productId: 0x027c,
+        name: 'Sony NW-A608',
+        databaseParameters: {
+            initLayers: ['stick_gtrlst'],
+        }
+    },
+    {
+        vendorId: 0x054c,
+        productId: 0x082e,
+        name: 'Sony NWZ-W273S',
+        databaseParameters: {
+            initLayers: ['stick_gtrlst'],
+        }
+    },
+    {
+        vendorId: 0x054c,
+        productId: 0x0358,
+        name: 'Sony NW-E026f',
+        databaseParameters: {
+            initLayers: ['stick_gtrlst'],
+        }
+    },
 ];
+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

@@ -4,12 +4,12 @@ export declare const EKBROOTS: {
     [key: number]: Uint8Array;
 };
 export declare function importKeys(rawKeysContents: Uint8Array): void;
-export declare function getMP3EncryptionKey(discId: Uint8Array, trackNumber: number): Uint8Array;
+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 encryptTrackKey(trackKey: 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;

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,UAAU,EAAE,WAAW,EAAE,MAAM,cAG1E;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,cAsBzG;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,QAAQ,EAAE,UAAU,cAKnD;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,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"}

package/dist/encryption.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.desDecrypt = exports.createTrackMac = exports.createTrackMac2 = exports.encryptTrackKey = exports.createIcvMac = exports.retailMac = exports.createMaclistValue = exports.createTrackKeyForKeyring = exports.getMP3EncryptionKey = exports.importKeys = exports.EKBROOTS = exports.initCrypto = void 0;
+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;
 const crypto_js_wasm_1 = __importDefault(require("@originjs/crypto-js-wasm"));
 const bytemanip_1 = require("./bytemanip");
 const errors_1 = require("./errors");
@@ -28,13 +28,12 @@ function importKeys(rawKeysContents) {
 }
 exports.importKeys = importKeys;
 function getMP3EncryptionKey(discId, trackNumber) {
-    const key = (trackNumber * 0x6953b2ed + 0x6baab1) ^ (0, bytemanip_1.getUint32)(discId, 12);
-    return (0, bytemanip_1.writeUint32)(key);
+    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 decription with an unknown EKB');
+        throw new errors_1.NWJSError('Requested decryption with an unknown EKB');
     }
     const rootKeyC = crypto_js_wasm_1.default.lib.WordArray.create(exports.EKBROOTS[ekbNum]);
     const verificationKeyC = crypto_js_wasm_1.default.lib.CipherParams.create({
@@ -54,9 +53,30 @@ 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');
+    }
+    const rootKeyC = crypto_js_wasm_1.default.lib.WordArray.create(exports.EKBROOTS[ekbNum]);
+    const verificationKeyC = crypto_js_wasm_1.default.lib.CipherParams.create({
+        ciphertext: crypto_js_wasm_1.default.lib.WordArray.create(encryptedVerificationKey),
+    });
+    const trackKeyC = crypto_js_wasm_1.default.lib.WordArray.create(encryptedTrackKey);
+    // Step 1: get real verification key
+    const verificationKey = crypto_js_wasm_1.default.TripleDES.decrypt(verificationKeyC, rootKeyC, {
+        mode: crypto_js_wasm_1.default.mode.ECB,
+    });
+    // Step 2: get decrypted track key - so encrypt it
+    const decryptedTrackKey = crypto_js_wasm_1.default.TripleDES.encrypt(trackKeyC, verificationKey, {
+        mode: crypto_js_wasm_1.default.mode.ECB,
+        padding: NO_PADDING
+    }).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 decription with an unknown EKB');
+        throw new errors_1.NWJSError('Requested decryption with an unknown EKB');
     }
     const rootKeyC = crypto_js_wasm_1.default.lib.WordArray.create(exports.EKBROOTS[ekbNum]);
     const verificationKeyC = crypto_js_wasm_1.default.lib.CipherParams.create({
@@ -96,13 +116,6 @@ function createIcvMac(icvAndHeader, sessionKey) {
     return (0, utils_1.wordArrayToByteArray)(result.ciphertext).subarray(-8);
 }
 exports.createIcvMac = createIcvMac;
-function encryptTrackKey(trackKey) {
-    const trackKeyWa = crypto_js_wasm_1.default.lib.WordArray.create(trackKey);
-    const keyWa = crypto_js_wasm_1.default.lib.WordArray.create(exports.EKBROOTS[0x00010012]);
-    const encrypted = crypto_js_wasm_1.default.TripleDES.encrypt(trackKeyWa, keyWa, { mode: crypto_js_wasm_1.default.mode.ECB, padding: NO_PADDING });
-    return (0, utils_1.wordArrayToByteArray)(encrypted.ciphertext);
-}
-exports.encryptTrackKey = encryptTrackKey;
 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));

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

@@ -1,8 +1,10 @@
 import { HiMDFile, HiMDFilesystem, SonyVendorUSMCDriver, UMSCHiMDFilesystem } from 'himd-js';
 import { WebUSBDevice } from 'usb';
 export declare class SonyVendorNWJSUSMCDriver extends SonyVendorUSMCDriver {
+    constructor(webUSB: WebUSBDevice);
     protected drmRead(param: number, length: number): Promise<Uint8Array>;
     protected drmWrite(param: number, data: Uint8Array): Promise<void>;
+    getDiscID(): Promise<Uint8Array>;
     writeHostLeafID(leafID: Uint8Array, hostNonce: Uint8Array): Promise<void>;
     getAuthenticationStage2Info(): Promise<{
         discId: Uint8Array;

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;AAGnC,qBAAa,wBAAyB,SAAQ,oBAAoB;cAC9C,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;cAuBrC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IA2BlD,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;IACtD,MAAM,EAAE,wBAAwB,CAAC;gBACrB,MAAM,EAAE,YAAY;cAKhB,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;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;IACtD,MAAM,EAAE,wBAAwB,CAAC;gBACrB,MAAM,EAAE,YAAY;cAKhB,MAAM,CAAC,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAYrF"}

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

@@ -6,7 +6,11 @@ const utils_1 = require("../utils");
 const bytemanip_1 = require("../bytemanip");
 const encryption_1 = require("../encryption");
 const nufatfs_1 = require("nufatfs");
+const USB_MASS_STORAGE_CLASS = 8;
 class SonyVendorNWJSUSMCDriver extends himd_js_1.SonyVendorUSMCDriver {
+    constructor(webUSB) {
+        super(webUSB, webUSB.configuration.interfaces.find(e => e.alternate.interfaceClass === USB_MASS_STORAGE_CLASS).alternate.interfaceSubclass);
+    }
     async drmRead(param, length) {
         const command = new Uint8Array([
             0xa4,
@@ -54,6 +58,9 @@ class SonyVendorNWJSUSMCDriver extends himd_js_1.SonyVendorUSMCDriver {
         ]);
         await this.sendCommandOutGetResult(command, newData, command.length);
     }
+    async getDiscID() {
+        return (await this.drmRead(0x3f, 0x12)).slice(0, -2);
+    }
     async writeHostLeafID(leafID, hostNonce) {
         (0, utils_1.assert)(leafID.length === 8, 'Wrong length of leaf id');
         const finalBuffer = new Uint8Array(2 + 8 + 8);
@@ -171,7 +178,7 @@ exports.UMSCNWJSSession = UMSCNWJSSession;
 class UMSCNWJSFilesystem extends himd_js_1.UMSCHiMDFilesystem {
     constructor(webUSB) {
         super(webUSB);
-        this.driver = new SonyVendorNWJSUSMCDriver(webUSB, 0x06);
+        this.driver = new SonyVendorNWJSUSMCDriver(webUSB);
     }
     async initFS(bypassCoherencyChecks) {
         await this.driver.inquiry();

package/dist/helpers.d.ts

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

package/dist/helpers.d.ts.map

@@ -1 +1 @@
-{"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;AAKlD,wBAAgB,0BAA0B,CAAC,gBAAgB,EAAE,MAAM,UAElE;AAED,wBAAsB,YAAY,CAAC,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,OAAO,+BAO5F;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC;IAAE,GAAG,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA2B7F"}
+{"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"}