@etothepii/satisfactory-file-parser 0.0.33 → 0.1.1

package/build/parser/satisfactory/save/level.class.js

@@ -1,148 +1,167 @@
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Level = void 0;
+const ObjectReference_1 = require("../objects/ObjectReference");
+const SaveComponent_1 = require("../objects/SaveComponent");
+const SaveEntity_1 = require("../objects/SaveEntity");
+class Level {
+    constructor(name) {
+        this.name = name;
+        this.objects = [];
+        this.collectables = [];
     }
-    else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../objects/ObjectReference", "../objects/SaveComponent", "../objects/SaveEntity"], factory);
-    }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.Level = void 0;
-    const ObjectReference_1 = require("../objects/ObjectReference");
-    const SaveComponent_1 = require("../objects/SaveComponent");
-    const SaveEntity_1 = require("../objects/SaveEntity");
-    class Level {
-        constructor(name) {
-            this.name = name;
-            this.objects = [];
-            this.collectables = [];
-        }
-        static SerializeObjectHeaders(writer, objects) {
-            writer.writeInt32(objects.length);
-            for (const obj of objects) {
-                switch (obj.type) {
-                    case 'SaveEntity':
-                        writer.writeInt32(SaveEntity_1.SaveEntity.TypeID);
-                        SaveEntity_1.SaveEntity.SerializeHeader(writer, obj);
-                        break;
-                    case 'SaveComponent':
-                        writer.writeInt32(SaveComponent_1.SaveComponent.TypeID);
-                        SaveComponent_1.SaveComponent.SerializeHeader(writer, obj);
-                        break;
-                    default:
-                        console.log('Unknown object type', obj);
-                        break;
-                }
+    static SerializeObjectHeaders(writer, objects) {
+        writer.writeInt32(objects.length);
+        for (const obj of objects) {
+            switch (obj.type) {
+                case 'SaveEntity':
+                    writer.writeInt32(SaveEntity_1.SaveEntity.TypeID);
+                    SaveEntity_1.SaveEntity.SerializeHeader(writer, obj);
+                    break;
+                case 'SaveComponent':
+                    writer.writeInt32(SaveComponent_1.SaveComponent.TypeID);
+                    SaveComponent_1.SaveComponent.SerializeHeader(writer, obj);
+                    break;
+                default:
+                    console.log('Unknown object type', obj);
+                    break;
             }
         }
-        static WriteLevel(writer, level, buildVersion) {
-            const lenIndicatorHeaderAndCollectableSize = writer.getBufferPosition();
-            writer.writeInt32(0);
-            Level.SerializeObjectHeaders(writer, level.objects);
-            Level.SerializeCollectablesList(writer, level.collectables);
-            writer.writeBinarySizeFromPosition(lenIndicatorHeaderAndCollectableSize, lenIndicatorHeaderAndCollectableSize + 4);
-            Level.SerializeObjectContents(writer, level.objects, buildVersion, level.name);
-            Level.SerializeCollectablesList(writer, level.collectables);
-        }
-        static SerializeObjectContents(writer, objects, buildVersion, levelName) {
-            const lenIndicatorEntities = writer.getBufferPosition();
+    }
+    static WriteLevel(writer, level, buildVersion) {
+        const lenIndicatorHeaderAndCollectableSize = writer.getBufferPosition();
+        writer.writeInt32(0);
+        Level.SerializeObjectHeaders(writer, level.objects);
+        Level.SerializeCollectablesList(writer, level.collectables);
+        writer.writeBinarySizeFromPosition(lenIndicatorHeaderAndCollectableSize, lenIndicatorHeaderAndCollectableSize + 4);
+        Level.SerializeObjectContents(writer, level.objects, buildVersion, level.name);
+        Level.SerializeCollectablesList(writer, level.collectables);
+    }
+    static SerializeObjectContents(writer, objects, buildVersion, levelName) {
+        const lenIndicatorEntities = writer.getBufferPosition();
+        writer.writeInt32(0);
+        writer.writeInt32(objects.length);
+        for (const obj of objects) {
+            const lenReplacementPosition = writer.getBufferPosition();
             writer.writeInt32(0);
-            writer.writeInt32(objects.length);
-            for (const obj of objects) {
-                const lenReplacementPosition = writer.getBufferPosition();
-                writer.writeInt32(0);
-                if ((0, SaveEntity_1.isSaveEntity)(obj)) {
-                    SaveEntity_1.SaveEntity.SerializeData(writer, obj, buildVersion);
-                }
-                else if ((0, SaveComponent_1.isSaveComponent)(obj)) {
-                    SaveComponent_1.SaveComponent.SerializeData(writer, obj, buildVersion);
-                }
-                writer.writeBinarySizeFromPosition(lenReplacementPosition, lenReplacementPosition + 4);
+            if ((0, SaveEntity_1.isSaveEntity)(obj)) {
+                SaveEntity_1.SaveEntity.SerializeData(writer, obj, buildVersion);
             }
-            writer.writeBinarySizeFromPosition(lenIndicatorEntities, lenIndicatorEntities + 4);
+            else if ((0, SaveComponent_1.isSaveComponent)(obj)) {
+                SaveComponent_1.SaveComponent.SerializeData(writer, obj, buildVersion);
+            }
+            writer.writeBinarySizeFromPosition(lenReplacementPosition, lenReplacementPosition + 4);
         }
-        static ReadObjectHeaders(reader, objectsList, onProgressCallback) {
-            let countObjectHeaders = reader.readInt32();
-            for (let i = 0; i < countObjectHeaders; i++) {
-                if (i % 1000 === 0) {
-                    onProgressCallback(reader.getBufferProgress());
-                }
-                let objectType = reader.readInt32();
-                switch (objectType) {
-                    case SaveEntity_1.SaveEntity.TypeID:
-                        let object = new SaveEntity_1.SaveEntity('', '', '', '');
-                        SaveEntity_1.SaveEntity.ParseHeader(reader, object);
-                        objectsList.push(object);
-                        break;
-                    case SaveComponent_1.SaveComponent.TypeID:
-                        let component = new SaveComponent_1.SaveComponent('', '', '', '');
-                        SaveComponent_1.SaveComponent.ParseHeader(reader, component);
-                        objectsList.push(component);
-                        break;
-                    default:
-                        console.log('Unknown object type', objectType);
-                        break;
-                }
+        writer.writeBinarySizeFromPosition(lenIndicatorEntities, lenIndicatorEntities + 4);
+    }
+    static ReadObjectHeaders(reader, objectsList, onProgressCallback) {
+        let countObjectHeaders = reader.readInt32();
+        for (let i = 0; i < countObjectHeaders; i++) {
+            if (i % 1000 === 0) {
+                onProgressCallback(reader.getBufferProgress());
+            }
+            let objectType = reader.readInt32();
+            switch (objectType) {
+                case SaveEntity_1.SaveEntity.TypeID:
+                    let object = new SaveEntity_1.SaveEntity('', '', '', '');
+                    SaveEntity_1.SaveEntity.ParseHeader(reader, object);
+                    objectsList.push(object);
+                    break;
+                case SaveComponent_1.SaveComponent.TypeID:
+                    let component = new SaveComponent_1.SaveComponent('', '', '', '');
+                    SaveComponent_1.SaveComponent.ParseHeader(reader, component);
+                    objectsList.push(component);
+                    break;
+                default:
+                    console.log('Unknown object type', objectType);
+                    break;
             }
         }
-        static async ReadObjectContents(reader, objectsList, buildVersion, onProgressCallback) {
-            const binarySize = reader.readInt32();
-            const posBefore = reader.getBufferPosition();
-            const countEntities = reader.readInt32();
-            if (countEntities !== objectsList.length) {
-                throw new Error(`possibly corrupt. entity content count ${countEntities} does not equal object count of ${objectsList.length}`);
+        const unk = reader.readInt32();
+    }
+    static async ReadObjectContents(levelName, reader, objectsList, buildVersion, onProgressCallback) {
+        const posBefore = reader.getBufferPosition();
+        const countEntities = reader.readInt32();
+        if (countEntities !== objectsList.length) {
+            throw new Error(`possibly corrupt. entity content count ${countEntities} does not equal object count of ${objectsList.length}`);
+        }
+        for (let i = 0; i < countEntities; i++) {
+            if (i % 1000 === 0) {
+                onProgressCallback(reader.getBufferProgress());
             }
-            for (let i = 0; i < countEntities; i++) {
-                if (i % 1000 === 0) {
-                    onProgressCallback(reader.getBufferProgress());
-                }
-                const len = reader.readInt32();
-                const before = reader.getBufferPosition();
-                const obj = objectsList[i];
-                if ((0, SaveEntity_1.isSaveEntity)(obj)) {
-                    SaveEntity_1.SaveEntity.ParseData(obj, len, reader, buildVersion, obj.typePath);
-                }
-                else if ((0, SaveComponent_1.isSaveComponent)(obj)) {
-                    SaveComponent_1.SaveComponent.ParseData(obj, len, reader, buildVersion, obj.typePath);
-                }
-                const after = reader.getBufferPosition();
-                if (after - before !== len) {
-                    console.warn('entity may be corrupt', this.name, i);
-                }
+            const len = reader.readInt32();
+            if (len === 0) {
+                throw new Error(`check number is a wrong value (${len}). This normally indicates a corrupt entity or save.`);
             }
-            const posAfter = reader.getBufferPosition();
-            if (posAfter - posBefore !== binarySize) {
-                console.warn('save seems corrupt.', this.name);
+            const before = reader.getBufferPosition();
+            const obj = objectsList[i];
+            if ((0, SaveEntity_1.isSaveEntity)(obj)) {
+                SaveEntity_1.SaveEntity.ParseData(obj, len, reader, buildVersion, obj.typePath);
             }
+            else if ((0, SaveComponent_1.isSaveComponent)(obj)) {
+                const wtf1 = reader.readInt32();
+                const wtf2 = reader.readInt32();
+                SaveComponent_1.SaveComponent.ParseData(obj, wtf2, reader, buildVersion, obj.typePath);
+            }
+            const after = reader.getBufferPosition();
+            if (after - before !== len) {
+            }
+        }
+        const posAfter = reader.getBufferPosition();
+    }
+    static ReadLevel(reader, levelName, buildVersion) {
+        const level = new Level(levelName);
+        const levelStartPos = reader.getBufferPosition();
+        const placeholderHead = reader.readInt32();
+        if (placeholderHead === 8) {
+            const morePlaceholder = reader.readBytes(28);
+        }
+        else {
+            reader.skipBytes(-4);
         }
-        static ReadLevel(reader, levelName, buildVersion) {
-            const level = new Level(levelName);
-            reader.readInt32();
-            Level.ReadObjectHeaders(reader, level.objects, reader.onProgressCallback);
-            reader.onProgressCallback(reader.getBufferProgress());
-            level.collectables = Level.ReadCollectablesList(reader);
-            Level.ReadObjectContents(reader, level.objects, buildVersion, reader.onProgressCallback);
-            reader.onProgressCallback(reader.getBufferProgress());
-            Level.ReadCollectablesList(reader);
+        const lookahead1 = reader.readInt32();
+        const lookahead2 = reader.readInt32();
+        if (lookahead1 !== 0 && lookahead2 !== 0) {
+            reader.skipBytes(-8);
             return level;
         }
-        static SerializeCollectablesList(writer, collectables) {
-            writer.writeInt32(collectables.length);
-            for (const collectable of collectables) {
-                ObjectReference_1.ObjectReference.Serialize(writer, collectable);
-            }
+        else if (lookahead1 !== 0 && lookahead2 === 0) {
+            reader.skipBytes(-8);
         }
-        static ReadCollectablesList(reader) {
-            let countCollected = reader.readInt32();
-            const collected = [];
-            for (let i = 0; i < countCollected; i++) {
+        else {
+            throw new Error('Unexpected. what now? TODO FIXME');
+        }
+        const binLen = reader.readInt32();
+        const unk = reader.readInt32();
+        Level.ReadObjectHeaders(reader, level.objects, reader.onProgressCallback);
+        reader.onProgressCallback(reader.getBufferProgress());
+        level.collectables = Level.ReadCollectablesList(reader);
+        Level.ReadObjectContents(levelName, reader, level.objects, buildVersion, reader.onProgressCallback);
+        reader.onProgressCallback(reader.getBufferProgress());
+        Level.ReadCollectablesList(reader);
+        return level;
+    }
+    static SerializeCollectablesList(writer, collectables) {
+        writer.writeInt32(collectables.length);
+        for (const collectable of collectables) {
+            ObjectReference_1.ObjectReference.Serialize(writer, collectable);
+        }
+    }
+    static ReadCollectablesList(reader) {
+        const collected = [];
+        let countSmthing = reader.readInt32();
+        if (countSmthing > 0) {
+            const lookahead = reader.readInt32();
+            if (lookahead === 0) {
+                return collected;
+            }
+            reader.skipBytes(-4);
+            for (let i = 0; i < countSmthing; i++) {
                 const collectable = ObjectReference_1.ObjectReference.Parse(reader);
                 collected.push(collectable);
             }
-            return collected;
         }
+        return collected;
     }
-    exports.Level = Level;
-});
+}
+exports.Level = Level;

package/build/parser/satisfactory/save/satisfactory-save.js

@@ -1,21 +1,11 @@
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SatisfactorySave = void 0;
+class SatisfactorySave {
+    constructor(header) {
+        this.levels = [];
+        this.trailingCollectedObjects = [];
+        this.header = header;
     }
-    else if (typeof define === "function" && define.amd) {
-        define(["require", "exports"], factory);
-    }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.SatisfactorySave = void 0;
-    class SatisfactorySave {
-        constructor(header) {
-            this.levels = [];
-            this.trailingCollectedObjects = [];
-            this.header = header;
-        }
-    }
-    exports.SatisfactorySave = SatisfactorySave;
-});
+}
+exports.SatisfactorySave = SatisfactorySave;

package/build/parser/satisfactory/save/save-reader.d.ts

@@ -16,7 +16,7 @@ export type SaveProjectionConfig = {
 };
 export declare const projectionFilterApplies: (config: SaveProjectionConfig, object: SaveComponent | SaveEntity) => boolean;
 export type ReadMode = 'stream' | 'whole';
-export declare const DEFAULT_SATISFACTORY_CHUNK_HEADER_SIZE = 48;
+export declare const DEFAULT_SATISFACTORY_CHUNK_HEADER_SIZE = 49;
 export declare class SaveReader extends ByteReader {
     onProgressCallback: (progress: number, msg?: string) => void;
     header: SatisfactorySaveHeader | undefined;
@@ -30,6 +30,6 @@ export declare class SaveReader extends ByteReader {
         concatenatedChunkLength: number;
         numChunks: number;
     };
-    readLevels(): Level[];
+    readLevelsU8(): Level[];
     readLevelsAsynchronously(writer: SaveStreamWriter): Promise<Level[]>;
 }