Miko/node-metaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update messages

Browse Source
This commit is contained in:
Casper Warden
2023-11-09 18:00:35 +00:00
parent 7569f7272a
commit a0e259b717
21 changed files with 34 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/MessageClasses.ts
View File

@@ -478,9 +478,6 @@ export * from './messages/Error';
export * from './messages/ObjectIncludeInSearch';
export * from './messages/RezRestoreToWorld';
export * from './messages/LinkInventoryItem';
export * from './messages/RetrieveIMsExtended';
export * from './messages/JoinGroupRequestExtended';
export * from './messages/CreateGroupRequestExtended';
import { Message } from '../enums/Message';
const messages: { [index: number]: string } = {};
@@ -962,9 +959,6 @@ messages[<number>Message.Error] = 'ErrorMessage';
messages[<number>Message.ObjectIncludeInSearch] = 'ObjectIncludeInSearchMessage';
messages[<number>Message.RezRestoreToWorld] = 'RezRestoreToWorldMessage';
messages[<number>Message.LinkInventoryItem] = 'LinkInventoryItemMessage';
messages[<number>Message.RetrieveIMsExtended] = 'RetrieveIMsExtendedMessage';
messages[<number>Message.JoinGroupRequestExtended] = 'JoinGroupRequestExtendedMessage';
messages[<number>Message.CreateGroupRequestExtended] = 'CreateGroupRequestExtendedMessage';
export function nameFromID(id: Message): string
{

21
lib/classes/commands/CommunicationsCommands.ts
View File

@@ -68,9 +68,6 @@ export class CommunicationsCommands extends CommandsBase
Message: Utils.StringToBuffer(itemOrFolder.name),
BinaryBucket: bucket
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = circuit.sendMessage(im, PacketFlags.Reliable);
return await circuit.waitForAck(sequenceNo, 10000);
}
@@ -102,9 +99,6 @@ export class CommunicationsCommands extends CommandsBase
Message: Utils.StringToBuffer(message),
BinaryBucket: Buffer.allocUnsafe(0)
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = circuit.sendMessage(im, PacketFlags.Reliable);
return await circuit.waitForAck(sequenceNo, 10000);
}
@@ -229,9 +223,6 @@ export class CommunicationsCommands extends CommandsBase
Message: Utils.StringToBuffer(''),
BinaryBucket: Buffer.allocUnsafe(0)
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = circuit.sendMessage(im, PacketFlags.Reliable);
return await circuit.waitForAck(sequenceNo, 10000);
}
@@ -263,9 +254,6 @@ export class CommunicationsCommands extends CommandsBase
Message: Utils.StringToBuffer(''),
BinaryBucket: Buffer.allocUnsafe(0)
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = circuit.sendMessage(im, PacketFlags.Reliable);
return await circuit.waitForAck(sequenceNo, 10000);
}
@@ -419,9 +407,6 @@ export class CommunicationsCommands extends CommandsBase
Message: Buffer.allocUnsafe(0),
BinaryBucket: Buffer.allocUnsafe(0)
};
im.EstateBlock = {
EstateID: 0
};
this.agent.deleteChatSession(groupID);
const sequenceNo = this.circuit.sendMessage(im, PacketFlags.Reliable);
return this.circuit.waitForAck(sequenceNo, 10000);
@@ -460,9 +445,6 @@ export class CommunicationsCommands extends CommandsBase
Message: Utils.StringToBuffer(message),
BinaryBucket: Utils.StringToBuffer('')
};
im.EstateBlock = {
EstateID: 0
};
circuit.sendMessage(im, PacketFlags.Reliable);
await Utils.waitOrTimeOut(this.currentRegion.clientEvents.onGroupChatSessionJoin, 10000, (event: GroupChatSessionJoinEvent) =>
{
@@ -532,9 +514,6 @@ export class CommunicationsCommands extends CommandsBase
Message: Utils.StringToBuffer(message),
BinaryBucket: Utils.StringToBuffer('')
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = circuit.sendMessage(im, PacketFlags.Reliable);
await this.circuit.waitForAck(sequenceNo, 10000);

3
lib/classes/commands/FriendCommands.ts
View File

@@ -307,9 +307,6 @@ export class FriendCommands extends CommandsBase
Message: Utils.StringToBuffer(message),
BinaryBucket: Utils.StringToBuffer('')
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = this.circuit.sendMessage(im, PacketFlags.Reliable);
return await this.circuit.waitForAck(sequenceNo, 10000);
}

9
lib/classes/commands/GroupCommands.ts
View File

@@ -50,9 +50,6 @@ export class GroupCommands extends CommandsBase
Message: Utils.StringToBuffer(subject + '|' + message),
BinaryBucket: Buffer.allocUnsafe(0)
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = circuit.sendMessage(im, PacketFlags.Reliable);
return await circuit.waitForAck(sequenceNo, 10000);
}
@@ -140,9 +137,6 @@ export class GroupCommands extends CommandsBase
Message: Utils.StringToBuffer(''),
BinaryBucket: Buffer.allocUnsafe(0)
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = circuit.sendMessage(im, PacketFlags.Reliable);
return await circuit.waitForAck(sequenceNo, 10000);
}
@@ -170,9 +164,6 @@ export class GroupCommands extends CommandsBase
Message: Utils.StringToBuffer(''),
BinaryBucket: Buffer.allocUnsafe(0)
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = circuit.sendMessage(im, PacketFlags.Reliable);
return await circuit.waitForAck(sequenceNo, 10000);
}

