Merge branch 'main' into agent-image-capture

Author: Qizot

.github/workflows/build-and-test-room-manager-amd64.yaml

@@ -58,7 +58,7 @@ jobs:
           [[ $(jq -r .peer.name tmp2.json) == "testPeerName" ]]
       - name: Test Livestream token endpoint
         run: |
-          curl -vvv "http://127.0.0.1:8080/api/rooms?roomName=live&peerName=peer&roomType=livestream"
+          curl -vvv "http://127.0.0.1:8080/api/rooms/livestream?roomName=live"
           curl -o tmp3.json -s -vvv "http://127.0.0.1:8080/api/rooms/live/livestream-viewer-token"
           TOKEN=$(jq -r .token tmp3.json)
           # test if it's a json web token

examples/room-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "room-manager",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "",
   "main": "index.js",
   "scripts": {

examples/selective-subscription/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "selective-subscription-backend",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "scripts": {
     "dev": "bun run --watch src/index.ts",
     "typecheck": "tsc --noEmit"

examples/selective-subscription/frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "selective-subscription-frontend",
   "private": true,
-  "version": "0.24.0",
+  "version": "0.25.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

examples/selective-subscription/package.json

@@ -1,6 +1,6 @@
 {
   "name": "selective-subscription-demo",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "workspaces": [
     "frontend",
     "backend"

examples/transcription/package.json

@@ -1,6 +1,6 @@
 {
   "name": "transcription-demo",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "format": "prettier --write .",

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.24.0",
+  "version": "0.25.0",
   "license": "Apache-2.0",
   "workspaces": [
     "packages/*",

packages/fishjam-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/fishjam-openapi",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "private": true,
   "description": "Fishjam OpenAPI",
   "homepage": "https://github.com/fishjam-cloud/js-server-sdk",

packages/fishjam-openapi/src/generated/api.ts

@@ -4,7 +4,7 @@
  * Fishjam Media Server
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 0.23.0
+ * The version of the OpenAPI document: 0.24.1
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -23,27 +23,6 @@ import type { RequestArgs } from './base';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from './base';
 
-/**
- * 
- * @export
- * @interface AddPeerRequest
- */
-export interface AddPeerRequest {
-    /**
-     * 
-     * @type {PeerOptions}
-     * @memberof AddPeerRequest
-     */
-    'options': PeerOptions;
-    /**
-     * 
-     * @type {PeerType}
-     * @memberof AddPeerRequest
-     */
-    'type': PeerType;
-}
-
-
 /**
  * Output audio options
  * @export
@@ -156,6 +135,27 @@ export interface Peer {
 }
 
 
+/**
+ * Peer configuration
+ * @export
+ * @interface PeerConfig
+ */
+export interface PeerConfig {
+    /**
+     * 
+     * @type {PeerOptions}
+     * @memberof PeerConfig
+     */
+    'options': PeerOptions;
+    /**
+     * 
+     * @type {PeerType}
+     * @memberof PeerConfig
+     */
+    'type': PeerType;
+}
+
+
 /**
  * Response containing peer details and their token
  * @export
@@ -498,6 +498,12 @@ export interface StreamConfig {
      * @memberof StreamConfig
      */
     'public'?: boolean;
+    /**
+     * Webhook URL for receiving server notifications
+     * @type {string}
+     * @memberof StreamConfig
+     */
+    'webhookUrl'?: string | null;
 }
 /**
  * Describes streamer status
@@ -716,11 +722,11 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration)
          * 
          * @summary Create peer
          * @param {string} roomId Room id
-         * @param {AddPeerRequest} [addPeerRequest] Peer specification
+         * @param {PeerConfig} [peerConfig] Peer specification
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        addPeer: async (roomId: string, addPeerRequest?: AddPeerRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        addPeer: async (roomId: string, peerConfig?: PeerConfig, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'roomId' is not null or undefined
             assertParamExists('addPeer', 'roomId', roomId)
             const localVarPath = `/room/{room_id}/peer`
@@ -747,7 +753,7 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration)
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(addPeerRequest, localVarRequestOptions, configuration)
+            localVarRequestOptions.data = serializeDataIfNeeded(peerConfig, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -1093,12 +1099,12 @@ export const RoomApiFp = function(configuration?: Configuration) {
          * 
          * @summary Create peer
          * @param {string} roomId Room id
-         * @param {AddPeerRequest} [addPeerRequest] Peer specification
+         * @param {PeerConfig} [peerConfig] Peer specification
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async addPeer(roomId: string, addPeerRequest?: AddPeerRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PeerDetailsResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.addPeer(roomId, addPeerRequest, options);
+        async addPeer(roomId: string, peerConfig?: PeerConfig, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PeerDetailsResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.addPeer(roomId, peerConfig, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
             const localVarOperationServerBasePath = operationServerMap['RoomApi.addPeer']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
@@ -1226,12 +1232,12 @@ export const RoomApiFactory = function (configuration?: Configuration, basePath?
          * 
          * @summary Create peer
          * @param {string} roomId Room id
-         * @param {AddPeerRequest} [addPeerRequest] Peer specification
+         * @param {PeerConfig} [peerConfig] Peer specification
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        addPeer(roomId: string, addPeerRequest?: AddPeerRequest, options?: any): AxiosPromise<PeerDetailsResponse> {
-            return localVarFp.addPeer(roomId, addPeerRequest, options).then((request) => request(axios, basePath));
+        addPeer(roomId: string, peerConfig?: PeerConfig, options?: any): AxiosPromise<PeerDetailsResponse> {
+            return localVarFp.addPeer(roomId, peerConfig, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -1332,13 +1338,13 @@ export class RoomApi extends BaseAPI {
      * 
      * @summary Create peer
      * @param {string} roomId Room id
-     * @param {AddPeerRequest} [addPeerRequest] Peer specification
+     * @param {PeerConfig} [peerConfig] Peer specification
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof RoomApi
      */
-    public addPeer(roomId: string, addPeerRequest?: AddPeerRequest, options?: RawAxiosRequestConfig) {
-        return RoomApiFp(this.configuration).addPeer(roomId, addPeerRequest, options).then((request) => request(this.axios, this.basePath));
+    public addPeer(roomId: string, peerConfig?: PeerConfig, options?: RawAxiosRequestConfig) {
+        return RoomApiFp(this.configuration).addPeer(roomId, peerConfig, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -1492,7 +1498,7 @@ export const StreamApiAxiosParamCreator = function (configuration?: Configuratio
         /**
          * 
          * @summary Deletes stream
-         * @param {string} streamId 
+         * @param {string} streamId Stream ID
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -1564,7 +1570,7 @@ export const StreamApiAxiosParamCreator = function (configuration?: Configuratio
         /**
          * 
          * @summary Shows information about the stream
-         * @param {string} streamId 
+         * @param {string} streamId Stream ID
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -1625,7 +1631,7 @@ export const StreamApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary Deletes stream
-         * @param {string} streamId 
+         * @param {string} streamId Stream ID
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -1650,7 +1656,7 @@ export const StreamApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary Shows information about the stream
-         * @param {string} streamId 
+         * @param {string} streamId Stream ID
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -1683,7 +1689,7 @@ export const StreamApiFactory = function (configuration?: Configuration, basePat
         /**
          * 
          * @summary Deletes stream
-         * @param {string} streamId 
+         * @param {string} streamId Stream ID
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -1702,7 +1708,7 @@ export const StreamApiFactory = function (configuration?: Configuration, basePat
         /**
          * 
          * @summary Shows information about the stream
-         * @param {string} streamId 
+         * @param {string} streamId Stream ID
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -1734,7 +1740,7 @@ export class StreamApi extends BaseAPI {
     /**
      * 
      * @summary Deletes stream
-     * @param {string} streamId 
+     * @param {string} streamId Stream ID
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof StreamApi
@@ -1757,7 +1763,7 @@ export class StreamApi extends BaseAPI {
     /**
      * 
      * @summary Shows information about the stream
-     * @param {string} streamId 
+     * @param {string} streamId Stream ID
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof StreamApi

packages/fishjam-openapi/src/generated/base.ts

@@ -4,7 +4,7 @@
  * Fishjam Media Server
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 0.23.0
+ * The version of the OpenAPI document: 0.24.1
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).