fix: use URL type for media location and thumbnail

lies-exposed · Feb 2, 2025 · 429544f · 429544f
1 parent 9b4d84f
commit 429544f
Show file tree

Hide file tree

Showing 29 changed files with 123 additions and 131 deletions.
diff --git a/packages/@liexp/backend/src/entities/Event.v2.entity.ts b/packages/@liexp/backend/src/entities/Event.v2.entity.ts
@@ -1,7 +1,7 @@
+import { type BlockNoteDocument } from "@liexp/shared/lib/io/http/Common/BlockNoteDocument.js";
 import { type UUID } from "@liexp/shared/lib/io/http/Common/index.js";
 import { UNCATEGORIZED } from "@liexp/shared/lib/io/http/Events/EventType.js";
 import * as http from "@liexp/shared/lib/io/http/index.js";
-import { type BNEditorDocument } from "@liexp/shared/lib/providers/blocknote/type.js";
 import {
   Column,
   CreateDateColumn,
@@ -10,10 +10,10 @@ import {
   Index,
   JoinTable,
   ManyToMany,
+  ManyToOne,
   PrimaryGeneratedColumn,
   type Relation,
   UpdateDateColumn,
-  ManyToOne,
 } from "typeorm";
 import { type ActorEntity } from "./Actor.entity.js";
 import { AreaEntity } from "./Area.entity.js";
@@ -39,10 +39,10 @@ export class EventV2Entity {
   date: Date;
 
   @Column({ type: "json", nullable: true })
-  excerpt: BNEditorDocument | null;
+  excerpt: BlockNoteDocument | null;
 
   @Column({ type: "json", nullable: true })
-  body: any[] | null;
+  body: BlockNoteDocument | null;
 
   @Column({
     type: "enum",

diff --git a/packages/@liexp/backend/src/entities/Media.entity.ts b/packages/@liexp/backend/src/entities/Media.entity.ts
@@ -1,4 +1,4 @@
-import { type UUID } from "@liexp/shared/lib/io/http/Common/index.js";
+import { type URL, type UUID } from "@liexp/shared/lib/io/http/Common/index.js";
 import {
   MediaType,
   type MediaExtra,
@@ -35,10 +35,10 @@ export class MediaEntity {
   label: string | null;
 
   @Column({ type: "varchar", nullable: true })
-  thumbnail: string | null;
+  thumbnail: URL | null;
 
   @Column({ type: "varchar", nullable: false, unique: true })
-  location: string;
+  location: URL;
 
   @Column({ type: "varchar", nullable: true })
   description: string | null;

diff --git a/packages/@liexp/backend/src/flows/links/takeLinkScreenshot.flow.ts b/packages/@liexp/backend/src/flows/links/takeLinkScreenshot.flow.ts
@@ -1,4 +1,5 @@
 import { fp, pipe } from "@liexp/core/lib/fp/index.js";
+import { type URL } from "@liexp/shared/lib/io/http/Common/URL.js";
 import { PngType } from "@liexp/shared/lib/io/http/Media/index.js";
 import {
   contentTypeFromFileExt,
@@ -48,8 +49,8 @@ const uploadScreenshot = <C extends SpaceContext & ENVContext>(
       links: [],
       areas: [],
       type: PngType.value,
-      location: upload.Location,
-      thumbnail: upload.Location,
+      location: upload.Location as URL,
+      thumbnail: upload.Location as URL,
     })),
   );
 };

diff --git a/packages/@liexp/backend/src/flows/media/admin/getOrphanMedia.flow.ts b/packages/@liexp/backend/src/flows/media/admin/getOrphanMedia.flow.ts
@@ -1,6 +1,7 @@
 import path from "path";
 import { type ListObjectsOutput, type _Object } from "@aws-sdk/client-s3";
 import { fp, pipe } from "@liexp/core/lib/fp/index.js";
+import { type URL } from "@liexp/shared/lib/io/http/Common/URL.js";
 import { walkPaginatedRequest } from "@liexp/shared/lib/utils/fp.utils.js";
 import { getResourceAndIdFromLocation } from "@liexp/shared/lib/utils/media.utils.js";
 import { type Option } from "fp-ts/lib/Option.js";
@@ -94,7 +95,7 @@ export const getOrphanMediaFlow = <
                             return ctx.db.findOne(MediaEntity, {
                               where: [
                                 {
-                                  location: Like(`%${e.Key}`),
+                                  location: Like(`%${e.Key}` as URL),
                                 },
                               ],
                             });

diff --git a/packages/@liexp/backend/src/flows/media/createAndUpload.flow.ts b/packages/@liexp/backend/src/flows/media/createAndUpload.flow.ts
@@ -1,4 +1,5 @@
 import { fp, pipe } from "@liexp/core/lib/fp/index.js";
+import { type URL } from "@liexp/shared/lib/io/http/Common/URL.js";
 import { type UUID, uuid } from "@liexp/shared/lib/io/http/Common/UUID.js";
 import {
   IframeVideoType,
@@ -58,7 +59,7 @@ export const createAndUpload = <C extends CreateAndUploadFlowContext>(
       // ctx.logger.debug.log("Create media and upload %s", createMediaData);
 
       if (IframeVideoType.is(createMediaData.type)) {
-        return fp.RTE.right(createMediaData.location);
+        return fp.RTE.right(createMediaData.location as URL);
       }
 
       const mediaKey = getMediaKey(
@@ -74,7 +75,7 @@ export const createAndUpload = <C extends CreateAndUploadFlowContext>(
           ContentType,
           ACL: "public-read",
         }),
-        fp.RTE.map((r) => r.Location),
+        fp.RTE.map((r) => r.Location as URL),
         fp.RTE.mapLeft(ServerError.fromUnknown),
       );
     }),

diff --git a/packages/@liexp/backend/src/flows/media/extractMediaFromPlatform.flow.ts b/packages/@liexp/backend/src/flows/media/extractMediaFromPlatform.flow.ts
@@ -64,7 +64,7 @@ const extractEmbedFromPlatform = (
   url: URL,
   m: VideoPlatformMatch,
   page: puppeteer.Page,
-): TE.TaskEither<ServerError, string> => {
+): TE.TaskEither<ServerError, URL> => {
   return pipe(
     TE.tryCatch(async () => {
       await page.goto(url);
@@ -104,7 +104,7 @@ export const extractMediaFromPlatform =
         thumbnail: pipe(
           extractThumbnailFromVideoPlatform(m, page)(ctx),
           TE.orElse(
-            (): TE.TaskEither<ServerError, string | undefined> =>
+            (): TE.TaskEither<ServerError, URL | undefined> =>
               TE.right(undefined),
           ),
         ),

diff --git a/packages/@liexp/backend/src/flows/media/findOneByLocationOrElse.flow.ts b/packages/@liexp/backend/src/flows/media/findOneByLocationOrElse.flow.ts
@@ -1,4 +1,5 @@
 import { fp, pipe } from "@liexp/core/lib/fp/index.js";
+import { type URL } from "@liexp/shared/lib/io/http/Common/URL.js";
 import { uuid } from "@liexp/shared/lib/io/http/Common/UUID.js";
 import { type Option } from "fp-ts/lib/Option.js";
 import { type ReaderTaskEither } from "fp-ts/lib/ReaderTaskEither.js";
@@ -11,12 +12,12 @@ import { type DatabaseContext } from "context/db.context.js";
 export const findOneByLocationOrElse =
   <C extends DatabaseContext>(
     m: Partial<Metadata>,
-    orElse: (m: string) => Partial<MediaEntity>,
+    orElse: (m: URL) => Partial<MediaEntity>,
     creator: UserEntity,
   ): ReaderTaskEither<C, DBError, Option<MediaEntity>> =>
   (ctx) => {
     return pipe(
-      m.image,
+      m.image as URL,
       fp.O.fromNullable,
       fp.O.map((image) =>
         pipe(

diff --git a/packages/@liexp/backend/src/flows/media/thumbnails/createThumbnail.flow.ts b/packages/@liexp/backend/src/flows/media/thumbnails/createThumbnail.flow.ts
@@ -1,5 +1,6 @@
 import { type PutObjectCommandInput } from "@aws-sdk/client-s3";
 import { fp, pipe } from "@liexp/core/lib/fp/index.js";
+import { type URL } from "@liexp/shared/lib/io/http/Common/URL.js";
 import { type ReaderTaskEither } from "fp-ts/lib/ReaderTaskEither.js";
 import { type ConfigContext } from "../../../context/config.context.js";
 import { type ENVContext } from "../../../context/env.context.js";
@@ -18,7 +19,7 @@ import { extractThumbnail } from "./extractThumbnail.flow.js";
 
 const uploadThumbnails = <C extends SpaceContext & ENVContext>(
   thumbnails: PutObjectCommandInput[],
-): ReaderTaskEither<C, SpaceError, string[]> =>
+): ReaderTaskEither<C, SpaceError, URL[]> =>
   pipe(
     thumbnails,
     fp.A.traverse(fp.RTE.ApplicativePar)((thumbnail) =>
@@ -27,7 +28,7 @@ const uploadThumbnails = <C extends SpaceContext & ENVContext>(
           ...thumbnail,
           ACL: "public-read",
         }),
-        fp.RTE.map(({ Location }) => Location),
+        fp.RTE.map(({ Location }) => Location as URL),
       ),
     ),
   );
@@ -48,6 +49,6 @@ export const createThumbnail = <
     SpaceContext,
 >(
   media: SimpleMedia,
-): ReaderTaskEither<C, SpaceError, string[]> => {
+): ReaderTaskEither<C, SpaceError, URL[]> => {
   return pipe(extractThumbnail<C>(media), fp.RTE.chain(uploadThumbnails<C>));
 };
diff --git a/packages/@liexp/backend/src/flows/media/thumbnails/extractThumbnailFromVideoPlatform.flow.ts b/packages/@liexp/backend/src/flows/media/thumbnails/extractThumbnailFromVideoPlatform.flow.ts
@@ -3,6 +3,7 @@ import {
   getPlatform,
   type VideoPlatformMatch,
 } from "@liexp/shared/lib/helpers/media.helper.js";
+import { type URL } from "@liexp/shared/lib/io/http/Common/URL.js";
 import { type Media } from "@liexp/shared/lib/io/http/index.js";
 import * as E from "fp-ts/lib/Either.js";
 import { type ReaderTaskEither } from "fp-ts/lib/ReaderTaskEither.js";
@@ -21,7 +22,7 @@ export const extractThumbnailFromVideoPlatform =
   <C extends LoggerContext>(
     match: VideoPlatformMatch,
     page: Page,
-  ): ReaderTaskEither<C, ServerError, string> =>
+  ): ReaderTaskEither<C, ServerError, URL> =>
   (ctx) => {
     const toError = (m: VideoPlatformMatch): ServerError => {
       return ServerError.fromUnknown(
@@ -50,7 +51,7 @@ export const extractThumbnailFromVideoPlatform =
               `Thumbnail from selector ${selector}: ${coverUrl}`,
             );
 
-            return coverUrl;
+            return coverUrl as URL;
           }
           case "youtube": {
             const selector = 'div[class*="thumbnail-overlay-image"]';
@@ -68,7 +69,7 @@ export const extractThumbnailFromVideoPlatform =
               return undefined;
             });
 
-            return coverUrl;
+            return coverUrl as URL;
           }
           case "peertube":
           case "odysee": {
@@ -90,7 +91,7 @@ export const extractThumbnailFromVideoPlatform =
                 ?.replace('background-image: url("', "")
                 .replace('");', "");
 
-              return coverUrl;
+              return coverUrl as URL;
             });
           }
           case "rumble": {
@@ -111,7 +112,7 @@ export const extractThumbnailFromVideoPlatform =
               return el.getAttribute("poster");
             });
 
-            return videoPosterSrc;
+            return videoPosterSrc as URL;
           }
           case "dailymotion": {
             if (match.type === "embed") {
@@ -121,7 +122,7 @@ export const extractThumbnailFromVideoPlatform =
 
               return page.$eval(selector, (el) => {
                 return el.getAttribute("src");
-              });
+              }) as Promise<URL | null>;
             }
 
             const selector = 'meta[name="og:image:secure_url"]';
