fix: media upload location key and space endpoint resolution

Author: ascariandrea

compose.yml

@@ -17,7 +17,7 @@ services:
       - reverseproxy
 
   fra1.space.liexp.dev:
-    image: minio/minio:latest
+    image: minio/minio:RELEASE.2024-08-03T04-33-23Z
     command: server --console-address ":9001" /data
     ports:
       - "127.0.0.1:9000:9000"

lies.exposed.code-workspace

@@ -69,7 +69,7 @@
     "typescript.format.enable": true,
     "eslint.codeActionsOnSave.mode": "problems",
     "eslint.workingDirectories": [
-      "./",
+      "./"
     ],
     "eslint.useFlatConfig": true,
     "explorer.fileNesting.enabled": true,

packages/@liexp/backend/src/flows/media/thumbnails/extractThumbnail.flow.ts

@@ -3,6 +3,7 @@ import { fp, pipe } from "@liexp/core/lib/fp/index.js";
 import { ImageType } from "@liexp/shared/lib/io/http/Media/index.js";
 import { Media } from "@liexp/shared/lib/io/http/index.js";
 import { getMediaThumbKey } from "@liexp/shared/lib/utils/media.utils.js";
+import { ensureHTTPProtocol } from "@liexp/shared/lib/utils/url.utils.js";
 import { Schema } from "effect";
 import { type ReaderTaskEither } from "fp-ts/lib/ReaderTaskEither.js";
 import { type ConfigContext } from "../../../context/config.context.js";
@@ -16,7 +17,6 @@ import { type PDFProviderContext } from "../../../context/pdf.context.js";
 import { type PuppeteerProviderContext } from "../../../context/puppeteer.context.js";
 import { type ServerError } from "../../../errors/ServerError.js";
 import { type SimpleMedia } from "../../../io/media.io.js";
-import { LoggerService } from "../../../services/logger/logger.service.js";
 import { extractMP4Thumbnail } from "./extractMP4Thumbnail.flow.js";
 import { extractThumbnailFromImage } from "./extractThumbnailFromImage.flow.js";
 import { extractThumbnailFromPDF } from "./extractThumbnailFromPDF.flow.js";
