From f16a8a7069b12c8ea14e28f7842ef505fad722e4 Mon Sep 17 00:00:00 2001 From: yiling Date: Tue, 16 Jun 2026 09:47:27 +0800 Subject: [PATCH] refactor(transcode): relocate TranscodeService to core and flatten API package --- AGENTS.md | 2 +- bun.lock | 24 ++-- packages/agent/src/activities/ai.test.ts | 4 +- packages/agent/src/activities/ai.ts | 2 +- packages/api/src/{api => }/agent.test.ts | 0 packages/api/src/{api => }/agent.ts | 0 packages/api/src/{api => }/attachment.test.ts | 0 packages/api/src/{api => }/attachment.ts | 0 packages/api/src/{api => }/authn.test.ts | 0 packages/api/src/{api => }/authn.ts | 0 packages/api/src/{api => }/collection.test.ts | 0 packages/api/src/{api => }/collection.ts | 0 packages/api/src/{api => }/file.test.ts | 2 +- packages/api/src/{api => }/file.ts | 2 +- packages/api/src/{api => }/folder.test.ts | 0 packages/api/src/{api => }/folder.ts | 0 packages/api/src/index.ts | 40 +++--- packages/api/src/{api => }/invite.test.ts | 0 packages/api/src/{api => }/invite.ts | 0 packages/api/src/{api => }/metadata.test.ts | 0 packages/api/src/{api => }/metadata.ts | 0 packages/api/src/{api => }/middleware/auth.ts | 0 .../api/src/{api => }/notification.test.ts | 0 packages/api/src/{api => }/notification.ts | 0 packages/api/src/{api => }/project.test.ts | 0 packages/api/src/{api => }/project.ts | 0 packages/api/src/{api => }/provider.test.ts | 0 packages/api/src/{api => }/provider.ts | 0 packages/api/src/{api => }/public-invite.ts | 0 packages/api/src/{api => }/public-share.ts | 0 packages/api/src/{api => }/s3.test.ts | 0 packages/api/src/{api => }/s3.ts | 0 packages/api/src/{api => }/share.test.ts | 0 packages/api/src/{api => }/share.ts | 0 packages/api/src/{api => }/skill.test.ts | 0 packages/api/src/{api => }/skill.ts | 0 packages/api/src/{api => }/team.test.ts | 0 packages/api/src/{api => }/team.ts | 0 packages/api/src/{api => }/upload.test.ts | 0 packages/api/src/{api => }/upload.ts | 0 .../api/src/{api => }/versionStack.test.ts | 0 packages/api/src/{api => }/versionStack.ts | 0 packages/core/package.json | 1 + packages/core/src/index.ts | 1 + .../core/src/transcode/dataFormatNames.ts | 115 +++++++++++++++++ .../src/transcode}/transcode.test.ts | 2 + .../src => core/src/transcode}/transcode.ts | 117 +----------------- packages/transcode/package.json | 1 - .../src/activities/transcode.test.ts | 4 +- .../transcode/src/activities/transcode.ts | 2 +- packages/transcode/src/index.ts | 1 - 51 files changed, 161 insertions(+), 159 deletions(-) rename packages/api/src/{api => }/agent.test.ts (100%) rename packages/api/src/{api => }/agent.ts (100%) rename packages/api/src/{api => }/attachment.test.ts (100%) rename packages/api/src/{api => }/attachment.ts (100%) rename packages/api/src/{api => }/authn.test.ts (100%) rename packages/api/src/{api => }/authn.ts (100%) rename packages/api/src/{api => }/collection.test.ts (100%) rename packages/api/src/{api => }/collection.ts (100%) rename packages/api/src/{api => }/file.test.ts (99%) rename packages/api/src/{api => }/file.ts (99%) rename packages/api/src/{api => }/folder.test.ts (100%) rename packages/api/src/{api => }/folder.ts (100%) rename packages/api/src/{api => }/invite.test.ts (100%) rename packages/api/src/{api => }/invite.ts (100%) rename packages/api/src/{api => }/metadata.test.ts (100%) rename packages/api/src/{api => }/metadata.ts (100%) rename packages/api/src/{api => }/middleware/auth.ts (100%) rename packages/api/src/{api => }/notification.test.ts (100%) rename packages/api/src/{api => }/notification.ts (100%) rename packages/api/src/{api => }/project.test.ts (100%) rename packages/api/src/{api => }/project.ts (100%) rename packages/api/src/{api => }/provider.test.ts (100%) rename packages/api/src/{api => }/provider.ts (100%) rename packages/api/src/{api => }/public-invite.ts (100%) rename packages/api/src/{api => }/public-share.ts (100%) rename packages/api/src/{api => }/s3.test.ts (100%) rename packages/api/src/{api => }/s3.ts (100%) rename packages/api/src/{api => }/share.test.ts (100%) rename packages/api/src/{api => }/share.ts (100%) rename packages/api/src/{api => }/skill.test.ts (100%) rename packages/api/src/{api => }/skill.ts (100%) rename packages/api/src/{api => }/team.test.ts (100%) rename packages/api/src/{api => }/team.ts (100%) rename packages/api/src/{api => }/upload.test.ts (100%) rename packages/api/src/{api => }/upload.ts (100%) rename packages/api/src/{api => }/versionStack.test.ts (100%) rename packages/api/src/{api => }/versionStack.ts (100%) create mode 100644 packages/core/src/transcode/dataFormatNames.ts rename packages/{transcode/src => core/src/transcode}/transcode.test.ts (99%) rename packages/{transcode/src => core/src/transcode}/transcode.ts (80%) diff --git a/AGENTS.md b/AGENTS.md index df5c74fc..de9d0009 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -244,7 +244,7 @@ The `bunfig.toml` is configured to run `setup-tests.ts` automatically as a prelo ### API Tests -- Located in `packages/api/src/api/**/*.test.ts`. +- Located in `packages/api/src/**/*.test.ts`. - Mock the Service layer using `vi.spyOn(service, 'method')` or `vi.mock('@shumai/core/src/team/team')`. - Verify that the API calls the Service methods correctly. diff --git a/bun.lock b/bun.lock index 3549fdf9..1271e12e 100644 --- a/bun.lock +++ b/bun.lock @@ -32,7 +32,7 @@ }, "apps/agent": { "name": "@shumai/agent-app", - "version": "0.1.0", + "version": "0.0.6", "bin": { "shumai-agent": "./src/index.ts", }, @@ -44,7 +44,7 @@ }, "apps/transcode": { "name": "@shumai/transcode-app", - "version": "0.1.0", + "version": "0.0.6", "bin": { "shumai-transcode": "./src/index.ts", }, @@ -56,7 +56,7 @@ }, "apps/web": { "name": "@shumai/web-app", - "version": "0.1.0", + "version": "0.0.6", "dependencies": { "@shumai/agent": "workspace:*", "@shumai/api": "workspace:*", @@ -71,7 +71,7 @@ }, "packages/agent": { "name": "@shumai/agent", - "version": "0.1.0", + "version": "0.0.6", "dependencies": { "@anthropic-ai/sandbox-runtime": "0.0.52", "@earendil-works/pi-agent-core": "0.78.0", @@ -95,7 +95,7 @@ }, "packages/api": { "name": "@shumai/api", - "version": "0.1.0", + "version": "0.0.6", "dependencies": { "@hono/zod-validator": "0.7.6", "@shumai/core": "workspace:*", @@ -109,7 +109,7 @@ }, "packages/core": { "name": "@shumai/core", - "version": "0.1.0", + "version": "0.0.6", "dependencies": { "@shumai/db": "workspace:*", "@shumai/dtos": "workspace:*", @@ -123,6 +123,7 @@ "hono": "4.12.23", "jittered-fractional-indexing": "1.0.1", "pino": "10.3.1", + "sharp": "0.34.5", "tweetnacl": "1.0.3", "ulid": "3.0.2", "yaml": "2.9.0", @@ -135,7 +136,7 @@ }, "packages/db": { "name": "@shumai/db", - "version": "0.1.0", + "version": "0.0.6", "dependencies": { "@earendil-works/pi-agent-core": "0.78.0", "@prisma/adapter-pg": "7.8.0", @@ -151,14 +152,14 @@ }, "packages/dtos": { "name": "@shumai/dtos", - "version": "0.1.0", + "version": "0.0.6", "dependencies": { "zod": "4.4.3", }, }, "packages/transcode": { "name": "@shumai/transcode", - "version": "0.1.0", + "version": "0.0.6", "dependencies": { "@shumai/core": "workspace:*", "@shumai/db": "workspace:*", @@ -167,13 +168,12 @@ "@temporalio/activity": "1.17.2", "@temporalio/worker": "1.17.2", "@temporalio/workflow": "1.17.2", - "sharp": "0.34.5", "ulid": "3.0.2", }, }, "packages/webui": { "name": "@shumai/webui", - "version": "0.1.0", + "version": "0.0.6", "dependencies": { "@base-ui/react": "1.5.0", "@dnd-kit/abstract": "0.4.0", @@ -273,7 +273,7 @@ }, "packages/workflow-core": { "name": "@shumai/workflow-core", - "version": "0.1.0", + "version": "0.0.6", "dependencies": { "@shumai/core": "workspace:*", "@shumai/db": "workspace:*", diff --git a/packages/agent/src/activities/ai.test.ts b/packages/agent/src/activities/ai.test.ts index ca9f9110..b2fb44a1 100644 --- a/packages/agent/src/activities/ai.test.ts +++ b/packages/agent/src/activities/ai.test.ts @@ -7,7 +7,7 @@ import { saveAssetEmbeddingsActivity, } from './ai' import { s3Service } from '@shumai/core/src/s3/s3' -import { transcodeService } from '@shumai/transcode' +import { transcodeService } from '@shumai/core/src/transcode/transcode' import { prisma, AssetType, AssetStatus } from '@shumai/db' import { setupTestDbHooks } from '@shumai/db/test' import * as fs from 'fs' @@ -38,7 +38,7 @@ vi.mock('@shumai/core/src/s3/s3', () => ({ }, })) -vi.mock('@shumai/transcode', () => ({ +vi.mock('@shumai/core/src/transcode/transcode', () => ({ transcodeService: { extractVideoFrames: vi.fn(), }, diff --git a/packages/agent/src/activities/ai.ts b/packages/agent/src/activities/ai.ts index 29324a79..64938ef9 100644 --- a/packages/agent/src/activities/ai.ts +++ b/packages/agent/src/activities/ai.ts @@ -1,6 +1,6 @@ import { GoogleGenAI } from '@google/genai' import { s3Service } from '@shumai/core/src/s3/s3' -import { transcodeService } from '@shumai/transcode' +import { transcodeService } from '@shumai/core/src/transcode/transcode' import { execFile } from 'child_process' import * as fs from 'fs' import * as os from 'os' diff --git a/packages/api/src/api/agent.test.ts b/packages/api/src/agent.test.ts similarity index 100% rename from packages/api/src/api/agent.test.ts rename to packages/api/src/agent.test.ts diff --git a/packages/api/src/api/agent.ts b/packages/api/src/agent.ts similarity index 100% rename from packages/api/src/api/agent.ts rename to packages/api/src/agent.ts diff --git a/packages/api/src/api/attachment.test.ts b/packages/api/src/attachment.test.ts similarity index 100% rename from packages/api/src/api/attachment.test.ts rename to packages/api/src/attachment.test.ts diff --git a/packages/api/src/api/attachment.ts b/packages/api/src/attachment.ts similarity index 100% rename from packages/api/src/api/attachment.ts rename to packages/api/src/attachment.ts diff --git a/packages/api/src/api/authn.test.ts b/packages/api/src/authn.test.ts similarity index 100% rename from packages/api/src/api/authn.test.ts rename to packages/api/src/authn.test.ts diff --git a/packages/api/src/api/authn.ts b/packages/api/src/authn.ts similarity index 100% rename from packages/api/src/api/authn.ts rename to packages/api/src/authn.ts diff --git a/packages/api/src/api/collection.test.ts b/packages/api/src/collection.test.ts similarity index 100% rename from packages/api/src/api/collection.test.ts rename to packages/api/src/collection.test.ts diff --git a/packages/api/src/api/collection.ts b/packages/api/src/collection.ts similarity index 100% rename from packages/api/src/api/collection.ts rename to packages/api/src/collection.ts diff --git a/packages/api/src/api/file.test.ts b/packages/api/src/file.test.ts similarity index 99% rename from packages/api/src/api/file.test.ts rename to packages/api/src/file.test.ts index 0251020b..70a81a9b 100644 --- a/packages/api/src/api/file.test.ts +++ b/packages/api/src/file.test.ts @@ -6,7 +6,7 @@ import { assetService } from '@shumai/core/src/asset/asset' import { metadataService } from '@shumai/core/src/metadata/metadata' import { notificationService } from '@shumai/core/src/notification/notification' import { s3Service } from '@shumai/core/src/s3/s3' -import { transcodeService } from '@shumai/transcode/src/transcode' +import { transcodeService } from '@shumai/core/src/transcode/transcode' import { authMiddleware } from './middleware/auth' import { authzService, ResourceType, Permission } from '@shumai/core/src/authz/authz' diff --git a/packages/api/src/api/file.ts b/packages/api/src/file.ts similarity index 99% rename from packages/api/src/api/file.ts rename to packages/api/src/file.ts index e73cf8a8..cd62d1a1 100644 --- a/packages/api/src/api/file.ts +++ b/packages/api/src/file.ts @@ -17,7 +17,7 @@ import { uploadFileRequestSchema, getDownloadLinksRequestSchema, } from '@shumai/dtos' -import { transcodeService } from '@shumai/transcode/src/transcode' +import { transcodeService } from '@shumai/core/src/transcode/transcode' import fs from 'fs' import { Hono } from 'hono' import os from 'os' diff --git a/packages/api/src/api/folder.test.ts b/packages/api/src/folder.test.ts similarity index 100% rename from packages/api/src/api/folder.test.ts rename to packages/api/src/folder.test.ts diff --git a/packages/api/src/api/folder.ts b/packages/api/src/folder.ts similarity index 100% rename from packages/api/src/api/folder.ts rename to packages/api/src/folder.ts diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index f971585c..2c747fc7 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,25 +1,25 @@ import type { Prisma } from '@shumai/db' import { Hono } from 'hono' -import agentRoute from './api/agent' -import attachmentRoute from './api/attachment' -import authnRoute from './api/authn' -import collectionRoute from './api/collection' -import fileRoute from './api/file' -import folderRoute from './api/folder' -import inviteRoute from './api/invite' -import metadataRoute from './api/metadata' -import { authMiddleware } from './api/middleware/auth' -import notificationRoute from './api/notification' -import projectRoute from './api/project' -import providerRoute from './api/provider' -import publicInviteRoute from './api/public-invite' -import publicShareRoute from './api/public-share' -import s3Route from './api/s3' -import shareRoute from './api/share' -import skillRoute from './api/skill' -import teamRoute from './api/team' -import uploadRoute from './api/upload' -import versionStackRoute from './api/versionStack' +import agentRoute from './agent' +import attachmentRoute from './attachment' +import authnRoute from './authn' +import collectionRoute from './collection' +import fileRoute from './file' +import folderRoute from './folder' +import inviteRoute from './invite' +import metadataRoute from './metadata' +import { authMiddleware } from './middleware/auth' +import notificationRoute from './notification' +import projectRoute from './project' +import providerRoute from './provider' +import publicInviteRoute from './public-invite' +import publicShareRoute from './public-share' +import s3Route from './s3' +import shareRoute from './share' +import skillRoute from './skill' +import teamRoute from './team' +import uploadRoute from './upload' +import versionStackRoute from './versionStack' type User = Prisma.UserGetPayload> diff --git a/packages/api/src/api/invite.test.ts b/packages/api/src/invite.test.ts similarity index 100% rename from packages/api/src/api/invite.test.ts rename to packages/api/src/invite.test.ts diff --git a/packages/api/src/api/invite.ts b/packages/api/src/invite.ts similarity index 100% rename from packages/api/src/api/invite.ts rename to packages/api/src/invite.ts diff --git a/packages/api/src/api/metadata.test.ts b/packages/api/src/metadata.test.ts similarity index 100% rename from packages/api/src/api/metadata.test.ts rename to packages/api/src/metadata.test.ts diff --git a/packages/api/src/api/metadata.ts b/packages/api/src/metadata.ts similarity index 100% rename from packages/api/src/api/metadata.ts rename to packages/api/src/metadata.ts diff --git a/packages/api/src/api/middleware/auth.ts b/packages/api/src/middleware/auth.ts similarity index 100% rename from packages/api/src/api/middleware/auth.ts rename to packages/api/src/middleware/auth.ts diff --git a/packages/api/src/api/notification.test.ts b/packages/api/src/notification.test.ts similarity index 100% rename from packages/api/src/api/notification.test.ts rename to packages/api/src/notification.test.ts diff --git a/packages/api/src/api/notification.ts b/packages/api/src/notification.ts similarity index 100% rename from packages/api/src/api/notification.ts rename to packages/api/src/notification.ts diff --git a/packages/api/src/api/project.test.ts b/packages/api/src/project.test.ts similarity index 100% rename from packages/api/src/api/project.test.ts rename to packages/api/src/project.test.ts diff --git a/packages/api/src/api/project.ts b/packages/api/src/project.ts similarity index 100% rename from packages/api/src/api/project.ts rename to packages/api/src/project.ts diff --git a/packages/api/src/api/provider.test.ts b/packages/api/src/provider.test.ts similarity index 100% rename from packages/api/src/api/provider.test.ts rename to packages/api/src/provider.test.ts diff --git a/packages/api/src/api/provider.ts b/packages/api/src/provider.ts similarity index 100% rename from packages/api/src/api/provider.ts rename to packages/api/src/provider.ts diff --git a/packages/api/src/api/public-invite.ts b/packages/api/src/public-invite.ts similarity index 100% rename from packages/api/src/api/public-invite.ts rename to packages/api/src/public-invite.ts diff --git a/packages/api/src/api/public-share.ts b/packages/api/src/public-share.ts similarity index 100% rename from packages/api/src/api/public-share.ts rename to packages/api/src/public-share.ts diff --git a/packages/api/src/api/s3.test.ts b/packages/api/src/s3.test.ts similarity index 100% rename from packages/api/src/api/s3.test.ts rename to packages/api/src/s3.test.ts diff --git a/packages/api/src/api/s3.ts b/packages/api/src/s3.ts similarity index 100% rename from packages/api/src/api/s3.ts rename to packages/api/src/s3.ts diff --git a/packages/api/src/api/share.test.ts b/packages/api/src/share.test.ts similarity index 100% rename from packages/api/src/api/share.test.ts rename to packages/api/src/share.test.ts diff --git a/packages/api/src/api/share.ts b/packages/api/src/share.ts similarity index 100% rename from packages/api/src/api/share.ts rename to packages/api/src/share.ts diff --git a/packages/api/src/api/skill.test.ts b/packages/api/src/skill.test.ts similarity index 100% rename from packages/api/src/api/skill.test.ts rename to packages/api/src/skill.test.ts diff --git a/packages/api/src/api/skill.ts b/packages/api/src/skill.ts similarity index 100% rename from packages/api/src/api/skill.ts rename to packages/api/src/skill.ts diff --git a/packages/api/src/api/team.test.ts b/packages/api/src/team.test.ts similarity index 100% rename from packages/api/src/api/team.test.ts rename to packages/api/src/team.test.ts diff --git a/packages/api/src/api/team.ts b/packages/api/src/team.ts similarity index 100% rename from packages/api/src/api/team.ts rename to packages/api/src/team.ts diff --git a/packages/api/src/api/upload.test.ts b/packages/api/src/upload.test.ts similarity index 100% rename from packages/api/src/api/upload.test.ts rename to packages/api/src/upload.test.ts diff --git a/packages/api/src/api/upload.ts b/packages/api/src/upload.ts similarity index 100% rename from packages/api/src/api/upload.ts rename to packages/api/src/upload.ts diff --git a/packages/api/src/api/versionStack.test.ts b/packages/api/src/versionStack.test.ts similarity index 100% rename from packages/api/src/api/versionStack.test.ts rename to packages/api/src/versionStack.test.ts diff --git a/packages/api/src/api/versionStack.ts b/packages/api/src/versionStack.ts similarity index 100% rename from packages/api/src/api/versionStack.ts rename to packages/api/src/versionStack.ts diff --git a/packages/core/package.json b/packages/core/package.json index 591871db..2bd6f35c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -18,6 +18,7 @@ "hono": "4.12.23", "jittered-fractional-indexing": "1.0.1", "pino": "10.3.1", + "sharp": "0.34.5", "tweetnacl": "1.0.3", "ulid": "3.0.2", "yaml": "2.9.0", diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 39271f22..d3328a3e 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -13,6 +13,7 @@ export * from './search/search' export * from './share/share' export * from './skill/skill' export * from './team/team' +export * from './transcode/transcode' export * from './upload/upload' export * from './user-metadata/user-metadata' export * from './user/avatar' diff --git a/packages/core/src/transcode/dataFormatNames.ts b/packages/core/src/transcode/dataFormatNames.ts new file mode 100644 index 00000000..110469c5 --- /dev/null +++ b/packages/core/src/transcode/dataFormatNames.ts @@ -0,0 +1,115 @@ +export const dataFormatNames: Record = { + // additional codecs + apch: 'Apple ProRes 422 High Quality', + apcn: 'Apple ProRes 422 Standard Definition', + apcs: 'Apple ProRes 422 LT', + apco: 'Apple ProRes 422 Proxy', + ap4h: 'Apple ProRes 4444', + jpeg: 'JPEG Image', + + // codecs from https://mp4ra.org/ + '3gvo': '3GPP Video Orientation', + a3d1: 'Multiview Video Coding', + a3d2: 'Multiview Video Coding', + a3d3: 'Multiview Video Coding', + a3d4: 'Multiview Video Coding', + a3ds: 'Auro-Cx 3D audio', + 'ac-3': 'AC-3 audio', + 'ac-4': 'AC-4 audio', + alac: 'Apple lossless audio codec', + alaw: 'a-Law', + av01: 'AV1 video', + avc1: 'Advanced Video Coding', + avc2: 'Advanced Video Coding', + avc3: 'Advanced Video Coding', + avc4: 'Advanced Video Coding', + avcp: 'Advanced Video Coding Parameters', + dra1: 'DRA Audio', + drac: 'Dirac Video Coder', + 'dts-': 'Dependent base layer for DTS layered audio', + 'dts+': 'Enhancement layer for DTS layered audio', + dtsc: 'DTS Coherent Acoustics audio', + dtse: 'DTS Express low bit rate audio, also known as DTS LBR', + dtsh: 'DTS-HD High Resolution Audio', + dtsl: 'DTS-HD Master Audio', + dtsx: 'DTS:X', + dvav: 'AVC-based “Dolby Vision”', + dvhe: 'HEVC-based “Dolby Vision”', + 'ec-3': 'Enhanced AC-3 audio', + enca: 'Encrypted/Protected audio', + encf: 'Encrypted/Protected font', + encm: 'Encrypted/Protected metadata stream', + encs: 'Encrypted Systems stream', + enct: 'Encrypted Text', + encv: 'Encrypted/protected video', + fdp: 'File delivery hints', + fLaC: 'Fres Lossless Audio Codec', + g719: 'ITU-T Recommendation G.719 (2008)', + g726: 'ITU-T Recommendation G.726 (1990)', + hev1: 'High Efficiency Video Coding', + hvc1: 'High Efficiency Video Coding', + hvt1: 'High Efficiency Video Coding', + ixse: 'DVB Track Level Index Track', + lhe1: 'Layered High Efficiency Video Coding', + lht1: 'Layered High Efficiency Video Coding', + lhv1: 'Layered High Efficiency Video Coding', + m2ts: 'MPEG-2 transport stream for DMB', + m4ae: 'MPEG-4 Audio Enhancement MP4v1/2', + mett: 'Text timed metadata that is not XML', + metx: 'XML timed metadata', + mha1: 'MPEG-H Audio (single stream, uncapsulated)', + mha2: 'MPEG-H Audio (multi-stream, unencapsulated)', + mhm1: 'MPEG-H Audio (single stream, MHAS encapsulated)', + mhm2: 'MPEG-H Audio (multi-stream, MHAS encapsulated)', + mjp2: 'Motion JPEG 2000', + mlix: 'DVB Movie level index track', + mlpa: 'MLP Audio', + mp4a: 'MPEG-4 Audio', + mp4s: 'MPEG-4 Systems', + mp4v: 'MPEG-4 Visual', + mvc1: 'Multiview coding', + mvc2: 'Multiview coding', + mvc3: 'Multiview coding', + mvc4: 'Multiview coding', + mvd1: 'Multiview coding', + mvd2: 'Multiview coding', + mvd3: 'Multiview coding', + mvd4: 'Multiview coding', + oksd: 'OMA Keys', + // eslint-disable-next-line @typescript-eslint/naming-convention + Opus: 'Opus audio coding', + pm2t: 'Protected MPEG-2 Transport', + prtp: 'Protected RTP Reception', + raw: 'Uncompressed audio', + resv: 'Restricted Video', + rm2t: 'MPEG-2 Transport Reception', + rrtp: 'RTP reception', + rsrp: 'SRTP Reception', + rtmd: 'Real Time Metadata Sample Entry(XAVC Format)', + rtp: 'RTP Hints', + s263: 'ITU H.263 video (3GPP format)', + samr: 'Narrowband AMR voice', + sawb: 'Wideband AMR voice', + sawp: 'Extended AMR-WB (AMR-WB+)', + sevc: 'EVRC Voice', + sm2t: 'MPEG-2 Transport Server', + sqcp: '13K Voice', + srtp: 'SRTP Hints', + ssmv: 'SMV Voice', + STGS: 'Subtitle Sample Entry (HMMP)', + stpp: 'Subtitles (Timed Text)', + svc1: 'Scalable Video Coding', + svc2: 'Scalable Video Coding', + svcM: 'SVC Metadata', + tc64: '64 bit timecode samples', + tmcd: '32 bit timecode samples', + twos: 'Uncompressed 16-bit audio', + tx3g: 'Timed Text stream', + ulaw: 'Samples have been compressed using uLaw 2:1.', + unid: 'Dynamic Range Control (DRC) data', + urim: 'Binary timed metadata identified by URI', + 'vc-1': 'SMPTE VC-1', + vp08: 'VP8 video', + vp09: 'VP9 video', + wvtt: 'WebVTT', +} diff --git a/packages/transcode/src/transcode.test.ts b/packages/core/src/transcode/transcode.test.ts similarity index 99% rename from packages/transcode/src/transcode.test.ts rename to packages/core/src/transcode/transcode.test.ts index a67b770c..689a77d8 100644 --- a/packages/transcode/src/transcode.test.ts +++ b/packages/core/src/transcode/transcode.test.ts @@ -3,6 +3,7 @@ import { transcodeService } from './transcode' import * as path from 'path' import * as child_process from 'child_process' import { WorkflowTask } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import sharp from 'sharp' // Mock child_process @@ -25,6 +26,7 @@ vi.mock('sharp', () => { }) describe('TranscodeService', () => { + setupTestDbHooks() let tempDir: string beforeEach(() => { diff --git a/packages/transcode/src/transcode.ts b/packages/core/src/transcode/transcode.ts similarity index 80% rename from packages/transcode/src/transcode.ts rename to packages/core/src/transcode/transcode.ts index 46a5ccb7..b1ea2175 100644 --- a/packages/transcode/src/transcode.ts +++ b/packages/core/src/transcode/transcode.ts @@ -8,125 +8,10 @@ import * as path from 'path' import sharp from 'sharp' import { ulid } from 'ulid' import { promisify } from 'util' +import { dataFormatNames } from './dataFormatNames' const execFileAsync = promisify(execFile) -const dataFormatNames: Record = { - // additional codecs - apch: 'Apple ProRes 422 High Quality', - apcn: 'Apple ProRes 422 Standard Definition', - apcs: 'Apple ProRes 422 LT', - apco: 'Apple ProRes 422 Proxy', - ap4h: 'Apple ProRes 4444', - jpeg: 'JPEG Image', - - // codecs from https://mp4ra.org/ - '3gvo': '3GPP Video Orientation', - a3d1: 'Multiview Video Coding', - a3d2: 'Multiview Video Coding', - a3d3: 'Multiview Video Coding', - a3d4: 'Multiview Video Coding', - a3ds: 'Auro-Cx 3D audio', - 'ac-3': 'AC-3 audio', - 'ac-4': 'AC-4 audio', - alac: 'Apple lossless audio codec', - alaw: 'a-Law', - av01: 'AV1 video', - avc1: 'Advanced Video Coding', - avc2: 'Advanced Video Coding', - avc3: 'Advanced Video Coding', - avc4: 'Advanced Video Coding', - avcp: 'Advanced Video Coding Parameters', - dra1: 'DRA Audio', - drac: 'Dirac Video Coder', - 'dts-': 'Dependent base layer for DTS layered audio', - 'dts+': 'Enhancement layer for DTS layered audio', - dtsc: 'DTS Coherent Acoustics audio', - dtse: 'DTS Express low bit rate audio, also known as DTS LBR', - dtsh: 'DTS-HD High Resolution Audio', - dtsl: 'DTS-HD Master Audio', - dtsx: 'DTS:X', - dvav: 'AVC-based “Dolby Vision”', - dvhe: 'HEVC-based “Dolby Vision”', - 'ec-3': 'Enhanced AC-3 audio', - enca: 'Encrypted/Protected audio', - encf: 'Encrypted/Protected font', - encm: 'Encrypted/Protected metadata stream', - encs: 'Encrypted Systems stream', - enct: 'Encrypted Text', - encv: 'Encrypted/protected video', - fdp: 'File delivery hints', - fLaC: 'Fres Lossless Audio Codec', - g719: 'ITU-T Recommendation G.719 (2008)', - g726: 'ITU-T Recommendation G.726 (1990)', - hev1: 'High Efficiency Video Coding', - hvc1: 'High Efficiency Video Coding', - hvt1: 'High Efficiency Video Coding', - ixse: 'DVB Track Level Index Track', - lhe1: 'Layered High Efficiency Video Coding', - lht1: 'Layered High Efficiency Video Coding', - lhv1: 'Layered High Efficiency Video Coding', - m2ts: 'MPEG-2 transport stream for DMB', - m4ae: 'MPEG-4 Audio Enhancement MP4v1/2', - mett: 'Text timed metadata that is not XML', - metx: 'XML timed metadata', - mha1: 'MPEG-H Audio (single stream, uncapsulated)', - mha2: 'MPEG-H Audio (multi-stream, unencapsulated)', - mhm1: 'MPEG-H Audio (single stream, MHAS encapsulated)', - mhm2: 'MPEG-H Audio (multi-stream, MHAS encapsulated)', - mjp2: 'Motion JPEG 2000', - mlix: 'DVB Movie level index track', - mlpa: 'MLP Audio', - mp4a: 'MPEG-4 Audio', - mp4s: 'MPEG-4 Systems', - mp4v: 'MPEG-4 Visual', - mvc1: 'Multiview coding', - mvc2: 'Multiview coding', - mvc3: 'Multiview coding', - mvc4: 'Multiview coding', - mvd1: 'Multiview coding', - mvd2: 'Multiview coding', - mvd3: 'Multiview coding', - mvd4: 'Multiview coding', - oksd: 'OMA Keys', - // eslint-disable-next-line @typescript-eslint/naming-convention - Opus: 'Opus audio coding', - pm2t: 'Protected MPEG-2 Transport', - prtp: 'Protected RTP Reception', - raw: 'Uncompressed audio', - resv: 'Restricted Video', - rm2t: 'MPEG-2 Transport Reception', - rrtp: 'RTP reception', - rsrp: 'SRTP Reception', - rtmd: 'Real Time Metadata Sample Entry(XAVC Format)', - rtp: 'RTP Hints', - s263: 'ITU H.263 video (3GPP format)', - samr: 'Narrowband AMR voice', - sawb: 'Wideband AMR voice', - sawp: 'Extended AMR-WB (AMR-WB+)', - sevc: 'EVRC Voice', - sm2t: 'MPEG-2 Transport Server', - sqcp: '13K Voice', - srtp: 'SRTP Hints', - ssmv: 'SMV Voice', - STGS: 'Subtitle Sample Entry (HMMP)', - stpp: 'Subtitles (Timed Text)', - svc1: 'Scalable Video Coding', - svc2: 'Scalable Video Coding', - svcM: 'SVC Metadata', - tc64: '64 bit timecode samples', - tmcd: '32 bit timecode samples', - twos: 'Uncompressed 16-bit audio', - tx3g: 'Timed Text stream', - ulaw: 'Samples have been compressed using uLaw 2:1.', - unid: 'Dynamic Range Control (DRC) data', - urim: 'Binary timed metadata identified by URI', - 'vc-1': 'SMPTE VC-1', - vp08: 'VP8 video', - vp09: 'VP9 video', - wvtt: 'WebVTT', -} - export interface MediaMetadata { originalWidth: number originalHeight: number diff --git a/packages/transcode/package.json b/packages/transcode/package.json index 2dd4b472..acf57eed 100644 --- a/packages/transcode/package.json +++ b/packages/transcode/package.json @@ -13,7 +13,6 @@ "@temporalio/activity": "1.17.2", "@temporalio/worker": "1.17.2", "@temporalio/workflow": "1.17.2", - "sharp": "0.34.5", "ulid": "3.0.2" } } diff --git a/packages/transcode/src/activities/transcode.test.ts b/packages/transcode/src/activities/transcode.test.ts index a6256fa0..4e77e0f3 100644 --- a/packages/transcode/src/activities/transcode.test.ts +++ b/packages/transcode/src/activities/transcode.test.ts @@ -3,7 +3,7 @@ import { s3Service } from '@shumai/core/src/s3/s3' import { prisma } from '@shumai/db' import { setupTestDbHooks } from '@shumai/db/test' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { transcodeService } from '../transcode' +import { transcodeService } from '@shumai/core/src/transcode/transcode' import { getMediaInfoActivity, overlayAnnotationsActivity, @@ -25,7 +25,7 @@ vi.mock('@shumai/core/src/s3/s3', () => ({ }, })) -vi.mock('../transcode', () => ({ +vi.mock('@shumai/core/src/transcode/transcode', () => ({ transcodeService: { getVideoInfo: vi.fn(), getImageInfo: vi.fn(), diff --git a/packages/transcode/src/activities/transcode.ts b/packages/transcode/src/activities/transcode.ts index ce7e2aa7..77feb76a 100644 --- a/packages/transcode/src/activities/transcode.ts +++ b/packages/transcode/src/activities/transcode.ts @@ -1,6 +1,6 @@ import { prisma } from '@shumai/db' import { s3Service } from '@shumai/core/src/s3/s3' -import { transcodeService } from '../transcode' +import { transcodeService } from '@shumai/core/src/transcode/transcode' import { metadataService } from '@shumai/core/src/metadata/metadata' import { ApplicationFailure } from '@temporalio/activity' import * as path from 'path' diff --git a/packages/transcode/src/index.ts b/packages/transcode/src/index.ts index a9ee849e..487cdae3 100644 --- a/packages/transcode/src/index.ts +++ b/packages/transcode/src/index.ts @@ -9,6 +9,5 @@ export function initTranscodeWorkflows() { } export * from './transcoder' -export * from './transcode' export * from './workflows/transcode' export * from './activities/transcode'