networkwm-js 0.1.2 → 0.2.0

package/dist/cli/encrypt-oma.d.ts

@@ -0,0 +1,2 @@
+export declare function main(invocation: string, args: string[]): Promise<void>;
+//# sourceMappingURL=encrypt-oma.d.ts.map

package/dist/cli/encrypt-oma.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"encrypt-oma.d.ts","sourceRoot":"","sources":["../../src/cli/encrypt-oma.ts"],"names":[],"mappings":"AAQA,wBAAsB,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,iBAgE5D"}

package/dist/cli/encrypt-oma.js

@@ -0,0 +1,83 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = void 0;
+const fs_1 = __importDefault(require("fs"));
+const tagged_oma_1 = require("../tagged-oma");
+const himd_js_1 = require("himd-js");
+const utils_1 = require("../utils");
+const encryption_1 = require("../encryption");
+const path_1 = require("path");
+async function main(invocation, args) {
+    if (args.length < 2) {
+        console.log(`Usage: ${invocation} <source WAV> <codec:kbps> [--title <title> --artist <artist> --album <album>] <destination OMA>`);
+        return;
+    }
+    const [source, codec, ...rest] = args;
+    let codecSplit = codec.split(':');
+    if (codecSplit.length != 2) {
+        console.log("Invalid codec format!");
+        return;
+    }
+    let [codecNameStr, codecBitrateStr] = codecSplit;
+    let codecBitrate = parseInt(codecBitrateStr);
+    if (isNaN(codecBitrate)) {
+        console.log("Invalid bitrate provided!");
+        return;
+    }
+    let codecInfo;
+    if (codecNameStr == "A3+") {
+        codecInfo = (0, himd_js_1.generateCodecInfo)("A3+", himd_js_1.HiMDKBPSToFrameSize.atrac3plus[codecBitrate]);
+    }
+    else if (codecNameStr == "AT3") {
+        codecInfo = (0, himd_js_1.generateCodecInfo)("AT3", himd_js_1.HiMDKBPSToFrameSize.atrac3[codecBitrate]);
+    }
+    else {
+        console.log("Invalid codec name provided!");
+        return;
+    }
+    let metadata = {
+        album: "",
+        artist: "",
+        genre: "",
+        title: "",
+    };
+    let dest = "";
+    let i = 0;
+    for (i; i < rest.length; i++) {
+        let arg = rest[i];
+        if (arg == "--title") {
+            metadata.title = rest[++i];
+        }
+        else if (arg == "--album") {
+            metadata.album = rest[++i];
+        }
+        else if (arg == "--artist") {
+            metadata.artist = rest[++i];
+        }
+        else if (arg == "--genre") {
+            metadata.genre = rest[++i];
+        }
+        else {
+            dest = arg;
+        }
+    }
+    if (!fs_1.default.existsSync(source)) {
+        console.log("Source does not exist!");
+        return;
+    }
+    if (fs_1.default.existsSync(dest)) {
+        console.log("Destination file exists!");
+        return;
+    }
+    await (0, encryption_1.initCrypto)();
+    (0, encryption_1.importKeys)(new Uint8Array(fs_1.default.readFileSync((0, path_1.join)(__dirname, "..", "..", "EKBROOTS.DES"))));
+    let rawAudioStream = (0, utils_1.getAudioDataFromWave)(new Uint8Array(fs_1.default.readFileSync(source)));
+    let encrypted = (0, tagged_oma_1.createTaggedEncryptedOMA)(rawAudioStream, metadata, codecInfo);
+    console.log("MACList value for the encrypted file is: ", Array.from(encrypted.maclistValue).map(e => e.toString(16).padStart(2, '0')).join(''));
+    console.log("Duration is: ", encrypted.duration, " seconds");
+    fs_1.default.writeFileSync(dest, encrypted.data);
+}
+exports.main = main;