3
lib/classes/commands/InventoryCommands.ts
View File

@@ -48,9 +48,6 @@ export class InventoryCommands extends CommandsBase
Message: Utils.StringToBuffer(''),
BinaryBucket: binary
};
im.EstateBlock = {
EstateID: 0
};
const sequenceNo = this.circuit.sendMessage(im, PacketFlags.Reliable);
return await this.circuit.waitForAck(sequenceNo, 10000);
}

34
lib/classes/messages/AlertMessage.ts
View File

@@ -1,6 +1,5 @@
// This file has been automatically generated by writeMessageClasses.js
import { UUID } from '../UUID';
import { MessageFlags } from '../../enums/MessageFlags';
import { MessageBase } from '../MessageBase';
import { Message } from '../../enums/Message';
@@ -18,13 +17,10 @@ export class AlertMessageMessage implements MessageBase
Message: Buffer;
ExtraParams: Buffer;
}[];
AgentInfo: {
AgentID: UUID;
}[];
getSize(): number
{
return (this.AlertData['Message'].length + 1) + this.calculateVarVarSize(this.AlertInfo, 'Message', 1) + this.calculateVarVarSize(this.AlertInfo, 'ExtraParams', 1) + ((16) * this.AgentInfo.length) + 2;
return (this.AlertData['Message'].length + 1) + this.calculateVarVarSize(this.AlertInfo, 'Message', 1) + this.calculateVarVarSize(this.AlertInfo, 'ExtraParams', 1) + 1;
}
calculateVarVarSize(block: { [key: string]: any }[], paramName: string, extraPerVar: number): number
@@ -44,7 +40,7 @@ export class AlertMessageMessage implements MessageBase
buf.writeUInt8(this.AlertData['Message'].length, pos++);
this.AlertData['Message'].copy(buf, pos);
pos += this.AlertData['Message'].length;
let count = this.AlertInfo.length;
const count = this.AlertInfo.length;
buf.writeUInt8(this.AlertInfo.length, pos++);
for (let i = 0; i < count; i++)
{
@@ -55,13 +51,6 @@ export class AlertMessageMessage implements MessageBase
this.AlertInfo[i]['ExtraParams'].copy(buf, pos);
pos += this.AlertInfo[i]['ExtraParams'].length;
}
count = this.AgentInfo.length;
buf.writeUInt8(this.AgentInfo.length, pos++);
for (let i = 0; i < count; i++)
{
this.AgentInfo[i]['AgentID'].writeToBuffer(buf, pos);
pos += 16;
}
return pos - startPos;
}
@@ -83,7 +72,7 @@ export class AlertMessageMessage implements MessageBase
{
return pos - startPos;
}
let count = buf.readUInt8(pos++);
const count = buf.readUInt8(pos++);
this.AlertInfo = [];
for (let i = 0; i < count; i++)
{
@@ -102,23 +91,6 @@ export class AlertMessageMessage implements MessageBase
pos += varLength;
this.AlertInfo.push(newObjAlertInfo);
}
if (pos >= buf.length)
{
return pos - startPos;
}
count = buf.readUInt8(pos++);
this.AgentInfo = [];
for (let i = 0; i < count; i++)
{
const newObjAgentInfo: {
AgentID: UUID
} = {
AgentID: UUID.zero()
};
newObjAgentInfo['AgentID'] = new UUID(buf, pos);
pos += 16;
this.AgentInfo.push(newObjAgentInfo);
}
return pos - startPos;
}
}

31
lib/classes/messages/ChildAgentUpdate.ts
View File

@@ -67,13 +67,10 @@ export class ChildAgentUpdateMessage implements MessageBase
AgentInfo: {
Flags: number;
}[];
AgentInventoryHost: {
InventoryHost: Buffer;
}[];
getSize(): number
{
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;
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) + 215;
}
calculateVarVarSize(block: { [key: string]: any }[], paramName: string, extraPerVar: number): number
@@ -200,14 +197,6 @@ export class ChildAgentUpdateMessage implements MessageBase
buf.writeUInt32LE(this.AgentInfo[i]['Flags'], pos);
pos += 4;
}
count = this.AgentInventoryHost.length;
buf.writeUInt8(this.AgentInventoryHost.length, pos++);
for (let i = 0; i < count; i++)
{
buf.writeUInt8(this.AgentInventoryHost[i]['InventoryHost'].length, pos++);
this.AgentInventoryHost[i]['InventoryHost'].copy(buf, pos);
pos += this.AgentInventoryHost[i]['InventoryHost'].length;
}
return pos - startPos;
}
@@ -456,24 +445,6 @@ export class ChildAgentUpdateMessage implements MessageBase
pos += 4;
this.AgentInfo.push(newObjAgentInfo);
}
if (pos >= buf.length)
{
return pos - startPos;
}
count = buf.readUInt8(pos++);
this.AgentInventoryHost = [];
for (let i = 0; i < count; i++)
{
const newObjAgentInventoryHost: {
InventoryHost: Buffer
} = {
InventoryHost: Buffer.allocUnsafe(0)
};
varLength = buf.readUInt8(pos++);
newObjAgentInventoryHost['InventoryHost'] = buf.slice(pos, pos + varLength);
pos += varLength;
this.AgentInventoryHost.push(newObjAgentInventoryHost);
}
return pos - startPos;
}
}

