networkwm-js 0.1.0 → 0.1.1

package/dist/tagged-oma.js

@@ -3,22 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateMetadata = exports.createTaggedEncryptedOMA = void 0;
+exports.decryptOMA = exports.updateMetadata = 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");
 const id3_1 = require("./id3");
 const encryption_1 = require("./encryption");
+const codecs_1 = require("./codecs");
 const textEncoder = new TextEncoder();
 const PHONY_CID = new Uint8Array([0x00, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x50, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xA9, 0xC1, 0x6A, 0x81, 0x6A, 0x87, 0xDA, 0xAD, 0x4B, 0xA2, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]);
 const EKB1001D_CONTENTS = new Uint8Array([0x45, 0x4B, 0x42, 0x20, 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, 0x01, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x39, 0x47, 0xF4, 0x0A, 0x33, 0x65, 0x2F, 0x98, 0x71, 0x73, 0xC3, 0x98, 0x68, 0xC5, 0x23, 0x5B, 0x84, 0x20, 0xC8, 0xCF, 0xFB, 0x0E, 0x7F, 0x4E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x34, 0x85, 0x14, 0x51, 0x45, 0x04, 0x02, 0xFF, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x36, 0xD2, 0x00, 0x38, 0x74, 0x91, 0x51, 0x9D, 0xA7, 0x75, 0x94, 0x70, 0xA0, 0x17, 0x69, 0xDA, 0x69, 0x55, 0xAE, 0xA6, 0x9F, 0x6A, 0x3E, 0x69, 0x18, 0xC7, 0xC6, 0xBB, 0xD7, 0xCC, 0xFB, 0x1B, 0x81, 0x8D, 0xA9, 0x97, 0x90, 0x67, 0x29, 0x5C, 0xB7, 0x55, 0x5A, 0xEC, 0x21, 0x1B, 0x9E, 0xBD, 0xD4, 0x7E, 0xD9, 0x09, 0x79, 0xE0, 0x39, 0xA1, 0xE0, 0x76, 0x68, 0x0D, 0xB8, 0xBF, 0xED, 0xB0, 0xD3, 0x24, 0x26, 0xB8, 0xF7, 0x79, 0x22, 0xBD, 0x46, 0xC9, 0x44, 0x9F, 0xDF, 0x01, 0x74, 0xC0, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x28, 0xDB, 0x54, 0x6A, 0xC5, 0xE0, 0x4D, 0x4F, 0xCB, 0xF2, 0x46, 0x3B, 0x01, 0xDE, 0x2C, 0xD0, 0xFB, 0xAF, 0x7A, 0xA7, 0x1E, 0xEF, 0x44, 0x29, 0x05, 0x97, 0x9D, 0xBE, 0xE7, 0x28, 0x4E, 0xA4, 0x53, 0x3A, 0x2F, 0x71, 0xC7, 0xCB, 0x86, 0x58, 0x39]);
