Merge pull request #1 from DjDeveloperr/master

fix imports

Author: viztea

.gitignore

@@ -1,4 +1,6 @@
 node_modules/
 
 yarn.lock
-yarn-error.log
+yarn-error.log
+
+.vscode

mod.ts

@@ -1,5 +1,5 @@
-export * from "./src/@types/track.d.ts";
-export * from "./src/@types/player.d.ts";
+export type { Track, TrackInfo, LoadTracksException, LoadTracksResponse, LoadType } from "./src/@types/track.d.ts";
+export type { PlayTrack, PlayerEvent, PlayerEventType, PlayerRequest, PlayerState, PlayerUpdate } from "./src/@types/player.d.ts";
 export * from "./src/api/Socket.ts";
 export * from "./src/api/Player.ts";
 export * from "./src/Manager.ts";

src/@types/track.d.ts

@@ -1,4 +1,4 @@
-import { Severity } from "./misc";
+import { Severity } from "./player.d.ts";
 
 export type LoadType = "TRACK_LOADED" | "PLAYLIST_LOADED" | "SEARCH_RESULT" | "NO_MATCHES" | "LOAD_FAILED"
 
@@ -33,4 +33,4 @@ export interface TrackInfo {
   position: number;
   title: string;
   uri: string;
-}
+}

src/Manager.ts

@@ -1,10 +1,9 @@
 import { EventEmitter } from "https://deno.land/[email protected]/node/events.ts";
 import { WebSocketCloseEvent } from "https://deno.land/[email protected]/ws/mod.ts";
-import { soxa } from "https://deno.land/x/soxa/mod.ts"
 import { Socket, SocketData } from "./api/Socket.ts";
 import { Player } from "./api/Player.ts";
 
-import type { LoadTracksResponse } from "./@types";
+import type { LoadTracksResponse } from "./@types/track.d.ts";
 
 const defaults = {
   resuming: { key: Math.random().toString(32), timeout: 60000 },
@@ -184,15 +183,17 @@ export class Manager extends EventEmitter {
    * @param query The search query.
    */
   public async search(query: string): Promise<LoadTracksResponse> {
-    return new Promise(async (resolve, reject) => {
-      const socket = this.ideal[0];
-      if (!socket)
-        throw new Error("Manager#create(): No available sockets.")
-
-      soxa.get(`http${socket.secure ? "s" : ""}://${socket.address}/loadtracks?identifier=${query}`)
-        .then((r) => resolve(r.data))
-        .catch(e => reject(e));
+    const socket = this.ideal[0];
+    if (!socket)
+      throw new Error("Manager#create(): No available sockets.")
+                
+    const resp = await fetch(`http${socket.secure ? "s" : ""}://${socket.address}/loadtracks?identifier=${encodeURIComponent(query ?? '')}`, {
+      headers: { Authorization: socket.password ?? 'youshallnotpass' },
+      method: 'GET',
     });
+    
+    const data = await resp.json();
+    return data;
   }
 }
 
@@ -247,7 +248,7 @@ export interface ManagerOptions {
   reconnect?: ReconnectOptions;
 }
 
-export interface ReconnectOptions {
+interface ReconnectOptions {
   /**
    * The total amount of reconnect tries
    */

src/api/Player.ts

@@ -12,7 +12,7 @@ import type {
   TrackStartEvent,
   TrackStuckEvent,
   WebSocketClosedEvent
-} from "../@types";
+} from "../@types/index.d.ts";
 
 export class Player extends EventEmitter {
   /**

src/api/Socket.ts

@@ -9,7 +9,23 @@ import {
 import { Buffer } from "https://deno.land/[email protected]/node/buffer.ts";
 
 import type { Manager } from "../Manager.ts";
-import type { ReconnectOptions } from "../../../lavaclient/src";
+
+export interface ReconnectOptions {
+  /**
+   * The total amount of reconnect tries
+   */
+  maxTries?: number;
+
+  /**
+   * Whether or not reconnection's are automatically done.
+   */
+  auto?: boolean;
+
+  /**
+   * The delay between socket reconnection's.
+   */
+  delay?: number;
+}
 
 export enum Status {
   CONNECTED,
@@ -397,4 +413,4 @@ export interface NodeStats {
     nulled?: number;
     deficit?: number;
   };
-}
+}