From 6e4bcea4fd64600153b14ff996d499db2007486b Mon Sep 17 00:00:00 2001 From: Dank074 Date: Fri, 30 Jul 2021 20:30:27 -0500 Subject: [PATCH] added incoming camera packets --- src/nitro/communication/NitroMessages.ts | 34 +++++++------- .../messages/incoming/IncomingHeader.ts | 11 ++--- .../camera/CameraPublishStatusMessageEvent.ts | 16 +++++++ .../camera/CameraPurchaseOKMessageEvent.ts | 16 +++++++ .../camera/CameraStorageUrlMessageEvent.ts | 16 +++++++ .../camera/CompetitionStatusMessageEvent.ts | 16 +++++++ .../incoming/camera/InitCameraMessageEvent.ts | 16 +++++++ .../camera/ThumbnailStatusMessageEvent.ts | 16 +++++++ .../messages/incoming/camera/index.ts | 6 +++ .../communication/messages/incoming/index.ts | 2 +- .../RoomWidgetCameraConfigurationEvent.ts | 16 ------- .../camera/RoomWidgetCameraPublishedEvent.ts | 16 ------- ...RoomWidgetCameraPurchaseSuccessfulEvent.ts | 16 ------- .../messages/incoming/room/camera/index.ts | 3 -- .../messages/incoming/room/index.ts | 1 - .../messages/outgoing/OutgoingHeader.ts | 5 --- .../RoomWidgetCameraConfigurationComposer.ts | 21 --------- .../camera/RoomWidgetCameraPublishComposer.ts | 21 --------- .../RoomWidgetCameraPurchaseComposer.ts | 21 --------- .../RoomWidgetCameraRoomPictureComposer.ts | 21 --------- .../RoomWidgetCameraRoomThumbnailComposer.ts | 21 --------- .../messages/outgoing/room/camera/index.ts | 5 --- .../messages/outgoing/room/index.ts | 1 - .../CameraPublishStatusMessageParser.ts | 44 +++++++++++++++++++ .../camera/CameraPurchaseOKMessageParser.ts | 15 +++++++ .../camera/CameraStorageUrlMessageParser.ts | 24 ++++++++++ .../camera/CompetitionStatusMessageParser.ts | 33 ++++++++++++++ .../parser/camera/InitCameraMessageParser.ts | 44 +++++++++++++++++++ .../camera/ThumbnailStatusMessageParser.ts | 36 +++++++++++++++ .../messages/parser/camera/index.ts | 6 +++ .../communication/messages/parser/index.ts | 1 + .../RoomWidgetCameraConfigurationParser.ts | 44 ------------------- .../camera/RoomWidgetCameraPublishedParser.ts | 44 ------------------- ...oomWidgetCameraPurchaseSuccessfulParser.ts | 17 ------- .../messages/parser/room/camera/index.ts | 3 -- .../messages/parser/room/index.ts | 1 - 36 files changed, 327 insertions(+), 302 deletions(-) create mode 100644 src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/camera/index.ts delete mode 100644 src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraConfigurationEvent.ts delete mode 100644 src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraPublishedEvent.ts delete mode 100644 src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraPurchaseSuccessfulEvent.ts delete mode 100644 src/nitro/communication/messages/incoming/room/camera/index.ts delete mode 100644 src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraConfigurationComposer.ts delete mode 100644 src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraPublishComposer.ts delete mode 100644 src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraPurchaseComposer.ts delete mode 100644 src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraRoomPictureComposer.ts delete mode 100644 src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraRoomThumbnailComposer.ts delete mode 100644 src/nitro/communication/messages/outgoing/room/camera/index.ts create mode 100644 src/nitro/communication/messages/parser/camera/CameraPublishStatusMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/camera/CameraPurchaseOKMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/camera/CameraStorageUrlMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/camera/CompetitionStatusMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/camera/InitCameraMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/camera/ThumbnailStatusMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/camera/index.ts delete mode 100644 src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraConfigurationParser.ts delete mode 100644 src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraPublishedParser.ts delete mode 100644 src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraPurchaseSuccessfulParser.ts delete mode 100644 src/nitro/communication/messages/parser/room/camera/index.ts diff --git a/src/nitro/communication/NitroMessages.ts b/src/nitro/communication/NitroMessages.ts index c6347dfc..efe3073f 100644 --- a/src/nitro/communication/NitroMessages.ts +++ b/src/nitro/communication/NitroMessages.ts @@ -1,6 +1,12 @@ import { IMessageConfiguration } from '../../core/communication/messages/IMessageConfiguration'; -import { ApproveNameMessageComposer, BadgeReceivedEvent, BonusRareInfoMessageEvent, CatalogApproveNameResultEvent, ChangeUserNameResultMessageEvent, FurnitureGuildInfoComposer, GetBonusRareInfoMessageComposer, MysteryBoxKeysEvent, PetExperienceEvent, PetMountComposer, PetSupplementComposer, RemovePetSaddleComposer, RoomUnitGiveHandItemPetComposer, RoomWidgetCameraPublishedEvent, RoomWidgetCameraPurchaseComposer, SellablePetPalettesEvent, TogglePetBreedingComposer, TogglePetRidingComposer, UnseenResetCategoryComposer, UnseenResetItemsComposer, UsePetProductComposer } from './messages'; +import { ApproveNameMessageComposer, BadgeReceivedEvent, BonusRareInfoMessageEvent, CatalogApproveNameResultEvent, ChangeUserNameResultMessageEvent, FurnitureGuildInfoComposer, GetBonusRareInfoMessageComposer, MysteryBoxKeysEvent, PetExperienceEvent, PetMountComposer, PetSupplementComposer, RemovePetSaddleComposer, RoomUnitGiveHandItemPetComposer, SellablePetPalettesEvent, TogglePetBreedingComposer, TogglePetRidingComposer, UnseenResetCategoryComposer, UnseenResetItemsComposer, UsePetProductComposer } from './messages'; import { AvailabilityStatusMessageEvent } from './messages/incoming/availability/AvailabilityStatusMessageEvent'; +import { CameraPublishStatusMessageEvent } from './messages/incoming/camera/CameraPublishStatusMessageEvent'; +import { CameraPurchaseOKMessageEvent } from './messages/incoming/camera/CameraPurchaseOKMessageEvent'; +import { CameraStorageUrlMessageEvent } from './messages/incoming/camera/CameraStorageUrlMessageEvent'; +import { CompetitionStatusMessageEvent } from './messages/incoming/camera/CompetitionStatusMessageEvent'; +import { InitCameraMessageEvent } from './messages/incoming/camera/InitCameraMessageEvent'; +import { ThumbnailStatusMessageEvent } from './messages/incoming/camera/ThumbnailStatusMessageEvent'; import { CatalogClubEvent } from './messages/incoming/catalog/CatalogClubEvent'; import { CatalogClubGiftsEvent } from './messages/incoming/catalog/CatalogClubGiftsEvent'; import { CatalogGiftConfigurationEvent } from './messages/incoming/catalog/CatalogGiftConfigurationEvent'; @@ -138,8 +144,6 @@ import { RoomEnterErrorEvent } from './messages/incoming/room/access/RoomEnterEr import { RoomEnterEvent } from './messages/incoming/room/access/RoomEnterEvent'; import { RoomForwardEvent } from './messages/incoming/room/access/RoomForwardEvent'; import { BotCommandConfigurationEvent } from './messages/incoming/room/bots/BotCommandConfigurationEvent'; -import { RoomWidgetCameraConfigurationEvent } from './messages/incoming/room/camera/RoomWidgetCameraConfigurationEvent'; -import { RoomWidgetCameraPurchaseSuccessfulEvent } from './messages/incoming/room/camera/RoomWidgetCameraPurchaseSuccessfulEvent'; import { RoomBannedUsersEvent } from './messages/incoming/room/data/RoomBannedUsersEvent'; import { RoomChatSettingsEvent } from './messages/incoming/room/data/RoomChatSettingsEvent'; import { RoomInfoEvent } from './messages/incoming/room/data/RoomInfoEvent'; @@ -369,10 +373,6 @@ import { RoomStaffPickComposer } from './messages/outgoing/room/action/RoomStaff import { RoomTakeRightsComposer } from './messages/outgoing/room/action/RoomTakeRightsComposer'; import { RoomUnbanUserComposer } from './messages/outgoing/room/action/RoomUnbanUserComposer'; import { RequestBotCommandConfigurationComposer } from './messages/outgoing/room/bots/RequestBotConfigurationComposer'; -import { RoomWidgetCameraConfigurationComposer } from './messages/outgoing/room/camera/RoomWidgetCameraConfigurationComposer'; -import { RoomWidgetCameraPublishComposer } from './messages/outgoing/room/camera/RoomWidgetCameraPublishComposer'; -import { RoomWidgetCameraRoomPictureComposer } from './messages/outgoing/room/camera/RoomWidgetCameraRoomPictureComposer'; -import { RoomWidgetCameraRoomThumbnailComposer } from './messages/outgoing/room/camera/RoomWidgetCameraRoomThumbnailComposer'; import { RoomBannedUsersComposer } from './messages/outgoing/room/data/RoomBannedUsersComposer'; import { RoomInfoComposer } from './messages/outgoing/room/data/RoomInfoComposer'; import { RoomSettingsComposer } from './messages/outgoing/room/data/RoomSettingsComposer'; @@ -504,11 +504,6 @@ export class NitroMessages implements IMessageConfiguration this._events.set(IncomingHeader.CATALOG_APPROVE_NAME_RESULT, CatalogApproveNameResultEvent); this._events.set(IncomingHeader.BONUS_RARE_INFO, BonusRareInfoMessageEvent); - // CAMERA - this._events.set(IncomingHeader.CAMERA_PRICE, RoomWidgetCameraConfigurationEvent); - this._events.set(IncomingHeader.CAMERA_PUBLISHED, RoomWidgetCameraPublishedEvent); - this._events.set(IncomingHeader.CAMERA_PURCHASE_SUCCESSFUL, RoomWidgetCameraPurchaseSuccessfulEvent); - // CLIENT this._events.set(IncomingHeader.CLIENT_PING, ClientPingEvent); @@ -816,6 +811,14 @@ export class NitroMessages implements IMessageConfiguration this._events.set(IncomingHeader.CRAFTING_RECIPE, CraftingRecipeEvent); this._events.set(IncomingHeader.CRAFTING_RECIPES_AVAILABLE, CraftingRecipesAvailableEvent); this._events.set(IncomingHeader.CRAFTING_RESULT, CraftingResultEvent); + + // CAMERA + this._events.set(IncomingHeader.CAMERA_PUBLISH_STATUS, CameraPublishStatusMessageEvent); + this._events.set(IncomingHeader.CAMERA_PURCHASE_OK, CameraPurchaseOKMessageEvent); + this._events.set(IncomingHeader.CAMERA_STORAGE_URL, CameraStorageUrlMessageEvent); + this._events.set(IncomingHeader.COMPETITION_STATUS, CompetitionStatusMessageEvent); + this._events.set(IncomingHeader.INIT_CAMERA, InitCameraMessageEvent); + this._events.set(IncomingHeader.THUMBNAIL_STATUS, ThumbnailStatusMessageEvent); } private registerComposers(): void @@ -839,13 +842,6 @@ export class NitroMessages implements IMessageConfiguration this._composers.set(OutgoingHeader.CATALOG_REQUESET_PET_BREEDS, CatalogRequestPetBreedsComposer); this._composers.set(OutgoingHeader.GET_BONUS_RARE_INFO, GetBonusRareInfoMessageComposer); - // CAMERA - this._composers.set(OutgoingHeader.CAMERA_PRICE, RoomWidgetCameraConfigurationComposer); - this._composers.set(OutgoingHeader.CAMERA_PUBLISH, RoomWidgetCameraPublishComposer); - this._composers.set(OutgoingHeader.CAMERA_PURCHASE, RoomWidgetCameraPurchaseComposer); - this._composers.set(OutgoingHeader.CAMERA_SAVE, RoomWidgetCameraRoomPictureComposer); - this._composers.set(OutgoingHeader.CAMERA_THUMBNAIL, RoomWidgetCameraRoomThumbnailComposer); - // CLIENT this._composers.set(OutgoingHeader.CLIENT_PONG, ClientPongComposer); this._composers.set(OutgoingHeader.RELEASE_VERSION, ClientReleaseVersionComposer); diff --git a/src/nitro/communication/messages/incoming/IncomingHeader.ts b/src/nitro/communication/messages/incoming/IncomingHeader.ts index 9e2e3637..ade297bf 100644 --- a/src/nitro/communication/messages/incoming/IncomingHeader.ts +++ b/src/nitro/communication/messages/incoming/IncomingHeader.ts @@ -5,11 +5,6 @@ export class IncomingHeader public static AUTHENTICATION = -1; public static AVAILABILITY_STATUS = 2033; public static BUILDERS_CLUB_EXPIRED = 1452; - public static CAMERA_PRICE = 3878; - public static CAMERA_PUBLISHED = 2057; - public static CAMERA_PURCHASE_SUCCESSFUL = 2783; - public static CAMERA_THUMBNAIL_SAVED = 3595; - public static CAMERA_URL = 3696; public static CATALOG_CLUB = 2405; public static CATALOG_MODE = 3828; public static CATALOG_PAGE = 804; @@ -270,4 +265,10 @@ export class IncomingHeader public static CRAFTING_RECIPE = 2774; public static CRAFTING_RECIPES_AVAILABLE = 2124; public static CRAFTING_RESULT = 618; + public static CAMERA_PUBLISH_STATUS = 2057; + public static CAMERA_PURCHASE_OK = 2783; + public static CAMERA_STORAGE_URL = 3696; + public static COMPETITION_STATUS = 133; + public static INIT_CAMERA = 3878; + public static THUMBNAIL_STATUS = 3595; } diff --git a/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts new file mode 100644 index 00000000..88150612 --- /dev/null +++ b/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts @@ -0,0 +1,16 @@ +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { CameraPublishStatusMessageParser } from '../../parser/camera/CameraPublishStatusMessageParser'; + +export class CameraPublishStatusMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, CameraPublishStatusMessageParser); + } + + public getParser(): CameraPublishStatusMessageParser + { + return this.parser as CameraPublishStatusMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts new file mode 100644 index 00000000..dac28290 --- /dev/null +++ b/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts @@ -0,0 +1,16 @@ +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { CameraPurchaseOKMessageParser } from '../../parser/camera/CameraPurchaseOKMessageParser'; + +export class CameraPurchaseOKMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, CameraPurchaseOKMessageParser); + } + + public getParser(): CameraPurchaseOKMessageParser + { + return this.parser as CameraPurchaseOKMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts new file mode 100644 index 00000000..1d29fea0 --- /dev/null +++ b/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts @@ -0,0 +1,16 @@ +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { CameraStorageUrlMessageParser } from '../../parser/camera/CameraStorageUrlMessageParser'; + +export class CameraStorageUrlMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, CameraStorageUrlMessageParser); + } + + public getParser(): CameraStorageUrlMessageParser + { + return this.parser as CameraStorageUrlMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts new file mode 100644 index 00000000..2c87c7b8 --- /dev/null +++ b/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts @@ -0,0 +1,16 @@ +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { CompetitionStatusMessageParser } from '../../parser/camera/CompetitionStatusMessageParser'; + +export class CompetitionStatusMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, CompetitionStatusMessageParser); + } + + public getParser(): CompetitionStatusMessageParser + { + return this.parser as CompetitionStatusMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts new file mode 100644 index 00000000..50a36acd --- /dev/null +++ b/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts @@ -0,0 +1,16 @@ +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { InitCameraMessageParser } from '../../parser/camera/InitCameraMessageParser'; + +export class InitCameraMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, InitCameraMessageParser); + } + + public getParser(): InitCameraMessageParser + { + return this.parser as InitCameraMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts new file mode 100644 index 00000000..f48dd727 --- /dev/null +++ b/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts @@ -0,0 +1,16 @@ +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; +import { ThumbnailStatusMessageParser } from '../../parser/camera/ThumbnailStatusMessageParser'; + +export class ThumbnailStatusMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, ThumbnailStatusMessageParser); + } + + public getParser(): ThumbnailStatusMessageParser + { + return this.parser as ThumbnailStatusMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/camera/index.ts b/src/nitro/communication/messages/incoming/camera/index.ts new file mode 100644 index 00000000..c89e0136 --- /dev/null +++ b/src/nitro/communication/messages/incoming/camera/index.ts @@ -0,0 +1,6 @@ +export * from './CameraPublishStatusMessageEvent'; +export * from './CameraPurchaseOKMessageEvent'; +export * from './CameraStorageUrlMessageEvent'; +export * from './CompetitionStatusMessageEvent'; +export * from './InitCameraMessageEvent'; +export * from './ThumbnailStatusMessageEvent'; diff --git a/src/nitro/communication/messages/incoming/index.ts b/src/nitro/communication/messages/incoming/index.ts index 9cd40fbc..5f682b50 100644 --- a/src/nitro/communication/messages/incoming/index.ts +++ b/src/nitro/communication/messages/incoming/index.ts @@ -1,5 +1,6 @@ export * from './availability'; export * from './avatar'; +export * from './camera'; export * from './catalog'; export * from './catalog/marketplace'; export * from './client'; @@ -34,7 +35,6 @@ export * from './room/access'; export * from './room/access/doorbell'; export * from './room/access/rights'; export * from './room/bots'; -export * from './room/camera'; export * from './room/data'; export * from './room/engine'; export * from './room/furniture'; diff --git a/src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraConfigurationEvent.ts b/src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraConfigurationEvent.ts deleted file mode 100644 index 2c7293ef..00000000 --- a/src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraConfigurationEvent.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { IMessageEvent } from '../../../../../../core/communication/messages/IMessageEvent'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; -import { RoomWidgetCameraConfigurationParser } from '../../../parser/room/camera/RoomWidgetCameraConfigurationParser'; - -export class RoomWidgetCameraConfigurationEvent extends MessageEvent implements IMessageEvent -{ - constructor(callBack: Function) - { - super(callBack, RoomWidgetCameraConfigurationParser); - } - - public getParser(): RoomWidgetCameraConfigurationParser - { - return this.parser as RoomWidgetCameraConfigurationParser; - } -} diff --git a/src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraPublishedEvent.ts b/src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraPublishedEvent.ts deleted file mode 100644 index dac2a890..00000000 --- a/src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraPublishedEvent.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { IMessageEvent } from '../../../../../../core/communication/messages/IMessageEvent'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; -import { RoomWidgetCameraPublishedParser } from '../../../parser/room/camera/RoomWidgetCameraPublishedParser'; - -export class RoomWidgetCameraPublishedEvent extends MessageEvent implements IMessageEvent -{ - constructor(callBack: Function) - { - super(callBack, RoomWidgetCameraPublishedParser); - } - - public getParser(): RoomWidgetCameraPublishedParser - { - return this.parser as RoomWidgetCameraPublishedParser; - } -} diff --git a/src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraPurchaseSuccessfulEvent.ts b/src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraPurchaseSuccessfulEvent.ts deleted file mode 100644 index eb153983..00000000 --- a/src/nitro/communication/messages/incoming/room/camera/RoomWidgetCameraPurchaseSuccessfulEvent.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { IMessageEvent } from '../../../../../../core/communication/messages/IMessageEvent'; -import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent'; -import { RoomWidgetCameraPurchaseSuccessfulParser } from '../../../parser/room/camera/RoomWidgetCameraPurchaseSuccessfulParser'; - -export class RoomWidgetCameraPurchaseSuccessfulEvent extends MessageEvent implements IMessageEvent -{ - constructor(callBack: Function) - { - super(callBack, RoomWidgetCameraPurchaseSuccessfulParser); - } - - public getParser(): RoomWidgetCameraPurchaseSuccessfulParser - { - return this.parser as RoomWidgetCameraPurchaseSuccessfulParser; - } -} diff --git a/src/nitro/communication/messages/incoming/room/camera/index.ts b/src/nitro/communication/messages/incoming/room/camera/index.ts deleted file mode 100644 index b1984472..00000000 --- a/src/nitro/communication/messages/incoming/room/camera/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './RoomWidgetCameraConfigurationEvent'; -export * from './RoomWidgetCameraPublishedEvent'; -export * from './RoomWidgetCameraPurchaseSuccessfulEvent'; diff --git a/src/nitro/communication/messages/incoming/room/index.ts b/src/nitro/communication/messages/incoming/room/index.ts index 0af11081..e692b601 100644 --- a/src/nitro/communication/messages/incoming/room/index.ts +++ b/src/nitro/communication/messages/incoming/room/index.ts @@ -1,6 +1,5 @@ export * from './access'; export * from './bots'; -export * from './camera'; export * from './data'; export * from './engine'; export * from './furniture'; diff --git a/src/nitro/communication/messages/outgoing/OutgoingHeader.ts b/src/nitro/communication/messages/outgoing/OutgoingHeader.ts index dafeec4b..5d152c36 100644 --- a/src/nitro/communication/messages/outgoing/OutgoingHeader.ts +++ b/src/nitro/communication/messages/outgoing/OutgoingHeader.ts @@ -6,11 +6,6 @@ export class OutgoingHeader public static BOT_PICKUP = 3323; public static BOT_PLACE = 1592; public static BOT_SKILL_SAVE = 2624; - public static CAMERA_PRICE = 796; - public static CAMERA_PUBLISH = 2068; - public static CAMERA_PURCHASE = 2408; - public static CAMERA_SAVE = 3226; - public static CAMERA_THUMBNAIL = 1982; public static CATALOG_CLUB = 3285; public static CATALOG_CLUB_GIFTS = 487; public static CATALOG_MODE = 1195; diff --git a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraConfigurationComposer.ts b/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraConfigurationComposer.ts deleted file mode 100644 index 6f47811f..00000000 --- a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraConfigurationComposer.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer'; - -export class RoomWidgetCameraConfigurationComposer implements IMessageComposer> -{ - private _data: ConstructorParameters; - - constructor() - { - this._data = []; - } - - public getMessageArray() - { - return this._data; - } - - public dispose(): void - { - return; - } -} diff --git a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraPublishComposer.ts b/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraPublishComposer.ts deleted file mode 100644 index 586ce45a..00000000 --- a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraPublishComposer.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer'; - -export class RoomWidgetCameraPublishComposer implements IMessageComposer> -{ - private _data: ConstructorParameters; - - constructor() - { - this._data = []; - } - - public getMessageArray() - { - return this._data; - } - - public dispose(): void - { - return; - } -} diff --git a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraPurchaseComposer.ts b/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraPurchaseComposer.ts deleted file mode 100644 index eaae2502..00000000 --- a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraPurchaseComposer.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer'; - -export class RoomWidgetCameraPurchaseComposer implements IMessageComposer> -{ - private _data: ConstructorParameters; - - constructor() - { - this._data = []; - } - - public getMessageArray() - { - return this._data; - } - - public dispose(): void - { - return; - } -} diff --git a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraRoomPictureComposer.ts b/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraRoomPictureComposer.ts deleted file mode 100644 index e353dc4b..00000000 --- a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraRoomPictureComposer.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer'; - -export class RoomWidgetCameraRoomPictureComposer implements IMessageComposer> -{ - private _data: ConstructorParameters; - - constructor(unknownFloat: number, image: number[]) - { - this._data = [ unknownFloat, image ]; - } - - public getMessageArray() - { - return this._data; - } - - public dispose(): void - { - return; - } -} diff --git a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraRoomThumbnailComposer.ts b/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraRoomThumbnailComposer.ts deleted file mode 100644 index 99ca2682..00000000 --- a/src/nitro/communication/messages/outgoing/room/camera/RoomWidgetCameraRoomThumbnailComposer.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer'; - -export class RoomWidgetCameraRoomThumbnailComposer implements IMessageComposer> -{ - private _data: ConstructorParameters; - - constructor(unknownFloat: number, image: number[]) - { - this._data = [ unknownFloat, image ]; - } - - public getMessageArray() - { - return this._data; - } - - public dispose(): void - { - return; - } -} diff --git a/src/nitro/communication/messages/outgoing/room/camera/index.ts b/src/nitro/communication/messages/outgoing/room/camera/index.ts deleted file mode 100644 index bfad4dc9..00000000 --- a/src/nitro/communication/messages/outgoing/room/camera/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './RoomWidgetCameraConfigurationComposer'; -export * from './RoomWidgetCameraPublishComposer'; -export * from './RoomWidgetCameraPurchaseComposer'; -export * from './RoomWidgetCameraRoomPictureComposer'; -export * from './RoomWidgetCameraRoomThumbnailComposer'; diff --git a/src/nitro/communication/messages/outgoing/room/index.ts b/src/nitro/communication/messages/outgoing/room/index.ts index 48d479c2..4b101b0e 100644 --- a/src/nitro/communication/messages/outgoing/room/index.ts +++ b/src/nitro/communication/messages/outgoing/room/index.ts @@ -1,7 +1,6 @@ export * from './access'; export * from './action'; export * from './bots'; -export * from './camera'; export * from './data'; export * from './engine'; export * from './furniture'; diff --git a/src/nitro/communication/messages/parser/camera/CameraPublishStatusMessageParser.ts b/src/nitro/communication/messages/parser/camera/CameraPublishStatusMessageParser.ts new file mode 100644 index 00000000..0b42becd --- /dev/null +++ b/src/nitro/communication/messages/parser/camera/CameraPublishStatusMessageParser.ts @@ -0,0 +1,44 @@ +import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper'; +import { IMessageParser } from './../../../../../core/communication/messages/IMessageParser'; + +export class CameraPublishStatusMessageParser implements IMessageParser +{ + private _ok: boolean = false; + private _secondsToWait: number = 0; + private _extraDataId: string; + + + public isOk(): boolean + { + return this._ok; + } + + public getSecondsToWait(): number + { + return this._secondsToWait; + } + + public getExtraDataId(): string + { + return this._extraDataId; + } + + public flush(): boolean + { + this._ok = false; + this._secondsToWait = 0; + this._extraDataId = null; + return true; + } + + public parse(k: IMessageDataWrapper): boolean + { + this._ok = k.readBoolean(); + this._secondsToWait = k.readInt(); + if(((this._ok) && (k.bytesAvailable))) + { + this._extraDataId = k.readString(); + } + return true; + } +} diff --git a/src/nitro/communication/messages/parser/camera/CameraPurchaseOKMessageParser.ts b/src/nitro/communication/messages/parser/camera/CameraPurchaseOKMessageParser.ts new file mode 100644 index 00000000..5581d07b --- /dev/null +++ b/src/nitro/communication/messages/parser/camera/CameraPurchaseOKMessageParser.ts @@ -0,0 +1,15 @@ +import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper'; +import { IMessageParser } from './../../../../../core/communication/messages/IMessageParser'; + +export class CameraPurchaseOKMessageParser implements IMessageParser +{ + public flush():boolean + { + return true; + } + + public parse(k:IMessageDataWrapper):boolean + { + return true; + } +} diff --git a/src/nitro/communication/messages/parser/camera/CameraStorageUrlMessageParser.ts b/src/nitro/communication/messages/parser/camera/CameraStorageUrlMessageParser.ts new file mode 100644 index 00000000..47de4a80 --- /dev/null +++ b/src/nitro/communication/messages/parser/camera/CameraStorageUrlMessageParser.ts @@ -0,0 +1,24 @@ +import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper'; +import { IMessageParser } from './../../../../../core/communication/messages/IMessageParser'; + +export class CameraStorageUrlMessageParser implements IMessageParser +{ + private _url:string; + + public get url():string + { + return this._url; + } + + public flush():boolean + { + this._url = ''; + return true; + } + + public parse(k:IMessageDataWrapper):boolean + { + this._url = k.readString(); + return true; + } +} diff --git a/src/nitro/communication/messages/parser/camera/CompetitionStatusMessageParser.ts b/src/nitro/communication/messages/parser/camera/CompetitionStatusMessageParser.ts new file mode 100644 index 00000000..6c4f1148 --- /dev/null +++ b/src/nitro/communication/messages/parser/camera/CompetitionStatusMessageParser.ts @@ -0,0 +1,33 @@ +import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper'; +import { IMessageParser } from './../../../../../core/communication/messages/IMessageParser'; + +export class CompetitionStatusMessageParser implements IMessageParser +{ + private _ok:boolean = false; + private _errorReason:string = null; + + + public isOk():boolean + { + return this._ok; + } + + public getErrorReason():string + { + return this._errorReason; + } + + public flush():boolean + { + this._ok = false; + this._errorReason = null; + return true; + } + + public parse(k:IMessageDataWrapper):boolean + { + this._ok = k.readBoolean(); + this._errorReason = k.readString(); + return true; + } +} diff --git a/src/nitro/communication/messages/parser/camera/InitCameraMessageParser.ts b/src/nitro/communication/messages/parser/camera/InitCameraMessageParser.ts new file mode 100644 index 00000000..9ad61abd --- /dev/null +++ b/src/nitro/communication/messages/parser/camera/InitCameraMessageParser.ts @@ -0,0 +1,44 @@ +import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper'; +import { IMessageParser } from './../../../../../core/communication/messages/IMessageParser'; + +export class InitCameraMessageParser implements IMessageParser +{ + private _creditPrice:number = 0; + private _ducketPrice:number = 0; + private _publishDucketPrice:number = 0; + + + public getCreditPrice():number + { + return this._creditPrice; + } + + public getDucketPrice():number + { + return this._ducketPrice; + } + + public getPublishDucketPrice():number + { + return this._publishDucketPrice; + } + + public flush():boolean + { + this._creditPrice = 0; + this._ducketPrice = 0; + this._publishDucketPrice = 0; + return true; + } + + public parse(k:IMessageDataWrapper):boolean + { + this._creditPrice = k.readInt(); + this._ducketPrice = k.readInt(); + if(k.bytesAvailable) + { + this._publishDucketPrice = k.readInt(); + } + return true; + } +} diff --git a/src/nitro/communication/messages/parser/camera/ThumbnailStatusMessageParser.ts b/src/nitro/communication/messages/parser/camera/ThumbnailStatusMessageParser.ts new file mode 100644 index 00000000..226c9569 --- /dev/null +++ b/src/nitro/communication/messages/parser/camera/ThumbnailStatusMessageParser.ts @@ -0,0 +1,36 @@ +import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper'; +import { IMessageParser } from './../../../../../core/communication/messages/IMessageParser'; + +export class ThumbnailStatusMessageParser implements IMessageParser +{ + private _ok:boolean = true; + private _renderLimitHit:boolean = false; + + + public isOk():boolean + { + return this._ok; + } + + public isRenderLimitHit():boolean + { + return this._renderLimitHit; + } + + public flush():boolean + { + this._ok = true; + this._renderLimitHit = false; + return true; + } + + public parse(k:IMessageDataWrapper):boolean + { + if(k.bytesAvailable) + { + this._ok = k.readBoolean(); + this._renderLimitHit = k.readBoolean(); + } + return true; + } +} diff --git a/src/nitro/communication/messages/parser/camera/index.ts b/src/nitro/communication/messages/parser/camera/index.ts new file mode 100644 index 00000000..faa48002 --- /dev/null +++ b/src/nitro/communication/messages/parser/camera/index.ts @@ -0,0 +1,6 @@ +export * from './CameraPublishStatusMessageParser'; +export * from './CameraPurchaseOKMessageParser'; +export * from './CameraStorageUrlMessageParser'; +export * from './CompetitionStatusMessageParser'; +export * from './InitCameraMessageParser'; +export * from './ThumbnailStatusMessageParser'; diff --git a/src/nitro/communication/messages/parser/index.ts b/src/nitro/communication/messages/parser/index.ts index 821f7d5f..f9898c17 100644 --- a/src/nitro/communication/messages/parser/index.ts +++ b/src/nitro/communication/messages/parser/index.ts @@ -1,5 +1,6 @@ export * from './availability'; export * from './avatar'; +export * from './camera'; export * from './catalog'; export * from './client'; export * from './desktop'; diff --git a/src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraConfigurationParser.ts b/src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraConfigurationParser.ts deleted file mode 100644 index 9fd54e6c..00000000 --- a/src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraConfigurationParser.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { IMessageDataWrapper } from '../../../../../../core/communication/messages/IMessageDataWrapper'; -import { IMessageParser } from '../../../../../../core/communication/messages/IMessageParser'; - -export class RoomWidgetCameraConfigurationParser implements IMessageParser -{ - private _credits: number; - private _points: number; - private _pointsType: number; - - public flush(): boolean - { - this._credits = 0; - this._points = 0; - this._pointsType = 0; - - return true; - } - - public parse(wrapper: IMessageDataWrapper): boolean - { - if(!wrapper) return false; - - this._credits = wrapper.readInt(); - this._points = wrapper.readInt(); - this._pointsType = wrapper.readInt(); - - return true; - } - - public get credits(): number - { - return this._credits; - } - - public get points(): number - { - return this._points; - } - - public get pointsType(): number - { - return this._pointsType; - } -} diff --git a/src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraPublishedParser.ts b/src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraPublishedParser.ts deleted file mode 100644 index 4149d073..00000000 --- a/src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraPublishedParser.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { IMessageDataWrapper } from '../../../../../../core/communication/messages/IMessageDataWrapper'; -import { IMessageParser } from '../../../../../../core/communication/messages/IMessageParser'; - -export class RoomWidgetCameraPublishedParser implements IMessageParser -{ - private _wasSuccessful: boolean; - private _cooldownSeconds: number; - private _extraDataId: number; - - public flush(): boolean - { - this._wasSuccessful = false; - this._cooldownSeconds = 0; - this._extraDataId = 0; - - return true; - } - - public parse(wrapper: IMessageDataWrapper): boolean - { - if(!wrapper) return false; - - this._wasSuccessful = wrapper.readBoolean(); - this._cooldownSeconds = wrapper.readInt(); - this._extraDataId = wrapper.readInt(); - - return true; - } - - public get wasSuccessful(): boolean - { - return this._wasSuccessful; - } - - public get cooldownSeconds(): number - { - return this._cooldownSeconds; - } - - public get extraDataId(): number - { - return this._extraDataId; - } -} diff --git a/src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraPurchaseSuccessfulParser.ts b/src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraPurchaseSuccessfulParser.ts deleted file mode 100644 index 33a55829..00000000 --- a/src/nitro/communication/messages/parser/room/camera/RoomWidgetCameraPurchaseSuccessfulParser.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { IMessageDataWrapper } from '../../../../../../core/communication/messages/IMessageDataWrapper'; -import { IMessageParser } from '../../../../../../core/communication/messages/IMessageParser'; - -export class RoomWidgetCameraPurchaseSuccessfulParser implements IMessageParser -{ - public flush(): boolean - { - return true; - } - - public parse(wrapper: IMessageDataWrapper): boolean - { - if(!wrapper) return false; - - return true; - } -} diff --git a/src/nitro/communication/messages/parser/room/camera/index.ts b/src/nitro/communication/messages/parser/room/camera/index.ts deleted file mode 100644 index 32a976b4..00000000 --- a/src/nitro/communication/messages/parser/room/camera/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './RoomWidgetCameraConfigurationParser'; -export * from './RoomWidgetCameraPublishedParser'; -export * from './RoomWidgetCameraPurchaseSuccessfulParser'; diff --git a/src/nitro/communication/messages/parser/room/index.ts b/src/nitro/communication/messages/parser/room/index.ts index 0af11081..e692b601 100644 --- a/src/nitro/communication/messages/parser/room/index.ts +++ b/src/nitro/communication/messages/parser/room/index.ts @@ -1,6 +1,5 @@ export * from './access'; export * from './bots'; -export * from './camera'; export * from './data'; export * from './engine'; export * from './furniture';