diff --git a/example/testBot.js b/example/testBot.js index b70bb43..d5deeb1 100644 --- a/example/testBot.js +++ b/example/testBot.js @@ -244,14 +244,15 @@ async function connect() bot.clientCommands.friends.sendFriendRequest(master, 'Be friends with me?').then(() => {}); const folders = bot.clientCommands.inventory.getInventoryRoot().getChildFolders(); - folders.forEach((folder) => + for (const folder of folders) { console.log('Top level folder: ' + folder.name); folder.populate().then(() => {}); - }); + } const roles = await bot.clientCommands.group.getGroupRoles(groupID); - roles.forEach(async (role) => + + for(const role of roles) { if (role.Name === 'Officers') { @@ -261,13 +262,13 @@ async function connect() { const members = await bot.clientCommands.group.getMemberList(groupID); let found = true; - members.forEach((member) => + for (const member of members) { if (member.AgentID.toString() === userToInvite.toString()) { found = true; } - }); + } if (found) { console.log("User already in group, skipping invite"); @@ -282,7 +283,7 @@ async function connect() console.error('Error retrieving member list for group invite'); } } - }); + } await bot.waitForEventQueue(); try diff --git a/lib/classes/Agent.ts b/lib/classes/Agent.ts index c2f1940..d0ca09b 100644 --- a/lib/classes/Agent.ts +++ b/lib/classes/Agent.ts @@ -201,7 +201,7 @@ export class Agent const animMsg = packet.message as AvatarAnimationMessage; if (animMsg.Sender.ID.toString() === this.agentID.toString()) { - animMsg.AnimationList.forEach((anim) => + for (const anim of animMsg.AnimationList) { const a = anim.AnimID.toString(); if (a === BuiltInAnimations.STANDUP || @@ -216,7 +216,7 @@ export class Agent this.sendAgentUpdate(); this.controlFlags = 0; } - }); + } } } } @@ -237,7 +237,7 @@ export class Agent serialNumber: wearables.AgentData.SerialNum, attachments: [] }; - wearables.WearableData.forEach((wearable) => + for (const wearable of wearables.WearableData) { if (this.wearables && this.wearables.attachments) { @@ -247,10 +247,10 @@ export class Agent wearableType: wearable.WearableType }); } - }); + } } - Object.keys(this.inventory.main.skeleton).forEach((uuid) => + for (const uuid of Object.keys(this.inventory.main.skeleton)) { const folder = this.inventory.main.skeleton[uuid]; if (folder.typeDefault === FolderType.CurrentOutfit) @@ -273,12 +273,12 @@ export class Agent { const currentOutfitFolderContents = folderContents['folders'][0]['items']; const wornObjects = this.currentRegion.objects.getObjectsByParent(this.localID); - currentOutfitFolderContents.forEach((item: any) => + for (const item of currentOutfitFolderContents) { if (item.type === 6) { let found = false; - wornObjects.forEach((obj: GameObject) => + for (const obj of wornObjects) { if (obj.hasNameValueEntry('AttachItemID')) { @@ -287,7 +287,7 @@ export class Agent found = true; } } - }); + } if (!found) { @@ -310,11 +310,11 @@ export class Agent circuit.sendMessage(rsafi, PacketFlags.Reliable); } } - }); + } }); } - }); + } this.appearanceSet = true; this.appearanceSetEvent.next(); diff --git a/lib/classes/Circuit.ts b/lib/classes/Circuit.ts index 9a8b8dc..a7a7b92 100644 --- a/lib/classes/Circuit.ts +++ b/lib/classes/Circuit.ts @@ -60,10 +60,10 @@ export class Circuit subscribeToMessages(ids: number[], callback: (packet: Packet) => void) { const lookupObject: { [key: number]: boolean } = {}; - ids.forEach((id) => + for (const id of ids) { lookupObject[id] = true; - }); + } return this.onPacketReceived.pipe(filter((packet: Packet) => { @@ -293,17 +293,17 @@ export class Circuit shutdown() { - Object.keys(this.awaitingAck).forEach((sequenceNumber: string) => + for (const sequenceNumber of Object.keys(this.awaitingAck)) { clearTimeout(this.awaitingAck[parseInt(sequenceNumber, 10)].timeout); delete this.awaitingAck[parseInt(sequenceNumber, 10)]; - }); - Object.keys(this.receivedPackets).forEach((sequenceNumber: string) => + } + for (const sequenceNumber of Object.keys(this.receivedPackets)) { const seq: number = parseInt(sequenceNumber, 10); clearTimeout(this.receivedPackets[seq]); delete this.receivedPackets[seq]; - }); + } if (this.client !== null) { this.client.close(); @@ -445,7 +445,7 @@ export class Circuit const keys: string[] = Object.keys(this.awaitingAck); - keys.forEach((seqID: string) => + for (const seqID of keys) { const nSeq = parseInt(seqID, 10); if (oldest === -1 || this.awaitingAck[nSeq].sent < oldest) @@ -453,7 +453,7 @@ export class Circuit result = nSeq; oldest = this.awaitingAck[nSeq].sent; } - }); + } return result; } @@ -494,10 +494,10 @@ export class Circuit if (packet.message.id === Message.PacketAck) { const msg = packet.message as PacketAckMessage; - msg.Packets.forEach((obj) => + for (const obj of msg.Packets) { this.ackReceived(obj.ID); - }); + } } else if (packet.message.id === Message.StartPingCheck) { diff --git a/lib/classes/Comms.ts b/lib/classes/Comms.ts index b0e0d4e..9a04190 100644 --- a/lib/classes/Comms.ts +++ b/lib/classes/Comms.ts @@ -283,12 +283,11 @@ export class Comms const alertMessage = Utils.BufferToStringSimple(alertm.AlertData.Message); - console.log('Alert message: ' + alertMessage); - alertm.AlertInfo.forEach((info) => + for (const info of alertm.AlertInfo) { const alertInfoMessage = Utils.BufferToStringSimple(info.Message); console.log('Alert info message: ' + alertInfoMessage); - }); + } break; } case Message.ScriptDialog: diff --git a/lib/classes/EventQueueClient.ts b/lib/classes/EventQueueClient.ts index 2a23870..1b33f3b 100644 --- a/lib/classes/EventQueueClient.ts +++ b/lib/classes/EventQueueClient.ts @@ -75,7 +75,7 @@ export class EventQueueClient { if (data['events']) { - data['events'].forEach((event: any) => + for (const event of data['events']) { try { @@ -317,7 +317,7 @@ export class EventQueueClient { if (event['body']['agent_updates']) { - Object.keys(event['body']['agent_updates']).forEach((agentUpdate) => + for (const agentUpdate of Object.keys(event['body']['agent_updates'])) { const updObj = event['body']['agent_updates'][agentUpdate]; const gcsale = new GroupChatSessionAgentListEvent(); @@ -339,7 +339,7 @@ export class EventQueueClient } } this.clientEvents.onGroupChatAgentListUpdate.next(gcsale); - }); + } } } break; @@ -400,7 +400,7 @@ export class EventQueueClient console.error('Error handling cap'); console.error(erro); } - }); + } } } catch (error) diff --git a/lib/classes/InventoryFolder.ts b/lib/classes/InventoryFolder.ts index d59a189..f814662 100644 --- a/lib/classes/InventoryFolder.ts +++ b/lib/classes/InventoryFolder.ts @@ -46,14 +46,14 @@ export class InventoryFolder { const children: InventoryFolder[] = []; const ofi = this.folderID.toString(); - Object.keys(this.inventoryBase.skeleton).forEach((uuid) => + for (const uuid of Object.keys(this.inventoryBase.skeleton)) { const folder = this.inventoryBase.skeleton[uuid]; if (folder.parentID.toString() === ofi) { children.push(folder); } - }); + } return children; } @@ -101,7 +101,7 @@ export class InventoryFolder if (json['version'] >= this.version) { this.items = []; - json['items'].forEach((item: any) => + for (const item of json['items']) { item.created = new Date(item.created.mUUID); item.assetID = new UUID(item.assetID.mUUID); @@ -111,8 +111,11 @@ export class InventoryFolder item.permissions.owner = new UUID(item.permissions.owner.mUUID); item.permissions.creator = new UUID(item.permissions.creator.mUUID); item.permissions.group = new UUID(item.permissions.group.mUUID); - this.addItem(item); - }); + this.addItem(item).catch((error) => + { + console.error(error); + }); + } resolve(); } else @@ -191,7 +194,7 @@ export class InventoryFolder { this.version = folderContents['folders'][0]['version']; this.items = []; - folderContents['folders'][0]['items'].forEach((item: any) => + for (const item of folderContents['folders'][0]['items']) { const invItem = new InventoryItem(); invItem.assetID = new UUID(item['asset_id'].toString()); @@ -222,7 +225,7 @@ export class InventoryFolder group: new UUID(item['permissions']['group_id'].toString()) }; this.addItem(invItem); - }); + } this.saveCache().then(() => { resolve(); diff --git a/lib/classes/LoginResponse.ts b/lib/classes/LoginResponse.ts index fc4bd86..d00bd71 100644 --- a/lib/classes/LoginResponse.ts +++ b/lib/classes/LoginResponse.ts @@ -5,8 +5,8 @@ import { Vector3 } from './Vector3'; import * as Long from 'long'; import { ClientEvents } from './ClientEvents'; import { InventoryFolder } from './InventoryFolder'; -import { LoginFlags } from '../enums/LoginFlags'; -import { BotOptionFlags } from '../enums/BotOptionFlags'; +import { LoginFlags } from '..'; +import { BotOptionFlags } from '..'; export class LoginResponse { @@ -119,13 +119,13 @@ export class LoginResponse this.agent.agentID = new UUID(json['agent_id']); } - Object.keys(json).forEach((key: string) => + for (const key of Object.keys(json)) { const val: any = json[key]; switch (key) { case 'inventory-skeleton': - val.forEach((item: any) => + for (const item of val) { const folder = new InventoryFolder(this.agent.inventory.main, this.agent); folder.typeDefault = parseInt(item['type_default'], 10); @@ -134,10 +134,10 @@ export class LoginResponse folder.folderID = new UUID(item['folder_id']); folder.parentID = new UUID(item['parent_id']); this.agent.inventory.main.skeleton[folder.folderID.toString()] = folder; - }); + } break; case 'inventory-skel-lib': - val.forEach((item: any) => + for (const item of val) { const folder = new InventoryFolder(this.agent.inventory.library, this.agent); folder.typeDefault = parseInt(item['type_default'], 10); @@ -146,7 +146,7 @@ export class LoginResponse folder.folderID = new UUID(item['folder_id']); folder.parentID = new UUID(item['parent_id']); this.agent.inventory.library.skeleton[folder.folderID.toString()] = folder; - }); + } break; case 'inventory-root': { @@ -194,7 +194,7 @@ export class LoginResponse this.agent.AOTransition = (val !== 0); break; case 'global-textures': - val.forEach((obj: any) => + for (const obj of val) { if (obj['cloud_texture_id']) { @@ -208,14 +208,14 @@ export class LoginResponse { this.textures.moonTextureID = obj['moon_texture_id']; } - }); + } break; case 'search_token': this.searchToken = String(val); break; case 'login-flags': let flags: LoginFlags = 0; - val.forEach((obj: any) => + for (const obj of val) { if (obj['ever_logged_in'] === 'Y') { @@ -233,18 +233,18 @@ export class LoginResponse { flags = flags | LoginFlags.gendered; } - }); + } this.loginFlags = flags; break; case 'buddy-list': - val.forEach((obj: any) => + for (const obj of val) { this.agent.buddyList.push({ buddyRightsGiven: obj['buddy_rights_given'] !== 0, buddyID: new UUID(obj['buddy_id']), buddyRightsHas: obj['buddy_rights_has'] !== 0, }); - }); + } break; case 'sim_port': this.region.circuit.port = parseInt(val, 10); @@ -256,13 +256,13 @@ export class LoginResponse this.agent.agentAppearanceService = val; break; case 'ui-config': - val.forEach((item: any) => + for (const item of val) { if (item['allow_first_life'] === 'Y') { this.agent.uiFlags.allowFirstLife = true; } - }); + } break; case 'look_at': try @@ -287,13 +287,13 @@ export class LoginResponse this.agent.agentFlags = parseInt(val, 10); break; case 'event_categories': - val.forEach((item: any) => + for (const item of val) { this.events.categories.push({ 'categoryID': parseInt(item['category_id'], 10), 'categoryName': String(item['category_name']) }); - }); + } break; case 'start_location': this.agent.startLocation = String(val); @@ -311,13 +311,13 @@ export class LoginResponse this.agent.home = LoginResponse.parseHome(val); break; case 'classified_categories': - val.forEach((item: any) => + for (const item of val) { this.classifieds.categories.push({ 'categoryID': parseInt(item['category_id'], 10), 'categoryName': String(item['category_name']) }); - }); + } break; case 'snapshot_config_url': this.agent.snapshotConfigURL = String(val); @@ -335,13 +335,13 @@ export class LoginResponse this.loginMessage = String(val); break; case 'gestures': - val.forEach((item: any) => + for (const item of val) { this.agent.gestures.push({ 'assetID': new UUID(item['asset_id']), 'itemID': new UUID(item['item_id']) }); - }); + } break; case 'udp_blacklist': const list = String(val).split(','); @@ -356,9 +356,8 @@ export class LoginResponse case 'first_name': this.agent.firstName = String(val).replace(/"/g, ''); break; - } - }); + } this.agent.setCurrentRegion(this.region); } } diff --git a/lib/classes/ObjectStoreFull.ts b/lib/classes/ObjectStoreFull.ts index 7014637..80a07f7 100644 --- a/lib/classes/ObjectStoreFull.ts +++ b/lib/classes/ObjectStoreFull.ts @@ -136,13 +136,13 @@ export class ObjectStoreFull extends ObjectStoreLite implements IObjectStore if (this.options & BotOptionFlags.StoreMyAttachmentsOnly) { - Object.keys(this.objectsByParent).forEach((objParentID: string) => + for (const objParentID of Object.keys(this.objectsByParent)) { const parent = parseInt(objParentID, 10); if (parent !== this.agent.localID) { let foundAvatars = false; - this.objectsByParent[parent].forEach((objID) => + for(const objID of this.objectsByParent[parent]) { if (this.objects[objID]) { @@ -152,7 +152,7 @@ export class ObjectStoreFull extends ObjectStoreLite implements IObjectStore foundAvatars = true; } } - }); + } if (this.objects[parent]) { const o = this.objects[parent]; @@ -166,7 +166,7 @@ export class ObjectStoreFull extends ObjectStoreLite implements IObjectStore this.deleteObject(parent); } } - }); + } } } this.objects[localID].extraParams = ExtraParams.from(objData.ExtraParams); diff --git a/lib/classes/ObjectStoreLite.ts b/lib/classes/ObjectStoreLite.ts index 30af79f..de7b42a 100644 --- a/lib/classes/ObjectStoreLite.ts +++ b/lib/classes/ObjectStoreLite.ts @@ -303,7 +303,7 @@ export class ObjectStoreLite implements IObjectStore protected objectUpdate(objectUpdate: ObjectUpdateMessage) { - objectUpdate.ObjectData.forEach((objData) => + for (const objData of objectUpdate.ObjectData) { const localID = objData.ID; const parentID = objData.ParentID; @@ -350,13 +350,13 @@ export class ObjectStoreLite implements IObjectStore if (this.options & BotOptionFlags.StoreMyAttachmentsOnly) { - Object.keys(this.objectsByParent).forEach((objParentID: string) => + for (const objParentID of Object.keys(this.objectsByParent)) { const parent = parseInt(objParentID, 10); if (parent !== this.agent.localID) { let foundAvatars = false; - this.objectsByParent[parent].forEach((objID) => + for (const objID of this.objectsByParent[parent]) { if (this.objects[objID]) { @@ -366,7 +366,7 @@ export class ObjectStoreLite implements IObjectStore foundAvatars = true; } } - }); + } if (this.objects[parent]) { const o = this.objects[parent]; @@ -380,7 +380,7 @@ export class ObjectStoreLite implements IObjectStore this.deleteObject(parent); } } - }); + } } } @@ -413,7 +413,7 @@ export class ObjectStoreLite implements IObjectStore { this.requestMissingObject(objData.ParentID); } - }); + } } protected notifyObjectUpdate(newObject: boolean, obj: GameObject) @@ -455,13 +455,13 @@ export class ObjectStoreLite implements IObjectStore SessionID: this.circuit.sessionID }; rmo.ObjectData = []; - objectUpdateCached.ObjectData.forEach((obj) => + for (const obj of objectUpdateCached.ObjectData) { rmo.ObjectData.push({ CacheMissType: 0, ID: obj.ID }); - }); + } this.circuit.sendMessage(rmo, 0); } @@ -618,14 +618,14 @@ export class ObjectStoreLite implements IObjectStore protected killObject(killObj: KillObjectMessage) { - killObj.ObjectData.forEach((obj) => + for (const obj of killObj.ObjectData) { const objectID = obj.ID; if (this.objects[objectID]) { this.deleteObject(objectID); } - }); + } } setPersist(persist: boolean): void @@ -698,13 +698,13 @@ export class ObjectStoreLite implements IObjectStore return []; } const result: GameObject[] = []; - list.forEach((localID) => + for (const localID of list) { if (this.objects[localID]) { result.push(this.objects[localID]); } - }); + } return result; } @@ -712,7 +712,7 @@ export class ObjectStoreLite implements IObjectStore { const nv: { [key: string]: NameValue } = {}; const lines = str.split('\n'); - lines.forEach((line) => + for (const line of lines) { if (line.length > 0) { @@ -735,7 +735,7 @@ export class ObjectStoreLite implements IObjectStore nv[kv[0]] = namevalue; } } - }); + } return nv; } diff --git a/lib/classes/commands/AgentCommands.ts b/lib/classes/commands/AgentCommands.ts index 7f58d67..6ab1e58 100644 --- a/lib/classes/commands/AgentCommands.ts +++ b/lib/classes/commands/AgentCommands.ts @@ -24,13 +24,13 @@ export class AgentCommands extends CommandsBase }; animPacket.PhysicalAvatarEventList = []; animPacket.AnimationList = []; - anim.forEach((a) => + for (const a of anim) { animPacket.AnimationList.push({ AnimID: a, StartAnim: run }); - }); + } return await circuit.waitForAck(circuit.sendMessage(animPacket, PacketFlags.Reliable), 10000); } diff --git a/lib/classes/commands/GridCommands.ts b/lib/classes/commands/GridCommands.ts index 5b3ad52..011771a 100644 --- a/lib/classes/commands/GridCommands.ts +++ b/lib/classes/commands/GridCommands.ts @@ -46,14 +46,14 @@ export class GridCommands extends CommandsBase circuit.waitForMessage(Message.MapBlockReply, 10000, (filterMsg: MapBlockReplyMessage): FilterResponse => { let found = false; - filterMsg.Data.forEach((region) => + for (const region of filterMsg.Data) { const name = Utils.BufferToStringSimple(region.Name); if (name.trim().toLowerCase() === regionName.trim().toLowerCase()) { found = true; } - }); + } if (found) { return FilterResponse.Finish; @@ -61,7 +61,7 @@ export class GridCommands extends CommandsBase return FilterResponse.NoMatch; }).then((responseMsg: MapBlockReplyMessage) => { - responseMsg.Data.forEach((region) => + for (const region of responseMsg.Data) { const name = Utils.BufferToStringSimple(region.Name); if (name.trim().toLowerCase() === regionName.trim().toLowerCase() && !(region.X === 0 && region.Y === 0)) @@ -80,7 +80,7 @@ export class GridCommands extends CommandsBase }; resolve(reply); } - }); + } }).catch((err) => { reject(err); @@ -111,13 +111,13 @@ export class GridCommands extends CommandsBase circuit.waitForMessage(Message.MapBlockReply, 10000, (filterMsg: MapBlockReplyMessage): FilterResponse => { let found = false; - filterMsg.Data.forEach((data) => + for (const data of filterMsg.Data) { if (data.X === gridX && data.Y === gridY) { found = true; } - }); + } if (found) { return FilterResponse.Finish; @@ -125,7 +125,7 @@ export class GridCommands extends CommandsBase return FilterResponse.NoMatch; }).then((responseMsg: MapBlockReplyMessage) => { - responseMsg.Data.forEach((data) => + for (const data of responseMsg.Data) { if (data.X === gridX && data.Y === gridY) { @@ -134,7 +134,7 @@ export class GridCommands extends CommandsBase response.block.accessFlags = data.Access; response.block.mapImage = data.MapImageID; } - }); + } // Now get the region handle const regionHandle: Long = Utils.RegionCoordinatesToHandle(gridX * 256, gridY * 256).regionHandle; @@ -160,14 +160,14 @@ export class GridCommands extends CommandsBase circuit.waitForMessage(Message.MapItemReply, 10000, (filterMsg: MapItemReplyMessage): FilterResponse => { let found = false; - filterMsg.Data.forEach((data) => + for (const data of filterMsg.Data) { // Check if avatar is within our bounds if (data.X >= minX && data.X <= maxX && data.Y >= minY && data.Y <= maxY) { found = true; } - }); + } if (found) { return FilterResponse.Finish; @@ -178,7 +178,7 @@ export class GridCommands extends CommandsBase } }).then((responseMsg2: MapItemReplyMessage) => { - responseMsg2.Data.forEach((data) => + for (const data of responseMsg2.Data) { for (let index = 0; index <= data.Extra; index++) { response.avatars.push(new Vector2([ @@ -186,7 +186,7 @@ export class GridCommands extends CommandsBase data.Y ])); } - }); + } resolve(response); }).catch((err) => { @@ -224,7 +224,7 @@ export class GridCommands extends CommandsBase circuit.waitForMessage(Message.MapBlockReply, 30000, (filterMsg: MapBlockReplyMessage): FilterResponse => { let found = false; - filterMsg.Data.forEach((data) => + for (const data of filterMsg.Data) { if (data.X >= minX && data.X <= maxX && data.Y >= minY && data.Y <= maxY) { @@ -239,7 +239,7 @@ export class GridCommands extends CommandsBase mapBlock.regionFlags = data.RegionFlags; response.regions.push(mapBlock); } - }); + } if (found) { return FilterResponse.Match; @@ -299,7 +299,7 @@ export class GridCommands extends CommandsBase { let foundKey: UUID | undefined; let foundName: string | undefined; - apr.Data.forEach((dataBlock) => + for (const dataBlock of apr.Data) { const resultName = (Utils.BufferToStringSimple(dataBlock.FirstName) + ' ' + Utils.BufferToStringSimple(dataBlock.LastName)); @@ -308,7 +308,7 @@ export class GridCommands extends CommandsBase foundKey = dataBlock.AvatarID; foundName = resultName; } - }); + } if (foundKey !== undefined && foundName !== undefined) { @@ -364,7 +364,7 @@ export class GridCommands extends CommandsBase }).then((apr: AvatarPickerReplyMessage) => { let found: UUID | null = null; - apr.Data.forEach((dataBlock) => + for (const dataBlock of apr.Data) { const resultName = (Utils.BufferToStringSimple(dataBlock.FirstName) + ' ' + Utils.BufferToStringSimple(dataBlock.LastName)).toLowerCase(); @@ -372,7 +372,7 @@ export class GridCommands extends CommandsBase { found = dataBlock.AvatarID; } - }); + } if (found !== null) { diff --git a/lib/classes/commands/GroupCommands.ts b/lib/classes/commands/GroupCommands.ts index 50a9fa4..3029027 100644 --- a/lib/classes/commands/GroupCommands.ts +++ b/lib/classes/commands/GroupCommands.ts @@ -75,7 +75,7 @@ export class GroupCommands extends CommandsBase GroupID: groupID }; igr.InviteData = []; - sendTo.forEach((to) => + for (const to of sendTo) { if (typeof to.avatarID === 'string') { @@ -93,7 +93,7 @@ export class GroupCommands extends CommandsBase InviteeID: to.avatarID, RoleID: to.roleID }); - }); + } const sequenceNo = this.circuit.sendMessage(igr, PacketFlags.Reliable); return await this.circuit.waitForAck(sequenceNo, 10000); @@ -314,7 +314,7 @@ export class GroupCommands extends CommandsBase if (gmr.GroupData.RequestID.toString() === requestID.toString()) { totalRoleCount = gmr.GroupData.RoleCount; - gmr.RoleData.forEach((role) => + for (const role of gmr.RoleData) { const gr = new GroupRole(); gr.RoleID = role.RoleID; @@ -324,7 +324,7 @@ export class GroupCommands extends CommandsBase gr.Powers = role.Powers; gr.Members = role.Members; result.push(gr); - }); + } if (totalRoleCount > result.length) { return FilterResponse.Match; diff --git a/lib/classes/messages/AgentAnimation.ts b/lib/classes/messages/AgentAnimation.ts index cb06e74..3cf6776 100644 --- a/lib/classes/messages/AgentAnimation.ts +++ b/lib/classes/messages/AgentAnimation.ts @@ -28,13 +28,13 @@ export class AgentAnimationMessage implements MessageBase return ((17) * this.AnimationList.length) + this.calculateVarVarSize(this.PhysicalAvatarEventList, 'TypeData', 1) + 34; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/AgentCachedTextureResponse.ts b/lib/classes/messages/AgentCachedTextureResponse.ts index a7e6b6a..6e64f4e 100644 --- a/lib/classes/messages/AgentCachedTextureResponse.ts +++ b/lib/classes/messages/AgentCachedTextureResponse.ts @@ -27,13 +27,13 @@ export class AgentCachedTextureResponseMessage implements MessageBase return this.calculateVarVarSize(this.WearableData, 'HostName', 1) + ((17) * this.WearableData.length) + 37; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/AgentGroupDataUpdate.ts b/lib/classes/messages/AgentGroupDataUpdate.ts index 69890ea..adca9e7 100644 --- a/lib/classes/messages/AgentGroupDataUpdate.ts +++ b/lib/classes/messages/AgentGroupDataUpdate.ts @@ -29,13 +29,13 @@ export class AgentGroupDataUpdateMessage implements MessageBase return this.calculateVarVarSize(this.GroupData, 'GroupName', 1) + ((45) * this.GroupData.length) + 17; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/AlertMessage.ts b/lib/classes/messages/AlertMessage.ts index 2dd6139..bb3fd71 100644 --- a/lib/classes/messages/AlertMessage.ts +++ b/lib/classes/messages/AlertMessage.ts @@ -27,13 +27,13 @@ export class AlertMessageMessage implements MessageBase return (this.AlertData['Message'].length + 1) + this.calculateVarVarSize(this.AlertInfo, 'Message', 1) + this.calculateVarVarSize(this.AlertInfo, 'ExtraParams', 1) + ((16) * this.AgentInfo.length) + 2; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/AvatarAnimation.ts b/lib/classes/messages/AvatarAnimation.ts index f2cec99..3ce9bdb 100644 --- a/lib/classes/messages/AvatarAnimation.ts +++ b/lib/classes/messages/AvatarAnimation.ts @@ -30,13 +30,13 @@ export class AvatarAnimationMessage implements MessageBase return ((20) * this.AnimationList.length) + ((16) * this.AnimationSourceList.length) + this.calculateVarVarSize(this.PhysicalAvatarEventList, 'TypeData', 1) + 19; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/AvatarClassifiedReply.ts b/lib/classes/messages/AvatarClassifiedReply.ts index cd85f7d..352c241 100644 --- a/lib/classes/messages/AvatarClassifiedReply.ts +++ b/lib/classes/messages/AvatarClassifiedReply.ts @@ -25,13 +25,13 @@ export class AvatarClassifiedReplyMessage implements MessageBase return this.calculateVarVarSize(this.Data, 'Name', 1) + ((16) * this.Data.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/AvatarGroupsReply.ts b/lib/classes/messages/AvatarGroupsReply.ts index a309ec5..bb2533e 100644 --- a/lib/classes/messages/AvatarGroupsReply.ts +++ b/lib/classes/messages/AvatarGroupsReply.ts @@ -33,13 +33,13 @@ export class AvatarGroupsReplyMessage implements MessageBase return this.calculateVarVarSize(this.GroupData, 'GroupTitle', 1) + this.calculateVarVarSize(this.GroupData, 'GroupName', 1) + ((41) * this.GroupData.length) + 34; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/AvatarPickerReply.ts b/lib/classes/messages/AvatarPickerReply.ts index 2d27723..ff4cc94 100644 --- a/lib/classes/messages/AvatarPickerReply.ts +++ b/lib/classes/messages/AvatarPickerReply.ts @@ -26,13 +26,13 @@ export class AvatarPickerReplyMessage implements MessageBase return this.calculateVarVarSize(this.Data, 'FirstName', 1) + this.calculateVarVarSize(this.Data, 'LastName', 1) + ((16) * this.Data.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/AvatarPicksReply.ts b/lib/classes/messages/AvatarPicksReply.ts index 1d3eb9e..3385600 100644 --- a/lib/classes/messages/AvatarPicksReply.ts +++ b/lib/classes/messages/AvatarPicksReply.ts @@ -25,13 +25,13 @@ export class AvatarPicksReplyMessage implements MessageBase return this.calculateVarVarSize(this.Data, 'PickName', 1) + ((16) * this.Data.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/AvatarTextureUpdate.ts b/lib/classes/messages/AvatarTextureUpdate.ts index d066ab6..d0db9b2 100644 --- a/lib/classes/messages/AvatarTextureUpdate.ts +++ b/lib/classes/messages/AvatarTextureUpdate.ts @@ -29,13 +29,13 @@ export class AvatarTextureUpdateMessage implements MessageBase return this.calculateVarVarSize(this.WearableData, 'HostName', 1) + ((17) * this.WearableData.length) + ((16) * this.TextureData.length) + 19; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/BulkUpdateInventory.ts b/lib/classes/messages/BulkUpdateInventory.ts index d337880..b486b83 100644 --- a/lib/classes/messages/BulkUpdateInventory.ts +++ b/lib/classes/messages/BulkUpdateInventory.ts @@ -51,13 +51,13 @@ export class BulkUpdateInventoryMessage implements MessageBase return this.calculateVarVarSize(this.FolderData, 'Name', 1) + ((33) * this.FolderData.length) + this.calculateVarVarSize(this.ItemData, 'Name', 1) + this.calculateVarVarSize(this.ItemData, 'Description', 1) + ((140) * this.ItemData.length) + 34; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ChildAgentUpdate.ts b/lib/classes/messages/ChildAgentUpdate.ts index b99a27e..f54893e 100644 --- a/lib/classes/messages/ChildAgentUpdate.ts +++ b/lib/classes/messages/ChildAgentUpdate.ts @@ -76,13 +76,13 @@ export class ChildAgentUpdateMessage implements MessageBase return (this.AgentData['Throttles'].length + 1 + this.AgentData['AgentTextures'].length + 2) + ((25) * this.GroupData.length) + ((32) * this.AnimationData.length) + ((16) * this.GranterBlock.length) + this.calculateVarVarSize(this.NVPairData, 'NVPairs', 2) + ((1) * this.VisualParam.length) + ((2) * this.AgentAccess.length) + ((4) * this.AgentInfo.length) + this.calculateVarVarSize(this.AgentInventoryHost, 'InventoryHost', 1) + 216; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/CopyInventoryItem.ts b/lib/classes/messages/CopyInventoryItem.ts index dfeb5f9..a0a74ee 100644 --- a/lib/classes/messages/CopyInventoryItem.ts +++ b/lib/classes/messages/CopyInventoryItem.ts @@ -28,13 +28,13 @@ export class CopyInventoryItemMessage implements MessageBase return this.calculateVarVarSize(this.InventoryData, 'NewName', 1) + ((52) * this.InventoryData.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/DirClassifiedReply.ts b/lib/classes/messages/DirClassifiedReply.ts index ec50592..a01d1c7 100644 --- a/lib/classes/messages/DirClassifiedReply.ts +++ b/lib/classes/messages/DirClassifiedReply.ts @@ -34,13 +34,13 @@ export class DirClassifiedReplyMessage implements MessageBase return this.calculateVarVarSize(this.QueryReplies, 'Name', 1) + ((29) * this.QueryReplies.length) + ((4) * this.StatusData.length) + 34; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/DirEventsReply.ts b/lib/classes/messages/DirEventsReply.ts index 248b190..63a4631 100644 --- a/lib/classes/messages/DirEventsReply.ts +++ b/lib/classes/messages/DirEventsReply.ts @@ -34,13 +34,13 @@ export class DirEventsReplyMessage implements MessageBase return this.calculateVarVarSize(this.QueryReplies, 'Name', 1) + this.calculateVarVarSize(this.QueryReplies, 'Date', 1) + ((28) * this.QueryReplies.length) + ((4) * this.StatusData.length) + 34; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/DirGroupsReply.ts b/lib/classes/messages/DirGroupsReply.ts index 0ee5c50..18b0b60 100644 --- a/lib/classes/messages/DirGroupsReply.ts +++ b/lib/classes/messages/DirGroupsReply.ts @@ -29,13 +29,13 @@ export class DirGroupsReplyMessage implements MessageBase return this.calculateVarVarSize(this.QueryReplies, 'GroupName', 1) + ((24) * this.QueryReplies.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/DirLandReply.ts b/lib/classes/messages/DirLandReply.ts index b80777e..2363c20 100644 --- a/lib/classes/messages/DirLandReply.ts +++ b/lib/classes/messages/DirLandReply.ts @@ -31,13 +31,13 @@ export class DirLandReplyMessage implements MessageBase return this.calculateVarVarSize(this.QueryReplies, 'Name', 1) + ((26) * this.QueryReplies.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/DirPeopleReply.ts b/lib/classes/messages/DirPeopleReply.ts index 55f0661..115c619 100644 --- a/lib/classes/messages/DirPeopleReply.ts +++ b/lib/classes/messages/DirPeopleReply.ts @@ -31,13 +31,13 @@ export class DirPeopleReplyMessage implements MessageBase return this.calculateVarVarSize(this.QueryReplies, 'FirstName', 1) + this.calculateVarVarSize(this.QueryReplies, 'LastName', 1) + this.calculateVarVarSize(this.QueryReplies, 'Group', 1) + ((21) * this.QueryReplies.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/DirPlacesReply.ts b/lib/classes/messages/DirPlacesReply.ts index 65c2201..1b7d6e8 100644 --- a/lib/classes/messages/DirPlacesReply.ts +++ b/lib/classes/messages/DirPlacesReply.ts @@ -33,13 +33,13 @@ export class DirPlacesReplyMessage implements MessageBase return ((16) * this.QueryData.length) + this.calculateVarVarSize(this.QueryReplies, 'Name', 1) + ((22) * this.QueryReplies.length) + ((4) * this.StatusData.length) + 19; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/DirPopularReply.ts b/lib/classes/messages/DirPopularReply.ts index 7c965d9..c1bed48 100644 --- a/lib/classes/messages/DirPopularReply.ts +++ b/lib/classes/messages/DirPopularReply.ts @@ -28,13 +28,13 @@ export class DirPopularReplyMessage implements MessageBase return this.calculateVarVarSize(this.QueryReplies, 'Name', 1) + ((20) * this.QueryReplies.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/EstateOwnerMessage.ts b/lib/classes/messages/EstateOwnerMessage.ts index b03f017..2ab24c8 100644 --- a/lib/classes/messages/EstateOwnerMessage.ts +++ b/lib/classes/messages/EstateOwnerMessage.ts @@ -29,13 +29,13 @@ export class EstateOwnerMessageMessage implements MessageBase return (this.MethodData['Method'].length + 1) + this.calculateVarVarSize(this.ParamList, 'Parameter', 1) + 65; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/FetchInventoryReply.ts b/lib/classes/messages/FetchInventoryReply.ts index 05381fe..86a17ff 100644 --- a/lib/classes/messages/FetchInventoryReply.ts +++ b/lib/classes/messages/FetchInventoryReply.ts @@ -43,13 +43,13 @@ export class FetchInventoryReplyMessage implements MessageBase return this.calculateVarVarSize(this.InventoryData, 'Name', 1) + this.calculateVarVarSize(this.InventoryData, 'Description', 1) + ((136) * this.InventoryData.length) + 17; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GenericMessage.ts b/lib/classes/messages/GenericMessage.ts index ff21e2a..a7b0f2f 100644 --- a/lib/classes/messages/GenericMessage.ts +++ b/lib/classes/messages/GenericMessage.ts @@ -29,13 +29,13 @@ export class GenericMessageMessage implements MessageBase return (this.MethodData['Method'].length + 1) + this.calculateVarVarSize(this.ParamList, 'Parameter', 1) + 65; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GodlikeMessage.ts b/lib/classes/messages/GodlikeMessage.ts index 607234a..743949d 100644 --- a/lib/classes/messages/GodlikeMessage.ts +++ b/lib/classes/messages/GodlikeMessage.ts @@ -29,13 +29,13 @@ export class GodlikeMessageMessage implements MessageBase return (this.MethodData['Method'].length + 1) + this.calculateVarVarSize(this.ParamList, 'Parameter', 1) + 65; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupAccountDetailsReply.ts b/lib/classes/messages/GroupAccountDetailsReply.ts index eb987a2..4f27eb5 100644 --- a/lib/classes/messages/GroupAccountDetailsReply.ts +++ b/lib/classes/messages/GroupAccountDetailsReply.ts @@ -31,13 +31,13 @@ export class GroupAccountDetailsReplyMessage implements MessageBase return (this.MoneyData['StartDate'].length + 1) + this.calculateVarVarSize(this.HistoryData, 'Description', 1) + ((4) * this.HistoryData.length) + 57; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupAccountTransactionsReply.ts b/lib/classes/messages/GroupAccountTransactionsReply.ts index cd1b626..48b7d2f 100644 --- a/lib/classes/messages/GroupAccountTransactionsReply.ts +++ b/lib/classes/messages/GroupAccountTransactionsReply.ts @@ -34,13 +34,13 @@ export class GroupAccountTransactionsReplyMessage implements MessageBase return (this.MoneyData['StartDate'].length + 1) + this.calculateVarVarSize(this.HistoryData, 'Time', 1) + this.calculateVarVarSize(this.HistoryData, 'User', 1) + this.calculateVarVarSize(this.HistoryData, 'Item', 1) + ((8) * this.HistoryData.length) + 57; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupActiveProposalItemReply.ts b/lib/classes/messages/GroupActiveProposalItemReply.ts index b6ff267..7e1aadd 100644 --- a/lib/classes/messages/GroupActiveProposalItemReply.ts +++ b/lib/classes/messages/GroupActiveProposalItemReply.ts @@ -37,13 +37,13 @@ export class GroupActiveProposalItemReplyMessage implements MessageBase return this.calculateVarVarSize(this.ProposalData, 'TerseDateID', 1) + this.calculateVarVarSize(this.ProposalData, 'StartDateTime', 1) + this.calculateVarVarSize(this.ProposalData, 'EndDateTime', 1) + this.calculateVarVarSize(this.ProposalData, 'VoteCast', 1) + this.calculateVarVarSize(this.ProposalData, 'ProposalText', 1) + ((41) * this.ProposalData.length) + 53; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupDataUpdate.ts b/lib/classes/messages/GroupDataUpdate.ts index 2e8a099..8b8dff2 100644 --- a/lib/classes/messages/GroupDataUpdate.ts +++ b/lib/classes/messages/GroupDataUpdate.ts @@ -24,13 +24,13 @@ export class GroupDataUpdateMessage implements MessageBase return this.calculateVarVarSize(this.AgentGroupData, 'GroupTitle', 1) + ((40) * this.AgentGroupData.length) + 1; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupMembersReply.ts b/lib/classes/messages/GroupMembersReply.ts index c50565c..465b7b5 100644 --- a/lib/classes/messages/GroupMembersReply.ts +++ b/lib/classes/messages/GroupMembersReply.ts @@ -34,13 +34,13 @@ export class GroupMembersReplyMessage implements MessageBase return this.calculateVarVarSize(this.MemberData, 'OnlineStatus', 1) + this.calculateVarVarSize(this.MemberData, 'Title', 1) + ((29) * this.MemberData.length) + 53; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupNoticesListReply.ts b/lib/classes/messages/GroupNoticesListReply.ts index 0ac1c9e..29fe302 100644 --- a/lib/classes/messages/GroupNoticesListReply.ts +++ b/lib/classes/messages/GroupNoticesListReply.ts @@ -29,13 +29,13 @@ export class GroupNoticesListReplyMessage implements MessageBase return this.calculateVarVarSize(this.Data, 'FromName', 2) + this.calculateVarVarSize(this.Data, 'Subject', 2) + ((22) * this.Data.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupRoleDataReply.ts b/lib/classes/messages/GroupRoleDataReply.ts index 24b822d..6580e09 100644 --- a/lib/classes/messages/GroupRoleDataReply.ts +++ b/lib/classes/messages/GroupRoleDataReply.ts @@ -34,13 +34,13 @@ export class GroupRoleDataReplyMessage implements MessageBase return this.calculateVarVarSize(this.RoleData, 'Name', 1) + this.calculateVarVarSize(this.RoleData, 'Title', 1) + this.calculateVarVarSize(this.RoleData, 'Description', 1) + ((28) * this.RoleData.length) + 53; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupRoleUpdate.ts b/lib/classes/messages/GroupRoleUpdate.ts index 65cbc0f..aaa48d0 100644 --- a/lib/classes/messages/GroupRoleUpdate.ts +++ b/lib/classes/messages/GroupRoleUpdate.ts @@ -31,13 +31,13 @@ export class GroupRoleUpdateMessage implements MessageBase return this.calculateVarVarSize(this.RoleData, 'Name', 1) + this.calculateVarVarSize(this.RoleData, 'Description', 1) + this.calculateVarVarSize(this.RoleData, 'Title', 1) + ((25) * this.RoleData.length) + 49; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupTitlesReply.ts b/lib/classes/messages/GroupTitlesReply.ts index b3766f7..b0f9a6f 100644 --- a/lib/classes/messages/GroupTitlesReply.ts +++ b/lib/classes/messages/GroupTitlesReply.ts @@ -27,13 +27,13 @@ export class GroupTitlesReplyMessage implements MessageBase return this.calculateVarVarSize(this.GroupData, 'Title', 1) + ((17) * this.GroupData.length) + 49; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/GroupVoteHistoryItemReply.ts b/lib/classes/messages/GroupVoteHistoryItemReply.ts index d04fa0f..3979219 100644 --- a/lib/classes/messages/GroupVoteHistoryItemReply.ts +++ b/lib/classes/messages/GroupVoteHistoryItemReply.ts @@ -42,13 +42,13 @@ export class GroupVoteHistoryItemReplyMessage implements MessageBase return (this.HistoryItemData['TerseDateID'].length + 1 + this.HistoryItemData['StartDateTime'].length + 1 + this.HistoryItemData['EndDateTime'].length + 1 + this.HistoryItemData['VoteType'].length + 1 + this.HistoryItemData['VoteResult'].length + 1 + this.HistoryItemData['ProposalText'].length + 2) + this.calculateVarVarSize(this.VoteItem, 'VoteCast', 1) + ((20) * this.VoteItem.length) + 93; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ImprovedTerseObjectUpdate.ts b/lib/classes/messages/ImprovedTerseObjectUpdate.ts index 714fa7a..ee4a5d7 100644 --- a/lib/classes/messages/ImprovedTerseObjectUpdate.ts +++ b/lib/classes/messages/ImprovedTerseObjectUpdate.ts @@ -25,13 +25,13 @@ export class ImprovedTerseObjectUpdateMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'Data', 1) + this.calculateVarVarSize(this.ObjectData, 'TextureEntry', 2) + 11; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/InventoryDescendents.ts b/lib/classes/messages/InventoryDescendents.ts index b23789d..17abb8f 100644 --- a/lib/classes/messages/InventoryDescendents.ts +++ b/lib/classes/messages/InventoryDescendents.ts @@ -53,13 +53,13 @@ export class InventoryDescendentsMessage implements MessageBase return this.calculateVarVarSize(this.FolderData, 'Name', 1) + ((33) * this.FolderData.length) + this.calculateVarVarSize(this.ItemData, 'Name', 1) + this.calculateVarVarSize(this.ItemData, 'Description', 1) + ((136) * this.ItemData.length) + 58; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/LandStatReply.ts b/lib/classes/messages/LandStatReply.ts index 4ed070f..78eea08 100644 --- a/lib/classes/messages/LandStatReply.ts +++ b/lib/classes/messages/LandStatReply.ts @@ -32,13 +32,13 @@ export class LandStatReplyMessage implements MessageBase return this.calculateVarVarSize(this.ReportData, 'TaskName', 1) + this.calculateVarVarSize(this.ReportData, 'OwnerName', 1) + ((36) * this.ReportData.length) + 13; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/LogTextMessage.ts b/lib/classes/messages/LogTextMessage.ts index 9306b6b..e57296f 100644 --- a/lib/classes/messages/LogTextMessage.ts +++ b/lib/classes/messages/LogTextMessage.ts @@ -25,13 +25,13 @@ export class LogTextMessageMessage implements MessageBase return this.calculateVarVarSize(this.DataBlock, 'Message', 2) + ((52) * this.DataBlock.length) + 1; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/MapBlockReply.ts b/lib/classes/messages/MapBlockReply.ts index bdd6c04..c825be8 100644 --- a/lib/classes/messages/MapBlockReply.ts +++ b/lib/classes/messages/MapBlockReply.ts @@ -31,13 +31,13 @@ export class MapBlockReplyMessage implements MessageBase return this.calculateVarVarSize(this.Data, 'Name', 1) + ((27) * this.Data.length) + 21; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/MapItemReply.ts b/lib/classes/messages/MapItemReply.ts index 9637bc0..ce32378 100644 --- a/lib/classes/messages/MapItemReply.ts +++ b/lib/classes/messages/MapItemReply.ts @@ -32,13 +32,13 @@ export class MapItemReplyMessage implements MessageBase return this.calculateVarVarSize(this.Data, 'Name', 1) + ((32) * this.Data.length) + 25; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/MoveInventoryItem.ts b/lib/classes/messages/MoveInventoryItem.ts index ada8ef4..c4ce833 100644 --- a/lib/classes/messages/MoveInventoryItem.ts +++ b/lib/classes/messages/MoveInventoryItem.ts @@ -27,13 +27,13 @@ export class MoveInventoryItemMessage implements MessageBase return this.calculateVarVarSize(this.InventoryData, 'NewName', 1) + ((32) * this.InventoryData.length) + 34; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/MultipleObjectUpdate.ts b/lib/classes/messages/MultipleObjectUpdate.ts index 73f0c0c..523f434 100644 --- a/lib/classes/messages/MultipleObjectUpdate.ts +++ b/lib/classes/messages/MultipleObjectUpdate.ts @@ -26,13 +26,13 @@ export class MultipleObjectUpdateMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'Data', 1) + ((5) * this.ObjectData.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/NameValuePair.ts b/lib/classes/messages/NameValuePair.ts index 92e60ac..86f97f7 100644 --- a/lib/classes/messages/NameValuePair.ts +++ b/lib/classes/messages/NameValuePair.ts @@ -23,13 +23,13 @@ export class NameValuePairMessage implements MessageBase return this.calculateVarVarSize(this.NameValueData, 'NVPair', 2) + 17; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/NeighborList.ts b/lib/classes/messages/NeighborList.ts index c3379fd..3f8604c 100644 --- a/lib/classes/messages/NeighborList.ts +++ b/lib/classes/messages/NeighborList.ts @@ -27,13 +27,13 @@ export class NeighborListMessage implements MessageBase return this.calculateVarVarSize(this.NeighborBlock, 'Name', 1) + 116; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ObjectDescription.ts b/lib/classes/messages/ObjectDescription.ts index bc149a9..9f2d97d 100644 --- a/lib/classes/messages/ObjectDescription.ts +++ b/lib/classes/messages/ObjectDescription.ts @@ -25,13 +25,13 @@ export class ObjectDescriptionMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'Description', 1) + ((4) * this.ObjectData.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ObjectExtraParams.ts b/lib/classes/messages/ObjectExtraParams.ts index 511b184..fdb8374 100644 --- a/lib/classes/messages/ObjectExtraParams.ts +++ b/lib/classes/messages/ObjectExtraParams.ts @@ -28,13 +28,13 @@ export class ObjectExtraParamsMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'ParamData', 1) + ((11) * this.ObjectData.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ObjectImage.ts b/lib/classes/messages/ObjectImage.ts index 331358d..f2ab59a 100644 --- a/lib/classes/messages/ObjectImage.ts +++ b/lib/classes/messages/ObjectImage.ts @@ -26,13 +26,13 @@ export class ObjectImageMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'MediaURL', 1) + this.calculateVarVarSize(this.ObjectData, 'TextureEntry', 2) + ((4) * this.ObjectData.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ObjectName.ts b/lib/classes/messages/ObjectName.ts index 9132716..6be711e 100644 --- a/lib/classes/messages/ObjectName.ts +++ b/lib/classes/messages/ObjectName.ts @@ -25,13 +25,13 @@ export class ObjectNameMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'Name', 1) + ((4) * this.ObjectData.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ObjectProperties.ts b/lib/classes/messages/ObjectProperties.ts index 15efdec..13bf783 100644 --- a/lib/classes/messages/ObjectProperties.ts +++ b/lib/classes/messages/ObjectProperties.ts @@ -47,13 +47,13 @@ export class ObjectPropertiesMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'Name', 1) + this.calculateVarVarSize(this.ObjectData, 'Description', 1) + this.calculateVarVarSize(this.ObjectData, 'TouchName', 1) + this.calculateVarVarSize(this.ObjectData, 'SitName', 1) + this.calculateVarVarSize(this.ObjectData, 'TextureID', 1) + ((174) * this.ObjectData.length) + 1; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ObjectUpdate.ts b/lib/classes/messages/ObjectUpdate.ts index 8e1611b..a3b9ce0 100644 --- a/lib/classes/messages/ObjectUpdate.ts +++ b/lib/classes/messages/ObjectUpdate.ts @@ -71,13 +71,13 @@ export class ObjectUpdateMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'ObjectData', 1) + this.calculateVarVarSize(this.ObjectData, 'TextureEntry', 2) + this.calculateVarVarSize(this.ObjectData, 'TextureAnim', 1) + this.calculateVarVarSize(this.ObjectData, 'NameValue', 2) + this.calculateVarVarSize(this.ObjectData, 'Data', 2) + this.calculateVarVarSize(this.ObjectData, 'Text', 1) + this.calculateVarVarSize(this.ObjectData, 'MediaURL', 1) + this.calculateVarVarSize(this.ObjectData, 'PSBlock', 1) + this.calculateVarVarSize(this.ObjectData, 'ExtraParams', 1) + ((141) * this.ObjectData.length) + 11; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ObjectUpdateCompressed.ts b/lib/classes/messages/ObjectUpdateCompressed.ts index 0638b63..1dde4f7 100644 --- a/lib/classes/messages/ObjectUpdateCompressed.ts +++ b/lib/classes/messages/ObjectUpdateCompressed.ts @@ -25,13 +25,13 @@ export class ObjectUpdateCompressedMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'Data', 2) + ((4) * this.ObjectData.length) + 11; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ParcelRename.ts b/lib/classes/messages/ParcelRename.ts index f2d5779..36d7580 100644 --- a/lib/classes/messages/ParcelRename.ts +++ b/lib/classes/messages/ParcelRename.ts @@ -21,13 +21,13 @@ export class ParcelRenameMessage implements MessageBase return this.calculateVarVarSize(this.ParcelData, 'NewName', 1) + ((16) * this.ParcelData.length) + 1; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/PlacesReply.ts b/lib/classes/messages/PlacesReply.ts index eb53c37..7cb8b81 100644 --- a/lib/classes/messages/PlacesReply.ts +++ b/lib/classes/messages/PlacesReply.ts @@ -39,13 +39,13 @@ export class PlacesReplyMessage implements MessageBase return this.calculateVarVarSize(this.QueryData, 'Name', 1) + this.calculateVarVarSize(this.QueryData, 'Desc', 1) + this.calculateVarVarSize(this.QueryData, 'SimName', 1) + ((61) * this.QueryData.length) + 49; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/RegionPresenceResponse.ts b/lib/classes/messages/RegionPresenceResponse.ts index f5f7983..4fe825f 100644 --- a/lib/classes/messages/RegionPresenceResponse.ts +++ b/lib/classes/messages/RegionPresenceResponse.ts @@ -28,13 +28,13 @@ export class RegionPresenceResponseMessage implements MessageBase return this.calculateVarVarSize(this.RegionData, 'Message', 1) + ((42) * this.RegionData.length) + 1; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/RemoveNameValuePair.ts b/lib/classes/messages/RemoveNameValuePair.ts index fcf6511..52ceb56 100644 --- a/lib/classes/messages/RemoveNameValuePair.ts +++ b/lib/classes/messages/RemoveNameValuePair.ts @@ -23,13 +23,13 @@ export class RemoveNameValuePairMessage implements MessageBase return this.calculateVarVarSize(this.NameValueData, 'NVPair', 2) + 17; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/RezMultipleAttachmentsFromInv.ts b/lib/classes/messages/RezMultipleAttachmentsFromInv.ts index 896d96f..be8f402 100644 --- a/lib/classes/messages/RezMultipleAttachmentsFromInv.ts +++ b/lib/classes/messages/RezMultipleAttachmentsFromInv.ts @@ -37,13 +37,13 @@ export class RezMultipleAttachmentsFromInvMessage implements MessageBase return this.calculateVarVarSize(this.ObjectData, 'Name', 1) + this.calculateVarVarSize(this.ObjectData, 'Description', 1) + ((49) * this.ObjectData.length) + 51; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ScriptDataReply.ts b/lib/classes/messages/ScriptDataReply.ts index 6cde431..af3566c 100644 --- a/lib/classes/messages/ScriptDataReply.ts +++ b/lib/classes/messages/ScriptDataReply.ts @@ -21,13 +21,13 @@ export class ScriptDataReplyMessage implements MessageBase return this.calculateVarVarSize(this.DataBlock, 'Reply', 2) + ((8) * this.DataBlock.length) + 1; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ScriptDataRequest.ts b/lib/classes/messages/ScriptDataRequest.ts index decfe78..08379b0 100644 --- a/lib/classes/messages/ScriptDataRequest.ts +++ b/lib/classes/messages/ScriptDataRequest.ts @@ -22,13 +22,13 @@ export class ScriptDataRequestMessage implements MessageBase return this.calculateVarVarSize(this.DataBlock, 'Request', 2) + ((9) * this.DataBlock.length) + 1; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ScriptDialog.ts b/lib/classes/messages/ScriptDialog.ts index 65df670..dfd6483 100644 --- a/lib/classes/messages/ScriptDialog.ts +++ b/lib/classes/messages/ScriptDialog.ts @@ -32,13 +32,13 @@ export class ScriptDialogMessage implements MessageBase return (this.Data['FirstName'].length + 1 + this.Data['LastName'].length + 1 + this.Data['ObjectName'].length + 1 + this.Data['Message'].length + 2) + this.calculateVarVarSize(this.Buttons, 'ButtonLabel', 1) + ((16) * this.OwnerData.length) + 38; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ScriptSensorReply.ts b/lib/classes/messages/ScriptSensorReply.ts index 711d885..c3b9975 100644 --- a/lib/classes/messages/ScriptSensorReply.ts +++ b/lib/classes/messages/ScriptSensorReply.ts @@ -33,13 +33,13 @@ export class ScriptSensorReplyMessage implements MessageBase return this.calculateVarVarSize(this.SensedData, 'Name', 1) + ((92) * this.SensedData.length) + 17; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/SystemMessage.ts b/lib/classes/messages/SystemMessage.ts index 1b8f13c..05396fe 100644 --- a/lib/classes/messages/SystemMessage.ts +++ b/lib/classes/messages/SystemMessage.ts @@ -25,13 +25,13 @@ export class SystemMessageMessage implements MessageBase return (this.MethodData['Method'].length + 1) + this.calculateVarVarSize(this.ParamList, 'Parameter', 1) + 49; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/TeleportFailed.ts b/lib/classes/messages/TeleportFailed.ts index 2dce4df..980582a 100644 --- a/lib/classes/messages/TeleportFailed.ts +++ b/lib/classes/messages/TeleportFailed.ts @@ -25,13 +25,13 @@ export class TeleportFailedMessage implements MessageBase return (this.Info['Reason'].length + 1) + this.calculateVarVarSize(this.AlertInfo, 'Message', 1) + this.calculateVarVarSize(this.AlertInfo, 'ExtraParams', 1) + 17; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/UUIDGroupNameReply.ts b/lib/classes/messages/UUIDGroupNameReply.ts index 77e6095..a9ee0e9 100644 --- a/lib/classes/messages/UUIDGroupNameReply.ts +++ b/lib/classes/messages/UUIDGroupNameReply.ts @@ -21,13 +21,13 @@ export class UUIDGroupNameReplyMessage implements MessageBase return this.calculateVarVarSize(this.UUIDNameBlock, 'GroupName', 1) + ((16) * this.UUIDNameBlock.length) + 1; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/UUIDNameReply.ts b/lib/classes/messages/UUIDNameReply.ts index aebf955..06e9f4e 100644 --- a/lib/classes/messages/UUIDNameReply.ts +++ b/lib/classes/messages/UUIDNameReply.ts @@ -22,13 +22,13 @@ export class UUIDNameReplyMessage implements MessageBase return this.calculateVarVarSize(this.UUIDNameBlock, 'FirstName', 1) + this.calculateVarVarSize(this.UUIDNameBlock, 'LastName', 1) + ((16) * this.UUIDNameBlock.length) + 1; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/UpdateCreateInventoryItem.ts b/lib/classes/messages/UpdateCreateInventoryItem.ts index 600704b..020bfc6 100644 --- a/lib/classes/messages/UpdateCreateInventoryItem.ts +++ b/lib/classes/messages/UpdateCreateInventoryItem.ts @@ -46,13 +46,13 @@ export class UpdateCreateInventoryItemMessage implements MessageBase return this.calculateVarVarSize(this.InventoryData, 'Name', 1) + this.calculateVarVarSize(this.InventoryData, 'Description', 1) + ((140) * this.InventoryData.length) + 34; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/UpdateInventoryFolder.ts b/lib/classes/messages/UpdateInventoryFolder.ts index 999d072..f4cf49f 100644 --- a/lib/classes/messages/UpdateInventoryFolder.ts +++ b/lib/classes/messages/UpdateInventoryFolder.ts @@ -27,13 +27,13 @@ export class UpdateInventoryFolderMessage implements MessageBase return this.calculateVarVarSize(this.FolderData, 'Name', 1) + ((33) * this.FolderData.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/UpdateInventoryItem.ts b/lib/classes/messages/UpdateInventoryItem.ts index bc15ed2..53fab94 100644 --- a/lib/classes/messages/UpdateInventoryItem.ts +++ b/lib/classes/messages/UpdateInventoryItem.ts @@ -46,13 +46,13 @@ export class UpdateInventoryItemMessage implements MessageBase return this.calculateVarVarSize(this.InventoryData, 'Name', 1) + this.calculateVarVarSize(this.InventoryData, 'Description', 1) + ((140) * this.InventoryData.length) + 49; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/classes/messages/ViewerEffect.ts b/lib/classes/messages/ViewerEffect.ts index 79a093c..d3464fc 100644 --- a/lib/classes/messages/ViewerEffect.ts +++ b/lib/classes/messages/ViewerEffect.ts @@ -29,13 +29,13 @@ export class ViewerEffectMessage implements MessageBase return this.calculateVarVarSize(this.Effect, 'TypeData', 1) + ((41) * this.Effect.length) + 33; } - calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number + calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number { let size = 0; - block.forEach((bl: any) => + for (const bl of block) { size += bl[paramName].length + extraPerVar; - }); + } return size; } diff --git a/lib/tests/packets.ts b/lib/tests/packets.ts index c3c70ff..aa86491 100644 --- a/lib/tests/packets.ts +++ b/lib/tests/packets.ts @@ -26,7 +26,7 @@ describe('Packets', () => { const p = path.resolve(__dirname + '/../../testing/packets'); const files = fs.readdirSync(p); - files.forEach((file) => + for (const file of files) { if (file.substr(file.length - 7) === '.packet') { @@ -163,5 +163,5 @@ describe('Packets', () => }); } } - }); + } }); diff --git a/tools/parseMessageTemplate.js b/tools/parseMessageTemplate.js index f46c18f..6e8fdb3 100644 --- a/tools/parseMessageTemplate.js +++ b/tools/parseMessageTemplate.js @@ -81,21 +81,22 @@ fs.readFile('./msg_template.msg', (err, data) => //Remove all comments const lines = msgTemplate.split('\n'); let newLines = []; - lines.forEach((line) => { - let pos = line.indexOf('//'); - if (pos !== -1) - { - line = line.substr(0, pos-1); - } - newLines.push(line); - }); + for (const line of lines) + { + let pos = line.indexOf('//'); + if (pos !== -1) + { + line = line.substr(0, pos-1); + } + newLines.push(line); + } msgTemplate = newLines.join('\n'); let messages = getBlocks(msgTemplate); let done = false; let msgObjects = []; - messages.forEach((message) => + for (const message of messages) { let newMessage = {}; @@ -113,7 +114,7 @@ fs.readFile('./msg_template.msg', (err, data) => } let blocks = getBlocks(message); - blocks.forEach((block) => + for (const block of blocks) { let newBlock = {}; params = getParams(block); @@ -128,7 +129,7 @@ fs.readFile('./msg_template.msg', (err, data) => } let paramBlocks = getBlocks(block); - paramBlocks.forEach((paramBlock) => + for (const paramBlock of paramBlocks) { let data = getParams(paramBlock); data = data.split(' '); @@ -143,12 +144,12 @@ fs.readFile('./msg_template.msg', (err, data) => obj['size'] = data[2]; } newBlock.params.push(obj); - }); + } newMessage.blocks.push(newBlock); - }); + } msgObjects.push(newMessage); - }); + } fs.writeFile('./msg_template.json', JSON.stringify(msgObjects, null, 4), (err) => { diff --git a/tools/writePacketClasses.js b/tools/writePacketClasses.js index 4993968..8f0b195 100644 --- a/tools/writePacketClasses.js +++ b/tools/writePacketClasses.js @@ -2,7 +2,7 @@ const messages = require('./msg_template.json'); const path = require('path'); const fs = require('fs'); -messages.forEach((message) => +for (const message of messages) { let classString = '// This file has been automatically generated by writeMessageClasses.js\n\n'; @@ -13,9 +13,9 @@ messages.forEach((message) => let vector4 = false; let long = false; let quaternion = false; - message.blocks.forEach((block) => + for (const block of message.blocks) { - block.params.forEach((param) => + for (const param of block.params) { switch(param.type) { @@ -56,8 +56,8 @@ messages.forEach((message) => default: console.log("UNKNOWN TYPE: "+param.type); } - }); - }); + } + } if (uuid) { classString += 'import { UUID } from \'../UUID\';\n' @@ -92,7 +92,7 @@ messages.forEach((message) => let flags = []; - message.flags.forEach((flag) => + for (const flag of message.flags) { switch(flag.toUpperCase()) { @@ -118,7 +118,7 @@ messages.forEach((message) => break; } - }); + } let id = parseInt(message.id); switch(message.frequency) { @@ -152,15 +152,14 @@ messages.forEach((message) => let messageVariableSize = []; let calcVarVar = false; - message.blocks.forEach((block) => + for (const block of message.blocks) { classString += ' '+block.name+': {\n'; let blockFixedSize = 0; let blockVariableSize = []; - - block.params.forEach((param) => + for (const param of block.params) { classString += ' '+param.name+': '; let jstype = 'string'; @@ -244,7 +243,7 @@ messages.forEach((message) => console.log('Unknown type: '+param.type); } classString += jstype + ';\n'; - }); + } if (block.type === 'Single') { @@ -288,7 +287,7 @@ messages.forEach((message) => default: console.log("Unknown type: "+block.type); } - }); + } classString+='\n'; classString+=' getSize(): number\n'; @@ -309,13 +308,13 @@ messages.forEach((message) => classString+='\n'; if (calcVarVar) { - classString+=' calculateVarVarSize(block: object[], paramName: string, extraPerVar: number): number\n' + + classString+=' calculateVarVarSize(block: {[key: string]: any}[], paramName: string, extraPerVar: number): number\n' + ' {\n' + ' let size = 0;\n' + - ' block.forEach((bl: any) =>\n' + + ' for (const bl of block)\n' + ' {\n' + ' size += bl[paramName].length + extraPerVar;\n' + - ' });\n' + + ' }\n' + ' return size;\n' + ' }\n\n'; } @@ -330,19 +329,19 @@ messages.forEach((message) => let letConst = 'const'; let varBlockCount = 0; - message.blocks.forEach((block) => + for (const block of message.blocks) { if (block.type === 'Variable' || block.type === 'Multiple') { varBlockCount++; } - }); + } if (varBlockCount > 1) { letConst = 'let'; } - message.blocks.forEach((block) => + for (const block of message.blocks) { let single = false; let blockIndex = ''; @@ -379,7 +378,7 @@ messages.forEach((message) => classString += ' for (let i = 0; i < count; i++)\n'; classString += ' {\n'; } - block.params.forEach((param) => + for (const param of block.params) { let val = ''; if (!single) @@ -477,13 +476,13 @@ messages.forEach((message) => default: console.log('Unknown type: ' + param.type); } - }); + } if (!single) { classString += ' }\n'; } - }); + } classString += ' return pos - startPos;\n'; } else @@ -503,13 +502,13 @@ messages.forEach((message) => let letConst = 'const'; let varBlockCount = 0; - message.blocks.forEach((block) => + for (const block of message.blocks) { if (block.type === 'Variable' || block.type === 'Multiple') { varBlockCount++; } - }); + } if (varBlockCount > 1) { letConst = 'let'; @@ -522,7 +521,7 @@ messages.forEach((message) => } let firstBlock = true; let donelet = false; - message.blocks.forEach((block) => + for (const block of message.blocks) { let single = false; let blockIndex = ''; @@ -575,7 +574,7 @@ messages.forEach((message) => } const paramTypes = []; const paramValues = []; - block.params.forEach((param) => + for (const param of block.params) { let jstype = 'string'; let jsvalue = '\'\''; @@ -648,12 +647,12 @@ messages.forEach((message) => } paramTypes.push(spaces + ' ' + param.name + ': '+jstype); paramValues.push(spaces + ' ' + param.name + ': '+jsvalue); - }); + } classString += paramTypes.join(',\n')+'\n'; classString += spaces + ' } = {\n'; classString += paramValues.join(',\n')+'\n'; classString += spaces + ' };\n'; - block.params.forEach((param) => + for (const param of block.params) { let val = ''; switch (param.type) @@ -745,7 +744,7 @@ messages.forEach((message) => default: console.log('Unknown type: ' + param.type); } - }); + } if (!single) { classString += ' this.'+block.name+'.push(newObj' + block.name + ');\n'; @@ -757,7 +756,7 @@ messages.forEach((message) => } - }); + } classString += ' return pos - startPos;\n'; } else @@ -774,22 +773,22 @@ messages.forEach((message) => }); -}); +} //Now write the Messages class let classString = '// This file has been automatically generated by writePacketClasses.js\n\n'; -messages.forEach((message) => +for (const message of messages) { const name = message.name; classString += 'export * from \'./messages/'+name+'\';\n'; -}); +} classString += 'import { Message } from \'../enums/Message\';\n'; classString += '\n'; classString += 'const messages: {[index: number]: string} = {};\n'; const msgs = []; -messages.forEach((message) => +for (const message of messages) { msgs.push('messages[Message.' + message.name + '] = \'' + message.name + 'Message\''); -}); +} classString += msgs.join(';\n')+';\n'; classString += '\n'; classString += 'export function nameFromID(id: Message): string\n'; @@ -804,7 +803,7 @@ fs.writeFile(p, classString, (err) => classString = 'export enum Message {\n'; const msgArr = []; -messages.forEach((message) => +for (const message of messages) { let id = parseInt(message.id); switch(message.frequency) @@ -824,7 +823,7 @@ messages.forEach((message) => break; } msgArr.push(' '+message.name+' = '+id); -}); +} classString += msgArr.join(',\n')+'\n'; classString += '}\n'; const e = path.join(__dirname+'/../lib/enums/Message.ts');