122
lib/classes/messages/CreateGroupRequestExtended.ts
View File

@@ -1,122 +0,0 @@
// This file has been automatically generated by writeMessageClasses.js
import { UUID } from '../UUID';
import { MessageFlags } from '../../enums/MessageFlags';
import { MessageBase } from '../MessageBase';
import { Message } from '../../enums/Message';
export class CreateGroupRequestExtendedMessage implements MessageBase
{
name = 'CreateGroupRequestExtended';
messageFlags = MessageFlags.Trusted | MessageFlags.FrequencyLow;
id = Message.CreateGroupRequestExtended;
AgentData: {
AgentID: UUID;
SessionID: UUID;
GroupLimit: number;
};
GroupData: {
Name: Buffer;
Charter: Buffer;
ShowInList: boolean;
InsigniaID: UUID;
MembershipFee: number;
OpenEnrollment: boolean;
AllowPublish: boolean;
MaturePublish: boolean;
};
getSize(): number
{
return (this.GroupData['Name'].length + 1 + this.GroupData['Charter'].length + 2) + 60;
}
// @ts-ignore
writeToBuffer(buf: Buffer, pos: number): number
{
const startPos = pos;
this.AgentData['AgentID'].writeToBuffer(buf, pos);
pos += 16;
this.AgentData['SessionID'].writeToBuffer(buf, pos);
pos += 16;
buf.writeInt32LE(this.AgentData['GroupLimit'], pos);
pos += 4;
buf.writeUInt8(this.GroupData['Name'].length, pos++);
this.GroupData['Name'].copy(buf, pos);
pos += this.GroupData['Name'].length;
buf.writeUInt16LE(this.GroupData['Charter'].length, pos);
pos += 2;
this.GroupData['Charter'].copy(buf, pos);
pos += this.GroupData['Charter'].length;
buf.writeUInt8((this.GroupData['ShowInList']) ? 1 : 0, pos++);
this.GroupData['InsigniaID'].writeToBuffer(buf, pos);
pos += 16;
buf.writeInt32LE(this.GroupData['MembershipFee'], pos);
pos += 4;
buf.writeUInt8((this.GroupData['OpenEnrollment']) ? 1 : 0, pos++);
buf.writeUInt8((this.GroupData['AllowPublish']) ? 1 : 0, pos++);
buf.writeUInt8((this.GroupData['MaturePublish']) ? 1 : 0, pos++);
return pos - startPos;
}
// @ts-ignore
readFromBuffer(buf: Buffer, pos: number): number
{
const startPos = pos;
let varLength = 0;
const newObjAgentData: {
AgentID: UUID,
SessionID: UUID,
GroupLimit: number
} = {
AgentID: UUID.zero(),
SessionID: UUID.zero(),
GroupLimit: 0
};
newObjAgentData['AgentID'] = new UUID(buf, pos);
pos += 16;
newObjAgentData['SessionID'] = new UUID(buf, pos);
pos += 16;
newObjAgentData['GroupLimit'] = buf.readInt32LE(pos);
pos += 4;
this.AgentData = newObjAgentData;
const newObjGroupData: {
Name: Buffer,
Charter: Buffer,
ShowInList: boolean,
InsigniaID: UUID,
MembershipFee: number,
OpenEnrollment: boolean,
AllowPublish: boolean,
MaturePublish: boolean
} = {
Name: Buffer.allocUnsafe(0),
Charter: Buffer.allocUnsafe(0),
ShowInList: false,
InsigniaID: UUID.zero(),
MembershipFee: 0,
OpenEnrollment: false,
AllowPublish: false,
MaturePublish: false
};
varLength = buf.readUInt8(pos++);
newObjGroupData['Name'] = buf.slice(pos, pos + varLength);
pos += varLength;
varLength = buf.readUInt16LE(pos);
pos += 2;
newObjGroupData['Charter'] = buf.slice(pos, pos + varLength);
pos += varLength;
newObjGroupData['ShowInList'] = (buf.readUInt8(pos++) === 1);
newObjGroupData['InsigniaID'] = new UUID(buf, pos);
pos += 16;
newObjGroupData['MembershipFee'] = buf.readInt32LE(pos);
pos += 4;
newObjGroupData['OpenEnrollment'] = (buf.readUInt8(pos++) === 1);
newObjGroupData['AllowPublish'] = (buf.readUInt8(pos++) === 1);
newObjGroupData['MaturePublish'] = (buf.readUInt8(pos++) === 1);
this.GroupData = newObjGroupData;
return pos - startPos;
}
}