@@ -131,10 +132,10 @@ export const extractThumbnailFromVideoPlatform =
               return el.getAttribute("content");
             });
 
-            return url;
+            return url as URL;
           }
           default: {
-            return undefined;
+            return null;
           }
         }
       }, ServerError.fromUnknown),

diff --git a/packages/@liexp/backend/src/flows/tg/parseVideo.flow.ts b/packages/@liexp/backend/src/flows/tg/parseVideo.flow.ts
@@ -1,7 +1,7 @@
 import { pipe } from "@liexp/core/lib/fp/index.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/media.utils.js";
+import { ensureHTTPS } 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";

diff --git a/packages/@liexp/backend/src/flows/tg/upsertPinnedMessage.flow.ts b/packages/@liexp/backend/src/flows/tg/upsertPinnedMessage.flow.ts
@@ -3,15 +3,16 @@ import { sequenceS } from "fp-ts/lib/Apply.js";
 import { type ReaderTaskEither } from "fp-ts/lib/ReaderTaskEither.js";
 import * as TE from "fp-ts/lib/TaskEither.js";
 import type TelegramBot from "node-telegram-bot-api";
-import { type DatabaseContext } from "../../context/db.context";
-import { type ENVContext } from "../../context/env.context";
+import { type DatabaseContext } from "../../context/db.context.js";
+import { type ENVContext } from "../../context/env.context.js";
 import { type TGBotProviderContext } from "../../context/index.js";
