From 8e9b7e07ef8b2233acc7940bb2b45704d4646c18 Mon Sep 17 00:00:00 2001 From: Jakub Balinski <31112335+balins@users.noreply.github.com> Date: Fri, 17 May 2024 16:30:14 +0200 Subject: [PATCH] change namespace to `fishjam`, update `fishjam` to `0.6.1` --- .gitmodules | 2 +- codegen/openapi.sh | 2 +- codegen/protobuf.sh | 2 +- examples/room-manager/.env.example | 4 +-- examples/room-manager/README.md | 2 +- examples/room-manager/docker-compose.yaml | 22 ++++++------ examples/room-manager/package-lock.json | 16 ++++----- examples/room-manager/package.json | 12 +++---- examples/room-manager/src/config.ts | 4 +-- examples/room-manager/src/index.ts | 4 +-- examples/room-manager/src/room_service.ts | 24 ++++++------- package-lock.json | 4 +-- package.json | 16 ++++----- protos | 2 +- src/openapi/.openapi-generator/FILES | 1 + src/openapi/api.ts | 36 +++++++++---------- src/openapi/base.ts | 4 +-- src/openapi/common.ts | 4 +-- src/openapi/configuration.ts | 4 +-- src/openapi/index.ts | 4 +-- src/protos/fishjam/index.ts | 6 ++++ .../server_notifications.ts | 14 ++++---- src/protos/jellyfish/index.ts | 6 ---- 23 files changed, 98 insertions(+), 97 deletions(-) create mode 100644 src/protos/fishjam/index.ts rename src/protos/{jellyfish => fishjam}/server_notifications.ts (99%) delete mode 100644 src/protos/jellyfish/index.ts diff --git a/.gitmodules b/.gitmodules index b2e4ed5..19b4849 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "protos"] path = protos - url = https://github.com/jellyfish-dev/protos.git + url = https://github.com/fishjam-dev/protos.git diff --git a/codegen/openapi.sh b/codegen/openapi.sh index 0be9263..b7a6ad1 100644 --- a/codegen/openapi.sh +++ b/codegen/openapi.sh @@ -17,6 +17,6 @@ echo "Generating code for $1...\n" cd $ROOTDIR \ && npx openapi-generator-cli generate \ - -i https://raw.githubusercontent.com/jellyfish-dev/jellyfish/$1/openapi.yaml \ + -i https://raw.githubusercontent.com/fishjam-dev/fishjam/$1/openapi.yaml \ -g typescript-axios \ -o src/openapi diff --git a/codegen/protobuf.sh b/codegen/protobuf.sh index 54d8287..bde1ecb 100644 --- a/codegen/protobuf.sh +++ b/codegen/protobuf.sh @@ -11,7 +11,7 @@ git submodule sync --recursive >> /dev/null git submodule update --recursive --remote --init >> /dev/null printf "DONE\n" -file="./protos/jellyfish/server_notifications.proto" +file="./protos/fishjam/server_notifications.proto" printf "Compiling file $file... " protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./src/ $file diff --git a/examples/room-manager/.env.example b/examples/room-manager/.env.example index 8064c35..9c6fe93 100644 --- a/examples/room-manager/.env.example +++ b/examples/room-manager/.env.example @@ -1,7 +1,7 @@ PORT=8080 WEBHOOK_URL=http://host.docker.internal:8080/webhook -JELLYFISH_URL=http://localhost:5002 -JELLYFISH_SERVER_TOKEN=development +FISHJAM_URL=http://localhost:5002 +FISHJAM_SERVER_TOKEN=development # # Optional configuration: # ENABLE_SIMULCAST=true # PEERLESS_PURGE_TIMEOUT=60 diff --git a/examples/room-manager/README.md b/examples/room-manager/README.md index 51f85bb..293e69f 100644 --- a/examples/room-manager/README.md +++ b/examples/room-manager/README.md @@ -12,7 +12,7 @@ A simple web server that uses the SDK to manage rooms and users on a Fishjam ser To start the Fishjam server and the Room Manager, run the following commands: ```sh -EXTERNAL_IP=`ifconfig | grep 192.168 | cut -d ' ' -f 2` JELLYFISH_VERSION=edge docker compose up +EXTERNAL_IP=`ifconfig | grep 192.168 | cut -d ' ' -f 2` FISHJAM_VERSION=edge docker compose up cp .env.example .env npm install npm start diff --git a/examples/room-manager/docker-compose.yaml b/examples/room-manager/docker-compose.yaml index ca9989e..da1949b 100644 --- a/examples/room-manager/docker-compose.yaml +++ b/examples/room-manager/docker-compose.yaml @@ -1,7 +1,7 @@ services: - jellyfish: - image: 'ghcr.io/jellyfish-dev/jellyfish:${JELLYFISH_VERSION:-edge}' - container_name: jellyfish + fishjam: + image: 'ghcr.io/fishjam-dev/fishjam:${FISHJAM_VERSION:-edge}' + container_name: fishjam restart: on-failure healthcheck: test: > @@ -10,14 +10,14 @@ services: retries: 2 timeout: 2s environment: - JF_PORT: 5002 - JF_HOST: 'localhost:5002' - JF_WEBRTC_TURN_IP: '${EXTERNAL_IP:-127.0.0.1}' - JF_WEBRTC_TURN_LISTEN_IP: '0.0.0.0' - JF_WEBRTC_TURN_PORT_RANGE: '50000-50050' - JF_WEBRTC_TURN_TCP_PORT: '49999' - JF_SERVER_API_TOKEN: 'development' - JF_CHECK_ORIGIN: 'false' + FJ_PORT: 5002 + FJ_HOST: 'localhost:5002' + FJ_WEBRTC_TURN_IP: '${EXTERNAL_IP:-127.0.0.1}' + FJ_WEBRTC_TURN_LISTEN_IP: '0.0.0.0' + FJ_WEBRTC_TURN_PORT_RANGE: '50000-50050' + FJ_WEBRTC_TURN_TCP_PORT: '49999' + FJ_SERVER_API_TOKEN: 'development' + FJ_CHECK_ORIGIN: 'false' ports: - '5002:5002' - '49999:49999' diff --git a/examples/room-manager/package-lock.json b/examples/room-manager/package-lock.json index 4708d99..b7c47d5 100644 --- a/examples/room-manager/package-lock.json +++ b/examples/room-manager/package-lock.json @@ -1,15 +1,15 @@ { - "name": "@jellyfish-dev/room-manager", + "name": "@fishjam-dev/room-manager", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@jellyfish-dev/room-manager", + "name": "@fishjam-dev/room-manager", "version": "0.1.0", "license": "Apache-2.0", "dependencies": { - "@jellyfish-dev/js-server-sdk": "file:../../", + "@fishjam-dev/js-server-sdk": "file:../../", "axios": "^1.6.8", "body-parser": "^1.20.2", "dotenv": "^16.4.5", @@ -34,7 +34,7 @@ } }, "../..": { - "name": "@jellyfish-dev/js-server-sdk", + "name": "@fishjam-dev/js-server-sdk", "version": "0.1.0", "license": "Apache-2.0", "dependencies": { @@ -2011,6 +2011,10 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@fishjam-dev/js-server-sdk": { + "resolved": "../..", + "link": true + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.14", "dev": true, @@ -2041,10 +2045,6 @@ "dev": true, "license": "BSD-3-Clause" }, - "node_modules/@jellyfish-dev/js-server-sdk": { - "resolved": "../..", - "link": true - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "dev": true, diff --git a/examples/room-manager/package.json b/examples/room-manager/package.json index bcbac58..cbe5ad0 100644 --- a/examples/room-manager/package.json +++ b/examples/room-manager/package.json @@ -1,16 +1,16 @@ { - "name": "@jellyfish-dev/room-manager", + "name": "@fishjam-dev/room-manager", "version": "0.1.0", - "description": "A room manager for Jellyfish", - "homepage": "https://github.com/jellyfish-dev/js-server-sdk/examples/room-manager", + "description": "A room manager for Fishjam", + "homepage": "https://github.com/fishjam-dev/js-server-sdk/examples/room-manager", "repository": { "type": "git", - "url": "https://github.com/jellyfish-dev/js-server-sdk.git" + "url": "https://github.com/fishjam-dev/js-server-sdk.git" }, "license": "Apache-2.0", "keywords": [ "webrtc", - "jellyfish", + "fishjam", "membrane" ], "main": "./dist/index.js", @@ -28,7 +28,7 @@ "lint:check": "eslint src" }, "dependencies": { - "@jellyfish-dev/js-server-sdk": "file:../../", + "@fishjam-dev/js-server-sdk": "file:../../", "axios": "^1.6.8", "body-parser": "^1.20.2", "dotenv": "^16.4.5", diff --git a/examples/room-manager/src/config.ts b/examples/room-manager/src/config.ts index a1c827b..d7a230b 100644 --- a/examples/room-manager/src/config.ts +++ b/examples/room-manager/src/config.ts @@ -4,8 +4,8 @@ import 'dotenv/config'; export default { port: parseInt(process.env.PORT!), webhookUrl: process.env.WEBHOOK_URL!, - jellyfishUrl: process.env.JELLYFISH_URL!, - serverToken: process.env.JELLYFISH_SERVER_TOKEN!, + fishjamUrl: process.env.FISHJAM_URL!, + serverToken: process.env.FISHJAM_SERVER_TOKEN!, enableSimulcast: process.env.ENABLE_SIMULCAST ? process.env.ENABLE_SIMULCAST === 'true' : true, maxPeers: process.env.MAX_PEERS ? parseInt(process.env.MAX_PEERS) : undefined, peerlessPurgeTimeout: process.env.PEERLESS_PURGE_TIMEOUT ? parseInt(process.env.PEERLESS_PURGE_TIMEOUT) : undefined, diff --git a/examples/room-manager/src/index.ts b/examples/room-manager/src/index.ts index 1ac85db..eff94cd 100644 --- a/examples/room-manager/src/index.ts +++ b/examples/room-manager/src/index.ts @@ -1,7 +1,7 @@ import express, { type RequestHandler } from 'express'; import bodyParser from 'body-parser'; -import { ServerMessage } from '@jellyfish-dev/js-server-sdk/proto'; +import { ServerMessage } from '@fishjam-dev/js-server-sdk/proto'; import config from './config'; import { RoomService } from './room_service'; @@ -23,7 +23,7 @@ app.post('/webhook', bodyParser.raw({ type: 'application/x-protobuf' }), (req, r if (contentType === 'application/x-protobuf' && Buffer.isBuffer(req.body)) { const message = ServerMessage.decode(req.body); - roomService.handleJellyfishMessage(message); + roomService.handleFishjamMessage(message); res.status(200).send(); } else { diff --git a/examples/room-manager/src/room_service.ts b/examples/room-manager/src/room_service.ts index a0e134c..af5f62c 100644 --- a/examples/room-manager/src/room_service.ts +++ b/examples/room-manager/src/room_service.ts @@ -1,6 +1,6 @@ import axios from 'axios'; -import { type Room as RemoteRoom, type Peer as RemoteUser, RoomApi } from '@jellyfish-dev/js-server-sdk'; +import { type Room as RemoteRoom, type Peer as RemoteUser, RoomApi } from '@fishjam-dev/js-server-sdk'; import type { ServerMessage, @@ -8,7 +8,7 @@ import type { ServerMessage_PeerDeleted, ServerMessage_RoomCrashed, ServerMessage_RoomDeleted, -} from '@jellyfish-dev/js-server-sdk/proto'; +} from '@fishjam-dev/js-server-sdk/proto'; import config from './config'; @@ -39,15 +39,15 @@ export class RoomService { }, }); - this.roomApi = new RoomApi(undefined, config.jellyfishUrl, client); - this.tls = config.jellyfishUrl.startsWith('https'); + this.roomApi = new RoomApi(undefined, config.fishjamUrl, client); + this.tls = config.fishjamUrl.startsWith('https'); } async findOrCreateUser(roomId: string, userId: string): Promise { const room = await this.findOrCreateRoom(roomId); let user = room.users.get(userId); - // make sure the user exists on the Jellyfish server as well + // make sure the user exists on the Fishjam server as well const remoteUser = user ? await this.findRemoteUser(roomId, user.peerId) : null; if (user && remoteUser) { @@ -63,7 +63,7 @@ export class RoomService { return user; } - handleJellyfishMessage(notification: ServerMessage): void { + handleFishjamMessage(notification: ServerMessage): void { Object.entries(notification) .filter(([_key, value]) => value) .forEach(([key, value]) => { @@ -91,7 +91,7 @@ export class RoomService { const remoteRoom = await this.findRemoteRoom(roomId); if (!(room && remoteRoom)) { - await this.findOrCreateRoomInJellyfish(roomId); + await this.findOrCreateRoomInFishjam(roomId); room = { roomId, users: new Map() }; @@ -106,7 +106,7 @@ export class RoomService { data: { data }, } = await this.roomApi.addPeer(roomId, { type: 'webrtc', options: { enableSimulcast: config.enableSimulcast } }); - const peerWebsocketUrl = data.peer_websocket_url ?? config.jellyfishUrl + '/socket/peer/websocket'; + const peerWebsocketUrl = data.peer_websocket_url ?? config.fishjamUrl + '/socket/peer/websocket'; const peerId = data.peer.id; @@ -121,7 +121,7 @@ export class RoomService { return user; } - private async findOrCreateRoomInJellyfish(roomId: string): Promise { + private async findOrCreateRoomInFishjam(roomId: string): Promise { try { // Check if the room exists in the application. // This may happen when someone creates a room outside of this application @@ -129,12 +129,12 @@ export class RoomService { const room = (await this.roomApi.getAllRooms()).data.data.find((room) => room.id === roomId); if (room) { - console.warn({ message: 'Room already exists in Jellyfish', roomId }); + console.warn({ message: 'Room already exists in Fishjam', roomId }); return; } - console.log({ message: 'Creating a room in Jellyfish', roomId }); + console.log({ message: 'Creating a room in Fishjam', roomId }); const optionalConfig = { maxPeers: config.maxPeers, @@ -151,7 +151,7 @@ export class RoomService { } catch (error) { const stringified = JSON.stringify(error); - console.error({ message: `Failed to create room in Jellyfish due to ${stringified}`, roomId }); + console.error({ message: `Failed to create room in Fishjam due to ${stringified}`, roomId }); throw error; } diff --git a/package-lock.json b/package-lock.json index 4415097..d24458e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "@jellyfish-dev/js-server-sdk", + "name": "@fishjam-dev/js-server-sdk", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@jellyfish-dev/js-server-sdk", + "name": "@fishjam-dev/js-server-sdk", "version": "0.1.0", "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 0349d92..63a0926 100644 --- a/package.json +++ b/package.json @@ -1,19 +1,19 @@ { - "name": "@jellyfish-dev/js-server-sdk", + "name": "@fishjam-dev/js-server-sdk", "version": "0.1.0", - "description": "Jellyfish server SDK for JavaScript", - "homepage": "https://github.com/jellyfish-dev/js-server-sdk", + "description": "Fishjam server SDK for JavaScript", + "homepage": "https://github.com/fishjam-dev/js-server-sdk", "repository": { "type": "git", - "url": "https://github.com/jellyfish-dev/js-server-sdk.git" + "url": "https://github.com/fishjam-dev/js-server-sdk.git" }, "bugs": { - "url": "https://github.com/jellyfish-dev/js-server-sdk/issues" + "url": "https://github.com/fishjam-dev/js-server-sdk/issues" }, "license": "Apache-2.0", "keywords": [ "webrtc", - "jellyfish", + "fishjam", "server", "membrane" ], @@ -24,14 +24,14 @@ ], "exports": { ".": "./dist/index.js", - "./proto": "./dist/protos/jellyfish/index.js" + "./proto": "./dist/protos/fishjam/index.js" }, "scripts": { "build": "tsc", "build:check": "tsc --noEmit", "format": "prettier --write .", "format:check": "prettier --check .", - "docs": "typedoc src src/protos/jellyfish", + "docs": "typedoc src src/protos/fishjam", "gen:proto": "sh codegen/protobuf.sh", "gen:api": "sh codegen/openapi.sh", "prepare": "tsc" diff --git a/protos b/protos index 7da5da1..83aa151 160000 --- a/protos +++ b/protos @@ -1 +1 @@ -Subproject commit 7da5da127c8e018ee0c845c921f598b10209271c +Subproject commit 83aa151401f9cd03fe91029d4ef2f8175fcf58f2 diff --git a/src/openapi/.openapi-generator/FILES b/src/openapi/.openapi-generator/FILES index a80cd4f..16b445e 100644 --- a/src/openapi/.openapi-generator/FILES +++ b/src/openapi/.openapi-generator/FILES @@ -1,5 +1,6 @@ .gitignore .npmignore +.openapi-generator-ignore api.ts base.ts common.ts diff --git a/src/openapi/api.ts b/src/openapi/api.ts index db41a20..8c77a27 100644 --- a/src/openapi/api.ts +++ b/src/openapi/api.ts @@ -1,10 +1,10 @@ /* tslint:disable */ /* eslint-disable */ /** - * Jellyfish Media Server + * Fishjam Media Server * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.5.0 + * The version of the OpenAPI document: 0.6.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -546,7 +546,7 @@ export interface DialConfig { 'phoneNumber'?: string; } /** - * Describes overall Jellyfish health + * Describes overall Fishjam health * @export * @interface HealthReport */ @@ -570,13 +570,13 @@ export interface HealthReport { */ 'status': HealthReportStatus; /** - * Uptime of Jellyfish (in seconds) + * Uptime of Fishjam (in seconds) * @type {number} * @memberof HealthReport */ 'uptime': number; /** - * Version of Jellyfish + * Version of Fishjam * @type {string} * @memberof HealthReport */ @@ -585,13 +585,13 @@ export interface HealthReport { /** - * Informs about the status of Jellyfish distribution + * Informs about the status of Fishjam distribution * @export * @interface HealthReportDistribution */ export interface HealthReportDistribution { /** - * Whether distribution is enabled on this Jellyfish + * Whether distribution is enabled on this Fishjam * @type {boolean} * @memberof HealthReportDistribution */ @@ -603,7 +603,7 @@ export interface HealthReportDistribution { */ 'nodeStatus': HealthReportStatus; /** - * Amount of nodes (including this Jellyfish\'s node) in the distribution cluster + * Amount of nodes (including this Fishjam\'s node) in the distribution cluster * @type {number} * @memberof HealthReportDistribution */ @@ -612,7 +612,7 @@ export interface HealthReportDistribution { /** - * Informs about the status of Jellyfish or a specific service + * Informs about the status of Fishjam or a specific service * @export * @enum {string} */ @@ -626,7 +626,7 @@ export type HealthReportStatus = typeof HealthReportStatus[keyof typeof HealthRe /** - * Response containing health report of Jellyfish + * Response containing health report of Fishjam * @export * @interface HealthcheckResponse */ @@ -831,7 +831,7 @@ export interface RoomConfig { */ 'peerlessPurgeTimeout'?: number | null; /** - * Custom id used for identifying room within Jellyfish. Must be unique across all rooms. If not provided, random UUID is generated. + * Custom id used for identifying room within Fishjam. Must be unique across all rooms. If not provided, random UUID is generated. * @type {string} * @memberof RoomConfig */ @@ -843,7 +843,7 @@ export interface RoomConfig { */ 'videoCodec'?: RoomConfigVideoCodecEnum | null; /** - * URL where Jellyfish notifications will be sent + * URL where Fishjam notifications will be sent * @type {string} * @memberof RoomConfig */ @@ -877,11 +877,11 @@ export interface RoomCreateDetailsResponse { */ export interface RoomCreateDetailsResponseData { /** - * Jellyfish instance address where the room was created. This might be different than the address of Jellyfish where the request was sent only when running a cluster of Jellyfishes. + * Fishjam instance address where the room was created. This might be different than the address of Fishjam where the request was sent only when running a cluster of Fishjams. * @type {string} * @memberof RoomCreateDetailsResponseData */ - 'jellyfish_address': string; + 'fishjam_address': string; /** * * @type {Room} @@ -1051,7 +1051,7 @@ export const HealthApiAxiosParamCreator = function (configuration?: Configuratio return { /** * - * @summary Describes the health of Jellyfish + * @summary Describes the health of Fishjam * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -1095,7 +1095,7 @@ export const HealthApiFp = function(configuration?: Configuration) { return { /** * - * @summary Describes the health of Jellyfish + * @summary Describes the health of Fishjam * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -1117,7 +1117,7 @@ export const HealthApiFactory = function (configuration?: Configuration, basePat return { /** * - * @summary Describes the health of Jellyfish + * @summary Describes the health of Fishjam * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -1136,7 +1136,7 @@ export const HealthApiFactory = function (configuration?: Configuration, basePat export class HealthApi extends BaseAPI { /** * - * @summary Describes the health of Jellyfish + * @summary Describes the health of Fishjam * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof HealthApi diff --git a/src/openapi/base.ts b/src/openapi/base.ts index 2d4e14e..e07960d 100644 --- a/src/openapi/base.ts +++ b/src/openapi/base.ts @@ -1,10 +1,10 @@ /* tslint:disable */ /* eslint-disable */ /** - * Jellyfish Media Server + * Fishjam Media Server * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.5.0 + * The version of the OpenAPI document: 0.6.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/openapi/common.ts b/src/openapi/common.ts index b9c2c02..bd58e2e 100644 --- a/src/openapi/common.ts +++ b/src/openapi/common.ts @@ -1,10 +1,10 @@ /* tslint:disable */ /* eslint-disable */ /** - * Jellyfish Media Server + * Fishjam Media Server * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.5.0 + * The version of the OpenAPI document: 0.6.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/openapi/configuration.ts b/src/openapi/configuration.ts index 6f602fb..c6226c4 100644 --- a/src/openapi/configuration.ts +++ b/src/openapi/configuration.ts @@ -1,10 +1,10 @@ /* tslint:disable */ /* eslint-disable */ /** - * Jellyfish Media Server + * Fishjam Media Server * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.5.0 + * The version of the OpenAPI document: 0.6.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/openapi/index.ts b/src/openapi/index.ts index 51ed3d6..a6e37b6 100644 --- a/src/openapi/index.ts +++ b/src/openapi/index.ts @@ -1,10 +1,10 @@ /* tslint:disable */ /* eslint-disable */ /** - * Jellyfish Media Server + * Fishjam Media Server * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.5.0 + * The version of the OpenAPI document: 0.6.1 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/protos/fishjam/index.ts b/src/protos/fishjam/index.ts new file mode 100644 index 0000000..62d88ca --- /dev/null +++ b/src/protos/fishjam/index.ts @@ -0,0 +1,6 @@ +/** + * Definitions of protobufs for communication with a Fishjam server. + * @module proto + */ + +export * from "./server_notifications"; diff --git a/src/protos/jellyfish/server_notifications.ts b/src/protos/fishjam/server_notifications.ts similarity index 99% rename from src/protos/jellyfish/server_notifications.ts rename to src/protos/fishjam/server_notifications.ts index f0d5280..2d51a7e 100644 --- a/src/protos/jellyfish/server_notifications.ts +++ b/src/protos/fishjam/server_notifications.ts @@ -1,9 +1,9 @@ /* eslint-disable */ import * as _m0 from "protobufjs/minimal"; -export const protobufPackage = "jellyfish"; +export const protobufPackage = "fishjam"; -/** Defines any type of message passed between JF and server client */ +/** Defines any type of message passed between FJ and server client */ export interface ServerMessage { roomCrashed?: ServerMessage_RoomCrashed | undefined; peerConnected?: ServerMessage_PeerConnected | undefined; @@ -131,7 +131,7 @@ export interface ServerMessage_PeerConnected { peerId: string; } -/** Notification sent when a peer disconnects from JF */ +/** Notification sent when a peer disconnects from FJ */ export interface ServerMessage_PeerDisconnected { roomId: string; peerId: string; @@ -150,11 +150,11 @@ export interface ServerMessage_ComponentCrashed { componentId: string; } -/** Response sent by JF, confirming successfull authentication */ +/** Response sent by FJ, confirming successfull authentication */ export interface ServerMessage_Authenticated { } -/** Request sent by client, to authenticate to JF server */ +/** Request sent by client, to authenticate to FJ server */ export interface ServerMessage_AuthRequest { token: string; } @@ -164,7 +164,7 @@ export interface ServerMessage_SubscribeRequest { eventType: ServerMessage_EventType; } -/** Response sent by JF, confirming subscription for message type */ +/** Response sent by FJ, confirming subscription for message type */ export interface ServerMessage_SubscribeResponse { eventType: ServerMessage_EventType; } @@ -179,7 +179,7 @@ export interface ServerMessage_RoomDeleted { roomId: string; } -/** Message containing WebRTC metrics from JF */ +/** Message containing WebRTC metrics from FJ */ export interface ServerMessage_MetricsReport { metrics: string; } diff --git a/src/protos/jellyfish/index.ts b/src/protos/jellyfish/index.ts deleted file mode 100644 index 61ada71..0000000 --- a/src/protos/jellyfish/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Definitions of protobufs for communication with a Jellyfish server. - * @module proto - */ - -export * from "./server_notifications";