use correct insecure port, update tests

Author: KobanDavis

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@mondago/integrator-api",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"license": "MIT",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

src/IntegratorAPI.test.ts

@@ -11,6 +11,10 @@ beforeEach(() => {
 	}
 })
 
+// @ts-ignore
+global.WebSocket = jest.fn()
+const WebSocket: jest.Mock = global.WebSocket as any
+
 global.fetch = jest.fn()
 const fetch: jest.Mock = global.fetch as any
 
@@ -29,22 +33,40 @@ describe('IntegratorAPI', () => {
 	it('should use port 10443 if `https` is set to true', async () => {
 		config.https = true
 		const integrator = new IntegratorAPI(config)
+
 		fetch.mockImplementationOnce((url) => {
 			expect(new URL(url).port).toBe('10443')
 			return new Response()
 		})
 
+		WebSocket.mockImplementation((url) => {
+			expect(new URL(url).port).toBe('10443')
+			return { addEventListener: jest.fn() }
+		})
+
 		await integrator.version()
+		integrator.connectWS(() => {})
+
+		expect.assertions(2)
 	})
-	it('should use port 10080 if `https` is set to false', async () => {
+	it('should use port 10088 if `https` is set to false', async () => {
 		config.https = false
 		const integrator = new IntegratorAPI(config)
 
 		fetch.mockImplementationOnce((url) => {
-			expect(new URL(url).port).toBe('10080')
+			expect(new URL(url).port).toBe('10088')
 			return new Response()
 		})
+
+		WebSocket.mockImplementation((url) => {
+			expect(new URL(url).port).toBe('10088')
+			return { addEventListener: jest.fn() }
+		})
+
 		await integrator.version()
+		integrator.connectWS(() => {})
+
+		expect.assertions(2)
 	})
 	it('should serialize data to `application/x-www-form-urlencoded` correctly', async () => {
 		const integrator = new IntegratorAPI(config)

src/IntegratorAPI.ts

@@ -3,7 +3,7 @@ import { Integrator } from './types'
 
 class IntegratorAPI {
 	private static SECURE_PORT = 10443
-	private static INSECURE_PORT = 10080
+	private static INSECURE_PORT = 10088
 	private static VERSION = 'v1'
 
 	private _headers = new Headers()
@@ -194,11 +194,9 @@ class IntegratorAPI {
 		return this._post('Pickup', body)
 	}
 
-	/**
-	 * Currently only supports WSS, with secure sockets enabled on the client
-	 */
 	public connectWS(eventHandler: Integrator.WebSocketEventHandler) {
-		const url = `wss://localhost:${IntegratorAPI.SECURE_PORT}/api/${IntegratorAPI.VERSION}/events/${this._config.id}`
+		const origin = this._config.https ? `wss://localhost:${IntegratorAPI.SECURE_PORT}` : `ws://localhost:${IntegratorAPI.INSECURE_PORT}`
+		const url = origin + `/api/${IntegratorAPI.VERSION}/events/${this._config.id}`
 		const ws = new WebSocket(url)
 		ws.addEventListener('message', (e) => {
 			const event = JSON.parse(e.data)