Switch from axios to fetch

packages/fishjam-openapi/openapi.sh

@@ -1,24 +1,44 @@
 #!/bin/sh
 
 # Usage:
-# sh openapi.sh main
-# sh openapi.sh v0.1.0
+# sh openapi.sh main <github-token>
+# sh openapi.sh v0.1.0 <github-token>
+# sh openapi.sh path/to/openapi.yaml
 
 set -e
 
 ROOTDIR=$(dirname "$(readlink -f $0)")
 
 if [ -z "$1" ]; then
-  echo "Missing a tag or a branch name as the first argument" 1>&2
-  exit 1
-elif [ -z "$2" ]; then
-  echo "Missing github token as as second argument" 1>&2
+  echo "Missing a tag/branch name or a local spec file path as the first argument" 1>&2
   exit 1
 fi
-echo "Generating code for $1...\n"
+
+if [ -f "$1" ]; then
+  SPEC=$(readlink -f "$1")
+  echo "Generating code from local spec $SPEC...\n"
+else
+  if [ -z "$2" ]; then
+    echo "Missing github token as the second argument" 1>&2
+    exit 1
+  fi
+  SPEC_DIR=$(mktemp -d)
+  trap 'rm -rf "$SPEC_DIR"' EXIT
+  SPEC="$SPEC_DIR/openapi.yaml"
+  curl -sfL \
+    -H "Authorization: token $2" \
+    -H "Accept: application/vnd.github.v3.raw" \
+    "https://raw.githubusercontent.com/fishjam-cloud/fishjam/$1/openapi.yaml" \
+    -o "$SPEC" \
+  || { echo "Failed to download openapi.yaml for ref '$1'" 1>&2; exit 1; }
+  echo "Generating code for $1...\n"
+fi
 
 cd $ROOTDIR \
 && npx @openapitools/openapi-generator-cli generate \
-  -i https://raw.githubusercontent.com/fishjam-cloud/fishjam/refs/heads/$1/openapi.yaml?token=$2 \
-  -g typescript-axios \
+  -i "$SPEC" \
+  -g typescript-fetch \
+  --additional-properties=modelPropertyNaming=original \
+  --reserved-words-mappings public=public \
+  --global-property=apiDocs=false,modelDocs=false \
   -o ./src/generated

packages/fishjam-openapi/openapitools.json

@@ -2,6 +2,6 @@
   "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "7.7.0"
+    "version": "7.23.0"
   }
 }

packages/fishjam-openapi/package.json

@@ -42,8 +42,8 @@
     "@openapitools/openapi-generator-cli": "^2.18.4",
     "tsup": "^8.4.0"
   },
-  "dependencies": {
-    "axios": "^1.7.9"
+  "engines": {
+    "node": ">=18"
   },
   "stableVersion": "0.28.1"
 }

packages/fishjam-openapi/src/generated/.openapi-generator/FILES

@@ -1,8 +1,57 @@
-.gitignore
-.npmignore
-api.ts
-base.ts
-common.ts
-configuration.ts
-git_push.sh
+apis/CredentialsApi.ts
+apis/MoQApi.ts
+apis/RoomsApi.ts
+apis/StreamersApi.ts
+apis/StreamsApi.ts
+apis/TrackForwardingsApi.ts
+apis/ViewersApi.ts
+apis/index.ts
 index.ts
+models/AgentOutput.ts
+models/AudioFormat.ts
+models/AudioSampleRate.ts
+models/CompositionInfo.ts
+models/ModelError.ts
+models/MoqAccess.ts
+models/MoqAccessConfig.ts
+models/Peer.ts
+models/PeerConfig.ts
+models/PeerConfigAgent.ts
+models/PeerConfigVAPI.ts
+models/PeerConfigWebRTC.ts
+models/PeerDetailsResponse.ts
+models/PeerDetailsResponseData.ts
+models/PeerOptionsAgent.ts
+models/PeerOptionsVapi.ts
+models/PeerOptionsWebRTC.ts
+models/PeerRefreshTokenResponse.ts
+models/PeerRefreshTokenResponseData.ts
+models/PeerStatus.ts
+models/PeerType.ts
+models/Room.ts
+models/RoomConfig.ts
+models/RoomCreateDetailsResponse.ts
+models/RoomCreateDetailsResponseData.ts
+models/RoomDetailsResponse.ts
+models/RoomType.ts
+models/RoomsListingResponse.ts
+models/Stream.ts
+models/StreamConfig.ts
+models/StreamDetailsResponse.ts
+models/Streamer.ts
+models/StreamerDetailsResponse.ts
+models/StreamerToken.ts
+models/StreamsListingResponse.ts
+models/SubscribeMode.ts
+models/SubscribeTracksRequest.ts
+models/Subscriptions.ts
+models/Track.ts
+models/TrackForwarding.ts
+models/TrackForwardingInfo.ts
+models/TrackType.ts
+models/VideoCodec.ts
+models/Viewer.ts
+models/ViewerDetailsResponse.ts
+models/ViewerToken.ts
+models/index.ts
+runtime.ts

packages/fishjam-openapi/src/generated/.openapi-generator/VERSION

@@ -1 +1 @@
-7.7.0
+7.23.0