15
lib/classes/messages/ImprovedInstantMessage.ts
View File

@@ -30,13 +30,10 @@ export class ImprovedInstantMessageMessage implements MessageBase
Message: Buffer;
BinaryBucket: Buffer;
};
EstateBlock: {
EstateID: number;
};
getSize(): number
{
return (this.MessageBlock['FromAgentName'].length + 1 + this.MessageBlock['Message'].length + 2 + this.MessageBlock['BinaryBucket'].length + 2) + 107;
return (this.MessageBlock['FromAgentName'].length + 1 + this.MessageBlock['Message'].length + 2 + this.MessageBlock['BinaryBucket'].length + 2) + 103;
}
// @ts-ignore
@@ -73,8 +70,6 @@ export class ImprovedInstantMessageMessage implements MessageBase
pos += 2;
this.MessageBlock['BinaryBucket'].copy(buf, pos);
pos += this.MessageBlock['BinaryBucket'].length;
buf.writeUInt32LE(this.EstateBlock['EstateID'], pos);
pos += 4;
return pos - startPos;
}
@@ -149,14 +144,6 @@ export class ImprovedInstantMessageMessage implements MessageBase
newObjMessageBlock['BinaryBucket'] = buf.slice(pos, pos + varLength);
pos += varLength;
this.MessageBlock = newObjMessageBlock;
const newObjEstateBlock: {
EstateID: number
} = {
EstateID: 0
};
newObjEstateBlock['EstateID'] = buf.readUInt32LE(pos);
pos += 4;
this.EstateBlock = newObjEstateBlock;
return pos - startPos;
}
}

15
lib/classes/messages/InviteGroupResponse.ts
View File

@@ -18,13 +18,10 @@ export class InviteGroupResponseMessage implements MessageBase
RoleID: UUID;
MembershipFee: number;
};
GroupData: {
GroupLimit: number;
};
getSize(): number
{
return 72;
return 68;
}
// @ts-ignore
@@ -41,8 +38,6 @@ export class InviteGroupResponseMessage implements MessageBase
pos += 16;
buf.writeInt32LE(this.InviteData['MembershipFee'], pos);
pos += 4;
buf.writeInt32LE(this.GroupData['GroupLimit'], pos);
pos += 4;
return pos - startPos;
}
@@ -74,14 +69,6 @@ export class InviteGroupResponseMessage implements MessageBase
newObjInviteData['MembershipFee'] = buf.readInt32LE(pos);
pos += 4;
this.InviteData = newObjInviteData;
const newObjGroupData: {
GroupLimit: number
} = {
GroupLimit: 0
};
newObjGroupData['GroupLimit'] = buf.readInt32LE(pos);
pos += 4;
this.GroupData = newObjGroupData;
return pos - startPos;
}
}

74
lib/classes/messages/JoinGroupRequestExtended.ts
View File

@@ -1,74 +0,0 @@
// This file has been automatically generated by writeMessageClasses.js
import { UUID } from '../UUID';
import { MessageFlags } from '../../enums/MessageFlags';
import { MessageBase } from '../MessageBase';
import { Message } from '../../enums/Message';
export class JoinGroupRequestExtendedMessage implements MessageBase
{
name = 'JoinGroupRequestExtended';
messageFlags = MessageFlags.Trusted | MessageFlags.FrequencyLow;
id = Message.JoinGroupRequestExtended;
AgentData: {
AgentID: UUID;
SessionID: UUID;
GroupLimit: number;
};
GroupData: {
GroupID: UUID;
};
getSize(): number
{
return 52;
}
// @ts-ignore
writeToBuffer(buf: Buffer, pos: number): number
{
const startPos = pos;
this.AgentData['AgentID'].writeToBuffer(buf, pos);
pos += 16;
this.AgentData['SessionID'].writeToBuffer(buf, pos);
pos += 16;
buf.writeInt32LE(this.AgentData['GroupLimit'], pos);
pos += 4;
this.GroupData['GroupID'].writeToBuffer(buf, pos);
pos += 16;
return pos - startPos;
}
// @ts-ignore
readFromBuffer(buf: Buffer, pos: number): number
{
const startPos = pos;
const newObjAgentData: {
AgentID: UUID,
SessionID: UUID,
GroupLimit: number
} = {
AgentID: UUID.zero(),
SessionID: UUID.zero(),
GroupLimit: 0
};
newObjAgentData['AgentID'] = new UUID(buf, pos);
pos += 16;
newObjAgentData['SessionID'] = new UUID(buf, pos);
pos += 16;
newObjAgentData['GroupLimit'] = buf.readInt32LE(pos);
pos += 4;
this.AgentData = newObjAgentData;
const newObjGroupData: {
GroupID: UUID
} = {
GroupID: UUID.zero()
};
newObjGroupData['GroupID'] = new UUID(buf, pos);
pos += 16;
this.GroupData = newObjGroupData;
return pos - startPos;
}
}

40
lib/classes/messages/MapBlockReply.ts
View File

