From 41f79d969ebdec6ba5fe0ed3e106a8e6360ad801 Mon Sep 17 00:00:00 2001 From: Casper Warden <216465704+casperwardensl@users.noreply.github.com> Date: Wed, 22 Sep 2021 15:34:53 +0100 Subject: [PATCH] Bit of tidyup --- examples/Inventory/Inventory.ts | 8 ++-- lib/Bot.ts | 2 +- lib/classes/Caps.ts | 4 +- lib/classes/Circuit.ts | 12 +++--- lib/classes/ClientEvents.ts | 2 +- lib/classes/InventoryItem.ts | 1 + lib/classes/ObjectStoreLite.ts | 2 +- lib/classes/Region.ts | 4 +- lib/classes/commands/FriendCommands.ts | 2 +- lib/classes/commands/TeleportCommands.ts | 2 +- lib/classes/public/GameObject.ts | 4 -- package-lock.json | 48 ++++++++++++------------ package.json | 2 +- tslint.json | 1 - 14 files changed, 45 insertions(+), 49 deletions(-) diff --git a/examples/Inventory/Inventory.ts b/examples/Inventory/Inventory.ts index c09f060..106f3eb 100644 --- a/examples/Inventory/Inventory.ts +++ b/examples/Inventory/Inventory.ts @@ -11,7 +11,7 @@ import { InventoryOfferedEvent } from '../../lib/events/InventoryOfferedEvent'; class Inventory extends ExampleBot { - async onConnected() + async onConnected(): Promise { this.bot.clientEvents.onInventoryOffered.subscribe(this.onInventoryOffered.bind(this)); this.bot.clientEvents.onInventoryResponse.subscribe(this.onInventoryResponse.bind(this)); @@ -94,7 +94,7 @@ class Inventory extends ExampleBot console.log('Done iterating through library'); } - async onInventoryResponse(response: InventoryResponseEvent) + async onInventoryResponse(response: InventoryResponseEvent): Promise { if (response.accepted) { @@ -106,7 +106,7 @@ class Inventory extends ExampleBot } } - async iterateFolder(folder: InventoryFolder, prefix: string) + async iterateFolder(folder: InventoryFolder, prefix: string): Promise { console.log(prefix + ' [' + folder.name + ']'); await folder.populate(false); @@ -128,7 +128,7 @@ class Inventory extends ExampleBot } } - async onInventoryOffered(event: InventoryOfferedEvent) + async onInventoryOffered(event: InventoryOfferedEvent): Promise { if (event.from.toString() === this.masterAvatar) { diff --git a/lib/Bot.ts b/lib/Bot.ts index af1530a..f85b3ed 100644 --- a/lib/Bot.ts +++ b/lib/Bot.ts @@ -30,7 +30,7 @@ import { UUID } from './classes/UUID'; import { Vector3 } from './classes/Vector3'; import { RegionHandshakeMessage } from './classes/messages/RegionHandshake'; import { AgentMovementCompleteMessage } from './classes/messages/AgentMovementComplete'; -import { Subscription } from 'rxjs/internal/Subscription'; +import { Subscription } from 'rxjs'; import Timer = NodeJS.Timer; export class Bot diff --git a/lib/classes/Caps.ts b/lib/classes/Caps.ts index 311b118..2cfe6cc 100644 --- a/lib/classes/Caps.ts +++ b/lib/classes/Caps.ts @@ -1,9 +1,9 @@ -import { Subscription } from 'rxjs/internal/Subscription'; +import { Subscription } from 'rxjs'; import { EventQueueClient } from './EventQueueClient'; import { UUID } from './UUID'; import { ClientEvents } from './ClientEvents'; import { Agent } from './Agent'; -import { Subject } from 'rxjs/internal/Subject'; +import { Subject } from 'rxjs'; import { ICapResponse } from './interfaces/ICapResponse'; import { HTTPAssets } from '../enums/HTTPAssets'; diff --git a/lib/classes/Circuit.ts b/lib/classes/Circuit.ts index 4ac1ae5..72eeb92 100644 --- a/lib/classes/Circuit.ts +++ b/lib/classes/Circuit.ts @@ -7,10 +7,10 @@ import { PacketAckMessage } from './messages/PacketAck'; import { Message } from '../enums/Message'; import { StartPingCheckMessage } from './messages/StartPingCheck'; import { CompletePingCheckMessage } from './messages/CompletePingCheck'; -import { Subscription } from 'rxjs/internal/Subscription'; -import { filter } from 'rxjs/operators'; +import { Subscription } from 'rxjs'; +import { filter } from 'rxjs/operators' import { FilterResponse } from '../enums/FilterResponse'; -import { Subject } from 'rxjs/internal/Subject'; +import { Subject } from 'rxjs'; import { TimeoutError } from './TimeoutError'; import { RequestXferMessage } from './messages/RequestXfer'; import { SendXferPacketMessage } from './messages/SendXferPacket'; @@ -65,10 +65,10 @@ export class Circuit lookupObject[id] = true; } - return this.onPacketReceived.pipe(filter((packet: Packet) => + return this.onPacketReceived.pipe(filter((packet: Packet): boolean => { - return lookupObject[packet.message.id] === true; - })).subscribe(callback); + return lookupObject[packet.message.id]; + }) as any).subscribe(callback as any); } sendMessage(message: MessageBase, flags: PacketFlags): number diff --git a/lib/classes/ClientEvents.ts b/lib/classes/ClientEvents.ts index 241bd82..980d4a7 100644 --- a/lib/classes/ClientEvents.ts +++ b/lib/classes/ClientEvents.ts @@ -1,4 +1,4 @@ -import { Subject } from 'rxjs/internal/Subject'; +import { Subject } from 'rxjs'; import { NewObjectEvent } from '../events/NewObjectEvent'; import { ObjectUpdatedEvent } from '../events/ObjectUpdatedEvent'; import { ObjectKilledEvent } from '../events/ObjectKilledEvent'; diff --git a/lib/classes/InventoryItem.ts b/lib/classes/InventoryItem.ts index 7d66fe4..c823807 100644 --- a/lib/classes/InventoryItem.ts +++ b/lib/classes/InventoryItem.ts @@ -242,6 +242,7 @@ export class InventoryItem item.inventoryType = InventoryType.Snapshot; break; case 'LSL': + case 'lsl': item.inventoryType = InventoryType.LSL; break; case 'attach': diff --git a/lib/classes/ObjectStoreLite.ts b/lib/classes/ObjectStoreLite.ts index 522d893..2674ea5 100644 --- a/lib/classes/ObjectStoreLite.ts +++ b/lib/classes/ObjectStoreLite.ts @@ -20,7 +20,7 @@ import { FilterResponse } from '../enums/FilterResponse'; import { ObjectSelectMessage } from './messages/ObjectSelect'; import { ObjectDeselectMessage } from './messages/ObjectDeselect'; import { Quaternion } from './Quaternion'; -import { Subscription } from 'rxjs/internal/Subscription'; +import { Subscription } from 'rxjs'; import { ExtraParams } from './public/ExtraParams'; import { ObjectPropertiesMessage } from './messages/ObjectProperties'; import { SelectedObjectEvent } from '../events/SelectedObjectEvent'; diff --git a/lib/classes/Region.ts b/lib/classes/Region.ts index f369e93..790b8f7 100644 --- a/lib/classes/Region.ts +++ b/lib/classes/Region.ts @@ -19,11 +19,11 @@ import * as Long from 'long'; import { Packet } from './Packet'; import { LayerDataMessage } from './messages/LayerData'; import { LayerType } from '../enums/LayerType'; -import { Subscription } from 'rxjs/internal/Subscription'; +import { Subscription } from 'rxjs'; import { BitPack } from './BitPack'; import * as builder from 'xmlbuilder'; import { SimAccessFlags } from '../enums/SimAccessFlags'; -import { Subject } from 'rxjs/internal/Subject'; +import { Subject } from 'rxjs'; import { ParcelDwellRequestMessage } from './messages/ParcelDwellRequest'; import { ParcelDwellReplyMessage } from './messages/ParcelDwellReply'; import { Parcel } from './public/Parcel'; diff --git a/lib/classes/commands/FriendCommands.ts b/lib/classes/commands/FriendCommands.ts index 69ceb2b..c4dad9f 100644 --- a/lib/classes/commands/FriendCommands.ts +++ b/lib/classes/commands/FriendCommands.ts @@ -2,7 +2,7 @@ import { CommandsBase } from './CommandsBase'; import { Region } from '../Region'; import { Agent } from '../Agent'; import { Bot } from '../../Bot'; -import { Subscription } from 'rxjs/internal/Subscription'; +import { Subscription } from 'rxjs'; import { Message } from '../../enums/Message'; import { Packet } from '../Packet'; import { OnlineNotificationMessage } from '../messages/OnlineNotification'; diff --git a/lib/classes/commands/TeleportCommands.ts b/lib/classes/commands/TeleportCommands.ts index 65f716b..caae328 100644 --- a/lib/classes/commands/TeleportCommands.ts +++ b/lib/classes/commands/TeleportCommands.ts @@ -6,7 +6,7 @@ import { Vector3 } from '../Vector3'; import { TeleportLocationRequestMessage } from '../messages/TeleportLocationRequest'; import * as Long from 'long'; import { Agent } from '../Agent'; -import { Subscription } from 'rxjs/internal/Subscription'; +import { Subscription } from 'rxjs'; import { TeleportEvent } from '../../events/TeleportEvent'; import { LureEvent } from '../../events/LureEvent'; import { TeleportFlags } from '../../enums/TeleportFlags'; diff --git a/lib/classes/public/GameObject.ts b/lib/classes/public/GameObject.ts index 6918256..dd17c79 100644 --- a/lib/classes/public/GameObject.ts +++ b/lib/classes/public/GameObject.ts @@ -1019,10 +1019,6 @@ export class GameObject implements IGameObjectData case 'inv_item': this.inventory.push(InventoryItem.fromAsset(lineObj, this, this.region.agent)); break; - default: - { - console.log('Unrecognised task inventory token: [' + result.key + ']'); - } } } } diff --git a/package-lock.json b/package-lock.json index 2e928b3..58cc63f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.5.25", "license": "MIT", "dependencies": { - "@caspertech/llsd": "^1.0.4", + "@caspertech/llsd": "^1.0.5", "@types/long": "^4.0.1", "@types/mocha": "^9.0.0", "@types/request": "^2.48.7", @@ -161,12 +161,12 @@ } }, "node_modules/@caspertech/llsd": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@caspertech/llsd/-/llsd-1.0.4.tgz", - "integrity": "sha512-zfRgIxbUHd/OddxPzKiqqXusHppEZ415hWQ+PZkrujT7kP0F3gkZ09CFO3mNEpCu7uX4kUgXx3+/Kq8zPWleNA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@caspertech/llsd/-/llsd-1.0.5.tgz", + "integrity": "sha512-IOOGYgrL7ACMDYnA3tkN/NFJbu3z0XvddY2hmS+632nPp2kHIhtulMyw45gwRzpMwNNBtoFr9OxT8MOLZPHhiw==", "dependencies": { - "abab": "^2.0.5", - "xmldom": "^0.6.0" + "@xmldom/xmldom": "^0.7.5", + "abab": "^2.0.5" } }, "node_modules/@cspotcode/source-map-consumer": { @@ -329,6 +329,14 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "node_modules/@xmldom/xmldom": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz", + "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -2542,14 +2550,6 @@ "node": ">=8.0" } }, - "node_modules/xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==", - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/xmlrpc": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/xmlrpc/-/xmlrpc-1.3.2.tgz", @@ -2779,12 +2779,12 @@ } }, "@caspertech/llsd": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@caspertech/llsd/-/llsd-1.0.4.tgz", - "integrity": "sha512-zfRgIxbUHd/OddxPzKiqqXusHppEZ415hWQ+PZkrujT7kP0F3gkZ09CFO3mNEpCu7uX4kUgXx3+/Kq8zPWleNA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@caspertech/llsd/-/llsd-1.0.5.tgz", + "integrity": "sha512-IOOGYgrL7ACMDYnA3tkN/NFJbu3z0XvddY2hmS+632nPp2kHIhtulMyw45gwRzpMwNNBtoFr9OxT8MOLZPHhiw==", "requires": { - "abab": "^2.0.5", - "xmldom": "^0.6.0" + "@xmldom/xmldom": "^0.7.5", + "abab": "^2.0.5" } }, "@cspotcode/source-map-consumer": { @@ -2941,6 +2941,11 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "@xmldom/xmldom": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz", + "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==" + }, "abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -4648,11 +4653,6 @@ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==" }, - "xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==" - }, "xmlrpc": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/xmlrpc/-/xmlrpc-1.3.2.tgz", diff --git a/package.json b/package.json index b4e54ab..9b9ef3f 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "typescript": "^4.4.3" }, "dependencies": { - "@caspertech/llsd": "^1.0.4", + "@caspertech/llsd": "^1.0.5", "@types/long": "^4.0.1", "@types/mocha": "^9.0.0", "@types/request": "^2.48.7", diff --git a/tslint.json b/tslint.json index dac1a32..754a020 100644 --- a/tslint.json +++ b/tslint.json @@ -12,7 +12,6 @@ "curly": true, "eofline": true, "forin": true, - "import-blacklist": [true, "rxjs"], "import-spacing": true, "indent": [ true,