networkwm-js 0.2.2 → 0.2.4

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

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

package/dist/id3.d.ts

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

package/dist/id3.d.ts.map

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

package/dist/id3.js

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

package/dist/index.d.ts

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

package/dist/index.d.ts.map

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

package/dist/index.js

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

package/dist/init-data.d.ts

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

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

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

package/dist/initialization.js

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

package/dist/mp3.js

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

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

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

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

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

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

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

package/dist/sort.d.ts

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

package/dist/sort.d.ts.map

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

package/dist/sort.js

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

package/dist/tables.js

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

package/dist/tagged-oma.d.ts

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

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

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

package/dist/tagged-oma.js

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

package/dist/utils.d.ts

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

package/dist/utils.d.ts.map

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

package/dist/utils.js

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

package/package.json

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

package/dist/helpers.d.ts.map

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