@caspertech/node-metaverse 0.6.26 → 0.7.1

package/dist/lib/classes/ObjectResolver.js

@@ -11,142 +11,64 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectResolver = void 0;
 const __1 = require("..");
-const rxjs_1 = require("rxjs");
-const LLSD = require("@caspertech/llsd");
+const timers_1 = require("timers");
+const BatchQueue_1 = require("./BatchQueue");
 class ObjectResolver {
     constructor(region) {
         this.region = region;
-        this.objectsInQueue = {};
-        this.queue = [];
-        this.maxConcurrency = 128;
-        this.currentlyRunning = false;
-        this.onObjectResolveRan = new rxjs_1.Subject();
+        this.resolveQueue = new BatchQueue_1.BatchQueue(256, this.resolveInternal.bind(this));
+        this.getCostsQueue = new BatchQueue_1.BatchQueue(256, this.getCostsInternal.bind(this));
     }
     resolveObjects(objects, options) {
-        return new Promise((resolve, reject) => {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
             if (!this.region) {
-                reject(new Error('Region is going away'));
-                return;
+                throw new Error('Region is going away');
             }
-            if (options.outputLog) {
-            }
-            const objs = {};
+            const objs = new Map();
             const failed = [];
             for (const obj of objects) {
-                this.region.objects.populateChildren(obj);
-                this.scanObject(obj, objs);
-            }
-            const queueObject = (id) => {
-                if (this.objectsInQueue[id] === undefined) {
-                    this.objectsInQueue[id] = {
-                        object: objs[id],
-                        options
-                    };
-                    this.queue.push(id);
-                }
-                else if (this.objectsInQueue[id].options.skipInventory && !options.skipInventory) {
-                    this.objectsInQueue[id].options.skipInventory = false;
-                }
-            };
-            const skipped = [];
-            for (const obj of Object.keys(objs)) {
-                const id = parseInt(obj, 10);
-                const gameObject = objs[id];
-                if (options.outputLog === true) {
-                }
-                if (!options.onlyUnresolved || gameObject.resolvedAt === undefined || gameObject.resolvedAt === 0 || (!options.skipInventory && !gameObject.resolvedInventory)) {
-                    if (!options.onlyUnresolved) {
-                        gameObject.resolvedAt = 0;
-                        gameObject.resolveAttempts = 0;
-                    }
-                    queueObject(id);
-                }
-                else {
-                    skipped.push(id);
+                if (!options.includeTempObjects && (((_a = obj.Flags) !== null && _a !== void 0 ? _a : 0) & __1.PrimFlags.TemporaryOnRez)) {
+                    continue;
                 }
-            }
-            for (const id of skipped) {
-                delete objs[id];
-                if (options.outputLog === true) {
+                if (!options.includeAvatars && obj.PCode === __1.PCode.Avatar) {
+                    continue;
                 }
+                this.region.objects.populateChildren(obj);
+                this.scanObject(obj, objs);
             }
-            if (Object.keys(objs).length === 0) {
-                resolve(failed);
-                return;
+            if (objs.size === 0) {
+                return failed;
             }
-            let objResolve = undefined;
-            let objProps = undefined;
-            const checkObject = (obj) => {
-                let done = false;
-                if (obj.resolvedAt !== undefined && obj.resolvedAt > 0) {
-                    if (options.skipInventory === true || obj.resolvedInventory) {
-                        if (options.outputLog === true) {
-                        }
-                        done = true;
-                    }
-                }
-                if (obj.resolveAttempts > 2) {
-                    failed.push(obj);
-                    done = true;
-                }
-                if (done) {
-                    delete objs[obj.ID];
-                    if (Object.keys(objs).length === 0) {
-                        if (objResolve !== undefined) {
-                            objResolve.unsubscribe();
-                            objResolve = undefined;
-                        }
-                        if (objProps !== undefined) {
-                            objProps.unsubscribe();
-                            objProps = undefined;
-                        }
-                        resolve(failed);
-                    }
-                }
-                return done;
-            };
-            objResolve = this.onObjectResolveRan.subscribe((obj) => {
-                if (objs[obj.ID] !== undefined) {
-                    if (options.outputLog === true) {
-                    }
-                    if (!checkObject(obj)) {
-                        if (options.outputLog === true) {
-                        }
-                        setTimeout(() => {
-                            if (!checkObject(obj)) {
-                                if (options.outputLog) {
-                                }
-                                queueObject(obj.ID);
-                                this.run().then(() => {
-                                }).catch((err) => {
-                                    console.error(err);
-                                });
-                            }
-                        }, 10000);
-                    }
+            return this.resolveQueue.add(Array.from(objs.values()));
+        });
+    }
+    getInventory(object) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.getInventories([object]);
+        });
+    }
+    getInventories(objects) {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const obj of objects) {
+                if (!obj.resolvedInventory) {
+                    yield obj.updateInventory();
                 }
-            });
-            if (!this.region) {
-                return;
             }
-            objProps = this.region.clientEvents.onObjectResolvedEvent.subscribe((obj) => {
-                if (objs[obj.object.ID] !== undefined) {
-                    if (options.outputLog) {
-                    }
-                    if (!checkObject(obj.object)) {
-                    }
-                }
-            });
-            this.run().then(() => {
-            }).catch((err) => {
-                console.error(err);
-            });
         });
     }