@@ -25,14 +25,10 @@ export class MapBlockReplyMessage implements MessageBase
Agents: number;
MapImageID: UUID;
}[];
Size: {
SizeX: number;
SizeY: number;
}[];
getSize(): number
{
return this.calculateVarVarSize(this.Data, 'Name', 1) + ((27) * this.Data.length) + ((4) * this.Size.length) + 22;
return this.calculateVarVarSize(this.Data, 'Name', 1) + ((27) * this.Data.length) + 21;
}
calculateVarVarSize(block: { [key: string]: any }[], paramName: string, extraPerVar: number): number
@@ -53,7 +49,7 @@ export class MapBlockReplyMessage implements MessageBase
pos += 16;
buf.writeUInt32LE(this.AgentData['Flags'], pos);
pos += 4;
let count = this.Data.length;
const count = this.Data.length;
buf.writeUInt8(this.Data.length, pos++);
for (let i = 0; i < count; i++)
{
@@ -72,15 +68,6 @@ export class MapBlockReplyMessage implements MessageBase
this.Data[i]['MapImageID'].writeToBuffer(buf, pos);
pos += 16;
}
count = this.Size.length;
buf.writeUInt8(this.Size.length, pos++);
for (let i = 0; i < count; i++)
{
buf.writeUInt16LE(this.Size[i]['SizeX'], pos);
pos += 2;
buf.writeUInt16LE(this.Size[i]['SizeY'], pos);
pos += 2;
}
return pos - startPos;
}
@@ -105,7 +92,7 @@ export class MapBlockReplyMessage implements MessageBase
{
return pos - startPos;
}
let count = buf.readUInt8(pos++);
const count = buf.readUInt8(pos++);
this.Data = [];
for (let i = 0; i < count; i++)
{
@@ -144,27 +131,6 @@ export class MapBlockReplyMessage implements MessageBase
pos += 16;
this.Data.push(newObjData);
}
if (pos >= buf.length)
{
return pos - startPos;
}
count = buf.readUInt8(pos++);
this.Size = [];
for (let i = 0; i < count; i++)
{
const newObjSize: {
SizeX: number,
SizeY: number
} = {
SizeX: 0,
SizeY: 0
};
newObjSize['SizeX'] = buf.readUInt16LE(pos);
pos += 2;
newObjSize['SizeY'] = buf.readUInt16LE(pos);
pos += 2;
this.Size.push(newObjSize);
}
return pos - startPos;
}
}

2
lib/classes/messages/ParcelProperties.ts
View File

