@isopodlabs/binary_libs 1.2.1 → 1.3.0

package/dist/pe.js

@@ -27,16 +27,17 @@ exports.DLLImports = exports.PE = exports.DATA_DIRECTORY = exports.DIRECTORIES =
 exports.ReadExports = ReadExports;
 exports.ReadImports = ReadImports;
 exports.ReadResourceDirectory = ReadResourceDirectory;
-const binary = __importStar(require("@isopodlabs/binary"));
+const bin = __importStar(require("@isopodlabs/binary"));
+const clr_1 = require("./clr");
 class MyDate extends Date {
     constructor(x) { super(x * 1000); }
     valueOf() { return this.getTime() / 1000; }
     toString() { return super.toString(); }
 }
-const uint16 = binary.UINT16_LE;
-const uint32 = binary.UINT32_LE;
-const uint64 = binary.UINT64_LE;
-const TIMEDATE = binary.as(uint32, MyDate);
+const uint16 = bin.UINT16_LE;
+const uint32 = bin.UINT32_LE;
+const uint64 = bin.UINT64_LE;
+const TIMEDATE = bin.as(uint32, MyDate);
 //-----------------------------------------------------------------------------
 //	COFF
 //-----------------------------------------------------------------------------
@@ -63,7 +64,7 @@ const MACHINES = {
     THUMB: 0x1c2,
     WCEMIPSV2: 0x169,
 };
