@ho3einwave/pterodactyl-ts 0.1.0 → 0.1.1

package/README.md

@@ -134,7 +134,9 @@ ws.disconnect();
 import { PteroError, PteroValidationError, PteroRateLimitError } from '@ho3einwave/pterodactyl-ts';
 
 try {
-  await app.users.create({ /* ... */ });
+  await app.users.create({
+    /* ... */
+  });
 } catch (err) {
   if (err instanceof PteroValidationError) {
     console.log(err.fieldErrors); // { email: ['Must be valid email.'] }

package/dist/index.d.mts

@@ -1021,10 +1021,10 @@ interface WebSocketEventMap {
 type WebSocketEvent = keyof WebSocketEventMap;
 type Handler<E extends WebSocketEvent> = (...args: WebSocketEventMap[E]) => void;
 interface WebSocketManagerOptions {
-  /** Origin used to construct the WebSocket URL. Usually the node FQDN. */
+  /** Full WebSocket URL returned by the API (the `socket` field from credentials). */
+  socket: string;
+  /** Panel origin URL (e.g. "https://panel.example.com"). Sent as the Origin header. */
   origin: string;
-  /** Server UUID for the WebSocket path. */
-  serverUuid: string;
   /** Function that returns a fresh JWT token. Called on connect and token refresh. */
   getToken: () => Promise<string>;
   /** Maximum reconnect delay in ms. Default: 30000. */
@@ -1038,13 +1038,13 @@ declare class WebSocketManager {
   private reconnectAttempts;
   private reconnectTimer;
   private intentionalClose;
+  private readonly socket;
   private readonly origin;
-  private readonly serverUuid;
   private readonly getToken;
   private readonly maxReconnectDelay;
   private readonly autoReconnect;
   constructor(options: WebSocketManagerOptions);
-  /** Connect to the WebSocket server. */
+  /** Connect to the WebSocket server. Resolves once authenticated, rejects on error. */
   connect(): Promise<void>;
   /** Disconnect from the WebSocket server. */
   disconnect(): void;

package/dist/index.mjs

@@ -497,7 +497,7 @@ var ServerContext = class {
 		await this.http.post(`${this.base}/power`, { signal });
 	}
 	async getWebSocketCredentials() {
-		return this.http.get(`${this.base}/websocket`);
+		return (await (await this.http.raw("GET", `${this.base}/websocket`)).json()).data;
 	}
 	async listStartupVariables() {
 		return (await this.http.getList(`${this.base}/startup`)).data;
@@ -751,37 +751,66 @@ var WebSocketManager = class {
 	reconnectAttempts = 0;
 	reconnectTimer = null;
 	intentionalClose = false;
+	socket;
 	origin;
-	serverUuid;
 	getToken;
 	maxReconnectDelay;
 	autoReconnect;
 	constructor(options) {
+		this.socket = options.socket;
 		this.origin = options.origin.replace(/\/+$/, "");
-		this.serverUuid = options.serverUuid;
 		this.getToken = options.getToken;
 		this.maxReconnectDelay = options.maxReconnectDelay ?? 3e4;
 		this.autoReconnect = options.autoReconnect ?? true;
 	}
-	/** Connect to the WebSocket server. */
+	/** Connect to the WebSocket server. Resolves once authenticated, rejects on error. */
 	async connect() {
 		if (this.ws) return;
 		this.intentionalClose = false;
 		const token = await this.getToken();
-		const url = `${this.origin.startsWith("https") ? "wss" : "ws"}://${this.origin.replace(/^https?:\/\//, "")}/api/servers/${this.serverUuid}/ws`;
-		this.ws = new WebSocket(url);
-		this.ws.onopen = () => {
-			this.reconnectAttempts = 0;
-			this.sendAuth(token);
-		};
-		this.ws.onmessage = (event) => {
-			this.handleMessage(event.data);
-		};
-		this.ws.onclose = () => {
-			this.ws = null;
-			if (!this.intentionalClose && this.autoReconnect) this.scheduleReconnect();
-		};
-		this.ws.onerror = () => {};
+		return new Promise((resolve, reject) => {
+			let settled = false;
+			const cleanup = () => {
+				this.off("auth success", onAuth);
+				this.off("daemon error", onDaemonError);
+			};
+			const onAuth = () => {
+				if (settled) return;
+				settled = true;
+				cleanup();
+				resolve();
+			};
+			const onDaemonError = (message) => {
+				if (settled) return;
+				settled = true;
+				cleanup();
+				reject(/* @__PURE__ */ new Error(`WebSocket authentication failed: ${message}`));
+			};
+			this.on("auth success", onAuth);
+			this.on("daemon error", onDaemonError);
+			this.ws = new WebSocket(this.socket, { headers: {
+				Authorization: `Bearer ${token}`,
+				Origin: this.origin
+			} });
+			this.ws.onopen = () => {
+				this.reconnectAttempts = 0;
+				this.sendAuth(token);
+			};
+			this.ws.onmessage = (event) => {
+				this.handleMessage(event.data);
+			};
+			this.ws.onclose = (event) => {
+				this.ws = null;
+				if (!settled) {
+					settled = true;
+					cleanup();
+					reject(/* @__PURE__ */ new Error(`WebSocket closed before authentication completed (code: ${event.code}, reason: ${event.reason || "none"})`));
+					return;
+				}
+				if (!this.intentionalClose && this.autoReconnect) this.scheduleReconnect();
+			};
+			this.ws.onerror = () => {};
+		});
 	}
 	/** Disconnect from the WebSocket server. */
 	disconnect() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ho3einwave/pterodactyl-ts",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Type-safe TypeScript library for the Pterodactyl Panel API. Covers Client API, Application API, and WebSocket API with zero dependencies.",
   "author": "",
   "license": "MIT",
@@ -37,11 +37,14 @@
     "dev": "tsdown --watch",
     "test": "vitest",
     "typecheck": "tsc --noEmit",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
     "prepublishOnly": "bun run build"
   },
   "devDependencies": {
     "@types/node": "^25.0.3",
     "bumpp": "^10.3.2",
+    "prettier": "^3.8.1",
     "tsdown": "^0.18.1",
     "typescript": "^5.9.3",
     "vitest": "^4.0.16"