@@ -37,17 +37,17 @@ export const extractThumbnail = <
   media: SimpleMedia,
 ): ReaderTaskEither<C, ServerError, PutObjectCommandInput[]> => {
   return pipe(
-    fp.RTE.right<C, ServerError, SimpleMedia>(media),
-    LoggerService.RTE.debug((m) => [
-      "Extracting thumbnail from url %s with type %s",
-      m.location,
-      m.type,
-    ]),
+    fp.RTE.Do,
+    fp.RTE.apS("media", fp.RTE.right(media)),
     fp.RTE.bind("bucket", () => fp.RTE.asks((ctx: C) => ctx.env.SPACE_BUCKET)),
+    fp.RTE.apS("location", fp.RTE.right(ensureHTTPProtocol(media.location))),
     fp.RTE.bind(
       "thumbnails",
-      (): ReaderTaskEither<C, ServerError, readonly ArrayBuffer[]> => {
-        const { type, ...m } = media;
+      ({
+        location,
+        media,
+      }): ReaderTaskEither<C, ServerError, readonly ArrayBuffer[]> => {
+        const { type, ...m } = { ...media, location };
 
         if (Schema.is(Media.PDFType)(type)) {
           return extractThumbnailFromPDF({
@@ -86,7 +86,7 @@ export const extractThumbnail = <
         fp.A.traverse(fp.RTE.ApplicativePar)(resizeThumbnailFlow<C>),
       );
     }),
-    fp.RTE.map(({ resizedThumbnail, bucket }) => {
+    fp.RTE.map(({ resizedThumbnail, bucket, media }) => {
       return resizedThumbnail.map((Body, index) => ({
         Key: getMediaThumbKey(
           media.id,

packages/@liexp/backend/src/flows/media/thumbnails/extractThumbnailFromPDF.flow.ts

@@ -38,11 +38,11 @@ export const extractThumbnailFromPDFPage = (
             ? [outputScale, 0, 0, outputScale, 0, 0]
             : undefined;
 
-        const renderContext: RenderParameters = {
+        const renderContext = {
           canvasContext: context as unknown as CanvasRenderingContext2D,
           transform,
           viewport,
-        };
+        } as RenderParameters;
 
         await page.render(renderContext).promise;
 

packages/@liexp/backend/src/flows/tg/parseDocument.flow.ts

@@ -66,6 +66,7 @@ export const parseDocument =
 
         return createAndUpload(
           {
+            id: mediaId,
             type: contentType,
             location: messageDocument.file_id as URL,
             label: messageDocument.file_name,

packages/@liexp/backend/src/flows/tg/parsePhoto.flow.ts

@@ -56,6 +56,7 @@ export const parsePhoto =
 
             return createAndUpload(
               {
+                id: mediaId,
                 type: MediaType.members[0].literals[0],
                 location: p.file_id as URL,
                 label: description,

packages/@liexp/backend/src/flows/tg/parseVideo.flow.ts

@@ -2,7 +2,8 @@ import { pipe } from "@liexp/core/lib/fp/index.js";
 import { type URL } from "@liexp/shared/lib/io/http/Common/URL.js";
 import { uuid, type UUID } from "@liexp/shared/lib/io/http/Common/UUID.js";
 import { MP4Type } from "@liexp/shared/lib/io/http/Media/index.js";
-import { ensureHTTPS } from "@liexp/shared/lib/utils/url.utils.js";
+import { getMediaKey } from "@liexp/shared/lib/utils/media.utils.js";
+import { ensureHTTPProtocol } from "@liexp/shared/lib/utils/url.utils.js";
 import { sequenceS } from "fp-ts/lib/Apply.js";
 import * as O from "fp-ts/lib/Option.js";
 import { type ReaderTaskEither } from "fp-ts/lib/ReaderTaskEither.js";
@@ -67,13 +68,13 @@ export const parseVideo =
             TE.chain((f) => {
               return pipe(
                 upload({
-                  Key: `public/media/${mediaId}/${mediaId}.jpg`,
+                  Key: getMediaKey("media", mediaId, mediaId, "image/jpeg"),
                   Body: f,
                 })(ctx),
                 TE.mapLeft(ServerError.fromUnknown),
               );
             }),
-            TE.map((r) => ensureHTTPS(r.Location)),
+            TE.map((r) => ensureHTTPProtocol(r.Location)),
           ),
       ),
     );
@@ -89,6 +90,7 @@ export const parseVideo =
       TE.chain(({ video, thumb }) => {
         return createAndUpload(
           {
+            id: mediaId,
             type: MP4Type.literals[0],
             location: "" as URL,
             label: description,

packages/@liexp/backend/src/io/Actor.io.ts

@@ -14,10 +14,10 @@ import { type ActorEntity } from "../entities/Actor.entity.js";
 import { IOCodec } from "./DomainCodec.js";
 import { MediaIO } from "./media.io.js";
 
-export const encodeActor = (
-  { old_avatar, ...a }: ActorEntity,
-  spaceEndpoint: string,
-): E.Either<
+export const encodeActor = ({
+  old_avatar,
+  ...a
+}: ActorEntity): E.Either<
   _DecodeError,
   Schema.Schema.Encoded<typeof io.http.Actor.Actor>
 > => {
@@ -30,7 +30,7 @@ export const encodeActor = (
           ? Schema.is(UUID)(a.avatar)
             ? E.right(a.avatar)
             : pipe(
-                MediaIO.decodeSingle(a.avatar, spaceEndpoint),
+                MediaIO.decodeSingle(a.avatar),
                 // E.map((m) => ({
                 //   ...m,
                 //   createdAt: m.createdAt.toISOString(),
@@ -61,10 +61,10 @@ export const encodeActor = (
   );
 };
 
-const decodeActor = (
-  { old_avatar, ...a }: ActorEntity,
-  spaceEndpoint: string,
-): E.Either<_DecodeError, io.http.Actor.Actor> => {
+const decodeActor = ({
+  old_avatar,
+  ...a
+}: ActorEntity): E.Either<_DecodeError, io.http.Actor.Actor> => {
   return pipe(
     E.Do,
     E.bind(
@@ -76,7 +76,7 @@ const decodeActor = (
         a.avatar
           ? Schema.is(UUID)(a.avatar)
             ? E.right(a.avatar)
-            : pipe(MediaIO.encodeSingle(a.avatar, spaceEndpoint))
+            : pipe(MediaIO.encodeSingle(a.avatar))
           : E.right(undefined),
     ),
     E.chain(({ avatar }) => {

packages/@liexp/backend/src/io/Area.io.ts

@@ -12,13 +12,13 @@ import { type AreaEntity } from "../entities/Area.entity.js";
 import { IOCodec } from "./DomainCodec.js";
 import { MediaIO } from "./media.io.js";
 
-const toAreaIO = (
-  { featuredImage, ...area }: AreaEntity,
-  spaceEndpoint: string,
-): E.Either<_DecodeError, io.http.Area.Area> => {
+const toAreaIO = ({
+  featuredImage,
+  ...area
+}: AreaEntity): E.Either<_DecodeError, io.http.Area.Area> => {
   return pipe(
     featuredImage
-      ? MediaIO.decodeSingle(featuredImage, spaceEndpoint)
+      ? MediaIO.decodeSingle(featuredImage)
       : E.right<_DecodeError, io.http.Media.Media | null>(null),
     fp.E.chain((media) =>
       pipe(

packages/@liexp/backend/src/io/group.io.ts

@@ -14,10 +14,11 @@ import { type GroupEntity } from "../entities/Group.entity.js";
 import { IOCodec } from "./DomainCodec.js";
 import { MediaIO } from "./media.io.js";
 
-const encodeGroupIO = (
-  { avatar, old_avatar, ...group }: GroupEntity,
-  spaceEndpoint: string,
-): E.Either<
+const encodeGroupIO = ({
+  avatar,
+  old_avatar,
+  ...group
+}: GroupEntity): E.Either<
   _DecodeError,
   Schema.Schema.Encoded<typeof io.http.Group.Group>
 > => {
@@ -26,9 +27,7 @@ const encodeGroupIO = (
     E.bind(
       "avatar",
       (): E.Either<_DecodeError, io.http.Media.Media | undefined> =>
-        avatar
-          ? pipe(MediaIO.decodeSingle(avatar, spaceEndpoint))
-          : E.right(undefined),
+        avatar ? pipe(MediaIO.decodeSingle(avatar)) : E.right(undefined),
     ),
     E.map(({ avatar }) => ({
       ...group,
@@ -57,10 +56,11 @@ const encodeGroupIO = (
     ),
   );
 };
-const decodeGroupIO = (
-  { avatar, old_avatar, ...group }: GroupEntity,
-  spaceEndpoint: string,
-): E.Either<_DecodeError, io.http.Group.Group> => {
+const decodeGroupIO = ({
+  avatar,
+  old_avatar,
+  ...group
+}: GroupEntity): E.Either<_DecodeError, io.http.Group.Group> => {
   return pipe(
     E.Do,
     E.bind(
@@ -72,7 +72,7 @@ const decodeGroupIO = (
         avatar
           ? Schema.is(UUID)(avatar)
             ? E.right(avatar)
-            : pipe(MediaIO.encodeSingle(avatar, spaceEndpoint))
+            : pipe(MediaIO.encodeSingle(avatar))
           : E.right(undefined),
     ),
     E.chain(({ avatar }) =>