-const MACHINE = binary.asEnum(uint16, MACHINES);
+const MACHINE = bin.asEnum(uint16, MACHINES);
 const FILE_HEADER = {
     Machine: MACHINE,
     NumberOfSections: uint16,
@@ -117,47 +118,47 @@ const SECTION_CHARACTERISTICS = {
     MEM_READ: 0x40000000,
     MEM_WRITE: 0x80000000,
 };
-class Section extends binary.ReadClass({
-    Name: binary.StringType(8),
+class Section extends bin.ReadClass({
+    Name: bin.StringType(8),
     VirtualSize: uint32,
-    VirtualAddress: binary.asHex(uint32),
+    VirtualAddress: bin.asHex(uint32),
     SizeOfRawData: uint32,
-    PointerToRawData: binary.asHex(uint32),
-    PointerToRelocations: binary.asHex(uint32),
-    PointerToLinenumbers: binary.asHex(uint32),
-    NumberOfRelocations: binary.INT16_LE,
-    NumberOfLinenumbers: binary.INT16_LE,
-    Characteristics: binary.asFlags(uint32, SECTION_CHARACTERISTICS)
+    PointerToRawData: bin.asHex(uint32),
+    PointerToRelocations: bin.asHex(uint32),
+    PointerToLinenumbers: bin.asHex(uint32),
+    NumberOfRelocations: bin.INT16_LE,
+    NumberOfLinenumbers: bin.INT16_LE,
+    Characteristics: bin.asFlags(uint32, SECTION_CHARACTERISTICS)
 }) {
     data;
     constructor(r) {
         super(r);
         try {
-            this.data = new binary.MappedMemory(r.buffer_at(+this.PointerToRawData, this.SizeOfRawData), +this.VirtualAddress, this.flags);
+            this.data = new bin.MappedMemory(r.buffer_at(+this.PointerToRawData, this.SizeOfRawData), BigInt(this.VirtualAddress.value), this.flags);
         }
         catch (e) {
             console.log(e);
         }
     }
     get flags() {
-        return binary.MappedMemory.RELATIVE
-            | (this.Characteristics.MEM_READ ? binary.MappedMemory.READ : 0)
-            | (this.Characteristics.MEM_WRITE ? binary.MappedMemory.WRITE : 0)
-            | (this.Characteristics.MEM_EXECUTE ? binary.MappedMemory.EXECUTE : 0);
+        return bin.MappedMemory.RELATIVE
+            | (this.Characteristics.MEM_READ ? bin.MappedMemory.READ : 0)
+            | (this.Characteristics.MEM_WRITE ? bin.MappedMemory.WRITE : 0)
+            | (this.Characteristics.MEM_EXECUTE ? bin.MappedMemory.EXECUTE : 0);
     }
 }
 exports.Section = Section;
 class COFF {
     static check(data) {
-        const header = binary.read(new binary.stream(data), FILE_HEADER);
+        const header = bin.read(new bin.stream(data), FILE_HEADER);
         return MACHINES[header.Machine] !== undefined;
     }
     header;
     opt;
     sections;
     constructor(data) {
-        const file = new binary.stream(data);
-        this.header = binary.read(file, FILE_HEADER);
+        const file = new bin.stream(data);
+        this.header = bin.read(file, FILE_HEADER);
         if (this.header.SizeOfOptionalHeader) {
             console.log("COFF: SizeOfOptionalHeader", this.header.SizeOfOptionalHeader);
         }
@@ -179,45 +180,46 @@ const SYMBOL = {
     Value: uint16,
     //}
     Type: uint16,
-    Symbol: binary.NullTerminatedStringType(),
-    Module: binary.NullTerminatedStringType(),
+    Symbol: bin.NullTerminatedStringType(),
+    Module: bin.NullTerminatedStringType(),
 };
-class COFFSymbol extends binary.ReadClass(SYMBOL) {
+class COFFSymbol extends bin.ReadClass(SYMBOL) {
     static check(data) {
-        const test = binary.read(new binary.stream(data), SYMBOL);
+        const test = bin.read(new bin.stream(data), SYMBOL);
         return test.a === 0 && test.b === 0xffff && test.c === 0 && test.Architecture != 'UNKNOWN';
     }
     constructor(data) {
-        super(new binary.stream(data));
+        super(new bin.stream(data));
     }
 }
 exports.COFFSymbol = COFFSymbol;
 //-----------------------------------------------------------------------------
 //	PE
 //-----------------------------------------------------------------------------
-class pe_stream extends binary.stream {
+class pe_stream extends bin.stream {
     pe;
     constructor(pe, data) {
         super(data);
         this.pe = pe;
     }
+    translate_rva(addr) { return this.pe.GetDataRVA(addr); }
     get_rva() { return this.pe.GetDataRVA(uint32.get(this))?.data; }
 }
 exports.pe_stream = pe_stream;
+const RVA_BLOB = {
+    get(s) { return s.get_rva(); },
+    put(_s) { }
+};
 const RVA_STRING = {
-    get(s) { return binary.utils.decodeTextTo0(s.get_rva(), 'utf8'); },
+    get(s) { return bin.utils.decodeTextTo0(s.get_rva(), 'utf8'); },
     put(_s) { }
 };
 const RVA_ARRAY16 = {
-    get(s) { return binary.utils.to16(s.get_rva()); },
+    get(s) { return bin.utils.to16(s.get_rva()); },
     put(_s) { }
 };
 const RVA_ARRAY32 = {
-    get(s) { return binary.utils.to32(s.get_rva()); },
-    put(_s) { }
-};
-const RVA_ARRAY64 = {
-    get(s) { return binary.utils.to64(s.get_rva()); },
+    get(s) { return bin.utils.to32(s.get_rva()); },
     put(_s) { }
 };
 const DOS_HEADER = {
@@ -227,7 +229,7 @@ const DOS_HEADER = {
     crlc: uint16,
     cparhdr: uint16,
     minalloc: uint16,
-    maxalloc: binary.asHex(uint16),
+    maxalloc: bin.asHex(uint16),
     ss: uint16,
     sp: uint16,
     csum: uint16,
@@ -237,28 +239,31 @@ const DOS_HEADER = {
     ovno: uint16,
 };
 const EXE_HEADER = {
-    res: binary.ArrayType(4, uint16),
+    res: bin.ArrayType(4, uint16),
     oemid: uint16,
     oeminfo: uint16,
-    res2: binary.ArrayType(10, uint16),
-    lfanew: binary.INT32_LE,
+    res2: bin.ArrayType(10, uint16),
+    lfanew: bin.INT32_LE,
+};
+const NoInfo = {
+    read: (pe, data) => data
 };
 exports.DIRECTORIES = {
     EXPORT: { read: (pe, data) => ReadExports(new pe_stream(pe, data.data)) },
     IMPORT: { read: (pe, data) => ReadImports(new pe_stream(pe, data.data)) },
-    RESOURCE: { read: (pe, data) => ReadResourceDirectory(new binary.stream(data.data), data) },
-    EXCEPTION: {}, // Exception Directory
-    SECURITY: {}, // Security Directory
-    BASERELOC: {}, // Base Relocation Table
-    DEBUG_DIR: {}, // Debug Directory
-    ARCHITECTURE: {}, // Architecture Specific Data
-    GLOBALPTR: {}, // RVA of GP
-    TLS: {},
-    LOAD_CONFIG: {}, // Load Configuration Directory
-    BOUND_IMPORT: {}, // Bound Import Directory in headers
-    IAT: {}, // Import Address Table
-    DELAY_IMPORT: {},
-    CLR_DESCRIPTOR: {},
+    RESOURCE: { read: (pe, data) => ReadResourceDirectory(new pe_stream(pe, data.data)) },
+    EXCEPTION: NoInfo, // Exception Directory
+    SECURITY: NoInfo, // Security Directory
+    BASERELOC: NoInfo, // Base Relocation Table
+    DEBUG_DIR: NoInfo, // Debug Directory
+    ARCHITECTURE: NoInfo, // Architecture Specific Data
+    GLOBALPTR: NoInfo, // RVA of GP
+    TLS: NoInfo,
+    LOAD_CONFIG: NoInfo, // Load Configuration Directory
+    BOUND_IMPORT: NoInfo, // Bound Import Directory in headers
+    IAT: NoInfo, // Import Address Table
+    DELAY_IMPORT: NoInfo,
+    CLR_DESCRIPTOR: { read: clr_1.ReadCLR },
 };
 exports.DATA_DIRECTORY = {
     VirtualAddress: uint32,
@@ -284,18 +289,18 @@ const DLLCHARACTERISTICS = {
     TERMINAL_SERVER_AWARE: 0x8000, // Terminal Server aware
 };
 const OPTIONAL_HEADER = {
-    Magic: binary.asEnum(uint16, MAGIC),
-    MajorLinkerVersion: binary.UINT8,
-    MinorLinkerVersion: binary.UINT8,
+    Magic: bin.asEnum(uint16, MAGIC),
+    MajorLinkerVersion: bin.UINT8,
+    MinorLinkerVersion: bin.UINT8,
     SizeOfCode: uint32,
     SizeOfInitializedData: uint32,
     SizeOfUninitializedData: uint32,
-    AddressOfEntryPoint: binary.asHex(uint32),
-    BaseOfCode: binary.asHex(uint32),
+    AddressOfEntryPoint: bin.asHex(uint32),
+    BaseOfCode: bin.asHex(uint32),
 };
 const OPTIONAL_HEADER32 = {
-    BaseOfData: binary.asHex(uint32),
-    ImageBase: binary.asHex(uint32),
+    BaseOfData: bin.asHex(uint32),
+    ImageBase: bin.asHex(uint32),
     SectionAlignment: uint32,
     FileAlignment: uint32,
     MajorOperatingSystemVersion: uint16,
@@ -309,16 +314,16 @@ const OPTIONAL_HEADER32 = {
     SizeOfHeaders: uint32,
     CheckSum: uint32,
     Subsystem: uint16,
-    DllCharacteristics: binary.asFlags(uint16, DLLCHARACTERISTICS),
+    DllCharacteristics: bin.asFlags(uint16, DLLCHARACTERISTICS),
     SizeOfStackReserve: uint32,
     SizeOfStackCommit: uint32,
     SizeOfHeapReserve: uint32,
     SizeOfHeapCommit: uint32,
     LoaderFlags: uint32,
-    DataDirectory: binary.objectWithNames(binary.ArrayType(uint32, exports.DATA_DIRECTORY), binary.names(Object.keys(exports.DIRECTORIES))),
+    DataDirectory: bin.objectWithNames(bin.ArrayType(uint32, exports.DATA_DIRECTORY), bin.names(Object.keys(exports.DIRECTORIES))),
 };
 const OPTIONAL_HEADER64 = {
-    ImageBase: binary.asHex(uint64),
+    ImageBase: bin.asHex(uint64),
     SectionAlignment: uint32,
     FileAlignment: uint32,
     MajorOperatingSystemVersion: uint16,
@@ -332,34 +337,34 @@ const OPTIONAL_HEADER64 = {
     SizeOfHeaders: uint32,
     CheckSum: uint32,
     Subsystem: uint16,
-    DllCharacteristics: binary.asFlags(uint16, DLLCHARACTERISTICS),
+    DllCharacteristics: bin.asFlags(uint16, DLLCHARACTERISTICS),
     SizeOfStackReserve: uint64,
     SizeOfStackCommit: uint64,
     SizeOfHeapReserve: uint64,
     SizeOfHeapCommit: uint64,
     LoaderFlags: uint32,
-    DataDirectory: binary.objectWithNames(binary.ArrayType(uint32, exports.DATA_DIRECTORY), binary.names(Object.keys(exports.DIRECTORIES))),
+    DataDirectory: bin.objectWithNames(bin.ArrayType(uint32, exports.DATA_DIRECTORY), bin.names(Object.keys(exports.DIRECTORIES))),
 };
 class PE {
     static check(data) {
-        return uint16.get(new binary.stream(data)) === binary.utils.stringCode("MZ");
+        return uint16.get(new bin.stream(data)) === bin.utils.stringCode("MZ");
     }
     header;
     opt;
     sections;
     constructor(data) {
-        const file = new binary.stream(data);
-        this.header = binary.read(file, { ...DOS_HEADER, ...EXE_HEADER });
+        const file = new bin.stream(data);
+        this.header = bin.read(file, { ...DOS_HEADER, ...EXE_HEADER });
         file.seek(this.header.lfanew);
-        if (uint32.get(file) == binary.utils.stringCode("PE\0\0")) {
-            const h = binary.read(file, FILE_HEADER);
+        if (uint32.get(file) == bin.utils.stringCode("PE\0\0")) {
+            const h = bin.read(file, FILE_HEADER);
             if (h.SizeOfOptionalHeader) {
-                const opt = new binary.stream(file.read_buffer(h.SizeOfOptionalHeader));
-                const opt1 = binary.read(opt, OPTIONAL_HEADER);
+                const opt = new bin.stream(file.read_buffer(h.SizeOfOptionalHeader));
+                const opt1 = bin.read(opt, OPTIONAL_HEADER);
                 if (opt1.Magic == 'NT32')
-                    this.opt = binary.read_more(opt, OPTIONAL_HEADER32, opt1);
+                    this.opt = bin.read_more(opt, OPTIONAL_HEADER32, opt1);
                 else if (opt1.Magic == 'NT64')
-                    this.opt = binary.read_more(opt, OPTIONAL_HEADER64, opt1);
+                    this.opt = bin.read_more(opt, OPTIONAL_HEADER64, opt1);
             }
             this.sections = Array.from({ length: h.NumberOfSections }, () => new Section(file));
         }
@@ -385,7 +390,7 @@ class PE {
     GetDataRVA(rva, size) {
         const sect = this.FindSectionRVA(rva);
         if (sect && sect.data)
-            return sect.data.at(rva, size);
+            return sect.data.at(BigInt(rva), size);
     }
     GetDataRaw(addr, size) {
         const sect = this.FindSectionRaw(addr);
@@ -403,10 +408,11 @@ class PE {
         if (dir?.Size) {
             const data = this.GetDataDir(dir);
             const info = exports.DIRECTORIES[name];
-            if (data && info?.read)
+            if (data && 'read' in info && info.read)
                 return info.read(this, data);
             return data;
         }
+        return undefined;
     }
 }
 exports.PE = PE;
@@ -416,8 +422,8 @@ exports.PE = PE;
 const EXPORT_DIRECTORY = {
     ExportFlags: uint32, // Reserved, must be 0.
     TimeDateStamp: TIMEDATE, // The time and date that the export data was created.
-    MajorVersion: binary.asHex(uint16), // The major version number. The major and minor version numbers can be set by the user.
-    MinorVersion: binary.asHex(uint16), // The minor version number.
+    MajorVersion: bin.asHex(uint16), // The major version number. The major and minor version numbers can be set by the user.
+    MinorVersion: bin.asHex(uint16), // The minor version number.
     DLLName: RVA_STRING, // The address of the ASCII string that contains the name of the DLL. This address is relative to the image base.
     OrdinalBase: uint32, // The starting ordinal number for exports in this image. This field specifies the starting ordinal number for the export address table. It is usually set to 1.
     NumberEntries: uint32, // The number of entries in the export address table.
@@ -427,7 +433,7 @@ const EXPORT_DIRECTORY = {
     OrdinalTable: RVA_ARRAY16, // RVA from base of image
 };
 function ReadExports(file) {
-    const dir = binary.read(file, EXPORT_DIRECTORY);
+    const dir = bin.read(file, EXPORT_DIRECTORY);
     const addresses = dir.FunctionTable;
     const names = dir.NameTable;
     const ordinals = dir.OrdinalTable;
@@ -436,7 +442,7 @@ function ReadExports(file) {
         const sect = file.pe.FindSectionRVA(addresses[i]);
         if (sect) {
             const ordinal = (ordinals && i < dir.NumberNames ? ordinals[i] : i) + dir.OrdinalBase;
-            const name = names && i < dir.NumberNames ? binary.utils.decodeTextTo0(file.pe.GetDataRVA(names[i])?.data, 'utf8') : '';
+            const name = names && i < dir.NumberNames ? bin.utils.decodeTextTo0(file.pe.GetDataRVA(names[i])?.data, 'utf8') : '';
             result.push({ ordinal, name, address: addresses[i] });
         }
     }
@@ -456,11 +462,11 @@ class DLLImports extends Array {
 exports.DLLImports = DLLImports;
 const RVA_ITA64 = {
     get(s) {
-        const r = binary.utils.to64(s.get_rva());
+        const r = bin.utils.to64(s.get_rva());
         if (r) {
             const result = Array.from(r.subarray(0, r.indexOf(0n)), i => i >> 63n
                 ? `ordinal_${i - (1n << 63n)}`
-                : binary.utils.decodeTextTo0(s.pe.GetDataRVA(Number(i))?.data.subarray(2), 'utf8'));
+                : bin.utils.decodeTextTo0(s.pe.GetDataRVA(Number(i))?.data.subarray(2), 'utf8'));
             Object.setPrototypeOf(result, DLLImports.prototype);
             return result;
         }
@@ -477,7 +483,7 @@ const IMPORT_DESCRIPTOR = {
 function ReadImports(file) {
     const result = [];
     while (file.remaining()) {
-        const r = binary.read(file, IMPORT_DESCRIPTOR);
+        const r = bin.read(file, IMPORT_DESCRIPTOR);
         if (!r.Characteristics)
             break;
         result.push([r.DllName, r.FirstThunk]);
@@ -487,16 +493,14 @@ function ReadImports(file) {
 //-----------------------------------------------------------------------------
 //	resources
 //-----------------------------------------------------------------------------
-class RESOURCE_DATA_ENTRY extends binary.ReadClass({
-    OffsetToData: uint32,
+class RESOURCE_DATA_ENTRY extends bin.ReadClass({
+    Data: RVA_BLOB,
     Size: uint32,
     CodePage: uint32,
     Reserved: uint32,
 }) {
-    data;
-    constructor(file, data) {
-        super(file);
-        this.data = data.slice(this.OffsetToData, this.OffsetToData + this.Size).data;
+    get data() {
+        return this.Data.slice(0, this.Size);
     }
 }
 const RESOURCE_DIRECTORY = {
@@ -506,7 +510,7 @@ const RESOURCE_DIRECTORY = {
     MinorVersion: uint16,
     NumberOfNamedEntries: uint16,
     NumberOfIdEntries: uint16,
-    entries: binary.ArrayType(s => s.obj.NumberOfNamedEntries + s.obj.NumberOfIdEntries, {
+    entries: bin.ArrayType(s => s.obj.NumberOfNamedEntries + s.obj.NumberOfIdEntries, {
         u0: uint32,
         u1: uint32,
     })
@@ -536,17 +540,17 @@ const IRT = {
     24: 'MANIFEST',
     241: 'TOOLBAR',
 };
-function ReadResourceDirectory(file, data, type = 0) {
-    const dir = binary.read(file, RESOURCE_DIRECTORY);
-    const id_type = binary.StringType(uint16, 'utf16le');
+function ReadResourceDirectory(file, type = 0) {
+    const dir = bin.read(file, RESOURCE_DIRECTORY);
+    const id_type = bin.StringType(uint16, 'utf16le');
     const topbit = 0x80000000;
     const result = {};
     for (const i of dir.entries) {
         const id = i.u0 & topbit ? id_type.get(file.seek(i.u0 & ~topbit)) : !type ? IRT[i.u0] : i.u0;
         file.seek(i.u1 & ~topbit);
         result[id] = i.u1 & topbit
-            ? ReadResourceDirectory(file, data, type || i.u0)
-            : new RESOURCE_DATA_ENTRY(file, data);
+            ? ReadResourceDirectory(file, type || i.u0)
+            : new RESOURCE_DATA_ENTRY(file);
     }
     return result;
 }

package/package.json

@@ -19,8 +19,8 @@
 	],
 	"scripts": {
 		"build": "tsc",
+		"watch": "tsc -watch -p ./",
 		"lint": "eslint \"src/**/*.ts\"",
-		"test": "echo \"No tests specified\" && exit 0",
 		"patch": "ts-patch install"
 	},
 	"keywords": [
@@ -39,11 +39,10 @@
 		"eslint": "^9.21.0",
 		"ts-node": "^10.9.2",
 		"ts-patch": "^3.3.0",
-		"typescript": "~5.5.0",
 		"typescript-eslint": "^8.26.0"
 	},
+	"version": "1.3.0",
 	"dependencies": {
-		"@isopodlabs/binary": "^1.4.1"
-	},
-	"version": "1.2.1"
+		"@isopodlabs/binary": "^1.6.0"
+	}
 }