From 8bc56a433db6915727247c3b7a44c4968eee1e04 Mon Sep 17 00:00:00 2001
From: "azykov@mail.ru" <azykov@mail.ru>
Date: Tue, 2 Jun 2026 20:07:42 +0300
Subject: [PATCH] autosave fixes

---
 src/components/ObjectView.tsx |  7 ++++-
 src/state/worldState.ts       | 53 ++++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/components/ObjectView.tsx b/src/components/ObjectView.tsx
index 0fdd318..14d2ce3 100644
--- a/src/components/ObjectView.tsx
+++ b/src/components/ObjectView.tsx
@@ -59,6 +59,7 @@ export const ObjectView = observer(function ({ object }: ObjectViewProps) {
         }
         <group
             ref={groupRef}
+            name={`${object.id} (${object.typeId} instance)`}
             position={object.position}
             rotation={object.rotation}
             scale={object.scale}
@@ -70,7 +71,11 @@ export const ObjectView = observer(function ({ object }: ObjectViewProps) {
                     const color = (v.color ?? vt?.color) ?? 'white';
                     const opacity = (v.opacity ?? vt?.opacity) ?? 1;
                     return (
-                        <mesh key={idx} position={v.position}>
+                        <mesh
+                            key={idx}
+                            name={`voxel ${idx} [${v.position}]`}
+                            position={v.position}
+                        >
                             <boxGeometry args={[1, 1, 1]} />
                             <meshStandardMaterial
                                 color={color}
diff --git a/src/state/worldState.ts b/src/state/worldState.ts
index 09b8e04..16c3230 100644
--- a/src/state/worldState.ts
+++ b/src/state/worldState.ts
@@ -1,5 +1,4 @@
 import { makeAutoObservable, reaction, toJS } from "mobx";
-import { deepObserve } from "mobx-utils";
 import { WorldFactory } from "../model/worldFactory";
 import type { ObjectType, World } from "../types";
 import type { VoxelType } from "../types/voxel";
@@ -11,29 +10,29 @@ import { clone } from "../utils";
 export class WorldState {
     public data: World = WorldFactory.create();
 
-    private saveTimer: ReturnType<typeof setTimeout> | undefined;
+    private startAutoSave() {
+        return reaction(() => toJS(this.data), (data) => this.saveData(data), { delay: 500 });
+    }
+
+    private withoutAutoSave(fn: () => void) {
+        this._stopAutoSave();
+        fn();
+        this._stopAutoSave = this.startAutoSave();
+    }
+
+    private _stopAutoSave: () => void = () => { };
 
     constructor() {
         makeAutoObservable(this);
-        this.setupAutoSave();
-    }
-
-    private setupAutoSave() {
-        let disposeDeep: (() => void) | undefined;
-        reaction(
-            () => this.data,
-            (data) => {
-                disposeDeep?.();
-                disposeDeep = deepObserve(data, () => this.save());
-            },
-            { fireImmediately: true },
-        );
+        this._stopAutoSave = this.startAutoSave();
     }
 
     public reset() {
         console.log('Resetting world...');
 
-        this.data = WorldFactory.create();
+        this.withoutAutoSave(() => {
+            this.data = WorldFactory.create();
+        });
         state.worldEditor.resetSelectedObject();
     }
 
@@ -83,20 +82,22 @@ export class WorldState {
 
     public load() {
         console.log('Loading world...');
-        this.data = WorldFactory.load() ?? WorldFactory.create();
+        this.withoutAutoSave(() => {
+            this.data = WorldFactory.load() ?? WorldFactory.create();
+        });
         state.worldEditor.resetSelectedObject();
     }
 
-    public save(): void {
+    private saveData(data: World): void {
         console.log('Saving world...');
-        console.log((new Error('').stack!));
-        const { objectTypes, voxelTypes, ...debug } = toJS(this.data);
-        console.log(JSON.stringify(debug, undefined, 4));
-        // debounce
-        clearTimeout(this.saveTimer);
-        this.saveTimer = setTimeout(() => {
-            WorldFactory.save(toJS(this.data));
-        }, 500);
+        const stack = new Error('Saving world...').stack!.split('\n').slice(1);
+        const { objectTypes, voxelTypes, ...debug } = toJS(data);
+        console.dir({ stack, debug });
+        WorldFactory.save(toJS(this.data));
+    }
+
+    public save(): void {
+        this.saveData(this.data);
     }
 
     public getObjectTypeById(id: string): ObjectType | undefined {