Feature/interactivity

.eslintrc.js

@@ -26,6 +26,7 @@ module.exports = {
     '@typescript-eslint/no-redeclare': 'off',
     '@typescript-eslint/space-before-function-paren': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-empty-object-type': 'off',
     'prefer-const': 'warn',
     // 'prettier/prettier': 'warn',
     'prettier/prettier': ['warn', { endOfLine: 'auto' }],

Makefile

@@ -0,0 +1,6 @@
+network-server: ./Dockerfile
+	docker-compose -f docker-compose.network.yml up server
+
+network-proxy: ./proxy
+	docker-compose -f docker-compose.network.yml up proxy --build --force-recreate
+

docs/Spotify.md

@@ -66,6 +66,7 @@ In the project, `/api/v1/spotify/login/` has implemented Spotify's access token
 
 - Dashboard: <https://developer.spotify.com/dashboard>
 - How spotify authorization works: <https://developer.spotify.com/documentation/web-api/tutorials/code-flow>
+- Spotify's GitHub: <https://github.com/spotify>
 
 ### Web Playback SDK
 

package.json

@@ -58,6 +58,7 @@
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.2",
     "@types/node": "^20.3.1",
+    "@types/spotify-web-playback-sdk": "^0.1.19",
     "@types/supertest": "^6.0.0",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",

proxy/default.conf.tpl

@@ -12,7 +12,7 @@ include /etc/nginx/conf.d/includes/club-admin.conf;
 server {
   listen 8080;
 
-  add_header Access-Control-Allow-Origin *;
+  # add_header Access-Control-Allow-Origin *;
   # proxy_set_header Access-Control-Allow-Origin *;
   add_header Access-Control-Allow-Headers *;
   add_header Access-Control-Allow-Methods *;
@@ -55,6 +55,8 @@ server {
 
     client_max_body_size    32M;
     include /etc/nginx/uwsgi_params;
+
+
   }
 
   location ~* ^/api/v[0-9]/(docs|schema)/club-manager {

src/app.gateway.ts

@@ -1,12 +1,7 @@
 import { WebSocketGateway, WebSocketServer } from '@nestjs/websockets'
 import { Server } from 'socket.io'
-import { TrackStateUpdateDto } from './jukebox/dto/track-player-state.dto'
 
-@WebSocketGateway()
+@WebSocketGateway({ cors: true })
 export class AppGateway {
   @WebSocketServer() server: Server
-
-  public emitTrackStateUpdate(payload: TrackStateUpdateDto) {
-    this.server.emit('track-state-update', payload)
-  }
 }

src/config/cache-options.ts

@@ -1,4 +1,4 @@
-import { CacheModuleAsyncOptions } from '@nestjs/cache-manager'
+import type { CacheModuleAsyncOptions } from '@nestjs/cache-manager'
 import { ConfigModule, ConfigService } from '@nestjs/config'
 import { redisStore } from 'cache-manager-redis-store'
 
@@ -7,6 +7,7 @@ export const CacheOptions: CacheModuleAsyncOptions = {
   imports: [ConfigModule],
   useFactory: async (configService: ConfigService) => {
     const store = await redisStore({
+      ttl: 600,
       socket: {
         host: configService.get<string>('REDIS_HOST'),
         port: parseInt(configService.get<string>('REDIS_PORT')!),

src/jukebox/dto/jukebox-action.dto.ts

@@ -0,0 +1,7 @@
+interface IJukeboxAction {
+  jukebox_id: number
+  action: 'like' | 'dislike'
+
+  queue_index: number
+}
+export class JukeboxActionDto {}

src/jukebox/dto/jukebox-link.dto.ts

@@ -0,0 +1,22 @@
+import { ApiProperty } from '@nestjs/swagger'
+import { Expose } from 'class-transformer'
+
+export class JukeboxLinkDto implements IJukeboxLink {
+  @Expose()
+  @ApiProperty()
+  id: number
+
+  @Expose()
+  @ApiProperty()
+  type: JukeboxLinkType
+
+  @Expose()
+  @ApiProperty()
+  email: string
+
+  @Expose()
+  @ApiProperty()
+  active: boolean
+}
+
+// export class JukeboxLinkCreds implements IJukeboxLinkCreds

src/jukebox/dto/jukebox.dto.ts

@@ -1,24 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger'
 import { Expose } from 'class-transformer'
 import { BaseDto } from 'src/config/dtos'
-
-export class JukeboxLinkDto implements IJukeboxLink {
-  @Expose()
-  @ApiProperty()
-  id: number
-
-  @Expose()
-  @ApiProperty()
-  type: JukeboxLinkType
-
-  @Expose()
-  @ApiProperty()
-  email: string
-
-  @Expose()
-  @ApiProperty()
-  active: boolean
-}
+import { JukeboxLinkDto } from './jukebox-link.dto'
 
 export class JukeboxDto extends BaseDto implements IJukebox {
   @Expose()
@@ -36,18 +19,4 @@ export class JukeboxDto extends BaseDto implements IJukebox {
   @Expose()
   @ApiProperty()
   links: JukeboxLinkDto[]
-
-  // static serialize(entity: Jukebox): JukeboxDto {
-  //   return {
-  //     ...super.serialize(entity),
-  //     name: entity.name,
-  //     club_id: entity.club_id,
-  //     links:
-  //       entity.spotify_link_assignments?.map((assignment) => ({
-  //         type: 'spotify',
-  //         email: assignment.spotify_link.spotify_email,
-  //         active: assignment.active,
-  //       })) ?? [],
-  //   }
-  // }
 }

src/jukebox/dto/player-state.dto.ts

@@ -0,0 +1,22 @@
+import type { TrackMetaDto } from './track.dto'
+
+export class PlayerStateDto implements IPlayerState {
+  jukebox_id: number
+  current_track?: TrackMetaDto
+  progress: number
+  is_playing: boolean
+}
+export class PlayerQueueStateDto extends PlayerStateDto implements IPlayerQueueState {
+  next_tracks: ITrack[]
+}
+
+export class PlayerMetaStateDto extends PlayerStateDto implements IPlayerMetaState {
+  default_next_tracks: ITrack[]
+}
+
+export class PlayerStateActionDto implements IPlayerAction {
+  jukebox_id: number
+  current_track?: Partial<TrackMetaDto>
+  progress?: number
+  is_playing?: boolean
+}

src/jukebox/dto/track-player-state.dto.ts

@@ -1,11 +1,16 @@
-export class TrackStateUpdateDto implements ITrackStateUpdate {
-  current_track?: ITrack
-  next_tracks?: ITrack[]
+export class PlayerUpdateDto implements IPlayerUpdate {
   jukebox_id: number
+  current_track?: ITrackMeta
+  progress: number
+  is_playing: boolean
+  next_tracks: ITrack[]
 }
 
-export class PlayerUpdateDto implements IPlayerUpdate {
-
-  current_track?: ITrack
+export class PlayerAuxUpdateDto implements IPlayerAuxUpdate {
   jukebox_id: number
+  current_track: ITrackMeta
+  progress: number
+  is_playing: boolean
+  default_next_tracks: ITrack[]
+  changed_tracks?: boolean
 }

src/jukebox/dto/track.dto.ts

@@ -0,0 +1,73 @@
+import { ApiProperty } from '@nestjs/swagger'
+
+class SpotifyImageDto implements Spotify.Image {
+  height?: number
+  url: string
+  size?: string
+  width?: number
+}
+
+class SpotifyAlbumDto implements Spotify.Album {
+  name: string
+  uri: string
+  images: SpotifyImageDto[]
+}
+
+class SpotifyEntityDto implements Spotify.Entity {
+  name: string
+  uri: string
+  url: string
+}
+
+export class TrackMetaDto implements ITrackMeta {
+  @ApiProperty()
+  queue_id: string
+
+  @ApiProperty()
+  recommended_by?: string
+
+  @ApiProperty()
+  spotify_queued?: boolean
+
+  @ApiProperty()
+  likes?: number
+
+  @ApiProperty()
+  dislikes?: number
+
+  @ApiProperty()
+  album: SpotifyAlbumDto
+
+  @ApiProperty()
+  artists: SpotifyEntityDto[]
+
+  @ApiProperty()
+  duration_ms: number
+
+  @ApiProperty()
+  id: string
+
+  @ApiProperty()
+  is_playable: boolean
+
+  @ApiProperty()
+  name: string
+
+  @ApiProperty()
+  uid: string
+
+  @ApiProperty()
+  uri: string
+
+  @ApiProperty({ oneOf: [{ type: 'string', enum: ['audio', 'video'] }] })
+  media_type: 'audio' | 'video'
+
+  @ApiProperty({ oneOf: [{ type: 'string', enum: ['track', 'episode', 'ad'] }] })
+  type: 'track' | 'episode' | 'ad'
+
+  @ApiProperty({ oneOf: [{ type: 'string', enum: ['audio', 'video'] }] })
+  track_type: 'audio' | 'video'
+
+  @ApiProperty()
+  linked_from: { uri: string | null; id: string | null }
+}

src/jukebox/entities/jukebox.entity.ts

@@ -9,7 +9,8 @@ import {
   PrimaryColumn,
   PrimaryGeneratedColumn,
 } from 'typeorm'
-import { JukeboxDto, JukeboxLinkDto } from '../dto/jukebox.dto'
+import { JukeboxLinkDto } from '../dto/jukebox-link.dto'
+import { JukeboxDto } from '../dto/jukebox.dto'
 
 @Entity('jukebox')
 export class Jukebox extends BaseEntity {