fix: minor platform and video related fixes

- Fix png decoding on image processor
- Fix video api event ack ratelimit
- Fix docker compose default binding
- Fix docker compose storage persistence
- Fix ci self-hosted runner selector

.github/workflows/lint-test-build.yml

@@ -34,7 +34,7 @@ jobs:
   lint:
     needs: pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: scuffle-ci-ryzen-9-7950x3d
+    runs-on: scuffle-ci
     container: ghcr.io/scuffletv/ci/build:latest
     steps:
       - uses: actions/checkout@v4
@@ -48,7 +48,7 @@ jobs:
   test:
     needs: pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: scuffle-ci-ryzen-9-7950x3d
+    runs-on: scuffle-ci
     container: ghcr.io/scuffletv/ci/build:latest
     services:
       cockroach:

dev/docker-compose.yml

@@ -6,31 +6,38 @@ services:
   cockroach:
     image: ghcr.io/scuffletv/ci/cockroach:latest
     pull_policy: "always"
-    command: start-single-node --insecure --store=type=mem,size=0.25 --advertise-addr=0.0.0.0
+    command: start-single-node --insecure --advertise-addr=0.0.0.0
+    volumes:
+      - cockroach:/cockroach/cockroach-data
     ports:
-      - "5432:26257"
-      - "8080:8080"
+      - "127.0.0.1:5432:26257"
+      - "127.0.0.1:8080:8080"
 
   nats:
     image: ghcr.io/scuffletv/ci/nats:latest
     pull_policy: "always"
     ports:
-      - "4222:4222"
-      - "8222:8222"
-      - "6222:6222"
+      - "127.0.0.1:4222:4222"
+      - "127.0.0.1:8222:8222"
+      - "127.0.0.1:6222:6222"
+    volumes:
+      - nats:/data
     command:
-      - "-js"
+      - --jetstream
+      - --store_dir=/data
 
   minio:
     image: ghcr.io/scuffletv/ci/minio:latest
     pull_policy: "always"
     ports:
-      - "9000:9000"
-      - "9001:9001"
+      - "127.0.0.1:9000:9000"
+      - "127.0.0.1:9001:9001"
     environment:
       - "MINIO_ACCESS_KEY=root"
       - "MINIO_SECRET_KEY=scuffle123"
-    command: server /export --console-address ":9001"
+    volumes:
+      - minio:/data
+    command: server /data --console-address ":9001"
 
   createbuckets:
     image: minio/mc:latest
@@ -56,4 +63,10 @@ services:
     image: ghcr.io/scuffletv/ci/redis:latest
     pull_policy: "always"
     ports:
-      - "6379:6379"
+      - "127.0.0.1:6379:6379"
+
+volumes:
+  cockroach:
+  nats:
+  minio:
+  redis:

docker/ffmpeg.sh

@@ -22,7 +22,14 @@ apt-get install -y --no-install-recommends \
         libtool \
         autoconf \
         automake \
-        build-essential
+        build-essential \
+        libpng-dev \
+        libjpeg-dev \
+        libtiff-dev \
+        libpng-16-16 \
+        libjpeg62 \
+        libtiff6
+
 
 git clone https://github.com/ScuffleTV/external.git --depth 1 --recurse-submodule --shallow-submodules /tmp/external
 /tmp/external/build.sh --prefix /usr/local --build "x264 x265 svt-av1 libvpx opus dav1d ffmpeg opencv"

platform/image_processor/src/processor/job/decoder/ffmpeg.rs

