Compare commits

..

No commits in common. "master" and "1.2.0" have entirely different histories.

10 changed files with 92 additions and 276 deletions

View File

@ -5,29 +5,24 @@ export enum SongType {
export class Song {
constructor(public type: SongType, public title: string, public songId: string, public image: string, public inAutoPlay: boolean) {
constructor(public type: SongType, public title: string, public songId: string, public image: string) {
}
}
export class QueuedSong extends Song {
constructor(type: SongType, title: string, songId: string, image: string, public listener: string, public inAutoPlay: boolean) {
super(type, title, songId, image, inAutoPlay);
constructor(type: SongType, title: string, songId: string, image: string, public listener: string) {
super(type, title, songId, image);
}
}
export class PlayingSong extends QueuedSong {
constructor(type: SongType, title: string, songId: string, image: string, listener: string, public length: number, public position: number, public tags: string[], public inAutoPlay: boolean) {
super(type, title, songId, image, listener, inAutoPlay);
constructor(type: SongType, title: string, songId: string, image: string, listener: string, public length: number, public position: number) {
super(type, title, songId, image, listener);
}
}
export class Playlist {
constructor(public title: string, public listener: string, public type: SongType, public songs: Song[]) {
}
}
export class PlaylistDescription {
constructor(public title: string, public listener: string, public type: SongType) {
constructor(public title: string, public listener: string, public songs: Song[]) {
}
}

2
dist/common.js vendored
View File

@ -13,7 +13,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
var __exportStar = (this && this.__exportStar) || function(m, exports) {
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.__esModule = true;
__exportStar(require("./dataTypes"), exports);
__exportStar(require("./messageTypes"), exports);
__exportStar(require("./parseMessage"), exports);

19
dist/dataTypes.d.ts vendored
View File

@ -7,31 +7,20 @@ export declare class Song {
title: string;
songId: string;
image: string;
inAutoPlay: boolean;
constructor(type: SongType, title: string, songId: string, image: string, inAutoPlay: boolean);
constructor(type: SongType, title: string, songId: string, image: string);
}
export declare class QueuedSong extends Song {
listener: string;
inAutoPlay: boolean;
constructor(type: SongType, title: string, songId: string, image: string, listener: string, inAutoPlay: boolean);
constructor(type: SongType, title: string, songId: string, image: string, listener: string);
}
export declare class PlayingSong extends QueuedSong {
length: number;
position: number;
tags: string[];
inAutoPlay: boolean;
constructor(type: SongType, title: string, songId: string, image: string, listener: string, length: number, position: number, tags: string[], inAutoPlay: boolean);
constructor(type: SongType, title: string, songId: string, image: string, listener: string, length: number, position: number);
}
export declare class Playlist {
title: string;
listener: string;
type: SongType;
songs: Song[];
constructor(title: string, listener: string, type: SongType, songs: Song[]);
}
export declare class PlaylistDescription {
title: string;
listener: string;
type: SongType;
constructor(title: string, listener: string, type: SongType);
constructor(title: string, listener: string, songs: Song[]);
}

32
dist/dataTypes.js vendored
View File

@ -14,30 +14,28 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.PlaylistDescription = exports.Playlist = exports.PlayingSong = exports.QueuedSong = exports.Song = exports.SongType = void 0;
exports.__esModule = true;
exports.Playlist = exports.PlayingSong = exports.QueuedSong = exports.Song = exports.SongType = void 0;
var SongType;
(function (SongType) {
SongType[SongType["YouTube"] = 0] = "YouTube";
SongType[SongType["Spotify"] = 1] = "Spotify";
})(SongType || (exports.SongType = SongType = {}));
})(SongType = exports.SongType || (exports.SongType = {}));
var Song = /** @class */ (function () {
function Song(type, title, songId, image, inAutoPlay) {
function Song(type, title, songId, image) {
this.type = type;
this.title = title;
this.songId = songId;
this.image = image;
this.inAutoPlay = inAutoPlay;
}
return Song;
}());
exports.Song = Song;
var QueuedSong = /** @class */ (function (_super) {
__extends(QueuedSong, _super);
function QueuedSong(type, title, songId, image, listener, inAutoPlay) {
var _this = _super.call(this, type, title, songId, image, inAutoPlay) || this;
function QueuedSong(type, title, songId, image, listener) {
var _this = _super.call(this, type, title, songId, image) || this;
_this.listener = listener;
_this.inAutoPlay = inAutoPlay;
return _this;
}
return QueuedSong;
@ -45,33 +43,21 @@ var QueuedSong = /** @class */ (function (_super) {
exports.QueuedSong = QueuedSong;
var PlayingSong = /** @class */ (function (_super) {
__extends(PlayingSong, _super);
function PlayingSong(type, title, songId, image, listener, length, position, tags, inAutoPlay) {
var _this = _super.call(this, type, title, songId, image, listener, inAutoPlay) || this;
function PlayingSong(type, title, songId, image, listener, length, position) {
var _this = _super.call(this, type, title, songId, image, listener) || this;
_this.length = length;
_this.position = position;
_this.tags = tags;
_this.inAutoPlay = inAutoPlay;
return _this;
}
return PlayingSong;
}(QueuedSong));
exports.PlayingSong = PlayingSong;
var Playlist = /** @class */ (function () {
function Playlist(title, listener, type, songs) {
function Playlist(title, listener, songs) {
this.title = title;
this.listener = listener;
this.type = type;
this.songs = songs;
}
return Playlist;
}());
exports.Playlist = Playlist;
var PlaylistDescription = /** @class */ (function () {
function PlaylistDescription(title, listener, type) {
this.title = title;
this.listener = listener;
this.type = type;
}
return PlaylistDescription;
}());
exports.PlaylistDescription = PlaylistDescription;

View File

@ -1,5 +1,5 @@
import { Song, PlayingSong, QueuedSong, Playlist, PlaylistDescription } from "./dataTypes";
export type StuenMessages = ListenerList | SendChatMessage | SearchSong | SearchSongResult | Join | QueueSong | CurrentQueue | CurrentSong | UnqueueSong | ReorderSong | SkipSong | SongLikes | ToggleSongLike | CreatePlaylist | RemovePlaylist | AddSongToPlaylist | RemoveSongFromPlaylist | Playlists | GetPlaylist | PlaylistSongs | GetOtherPlaylists | ToggleTag | Shuffle | RemoveFromAutoPlay;
import { Song, PlayingSong, QueuedSong, Playlist } from "./dataTypes";
export declare type StuenMessages = ListenerLeft | ListenerList | ListenerJoined | SendChatMessage | SearchSong | SearchSongResult | Join | QueueSong | CurrentQueue | CurrentSong | UnqueueSong | ReorderSong | SkipSong | SongLikes | CreatePlaylist | ToggleSongLike | AddSongToPlaylist | RemoveSongFromPlaylist | Playlists;
export declare abstract class StuenMessage {
type: string;
constructor(type: string);
@ -8,6 +8,14 @@ export declare class Join extends StuenMessage {
name: string;
constructor(name: string);
}
export declare class ListenerJoined extends StuenMessage {
name: string;
constructor(name: string);
}
export declare class ListenerLeft extends StuenMessage {
name: string;
constructor(name: string);
}
export declare class ListenerList extends StuenMessage {
names: string[];
constructor(names: string[]);
@ -65,28 +73,9 @@ export declare class CreatePlaylist extends StuenMessage {
title: string;
constructor(title: string);
}
export declare class RemovePlaylist extends StuenMessage {
title: string;
constructor(title: string);
}
export declare class Playlists extends StuenMessage {
playlists: PlaylistDescription[];
constructor(playlists: PlaylistDescription[]);
}
export declare class GetPlaylist extends StuenMessage {
playlist: PlaylistDescription;
constructor(playlist: PlaylistDescription);
}
export declare class PlaylistSongs extends StuenMessage {
playlist: Playlist;
constructor(playlist: Playlist);
}
export declare class GetOtherPlaylists extends StuenMessage {
constructor();
}
export declare class OthersPlaylists extends StuenMessage {
playlists: PlaylistDescription[];
constructor(playlists: PlaylistDescription[]);
playlists: Playlist[];
constructor(playlists: Playlist[]);
}
export declare class AddSongToPlaylist extends StuenMessage {
song: Song;
@ -98,14 +87,3 @@ export declare class RemoveSongFromPlaylist extends StuenMessage {
playlist: string;
constructor(song: Song, playlist: string);
}
export declare class ToggleTag extends StuenMessage {
song: Song;
tag: string;
constructor(song: Song, tag: string);
}
export declare class Shuffle extends StuenMessage {
constructor();
}
export declare class RemoveFromAutoPlay extends StuenMessage {
constructor();
}

101
dist/messageTypes.js vendored
View File

@ -14,8 +14,8 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.RemoveFromAutoPlay = exports.Shuffle = exports.ToggleTag = exports.RemoveSongFromPlaylist = exports.AddSongToPlaylist = exports.OthersPlaylists = exports.GetOtherPlaylists = exports.PlaylistSongs = exports.GetPlaylist = exports.Playlists = exports.RemovePlaylist = exports.CreatePlaylist = exports.SongLikes = exports.ToggleSongLike = exports.SkipSong = exports.ReorderSong = exports.UnqueueSong = exports.CurrentSong = exports.CurrentQueue = exports.QueueSong = exports.SearchSongResult = exports.SearchSong = exports.ChatMessage = exports.SendChatMessage = exports.ListenerList = exports.Join = exports.StuenMessage = void 0;
exports.__esModule = true;
exports.RemoveSongFromPlaylist = exports.AddSongToPlaylist = exports.Playlists = exports.CreatePlaylist = exports.SongLikes = exports.ToggleSongLike = exports.SkipSong = exports.ReorderSong = exports.UnqueueSong = exports.CurrentSong = exports.CurrentQueue = exports.QueueSong = exports.SearchSongResult = exports.SearchSong = exports.ChatMessage = exports.SendChatMessage = exports.ListenerList = exports.ListenerLeft = exports.ListenerJoined = exports.Join = exports.StuenMessage = void 0;
var StuenMessage = /** @class */ (function () {
function StuenMessage(type) {
this.type = type;
@ -33,6 +33,26 @@ var Join = /** @class */ (function (_super) {
return Join;
}(StuenMessage));
exports.Join = Join;
var ListenerJoined = /** @class */ (function (_super) {
__extends(ListenerJoined, _super);
function ListenerJoined(name) {
var _this = _super.call(this, 'ListenerJoined') || this;
_this.name = name;
return _this;
}
return ListenerJoined;
}(StuenMessage));
exports.ListenerJoined = ListenerJoined;
var ListenerLeft = /** @class */ (function (_super) {
__extends(ListenerLeft, _super);
function ListenerLeft(name) {
var _this = _super.call(this, 'ListenerLeft') || this;
_this.name = name;
return _this;
}
return ListenerLeft;
}(StuenMessage));
exports.ListenerLeft = ListenerLeft;
var ListenerList = /** @class */ (function (_super) {
__extends(ListenerList, _super);
function ListenerList(names) {
@ -173,16 +193,6 @@ var CreatePlaylist = /** @class */ (function (_super) {
return CreatePlaylist;
}(StuenMessage));
exports.CreatePlaylist = CreatePlaylist;
var RemovePlaylist = /** @class */ (function (_super) {
__extends(RemovePlaylist, _super);
function RemovePlaylist(title) {
var _this = _super.call(this, 'RemovePlaylist') || this;
_this.title = title;
return _this;
}
return RemovePlaylist;
}(StuenMessage));
exports.RemovePlaylist = RemovePlaylist;
var Playlists = /** @class */ (function (_super) {
__extends(Playlists, _super);
function Playlists(playlists) {
@ -193,44 +203,6 @@ var Playlists = /** @class */ (function (_super) {
return Playlists;
}(StuenMessage));
exports.Playlists = Playlists;
var GetPlaylist = /** @class */ (function (_super) {
__extends(GetPlaylist, _super);
function GetPlaylist(playlist) {
var _this = _super.call(this, 'GetPlaylist') || this;
_this.playlist = playlist;
return _this;
}
return GetPlaylist;
}(StuenMessage));
exports.GetPlaylist = GetPlaylist;
var PlaylistSongs = /** @class */ (function (_super) {
__extends(PlaylistSongs, _super);
function PlaylistSongs(playlist) {
var _this = _super.call(this, 'PlaylistSongs') || this;
_this.playlist = playlist;
return _this;
}
return PlaylistSongs;
}(StuenMessage));
exports.PlaylistSongs = PlaylistSongs;
var GetOtherPlaylists = /** @class */ (function (_super) {
__extends(GetOtherPlaylists, _super);
function GetOtherPlaylists() {
return _super.call(this, 'GetOtherPlaylists') || this;
}
return GetOtherPlaylists;
}(StuenMessage));
exports.GetOtherPlaylists = GetOtherPlaylists;
var OthersPlaylists = /** @class */ (function (_super) {
__extends(OthersPlaylists, _super);
function OthersPlaylists(playlists) {
var _this = _super.call(this, 'OthersPlaylists') || this;
_this.playlists = playlists;
return _this;
}
return OthersPlaylists;
}(StuenMessage));
exports.OthersPlaylists = OthersPlaylists;
var AddSongToPlaylist = /** @class */ (function (_super) {
__extends(AddSongToPlaylist, _super);
function AddSongToPlaylist(song, playlist) {
@ -245,7 +217,7 @@ exports.AddSongToPlaylist = AddSongToPlaylist;
var RemoveSongFromPlaylist = /** @class */ (function (_super) {
__extends(RemoveSongFromPlaylist, _super);
function RemoveSongFromPlaylist(song, playlist) {
var _this = _super.call(this, 'RemoveSongFromPlaylist') || this;
var _this = _super.call(this, 'RemoveSongToPlaylist') || this;
_this.song = song;
_this.playlist = playlist;
return _this;
@ -253,30 +225,3 @@ var RemoveSongFromPlaylist = /** @class */ (function (_super) {
return RemoveSongFromPlaylist;
}(StuenMessage));
exports.RemoveSongFromPlaylist = RemoveSongFromPlaylist;
var ToggleTag = /** @class */ (function (_super) {
__extends(ToggleTag, _super);
function ToggleTag(song, tag) {
var _this = _super.call(this, 'ToggleTag') || this;
_this.song = song;
_this.tag = tag;
return _this;
}
return ToggleTag;
}(StuenMessage));
exports.ToggleTag = ToggleTag;
var Shuffle = /** @class */ (function (_super) {
__extends(Shuffle, _super);
function Shuffle() {
return _super.call(this, 'Shuffle') || this;
}
return Shuffle;
}(StuenMessage));
exports.Shuffle = Shuffle;
var RemoveFromAutoPlay = /** @class */ (function (_super) {
__extends(RemoveFromAutoPlay, _super);
function RemoveFromAutoPlay() {
return _super.call(this, 'RemoveFromAutoPlay') || this;
}
return RemoveFromAutoPlay;
}(StuenMessage));
exports.RemoveFromAutoPlay = RemoveFromAutoPlay;

24
dist/parseMessage.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.__esModule = true;
var messageTypes_1 = require("./messageTypes");
function parseMessage(message) {
try {
@ -7,6 +7,10 @@ function parseMessage(message) {
switch (data.type) {
case 'Join':
return new messageTypes_1.Join(data.name);
case 'ListenerJoined':
return new messageTypes_1.ListenerJoined(data.name);
case 'ListenerLeft':
return new messageTypes_1.ListenerLeft(data.name);
case 'ListenerList':
return new messageTypes_1.ListenerList(data.names);
case 'SendChatMessage':
@ -35,28 +39,12 @@ function parseMessage(message) {
return new messageTypes_1.SongLikes(data.listeners);
case 'Playlists':
return new messageTypes_1.Playlists(data.playlists);
case 'GetPlaylist':
return new messageTypes_1.GetPlaylist(data.playlist);
case 'PlaylistSongs':
return new messageTypes_1.PlaylistSongs(data.playlist);
case 'CreatePlaylist':
return new messageTypes_1.CreatePlaylist(data.title);
case 'RemovePlaylist':
return new messageTypes_1.RemovePlaylist(data.title);
case 'AddSongToPlaylist':
return new messageTypes_1.AddSongToPlaylist(data.song, data.playlist);
case 'RemoveSongFromPlaylist':
return new messageTypes_1.RemoveSongFromPlaylist(data.song, data.playlist);
case 'GetOtherPlaylists':
return new messageTypes_1.GetOtherPlaylists();
case 'OthersPlaylists':
return new messageTypes_1.OthersPlaylists(data.playlists);
case 'ToggleTag':
return new messageTypes_1.ToggleTag(data.song, data.tag);
case 'Shuffle':
return new messageTypes_1.Shuffle();
case 'RemoveFromAutoPlay':
return new messageTypes_1.RemoveFromAutoPlay();
default:
console.error('Unknown message type:', data.type);
return null;
@ -67,4 +55,4 @@ function parseMessage(message) {
return null; // Handle parsing errors
}
}
exports.default = parseMessage;
exports["default"] = parseMessage;

View File

@ -1,7 +1,9 @@
import {Song, PlayingSong, QueuedSong, Playlist, PlaylistDescription} from "./dataTypes";
import {Song, PlayingSong, QueuedSong, Playlist} from "./dataTypes";
export type StuenMessages =
ListenerList
ListenerLeft
| ListenerList
| ListenerJoined
| SendChatMessage
| SearchSong
| SearchSongResult
@ -13,18 +15,11 @@ export type StuenMessages =
| ReorderSong
| SkipSong
| SongLikes
| ToggleSongLike
| CreatePlaylist
| RemovePlaylist
| ToggleSongLike
| AddSongToPlaylist
| RemoveSongFromPlaylist
| Playlists
| GetPlaylist
| PlaylistSongs
| GetOtherPlaylists
| ToggleTag
| Shuffle
| RemoveFromAutoPlay
| Playlists;
export abstract class StuenMessage {
constructor(public type: string) {
@ -37,6 +32,18 @@ export class Join extends StuenMessage {
}
}
export class ListenerJoined extends StuenMessage {
constructor(public name: string) {
super('ListenerJoined');
}
}
export class ListenerLeft extends StuenMessage {
constructor(public name: string) {
super('ListenerLeft');
}
}
export class ListenerList extends StuenMessage {
constructor(public names: string[]) {
super('ListenerList');
@ -123,41 +130,13 @@ export class CreatePlaylist extends StuenMessage {
super('CreatePlaylist');
}
}
export class RemovePlaylist extends StuenMessage {
constructor(public title: string) {
super('RemovePlaylist');
}
}
export class Playlists extends StuenMessage {
constructor(public playlists: PlaylistDescription[]) {
constructor(public playlists: Playlist[]) {
super('Playlists');
}
}
export class GetPlaylist extends StuenMessage {
constructor(public playlist: PlaylistDescription) {
super('GetPlaylist');
}
}
export class PlaylistSongs extends StuenMessage {
constructor(public playlist: Playlist) {
super('PlaylistSongs');
}
}
export class GetOtherPlaylists extends StuenMessage {
constructor() {
super('GetOtherPlaylists');
}
}
export class OthersPlaylists extends StuenMessage {
constructor(public playlists: PlaylistDescription[]) {
super('OthersPlaylists');
}
}
export class AddSongToPlaylist extends StuenMessage {
constructor(public song: Song, public playlist: string) {
super('AddSongToPlaylist');
@ -166,24 +145,6 @@ export class AddSongToPlaylist extends StuenMessage {
export class RemoveSongFromPlaylist extends StuenMessage {
constructor(public song: Song, public playlist: string) {
super('RemoveSongFromPlaylist');
}
}
export class ToggleTag extends StuenMessage {
constructor(public song: Song, public tag: string) {
super('ToggleTag');
}
}
export class Shuffle extends StuenMessage {
constructor() {
super('Shuffle');
}
}
export class RemoveFromAutoPlay extends StuenMessage {
constructor() {
super('RemoveFromAutoPlay');
super('RemoveSongToPlaylist');
}
}

View File

@ -1,6 +1,6 @@
{
"name": "stuen-common",
"version": "1.2.17",
"version": "1.2.0",
"main": "dist/common.js",
"type": "commonjs",
"types": "dist/common.d.ts",

View File

@ -1,26 +1,12 @@
import {
AddSongToPlaylist,
ChatMessage,
CreatePlaylist,
CurrentQueue,
CurrentSong,
GetPlaylist,
ChatMessage, CreatePlaylist, CurrentQueue, CurrentSong,
Join,
ListenerList,
Playlists,
PlaylistSongs,
GetOtherPlaylists,
QueueSong, RemoveFromAutoPlay, RemovePlaylist,
RemoveSongFromPlaylist,
ReorderSong,
SearchSong,
SearchSongResult,
SendChatMessage, Shuffle,
SkipSong,
SongLikes,
StuenMessage,
ToggleSongLike, ToggleTag,
UnqueueSong, OthersPlaylists,
ListenerJoined,
ListenerLeft,
ListenerList, Playlists, QueueSong, RemoveSongFromPlaylist, ReorderSong, SearchSong, SearchSongResult,
SendChatMessage, SkipSong, SongLikes,
StuenMessage, ToggleSongLike, UnqueueSong
} from "./messageTypes";
export default function parseMessage(message: string): StuenMessage | null {
@ -30,6 +16,10 @@ export default function parseMessage(message: string): StuenMessage | null {
switch (data.type) {
case 'Join':
return new Join(data.name);
case 'ListenerJoined':
return new ListenerJoined(data.name);
case 'ListenerLeft':
return new ListenerLeft(data.name);
case 'ListenerList':
return new ListenerList(data.names);
case 'SendChatMessage':
@ -58,28 +48,12 @@ export default function parseMessage(message: string): StuenMessage | null {
return new SongLikes(data.listeners);
case 'Playlists':
return new Playlists(data.playlists);
case 'GetPlaylist':
return new GetPlaylist(data.playlist);
case 'PlaylistSongs':
return new PlaylistSongs(data.playlist);
case 'CreatePlaylist':
return new CreatePlaylist(data.title);
case 'RemovePlaylist':
return new RemovePlaylist(data.title);
case 'AddSongToPlaylist':
return new AddSongToPlaylist(data.song, data.playlist);
case 'RemoveSongFromPlaylist':
return new RemoveSongFromPlaylist(data.song, data.playlist);
case 'GetOtherPlaylists':
return new GetOtherPlaylists();
case 'OthersPlaylists':
return new OthersPlaylists(data.playlists);
case 'ToggleTag':
return new ToggleTag(data.song, data.tag);
case 'Shuffle':
return new Shuffle();
case 'RemoveFromAutoPlay':
return new RemoveFromAutoPlay();
default:
console.error('Unknown message type:', data.type);
return null;