@@ -9,7 +9,7 @@ import { Message } from '../../enums/Message';
export class ParcelPropertiesMessage implements MessageBase
{
name = 'ParcelProperties';
messageFlags = MessageFlags.Trusted | MessageFlags.Zerocoded | MessageFlags.Deprecated | MessageFlags.FrequencyHigh;
messageFlags = MessageFlags.Trusted | MessageFlags.Zerocoded | MessageFlags.FrequencyHigh;
id = Message.ParcelProperties;
ParcelData: {

59
lib/classes/messages/RetrieveIMsExtended.ts
View File

@@ -1,59 +0,0 @@
// This file has been automatically generated by writeMessageClasses.js
import { UUID } from '../UUID';
import { MessageFlags } from '../../enums/MessageFlags';
import { MessageBase } from '../MessageBase';
import { Message } from '../../enums/Message';
export class RetrieveIMsExtendedMessage implements MessageBase
{
name = 'RetrieveIMsExtended';
messageFlags = MessageFlags.Trusted | MessageFlags.FrequencyLow;
id = Message.RetrieveIMsExtended;
AgentData: {
AgentID: UUID;
SessionID: UUID;
IsPremium: boolean;
};
getSize(): number
{
return 33;
}
// @ts-ignore
writeToBuffer(buf: Buffer, pos: number): number
{
const startPos = pos;
this.AgentData['AgentID'].writeToBuffer(buf, pos);
pos += 16;
this.AgentData['SessionID'].writeToBuffer(buf, pos);
pos += 16;
buf.writeUInt8((this.AgentData['IsPremium']) ? 1 : 0, pos++);
return pos - startPos;
}
// @ts-ignore
readFromBuffer(buf: Buffer, pos: number): number
{
const startPos = pos;
const newObjAgentData: {
AgentID: UUID,
SessionID: UUID,
IsPremium: boolean
} = {
AgentID: UUID.zero(),
SessionID: UUID.zero(),
IsPremium: false
};
newObjAgentData['AgentID'] = new UUID(buf, pos);
pos += 16;
newObjAgentData['SessionID'] = new UUID(buf, pos);
pos += 16;
newObjAgentData['IsPremium'] = (buf.readUInt8(pos++) === 1);
this.AgentData = newObjAgentData;
return pos - startPos;
}
}

2
lib/classes/messages/RoutedMoneyBalanceReply.ts
View File

@@ -9,7 +9,7 @@ import { Message } from '../../enums/Message';
export class RoutedMoneyBalanceReplyMessage implements MessageBase
{
name = 'RoutedMoneyBalanceReply';
messageFlags = MessageFlags.Trusted | MessageFlags.Zerocoded | MessageFlags.Deprecated | MessageFlags.FrequencyLow;
messageFlags = MessageFlags.Trusted | MessageFlags.Zerocoded | MessageFlags.FrequencyLow;
id = Message.RoutedMoneyBalanceReply;
TargetBlock: {

2
lib/classes/messages/SetSimPresenceInDatabase.ts
View File

@@ -8,7 +8,7 @@ import { Message } from '../../enums/Message';
export class SetSimPresenceInDatabaseMessage implements MessageBase
{
name = 'SetSimPresenceInDatabase';
messageFlags = MessageFlags.Trusted | MessageFlags.Deprecated | MessageFlags.FrequencyLow;
messageFlags = MessageFlags.Trusted | MessageFlags.FrequencyLow;
id = Message.SetSimPresenceInDatabase;
SimData: {

18
lib/classes/messages/SimStatus.ts
View File

@@ -1,6 +1,5 @@
// This file has been automatically generated by writeMessageClasses.js
import * as Long from 'long';
import { MessageFlags } from '../../enums/MessageFlags';
import { MessageBase } from '../MessageBase';
import { Message } from '../../enums/Message';
@@ -15,13 +14,10 @@ export class SimStatusMessage implements MessageBase
CanAcceptAgents: boolean;
CanAcceptTasks: boolean;
};
SimFlags: {
Flags: Long;
};
getSize(): number
{
return 10;
return 2;
}
// @ts-ignore
@@ -30,10 +26,6 @@ export class SimStatusMessage implements MessageBase
const startPos = pos;
buf.writeUInt8((this.SimStatus['CanAcceptAgents']) ? 1 : 0, pos++);
buf.writeUInt8((this.SimStatus['CanAcceptTasks']) ? 1 : 0, pos++);
buf.writeInt32LE(this.SimFlags['Flags'].low, pos);
pos += 4;
buf.writeInt32LE(this.SimFlags['Flags'].high, pos);
pos += 4;
return pos - startPos;
}
@@ -51,14 +43,6 @@ export class SimStatusMessage implements MessageBase
newObjSimStatus['CanAcceptAgents'] = (buf.readUInt8(pos++) === 1);
newObjSimStatus['CanAcceptTasks'] = (buf.readUInt8(pos++) === 1);
this.SimStatus = newObjSimStatus;
const newObjSimFlags: {
Flags: Long
} = {
Flags: Long.ZERO
};
newObjSimFlags['Flags'] = new Long(buf.readInt32LE(pos), buf.readInt32LE(pos + 4));
pos += 8;
this.SimFlags = newObjSimFlags;
return pos - startPos;
}
}

20
lib/classes/messages/TransferInventory.ts
View File

@@ -20,14 +20,10 @@ export class TransferInventoryMessage implements MessageBase
InventoryID: UUID;
Type: number;
}[];
ValidationBlock: {
NeedsValidation: boolean;
EstateID: number;
};
getSize(): number
{
return ((17) * this.InventoryBlock.length) + 54;
return ((17) * this.InventoryBlock.length) + 49;
}
// @ts-ignore
@@ -48,9 +44,6 @@ export class TransferInventoryMessage implements MessageBase
pos += 16;
buf.writeInt8(this.InventoryBlock[i]['Type'], pos++);
}
buf.writeUInt8((this.ValidationBlock['NeedsValidation']) ? 1 : 0, pos++);
buf.writeUInt32LE(this.ValidationBlock['EstateID'], pos);
pos += 4;
return pos - startPos;
}
@@ -94,17 +87,6 @@ export class TransferInventoryMessage implements MessageBase
newObjInventoryBlock['Type'] = buf.readInt8(pos++);
this.InventoryBlock.push(newObjInventoryBlock);
}
const newObjValidationBlock: {
NeedsValidation: boolean,
EstateID: number
} = {
NeedsValidation: false,
EstateID: 0
};
newObjValidationBlock['NeedsValidation'] = (buf.readUInt8(pos++) === 1);
newObjValidationBlock['EstateID'] = buf.readUInt32LE(pos);
pos += 4;
this.ValidationBlock = newObjValidationBlock;
return pos - startPos;
}
}

5
lib/enums/Message.ts
View File

@@ -477,8 +477,5 @@ export enum Message
Error = 4294902183,
ObjectIncludeInSearch = 4294902184,
RezRestoreToWorld = 4294902185,
LinkInventoryItem = 4294902186,
RetrieveIMsExtended = 4294902187,
JoinGroupRequestExtended = 4294902188,
CreateGroupRequestExtended = 4294902189
LinkInventoryItem = 4294902186
}

96
tools/message_template.msg
View File

