diff --git a/package-lock.json b/package-lock.json index b2d2f39..7752dce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,6 +57,7 @@ "devDependencies": { "@eslint/eslintrc": "^3.3.1", "@eslint/js": "^9.14.0", + "@spacebarchat/spacebar-webrtc-types": "^1.0.1", "@types/amqplib": "^0.10.5", "@types/bcrypt": "^5.0.2", "@types/body-parser": "^1.19.5", @@ -84,7 +85,6 @@ "husky": "^9.1.7", "prettier": "^3.5.3", "pretty-quick": "^4.1.1", - "spacebar-webrtc-types": "github:spacebarchat/spacebar-webrtc-types", "typescript": "^5.8.3" }, "optionalDependencies": { @@ -4140,6 +4140,13 @@ "node": ">=18.0.0" } }, + "node_modules/@spacebarchat/spacebar-webrtc-types": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@spacebarchat/spacebar-webrtc-types/-/spacebar-webrtc-types-1.0.1.tgz", + "integrity": "sha512-WfBRUN2520w7o5vU9HNDug9alNvydQP7H/jwAy8LeHTHwlMMUw/60A54FQDIAtsahw787fR3QZ83UGjhKDzDTg==", + "dev": true, + "license": "AGPL-3.0-only" + }, "node_modules/@sqltools/formatter": { "version": "1.2.5", "license": "MIT" @@ -9375,12 +9382,6 @@ "source-map": "^0.6.0" } }, - "node_modules/spacebar-webrtc-types": { - "version": "1.0.1", - "resolved": "git+ssh://git@github.com/spacebarchat/spacebar-webrtc-types.git#fcab265b1c2c4ea4426c8bf5832ce75edbf1741d", - "dev": true, - "license": "ISC" - }, "node_modules/split2": { "version": "4.2.0", "license": "ISC", diff --git a/package.json b/package.json index c792f76..effc386 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "devDependencies": { "@eslint/eslintrc": "^3.3.1", "@eslint/js": "^9.14.0", + "@spacebarchat/spacebar-webrtc-types": "^1.0.1", "@types/amqplib": "^0.10.5", "@types/bcrypt": "^5.0.2", "@types/body-parser": "^1.19.5", @@ -67,7 +68,6 @@ "husky": "^9.1.7", "prettier": "^3.5.3", "pretty-quick": "^4.1.1", - "spacebar-webrtc-types": "github:spacebarchat/spacebar-webrtc-types", "typescript": "^5.8.3" }, "dependencies": { @@ -132,4 +132,4 @@ "pg": "^8.14.1", "sqlite3": "^5.1.7" } -} \ No newline at end of file +} diff --git a/src/webrtc/opcodes/Identify.ts b/src/webrtc/opcodes/Identify.ts index 065813f..9bcaa67 100644 --- a/src/webrtc/opcodes/Identify.ts +++ b/src/webrtc/opcodes/Identify.ts @@ -24,15 +24,15 @@ VoiceState, } from "@spacebar/util"; import { + generateSsrc, mediaServer, + Send, VoiceOPCodes, VoicePayload, WebRtcWebSocket, - Send, - generateSsrc, } from "@spacebar/webrtc"; +import { SSRCs } from "@spacebarchat/spacebar-webrtc-types"; import { subscribeToProducers } from "./Video"; -import { SSRCs } from "spacebar-webrtc-types"; export async function onIdentify(this: WebRtcWebSocket, data: VoicePayload) { clearTimeout(this.readyTimeout); diff --git a/src/webrtc/opcodes/Video.ts b/src/webrtc/opcodes/Video.ts index d78827a..2b327a0 100644 --- a/src/webrtc/opcodes/Video.ts +++ b/src/webrtc/opcodes/Video.ts @@ -18,12 +18,12 @@ import { Stream, validateSchema, VoiceVideoSchema } from "@spacebar/util"; import { mediaServer, + Send, VoiceOPCodes, VoicePayload, WebRtcWebSocket, - Send, } from "@spacebar/webrtc"; -import type { WebRtcClient } from "spacebar-webrtc-types"; +import type { WebRtcClient } from "@spacebarchat/spacebar-webrtc-types"; export async function onVideo(this: WebRtcWebSocket, payload: VoicePayload) { if (!this.webRtcClient) return; diff --git a/src/webrtc/util/MediaServer.ts b/src/webrtc/util/MediaServer.ts index 848b3f7..793419c 100644 --- a/src/webrtc/util/MediaServer.ts +++ b/src/webrtc/util/MediaServer.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import type { SignalingDelegate } from "spacebar-webrtc-types"; +import type { SignalingDelegate } from "@spacebarchat/spacebar-webrtc-types"; import { green, red } from "picocolors"; export let mediaServer: SignalingDelegate; diff --git a/src/webrtc/util/WebRtcWebSocket.ts b/src/webrtc/util/WebRtcWebSocket.ts index 5bb2da4..b97c169 100644 --- a/src/webrtc/util/WebRtcWebSocket.ts +++ b/src/webrtc/util/WebRtcWebSocket.ts @@ -1,5 +1,5 @@ import { WebSocket } from "@spacebar/gateway"; -import type { WebRtcClient } from "spacebar-webrtc-types"; +import type { WebRtcClient } from "@spacebarchat/spacebar-webrtc-types"; export interface WebRtcWebSocket extends WebSocket { type: "guild-voice" | "dm-voice" | "stream";