-function encodeSonyWeirdString(type, data) {
-    return (0, utils_1.concatUint8Arrays)([
-        (0, id3_1.encodeUTF16BEStringEA3)(type),
-        new Uint8Array([0, 0]),
-        (0, id3_1.encodeUTF16BEStringEA3)(data, false),
-    ]);
-}
+const ULINF_KEYRING_HEADER = new Uint8Array([
+    0x00, 0x28, 0x00, 0x01,
+    0x00, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x21,
+]);
 function createSonyGEOB(geobName, header, kvmap) {
     // Header:
     const dataSlices = [
@@ -42,12 +42,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)([
-        new Uint8Array([
-            0x00, 0x28, 0x00, 0x01,
-            0x00, 0x03, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x01, 0x00, 0x21,
-        ]),
+        ULINF_KEYRING_HEADER,
         verificationKey, (0, encryption_1.createTrackKeyForKeyring)(0x00010021, verificationKey, actualTrackKey), padding,
         new Uint8Array(8).fill(0),
     ]);
@@ -87,15 +82,7 @@ function createEncryptionHeader(titleInfo, milliseconds) {
         version: { major: 3, minor: 0 },
         tags: [
             { id: "GEOB", contents: firstGEOBContents, flags: 0 },
-            { id: "TIT2", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.title), flags: 0 },
-            { id: "TPE1", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.artist), flags: 0 },
-            { id: "TALB", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.album), flags: 0 },
-            { id: "TALB", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.album), flags: 0 },
-            { id: "TCON", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.genre), flags: 0 },
-            { id: "TXXX", contents: encodeSonyWeirdString("OMG_TPE1S", titleInfo.artist), flags: 0 },
-            { id: "TXXX", contents: encodeSonyWeirdString("OMG_TRACK", '0'), flags: 0 },
-            { id: "TXXX", contents: encodeSonyWeirdString("OMG_ALBMS", titleInfo.album), flags: 0 },
-            { id: "TXXX", contents: encodeSonyWeirdString("OMG_TIT2S", titleInfo.title), flags: 0 },
+            ...(0, id3_1.createCommonID3Tags)(titleInfo),
             { id: "TLEN", contents: (0, id3_1.encodeUTF16BEStringEA3)(milliseconds.toString()), flags: 0 },
             { id: "GEOB", contents: secondGEOBContents, flags: 0 }, // OMG_BKLSI
         ]
@@ -103,7 +90,7 @@ function createEncryptionHeader(titleInfo, milliseconds) {
     return { contents: (0, id3_1.serialize)(id3Info), trackEncryptionKey: actualTrackKey, maclistValue };
 }
 function createTaggedEncryptedOMA(rawData, titleInfo, codec) {
-    const formatHeader = (0, utils_1.createEA3Header)(codec, true);
+    const formatHeader = (0, codecs_1.createEA3Header)(codec, 0x0001);
     const milliseconds = Math.floor(1000 * (0, himd_js_1.getSeconds)(codec, Math.ceil(rawData.length / (0, himd_js_1.getBytesPerFrame)(codec))));
     const { contents: encHeader, trackEncryptionKey, maclistValue } = createEncryptionHeader(titleInfo, milliseconds);
     let iv = (0, utils_1.createRandomBytes)(8);
@@ -151,15 +138,7 @@ async function updateMetadata(file, titleInfo) {
         version: metadata.version,
         tags: [
             ulinf,
-            { id: "TIT2", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.title), flags: 0 },
-            { id: "TPE1", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.artist), flags: 0 },
-            { id: "TALB", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.album), flags: 0 },
-            { id: "TALB", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.album), flags: 0 },
-            { id: "TCON", contents: (0, id3_1.encodeUTF16BEStringEA3)(titleInfo.genre), flags: 0 },
-            { id: "TXXX", contents: encodeSonyWeirdString("OMG_TPE1S", titleInfo.artist), flags: 0 },
-            { id: "TXXX", contents: encodeSonyWeirdString("OMG_TRACK", '0'), flags: 0 },
-            { id: "TXXX", contents: encodeSonyWeirdString("OMG_ALBMS", titleInfo.album), flags: 0 },
-            { id: "TXXX", contents: encodeSonyWeirdString("OMG_TIT2S", titleInfo.title), flags: 0 },
+            ...(0, id3_1.createCommonID3Tags)(titleInfo),
             tlen,
             bklsi,
         ]
@@ -173,3 +152,63 @@ async function updateMetadata(file, titleInfo) {
     await file.write(new Uint8Array(zeroOutDifference).fill(0));
 }
 exports.updateMetadata = updateMetadata;
