From 70f1faafdcd29576c347dc7d04c50551391ae0ca Mon Sep 17 00:00:00 2001 From: Casper Warden <216465704+casperwardensl@users.noreply.github.com> Date: Sat, 7 Apr 2018 21:43:39 +0100 Subject: [PATCH] Add support for getting grid map block data via a range request --- dist/classes/Circuit.js.map | 2 +- dist/classes/MapBlock.d.ts | 6 ++ dist/classes/MapBlock.js | 6 ++ dist/classes/MapBlock.js.map | 1 + dist/classes/commands/GridCommands.d.ts | 2 + dist/classes/commands/GridCommands.js | 69 ++++++++++++++++--- dist/classes/commands/GridCommands.js.map | 2 +- dist/events/MapInfoRangeReply.d.ts | 4 ++ dist/events/MapInfoRangeReply.js | 9 +++ dist/events/MapInfoRangeReply.js.map | 1 + dist/events/MapInfoReply.d.ts | 6 +- dist/events/MapInfoReply.js.map | 2 +- lib/classes/Circuit.ts | 3 +- lib/classes/MapBlock.ts | 8 +++ lib/classes/commands/GridCommands.ts | 81 ++++++++++++++++++++--- lib/events/MapInfoRangeReply.ts | 6 ++ lib/events/MapInfoReply.ts | 6 +- 17 files changed, 183 insertions(+), 31 deletions(-) create mode 100644 dist/classes/MapBlock.d.ts create mode 100644 dist/classes/MapBlock.js create mode 100644 dist/classes/MapBlock.js.map create mode 100644 dist/events/MapInfoRangeReply.d.ts create mode 100644 dist/events/MapInfoRangeReply.js create mode 100644 dist/events/MapInfoRangeReply.js.map create mode 100644 lib/classes/MapBlock.ts create mode 100644 lib/events/MapInfoRangeReply.ts diff --git a/dist/classes/Circuit.js.map b/dist/classes/Circuit.js.map index df9b677..18eaef3 100644 --- a/dist/classes/Circuit.js.map +++ b/dist/classes/Circuit.js.map @@ -1 +1 @@ -{"version":3,"file":"Circuit.js","sourceRoot":"","sources":["../../lib/classes/Circuit.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Circuit.js","sourceRoot":"","sources":["../../lib/classes/Circuit.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/classes/MapBlock.d.ts b/dist/classes/MapBlock.d.ts new file mode 100644 index 0000000..0a1e773 --- /dev/null +++ b/dist/classes/MapBlock.d.ts @@ -0,0 +1,6 @@ +import { UUID } from "./UUID"; +export declare class MapBlock { + name: string; + mapImage: UUID; + accessFlags: number; +} diff --git a/dist/classes/MapBlock.js b/dist/classes/MapBlock.js new file mode 100644 index 0000000..1813aa4 --- /dev/null +++ b/dist/classes/MapBlock.js @@ -0,0 +1,6 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +class MapBlock { +} +exports.MapBlock = MapBlock; +//# sourceMappingURL=MapBlock.js.map \ No newline at end of file diff --git a/dist/classes/MapBlock.js.map b/dist/classes/MapBlock.js.map new file mode 100644 index 0000000..4a8f569 --- /dev/null +++ b/dist/classes/MapBlock.js.map @@ -0,0 +1 @@ +{"version":3,"file":"MapBlock.js","sourceRoot":"","sources":["../../lib/classes/MapBlock.ts"],"names":[],"mappings":";;AAEA;CAKC;AALD,4BAKC"} \ No newline at end of file diff --git a/dist/classes/commands/GridCommands.d.ts b/dist/classes/commands/GridCommands.d.ts index 7f97ecc..26cdc7c 100644 --- a/dist/classes/commands/GridCommands.d.ts +++ b/dist/classes/commands/GridCommands.d.ts @@ -2,8 +2,10 @@ import { MapInfoReply } from '../../events/MapInfoReply'; import { UUID } from '../UUID'; import { CommandsBase } from './CommandsBase'; import { RegionInfoReply } from '../../events/RegionInfoReply'; +import { MapInfoRangeReply } from '../../events/MapInfoRangeReply'; export declare class GridCommands extends CommandsBase { getRegionByName(regionName: string): Promise; getRegionMapInfo(gridX: number, gridY: number): Promise; + getRegionMapInfoRange(minX: number, minY: number, maxX: number, maxY: number): Promise; name2Key(name: string): Promise; } diff --git a/dist/classes/commands/GridCommands.js b/dist/classes/commands/GridCommands.js index a5e67de..a6d4c87 100644 --- a/dist/classes/commands/GridCommands.js +++ b/dist/classes/commands/GridCommands.js @@ -14,6 +14,8 @@ const FilterResponse_1 = require("../../enums/FilterResponse"); const MapNameRequest_1 = require("../messages/MapNameRequest"); const GridLayerType_1 = require("../../enums/GridLayerType"); const RegionInfoReply_1 = require("../../events/RegionInfoReply"); +const MapInfoRangeReply_1 = require("../../events/MapInfoRangeReply"); +const MapBlock_1 = require("../MapBlock"); class GridCommands extends CommandsBase_1.CommandsBase { getRegionByName(regionName) { return new Promise((resolve, reject) => { @@ -75,15 +77,15 @@ class GridCommands extends CommandsBase_1.CommandsBase { msg.AgentData = { AgentID: this.agent.agentID, SessionID: circuit.sessionID, - Flags: 65536, + Flags: 2, EstateID: 0, Godlike: false }; msg.PositionData = { - MinX: (gridX / 256), - MaxX: (gridX / 256), - MinY: (gridY / 256), - MaxY: (gridY / 256) + MinX: gridX, + MaxX: gridX, + MinY: gridY, + MaxY: gridY }; circuit.sendMessage(msg, PacketFlags_1.PacketFlags.Reliable); circuit.waitForMessage(Message_1.Message.MapBlockReply, 10000, (packet) => { @@ -102,9 +104,10 @@ class GridCommands extends CommandsBase_1.CommandsBase { const responseMsg = packet.message; responseMsg.Data.forEach((data) => { if (data.X === (gridX / 256) && data.Y === (gridY / 256)) { - response.name = Utils_1.Utils.BufferToStringSimple(data.Name); - response.accessFlags = data.Access; - response.mapImage = data.MapImageID; + response.block = new MapBlock_1.MapBlock(); + response.block.name = Utils_1.Utils.BufferToStringSimple(data.Name); + response.block.accessFlags = data.Access; + response.block.mapImage = data.MapImageID; } }); const regionHandle = Utils_1.Utils.RegionCoordinatesToHandle(gridX, gridY); @@ -157,6 +160,53 @@ class GridCommands extends CommandsBase_1.CommandsBase { }); }); } + getRegionMapInfoRange(minX, minY, maxX, maxY) { + return new Promise((resolve, reject) => { + const circuit = this.currentRegion.circuit; + const response = new MapInfoRangeReply_1.MapInfoRangeReply(); + const msg = new MapBlockRequest_1.MapBlockRequestMessage(); + msg.AgentData = { + AgentID: this.agent.agentID, + SessionID: circuit.sessionID, + Flags: 2, + EstateID: 0, + Godlike: false + }; + msg.PositionData = { + MinX: minX, + MaxX: maxX, + MinY: minY, + MaxY: maxY + }; + circuit.sendMessage(msg, PacketFlags_1.PacketFlags.Reliable); + circuit.waitForMessage(Message_1.Message.MapBlockReply, 30000, (packet) => { + const filterMsg = packet.message; + let found = false; + filterMsg.Data.forEach((data) => { + if (data.X >= minX && data.X <= maxX && data.Y >= minY && data.Y <= maxY) { + found = true; + const mapBlock = new MapBlock_1.MapBlock(); + mapBlock.name = Utils_1.Utils.BufferToStringSimple(data.Name); + mapBlock.accessFlags = data.Access; + mapBlock.mapImage = data.MapImageID; + response.regions.push(mapBlock); + } + }); + if (found) { + return FilterResponse_1.FilterResponse.Match; + } + return FilterResponse_1.FilterResponse.NoMatch; + }).then((packet) => { + }).catch((err) => { + if (err.message === 'Timeout') { + resolve(response); + } + else { + reject(err); + } + }); + }); + } name2Key(name) { const check = name.split('.'); if (check.length > 1) { @@ -190,7 +240,8 @@ class GridCommands extends CommandsBase_1.CommandsBase { let found = null; const apr = packet.message; apr.Data.forEach((dataBlock) => { - const resultName = (Utils_1.Utils.BufferToStringSimple(dataBlock.FirstName) + ' ' + Utils_1.Utils.BufferToStringSimple(dataBlock.LastName)).toLowerCase(); + const resultName = (Utils_1.Utils.BufferToStringSimple(dataBlock.FirstName) + ' ' + + Utils_1.Utils.BufferToStringSimple(dataBlock.LastName)).toLowerCase(); if (resultName === name) { found = dataBlock.AvatarID; } diff --git a/dist/classes/commands/GridCommands.js.map b/dist/classes/commands/GridCommands.js.map index 5e5b4ff..d049f72 100644 --- a/dist/classes/commands/GridCommands.js.map +++ b/dist/classes/commands/GridCommands.js.map @@ -1 +1 @@ -{"version":3,"file":"GridCommands.js","sourceRoot":"","sources":["../../../lib/classes/commands/GridCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"GridCommands.js","sourceRoot":"","sources":["../../../lib/classes/commands/GridCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/events/MapInfoRangeReply.d.ts b/dist/events/MapInfoRangeReply.d.ts new file mode 100644 index 0000000..bf9687f --- /dev/null +++ b/dist/events/MapInfoRangeReply.d.ts @@ -0,0 +1,4 @@ +import { MapBlock } from '../classes/MapBlock'; +export declare class MapInfoRangeReply { + regions: MapBlock[]; +} diff --git a/dist/events/MapInfoRangeReply.js b/dist/events/MapInfoRangeReply.js new file mode 100644 index 0000000..03d1ced --- /dev/null +++ b/dist/events/MapInfoRangeReply.js @@ -0,0 +1,9 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +class MapInfoRangeReply { + constructor() { + this.regions = []; + } +} +exports.MapInfoRangeReply = MapInfoRangeReply; +//# sourceMappingURL=MapInfoRangeReply.js.map \ No newline at end of file diff --git a/dist/events/MapInfoRangeReply.js.map b/dist/events/MapInfoRangeReply.js.map new file mode 100644 index 0000000..1329a52 --- /dev/null +++ b/dist/events/MapInfoRangeReply.js.map @@ -0,0 +1 @@ +{"version":3,"file":"MapInfoRangeReply.js","sourceRoot":"","sources":["../../lib/events/MapInfoRangeReply.ts"],"names":[],"mappings":";;AAEA;IAAA;QAEI,YAAO,GAAe,EAAE,CAAC;IAC7B,CAAC;CAAA;AAHD,8CAGC"} \ No newline at end of file diff --git a/dist/events/MapInfoReply.d.ts b/dist/events/MapInfoReply.d.ts index da4078b..cd00e57 100644 --- a/dist/events/MapInfoReply.d.ts +++ b/dist/events/MapInfoReply.d.ts @@ -1,8 +1,6 @@ -import { UUID } from '../classes/UUID'; +import { MapBlock } from '../classes/MapBlock'; export declare class MapInfoReply { - name: string; - mapImage: UUID; - accessFlags: number; + block: MapBlock; avatars: { X: number; Y: number; diff --git a/dist/events/MapInfoReply.js.map b/dist/events/MapInfoReply.js.map index 256c3a7..95139c8 100644 --- a/dist/events/MapInfoReply.js.map +++ b/dist/events/MapInfoReply.js.map @@ -1 +1 @@ -{"version":3,"file":"MapInfoReply.js","sourceRoot":"","sources":["../../lib/events/MapInfoReply.ts"],"names":[],"mappings":";;AAEA;CASC;AATD,oCASC"} \ No newline at end of file +{"version":3,"file":"MapInfoReply.js","sourceRoot":"","sources":["../../lib/events/MapInfoReply.ts"],"names":[],"mappings":";;AAEA;CAOC;AAPD,oCAOC"} \ No newline at end of file diff --git a/lib/classes/Circuit.ts b/lib/classes/Circuit.ts index 7648185..5b0b791 100644 --- a/lib/classes/Circuit.ts +++ b/lib/classes/Circuit.ts @@ -299,8 +299,7 @@ export class Circuit const keys: string[] = Object.keys(this.awaitingAck); - keys.forEach((seqID: string) => - { + keys.forEach((seqID: string) => { const nSeq = parseInt(seqID, 10); if (oldest === -1 || this.awaitingAck[nSeq].sent < oldest) { diff --git a/lib/classes/MapBlock.ts b/lib/classes/MapBlock.ts new file mode 100644 index 0000000..e4b4a5c --- /dev/null +++ b/lib/classes/MapBlock.ts @@ -0,0 +1,8 @@ +import {UUID} from "./UUID"; + +export class MapBlock +{ + name: string; + mapImage: UUID; + accessFlags: number; +} \ No newline at end of file diff --git a/lib/classes/commands/GridCommands.ts b/lib/classes/commands/GridCommands.ts index 808473e..e396097 100644 --- a/lib/classes/commands/GridCommands.ts +++ b/lib/classes/commands/GridCommands.ts @@ -17,6 +17,8 @@ import {FilterResponse} from '../../enums/FilterResponse'; import {MapNameRequestMessage} from '../messages/MapNameRequest'; import {GridLayerType} from '../../enums/GridLayerType'; import {RegionInfoReply} from '../../events/RegionInfoReply'; +import {MapInfoRangeReply} from '../../events/MapInfoRangeReply'; +import {MapBlock} from '../MapBlock'; export class GridCommands extends CommandsBase { getRegionByName(regionName: string) @@ -92,15 +94,15 @@ export class GridCommands extends CommandsBase msg.AgentData = { AgentID: this.agent.agentID, SessionID: circuit.sessionID, - Flags: 65536, + Flags: 2, EstateID: 0, Godlike: false }; msg.PositionData = { - MinX: (gridX / 256), - MaxX: (gridX / 256), - MinY: (gridY / 256), - MaxY: (gridY / 256) + MinX: gridX, + MaxX: gridX, + MinY: gridY, + MaxY: gridY }; circuit.sendMessage(msg, PacketFlags.Reliable); circuit.waitForMessage(Message.MapBlockReply, 10000, (packet: Packet): FilterResponse => @@ -126,9 +128,10 @@ export class GridCommands extends CommandsBase { if (data.X === (gridX / 256) && data.Y === (gridY / 256)) { - response.name = Utils.BufferToStringSimple(data.Name); - response.accessFlags = data.Access; - response.mapImage = data.MapImageID; + response.block = new MapBlock(); + response.block.name = Utils.BufferToStringSimple(data.Name); + response.block.accessFlags = data.Access; + response.block.mapImage = data.MapImageID; } }); @@ -195,6 +198,65 @@ export class GridCommands extends CommandsBase }); } + getRegionMapInfoRange(minX: number, minY: number, maxX: number, maxY: number): Promise + { + return new Promise((resolve, reject) => + { + const circuit = this.currentRegion.circuit; + const response = new MapInfoRangeReply(); + const msg: MapBlockRequestMessage = new MapBlockRequestMessage(); + msg.AgentData = { + AgentID: this.agent.agentID, + SessionID: circuit.sessionID, + Flags: 2, + EstateID: 0, + Godlike: false + }; + msg.PositionData = { + MinX: minX, + MaxX: maxX, + MinY: minY, + MaxY: maxY + }; + circuit.sendMessage(msg, PacketFlags.Reliable); + circuit.waitForMessage(Message.MapBlockReply, 30000, (packet: Packet): FilterResponse => + { + const filterMsg = packet.message as MapBlockReplyMessage; + let found = false; + filterMsg.Data.forEach((data) => + { + if (data.X >= minX && data.X <= maxX && data.Y >= minY && data.Y <= maxY) + { + found = true; + const mapBlock = new MapBlock(); + mapBlock.name = Utils.BufferToStringSimple(data.Name); + mapBlock.accessFlags = data.Access; + mapBlock.mapImage = data.MapImageID; + response.regions.push(mapBlock); + } + }); + if (found) + { + return FilterResponse.Match; + } + return FilterResponse.NoMatch; + }).then((packet: Packet) => + { + + }).catch((err) => + { + if (err.message === 'Timeout') + { + resolve(response); + } + else + { + reject(err); + } + }); + }); + } + name2Key(name: string): Promise { const check = name.split('.'); @@ -239,7 +301,8 @@ export class GridCommands extends CommandsBase const apr = packet.message as AvatarPickerReplyMessage; apr.Data.forEach((dataBlock) => { - const resultName = (Utils.BufferToStringSimple(dataBlock.FirstName) + ' ' + Utils.BufferToStringSimple(dataBlock.LastName)).toLowerCase(); + const resultName = (Utils.BufferToStringSimple(dataBlock.FirstName) + ' ' + + Utils.BufferToStringSimple(dataBlock.LastName)).toLowerCase(); if (resultName === name) { found = dataBlock.AvatarID; diff --git a/lib/events/MapInfoRangeReply.ts b/lib/events/MapInfoRangeReply.ts new file mode 100644 index 0000000..1a92755 --- /dev/null +++ b/lib/events/MapInfoRangeReply.ts @@ -0,0 +1,6 @@ +import {MapBlock} from '../classes/MapBlock'; + +export class MapInfoRangeReply +{ + regions: MapBlock[] = []; +} diff --git a/lib/events/MapInfoReply.ts b/lib/events/MapInfoReply.ts index 86ac0b3..4f7d855 100644 --- a/lib/events/MapInfoReply.ts +++ b/lib/events/MapInfoReply.ts @@ -1,10 +1,8 @@ -import {UUID} from '../classes/UUID'; +import {MapBlock} from '../classes/MapBlock'; export class MapInfoReply { - name: string; - mapImage: UUID; - accessFlags: number; + block: MapBlock; avatars: { X: number, Y: number