@caspertech/node-metaverse 0.6.4 → 0.6.6

package/dist/lib/classes/ObjectStoreLite.js

@@ -33,21 +33,24 @@ const CompressedFlags_1 = require("../enums/CompressedFlags");
 const Vector3_1 = require("./Vector3");
 const ObjectResolvedEvent_1 = require("../events/ObjectResolvedEvent");
 const Avatar_1 = require("./public/Avatar");
-const PythonParser_1 = require("./python/PythonParser");
-const PythonDict_1 = require("./python/PythonDict");
-const PythonList_1 = require("./python/PythonList");
+const LLSDNotationParser_1 = require("./llsd/LLSDNotationParser");
+const LLSDMap_1 = require("./llsd/LLSDMap");
+const LLGLTFMaterialOverride_1 = require("./LLGLTFMaterialOverride");
 class ObjectStoreLite {
     constructor(circuit, agent, clientEvents, options) {
-        this.objects = {};
-        this.objectsByUUID = {};
-        this.objectsByParent = {};
-        this.requestedObjects = {};
+        this.objects = new Map();
+        this.objectsByUUID = new Map();
+        this.objectsByParent = new Map();
+        this.fullStore = false;
+        this.requestedObjects = new Set();
         this.deadObjects = [];
         this.persist = false;
-        this.pendingObjectProperties = {};
-        this.selectedPrimsWithoutUpdate = {};
+        this.cachedMaterialOverrides = new Map();
+        this.pendingObjectProperties = new Map;
+        this.selectedPrimsWithoutUpdate = new Map();
         agent.localID = 0;
         this.options = options;
+        this.fullStore = false;
         this.clientEvents = clientEvents;
         this.circuit = circuit;
         this.agent = agent;
@@ -63,14 +66,102 @@ class ObjectStoreLite {
             switch (packet.message.id) {
                 case Message_1.Message.GenericStreamingMessage:
                     {
+                        if (!this.fullStore) {
+                            return;
+                        }
                         const genMsg = packet.message;
                         if (genMsg.MethodData.Method === 0x4175) {
-                            const result = PythonParser_1.PythonParser.parse(genMsg.DataBlock.Data.toString('utf-8'));
-                            if (result instanceof PythonDict_1.PythonDict) {
-                                const arr = result.get('te');
-                                if (arr instanceof PythonList_1.PythonList) {
-                                    if (arr.length === 0) {
-                                        return;
+                            const result = LLSDNotationParser_1.LLSDNotationParser.parse(genMsg.DataBlock.Data.toString('utf-8'));
+                            if (result instanceof LLSDMap_1.LLSDMap) {
+                                const localID = result.get('id');
+                                if (typeof localID !== 'number') {
+                                    return;
+                                }
+                                const tes = result.get('te');
+                                const ods = result.get('od');
+                                const overrides = new Map();
+                                if (Array.isArray(tes) && Array.isArray(ods) && tes.length === ods.length) {
+                                    for (let x = 0; x < tes.length; x++) {
+                                        const te = tes[x];
+                                        if (typeof te !== 'number') {
+                                            continue;
+                                        }
+                                        const params = ods[x];
+                                        if (!(params instanceof LLSDMap_1.LLSDMap)) {
+                                            continue;
+                                        }
+                                        const textureIDs = params.get('tex');
+                                        const baseColor = params.get('bc');
+                                        const emissiveColor = params.get('ec');
+                                        const metallicFactor = params.get('mf');
+                                        const roughnessFactor = params.get('rf');
+                                        const alphaMode = params.get('am');
+                                        const alphaCutoff = params.get('ac');
+                                        const doubleSided = params.get('ds');
+                                        const textureTransforms = params.get('ti');
+                                        const override = new LLGLTFMaterialOverride_1.LLGLTFMaterialOverride();
+                                        overrides.set(te, override);
+                                        if (textureIDs !== undefined && Array.isArray(textureIDs) && textureIDs.length === 4) {
+                                            override.textures = [];
+                                            for (const tex of textureIDs) {
+                                                if (typeof tex === 'string') {
+                                                    override.textures.push(tex);
+                                                }
+                                                else if (tex instanceof UUID_1.UUID) {
+                                                    override.textures.push(tex.toString());
+                                                }
+                                            }
+                                        }
+                                        function isNumberArray(array) {
+                                            return array.every(element => typeof element === 'number');
+                                        }
+                                        if (baseColor !== undefined && Array.isArray(baseColor) && baseColor.length === 4 && isNumberArray(baseColor)) {
+                                            override.baseColor = baseColor;
+                                        }
+                                        if (emissiveColor !== undefined && Array.isArray(emissiveColor) && emissiveColor.length === 3 && isNumberArray(emissiveColor)) {
+                                            override.emissiveColor = emissiveColor;
+                                        }
+                                        if (metallicFactor !== undefined && typeof metallicFactor === 'number') {
+                                            override.metallicFactor = metallicFactor;
+                                        }
+                                        if (roughnessFactor !== undefined && typeof roughnessFactor === 'number') {
+                                            override.roughnessFactor = roughnessFactor;
+                                        }
+                                        if (alphaMode !== undefined && typeof alphaMode === 'number') {
+                                            override.alphaMode = alphaMode;
+                                        }
+                                        if (alphaCutoff !== undefined && typeof alphaCutoff === 'number') {
+                                            override.alphaCutoff = alphaCutoff;
+                                        }
+                                        if (doubleSided !== undefined && typeof doubleSided === 'boolean') {
+                                            override.doubleSided = doubleSided;
+                                        }
+                                        function isLLGLTFTextureTransformOverride(objToCheck) {
+                                            const isArrayOfNumbers = (value) => {
+                                                return Array.isArray(value) && value.every(item => typeof item === 'number');
+                                            };
+                                            return (typeof objToCheck === 'object' &&
+                                                objToCheck !== null &&
+                                                'offset' in objToCheck && isArrayOfNumbers(objToCheck.offset) &&
+                                                'scale' in objToCheck && isArrayOfNumbers(objToCheck.scale) &&
+                                                'rotation' in objToCheck && typeof objToCheck.rotation === 'number');
+                                        }
+                                        if (textureTransforms !== undefined && Array.isArray(textureTransforms) && textureTransforms.length === 4) {
+                                            override.textureTransforms = [];
+                                            for (const transform of textureTransforms) {
+                                                if (isLLGLTFTextureTransformOverride(transform)) {
+                                                    override.textureTransforms.push(transform);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    const obj = this.objects.get(localID);
+                                    const textureEntry = obj === null || obj === void 0 ? void 0 : obj.TextureEntry;
+                                    if (textureEntry) {
+                                        textureEntry.gltfMaterialOverrides = overrides;
+                                    }
+                                    else {
+                                        this.cachedMaterialOverrides.set(localID, overrides);
                                     }
                                 }
                             }
@@ -81,13 +172,13 @@ class ObjectStoreLite {
                     {
                         const objProp = packet.message;
                         for (const obj of objProp.ObjectData) {
-                            const obje = this.objectsByUUID[obj.ObjectID.toString()];
-                            if (obje !== undefined && this.objects[obje] !== undefined) {
-                                const o = this.objects[obje];
+                            const obje = this.objectsByUUID.get(obj.ObjectID.toString());
+                            const o = this.objects.get(obje !== null && obje !== void 0 ? obje : 0);
+                            if (obje !== undefined && o !== undefined) {
                                 this.applyObjectProperties(o, obj);
                             }
                             else {
-                                this.pendingObjectProperties[obj.ObjectID.toString()] = obj;
+                                this.pendingObjectProperties.set(obj.ObjectID.toString(), obj);
                             }
                         }
                         break;
@@ -125,12 +216,13 @@ class ObjectStoreLite {
             }
         }));
         this.physicsSubscription = this.clientEvents.onPhysicsDataEvent.subscribe((evt) => {
-            if (this.objects[evt.localID]) {
-                this.objects[evt.localID].physicsShapeType = evt.physicsShapeType;
-                this.objects[evt.localID].density = evt.density;
-                this.objects[evt.localID].restitution = evt.restitution;
-                this.objects[evt.localID].gravityMultiplier = evt.gravityMultiplier;
-                this.objects[evt.localID].friction = evt.friction;
+            const obj = this.objects.get(evt.localID);
+            if (obj) {
+                obj.physicsShapeType = evt.physicsShapeType;
+                obj.density = evt.density;
+                obj.restitution = evt.restitution;
+                obj.gravityMultiplier = evt.gravityMultiplier;
+                obj.friction = evt.friction;
             }
         });
         this.selectedChecker = setInterval(() => {
@@ -177,9 +269,7 @@ class ObjectStoreLite {
         }, 1000);
     }
     applyObjectProperties(o, obj) {
-        if (this.selectedPrimsWithoutUpdate[o.ID]) {
-            delete this.selectedPrimsWithoutUpdate[o.ID];
-        }
+        this.selectedPrimsWithoutUpdate.delete(o.ID);
         o.creatorID = obj.CreatorID;
         o.creationDate = obj.CreationDate;
         o.baseMask = obj.BaseMask;
@@ -223,13 +313,13 @@ class ObjectStoreLite {
     }
     requestMissingObject(localID, attempt = 0) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.requestedObjects[localID]) {
+            if (this.requestedObjects.has(localID)) {
                 return;
             }
             if (this.circuit === undefined) {
                 return;
             }
-            this.requestedObjects[localID] = true;
+            this.requestedObjects.add(localID);
             const rmo = new RequestMultipleObjects_1.RequestMultipleObjectsMessage();
             rmo.AgentData = {
                 AgentID: this.agent.agentID,
@@ -261,10 +351,10 @@ class ObjectStoreLite {
                     }
                     return FilterResponse_1.FilterResponse.NoMatch;
                 });
-                delete this.requestedObjects[localID];
+                this.requestedObjects.delete(localID);
             }
             catch (error) {
-                delete this.requestedObjects[localID];
+                this.requestedObjects.delete(localID);
                 if (attempt < 5) {
                     yield this.requestMissingObject(localID, ++attempt);
                 }
@@ -299,52 +389,58 @@ class ObjectStoreLite {
             const parentID = objData.ParentID;
             let addToParentList = true;
             let newObject = false;
-            if (this.objects[localID]) {
-                if (this.objects[localID].ParentID !== parentID && this.objectsByParent[parentID]) {
-                    const ind = this.objectsByParent[parentID].indexOf(localID);
+            let obj = this.objects.get(localID);
+            if (obj) {
+                const p = this.objectsByParent.get(parentID);
+                if (obj.ParentID !== parentID && p !== undefined) {
+                    const ind = p.indexOf(localID);
                     if (ind !== -1) {
-                        this.objectsByParent[parentID].splice(ind, 1);
+                        p.splice(ind, 1);
                     }
                 }
-                else if (this.objectsByParent[parentID]) {
+                else if (p) {
                     addToParentList = false;
                 }
             }
             else {
                 newObject = true;
-                this.objects[localID] = new GameObject_1.GameObject();
-                this.objects[localID].region = this.agent.currentRegion;
+                const newObj = new GameObject_1.GameObject();
+                newObj.region = this.agent.currentRegion;
+                this.objects.set(localID, newObj);
             }
-            const obj = this.objects[localID];
+            obj = this.objects.get(localID);
             obj.deleted = false;
             obj.ID = objData.ID;
             obj.FullID = objData.FullID;
             obj.ParentID = objData.ParentID;
             obj.OwnerID = objData.OwnerID;
             obj.PCode = objData.PCode;
-            this.objects[localID].NameValue = this.parseNameValues(Utils_1.Utils.BufferToStringSimple(objData.NameValue));
-            this.objects[localID].IsAttachment = this.objects[localID].NameValue['AttachItemID'] !== undefined;
+            obj.NameValue = this.parseNameValues(Utils_1.Utils.BufferToStringSimple(objData.NameValue));
+            obj.IsAttachment = obj.NameValue.AttachItemID !== undefined;
             if (obj.IsAttachment && obj.State !== undefined) {
-                this.objects[localID].attachmentPoint = this.decodeAttachPoint(obj.State);
+                obj.attachmentPoint = this.decodeAttachPoint(obj.State);
             }
-            if (objData.PCode === PCode_1.PCode.Avatar && this.objects[localID].FullID.toString() === this.agent.agentID.toString()) {
+            if (objData.PCode === PCode_1.PCode.Avatar && obj.FullID.toString() === this.agent.agentID.toString()) {
                 this.agent.localID = localID;
                 if (this.options & BotOptionFlags_1.BotOptionFlags.StoreMyAttachmentsOnly) {
                     for (const objParentID of Object.keys(this.objectsByParent)) {
                         const parent = parseInt(objParentID, 10);
                         if (parent !== this.agent.localID) {
                             let foundAvatars = false;
-                            for (const objID of this.objectsByParent[parent]) {
-                                if (this.objects[objID]) {
-                                    const o = this.objects[objID];
-                                    if (o.PCode === PCode_1.PCode.Avatar) {
-                                        foundAvatars = true;
+                            const p = this.objectsByParent.get(parent);
+                            if (p !== undefined) {
+                                for (const objID of p) {
+                                    const childObj = this.objects.get(objID);
+                                    if (childObj) {
+                                        if (childObj.PCode === PCode_1.PCode.Avatar) {
+                                            foundAvatars = true;
+                                        }
                                     }
                                 }
                             }
-                            if (this.objects[parent]) {
-                                const o = this.objects[parent];
-                                if (o.PCode === PCode_1.PCode.Avatar) {
+                            const parentObj = this.objects.get(parent);
+                            if (parentObj) {
+                                if (parentObj.PCode === PCode_1.PCode.Avatar) {
                                     foundAvatars = true;
                                 }
                             }
@@ -355,12 +451,14 @@ class ObjectStoreLite {
                     }
                 }
             }
-            this.objectsByUUID[objData.FullID.toString()] = localID;
-            if (!this.objectsByParent[parentID]) {
-                this.objectsByParent[parentID] = [];
+            this.objectsByUUID.set(objData.FullID.toString(), localID);
+            let objByParent = this.objectsByParent.get(parentID);
+            if (!objByParent) {
+                objByParent = [];
+                this.objectsByParent.set(parentID, objByParent);
             }
             if (addToParentList) {
-                this.objectsByParent[parentID].push(localID);
+                objByParent.push(localID);
             }
             if (objData.PCode !== PCode_1.PCode.Avatar && this.options & BotOptionFlags_1.BotOptionFlags.StoreMyAttachmentsOnly) {
                 if (this.agent.localID !== 0 && obj.ParentID !== this.agent.localID) {
@@ -369,13 +467,13 @@ class ObjectStoreLite {
                 }
             }
             this.notifyObjectUpdate(newObject, obj);
-            if (objData.ParentID !== undefined && objData.ParentID !== 0 && !this.objects[objData.ParentID]) {
+            if (objData.ParentID !== undefined && objData.ParentID !== 0 && !this.objects.get(objData.ParentID)) {
                 this.requestMissingObject(objData.ParentID);
             }
         }
     }
     notifyTerseUpdate(obj) {
-        if (this.objects[obj.ID]) {
+        if (this.objects.get(obj.ID)) {
             if (obj.PCode === PCode_1.PCode.Avatar) {
                 if (this.agent.currentRegion.agents[obj.FullID.toString()] !== undefined) {
                     this.agent.currentRegion.agents[obj.FullID.toString()].processObjectUpdate(obj);
@@ -392,6 +490,7 @@ class ObjectStoreLite {
         }
     }
     notifyObjectUpdate(newObject, obj) {
+        var _a;
         if (obj.PCode === PCode_1.PCode.Avatar) {
             const avatarID = obj.FullID.toString();
             if (newObject) {
@@ -413,11 +512,12 @@ class ObjectStoreLite {
                 }
             }
         }
-        if (obj.ParentID === 0 || (obj.ParentID !== undefined && this.objects[obj.ParentID] !== undefined && this.objects[obj.ParentID].PCode === PCode_1.PCode.Avatar)) {
+        const parentObj = this.objects.get((_a = obj.ParentID) !== null && _a !== void 0 ? _a : 0);
+        if (obj.ParentID === 0 || (obj.ParentID !== undefined && parentObj !== undefined && parentObj.PCode === PCode_1.PCode.Avatar)) {
             if (newObject) {
                 if (obj.IsAttachment && obj.ParentID !== undefined) {
-                    if (this.objects[obj.ParentID] !== undefined && this.objects[obj.ParentID].PCode === PCode_1.PCode.Avatar) {
-                        const avatar = this.agent.currentRegion.agents[this.objects[obj.ParentID].FullID.toString()];
+                    if (parentObj !== undefined && parentObj.PCode === PCode_1.PCode.Avatar) {
+                        const avatar = this.agent.currentRegion.agents[parentObj.FullID.toString()];
                         let invItemID = UUID_1.UUID.zero();
                         if (obj.NameValue['AttachItemID']) {
                             invItemID = new UUID_1.UUID(obj.NameValue['AttachItemID'].value);
@@ -446,8 +546,8 @@ class ObjectStoreLite {
                 newObj.object = obj;
                 newObj.createSelected = obj.Flags !== undefined && (obj.Flags & PrimFlags_1.PrimFlags.CreateSelected) !== 0;
                 obj.createdSelected = newObj.createSelected;
-                if (obj.Flags !== undefined && obj.Flags & PrimFlags_1.PrimFlags.CreateSelected && !this.pendingObjectProperties[obj.FullID.toString()]) {
-                    this.selectedPrimsWithoutUpdate[obj.ID] = true;
+                if (obj.Flags !== undefined && obj.Flags & PrimFlags_1.PrimFlags.CreateSelected && !this.pendingObjectProperties.get(obj.FullID.toString())) {
+                    this.selectedPrimsWithoutUpdate.set(obj.ID, true);
                 }
                 this.clientEvents.onNewObjectEvent.next(newObj);
             }
@@ -458,9 +558,10 @@ class ObjectStoreLite {
                 updObj.object = obj;
                 this.clientEvents.onObjectUpdatedEvent.next(updObj);
             }
-            if (this.pendingObjectProperties[obj.FullID.toString()]) {
-                this.applyObjectProperties(obj, this.pendingObjectProperties[obj.FullID.toString()]);
-                delete this.pendingObjectProperties[obj.FullID.toString()];
+            const pendingProp = this.pendingObjectProperties.get(obj.FullID.toString());
+            if (pendingProp) {
+                this.applyObjectProperties(obj, pendingProp);
+                this.pendingObjectProperties.delete(obj.FullID.toString());
             }
         }
     }
@@ -491,17 +592,17 @@ class ObjectStoreLite {
             const localID = buf.readUInt32LE(pos);
             pos += 4;
             const pcode = buf.readUInt8(pos++);
-            let newObj = false;
-            if (!this.objects[localID]) {
-                newObj = true;
-                this.objects[localID] = new GameObject_1.GameObject();
-                this.objects[localID].region = this.agent.currentRegion;
+            const newObj = false;
+            let o = this.objects.get(localID);
+            if (!o) {
+                o = new GameObject_1.GameObject();
+                o.region = this.agent.currentRegion;
+                this.objects.set(localID, o);
             }
-            const o = this.objects[localID];
             o.deleted = false;
             o.ID = localID;
             o.PCode = pcode;
-            this.objectsByUUID[fullID.toString()] = localID;
+            this.objectsByUUID.set(fullID.toString(), localID);
             o.FullID = fullID;
             pos++;
             pos = pos + 42;
@@ -520,21 +621,24 @@ class ObjectStoreLite {
             o.ParentID = newParentID;
             let add = true;
             if (!newObj && o.ParentID !== undefined) {
-                if (newParentID !== o.ParentID) {
-                    const index = this.objectsByParent[o.ParentID].indexOf(localID);
-                    if (index !== -1) {
-                        this.objectsByParent[o.ParentID].splice(index, 1);
+                const p = this.objectsByParent.get(o.ParentID);
+                if (newParentID !== o.ParentID && p) {
+                    const ind = p.indexOf(localID);
+                    if (ind !== -1) {
+                        p.splice(ind, 1);
                     }
                 }
-                else if (this.objectsByParent[o.ParentID]) {
+                else if (p) {
                     add = false;
                 }
             }
             if (add) {
-                if (!this.objectsByParent[newParentID]) {
-                    this.objectsByParent[newParentID] = [];
+                let objByParent = this.objectsByParent.get(newParentID);
+                if (!objByParent) {
+                    objByParent = [];
+                    this.objectsByParent.set(newParentID, objByParent);
                 }
-                this.objectsByParent[newParentID].push(localID);
+                objByParent.push(localID);
             }
             if (pcode !== PCode_1.PCode.Avatar && newObj && this.options & BotOptionFlags_1.BotOptionFlags.StoreMyAttachmentsOnly) {
                 if (this.agent.localID !== 0 && o.ParentID !== this.agent.localID) {
@@ -542,8 +646,10 @@ class ObjectStoreLite {
                     return;
                 }
             }
-            if (o.ParentID !== undefined && o.ParentID !== 0 && !this.objects[o.ParentID]) {
-                this.requestMissingObject(o.ParentID);
+            if (o.ParentID !== undefined && o.ParentID !== 0 && !this.objects.has(o.ParentID)) {
+                this.requestMissingObject(o.ParentID).catch((e) => {
+                    console.error(e);
+                });
             }
             if (compressedflags & CompressedFlags_1.CompressedFlags.Tree) {
                 pos++;
@@ -599,7 +705,7 @@ class ObjectStoreLite {
     killObject(killObj) {
         for (const obj of killObj.ObjectData) {
             const objectID = obj.ID;
-            if (this.objects[objectID]) {
+            if (this.objects.has(objectID)) {
                 this.deleteObject(objectID);
             }
         }
@@ -615,56 +721,59 @@ class ObjectStoreLite {
     }
     deleteObject(objectID) {
         var _a;
-        if (this.objects[objectID]) {
-            const objectUUID = this.objects[objectID].FullID;
-            const obj = this.objects[objectID];
+        const obj = this.objects.get(objectID);
+        if (obj) {
+            const objectUUID = obj.FullID;
             obj.deleted = true;
             if (this.persist) {
                 this.deadObjects.push(objectID);
                 return;
             }
             if (obj.IsAttachment && obj.ParentID !== undefined) {
-                if (this.objects[obj.ParentID] !== undefined && this.objects[obj.ParentID].PCode === PCode_1.PCode.Avatar) {
-                    (_a = this.agent.currentRegion.agents[this.objects[obj.ParentID].FullID.toString()]) === null || _a === void 0 ? void 0 : _a.removeAttachment(obj);
+                const parent = this.objects.get(obj.ParentID);
+                if (parent !== undefined && parent.PCode === PCode_1.PCode.Avatar) {
+                    (_a = this.agent.currentRegion.agents[parent.FullID.toString()]) === null || _a === void 0 ? void 0 : _a.removeAttachment(obj);
                 }
             }
             if (this.agent.currentRegion.agents[objectUUID.toString()] !== undefined) {
                 this.agent.currentRegion.agents[objectUUID.toString()].isVisible = false;
             }
-            if (this.objectsByParent[objectID]) {
-                for (const childObjID of this.objectsByParent[objectID]) {
+            const objsByParent = this.objectsByParent.get(objectID);
+            if (objsByParent) {
+                for (const childObjID of objsByParent) {
                     this.deleteObject(childObjID);
                 }
             }
-            delete this.objectsByParent[objectID];
+            this.objectsByParent.delete(objectID);
             const uuid = obj.FullID.toString();
-            if (this.objectsByUUID[uuid]) {
-                delete this.objectsByUUID[uuid];
-            }
+            this.objectsByUUID.delete(uuid);
             if (obj.ParentID !== undefined) {
                 const parentID = obj.ParentID;
-                if (this.objectsByParent[parentID]) {
-                    const ind = this.objectsByParent[parentID].indexOf(objectID);
+                const objsByParentParent = this.objectsByParent.get(parentID);
+                if (objsByParentParent) {
+                    const ind = objsByParentParent.indexOf(objectID);
                     if (ind !== -1) {
-                        this.objectsByParent[parentID].splice(ind, 1);
+                        objsByParentParent.splice(ind, 1);
                     }
                 }
             }
             if (this.rtree && obj.rtreeEntry !== undefined) {
                 this.rtree.remove(obj.rtreeEntry);
             }
-            delete this.objects[objectID];
+            this.objects.delete(objectID);
+            this.cachedMaterialOverrides.delete(objectID);
         }
     }
     getObjectsByParent(parentID) {
-        const list = this.objectsByParent[parentID];
+        const list = this.objectsByParent.get(parentID);
         if (list === undefined) {
             return [];
         }
         const result = [];
         for (const localID of list) {
-            if (this.objects[localID]) {
-                result.push(this.objects[localID]);
+            const obj = this.objects.get(localID);
+            if (obj) {
+                result.push(obj);
             }
         }
         result.sort((a, b) => {
@@ -702,20 +811,22 @@ class ObjectStoreLite {
             delete this.selectedChecker;
         }
         this.physicsSubscription.unsubscribe();
-        this.objects = {};
+        this.objects.clear();
         if (this.rtree) {
             this.rtree.clear();
         }
-        this.objectsByUUID = {};
-        this.objectsByParent = {};
+        this.objectsByUUID.clear();
+        this.objectsByParent.clear();
         delete this.circuit;
     }
     findParent(go) {
-        if (go.ParentID !== undefined && go.ParentID !== 0 && this.objects[go.ParentID]) {
-            return this.findParent(this.objects[go.ParentID]);
+        var _a;
+        const parentObj = this.objects.get((_a = go.ParentID) !== null && _a !== void 0 ? _a : 0);
+        if (go.ParentID !== undefined && go.ParentID !== 0 && parentObj) {
+            return this.findParent(parentObj);
         }
         else {
-            if (go.ParentID !== undefined && go.ParentID !== 0 && !this.objects[go.ParentID]) {
+            if (go.ParentID !== undefined && go.ParentID !== 0 && !parentObj) {
                 this.requestMissingObject(go.ParentID).catch((e) => {
                     Logger_1.Logger.Error(e);
                 });
@@ -743,9 +854,9 @@ class ObjectStoreLite {
         return __awaiter(this, void 0, void 0, function* () {
             const results = [];
             const found = {};
-            for (const k of Object.keys(this.objects)) {
-                const go = this.objects[parseInt(k, 10)];
-                if (go.PCode !== PCode_1.PCode.Avatar && (go.IsAttachment === undefined || !go.IsAttachment)) {
+            for (const localID of this.objects.keys()) {
+                const go = this.objects.get(localID);
+                if (go && go.PCode !== PCode_1.PCode.Avatar && (go.IsAttachment === undefined || !go.IsAttachment)) {
                     try {
                         const parent = this.findParent(go);
                         if (parent.ParentID === 0) {
@@ -816,17 +927,19 @@ class ObjectStoreLite {
         if (fullID instanceof UUID_1.UUID) {
             fullID = fullID.toString();
         }
-        if (!this.objectsByUUID[fullID]) {
+        const localID = this.objectsByUUID.get(fullID);
+        const go = this.objects.get(localID !== null && localID !== void 0 ? localID : 0);
+        if (localID === undefined || go === undefined) {
             throw new Error('No object found with that UUID');
         }
-        const localID = this.objectsByUUID[fullID];
-        return this.objects[localID];
+        return go;
     }
     getObjectByLocalID(localID) {
-        if (!this.objects[localID]) {
+        const go = this.objects.get(localID);
+        if (!go) {
             throw new Error('No object found with that UUID');
         }
-        return this.objects[localID];
+        return go;
     }
     insertIntoRtree(obj) {
         if (!this.rtree) {