ttfm-socket 1.1.5-beta.0 → 1.2.0-beta.0

package/dist-client/actions/addDj.d.ts

@@ -1,5 +1,5 @@
 import { Action, ParamsFrom } from "actionhero";
-import { ActionName, MiddlewareName } from "../types/names.js";
+import { ActionName, MiddlewareName } from "../types/names";
 export declare class AddDjAction extends Action {
     name: ActionName.addDj;
     description: string;

package/dist-client/actions/joinRoom.d.ts

@@ -1,5 +1,5 @@
 import { Action, ParamsFrom, Connection } from "actionhero";
-import { ActionName } from "../types/names.js";
+import { ActionName } from "../types/names";
 export declare class JoinRoomAction extends Action {
     name: ActionName.joinRoom;
     description: string;

package/dist-client/actions/playOneTimeAnimation.d.ts

@@ -1,6 +1,6 @@
 import { Action, ParamsFrom } from "actionhero";
-import { ActionName, MiddlewareName } from "../types/names.js";
-import { OneTimeAnimationType } from "../types/messages.js";
+import { ActionName, MiddlewareName } from "../types/names";
+import { OneTimeAnimationType } from "../types/messages";
 export declare class PlayOneTimeAnimationAction extends Action {
     name: ActionName.playOneTimeAnimation;
     description: string;

package/dist-client/actions/removeDj.d.ts

@@ -1,6 +1,6 @@
 import { Action, ParamsFrom } from "actionhero";
-import { ActionName, MiddlewareName } from "../types/names.js";
-import { ServerRoomState } from "../types/state.js";
+import { ActionName, MiddlewareName } from "../types/names";
+import { ServerRoomState } from "../types/state";
 export declare class RemoveDjAction extends Action {
     name: ActionName.removeDj;
     description: string;

package/dist-client/actions/skipSong.d.ts

@@ -1,5 +1,5 @@
 import { Action, ParamsFrom } from "actionhero";
-import { ActionName, MiddlewareName } from "../types/names.js";
+import { ActionName, MiddlewareName } from "../types/names";
 export declare class SkipSongAction extends Action {
     name: ActionName.skipSong;
     description: string;

package/dist-client/actions/updateNextSong.d.ts

@@ -1,5 +1,5 @@
 import { Action, ParamsFrom } from "actionhero";
-import { ActionName, MiddlewareName } from "../types/names.js";
+import { ActionName, MiddlewareName } from "../types/names";
 export declare class UpdateNextSongAction extends Action {
     name: ActionName.updateNextSong;
     description: string;

package/dist-client/actions/voteOnSong.d.ts

@@ -1,6 +1,6 @@
 import { Action, ParamsFrom } from "actionhero";
-import { ActionName, MiddlewareName } from "../types/names.js";
-import { SongVotes } from "../types/state.js";
+import { ActionName, MiddlewareName } from "../types/names";
+import { SongVotesInput } from "../types/state";
 export declare class VoteOnSongAction extends Action {
     name: ActionName.voteOnSong;
     description: string;
@@ -13,8 +13,8 @@ export declare class VoteOnSongAction extends Action {
         };
         songVotes: {
             required: true;
-            formatter: (voteParams: Partial<SongVotes>) => Partial<SongVotes>;
-            validator: (songVotes: Partial<SongVotes>) => void;
+            formatter: (voteParams: Partial<SongVotesInput>) => Partial<SongVotesInput>;
+            validator: (songVotes: Partial<SongVotesInput>) => void;
             description: string;
         };
     };

package/dist-client/client/ActionheroWebsocketClient.js

@@ -3355,8 +3355,8 @@
         }
     };
     if (typeof Primus === 'undefined') {
-        var util = require('node:util');
-        var EventEmitter = require('node:events').EventEmitter;
+        var util = require('util');
+        var EventEmitter = require('events').EventEmitter;
         util.inherits(ActionheroWebsocketClient, EventEmitter);
     }
     else {

package/dist-client/client/SocketClient.d.ts

@@ -1,7 +1,7 @@
 import EventEmitter from "eventemitter3";
-import { ServerMessage, StatefulServerMessage, StatelessServerMessage, StatefulServerMessageNameType, StatelessServerMessageNameType, ExtractStatelessServerMessage } from "../types/messages.js";
-import { JoinRoomAction } from "../actions/joinRoom.js";
-import type { ParamsFrom, SimpleAction } from "./types.js";
+import { ServerMessage, StatefulServerMessage, StatelessServerMessage, StatefulServerMessageNameType, StatelessServerMessageNameType, ExtractStatelessServerMessage } from "../types/messages";
+import { JoinRoomAction } from "../actions/joinRoom";
+import type { ParamsFrom, SimpleAction } from "./types";
 type ConnectionState = "connected" | "disconnected" | "reconnecting" | "timeout";
 type ClientActionParams<A extends SimpleAction> = Omit<ParamsFrom<A>, "roomUuid" | "userUuid" | "tokenRole">;
 type RequiredFieldsOnly<T> = {

package/dist-client/client/index.d.ts

@@ -1,14 +1,14 @@
-export { SocketClient } from "./SocketClient.js";
-export type { JoinRoomAction } from "../actions/joinRoom.js";
-export type { AddDjAction } from "../actions/addDj.js";
-export type { PlayOneTimeAnimationAction } from "../actions/playOneTimeAnimation.js";
-export type { RemoveDjAction } from "../actions/removeDj.js";
-export type { SkipSongAction } from "../actions/skipSong.js";
-export type { UpdateNextSongAction } from "../actions/updateNextSong.js";
-export type { VoteOnSongAction } from "../actions/voteOnSong.js";
-export { ActionName } from "../types/names.js";
-export * from "../types/messages.js";
-export * from "./types.js";
-export * from "../types/services.js";
-export type { AllClientUserData as AllUserData, AvatarPosition, ClientRoomState as RoomState, ClientDj as Dj, ClientRoomUser as RoomUser, ClientNowPlaying as NowPlaying, SongVotes, GhostUserProfile, VoteCounts, } from "../types/state.js";
-export { TokenRole } from "../types/services.js";
+export { SocketClient } from "./SocketClient";
+export type { JoinRoomAction } from "../actions/joinRoom";
+export type { AddDjAction } from "../actions/addDj";
+export type { PlayOneTimeAnimationAction } from "../actions/playOneTimeAnimation";
+export type { RemoveDjAction } from "../actions/removeDj";
+export type { SkipSongAction } from "../actions/skipSong";
+export type { UpdateNextSongAction } from "../actions/updateNextSong";
+export type { VoteOnSongAction } from "../actions/voteOnSong";
+export { ActionName } from "../types/names";
+export * from "../types/messages";
+export * from "./types";
+export * from "../types/services";
+export type { AllClientUserData as AllUserData, AvatarPosition, ClientRoomState as RoomState, ClientDj as Dj, ClientRoomUser as RoomUser, ClientNowPlaying as NowPlaying, SongVotes, GhostUserProfile, VoteCounts, } from "../types/state";
+export { TokenRole } from "../types/services";

package/dist-client/client/types.d.ts

@@ -1,4 +1,4 @@
-import { ActionName } from "../types/names.js";
+import { ActionName } from "../types/names";
 type SimpleInput = {
     required?: boolean;
     formatter?: Function | string[] | Function[];

package/dist-client/types/jsonPatch.d.ts

@@ -0,0 +1,31 @@
+export interface BaseOperation {
+    path: string;
+}
+export interface AddOperation<T> extends BaseOperation {
+    op: "add";
+    value: T;
+}
+export interface RemoveOperation extends BaseOperation {
+    op: "remove";
+}
+export interface ReplaceOperation<T> extends BaseOperation {
+    op: "replace";
+    value: T;
+}
+export interface MoveOperation extends BaseOperation {
+    op: "move";
+    from: string;
+}
+export interface CopyOperation extends BaseOperation {
+    op: "copy";
+    from: string;
+}
+export interface TestOperation<T> extends BaseOperation {
+    op: "test";
+    value: T;
+}
+export interface GetOperation<T> extends BaseOperation {
+    op: "_get";
+    value: T;
+}
+export declare type Operation = AddOperation<unknown> | RemoveOperation | ReplaceOperation<unknown> | MoveOperation | CopyOperation | TestOperation<unknown> | GetOperation<unknown>;

package/dist-client/types/messages.d.ts

@@ -1,6 +1,6 @@
-import { Operation } from "fast-json-patch";
-import { JoinRoomAction } from "../actions/joinRoom.js";
+import { JoinRoomAction } from "../actions/joinRoom";
 import { ActionResponse } from "./actionhero";
+import { Operation } from "./jsonPatch";
 export declare const StatefulServerMessageName: {
     readonly addedDj: "addedDj";
     readonly lookedUpSong: "lookedUpSong";

package/dist-client/types/services.d.ts

@@ -65,6 +65,7 @@ export declare type MinimalCrateSongResDTO = {
     crateSongUuid?: string;
     status?: MinimalCrateSongResDTO.status;
     position?: number;
+    explicit: boolean;
 };
 export declare namespace MinimalCrateSongResDTO {
     enum status {
@@ -106,12 +107,14 @@ export declare namespace UserRoles {
 export declare type RoomDto = {
     song?: MinimalCrateSongResDTO | null;
     unlisted?: boolean;
+    varietyStyleMusic?: boolean;
+    explicit: boolean;
     id?: number;
     name: string;
     description: string;
     vibe: string;
     djType: RoomDto.djType;
-    musicProviderKeys: Array<"apple" | "audius" | "napster" | "soundCloudPublic" | "spotify" | "uploadService" | "youtube">;
+    musicProviderKeys: Array<"apple" | "audius" | "napster" | "soundCloudPublic" | "spotify" | "uploadService" | "youtube" | "sevenDigital">;
     numberOfDjs: number;
     songsPerDj: number;
     usersInRoomUuids?: Array<string>;
@@ -135,6 +138,7 @@ export declare type RoomDto = {
     isLive: boolean;
     liveAudio: boolean;
     posterUrl?: string | null;
+    discordServer?: string | null;
     externalUrl?: string | null;
     uuid: string;
     isGuestPasswordProtected: boolean;
@@ -171,6 +175,7 @@ export declare type OtherUserProfileResDto = {
     uuid: string;
     avatarId: string;
     nickname: string;
+    discordNickname: string;
     firstName: string;
     lastName: string;
     pronoun: string;
@@ -185,6 +190,7 @@ export declare type OtherUserProfileResDto = {
     twitter: string;
     snapchat: string;
     tiktok: string;
+    discord: string;
     badges: Array<"VERIFIED" | "PLATINUM" | "DOUBLE_PLATINUM" | "JQBX" | "STAFF">;
     priceForGig: number;
 };

package/dist-client/types/state.d.ts

@@ -1,4 +1,4 @@
-import { MinimalCrateSongResDTO, OtherUserProfileResDto, RoomDto, TokenRole, UserRoles } from "./services.js";
+import { MinimalCrateSongResDTO, OtherUserProfileResDto, RoomDto, TokenRole, UserRoles } from "./services";
 export type GhostUserProfile = Pick<OtherUserProfileResDto, "color" | "uuid" | "avatarId" | "nickname">;
 export type ServerDj = {
     userUuid: string;
@@ -16,6 +16,10 @@ export type SongVotes = {
     like?: boolean;
     star?: boolean;
 };
+export type SongVotesInput = {
+    like?: boolean | null;
+    star?: boolean;
+};
 export type ServerUserData = {
     userProfile: OtherUserProfileResDto | GhostUserProfile;
     position: AvatarPosition;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ttfm-socket",
-  "version": "1.1.5-beta.0",
+  "version": "1.2.0-beta.0",
   "main": "./dist-client/client/index.js",
   "typings": "./dist-client/client/index.d.ts",
   "devDependencies": {