Merge branch 'develop'

Author: CarsonF

Dockerfile

@@ -1,9 +1,12 @@
 # Base node stage that sets up common config for dev & prod
 FROM public.ecr.aws/docker/library/node:18-slim as node
 
-# Add wget in for healthchecks
+# Install these native packages
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates wget curl \
+    && apt-get install -y --no-install-recommends \
+      ca-certificates wget curl \
+      # Install ffprobe from here, as the npm version is manually published and as of comment segfaults with urls
+      ffmpeg \
     && apt-get clean -q -y \
     && rm -rf /var/lib/apt/lists/*
 

package.json

@@ -42,11 +42,11 @@
     "@nestjs/graphql": "^12.0.8",
     "@nestjs/platform-express": "^10.2.1",
     "@patarapolw/prettyprint": "^1.0.3",
-    "@seedcompany/common": ">=0.10 <1",
+    "@seedcompany/common": ">=0.11 <1",
     "@seedcompany/data-loader": "^0.5.4",
     "@seedcompany/nestjs-email": "^3.3.2",
     "@seedcompany/scripture": "^0.3.0",
-    "argon2": "^0.31.0",
+    "argon2": "^0.31.1",
     "aws-xray-sdk-core": "^3.5.1",
     "chalk": "^5.3.0",
     "class-transformer": "^0.5.1",

src/components/file/media/media-detector.service.ts

@@ -1,6 +1,7 @@
-import { path as ffprobeBinary } from '@ffprobe-installer/ffprobe';
+import npmFfprobe from '@ffprobe-installer/ffprobe';
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
-import { execa } from 'execa';
+import { CachedByArg as Once } from '@seedcompany/common';
+import { $, execa } from 'execa';
 import { FFProbeResult } from 'ffprobe';
 import { imageSize } from 'image-size';
 import { ISize as ImageSize } from 'image-size/dist/types/interface';
@@ -69,11 +70,12 @@ export class MediaDetector {
   }
 
   private async ffprobe(url: string): Promise<Partial<FFProbeResult>> {
+    const binaryPath = await this.getFfprobeBinaryPath();
     try {
       return await retry(
         async () => {
           const probe = await execa(
-            ffprobeBinary,
+            binaryPath,
             [
               '-v',
               'error',
@@ -104,4 +106,14 @@ export class MediaDetector {
       return {};
     }
   }
+
+  @Once()
+  private async getFfprobeBinaryPath() {
+    try {
+      await retry(async () => await $`which ffprobe`, { retries: 3 });
+      return 'ffprobe';
+    } catch {
+      return npmFfprobe.path;
+    }
+  }
 }