+function decryptOMA(omaFile) {
+    var _a;
+    const OMA_METADATA_HEADER = textEncoder.encode("ea3");
+    if (!(0, utils_1.arrayEq)(OMA_METADATA_HEADER, omaFile.subarray(0, 3))) {
+        throw new Error("Not a valid OMA file");
+    }
+    const metaHeaderSize = 10 + (0, id3_1.readSynchsafeInt32)(new DataView(omaFile.buffer), 6)[0];
+    const metadata = (0, id3_1.parse)(omaFile.subarray(0, metaHeaderSize));
+    const textDecoder = new TextDecoder();
+    const ulinf = (_a = findInMetadata(metadata, "OMG_ULINF", true)) === null || _a === void 0 ? void 0 : _a.contents;
+    let dataOffset = 10 + 'OMG_ULINF'.length * 2 + 2;
+    let keyringContents = null;
+    if (!ulinf)
+        throw new Error("No ULINF GEOB found!");
+    while ((dataOffset + 16) < ulinf.length) {
+        let name = textDecoder.decode(ulinf.subarray(dataOffset, dataOffset + 12)).trim();
+        let chunkLen = ulinf[dataOffset + 13];
+        let chunkCount = ulinf[dataOffset + 15];
+        if (name.includes("\x00")) {
+            name = name.substring(0, name.indexOf("\x00"));
+        }
+        if (name !== 'KEYRING') {
+            dataOffset += 16 + (chunkCount * chunkLen);
+            continue;
+        }
+        keyringContents = ulinf.subarray(dataOffset + 16, dataOffset + 16 + (chunkCount * chunkLen));
+        break;
+    }
+    if (!keyringContents)
+        throw new Error("Cannot find KEYRING in ULINF!");
+    if (!(0, utils_1.arrayEq)(ULINF_KEYRING_HEADER, keyringContents.subarray(0, ULINF_KEYRING_HEADER.length)))
+        throw new Error("Invalid ULINF KEYRING header");
+    const encryptedVerificationKey = keyringContents.slice(16, 16 + 8);
+    const encryptedTrackKey = keyringContents.slice(24, 24 + 8);
+    const decryptedTrackKey = (0, encryption_1.createTrackKeyFromKeyring)(0x00010021, encryptedVerificationKey, encryptedTrackKey);
+    // We have the key now. Recreate the headers and form the final file.
+    // Strip all DRM tags:
+    metadata.tags = metadata.tags.filter(e => e.id !== "GEOB");
+    const newMetaHeader = (0, id3_1.serialize)(metadata);
+    const newFormatHeader = omaFile.slice(metaHeaderSize, metaHeaderSize + 96);
+    // Set encryption type to 0xFFFF (unencrypted)
+    newFormatHeader[6] = 0xFF;
+    newFormatHeader[7] = 0xFF;
+    // Retrieve IV from the header
+    const iv = newFormatHeader.slice(96 - 8);
+    // ...and destroy it
+    newFormatHeader.fill(0, 96 - 8);
+    // Finally, decrypt all the audio
+    const rawData = omaFile.subarray(metaHeaderSize + 96);
+    const keyWa = crypto_js_wasm_1.default.lib.WordArray.create(decryptedTrackKey);
+    const ivWa = crypto_js_wasm_1.default.lib.WordArray.create(iv);
+    const blockWa = crypto_js_wasm_1.default.lib.CipherParams.create({
+        ciphertext: crypto_js_wasm_1.default.lib.WordArray.create(rawData)
+    });
+    const allData = crypto_js_wasm_1.default.DES.decrypt(blockWa, keyWa, { mode: crypto_js_wasm_1.default.mode.CBC, iv: ivWa });
+    const decryptedAudio = (0, utils_1.wordArrayToByteArray)(allData, rawData.length);
+    // And merge all into the final OMA.
+    return (0, utils_1.concatUint8Arrays)([newMetaHeader, newFormatHeader, decryptedAudio]);
+}
+exports.decryptOMA = decryptOMA;

package/dist/test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=test.d.ts.map

package/dist/test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":""}

