@isopodlabs/binary_libs 0.2.2 → 0.2.3

package/dist/mach.js

@@ -424,7 +424,7 @@ function section(bits) {
         data;
         constructor(s) {
             super(s);
-            const prot = this.flags.ATTRIBUTES.SYS.SOME_INSTRUCTIONS ? 4 /* binary.MEM.EXECUTE */ : 0 /* binary.MEM.NONE */;
+            const prot = this.flags.ATTRIBUTES.SYS.SOME_INSTRUCTIONS ? binary.MappedMemory.EXECUTE : binary.MappedMemory.NONE;
             this.data = (async () => 
             //new binary.utils.MappedMemory(await s.file.get(BigInt(this.addr), Number(this.size)), Number(this.addr), prot)
             new binary.MappedMemory(s.subdata(+this.offset, Number(this.size)), Number(this.addr), prot))();
@@ -1038,10 +1038,31 @@ class MachFile {
 }
 exports.MachFile = MachFile;
 const FAT_MAGIC = 0xcafebabe;
-const FAT_CIGAM = 0xbebafeca;
 class FATMachFile {
     archs = [];
     static check(data) {
+        return binary.UINT32_BE.get(new binary.stream(data)) === FAT_MAGIC;
+    }
+    constructor(data, mem) {
+        const file = new binary.endianStream(data, true);
+        const header = binary.read(file, fat_header);
+        this.archs = header.archs;
+        for (const arch of header.archs) {
+            const cpu = CPU_TYPE[arch.cputype];
+            const data = file.buffer_at(arch.offset, arch.size);
+            arch.cpusubtype = binary.Enum(CPU_SUBTYPES[cpu])(+arch.cpusubtype);
+            arch.contents = new MachFile(data, mem);
+        }
+    }
+}
+exports.FATMachFile = FATMachFile;
+/*
+const FAT_CIGAM		= 0xbebafeca;
+
+export class FATMachFile {
+    archs:	binary.ReadType<typeof fat_arch>[] = [];
+
+    static check(data: Uint8Array): boolean {
         switch (binary.UINT32_BE.get(new binary.stream(data))) {
             case FAT_MAGIC:
             case FAT_CIGAM:
@@ -1050,33 +1071,26 @@ class FATMachFile {
                 return false;
         }
     }
-    constructor(data, mem) {
+    
+    constructor(data: Uint8Array, mem?: binary.memory) {
         switch (binary.UINT32_BE.get(new binary.stream(data))) {
-            case FAT_MAGIC:
-                this.load(new binary.endianStream(data, false), mem);
-                break;
-            case FAT_CIGAM:
-                this.load(new binary.endianStream(data, true), mem);
-                break;
+            case FAT_MAGIC:		this.load(new binary.endianStream(data, false), mem); break;
+            case FAT_CIGAM:		this.load(new binary.endianStream(data, true), mem); break;
             default:
                 throw new Error('not a fat mach file');
         }
     }
-    load(file, mem) {
+
+    load(file: binary.endianStream, mem?: binary.memory) {
         const header = binary.read(file, fat_header);
         this.archs = header.archs;
         for (const arch of header.archs) {
-            const cpu = CPU_TYPE[arch.cputype];
-            const data = file.buffer_at(arch.offset, arch.size);
+            const cpu	= CPU_TYPE[arch.cputype as keyof typeof CPU_TYPE];
+            const data	= file.buffer_at(arch.offset, arch. size);
             arch.cpusubtype = binary.Enum(CPU_SUBTYPES[cpu])(+arch.cpusubtype);
-            arch.contents = new MachFile(data, mem);
+            arch.contents	= new MachFile(data, mem);
         }
     }
 }
-exports.FATMachFile = FATMachFile;
-/*
-export function freestanding<T extends CMD>(s: binary.stream, cmd: T) : binary.ReadType<typeof cmd_table[T]>;
-export function freestanding(s: binary.stream, cmd: CMD) {
-    return binary.read(s, cmd_table[cmd]);
-}
+
 */ 

package/dist/pe.d.ts

@@ -1,4 +1,27 @@
 import * as binary from '@isopodlabs/binary';
+declare const DOS_HEADER: {
+    magic: binary.TypeT<number>;
+    cblp: binary.TypeT<number>;
+    cp: binary.TypeT<number>;
+    crlc: binary.TypeT<number>;
+    cparhdr: binary.TypeT<number>;
+    minalloc: binary.TypeT<number>;
+    maxalloc: binary.TypeT<binary.hex<number | bigint>>;
+    ss: binary.TypeT<number>;
+    sp: binary.TypeT<number>;
+    csum: binary.TypeT<number>;
+    ip: binary.TypeT<number>;
+    cs: binary.TypeT<number>;
+    lfarlc: binary.TypeT<number>;
+    ovno: binary.TypeT<number>;
+};
+declare const EXE_HEADER: {
+    res: binary.TypeT<number[]>;
+    oemid: binary.TypeT<number>;
+    oeminfo: binary.TypeT<number>;
+    res2: binary.TypeT<number[]>;
+    lfanew: binary.TypeT<number>;
+};
 export declare class pe_stream extends binary.stream {
     pe: PE;
     constructor(pe: PE, data: Uint8Array);
@@ -31,95 +54,74 @@ export declare const DATA_DIRECTORY: {
     VirtualAddress: binary.TypeT<number>;
     Size: binary.TypeT<number>;
 };
-type Directory = {
-    VirtualAddress: number;
-    Size: number;
+type Directory = binary.ReadType<typeof DATA_DIRECTORY>;
+declare const OPTIONAL_HEADER: {
+    Magic: binary.TypeT<string>;
+    MajorLinkerVersion: binary.TypeT<number>;
+    MinorLinkerVersion: binary.TypeT<number>;
+    SizeOfCode: binary.TypeT<number>;
+    SizeOfInitializedData: binary.TypeT<number>;
+    SizeOfUninitializedData: binary.TypeT<number>;
+    AddressOfEntryPoint: binary.TypeT<binary.hex<number | bigint>>;
+    BaseOfCode: binary.TypeT<binary.hex<number | bigint>>;
+};
+declare const OPTIONAL_HEADER32: {
+    BaseOfData: binary.TypeT<binary.hex<number | bigint>>;
+    ImageBase: binary.TypeT<binary.hex<number | bigint>>;
+    SectionAlignment: binary.TypeT<number>;
+    FileAlignment: binary.TypeT<number>;
+    MajorOperatingSystemVersion: binary.TypeT<number>;
+    MinorOperatingSystemVersion: binary.TypeT<number>;
+    MajorImageVersion: binary.TypeT<number>;
+    MinorImageVersion: binary.TypeT<number>;
+    MajorSubsystemVersion: binary.TypeT<number>;
+    MinorSubsystemVersion: binary.TypeT<number>;
+    Win32VersionValue: binary.TypeT<number>;
+    SizeOfImage: binary.TypeT<number>;
+    SizeOfHeaders: binary.TypeT<number>;
+    CheckSum: binary.TypeT<number>;
+    Subsystem: binary.TypeT<number>;
+    DllCharacteristics: binary.TypeT<Record<string, bigint | boolean> | Record<string, number | boolean>>;
+    SizeOfStackReserve: binary.TypeT<number>;
+    SizeOfStackCommit: binary.TypeT<number>;
+    SizeOfHeapReserve: binary.TypeT<number>;
+    SizeOfHeapCommit: binary.TypeT<number>;
+    LoaderFlags: binary.TypeT<number>;
+    DataDirectory: binary.TypeT<Record<string, {
+        VirtualAddress: number;
+        Size: number;
+    }>>;
+};
+declare const OPTIONAL_HEADER64: {
+    ImageBase: binary.TypeT<binary.hex<number | bigint>>;
+    SectionAlignment: binary.TypeT<number>;
+    FileAlignment: binary.TypeT<number>;
+    MajorOperatingSystemVersion: binary.TypeT<number>;
+    MinorOperatingSystemVersion: binary.TypeT<number>;
+    MajorImageVersion: binary.TypeT<number>;
+    MinorImageVersion: binary.TypeT<number>;
+    MajorSubsystemVersion: binary.TypeT<number>;
+    MinorSubsystemVersion: binary.TypeT<number>;
+    Win32VersionValue: binary.TypeT<number>;
+    SizeOfImage: binary.TypeT<number>;
+    SizeOfHeaders: binary.TypeT<number>;
+    CheckSum: binary.TypeT<number>;
+    Subsystem: binary.TypeT<number>;
+    DllCharacteristics: binary.TypeT<Record<string, bigint | boolean> | Record<string, number | boolean>>;
+    SizeOfStackReserve: binary.TypeT<bigint>;
+    SizeOfStackCommit: binary.TypeT<bigint>;
+    SizeOfHeapReserve: binary.TypeT<bigint>;
+    SizeOfHeapCommit: binary.TypeT<bigint>;
+    LoaderFlags: binary.TypeT<number>;
+    DataDirectory: binary.TypeT<Record<string, {
+        VirtualAddress: number;
+        Size: number;
+    }>>;
 };
 export declare class PE {
     static check(data: Uint8Array): boolean;
-    header: {
-        magic: number;
-        cblp: number;
-        cp: number;
-        crlc: number;
-        cparhdr: number;
-        minalloc: number;
-        maxalloc: binary.hex<number | bigint>;
-        ss: number;
-        sp: number;
-        csum: number;
-        ip: number;
-        cs: number;
-        lfarlc: number;
-        ovno: number;
-    } & {
-        res: number[];
-        oemid: number;
-        oeminfo: number;
-        res2: number[];
-        lfanew: number;
-    };
-    opt?: {
-        Magic: string;
-        MajorLinkerVersion: number;
-        MinorLinkerVersion: number;
-        SizeOfCode: number;
-        SizeOfInitializedData: number;
-        SizeOfUninitializedData: number;
-        AddressOfEntryPoint: binary.hex<number | bigint>;
-        BaseOfCode: binary.hex<number | bigint>;
-    } & ({
-        BaseOfData: binary.hex<number | bigint>;
-        ImageBase: binary.hex<number | bigint>;
-        SectionAlignment: number;
-        FileAlignment: number;
-        MajorOperatingSystemVersion: number;
-        MinorOperatingSystemVersion: number;
-        MajorImageVersion: number;
-        MinorImageVersion: number;
-        MajorSubsystemVersion: number;
-        MinorSubsystemVersion: number;
-        Win32VersionValue: number;
-        SizeOfImage: number;
-        SizeOfHeaders: number;
-        CheckSum: number;
-        Subsystem: number;
-        DllCharacteristics: Record<string, bigint | boolean> | Record<string, number | boolean>;
-        SizeOfStackReserve: number;
-        SizeOfStackCommit: number;
-        SizeOfHeapReserve: number;
-        SizeOfHeapCommit: number;
-        LoaderFlags: number;
-        DataDirectory: Record<string, {
-            VirtualAddress: number;
-            Size: number;
-        }>;
-    } | {
-        ImageBase: binary.hex<number | bigint>;
-        SectionAlignment: number;
-        FileAlignment: number;
-        MajorOperatingSystemVersion: number;
-        MinorOperatingSystemVersion: number;
-        MajorImageVersion: number;
-        MinorImageVersion: number;
-        MajorSubsystemVersion: number;
-        MinorSubsystemVersion: number;
-        Win32VersionValue: number;
-        SizeOfImage: number;
-        SizeOfHeaders: number;
-        CheckSum: number;
-        Subsystem: number;
-        DllCharacteristics: Record<string, bigint | boolean> | Record<string, number | boolean>;
-        SizeOfStackReserve: bigint;
-        SizeOfStackCommit: bigint;
-        SizeOfHeapReserve: bigint;
-        SizeOfHeapCommit: bigint;
-        LoaderFlags: number;
-        DataDirectory: Record<string, {
-            VirtualAddress: number;
-            Size: number;
-        }>;
-    });
+    header: binary.ReadType<typeof DOS_HEADER> & binary.ReadType<typeof EXE_HEADER>;
+    opt?: binary.ReadType<typeof OPTIONAL_HEADER> & (binary.ReadType<typeof OPTIONAL_HEADER32> | binary.ReadType<typeof OPTIONAL_HEADER64>);
     sections: Section[];
     constructor(data: Uint8Array);
     get directories(): Record<string, {

package/dist/pe.js

@@ -167,10 +167,10 @@ class Section extends binary.ReadClass({
         }
     }
     get flags() {
-        return 8 /* binary.MEM.RELATIVE */
-            | (this.Characteristics.MEM_READ ? 1 /* binary.MEM.READ */ : 0)
-            | (this.Characteristics.MEM_WRITE ? 2 /* binary.MEM.WRITE */ : 0)
-            | (this.Characteristics.MEM_EXECUTE ? 4 /* binary.MEM.EXECUTE */ : 0);
+        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);
     }
 }
 exports.DIRECTORIES = {

package/package.json

@@ -38,8 +38,8 @@
     "typescript": "~5.5.0",
     "typescript-eslint": "^8.26.0"
   },
+  "version": "0.2.3",
   "dependencies": {
-    "@isopodlabs/binary": "^1.0.3"
-  },
-  "version": "0.2.2"
+    "@isopodlabs/binary": "^1.3.4"
+  }
 }