@@ -460,7 +460,7 @@ version 2.0
// that a given simulator is present and valid for a set amount of
// time
{
SetSimPresenceInDatabase Low 23 Trusted Unencoded UDPDeprecated
SetSimPresenceInDatabase Low 23 Trusted Unencoded
{
SimData Single
{ RegionID LLUUID }
@@ -2068,6 +2068,7 @@ version 2.0
{ Friction F32 }
{ Restitution F32 }
{ GravityMultiplier F32 }
}
}
@@ -2846,10 +2847,6 @@ version 2.0
{ Message Variable 1 }
{ ExtraParams Variable 1 }
}
{
AgentInfo Variable
{ AgentID LLUUID }
}
}
// Send an AlertMessage to the named agent.
@@ -4452,7 +4449,7 @@ version 2.0
// WARNING: This packet is potentially large. With max length name,
// description, music URL and media URL, it is 1526 + sizeof ( LLUUID ) bytes.
{
ParcelProperties High 23 Trusted Zerocoded UDPDeprecated
ParcelProperties High 23 Trusted Zerocoded
{
ParcelData Single
{ RequestResult S32 }
@@ -4506,7 +4503,6 @@ version 2.0
{ RegionDenyAnonymous BOOL }
{ RegionDenyIdentified BOOL }
{ RegionDenyTransacted BOOL }
// in llsd message, SeeAVs, GroupAVSounds and AnyAVSounds BOOLs are also sent
}
{
AgeVerificationBlock Single
@@ -5284,10 +5280,6 @@ version 2.0
{ CanAcceptAgents BOOL }
{ CanAcceptTasks BOOL }
}
{
SimFlags Single
{ Flags U64 }
}
}
// Child Agent Update - agents send child agents to neighboring simulators.
@@ -5366,10 +5358,6 @@ version 2.0
AgentInfo Variable
{ Flags U32 }
}
{
AgentInventoryHost Variable
{ InventoryHost Variable 1 } //String
}
}
// ChildAgentAlive
@@ -5671,15 +5659,10 @@ version 2.0
{ Message Variable 2 }
{ BinaryBucket Variable 2 }
}
{
EstateBlock Single
{ EstateID U32 }
}
}
// RetrieveInstantMessages - used to get instant messages that
// were persisted out to the database while the user was offline
// Sent from viewer->simulator. Also see RetrieveIMsExtended (back-end only)
{
RetrieveInstantMessages Low 255 NotTrusted Unencoded
{
@@ -6612,11 +6595,6 @@ version 2.0
{ InventoryID LLUUID }
{ Type S8 }
}
{
ValidationBlock Single
{ NeedsValidation BOOL }
{ EstateID U32 }
}
}
// dataserver -> sim
@@ -6962,7 +6940,7 @@ version 2.0
// dataserver -> simulator -> spaceserver -> simulator -> viewer
// reliable
{
RoutedMoneyBalanceReply Low 315 Trusted Zerocoded UDPDeprecated
RoutedMoneyBalanceReply Low 315 Trusted Zerocoded
{
TargetBlock Single
{ TargetIP IPADDR } // U32 encoded IP
@@ -7481,6 +7459,7 @@ version 2.0
// CreateGroupRequest
// viewer -> simulator
// simulator -> dataserver
// reliable
{
CreateGroupRequest Low 339 NotTrusted Zerocoded
@@ -7564,7 +7543,7 @@ version 2.0
}
// JoinGroupRequest
// viewer -> simulator
// viewer -> simulator -> dataserver
// reliable
{
JoinGroupRequest Low 343 NotTrusted Zerocoded
@@ -7699,10 +7678,6 @@ version 2.0
{ RoleID LLUUID }
{ MembershipFee S32 }
}
{
GroupData Single
{ GroupLimit S32 } // Extra block for the agent's group limit
}
}
// GroupProfileRequest
@@ -8822,11 +8797,6 @@ version 2.0
{ Agents U8 }
{ MapImageID LLUUID }
}
{
Size Variable
{ SizeX U16 }
{ SizeY U16 }
}
}
// viewer -> sim
@@ -9158,57 +9128,3 @@ version 2.0
}
}
// RetrieveIMsExtended - extended version of RetrieveInstantMessages,
// used to get instant messages that were persisted out to the database while the user was offline
// sent between the simulator and dataserver
{
RetrieveIMsExtended Low 427 Trusted Unencoded
{
AgentData Single
{ AgentID LLUUID }
{ SessionID LLUUID }
{ IsPremium BOOL }
}
}
// JoinGroupRequestExtended
// Extends JoinGroupRequest from viewer and passed to dataserver
// simulator -> dataserver
// reliable
{
JoinGroupRequestExtended Low 428 Trusted Unencoded
{
AgentData Single
{ AgentID LLUUID }
{ SessionID LLUUID }
{ GroupLimit S32 }
}
{
GroupData Single
{ GroupID LLUUID }
}
}
// CreateGroupRequestExtended
// simulator -> dataserver, extends data from CreateGroupRequest
// reliable
{
CreateGroupRequestExtended Low 429 Trusted Unencoded
{
AgentData Single
{ AgentID LLUUID }
{ SessionID LLUUID }
{ GroupLimit S32 }
}
{
GroupData Single
{ Name Variable 1 } // string
{ Charter Variable 2 } // string
{ ShowInList BOOL }
{ InsigniaID LLUUID }
{ MembershipFee S32 } // S32
{ OpenEnrollment BOOL } // BOOL (U8)
{ AllowPublish BOOL } // whether profile is externally visible or not
{ MaturePublish BOOL } // profile is "mature"
}
}