package/dist/test.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const codecs_1 = require("./codecs");
+// (async () => {
+//     const data = new Uint8Array(fs.readFileSync("/ram/10000001.OMA"));
+//     const id3 = parse(data);
+//     console.log(id3);
+//     for(let tag of id3.tags) {
+//         fs.writeFileSync(`/ram/tag-${tag.id}`, tag.contents);
+//     }
+// })();
+// import {  } from 'himd-js';
+// import { createEA3Header } from './utils';
+// (async () => {
+//     const header = createEA3Header({  })
+// })
+// const data = new Uint8Array(fs.readFileSync("/ram/10000007.OMA"));
+// let trackKey;
+// console.log(trackKey = deriveMP3TrackKey(data, console.log));
+// console.log(deriveDeviceKey(trackKey, 0x07));
+(async () => {
+    // const device = await openNewDeviceNode();
+    // initCrypto();
+    // importKeys(new Uint8Array(nfs.readFileSync("EKBROOTS.DES")));
+    // if(!device) {
+    //     console.log("No device");
+    //     return;
+    // }
+    // console.log(`Connected to ${device.definition.name}`);
+    // const fs = await createNWJSFS(device);
+    // const database = await DatabaseAbstraction.create(fs, device.definition);
+    // const session = new UMSCNWJSSession(fs.driver, fs);
+    // await session.performAuthorization();
+    // const trackNames = (JSON.parse(nfs.readFileSync("/mnt/NAS/Code/ALT_SS_STAGE/Putting the 9 hour mix on the MD/titlesv2/tracknames.json").toString()) as [string, string][]).map(e => e[1]);
+    // const BASE_LOC = "/mnt/NAS/Code/ALT_SS_STAGE/Putting the 9 hour mix on the MD/tracks/";
+    // for(let i = 1; i<180; i++){
+    //     let file = `${BASE_LOC}/${i + 1}.wav`;
+    //     const contents = new Uint8Array(nfs.readFileSync(file)).subarray(76);
+    //     await uploadTrack(database, session, {
+    //         album: "The Ultimate S3RL Tribute Mix 2023",
+    //         artist: "S3RL",
+    //         genre: "Happy Hardcore",
+    //         title: trackNames[i],
+    //         trackDuration: -1,
+    //         trackNumber: -1,
+    //     }, generateCodecInfo("AT3", HiMDKBPSToFrameSize.atrac3[66]), contents, console.log);
+    //     console.log(`Finished uploading ${i + 1} / 180`);
+    // }
+    // await session.finalizeSession();
+    // await database.flushUpdates();
+    // await fs.fatfs!.flushMetadataChanges();
+    // console.log(await fs.list("/OMGAUDIO"));
+    // const session = new UMSCNWJSSession(fs.driver, fs);
+    // await session.performAuthorization();
+    // await database.uploadTrack({
+    //     album: 'Singles',
+    //     artist: 'cy4ne',
+    //     genre: 'Scenecore',
+    //     title: 'solace',
+    //     trackNumber: -1,
+    // }, generateCodecInfo('A3+', HiMDKBPSToFrameSize.atrac3plus[256]), new Uint8Array(nfs.readFileSync("/ram/solace.raw.at3p")), session);
+    // await session.finalizeSession();
+    // await database.flushUpdates();
+    // await fs.fatfs!.flushMetadataChanges();
+    const nwCodec = {
+        codecId: codecs_1.NWCodec.MP3,
+        codecInfo: new Uint8Array([0x80, 0xdd, 0x10]),
+    };
+    console.log((0, codecs_1.getKBPS)(nwCodec));
+})().then(() => process.exit(0));

package/dist/utils.d.ts

@@ -1,9 +1,13 @@
-import { CodecInfo } from 'himd-js';
 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 createEA3Header({ codecId, codecInfo }: CodecInfo, encrypted?: boolean): Uint8Array;
 export declare function wordArrayToByteArray(wordArray: any, length?: number): Uint8Array;
 export declare function createRandomBytes(length?: number): Uint8Array;
 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 {
+    preffix: string;
+    bumpIndent(i: number): void;
+    log(...data: string[]): void;
+}
 //# 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":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,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;AAED,wBAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,SAAS,UAAQ,cASnF;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"}