-import { type LoggerContext } from "../../context/logger.context";
-import { EventV2Entity } from "../../entities/Event.v2.entity";
-import { KeywordEntity } from "../../entities/Keyword.entity";
+import { type LoggerContext } from "../../context/logger.context.js";
+import { EventV2Entity } from "../../entities/Event.v2.entity.js";
+import { KeywordEntity } from "../../entities/Keyword.entity.js";
+import { type TG_BOT_ENV } from "../../io/ENV.js";
 import { type DBError } from "../../providers/orm/index.js";
-import { type TGError, toTGError } from "../../providers/tg/tg.provider";
-import { LoggerService } from "../../services/logger/logger.service";
+import { type TGError, toTGError } from "../../providers/tg/tg.provider.js";
+import { LoggerService } from "../../services/logger/logger.service.js";
 
 interface ToPinnedMessageOptions {
   bot: string;
@@ -40,7 +41,7 @@ ${keywords.map((k) => `#${k.tag} (${k.eventCount})`).join("\n")}
 
 export type UpsertPinnerMessageFlowContext = DatabaseContext &
   LoggerContext &
-  ENVContext &
+  ENVContext<TG_BOT_ENV> &
   TGBotProviderContext;
 
 export const upsertPinnedMessage =

diff --git a/packages/@liexp/backend/src/io/ENV.ts b/packages/@liexp/backend/src/io/ENV.ts
@@ -2,6 +2,15 @@ import { NODE_ENV } from "@liexp/core/lib/env/node-env.js";
 import * as t from "io-ts";
 import { NumberFromString } from "io-ts-types/lib/NumberFromString.js";
 
+export const JWT_ENV = t.strict(
+  {
+    JWT_SECRET: t.string,
+  },
+  "JWT_ENV",
+);
+
+export type JWT_ENV = t.TypeOf<typeof JWT_ENV>;
+
 export const DATABASE_ENV = t.intersection(
   [
     t.strict(
@@ -58,7 +67,6 @@ export const BACKEND_ENV = t.intersection(
     t.strict({ NODE_ENV, DEFAULT_PAGE_SIZE: NumberFromString }),
     DATABASE_ENV,
     SPACE_ENV,
-    TG_BOT_ENV,
   ],
   "BACKEND_ENV",
 );

diff --git a/packages/@liexp/backend/src/io/media.io.ts b/packages/@liexp/backend/src/io/media.io.ts
@@ -6,7 +6,7 @@ import {
 import { MediaExtraMonoid } from "@liexp/shared/lib/io/http/Media/MediaExtra.js";
 import { type MediaType } from "@liexp/shared/lib/io/http/Media/MediaType.js";
 import * as io from "@liexp/shared/lib/io/index.js";
-import { ensureHTTPS } from "@liexp/shared/lib/utils/media.utils.js";
+import { ensureHTTPS } from "@liexp/shared/lib/utils/url.utils.js";
 import * as E from "fp-ts/lib/Either.js";
 import { type MediaEntity } from "../entities/Media.entity.js";
 import { IOCodec } from "./DomainCodec.js";

diff --git a/packages/@liexp/backend/src/providers/wikipedia/wikipedia.provider.ts b/packages/@liexp/backend/src/providers/wikipedia/wikipedia.provider.ts
@@ -1,6 +1,6 @@
 import { pipe, fp } from "@liexp/core/lib/fp/index.js";
 import { type Logger } from "@liexp/core/lib/logger/index.js";
-import { ensureHTTPS } from "@liexp/shared/lib/utils/media.utils.js";
+import { ensureHTTPS } from "@liexp/shared/lib/utils/url.utils.js";
 import {
   type AxiosRequestConfig,
   type AxiosInstance,

diff --git a/packages/@liexp/shared/src/endpoints/media.endpoints.ts b/packages/@liexp/shared/src/endpoints/media.endpoints.ts
@@ -1,9 +1,8 @@
 import * as t from "io-ts";
 import { UUID } from "io-ts-types/lib/UUID.js";
-import { optionFromNullable } from "io-ts-types/lib/optionFromNullable.js";
 import { Endpoint } from "ts-endpoint";
 import { ListOutput, Output } from "../io/http/Common/Output.js";
-import { CreateMedia, MediaExtra } from "../io/http/Media/index.js";
+import { CreateMedia, EditMediaBody } from "../io/http/Media/index.js";
 import { Media } from "../io/http/index.js";
 import { ResourceEndpoints } from "./types.js";
 
@@ -43,24 +42,7 @@ export const Edit = Endpoint({
   getPath: ({ id }) => `/media/${id}`,
   Input: {
     Params: t.type({ id: UUID }),
-    Body: t.strict({
-      type: Media.MediaType,
-      thumbnail: optionFromNullable(t.string),
-      location: t.string,
-      label: t.string,
-      description: optionFromNullable(t.string),
-      extra: optionFromNullable(MediaExtra),
-      links: t.array(UUID),
-      events: t.array(UUID),
-      keywords: t.array(UUID),
-      areas: t.array(UUID),
-      creator: optionFromNullable(UUID),
-      overrideThumbnail: optionFromNullable(t.boolean),
-      overrideExtra: optionFromNullable(t.boolean),
-      transfer: optionFromNullable(t.boolean),
-      transferThumbnail: optionFromNullable(t.boolean),
-      restore: optionFromNullable(t.boolean),
-    }),
+    Body: EditMediaBody,
   },
   Output: SingleMediaOutput,
 });

diff --git a/packages/@liexp/shared/src/io/http/Events/index.ts b/packages/@liexp/shared/src/io/http/Events/index.ts
@@ -69,7 +69,7 @@ export const CreateEventPlainBody = t.union(
 export type CreateEventPlainBody = t.TypeOf<typeof CreateEventPlainBody>;
 
 export const CreateEventBody = t.union(
-  [CreateEventPlainBody, EventFromURLBody],
+  [EventFromURLBody, CreateEventPlainBody],
   "CreateEventBody",
 );
 

diff --git a/packages/@liexp/shared/src/io/http/Media/Media.ts b/packages/@liexp/shared/src/io/http/Media/Media.ts
@@ -100,8 +100,8 @@ export type CreateMedia = t.TypeOf<typeof CreateMedia>;
 export const EditMediaBody = t.strict(
   {
     type: MediaType,
-    thumbnail: optionFromNullable(t.string),
-    location: t.string,
+    thumbnail: optionFromNullable(URL),
+    location: URL,
     label: t.string,
     description: optionFromNullable(t.string),
     extra: optionFromNullable(MediaExtra),