@@ -41,7 +41,7 @@ impl<'data> FfmpegDecoder<'data> {
 		let input_stream_duration = input_stream.duration().unwrap_or(0);
 		let input_stream_frames = input_stream
 			.nb_frames()
-			.ok_or_else(|| ProcessorError::FfmpegDecode(anyhow!("no frame count")))?;
+			.ok_or_else(|| ProcessorError::FfmpegDecode(anyhow!("no frame count")))?.max(1);
 
 		if input_stream_time_base.den == 0 || input_stream_time_base.num == 0 {
 			return Err(ProcessorError::FfmpegDecode(anyhow!("stream time base is 0")));

platform/image_processor/src/tests/processor/decoder.rs

@@ -57,6 +57,26 @@ fn decode_ffmpeg_gif_test() {
 	decode("meow.gif", DecoderBackend::Ffmpeg, expected_info, expected_frames);
 }
 
+#[test]
+fn decode_ffmpeg_png_test() {
+	let expected_info = DecoderInfo {
+		timescale: 25,
+		frame_count: 1,
+		loop_count: LoopCount::Infinite,
+		height: 400,
+		width: 400,
+	};
+
+	let expected_frames = (0..1)
+		.map(|_| Frame {
+			duration_ts: 0,
+			image: ImgVec::new(vec![], 400, 400),
+		})
+		.collect();
+
+	decode("frog.png", DecoderBackend::Ffmpeg, expected_info, expected_frames);
+}
+
 #[test]
 fn decode_libwebp_webp_test() {
 	let expected_info = DecoderInfo {

video/api/src/api/events/ack.rs

@@ -19,7 +19,7 @@ impl_request_scopes!(
 	EventsAckRequest,
 	(),
 	(Resource::Event, Permission::Read),
-	RateLimitResource::EventsSubscribe
+	RateLimitResource::EventsAck
 );
 
 impl ApiRequest<EventsAckResponse> for tonic::Request<EventsAckRequest> {

video/api/src/api/events/fetch.rs

@@ -25,7 +25,7 @@ impl_request_scopes!(
 	EventsFetchRequest,
 	(),
 	(Resource::Event, Permission::Read),
-	RateLimitResource::EventsSubscribe
+	RateLimitResource::EventsFetch
 );
 
 pub type Stream = Pin<Box<dyn futures_util::Stream<Item = tonic::Result<EventsFetchResponse>> + Send>>;

video/api/src/config.rs

@@ -132,7 +132,7 @@ impl Default for ApiConfig {
 			bind_address: "[::]:9080".to_string().parse().unwrap(),
 			tls: None,
 			events: EventsConfig::default(),
-			recording_delete_stream: "scuffle:video:recording_delete".to_string(),
+			recording_delete_stream: "scuffle-video-recording_delete".to_string(),
 			recording_delete_batch_size: 1000,
 			rate_limit_rules: RatelimitRules::default(),
 		}

video/api/src/ratelimit.rs

@@ -8,7 +8,8 @@ pub enum RateLimitResource {
 	AccessTokenTag,
 	AccessTokenUntag,
 
-	EventsSubscribe,
+	EventsFetch,
+	EventsAck,
 
 	PlaybackKeyPairGet,
 	PlaybackKeyPairCreate,
@@ -68,7 +69,8 @@ impl RateLimitResource {
 			Self::AccessTokenTag => "access_token:tag",
 			Self::AccessTokenUntag => "access_token:untag",
 
-			Self::EventsSubscribe => "events:subscribe",
+			Self::EventsFetch => "events:subscribe",
+			Self::EventsAck => "events:ack",
 
 			Self::PlaybackKeyPairGet => "playback_key_pair:get",
 			Self::PlaybackKeyPairCreate => "playback_key_pair:create",
@@ -131,7 +133,7 @@ impl FromStr for RateLimitResource {
 			"access_token:tag" => Ok(Self::AccessTokenTag),
 			"access_token:untag" => Ok(Self::AccessTokenUntag),
 
-			"events:subscribe" => Ok(Self::EventsSubscribe),
+			"events:subscribe" => Ok(Self::EventsFetch),
 
 			"playback_key_pair:get" => Ok(Self::PlaybackKeyPairGet),
 			"playback_key_pair:create" => Ok(Self::PlaybackKeyPairCreate),