+{"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"}

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.arrayEq = exports.createRandomBytes = exports.wordArrayToByteArray = exports.createEA3Header = exports.concatUint8Arrays = exports.join = exports.assert = void 0;
+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;
@@ -27,17 +27,6 @@ function concatUint8Arrays(args) {
     return res;
 }
 exports.concatUint8Arrays = concatUint8Arrays;
-function createEA3Header({ codecId, codecInfo }, encrypted = false) {
-    const headerSize = 96;
-    const header = new Uint8Array(headerSize);
-    header.set(new Uint8Array([0x45, 0x41, 0x33, 0x01, 0x00, 0x60, encrypted ? 0x00 : 0xff, encrypted ? 0x01 : 0xff, 0x00, 0x00, 0x00, 0x00]));
-    header[32] = codecId;
-    header[33] = codecInfo[0];
-    header[34] = codecInfo[1];
-    header[35] = codecInfo[2];
-    return header;
-}
-exports.createEA3Header = createEA3Header;
 function wordToByteArray(word, length, littleEndian = false) {
     let ba = [], xFF = 0xff;
     let actualLength = length;
@@ -88,3 +77,37 @@ function arrayEq(a, b) {
     return true;
 }
 exports.arrayEq = arrayEq;
+const textDecoder = new TextDecoder();
+function hexDump(logger, data, truncate = true) {
+    if (data.length === 0)
+        logger("<None>");
+    let rows = Math.ceil(data.length / 16), truncated = false;
+    if (truncate && rows > 20) {
+        rows = 20;
+        truncated = true;
+    }
+    for (let row = 0; row < rows; row++) {
+        const rowData = data.subarray(row * 16, (row + 1) * 16);
+        logger(`${(row * 16).toString(16).padStart(4, '0')}:\t${Array.from(rowData).map(e => e.toString(16).padStart(2, '0')).join(' ')}\t${textDecoder.decode(rowData.map(e => e > 0x20 && e < 0x7F ? e : 46))}`);
+    }
+    if (truncated)
+        logger("<truncated>");
+}
+exports.hexDump = hexDump;
+class Logger {
+    constructor() {
+        this.preffix = "";
+    }
+    bumpIndent(i) {
+        if (i < 0) {
+            this.preffix = this.preffix.substring(0, this.preffix.length + i * 4);
+        }
+        else {
+            this.preffix = this.preffix + " ".repeat(4 * i);
+        }
+    }
+    log(...data) {
+        console.log(this.preffix + data.join(' '));
+    }
+}
+exports.Logger = Logger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "networkwm-js",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A library which lets you manage tracks and metadata on Sony Network Walkmen.",
   "main": "dist/index.js",
   "scripts": {
@@ -21,6 +21,9 @@
   "files": [
     "dist"
   ],
+  "bin": {
+    "nwjs": "dist/cli.js"
+  },
   "bugs": {
     "url": "https://github.com/asivery/networkwm-js/issues"
   },
@@ -28,16 +31,17 @@
   "devDependencies": {
     "@types/node": "^18.11.9",
     "prettier": "^2.8.8",
+    "ts-node": "^10.9.2",
     "typescript": "^4.8.4"
   },
   "dependencies": {
     "@originjs/crypto-js-wasm": "github:asivery/crypto-js-wasm",
     "async-mutex": "^0.4.0",
-    "himd-js": "^0.2.0-alpha.5",
+    "himd-js": "^0.2.0",
     "mp3-parser": "^0.3.0",
     "node-id3": "^0.2.5",
-    "node-mass-storage": "^0.2.0",
-    "nufatfs": "^0.1.5",
+    "node-mass-storage": "^0.2.2",
+    "nufatfs": "^0.1.8",
     "usb": "^2.4.1"
   }
 }

package/dist/functions.d.ts

@@ -1,12 +0,0 @@
-import { CodecInfo } from "himd-js";
-import { WebUSBDevice } from "usb";
-import { TrackMetadata } from "./databases";
-import { UMSCNWJSFilesystem, UMSCNWJSSession } from "./filesystem";
-import { DatabaseAbstraction } from "./database-abstraction";
-export declare function uploadTrack(database: DatabaseAbstraction, session: UMSCNWJSSession, trackInfo: TrackMetadata, codec: CodecInfo, rawData: Uint8Array, callback?: (done: number, outOf: number) => void): Promise<void>;
-export declare function createNWJSFS(webUsbDevice: WebUSBDevice, bypassCoherencyChecks: boolean): Promise<UMSCNWJSFilesystem>;
-export declare function openNewDeviceNode(): Promise<{
-    dev: WebUSBDevice;
-    name: string;
-} | null>;
-//# sourceMappingURL=functions.d.ts.map

package/dist/functions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../src/functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,YAAY,EAAa,MAAM,KAAK,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAInE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAO7D,wBAAsB,WAAW,CAC7B,QAAQ,EAAE,mBAAmB,EAC7B,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,iBA2BnD;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"}

package/dist/functions.js

@@ -1,73 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.openNewDeviceNode = exports.createNWJSFS = exports.uploadTrack = void 0;
-const usb_1 = require("usb");
-const filesystem_1 = require("./filesystem");
-const tagged_oma_1 = require("./tagged-oma");
-const utils_1 = require("./utils");
-const devices_1 = require("./devices");
-const initialization_1 = require("./initialization");
-function resolvePathFromGlobalIndex(globalTrackIndex) {
-    return (0, utils_1.join)('OMGAUDIO', '10F00', '1000' + globalTrackIndex.toString(16).padStart(4, '0').toUpperCase() + '.OMA');
-}
-async function uploadTrack(database, session, trackInfo, codec, rawData, callback) {
-    // 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 = database.addNewTrack({
-        ...trackInfo,
-        trackDuration: encryptedOMA.duration,
-    }, codec);
-    // Step 3 - write track to the filesystem
-    const fh = await database.database.filesystem.open(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);
-    while (remaining) {
-        const toWrite = Math.min(2048, remaining);
-        await fh.write(data.slice(i, i + toWrite));
-        i += toWrite;
-        remaining -= toWrite;
-        callback === null || callback === void 0 ? void 0 : callback(i, data.length);
-    }
-    await fh.close();
-    // Step 4 - write MAC
-    session.writeTrackMac(globalTrackIndex - 1, encryptedOMA.maclistValue);
-}
-exports.uploadTrack = uploadTrack;
-async function createNWJSFS(webUsbDevice, bypassCoherencyChecks) {
-    // Connect into the HiMD codebase
-    const fs = new filesystem_1.UMSCNWJSFilesystem(webUsbDevice);
-    await fs.init();
-    await (0, initialization_1.initializeIfNeeded)(fs);
-    return fs;
-}
-exports.createNWJSFS = createNWJSFS;
-async function openNewDeviceNode() {
-    let legacyDevice, devName = null;
-    for (let dev of devices_1.DeviceIds) {
-        legacyDevice = (0, usb_1.findByIds)(dev.vendorId, dev.productId);
-        if (legacyDevice) {
-            devName = dev.name;
-            break;
-        }
-    }
-    if (!legacyDevice) {
-        return null;
-    }
-    legacyDevice.open();
-    await new Promise(res => legacyDevice.reset(res));
-    const iface = legacyDevice.interface(0);
-    try {
-        if (iface.isKernelDriverActive())
-            iface.detachKernelDriver();
-    }
-    catch (ex) {
-        // console.log("Couldn't detach the kernel driver. Expected on Windows.");
-    }
-    const webUsbDevice = (await usb_1.WebUSBDevice.createInstance(legacyDevice));
-    await webUsbDevice.open();
-    return { dev: webUsbDevice, name: devName };
-}
-exports.openNewDeviceNode = openNewDeviceNode;