package/dist/cli.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const table_file_info_1 = require("./cli/table-file-info");
 const tagged_oma_info_1 = require("./cli/tagged-oma-info");
 const decrypt_oma_1 = require("./cli/decrypt-oma");
+const encrypt_oma_1 = require("./cli/encrypt-oma");
 const decrypt_mp3_1 = require("./cli/decrypt-mp3");
 const decrypt_mp3_2 = require("./cli/decrypt-mp3");
 const sign_device_1 = require("./cli/sign-device");
@@ -21,6 +22,10 @@ const commands = [
         name: 'decrypt-oma',
         root: decrypt_oma_1.main,
     },
+    {
+        name: 'encrypt-oma',
+        root: encrypt_oma_1.main,
+    },
     {
         name: 'derive-mp3-key',
         root: decrypt_mp3_1.mainDeriveKey,

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;IA+BnF,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,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"}

package/dist/database-abstraction.js

@@ -26,24 +26,26 @@ class DatabaseAbstraction {
         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();
+        if (!deviceInfo.disableDRM) {
+            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();
+            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) {
@@ -137,7 +139,7 @@ class DatabaseAbstraction {
         await fh.close();
     }
     async uploadMP3Track(trackInfo, rawData, callback) {
-        if (this.mp3DeviceKey === undefined)
+        if (this.mp3DeviceKey === undefined && !this.deviceInfo.disableDRM)
             throw new Error("Please load the device key first!");
         const { codec, duration } = (0, mp3_1.generateMP3CodecField)(rawData);
         const trackNumber = trackInfo.trackNumber = this.reassignTrackNumber(trackInfo);
@@ -145,24 +147,25 @@ class DatabaseAbstraction {
             ...trackInfo,
             trackDuration: duration,
             trackNumber,
-        }, codec, 0xFFFE);
-        const mp3Data = (0, mp3_1.createMP3OMAFile)(globalTrackIndex, trackInfo, rawData, this.mp3DeviceKey, codec);
+        }, codec, this.deviceInfo.disableDRM ? 0xFFFF : 0xFFFE);
+        const mp3Data = (0, mp3_1.createMP3OMAFile)(globalTrackIndex, trackInfo, rawData, this.deviceInfo.disableDRM ? null : this.mp3DeviceKey, codec);
         await this.copyToFilesystem(mp3Data, globalTrackIndex, callback);
     }
     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);
+        const omaFile = (this.deviceInfo.disableDRM ? tagged_oma_1.createTaggedOMA : tagged_oma_1.createTaggedEncryptedOMA)(rawData, trackInfo, codec);
         // Step 2 - write track to the database
         const globalTrackIndex = this.addNewTrack({
             ...trackInfo,
-            trackDuration: encryptedOMA.duration,
+            trackDuration: omaFile.duration,
             trackNumber,
-        }, codec, 0x0001);
+        }, codec, this.deviceInfo.disableDRM ? 0xFFFF : 0x0001);
         // Step 3 - write track to the filesystem
-        await this.copyToFilesystem(encryptedOMA.data, globalTrackIndex, callback);
+        await this.copyToFilesystem(omaFile.data, globalTrackIndex, callback);
         // Step 4 - write MAC
-        session === null || session === void 0 ? void 0 : session.writeTrackMac(globalTrackIndex - 1, encryptedOMA.maclistValue);
+        if (!this.deviceInfo.disableDRM)
+            session === null || session === void 0 ? void 0 : session.writeTrackMac(globalTrackIndex - 1, omaFile.maclistValue);
     }
     async flushUpdates() {
         this.reserializeDatabase();

package/dist/devices.d.ts

@@ -7,6 +7,8 @@ export interface DeviceDefinition {
     productId: number;
     name: string;
     databaseParameters?: DatabaseParameters;
+    disableDRM?: boolean;
+    unparitioned?: boolean;
 }
 export declare const DeviceIds: DeviceDefinition[];
 export declare function findDevice(vid: number, pid: number): DeviceDefinition | null;

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;CAC3C;AAED,eAAO,MAAM,SAAS,EAAE,gBAAgB,EA4EvC,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,EA8GvC,CAAC;AAEF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAE5E"}

package/dist/devices.js

@@ -5,6 +5,14 @@ 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: 0x026a,
+        name: 'Sony NW-A1000',
+        databaseParameters: {
+            initLayers: ['needs_cid'],
+        }
+    },
     {
         vendorId: 0x054c,
         productId: 0x0269,
@@ -77,6 +85,32 @@ exports.DeviceIds = [
             initLayers: ['stick_gtrlst'],
         }
     },