261
tools/msg_template.json
View File

@@ -1171,8 +1171,7 @@
"id": "23",
"flags": [
"Trusted",
"Unencoded",
"UDPDeprecated"
"Unencoded"
],
"blocks": [
{
@@ -7938,18 +7937,6 @@
"size": "1"
}
]
},
{
"name": "AgentInfo",
"type": "Variable",
"count": 1,
"params": [
{
"name": "AgentID",
"type": "LLUUID",
"size": 1
}
]
}
]
},
@@ -12447,8 +12434,7 @@
"id": "23",
"flags": [
"Trusted",
"Zerocoded",
"UDPDeprecated"
"Zerocoded"
],
"blocks": [
{
@@ -14860,18 +14846,6 @@
"size": 1
}
]
},
{
"name": "SimFlags",
"type": "Single",
"count": 1,
"params": [
{
"name": "Flags",
"type": "U64",
"size": 1
}
]
}
]
},
@@ -15124,18 +15098,6 @@
"size": 1
}
]
},
{
"name": "AgentInventoryHost",
"type": "Variable",
"count": 1,
"params": [
{
"name": "InventoryHost",
"type": "Variable",
"size": "1"
}
]
}
]
},
@@ -15965,18 +15927,6 @@
"size": "2"
}
]
},
{
"name": "EstateBlock",
"type": "Single",
"count": 1,
"params": [
{
"name": "EstateID",
"type": "U32",
"size": 1
}
]
}
]
},
@@ -18950,23 +18900,6 @@
"size": 1
}
]
},
{
"name": "ValidationBlock",
"type": "Single",
"count": 1,
"params": [
{
"name": "NeedsValidation",
"type": "BOOL",
"size": 1
},
{
"name": "EstateID",
"type": "U32",
"size": 1
}
]
}
]
},
@@ -20024,8 +19957,7 @@
"id": "315",
"flags": [
"Trusted",
"Zerocoded",
"UDPDeprecated"
"Zerocoded"
],
"blocks": [
{
@@ -21955,18 +21887,6 @@
"size": 1
}
]
},
{
"name": "GroupData",
"type": "Single",
"count": 1,
"params": [
{
"name": "GroupLimit",
"type": "S32",
"size": 1
}
]
}
]
},
@@ -25196,23 +25116,6 @@
"size": 1
}
]
},
{
"name": "Size",
"type": "Variable",
"count": 1,
"params": [
{
"name": "SizeX",
"type": "U16",
"size": 1
},
{
"name": "SizeY",
"type": "U16",
"size": 1
}
]
}
]
},
@@ -26246,163 +26149,5 @@
]
}
]
},
{
"name": "RetrieveIMsExtended",
"frequency": "Low",
"id": "427",
"flags": [
"Trusted",
"Unencoded"
],
"blocks": [
{
"name": "AgentData",
"type": "Single",
"count": 1,
"params": [
{
"name": "AgentID",
"type": "LLUUID",
"size": 1
},
{
"name": "SessionID",
"type": "LLUUID",
"size": 1
},
{
"name": "IsPremium",
"type": "BOOL",
"size": 1
}
]
}
]
},
{
"name": "JoinGroupRequestExtended",
"frequency": "Low",
"id": "428",
"flags": [
"Trusted",
"Unencoded"
],
"blocks": [
{
"name": "AgentData",
"type": "Single",
"count": 1,
"params": [
{
"name": "AgentID",
"type": "LLUUID",
"size": 1
},
{
"name": "SessionID",
"type": "LLUUID",
"size": 1
},
{
"name": "GroupLimit",
"type": "S32",
"size": 1
}
]
},
{
"name": "GroupData",
"type": "Single",
"count": 1,
"params": [
{
"name": "GroupID",
"type": "LLUUID",
"size": 1
}
]
}
]
},
{
"name": "CreateGroupRequestExtended",
"frequency": "Low",
"id": "429",
"flags": [
"Trusted",
"Unencoded"
],
"blocks": [
{
"name": "AgentData",
"type": "Single",
"count": 1,
"params": [
{
"name": "AgentID",
"type": "LLUUID",
"size": 1
},
{
"name": "SessionID",
"type": "LLUUID",
"size": 1
},
{
"name": "GroupLimit",
"type": "S32",
"size": 1
}
]
},
{
"name": "GroupData",
"type": "Single",
"count": 1,
"params": [
{
"name": "Name",
"type": "Variable",
"size": "1"
},
{
"name": "Charter",
"type": "Variable",
"size": "2"
},
{
"name": "ShowInList",
"type": "BOOL",
"size": 1
},
{
"name": "InsigniaID",
"type": "LLUUID",
"size": 1
},
{
"name": "MembershipFee",
"type": "S32",
"size": 1
},
{
"name": "OpenEnrollment",
"type": "BOOL",
"size": 1
},
{
"name": "AllowPublish",
"type": "BOOL",
"size": 1
},
{
"name": "MaturePublish",
"type": "BOOL",
"size": 1
}
]
}
]
}
]