+    getCosts(objects) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.getCostsQueue.add(objects);
+        });
+    }
+    shutdown() {
+        delete this.region;
+    }
     scanObject(obj, map) {
         const localID = obj.ID;
-        if (!map[localID]) {
-            map[localID] = obj;
+        if (!map.has(localID)) {
+            map.set(localID, obj);
             if (obj.children) {
                 for (const child of obj.children) {
                     this.scanObject(child, map);
@@ -154,185 +76,130 @@ class ObjectResolver {
             }
         }
     }
-    run() {
+    resolveInternal(objs) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.currentlyRunning) {
-                return;
+            if (!this.region) {
+                throw new Error('Region went away');
             }
+            const objArray = Array.from(objs.values());
             try {
-                while (this.queue.length > 0) {
-                    const jobs = [];
-                    for (let x = 0; x < this.maxConcurrency && this.queue.length > 0; x++) {
-                        const objectID = this.queue.shift();
-                        if (objectID !== undefined) {
-                            jobs.push(this.objectsInQueue[objectID]);
-                            delete this.objectsInQueue[objectID];
-                        }
-                    }
-                    yield this.doResolve(jobs);
-                }
-            }
-            catch (error) {
-                console.error(error);
+                yield this.region.clientCommands.region.selectObjects(objArray);
             }
             finally {
-                this.currentlyRunning = false;
+                yield this.region.clientCommands.region.deselectObjects(objArray);
             }
-            if (this.queue.length > 0) {
-                this.run().then(() => {
-                }, (err) => {
-                    console.error(err);
-                });
+            if (!this.region) {
+                throw new Error('Region went away');
+            }
+            const objects = new Map();
+            for (const obj of objs.values()) {
+                objects.set(obj.ID, obj);
+            }
+            for (let x = 0; x < 3; x++) {
+                try {
+                    yield this.waitForResolve(objects, 10000);
+                }
+                catch (_e) {
+                }
+            }
+            const failed = new Set();
+            for (const o of objects.values()) {
+                failed.add(o);
             }
+            return failed;
         });
     }
-    doResolve(jobs) {
-        var _a;
+    getCostsInternal(objs) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.region) {
-                return;
+            const failed = new Set();
+            const submitted = new Map();
+            for (const obj of objs.values()) {
+                submitted.set(obj.FullID.toString(), obj);
             }
-            const resolveTime = new Date().getTime() / 1000;
-            const objectList = [];
-            let totalRemaining = 0;
             try {
-                for (const job of jobs) {
-                    if (job.object.resolvedAt === undefined || job.object.resolvedAt < resolveTime) {
-                        objectList.push(job.object);
-                        totalRemaining++;
-                    }
+                if (!this.region) {
+                    return objs;
                 }
-                if (objectList.length > 0) {
-                    if (!this.region) {
-                        return;
-                    }
-                    yield this.region.clientCommands.region.selectObjects(objectList);
-                    if (!this.region) {
-                        return;
-                    }
-                    yield this.region.clientCommands.region.deselectObjects(objectList);
-                    for (const chk of objectList) {
-                        if (chk.resolvedAt !== undefined && chk.resolvedAt >= resolveTime) {
-                            totalRemaining--;
+                const result = yield this.region.caps.capsPostXML('GetObjectCost', {
+                    'object_ids': Array.from(submitted.keys())
+                });
+                const uuids = Object.keys(result);
+                for (const key of uuids) {
+                    const costs = result[key];
+                    try {
+                        if (!this.region) {
+                            continue;
                         }
-                    }
-                }
-                for (const job of jobs) {
-                    if (!this.region) {
-                        return;
-                    }
-                    if (!job.options.skipInventory && (job.options.includeTempObjects || (((_a = job.object.Flags) !== null && _a !== void 0 ? _a : 0) & __1.PrimFlags.TemporaryOnRez) === 0)) {
-                        const o = job.object;
-                        if ((o.resolveAttempts === undefined || o.resolveAttempts < 3) && o.FullID !== undefined && o.name !== undefined && o.Flags !== undefined && !(o.Flags & __1.PrimFlags.InventoryEmpty) && (!o.inventory || o.inventory.length === 0)) {
-                            if (job.options.outputLog) {
-                            }
-                            try {
-                                yield o.updateInventory();
-                            }
-                            catch (error) {
-                                if (o.resolveAttempts === undefined) {
-                                    o.resolveAttempts = 0;
-                                }
-                                o.resolveAttempts++;
-                                if (o.FullID !== undefined) {
-                                    console.error('Error downloading task inventory of ' + o.FullID.toString() + ':');
-                                    console.error(error);
-                                }
-                                else {
-                                    console.error('Error downloading task inventory of ' + o.ID + ':');
-                                    console.error(error);
-                                }
-                            }
+                        const obj = this.region.objects.getObjectByUUID(new __1.UUID(key));
+                        obj.linkPhysicsImpact = parseFloat(costs['linked_set_physics_cost']);
+                        obj.linkResourceImpact = parseFloat(costs['linked_set_resource_cost']);
+                        obj.physicaImpact = parseFloat(costs['physics_cost']);
+                        obj.resourceImpact = parseFloat(costs['resource_cost']);
+                        obj.limitingType = costs['resource_limiting_type'];
+                        obj.landImpact = Math.round(obj.linkPhysicsImpact);
+                        if (obj.linkResourceImpact > obj.linkPhysicsImpact) {
+                            obj.landImpact = Math.round(obj.linkResourceImpact);
                         }
-                        else {
-                            if (job.options.outputLog) {
-                            }
+                        obj.calculatedLandImpact = obj.landImpact;
+                        if (obj.Flags !== undefined && obj.Flags & __1.PrimFlags.TemporaryOnRez && obj.limitingType === 'legacy') {
+                            obj.calculatedLandImpact = 0;
                         }
-                        o.resolvedInventory = true;
+                        submitted.delete(key);
+                    }
+                    catch (error) {
                     }
                 }
             }
-            catch (ignore) {
-                console.error(ignore);
+            catch (error) {
             }
-            finally {
-                if (totalRemaining < 1) {
-                    totalRemaining = 0;
-                    for (const obj of objectList) {
-                        if (obj.resolvedAt === undefined || obj.resolvedAt < resolveTime) {
-                            totalRemaining++;
-                        }
-                    }
-                    if (totalRemaining > 0) {
-                        console.error(totalRemaining + ' objects could not be resolved');
-                    }
+            for (const go of submitted.values()) {
+                failed.add(go);
+            }
+            return failed;
+        });
+    }
+    waitForResolve(objs, timeout = 10000) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const entries = objs.entries();
+            for (const [localID, entry] of entries) {
+                if (entry.resolvedAt !== undefined) {
+                    objs.delete(localID);
                 }
-                const that = this;
-                const getCosts = function (objIDs) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        try {
-                            if (!that.region) {
-                                return;
-                            }
-                            const result = yield that.region.caps.capsPostXML('GetObjectCost', {
-                                'object_ids': objIDs
-                            });
-                            const uuids = Object.keys(result);
-                            for (const key of uuids) {
-                                const costs = result[key];
-                                try {
-                                    if (!that.region) {
-                                        return;
-                                    }
-                                    const obj = that.region.objects.getObjectByUUID(new __1.UUID(key));
-                                    obj.linkPhysicsImpact = parseFloat(costs['linked_set_physics_cost']);
-                                    obj.linkResourceImpact = parseFloat(costs['linked_set_resource_cost']);
-                                    obj.physicaImpact = parseFloat(costs['physics_cost']);
-                                    obj.resourceImpact = parseFloat(costs['resource_cost']);
-                                    obj.limitingType = costs['resource_limiting_type'];
-                                    obj.landImpact = Math.round(obj.linkPhysicsImpact);
-                                    if (obj.linkResourceImpact > obj.linkPhysicsImpact) {
-                                        obj.landImpact = Math.round(obj.linkResourceImpact);
-                                    }
-                                    obj.calculatedLandImpact = obj.landImpact;
-                                    if (obj.Flags !== undefined && obj.Flags & __1.PrimFlags.TemporaryOnRez && obj.limitingType === 'legacy') {
-                                        obj.calculatedLandImpact = 0;
-                                    }
-                                }
-                                catch (error) {
-                                }
-                            }
+            }
+            if (objs.size === 0) {
+                return;
+            }
+            return new Promise((resolve, reject) => {
+                if (!this.region) {
+                    reject(new Error('Region went away'));
+                    return;
+                }
+                let subs = undefined;
+                let timer = undefined;
+                subs = this.region.clientEvents.onObjectResolvedEvent.subscribe((obj) => {
+                    objs.delete(obj.object.ID);
+                    if (objs.size === 0) {
+                        if (timer !== undefined) {
+                            (0, timers_1.clearTimeout)(timer);
+                            timer = undefined;
                         }
-                        catch (error) {
+                        if (subs !== undefined) {
+                            subs.unsubscribe();
+                            subs = undefined;
                         }
-                    });
-                };
-                let ids = [];
-                const promises = [];
-                for (const job of jobs) {
-                    if (job.object.landImpact === undefined) {
-                        ids.push(new LLSD.UUID(job.object.FullID));
-                    }
-                    if (ids.length > 255) {
-                        promises.push(getCosts(ids));
-                        ids = [];
+                        resolve();
                     }
-                }
-                if (ids.length > 0) {
-                    promises.push(getCosts(ids));
-                }
-                yield Promise.all(promises);
-                for (const job of jobs) {
-                    if (job.options.outputLog) {
+                });
+                timer = setTimeout(() => {
+                    if (subs !== undefined) {
+                        subs.unsubscribe();
+                        subs = undefined;
                     }
-                    this.onObjectResolveRan.next(job.object);
-                }
-            }
+                    reject(new Error('Timeout'));
+                }, timeout);
+            });
         });
     }
-    shutdown() {
-        delete this.region;
-    }
 }
 exports.ObjectResolver = ObjectResolver;
 //# sourceMappingURL=ObjectResolver.js.map

package/dist/lib/classes/ObjectResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectResolver.js","sourceRoot":"","sources":["../../../lib/classes/ObjectResolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ObjectResolver.js","sourceRoot":"","sources":["../../../lib/classes/ObjectResolver.ts"],"names":[],"mappings":"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"}

package/dist/lib/classes/ObjectStoreLite.d.ts

@@ -61,6 +61,7 @@ export declare class ObjectStoreLite implements IObjectStore {
     private selectedPrimsWithoutUpdate;
     private selectedChecker?;
     private blacklist;
+    private pendingResolves;
     rtree?: RBush3D;
     constructor(circuit: Circuit, agent: Agent, clientEvents: ClientEvents, options: BotOptionFlags);
     private applyObjectProperties;
@@ -68,7 +69,7 @@ export declare class ObjectStoreLite implements IObjectStore {
     protected objectUpdate(objectUpdate: ObjectUpdateMessage): void;
     protected notifyTerseUpdate(obj: GameObject): void;
     protected notifyObjectUpdate(newObject: boolean, obj: GameObject): void;
-    private checkAttachToAvatar;
+    pendingResolve(id: number): void;
     protected objectUpdateCached(objectUpdateCached: ObjectUpdateCachedMessage): void;
     protected objectUpdateCompressed(objectUpdateCompressed: ObjectUpdateCompressedMessage): void;
     protected decodeAttachPoint(state: number): number;

package/dist/lib/classes/ObjectStoreLite.js

@@ -49,6 +49,7 @@ class ObjectStoreLite {
         this.pendingObjectProperties = new Map;
         this.selectedPrimsWithoutUpdate = new Map();
         this.blacklist = new Map();
+        this.pendingResolves = new Set();
         agent.localID = 0;
         this.options = options;
         this.fullStore = false;
@@ -318,12 +319,6 @@ class ObjectStoreLite {
                 this.clientEvents.onSelectedObjectEvent.next(evt);
             }
         }
-        if (o.ParentID !== undefined) {
-            const parent = this.objects.get(o.ParentID);
-            if (parent !== undefined && parent.PCode === PCode_1.PCode.Avatar) {
-                this.checkAttachToAvatar(o);
-            }
-        }
     }
     requestMissingObject(localID, attempt = 0) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -539,7 +534,31 @@ class ObjectStoreLite {
         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) {
-                this.checkAttachToAvatar(obj);
+                if (obj.IsAttachment && obj.ParentID !== undefined) {
+                    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);
+                        }
+                        this.agent.currentRegion.clientCommands.region.resolveObject(obj, {}).then(() => {
+                            try {
+                                if (obj.itemID === undefined) {
+                                    obj.itemID = UUID_1.UUID.zero();
+                                }
+                                obj.itemID = invItemID;
+                                if (avatar !== undefined) {
+                                    avatar.addAttachment(obj);
+                                }
+                            }
+                            catch (err) {
+                                console.error(err);
+                            }
+                        }).catch(() => {
+                            console.error('Failed to resolve new avatar attachment');
+                        });
+                    }
+                }
                 const newObj = new NewObjectEvent_1.NewObjectEvent();
                 newObj.localID = obj.ID;
                 newObj.objectID = obj.FullID;
@@ -560,42 +579,13 @@ class ObjectStoreLite {
             }
             const pendingProp = this.pendingObjectProperties.get(obj.FullID.toString());
             if (pendingProp) {
-                this.pendingObjectProperties.delete(obj.FullID.toString());
                 this.applyObjectProperties(obj, pendingProp);
+                this.pendingObjectProperties.delete(obj.FullID.toString());
             }
         }
     }
-    checkAttachToAvatar(obj) {
-        if (obj.IsAttachment && obj.ParentID !== undefined) {
-            const parentObj = this.objects.get(obj.ParentID);
-            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);
-                }
-                try {
-                    if (avatar.getAttachment(invItemID)) {
-                        return;
-                    }
-                }
-                catch (e) {
-                }
-                this.agent.currentRegion.clientCommands.region.resolveObject(obj, true, false).then(() => {
-                    try {
-                        obj.itemID = invItemID;
-                        if (avatar !== undefined) {
-                            avatar.addAttachment(obj);
-                        }
-                    }
-                    catch (err) {
-                        console.error(err);
-                    }
-                }).catch(() => {
-                    console.error('Failed to resolve new avatar attachment');
-                });
-            }
-        }
+    pendingResolve(id) {
+        this.pendingResolves.add(id);
     }
     objectUpdateCached(objectUpdateCached) {
         if (this.circuit === undefined) {