+    {
+        vendorId: 0x054c,
+        productId: 0x02ED,
+        name: 'Sony NW-A808',
+        databaseParameters: {
+            initLayers: ['stick_gtrlst'],
+        }
+    },
+    {
+        vendorId: 0x054c,
+        productId: 0x04c8,
+        name: 'Sony NW-S754',
+        databaseParameters: {
+            initLayers: ['stick_gtrlst'],
+        },
+        disableDRM: true,
+        unparitioned: true,
+    },
+    {
+        vendorId: 0x054c,
+        productId: 0x00E8,
+        name: 'Sony NW-MS70D',
+        databaseParameters: {
+            initLayers: [],
+        }
+    }
 ];
 function findDevice(vid, pid) {
     var _a;

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

@@ -39,8 +39,9 @@ export declare class UMSCNWJSSession {
     writeTrackMac(trackNumber: number, mac: Uint8Array): void;
 }
 export declare class UMSCNWJSFilesystem extends UMSCHiMDFilesystem {
+    private partition;
     driver: SonyVendorNWJSUSMCDriver;
-    constructor(webUSB: WebUSBDevice);
+    constructor(webUSB: WebUSBDevice, partition?: number | null);
     protected initFS(bypassCoherencyChecks?: boolean | undefined): Promise<void>;
 }
 //# 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;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;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

@@ -176,8 +176,9 @@ class UMSCNWJSSession {
 }
 exports.UMSCNWJSSession = UMSCNWJSSession;
 class UMSCNWJSFilesystem extends himd_js_1.UMSCHiMDFilesystem {
-    constructor(webUSB) {
+    constructor(webUSB, partition = 0) {
         super(webUSB);
+        this.partition = partition;
         this.driver = new SonyVendorNWJSUSMCDriver(webUSB);
     }
     async initFS(bypassCoherencyChecks) {
@@ -185,7 +186,7 @@ class UMSCNWJSFilesystem extends himd_js_1.UMSCHiMDFilesystem {
         await this.driver.testUnitReady();
         const partInfo = await this.driver.getCapacity();
         console.log(partInfo);
-        const baseDriver = await this.driver.createNUFatFSVolumeDriverFromMBRPart(0, true);
+        const baseDriver = await this.driver.createNUFatFSVolumeDriverFromMBRPart(this.partition, true);
         this.fsUncachedDriver = this.fsDriver = (0, nufatfs_1.createChunkingDriver)(baseDriver, 240, partInfo.blockSize);
         this.fatfs = await nufatfs_1.FatFilesystem.create(this.fsDriver, bypassCoherencyChecks);
         this.volumeSize = partInfo.deviceSize;

package/dist/helpers.js

@@ -13,7 +13,7 @@ exports.resolvePathFromGlobalIndex = resolvePathFromGlobalIndex;
 async function createNWJSFS(device) {
     var _a, _b;
     // Connect into the HiMD codebase
-    const fs = new filesystem_1.UMSCNWJSFilesystem(device.dev);
+    const fs = new filesystem_1.UMSCNWJSFilesystem(device.dev, device.definition.unparitioned ? null : 0);
     await fs.init();
     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;

package/dist/mp3.d.ts

@@ -6,6 +6,6 @@ export declare function generateMP3CodecField(mp3Data: Uint8Array): {
     duration: number;
     frames: number;
 };
-export declare function createMP3OMAFile(index: number, metadata: InboundTrackMetadata, rawFile: Uint8Array, deviceKey: number, codec: NWCodecInfo): Uint8Array;
+export declare function createMP3OMAFile(index: number, metadata: InboundTrackMetadata, rawFile: Uint8Array, deviceKey: number | null, codec: NWCodecInfo): Uint8Array;
 export declare function updateMP3Metadata(file: HiMDFile, titleInfo: TrackMetadata): Promise<void>;
 //# sourceMappingURL=mp3.d.ts.map

package/dist/mp3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mp3.d.ts","sourceRoot":"","sources":["../src/mp3.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4B,WAAW,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiBnC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,UAAU,GAAG;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAsFnH;AAID,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,UAAU,CAqCtJ;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,iBAmB/E"}
+{"version":3,"file":"mp3.d.ts","sourceRoot":"","sources":["../src/mp3.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4B,WAAW,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiBnC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,UAAU,GAAG;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAsFnH;AAID,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,WAAW,GAAG,UAAU,CAyC7J;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,iBAmB/E"}

package/dist/mp3.js

@@ -123,16 +123,21 @@ function createMP3OMAFile(index, metadata, rawFile, deviceKey, codec) {
             { id: 'TXXX', flags: 0, contents: (0, id3_1.encodeSonyWeirdString)("OMG_TRLDA", "1982/01/01 00:00:00") },
         ],
     }, METADATA_BLOCK_SIZE);
-    const formatHeader = (0, codecs_1.createEA3Header)(codec, 0xFFFE, 2);
+    const formatHeader = (0, codecs_1.createEA3Header)(codec, deviceKey === null ? 0xFFFF : 0xFFFE, 2);
     const finalFileBuffer = new Uint8Array(rootID3.length + formatHeader.length + rawFile.length - cursor);
     finalFileBuffer.set(rootID3, 0);
     finalFileBuffer.set(formatHeader, rootID3.length);
-    const finalDataView = new DataView(finalFileBuffer.buffer);
-    const key = (0, encryption_1.getMP3EncryptionKey)(deviceKey, index);
-    let finalBufferCursor = rootID3.length + formatHeader.length;
-    for (; cursor < rawFile.length - 7; cursor += 8, finalBufferCursor += 8) {
-        finalDataView.setUint32(finalBufferCursor, rawDataView.getUint32(cursor) ^ key);
-        finalDataView.setUint32(finalBufferCursor + 4, rawDataView.getUint32(cursor + 4) ^ key);
+    if (deviceKey != null) {
+        const finalDataView = new DataView(finalFileBuffer.buffer);
+        const key = (0, encryption_1.getMP3EncryptionKey)(deviceKey, index);
+        let finalBufferCursor = rootID3.length + formatHeader.length;
+        for (; cursor < rawFile.length - 7; cursor += 8, finalBufferCursor += 8) {
+            finalDataView.setUint32(finalBufferCursor, rawDataView.getUint32(cursor) ^ key);
+            finalDataView.setUint32(finalBufferCursor + 4, rawDataView.getUint32(cursor + 4) ^ key);
+        }
+    }
+    else {
+        finalFileBuffer.set(rawFile.subarray(cursor), rootID3.length + formatHeader.length);
     }
     return finalFileBuffer;
 }

package/dist/tagged-oma.d.ts

@@ -1,13 +1,18 @@
 import { HiMDCodec, HiMDFile } from "himd-js";
 import { InboundTrackMetadata, TrackMetadata } from './databases';
+export interface OmaFile {
+    data: Uint8Array;
+    duration: number;
+    maclistValue?: Uint8Array;
+}
 export declare function createTaggedEncryptedOMA(rawData: Uint8Array, titleInfo: InboundTrackMetadata, codec: {
     codecId: HiMDCodec;
     codecInfo: Uint8Array;
-}): {
-    data: Uint8Array;
-    maclistValue: Uint8Array;
-    duration: number;
-};
+}): OmaFile;
+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;
 //# 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;AAqGlE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,KAAK,EAAE;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,UAAU,CAAA;CAAC;;;;EAchJ;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;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"}

package/dist/tagged-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.decryptOMA = exports.updateMetadata = exports.createTaggedEncryptedOMA = void 0;
+exports.decryptOMA = exports.updateMetadata = exports.createTaggedOMA = exports.createTaggedEncryptedOMA = void 0;
 const crypto_js_wasm_1 = __importDefault(require("@originjs/crypto-js-wasm"));
 const himd_js_1 = require("himd-js");
 const utils_1 = require("./utils");
@@ -36,6 +36,17 @@ function createSonyGEOB(geobName, header, kvmap) {
     }
     return (0, utils_1.concatUint8Arrays)(dataSlices);
 }
+function createPrimaryHeader(titleInfo, milliseconds) {
+    const id3Info = {
+        flags: 0,
+        version: { major: 3, minor: 0 },
+        tags: [
+            ...(0, id3_1.createCommonID3Tags)(titleInfo),
+            { id: "TLEN", contents: (0, id3_1.encodeUTF16BEStringEA3)(milliseconds.toString()), flags: 0 },
+        ]
+    };
+    return (0, id3_1.serialize)(id3Info);
+}
 function createEncryptionHeader(titleInfo, milliseconds) {
     const verificationKey = (0, utils_1.createRandomBytes)(8);
     const actualTrackKey = (0, utils_1.createRandomBytes)(8);
@@ -104,6 +115,13 @@ function createTaggedEncryptedOMA(rawData, titleInfo, codec) {
     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);

package/dist/utils.d.ts

@@ -10,4 +10,5 @@ export declare class Logger {
     bumpIndent(i: number): void;
     log(...data: string[]): void;
 }
+export declare function getAudioDataFromWave(waveFile: Uint8Array): Uint8Array | null;
 //# 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"}
+{"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"}

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logger = exports.hexDump = exports.arrayEq = exports.createRandomBytes = exports.wordArrayToByteArray = exports.concatUint8Arrays = exports.join = exports.assert = void 0;
+exports.getAudioDataFromWave = exports.Logger = exports.hexDump = exports.arrayEq = exports.createRandomBytes = exports.wordArrayToByteArray = exports.concatUint8Arrays = exports.join = exports.assert = void 0;
 function assert(condition, message) {
     if (condition) {
         return;
@@ -111,3 +111,23 @@ class Logger {
     }
 }
 exports.Logger = Logger;
+function getAudioDataFromWave(waveFile) {
+    const dv = new DataView(waveFile.buffer);
+    const magic = textDecoder.decode(waveFile.slice(0, 4));
+    if (magic != 'RIFF')
+        throw new Error("Not a valid RIFF wave file!");
+    let cursor = 0x0c;
+    while (cursor < waveFile.length) {
+        let name = textDecoder.decode(waveFile.slice(cursor, cursor + 4));
+        cursor += 4;
+        let size = dv.getUint32(cursor, true);
+        cursor += 4;
+        if (name != 'data')
+            cursor += size;
+        else {
+            return waveFile.slice(cursor, cursor + size);
+        }
+    }
+    return null;
+}
+exports.getAudioDataFromWave = getAudioDataFromWave;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "networkwm-js",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "A library which lets you manage tracks and metadata on Sony Network Walkmen.",
   "main": "dist/index.js",
   "scripts": {
@@ -40,7 +40,7 @@
     "himd-js": "^0.2.7",
     "mp3-parser": "^0.3.0",
     "node-id3": "^0.2.5",
-    "node-mass-storage": "^0.2.2",
+    "node-mass-storage": "^0.2.4",
     "nufatfs": "^0.1.10",
     "usb": "^2.4.1"
   }