Compare commits

...
87 Commits
Author SHA1 Message Date
yiling 6e460430dd Release v0.1.7 2026-07-06 13:01:47 +08:00
yiling ffc578cb45 fix(comments): prevent reload of main viewer by invalidating only comments queries 2026-07-06 12:51:25 +08:00
Yiling-J 1414632c4a Merge pull request #179 from shumaiOne/feat/comment-completion
feat(comments): allow marking comments as complete or incomplete
2026-07-06 12:50:04 +08:00
yiling a312ecf7ef style(comments): use custom filled circle check icon and make actions row always visible 2026-07-06 12:40:20 +08:00
yiling e1d3dd46db feat(comments): allow marking comments as complete or incomplete 2026-07-06 12:24:40 +08:00
yiling af7d636f31 update cn translate 2026-07-06 11:49:51 +08:00
yiling b98b710222 update doc 2026-07-06 11:22:32 +08:00
Yiling-J 79b19d3983 Revise feature descriptions in README_CN.md
Updated feature descriptions and improved clarity in the README_CN.md file.
2026-07-06 11:15:29 +08:00
yiling 474fe7ced1 fix(webui): center unread badge count 2026-07-06 11:06:09 +08:00
Yiling-J bf82eff068 Merge pull request #178 from shumaiOne/feat/i18n-fixes
feat(i18n): localize members dialog, notifications, uploads, user menus, dates, and players
2026-07-06 10:59:24 +08:00
yiling 01a9c7cde6 refactor(i18n): address code review feedback on string legos, hardcoded locales, and fragile checks 2026-07-06 10:52:55 +08:00
yiling 45f3255796 feat(i18n): localize members dialog, notifications, uploads, user menus, dates, and players 2026-07-06 10:38:41 +08:00
Yiling-J 64ad183bc1 Merge pull request #177 from shumaiOne/docs-s3-storage
docs: improve documentation and examples for S3 compatible storage
2026-07-06 10:20:31 +08:00
yiling af8bc30409 docs: improve documentation and examples for S3 compatible storage 2026-07-06 10:13:12 +08:00
Yiling-J aac8bea4e8 Merge pull request #176 from shumaiOne/fix/upload-mime-type
fix(upload): resolve empty and generic MIME types in confirmFileUpload
2026-07-05 22:10:22 +08:00
yiling a05c0ac0db fix(upload): resolve empty and generic MIME types in confirmFileUpload
Use Bun's built-in file resolver to fall back to extension-based MIME type detection when the mediaType is missing, empty, or generic ('application/octet-stream').
2026-07-05 21:55:26 +08:00
Yiling-J 714158b5b2 Merge pull request #175 from shumaiOne/feat/audio-support
feat(audio): support frame-accurate audio playback, comments, and AI safeguards
2026-07-05 19:33:37 +08:00
yiling 8ad25215dd refactor(agent): prevent creating autofill and embedding tasks for audio assets 2026-07-05 16:31:14 +08:00
yiling 73aa374b2b feat(agent): prevent exposing screenshot and analyze_image tools and executing autofill/embeddings for audio files 2026-07-05 16:26:48 +08:00
yiling cee4142936 style(webui): use dark background for audio preview to keep duration clear 2026-07-05 16:16:04 +08:00
yiling 0f6912c977 feat(webui): render duration overlay for audio files in file browser 2026-07-05 16:13:00 +08:00
yiling 868e7b2a7b fix(webui): remount file viewer when file ID changes to reset state 2026-07-05 16:10:01 +08:00
yiling ccfcdce23c fix(upload): correct .wma MIME type to audio prefix on upload and add tests 2026-07-05 15:57:29 +08:00
yiling 8d336836cc test(webui): add audio comment seek roundtrip E2E test case 2026-07-05 15:37:30 +08:00
yiling f24c8afa3d test(webui): add e2e test to verify playhead advances immediately for audio assets 2026-07-05 15:28:18 +08:00
yiling e511af219e fix(webui): immediately use currentTime fallback in useFramePlayer for audio files 2026-07-05 15:23:52 +08:00
yiling 5cae1adce1 fix(webui): hide zoom/fit controls and comment draw button for audio assets 2026-07-05 15:19:53 +08:00
yiling a2e982f2e6 feat(transcode): add audio file support with AAC stereo mp4 proxy and styled viewer 2026-07-05 15:11:19 +08:00
Yiling-J 9a7abaed1a Merge pull request #174 from shumaiOne/refactor/file-viewer-registry
refactor(webui): modularize file viewer components into registry-driven architecture
2026-07-05 12:40:41 +08:00
yiling e03c44a00e docs(webui): add file viewer registry developer documentation 2026-07-05 12:26:50 +08:00
yiling 1524d41392 fix(webui): resolve react hook order violation in video viewer 2026-07-05 12:04:35 +08:00
yiling 4cc35d3453 refactor(webui): modularize file viewer components into registry-driven architecture 2026-07-05 10:51:42 +08:00
yiling 229070fe19 Release v0.1.6 2026-07-04 21:39:52 +08:00
Yiling-J 3bfbd2c217 Merge pull request #173 from shumaiOne/fix-version-stack-comments
fix(version-stack): resolve correct latest version ID of version stack
2026-07-04 21:07:00 +08:00
yiling 481c1ff8ba fix(version-stack): resolve correct latest version ID of version stack 2026-07-04 20:56:31 +08:00
Yiling-J 5f6847a373 Merge pull request #172 from shumaiOne/fix/video-player-frame-count-mismatch
fix(webui): resolve video player total frames mismatch
2026-07-04 20:47:09 +08:00
yiling 175b5ac171 fix(webui): resolve video player total frames mismatch
Avoid deriving total frames from container duration when the audio tail mismatch is below the dynamic playback stall threshold. This prevents the rendering of phantom trailing frames that the playhead cannot reach during playback.

Also adds comprehensive unit and E2E tests covering both small and large audio tail gaps.
2026-07-04 16:44:09 +08:00
Yiling-J f32f2d43aa Merge pull request #171 from shumaiOne/feat/compare-versions
feat(webui): compare versions view for version stacks
2026-07-04 15:38:37 +08:00
yiling ba88cdad78 fix(webui): sync compare video pane resolution/source on asset change
currentResolution state and currentSrcRef were only initialized on mount,
so if file.id changed without a remount the video.js init effect (keyed on
file.id) would re-create the player with a stale source. Add an effect
that resets them when file.id changes, before the init effect runs, making
the pane robust even without a per-asset key on the parent.
2026-07-04 15:29:07 +08:00
yiling 0bbb846beb fix(webui): support version switching on public share (no login redirect)
Switching a version in the public share breadcrumb navigated to the
authenticated /projects/:id/files/:id route, which triggered the
authenticated /api/projects/:id/team call (via resolveTeamIdFromPath) ->
401 -> redirect to login.

- breadcrumb handleVersionClick now routes to /share/:shareId/files/:id
  with a version search param when public.
- public share route gains a version param; PublicShareManager fetches the
  stack asset (for the version list) and the active version child asset
  (for display/comments/fields), mirroring the authenticated page.
- compare exit sets version to the active side for parity.
2026-07-04 15:22:38 +08:00
yiling c793e0dd78 fix(webui): keep fullscreen controls visible while cursor is over them
Track when the cursor is over the control bar (VideoControlBar now
forwards mouse enter/leave) and skip the idle-hide timer while it is, so
the bar no longer disappears when the cursor rests on it. Also reduce the
fullscreen auto-hide delay from 2s to 1.2s.
2026-07-04 13:15:52 +08:00
yiling 13833e8144 fix(webui): auto-hide fullscreen controls on idle regardless of play state
The fullscreen control bar only auto-hid while playing, and a separate
effect force-showed it whenever paused, so it stayed visible permanently
when paused in fullscreen. Now in fullscreen the bar shows on cursor move
and hides after the cursor is idle (~2s) whether playing or paused;
windowed mode keeps the bar always visible.
2026-07-04 13:04:25 +08:00
yiling d3c1c641b4 fix(webui): show control bar in single-file fullscreen; theme the overlay
The single-file player fullscreened the inner video-area element, which
is not an ancestor of the control bar, so the bar was never visible in
fullscreen. Fullscreen the player root instead so the floating control
bar is included and the existing show-on-move / hide-after-idle logic
works (YouTube-style).

Also make the control-bar colors theme-aware in all cases. The fullscreen
floating overlay now uses bg-card/90 + backdrop-blur + foreground text
instead of a hardcoded dark overlay, so it follows the app light/dark
theme. The former themedChrome prop is renamed to floatOverlayInFullScreen
(default true = single-file floating overlay; compare passes false to keep
its bar in-flow).
2026-07-04 12:48:15 +08:00
yiling aeaff3bc88 feat(webui): compare fullscreen control bar follows app theme
Add a themedChrome prop to VideoControlBar that keeps the normal
theme-aware chrome (bg-card / foreground text) while fullscreen instead
of the dark video overlay. Compare mode passes it so its fullscreen bar
matches the app light/dark theme for both video- and image-active panes
(ImageControlBar is already themed). The single-file player is unchanged
(themedChrome defaults to false -> dark overlay). The fullscreen toggle
icon still reflects the actual fullscreen state.
2026-07-04 12:28:08 +08:00
yiling cf005797be fix(webui): readable zoom/Fit controls in fullscreen light mode
In the fullscreen control bar the whole bar uses text-white (it overlays
the dark video), but the zoom group and Fit button hardcoded bg-muted,
which is light in light mode -> white text on a light background. Use a
translucent bg-white/15 for those controls when fullscreen so they stay
readable; the normal (non-fullscreen) bar keeps bg-muted. Also fixes the
same latent issue in the single-file video player.
2026-07-04 11:36:04 +08:00
yiling 4b3b31c83d style(webui): compare pane topbar is always dark with light text
Force the dark palette on the compare pane topbar (via a scoped `dark`
class + system tokens, no hardcoded hex) so the bar background is dark in
both light and dark app themes. Active pane text uses text-foreground
(white in the dark scope); inactive pane uses text-muted-foreground
(light gray).
2026-07-04 11:25:39 +08:00
yiling a4e25db0f7 style(webui): emphasize active compare pane topbar
The active version's topbar now uses an inverted bar (bg-foreground /
text-background) so it reads as black background with white text in the
light theme, while the inactive pane keeps the card background with muted
text. Filename/version text color now differs between active and inactive
panes.
2026-07-04 11:19:50 +08:00
yiling 78c8a56183 fix(webui): clicking an inactive compare pane only activates it
Previously clicking a non-active video pane both switched the active
version and toggled playback. Now a click on an inactive pane only makes
it active; play/pause is only toggled when clicking the already-active
pane.
2026-07-04 10:56:55 +08:00
yiling e2d4944060 refactor(webui): extract shared Video/Image control bars and reuse in compare
Extract the video player's inline ControlBar into an exported
viewers/video-control-bar.tsx (VideoControlBar + PlayerState +
DisplayTranscode) and the image toolbar from file-viewer into an exported
viewers/image-control-bar.tsx (ImageControlBar). video-player and
file-viewer now consume the shared components with unchanged behavior.

compare-control-bar composes the same two shared bars (video vs image
active) with fan-out handlers, so the compare control bar can no longer
drift from the single-file players (e.g. the time-format dropdown).
2026-07-04 10:49:00 +08:00
yiling 6c3d3ea2b3 feat(webui): add compare versions view for version stacks
Add a Compare Versions mode to the file detail page (authenticated and
public share) that splits the viewer into two 50/50 panes showing two
versions side by side.

- Breadcrumb file menu gains a Compare Versions entry (version stacks
  with >=2 versions); the file segment is hidden in compare mode.
- URL-driven state (compare/cmpLeft/cmpRight/cmpActive) on both file
  routes so the view is refresh/share-safe.
- Per-side topbar with filename, version, version-switch dropdown, an
  active-side highlight, and an X exit button.
- Shared control bar reflects the active pane; for same-type media it
  coordinates both panes (play/pause, seek, frame-step, zoom, pan sync),
  seekbar length matches the active side while the shorter side holds its
  last frame; only the active side plays audio; resolution/download apply
  to the active side; fullscreen covers the whole compare view.
- Right sidebar (comments/fields) binds to the active side; comment
  selection seeks the active pane and annotations/comments can be created.
- Reuses useFramePlayer + DrawingCanvas without modifying the existing
  single-file video player.
- Unit tests for compare selection/clamp logic.
2026-07-04 10:20:16 +08:00
Yiling-J e7273f1a02 Merge pull request #170 from shumaiOne/feat/video-duration-card-preview
feat(file-browser): show video duration on file card preview
2026-07-03 23:08:03 +08:00
yiling d3efc00902 feat(file-browser): show video duration on file card preview
Display the video duration (mm:ss) in the bottom-right corner of the
video file card preview area with white text and a transparent
background. Duration is sourced from media metadata and exposed via the
preview DTO. The overlay is gated behind a showDuration prop so it only
appears on file cards, not folder card child previews.
2026-07-03 20:48:26 +08:00
Yiling-J 06df7537e0 Merge pull request #169 from shumaiOne/test/video-player-restart-on-end
test(webui): verify video player restarts playback after end
2026-07-03 20:33:04 +08:00
yiling 1de8c4ad32 test(webui): verify video player restarts playback after end
Add an e2e spec covering restart-on-end for the frame-accurate video
player. Drives the real player to its natural end (seek near the tail,
play out the last frames) and asserts both restart triggers resume from
the start: the play/pause control and clicking the video area.

Adds seekToFrame and waitForEnded helpers to VideoPlayerPage.
2026-07-03 20:16:48 +08:00
Yiling-J 278bbdd4fe Merge pull request #168 from shumaiOne/test/video-comment-seek-e2e
test(webui): add frame-accurate comment seek roundtrip e2e
2026-07-03 20:08:13 +08:00
yiling ed40b41e1a test(webui): rework seek-settle wait to avoid overlapping browser polls
Address review feedback: an async predicate with setTimeout inside
page.waitForFunction spawns overlapping executions at rAF rate, and checking
currentTime stability before arrival can resolve prematurely.

Reorder to arrival-first: wait for the target frame via a synchronous rAF-polled
predicate, then wait for currentTime to stabilize using a sequential Node-side
loop so browser evaluations never overlap.
2026-07-03 19:36:39 +08:00
yiling 3dcab584ae test(webui): add frame-accurate comment seek roundtrip e2e
Extend the backend-free video-player harness with the app's real comment↔player
wiring (onTimeUpdate capture, player.currentTime(second) seek on comment click,
and a remount to simulate a second user) and add a Playwright spec.

User A comments on 5 distinct random frames (regenerated each run); user B
reloads and clicks each comment. Asserts the seconds-based roundtrip is
loss-free: frameA -> second=frameA/fps -> seek(second) -> floor(second*fps+0.45)
== frameA, so the comment is stored at the frame the author saw and the reader
lands on that exact frame.
2026-07-03 19:20:17 +08:00
Yiling-J cfbb799ddc Merge pull request #167 from shumaiOne/fix/root-component-conditional-hooks
fix(webui): resolve conditional hooks and setState-in-render errors
2026-07-03 18:59:34 +08:00
yiling 9623da7504 fix(webui): resolve conditional hooks and setState-in-render errors
- __root.tsx: move useTeamContextStore/useEffect/useQuery above the
  conditional 'return <Outlet />' so hooks run unconditionally in a
  stable order (fixes 'Rendered more hooks than during the previous
  render')
- team-selector.tsx: move single-team navigate() into a useEffect to
  avoid updating the router Transitioner during render
2026-07-03 18:53:38 +08:00
Yiling-J 370b0d3050 Merge pull request #166 from shumaiOne/test/video-player-playwright-e2e
test(webui): video player e2e framework + Safari playhead fix
2026-07-03 17:20:51 +08:00
yiling c847649242 docs(webui): update video player design doc for rVFC-gated playhead sync
Reflect the useFramePlayer changes: the currentTime/RAF path only drives the
playhead once rVFC has delivered a frame this session (or is unsupported / a
grace elapsed), pause locks to the last presented mediaTime when fresh, and
document the frame-accurate pause/resume audio-replay tradeoff.
2026-07-03 16:14:19 +08:00
yiling 38694eb77b fix(webui): stop Safari video playhead from rewinding on play/pause
On Safari/WebKit, video.currentTime (the playback clock) runs ahead of the
frame actually presented on screen at playback start, and the first
requestVideoFrameCallback arrives only after a delay. useFramePlayer drove the
playhead from currentTime immediately on play, racing it forward, then snapped
it backward when the first rVFC reported the true (lower) presented frame.

Fix 1 (play-start rewind): reset the per-session VFC state on each play and only
use the currentTime/RAF path when rVFC is unsupported, or has delivered a frame
this session and then stalled (e.g. video track ended while audio continues), or
never delivered within a safety grace. The playhead now follows the actually
presented frame instead of the leading playback clock.

Fix 2 (pause snap): on pause, prefer the last presented mediaTime when rVFC is
fresh so the playhead locks to the frame the user is looking at, instead of
jumping forward to the leading currentTime. Falls back to currentTime when rVFC
is stale/unsupported.

Add a deterministic useFramePlayer hook unit test (happy-dom) that simulates
Safari's leading currentTime and lagging mediaTime; it asserts the playhead is
monotonic on play and locks to the presented frame on pause (both fail on the
old logic), and that the end-of-track currentTime fallback still works.
2026-07-03 15:56:31 +08:00
yiling 8c53685590 chore(webui): remove unused vite dev dependencies
The webui package was migrated from a Vite project but now uses the Bun
fullstack framework (Bun.serve + bun-plugin-tailwind) for dev/prod, and the
e2e harness serves via Bun too. Nothing in webui imports vite, @vitejs/plugin-react,
@tailwindcss/vite or vite-tsconfig-paths (the only vite-tsconfig-paths usage is
the root vitest.config.ts via the root devDependency), so drop them from the
webui package.

Verified: typecheck, lint, vitest and the playwright e2e suite all still pass
(Tailwind compiles via bun-plugin-tailwind).
2026-07-03 14:55:56 +08:00
yiling 469f68b25d test(webui): add playwright e2e framework with video player play/pause test
Add a Playwright UI integration test framework for the frame-accurate video
player. Tests run against a backend-free harness served by Bun's native HTML
bundler (matching the project's Bun-based dev/prod serving), so no database,
auth or transcode pipeline is required.

- Add @playwright/test with chromium/firefox/webkit projects; the browser is
  selectable via the Playwright --project flag (webkit = Safari engine).
- Serve the harness with Bun.serve + bun-plugin-tailwind (no separate Vite
  toolchain); commit a deterministic 16x16/5s/30fps fixture video and matching
  AssetInfo.
- Add a play/pause spec covering both the play control and clicking the video
  area, asserting the native video clock, seekbar fill and frame readout stay
  frame-locked after pause (settle-aware, tolerance-based assertions).
- Mock all backend API calls (anchored /api/ and /files/ routes) for isolation.
- Exclude e2e specs from Vitest; add a separate CI job (webkit on macOS).
2026-07-03 14:50:38 +08:00
yiling 7c3412686c Release v0.1.5 2026-07-02 19:01:12 +08:00
Yiling-J 297c4903fe Merge pull request #165 from shumaiOne/refactor/friendly-storage-filenames
refactor(storage): use original filenames for stored files
2026-07-02 18:18:00 +08:00
yiling b7367bb129 refactor(storage): use original filenames and fix download UX
- Store uploaded files as files/{ulid}/{original-name} instead of files/{ulid}/raw
- Store transcoded videos as {stem}-{resolution}.mp4 (e.g. foo-720p.mp4)
- Store transcoded images as {stem}-{width}p.webp (e.g. foo-1920p.webp)
- Add download?: boolean param to presign - only sets Content-Disposition: attachment when true
- Local storage handler only sets Content-Disposition when ?download=1 query param is present
- Add POST /api/files/download-url endpoint for key-based single file downloads
  - Uses ResourceType.Asset for permission check
  - Validates key belongs to the asset's storage directory
- Fix existing download-links API to pass download: true to presign
- Fix breadcrumb navbar download: video shows resolution submenu, others download directly
- Fix video player download: calls download-url API, shows correct file type label
- Remove filename query param hack from presign URLs
- Add sanitizeFilename() and stemFromKey() utility helpers
- Add key field to VideoTranscode DTO interface
2026-07-02 17:39:23 +08:00
yiling 114cdca4ee update aliyun acr image 2026-07-02 10:51:06 +08:00
Yiling-J 9d7b142129 Improve formatting of commands in README_CN.md
Fix formatting issues in README_CN.md for clarity.
2026-07-02 10:44:57 +08:00
Yiling-J 91fafafeff Merge pull request #164 from shumaiOne/feature/update-release-workflow
ci(release): add Aliyun ACR push to release workflow
2026-07-02 10:10:32 +08:00
yiling d5b9439371 ci(release): add Aliyun ACR push to release workflow 2026-07-02 10:02:13 +08:00
yiling 3725193e72 Release v0.1.4 2026-07-01 20:24:39 +08:00
Yiling-J 62c9fb46ae Merge pull request #163 from shumaiOne/feat/signup-locale
feat(auth): allow setting user locale on signup
2026-07-01 19:29:02 +08:00
yiling 9b1890f57c feat(auth): allow setting user locale on signup 2026-07-01 19:23:49 +08:00
Yiling-J 68a8b67931 Merge pull request #162 from shumaiOne/fix/video-replay
fix(webui): preserve video ended state by skipping playhead snap on ended
2026-07-01 14:56:19 +08:00
yiling d0bda60b9f fix(webui): preserve video ended state by skipping playhead snap on ended 2026-07-01 14:46:12 +08:00
yiling d71b0de056 remove video player debug logs 2026-07-01 14:37:34 +08:00
yiling 8c7d4f5b72 update cn docker setup guide 2026-07-01 14:36:09 +08:00
Yiling-J d8793a89a2 Merge pull request #161 from shumaiOne/feat/video-poster-480p
feat(transcode): change video poster resolution to 480p
2026-07-01 12:55:25 +08:00
yiling 178670fdab feat(transcode): change video poster resolution to 480p 2026-07-01 12:45:16 +08:00
yiling 715b657153 update readme 2026-07-01 12:40:30 +08:00
Yiling-J c0353bb050 Update README_CN.md with English documentation link
Added English link to the README_CN.md file.
2026-07-01 11:14:11 +08:00
Yiling-J 0c1907d868 Add Chinese README link to README.md
Added a link to the Chinese README in the main README.
2026-07-01 11:12:03 +08:00
Yiling-J edbf2c6001 Refine AI feature descriptions in README
Updated descriptions for AI features in README.
2026-07-01 11:04:21 +08:00
Yiling-J fa319d0898 Add Dockerfile syntax version specification 2026-07-01 10:50:37 +08:00
Yiling-J b0a595fe9c Add README_CN.md 2026-07-01 10:44:19 +08:00
Yiling-J b7d250dbac Update README with media processing information
Added note about media processing and storage details.
2026-07-01 09:45:24 +08:00
210 changed files with 10071 additions and 1867 deletions
+41
View File
@@ -55,3 +55,44 @@ jobs:
echo "Smoke testing shumai-transcode..."
bun run /tmp/shumai-local-release/node/node_modules/@shumai-one/shumai-transcode/bin/shumai-transcode-app.js --check
e2e_video_player:
name: E2E (${{ matrix.project }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
project: chromium
- os: ubuntu-latest
project: firefox
# WebKit is the Safari engine; run it on a macOS runner to validate
# Safari compatibility.
- os: macos-latest
project: webkit
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Bun
uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Install dependencies
run: bun install
- name: Install Playwright browser (${{ matrix.project }})
run: bunx playwright install --with-deps ${{ matrix.project }}
- name: Run video player e2e tests
run: bun run test:e2e --project=${{ matrix.project }}
- name: Upload Playwright report
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
with:
name: playwright-report-${{ matrix.project }}
path: playwright-report/
retention-days: 7
+11 -1
View File
@@ -27,12 +27,22 @@ jobs:
username: shumaione
password: ${{ secrets.DOCKERHUB_TOKEN }}
# Log in to Aliyun ACR
- name: Log in to Aliyun ACR
uses: docker/login-action@v3
with:
registry: crpi-000nkafzu6xvpwsc.cn-hongkong.personal.cr.aliyuncs.com
username: njjyl723
password: ${{ secrets.ALI_ACR_TOKEN }}
# Extract metadata (tags, labels) for Docker
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: shumaione/shumai
images: |
shumaione/shumai
crpi-000nkafzu6xvpwsc.cn-hongkong.personal.cr.aliyuncs.com/shumai-one/shumai
tags: |
type=semver,pattern={{version}}
type=ref,event=branch
+6
View File
@@ -11,3 +11,9 @@ data/
*.db
*.diff
*.orig
# Playwright
/playwright-report/
/test-results/
/blob-report/
/playwright/.cache/
+1
View File
@@ -90,6 +90,7 @@ Add any additional context, caveats, or follow-up work.
- `bun run format`
- `bun run typecheck`
- `bun run test`
- `bun run test:e2e`
- **Backend Testing Mandate**: Every backend feature, service method, workflow, and activity MUST be accompanied by comprehensive tests. Logic-heavy code without corresponding test coverage is considered incomplete.
+1
View File
@@ -1,3 +1,4 @@
#syntax=docker/dockerfile:1.7-labs
# Stage 1: Builder
FROM oven/bun:1 AS builder
+28 -11
View File
@@ -9,7 +9,7 @@
</p>
<p align="center">
<a target="_blank" href="https://shumai.one/">Website</a> | <a target="_blank" href="https://docs.shumai.one/introduction">Docs</a> | <a target="_blank" href="https://staging.shumai.one">Demo</a>
<a target="_blank" href="https://shumai.one/">Website</a> | <a target="_blank" href="https://docs.shumai.one/introduction">Docs</a> | <a target="_blank" href="https://staging.shumai.one">Demo</a> | <a target="_blank" href="README_CN.md">中文</a>
</p>
![Shumai App Screenshot](docs/screenshot.webp)
@@ -25,11 +25,16 @@
#### Shumai Agent
- **Collaborative AI Chat**: Converse with a context-aware AI agent directly within your project workspace.
- **Collaborative AI Chat**: Converse with a context-aware AI agent by using `@mentions` directly within the file's comments area.
- **Custom Skills & Tools**: Extend the agent's capabilities by registering custom scripts, tools, and automation skills.
- **Isolated Sandbox Execution**: Run agent-submitted scripts securely within a sandboxed environment.
- **AI-Powered Metadata Autofill**: Automatically generate tags, descriptions, and custom metadata for new assets using Google Gemini.
- **Semantic Search**: Locate assets instantly based on visual or conceptual search queries using vector embeddings.
- **AI Metadata Autofill**: Automatically autofill custom metadata for new assets.
- **Semantic Search**: Find assets based on visual or conceptual search queries using vector embeddings(Gemini Embedding 2).
> [!NOTE]
> **Media Processing & Storage:** When uploading media, Shumai always preserves and stores your original raw file. For all media types (both images and videos), Shumai creates a 480p WebP poster image to serve as the preview in the file list view. Additionally:
> * **For Images:** Shumai generates a high-quality WebP proxy at the exact same resolution as your original file for optimized viewing.
> * **For Videos:** It generates at least one proxy video (depending on your transcoding settings), alongside a sprite image and a small preview video (capped at 1600 frames) to enable fast timeline scrubbing and lightning-quick previews.
---
@@ -52,14 +57,26 @@ Docker Compose is the fastest way to get Shumai running. You do not need to clon
3. Configure environment variables (optional):
* `SHUMAI_SERVER_PORT` controls the port the Shumai server listens on. The default is `3000`.
* By default, Shumai uses the bundled local storage service in this Docker Compose setup. To use an external S3-compatible storage instead, set `AWS_ENDPOINT_URL_S3` to the provider's endpoint URL and configure the corresponding AWS credentials and bucket settings as needed.
* By default, Shumai uses the bundled local storage service in this Docker Compose setup. To use an external S3-compatible storage instead, configure the environment variables for your S3 provider. Here are examples for AWS S3 and Cloudflare R2:
**AWS S3 Example:**
```yaml
STORAGE_BACKEND: s3
S3_BUCKET: your-bucket-name
S3_ACCESS_KEY_ID: your-access-key-id
S3_SECRET_ACCESS_KEY: your-secret-access-key
AWS_ENDPOINT_URL_S3: https://s3.us-east-1.amazonaws.com
```
**Cloudflare R2 Example:**
```yaml
STORAGE_BACKEND: s3
S3_BUCKET: your-bucket-name
S3_REGION: auto
S3_ACCESS_KEY_ID: your-access-key-id
S3_SECRET_ACCESS_KEY: your-secret-access-key
AWS_ENDPOINT_URL_S3: https://<account-id>.r2.cloudflarestorage.com
```
AWS_ENDPOINT_URL_S3: S3_ENDPOINT_URL
S3_REGION: S3_REGION
S3_BUCKET: BUCKET_NAME
S3_ACCESS_KEY_ID: ID
S3_SECRET_ACCESS_KEY: KEY
```
* By default, `AWS_ENDPOINT_URL_S3` is set to: `http://localhost:{SHUMAI_SERVER_PORT}`, if you use local storage and expose Shumai on a custom host/port combination, set `AWS_ENDPOINT_URL_S3` to the external URL that browsers will use to upload files.
For example, if you change the port mapping in `docker-compose.yaml` from `3000:3000` to `12345:3000` and deploy on a server with IP address `12.34.56.78`, set:
+272
View File
@@ -0,0 +1,272 @@
<p align="center">
<img src="docs/logo-rounded.png" alt="Shumai Logo" width="65" />
</p>
<h1 align="center">Shumai</h1>
<p align="center">
<strong>为创意工作打造的开源协作平台。</strong>
</p>
<p align="center">
<a target="_blank" href="https://shumai.one/">官方网站</a> | <a target="_blank" href="https://docs.shumai.one/introduction">文档</a> | <a target="_blank" href="https://staging.shumai.one">在线演示</a> | <a target="_blank" href="README.md">English</a>
</p>
</p>
![Shumai 应用截图](docs/screenshot.webp)
## 功能特性
- **兼容 S3 与本地存储**:支持使用本地文件系统或任意兼容 S3 协议的对象存储(AWS S3、Cloudflare R2、MinIO 等)安全存储和访问你的创意资产。
- **逐帧标注与评论**:可直接在图片和视频上进行逐帧绘制标注,并结合时间戳评论,实现精准反馈与协作。
- **安全分享与媒体合集**:支持创建安全的公开分享链接和精心组织的媒体合集,方便与客户及团队成员协同沟通。
- **细粒度权限控制**:基于团队和项目两级角色权限(RBAC),灵活管理工作区访问权限。
- **基于 Temporal 的分布式转码**:将高负载的视频转码任务交由 Temporal 调度的后台 Worker 集群处理,提升系统扩展性与处理效率。
- **自定义资产元数据**:支持定义和扩展动态元数据字段,灵活适配你的制作流程。
#### Shumai Agent
- **协作式 AI 对话**:在文件评论区通过 `@mention` 即可唤起具备上下文感知能力的 AI Agent,参与讨论与协作。
- **自定义技能与工具**:支持为 Agent 注册自定义脚本、工具和自动化技能,扩展其能力边界。
- **隔离沙箱执行**:Agent 提交的脚本会在安全隔离的沙箱环境中运行,保障执行安全。
- **AI 自动填充元数据**:为新上传的资产自动生成并填写自定义元数据。
- **语义搜索**:基于向量进行搜索(Gemini Embedding 2),支持按视觉内容或语义概念搜索资产。
> [!NOTE]
> **媒体处理与存储机制:** 上传媒体文件后,Shumai 始终会保留并存储原始文件。无论图片还是视频,都会额外生成一张 480p 的 WebP 封面图,作为文件列表中的预览图。此外:
>
> * **图片:** 会生成一份与原图分辨率完全一致的高质量 WebP 转码版本,在保证画质的同时提升浏览性能。
> * **视频:** 会根据转码配置生成至少一个代理视频,同时生成雪碧图(Sprite)和一段最长 1600 帧的低分辨率转码视频,用于实现快速拖动时间轴和即时视频预览。
---
## 安装指南
以下是使用本地存储运行 Shumai 的快速上手指南。如需了解高级配置(包括 S3 兼容存储配置、Temporal 工作流编排等),请参阅我们的[官方文档](https://docs.shumai.one/getting-started/overview)。
### 方案一:使用 Docker Compose(推荐)
使用 Docker Compose 是运行 Shumai 最快的方式。您无需克隆仓库,也不需要手动安装依赖包。请确保电脑上已安装 [Docker](https://docs.docker.com/get-docker/) 和 [Docker Compose](https://docs.docker.com/compose/install/),然后按照以下步骤操作:
1. 创建并进入一个新目录,用于存放配置文件和数据卷:
```bash
mkdir shumai && cd shumai
```
2. 下载 `docker-compose.yaml` 配置文件:
```bash
curl -o docker-compose.yaml https://raw.githubusercontent.com/shumaiOne/shumai/main/docker-compose/local/docker-compose-aliyun.yaml
```
3. 配置环境变量(可选):
* `SHUMAI_SERVER_PORT` 用于控制 Shumai 服务监听的端口,默认值为 `3000`。
* 默认情况下,该 Docker Compose 部署会自动启用集成的本地存储。若想切换至外部 S3 兼容存储,请在 `environment` 中配置 S3 提供商的环境变量。以下是 AWS S3 和 Cloudflare R2 的配置示例:
**AWS S3 示例:**
```yaml
STORAGE_BACKEND: s3
S3_BUCKET: your-bucket-name
S3_ACCESS_KEY_ID: your-access-key-id
S3_SECRET_ACCESS_KEY: your-secret-access-key
AWS_ENDPOINT_URL_S3: https://s3.us-east-1.amazonaws.com
```
**Cloudflare R2 示例:**
```yaml
STORAGE_BACKEND: s3
S3_BUCKET: your-bucket-name
S3_REGION: auto
S3_ACCESS_KEY_ID: your-access-key-id
S3_SECRET_ACCESS_KEY: your-secret-access-key
AWS_ENDPOINT_URL_S3: https://<account-id>.r2.cloudflarestorage.com
```
* 默认情况下 `AWS_ENDPOINT_URL_S3` 指向 `http://localhost:{SHUMAI_SERVER_PORT}`。如果您使用本地存储,但希望在自定义的主机名或端口上公开访问 Shumai,请务必将 `AWS_ENDPOINT_URL_S3` 修改为浏览器访问该服务时所使用的外部 URL。
例如,如果您将 `docker-compose.yaml` 中的端口映射从 `3000:3000` 修改为了 `12345:3000`,且服务部署在 IP 为 `12.34.56.78` 的服务器上,请进行如下设置:
```
AWS_ENDPOINT_URL_S3: http://12.34.56.78:12345
```
此地址必须能够从客户端浏览器正常访问,且必须包含对外暴露的实际端口号。
4. 在后台启动所有服务:
```bash
docker compose up -d
```
5. 打开浏览器,访问 `http://localhost:3000` 即可开始使用(若是远程部署,请访问 `http://<您的服务器IP>:3000`)。
### 方案二:通过 NPM / 包管理器安装
通过 NPM 上的 `@shumai-one/shumai` 进行安装。
#### 第一步:启动带 pgvector 支持的 PostgreSQL
Shumai 依赖支持 `pgvector` 扩展的 PostgreSQL 数据库。您可以使用 Docker 快速启动一个预配置好的数据库容器:
```bash
docker run --name shumai_postgres \
-e POSTGRES_USER=shumai \
-e POSTGRES_PASSWORD=shumai_password \
-e POSTGRES_DB=shumai_db \
-p 5432:5432 \
-d docker.m.daocloud.io/pgvector/pgvector:pg18
```
#### 第二步:创建工作区目录
创建一个专属目录用来存放环境配置和媒体文件(媒体文件默认会保存在 `./data` 目录下):
```bash
mkdir shumai && cd shumai
```
#### 第三步:安装平台特定系统依赖
在安装 Shumai 之前,请确保您的宿主机上已经安装了以下系统依赖项:
| 依赖包 | 功能描述 | Ubuntu/Debian | Fedora | Arch | macOS |
| --- | --- | --- | --- | --- | --- |
| **ffmpeg** | 媒体转码及元数据提取 | `sudo apt install -y ffmpeg` | `sudo dnf install -y ffmpeg` | `sudo pacman -S --noconfirm ffmpeg` | `brew install ffmpeg` |
| **bubblewrap** | 用于安全执行 AI 助手脚本的隔离沙箱环境 | `sudo apt install -y bubblewrap` | `sudo dnf install -y bubblewrap` | `sudo pacman -S --noconfirm bubblewrap` | *无需安装* |
| **socat** | 用于沙箱网络桥接的双向套接字中继 | `sudo apt install -y socat` | `sudo dnf install -y socat` | `sudo pacman -S --noconfirm socat` | `brew install socat` |
| **ripgrep** | 用于工作区安全策略的高效文本搜索工具 | `sudo apt install -y ripgrep` | `sudo dnf install -y ripgrep` | `sudo pacman -S --noconfirm ripgrep` | `brew install ripgrep` |
> [!NOTE]
> **Ubuntu 24.04+ 用户请注意:** 这些系统版本默认限制了非特权用户命名空间(unprivileged user namespaces)。为了让 `bubblewrap` 和沙箱隔离层正常工作,需要关闭此限制:
> ```bash
> sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
>
> ```
>
>
> 或者,您也可以专门配置一个 AppArmor 配置文件,为相关二进制文件授予用户命名空间创建(`userns`)权限。
#### 第四步:全局安装 Shumai
使用您常用的包管理器进行全局安装:
```bash
# 使用 NPM
npm install -g @shumai-one/shumai
# 使用 PNPM
pnpm add -g @shumai-one/shumai
# 使用 Bun
bun add -g @shumai-one/shumai
```
#### 第五步:配置环境配置
在刚才创建的工作区目录(`shumai/`)下新建一个 `.env` 文件,并填入以下配置:
```env
DATABASE_URL=postgresql://shumai:shumai_password@localhost:5432/shumai_db?schema=public
BETTER_AUTH_SECRET=ySxs7DxzHDZBbeeHNPEwBuspYwipBqz5Gk5XdBjNhWw=
STORAGE_BACKEND=local
SHUMAI_SERVER_PORT=3000
AWS_ENDPOINT_URL_S3=http://localhost:3000
```
> [!NOTE]
> `SHUMAI_SERVER_PORT` 用于设置 Web 服务的启动端口,而 `AWS_ENDPOINT_URL_S3` 供浏览器端构建文件上传链接。
> 如果您部署在远程服务器(如 `http://123.456.7.8`)并且做了端口映射(如 Docker 中的 `12345:3000`),请将 `AWS_ENDPOINT_URL_S3` 设置为 `http://123.456.7.8:12345`。
#### 第六步:启动 Shumai
> [!IMPORTANT]
> **Bun 用户特别提示:** 由于发布的包二进制文件包含 `#!/usr/bin/env node` 头部声明(Shebang),直接在终端执行全局命令(例如 `shumai`)默认会通过 Node.js 运行。如果您是用 Bun 安装的并且希望调用 Bun 运行时,请在所有命令前加上 `bun run --bun` 前缀(例如:`bun run --bun shumai`、`bun run --bun shumai -d`、`bun run --bun shumai stop`)。
在您的工作区目录下执行以下命令启动应用:
```bash
shumai
```
您也可以让 Shumai 在后台以守护进程(Daemon)模式运行和管理:
* **后台模式启动**:
```bash
shumai -d
```
* **停止服务**:
```bash
shumai stop
```
* **重启服务**:
```bash
shumai restart
```
* **查看并跟踪实时日志**:
```bash
shumai logs
```
启动时,Shumai 会自动执行数据库迁移(Migration)并在 `http://localhost:3000` 拉起 Web 服务。
---
### 方案三:源码编译运行(开发环境)
如果您希望在本地参与 Shumai 的开发,请按以下步骤配置开发环境:
1. 克隆代码仓库并安装依赖项:
```bash
git clone [https://github.com/shumaiOne/shumai.git](https://github.com/shumaiOne/shumai.git)
cd shumai
bun install
```
2. 启动 `pgvector` 数据库容器(参考**方案二中的第一步**)。
3. 参照**方案二中的第五步**,在项目根目录下创建一个 `.env` 文件。
4. 执行数据库结构迁移:
```bash
bun run db:migrate
```
5. 启动本地开发服务器:
```bash
bun run dev
```
---
## 命令行工具 (CLI)
Shumai 自带一个功能完备的命令行工具(CLI),支持您直接在终端里高效管理项目、文件夹、资产,批量上传文件/目录,以及快速创建新版本。
关于 CLI 的安装与详细使用指南,请参阅 [CLI Readme](https://www.google.com/search?q=apps/cli/README.md)。
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/agent-app",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"bin": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/cli",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"bin": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/transcode-app",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"bin": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/web-app",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"dependencies": {
+60 -38
View File
@@ -11,7 +11,10 @@
"devDependencies": {
"@eslint/js": "10.0.1",
"@inlang/paraglide-js": "2.20.0",
"@playwright/test": "1.61.1",
"@testcontainers/postgresql": "12.0.1",
"@testing-library/dom": "10.4.1",
"@testing-library/react": "16.3.2",
"@types/bun": "1.3.14",
"@types/node": "25.9.1",
"bun-plugin-pino": "1.5.0",
@@ -22,6 +25,7 @@
"eslint-plugin-prettier": "5.5.6",
"eslint-plugin-react": "7.37.5",
"globals": "17.6.0",
"happy-dom": "20.10.6",
"pino-pretty": "13.1.3",
"prisma": "7.8.0",
"testcontainers": "12.0.1",
@@ -33,7 +37,7 @@
},
"apps/agent": {
"name": "@shumai/agent-app",
"version": "0.1.2",
"version": "0.1.5",
"bin": {
"shumai-agent": "./src/index.ts",
},
@@ -45,7 +49,7 @@
},
"apps/cli": {
"name": "@shumai/cli",
"version": "0.1.2",
"version": "0.1.5",
"bin": {
"shumai-cli": "./src/index.ts",
},
@@ -60,7 +64,7 @@
},
"apps/transcode": {
"name": "@shumai/transcode-app",
"version": "0.1.2",
"version": "0.1.5",
"bin": {
"shumai-transcode": "./src/index.ts",
},
@@ -72,7 +76,7 @@
},
"apps/web": {
"name": "@shumai/web-app",
"version": "0.1.2",
"version": "0.1.5",
"dependencies": {
"@shumai/agent": "workspace:*",
"@shumai/api": "workspace:*",
@@ -87,7 +91,7 @@
},
"packages/agent": {
"name": "@shumai/agent",
"version": "0.1.2",
"version": "0.1.5",
"dependencies": {
"@anthropic-ai/sandbox-runtime": "0.0.52",
"@earendil-works/pi-agent-core": "0.78.0",
@@ -111,7 +115,7 @@
},
"packages/api": {
"name": "@shumai/api",
"version": "0.1.2",
"version": "0.1.5",
"dependencies": {
"@hono/zod-validator": "0.7.6",
"@shumai/core": "workspace:*",
@@ -125,7 +129,7 @@
},
"packages/core": {
"name": "@shumai/core",
"version": "0.1.2",
"version": "0.1.5",
"dependencies": {
"@shumai/db": "workspace:*",
"@shumai/dtos": "workspace:*",
@@ -152,7 +156,7 @@
},
"packages/db": {
"name": "@shumai/db",
"version": "0.1.2",
"version": "0.1.5",
"dependencies": {
"@earendil-works/pi-agent-core": "0.78.0",
"@prisma/adapter-pg": "7.8.0",
@@ -168,18 +172,18 @@
},
"packages/dtos": {
"name": "@shumai/dtos",
"version": "0.1.2",
"version": "0.1.5",
"dependencies": {
"zod": "4.4.3",
},
},
"packages/tableprinter": {
"name": "@shumai/tableprinter",
"version": "0.1.2",
"version": "0.1.5",
},
"packages/transcode": {
"name": "@shumai/transcode",
"version": "0.1.2",
"version": "0.1.5",
"dependencies": {
"@shumai/core": "workspace:*",
"@shumai/db": "workspace:*",
@@ -193,7 +197,7 @@
},
"packages/webui": {
"name": "@shumai/webui",
"version": "0.1.2",
"version": "0.1.5",
"dependencies": {
"@base-ui/react": "1.5.0",
"@dnd-kit/abstract": "0.4.0",
@@ -277,24 +281,20 @@
},
"devDependencies": {
"@tailwindcss/postcss": "4.3.0",
"@tailwindcss/vite": "4.3.0",
"@tanstack/router-cli": "1.167.13",
"@tanstack/router-plugin": "1.168.14",
"@types/react": "19.2.16",
"@types/react-dom": "19.2.3",
"@vitejs/plugin-react": "5.2.0",
"autoprefixer": "10.5.0",
"postcss": "8.5.15",
"tailwindcss": "4.3.0",
"tw-animate-css": "1.3.3",
"typescript": "6.0.3",
"vite": "7.3.5",
"vite-tsconfig-paths": "6.1.1",
},
},
"packages/workflow-core": {
"name": "@shumai/workflow-core",
"version": "0.1.2",
"version": "0.1.5",
"dependencies": {
"@shumai/core": "workspace:*",
"@shumai/db": "workspace:*",
@@ -395,10 +395,6 @@
"@babel/plugin-syntax-typescript": ["@babel/plugin-syntax-typescript@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA=="],
"@babel/plugin-transform-react-jsx-self": ["@babel/plugin-transform-react-jsx-self@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw=="],
"@babel/plugin-transform-react-jsx-source": ["@babel/plugin-transform-react-jsx-source@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q=="],
"@babel/runtime": ["@babel/runtime@7.29.7", "", {}, "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw=="],
"@babel/template": ["@babel/template@7.29.7", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/parser": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg=="],
@@ -761,6 +757,8 @@
"@pkgr/core": ["@pkgr/core@0.3.6", "", {}, "sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA=="],
"@playwright/test": ["@playwright/test@1.61.1", "", { "dependencies": { "playwright": "1.61.1" }, "bin": { "playwright": "cli.js" } }, "sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig=="],
"@pondwader/socks5-server": ["@pondwader/socks5-server@1.0.10", "", {}, "sha512-bQY06wzzR8D2+vVCUoBsr5QS2U6UgPUQRmErNwtsuI6vLcyRKkafjkr3KxbtGFf9aBBIV2mcvlsKD1UYaIV+sg=="],
"@preact/signals-core": ["@preact/signals-core@1.14.2", "", {}, "sha512-RZHdBj9ZF4n40Rp4jS052EHHjBWf96P9oNdXPfhQTovCuWY9iQn3Gq+gOTJSgBO9A/JBuPfMOWsSX/lIU9Pc/A=="],
@@ -941,8 +939,6 @@
"@reduxjs/toolkit": ["@reduxjs/toolkit@2.12.0", "", { "dependencies": { "@standard-schema/spec": "^1.0.0", "@standard-schema/utils": "^0.3.0", "immer": "^11.0.0", "redux": "^5.0.1", "redux-thunk": "^3.1.0", "reselect": "^5.1.0" }, "peerDependencies": { "react": "^16.9.0 || ^17.0.0 || ^18 || ^19", "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0" }, "optionalPeers": ["react", "react-redux"] }, "sha512-KiT+RzZbp6mQET+Mg+h2c97+9j1sNflUxQkIHI7Yuzf6Peu+OYpmkn6nbHWmLLWj+1ZODUJFwGZ7gx3L9R9EOw=="],
"@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.0-rc.3", "", {}, "sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q=="],
"@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.61.0", "", { "os": "android", "cpu": "arm" }, "sha512-dnxczajOqt0gesZlN5pGQ1s1imQVrsmCw5G2Ci4oM+0WvNz3pyRnlWrT7McoZIb8VlFwCawdmbWRmxRn7HI+VQ=="],
"@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.61.0", "", { "os": "android", "cpu": "arm64" }, "sha512-Bp3JpGP00Vu3f238ivRrjf7z3xSzVPXqCmaJYA9t2c+c8vKYvOzmXF7LkkeUalTEGd6cZcSWe+PFIP3Vy48fRg=="],
@@ -1105,8 +1101,6 @@
"@tailwindcss/postcss": ["@tailwindcss/postcss@4.3.0", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "@tailwindcss/node": "4.3.0", "@tailwindcss/oxide": "4.3.0", "postcss": "^8.5.10", "tailwindcss": "4.3.0" } }, "sha512-Jm05Tjx+9yCLGv5qw1c+84Psds8MnyrEQYCB+FFk2lgGiUjlRqdxke4mVTuYrj2xnVZqKim2Apr5ySuQRYAw/w=="],
"@tailwindcss/vite": ["@tailwindcss/vite@4.3.0", "", { "dependencies": { "@tailwindcss/node": "4.3.0", "@tailwindcss/oxide": "4.3.0", "tailwindcss": "4.3.0" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7 || ^8" } }, "sha512-t6J3OrB5Fc0ExuhohouH0fWUGMYL6PTLhW+E7zIk/pdbnJARZDCwjBznFnkh5ynRnIRSI4YjtTH0t6USjJISrw=="],
"@tanstack/devtools-event-client": ["@tanstack/devtools-event-client@0.4.3", "", { "bin": { "intent": "bin/intent.js" } }, "sha512-OZI6QyULw0FI0wjgmeYzCIfbgPsOEzwJtCpa69XrfLMtNXLGnz3d/dIabk7frg0TmHo+Ah49w5I4KC7Tufwsvw=="],
"@tanstack/form-core": ["@tanstack/form-core@1.33.0", "", { "dependencies": { "@tanstack/devtools-event-client": "^0.4.1", "@tanstack/pacer-lite": "^0.1.1", "@tanstack/store": "^0.11.0" } }, "sha512-AV4Pw9Dk4orFsuPBcDssfWMJFs+yMYBae7zZ4oTqrCf4ftNGQKxvrQRZeqKHG6A4TkiLeSvf2kzIjcVkrW7E6w=="],
@@ -1165,15 +1159,13 @@
"@testcontainers/postgresql": ["@testcontainers/postgresql@12.0.1", "", { "dependencies": { "testcontainers": "^12.0.1" } }, "sha512-6SyyduUM6lTAo4UwKG1aCochP6wTe0k7/W/m5uODZQMUrV3STk6/28Km3474JLGZdw/P793BUEF2IeU7rDyoEg=="],
"@testing-library/dom": ["@testing-library/dom@10.4.1", "", { "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", "@types/aria-query": "^5.0.1", "aria-query": "5.3.0", "dom-accessibility-api": "^0.5.9", "lz-string": "^1.5.0", "picocolors": "1.1.1", "pretty-format": "^27.0.2" } }, "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg=="],
"@testing-library/react": ["@testing-library/react@16.3.2", "", { "dependencies": { "@babel/runtime": "^7.12.5" }, "peerDependencies": { "@testing-library/dom": "^10.0.0", "@types/react": "^18.0.0 || ^19.0.0", "@types/react-dom": "^18.0.0 || ^19.0.0", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g=="],
"@types/adm-zip": ["@types/adm-zip@0.5.8", "", { "dependencies": { "@types/node": "*" } }, "sha512-RVVH7QvZYbN+ihqZ4kX/dMiowf6o+Jk1fNwiSdx0NahBJLU787zkULhGhJM8mf/obmLGmgdMM0bXsQTmyfbR7Q=="],
"@types/babel__core": ["@types/babel__core@7.20.5", "", { "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" } }, "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA=="],
"@types/babel__generator": ["@types/babel__generator@7.27.0", "", { "dependencies": { "@babel/types": "^7.0.0" } }, "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg=="],
"@types/babel__template": ["@types/babel__template@7.4.4", "", { "dependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0" } }, "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A=="],
"@types/babel__traverse": ["@types/babel__traverse@7.28.0", "", { "dependencies": { "@babel/types": "^7.28.2" } }, "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q=="],
"@types/aria-query": ["@types/aria-query@5.0.4", "", {}, "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw=="],
"@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="],
@@ -1241,6 +1233,10 @@
"@types/use-sync-external-store": ["@types/use-sync-external-store@0.0.6", "", {}, "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg=="],
"@types/whatwg-mimetype": ["@types/whatwg-mimetype@3.0.2", "", {}, "sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA=="],
"@types/ws": ["@types/ws@8.18.1", "", { "dependencies": { "@types/node": "*" } }, "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg=="],
"@types/yauzl": ["@types/yauzl@2.10.3", "", { "dependencies": { "@types/node": "*" } }, "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q=="],
"@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.60.1", "", { "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.60.1", "@typescript-eslint/type-utils": "8.60.1", "@typescript-eslint/utils": "8.60.1", "@typescript-eslint/visitor-keys": "8.60.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.60.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-JQ4S5GB0tfjO8BuJ4fcX+HodkzJjYBV+7OJ+wLygaX7OGQ7FudyHL4NSCA6ob+w3Yn+5MkKIozOwQhXeM7opVg=="],
@@ -1271,8 +1267,6 @@
"@videojs/xhr": ["@videojs/xhr@2.7.0", "", { "dependencies": { "@babel/runtime": "^7.5.5", "global": "~4.4.0", "is-function": "^1.0.1" } }, "sha512-giab+EVRanChIupZK7gXjHy90y3nncA2phIOyG3Ne5fvpiMJzvqYwiTOnEVW2S4CoYcuKJkomat7bMXA/UoUZQ=="],
"@vitejs/plugin-react": ["@vitejs/plugin-react@5.2.0", "", { "dependencies": { "@babel/core": "^7.29.0", "@babel/plugin-transform-react-jsx-self": "^7.27.1", "@babel/plugin-transform-react-jsx-source": "^7.27.1", "@rolldown/pluginutils": "1.0.0-rc.3", "@types/babel__core": "^7.20.5", "react-refresh": "^0.18.0" }, "peerDependencies": { "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-YmKkfhOAi3wsB1PhJq5Scj3GXMn3WvtQ/JC0xoopuHoXSdmtdStOpFrYaT1kie2YgFBcIe64ROzMYRjCrYOdYw=="],
"@vitest/expect": ["@vitest/expect@4.1.8", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.8", "@vitest/utils": "4.1.8", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" } }, "sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ=="],
"@vitest/mocker": ["@vitest/mocker@4.1.8", "", { "dependencies": { "@vitest/spy": "4.1.8", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["msw", "vite"] }, "sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw=="],
@@ -1345,7 +1339,7 @@
"ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
"ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
"ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="],
"ansis": ["ansis@4.3.1", "", {}, "sha512-BJ8/l4R5LRE7hW9WdSuGYrLSHi2ynxeFpDFbH0K/CgNeY/tyhk+vO6TYxXC5r5CpUhNVX310xzPsN/H9lCdfOA=="],
@@ -1355,6 +1349,8 @@
"aria-hidden": ["aria-hidden@1.2.6", "", { "dependencies": { "tslib": "^2.0.0" } }, "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA=="],
"aria-query": ["aria-query@5.3.0", "", { "dependencies": { "dequal": "^2.0.3" } }, "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A=="],
"array-buffer-byte-length": ["array-buffer-byte-length@1.0.2", "", { "dependencies": { "call-bound": "^1.0.3", "is-array-buffer": "^3.0.5" } }, "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw=="],
"array-includes": ["array-includes@3.1.9", "", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.4", "define-properties": "^1.2.1", "es-abstract": "^1.24.0", "es-object-atoms": "^1.1.1", "get-intrinsic": "^1.3.0", "is-string": "^1.1.1", "math-intrinsics": "^1.1.0" } }, "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ=="],
@@ -1439,6 +1435,8 @@
"buffer-from": ["buffer-from@1.1.2", "", {}, "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="],
"buffer-image-size": ["buffer-image-size@0.6.4", "", { "dependencies": { "@types/node": "*" } }, "sha512-nEh+kZOPY1w+gcCMobZ6ETUp9WfibndnosbpwB1iJk/8Gt5ZF2bhS6+B6bPYz424KtwsR6Rflc3tCz1/ghX2dQ=="],
"buildcheck": ["buildcheck@0.0.7", "", {}, "sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA=="],
"bun": ["bun@1.3.14", "", { "optionalDependencies": { "@oven/bun-darwin-aarch64": "1.3.14", "@oven/bun-darwin-x64": "1.3.14", "@oven/bun-darwin-x64-baseline": "1.3.14", "@oven/bun-freebsd-aarch64": "1.3.14", "@oven/bun-freebsd-x64": "1.3.14", "@oven/bun-linux-aarch64": "1.3.14", "@oven/bun-linux-aarch64-android": "1.3.14", "@oven/bun-linux-aarch64-musl": "1.3.14", "@oven/bun-linux-x64": "1.3.14", "@oven/bun-linux-x64-android": "1.3.14", "@oven/bun-linux-x64-baseline": "1.3.14", "@oven/bun-linux-x64-musl": "1.3.14", "@oven/bun-linux-x64-musl-baseline": "1.3.14", "@oven/bun-windows-aarch64": "1.3.14", "@oven/bun-windows-x64": "1.3.14", "@oven/bun-windows-x64-baseline": "1.3.14" }, "os": [ "!aix", "!sunos", "!openbsd", ], "cpu": [ "x64", "arm64", ], "bin": { "bun": "bin/bun.exe", "bunx": "bin/bunx.exe" } }, "sha512-aB6GVd42x1Y5ie1K16SF+oLGtgSkwX9hgoDdIW88pjvfTccU8F1vfpoOt34QLv0dZ1v3XimtaxPlZUG81Gx9Zg=="],
@@ -1599,6 +1597,8 @@
"doctrine": ["doctrine@2.1.0", "", { "dependencies": { "esutils": "^2.0.2" } }, "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="],
"dom-accessibility-api": ["dom-accessibility-api@0.5.16", "", {}, "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg=="],
"dom-walk": ["dom-walk@0.1.2", "", {}, "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="],
"dotenv": ["dotenv@16.6.1", "", {}, "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow=="],
@@ -1629,6 +1629,8 @@
"enhanced-resolve": ["enhanced-resolve@5.22.1", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.3" } }, "sha512-6QEuw3zoX1SJQc7b87aBXke/no+mG2bTBgw29gWMQonLmpEkWoCAVkl+M49e48AZlWzxiDzDZzYdp6kobcyLww=="],
"entities": ["entities@7.0.1", "", {}, "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA=="],
"env-paths": ["env-paths@3.0.0", "", {}, "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A=="],
"es-abstract": ["es-abstract@1.24.2", "", { "dependencies": { "array-buffer-byte-length": "^1.0.2", "arraybuffer.prototype.slice": "^1.0.4", "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", "call-bound": "^1.0.4", "data-view-buffer": "^1.0.2", "data-view-byte-length": "^1.0.2", "data-view-byte-offset": "^1.0.1", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.1.1", "es-set-tostringtag": "^2.1.0", "es-to-primitive": "^1.3.0", "function.prototype.name": "^1.1.8", "get-intrinsic": "^1.3.0", "get-proto": "^1.0.1", "get-symbol-description": "^1.1.0", "globalthis": "^1.0.4", "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", "has-proto": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "internal-slot": "^1.1.0", "is-array-buffer": "^3.0.5", "is-callable": "^1.2.7", "is-data-view": "^1.0.2", "is-negative-zero": "^2.0.3", "is-regex": "^1.2.1", "is-set": "^2.0.3", "is-shared-array-buffer": "^1.0.4", "is-string": "^1.1.1", "is-typed-array": "^1.1.15", "is-weakref": "^1.1.1", "math-intrinsics": "^1.1.0", "object-inspect": "^1.13.4", "object-keys": "^1.1.1", "object.assign": "^4.1.7", "own-keys": "^1.0.1", "regexp.prototype.flags": "^1.5.4", "safe-array-concat": "^1.1.3", "safe-push-apply": "^1.0.0", "safe-regex-test": "^1.1.0", "set-proto": "^1.0.0", "stop-iteration-iterator": "^1.1.0", "string.prototype.trim": "^1.2.10", "string.prototype.trimend": "^1.0.9", "string.prototype.trimstart": "^1.0.8", "typed-array-buffer": "^1.0.3", "typed-array-byte-length": "^1.0.3", "typed-array-byte-offset": "^1.0.4", "typed-array-length": "^1.0.7", "unbox-primitive": "^1.1.0", "which-typed-array": "^1.1.19" } }, "sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg=="],
@@ -1751,7 +1753,7 @@
"fs-monkey": ["fs-monkey@1.1.0", "", {}, "sha512-QMUezzXWII9EV5aTFXW1UBVUO77wYPpjqIF8/AviUCThNeSYZykpoTixUeaNNBwmCev0AMDWMAni+f8Hxb1IFw=="],
"fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
"fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="],
"function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="],
@@ -1815,6 +1817,8 @@
"graphmatch": ["graphmatch@1.1.1", "", {}, "sha512-5ykVn/EXM1hF0XCaWh05VbYvEiOL2lY1kBxZtaYsyvjp7cmWOU1XsAdfQBwClraEofXDT197lFbXOEVMHpvQOg=="],
"happy-dom": ["happy-dom@20.10.6", "", { "dependencies": { "@types/node": ">=20.0.0", "@types/whatwg-mimetype": "^3.0.2", "@types/ws": "^8.18.1", "buffer-image-size": "^0.6.4", "entities": "^7.0.1", "whatwg-mimetype": "^3.0.0", "ws": "^8.21.0" } }, "sha512-6QD0ilzDDt93tX44y8tbmZdAcdTRYDhUP+Asgi6pC8Pp5IA3cvaZGyoVN/EGtlq9ziT65iPuBBn3ASLr6hCgVw=="],
"has-bigints": ["has-bigints@1.1.0", "", {}, "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg=="],
"has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
@@ -2043,6 +2047,8 @@
"lucide-react": ["lucide-react@1.17.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-9FA9evdox/JQL5PT57fdA1x/yg8T7knJ98+zjTL3UfKza6pflQUUh3XtaQIHKvnsJw1lmsEyHVlt5jchYxOQ5w=="],
"lz-string": ["lz-string@1.5.0", "", { "bin": { "lz-string": "bin/bin.js" } }, "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ=="],
"m3u8-parser": ["m3u8-parser@7.2.0", "", { "dependencies": { "@babel/runtime": "^7.12.5", "@videojs/vhs-utils": "^4.1.1", "global": "^4.4.0" } }, "sha512-CRatFqpjVtMiMaKXxNvuI3I++vUumIXVVT/JpCpdU/FynV/ceVw1qpPyyBNindL+JlPMSesx+WX1QJaZEJSaMQ=="],
"magic-string": ["magic-string@0.30.21", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="],
@@ -2249,6 +2255,10 @@
"pkg-types": ["pkg-types@2.3.1", "", { "dependencies": { "confbox": "^0.2.4", "exsolve": "^1.0.8", "pathe": "^2.0.3" } }, "sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg=="],
"playwright": ["playwright@1.61.1", "", { "dependencies": { "playwright-core": "1.61.1" }, "optionalDependencies": { "fsevents": "2.3.2" }, "bin": { "playwright": "cli.js" } }, "sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ=="],
"playwright-core": ["playwright-core@1.61.1", "", { "bin": { "playwright-core": "cli.js" } }, "sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg=="],
"possible-typed-array-names": ["possible-typed-array-names@1.1.0", "", {}, "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg=="],
"postcss": ["postcss@8.5.15", "", { "dependencies": { "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A=="],
@@ -2271,6 +2281,8 @@
"prettier-linter-helpers": ["prettier-linter-helpers@1.0.1", "", { "dependencies": { "fast-diff": "^1.1.2" } }, "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg=="],
"pretty-format": ["pretty-format@27.5.1", "", { "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", "react-is": "^17.0.1" } }, "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="],
"prisma": ["prisma@7.8.0", "", { "dependencies": { "@prisma/config": "7.8.0", "@prisma/dev": "0.24.3", "@prisma/engines": "7.8.0", "@prisma/studio-core": "0.27.3", "mysql2": "3.15.3", "postgres": "3.4.7" }, "peerDependencies": { "better-sqlite3": ">=9.0.0", "typescript": ">=5.4.0" }, "optionalPeers": ["better-sqlite3", "typescript"], "bin": { "prisma": "build/index.js" } }, "sha512-yfN4yrw7HV9kEJhoy1+jgah0jafEIQsf7uWouSsM8MvJtlubsk+kM7AIBWZ8+GJl74Yj3c+nbYqBkMOxtsZ3Lw=="],
"prisma-json-types-generator": ["prisma-json-types-generator@4.1.1", "", { "dependencies": { "@prisma/generator-helper": "^7.2.0", "semver": "^7.7.3", "try": "^1.0.3", "tslib": "^2.8.1" }, "peerDependencies": { "@prisma/client": "^7.2.0", "prisma": "^7.2.0", "typescript": "^5.9.3" }, "bin": { "prisma-json-types-generator": "index.js" } }, "sha512-oz0MYu1r2Jqu3qOGCEGulz6RjPsECVjyS3ZAz3HEmz0jkKbVkZEwQyksNJm0X5utV1TZCmaG/98EPExN7S22xw=="],
@@ -2329,8 +2341,6 @@
"react-redux": ["react-redux@9.3.0", "", { "dependencies": { "@types/use-sync-external-store": "^0.0.6", "use-sync-external-store": "^1.4.0" }, "peerDependencies": { "@types/react": "^18.2.25 || ^19", "react": "^18.0 || ^19", "redux": "^5.0.0" }, "optionalPeers": ["@types/react", "redux"] }, "sha512-KQopgqFo/p/fgmAs5qz6p5RWaNAzq40WAu7fJIXnQpYxFPbJYtsJPWvGeF2rOBaY/kEuV77AVsX8TsQzKm+A/g=="],
"react-refresh": ["react-refresh@0.18.0", "", {}, "sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw=="],
"react-remove-scroll": ["react-remove-scroll@2.7.2", "", { "dependencies": { "react-remove-scroll-bar": "^2.3.7", "react-style-singleton": "^2.2.3", "tslib": "^2.1.0", "use-callback-ref": "^1.3.3", "use-sidecar": "^1.1.3" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q=="],
"react-remove-scroll-bar": ["react-remove-scroll-bar@2.3.8", "", { "dependencies": { "react-style-singleton": "^2.2.2", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "optionalPeers": ["@types/react"] }, "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q=="],
@@ -2657,6 +2667,8 @@
"webpack-virtual-modules": ["webpack-virtual-modules@0.6.2", "", {}, "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ=="],
"whatwg-mimetype": ["whatwg-mimetype@3.0.0", "", {}, "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="],
"which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="],
"which-boxed-primitive": ["which-boxed-primitive@1.1.1", "", { "dependencies": { "is-bigint": "^1.1.0", "is-boolean-object": "^1.2.1", "is-number-object": "^1.1.1", "is-string": "^1.1.1", "is-symbol": "^1.1.1" } }, "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA=="],
@@ -3027,6 +3039,8 @@
"pg-types/postgres-array": ["postgres-array@2.0.0", "", {}, "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="],
"pretty-format/react-is": ["react-is@17.0.2", "", {}, "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="],
"prisma-json-types-generator/semver": ["semver@7.8.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg=="],
"protobufjs/@types/node": ["@types/node@22.19.19", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-dyh/xO2Fh5bYrfWaaqGrRQQGkNdmYw6AmaAUvYeUMNTWQtvb796ikLdmTchRmOlOiIJ1TDXfWgVx1QkUlQ6Hew=="],
@@ -3113,6 +3127,8 @@
"readdir-glob/minimatch": ["minimatch@5.1.9", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw=="],
"rollup/fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
"schema-utils/ajv": ["ajv@8.20.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA=="],
"sharp/semver": ["semver@7.8.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg=="],
@@ -3127,8 +3143,14 @@
"thread-stream/real-require": ["real-require@1.0.0", "", {}, "sha512-P4nbQYQfePJxRSmY+v/KINxVucm4NF3p3s7pJveMTtom52FR4YGltUQLB8idDXwDDWW+eYrWDFbuzUnjoWHF7g=="],
"vite/fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
"webpack/eslint-scope": ["eslint-scope@5.1.1", "", { "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="],
"wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
"wrap-ansi-cjs/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
"yauzl/buffer-crc32": ["buffer-crc32@0.2.13", "", {}, "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="],
"@isaacs/cliui/string-width/emoji-regex": ["emoji-regex@9.2.2", "", {}, "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="],
@@ -0,0 +1,45 @@
services:
postgres:
image: docker.m.daocloud.io/pgvector/pgvector:pg18
container_name: shumai_postgres
environment:
POSTGRES_USER: shumai
POSTGRES_PASSWORD: shumai_password
POSTGRES_DB: shumai_db
ports:
- '5432:5432'
volumes:
- postgres_data:/var/lib/postgresql/18/docker
healthcheck:
test: ['CMD-SHELL', 'pg_isready -U shumai -d shumai_db']
interval: 5s
timeout: 5s
retries: 5
shumai:
image: crpi-000nkafzu6xvpwsc.cn-hongkong.personal.cr.aliyuncs.com/shumai-one/shumai:latest
container_name: shumai_app
ports:
- '3000:3000'
volumes:
- ./data:/app/data
environment:
# Database Configuration
DATABASE_URL: postgres://shumai:shumai_password@shumai_postgres:5432/shumai_db?search_path=public&sslmode=disable
# Server Configuration
SHUMAI_SERVER_PORT: 3000
# S3 Configuration
STORAGE_BACKEND: local
AWS_ENDPOINT_URL_S3: http://localhost:3000
# Better Auth
BETTER_AUTH_SECRET: qSxs9DxzHDZBbeeTNPEwBuspYwipBqz5Gk5XdBjNhWw=
depends_on:
postgres:
condition: service_healthy
volumes:
postgres_data:
-1
View File
@@ -45,7 +45,6 @@ Shumai supports storing files locally or on S3-compatible endpoints.
| `S3_ACCESS_KEY_ID` | Access key credentials for S3. | `minioadmin` (default) |
| `S3_SECRET_ACCESS_KEY` | Secret key credentials for S3. | `minioadmin` (default) |
| `S3_REGION` | S3 storage region. | `auto` (default) |
| `S3_USE_SSL` | Set to `true` to use HTTPS for S3 endpoints. | `false` (default) |
| `PRESIGNED_URL_EXPIRES_IN` | Number of hours for which generated presigned download/upload links are valid. | `5` (default) |
### Local Storage Port Configuration
+5 -1
View File
@@ -16,7 +16,11 @@
"groups": [
{
"group": "Getting Started",
"pages": ["getting-started/overview", "getting-started/quickstart"]
"pages": [
"getting-started/overview",
"getting-started/quickstart",
"getting-started/s3-storage"
]
},
{
"group": "Using Shumai",
+125
View File
@@ -0,0 +1,125 @@
---
title: S3 Compatible Storage
description: Configure AWS S3 or any S3-compatible storage backend (Cloudflare R2, MinIO, Google Cloud Storage, etc.) for Shumai.
---
Shumai uses Bun's high-performance native S3 client to store and serve creative assets. By utilizing standard S3 APIs, Shumai can connect to any S3-compatible storage provider, including AWS S3, Cloudflare R2, MinIO, Google Cloud Storage, and more.
Using external S3 storage is highly recommended for production teams. It allows you to separate storage from the application server, scale storage capacity independently, and support distributed media transcoding.
---
## Configuration Variables
To enable S3-compatible storage, update the following environment variables in your `.env` file or Docker Compose configuration:
| Variable | Description | Required | Default / Example |
| :------------------------- | :------------------------------------------------------------------------ | :------- | :----------------------------------- |
| `STORAGE_BACKEND` | Set to `s3` to enable S3 compatible storage. | Yes | `s3` |
| `S3_BUCKET` | The name of the S3 bucket where files will be stored. | Yes | `shumai-bucket` |
| `S3_REGION` | The region of your S3 bucket. | No | `auto` |
| `S3_ACCESS_KEY_ID` | The access key ID for your storage service. | Yes | `your-access-key-id` |
| `S3_SECRET_ACCESS_KEY` | The secret access key for your storage service. | Yes | `your-secret-access-key` |
| `AWS_ENDPOINT_URL_S3` | The endpoint URL of your S3 compatible storage provider. | Yes | `https://s3.us-east-1.amazonaws.com` |
| `PRESIGNED_URL_EXPIRES_IN` | Duration in hours before generated presigned download/upload URLs expire. | No | `5` |
---
## Provider Examples
Below are configuration templates for popular S3 providers. Add these variables to your `.env` file or under the `environment` section in your `docker-compose.yaml`.
### AWS S3
For standard AWS S3, configure the corresponding endpoint URL:
```env
STORAGE_BACKEND=s3
S3_BUCKET=your-shumai-bucket
S3_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMPLE
S3_SECRET_ACCESS_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
AWS_ENDPOINT_URL_S3=https://s3.us-east-1.amazonaws.com
```
### Cloudflare R2
Cloudflare R2 requires your Cloudflare account ID to construct the endpoint URL. Set the region to `auto`:
```env
STORAGE_BACKEND=s3
S3_BUCKET=your-shumai-bucket
S3_ACCESS_KEY_ID=your-r2-access-key-id
S3_SECRET_ACCESS_KEY=your-r2-secret-access-key
AWS_ENDPOINT_URL_S3=https://<account-id>.r2.cloudflarestorage.com
```
### MinIO (Self-Hosted)
For local development or self-hosted environments using MinIO, set the endpoint to your MinIO server URL and port (usually `9000`):
```env
STORAGE_BACKEND=s3
S3_BUCKET=shumai
S3_ACCESS_KEY_ID=minioadmin
S3_SECRET_ACCESS_KEY=minioadmin
AWS_ENDPOINT_URL_S3=http://localhost:9000
```
### Google Cloud Storage (GCS)
Google Cloud Storage provides an S3-compatible XML API. Configure your HMAC credentials and set the endpoint to standard GCS storage:
```env
STORAGE_BACKEND=s3
S3_BUCKET=your-gcs-bucket
S3_ACCESS_KEY_ID=GOOG1EXAMPLETOCKENKEY
S3_SECRET_ACCESS_KEY=your-gcs-hmac-secret-access-key
AWS_ENDPOINT_URL_S3=https://storage.googleapis.com
```
### DigitalOcean Spaces
For DigitalOcean Spaces, set the endpoint URL to match your space's region:
```env
STORAGE_BACKEND=s3
S3_BUCKET=your-spaces-bucket
S3_ACCESS_KEY_ID=your-spaces-access-key-id
S3_SECRET_ACCESS_KEY=your-spaces-secret-access-key
AWS_ENDPOINT_URL_S3=https://nyc3.digitaloceanspaces.com
```
### Supabase Storage
To connect to Supabase Storage via S3, ensure you have enabled S3 connection support in the Supabase Dashboard (`Settings > Storage > Enable connection via S3 protocol`). Copy the endpoint URL and region details from the same settings page:
```env
STORAGE_BACKEND=s3
S3_BUCKET=your-supabase-bucket
S3_REGION=us-east-1
S3_ACCESS_KEY_ID=your-supabase-access-key-id
S3_SECRET_ACCESS_KEY=your-supabase-secret-access-key
AWS_ENDPOINT_URL_S3=https://<account-id>.supabase.co/storage/v1/s3
```
---
## CORS Configuration
Since Shumai uploads files directly from the user's browser using presigned URLs, you must configure **Cross-Origin Resource Sharing (CORS)** on your storage bucket. Without CORS configuration, uploads will fail with network or origin errors.
Ensure your bucket CORS policy allows the following rules from your Shumai application URL (e.g., `http://localhost:3000` or `https://app.shumai.one`):
### CORS JSON Policy Example (AWS S3, R2, GCS)
```json
[
{
"AllowedHeaders": ["*"],
"AllowedMethods": ["GET", "PUT", "POST", "DELETE", "HEAD"],
"AllowedOrigins": ["http://localhost:3000", "https://your-shumai-domain.com"],
"ExposeHeaders": ["ETag"],
"MaxAgeSeconds": 3000
}
]
```
+10 -1
View File
@@ -1,6 +1,6 @@
{
"name": "shumai",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"repository": {
@@ -18,6 +18,11 @@
"typecheck": "tsc --noEmit",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"test": "bun --bun vitest run",
"test:e2e": "playwright test",
"test:e2e:ui": "playwright test --ui",
"test:e2e:report": "playwright show-report",
"test:e2e:install": "playwright install --with-deps",
"harness:dev": "bun run packages/webui/e2e/harness/serve.ts",
"format": "prettier --write .",
"db:migrate": "bun run prisma migrate dev",
"db:deploy": "bun run prisma migrate deploy",
@@ -38,7 +43,10 @@
"devDependencies": {
"@eslint/js": "10.0.1",
"@inlang/paraglide-js": "2.20.0",
"@playwright/test": "1.61.1",
"@testcontainers/postgresql": "12.0.1",
"@testing-library/dom": "10.4.1",
"@testing-library/react": "16.3.2",
"@types/bun": "1.3.14",
"@types/node": "25.9.1",
"bun-plugin-pino": "1.5.0",
@@ -49,6 +57,7 @@
"eslint-plugin-prettier": "5.5.6",
"eslint-plugin-react": "7.37.5",
"globals": "17.6.0",
"happy-dom": "20.10.6",
"pino-pretty": "13.1.3",
"prisma": "7.8.0",
"testcontainers": "12.0.1",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/agent",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"main": "./src/index.ts",
@@ -2,7 +2,7 @@ import { prisma } from '@shumai/db'
import { setupTestDbHooks } from '@shumai/db/test'
import { s3Service } from '@shumai/core/src/s3/s3'
import { type SessionTreeEntry } from '@earendil-works/pi-agent-core'
import { describe, expect, it, vi } from 'vitest'
import { describe, expect, it, vi, afterEach } from 'vitest'
import { DatabaseSessionStorage } from './database-session-storage'
import { agentService } from '@shumai/core/src/agent/agent'
import { createAgentSession } from './index'
@@ -13,6 +13,10 @@ import * as screenshotModule from './tools/screenshot'
describe('DatabaseSessionStorage', () => {
setupTestDbHooks()
afterEach(() => {
vi.restoreAllMocks()
})
const mockModelConfig: PrismaJson.ModelConfig = {
reasoning: false,
input: ['text'],
@@ -392,7 +396,7 @@ describe('DatabaseSessionStorage', () => {
expect(entries[2].id).toBe('01C')
})
it('should use the current comment ID for media tools in subsequent turns', async () => {
it('should use the current comment ID for media tools in subsequent turns (image)', async () => {
const { agent, user, team } = await setupTestData()
// Create a project and asset to satisfy FK constraints
@@ -441,6 +445,58 @@ describe('DatabaseSessionStorage', () => {
// 4. Assert that the tools were instantiated using the new comment ID, not the original one
expect(createAnalyzeImageToolSpy).toHaveBeenCalledWith(asset.id, 'new-comment-456')
expect(createScreenshotToolSpy).not.toHaveBeenCalled()
})
it('should use the current comment ID for media tools in subsequent turns (video)', async () => {
const { agent, user, team } = await setupTestData()
// Create a project and asset to satisfy FK constraints
const project = await prisma.project.create({
data: { name: 'Test Project', teamId: team.id },
})
const asset = await prisma.asset.create({
data: {
id: 'asset-456',
name: 'test.mp4',
type: 'file',
mediaType: 'video/mp4',
projectId: project.id,
status: 'uploaded',
},
})
// 1. Create a session with an original comment ID and an asset ID using the storage class
const initialStorage = await DatabaseSessionStorage.create({
agentId: agent.id,
userId: user.id,
cwd: '/test/cwd',
assetId: asset.id,
userCommentId: 'original-comment-123',
})
const sessionId = initialStorage.sessionId
// 2. Spy on media tools constructors
const createAnalyzeImageToolSpy = vi.spyOn(analyzeImageModule, 'createAnalyzeImageTool')
const createScreenshotToolSpy = vi.spyOn(screenshotModule, 'createScreenshotTool')
// 3. Resume the session via createAgentSession with a NEW comment ID
await createAgentSession({
teamId: 't1',
agentId: agent.id,
providerName: 'test-provider',
modelId: 'test-model',
systemPrompt: 'Test prompt',
teamSkills: [],
allowedDomains: [],
sessionId: sessionId,
userId: user.id,
userCommentId: 'new-comment-456',
providers: [],
})
// 4. Assert that the tools were instantiated using the new comment ID, not the original one
expect(createScreenshotToolSpy).toHaveBeenCalledWith(asset.id, 'new-comment-456')
expect(createAnalyzeImageToolSpy).not.toHaveBeenCalled()
})
})
+12 -4
View File
@@ -15,6 +15,7 @@ import { agentService } from '@shumai/core/src/agent/agent'
import { DatabaseSessionStorage } from './database-session-storage'
import { createAnalyzeImageTool } from './tools/analyze-image'
import { createScreenshotTool } from './tools/screenshot'
import { getSimpleMediaType } from './workflows/agent-chat-prompt-builder'
import { createCreateFileTool } from './tools/create-file'
import { createCreateFolderTool } from './tools/create-folder'
import { createCreateVersionTool } from './tools/create-version'
@@ -212,10 +213,17 @@ export async function createAgentSession(params: CreateAgentSessionParams) {
const mediaTools: AgentTool[] = []
if (assetId) {
mediaTools.push(
createAnalyzeImageTool(assetId, userCommentId),
createScreenshotTool(assetId, userCommentId),
)
const asset = await prisma.asset.findUnique({
where: { id: assetId },
})
if (asset?.mediaType) {
const type = getSimpleMediaType(asset.mediaType)
if (type === 'image') {
mediaTools.push(createAnalyzeImageTool(assetId, userCommentId))
} else if (type === 'video') {
mediaTools.push(createScreenshotTool(assetId, userCommentId))
}
}
}
const sandboxedBash = createSandboxedBashTool(process.cwd(), skillEnvs, {
+2 -1
View File
@@ -6,6 +6,7 @@ import * as path from 'path'
import { s3Service } from '@shumai/core/src/s3/s3'
import { detectSupportedMimeType } from '@shumai/core/src/utils/mime'
import { ulid } from 'ulid'
import { sanitizeFilename } from '@shumai/core/src/utils/filename'
function getMimeType(filePath: string): string {
try {
@@ -64,7 +65,7 @@ export function createCreateFileTool(userId: string): AgentTool<typeof createFil
const mimeType = getMimeType(absolutePath)
// Generate compliant S3 key matching normal file upload format
const s3Key = `files/${ulid()}/raw`
const s3Key = `files/${ulid()}/${sanitizeFilename(path.basename(absolutePath))}`
await s3Service.uploadFileToKey(absolutePath, s3Key, mimeType)
const result = await executeAgentToolWorkflow({
+2 -1
View File
@@ -6,6 +6,7 @@ import * as path from 'path'
import { s3Service } from '@shumai/core/src/s3/s3'
import { detectSupportedMimeType } from '@shumai/core/src/utils/mime'
import { ulid } from 'ulid'
import { sanitizeFilename } from '@shumai/core/src/utils/filename'
function getMimeType(filePath: string): string {
try {
@@ -65,7 +66,7 @@ export function createCreateVersionTool(userId: string): AgentTool<typeof create
const mimeType = getMimeType(absolutePath)
// Generate compliant S3 key matching normal file upload format
const s3Key = `files/${ulid()}/raw`
const s3Key = `files/${ulid()}/${sanitizeFilename(path.basename(absolutePath))}`
await s3Service.uploadFileToKey(absolutePath, s3Key, mimeType)
const result = await executeAgentToolWorkflow({
@@ -283,4 +283,32 @@ describe('Agent Autofill Workflow', () => {
tmpDir: '/tmp/test-dir',
})
})
it('should fail with non-retryable ApplicationFailure for unsupported audio files', async () => {
mockActivities.getAssetActivity.mockResolvedValue({
id: 'a1',
storageKey: { key: 'asset-key' },
project: { id: 'p1', teamId: 't1' },
mediaType: 'audio/mp3',
})
const task = await prisma.workflowTask.create({
data: {
type: 'ai_metadata_autofill',
status: 'pending',
assetId: 'a1',
},
})
await expect(agentAutofillMedia(task)).rejects.toThrow(
'unsupported media type for autofill: audio/mp3',
)
// Verify task failed status
expect(mockActivities.updateTaskStatusActivity).toHaveBeenCalledWith({
taskId: task.id,
status: 'failed',
output: { error: 'unsupported media type for autofill: audio/mp3' },
})
})
})
@@ -65,6 +65,14 @@ export async function agentAutofillMedia(task: WorkflowTask): Promise<void> {
// 2. Prepare Data (Images)
const isImage = asset.mediaType?.startsWith('image/') || false
const isVideo = asset.mediaType?.startsWith('video/') || false
if (!isImage && !isVideo) {
throw ApplicationFailure.create({
message: `unsupported media type for autofill: ${asset.mediaType}`,
nonRetryable: true,
})
}
const download = await executeActivity(transcodeWorkerQueue, downloadMediaToTmpActivity, {
assetKey: key,
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/api",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"main": "./src/index.ts",
+47
View File
@@ -56,6 +56,7 @@ describe('file api', () => {
vi.spyOn(assetService, 'updateAssetName').mockImplementation(vi.fn())
vi.spyOn(assetService, 'deleteAssets').mockImplementation(vi.fn())
vi.spyOn(assetService, 'createComment').mockImplementation(vi.fn())
vi.spyOn(assetService, 'completeComment').mockImplementation(vi.fn())
vi.spyOn(assetService, 'listComments').mockImplementation(vi.fn())
vi.spyOn(assetService, 'restoreAssets').mockImplementation(vi.fn())
vi.spyOn(metadataService, 'updateAssetMetadata').mockImplementation(vi.fn())
@@ -185,6 +186,8 @@ describe('file api', () => {
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
sessionId: null,
isCompleted: false,
completionLastChangedBy: null,
})
// Mock assetService.getAsset to return teamId for notification
@@ -234,6 +237,8 @@ describe('file api', () => {
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
sessionId: null,
isCompleted: false,
completionLastChangedBy: null,
})
// Mock assetService.getAsset to return teamId for notification
@@ -290,6 +295,8 @@ describe('file api', () => {
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
sessionId: null,
isCompleted: false,
completionLastChangedBy: null,
},
],
pageInfo: { cursor: 'cursor', total: 1 },
@@ -311,6 +318,46 @@ describe('file api', () => {
})
})
it('POST /comments/:commentId/complete', async () => {
vi.mocked(assetService.completeComment).mockResolvedValue({
id: 'comment-id',
assetId: 'file-id',
message: 'hello',
annotations: null,
second: null,
creator: { id: 'user-id', name: 'Test User' },
replies: [],
attachments: [],
mentions: [],
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
sessionId: null,
isCompleted: true,
completionLastChangedBy: { id: 'user1', name: 'Test User' },
})
const app = new Hono().use('*', authMiddleware).route('/', fileRoute)
const res = await app.request('/comments/comment-id/complete', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ isCompleted: true }),
})
expect(res.status).toBe(200)
const json = await res.json()
expect(json.isCompleted).toBe(true)
expect(json.completionLastChangedBy.id).toBe('user1')
expect(authzService.hasPermission).toHaveBeenCalledWith({
user: { id: 'user1', name: 'Test User' },
permission: Permission.Read,
type: ResourceType.Comment,
id: 'comment-id',
})
})
it('POST /teams/:teamId/files - image with compression', async () => {
vi.mocked(s3Service.putObject).mockResolvedValue(undefined)
+47
View File
@@ -16,6 +16,7 @@ import {
updateFileRequestSchema,
uploadFileRequestSchema,
getDownloadLinksRequestSchema,
completeCommentRequestSchema,
} from '@shumai/dtos'
import { transcodeService } from '@shumai/core'
import fs from 'fs'
@@ -200,6 +201,25 @@ const route = new Hono<{ Variables: { user: User } }>()
const comments = await assetService.listComments(fileId, req)
return c.json(comments)
})
.post(
'/comments/:commentId/complete',
zValidator('json', completeCommentRequestSchema),
async (c) => {
const commentId = c.req.param('commentId')
const user = c.get('user')
const req = c.req.valid('json')
await authzService.hasPermission({
user,
permission: Permission.Read,
type: ResourceType.Comment,
id: commentId,
})
const updated = await assetService.completeComment(commentId, req.isCompleted, user.id)
return c.json(updated)
},
)
.post('/files/restore', zValidator('json', restoreFilesRequestSchema), async (c) => {
const user = c.get('user')
const req = c.req.valid('json')
@@ -299,5 +319,32 @@ const route = new Hono<{ Variables: { user: User } }>()
const files = await assetService.getDownloadLinks(req.ids)
return c.json({ files })
})
.post(
'/files/download-url',
zValidator('json', z.object({ key: z.string().min(1), assetId: z.string().min(1) })),
async (c) => {
const user = c.get('user')
const req = c.req.valid('json')
const { key, assetId } = req
// Validate key format
if (!key.startsWith('files/')) {
return c.json({ error: 'Invalid key' }, 400)
}
// Verify user has read access to the asset
await authzService.hasPermission({
user,
permission: Permission.Read,
type: ResourceType.Asset,
id: assetId,
})
// Verify key belongs to the asset and generate download URL
const url = await assetService.getDownloadUrl(assetId, key)
return c.json({ url })
},
)
export default route
+22
View File
@@ -147,6 +147,28 @@ const route = app
return handlePublicShareError(c, err)
}
})
.post(
'/shares/:shareId/files/:fileId/download-url',
zValidator('json', z.object({ key: z.string().min(1) })),
async (c) => {
const fileId = c.req.param('fileId')
const password = c.req.header('x-share-password')
const { key } = c.req.valid('json')
try {
await shareService.verifyPublicAccess(fileId, password)
if (!key.startsWith('files/')) {
return c.json({ error: 'Invalid key' }, 400)
}
const url = await assetService.getDownloadUrl(fileId, key)
return c.json({ url })
} catch (err) {
return handlePublicShareError(c, err)
}
},
)
.get(
'/shares/:shareId/files/:fileId/comments',
zValidator('query', paginationParamsSchema),
+19 -11
View File
@@ -39,7 +39,7 @@ describe('S3 API', () => {
}
})
it('GET /files/* with filename query parameter sets Content-Disposition header', async () => {
it('GET /files/* sets Content-Disposition: attachment only when download=1 query param is present', async () => {
// We need to capture the onFound callback from serveStatic options
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let onFoundCallback: ((path: string, c: any) => void) | undefined
@@ -54,26 +54,34 @@ describe('S3 API', () => {
const { default: route } = await import('./s3')
const app = new Hono().route('/files', route)
// First, verify onFound is called through the mock
await app.request('/files/b1/test.webp?filename=my-file.txt')
await app.request('/files/b1/test.webp?download=1')
expect(onFoundCallback).toBeDefined()
// Test the callback directly
const mockContext = {
req: {
query: (key: string) => (key === 'filename' ? 'my-file.txt' : undefined),
},
// Test with download=1
const mockContextWithDownload = {
req: { query: (key: string) => (key === 'download' ? '1' : undefined) },
header: vi.fn(),
}
if (onFoundCallback) {
onFoundCallback('/files/b1/test.webp', mockContext)
expect(mockContext.header).toHaveBeenCalledWith(
onFoundCallback('/files/b1/test.webp', mockContextWithDownload)
expect(mockContextWithDownload.header).toHaveBeenCalledWith(
'Content-Disposition',
'attachment; filename="my-file.txt"',
'attachment',
)
}
// Test without download param
const mockContextWithout = {
req: { query: () => undefined },
header: vi.fn(),
}
if (onFoundCallback) {
onFoundCallback('/files/b1/test.webp', mockContextWithout)
expect(mockContextWithout.header).not.toHaveBeenCalled()
}
})
it('PUT /files/:bucket/:key calls s3Service.putObject', async () => {
+2 -4
View File
@@ -9,10 +9,8 @@ const route = new Hono()
root: './data',
rewriteRequestPath: (path) => path.replace(/^\/files\//, ''),
onFound: (_path, c) => {
const filename = c.req.query('filename')
if (filename) {
const safeFilename = filename.replace(/["\r\n]/g, '_')
c.header('Content-Disposition', `attachment; filename="${safeFilename}"`)
if (c.req.query('download') === '1') {
c.header('Content-Disposition', 'attachment')
}
},
}),
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/core",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"main": "./src/index.ts",
+234
View File
@@ -855,6 +855,31 @@ describe('AssetService', () => {
expect(listWithReplies.data[0].replies[1].id).toBe(r2.id)
})
it('can mark comments as complete and incomplete', async () => {
const { user, assets } = await setupBasicAssets()
const comment = await assetService.createComment({
assetId: assets.fileA1.id,
userId: user.id,
message: 'To be completed',
attachmentIds: [],
})
expect(comment.isCompleted).toBe(false)
expect(comment.completionLastChangedBy).toBeNull()
// Mark as complete
const completed = await assetService.completeComment(comment.id, true, user.id)
expect(completed.isCompleted).toBe(true)
expect(completed.completionLastChangedBy).toBeDefined()
expect(completed.completionLastChangedBy?.id).toBe(user.id)
// Mark as incomplete
const incompleted = await assetService.completeComment(comment.id, false, user.id)
expect(incompleted.isCompleted).toBe(false)
expect(incompleted.completionLastChangedBy?.id).toBe(user.id)
})
it('triggers AI workflow on bot mention', async () => {
const { user, project } = await setupBasicAssets()
@@ -1280,6 +1305,61 @@ describe('AssetService', () => {
expect(updatedA.sortIndex! < assetC.sortIndex!).toBe(true)
})
describe('Preview', () => {
it('toPreviewInfo includes video duration from media metadata', async () => {
const { project, user } = await setupBasicAssets()
const video = await prisma.asset.create({
data: {
name: 'clip.mp4',
type: AssetType.file,
projectId: project.id,
creatorId: user.id,
sizeByte: 123456,
mediaType: 'video/mp4',
status: 'processed',
media: {
poster: { key: 'poster-key' },
metadata: { duration: 262 },
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any,
},
})
const info = await assetService.getAsset({ assetId: video.id })
expect(info.preview).toBeDefined()
expect(info.preview?.mediaType).toBe('video/mp4')
expect(info.preview?.duration).toBe(262)
})
it('toPreviewInfo omits duration for images', async () => {
const { project, user } = await setupBasicAssets()
const image = await prisma.asset.create({
data: {
name: 'pic.png',
type: AssetType.file,
projectId: project.id,
creatorId: user.id,
sizeByte: 5000,
mediaType: 'image/png',
status: 'processed',
media: {
thumbnail: { key: 'thumb-key' },
metadata: { originalWidth: 100, originalHeight: 80 },
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any,
},
})
const info = await assetService.getAsset({ assetId: image.id })
expect(info.preview).toBeDefined()
expect(info.preview?.duration).toBeUndefined()
})
})
describe('Symlinks', () => {
it('toAssetInfo resolves symlink target metadata', async () => {
const { project, user } = await setupBasicAssets()
@@ -2222,4 +2302,158 @@ describe('AssetService — natural sort by name', () => {
expect(childActiveDb?.status).toBe('uploaded')
})
})
describe('getDownloadUrl', () => {
it('should return a presigned download URL for a key in the same directory', async () => {
const asset = await prisma.asset.create({
data: {
name: 'test.mp4',
type: AssetType.file,
status: AssetStatus.uploaded,
storageKey: {
create: { key: 'files/01TESTULID000000000000000/test.mp4' },
},
},
})
const url = await assetService.getDownloadUrl(
asset.id,
'files/01TESTULID000000000000000/test-720p.mp4',
)
expect(url).toBe('http://mock-s3-url')
})
it('should return a presigned download URL for the original key', async () => {
const asset = await prisma.asset.create({
data: {
name: 'test.mp4',
type: AssetType.file,
status: AssetStatus.uploaded,
storageKey: {
create: { key: 'files/01TESTULID000000000000000/test.mp4' },
},
},
})
const url = await assetService.getDownloadUrl(
asset.id,
'files/01TESTULID000000000000000/test.mp4',
)
expect(url).toBe('http://mock-s3-url')
})
it('should throw if the key does not share the same parent directory', async () => {
const asset = await prisma.asset.create({
data: {
name: 'test.mp4',
type: AssetType.file,
status: AssetStatus.uploaded,
storageKey: {
create: { key: 'files/01TESTULID000000000000000/test.mp4' },
},
},
})
await expect(
assetService.getDownloadUrl(asset.id, 'files/01OTHERULIDXXXXXXXXXX/hack.mp4'),
).rejects.toThrow('Key does not belong to this asset')
})
it('should throw if the key contains path traversal segments', async () => {
const asset = await prisma.asset.create({
data: {
name: 'test.mp4',
type: AssetType.file,
status: AssetStatus.uploaded,
storageKey: {
create: { key: 'files/01TESTULID000000000000000/test.mp4' },
},
},
})
await expect(
assetService.getDownloadUrl(
asset.id,
'files/01TESTULID000000000000000/../01OTHERULIDXXXXXXXXXX/secret.mp4',
),
).rejects.toThrow('Key does not belong to this asset')
})
it('should throw if the asset does not exist', async () => {
await expect(
assetService.getDownloadUrl('nonexistent-id', 'files/01TESTULID000000000000000/test.mp4'),
).rejects.toThrow('Asset not found or has no storage key')
})
it('should throw if the asset has no storage key', async () => {
const asset = await prisma.asset.create({
data: {
name: 'folder',
type: AssetType.folder,
status: AssetStatus.uploaded,
},
})
await expect(
assetService.getDownloadUrl(asset.id, 'files/01TESTULID000000000000000/test.mp4'),
).rejects.toThrow('Asset not found or has no storage key')
})
})
describe('resolveLatestVersionId', () => {
it('resolves the latest version ID of a version stack correctly (the one with the smallest sort index)', async () => {
const team = await prisma.team.create({ data: { name: 'Test Team' } })
const project = await prisma.project.create({
data: { name: 'Test Project', teamId: team.id },
})
const user = await prisma.user.create({
data: { name: 'Test User', email: `test-${Date.now()}@example.com` },
})
const stack = await prisma.asset.create({
data: {
name: 'stack',
type: AssetType.version_stack,
project: { connect: { id: project.id } },
creator: { connect: { id: user.id } },
status: AssetStatus.uploaded,
},
})
// Oldest version (A): larger sort index
const fileA = await prisma.asset.create({
data: {
name: 'fileA.mp4',
type: AssetType.file,
project: { connect: { id: project.id } },
parent: { connect: { id: stack.id } },
creator: { connect: { id: user.id } },
status: AssetStatus.uploaded,
sortIndex: 'y',
},
})
// Latest version (B): smaller sort index
const fileB = await prisma.asset.create({
data: {
name: 'fileB.mp4',
type: AssetType.file,
project: { connect: { id: project.id } },
parent: { connect: { id: stack.id } },
creator: { connect: { id: user.id } },
status: AssetStatus.uploaded,
sortIndex: 'x',
},
})
// Act: resolve latest version of the stack
const resolvedId = await assetService.resolveLatestVersionId(stack.id)
// Assert: should resolve to the latest version (fileB)
expect(resolvedId).toBe(fileB.id)
expect(resolvedId).not.toBe(fileA.id)
})
})
})
+70 -21
View File
@@ -48,10 +48,12 @@ type AssetWithIncludes = Prisma.AssetGetPayload<{
type CommentWithIncludes = Prisma.AssetCommentGetPayload<{
include: {
creator: true
completionLastChangedBy: true
attachments: { include: { asset: { include: { storageKey: true } } } }
replies: {
include: {
creator: true
completionLastChangedBy: true
attachments: { include: { asset: { include: { storageKey: true } } } }
}
}
@@ -842,7 +844,6 @@ export class AssetService {
process.env.S3_BUCKET || 'shumai',
info.media.original.key,
'GET',
a.name,
)
}
}
@@ -910,7 +911,7 @@ export class AssetService {
if (currentType === AssetType.version_stack) {
const latestChild = await this.prismaClient.asset.findFirst({
where: { parentId: currentId, isDeleted: false },
orderBy: { sortIndex: 'desc' },
orderBy: { sortIndex: 'asc' },
select: { id: true },
})
if (latestChild) {
@@ -1380,11 +1381,13 @@ export class AssetService {
where: { id: commentId },
include: {
creator: true,
completionLastChangedBy: true,
asset: { include: { storageKey: true } },
attachments: { include: { asset: { include: { storageKey: true } } } },
replies: {
include: {
creator: true,
completionLastChangedBy: true,
attachments: { include: { asset: { include: { storageKey: true } } } },
},
orderBy: { id: 'asc' },
@@ -1395,6 +1398,21 @@ export class AssetService {
return this.toCommentInfo(c)
}
async completeComment(
commentId: string,
isCompleted: boolean,
userId: string,
): Promise<CommentInfo> {
await this.prismaClient.assetComment.update({
where: { id: commentId },
data: {
isCompleted,
completionLastChangedById: userId,
},
})
return this.getComment(commentId)
}
async listComments(
assetId: string,
params: PaginationParams,
@@ -1407,11 +1425,13 @@ export class AssetService {
where: { assetId: resolvedAssetId, replyToId: null },
include: {
creator: true,
completionLastChangedBy: true,
asset: { include: { storageKey: true } },
attachments: { include: { asset: { include: { storageKey: true } } } },
replies: {
include: {
creator: true,
completionLastChangedBy: true,
attachments: { include: { asset: { include: { storageKey: true } } } },
},
orderBy: { id: 'asc' },
@@ -1583,7 +1603,7 @@ export class AssetService {
}
}
const media = latestVersion.media as PrismaJson.MediaInfo | null
let media = latestVersion.media as PrismaJson.MediaInfo | null
if (media && media.videoPreview?.key) {
media.videoPreview.url = await s3Service.presign(
process.env.S3_BUCKET || 'shumai',
@@ -1593,21 +1613,19 @@ export class AssetService {
}
const key = latestVersion.storageKey?.key
if (media && key) {
const fileName =
a.type === AssetType.version_stack && (a.name === '' || !a.name)
? latestVersion.name
: a.name
if (key) {
if (!media) {
media = {
original: null,
videoTranscodes: [],
imageTranscodes: [],
} as unknown as PrismaJson.MediaInfo
}
media.original = {
key,
downloadUrl: await s3Service.presign(
process.env.S3_BUCKET || 'shumai',
key,
'GET',
fileName,
),
downloadUrl: await s3Service.presign(process.env.S3_BUCKET || 'shumai', key, 'GET'),
filesizeInBytes: latestVersion.sizeByte,
codec: '', // TODO: extract from metadata if needed
codec: '',
}
}
@@ -1845,12 +1863,7 @@ export class AssetService {
const key = file.storageKeyId ? storageKeyMap.get(file.storageKeyId) : null
if (!key) return null
const url = await s3Service.presign(
process.env.S3_BUCKET || 'shumai',
key,
'GET',
file.name,
)
const url = await s3Service.presign(process.env.S3_BUCKET || 'shumai', key, 'GET', true)
return {
id: file.id,
@@ -1863,6 +1876,31 @@ export class AssetService {
return downloadLinks.filter((link): link is { id: string; name: string; url: string } => !!link)
}
/**
* Generate a presigned download URL for a given key, verifying it belongs to the asset's
* storage directory. This ensures users can only download files (original, transcodes, etc.)
* that belong to an asset they have access to.
*/
async getDownloadUrl(assetId: string, key: string): Promise<string> {
const asset = await this.prismaClient.asset.findUnique({
where: { id: assetId },
select: { storageKey: { select: { key: true } } },
})
if (!asset?.storageKey?.key) {
throw new Error('Asset not found or has no storage key')
}
// Verify the requested key shares the same parent directory as the asset's storage key
const storageKey = asset.storageKey.key
const assetDir = storageKey.substring(0, storageKey.lastIndexOf('/') + 1)
if (key.includes('..') || !key.startsWith(assetDir)) {
throw new Error('Key does not belong to this asset')
}
return s3Service.presign(process.env.S3_BUCKET || 'shumai', key, 'GET', true)
}
private async toPreviewInfo(asset: Asset | AssetWithIncludes): Promise<PreviewInfo | null> {
if (!asset.media) return null
@@ -1896,6 +1934,7 @@ export class AssetService {
originalHeight: asset.media.metadata?.originalHeight,
originalWidth: asset.media.metadata?.originalWidth,
spriteUrl,
duration: asset.media.metadata?.duration,
}
}
@@ -1955,6 +1994,14 @@ export class AssetService {
creator.image = await getAvatarUrl(c.creator.image)
}
const completionLastChangedBy: AssetUserInfo | null = c.completionLastChangedBy
? {
id: c.completionLastChangedBy.id,
name: c.completionLastChangedBy.name,
image: await getAvatarUrl(c.completionLastChangedBy.image),
}
: null
return {
id: c.id,
assetId: c.assetId,
@@ -1968,6 +2015,8 @@ export class AssetService {
createdAt: c.createdAt.toISOString(),
updatedAt: c.updatedAt.toISOString(),
sessionId: c.sessionId,
isCompleted: c.isCompleted,
completionLastChangedBy,
}
}
}
+95
View File
@@ -0,0 +1,95 @@
import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'
import { prisma } from '@shumai/db'
import { setupTestDbHooks } from '@shumai/db/test'
import { auth } from './auth'
import { userMetadataService } from '../user-metadata/user-metadata'
import { teamService } from '@shumai/core/src/team/team'
describe('Auth Signup Locale Hook', () => {
setupTestDbHooks()
beforeEach(() => {
vi.spyOn(teamService, 'getSignupInfo').mockResolvedValue({
initialized: false,
demoMode: false,
userCount: 1,
})
})
afterEach(() => {
vi.restoreAllMocks()
})
it('should save locale metadata for the user upon signup', async () => {
const email = `signup-locale-${Date.now()}@example.com`
// We must use any here because 'locale' is a custom property we extract in
// our auth hooks, but better-auth's signUpEmail typescript interface does
// not recognize it.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const res = await (auth.api.signUpEmail as any)({
headers: new Headers(),
body: {
email,
password: 'testpassword',
name: 'Locale Tester',
locale: 'zh',
},
})
if (res.error) {
console.error('SIGNUP ERROR:', res.error)
}
expect(res).toBeDefined()
expect(res.user).toBeDefined()
expect(res.user.email).toBe(email)
// Check that the userMetadata record was created with key 'locale' and value 'zh'
const teamMembers = await prisma.teamMember.findMany({
where: { userId: res.user.id },
})
expect(teamMembers.length).toBeGreaterThan(0)
for (const member of teamMembers) {
const meta = await userMetadataService.getMetadata(res.user.id, member.teamId, 'locale')
expect(meta).toBeDefined()
expect(meta?.value).toBe('zh')
}
})
it('should not save locale metadata if locale is invalid or missing', async () => {
const email = `signup-no-locale-${Date.now()}@example.com`
// We must use any here because 'locale' is a custom property we extract in
// our auth hooks, but better-auth's signUpEmail typescript interface does
// not recognize it.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const res = await (auth.api.signUpEmail as any)({
headers: new Headers(),
body: {
email,
password: 'testpassword',
name: 'No Locale Tester',
locale: 'fr', // invalid locale
},
})
if (res.error) {
console.error('SIGNUP ERROR 2:', res.error)
}
expect(res).toBeDefined()
expect(res.user).toBeDefined()
const teamMembers = await prisma.teamMember.findMany({
where: { userId: res.user.id },
})
expect(teamMembers.length).toBeGreaterThan(0)
for (const member of teamMembers) {
const meta = await userMetadataService.getMetadata(res.user.id, member.teamId, 'locale')
expect(meta).toBeNull()
}
})
})
+12
View File
@@ -4,6 +4,7 @@ import { prisma } from '@shumai/db'
import { teamService } from '@shumai/core/src/team/team'
import { inviteService } from '@shumai/core/src/invite/invite'
import { createAuthMiddleware } from 'better-auth/api'
import { userMetadataService } from '@shumai/core/src/user-metadata/user-metadata'
export const auth = betterAuth({
database: prismaAdapter(prisma, {
@@ -102,6 +103,17 @@ export const auth = betterAuth({
if (inviteCode) {
await inviteService.consumeInvite(inviteCode, user.id)
}
const locale = body?.locale
if (locale === 'en' || locale === 'zh') {
const joinedTeams = await prisma.teamMember.findMany({
where: { userId: user.id },
select: { teamId: true },
})
for (const member of joinedTeams) {
await userMetadataService.upsertMetadata(user.id, member.teamId, 'locale', locale)
}
}
} catch (err) {
console.error(`[Better Auth Hook] Error in after hook: ${err}`)
}
+40 -14
View File
@@ -42,7 +42,7 @@ describe('S3Service implementations', () => {
describe('S3StorageService', () => {
it('should correctly build standard endpoints', () => {
const s3 = new S3StorageService('s3.example.com', 'key', 'secret', 'test-bucket', true)
const s3 = new S3StorageService('https://s3.example.com', 'key', 'secret', 'test-bucket')
expect(s3).toBeDefined()
expect(s3ClientConstructorSpy).toHaveBeenCalledWith(
expect.objectContaining({ region: 'auto' }),
@@ -52,11 +52,10 @@ describe('S3Service implementations', () => {
it('should use provided region', () => {
s3ClientConstructorSpy.mockClear()
const s3 = new S3StorageService(
's3.example.com',
'https://s3.example.com',
'key',
'secret',
'test-bucket',
true,
'ap-singapore',
)
expect(s3).toBeDefined()
@@ -66,14 +65,14 @@ describe('S3Service implementations', () => {
})
it('should implement presign correctly', async () => {
const s3 = new S3StorageService('localhost:9000', 'key', 'secret', 'test-bucket', false)
const s3 = new S3StorageService('http://localhost:9000', 'key', 'secret', 'test-bucket')
const url = await s3.presign('bucket', 'key', 'GET')
expect(url).toBe('http://presigned-url')
expect(s3PresignSpy).toHaveBeenCalledWith('key', expect.objectContaining({ method: 'GET' }))
})
it('should cache GET presign URLs', async () => {
const s3 = new S3StorageService('localhost:9000', 'key', 'secret', 'test-bucket', false)
const s3 = new S3StorageService('http://localhost:9000', 'key', 'secret', 'test-bucket')
s3PresignSpy.mockClear()
s3PresignSpy.mockReturnValueOnce('http://presigned-url-1')
@@ -88,7 +87,7 @@ describe('S3Service implementations', () => {
})
it('should NOT cache PUT presign URLs', async () => {
const s3 = new S3StorageService('localhost:9000', 'key', 'secret', 'test-bucket', false)
const s3 = new S3StorageService('http://localhost:9000', 'key', 'secret', 'test-bucket')
s3PresignSpy.mockReset()
s3PresignSpy.mockReturnValueOnce('http://unique-put-url-1')
@@ -104,7 +103,7 @@ describe('S3Service implementations', () => {
it('should respect PRESIGNED_URL_EXPIRES_IN env', async () => {
process.env.PRESIGNED_URL_EXPIRES_IN = '10'
const s3 = new S3StorageService('localhost:9000', 'key', 'secret', 'test-bucket', false)
const s3 = new S3StorageService('http://localhost:9000', 'key', 'secret', 'test-bucket')
s3PresignSpy.mockClear()
await s3.presign('bucket', 'key', 'GET')
@@ -117,17 +116,44 @@ describe('S3Service implementations', () => {
delete process.env.PRESIGNED_URL_EXPIRES_IN
})
it('should pass filename to presign', async () => {
const s3 = new S3StorageService('localhost:9000', 'key', 'secret', 'test-bucket', false)
await s3.presign('bucket', 'key', 'GET', 'test.txt')
it('should not set contentDisposition for normal GET presign', async () => {
const s3 = new S3StorageService('http://localhost:9000', 'key', 'secret', 'test-bucket')
await s3.presign('bucket', 'key', 'GET')
expect(s3PresignSpy).toHaveBeenCalledWith(
'key',
expect.not.objectContaining({
contentDisposition: expect.anything(),
}),
)
})
it('should set contentDisposition attachment when download is true', async () => {
const s3 = new S3StorageService('http://localhost:9000', 'key', 'secret', 'test-bucket')
await s3.presign('bucket', 'key', 'GET', true)
expect(s3PresignSpy).toHaveBeenCalledWith(
'key',
expect.objectContaining({
contentDisposition: 'attachment; filename="test.txt"',
contentDisposition: 'attachment',
}),
)
})
it('should not cache download presign URLs', async () => {
const s3 = new S3StorageService('http://localhost:9000', 'key', 'secret', 'test-bucket')
s3PresignSpy.mockClear()
s3PresignSpy.mockReturnValueOnce('http://download-url-1')
s3PresignSpy.mockReturnValueOnce('http://download-url-2')
const url1 = await s3.presign('bucket', 'key', 'GET', true)
const url2 = await s3.presign('bucket', 'key', 'GET', true)
expect(url1).toBe('http://download-url-1')
expect(url2).toBe('http://download-url-2')
expect(s3PresignSpy).toHaveBeenCalledTimes(2)
})
})
describe('LocalStorageService', () => {
@@ -182,9 +208,9 @@ describe('S3Service implementations', () => {
expect(url).toBe('http://localhost:3000/files/my-bucket/dir/file.txt')
})
it('should generate a local presign URL with filename', async () => {
const url = await localS3.presign('my-bucket', 'dir/file.txt', 'GET', 'original.txt')
expect(url).toBe('http://localhost:3000/files/my-bucket/dir/file.txt?filename=original.txt')
it('should generate a local presign URL with download param', async () => {
const url = await localS3.presign('my-bucket', 'dir/file.txt', 'GET', true)
expect(url).toBe('http://localhost:3000/files/my-bucket/dir/file.txt?download=1')
})
it('should throw an error for unsupported presign methods', async () => {
+11 -19
View File
@@ -54,7 +54,7 @@ export interface S3Service {
listObjects(bucket: string, prefix: string): Promise<string[]>
uploadFile(filePath: string, contentType: string): Promise<string>
uploadFileToKey(filePath: string, key: string, contentType: string): Promise<void>
presign(bucket: string, key: string, method: string, filename?: string): Promise<string>
presign(bucket: string, key: string, method: string, download?: boolean): Promise<string>
}
export class S3StorageService implements S3Service {
@@ -67,18 +67,11 @@ export class S3StorageService implements S3Service {
accessKeyId: string,
secretAccessKey: string,
bucket: string,
useSsl: boolean,
region: string = 'auto',
) {
let fullEndpoint = endpoint
if (!fullEndpoint.startsWith('http://') && !fullEndpoint.startsWith('https://')) {
const scheme = useSsl ? 'https' : 'http'
fullEndpoint = `${scheme}://${endpoint}`
}
this.client = new S3Client({
region,
endpoint: fullEndpoint,
endpoint,
accessKeyId,
secretAccessKey,
bucket,
@@ -203,16 +196,16 @@ export class S3StorageService implements S3Service {
})
}
async presign(bucket: string, key: string, method: string, filename?: string): Promise<string> {
async presign(bucket: string, key: string, method: string, download?: boolean): Promise<string> {
const expireHours = parseInt(process.env.PRESIGNED_URL_EXPIRES_IN || '5', 10)
const expiresInSeconds = expireHours * 3600
// Cache time is 2/3 of expire time, rounded to minute
const cacheMinutes = Math.round((expireHours * 60 * 2) / 3)
const cacheTtlMs = cacheMinutes * 60 * 1000
const cacheKey = `${bucket}:${key}:${filename || ''}`
const cacheKey = `${bucket}:${key}`
if (method === 'GET') {
if (method === 'GET' && !download) {
const cached = this.presignCache.get(cacheKey)
if (cached) return cached
}
@@ -225,13 +218,13 @@ export class S3StorageService implements S3Service {
method: method as any,
}
if (filename) {
options.contentDisposition = `attachment; filename="${filename}"`
if (download) {
options.contentDisposition = 'attachment'
}
const url = this.client.presign(key, options)
if (method === 'GET') {
if (method === 'GET' && !download) {
this.presignCache.set(cacheKey, url, cacheTtlMs)
}
@@ -435,7 +428,7 @@ export class LocalStorageService implements S3Service {
await fs.promises.copyFile(filePath, destPath)
}
async presign(bucket: string, key: string, method: string, filename?: string): Promise<string> {
async presign(bucket: string, key: string, method: string, download?: boolean): Promise<string> {
if (method !== 'GET' && method !== 'PUT') {
throw new Error(`Invalid method: ${method}`)
}
@@ -443,8 +436,8 @@ export class LocalStorageService implements S3Service {
return `${this.endpoint}${signLocalUrl(bucket, key)}`
}
let url = `${this.endpoint}/files/${bucket}/${key}`
if (filename) {
url += `?filename=${encodeURIComponent(filename)}`
if (download) {
url += '?download=1'
}
return url
}
@@ -461,7 +454,6 @@ export const s3Service: S3Service =
process.env.S3_ACCESS_KEY_ID || 'minioadmin',
process.env.S3_SECRET_ACCESS_KEY || 'minioadmin',
process.env.S3_BUCKET || 'shumai',
process.env.S3_USE_SSL === 'true',
process.env.S3_REGION || 'auto',
)
: new LocalStorageService(s3Endpoint)
@@ -270,4 +270,81 @@ describe('TranscodeService', () => {
expect(task.payload?.projectId).toBe('proj-123')
expect(task.payload?.transcode?.videoStrategy).toBe('best_match')
})
it('should parse audio info correctly from ffprobe output', async () => {
/* eslint-disable @typescript-eslint/naming-convention */
const mockOutput = JSON.stringify({
format: { duration: '120.4', bit_rate: '256000' },
streams: [
{
codec_type: 'audio',
codec_name: 'flac',
channels: 6,
sample_rate: '44100',
bits_per_sample: '24',
tags: {
mime_codec_string: 'fLaC',
},
},
],
})
/* eslint-enable @typescript-eslint/naming-convention */
// eslint-disable-next-line @typescript-eslint/no-explicit-any
;(child_process.execFile as any).mockImplementation((file: string, args: string[], cb: any) => {
cb(null, { stdout: mockOutput, stderr: '' })
})
const info = await transcodeService.getAudioInfo('test.flac')
expect(info.originalWidth).toBe(0)
expect(info.originalHeight).toBe(0)
expect(info.duration).toBe(120.4)
expect(info.frameRate).toBe(0)
expect(info.hasAudio).toBe(true)
expect(info.videoCodec).toBeUndefined()
expect(info.audioCodec).toBe('Fres Lossless Audio Codec')
expect(info.audioChannels).toBe(6)
expect(info.audioSampleRate).toBe(44100)
expect(info.audioBitDepth).toBe(24)
expect(child_process.execFile).toHaveBeenCalledWith(
'ffprobe',
expect.any(Array),
expect.any(Function),
)
})
it('should construct correct ffmpeg arguments for audio transcoding', async () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
;(child_process.execFile as any).mockImplementation((file: string, args: string[], cb: any) => {
cb(null, { stdout: '', stderr: '' })
})
await transcodeService.transcodeAudio({
inputFile: 'input.wav',
outputFile: 'output.mp4',
bitrate: '128k',
})
expect(child_process.execFile).toHaveBeenCalledWith(
'ffmpeg',
[
'-y',
'-loglevel',
'warning',
'-i',
'input.wav',
'-vn',
'-c:a',
'aac',
'-b:a',
'128k',
'-ac',
'2',
'output.mp4',
],
expect.any(Function),
)
})
})
+62 -1
View File
@@ -256,7 +256,7 @@ export class TranscodeService {
duration: number,
): Promise<void> {
const spriteFps = 100 / duration
const filterComplex = `[0:v]fps=${spriteFps},scale=w=480:h=-2,tile=10x10[sprite_out];[0:v]scale=-2:720:force_original_aspect_ratio=decrease,select='eq(n\\,0)'[thumb_out]`
const filterComplex = `[0:v]fps=${spriteFps},scale=w=480:h=-2,tile=10x10[sprite_out];[0:v]scale=-2:480:force_original_aspect_ratio=decrease,select='eq(n\\,0)'[thumb_out]`
const args = [
'-i',
@@ -292,6 +292,67 @@ export class TranscodeService {
await execFileAsync('ffmpeg', ['-y', '-loglevel', 'warning', ...args])
}
async getAudioInfo(inputFile: string): Promise<MediaMetadata> {
const { stdout } = await execFileAsync('ffprobe', [
'-v',
'quiet',
'-print_format',
'json',
'-show_format',
'-show_streams',
inputFile,
])
const info = JSON.parse(stdout)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const audioStream = info.streams.find((s: any) => s.codec_type === 'audio')
if (!audioStream) {
throw new Error('No audio stream found')
}
const duration = parseFloat(info.format.duration)
return {
originalWidth: 0,
originalHeight: 0,
duration: isNaN(duration) ? 0 : duration,
bitRate: parseFloat(info.format.bit_rate) || 0,
frameRate: 0,
totalFrames: 0,
startTimecode: undefined,
hasAudio: true,
videoCodec: undefined,
audioCodec: this.resolveCodecName(audioStream),
audioChannels: audioStream?.channels,
audioSampleRate: this.safeParseInt(audioStream?.sample_rate),
audioBitDepth:
this.safeParseInt(audioStream?.bits_per_raw_sample) ??
this.safeParseInt(audioStream?.bits_per_sample),
mimeType: '',
}
}
async transcodeAudio(params: {
inputFile: string
outputFile: string
bitrate?: string
}): Promise<void> {
const bitrate = params.bitrate || '128k'
const args = [
'-i',
params.inputFile,
'-vn',
'-c:a',
'aac',
'-b:a',
bitrate,
'-ac',
'2',
params.outputFile,
]
await execFileAsync('ffmpeg', ['-y', '-loglevel', 'warning', ...args])
}
async extractVideoFrames(params: ExtractVideoFramesParams): Promise<string[]> {
if (params.isImage) {
const outputFile = path.join(params.outputDir, '1.webp')
+99
View File
@@ -262,6 +262,72 @@ describe('UploadService', () => {
expect(workflowTask).toBeNull()
})
it('should confirm file upload and resolve empty mediaType using Bun resolver for audio', async () => {
const task = await prisma.task.create({
data: { creatorId: userId, total: 1, uploaded: 0, type: 'upload' },
})
const asset = await prisma.asset.create({
data: {
name: 'audio.mp3',
type: AssetType.file,
project: { connect: { id: projectId } },
parent: { connect: { id: parentId } },
status: AssetStatus.uploading,
storageKey: {
connectOrCreate: {
where: { key: 'test-key-audio-empty' },
create: { key: 'test-key-audio-empty' },
},
},
mediaType: '',
},
})
await uploadService.confirmFileUpload(userId, task.id, { fileId: asset.id })
const updatedAsset = await prisma.asset.findUnique({ where: { id: asset.id } })
expect(updatedAsset?.mediaType).toBe('audio/mpeg')
expect(updatedAsset?.status).toBe(AssetStatus.uploaded)
const workflowTask = await prisma.workflowTask.findFirst({
where: { assetId: asset.id, type: WorkflowTaskType.transcode },
})
expect(workflowTask).toBeDefined()
})
it('should confirm file upload and resolve application/octet-stream mediaType using Bun resolver for audio', async () => {
const task = await prisma.task.create({
data: { creatorId: userId, total: 1, uploaded: 0, type: 'upload' },
})
const asset = await prisma.asset.create({
data: {
name: 'song.wav',
type: AssetType.file,
project: { connect: { id: projectId } },
parent: { connect: { id: parentId } },
status: AssetStatus.uploading,
storageKey: {
connectOrCreate: {
where: { key: 'test-key-audio-octet' },
create: { key: 'test-key-audio-octet' },
},
},
mediaType: 'application/octet-stream',
},
})
await uploadService.confirmFileUpload(userId, task.id, { fileId: asset.id })
const updatedAsset = await prisma.asset.findUnique({ where: { id: asset.id } })
expect(updatedAsset?.mediaType).toBe('audio/x-wav')
expect(updatedAsset?.status).toBe(AssetStatus.uploaded)
const workflowTask = await prisma.workflowTask.findFirst({
where: { assetId: asset.id, type: WorkflowTaskType.transcode },
})
expect(workflowTask).toBeDefined()
})
it('should create a version stack when parentId is a file', async () => {
// Create an existing file
const fileA = await prisma.asset.create({
@@ -388,4 +454,37 @@ describe('UploadService', () => {
expect(result.data[0].id).toBe(task.id)
expect(result.data[0].name).toBe('test-upload-task')
})
it('should correct the mediaType for .wma files that browser incorrectly reports as video', async () => {
const req = {
parentId: parentId,
files: [
{
name: 'song.wma',
id: '1',
size: 100,
type: 'file' as const,
mediaType: 'video/x-ms-wma',
children: [],
},
{
name: 'other_song.WMA',
id: '2',
size: 200,
type: 'file' as const,
mediaType: 'video/x-ms-asf',
children: [],
},
],
}
const resp = await uploadService.createUploadTask(userId, req)
expect(resp.taskId).toBeDefined()
const song1 = await prisma.asset.findFirst({ where: { name: 'song.wma' } })
expect(song1?.mediaType).toBe('audio/x-ms-wma')
const song2 = await prisma.asset.findFirst({ where: { name: 'other_song.WMA' } })
expect(song2?.mediaType).toBe('audio/x-ms-asf')
})
})
+23 -6
View File
@@ -21,6 +21,7 @@ import {
import { ImageTranscoder, VideoTranscoder } from '@shumai/transcode'
import { generateKeyBetween } from 'jittered-fractional-indexing'
import { ulid } from 'ulid'
import { sanitizeFilename } from '@shumai/core/src/utils/filename'
export class UploadService {
constructor(private readonly prismaClient: typeof prisma = prisma) {}
@@ -130,7 +131,12 @@ export class UploadService {
const assetType = file.type === 'folder' ? AssetType.folder : AssetType.file
let key: string | null = null
if (assetType === AssetType.file) {
key = `files/${ulid()}/raw`
key = `files/${ulid()}/${sanitizeFilename(file.name)}`
}
let mediaType = file.mediaType
if (mediaType && file.name.toLowerCase().endsWith('.wma') && mediaType.startsWith('video/')) {
mediaType = mediaType.replace(/^video\//, 'audio/')
}
const newAsset = await tx.asset.create({
@@ -139,7 +145,7 @@ export class UploadService {
type: assetType,
storageKey: key ? { create: { key } } : undefined,
sortIndex: newSortIndex,
mediaType: file.mediaType,
mediaType: mediaType,
status: assetType === AssetType.folder ? AssetStatus.uploaded : AssetStatus.uploading,
sizeByte: file.size,
creator: userId ? { connect: { id: userId } } : undefined,
@@ -224,12 +230,18 @@ export class UploadService {
const project = asset.project
await this.prismaClient.$transaction(async (tx) => {
let resolvedMediaType = asset.mediaType
if (!resolvedMediaType || resolvedMediaType === 'application/octet-stream') {
resolvedMediaType = Bun.file(asset.name).type || 'application/octet-stream'
}
// Update asset
const updatedAsset = await tx.asset.update({
where: { id: asset.id },
data: {
status: AssetStatus.uploaded,
sizeByte: size,
mediaType: resolvedMediaType,
},
})
@@ -288,7 +300,11 @@ export class UploadService {
},
})
if (autofillAgent) {
const isVideo = asset.mediaType?.startsWith('video/')
const isImage = asset.mediaType?.startsWith('image/')
const isAudio = asset.mediaType?.startsWith('audio/')
if (autofillAgent && (isVideo || isImage)) {
await tx.workflowTask.create({
data: {
assetId: asset.id,
@@ -304,9 +320,7 @@ export class UploadService {
})
}
const isVideo = asset.mediaType?.startsWith('video/')
const isImage = asset.mediaType?.startsWith('image/')
if (!isVideo && !isImage) {
if (!isVideo && !isImage && !isAudio) {
await tx.asset.update({
where: { id: asset.id },
data: { status: AssetStatus.processed },
@@ -321,6 +335,9 @@ export class UploadService {
.withSprite()
.withPoster()
.submit()
} else if (isAudio) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await new VideoTranscoder(tx as any, asset.id, team.id, projectId).submit()
} else if (isImage) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await new ImageTranscoder(tx as any, asset.id, team.id, projectId).withThumbnail().submit()
+66
View File
@@ -0,0 +1,66 @@
import { describe, it, expect } from 'vitest'
import { sanitizeFilename, stemFromKey } from './filename'
describe('sanitizeFilename', () => {
it('returns the filename unchanged when it is already safe', () => {
expect(sanitizeFilename('foo.mp4')).toBe('foo.mp4')
expect(sanitizeFilename('my-video_final.mov')).toBe('my-video_final.mov')
})
it('replaces slashes and backslashes with underscores', () => {
expect(sanitizeFilename('path/to/file.mp4')).toBe('path_to_file.mp4')
expect(sanitizeFilename('path\\to\\file.mp4')).toBe('path_to_file.mp4')
})
it('replaces NUL bytes and control characters', () => {
expect(sanitizeFilename('foo\x00bar.mp4')).toBe('foo_bar.mp4')
expect(sanitizeFilename('foo\x01bar.mp4')).toBe('foo_bar.mp4')
})
it('trims leading and trailing dots and whitespace', () => {
expect(sanitizeFilename('.hidden')).toBe('hidden')
expect(sanitizeFilename('...dotted...')).toBe('dotted')
expect(sanitizeFilename(' spaced ')).toBe('spaced')
expect(sanitizeFilename(' .mixed. ')).toBe('mixed')
})
it('collapses multiple consecutive underscores', () => {
expect(sanitizeFilename('a//b')).toBe('a_b')
expect(sanitizeFilename('a///b')).toBe('a_b')
})
it('returns "file" for empty or whitespace-only input', () => {
expect(sanitizeFilename('')).toBe('file')
expect(sanitizeFilename(' ')).toBe('file')
expect(sanitizeFilename('...')).toBe('file')
})
it('preserves unicode characters', () => {
expect(sanitizeFilename('视频文件.mp4')).toBe('视频文件.mp4')
expect(sanitizeFilename('café.png')).toBe('café.png')
})
it('preserves spaces within the filename', () => {
expect(sanitizeFilename('my video file.mp4')).toBe('my video file.mp4')
})
})
describe('stemFromKey', () => {
it('extracts the stem from a key with extension', () => {
expect(stemFromKey('files/01ABC/foo.mp4')).toBe('foo')
expect(stemFromKey('files/01ABC/my-video.mov')).toBe('my-video')
})
it('extracts the stem from a key without extension', () => {
expect(stemFromKey('files/01ABC/raw')).toBe('raw')
})
it('handles keys with multiple dots in filename', () => {
expect(stemFromKey('files/01ABC/my.video.file.mp4')).toBe('my.video.file')
})
it('handles keys with no directory', () => {
expect(stemFromKey('foo.mp4')).toBe('foo')
expect(stemFromKey('raw')).toBe('raw')
})
})
+36
View File
@@ -0,0 +1,36 @@
import path from 'path'
/**
* Sanitize a filename for safe use as an S3 key segment.
* - Replaces characters unsafe for S3/filesystems with '_'
* - Trims leading/trailing whitespace and dots
* - Falls back to 'file' if the result is empty
*/
export function sanitizeFilename(filename: string): string {
// Replace NUL bytes, slashes, backslashes, and control characters
// eslint-disable-next-line no-control-regex
let safe = filename.replace(/[\x00-\x1f\x7f/\\]/g, '_')
// Trim leading/trailing whitespace and dots
safe = safe.replace(/^[\s.]+|[\s.]+$/g, '')
// Collapse multiple underscores
safe = safe.replace(/_+/g, '_')
if (!safe) {
return 'file'
}
return safe
}
/**
* Extract the filename stem (without extension) from a storage key.
* e.g. 'files/01ABC.../foo.mp4' → 'foo'
* 'files/01ABC.../raw' → 'raw'
*/
export function stemFromKey(key: string): string {
const basename = path.basename(key)
const ext = path.extname(basename)
return ext ? basename.slice(0, -ext.length) : basename
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/db",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"main": "./src/index.ts",
@@ -0,0 +1,6 @@
-- AlterTable
ALTER TABLE "asset_comments" ADD COLUMN "completion_last_changed_by_id" TEXT,
ADD COLUMN "is_completed" BOOLEAN NOT NULL DEFAULT false;
-- AddForeignKey
ALTER TABLE "asset_comments" ADD CONSTRAINT "asset_comments_completion_last_changed_by_id_fkey" FOREIGN KEY ("completion_last_changed_by_id") REFERENCES "users"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+6 -1
View File
@@ -136,7 +136,8 @@ model User {
authTokens AuthToken[] @relation("UserToAuthToken")
tasks Task[] @relation("UserToTask")
teamMembers TeamMember[] @relation("UserToTeamMember")
comments AssetComment[] @relation("UserToAssetComment")
comments AssetComment[] @relation("UserToAssetComment")
completionChangedComments AssetComment[] @relation("UserToAssetCommentCompletionChanged")
createdInvites Invite[] @relation("UserToInvite")
createdNotifications Notification[] @relation("UserToCreatedNotification")
notifications Notification[] @relation("UserToNotification")
@@ -471,6 +472,10 @@ model AssetComment {
creatorId String? @map("creator_id")
creator User? @relation("UserToAssetComment", fields: [creatorId], references: [id])
isCompleted Boolean @default(false) @map("is_completed")
completionLastChangedById String? @map("completion_last_changed_by_id")
completionLastChangedBy User? @relation("UserToAssetCommentCompletionChanged", fields: [completionLastChangedById], references: [id])
replyToId String? @map("reply_to_id")
replyTo AssetComment? @relation("CommentReplies", fields: [replyToId], references: [id], onDelete: Cascade)
replies AssetComment[] @relation("CommentReplies")
File diff suppressed because one or more lines are too long
@@ -3149,6 +3149,8 @@ export const AssetCommentScalarFieldEnum = {
updatedAt: 'updatedAt',
assetId: 'assetId',
creatorId: 'creatorId',
isCompleted: 'isCompleted',
completionLastChangedById: 'completionLastChangedById',
replyToId: 'replyToId'
} as const
@@ -334,6 +334,8 @@ export const AssetCommentScalarFieldEnum = {
updatedAt: 'updatedAt',
assetId: 'assetId',
creatorId: 'creatorId',
isCompleted: 'isCompleted',
completionLastChangedById: 'completionLastChangedById',
replyToId: 'replyToId'
} as const
+312 -1
View File
@@ -45,6 +45,8 @@ export type AssetCommentMinAggregateOutputType = {
updatedAt: Date | null
assetId: string | null
creatorId: string | null
isCompleted: boolean | null
completionLastChangedById: string | null
replyToId: string | null
}
@@ -57,6 +59,8 @@ export type AssetCommentMaxAggregateOutputType = {
updatedAt: Date | null
assetId: string | null
creatorId: string | null
isCompleted: boolean | null
completionLastChangedById: string | null
replyToId: string | null
}
@@ -70,6 +74,8 @@ export type AssetCommentCountAggregateOutputType = {
updatedAt: number
assetId: number
creatorId: number
isCompleted: number
completionLastChangedById: number
replyToId: number
_all: number
}
@@ -92,6 +98,8 @@ export type AssetCommentMinAggregateInputType = {
updatedAt?: true
assetId?: true
creatorId?: true
isCompleted?: true
completionLastChangedById?: true
replyToId?: true
}
@@ -104,6 +112,8 @@ export type AssetCommentMaxAggregateInputType = {
updatedAt?: true
assetId?: true
creatorId?: true
isCompleted?: true
completionLastChangedById?: true
replyToId?: true
}
@@ -117,6 +127,8 @@ export type AssetCommentCountAggregateInputType = {
updatedAt?: true
assetId?: true
creatorId?: true
isCompleted?: true
completionLastChangedById?: true
replyToId?: true
_all?: true
}
@@ -217,6 +229,8 @@ export type AssetCommentGroupByOutputType = {
updatedAt: Date
assetId: string
creatorId: string | null
isCompleted: boolean
completionLastChangedById: string | null
replyToId: string | null
_count: AssetCommentCountAggregateOutputType | null
_avg: AssetCommentAvgAggregateOutputType | null
@@ -253,10 +267,13 @@ export type AssetCommentWhereInput = {
updatedAt?: Prisma.DateTimeFilter<"AssetComment"> | Date | string
assetId?: Prisma.StringFilter<"AssetComment"> | string
creatorId?: Prisma.StringNullableFilter<"AssetComment"> | string | null
isCompleted?: Prisma.BoolFilter<"AssetComment"> | boolean
completionLastChangedById?: Prisma.StringNullableFilter<"AssetComment"> | string | null
replyToId?: Prisma.StringNullableFilter<"AssetComment"> | string | null
session?: Prisma.XOR<Prisma.AgentSessionNullableScalarRelationFilter, Prisma.AgentSessionWhereInput> | null
asset?: Prisma.XOR<Prisma.AssetScalarRelationFilter, Prisma.AssetWhereInput>
creator?: Prisma.XOR<Prisma.UserNullableScalarRelationFilter, Prisma.UserWhereInput> | null
completionLastChangedBy?: Prisma.XOR<Prisma.UserNullableScalarRelationFilter, Prisma.UserWhereInput> | null
replyTo?: Prisma.XOR<Prisma.AssetCommentNullableScalarRelationFilter, Prisma.AssetCommentWhereInput> | null
replies?: Prisma.AssetCommentListRelationFilter
attachments?: Prisma.AssetCommentAttachmentListRelationFilter
@@ -272,10 +289,13 @@ export type AssetCommentOrderByWithRelationInput = {
updatedAt?: Prisma.SortOrder
assetId?: Prisma.SortOrder
creatorId?: Prisma.SortOrderInput | Prisma.SortOrder
isCompleted?: Prisma.SortOrder
completionLastChangedById?: Prisma.SortOrderInput | Prisma.SortOrder
replyToId?: Prisma.SortOrderInput | Prisma.SortOrder
session?: Prisma.AgentSessionOrderByWithRelationInput
asset?: Prisma.AssetOrderByWithRelationInput
creator?: Prisma.UserOrderByWithRelationInput
completionLastChangedBy?: Prisma.UserOrderByWithRelationInput
replyTo?: Prisma.AssetCommentOrderByWithRelationInput
replies?: Prisma.AssetCommentOrderByRelationAggregateInput
attachments?: Prisma.AssetCommentAttachmentOrderByRelationAggregateInput
@@ -294,10 +314,13 @@ export type AssetCommentWhereUniqueInput = Prisma.AtLeast<{
updatedAt?: Prisma.DateTimeFilter<"AssetComment"> | Date | string
assetId?: Prisma.StringFilter<"AssetComment"> | string
creatorId?: Prisma.StringNullableFilter<"AssetComment"> | string | null
isCompleted?: Prisma.BoolFilter<"AssetComment"> | boolean
completionLastChangedById?: Prisma.StringNullableFilter<"AssetComment"> | string | null
replyToId?: Prisma.StringNullableFilter<"AssetComment"> | string | null
session?: Prisma.XOR<Prisma.AgentSessionNullableScalarRelationFilter, Prisma.AgentSessionWhereInput> | null
asset?: Prisma.XOR<Prisma.AssetScalarRelationFilter, Prisma.AssetWhereInput>
creator?: Prisma.XOR<Prisma.UserNullableScalarRelationFilter, Prisma.UserWhereInput> | null
completionLastChangedBy?: Prisma.XOR<Prisma.UserNullableScalarRelationFilter, Prisma.UserWhereInput> | null
replyTo?: Prisma.XOR<Prisma.AssetCommentNullableScalarRelationFilter, Prisma.AssetCommentWhereInput> | null
replies?: Prisma.AssetCommentListRelationFilter
attachments?: Prisma.AssetCommentAttachmentListRelationFilter
@@ -313,6 +336,8 @@ export type AssetCommentOrderByWithAggregationInput = {
updatedAt?: Prisma.SortOrder
assetId?: Prisma.SortOrder
creatorId?: Prisma.SortOrderInput | Prisma.SortOrder
isCompleted?: Prisma.SortOrder
completionLastChangedById?: Prisma.SortOrderInput | Prisma.SortOrder
replyToId?: Prisma.SortOrderInput | Prisma.SortOrder
_count?: Prisma.AssetCommentCountOrderByAggregateInput
_avg?: Prisma.AssetCommentAvgOrderByAggregateInput
@@ -334,6 +359,8 @@ export type AssetCommentScalarWhereWithAggregatesInput = {
updatedAt?: Prisma.DateTimeWithAggregatesFilter<"AssetComment"> | Date | string
assetId?: Prisma.StringWithAggregatesFilter<"AssetComment"> | string
creatorId?: Prisma.StringNullableWithAggregatesFilter<"AssetComment"> | string | null
isCompleted?: Prisma.BoolWithAggregatesFilter<"AssetComment"> | boolean
completionLastChangedById?: Prisma.StringNullableWithAggregatesFilter<"AssetComment"> | string | null
replyToId?: Prisma.StringNullableWithAggregatesFilter<"AssetComment"> | string | null
}
@@ -344,9 +371,11 @@ export type AssetCommentCreateInput = {
second?: number | null
createdAt?: Date | string
updatedAt?: Date | string
isCompleted?: boolean
session?: Prisma.AgentSessionCreateNestedOneWithoutCommentsInput
asset: Prisma.AssetCreateNestedOneWithoutCommentsInput
creator?: Prisma.UserCreateNestedOneWithoutCommentsInput
completionLastChangedBy?: Prisma.UserCreateNestedOneWithoutCompletionChangedCommentsInput
replyTo?: Prisma.AssetCommentCreateNestedOneWithoutRepliesInput
replies?: Prisma.AssetCommentCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentCreateNestedManyWithoutCommentInput
@@ -362,6 +391,8 @@ export type AssetCommentUncheckedCreateInput = {
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
replies?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentUncheckedCreateNestedManyWithoutCommentInput
@@ -374,9 +405,11 @@ export type AssetCommentUpdateInput = {
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
session?: Prisma.AgentSessionUpdateOneWithoutCommentsNestedInput
asset?: Prisma.AssetUpdateOneRequiredWithoutCommentsNestedInput
creator?: Prisma.UserUpdateOneWithoutCommentsNestedInput
completionLastChangedBy?: Prisma.UserUpdateOneWithoutCompletionChangedCommentsNestedInput
replyTo?: Prisma.AssetCommentUpdateOneWithoutRepliesNestedInput
replies?: Prisma.AssetCommentUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUpdateManyWithoutCommentNestedInput
@@ -392,6 +425,8 @@ export type AssetCommentUncheckedUpdateInput = {
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replies?: Prisma.AssetCommentUncheckedUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUncheckedUpdateManyWithoutCommentNestedInput
@@ -407,6 +442,8 @@ export type AssetCommentCreateManyInput = {
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
}
@@ -417,6 +454,7 @@ export type AssetCommentUpdateManyMutationInput = {
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
}
export type AssetCommentUncheckedUpdateManyInput = {
@@ -429,6 +467,8 @@ export type AssetCommentUncheckedUpdateManyInput = {
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
}
@@ -457,6 +497,8 @@ export type AssetCommentCountOrderByAggregateInput = {
updatedAt?: Prisma.SortOrder
assetId?: Prisma.SortOrder
creatorId?: Prisma.SortOrder
isCompleted?: Prisma.SortOrder
completionLastChangedById?: Prisma.SortOrder
replyToId?: Prisma.SortOrder
}
@@ -473,6 +515,8 @@ export type AssetCommentMaxOrderByAggregateInput = {
updatedAt?: Prisma.SortOrder
assetId?: Prisma.SortOrder
creatorId?: Prisma.SortOrder
isCompleted?: Prisma.SortOrder
completionLastChangedById?: Prisma.SortOrder
replyToId?: Prisma.SortOrder
}
@@ -485,6 +529,8 @@ export type AssetCommentMinOrderByAggregateInput = {
updatedAt?: Prisma.SortOrder
assetId?: Prisma.SortOrder
creatorId?: Prisma.SortOrder
isCompleted?: Prisma.SortOrder
completionLastChangedById?: Prisma.SortOrder
replyToId?: Prisma.SortOrder
}
@@ -504,6 +550,13 @@ export type AssetCommentCreateNestedManyWithoutCreatorInput = {
connect?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
}
export type AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput = {
create?: Prisma.XOR<Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput, Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput> | Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput[] | Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput[]
connectOrCreate?: Prisma.AssetCommentCreateOrConnectWithoutCompletionLastChangedByInput | Prisma.AssetCommentCreateOrConnectWithoutCompletionLastChangedByInput[]
createMany?: Prisma.AssetCommentCreateManyCompletionLastChangedByInputEnvelope
connect?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
}
export type AssetCommentUncheckedCreateNestedManyWithoutCreatorInput = {
create?: Prisma.XOR<Prisma.AssetCommentCreateWithoutCreatorInput, Prisma.AssetCommentUncheckedCreateWithoutCreatorInput> | Prisma.AssetCommentCreateWithoutCreatorInput[] | Prisma.AssetCommentUncheckedCreateWithoutCreatorInput[]
connectOrCreate?: Prisma.AssetCommentCreateOrConnectWithoutCreatorInput | Prisma.AssetCommentCreateOrConnectWithoutCreatorInput[]
@@ -511,6 +564,13 @@ export type AssetCommentUncheckedCreateNestedManyWithoutCreatorInput = {
connect?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
}
export type AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput = {
create?: Prisma.XOR<Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput, Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput> | Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput[] | Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput[]
connectOrCreate?: Prisma.AssetCommentCreateOrConnectWithoutCompletionLastChangedByInput | Prisma.AssetCommentCreateOrConnectWithoutCompletionLastChangedByInput[]
createMany?: Prisma.AssetCommentCreateManyCompletionLastChangedByInputEnvelope
connect?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
}
export type AssetCommentUpdateManyWithoutCreatorNestedInput = {
create?: Prisma.XOR<Prisma.AssetCommentCreateWithoutCreatorInput, Prisma.AssetCommentUncheckedCreateWithoutCreatorInput> | Prisma.AssetCommentCreateWithoutCreatorInput[] | Prisma.AssetCommentUncheckedCreateWithoutCreatorInput[]
connectOrCreate?: Prisma.AssetCommentCreateOrConnectWithoutCreatorInput | Prisma.AssetCommentCreateOrConnectWithoutCreatorInput[]
@@ -525,6 +585,20 @@ export type AssetCommentUpdateManyWithoutCreatorNestedInput = {
deleteMany?: Prisma.AssetCommentScalarWhereInput | Prisma.AssetCommentScalarWhereInput[]
}
export type AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput = {
create?: Prisma.XOR<Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput, Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput> | Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput[] | Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput[]
connectOrCreate?: Prisma.AssetCommentCreateOrConnectWithoutCompletionLastChangedByInput | Prisma.AssetCommentCreateOrConnectWithoutCompletionLastChangedByInput[]
upsert?: Prisma.AssetCommentUpsertWithWhereUniqueWithoutCompletionLastChangedByInput | Prisma.AssetCommentUpsertWithWhereUniqueWithoutCompletionLastChangedByInput[]
createMany?: Prisma.AssetCommentCreateManyCompletionLastChangedByInputEnvelope
set?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
disconnect?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
delete?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
connect?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
update?: Prisma.AssetCommentUpdateWithWhereUniqueWithoutCompletionLastChangedByInput | Prisma.AssetCommentUpdateWithWhereUniqueWithoutCompletionLastChangedByInput[]
updateMany?: Prisma.AssetCommentUpdateManyWithWhereWithoutCompletionLastChangedByInput | Prisma.AssetCommentUpdateManyWithWhereWithoutCompletionLastChangedByInput[]
deleteMany?: Prisma.AssetCommentScalarWhereInput | Prisma.AssetCommentScalarWhereInput[]
}
export type AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput = {
create?: Prisma.XOR<Prisma.AssetCommentCreateWithoutCreatorInput, Prisma.AssetCommentUncheckedCreateWithoutCreatorInput> | Prisma.AssetCommentCreateWithoutCreatorInput[] | Prisma.AssetCommentUncheckedCreateWithoutCreatorInput[]
connectOrCreate?: Prisma.AssetCommentCreateOrConnectWithoutCreatorInput | Prisma.AssetCommentCreateOrConnectWithoutCreatorInput[]
@@ -539,6 +613,20 @@ export type AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput = {
deleteMany?: Prisma.AssetCommentScalarWhereInput | Prisma.AssetCommentScalarWhereInput[]
}
export type AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput = {
create?: Prisma.XOR<Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput, Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput> | Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput[] | Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput[]
connectOrCreate?: Prisma.AssetCommentCreateOrConnectWithoutCompletionLastChangedByInput | Prisma.AssetCommentCreateOrConnectWithoutCompletionLastChangedByInput[]
upsert?: Prisma.AssetCommentUpsertWithWhereUniqueWithoutCompletionLastChangedByInput | Prisma.AssetCommentUpsertWithWhereUniqueWithoutCompletionLastChangedByInput[]
createMany?: Prisma.AssetCommentCreateManyCompletionLastChangedByInputEnvelope
set?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
disconnect?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
delete?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
connect?: Prisma.AssetCommentWhereUniqueInput | Prisma.AssetCommentWhereUniqueInput[]
update?: Prisma.AssetCommentUpdateWithWhereUniqueWithoutCompletionLastChangedByInput | Prisma.AssetCommentUpdateWithWhereUniqueWithoutCompletionLastChangedByInput[]
updateMany?: Prisma.AssetCommentUpdateManyWithWhereWithoutCompletionLastChangedByInput | Prisma.AssetCommentUpdateManyWithWhereWithoutCompletionLastChangedByInput[]
deleteMany?: Prisma.AssetCommentScalarWhereInput | Prisma.AssetCommentScalarWhereInput[]
}
export type AssetCommentCreateNestedManyWithoutAssetInput = {
create?: Prisma.XOR<Prisma.AssetCommentCreateWithoutAssetInput, Prisma.AssetCommentUncheckedCreateWithoutAssetInput> | Prisma.AssetCommentCreateWithoutAssetInput[] | Prisma.AssetCommentUncheckedCreateWithoutAssetInput[]
connectOrCreate?: Prisma.AssetCommentCreateOrConnectWithoutAssetInput | Prisma.AssetCommentCreateOrConnectWithoutAssetInput[]
@@ -702,8 +790,10 @@ export type AssetCommentCreateWithoutCreatorInput = {
second?: number | null
createdAt?: Date | string
updatedAt?: Date | string
isCompleted?: boolean
session?: Prisma.AgentSessionCreateNestedOneWithoutCommentsInput
asset: Prisma.AssetCreateNestedOneWithoutCommentsInput
completionLastChangedBy?: Prisma.UserCreateNestedOneWithoutCompletionChangedCommentsInput
replyTo?: Prisma.AssetCommentCreateNestedOneWithoutRepliesInput
replies?: Prisma.AssetCommentCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentCreateNestedManyWithoutCommentInput
@@ -718,6 +808,8 @@ export type AssetCommentUncheckedCreateWithoutCreatorInput = {
createdAt?: Date | string
updatedAt?: Date | string
assetId: string
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
replies?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentUncheckedCreateNestedManyWithoutCommentInput
@@ -733,6 +825,48 @@ export type AssetCommentCreateManyCreatorInputEnvelope = {
skipDuplicates?: boolean
}
export type AssetCommentCreateWithoutCompletionLastChangedByInput = {
id?: string
message?: string | null
annotation?:PrismaJson.AnnotationList | Prisma.NullableJsonNullValueInput
second?: number | null
createdAt?: Date | string
updatedAt?: Date | string
isCompleted?: boolean
session?: Prisma.AgentSessionCreateNestedOneWithoutCommentsInput
asset: Prisma.AssetCreateNestedOneWithoutCommentsInput
creator?: Prisma.UserCreateNestedOneWithoutCommentsInput
replyTo?: Prisma.AssetCommentCreateNestedOneWithoutRepliesInput
replies?: Prisma.AssetCommentCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentCreateNestedManyWithoutCommentInput
}
export type AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput = {
id?: string
message?: string | null
annotation?:PrismaJson.AnnotationList | Prisma.NullableJsonNullValueInput
second?: number | null
sessionId?: string | null
createdAt?: Date | string
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
replyToId?: string | null
replies?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentUncheckedCreateNestedManyWithoutCommentInput
}
export type AssetCommentCreateOrConnectWithoutCompletionLastChangedByInput = {
where: Prisma.AssetCommentWhereUniqueInput
create: Prisma.XOR<Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput, Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput>
}
export type AssetCommentCreateManyCompletionLastChangedByInputEnvelope = {
data: Prisma.AssetCommentCreateManyCompletionLastChangedByInput | Prisma.AssetCommentCreateManyCompletionLastChangedByInput[]
skipDuplicates?: boolean
}
export type AssetCommentUpsertWithWhereUniqueWithoutCreatorInput = {
where: Prisma.AssetCommentWhereUniqueInput
update: Prisma.XOR<Prisma.AssetCommentUpdateWithoutCreatorInput, Prisma.AssetCommentUncheckedUpdateWithoutCreatorInput>
@@ -762,9 +896,27 @@ export type AssetCommentScalarWhereInput = {
updatedAt?: Prisma.DateTimeFilter<"AssetComment"> | Date | string
assetId?: Prisma.StringFilter<"AssetComment"> | string
creatorId?: Prisma.StringNullableFilter<"AssetComment"> | string | null
isCompleted?: Prisma.BoolFilter<"AssetComment"> | boolean
completionLastChangedById?: Prisma.StringNullableFilter<"AssetComment"> | string | null
replyToId?: Prisma.StringNullableFilter<"AssetComment"> | string | null
}
export type AssetCommentUpsertWithWhereUniqueWithoutCompletionLastChangedByInput = {
where: Prisma.AssetCommentWhereUniqueInput
update: Prisma.XOR<Prisma.AssetCommentUpdateWithoutCompletionLastChangedByInput, Prisma.AssetCommentUncheckedUpdateWithoutCompletionLastChangedByInput>
create: Prisma.XOR<Prisma.AssetCommentCreateWithoutCompletionLastChangedByInput, Prisma.AssetCommentUncheckedCreateWithoutCompletionLastChangedByInput>
}
export type AssetCommentUpdateWithWhereUniqueWithoutCompletionLastChangedByInput = {
where: Prisma.AssetCommentWhereUniqueInput
data: Prisma.XOR<Prisma.AssetCommentUpdateWithoutCompletionLastChangedByInput, Prisma.AssetCommentUncheckedUpdateWithoutCompletionLastChangedByInput>
}
export type AssetCommentUpdateManyWithWhereWithoutCompletionLastChangedByInput = {
where: Prisma.AssetCommentScalarWhereInput
data: Prisma.XOR<Prisma.AssetCommentUpdateManyMutationInput, Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByInput>
}
export type AssetCommentCreateWithoutAssetInput = {
id?: string
message?: string | null
@@ -772,8 +924,10 @@ export type AssetCommentCreateWithoutAssetInput = {
second?: number | null
createdAt?: Date | string
updatedAt?: Date | string
isCompleted?: boolean
session?: Prisma.AgentSessionCreateNestedOneWithoutCommentsInput
creator?: Prisma.UserCreateNestedOneWithoutCommentsInput
completionLastChangedBy?: Prisma.UserCreateNestedOneWithoutCompletionChangedCommentsInput
replyTo?: Prisma.AssetCommentCreateNestedOneWithoutRepliesInput
replies?: Prisma.AssetCommentCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentCreateNestedManyWithoutCommentInput
@@ -788,6 +942,8 @@ export type AssetCommentUncheckedCreateWithoutAssetInput = {
createdAt?: Date | string
updatedAt?: Date | string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
replies?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentUncheckedCreateNestedManyWithoutCommentInput
@@ -826,9 +982,11 @@ export type AssetCommentCreateWithoutRepliesInput = {
second?: number | null
createdAt?: Date | string
updatedAt?: Date | string
isCompleted?: boolean
session?: Prisma.AgentSessionCreateNestedOneWithoutCommentsInput
asset: Prisma.AssetCreateNestedOneWithoutCommentsInput
creator?: Prisma.UserCreateNestedOneWithoutCommentsInput
completionLastChangedBy?: Prisma.UserCreateNestedOneWithoutCompletionChangedCommentsInput
replyTo?: Prisma.AssetCommentCreateNestedOneWithoutRepliesInput
attachments?: Prisma.AssetCommentAttachmentCreateNestedManyWithoutCommentInput
}
@@ -843,6 +1001,8 @@ export type AssetCommentUncheckedCreateWithoutRepliesInput = {
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
attachments?: Prisma.AssetCommentAttachmentUncheckedCreateNestedManyWithoutCommentInput
}
@@ -859,9 +1019,11 @@ export type AssetCommentCreateWithoutReplyToInput = {
second?: number | null
createdAt?: Date | string
updatedAt?: Date | string
isCompleted?: boolean
session?: Prisma.AgentSessionCreateNestedOneWithoutCommentsInput
asset: Prisma.AssetCreateNestedOneWithoutCommentsInput
creator?: Prisma.UserCreateNestedOneWithoutCommentsInput
completionLastChangedBy?: Prisma.UserCreateNestedOneWithoutCompletionChangedCommentsInput
replies?: Prisma.AssetCommentCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentCreateNestedManyWithoutCommentInput
}
@@ -876,6 +1038,8 @@ export type AssetCommentUncheckedCreateWithoutReplyToInput = {
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
replies?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentUncheckedCreateNestedManyWithoutCommentInput
}
@@ -908,9 +1072,11 @@ export type AssetCommentUpdateWithoutRepliesInput = {
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
session?: Prisma.AgentSessionUpdateOneWithoutCommentsNestedInput
asset?: Prisma.AssetUpdateOneRequiredWithoutCommentsNestedInput
creator?: Prisma.UserUpdateOneWithoutCommentsNestedInput
completionLastChangedBy?: Prisma.UserUpdateOneWithoutCompletionChangedCommentsNestedInput
replyTo?: Prisma.AssetCommentUpdateOneWithoutRepliesNestedInput
attachments?: Prisma.AssetCommentAttachmentUpdateManyWithoutCommentNestedInput
}
@@ -925,6 +1091,8 @@ export type AssetCommentUncheckedUpdateWithoutRepliesInput = {
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
attachments?: Prisma.AssetCommentAttachmentUncheckedUpdateManyWithoutCommentNestedInput
}
@@ -952,9 +1120,11 @@ export type AssetCommentCreateWithoutAttachmentsInput = {
second?: number | null
createdAt?: Date | string
updatedAt?: Date | string
isCompleted?: boolean
session?: Prisma.AgentSessionCreateNestedOneWithoutCommentsInput
asset: Prisma.AssetCreateNestedOneWithoutCommentsInput
creator?: Prisma.UserCreateNestedOneWithoutCommentsInput
completionLastChangedBy?: Prisma.UserCreateNestedOneWithoutCompletionChangedCommentsInput
replyTo?: Prisma.AssetCommentCreateNestedOneWithoutRepliesInput
replies?: Prisma.AssetCommentCreateNestedManyWithoutReplyToInput
}
@@ -969,6 +1139,8 @@ export type AssetCommentUncheckedCreateWithoutAttachmentsInput = {
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
replies?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutReplyToInput
}
@@ -996,9 +1168,11 @@ export type AssetCommentUpdateWithoutAttachmentsInput = {
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
session?: Prisma.AgentSessionUpdateOneWithoutCommentsNestedInput
asset?: Prisma.AssetUpdateOneRequiredWithoutCommentsNestedInput
creator?: Prisma.UserUpdateOneWithoutCommentsNestedInput
completionLastChangedBy?: Prisma.UserUpdateOneWithoutCompletionChangedCommentsNestedInput
replyTo?: Prisma.AssetCommentUpdateOneWithoutRepliesNestedInput
replies?: Prisma.AssetCommentUpdateManyWithoutReplyToNestedInput
}
@@ -1013,6 +1187,8 @@ export type AssetCommentUncheckedUpdateWithoutAttachmentsInput = {
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replies?: Prisma.AssetCommentUncheckedUpdateManyWithoutReplyToNestedInput
}
@@ -1024,8 +1200,10 @@ export type AssetCommentCreateWithoutSessionInput = {
second?: number | null
createdAt?: Date | string
updatedAt?: Date | string
isCompleted?: boolean
asset: Prisma.AssetCreateNestedOneWithoutCommentsInput
creator?: Prisma.UserCreateNestedOneWithoutCommentsInput
completionLastChangedBy?: Prisma.UserCreateNestedOneWithoutCompletionChangedCommentsInput
replyTo?: Prisma.AssetCommentCreateNestedOneWithoutRepliesInput
replies?: Prisma.AssetCommentCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentCreateNestedManyWithoutCommentInput
@@ -1040,6 +1218,8 @@ export type AssetCommentUncheckedCreateWithoutSessionInput = {
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
replies?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutReplyToInput
attachments?: Prisma.AssetCommentAttachmentUncheckedCreateNestedManyWithoutCommentInput
@@ -1080,6 +1260,22 @@ export type AssetCommentCreateManyCreatorInput = {
createdAt?: Date | string
updatedAt?: Date | string
assetId: string
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
}
export type AssetCommentCreateManyCompletionLastChangedByInput = {
id?: string
message?: string | null
annotation?:PrismaJson.AnnotationList | Prisma.NullableJsonNullValueInput
second?: number | null
sessionId?: string | null
createdAt?: Date | string
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
replyToId?: string | null
}
@@ -1090,8 +1286,10 @@ export type AssetCommentUpdateWithoutCreatorInput = {
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
session?: Prisma.AgentSessionUpdateOneWithoutCommentsNestedInput
asset?: Prisma.AssetUpdateOneRequiredWithoutCommentsNestedInput
completionLastChangedBy?: Prisma.UserUpdateOneWithoutCompletionChangedCommentsNestedInput
replyTo?: Prisma.AssetCommentUpdateOneWithoutRepliesNestedInput
replies?: Prisma.AssetCommentUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUpdateManyWithoutCommentNestedInput
@@ -1106,6 +1304,8 @@ export type AssetCommentUncheckedUpdateWithoutCreatorInput = {
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replies?: Prisma.AssetCommentUncheckedUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUncheckedUpdateManyWithoutCommentNestedInput
@@ -1120,6 +1320,54 @@ export type AssetCommentUncheckedUpdateManyWithoutCreatorInput = {
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
}
export type AssetCommentUpdateWithoutCompletionLastChangedByInput = {
id?: Prisma.StringFieldUpdateOperationsInput | string
message?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
annotation?:PrismaJson.AnnotationList | Prisma.NullableJsonNullValueInput
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
session?: Prisma.AgentSessionUpdateOneWithoutCommentsNestedInput
asset?: Prisma.AssetUpdateOneRequiredWithoutCommentsNestedInput
creator?: Prisma.UserUpdateOneWithoutCommentsNestedInput
replyTo?: Prisma.AssetCommentUpdateOneWithoutRepliesNestedInput
replies?: Prisma.AssetCommentUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUpdateManyWithoutCommentNestedInput
}
export type AssetCommentUncheckedUpdateWithoutCompletionLastChangedByInput = {
id?: Prisma.StringFieldUpdateOperationsInput | string
message?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
annotation?:PrismaJson.AnnotationList | Prisma.NullableJsonNullValueInput
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
sessionId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replies?: Prisma.AssetCommentUncheckedUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUncheckedUpdateManyWithoutCommentNestedInput
}
export type AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByInput = {
id?: Prisma.StringFieldUpdateOperationsInput | string
message?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
annotation?:PrismaJson.AnnotationList | Prisma.NullableJsonNullValueInput
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
sessionId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
}
@@ -1132,6 +1380,8 @@ export type AssetCommentCreateManyAssetInput = {
createdAt?: Date | string
updatedAt?: Date | string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
}
@@ -1142,8 +1392,10 @@ export type AssetCommentUpdateWithoutAssetInput = {
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
session?: Prisma.AgentSessionUpdateOneWithoutCommentsNestedInput
creator?: Prisma.UserUpdateOneWithoutCommentsNestedInput
completionLastChangedBy?: Prisma.UserUpdateOneWithoutCompletionChangedCommentsNestedInput
replyTo?: Prisma.AssetCommentUpdateOneWithoutRepliesNestedInput
replies?: Prisma.AssetCommentUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUpdateManyWithoutCommentNestedInput
@@ -1158,6 +1410,8 @@ export type AssetCommentUncheckedUpdateWithoutAssetInput = {
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replies?: Prisma.AssetCommentUncheckedUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUncheckedUpdateManyWithoutCommentNestedInput
@@ -1172,6 +1426,8 @@ export type AssetCommentUncheckedUpdateManyWithoutAssetInput = {
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
}
@@ -1185,6 +1441,8 @@ export type AssetCommentCreateManyReplyToInput = {
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
}
export type AssetCommentUpdateWithoutReplyToInput = {
@@ -1194,9 +1452,11 @@ export type AssetCommentUpdateWithoutReplyToInput = {
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
session?: Prisma.AgentSessionUpdateOneWithoutCommentsNestedInput
asset?: Prisma.AssetUpdateOneRequiredWithoutCommentsNestedInput
creator?: Prisma.UserUpdateOneWithoutCommentsNestedInput
completionLastChangedBy?: Prisma.UserUpdateOneWithoutCompletionChangedCommentsNestedInput
replies?: Prisma.AssetCommentUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUpdateManyWithoutCommentNestedInput
}
@@ -1211,6 +1471,8 @@ export type AssetCommentUncheckedUpdateWithoutReplyToInput = {
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replies?: Prisma.AssetCommentUncheckedUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUncheckedUpdateManyWithoutCommentNestedInput
}
@@ -1225,6 +1487,8 @@ export type AssetCommentUncheckedUpdateManyWithoutReplyToInput = {
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
}
export type AssetCommentCreateManySessionInput = {
@@ -1236,6 +1500,8 @@ export type AssetCommentCreateManySessionInput = {
updatedAt?: Date | string
assetId: string
creatorId?: string | null
isCompleted?: boolean
completionLastChangedById?: string | null
replyToId?: string | null
}
@@ -1246,8 +1512,10 @@ export type AssetCommentUpdateWithoutSessionInput = {
second?: Prisma.NullableFloatFieldUpdateOperationsInput | number | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
asset?: Prisma.AssetUpdateOneRequiredWithoutCommentsNestedInput
creator?: Prisma.UserUpdateOneWithoutCommentsNestedInput
completionLastChangedBy?: Prisma.UserUpdateOneWithoutCompletionChangedCommentsNestedInput
replyTo?: Prisma.AssetCommentUpdateOneWithoutRepliesNestedInput
replies?: Prisma.AssetCommentUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUpdateManyWithoutCommentNestedInput
@@ -1262,6 +1530,8 @@ export type AssetCommentUncheckedUpdateWithoutSessionInput = {
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replies?: Prisma.AssetCommentUncheckedUpdateManyWithoutReplyToNestedInput
attachments?: Prisma.AssetCommentAttachmentUncheckedUpdateManyWithoutCommentNestedInput
@@ -1276,6 +1546,8 @@ export type AssetCommentUncheckedUpdateManyWithoutSessionInput = {
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assetId?: Prisma.StringFieldUpdateOperationsInput | string
creatorId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
isCompleted?: Prisma.BoolFieldUpdateOperationsInput | boolean
completionLastChangedById?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
replyToId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
}
@@ -1329,10 +1601,13 @@ export type AssetCommentSelect<ExtArgs extends runtime.Types.Extensions.Internal
updatedAt?: boolean
assetId?: boolean
creatorId?: boolean
isCompleted?: boolean
completionLastChangedById?: boolean
replyToId?: boolean
session?: boolean | Prisma.AssetComment$sessionArgs<ExtArgs>
asset?: boolean | Prisma.AssetDefaultArgs<ExtArgs>
creator?: boolean | Prisma.AssetComment$creatorArgs<ExtArgs>
completionLastChangedBy?: boolean | Prisma.AssetComment$completionLastChangedByArgs<ExtArgs>
replyTo?: boolean | Prisma.AssetComment$replyToArgs<ExtArgs>
replies?: boolean | Prisma.AssetComment$repliesArgs<ExtArgs>
attachments?: boolean | Prisma.AssetComment$attachmentsArgs<ExtArgs>
@@ -1349,10 +1624,13 @@ export type AssetCommentSelectCreateManyAndReturn<ExtArgs extends runtime.Types.
updatedAt?: boolean
assetId?: boolean
creatorId?: boolean
isCompleted?: boolean
completionLastChangedById?: boolean
replyToId?: boolean
session?: boolean | Prisma.AssetComment$sessionArgs<ExtArgs>
asset?: boolean | Prisma.AssetDefaultArgs<ExtArgs>
creator?: boolean | Prisma.AssetComment$creatorArgs<ExtArgs>
completionLastChangedBy?: boolean | Prisma.AssetComment$completionLastChangedByArgs<ExtArgs>
replyTo?: boolean | Prisma.AssetComment$replyToArgs<ExtArgs>
}, ExtArgs["result"]["assetComment"]>
@@ -1366,10 +1644,13 @@ export type AssetCommentSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.
updatedAt?: boolean
assetId?: boolean
creatorId?: boolean
isCompleted?: boolean
completionLastChangedById?: boolean
replyToId?: boolean
session?: boolean | Prisma.AssetComment$sessionArgs<ExtArgs>
asset?: boolean | Prisma.AssetDefaultArgs<ExtArgs>
creator?: boolean | Prisma.AssetComment$creatorArgs<ExtArgs>
completionLastChangedBy?: boolean | Prisma.AssetComment$completionLastChangedByArgs<ExtArgs>
replyTo?: boolean | Prisma.AssetComment$replyToArgs<ExtArgs>
}, ExtArgs["result"]["assetComment"]>
@@ -1383,14 +1664,17 @@ export type AssetCommentSelectScalar = {
updatedAt?: boolean
assetId?: boolean
creatorId?: boolean
isCompleted?: boolean
completionLastChangedById?: boolean
replyToId?: boolean
}
export type AssetCommentOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "message" | "annotation" | "second" | "sessionId" | "createdAt" | "updatedAt" | "assetId" | "creatorId" | "replyToId", ExtArgs["result"]["assetComment"]>
export type AssetCommentOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "message" | "annotation" | "second" | "sessionId" | "createdAt" | "updatedAt" | "assetId" | "creatorId" | "isCompleted" | "completionLastChangedById" | "replyToId", ExtArgs["result"]["assetComment"]>
export type AssetCommentInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
session?: boolean | Prisma.AssetComment$sessionArgs<ExtArgs>
asset?: boolean | Prisma.AssetDefaultArgs<ExtArgs>
creator?: boolean | Prisma.AssetComment$creatorArgs<ExtArgs>
completionLastChangedBy?: boolean | Prisma.AssetComment$completionLastChangedByArgs<ExtArgs>
replyTo?: boolean | Prisma.AssetComment$replyToArgs<ExtArgs>
replies?: boolean | Prisma.AssetComment$repliesArgs<ExtArgs>
attachments?: boolean | Prisma.AssetComment$attachmentsArgs<ExtArgs>
@@ -1400,12 +1684,14 @@ export type AssetCommentIncludeCreateManyAndReturn<ExtArgs extends runtime.Types
session?: boolean | Prisma.AssetComment$sessionArgs<ExtArgs>
asset?: boolean | Prisma.AssetDefaultArgs<ExtArgs>
creator?: boolean | Prisma.AssetComment$creatorArgs<ExtArgs>
completionLastChangedBy?: boolean | Prisma.AssetComment$completionLastChangedByArgs<ExtArgs>
replyTo?: boolean | Prisma.AssetComment$replyToArgs<ExtArgs>
}
export type AssetCommentIncludeUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
session?: boolean | Prisma.AssetComment$sessionArgs<ExtArgs>
asset?: boolean | Prisma.AssetDefaultArgs<ExtArgs>
creator?: boolean | Prisma.AssetComment$creatorArgs<ExtArgs>
completionLastChangedBy?: boolean | Prisma.AssetComment$completionLastChangedByArgs<ExtArgs>
replyTo?: boolean | Prisma.AssetComment$replyToArgs<ExtArgs>
}
@@ -1415,6 +1701,7 @@ export type $AssetCommentPayload<ExtArgs extends runtime.Types.Extensions.Intern
session: Prisma.$AgentSessionPayload<ExtArgs> | null
asset: Prisma.$AssetPayload<ExtArgs>
creator: Prisma.$UserPayload<ExtArgs> | null
completionLastChangedBy: Prisma.$UserPayload<ExtArgs> | null
replyTo: Prisma.$AssetCommentPayload<ExtArgs> | null
replies: Prisma.$AssetCommentPayload<ExtArgs>[]
attachments: Prisma.$AssetCommentAttachmentPayload<ExtArgs>[]
@@ -1432,6 +1719,8 @@ export type $AssetCommentPayload<ExtArgs extends runtime.Types.Extensions.Intern
updatedAt: Date
assetId: string
creatorId: string | null
isCompleted: boolean
completionLastChangedById: string | null
replyToId: string | null
}, ExtArgs["result"]["assetComment"]>
composites: {}
@@ -1830,6 +2119,7 @@ export interface Prisma__AssetCommentClient<T, Null = never, ExtArgs extends run
session<T extends Prisma.AssetComment$sessionArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.AssetComment$sessionArgs<ExtArgs>>): Prisma.Prisma__AgentSessionClient<runtime.Types.Result.GetResult<Prisma.$AgentSessionPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
asset<T extends Prisma.AssetDefaultArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.AssetDefaultArgs<ExtArgs>>): Prisma.Prisma__AssetClient<runtime.Types.Result.GetResult<Prisma.$AssetPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | Null, Null, ExtArgs, GlobalOmitOptions>
creator<T extends Prisma.AssetComment$creatorArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.AssetComment$creatorArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
completionLastChangedBy<T extends Prisma.AssetComment$completionLastChangedByArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.AssetComment$completionLastChangedByArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
replyTo<T extends Prisma.AssetComment$replyToArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.AssetComment$replyToArgs<ExtArgs>>): Prisma.Prisma__AssetCommentClient<runtime.Types.Result.GetResult<Prisma.$AssetCommentPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
replies<T extends Prisma.AssetComment$repliesArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.AssetComment$repliesArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$AssetCommentPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
attachments<T extends Prisma.AssetComment$attachmentsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.AssetComment$attachmentsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$AssetCommentAttachmentPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
@@ -1871,6 +2161,8 @@ export interface AssetCommentFieldRefs {
readonly updatedAt: Prisma.FieldRef<"AssetComment", 'DateTime'>
readonly assetId: Prisma.FieldRef<"AssetComment", 'String'>
readonly creatorId: Prisma.FieldRef<"AssetComment", 'String'>
readonly isCompleted: Prisma.FieldRef<"AssetComment", 'Boolean'>
readonly completionLastChangedById: Prisma.FieldRef<"AssetComment", 'String'>
readonly replyToId: Prisma.FieldRef<"AssetComment", 'String'>
}
@@ -2310,6 +2602,25 @@ export type AssetComment$creatorArgs<ExtArgs extends runtime.Types.Extensions.In
where?: Prisma.UserWhereInput
}
/**
* AssetComment.completionLastChangedBy
*/
export type AssetComment$completionLastChangedByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
/**
* Select specific fields to fetch from the User
*/
select?: Prisma.UserSelect<ExtArgs> | null
/**
* Omit specific fields from the User
*/
omit?: Prisma.UserOmit<ExtArgs> | null
/**
* Choose, which related nodes to fetch as well
*/
include?: Prisma.UserInclude<ExtArgs> | null
where?: Prisma.UserWhereInput
}
/**
* AssetComment.replyTo
*/
+260
View File
@@ -233,6 +233,7 @@ export type UserWhereInput = {
tasks?: Prisma.TaskListRelationFilter
teamMembers?: Prisma.TeamMemberListRelationFilter
comments?: Prisma.AssetCommentListRelationFilter
completionChangedComments?: Prisma.AssetCommentListRelationFilter
createdInvites?: Prisma.InviteListRelationFilter
createdNotifications?: Prisma.NotificationListRelationFilter
notifications?: Prisma.NotificationListRelationFilter
@@ -263,6 +264,7 @@ export type UserOrderByWithRelationInput = {
tasks?: Prisma.TaskOrderByRelationAggregateInput
teamMembers?: Prisma.TeamMemberOrderByRelationAggregateInput
comments?: Prisma.AssetCommentOrderByRelationAggregateInput
completionChangedComments?: Prisma.AssetCommentOrderByRelationAggregateInput
createdInvites?: Prisma.InviteOrderByRelationAggregateInput
createdNotifications?: Prisma.NotificationOrderByRelationAggregateInput
notifications?: Prisma.NotificationOrderByRelationAggregateInput
@@ -296,6 +298,7 @@ export type UserWhereUniqueInput = Prisma.AtLeast<{
tasks?: Prisma.TaskListRelationFilter
teamMembers?: Prisma.TeamMemberListRelationFilter
comments?: Prisma.AssetCommentListRelationFilter
completionChangedComments?: Prisma.AssetCommentListRelationFilter
createdInvites?: Prisma.InviteListRelationFilter
createdNotifications?: Prisma.NotificationListRelationFilter
notifications?: Prisma.NotificationListRelationFilter
@@ -360,6 +363,7 @@ export type UserCreateInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -390,6 +394,7 @@ export type UserUncheckedCreateInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -420,6 +425,7 @@ export type UserUpdateInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -450,6 +456,7 @@ export type UserUncheckedUpdateInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -669,6 +676,12 @@ export type UserCreateNestedOneWithoutCommentsInput = {
connect?: Prisma.UserWhereUniqueInput
}
export type UserCreateNestedOneWithoutCompletionChangedCommentsInput = {
create?: Prisma.XOR<Prisma.UserCreateWithoutCompletionChangedCommentsInput, Prisma.UserUncheckedCreateWithoutCompletionChangedCommentsInput>
connectOrCreate?: Prisma.UserCreateOrConnectWithoutCompletionChangedCommentsInput
connect?: Prisma.UserWhereUniqueInput
}
export type UserUpdateOneWithoutCommentsNestedInput = {
create?: Prisma.XOR<Prisma.UserCreateWithoutCommentsInput, Prisma.UserUncheckedCreateWithoutCommentsInput>
connectOrCreate?: Prisma.UserCreateOrConnectWithoutCommentsInput
@@ -679,6 +692,16 @@ export type UserUpdateOneWithoutCommentsNestedInput = {
update?: Prisma.XOR<Prisma.XOR<Prisma.UserUpdateToOneWithWhereWithoutCommentsInput, Prisma.UserUpdateWithoutCommentsInput>, Prisma.UserUncheckedUpdateWithoutCommentsInput>
}
export type UserUpdateOneWithoutCompletionChangedCommentsNestedInput = {
create?: Prisma.XOR<Prisma.UserCreateWithoutCompletionChangedCommentsInput, Prisma.UserUncheckedCreateWithoutCompletionChangedCommentsInput>
connectOrCreate?: Prisma.UserCreateOrConnectWithoutCompletionChangedCommentsInput
upsert?: Prisma.UserUpsertWithoutCompletionChangedCommentsInput
disconnect?: Prisma.UserWhereInput | boolean
delete?: Prisma.UserWhereInput | boolean
connect?: Prisma.UserWhereUniqueInput
update?: Prisma.XOR<Prisma.XOR<Prisma.UserUpdateToOneWithWhereWithoutCompletionChangedCommentsInput, Prisma.UserUpdateWithoutCompletionChangedCommentsInput>, Prisma.UserUncheckedUpdateWithoutCompletionChangedCommentsInput>
}
export type UserCreateNestedOneWithoutCreatedInvitesInput = {
create?: Prisma.XOR<Prisma.UserCreateWithoutCreatedInvitesInput, Prisma.UserUncheckedCreateWithoutCreatedInvitesInput>
connectOrCreate?: Prisma.UserCreateOrConnectWithoutCreatedInvitesInput
@@ -832,6 +855,7 @@ export type UserCreateWithoutSessionsInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -861,6 +885,7 @@ export type UserUncheckedCreateWithoutSessionsInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -906,6 +931,7 @@ export type UserUpdateWithoutSessionsInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -935,6 +961,7 @@ export type UserUncheckedUpdateWithoutSessionsInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -964,6 +991,7 @@ export type UserCreateWithoutAccountsInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -993,6 +1021,7 @@ export type UserUncheckedCreateWithoutAccountsInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -1038,6 +1067,7 @@ export type UserUpdateWithoutAccountsInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -1067,6 +1097,7 @@ export type UserUncheckedUpdateWithoutAccountsInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -1095,6 +1126,7 @@ export type UserCreateWithoutAuthTokensInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -1124,6 +1156,7 @@ export type UserUncheckedCreateWithoutAuthTokensInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -1169,6 +1202,7 @@ export type UserUpdateWithoutAuthTokensInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -1198,6 +1232,7 @@ export type UserUncheckedUpdateWithoutAuthTokensInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -1227,6 +1262,7 @@ export type UserCreateWithoutTeamMembersInput = {
authTokens?: Prisma.AuthTokenCreateNestedManyWithoutUserInput
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -1256,6 +1292,7 @@ export type UserUncheckedCreateWithoutTeamMembersInput = {
authTokens?: Prisma.AuthTokenUncheckedCreateNestedManyWithoutUserInput
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -1301,6 +1338,7 @@ export type UserUpdateWithoutTeamMembersInput = {
authTokens?: Prisma.AuthTokenUpdateManyWithoutUserNestedInput
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -1330,6 +1368,7 @@ export type UserUncheckedUpdateWithoutTeamMembersInput = {
authTokens?: Prisma.AuthTokenUncheckedUpdateManyWithoutUserNestedInput
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -1360,6 +1399,7 @@ export type UserCreateWithoutShareLinksInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -1389,6 +1429,7 @@ export type UserUncheckedCreateWithoutShareLinksInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -1434,6 +1475,7 @@ export type UserUpdateWithoutShareLinksInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -1463,6 +1505,7 @@ export type UserUncheckedUpdateWithoutShareLinksInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -1491,6 +1534,7 @@ export type UserCreateWithoutAssetsInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -1520,6 +1564,7 @@ export type UserUncheckedCreateWithoutAssetsInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -1565,6 +1610,7 @@ export type UserUpdateWithoutAssetsInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -1594,6 +1640,7 @@ export type UserUncheckedUpdateWithoutAssetsInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -1623,6 +1670,7 @@ export type UserCreateWithoutCommentsInput = {
authTokens?: Prisma.AuthTokenCreateNestedManyWithoutUserInput
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -1652,6 +1700,7 @@ export type UserUncheckedCreateWithoutCommentsInput = {
authTokens?: Prisma.AuthTokenUncheckedCreateNestedManyWithoutUserInput
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -1670,6 +1719,71 @@ export type UserCreateOrConnectWithoutCommentsInput = {
create: Prisma.XOR<Prisma.UserCreateWithoutCommentsInput, Prisma.UserUncheckedCreateWithoutCommentsInput>
}
export type UserCreateWithoutCompletionChangedCommentsInput = {
id?: string
type?: $Enums.UserType
name: string
email: string
emailVerified?: boolean
image?: string | null
password?: string | null
agentSettings?:PrismaJson.AgentSettings | Prisma.NullableJsonNullValueInput
guestEmail?: string | null
createdAt?: Date | string
updatedAt?: Date | string
assets?: Prisma.AssetCreateNestedManyWithoutCreatorInput
authTokens?: Prisma.AuthTokenCreateNestedManyWithoutUserInput
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
sessions?: Prisma.SessionCreateNestedManyWithoutUserInput
accounts?: Prisma.AccountCreateNestedManyWithoutUserInput
agent?: Prisma.AgentCreateNestedOneWithoutUserInput
agentSessions?: Prisma.AgentSessionCreateNestedManyWithoutUserInput
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutCompletionChangedCommentsInput = {
id?: string
type?: $Enums.UserType
name: string
email: string
emailVerified?: boolean
image?: string | null
password?: string | null
agentSettings?:PrismaJson.AgentSettings | Prisma.NullableJsonNullValueInput
guestEmail?: string | null
createdAt?: Date | string
updatedAt?: Date | string
assets?: Prisma.AssetUncheckedCreateNestedManyWithoutCreatorInput
authTokens?: Prisma.AuthTokenUncheckedCreateNestedManyWithoutUserInput
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
sessions?: Prisma.SessionUncheckedCreateNestedManyWithoutUserInput
accounts?: Prisma.AccountUncheckedCreateNestedManyWithoutUserInput
agent?: Prisma.AgentUncheckedCreateNestedOneWithoutUserInput
agentSessions?: Prisma.AgentSessionUncheckedCreateNestedManyWithoutUserInput
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutCompletionChangedCommentsInput = {
where: Prisma.UserWhereUniqueInput
create: Prisma.XOR<Prisma.UserCreateWithoutCompletionChangedCommentsInput, Prisma.UserUncheckedCreateWithoutCompletionChangedCommentsInput>
}
export type UserUpsertWithoutCommentsInput = {
update: Prisma.XOR<Prisma.UserUpdateWithoutCommentsInput, Prisma.UserUncheckedUpdateWithoutCommentsInput>
create: Prisma.XOR<Prisma.UserCreateWithoutCommentsInput, Prisma.UserUncheckedCreateWithoutCommentsInput>
@@ -1697,6 +1811,7 @@ export type UserUpdateWithoutCommentsInput = {
authTokens?: Prisma.AuthTokenUpdateManyWithoutUserNestedInput
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -1726,6 +1841,78 @@ export type UserUncheckedUpdateWithoutCommentsInput = {
authTokens?: Prisma.AuthTokenUncheckedUpdateManyWithoutUserNestedInput
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
sessions?: Prisma.SessionUncheckedUpdateManyWithoutUserNestedInput
accounts?: Prisma.AccountUncheckedUpdateManyWithoutUserNestedInput
agent?: Prisma.AgentUncheckedUpdateOneWithoutUserNestedInput
agentSessions?: Prisma.AgentSessionUncheckedUpdateManyWithoutUserNestedInput
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserUpsertWithoutCompletionChangedCommentsInput = {
update: Prisma.XOR<Prisma.UserUpdateWithoutCompletionChangedCommentsInput, Prisma.UserUncheckedUpdateWithoutCompletionChangedCommentsInput>
create: Prisma.XOR<Prisma.UserCreateWithoutCompletionChangedCommentsInput, Prisma.UserUncheckedCreateWithoutCompletionChangedCommentsInput>
where?: Prisma.UserWhereInput
}
export type UserUpdateToOneWithWhereWithoutCompletionChangedCommentsInput = {
where?: Prisma.UserWhereInput
data: Prisma.XOR<Prisma.UserUpdateWithoutCompletionChangedCommentsInput, Prisma.UserUncheckedUpdateWithoutCompletionChangedCommentsInput>
}
export type UserUpdateWithoutCompletionChangedCommentsInput = {
id?: Prisma.StringFieldUpdateOperationsInput | string
type?: Prisma.EnumUserTypeFieldUpdateOperationsInput | $Enums.UserType
name?: Prisma.StringFieldUpdateOperationsInput | string
email?: Prisma.StringFieldUpdateOperationsInput | string
emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
password?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
agentSettings?:PrismaJson.AgentSettings | Prisma.NullableJsonNullValueInput
guestEmail?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assets?: Prisma.AssetUpdateManyWithoutCreatorNestedInput
authTokens?: Prisma.AuthTokenUpdateManyWithoutUserNestedInput
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
sessions?: Prisma.SessionUpdateManyWithoutUserNestedInput
accounts?: Prisma.AccountUpdateManyWithoutUserNestedInput
agent?: Prisma.AgentUpdateOneWithoutUserNestedInput
agentSessions?: Prisma.AgentSessionUpdateManyWithoutUserNestedInput
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutCompletionChangedCommentsInput = {
id?: Prisma.StringFieldUpdateOperationsInput | string
type?: Prisma.EnumUserTypeFieldUpdateOperationsInput | $Enums.UserType
name?: Prisma.StringFieldUpdateOperationsInput | string
email?: Prisma.StringFieldUpdateOperationsInput | string
emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
password?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
agentSettings?:PrismaJson.AgentSettings | Prisma.NullableJsonNullValueInput
guestEmail?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
assets?: Prisma.AssetUncheckedUpdateManyWithoutCreatorNestedInput
authTokens?: Prisma.AuthTokenUncheckedUpdateManyWithoutUserNestedInput
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -1756,6 +1943,7 @@ export type UserCreateWithoutCreatedInvitesInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
sessions?: Prisma.SessionCreateNestedManyWithoutUserInput
@@ -1785,6 +1973,7 @@ export type UserUncheckedCreateWithoutCreatedInvitesInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
sessions?: Prisma.SessionUncheckedCreateNestedManyWithoutUserInput
@@ -1830,6 +2019,7 @@ export type UserUpdateWithoutCreatedInvitesInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
sessions?: Prisma.SessionUpdateManyWithoutUserNestedInput
@@ -1859,6 +2049,7 @@ export type UserUncheckedUpdateWithoutCreatedInvitesInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
sessions?: Prisma.SessionUncheckedUpdateManyWithoutUserNestedInput
@@ -1888,6 +2079,7 @@ export type UserCreateWithoutCreatedNotificationsInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
sessions?: Prisma.SessionCreateNestedManyWithoutUserInput
@@ -1917,6 +2109,7 @@ export type UserUncheckedCreateWithoutCreatedNotificationsInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
sessions?: Prisma.SessionUncheckedCreateNestedManyWithoutUserInput
@@ -1951,6 +2144,7 @@ export type UserCreateWithoutNotificationsInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
sessions?: Prisma.SessionCreateNestedManyWithoutUserInput
@@ -1980,6 +2174,7 @@ export type UserUncheckedCreateWithoutNotificationsInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
sessions?: Prisma.SessionUncheckedCreateNestedManyWithoutUserInput
@@ -2025,6 +2220,7 @@ export type UserUpdateWithoutCreatedNotificationsInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
sessions?: Prisma.SessionUpdateManyWithoutUserNestedInput
@@ -2054,6 +2250,7 @@ export type UserUncheckedUpdateWithoutCreatedNotificationsInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
sessions?: Prisma.SessionUncheckedUpdateManyWithoutUserNestedInput
@@ -2094,6 +2291,7 @@ export type UserUpdateWithoutNotificationsInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
sessions?: Prisma.SessionUpdateManyWithoutUserNestedInput
@@ -2123,6 +2321,7 @@ export type UserUncheckedUpdateWithoutNotificationsInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
sessions?: Prisma.SessionUncheckedUpdateManyWithoutUserNestedInput
@@ -2151,6 +2350,7 @@ export type UserCreateWithoutTasksInput = {
authTokens?: Prisma.AuthTokenCreateNestedManyWithoutUserInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -2180,6 +2380,7 @@ export type UserUncheckedCreateWithoutTasksInput = {
authTokens?: Prisma.AuthTokenUncheckedCreateNestedManyWithoutUserInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -2225,6 +2426,7 @@ export type UserUpdateWithoutTasksInput = {
authTokens?: Prisma.AuthTokenUpdateManyWithoutUserNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -2254,6 +2456,7 @@ export type UserUncheckedUpdateWithoutTasksInput = {
authTokens?: Prisma.AuthTokenUncheckedUpdateManyWithoutUserNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -2284,6 +2487,7 @@ export type UserCreateWithoutAgentInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -2313,6 +2517,7 @@ export type UserUncheckedCreateWithoutAgentInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -2358,6 +2563,7 @@ export type UserUpdateWithoutAgentInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -2387,6 +2593,7 @@ export type UserUncheckedUpdateWithoutAgentInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -2416,6 +2623,7 @@ export type UserCreateWithoutAgentSessionsInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -2445,6 +2653,7 @@ export type UserUncheckedCreateWithoutAgentSessionsInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -2490,6 +2699,7 @@ export type UserUpdateWithoutAgentSessionsInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -2519,6 +2729,7 @@ export type UserUncheckedUpdateWithoutAgentSessionsInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -2548,6 +2759,7 @@ export type UserCreateWithoutUserMetadataInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -2577,6 +2789,7 @@ export type UserUncheckedCreateWithoutUserMetadataInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -2622,6 +2835,7 @@ export type UserUpdateWithoutUserMetadataInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -2651,6 +2865,7 @@ export type UserUncheckedUpdateWithoutUserMetadataInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -2680,6 +2895,7 @@ export type UserCreateWithoutCollectionsInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -2709,6 +2925,7 @@ export type UserUncheckedCreateWithoutCollectionsInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -2754,6 +2971,7 @@ export type UserUpdateWithoutCollectionsInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -2783,6 +3001,7 @@ export type UserUncheckedUpdateWithoutCollectionsInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -2812,6 +3031,7 @@ export type UserCreateWithoutApiTokensInput = {
tasks?: Prisma.TaskCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationCreateNestedManyWithoutUserInput
@@ -2841,6 +3061,7 @@ export type UserUncheckedCreateWithoutApiTokensInput = {
tasks?: Prisma.TaskUncheckedCreateNestedManyWithoutCreatorInput
teamMembers?: Prisma.TeamMemberUncheckedCreateNestedManyWithoutUserInput
comments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCreatorInput
completionChangedComments?: Prisma.AssetCommentUncheckedCreateNestedManyWithoutCompletionLastChangedByInput
createdInvites?: Prisma.InviteUncheckedCreateNestedManyWithoutInviterInput
createdNotifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutCreatorInput
notifications?: Prisma.NotificationUncheckedCreateNestedManyWithoutUserInput
@@ -2886,6 +3107,7 @@ export type UserUpdateWithoutApiTokensInput = {
tasks?: Prisma.TaskUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUpdateManyWithoutUserNestedInput
@@ -2915,6 +3137,7 @@ export type UserUncheckedUpdateWithoutApiTokensInput = {
tasks?: Prisma.TaskUncheckedUpdateManyWithoutCreatorNestedInput
teamMembers?: Prisma.TeamMemberUncheckedUpdateManyWithoutUserNestedInput
comments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCreatorNestedInput
completionChangedComments?: Prisma.AssetCommentUncheckedUpdateManyWithoutCompletionLastChangedByNestedInput
createdInvites?: Prisma.InviteUncheckedUpdateManyWithoutInviterNestedInput
createdNotifications?: Prisma.NotificationUncheckedUpdateManyWithoutCreatorNestedInput
notifications?: Prisma.NotificationUncheckedUpdateManyWithoutUserNestedInput
@@ -2938,6 +3161,7 @@ export type UserCountOutputType = {
tasks: number
teamMembers: number
comments: number
completionChangedComments: number
createdInvites: number
createdNotifications: number
notifications: number
@@ -2956,6 +3180,7 @@ export type UserCountOutputTypeSelect<ExtArgs extends runtime.Types.Extensions.I
tasks?: boolean | UserCountOutputTypeCountTasksArgs
teamMembers?: boolean | UserCountOutputTypeCountTeamMembersArgs
comments?: boolean | UserCountOutputTypeCountCommentsArgs
completionChangedComments?: boolean | UserCountOutputTypeCountCompletionChangedCommentsArgs
createdInvites?: boolean | UserCountOutputTypeCountCreatedInvitesArgs
createdNotifications?: boolean | UserCountOutputTypeCountCreatedNotificationsArgs
notifications?: boolean | UserCountOutputTypeCountNotificationsArgs
@@ -3013,6 +3238,13 @@ export type UserCountOutputTypeCountCommentsArgs<ExtArgs extends runtime.Types.E
where?: Prisma.AssetCommentWhereInput
}
/**
* UserCountOutputType without action
*/
export type UserCountOutputTypeCountCompletionChangedCommentsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
where?: Prisma.AssetCommentWhereInput
}
/**
* UserCountOutputType without action
*/
@@ -3101,6 +3333,7 @@ export type UserSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = r
tasks?: boolean | Prisma.User$tasksArgs<ExtArgs>
teamMembers?: boolean | Prisma.User$teamMembersArgs<ExtArgs>
comments?: boolean | Prisma.User$commentsArgs<ExtArgs>
completionChangedComments?: boolean | Prisma.User$completionChangedCommentsArgs<ExtArgs>
createdInvites?: boolean | Prisma.User$createdInvitesArgs<ExtArgs>
createdNotifications?: boolean | Prisma.User$createdNotificationsArgs<ExtArgs>
notifications?: boolean | Prisma.User$notificationsArgs<ExtArgs>
@@ -3164,6 +3397,7 @@ export type UserInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs =
tasks?: boolean | Prisma.User$tasksArgs<ExtArgs>
teamMembers?: boolean | Prisma.User$teamMembersArgs<ExtArgs>
comments?: boolean | Prisma.User$commentsArgs<ExtArgs>
completionChangedComments?: boolean | Prisma.User$completionChangedCommentsArgs<ExtArgs>
createdInvites?: boolean | Prisma.User$createdInvitesArgs<ExtArgs>
createdNotifications?: boolean | Prisma.User$createdNotificationsArgs<ExtArgs>
notifications?: boolean | Prisma.User$notificationsArgs<ExtArgs>
@@ -3188,6 +3422,7 @@ export type $UserPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs =
tasks: Prisma.$TaskPayload<ExtArgs>[]
teamMembers: Prisma.$TeamMemberPayload<ExtArgs>[]
comments: Prisma.$AssetCommentPayload<ExtArgs>[]
completionChangedComments: Prisma.$AssetCommentPayload<ExtArgs>[]
createdInvites: Prisma.$InvitePayload<ExtArgs>[]
createdNotifications: Prisma.$NotificationPayload<ExtArgs>[]
notifications: Prisma.$NotificationPayload<ExtArgs>[]
@@ -3614,6 +3849,7 @@ export interface Prisma__UserClient<T, Null = never, ExtArgs extends runtime.Typ
tasks<T extends Prisma.User$tasksArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$tasksArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$TaskPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
teamMembers<T extends Prisma.User$teamMembersArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$teamMembersArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$TeamMemberPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
comments<T extends Prisma.User$commentsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$commentsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$AssetCommentPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
completionChangedComments<T extends Prisma.User$completionChangedCommentsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$completionChangedCommentsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$AssetCommentPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
createdInvites<T extends Prisma.User$createdInvitesArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$createdInvitesArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$InvitePayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
createdNotifications<T extends Prisma.User$createdNotificationsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$createdNotificationsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$NotificationPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
notifications<T extends Prisma.User$notificationsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$notificationsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$NotificationPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
@@ -4177,6 +4413,30 @@ export type User$commentsArgs<ExtArgs extends runtime.Types.Extensions.InternalA
distinct?: Prisma.AssetCommentScalarFieldEnum | Prisma.AssetCommentScalarFieldEnum[]
}
/**
* User.completionChangedComments
*/
export type User$completionChangedCommentsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
/**
* Select specific fields to fetch from the AssetComment
*/
select?: Prisma.AssetCommentSelect<ExtArgs> | null
/**
* Omit specific fields from the AssetComment
*/
omit?: Prisma.AssetCommentOmit<ExtArgs> | null
/**
* Choose, which related nodes to fetch as well
*/
include?: Prisma.AssetCommentInclude<ExtArgs> | null
where?: Prisma.AssetCommentWhereInput
orderBy?: Prisma.AssetCommentOrderByWithRelationInput | Prisma.AssetCommentOrderByWithRelationInput[]
cursor?: Prisma.AssetCommentWhereUniqueInput
take?: number
skip?: number
distinct?: Prisma.AssetCommentScalarFieldEnum | Prisma.AssetCommentScalarFieldEnum[]
}
/**
* User.createdInvites
*/
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/dtos",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"main": "./src/index.ts",
+11
View File
@@ -13,6 +13,7 @@ export const previewInfoSchema = z.object({
originalHeight: z.number().optional(),
originalWidth: z.number().optional(),
spriteUrl: z.string().optional(),
duration: z.number().optional(),
})
export type PreviewInfo = z.infer<typeof previewInfoSchema>
@@ -203,6 +204,8 @@ export type CommentInfo = {
createdAt: string
updatedAt: string
sessionId: string | null
isCompleted: boolean
completionLastChangedBy: AssetUserInfo | null
}
export const commentInfoSchema: z.ZodType<CommentInfo> = z.object({
@@ -219,8 +222,15 @@ export const commentInfoSchema: z.ZodType<CommentInfo> = z.object({
createdAt: z.string(),
updatedAt: z.string(),
sessionId: z.string().nullable(),
isCompleted: z.boolean(),
completionLastChangedBy: assetUserInfoSchema.nullable(),
})
export const completeCommentRequestSchema = z.object({
isCompleted: z.boolean(),
})
export type CompleteCommentRequest = z.infer<typeof completeCommentRequestSchema>
export const reparentAssetsRequestSchema = z.object({
newParentId: z.string(),
assetIds: z.array(z.string()),
@@ -279,6 +289,7 @@ export interface ImageTranscode {
export interface VideoTranscode {
id: string
url: string
key: string
width: number
height: number
size: number
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/tableprinter",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"main": "./src/index.ts",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/transcode",
"version": "0.1.3",
"version": "0.1.7",
"private": true,
"type": "module",
"main": "./src/index.ts",
@@ -14,6 +14,7 @@ import {
overlayAnnotationsActivity,
takeScreenshotsActivity,
transcodeVideoActivity,
transcodeAudioActivity,
updateAssetMediaActivity,
downloadMediaToTmpActivity,
transcodeImageActivity,
@@ -36,8 +37,10 @@ vi.mock('@shumai/core/src/s3/s3', () => ({
vi.mock('@shumai/core/src/transcode/transcode', () => ({
transcodeService: {
getVideoInfo: vi.fn(),
getAudioInfo: vi.fn(),
getImageInfo: vi.fn(),
transcodeVideo: vi.fn(),
transcodeAudio: vi.fn(),
transcodeImage: vi.fn(),
generateSprite: vi.fn(),
createTempDir: vi.fn().mockReturnValue('/tmp'),
@@ -143,20 +146,49 @@ describe('Transcode Activities', () => {
)
})
it('should set file_type to audio for audio files', async () => {
it('should set file_type to audio for audio files and extract audio metadata', async () => {
const asset = await prisma.asset.create({
data: { name: 'a.mp3', type: 'file', status: 'uploaded' },
})
vi.mocked(transcodeService.getAudioInfo).mockResolvedValue({
originalWidth: 0,
originalHeight: 0,
duration: 45.5,
bitRate: 128000,
frameRate: 0,
totalFrames: 0,
hasAudio: true,
audioCodec: 'mp3',
audioChannels: 2,
audioSampleRate: 44100,
audioBitDepth: 16,
mimeType: 'audio/mpeg',
})
await getMediaInfoActivity({
const result = await getMediaInfoActivity({
assetId: asset.id,
filePath: '/tmp/a.mp3',
mediaType: 'audio/mpeg',
})
expect(transcodeService.getAudioInfo).toHaveBeenCalledWith('/tmp/a.mp3')
expect(result.duration).toBe(45.5)
expect(result.metadata?.duration).toBe(45.5)
expect(result.metadata?.audioCodec).toBe('mp3')
expect(result.metadata?.audioChannels).toBe(2)
expect(result.metadata?.audioSampleRate).toBe(44100)
expect(result.metadata?.audioBitDepth).toBe(16)
expect(metadataService.updateAssetMetadata).toHaveBeenCalledWith(
asset.id,
expect.arrayContaining([{ key: 'file_type', value: 'audio' }]),
expect.arrayContaining([
{ key: 'file_type', value: 'audio' },
{ key: 'duration', value: 45.5 },
{ key: 'audio_codec', value: 'mp3' },
{ key: 'audio_channels', value: 2 },
{ key: 'audio_sample_rate', value: 44100 },
{ key: 'audio_bit_depth', value: 16 },
]),
true,
)
})
@@ -437,5 +469,53 @@ describe('Transcode Activities', () => {
await deleteS3ObjectActivity({ key: 'files/test-key.mp4' })
expect(s3Service.deleteObject).toHaveBeenCalledWith('shumai', 'files/test-key.mp4')
})
it('should transcode audio file and upload proxy to S3', async () => {
vi.mocked(s3Service.headObject).mockRejectedValue(new Error('Not found'))
vi.mocked(transcodeService.transcodeAudio).mockResolvedValue()
const res = await transcodeAudioActivity({
assetKey: 'files/proj-123/a.wav',
filePath: '/tmp/a.wav',
})
expect(transcodeService.transcodeAudio).toHaveBeenCalledWith({
inputFile: '/tmp/a.wav',
outputFile: expect.stringContaining('a-audio-proxy.mp4'),
bitrate: '128k',
})
expect(s3Service.putObject).toHaveBeenCalledWith(
'shumai',
'files/proj-123/a-audio-proxy.mp4',
expect.any(Buffer),
expect.any(Number),
'video/mp4',
)
expect(res).toEqual({
width: 0,
height: 0,
key: 'files/proj-123/a-audio-proxy.mp4',
})
})
it('should return existing audio transcode if already exists in S3', async () => {
vi.mocked(s3Service.headObject).mockResolvedValue(
{} as Awaited<ReturnType<typeof s3Service.headObject>>,
)
const res = await transcodeAudioActivity({
assetKey: 'files/proj-123/a.wav',
filePath: '/tmp/a.wav',
})
expect(transcodeService.transcodeAudio).not.toHaveBeenCalled()
expect(res).toEqual({
width: 0,
height: 0,
key: 'files/proj-123/a-audio-proxy.mp4',
})
})
})
})
+116 -19
View File
@@ -2,6 +2,7 @@ import { prisma, WorkflowTaskType, WorkflowTaskStatus } from '@shumai/db'
import { s3Service } from '@shumai/core/src/s3/s3'
import { transcodeService } from '@shumai/core'
import { metadataService } from '@shumai/core/src/metadata/metadata'
import { stemFromKey } from '@shumai/core/src/utils/filename'
import { ApplicationFailure } from '@temporalio/activity'
import * as path from 'path'
import * as fs from 'fs'
@@ -115,6 +116,36 @@ export async function getMediaInfoActivity(params: {
metadataUpdates.push({ key: 'audio_sample_rate', value: info.audioSampleRate })
if (info.audioBitDepth !== undefined)
metadataUpdates.push({ key: 'audio_bit_depth', value: info.audioBitDepth })
} else if (isAudio) {
const info = await transcodeService.getAudioInfo(params.filePath)
mediaInfo.duration = info.duration
mediaInfo.metadata = {
originalWidth: 0,
originalHeight: 0,
duration: info.duration,
bitRate: info.bitRate,
frameRate: 0,
totalFrames: 0,
startTimecode: '00:00:00:00',
hasAudio: true,
videoCodec: undefined,
audioCodec: info.audioCodec,
audioChannels: info.audioChannels,
audioSampleRate: info.audioSampleRate,
audioBitDepth: info.audioBitDepth,
format: {},
}
metadataUpdates.push(
{ key: 'duration', value: info.duration },
{ key: 'bitRate', value: info.bitRate / 1000 },
)
if (info.audioCodec) metadataUpdates.push({ key: 'audio_codec', value: info.audioCodec })
if (info.audioChannels !== undefined)
metadataUpdates.push({ key: 'audio_channels', value: info.audioChannels })
if (info.audioSampleRate !== undefined)
metadataUpdates.push({ key: 'audio_sample_rate', value: info.audioSampleRate })
if (info.audioBitDepth !== undefined)
metadataUpdates.push({ key: 'audio_bit_depth', value: info.audioBitDepth })
} else if (isImage) {
const info = await transcodeService.getImageInfo(params.filePath)
mediaInfo.metadata = {
@@ -162,7 +193,9 @@ export async function transcodeVideoActivity(
params: VideoActivityParams,
): Promise<PrismaJson.VideoTranscode> {
const bucket = process.env.S3_BUCKET || 'shumai'
const key = path.join(path.dirname(params.assetKey), `video-${params.videoSpec.height}p.mp4`)
const stem = stemFromKey(params.assetKey)
const res = params.videoSpec.resolution || `${params.videoSpec.height}p`
const key = path.posix.join(path.posix.dirname(params.assetKey), `${stem}-${res}.mp4`)
try {
await s3Service.headObject(bucket, key)
@@ -172,7 +205,7 @@ export async function transcodeVideoActivity(
}
const tmpDir = path.dirname(params.filePath)
const outputFile = path.join(tmpDir, `video-${params.videoSpec.height}p.mp4`)
const outputFile = path.join(tmpDir, `${stem}-${res}.mp4`)
try {
let targetFps: number | string = params.originalFps || 30
@@ -227,6 +260,64 @@ export async function transcodeVideoActivity(
}
}
export interface AudioActivityParams {
assetKey: string
filePath: string
}
export async function transcodeAudioActivity(
params: AudioActivityParams,
): Promise<PrismaJson.VideoTranscode> {
const bucket = process.env.S3_BUCKET || 'shumai'
const stem = stemFromKey(params.assetKey)
const key = path.posix.join(path.posix.dirname(params.assetKey), `${stem}-audio-proxy.mp4`)
try {
await s3Service.headObject(bucket, key)
return { width: 0, height: 0, key }
} catch {
// Not found
}
const tmpDir = path.dirname(params.filePath)
const outputFile = path.join(tmpDir, `${stem}-audio-proxy.mp4`)
try {
await transcodeService.transcodeAudio({
inputFile: params.filePath,
outputFile,
bitrate: '128k',
})
const buffer = fs.readFileSync(outputFile)
await s3Service.putObject(bucket, key, buffer, buffer.length, 'video/mp4')
return { width: 0, height: 0, key }
} catch (err) {
const { code, message } = getErrorDetails(err)
const lowerMsg = message.toLowerCase()
if (
code === 'ENOENT' ||
lowerMsg.includes('enoent') ||
lowerMsg.includes('ffmpeg') ||
lowerMsg.includes('ffprobe') ||
lowerMsg.includes('spawn') ||
lowerMsg.includes('format') ||
lowerMsg.includes('no video stream found')
) {
throw ApplicationFailure.create({
message: `Audio transcoding failed: ${message}`,
nonRetryable: true,
cause: err instanceof Error ? err : undefined,
})
}
throw err
} finally {
if (fs.existsSync(outputFile)) fs.unlinkSync(outputFile)
}
}
export interface ImageActivityParams {
assetKey: string
filePath: string
@@ -237,7 +328,11 @@ export async function transcodeImageActivity(
params: ImageActivityParams,
): Promise<PrismaJson.ImageTranscode> {
const bucket = process.env.S3_BUCKET || 'shumai'
const key = path.join(path.dirname(params.assetKey), `image-${params.imageSpec.width}p.webp`)
const stem = stemFromKey(params.assetKey)
const key = path.posix.join(
path.posix.dirname(params.assetKey),
`${stem}-${params.imageSpec.width}p.webp`,
)
try {
await s3Service.headObject(bucket, key)
@@ -247,7 +342,7 @@ export async function transcodeImageActivity(
}
const tmpDir = path.dirname(params.filePath)
const outputFile = path.join(tmpDir, `image-${params.imageSpec.width}p.webp`)
const outputFile = path.join(tmpDir, `${stem}-${params.imageSpec.width}p.webp`)
try {
await transcodeService.transcodeImage(
@@ -487,23 +582,25 @@ export interface CreateEmbeddingTaskIfEnabledParams {
export async function createEmbeddingTaskIfEnabledActivity(
params: CreateEmbeddingTaskIfEnabledParams,
): Promise<void> {
let teamId = params.teamId
let projectId = params.projectId
// Resolve teamId and projectId from asset if missing
if (!teamId || !projectId) {
const asset = await prisma.asset.findUnique({
where: { id: params.assetId },
include: {
project: true,
},
})
if (asset) {
projectId = projectId || asset.projectId
teamId = teamId || asset.project?.teamId || null
}
const asset = await prisma.asset.findUnique({
where: { id: params.assetId },
include: {
project: true,
},
})
if (!asset) {
return
}
const isVideo = asset.mediaType?.startsWith('video/')
const isImage = asset.mediaType?.startsWith('image/')
if (!isVideo && !isImage) {
return
}
const teamId = params.teamId || asset.project?.teamId || null
const projectId = params.projectId || asset.projectId
if (!teamId) {
return
}
@@ -25,6 +25,7 @@ describe('Transcode Workflow', () => {
getAssetActivity: Object.assign(vi.fn(), { _activityName: 'getAssetActivity' }),
getMediaInfoActivity: Object.assign(vi.fn(), { _activityName: 'getMediaInfoActivity' }),
transcodeVideoActivity: Object.assign(vi.fn(), { _activityName: 'transcodeVideoActivity' }),
transcodeAudioActivity: Object.assign(vi.fn(), { _activityName: 'transcodeAudioActivity' }),
transcodeImageActivity: Object.assign(vi.fn(), { _activityName: 'transcodeImageActivity' }),
generateSpriteActivity: Object.assign(vi.fn(), { _activityName: 'generateSpriteActivity' }),
updateAssetMediaActivity: Object.assign(vi.fn(), {
@@ -388,4 +389,87 @@ describe('Transcode Workflow', () => {
output: { key: 'files/asset-image/annotations/ann1.webp' },
})
})
it('should run audio transcoding workflow successfully', async () => {
const task: WorkflowTask = {
id: 'task-audio',
assetId: 'asset-audio',
type: WorkflowTaskType.transcode,
status: WorkflowTaskStatus.pending,
output: null,
payload: {
projectId: 'proj-1',
transcode: {},
},
createdAt: new Date(),
updatedAt: new Date(),
heartbeat: null,
teamId: 'team-1',
projectId: 'proj-1',
uid: 'task-uid-2',
model: null,
inputTokens: 0,
outputTokens: 0,
}
mockActivities.getAssetActivity.mockResolvedValue({
id: 'asset-audio',
storageKey: { key: 'audio.wav' },
mediaType: 'audio/wav',
})
mockActivities.getMediaInfoActivity.mockResolvedValue({
mimeType: 'audio/wav',
metadata: {
originalWidth: 0,
originalHeight: 0,
duration: 30,
bitRate: 1411200,
frameRate: 0,
totalFrames: 0,
hasAudio: true,
audioCodec: 'pcm_s16le',
audioChannels: 2,
},
original: {
key: 'audio.wav',
downloadUrl: '',
filesizeInBytes: 0,
codec: '',
},
videoTranscodes: [],
})
mockActivities.transcodeAudioActivity.mockResolvedValue({
width: 0,
height: 0,
key: 'files/asset-audio/audio-audio-proxy.mp4',
})
await transcodeMedia(task)
expect(mockActivities.transcodeAudioActivity).toHaveBeenCalledWith({
assetKey: 'audio.wav',
filePath: '/tmp/video.mp4',
})
expect(mockActivities.updateAssetMediaActivity).toHaveBeenCalledWith({
assetId: 'asset-audio',
mediaInfo: expect.objectContaining({
mimeType: 'audio/wav',
videoTranscodes: [
{
width: 0,
height: 0,
key: 'files/asset-audio/audio-audio-proxy.mp4',
},
],
}),
})
expect(mockActivities.updateTaskStatusActivity).toHaveBeenCalledWith({
taskId: 'task-audio',
status: WorkflowTaskStatus.completed,
})
})
})
@@ -10,6 +10,7 @@ export async function transcodeMedia(task: WorkflowTask): Promise<void> {
getAssetActivity,
getMediaInfoActivity,
transcodeVideoActivity,
transcodeAudioActivity,
transcodeImageActivity,
generateSpriteActivity,
updateAssetMediaActivity,
@@ -181,6 +182,16 @@ export async function transcodeMedia(task: WorkflowTask): Promise<void> {
})
}
// 6.5 Audio Transcoding
const isAudio = mimeType.startsWith('audio/')
if (isAudio && metadata) {
const audioTranscode = await executeActivity(workerQueue, transcodeAudioActivity, {
assetKey: key,
filePath,
})
mediaInfo.videoTranscodes.push(audioTranscode)
}
// 7. Image Transcoding
const isImage = mimeType.startsWith('image/')
const isPsd = isMimePsd(mimeType)
+129 -6
View File
@@ -1,8 +1,10 @@
import { Badge } from '@/ui/components/ui/badge'
import { client } from '@/ui/api/client'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuPortal,
DropdownMenuSeparator,
DropdownMenuSub,
@@ -21,7 +23,7 @@ import { cn } from '@/ui/lib/utils'
import { m } from '@/ui/paraglide/messages.js'
import type { AncestorFolder } from '@shumai/dtos'
import { Link, useNavigate } from '@tanstack/react-router'
import { Check, ChevronDown, FileIcon, History, LayoutGrid, List } from 'lucide-react'
import { Check, ChevronDown, Columns2, FileIcon, History, LayoutGrid, List } from 'lucide-react'
interface BreadcrumbNavProps {
teamId: string
@@ -32,6 +34,7 @@ interface BreadcrumbNavProps {
name?: string
type: 'file' | 'folder'
version?: number
mediaType?: string | null
}
isRootFolder: boolean
displayStyle?: 'card' | 'list'
@@ -44,6 +47,15 @@ interface BreadcrumbNavProps {
shareId?: string
onFolderClick?: (folderId: string) => void
fileId?: string
downloadInfo?: {
originalKey?: string
videoTranscodes?: Array<{
key: string
width: number
height: number
isRaw?: boolean
}>
}
versions?: Array<{
id: string
version: number
@@ -51,6 +63,9 @@ interface BreadcrumbNavProps {
previewUrl?: string | null
creator?: { id: string; name: string | null } | null
}>
compareMode?: boolean
canCompareVersions?: boolean
onCompareVersions?: () => void
}
export function BreadcrumbNav({
@@ -69,13 +84,27 @@ export function BreadcrumbNav({
isPublic = false,
onFolderClick,
fileId,
shareId,
downloadInfo,
versions,
compareMode = false,
canCompareVersions = false,
onCompareVersions,
}: BreadcrumbNavProps) {
const navigate = useNavigate()
const { canEdit } = usePermissions(projectId)
const handleVersionClick = (versionId: string) => {
if (!projectId || !fileId) return
if (!fileId) return
if (isPublic && shareId) {
navigate({
to: '/share/$shareId/files/$fileId',
params: { shareId, fileId },
search: (prev: Record<string, unknown>) => ({ ...prev, version: versionId }),
})
return
}
if (!projectId) return
navigate({
to: '/projects/$projectId/files/$fileId',
params: { projectId, fileId },
@@ -83,6 +112,36 @@ export function BreadcrumbNav({
})
}
const handleDownload = async (key: string) => {
if (!fileId) return
try {
const res = shareId
? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
param: { shareId, fileId },
json: { key },
})
: await client.api.files['download-url'].$post({
json: { key, assetId: fileId },
})
if (!res.ok) return
const { url } = await res.json()
const link = document.createElement('a')
link.href = url
link.download = ''
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
} catch {
// silently fail
}
}
const isAudio = currentAsset.mediaType?.startsWith('audio/')
const hasVideoTranscodes =
!isAudio &&
downloadInfo?.videoTranscodes &&
downloadInfo.videoTranscodes.filter((t) => !t.isRaw).length > 0
const breadcrumbs: { name: string; path?: string; id?: string; isMuted?: boolean }[] = isPublic
? [
{
@@ -136,7 +195,7 @@ export function BreadcrumbNav({
)}
</div>
))}
{!isRootFolder && (
{!isRootFolder && !compareMode && (
<div className="flex items-center gap-1">
<span className="text-muted-foreground">/</span>
{currentAsset.type === 'folder' ? (
@@ -155,9 +214,63 @@ export function BreadcrumbNav({
<ChevronDown className="h-4 w-4" />
</DropdownMenuTrigger>
<DropdownMenuContent className="w-56">
<DropdownMenuItem onClick={() => console.log('Download')}>
Download
</DropdownMenuItem>
{hasVideoTranscodes ? (
<DropdownMenuSub>
<DropdownMenuSubTrigger className="flex items-center gap-2">
<span>{m.download()}</span>
</DropdownMenuSubTrigger>
<DropdownMenuPortal>
<DropdownMenuSubContent className="w-48">
<DropdownMenuLabel>{m.download()}</DropdownMenuLabel>
{downloadInfo?.videoTranscodes
?.filter((t) => !t.isRaw)
.map((t) => {
const longSide = Math.max(t.width, t.height)
let resolution = `${t.height}p`
if (longSide >= 3840) resolution = '2160p'
else if (longSide >= 1920) resolution = '1080p'
else if (longSide >= 1280) resolution = '720p'
else if (longSide >= 960) resolution = '540p'
else if (longSide >= 640) resolution = '360p'
else if (longSide >= 320) resolution = '180p'
return (
<DropdownMenuItem
key={resolution}
onClick={() => handleDownload(t.key)}
className="flex items-center justify-between"
>
<span>{resolution}</span>
<span className="text-xs text-muted-foreground">MP4</span>
</DropdownMenuItem>
)
})}
{downloadInfo?.originalKey && (
<>
<DropdownMenuSeparator />
<DropdownMenuItem
onClick={() => handleDownload(downloadInfo.originalKey!)}
className="flex items-center justify-between"
>
<span>Original</span>
<span className="text-xs text-muted-foreground">
{currentAsset.name?.split('.').pop()?.toUpperCase() || 'RAW'}
</span>
</DropdownMenuItem>
</>
)}
</DropdownMenuSubContent>
</DropdownMenuPortal>
</DropdownMenuSub>
) : (
<DropdownMenuItem
onClick={() =>
downloadInfo?.originalKey && handleDownload(downloadInfo.originalKey)
}
disabled={!downloadInfo?.originalKey}
>
{m.download()}
</DropdownMenuItem>
)}
{canEdit && (
<DropdownMenuItem onClick={() => console.log('Rename')}>
Rename
@@ -169,6 +282,16 @@ export function BreadcrumbNav({
</DropdownMenuItem>
)}
{canCompareVersions && onCompareVersions && (
<>
<DropdownMenuSeparator />
<DropdownMenuItem onClick={() => onCompareVersions()}>
<Columns2 className="h-4 w-4" />
<span>{m.compare_versions()}</span>
</DropdownMenuItem>
</>
)}
{versions && versions.length > 0 && (
<>
<DropdownMenuSeparator />
+97 -16
View File
@@ -10,16 +10,17 @@ import {
import { Separator } from '@/ui/components/ui/separator'
import { formatTimeAgo } from '@/ui/lib/time'
import type { AttachmentInfo, CommentInfo, UserInfo } from '@shumai/dtos'
import { useQuery } from '@tanstack/react-query'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { Download, File, Terminal } from 'lucide-react'
import React from 'react'
import Markdown from 'react-markdown'
import { Avatar, AvatarFallback, AvatarImage } from '../ui/avatar'
import { DrawAnnotation } from '../ui/icons'
import { Skeleton } from '../ui/skeleton'
import { formatTimecode } from '../viewers/utils'
import { formatTimecode } from '../viewers/video/utils'
import { m } from '@/ui/paraglide/messages.js'
import { useUiStore } from '@/ui/stores/ui'
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip'
interface MessageCardProps {
teamId?: string
@@ -37,6 +38,42 @@ interface MessageCardProps {
rootParentId?: string
}
const UnfilledCircleCheck: React.FC<React.SVGProps<SVGSVGElement>> = (props) => (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
{...props}
>
<circle cx="12" cy="12" r="10" />
<path d="m9 12 2 2 4-4" />
</svg>
)
const FilledCircleCheck: React.FC<React.SVGProps<SVGSVGElement>> = (props) => (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="currentColor"
stroke="none"
{...props}
>
<circle cx="12" cy="12" r="10" />
<path
d="m9 12 2 2 4-4"
fill="none"
stroke="white"
strokeWidth="2.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
)
/* eslint-disable @typescript-eslint/naming-convention */
const AI_PLACEHOLDERS: Record<string, string> = {
__CHAT__: 'Generating...',
@@ -91,6 +128,23 @@ export const MessageCard: React.FC<MessageCardProps> = ({
const isAdmin = me?.role === 'owner'
const queryClient = useQueryClient()
const { mutate: toggleComplete } = useMutation({
mutationFn: async () => {
const res = await client.api.comments[':commentId'].complete.$post({
param: { commentId: message.id },
json: { isCompleted: !message.isCompleted },
})
if (!res.ok) throw new Error('Failed to update comment completion status')
return await res.json()
},
onSuccess: () => {
queryClient.invalidateQueries({
predicate: (query) => query.queryKey.includes('comments'),
})
},
})
const { data: logs, isLoading: isLogsLoading } = useQuery({
queryKey: ['agent-sessions', message.sessionId, 'entries'],
queryFn: async () => {
@@ -273,13 +327,40 @@ export const MessageCard: React.FC<MessageCardProps> = ({
)}
{/* Actions */}
<div className="mt-2 opacity-0 group-hover:opacity-100 transition-opacity duration-200 flex items-center gap-4">
<div className="mt-2 flex items-center justify-between w-full">
<button
onClick={handleReply}
className="text-xs font-medium text-gray-500 hover:text-blue-600 flex items-center gap-1 cursor-pointer"
>
Reply
{m.reply()}
</button>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<button
onClick={(e) => {
e.stopPropagation()
toggleComplete()
}}
className={`flex items-center justify-center p-1 rounded-full transition-colors cursor-pointer ${
message.isCompleted
? 'text-green-500 hover:text-green-600 hover:bg-green-500/10'
: 'text-gray-400 hover:text-green-500 hover:bg-green-500/10'
}`}
>
{message.isCompleted ? (
<FilledCircleCheck className="w-5 h-5" />
) : (
<UnfilledCircleCheck className="w-5 h-5" />
)}
</button>
</TooltipTrigger>
<TooltipContent>
{message.isCompleted ? m.mark_as_incomplete() : m.mark_as_complete()}
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
</div>
@@ -289,11 +370,9 @@ export const MessageCard: React.FC<MessageCardProps> = ({
<DialogHeader className="pb-4 border-b border-foreground/15">
<DialogTitle className="flex items-center gap-2 text-xl font-bold">
<Terminal className="w-5 h-5 text-violet-500" />
Agent Session Logs
{m.agent_session_logs()}
</DialogTitle>
<DialogDescription>
Step-by-step execution trace of the agent's background tasks and tool calls.
</DialogDescription>
<DialogDescription>{m.agent_logs_description()}</DialogDescription>
</DialogHeader>
<div className="flex-1 overflow-y-auto pr-1 py-4 space-y-4 min-h-0 select-text">
@@ -338,20 +417,22 @@ export const MessageCard: React.FC<MessageCardProps> = ({
if (msg.role === 'user') {
badgeColor =
'bg-slate-100 text-slate-800 dark:bg-slate-900/30 dark:text-slate-300'
roleName = 'User'
roleName = m.role_user()
} else if (msg.role === 'assistant') {
badgeColor =
'bg-violet-100 text-violet-800 dark:bg-violet-900/30 dark:text-violet-300'
roleName = 'Agent'
roleName = m.role_agent()
} else if (msg.role === 'toolResult') {
badgeColor = msg.isError
? 'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-300'
: 'bg-emerald-100 text-emerald-800 dark:bg-emerald-900/30 dark:text-emerald-300'
roleName = `Tool Result: ${String(msg.toolName || 'Unknown')}`
roleName = m.tool_result_with_name({
name: String(msg.toolName || m.unknown()),
})
} else if (msg.role === 'thought') {
badgeColor =
'bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300'
roleName = 'Thinking'
roleName = m.role_thinking()
}
const renderToolCallArguments = (args: unknown) => {
@@ -450,7 +531,7 @@ export const MessageCard: React.FC<MessageCardProps> = ({
if (type === 'toolCall') {
const toolName = String(
itemObj.name || itemObj.toolName || 'Unknown',
itemObj.name || itemObj.toolName || m.unknown(),
)
const toolArgs = itemObj.arguments || itemObj.args
renderedBlocks.push(
@@ -480,7 +561,7 @@ export const MessageCard: React.FC<MessageCardProps> = ({
key={`img-${idx}`}
className="text-xs text-muted-foreground italic flex items-center gap-1.5 py-1"
>
[Image Object]
{m.image_object()}
</div>,
)
return
@@ -574,9 +655,9 @@ export const MessageCard: React.FC<MessageCardProps> = ({
) : (
<div className="flex flex-col items-center justify-center py-12 text-center text-muted-foreground">
<Terminal className="w-8 h-8 text-muted-foreground/40 mb-2 animate-pulse" />
<p className="text-sm font-medium">No logs found for this session.</p>
<p className="text-sm font-medium">{m.no_logs_found()}</p>
<p className="text-xs text-muted-foreground/60 mt-1">
The session might have been initialized but has not produced any entries yet.
{m.session_no_entries_yet()}
</p>
</div>
)}
@@ -1,4 +1,5 @@
import type { CommentInfo, PostAttachmentRequest, PostAttachmentResponse } from '@shumai/dtos'
import { m } from '@/ui/paraglide/messages.js'
import type { BotInfo } from '@shumai/dtos'
import type { UserInfo } from '@shumai/dtos'
import { client } from '@/ui/api/client'
@@ -27,7 +28,7 @@ import { Button } from '../ui/button'
import { DrawAnnotation } from '../ui/icons'
import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover'
import { ProgressCircle } from '../ui/progress-circle'
import { formatTimecode } from '../viewers/utils'
import { formatTimecode } from '../viewers/video/utils'
import { useUiStore } from '@/ui/stores/ui'
type UploadingFile = {
@@ -603,7 +604,7 @@ export const ChatInput = React.forwardRef<HTMLDivElement, ChatInputProps>(
{replyingTo && (
<div className="flex items-center justify-between bg-muted p-2 px-3 rounded-lg border border-border">
<div className="text-xs text-muted-foreground truncate mr-2">
reply to: {replyingTo.message}
{m.reply_to_message({ message: replyingTo.message || '' })}
</div>
<button
onClick={onCancelReply}
@@ -674,7 +675,7 @@ export const ChatInput = React.forwardRef<HTMLDivElement, ChatInputProps>(
suppressContentEditableWarning
onInput={handleInput}
onKeyDown={handleKeyDown}
data-placeholder={replyingTo ? 'Reply...' : 'Message...'}
data-placeholder={replyingTo ? m.reply_placeholder() : m.message_placeholder()}
className={`bg-transparent border-none focus:ring-0 resize-none min-h-[40px] leading-relaxed py-2 focus:outline-none block ${paddingLeftClass}`}
/>
</div>
@@ -784,7 +785,7 @@ export const ChatInput = React.forwardRef<HTMLDivElement, ChatInputProps>(
variant={isTimestampEnabled ? 'secondary' : 'ghost'}
size="icon"
className={`p-2 rounded-full cursor-pointer ${isTimestampEnabled ? 'text-blue-600 bg-blue-50 dark:bg-blue-900/20' : ''}`}
title={isTimestampEnabled ? 'Disable Timestamp' : 'Enable Timestamp'}
title={isTimestampEnabled ? m.disable_timestamp() : m.enable_timestamp()}
>
<Clock className="w-4 h-4" />
</Button>
@@ -794,7 +795,7 @@ export const ChatInput = React.forwardRef<HTMLDivElement, ChatInputProps>(
className="p-2 rounded-full cursor-pointer"
variant="ghost"
size="icon"
title="Attach files"
title={m.attach_files()}
>
<Paperclip className="w-4 h-4" />
</Button>
@@ -804,7 +805,7 @@ export const ChatInput = React.forwardRef<HTMLDivElement, ChatInputProps>(
variant="ghost"
size="icon"
className="p-2 rounded-full cursor-pointer"
title="Toggle Annotation"
title={m.toggle_annotation()}
>
<DrawAnnotation className="w-4 h-4" />
</Button>
@@ -0,0 +1,128 @@
import { ImageControlBar } from '@/ui/components/viewers/image/image-control-bar'
import {
VideoControlBar,
type DisplayTranscode,
type PlayerState,
} from '@/ui/components/viewers/video/video-control-bar'
import type { AssetInfo } from '@shumai/dtos'
import { Maximize, Minimize } from 'lucide-react'
import type { PaneReportedState } from './types'
interface CompareControlBarProps {
activeState: PaneReportedState | null
activeAsset: AssetInfo | null
previewUrl?: string
isFullScreen: boolean
onTogglePlay: () => void
onToggleLoop: () => void
onSeek: (frame: number) => void
onVolumeChange: (volume: number) => void
onToggleMute: () => void
onChangePlaybackRate: (rate: number) => void
onChangeResolution: (resolution: string) => void
onZoomIn: () => void
onZoomOut: () => void
onFit: () => void
onDownload: (key?: string) => void
onToggleFullScreen: () => void
}
export function CompareControlBar({
activeState,
activeAsset,
previewUrl,
isFullScreen,
onTogglePlay,
onToggleLoop,
onSeek,
onVolumeChange,
onToggleMute,
onChangePlaybackRate,
onChangeResolution,
onZoomIn,
onZoomOut,
onFit,
onDownload,
onToggleFullScreen,
}: CompareControlBarProps) {
// Active side is a video: reuse the shared VideoControlBar.
if (activeState?.kind === 'video' && activeState.video && activeAsset) {
const v = activeState.video
const duration = v.totalFrames / v.frameRate
const currentTime = v.currentFrame / v.frameRate
const state: PlayerState = {
isPlaying: v.isPlaying,
progress: duration > 0 ? (currentTime / duration) * 100 : 0,
currentTime,
duration,
volume: v.volume,
isMuted: v.isMuted,
isLooping: v.isLooping,
playbackRate: v.playbackRate,
isFullScreen,
showFrames: false,
currentResolution: v.currentResolution,
}
// The active-side asset carries the metadata used for timecode display and
// preview scrubbing; ensure the preview url is present for the shared bar.
const data =
previewUrl && !activeAsset.media?.videoPreview
? { ...activeAsset, media: { ...activeAsset.media, videoPreview: { url: previewUrl } } }
: activeAsset
return (
<VideoControlBar
state={state}
zoom={activeState.zoom}
isControlsVisible
floatOverlayInFullScreen={false}
buffered={v.buffered}
data={data}
resolutions={v.resolutions as DisplayTranscode[]}
togglePlay={onTogglePlay}
toggleLoop={onToggleLoop}
toggleMute={onToggleMute}
handleVolumeChange={onVolumeChange}
changePlaybackRate={onChangePlaybackRate}
changeResolution={(res: DisplayTranscode) => onChangeResolution(res.resolution)}
handleDownload={(key?: string) => onDownload(key)}
toggleFullScreen={onToggleFullScreen}
onZoomChange={(nz: number) => (nz >= activeState.zoom ? onZoomIn() : onZoomOut())}
onZoomReset={onFit}
frameRate={v.frameRate}
totalFrames={v.totalFrames}
currentFrame={v.currentFrame}
seekToFrame={onSeek}
/>
)
}
// Active side is an image: reuse the shared ImageControlBar.
if (activeState?.kind === 'image') {
return (
<ImageControlBar
zoom={activeState.zoom}
onZoomIn={onZoomIn}
onZoomOut={onZoomOut}
onFit={onFit}
onDownload={() => onDownload()}
canDownload={!!activeAsset?.media?.original?.key}
fullscreen={{ isFullScreen, onToggle: onToggleFullScreen }}
/>
)
}
// Unsupported / not yet loaded: only expose fullscreen.
return (
<div className="relative z-10 flex items-center justify-end gap-2 border-t border-border bg-card px-4 py-3">
<button
onClick={onToggleFullScreen}
className="text-foreground transition-colors hover:text-primary"
title="Fullscreen"
>
{isFullScreen ? <Minimize className="h-5 w-5" /> : <Maximize className="h-5 w-5" />}
</button>
</div>
)
}
@@ -0,0 +1,150 @@
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from '@/ui/components/ui/dropdown-menu'
import { cn } from '@/ui/lib/utils'
import { m } from '@/ui/paraglide/messages.js'
import { Check, ChevronDown, FileIcon, X } from 'lucide-react'
import type { CompareSide } from './types'
interface VersionItem {
id: string
version: number
name?: string | null
previewUrl?: string | null
creator?: { id: string; name: string | null } | null
}
interface ComparePaneTopbarProps {
side: CompareSide
fileName: string
version?: number
activeVersionId: string
versions: VersionItem[]
isActive: boolean
onActivate: () => void
onSwitchVersion: (versionId: string) => void
onExit: () => void
}
export function ComparePaneTopbar({
side,
fileName,
version,
activeVersionId,
versions,
isActive,
onActivate,
onSwitchVersion,
onExit,
}: ComparePaneTopbarProps) {
const iconButtonClass = cn(
'flex-shrink-0 rounded p-1 transition-colors hover:bg-muted',
isActive ? 'text-foreground' : 'text-muted-foreground hover:text-foreground',
)
const exitButton = (
<button onClick={onExit} title={m.exit_compare()} className={iconButtonClass}>
<X className="h-4 w-4" />
</button>
)
const label = (
<button
onClick={onActivate}
className={cn(
'flex min-w-0 items-center gap-1 rounded px-2 py-1 text-sm font-medium transition-colors hover:bg-muted',
isActive ? 'text-foreground' : 'text-muted-foreground hover:text-foreground',
)}
>
<span className="truncate">{fileName}</span>
{version !== undefined && (
<span
className={cn(
'flex-shrink-0 rounded border px-1 py-0 text-xs',
isActive ? 'border-foreground/40' : 'border-border',
)}
>
v{version}
</span>
)}
</button>
)
const versionDropdown = (
<DropdownMenu>
<DropdownMenuTrigger
onClick={onActivate}
title={m.switch_version()}
className={iconButtonClass}
>
<ChevronDown className="h-4 w-4" />
</DropdownMenuTrigger>
<DropdownMenuContent align={side === 'left' ? 'start' : 'end'} className="w-80 p-1">
<div className="flex max-h-96 flex-col gap-1 overflow-y-auto">
{versions.map((v) => {
const isCurrent = v.id === activeVersionId
return (
<DropdownMenuItem
key={v.id}
onClick={() => onSwitchVersion(v.id)}
className="flex cursor-pointer items-center gap-3 rounded-md px-3 py-2"
>
<div className="flex min-w-[2rem] flex-shrink-0 items-center justify-center rounded-full bg-muted px-2 py-0.5 text-xs font-semibold text-muted-foreground select-none">
v{v.version}
</div>
<div className="flex h-10 w-16 flex-shrink-0 items-center justify-center overflow-hidden rounded-md border border-border bg-muted">
{v.previewUrl ? (
<img
src={v.previewUrl}
alt={v.name || undefined}
className="h-full w-full object-cover"
/>
) : (
<FileIcon className="h-4 w-4 text-muted-foreground" />
)}
</div>
<div className="flex min-w-0 flex-1 flex-col text-left">
<span className="truncate text-sm font-semibold text-foreground">{v.name}</span>
<span className="truncate text-xs text-muted-foreground">
{v.creator?.name || 'Unknown'}
</span>
</div>
{isCurrent && <Check className="ml-auto h-4 w-4 flex-shrink-0 text-primary" />}
</DropdownMenuItem>
)
})}
</div>
</DropdownMenuContent>
</DropdownMenu>
)
return (
<div
onMouseDown={onActivate}
className={cn(
// Force the dark palette so the bar is always dark with light text in
// both light and dark app themes, using system tokens (no hardcoded hex).
'dark flex h-10 flex-shrink-0 items-center gap-1 border-b bg-background px-2 transition-colors',
isActive ? 'border-b-2 border-primary' : 'border-border',
)}
>
{side === 'left' ? (
<>
{exitButton}
{label}
{versionDropdown}
</>
) : (
<>
{label}
{versionDropdown}
<div className="ml-auto" />
{exitButton}
</>
)}
</div>
)
}
@@ -0,0 +1,82 @@
import { describe, it, expect } from 'vitest'
import { kindOf, pickDefaultCompareVersions, clampFrame, isSameType } from './compare-utils'
describe('compare-utils', () => {
describe('kindOf', () => {
it('classifies image media types', () => {
expect(kindOf('image/png')).toBe('image')
expect(kindOf('image/webp')).toBe('image')
})
it('classifies video media types', () => {
expect(kindOf('video/mp4')).toBe('video')
expect(kindOf('video/quicktime')).toBe('video')
})
it('returns unsupported for missing or unknown types', () => {
expect(kindOf(null)).toBe('unsupported')
expect(kindOf(undefined)).toBe('unsupported')
expect(kindOf('application/pdf')).toBe('unsupported')
})
})
describe('pickDefaultCompareVersions', () => {
it('picks latest and latest-1 regardless of input order', () => {
const versions = [
{ id: 'a', version: 1 },
{ id: 'c', version: 3 },
{ id: 'b', version: 2 },
]
const pair = pickDefaultCompareVersions(versions)
expect(pair).not.toBeNull()
expect(pair!.left.id).toBe('c') // v3 (latest)
expect(pair!.right.id).toBe('b') // v2 (latest - 1)
})
it('returns null when fewer than two versions', () => {
expect(pickDefaultCompareVersions([{ id: 'a', version: 1 }])).toBeNull()
expect(pickDefaultCompareVersions([])).toBeNull()
expect(pickDefaultCompareVersions(undefined)).toBeNull()
expect(pickDefaultCompareVersions(null)).toBeNull()
})
it('does not mutate the input array', () => {
const versions = [
{ id: 'a', version: 1 },
{ id: 'b', version: 2 },
]
pickDefaultCompareVersions(versions)
expect(versions.map((v) => v.id)).toEqual(['a', 'b'])
})
})
describe('clampFrame', () => {
it('clamps to the last frame when beyond total (shorter side holds last frame)', () => {
expect(clampFrame(500, 100)).toBe(99)
})
it('clamps negative frames to zero', () => {
expect(clampFrame(-5, 100)).toBe(0)
})
it('passes through in-range frames', () => {
expect(clampFrame(42, 100)).toBe(42)
})
it('handles zero-length safely', () => {
expect(clampFrame(10, 0)).toBe(0)
})
})
describe('isSameType', () => {
it('true only for matching, supported kinds', () => {
expect(isSameType('video', 'video')).toBe(true)
expect(isSameType('image', 'image')).toBe(true)
})
it('false for mismatched or unsupported kinds', () => {
expect(isSameType('video', 'image')).toBe(false)
expect(isSameType('unsupported', 'unsupported')).toBe(false)
})
})
})
@@ -0,0 +1,37 @@
import type { PaneKind } from './types'
/** Classify an asset's media type into a compare pane kind. */
export function kindOf(mediaType: string | null | undefined): PaneKind {
if (!mediaType) return 'unsupported'
if (mediaType.startsWith('image/')) return 'image'
if (mediaType.startsWith('video/')) return 'video'
return 'unsupported'
}
interface VersionLike {
id: string
version: number
}
/**
* Given a version stack's versions, pick the default compare pair:
* left = latest (highest version number), right = latest - 1.
* Returns null if fewer than two versions exist.
*/
export function pickDefaultCompareVersions(
versions: ReadonlyArray<VersionLike> | undefined | null,
): { left: VersionLike; right: VersionLike } | null {
if (!versions || versions.length < 2) return null
const sorted = [...versions].sort((a, b) => b.version - a.version)
return { left: sorted[0], right: sorted[1] }
}
/** Clamp a frame index into the valid range [0, totalFrames - 1]. */
export function clampFrame(frame: number, totalFrames: number): number {
return Math.max(0, Math.min(frame, Math.max(0, totalFrames - 1)))
}
/** True when both panes hold the same (non-unsupported) media kind. */
export function isSameType(left: PaneKind, right: PaneKind): boolean {
return left === right && left !== 'unsupported'
}
@@ -0,0 +1,343 @@
import { client } from '@/ui/api/client'
import type { Annotation } from '@/ui/types'
import type { AssetInfo } from '@shumai/dtos'
import { useQuery } from '@tanstack/react-query'
import { Loader2 } from 'lucide-react'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { getViewerForFile } from '@/ui/components/viewers/registry'
import { CompareControlBar } from './compare-control-bar'
import { ComparePaneTopbar } from './compare-pane-topbar'
import type { ComparePaneHandle, CompareSide, PaneReportedState } from './types'
interface VersionItem {
id: string
version: number
name?: string | null
previewUrl?: string | null
creator?: { id: string; name: string | null } | null
}
interface CompareViewerProps {
isPublic?: boolean
shareId?: string
versions: VersionItem[]
leftId: string
rightId: string
activeSide: CompareSide
annotations: Annotation[]
/** Bumped nonce requests the active pane seek to `second` (comment navigation). */
seekRequest?: { second: number; nonce: number }
onActiveSideChange: (side: CompareSide) => void
onSwitchVersion: (side: CompareSide, versionId: string) => void
onExit: () => void
onActiveAssetChange: (asset: AssetInfo | null) => void
onPlay?: () => void
onTimeUpdate?: (second: number) => void
}
function useCompareAsset(id: string, isPublic: boolean, shareId?: string) {
return useQuery({
queryKey: isPublic
? ['public-share-file', shareId, id, localStorage.getItem(`share_pwd_${shareId}`) || '']
: ['files', id],
queryFn: async () => {
if (isPublic) {
const password = localStorage.getItem(`share_pwd_${shareId}`) || ''
const res = await client.api.shares[':shareId'].files[':fileId'].$get(
{ param: { shareId: shareId!, fileId: id } },
{ headers: { 'x-share-password': password } },
)
if (!res.ok) throw new Error('Failed to fetch version asset')
return (await res.json()) as unknown as AssetInfo
}
const res = await client.api.files[':fileId'].$get({ param: { fileId: id } })
if (!res.ok) throw new Error('Failed to fetch version asset')
return (await res.json()) as unknown as AssetInfo
},
enabled: !!id && (!isPublic || !!shareId),
})
}
export function CompareViewer({
isPublic = false,
shareId,
versions,
leftId,
rightId,
activeSide,
annotations,
seekRequest,
onActiveSideChange,
onSwitchVersion,
onExit,
onActiveAssetChange,
onPlay,
onTimeUpdate,
}: CompareViewerProps) {
const rootRef = useRef<HTMLDivElement>(null)
const leftRef = useRef<ComparePaneHandle | null>(null)
const rightRef = useRef<ComparePaneHandle | null>(null)
const [leftState, setLeftState] = useState<PaneReportedState | null>(null)
const [rightState, setRightState] = useState<PaneReportedState | null>(null)
const [userVolume, setUserVolume] = useState(1)
const [userMuted, setUserMuted] = useState(false)
const [isFullScreen, setIsFullScreen] = useState(false)
const { data: leftAsset, isLoading: leftLoading } = useCompareAsset(leftId, isPublic, shareId)
const { data: rightAsset, isLoading: rightLoading } = useCompareAsset(rightId, isPublic, shareId)
const leftDef = getViewerForFile(leftAsset)
const rightDef = getViewerForFile(rightAsset)
const sameType = !!leftAsset && !!rightAsset && leftDef.id === rightDef.id
const activeAsset = activeSide === 'left' ? leftAsset : rightAsset
const activeState = activeSide === 'left' ? leftState : rightState
const getActive = useCallback(
() => (activeSide === 'left' ? leftRef.current : rightRef.current),
[activeSide],
)
const getOther = useCallback(
() => (activeSide === 'left' ? rightRef.current : leftRef.current),
[activeSide],
)
// Bind right sidebar to active asset
useEffect(() => {
onActiveAssetChange(activeAsset ?? null)
}, [activeAsset, onActiveAssetChange])
// Comment-driven seek on the active pane
useEffect(() => {
if (!seekRequest) return
const active = getActive()
active?.seekToSecond(seekRequest.second)
active?.pause()
if (sameType) {
const other = getOther()
other?.seekToSecond(seekRequest.second)
other?.pause()
}
}, [seekRequest?.nonce])
// Fullscreen tracking
useEffect(() => {
const onFs = () => setIsFullScreen(!!document.fullscreenElement)
document.addEventListener('fullscreenchange', onFs)
return () => document.removeEventListener('fullscreenchange', onFs)
}, [])
const handleStateChangeLeft = useCallback((s: PaneReportedState) => setLeftState(s), [])
const handleStateChangeRight = useCallback((s: PaneReportedState) => setRightState(s), [])
const applyBoth = useCallback(
(fn: (h: ComparePaneHandle) => void) => {
const active = getActive()
if (active) fn(active)
if (sameType) {
const other = getOther()
if (other) fn(other)
}
},
[getActive, getOther, sameType],
)
// --- Control handlers ---
const handleTogglePlay = useCallback(() => {
const shouldPlay = !activeState?.video?.isPlaying
applyBoth((h) => (shouldPlay ? h.play() : h.pause()))
}, [activeState?.video?.isPlaying, applyBoth])
const handleSeek = useCallback(
(frame: number) => applyBoth((h) => h.seekToFrame(frame)),
[applyBoth],
)
const handleToggleLoop = useCallback(() => getActive()?.toggleLoop(), [getActive])
const handleVolumeChange = useCallback((v: number) => {
setUserVolume(v)
setUserMuted(v === 0)
}, [])
const handleToggleMute = useCallback(() => setUserMuted((m) => !m), [])
const handlePlaybackRate = useCallback(
(rate: number) => applyBoth((h) => h.setPlaybackRate(rate)),
[applyBoth],
)
const handleChangeResolution = useCallback(
(resolution: string) => getActive()?.changeResolution(resolution),
[getActive],
)
const handleZoomIn = useCallback(() => applyBoth((h) => h.zoomBy(1.2)), [applyBoth])
const handleZoomOut = useCallback(() => applyBoth((h) => h.zoomBy(0.8)), [applyBoth])
const handleFit = useCallback(() => applyBoth((h) => h.fit()), [applyBoth])
const handleDownload = useCallback(
(key?: string) => {
getActive()?.download(key)
},
[getActive],
)
const handleToggleFullScreen = useCallback(() => {
if (!rootRef.current) return
if (!document.fullscreenElement) {
rootRef.current.requestFullscreen()
} else {
document.exitFullscreen()
}
}, [])
const handleUserPanLeft = useCallback(
(dx: number, dy: number) => {
if (sameType) rightRef.current?.panBy(dx, dy)
},
[sameType],
)
const handleUserPanRight = useCallback(
(dx: number, dy: number) => {
if (sameType) leftRef.current?.panBy(dx, dy)
},
[sameType],
)
const handleRequestTogglePlay = useCallback(() => handleTogglePlay(), [handleTogglePlay])
const versionOf = useCallback(
(id: string) => versions.find((v) => v.id === id)?.version,
[versions],
)
const activePreviewUrl = useMemo(
() => activeAsset?.media?.videoPreview?.url,
[activeAsset?.media?.videoPreview?.url],
)
const renderPane = (side: CompareSide, asset: AssetInfo) => {
const def = getViewerForFile(asset)
const ComparePane = def?.comparePane
if (!ComparePane) {
return (
<div className="flex flex-1 items-center justify-center bg-gray-100 dark:bg-gray-950">
<p className="text-muted-foreground">Preview unavailable</p>
</div>
)
}
const isActive = activeSide === side
const paneRef = side === 'left' ? leftRef : rightRef
const onStateChange = side === 'left' ? handleStateChangeLeft : handleStateChangeRight
const onUserPan = side === 'left' ? handleUserPanLeft : handleUserPanRight
const paneAnnotations = isActive ? annotations : []
return (
<ComparePane
key={asset.id}
ref={paneRef}
file={asset}
shareId={shareId}
isActive={isActive}
annotations={paneAnnotations}
onStateChange={onStateChange}
onUserPan={onUserPan}
onActivate={() => onActiveSideChange(side)}
muted={isActive ? userMuted : true}
volume={userVolume}
onPlay={onPlay}
onTimeUpdate={onTimeUpdate}
onRequestTogglePlay={handleRequestTogglePlay}
/>
)
}
const bothLoaded = !!leftAsset && !!rightAsset
const isLoading = leftLoading || rightLoading
return (
<div ref={rootRef} className="flex h-full flex-1 flex-col bg-background">
<div className="flex min-h-0 flex-1">
{/* Left pane */}
<div className="flex min-w-0 flex-1 flex-col border-r border-zinc-800">
{leftAsset && (
<ComparePaneTopbar
side="left"
fileName={leftAsset.name}
version={versionOf(leftId)}
activeVersionId={leftId}
versions={versions}
isActive={activeSide === 'left'}
onActivate={() => onActiveSideChange('left')}
onSwitchVersion={(vid) => onSwitchVersion('left', vid)}
onExit={onExit}
/>
)}
<div className="relative flex min-h-0 flex-1">
{leftAsset ? (
renderPane('left', leftAsset)
) : (
<div className="flex flex-1 items-center justify-center">
<Loader2 className="h-6 w-6 animate-spin text-foreground" />
</div>
)}
</div>
</div>
{/* Right pane */}
<div className="flex min-w-0 flex-1 flex-col">
{rightAsset && (
<ComparePaneTopbar
side="right"
fileName={rightAsset.name}
version={versionOf(rightId)}
activeVersionId={rightId}
versions={versions}
isActive={activeSide === 'right'}
onActivate={() => onActiveSideChange('right')}
onSwitchVersion={(vid) => onSwitchVersion('right', vid)}
onExit={onExit}
/>
)}
<div className="relative flex min-h-0 flex-1">
{rightAsset ? (
renderPane('right', rightAsset)
) : (
<div className="flex flex-1 items-center justify-center">
<Loader2 className="h-6 w-6 animate-spin text-foreground" />
</div>
)}
</div>
</div>
</div>
{isLoading && !bothLoaded && (
<div className="absolute inset-0 z-10 flex items-center justify-center bg-background/30">
<Loader2 className="h-8 w-8 animate-spin text-foreground" />
</div>
)}
<CompareControlBar
activeState={activeState}
activeAsset={activeAsset ?? null}
previewUrl={activePreviewUrl}
isFullScreen={isFullScreen}
onTogglePlay={handleTogglePlay}
onToggleLoop={handleToggleLoop}
onSeek={handleSeek}
onVolumeChange={handleVolumeChange}
onToggleMute={handleToggleMute}
onChangePlaybackRate={handlePlaybackRate}
onChangeResolution={handleChangeResolution}
onZoomIn={handleZoomIn}
onZoomOut={handleZoomOut}
onFit={handleFit}
onDownload={handleDownload}
onToggleFullScreen={handleToggleFullScreen}
/>
</div>
)
}
@@ -0,0 +1,55 @@
import type { VideoTranscode } from '@shumai/dtos'
export type PaneKind = 'image' | 'video' | 'unsupported'
export type CompareSide = 'left' | 'right'
export type DisplayTranscode = VideoTranscode & { resolution: string }
/**
* Reactive state a pane reports upward so the shared control bar can render.
* `video` is populated only for video panes.
*/
export interface PaneReportedState {
kind: PaneKind
zoom: number
video?: {
frameRate: number
totalFrames: number
currentFrame: number
isPlaying: boolean
volume: number
isMuted: boolean
playbackRate: number
isLooping: boolean
currentResolution: string
resolutions: DisplayTranscode[]
buffered: number
}
}
/**
* Imperative command surface exposed by each pane via ref. The shared control
* bar dispatches to the active pane (and, when media types match, to both).
*/
export interface ComparePaneHandle {
getKind: () => PaneKind
// Playback (video only; no-ops for images)
play: () => void
pause: () => void
togglePlay: () => void
seekToFrame: (frame: number) => void
seekToSecond: (second: number) => void
stepFrame: (delta: number) => void
setMuted: (muted: boolean) => void
setVolume: (volume: number) => void
setPlaybackRate: (rate: number) => void
toggleLoop: () => void
changeResolution: (resolution: string) => void
// Zoom / pan (image + video)
zoomBy: (factor: number) => void
fit: () => void
panBy: (dx: number, dy: number) => void
// Download active side's original/selected media
download: (key?: string) => void
}
@@ -513,7 +513,10 @@ export function FileBrowser({
fileCount: 0,
type: 'file',
status: hasUrl ? 'uploading' : 'error',
mediaType: f.file.type || null,
mediaType:
f.file.name.toLowerCase().endsWith('.wma') && f.file.type?.startsWith('video/')
? f.file.type.replace(/^video\//, 'audio/')
: f.file.type || null,
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
}
@@ -846,13 +849,17 @@ export function FileBrowser({
}
const fileWithId = { file, id: ulid() }
fileWithIds.push(fileWithId)
let mediaType = file.type
if (fileName.toLowerCase().endsWith('.wma') && mediaType?.startsWith('video/')) {
mediaType = mediaType.replace(/^video\//, 'audio/')
}
currentLevel.push({
name: fileName,
size: file.size,
type: 'file',
id: fileWithId.id,
children: [],
mediaType: file.type,
mediaType,
})
}
filesToUpload = fileWithIds
@@ -1,5 +1,6 @@
import { client } from '@/ui/api/client'
import type { AssetInfo, FieldValueInfo } from '@shumai/dtos'
import { m } from '@/ui/paraglide/messages.js'
import { useQuery } from '@tanstack/react-query'
import { Badge } from '@/ui/components/ui/badge'
@@ -276,7 +277,7 @@ export function FileCard({
)}
</div>
) : (
<FilePreview item={displayItem} />
<FilePreview item={displayItem} showDuration />
)}
</div>
@@ -292,8 +293,11 @@ export function FileCard({
className="h-auto p-0 text-sm text-foreground !bg-transparent"
/>
<p className="text-sm text-muted-foreground">
{displayItem.createdAt && formatTimeAgo(displayItem.createdAt)} by{' '}
{displayItem.creator?.name}
{displayItem.createdAt &&
m.created_by_at({
time: formatTimeAgo(displayItem.createdAt),
author: displayItem.creator?.name || m.unknown_user(),
})}
</p>
</div>
<DropdownMenu modal={false}>
@@ -317,7 +321,7 @@ export function FileCard({
}}
>
<Download className="mr-2 h-4 w-4" />
<span>Download</span>
<span>{m.download()}</span>
</DropdownMenuItem>
{canEdit && (
<DropdownMenuItem
@@ -328,7 +332,7 @@ export function FileCard({
className="text-destructive"
>
<Trash2 className="mr-2 h-4 w-4" />
<span>Remove from Share</span>
<span>{m.remove_from_share()}</span>
</DropdownMenuItem>
)}
</>
@@ -340,7 +344,7 @@ export function FileCard({
}}
>
<History className="mr-2 h-4 w-4" />
<span>Restore</span>
<span>{m.restore()}</span>
</DropdownMenuItem>
) : (
<>
@@ -352,7 +356,7 @@ export function FileCard({
}}
>
<Edit className="mr-2 h-4 w-4" />
<span>Rename</span>
<span>{m.rename()}</span>
</DropdownMenuItem>
)}
<DropdownMenuItem
@@ -362,7 +366,7 @@ export function FileCard({
}}
>
<Download className="mr-2 h-4 w-4" />
<span>Download</span>
<span>{m.download()}</span>
</DropdownMenuItem>
{canEdit && (
<>
@@ -375,7 +379,7 @@ export function FileCard({
className="text-destructive"
>
<Trash2 className="mr-2 h-4 w-4" />
<span>Delete</span>
<span>{m.delete()}</span>
</DropdownMenuItem>
</>
)}
@@ -3,7 +3,7 @@ import { client } from '@/ui/api/client'
import { useQuery } from '@tanstack/react-query'
import { useDraggable } from '@dnd-kit/react'
import { File, Folder, MoreVertical } from 'lucide-react'
import { File, Folder, MoreVertical, AudioLines } from 'lucide-react'
import React, { useEffect, useMemo, useRef, useState } from 'react'
import { cn } from '@/ui/lib/utils'
import type { DragState } from '../dnd-types'
@@ -214,6 +214,9 @@ export function FileListItem({
alt=""
className="w-full h-full object-cover"
/>
) : displayItem.preview?.mediaType?.startsWith('audio/') ||
displayItem.mediaType?.startsWith('audio/') ? (
<AudioLines className="h-4 w-4 text-muted-foreground" />
) : displayItem.type === 'folder' ? (
<Folder className="h-4 w-4 text-primary" />
) : (
@@ -1,5 +1,6 @@
import { File, Folder } from 'lucide-react'
import { File, Folder, AudioLines } from 'lucide-react'
import { SpriteScrubber } from '../sprite-scrubber'
import { formatTime } from '../viewers/video/utils'
type FilePreviewItem = {
type?: string | null
@@ -9,39 +10,69 @@ type FilePreviewItem = {
thumbnailUrl?: string
originalWidth?: number
originalHeight?: number
duration?: number
} | null
}
interface FilePreviewProps {
item: FilePreviewItem
showDuration?: boolean
}
export const FilePreview = ({ item }: FilePreviewProps) => {
export const FilePreview = ({ item, showDuration = false }: FilePreviewProps) => {
const isVideo = item.preview?.mediaType?.startsWith('video/')
const isAudio = item.preview?.mediaType?.startsWith('audio/')
const hasDuration = isVideo || isAudio
const duration = item.preview?.duration
const durationOverlay =
showDuration && hasDuration && typeof duration === 'number' && duration > 0 ? (
<span className="pointer-events-none absolute bottom-1 right-1 text-xs font-medium tabular-nums text-white">
{formatTime(duration)}
</span>
) : null
const isVideoWithSprite =
item.preview?.mediaType?.startsWith('video/') &&
item.preview.spriteUrl &&
isVideo &&
item.preview?.spriteUrl &&
item.preview.thumbnailUrl &&
item.preview.originalWidth &&
item.preview.originalHeight
if (isVideoWithSprite && item.preview) {
return (
<SpriteScrubber
spriteUrl={item.preview.spriteUrl!}
thumbnailUrl={item.preview.thumbnailUrl!}
videoWidth={item.preview.originalWidth!}
videoHeight={item.preview.originalHeight!}
/>
<>
<SpriteScrubber
spriteUrl={item.preview.spriteUrl!}
thumbnailUrl={item.preview.thumbnailUrl!}
videoWidth={item.preview.originalWidth!}
videoHeight={item.preview.originalHeight!}
/>
{durationOverlay}
</>
)
}
if (item.preview?.thumbnailUrl) {
return (
<img
src={item.preview.thumbnailUrl}
alt="Preview"
className="w-full h-full object-contain bg-black"
/>
<>
<img
src={item.preview.thumbnailUrl}
alt="Preview"
className="w-full h-full object-contain bg-black"
/>
{durationOverlay}
</>
)
}
if (isAudio) {
return (
<>
<div className="w-full h-full flex items-center justify-center bg-zinc-950">
<AudioLines className="w-8 h-8 text-zinc-500" />
</div>
{durationOverlay}
</>
)
}
@@ -10,6 +10,7 @@ import { EditableText } from '@/ui/components/ui/editable-text'
import { cn } from '@/ui/lib/utils'
import { useDraggable, useDroppable } from '@dnd-kit/react'
import type { AssetInfo, ChildPreview } from '@shumai/dtos'
import { m } from '@/ui/paraglide/messages.js'
import { Download, Edit, History, MoreHorizontal, Trash2 } from 'lucide-react'
import React, { useEffect, useMemo, useRef, useState } from 'react'
import type { DragState } from '../dnd-types'
@@ -344,7 +345,9 @@ export function FolderCard({
<div className="flex items-center justify-between text-muted-foreground">
<span className="text-xs tracking-wide opacity-80">
{item.fileCount || 0} {(item.fileCount || 0) === 1 ? 'Item' : 'Items'}
{(item.fileCount || 0) === 1
? m.n_items_singular({ count: item.fileCount || 0 })
: m.n_items_plural({ count: item.fileCount || 0 })}
</span>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
@@ -365,7 +368,7 @@ export function FolderCard({
}}
>
<Download className="mr-2 h-4 w-4" />
<span>Download</span>
<span>{m.download()}</span>
</DropdownMenuItem>
{canEdit && (
<DropdownMenuItem
@@ -376,7 +379,7 @@ export function FolderCard({
className="text-destructive"
>
<Trash2 className="mr-2 h-4 w-4" />
<span>Remove from Share</span>
<span>{m.remove_from_share()}</span>
</DropdownMenuItem>
)}
</>
@@ -388,7 +391,7 @@ export function FolderCard({
}}
>
<History className="mr-2 h-4 w-4" />
<span>Restore</span>
<span>{m.restore()}</span>
</DropdownMenuItem>
) : (
<>
@@ -400,7 +403,7 @@ export function FolderCard({
}}
>
<Edit className="mr-2 h-4 w-4" />
<span>Rename</span>
<span>{m.rename()}</span>
</DropdownMenuItem>
)}
<DropdownMenuItem
@@ -410,7 +413,7 @@ export function FolderCard({
}}
>
<Download className="mr-2 h-4 w-4" />
<span>Download</span>
<span>{m.download()}</span>
</DropdownMenuItem>
{canEdit && (
<>
@@ -423,7 +426,7 @@ export function FolderCard({
className="text-destructive"
>
<Trash2 className="mr-2 h-4 w-4" />
<span>Delete</span>
<span>{m.delete()}</span>
</DropdownMenuItem>
</>
)}
@@ -382,7 +382,8 @@ export function FileBrowserToolbar({
<MembersDialog
open={isMembersDialogOpen}
onOpenChange={handleOpenMembersDialog}
title="Project Members"
title={m.project_members()}
type="project"
members={members || []}
isOwner={me?.role === 'owner'}
onInvite={handleInvite}
@@ -2,7 +2,7 @@ import { client } from '@/ui/api/client'
import { cn } from '@/ui/lib/utils'
import type { AssetInfo, AssetInfoPaginatedList } from '@shumai/dtos'
import { Link } from '@tanstack/react-router'
import { File, Loader2 } from 'lucide-react'
import { File, Loader2, AudioLines } from 'lucide-react'
import type { FC } from 'react'
import { useEffect, useRef, useState } from 'react'
import { useInView } from 'react-intersection-observer'
@@ -22,6 +22,16 @@ export const CarouselFilePreview = ({ item }: { item: AssetInfo }) => {
)
}
const isAudio =
item.preview?.mediaType?.startsWith('audio/') || item.mediaType?.startsWith('audio/')
if (isAudio) {
return (
<div className="w-full h-full flex items-center justify-center bg-muted">
<AudioLines className="w-5 h-5 text-muted-foreground" />
</div>
)
}
return (
<div className="w-full h-full flex items-center justify-center bg-muted">
<File className="w-5 h-5 text-muted-foreground" />
@@ -15,6 +15,8 @@ import { ChatInput } from './chat/message-input'
import FieldRenderer from './field-renderer'
import { GuestIdentityPopup } from './guest-identity-popup'
import { ScrollArea } from './ui/scroll-area'
import { m } from '@/ui/paraglide/messages.js'
import { getViewerForFile } from '@/ui/components/viewers/registry'
interface FileViewerRightSidebarProps {
teamId: string
@@ -88,7 +90,8 @@ export function FileViewerRightSidebar({
enabled: !!projectId && !readOnly,
})
const isAiEnabled = file?.mediaType?.startsWith('image/') || file?.mediaType?.startsWith('video/')
const viewerDef = getViewerForFile(file)
const isAiEnabled = !!viewerDef?.commentsConfig?.hasAiBots
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const enabledBots = isAiEnabled ? (bots as any[]) || [] : []
@@ -302,10 +305,8 @@ export function FileViewerRightSidebar({
return (
<div className="flex h-full items-center justify-center p-8 text-center bg-background">
<div className="space-y-2">
<p className="text-sm font-medium text-foreground">No item selected</p>
<p className="text-xs text-muted-foreground">
Select a file to view its details and comments.
</p>
<p className="text-sm font-medium text-foreground">{m.no_item_selected()}</p>
<p className="text-xs text-muted-foreground">{m.select_file_to_view_details()}</p>
</div>
</div>
)
@@ -336,10 +337,10 @@ export function FileViewerRightSidebar({
<Tabs defaultValue="comments" className="p-1 flex-1 flex flex-col px-2 min-h-0">
<TabsList className="w-full shrink-0">
<TabsTrigger value="comments" className="flex-1">
Comments
{m.comments()}
</TabsTrigger>
<TabsTrigger value="fields" className="flex-1">
Fields
{m.fields()}
</TabsTrigger>
</TabsList>
<TabsContent value="comments" className="flex-1 flex flex-col overflow-hidden min-h-0 mt-0">
@@ -355,12 +356,12 @@ export function FileViewerRightSidebar({
onViewAttachment={setViewingAttachment}
hasReplies={!!comment.replies?.length}
frameRate={
file?.mediaType?.startsWith('video/')
viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.frameRate || 30
: undefined
}
startTimecode={
file?.mediaType?.startsWith('video/')
viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.startTimecode
: undefined
}
@@ -381,12 +382,12 @@ export function FileViewerRightSidebar({
hasReplies={false}
isLastReply={index === (comment.replies?.length ?? 0) - 1}
frameRate={
file?.mediaType?.startsWith('video/')
viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.frameRate || 30
: undefined
}
startTimecode={
file?.mediaType?.startsWith('video/')
viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.startTimecode
: undefined
}
@@ -417,14 +418,14 @@ export function FileViewerRightSidebar({
bots={enabledBots}
hideAnnotationControl={hideAnnotationControl}
disableMentions={isPublic}
currentTime={file?.mediaType?.startsWith('video/') ? currentTime : undefined}
currentTime={viewerDef?.commentsConfig?.hasTimestamp ? currentTime : undefined}
frameRate={
file?.mediaType?.startsWith('video/')
viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.frameRate || 30
: undefined
}
startTimecode={
file?.mediaType?.startsWith('video/')
viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.startTimecode
: undefined
}
+23 -305
View File
@@ -1,320 +1,38 @@
import { useScreenSize } from '@/ui/hooks/useScreenSize'
import { getBestTranscode } from '@/ui/lib/media'
import type { AssetInfo } from '@shumai/dtos'
import { Check, Copy, Download, Minus, Plus } from 'lucide-react'
import type { ReactNode, RefObject } from 'react'
import { useCallback, useEffect, useRef, useState } from 'react'
import type Player from 'video.js/dist/types/player'
import DrawingCanvas from './drawing-canvas'
import VideoPlayer from './viewers/video-player'
import { getViewerForFile } from './viewers/registry'
import type { FileViewerProps, MediaController } from './viewers/types'
import React, { RefObject } from 'react'
import { useAnnotationStore } from '@/ui/stores/annotation-store'
import type { Annotation } from '@/ui/types'
type FileViewerProps = {
file: AssetInfo
videoRef?: RefObject<Player | null>
onPlay?: () => void
onPause?: () => void
onTimeUpdate?: (time: number) => void
annotations?: Annotation[]
startTime?: number
children?: ReactNode
interface OuterFileViewerProps extends FileViewerProps {
mediaControllerRef?: RefObject<MediaController | null>
}
export function FileViewer({
file,
videoRef,
mediaControllerRef,
onPlay,
onPause,
onTimeUpdate,
annotations,
startTime,
shareId,
children,
}: FileViewerProps) {
const { width: screenWidth } = useScreenSize()
const isImage = file.mediaType?.startsWith('image/')
const isVideo = file.mediaType?.startsWith('video/')
// Annotation Store
const {
isDrawing,
currentTool,
currentColor,
addAnnotation,
annotations: draftAnnotations,
reset: resetAnnotations,
} = useAnnotationStore()
// Reset annotations when file changes
useEffect(() => {
resetAnnotations()
}, [file.id, resetAnnotations])
// State for Image Viewer
const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })
const [zoom, setZoom] = useState(1)
const [pan, setPan] = useState({ x: 0, y: 0 })
const [copied, setCopied] = useState(false)
const observerRef = useRef<ResizeObserver | null>(null)
const containerRef = useCallback((node: HTMLDivElement | null) => {
if (observerRef.current) {
observerRef.current.disconnect()
observerRef.current = null
}
if (node !== null) {
const observer = new ResizeObserver((entries) => {
const entry = entries[0]
if (entry) {
setContainerSize({
width: entry.contentRect.width,
height: entry.contentRect.height,
})
}
})
observer.observe(node)
observerRef.current = observer
}
}, [])
const imgW = file.media?.metadata?.originalWidth ?? 1920
const imgH = file.media?.metadata?.originalHeight ?? 1080
const conW = containerSize.width
const conH = containerSize.height
let baseScale = 1
if (conW > 0 && conH > 0) {
baseScale = Math.min(conW / imgW, conH / imgH)
}
// Reset/Fit logic
useEffect(() => {
if (conW > 0 && conH > 0 && isImage) {
setZoom(baseScale)
// Center
const x = (conW - imgW * baseScale) / 2
const y = (conH - imgH * baseScale) / 2
setPan({ x, y })
}
}, [file.id, conW, conH, isImage, baseScale, imgW, imgH])
const handleZoom = (factor: number) => {
const cx = conW / 2
const cy = conH / 2
// Limit min/max zoom if needed?
const newZoom = zoom * factor
if (newZoom < 0.01 || newZoom > 50) return
const newPanX = cx - (cx - pan.x) * (newZoom / zoom)
const newPanY = cy - (cy - pan.y) * (newZoom / zoom)
setZoom(newZoom)
setPan({ x: newPanX, y: newPanY })
}
const handleFit = () => {
setZoom(baseScale)
const x = (conW - imgW * baseScale) / 2
const y = (conH - imgH * baseScale) / 2
setPan({ x, y })
}
let bestUrl = file.media?.original?.downloadUrl
if (isImage) {
const bestTranscode = getBestTranscode(file.media?.imageTranscodes, screenWidth)
if (bestTranscode?.url) {
bestUrl = bestTranscode.url
}
}
const handleDownload = () => {
const url = file.media?.original?.downloadUrl
if (!url) return
const link = document.createElement('a')
link.href = url
link.download = file.name || 'image'
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
}
const handleCopy = async () => {
const webpUrl = bestUrl
if (!webpUrl) return
try {
// To support Safari and iOS, we must invoke navigator.clipboard.write
// synchronously inside the click handler. We can pass a promise to ClipboardItem
// which resolves to the Blob asynchronously.
const copyPromise = (async () => {
const response = await fetch(webpUrl)
const blob = await response.blob()
const img = new Image()
img.crossOrigin = 'anonymous'
const objectUrl = URL.createObjectURL(blob)
img.src = objectUrl
try {
await new Promise((resolve, reject) => {
img.onload = resolve
img.onerror = (e) => reject(new Error('Failed to load image: ' + String(e)))
})
const canvas = document.createElement('canvas')
canvas.width = img.width
canvas.height = img.height
const ctx = canvas.getContext('2d')
if (!ctx) throw new Error('Could not get canvas context')
ctx.drawImage(img, 0, 0)
const pngBlob = await new Promise<Blob | null>((resolve) => {
canvas.toBlob(resolve, 'image/png')
})
if (!pngBlob) throw new Error('Failed to convert image to PNG')
return pngBlob
} finally {
URL.revokeObjectURL(objectUrl)
}
})()
await navigator.clipboard.write([
new ClipboardItem({
'image/png': copyPromise,
}),
])
setCopied(true)
setTimeout(() => setCopied(false), 2000)
} catch (err) {
console.error('Failed to copy image to clipboard:', err)
}
}
const isUnsupported = !bestUrl || (!isImage && !isVideo)
if (isUnsupported) {
return (
<div className="flex flex-col flex-1 h-full overflow-hidden bg-gray-100 dark:bg-gray-950 relative">
<div className="flex-1 flex flex-col-reverse md:flex-row min-h-0 relative">
{children}
<div className="flex-1 flex items-center justify-center">
<p className="text-muted-foreground">Preview unavailable</p>
</div>
</div>
<div className="relative px-4 py-3 bg-card border-t border-gray-200 dark:border-gray-700 z-10 flex items-center justify-end gap-2 transition-colors duration-200">
<button
onClick={handleDownload}
disabled={!file.media?.original?.downloadUrl}
className="flex items-center gap-1.5 text-xs font-medium px-3 py-1.5 rounded bg-gray-200/50 dark:bg-white/10 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors border border-transparent disabled:opacity-50 animate-in fade-in zoom-in-95 duration-200"
title="Download original file"
>
<Download size={14} />
Download
</button>
</div>
</div>
)
}
// Combine saved annotations and draft annotations
const displayAnnotations = [...(annotations || []), ...draftAnnotations]
}: OuterFileViewerProps) {
const viewerDef = getViewerForFile(file)
const ViewerComponent = viewerDef.viewer
return (
<div className="flex flex-col flex-1 h-full overflow-hidden bg-gray-100 dark:bg-gray-950 relative">
{isImage && (
<>
<div className="flex-1 flex flex-col-reverse md:flex-row min-h-0 relative">
{children}
<div ref={containerRef} className="flex-1 relative overflow-hidden">
<DrawingCanvas
width={conW}
height={conH}
mediaDimensions={{
width: imgW,
height: imgH,
}}
imageUrl={bestUrl}
annotations={displayAnnotations}
scale={zoom}
offset={pan}
onPan={setPan}
className="absolute inset-0 z-0"
// Drawing Props
isDrawing={isDrawing}
currentTool={currentTool}
currentColor={currentColor}
onAddAnnotation={addAnnotation}
/>
</div>
</div>
{/* Zoom Toolbar */}
<div className="relative px-4 py-3 bg-card border-t border-gray-200 dark:border-gray-700 z-10 flex items-center justify-end gap-2 transition-colors duration-200">
<div className="flex items-center gap-1 bg-gray-200/50 dark:bg-white/10 rounded-md p-0.5 mr-auto">
<button
onClick={() => handleZoom(0.8)}
className="p-1.5 rounded hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors"
title="Zoom Out"
>
<Minus size={16} />
</button>
<span className="w-12 text-center text-xs font-mono font-medium text-gray-900 dark:text-gray-100 select-none">
{Math.round(zoom * 100)}%
</span>
<button
onClick={() => handleZoom(1.2)}
className="p-1.5 rounded hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors"
title="Zoom In"
>
<Plus size={16} />
</button>
</div>
<button
onClick={handleFit}
className="text-xs font-medium px-3 py-1.5 rounded bg-gray-200/50 dark:bg-white/10 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors border border-transparent animate-in fade-in zoom-in-95 duration-200"
>
Fit
</button>
<button
onClick={handleCopy}
disabled={!bestUrl}
className="flex items-center gap-1.5 text-xs font-medium px-3 py-1.5 rounded bg-gray-200/50 dark:bg-white/10 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors border border-transparent disabled:opacity-50 animate-in fade-in zoom-in-95 duration-200"
title="Copy optimized image to clipboard"
>
{copied ? <Check size={14} className="text-green-500" /> : <Copy size={14} />}
{copied ? 'Copied' : 'Copy'}
</button>
<button
onClick={handleDownload}
disabled={!file.media?.original?.downloadUrl}
className="flex items-center gap-1.5 text-xs font-medium px-3 py-1.5 rounded bg-gray-200/50 dark:bg-white/10 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors border border-transparent disabled:opacity-50 animate-in fade-in zoom-in-95 duration-200"
title="Download original image"
>
<Download size={14} />
Download
</button>
</div>
</>
)}
{isVideo && (
<VideoPlayer
key={file.id}
data={file}
playerRef={videoRef}
onPlay={onPlay}
onPause={onPause}
onTimeUpdate={onTimeUpdate}
annotations={displayAnnotations}
startTime={startTime}
>
{children}
</VideoPlayer>
)}
</div>
<ViewerComponent
key={file.id}
ref={mediaControllerRef}
file={file}
onPlay={onPlay}
onPause={onPause}
onTimeUpdate={onTimeUpdate}
annotations={annotations}
startTime={startTime}
shareId={shareId}
>
{children}
</ViewerComponent>
)
}
@@ -7,6 +7,7 @@ import { Input } from '@/ui/components/ui/input'
import { Label } from '@/ui/components/ui/label'
import { client } from '@/ui/api/client'
import { Loader2 } from 'lucide-react'
import { m } from '@/ui/paraglide/messages.js'
interface GuestIdentityPopupProps {
isOpen: boolean
@@ -58,31 +59,29 @@ export function GuestIdentityPopup({
<PopoverContent className="w-80" align="end" side="top">
<form onSubmit={handleSubmit} className="space-y-4">
<div className="space-y-2">
<h4 className="font-medium leading-none">Enter your details</h4>
<p className="text-sm text-muted-foreground">
Please provide your name and email to add a comment.
</p>
<h4 className="font-medium leading-none">{m.enter_your_details()}</h4>
<p className="text-sm text-muted-foreground">{m.provide_name_email_for_comment()}</p>
</div>
<div className="grid gap-2">
<div className="grid gap-1">
<Label htmlFor="name">Name</Label>
<Label htmlFor="name">{m.name()}</Label>
<Input
id="name"
value={name}
onChange={(e) => setName(e.target.value)}
placeholder="John Doe"
placeholder={m.name_placeholder()}
size={32}
required
/>
</div>
<div className="grid gap-1">
<Label htmlFor="email">Email</Label>
<Label htmlFor="email">{m.email()}</Label>
<Input
id="email"
type="email"
value={email}
onChange={(e) => setEmail(e.target.value)}
placeholder="john@example.com"
placeholder={m.email_field_placeholder()}
required
/>
</div>
@@ -90,11 +89,11 @@ export function GuestIdentityPopup({
</div>
<div className="flex justify-end gap-2">
<Button type="button" variant="outline" size="sm" onClick={onClose}>
Cancel
{m.cancel()}
</Button>
<Button type="submit" size="sm" disabled={isLoading}>
{isLoading && <Loader2 className="mr-2 h-3 w-3 animate-spin" />}
Confirm
{m.confirm()}
</Button>
</div>
</form>
+52 -29
View File
@@ -22,6 +22,7 @@ import { Input } from '@/ui/components/ui/input'
import { ChevronDown, Copy, Loader2, Trash2 } from 'lucide-react'
import { useState } from 'react'
import { toast } from 'sonner'
import { m } from '@/ui/paraglide/messages.js'
export interface Member {
id?: string
@@ -43,6 +44,7 @@ interface MembersDialogProps {
currentUserId?: string
availableMembersToAdd?: Member[]
onAddMember?: (userId: string, role: 'editor' | 'reviewer') => Promise<void>
type?: 'project' | 'team'
}
export function MembersDialog({
@@ -57,6 +59,7 @@ export function MembersDialog({
currentUserId,
availableMembersToAdd,
onAddMember,
type = 'team',
}: MembersDialogProps) {
const [inviteRole, setInviteRole] = useState<'editor' | 'reviewer'>('editor')
const [inviteLink, setInviteLink] = useState<string | null>(null)
@@ -66,6 +69,20 @@ export function MembersDialog({
const [rolesToAdd, setRolesToAdd] = useState<Record<string, 'editor' | 'reviewer'>>({})
const [addingMemberId, setAddingMemberId] = useState<string | null>(null)
const localizeRole = (role?: string) => {
if (!role) return ''
switch (role.toLowerCase()) {
case 'owner':
return m.owner()
case 'editor':
return m.editor()
case 'reviewer':
return m.reviewer()
default:
return role
}
}
const setRoleToAdd = (memberId: string, role: 'editor' | 'reviewer') => {
setRolesToAdd((prev) => ({ ...prev, [memberId]: role }))
}
@@ -75,10 +92,10 @@ export function MembersDialog({
setUpdatingMemberId(memberId)
try {
await onUpdateRole(memberId, role)
toast.success('Member role updated')
toast.success(m.member_role_updated())
} catch (error) {
console.error(error)
toast.error('Failed to update member role')
toast.error(m.failed_to_update_member_role())
} finally {
setUpdatingMemberId(null)
}
@@ -89,11 +106,11 @@ export function MembersDialog({
setUpdatingMemberId(memberToRemove.id)
try {
await onRemoveMember(memberToRemove.id)
toast.success('Member removed')
toast.success(m.member_removed())
setMemberToRemove(null)
} catch (error) {
console.error(error)
toast.error('Failed to remove member')
toast.error(m.failed_to_remove_member())
} finally {
setUpdatingMemberId(null)
}
@@ -108,7 +125,7 @@ export function MembersDialog({
setInviteLink(url)
} catch (error) {
console.error(error)
toast.error('Failed to generate invite link')
toast.error(m.failed_to_generate_invite_link())
} finally {
setIsGenerating(false)
}
@@ -117,7 +134,7 @@ export function MembersDialog({
const copyToClipboard = () => {
if (inviteLink) {
navigator.clipboard.writeText(inviteLink)
toast.success('Invite link copied to clipboard')
toast.success(m.invite_link_copied())
}
}
@@ -169,13 +186,13 @@ export function MembersDialog({
<span className="text-sm font-medium">{member.name}</span>
<div className="flex items-center gap-2">
<span className="text-xs text-muted-foreground capitalize">
{member.role}
{localizeRole(member.role)}
</span>
{member.scope && (
<>
<span className="text-[10px] text-muted-foreground/70">•</span>
<span className="text-xs text-muted-foreground capitalize">
{member.scope === 'team' ? 'Team Member' : 'Project Member'}
{member.scope === 'team' ? m.team_member() : m.project_member()}
</span>
</>
)}
@@ -193,7 +210,7 @@ export function MembersDialog({
className="h-8 px-2 text-xs capitalize w-26"
disabled={updatingMemberId === member.id}
>
{member.role}
{localizeRole(member.role)}
<ChevronDown className="ml-1 h-3 w-3 opacity-50" />
</Button>
</DropdownMenuTrigger>
@@ -205,10 +222,10 @@ export function MembersDialog({
}
>
<DropdownMenuRadioItem value="editor" className="text-xs">
Editor
{m.editor()}
</DropdownMenuRadioItem>
<DropdownMenuRadioItem value="reviewer" className="text-xs">
Reviewer
{m.reviewer()}
</DropdownMenuRadioItem>
</DropdownMenuRadioGroup>
</DropdownMenuContent>
@@ -237,26 +254,28 @@ export function MembersDialog({
>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>Remove Member</AlertDialogTitle>
<AlertDialogTitle>{m.remove_member()}</AlertDialogTitle>
<AlertDialogDescription>
Are you sure you want to remove <strong>{memberToRemove?.name}</strong> from this{' '}
{title.toLowerCase()}? This action cannot be undone.
{m.remove_member_confirmation({
name: memberToRemove?.name || '',
type: type === 'project' ? m.project() : m.team(),
})}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>Cancel</AlertDialogCancel>
<AlertDialogCancel>{m.cancel()}</AlertDialogCancel>
<AlertDialogAction
onClick={handleRemoveMember}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
Remove
{m.remove()}
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>{' '}
{isOwner && onAddMember && availableMembersToAdd && availableMembersToAdd.length > 0 && (
<div className="border-t pt-4">
<h4 className="text-sm font-medium mb-3">Add Team Member to Project</h4>
<h4 className="text-sm font-medium mb-3">{m.add_team_member_to_project()}</h4>
<div className="max-h-[200px] overflow-y-auto space-y-2 pr-1">
{availableMembersToAdd.map((member) => {
const currentRole = rolesToAdd[member.id!] || 'editor'
@@ -279,7 +298,7 @@ export function MembersDialog({
<div className="flex flex-col">
<span className="text-sm font-medium">{member.name}</span>
<span className="text-xs text-muted-foreground capitalize">
{member.scope === 'team' ? 'Team Member' : 'Project Member'}
{member.scope === 'team' ? m.team_member() : m.project_member()}
</span>
</div>
</div>
@@ -293,7 +312,7 @@ export function MembersDialog({
className="h-8 px-2 text-xs capitalize w-26"
disabled={addingMemberId === member.id}
>
{currentRole}
{localizeRole(currentRole)}
<ChevronDown className="ml-1 h-3 w-3 opacity-50" />
</Button>
</DropdownMenuTrigger>
@@ -305,10 +324,10 @@ export function MembersDialog({
}
>
<DropdownMenuRadioItem value="editor" className="text-xs">
Editor
{m.editor()}
</DropdownMenuRadioItem>
<DropdownMenuRadioItem value="reviewer" className="text-xs">
Reviewer
{m.reviewer()}
</DropdownMenuRadioItem>
</DropdownMenuRadioGroup>
</DropdownMenuContent>
@@ -319,10 +338,12 @@ export function MembersDialog({
setAddingMemberId(member.id!)
try {
await onAddMember(member.id!, currentRole)
toast.success(`Added ${member.name} successfully`)
toast.success(
m.added_member_successfully({ name: member.name || '' }),
)
} catch (error) {
console.error(error)
toast.error(`Failed to add ${member.name}`)
toast.error(m.failed_to_add_member({ name: member.name || '' }))
} finally {
setAddingMemberId(null)
}
@@ -334,7 +355,7 @@ export function MembersDialog({
{addingMemberId === member.id ? (
<Loader2 className="h-3 w-3 animate-spin" />
) : (
'Add'
m.add()
)}
</Button>
</div>
@@ -346,13 +367,13 @@ export function MembersDialog({
)}
{isOwner && onInvite && (
<div className="border-t pt-4">
<h4 className="text-sm font-medium mb-3">Invite New Member</h4>
<h4 className="text-sm font-medium mb-3">{m.invite_new_member()}</h4>
<div className="space-y-3">
<div className="flex gap-2">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="outline" className="w-[120px] justify-between">
{inviteRole === 'editor' ? 'Editor' : 'Reviewer'}
{inviteRole === 'editor' ? m.editor() : m.reviewer()}
<ChevronDown className="h-4 w-4 opacity-50" />
</Button>
</DropdownMenuTrigger>
@@ -361,14 +382,16 @@ export function MembersDialog({
value={inviteRole}
onValueChange={(v) => setInviteRole(v as 'editor' | 'reviewer')}
>
<DropdownMenuRadioItem value="editor">Editor</DropdownMenuRadioItem>
<DropdownMenuRadioItem value="reviewer">Reviewer</DropdownMenuRadioItem>
<DropdownMenuRadioItem value="editor">{m.editor()}</DropdownMenuRadioItem>
<DropdownMenuRadioItem value="reviewer">
{m.reviewer()}
</DropdownMenuRadioItem>
</DropdownMenuRadioGroup>
</DropdownMenuContent>
</DropdownMenu>
<Button onClick={handleGenerate} disabled={isGenerating} className="flex-1">
{isGenerating && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
Generate Link
{m.generate_link()}
</Button>
</div>
+60 -46
View File
@@ -2,78 +2,92 @@ import type { NotificationInfo } from '@shumai/dtos'
import { formatTimeAgo } from '@/ui/lib/time'
import { cn } from '@/ui/lib/utils'
import { SpriteScrubber } from './sprite-scrubber'
import { m } from '@/ui/paraglide/messages.js'
import React from 'react'
interface NotificationCardProps {
notification: NotificationInfo
}
const renderNotification = (
messageTemplate: string,
placeholders: Record<string, React.ReactNode>,
) => {
const regex = new RegExp(
`(${Object.keys(placeholders)
.map((k) => `\\{${k}\\}`)
.join('|')})`,
'g',
)
return (
<span>
{messageTemplate.split(regex).map((part, index) => {
const match = part.match(/^\{(.+)\}$/)
if (match && placeholders[match[1]]) {
return <React.Fragment key={index}>{placeholders[match[1]]}</React.Fragment>
}
return part
})}
</span>
)
}
export const NotificationCard = ({ notification }: NotificationCardProps) => {
const { creator, createdAt, isRead, type, asset, project, team, user } = notification
const message = (() => {
const creatorName = creator?.name || 'Unknown User'
const assetName = asset?.name || 'unknown asset'
const projectName = project?.name || 'unknown project'
const teamName = team?.name || 'unknown team'
const targetUserName = user?.name || 'unknown user'
const creatorName = creator?.name || m.unknown_user()
const assetName = asset?.name || m.unknown_asset()
const projectName = project?.name || m.unknown_project()
const teamName = team?.name || m.unknown_team()
const targetUserName = user?.name || m.unknown_user()
const placeholders = {
creator: <span className="font-semibold">{creatorName}</span>,
asset: <span className="font-semibold">{assetName}</span>,
project: <span className="font-semibold">{projectName}</span>,
team: <span className="font-semibold">{teamName}</span>,
user: <span className="font-semibold">{targetUserName}</span>,
}
switch (type) {
case 'comment_created':
return (
<span>
<span className="font-semibold">{creatorName}</span> commented on{' '}
<span className="font-semibold">{assetName}</span>
</span>
return renderNotification(
m.notification_commented_on({ creator: '{creator}', asset: '{asset}' }),
placeholders,
)
case 'reply_created':
return (
<span>
<span className="font-semibold">{creatorName}</span> replied to a comment on{' '}
<span className="font-semibold">{assetName}</span>
</span>
return renderNotification(
m.notification_replied_to({ creator: '{creator}', asset: '{asset}' }),
placeholders,
)
case 'mention':
return (
<span>
<span className="font-semibold">{creatorName}</span> mentioned you in{' '}
<span className="font-semibold">{assetName}</span>
</span>
return renderNotification(
m.notification_mentioned_you({ creator: '{creator}', asset: '{asset}' }),
placeholders,
)
case 'successful_file_uploaded':
return (
<span>
<span className="font-semibold">{creatorName}</span> uploaded{' '}
<span className="font-semibold">{assetName}</span> to{' '}
<span className="font-semibold">{projectName}</span>
</span>
return renderNotification(
m.notification_uploaded({ creator: '{creator}', asset: '{asset}', project: '{project}' }),
placeholders,
)
case 'metadata_field_updated_status':
return (
<span>
<span className="font-semibold">{creatorName}</span> updated status of{' '}
<span className="font-semibold">{assetName}</span>
</span>
return renderNotification(
m.notification_status_updated({ creator: '{creator}', asset: '{asset}' }),
placeholders,
)
case 'new_user_join_team':
return (
<span>
<span className="font-semibold">{targetUserName}</span> joined{' '}
<span className="font-semibold">{teamName}</span>
</span>
return renderNotification(
m.notification_joined_team({ user: '{user}', team: '{team}' }),
placeholders,
)
case 'new_user_join_project':
return (
<span>
<span className="font-semibold">{targetUserName}</span> joined{' '}
<span className="font-semibold">{projectName}</span>
</span>
return renderNotification(
m.notification_joined_project({ user: '{user}', project: '{project}' }),
placeholders,
)
default:
return (
<span>
New notification from <span className="font-semibold">{creatorName}</span>
</span>
)
return renderNotification(m.notification_generic({ creator: '{creator}' }), placeholders)
}
})()
@@ -3,6 +3,7 @@ import { NotificationCard } from '@/ui/components/notification-card'
import { Button } from '@/ui/components/ui/button'
import { Tabs, TabsList, TabsTrigger } from '@/ui/components/ui/tabs'
import { useTeamContextStore } from '@/ui/stores/team-context'
import { m } from '@/ui/paraglide/messages.js'
import { useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { CheckCheckIcon, Loader2 } from 'lucide-react'
import { useEffect, useMemo, useState } from 'react'
@@ -126,10 +127,10 @@ export const NotificationList = () => {
<div className="flex items-center justify-between mb-2">
<TabsList className="h-8">
<TabsTrigger value="all" className="text-xs px-3 h-6">
All
{m.all()}
</TabsTrigger>
<TabsTrigger value="unread" className="text-xs px-3 h-6">
Unread
{m.unread()}
</TabsTrigger>
</TabsList>
@@ -139,7 +140,7 @@ export const NotificationList = () => {
className="h-8 px-2 text-muted-foreground hover:text-foreground"
onClick={handleMarkAllRead}
disabled={notifications.length === 0 || markReadMutation.isPending}
title="Mark all as read"
title={m.mark_all_as_read()}
>
<CheckCheckIcon className="w-4 h-4" />
</Button>
@@ -156,7 +157,7 @@ export const NotificationList = () => {
{!isLoading && notifications.length === 0 && (
<div className="flex flex-col items-center justify-center h-40 text-muted-foreground">
<p className="text-sm">No notifications</p>
<p className="text-sm">{m.no_notifications()}</p>
</div>
)}
@@ -16,7 +16,9 @@ import { Lock, AlertCircle, Loader2 } from 'lucide-react'
import type { AncestorFolder, AssetInfoPaginatedList, AssetInfo, CommentInfo } from '@shumai/dtos'
import { FieldInfo } from '@shumai/dtos'
import { FileViewer } from './file-viewer'
import type Player from 'video.js/dist/types/player'
import { CompareViewer } from './compare/compare-viewer'
import { pickDefaultCompareVersions } from './compare/compare-utils'
import type { MediaController } from './viewers/types'
import type { Annotation } from '@/ui/types'
import { useNavigate } from '@tanstack/react-router'
@@ -26,6 +28,11 @@ interface PublicShareManagerProps {
initialFolderId?: string
initialFileId?: string
startTime?: number
versionId?: string
compare?: boolean
compareLeftId?: string
compareRightId?: string
compareActiveSide?: 'left' | 'right'
}
interface PublicShareInfo {
@@ -46,8 +53,14 @@ export function PublicShareManager({
initialFolderId,
initialFileId,
startTime,
versionId,
compare,
compareLeftId,
compareRightId,
compareActiveSide = 'left',
}: PublicShareManagerProps) {
const navigate = useNavigate()
const isCompareMode = !!compare && !!compareLeftId && !!compareRightId
const [password, setPassword] = useState(() => {
return localStorage.getItem(`share_pwd_${shareId}`) || ''
})
@@ -87,6 +100,9 @@ export function PublicShareManager({
const currentFolderId = initialFolderId || shareInfo?.rootFolderId
const viewingFileId = initialFileId || null
// The stack asset is always fetched by the route file id; when a version is
// selected we additionally display that version child asset.
const activeFileId = versionId || viewingFileId
const [ancestorFolders, setAncestorFolders] = useState<AncestorFolder[]>([])
@@ -125,10 +141,14 @@ export function PublicShareManager({
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
const [rightSidebarWidth, setRightSidebarWidth] = useState(360)
const [isRightSidebarCollapsed, setIsRightSidebarCollapsed] = useState(() => !initialFileId)
const videoRef = useRef<Player | null>(null)
const mediaControllerRef = useRef<MediaController | null>(null)
const [annotations, setAnnotations] = useState<Annotation[]>([])
const [currentTime, setCurrentTime] = useState(0)
const [selectedCommentId, setSelectedCommentId] = useState<string | null>(null)
const [compareActiveAsset, setCompareActiveAsset] = useState<AssetInfo | null>(null)
const [seekRequest, setSeekRequest] = useState<{ second: number; nonce: number } | undefined>(
undefined,
)
const {
data: foldersData,
@@ -214,7 +234,7 @@ export function PublicShareManager({
enabled: !!shareInfo,
})
const { data: viewingFileData, isLoading: isViewingFileLoading } = useQuery({
const { data: stackFileData, isLoading: isStackFileLoading } = useQuery({
queryKey: ['public-share-file', shareId, viewingFileId, password],
queryFn: async () => {
const res = await client.api.shares[':shareId'].files[':fileId'].$get(
@@ -233,6 +253,30 @@ export function PublicShareManager({
enabled: !!viewingFileId && !!shareInfo,
})
const { data: versionFileData, isLoading: isVersionFileLoading } = useQuery({
queryKey: ['public-share-file', shareId, versionId, password],
queryFn: async () => {
const res = await client.api.shares[':shareId'].files[':fileId'].$get(
{
param: { shareId, fileId: versionId! },
},
{
headers: {
'x-share-password': password,
},
},
)
if (res.status === 401) throw new Error('Unauthorized')
return (await res.json()) as unknown as AssetInfo
},
enabled: !!versionId && !!shareInfo,
})
// The stack asset provides the version list; the active asset (version child
// or the stack itself) is what we actually display.
const viewingFileData = versionId ? versionFileData : stackFileData
const isViewingFileLoading = isStackFileLoading || (!!versionId && isVersionFileLoading)
useEffect(() => {
if (foldersError?.message === 'Unauthorized') {
setPassword('')
@@ -307,15 +351,18 @@ export function PublicShareManager({
setAnnotations([])
}
if (isCompareMode) {
if (comment.second !== null && comment.second !== undefined) {
setSeekRequest({ second: comment.second, nonce: Date.now() })
}
return
}
if (comment.second !== null && comment.second !== undefined) {
if (videoRef.current) {
videoRef.current.currentTime(comment.second)
videoRef.current.pause()
}
mediaControllerRef.current?.seekTo(comment.second)
mediaControllerRef.current?.pause()
} else if (newAnnotations && newAnnotations.length > 0) {
if (videoRef.current) {
videoRef.current.pause()
}
mediaControllerRef.current?.pause()
}
}
@@ -324,6 +371,26 @@ export function PublicShareManager({
setSelectedCommentId(null)
}
const updateCompareSearch = (patch: Record<string, unknown>) => {
if (!viewingFileId) return
navigate({
to: '/share/$shareId/files/$fileId',
params: { shareId, fileId: viewingFileId },
search: (p: Record<string, unknown>) => ({ ...p, ...patch }),
})
}
const handleCompareExit = () => {
const activeId = compareActiveSide === 'left' ? compareLeftId : compareRightId
updateCompareSearch({
compare: undefined,
cmpLeft: undefined,
cmpRight: undefined,
cmpActive: undefined,
version: activeId,
})
}
const { setProjectState, clearProjectState } = useTopNavStore()
useEffect(() => {
@@ -341,18 +408,48 @@ export function PublicShareManager({
currentAsset: {
name: viewingFileData?.name || currentFolderName,
type: viewingFileId ? 'file' : 'folder',
version: viewingFileData?.versionStack
? (viewingFileData.versionStack.versions.find((v) => v.id === viewingFileData.id)
?.version ?? viewingFileData.versionStack.versions.length)
version: stackFileData?.versionStack
? (stackFileData.versionStack.versions.find((v) => v.id === activeFileId)?.version ??
stackFileData.versionStack.versions.length)
: undefined,
mediaType: viewingFileData?.mediaType || null,
},
isRootFolder: currentFolderId === shareInfo.rootFolderId && !viewingFileId,
isPublic: true,
shareId,
fileId: viewingFileId || undefined,
downloadInfo: viewingFileData
? {
originalKey: viewingFileData.media?.original?.key,
videoTranscodes: viewingFileData.media?.videoTranscodes?.map((t) => ({
key: t.key,
width: t.width,
height: t.height,
isRaw: t.isRaw,
})),
}
: undefined,
onFolderClick: handleBreadcrumbClick,
isRightSidebarCollapsed,
onRightSidebarToggle: () => setIsRightSidebarCollapsed((prev) => !prev),
versions: stackFileData?.versionStack?.versions,
compareMode: isCompareMode,
canCompareVersions: (stackFileData?.versionStack?.versions?.length ?? 0) >= 2,
onCompareVersions: () => {
const pair = pickDefaultCompareVersions(stackFileData?.versionStack?.versions)
if (!pair || !viewingFileId) return
navigate({
to: '/share/$shareId/files/$fileId',
params: { shareId, fileId: viewingFileId },
search: (p: Record<string, unknown>) => ({
...p,
compare: true,
cmpLeft: pair.left.id,
cmpRight: pair.right.id,
cmpActive: 'left' as const,
}),
})
},
})
}
@@ -362,11 +459,16 @@ export function PublicShareManager({
currentFolderId,
folders,
viewingFileData,
stackFileData,
activeFileId,
viewingFileId,
ancestorFolders,
setProjectState,
clearProjectState,
isRightSidebarCollapsed,
isCompareMode,
navigate,
shareId,
])
let content
@@ -445,20 +547,44 @@ export function PublicShareManager({
<div className="flex flex-1 overflow-hidden relative">
{viewingFileId ? (
<div className="flex-1 relative bg-muted/30">
{isViewingFileLoading && (
{isViewingFileLoading && !isCompareMode && (
<div className="absolute inset-0 z-10 flex items-center justify-center bg-background/50">
<Loader2 className="h-8 w-8 animate-spin text-foreground" />
</div>
)}
{viewingFileData && (
<FileViewer
file={viewingFileData}
videoRef={videoRef}
{isCompareMode && compareLeftId && compareRightId ? (
<CompareViewer
isPublic
shareId={shareId}
versions={viewingFileData?.versionStack?.versions ?? []}
leftId={compareLeftId}
rightId={compareRightId}
activeSide={compareActiveSide}
annotations={annotations}
seekRequest={seekRequest}
onActiveSideChange={(side) => updateCompareSearch({ cmpActive: side })}
onSwitchVersion={(side, versionId) =>
updateCompareSearch(
side === 'left' ? { cmpLeft: versionId } : { cmpRight: versionId },
)
}
onExit={handleCompareExit}
onActiveAssetChange={setCompareActiveAsset}
onPlay={handlePlay}
onTimeUpdate={setCurrentTime}
annotations={annotations}
startTime={startTime}
/>
) : (
viewingFileData && (
<FileViewer
file={viewingFileData}
mediaControllerRef={mediaControllerRef}
onPlay={handlePlay}
onTimeUpdate={setCurrentTime}
annotations={annotations}
startTime={startTime}
shareId={shareId}
/>
)
)}
</div>
) : (
@@ -508,7 +634,7 @@ export function PublicShareManager({
<FileViewerRightSidebar
teamId=""
projectId={shareInfo.projectId}
file={currentSelectedItem}
file={isCompareMode ? compareActiveAsset : currentSelectedItem}
onSaveField={() => {}}
members={[]}
readOnly={true}
@@ -518,11 +644,13 @@ export function PublicShareManager({
shareId={shareId}
currentTime={currentTime}
onTyping={() => {
if (videoRef.current) {
videoRef.current.pause()
}
mediaControllerRef.current?.pause()
}}
selectedCommentId={selectedCommentId}
hideAnnotationControl={(isCompareMode
? compareActiveAsset
: currentSelectedItem
)?.mediaType?.startsWith('audio/')}
/>
</div>
</>
+11 -4
View File
@@ -8,6 +8,7 @@ import {
} from '@/ui/components/ui/dialog'
import { useQuery } from '@tanstack/react-query'
import { useNavigate } from '@tanstack/react-router'
import { useEffect } from 'react'
import { m } from '@/ui/paraglide/messages.js'
export function TeamSelector() {
@@ -23,14 +24,20 @@ export function TeamSelector() {
},
})
const teams = teamsData?.data
const onlyTeamId = teams?.length === 1 ? teams[0].id : null
useEffect(() => {
if (onlyTeamId) {
navigate({ to: `/teams/${onlyTeamId}` })
}
}, [onlyTeamId, navigate])
if (isLoading) {
return <div>{m.loading()}</div>
}
const teams = teamsData?.data
if (teams?.length === 1) {
navigate({ to: `/teams/${teams[0].id}` })
if (onlyTeamId) {
return null
}
+8
View File
@@ -19,10 +19,14 @@ export function TopNav() {
currentAsset,
isRootFolder,
fileId,
downloadInfo,
versions,
isPublic,
shareId,
onFolderClick,
compareMode,
canCompareVersions,
onCompareVersions,
} = projectState
const isFileView = !!fileId
@@ -87,8 +91,12 @@ export function TopNav() {
isPublic={isPublic}
shareId={shareId}
fileId={fileId}
downloadInfo={downloadInfo}
versions={versions}
onFolderClick={onFolderClick}
compareMode={compareMode}
canCompareVersions={canCompareVersions}
onCompareVersions={onCompareVersions}
/>
)
}
+16 -15
View File
@@ -9,19 +9,20 @@ import { useInView } from 'react-intersection-observer'
import { format, parseISO, isToday, isYesterday } from 'date-fns'
import { Progress } from '@/ui/components/ui/progress'
import { formatTimeAgo } from '@/ui/lib/time'
import { m } from '@/ui/paraglide/messages.js'
function formatDayHeader(dateString: string): string {
const date = parseISO(dateString)
if (isNaN(date.getTime())) {
return 'Unknown Date'
return m.unknown_date()
}
if (isToday(date)) {
return 'Today'
return m.today()
}
if (isYesterday(date)) {
return 'Yesterday'
return m.yesterday()
}
return format(date, 'MMMM d, yyyy')
return format(date, m.date_format_long())
}
function formatBytes(bytes: number): string {
@@ -51,7 +52,7 @@ function UploadTaskItem({ task }: { task: TaskInfo }) {
try {
formattedTime = formatTimeAgo(task.createdAt)
} catch {
formattedTime = 'unknown'
formattedTime = m.unknown()
}
return (
@@ -63,19 +64,19 @@ function UploadTaskItem({ task }: { task: TaskInfo }) {
className="text-sm font-semibold tracking-tight text-sidebar-foreground truncate block"
title={task.name}
>
{task.name || 'Untitled Upload'}
{task.name || m.untitled_upload()}
</span>
</div>
<div className="flex-shrink-0">
{isCompleted ? (
<span className="inline-flex items-center gap-1 text-xs font-semibold text-muted-foreground bg-muted px-2 py-0.5 rounded-full transition-colors">
<CheckCircle2 className="w-3.5 h-3.5" />
Done
{m.done()}
</span>
) : (
<span className="inline-flex items-center gap-1 text-xs font-semibold text-sidebar-primary bg-sidebar-primary/10 px-2 py-0.5 rounded-full animate-pulse">
<Loader2 className="w-3.5 h-3.5 animate-spin" />
Uploading
{m.uploading_status()}
</span>
)}
</div>
@@ -92,8 +93,8 @@ function UploadTaskItem({ task }: { task: TaskInfo }) {
<div className="flex items-center justify-between text-xs font-semibold">
<span className="text-muted-foreground/80">
{clientProgress
? `${formatBytes(clientProgress.loaded)} / ${formatBytes(clientProgress.total)} (${task.uploaded} / ${task.total} ${task.total === 1 ? 'file' : 'files'})`
: `${task.uploaded} / ${task.total} ${task.total === 1 ? 'file' : 'files'}`}
? `${formatBytes(clientProgress.loaded)} / ${formatBytes(clientProgress.total)} (${m.files_progress({ uploaded: task.uploaded, total: task.total })})`
: m.files_progress({ uploaded: task.uploaded, total: task.total })}
</span>
{!isCompleted && (
<span className="text-sidebar-primary font-mono font-bold">{Math.round(percent)}%</span>
@@ -181,10 +182,8 @@ export function UploadTasks() {
return (
<div className="flex flex-col items-center justify-center p-8 text-center border border-dashed border-border rounded-xl bg-muted/10 my-4">
<UploadCloud className="h-8 w-8 text-muted-foreground/50 mb-3" />
<p className="text-sm font-semibold text-muted-foreground">No uploads yet</p>
<p className="text-xs text-muted-foreground/60 mt-1 max-w-[180px]">
Upload files in the project view to track progress here.
</p>
<p className="text-sm font-semibold text-muted-foreground">{m.no_uploads_yet()}</p>
<p className="text-xs text-muted-foreground/60 mt-1 max-w-[180px]">{m.no_uploads_hint()}</p>
</div>
)
}
@@ -211,7 +210,9 @@ export function UploadTasks() {
{group.day}
</span>
<span className="text-[10px] font-semibold text-muted-foreground/60 bg-muted px-2 py-0.5 rounded-full">
{group.tasks.length} {group.tasks.length === 1 ? 'task' : 'tasks'}
{group.tasks.length === 1
? m.n_tasks_singular({ count: group.tasks.length })
: m.n_tasks_plural({ count: group.tasks.length })}
</span>
</div>
{/* Tasks in Day */}
+17 -1
View File
@@ -44,6 +44,20 @@ export function UserMenu() {
const { clearAuth } = useAuthStore()
const teamId = useTeamId()
const localizeRole = (role?: string) => {
if (!role) return ''
switch (role.toLowerCase()) {
case 'owner':
return m.owner()
case 'editor':
return m.editor()
case 'reviewer':
return m.reviewer()
default:
return role
}
}
const { data: me } = useQuery({
queryKey: ['teams', teamId, 'me'],
queryFn: async () => {
@@ -95,7 +109,9 @@ export function UserMenu() {
<DropdownMenuLabel className="font-normal">
<div className="flex flex-col space-y-1">
<p className="text-sm font-medium leading-none">{me.name}</p>
<p className="text-xs leading-none text-muted-foreground">{me.role}</p>
<p className="text-xs leading-none text-muted-foreground">
{localizeRole(me.role)}
</p>
</div>
</DropdownMenuLabel>
<DropdownMenuSeparator />
@@ -0,0 +1,64 @@
import { client } from '@/ui/api/client'
import { Download } from 'lucide-react'
import React, { useImperativeHandle } from 'react'
import { FileViewerProps, MediaController } from '../types'
export const DefaultViewer = React.forwardRef<MediaController, FileViewerProps>(
({ file, shareId, children }, ref) => {
// Implement no-op media controller
useImperativeHandle(ref, () => ({
play: () => {},
pause: () => {},
seekTo: () => {},
}))
const handleDownload = async () => {
const key = file.media?.original?.key
if (!key || !file.id) return
try {
const res = shareId
? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
param: { shareId, fileId: file.id },
json: { key },
})
: await client.api.files['download-url'].$post({
json: { key, assetId: file.id },
})
if (!res.ok) return
const { url } = await res.json()
const link = document.createElement('a')
link.href = url
link.download = ''
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
} catch {
// silently fail
}
}
return (
<div className="flex flex-col flex-1 h-full overflow-hidden bg-gray-100 dark:bg-gray-950 relative">
<div className="flex-1 flex flex-col-reverse md:flex-row min-h-0 relative">
{children}
<div className="flex-1 flex items-center justify-center">
<p className="text-muted-foreground">Preview unavailable</p>
</div>
</div>
<div className="relative px-4 py-3 bg-card border-t border-gray-200 dark:border-gray-700 z-10 flex items-center justify-end gap-2 transition-colors duration-200">
<button
onClick={handleDownload}
disabled={!file.media?.original?.key}
className="flex items-center gap-1.5 text-xs font-medium px-3 py-1.5 rounded bg-gray-200/50 dark:bg-white/10 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors border border-transparent disabled:opacity-50 animate-in fade-in zoom-in-95 duration-200"
title="Download original file"
>
<Download size={14} />
Download
</button>
</div>
</div>
)
},
)
export default DefaultViewer
@@ -0,0 +1,14 @@
import { FileTypeDefinition } from '../types'
import DefaultViewer from './default-viewer'
export const defaultTypeDefinition: FileTypeDefinition = {
id: 'default',
name: 'Default',
match: () => true,
viewer: DefaultViewer,
commentsConfig: {
hasTimestamp: false,
hasAnnotations: false,
hasAiBots: false,
},
}
@@ -0,0 +1,218 @@
import { client } from '@/ui/api/client'
import DrawingCanvas from '@/ui/components/drawing-canvas'
import { useScreenSize } from '@/ui/hooks/useScreenSize'
import { getBestTranscode } from '@/ui/lib/media'
import { useAnnotationStore } from '@/ui/stores/annotation-store'
import type { Annotation } from '@/ui/types'
import type { AssetInfo } from '@shumai/dtos'
import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'
import type { ComparePaneHandle, PaneReportedState } from '../../compare/types'
interface CompareImagePaneProps {
file: AssetInfo
shareId?: string
isActive: boolean
annotations: Annotation[]
onStateChange: (state: PaneReportedState) => void
onUserPan?: (dx: number, dy: number) => void
onActivate?: () => void
}
const MIN_ZOOM = 0.01
const MAX_ZOOM = 50
export const CompareImagePane = forwardRef<ComparePaneHandle, CompareImagePaneProps>(
function CompareImagePane(
{ file, shareId, isActive, annotations, onStateChange, onUserPan, onActivate },
ref,
) {
const { width: screenWidth } = useScreenSize()
const {
isDrawing,
currentTool,
currentColor,
addAnnotation,
annotations: draftAnnotations,
} = useAnnotationStore()
const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })
const [zoom, setZoom] = useState(1)
const [pan, setPan] = useState({ x: 0, y: 0 })
const observerRef = useRef<ResizeObserver | null>(null)
const zoomRef = useRef(zoom)
zoomRef.current = zoom
const panRef = useRef(pan)
panRef.current = pan
const containerRef = useCallback((node: HTMLDivElement | null) => {
if (observerRef.current) {
observerRef.current.disconnect()
observerRef.current = null
}
if (node !== null) {
const observer = new ResizeObserver((entries) => {
const entry = entries[0]
if (entry) {
setContainerSize({
width: entry.contentRect.width,
height: entry.contentRect.height,
})
}
})
observer.observe(node)
observerRef.current = observer
}
}, [])
const imgW = file.media?.metadata?.originalWidth ?? 1920
const imgH = file.media?.metadata?.originalHeight ?? 1080
const conW = containerSize.width
const conH = containerSize.height
let baseScale = 1
if (conW > 0 && conH > 0) {
baseScale = Math.min(conW / imgW, conH / imgH)
}
// Fit on mount / container resize / file change
useEffect(() => {
if (conW > 0 && conH > 0) {
setZoom(baseScale)
setPan({
x: (conW - imgW * baseScale) / 2,
y: (conH - imgH * baseScale) / 2,
})
}
}, [file.id, conW, conH, baseScale, imgW, imgH])
const applyZoom = useCallback(
(factor: number) => {
const cx = conW / 2
const cy = conH / 2
const cur = zoomRef.current
const newZoom = cur * factor
if (newZoom < MIN_ZOOM || newZoom > MAX_ZOOM) return
const curPan = panRef.current
setPan({
x: cx - (cx - curPan.x) * (newZoom / cur),
y: cy - (cy - curPan.y) * (newZoom / cur),
})
setZoom(newZoom)
},
[conW, conH],
)
const fit = useCallback(() => {
setZoom(baseScale)
setPan({
x: (conW - imgW * baseScale) / 2,
y: (conH - imgH * baseScale) / 2,
})
}, [baseScale, conW, conH, imgW, imgH])
let bestUrl = file.media?.original?.downloadUrl
const bestTranscode = getBestTranscode(file.media?.imageTranscodes, screenWidth)
if (bestTranscode?.url) {
bestUrl = bestTranscode.url
}
const handleDownload = useCallback(async () => {
const key = file.media?.original?.key
if (!key || !file.id) return
try {
const res = shareId
? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
param: { shareId, fileId: file.id },
json: { key },
})
: await client.api.files['download-url'].$post({
json: { key, assetId: file.id },
})
if (!res.ok) return
const { url } = await res.json()
const link = document.createElement('a')
link.href = url
link.download = ''
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
} catch {
// silently fail
}
}, [file.id, file.media?.original?.key, shareId])
useImperativeHandle(
ref,
(): ComparePaneHandle => ({
getKind: () => 'image',
play: () => {},
pause: () => {},
togglePlay: () => {},
seekToFrame: () => {},
seekToSecond: () => {},
stepFrame: () => {},
setMuted: () => {},
setVolume: () => {},
setPlaybackRate: () => {},
toggleLoop: () => {},
changeResolution: () => {},
zoomBy: (factor) => applyZoom(factor),
fit,
panBy: (dx, dy) => setPan((p) => ({ x: p.x + dx, y: p.y + dy })),
download: handleDownload,
}),
[applyZoom, fit, handleDownload],
)
// Report state upward
useEffect(() => {
onStateChange({ kind: 'image', zoom })
}, [zoom, onStateChange])
const displayAnnotations = [...annotations, ...(isActive ? draftAnnotations : [])]
const handlePan = useCallback(
(newOffset: { x: number; y: number }) => {
const prev = panRef.current
const dx = newOffset.x - prev.x
const dy = newOffset.y - prev.y
setPan(newOffset)
if (dx !== 0 || dy !== 0) onUserPan?.(dx, dy)
},
[onUserPan],
)
if (!bestUrl) {
return (
<div className="flex flex-1 items-center justify-center bg-gray-100 dark:bg-gray-950">
<p className="text-muted-foreground">Preview unavailable</p>
</div>
)
}
return (
<div
ref={containerRef}
className="relative flex-1 overflow-hidden bg-gray-100 dark:bg-gray-950"
onMouseDown={onActivate}
>
<DrawingCanvas
width={conW}
height={conH}
mediaDimensions={{ width: imgW, height: imgH }}
imageUrl={bestUrl}
annotations={displayAnnotations}
scale={zoom}
offset={pan}
onPan={handlePan}
className="absolute inset-0 z-0"
isDrawing={isActive && isDrawing}
currentTool={currentTool}
currentColor={currentColor}
onAddAnnotation={isActive ? addAnnotation : undefined}
/>
</div>
)
},
)
@@ -0,0 +1,88 @@
import { Check, Copy, Download, Maximize, Minimize, Minus, Plus } from 'lucide-react'
import { m } from '@/ui/paraglide/messages.js'
export interface ImageControlBarProps {
zoom: number
onZoomIn: () => void
onZoomOut: () => void
onFit: () => void
onDownload: () => void
canDownload: boolean
onCopy?: () => void
copied?: boolean
canCopy?: boolean
/** When provided, renders a fullscreen toggle (used by compare mode). */
fullscreen?: { isFullScreen: boolean; onToggle: () => void }
}
export function ImageControlBar({
zoom,
onZoomIn,
onZoomOut,
onFit,
onDownload,
canDownload,
onCopy,
copied = false,
canCopy = true,
fullscreen,
}: ImageControlBarProps) {
return (
<div className="relative px-4 py-3 bg-card border-t border-gray-200 dark:border-gray-700 z-10 flex items-center justify-end gap-2 transition-colors duration-200">
<div className="flex items-center gap-1 bg-gray-200/50 dark:bg-white/10 rounded-md p-0.5 mr-auto">
<button
onClick={onZoomOut}
className="p-1.5 rounded hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors"
title={m.zoom_out()}
>
<Minus size={16} />
</button>
<span className="w-12 text-center text-xs font-mono font-medium text-gray-900 dark:text-gray-100 select-none">
{Math.round(zoom * 100)}%
</span>
<button
onClick={onZoomIn}
className="p-1.5 rounded hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors"
title={m.zoom_in()}
>
<Plus size={16} />
</button>
</div>
<button
onClick={onFit}
className="text-xs font-medium px-3 py-1.5 rounded bg-gray-200/50 dark:bg-white/10 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors border border-transparent animate-in fade-in zoom-in-95 duration-200"
>
{m.fit()}
</button>
{onCopy && (
<button
onClick={onCopy}
disabled={!canCopy}
className="flex items-center gap-1.5 text-xs font-medium px-3 py-1.5 rounded bg-gray-200/50 dark:bg-white/10 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors border border-transparent disabled:opacity-50 animate-in fade-in zoom-in-95 duration-200"
title={m.copy_image_to_clipboard()}
>
{copied ? <Check size={14} className="text-green-500" /> : <Copy size={14} />}
{copied ? m.copied() : m.copy()}
</button>
)}
<button
onClick={onDownload}
disabled={!canDownload}
className="flex items-center gap-1.5 text-xs font-medium px-3 py-1.5 rounded bg-gray-200/50 dark:bg-white/10 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors border border-transparent disabled:opacity-50 animate-in fade-in zoom-in-95 duration-200"
title={m.download_original_image()}
>
<Download size={14} />
{m.download()}
</button>
{fullscreen && (
<button
onClick={fullscreen.onToggle}
className="p-1.5 rounded hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-200 transition-colors"
title={m.fullscreen()}
>
{fullscreen.isFullScreen ? <Minimize size={16} /> : <Maximize size={16} />}
</button>
)}
</div>
)
}
@@ -0,0 +1,223 @@
import { useScreenSize } from '@/ui/hooks/useScreenSize'
import { client } from '@/ui/api/client'
import { getBestTranscode } from '@/ui/lib/media'
import React, { useCallback, useEffect, useRef, useState, useImperativeHandle } from 'react'
import DrawingCanvas from '@/ui/components/drawing-canvas'
import { ImageControlBar } from './image-control-bar'
import { useAnnotationStore } from '@/ui/stores/annotation-store'
import { FileViewerProps, MediaController } from '../types'
export const ImageViewer = React.forwardRef<MediaController, FileViewerProps>(
({ file, annotations, shareId, children }, ref) => {
// Implement no-op media controller since images are static
useImperativeHandle(ref, () => ({
play: () => {},
pause: () => {},
seekTo: () => {},
}))
const { width: screenWidth } = useScreenSize()
const {
isDrawing,
currentTool,
currentColor,
addAnnotation,
annotations: draftAnnotations,
} = useAnnotationStore()
const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })
const [zoom, setZoom] = useState(1)
const [pan, setPan] = useState({ x: 0, y: 0 })
const [copied, setCopied] = useState(false)
const observerRef = useRef<ResizeObserver | null>(null)
const containerRef = useCallback((node: HTMLDivElement | null) => {
if (observerRef.current) {
observerRef.current.disconnect()
observerRef.current = null
}
if (node !== null) {
const observer = new ResizeObserver((entries) => {
const entry = entries[0]
if (entry) {
setContainerSize({
width: entry.contentRect.width,
height: entry.contentRect.height,
})
}
})
observer.observe(node)
observerRef.current = observer
}
}, [])
const imgW = file.media?.metadata?.originalWidth ?? 1920
const imgH = file.media?.metadata?.originalHeight ?? 1080
const conW = containerSize.width
const conH = containerSize.height
let baseScale = 1
if (conW > 0 && conH > 0) {
baseScale = Math.min(conW / imgW, conH / imgH)
}
// Reset/Fit logic
useEffect(() => {
if (conW > 0 && conH > 0) {
setZoom(baseScale)
// Center
const x = (conW - imgW * baseScale) / 2
const y = (conH - imgH * baseScale) / 2
setPan({ x, y })
}
}, [file.id, conW, conH, baseScale, imgW, imgH])
const handleZoom = (factor: number) => {
const cx = conW / 2
const cy = conH / 2
const newZoom = zoom * factor
if (newZoom < 0.01 || newZoom > 50) return
const newPanX = cx - (cx - pan.x) * (newZoom / zoom)
const newPanY = cy - (cy - pan.y) * (newZoom / zoom)
setZoom(newZoom)
setPan({ x: newPanX, y: newPanY })
}
const handleFit = () => {
setZoom(baseScale)
const x = (conW - imgW * baseScale) / 2
const y = (conH - imgH * baseScale) / 2
setPan({ x, y })
}
let bestUrl = file.media?.original?.downloadUrl
const bestTranscode = getBestTranscode(file.media?.imageTranscodes, screenWidth)
if (bestTranscode?.url) {
bestUrl = bestTranscode.url
}
const handleDownload = async () => {
const key = file.media?.original?.key
if (!key || !file.id) return
try {
const res = shareId
? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
param: { shareId, fileId: file.id },
json: { key },
})
: await client.api.files['download-url'].$post({
json: { key, assetId: file.id },
})
if (!res.ok) return
const { url } = await res.json()
const link = document.createElement('a')
link.href = url
link.download = ''
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
} catch {
// silently fail
}
}
const handleCopy = async () => {
const webpUrl = bestUrl
if (!webpUrl) return
try {
const copyPromise = (async () => {
const response = await fetch(webpUrl)
const blob = await response.blob()
const img = new Image()
img.crossOrigin = 'anonymous'
const objectUrl = URL.createObjectURL(blob)
img.src = objectUrl
try {
await new Promise((resolve, reject) => {
img.onload = resolve
img.onerror = (e) => reject(new Error('Failed to load image: ' + String(e)))
})
const canvas = document.createElement('canvas')
canvas.width = img.width
canvas.height = img.height
const ctx = canvas.getContext('2d')
if (!ctx) throw new Error('Could not get canvas context')
ctx.drawImage(img, 0, 0)
const pngBlob = await new Promise<Blob | null>((resolve) => {
canvas.toBlob(resolve, 'image/png')
})
if (!pngBlob) throw new Error('Failed to convert image to PNG')
return pngBlob
} finally {
URL.revokeObjectURL(objectUrl)
}
})()
await navigator.clipboard.write([
new ClipboardItem({
'image/png': copyPromise,
}),
])
setCopied(true)
setTimeout(() => setCopied(false), 2000)
} catch (err) {
console.error('Failed to copy image to clipboard:', err)
}
}
const displayAnnotations = [...(annotations || []), ...draftAnnotations]
return (
<div className="flex flex-col flex-1 h-full overflow-hidden bg-gray-100 dark:bg-gray-950 relative">
<div className="flex-1 flex flex-col-reverse md:flex-row min-h-0 relative">
{children}
<div ref={containerRef} className="flex-1 relative overflow-hidden">
<DrawingCanvas
width={conW}
height={conH}
mediaDimensions={{
width: imgW,
height: imgH,
}}
imageUrl={bestUrl}
annotations={displayAnnotations}
scale={zoom}
offset={pan}
onPan={setPan}
className="absolute inset-0 z-0"
isDrawing={isDrawing}
currentTool={currentTool}
currentColor={currentColor}
onAddAnnotation={addAnnotation}
/>
</div>
</div>
<ImageControlBar
zoom={zoom}
onZoomIn={() => handleZoom(1.2)}
onZoomOut={() => handleZoom(0.8)}
onFit={handleFit}
onDownload={handleDownload}
canDownload={!!file.media?.original?.key}
onCopy={handleCopy}
copied={copied}
canCopy={!!bestUrl}
/>
</div>
)
},
)
export default ImageViewer
@@ -0,0 +1,16 @@
import { FileTypeDefinition } from '../types'
import ImageViewer from './image-viewer'
import { CompareImagePane } from './compare-image-pane'
export const imageTypeDefinition: FileTypeDefinition = {
id: 'image',
name: 'Image',
match: (file) => !!file.mediaType?.startsWith('image/'),
viewer: ImageViewer,
comparePane: CompareImagePane,
commentsConfig: {
hasTimestamp: false,
hasAnnotations: true,
hasAiBots: true,
},
}
@@ -0,0 +1,17 @@
import type { AssetInfo } from '@shumai/dtos'
import { FileTypeDefinition } from './types'
import { videoTypeDefinition } from './video'
import { imageTypeDefinition } from './image'
import { defaultTypeDefinition } from './default'
const registry: FileTypeDefinition[] = [videoTypeDefinition, imageTypeDefinition]
export function getViewerForFile(file: AssetInfo | null | undefined): FileTypeDefinition {
if (!file) return defaultTypeDefinition
const match = registry.find((viewer) => viewer.match(file))
return match || defaultTypeDefinition
}
export function getAllViewers(): FileTypeDefinition[] {
return registry
}
@@ -0,0 +1,53 @@
import type { AssetInfo } from '@shumai/dtos'
import type { Annotation } from '@/ui/types'
import type { ComparePaneHandle, PaneReportedState } from '@/ui/components/compare/types'
import type React from 'react'
export interface MediaController {
play: () => void
pause: () => void
seekTo: (second: number) => void
getCurrentTime?: () => number
getDuration?: () => number
}
export interface FileViewerProps {
file: AssetInfo
annotations?: Annotation[]
onPlay?: () => void
onPause?: () => void
onTimeUpdate?: (time: number) => void
startTime?: number
shareId?: string
children?: React.ReactNode
}
export interface ComparePaneProps {
file: AssetInfo
isActive: boolean
annotations: Annotation[]
onStateChange: (state: PaneReportedState) => void
onActivate: () => void
onUserPan?: (dx: number, dy: number) => void
shareId?: string
muted?: boolean
volume?: number
onPlay?: () => void
onTimeUpdate?: (second: number) => void
onRequestTogglePlay?: () => void
}
export interface FileTypeDefinition {
id: string
name: string
match: (file: AssetInfo) => boolean
viewer: React.ForwardRefExoticComponent<FileViewerProps & React.RefAttributes<MediaController>>
comparePane?: React.ForwardRefExoticComponent<
ComparePaneProps & React.RefAttributes<ComparePaneHandle>
>
commentsConfig?: {
hasTimestamp?: boolean
hasAnnotations?: boolean
hasAiBots?: boolean
}
}
@@ -1,69 +0,0 @@
import { describe, it, expect } from 'vitest'
import { formatTimecode, calculateFrameCenterTime } from './utils'
describe('formatTimecode tests', () => {
describe('non-drop-frame calculations', () => {
it('formats non-drop-frame correctly at 25 fps', () => {
// 2999 frames at 25 fps => 00:01:59:24
expect(formatTimecode(2999, 25, 'timecode')).toBe('00:01:59:24')
// 3000 frames at 25 fps => 00:02:00:00
expect(formatTimecode(3000, 25, 'timecode')).toBe('00:02:00:00')
// 15000 frames at 25 fps => 00:10:00:00
expect(formatTimecode(15000, 25, 'timecode')).toBe('00:10:00:00')
// 900000 frames at 25 fps => 10:00:00:00
expect(formatTimecode(900000, 25, 'timecode')).toBe('10:00:00:00')
})
})
describe('drop-frame calculations', () => {
it('formats drop-frame correctly at 29.97 fps', () => {
// 3597 frames at 29.97 fps => 00:01:59;29
expect(formatTimecode(3597, 29.97, 'timecode')).toBe('00:01:59;29')
// 17982 frames at 29.97 fps => 00:10:00;00
expect(formatTimecode(17982, 29.97, 'timecode')).toBe('00:10:00;00')
// 1078920 frames at 29.97 fps => 10:00:00;00
expect(formatTimecode(1078920, 29.97, 'timecode')).toBe('10:00:00;00')
})
it('formats drop-frame correctly at 59.94 fps', () => {
// 3597 * 2 + 1 = 7195 frames at 59.94 fps => 00:01:59;59
expect(formatTimecode(7195, 59.94, 'timecode')).toBe('00:01:59;59')
// 17982 * 2 = 35964 frames at 59.94 fps => 00:10:00;00
expect(formatTimecode(35964, 59.94, 'timecode')).toBe('00:10:00;00')
// 1078920 * 2 = 2157840 frames at 59.94 fps => 10:00:00;00
expect(formatTimecode(2157840, 59.94, 'timecode')).toBe('10:00:00;00')
})
})
describe('starting timecode offsets', () => {
it('offsets timecode correctly based on startTimecode string', () => {
// 0 frames at 29.97 fps with start '01:00:00:00' => 01:00:00:00
expect(formatTimecode(0, 29.97, 'timecode', '01:00:00:00')).toBe('01:00:00:00')
// 0 frames at 29.97 fps with start '01:00:00;00' => 01:00:00;00
expect(formatTimecode(0, 29.97, 'timecode', '01:00:00;00')).toBe('01:00:00;00')
// 30 frames at 30 fps with start '01:00:00:00' => 01:00:01:00
expect(formatTimecode(30, 30, 'timecode', '01:00:00:00')).toBe('01:00:01:00')
})
})
describe('other display modes', () => {
it('formats as frames index', () => {
expect(formatTimecode(150, 30, 'frames')).toBe('150 fr')
})
it('formats as standard MM:SS time', () => {
expect(formatTimecode(150, 30, 'standard')).toBe('00:05')
})
})
describe('calculateFrameCenterTime tests', () => {
it('calculates frame center time correctly', () => {
// frame 0 at 30 fps => 0 * 1/30 + 1/60 = 1/60 = 0.0166666...
expect(calculateFrameCenterTime(0, 30)).toBeCloseTo(0.0166666, 5)
// frame 251 at 30 fps => 251 * 1/30 + 1/60 = 251.5 / 30 = 8.3833333...
expect(calculateFrameCenterTime(251, 30)).toBeCloseTo(8.3833333, 5)
// frame rate 0 returns 0
expect(calculateFrameCenterTime(10, 0)).toBe(0)
})
})
})
@@ -1,955 +0,0 @@
import type { AssetInfo, VideoTranscode } from '@shumai/dtos'
import { cn } from '@/ui/lib/utils'
import {
Check,
ChevronDown,
Download,
Maximize,
Minimize,
Minus,
Pause,
Play,
Plus,
Repeat,
Settings,
Volume2,
VolumeX,
} from 'lucide-react'
import React, { useCallback, useEffect, useRef, useState } from 'react'
import videojs from 'video.js'
import type Player from 'video.js/dist/types/player'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuTrigger,
} from '../ui/dropdown-menu'
import { Slider } from '../ui/slider'
import ProgressBar from './progress-bar'
import { formatTimecode, formatTime } from './utils'
import { useFramePlayer } from './use-frame-player'
import { useUiStore } from '@/ui/stores/ui'
import type { Annotation } from '@/ui/types'
import DrawingCanvas from '../drawing-canvas'
import { useAnnotationStore } from '@/ui/stores/annotation-store'
export interface PlayerState {
isPlaying: boolean
progress: number // 0 to 100
currentTime: number
duration: number
volume: number
isMuted: boolean
isLooping: boolean
playbackRate: number
isFullScreen: boolean
showFrames: boolean // Toggle between time (02:30) and frames (1234)
currentResolution: string // 'Original' or '720p', '480p' etc.
currentSrc?: string
}
interface VideoPlayerProps {
data: AssetInfo
playerRef?: React.RefObject<Player | null>
onPlay?: () => void
onPause?: () => void
onTimeUpdate?: (time: number) => void
annotations?: Annotation[]
startTime?: number
children?: React.ReactNode
}
type DisplayTranscode = VideoTranscode & { resolution: string }
interface ControlBarProps {
state: PlayerState
zoom: number
isControlsVisible: boolean
buffered: number
data: AssetInfo
resolutions: DisplayTranscode[]
togglePlay: () => void
toggleLoop: () => void
toggleMute: () => void
handleVolumeChange: (newVolume: number) => void
changePlaybackRate: (rate: number) => void
changeResolution: (res: DisplayTranscode) => void
handleDownload: (url: string, resolution: string) => void
toggleFullScreen: () => void
onZoomChange: (zoom: number) => void
onZoomReset: () => void
// Frame-accurate props
frameRate: number
totalFrames: number
currentFrame: number
seekToFrame: (frame: number) => Promise<void>
}
const ControlBar: React.FC<ControlBarProps> = ({
state,
zoom,
isControlsVisible,
buffered,
data,
resolutions,
togglePlay,
toggleLoop,
toggleMute,
handleVolumeChange,
changePlaybackRate,
changeResolution,
handleDownload,
toggleFullScreen,
onZoomChange,
onZoomReset,
frameRate,
totalFrames,
currentFrame,
seekToFrame,
}) => {
if (!data.media?.metadata) {
return null
}
const previewResolutions = resolutions.filter((r) => !r.isRaw)
const { videoTimeDisplayMode, setVideoTimeDisplayMode } = useUiStore()
const startTimecode = data.media?.metadata?.startTimecode
const displayTotalFrames = Math.max(0, totalFrames - 1)
const displayString =
videoTimeDisplayMode === 'frames'
? `${currentFrame} / ${displayTotalFrames} fr`
: videoTimeDisplayMode === 'standard'
? `${formatTimecode(currentFrame, frameRate, 'standard')} / ${formatTime(totalFrames / frameRate)}`
: `${formatTimecode(currentFrame, frameRate, videoTimeDisplayMode, startTimecode)} / ${formatTimecode(displayTotalFrames, frameRate, videoTimeDisplayMode, startTimecode)}`
return (
<div
className={cn(
'transition-all duration-300 ease-in-out z-20',
state.isFullScreen
? 'absolute bottom-0 left-0 right-0 px-4 py-4 bg-black/60 backdrop-blur-md text-white'
: 'relative w-full bg-card border-t border-border px-4 py-3 z-10 transition-colors duration-200',
isControlsVisible
? 'opacity-100 translate-y-0'
: 'opacity-0 translate-y-4 pointer-events-none',
)}
>
{/* Progress Bar */}
<div className="mb-4 px-1">
<ProgressBar
totalFrames={totalFrames}
currentFrame={currentFrame}
fps={frameRate}
buffered={buffered}
previewUrl={data.media.videoPreview?.url}
onSeek={seekToFrame}
metadata={{
...data.media.metadata,
frameRate: frameRate,
}}
/>
</div>
{/* Lower Controls Row */}
<div
className={cn(
'flex items-center justify-between',
state.isFullScreen ? 'text-white/90' : 'text-foreground',
)}
>
{/* Left Side: Play, Vol, Time */}
<div className="flex items-center gap-4">
<button onClick={togglePlay} className="hover:text-primary transition-colors">
{state.isPlaying ? (
<Pause className="w-6 h-6 fill-current" />
) : (
<Play className="w-6 h-6 fill-current" />
)}
</button>
<button
onClick={toggleLoop}
className={cn(
'transition-colors',
state.isLooping ? 'text-primary' : 'text-muted-foreground',
)}
title="Loop"
>
<Repeat className="w-5 h-5" />
</button>
<div className="flex items-center gap-3 group/vol">
<button onClick={toggleMute} className="hover:text-primary">
{state.isMuted || state.volume === 0 ? (
<VolumeX className="w-6 h-6" />
) : (
<Volume2 className="w-6 h-6" />
)}
</button>
<div className="w-0 overflow-hidden group-hover/vol:w-24 transition-all duration-300 ease-in-out">
<div className="w-24 px-1">
<Slider
value={state.isMuted ? [0] : [state.volume]}
onValueChange={(v) => handleVolumeChange(v[0])}
max={1}
step={0.05}
/>
</div>
</div>
</div>
<div className="flex items-center gap-1 text-sm font-medium tabular-nums select-none min-w-[100px]">
<span className="text-muted-foreground font-mono">{displayString}</span>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<button className="h-6 w-6 inline-flex items-center justify-center rounded-md hover:bg-muted text-muted-foreground hover:text-foreground transition-colors cursor-pointer focus:outline-none">
<ChevronDown className="h-3.5 w-3.5" />
</button>
</DropdownMenuTrigger>
<DropdownMenuContent align="start" className="w-40 z-30">
<DropdownMenuLabel className="text-[10px] font-bold text-muted-foreground uppercase tracking-wider">
Format
</DropdownMenuLabel>
<DropdownMenuItem
onClick={() => setVideoTimeDisplayMode('standard')}
className="flex items-center justify-between cursor-pointer text-xs"
>
<span>Standard Time</span>
{videoTimeDisplayMode === 'standard' && (
<Check className="h-3.5 w-3.5 text-primary" />
)}
</DropdownMenuItem>
<DropdownMenuItem
onClick={() => setVideoTimeDisplayMode('frames')}
className="flex items-center justify-between cursor-pointer text-xs"
>
<span>Frames</span>
{videoTimeDisplayMode === 'frames' && (
<Check className="h-3.5 w-3.5 text-primary" />
)}
</DropdownMenuItem>
<DropdownMenuItem
onClick={() => setVideoTimeDisplayMode('timecode')}
className="flex items-center justify-between cursor-pointer text-xs"
>
<span>Timecode</span>
{videoTimeDisplayMode === 'timecode' && (
<Check className="h-3.5 w-3.5 text-primary" />
)}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
</div>
{/* Right Side: Zoom, Speed, Res, Download, Fullscreen */}
<div className="relative flex items-center gap-3">
{/* Zoom Controls */}
<div className="flex items-center gap-1">
<div className="flex items-center gap-1 bg-muted rounded-md p-0.5">
<button
onClick={() => onZoomChange(zoom * 0.8)}
className="p-1 hover:text-primary rounded"
>
<Minus size={14} />
</button>
<span className="text-xs w-8 text-center tabular-nums">
{Math.round(zoom * 100)}%
</span>
<button
onClick={() => onZoomChange(zoom * 1.2)}
className="p-1 hover:text-primary rounded"
>
<Plus size={14} />
</button>
</div>
<button
onClick={onZoomReset}
className="text-xs font-medium px-2 py-1 rounded bg-muted hover:text-primary transition-colors"
>
Fit
</button>
</div>
{/* Playback Rate */}
<DropdownMenu>
<DropdownMenuTrigger asChild>
<button className="w-8 text-sm font-bold hover:text-primary">
{state.playbackRate}x
</button>
</DropdownMenuTrigger>
<DropdownMenuContent>
{[0.5, 1, 1.5, 2].map((rate) => (
<DropdownMenuItem
key={rate}
onClick={() => changePlaybackRate(rate)}
className={cn(
'rounded py-1 px-2 text-left text-xs',
state.playbackRate === rate
? 'bg-primary text-primary-foreground focus:bg-primary focus:text-primary-foreground'
: 'text-foreground',
)}
>
{rate}x
</DropdownMenuItem>
))}
</DropdownMenuContent>
</DropdownMenu>
{/* Resolution Selector */}
<DropdownMenu>
<DropdownMenuTrigger asChild>
<button className="flex items-center gap-1 rounded border border-border px-2 py-0.5 text-sm font-semibold hover:bg-muted transition-colors">
<Settings className="h-3.5 w-3.5" />
<span>{state.currentResolution}</span>
</button>
</DropdownMenuTrigger>
<DropdownMenuContent>
<DropdownMenuLabel>Quality</DropdownMenuLabel>
{previewResolutions.map((res) => (
<DropdownMenuItem
key={res.resolution}
onClick={() => changeResolution(res)}
className={cn(
'flex w-full items-center justify-between',
state.currentResolution === res.resolution
? 'text-primary font-medium'
: 'text-foreground',
)}
>
<span>{res.resolution}</span>
<span className="pl-5 text-xs text-muted-foreground">
{res.width}x{res.height}
</span>
</DropdownMenuItem>
))}
</DropdownMenuContent>
</DropdownMenu>
{/* Download */}
<DropdownMenu>
<DropdownMenuTrigger asChild>
<button className="transition-colors hover:text-primary" title="Download">
<Download className="h-5 w-5" />
</button>
</DropdownMenuTrigger>
<DropdownMenuContent>
<DropdownMenuLabel>Download</DropdownMenuLabel>
{resolutions.map((res) => (
<DropdownMenuItem
key={res.resolution}
onClick={() => handleDownload(res.url ?? '', res.resolution)}
className="flex w-full items-center justify-between px-3 py-2 text-left text-sm text-foreground"
>
<span>{res.resolution}</span>
<span className="text-xs text-muted-foreground">MP4</span>
</DropdownMenuItem>
))}
</DropdownMenuContent>
</DropdownMenu>
{/* Fullscreen */}
<button onClick={toggleFullScreen} className="transition-colors hover:text-primary">
{state.isFullScreen ? (
<Minimize className="h-6 w-6" />
) : (
<Maximize className="h-6 w-6" />
)}
</button>
</div>
</div>
</div>
)
}
const VideoPlayer: React.FC<VideoPlayerProps> = ({
data,
playerRef: passedPlayerRef,
onPlay,
onPause,
onTimeUpdate,
annotations,
startTime,
children,
}) => {
const localPlayerRef = useRef<Player | null>(null)
const playerRef = passedPlayerRef || localPlayerRef
// We use a container ref to manually append the video element
const videoContainerRef = useRef<HTMLDivElement>(null)
const containerRef = useRef<HTMLDivElement>(null)
const controlsTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
const [videoHtmlEl, setVideoHtmlEl] = useState<HTMLVideoElement | undefined>(undefined)
const videoRef = useRef<HTMLVideoElement | null>(null)
const [zoom, setZoom] = useState(1)
const [hasManuallyZoomed, setHasManuallyZoomed] = useState(false)
const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })
const handleZoomChange = (newZoom: number) => {
setZoom(newZoom)
setHasManuallyZoomed(true)
}
const handleZoomReset = () => {
setHasManuallyZoomed(false)
}
// Store
const {
isDrawing,
currentTool,
currentColor,
addAnnotation,
annotations: draftAnnotations,
} = useAnnotationStore()
// Combine annotations
const displayAnnotations = [...(annotations || []), ...draftAnnotations]
// Resize Observer for container
useEffect(() => {
if (!containerRef.current) return
const observer = new ResizeObserver((entries) => {
const entry = entries[0]
if (entry) {
setContainerSize({
width: entry.contentRect.width,
height: entry.contentRect.height,
})
}
})
observer.observe(containerRef.current)
return () => observer.disconnect()
}, [])
// Fit to screen initial / responsive resize
useEffect(() => {
if (containerSize.width > 0 && containerSize.height > 0) {
const vidW = data.media?.metadata?.originalWidth ?? 1920
const vidH = data.media?.metadata?.originalHeight ?? 1080
const scale = Math.min(containerSize.width / vidW, containerSize.height / vidH)
if (!hasManuallyZoomed) {
setZoom(scale)
}
}
}, [containerSize.width, containerSize.height, data.media?.metadata, hasManuallyZoomed])
// Cleanup ref when player is disposed
useEffect(() => {
return () => {
videoRef.current = null
}
}, [])
if (!data.media?.original?.downloadUrl || !data.media.metadata) {
return (
<div className="flex h-full w-full items-center justify-center">
<p className="text-muted-foreground">Media is not available.</p>
</div>
)
}
// Initial resolution setup
const originalRes = {
url: data.media.original.downloadUrl,
width: data.media.metadata.originalWidth ?? 0,
height: data.media.metadata.originalHeight ?? 0,
resolution: 'Original',
} as DisplayTranscode
const resolutions: DisplayTranscode[] = (data.media.videoTranscodes ?? []).map((t) => {
const longSide = Math.max(t.width, t.height)
let resolution = `${t.height}p`
if (longSide >= 3840) resolution = '2160p'
else if (longSide >= 1920) resolution = '1080p'
else if (longSide >= 1280) resolution = '720p'
else if (longSide >= 960) resolution = '540p'
else if (longSide >= 640) resolution = '360p'
else if (longSide >= 320) resolution = '180p'
return {
...t,
resolution: t.isRaw ? 'Original' : resolution,
}
})
const previewResolutions = resolutions.filter((r) => !r.isRaw)
// Logic to select best resolution based on screen size
const getInitialResolution = (): DisplayTranscode => {
if (previewResolutions.length === 0) return originalRes
if (typeof window === 'undefined') return previewResolutions[0]
// Use device pixel ratio for high DPI screens
const screenWidth = window.innerWidth * (window.devicePixelRatio || 1)
// 1. Sort by width ascending
const sortedResolutions = [...previewResolutions].sort((a, b) => {
const wA = a.width ?? 0
const wB = b.width ?? 0
return wA - wB
})
// 2. Find first one >= screenWidth
const bestFit = sortedResolutions.find((r) => (r.width ?? 0) >= screenWidth)
// 3. If found, return it. If not (all are smaller), return the last one (largest).
return bestFit || sortedResolutions[sortedResolutions.length - 1]
}
const initialRes = getInitialResolution()
// State
const [state, setState] = useState<PlayerState>({
isPlaying: false,
progress: 0,
currentTime: 0,
duration: data.media.metadata.duration || 0,
volume: 1,
isMuted: false,
isLooping: false,
playbackRate: 1,
isFullScreen: false,
showFrames: false,
currentResolution: initialRes.resolution,
currentSrc: initialRes.url,
})
const [buffered, setBuffered] = useState(0)
const [isControlsVisible, setIsControlsVisible] = useState(true)
const [isPlayerReady, setIsPlayerReady] = useState(false)
const lastProcessedStartTimeRef = useRef<number | null>(null)
// Frame-accurate hook and derived state
const metadata = data.media.metadata
const frameRate = metadata.frameRate || 30
const dbTotalFrames = metadata.totalFrames || 0
const containerDuration = metadata.duration || 0
const videoDuration = dbTotalFrames / frameRate
const frameDuration = 1 / frameRate
const totalFrames =
containerDuration - videoDuration > 0.5 * frameDuration
? Math.round(containerDuration * frameRate)
: dbTotalFrames
const { currentFrame, seekToFrame } = useFramePlayer(videoRef, frameRate, totalFrames)
const currentTime = currentFrame / frameRate
const duration = totalFrames / frameRate
const progress = duration > 0 ? (currentTime / duration) * 100 : 0
const controlBarState: PlayerState = {
...state,
currentTime,
duration,
progress,
}
// Trigger time update event reactively
useEffect(() => {
if (onTimeUpdate) {
onTimeUpdate(currentFrame / frameRate)
}
}, [currentFrame, frameRate, onTimeUpdate])
// Initialize Video.js
useEffect(() => {
if (!videoContainerRef.current) return
// 1. Create the video element manually
// This avoids conflicts with React Strict Mode where the DOM might not match React's virtual DOM expectations after Video.js modifies it.
const videoElement = document.createElement('video-js')
videoElement.classList.add('vjs-big-play-centered', '!h-full', '!w-full')
// Hide it, but keep it in DOM
videoElement.style.opacity = '0'
videoElement.style.pointerEvents = 'none'
// Append to our container
videoContainerRef.current.appendChild(videoElement)
// 2. Initialize the player
const player = (playerRef.current = videojs(videoElement, {
controls: false,
autoplay: false,
preload: 'auto',
playsinline: true,
sources: [
{
src: state.currentSrc,
type: 'video/mp4',
},
],
}))
// Extract video element for Konva
const htmlVid = videoElement.querySelector('video')
if (htmlVid) {
setVideoHtmlEl(htmlVid)
videoRef.current = htmlVid
} else {
// Fallback: try player.tech().el()
// Wait for ready?
player.ready(() => {
const techEl = player.tech({ iWillNotUseThisInPlugins: true })?.el() as HTMLVideoElement
if (techEl) {
setVideoHtmlEl(techEl)
videoRef.current = techEl
}
})
}
player.on('play', () => {
setState((p) => ({ ...p, isPlaying: true }))
onPlay?.()
})
player.on('pause', () => {
setState((p) => ({ ...p, isPlaying: false }))
onPause?.()
})
player.on('ended', () => setState((p) => ({ ...p, isPlaying: false })))
player.on('loadedmetadata', () => {
setIsPlayerReady(true)
})
player.on('loadstart', () => {
setIsPlayerReady(false)
})
player.on('timeupdate', () => {
const playerDuration = player.duration() || data.media?.metadata?.duration || 0
const bufferedEnd = player.bufferedEnd()
if (playerDuration > 0) {
setBuffered((bufferedEnd / playerDuration) * 100)
}
})
player.on('volumechange', () => {
const vol = player.volume()
const muted = player.muted()
setState((prev) => ({
...prev,
volume: vol || 0,
isMuted: muted || false,
}))
})
player.on('ratechange', () => {
setState((prev) => ({
...prev,
playbackRate: player.playbackRate() || 1,
}))
})
player.on('error', () => {
console.error('VideoJS Error:', player.error())
})
// Set initial state
player.volume(state.volume)
// 4. Cleanup
return () => {
if (player && !player.isDisposed()) {
player.dispose()
playerRef.current = null
videoRef.current = null
}
}
}, [data])
// Handle changes to startTime (e.g., clicking different chunks in search results)
useEffect(() => {
if (!isPlayerReady) return
if (startTime !== undefined && startTime !== null && startTime > 0) {
if (startTime !== lastProcessedStartTimeRef.current) {
lastProcessedStartTimeRef.current = startTime
const targetFrame = Math.floor(startTime * frameRate + 0.45)
seekToFrame(targetFrame)
}
}
}, [startTime, frameRate, seekToFrame, isPlayerReady])
const handleMouseMove = useCallback(() => {
// Always show controls on movement
setIsControlsVisible(true)
if (controlsTimeoutRef.current) {
clearTimeout(controlsTimeoutRef.current)
}
// Only set auto-hide timer if we are in fullscreen and playing
// If paused, controls should remain visible so user can see what to do
if (state.isFullScreen && state.isPlaying) {
controlsTimeoutRef.current = setTimeout(() => {
setIsControlsVisible(false)
}, 2000)
}
}, [state.isFullScreen, state.isPlaying])
const handleMouseLeave = useCallback(() => {
// If we leave the player area in fullscreen, hide controls (optional preference, usually good)
if (state.isFullScreen && state.isPlaying) {
if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
setIsControlsVisible(false)
}
}, [state.isFullScreen, state.isPlaying])
// Clean up timeout on unmount or state change
useEffect(() => {
return () => {
if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
}
}, [])
// Ensure controls are visible when pausing or entering fullscreen initially
useEffect(() => {
if (!state.isPlaying) {
setIsControlsVisible(true)
if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
} else {
// If we just started playing (or re-entered playing state), trigger the timer logic
handleMouseMove()
}
}, [state.isPlaying, state.isFullScreen, handleMouseMove])
// -- Event Handlers --
const togglePlay = useCallback(() => {
// Disable click-to-play if drawing
if (useAnnotationStore.getState().isDrawing) return
const player = playerRef.current
if (!player) return
if (player.paused() || player.ended()) {
const playPromise = player.play()
if (playPromise !== undefined) {
playPromise.catch((error) => {
// Ignore AbortError which happens when pausing rapidly after playing
if (error.name === 'AbortError') return
console.error('Play failed:', error)
})
}
} else {
player.pause()
}
}, [])
const toggleLoop = () => {
const player = playerRef.current
if (!player) return
const newLoop = !state.isLooping
player.loop(newLoop)
setState((prev) => ({ ...prev, isLooping: newLoop }))
}
const handleVolumeChange = (newVolume: number) => {
// Optimistic update to prevent slider jumping and ensure immediate UI feedback
setState((prev) => ({
...prev,
volume: newVolume,
isMuted: newVolume === 0, // If dragging to 0, consider it muted
}))
const player = playerRef.current
if (!player) return
// Set volume first so if we unmute, it is at the correct level
player.volume(newVolume)
// Manage mute state based on volume
if (newVolume > 0 && player.muted()) {
player.muted(false)
} else if (newVolume === 0 && !player.muted()) {
player.muted(true)
}
}
const toggleMute = () => {
const player = playerRef.current
if (!player) return
const isMuted = player.muted()
if (isMuted) {
player.muted(false)
// If volume was 0 (e.g. user dragged to 0), restore to default 0.5 so they hear something
if (player.volume() === 0) {
player.volume(0.5)
}
} else {
player.muted(true)
}
}
const changePlaybackRate = (rate: number) => {
const player = playerRef.current
if (!player) return
player.playbackRate(rate)
}
const changeResolution = (res: DisplayTranscode) => {
const player = playerRef.current
if (!player) return
const wasPlaying = !player.paused()
const currentT = player.currentTime()
setState((prev) => ({
...prev,
currentResolution: res.resolution,
currentSrc: res.url,
}))
player.src({ type: 'video/mp4', src: res.url })
player.one('loadedmetadata', () => {
player.currentTime(currentT)
if (wasPlaying) {
const playPromise = player.play()
if (playPromise !== undefined) {
playPromise.catch((error) => {
if (error.name === 'AbortError') return
console.error('Play after seek failed:', error)
})
}
}
player.playbackRate(state.playbackRate)
})
}
const toggleFullScreen = () => {
if (!containerRef.current) return
if (!document.fullscreenElement) {
containerRef.current.requestFullscreen()
setState((prev) => ({ ...prev, isFullScreen: true }))
} else {
document.exitFullscreen()
setState((prev) => ({ ...prev, isFullScreen: false }))
}
}
const handleDownload = (url: string, resolution: string) => {
const link = document.createElement('a')
link.href = url
link.download = `${data.name}-${resolution}.mp4`
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
}
// Listen for fullscreen change events (ESC key)
useEffect(() => {
const onFsChange = () => {
setState((prev) => ({
...prev,
isFullScreen: !!document.fullscreenElement,
}))
}
document.addEventListener('fullscreenchange', onFsChange)
return () => document.removeEventListener('fullscreenchange', onFsChange)
}, [])
// Calculate center pan
const vidW = data.media?.metadata?.originalWidth ?? 1920
const vidH = data.media?.metadata?.originalHeight ?? 1080
const scale = zoom
const panX = (containerSize.width - vidW * scale) / 2
const panY = (containerSize.height - vidH * scale) / 2
return (
<div
className={cn(
'group shadow-2xl font-sans select-none flex flex-col mx-auto transition-all duration-300 relative',
state.isFullScreen ? 'h-full w-full rounded-none bg-black' : 'w-full h-full',
!isControlsVisible && state.isFullScreen ? 'cursor-none' : '',
)}
onMouseMove={handleMouseMove}
onMouseLeave={handleMouseLeave}
>
<div className="flex-1 flex flex-col-reverse md:flex-row min-h-0 relative">
{/* Render Carousel/Sidebar here if not fullscreen */}
{!state.isFullScreen && children}
{/* Video Area */}
<div
ref={containerRef}
className={cn(
'flex-1 bg-black cursor-pointer relative flex items-center justify-center overflow-hidden min-h-0',
)}
onClick={togglePlay}
data-vjs-player
>
{/* Hidden VideoJS container */}
<div ref={videoContainerRef} className="absolute inset-0 z-[-1]" />
{/* Drawing Canvas (Visible) */}
{videoHtmlEl && containerSize.width > 0 && (
<DrawingCanvas
width={containerSize.width}
height={containerSize.height}
mediaDimensions={{
width: vidW,
height: vidH,
}}
videoElement={videoHtmlEl}
annotations={displayAnnotations}
scale={scale}
offset={{ x: panX, y: panY }}
className="absolute inset-0"
onClick={togglePlay}
// Drawing Props
isDrawing={isDrawing}
currentTool={currentTool}
currentColor={currentColor}
onAddAnnotation={addAnnotation}
/>
)}
{/* Big Play Button Overlay (when paused) */}
{!state.isPlaying && !isDrawing && (
<div className="absolute inset-0 flex items-center justify-center bg-black/20 pointer-events-none z-10">
<div className="w-20 h-20 bg-white/10 backdrop-blur-sm rounded-full flex items-center justify-center border-2 border-white/30 animate-pulse">
<Play className="w-10 h-10 text-white ml-1 fill-white" />
</div>
</div>
)}
</div>
</div>
<ControlBar
state={controlBarState}
zoom={zoom}
isControlsVisible={isControlsVisible}
buffered={buffered}
data={data}
resolutions={resolutions}
togglePlay={togglePlay}
toggleLoop={toggleLoop}
toggleMute={toggleMute}
handleVolumeChange={handleVolumeChange}
changePlaybackRate={changePlaybackRate}
changeResolution={changeResolution}
handleDownload={handleDownload}
toggleFullScreen={toggleFullScreen}
onZoomChange={handleZoomChange}
onZoomReset={handleZoomReset}
frameRate={frameRate}
totalFrames={totalFrames}
currentFrame={currentFrame}
seekToFrame={seekToFrame}
/>
</div>
)
}
export default VideoPlayer
@@ -0,0 +1,483 @@
import { client } from '@/ui/api/client'
import DrawingCanvas from '@/ui/components/drawing-canvas'
import { cn } from '@/ui/lib/utils'
import { useAnnotationStore } from '@/ui/stores/annotation-store'
import type { Annotation } from '@/ui/types'
import type { AssetInfo } from '@shumai/dtos'
import { Play, AudioLines } from 'lucide-react'
import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'
import videojs from 'video.js'
import type Player from 'video.js/dist/types/player'
import { useFramePlayer } from './use-frame-player'
import { resolveTotalFrames } from './utils'
import { clampFrame as clampFrameUtil } from '../../compare/compare-utils'
import type { ComparePaneHandle, DisplayTranscode, PaneReportedState } from '../../compare/types'
interface CompareVideoPaneProps {
file: AssetInfo
shareId?: string
isActive: boolean
/** Whether this pane's audio should be muted (only the active side plays audio). */
muted?: boolean
volume?: number
annotations: Annotation[]
onStateChange: (state: PaneReportedState) => void
onActivate: () => void
onRequestTogglePlay?: () => void
/** Called with the current playhead time in seconds (used only for the active pane). */
onTimeUpdate?: (second: number) => void
onPlay?: () => void
}
function computeResolutions(file: AssetInfo): DisplayTranscode[] {
const original: DisplayTranscode | null = file.media?.original?.downloadUrl
? {
id: 'original',
url: file.media.original.downloadUrl,
key: file.media.original.key ?? '',
width: file.media?.metadata?.originalWidth ?? 0,
height: file.media?.metadata?.originalHeight ?? 0,
size: 0,
isRaw: true,
resolution: 'Original',
}
: null
const transcodes: DisplayTranscode[] = (file.media?.videoTranscodes ?? []).map((t) => {
const longSide = Math.max(t.width, t.height)
let resolution = `${t.height}p`
if (longSide >= 3840) resolution = '2160p'
else if (longSide >= 1920) resolution = '1080p'
else if (longSide >= 1280) resolution = '720p'
else if (longSide >= 960) resolution = '540p'
else if (longSide >= 640) resolution = '360p'
else if (longSide >= 320) resolution = '180p'
return { ...t, resolution: t.isRaw ? 'Original' : resolution }
})
const hasOriginalTranscode = transcodes.some((t) => t.isRaw)
if (!hasOriginalTranscode && original) {
return [...transcodes, original]
}
return transcodes
}
export const CompareVideoPane = forwardRef<ComparePaneHandle, CompareVideoPaneProps>(
function CompareVideoPane(
{
file,
shareId,
isActive,
muted = true,
volume = 1,
annotations,
onStateChange,
onActivate,
onRequestTogglePlay,
onTimeUpdate,
onPlay,
},
ref,
) {
const playerRef = useRef<Player | null>(null)
const videoContainerRef = useRef<HTMLDivElement>(null)
const containerRef = useRef<HTMLDivElement>(null)
const videoRef = useRef<HTMLVideoElement | null>(null)
const [videoHtmlEl, setVideoHtmlEl] = useState<HTMLVideoElement | undefined>(undefined)
const {
isDrawing,
currentTool,
currentColor,
addAnnotation,
annotations: draftAnnotations,
} = useAnnotationStore()
const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })
const [zoom, setZoom] = useState(1)
const [hasManuallyZoomed, setHasManuallyZoomed] = useState(false)
const [pan, setPan] = useState<{ x: number; y: number } | null>(null)
const [isPlaying, setIsPlaying] = useState(false)
const [isLooping, setIsLooping] = useState(false)
const [playbackRate, setPlaybackRate] = useState(1)
const [buffered, setBuffered] = useState(0)
const [playerVolume, setPlayerVolume] = useState(volume)
const [playerMuted, setPlayerMuted] = useState(muted)
const [isPlayerReady, setIsPlayerReady] = useState(false)
const metadata = file.media?.metadata
const frameRate = metadata?.frameRate || 30
const dbTotalFrames = metadata?.totalFrames || 0
const containerDuration = metadata?.duration || 0
const totalFrames = resolveTotalFrames({ dbTotalFrames, containerDuration, frameRate })
const resolutions = computeResolutions(file)
const previewResolutions = resolutions.filter((r) => !r.isRaw)
const initialRes = previewResolutions[0] ?? resolutions[0]
const [currentResolution, setCurrentResolution] = useState(initialRes?.resolution ?? 'Original')
const currentSrcRef = useRef(initialRes?.url)
const isAudio = file.mediaType?.startsWith('audio/')
const { currentFrame, seekToFrame } = useFramePlayer(videoRef, frameRate, totalFrames, isAudio)
const zoomRef = useRef(zoom)
zoomRef.current = zoom
const currentFrameRef = useRef(currentFrame)
currentFrameRef.current = currentFrame
// Resize observer
useEffect(() => {
if (!containerRef.current) return
const observer = new ResizeObserver((entries) => {
const entry = entries[0]
if (entry) {
setContainerSize({ width: entry.contentRect.width, height: entry.contentRect.height })
}
})
observer.observe(containerRef.current)
return () => observer.disconnect()
}, [])
const vidW = metadata?.originalWidth || 1920
const vidH = metadata?.originalHeight || 1080
// Auto-fit zoom
useEffect(() => {
if (containerSize.width > 0 && containerSize.height > 0 && !hasManuallyZoomed) {
const scale = Math.min(containerSize.width / vidW, containerSize.height / vidH)
setZoom(scale)
}
}, [containerSize.width, containerSize.height, vidW, vidH, hasManuallyZoomed])
// Keep the resolution selection and source url in sync when the displayed
// asset changes, so the player (re)initializes with the correct source even
// if the parent renders this pane without a per-asset `key`. Runs before the
// video.js init effect below (declaration order) so the ref is fresh.
useEffect(() => {
setCurrentResolution(initialRes?.resolution ?? 'Original')
currentSrcRef.current = initialRes?.url
}, [file.id])
// Initialize video.js
useEffect(() => {
if (!videoContainerRef.current) return
const videoElement = document.createElement('video-js')
videoElement.classList.add('vjs-big-play-centered', '!h-full', '!w-full')
videoElement.style.opacity = '0'
videoElement.style.pointerEvents = 'none'
videoContainerRef.current.appendChild(videoElement)
const player = (playerRef.current = videojs(videoElement, {
controls: false,
autoplay: false,
preload: 'auto',
playsinline: true,
sources: [{ src: currentSrcRef.current ?? '', type: 'video/mp4' }],
}))
const htmlVid = videoElement.querySelector('video')
if (htmlVid) {
setVideoHtmlEl(htmlVid)
videoRef.current = htmlVid
} else {
player.ready(() => {
const techEl = player.tech({ iWillNotUseThisInPlugins: true })?.el() as HTMLVideoElement
if (techEl) {
setVideoHtmlEl(techEl)
videoRef.current = techEl
}
})
}
player.on('play', () => {
setIsPlaying(true)
onPlay?.()
})
player.on('pause', () => setIsPlaying(false))
player.on('ended', () => setIsPlaying(false))
player.on('loadedmetadata', () => setIsPlayerReady(true))
player.on('loadstart', () => setIsPlayerReady(false))
player.on('timeupdate', () => {
const playerDuration = player.duration() || containerDuration || 0
const bufferedEnd = player.bufferedEnd()
if (playerDuration > 0) setBuffered((bufferedEnd / playerDuration) * 100)
})
player.on('volumechange', () => {
setPlayerVolume(player.volume() || 0)
setPlayerMuted(player.muted() || false)
})
player.on('ratechange', () => setPlaybackRate(player.playbackRate() || 1))
return () => {
if (player && !player.isDisposed()) {
player.dispose()
playerRef.current = null
videoRef.current = null
}
}
}, [file.id])
// Apply muted / volume (audio routing: only active side unmuted)
useEffect(() => {
const player = playerRef.current
if (!player || !isPlayerReady) return
player.muted(muted)
player.volume(volume)
}, [muted, volume, isPlayerReady])
// Report state upward
useEffect(() => {
const state: PaneReportedState = {
kind: 'video',
zoom,
video: {
frameRate,
totalFrames,
currentFrame,
isPlaying,
volume: playerVolume,
isMuted: playerMuted,
playbackRate,
isLooping,
currentResolution,
resolutions,
buffered,
},
}
onStateChange(state)
}, [
zoom,
frameRate,
totalFrames,
currentFrame,
isPlaying,
playerVolume,
playerMuted,
playbackRate,
isLooping,
currentResolution,
buffered,
])
// Propagate active playhead time
useEffect(() => {
if (isActive) onTimeUpdate?.(currentFrame / frameRate)
}, [currentFrame, frameRate, isActive, onTimeUpdate])
const applyZoom = useCallback((factor: number) => {
const cur = zoomRef.current
const newZoom = cur * factor
if (newZoom < 0.01 || newZoom > 50) return
setZoom(newZoom)
setHasManuallyZoomed(true)
}, [])
const fit = useCallback(() => {
setHasManuallyZoomed(false)
setPan(null)
}, [])
const clampFrame = useCallback(
(frame: number) => clampFrameUtil(frame, totalFrames),
[totalFrames],
)
const handleDownload = useCallback(
async (key?: string) => {
const dlKey = key ?? file.media?.original?.key
if (!dlKey || !file.id) return
try {
const res = shareId
? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
param: { shareId, fileId: file.id },
json: { key: dlKey },
})
: await client.api.files['download-url'].$post({
json: { key: dlKey, assetId: file.id },
})
if (!res.ok) return
const { url } = await res.json()
const link = document.createElement('a')
link.href = url
link.download = ''
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
} catch {
// silently fail
}
},
[file.id, file.media?.original?.key, shareId],
)
const changeResolution = useCallback(
(resolution: string) => {
const player = playerRef.current
if (!player) return
const target = resolutions.find((r) => r.resolution === resolution)
if (!target) return
const wasPlaying = !player.paused()
const currentT = player.currentTime()
setCurrentResolution(resolution)
currentSrcRef.current = target.url
player.src({ type: 'video/mp4', src: target.url })
player.one('loadedmetadata', () => {
player.currentTime(currentT)
if (wasPlaying) {
const p = player.play()
if (p !== undefined) p.catch(() => {})
}
})
},
[resolutions],
)
useImperativeHandle(
ref,
(): ComparePaneHandle => ({
getKind: () => 'video',
play: () => {
const p = playerRef.current?.play()
if (p !== undefined) p.catch(() => {})
},
pause: () => playerRef.current?.pause(),
togglePlay: () => {
const player = playerRef.current
if (!player) return
if (player.paused() || player.ended()) {
const p = player.play()
if (p !== undefined) p.catch(() => {})
} else {
player.pause()
}
},
seekToFrame: (frame) => seekToFrame(clampFrame(frame)),
seekToSecond: (second) => {
const frame = Math.floor(second * frameRate + 0.45)
seekToFrame(clampFrame(frame))
},
stepFrame: (delta) => seekToFrame(clampFrame(currentFrameRef.current + delta)),
setMuted: (m) => playerRef.current?.muted(m),
setVolume: (v) => {
const player = playerRef.current
if (!player) return
player.volume(v)
if (v > 0 && player.muted()) player.muted(false)
else if (v === 0 && !player.muted()) player.muted(true)
},
setPlaybackRate: (rate) => playerRef.current?.playbackRate(rate),
toggleLoop: () => {
const player = playerRef.current
if (!player) return
const next = !player.loop()
player.loop(next)
setIsLooping(next)
},
changeResolution,
zoomBy: applyZoom,
fit,
panBy: (dx, dy) =>
setPan((p) => {
const scale = zoomRef.current
const base = p ?? {
x: (containerSize.width - vidW * scale) / 2,
y: (containerSize.height - vidH * scale) / 2,
}
return { x: base.x + dx, y: base.y + dy }
}),
download: (key?: string) => handleDownload(key),
}),
[
seekToFrame,
clampFrame,
frameRate,
applyZoom,
fit,
changeResolution,
handleDownload,
containerSize.width,
containerSize.height,
vidW,
vidH,
],
)
const displayAnnotations = [...annotations, ...(isActive ? draftAnnotations : [])]
const scale = zoom
const defaultPanX = (containerSize.width - vidW * scale) / 2
const defaultPanY = (containerSize.height - vidH * scale) / 2
const panX = pan?.x ?? defaultPanX
const panY = pan?.y ?? defaultPanY
const handleAreaClick = useCallback(() => {
if (useAnnotationStore.getState().isDrawing) return
// Clicking an inactive pane only activates it; playback is untouched.
if (!isActive) {
onActivate?.()
return
}
onRequestTogglePlay?.()
}, [isActive, onActivate, onRequestTogglePlay])
if (!file.media?.original?.downloadUrl || !metadata) {
return (
<div className="flex h-full w-full items-center justify-center bg-black">
<p className="text-muted-foreground">Media is not available.</p>
</div>
)
}
return (
<div
ref={containerRef}
className={cn(
'relative flex flex-1 cursor-pointer items-center justify-center overflow-hidden bg-black',
)}
onClick={handleAreaClick}
data-testid="compare-video-area"
>
<div ref={videoContainerRef} className="absolute inset-0 z-[-1]" />
{file.mediaType?.startsWith('audio/') ? (
<div className="flex flex-col items-center justify-center text-muted-foreground w-full h-full pointer-events-none select-none">
<AudioLines
className={cn(
'w-16 h-16 text-foreground/75 transition-transform duration-500',
isPlaying ? 'animate-pulse scale-110 text-primary' : '',
)}
/>
</div>
) : (
videoHtmlEl &&
containerSize.width > 0 && (
<DrawingCanvas
width={containerSize.width}
height={containerSize.height}
mediaDimensions={{ width: vidW, height: vidH }}
videoElement={videoHtmlEl}
annotations={displayAnnotations}
scale={scale}
offset={{ x: panX, y: panY }}
className="absolute inset-0"
onClick={handleAreaClick}
isDrawing={isActive && isDrawing}
currentTool={currentTool}
currentColor={currentColor}
onAddAnnotation={isActive ? addAnnotation : undefined}
/>
)
)}
{!isPlaying && !isDrawing && (
<div className="pointer-events-none absolute inset-0 z-10 flex items-center justify-center bg-black/20">
<div className="flex h-16 w-16 items-center justify-center rounded-full border-2 border-white/30 bg-white/10 backdrop-blur-sm">
<Play className="ml-1 h-8 w-8 fill-white text-white" />
</div>
</div>
)}
</div>
)
},
)
@@ -0,0 +1,16 @@
import { FileTypeDefinition } from '../types'
import VideoViewer from './video-viewer'
import { CompareVideoPane } from './compare-video-pane'
export const videoTypeDefinition: FileTypeDefinition = {
id: 'video',
name: 'Video',
match: (file) => !!file.mediaType?.startsWith('video/') || !!file.mediaType?.startsWith('audio/'),
viewer: VideoViewer,
comparePane: CompareVideoPane,
commentsConfig: {
hasTimestamp: true,
hasAnnotations: true,
hasAiBots: true,
},
}
@@ -262,6 +262,7 @@ const ProgressBar: React.FC<ProgressBarProps> = ({
onMouseLeave={handleMouseLeave}
onMouseDown={handleMouseDown}
onTouchStart={handleTouchStart}
data-testid="seekbar"
>
{/* Hidden Preview Video Element */}
<video
@@ -316,6 +317,7 @@ const ProgressBar: React.FC<ProgressBarProps> = ({
<div
className="relative absolute top-0 left-0 h-full rounded-full bg-primary"
style={{ width: `${progressPercent}%` }}
data-testid="seekbar-fill"
>
{/* Thumb (Playhead) - visible on group hover or active */}
<div
@@ -0,0 +1,229 @@
// @vitest-environment happy-dom
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { act, cleanup, renderHook } from '@testing-library/react'
import { useFramePlayer } from './use-frame-player'
/**
* Deterministic reproduction of the Safari playhead-rewind bug.
*
* On Safari/WebKit, `video.currentTime` (the playback/audio clock) runs AHEAD of
* the frame actually presented on screen right after playback starts, and the
* first `requestVideoFrameCallback` (mediaTime) arrives only after a delay. The
* old logic drove the playhead from `currentTime` immediately on play, racing it
* forward, then snapped it backward when the first rVFC reported the true (lower)
* presented frame.
*
* The headless WebKit engine does not exhibit that clock skew, so this can only
* be reproduced deterministically at the logic layer: we mock a video element
* whose `currentTime` leads while a fake `requestVideoFrameCallback` delivers a
* lagging `mediaTime`, drive RAF/clock manually, and assert the playhead never
* moves backward.
*/
const FPS = 30
const TOTAL = 150
// --- Controllable environment -------------------------------------------------
interface RafEntry {
id: number
cb: FrameRequestCallback
}
let clock = 0
let rafQueue: RafEntry[] = []
let rafSeq = 0
/** Run exactly the RAF callbacks queued at flush time (one simulated frame). */
const flushRaf = () => {
const queued = rafQueue
rafQueue = []
for (const { cb } of queued) cb(clock)
}
/** Minimal HTMLVideoElement stand-in with a manually-fired rVFC. */
class FakeVideo extends EventTarget {
currentTime = 0
paused = true
ended = false
private vfcCallbacks: Array<(now: number, meta: { mediaTime: number }) => void> = []
requestVideoFrameCallback(cb: (now: number, meta: { mediaTime: number }) => void): number {
this.vfcCallbacks.push(cb)
return this.vfcCallbacks.length
}
cancelVideoFrameCallback(): void {
this.vfcCallbacks = []
}
pause(): void {
this.paused = true
this.dispatchEvent(new Event('pause'))
}
play(): void {
this.paused = false
this.dispatchEvent(new Event('play'))
}
/** Simulate the compositor presenting a frame at the given mediaTime. */
fireVfc(mediaTime: number): void {
const callbacks = this.vfcCallbacks
this.vfcCallbacks = []
for (const cb of callbacks) cb(0, { mediaTime })
}
}
function makeRef(video: FakeVideo): { current: HTMLVideoElement | null } {
return { current: video as unknown as HTMLVideoElement }
}
let originalRaf: typeof globalThis.requestAnimationFrame
let originalCaf: typeof globalThis.cancelAnimationFrame
beforeEach(() => {
clock = 0
rafQueue = []
rafSeq = 0
vi.spyOn(Date, 'now').mockImplementation(() => clock)
originalRaf = globalThis.requestAnimationFrame
originalCaf = globalThis.cancelAnimationFrame
globalThis.requestAnimationFrame = ((cb: FrameRequestCallback): number => {
rafSeq += 1
rafQueue.push({ id: rafSeq, cb })
return rafSeq
}) as typeof globalThis.requestAnimationFrame
globalThis.cancelAnimationFrame = ((id: number): void => {
rafQueue = rafQueue.filter((entry) => entry.id !== id)
}) as typeof globalThis.cancelAnimationFrame
})
afterEach(() => {
cleanup()
vi.restoreAllMocks()
globalThis.requestAnimationFrame = originalRaf
globalThis.cancelAnimationFrame = originalCaf
})
// --- Tests --------------------------------------------------------------------
describe('useFramePlayer Safari playhead synchronization', () => {
it('does not rewind the playhead on play when currentTime leads the presented frame', () => {
const video = new FakeVideo()
const { result } = renderHook(() => useFramePlayer(makeRef(video), FPS, TOTAL))
const frames: number[] = []
const record = () => frames.push(result.current.currentFrame)
// Start playback via the play event (as a real click would).
act(() => {
video.paused = false
video.dispatchEvent(new Event('play'))
})
record()
// Safari: the playback clock races ahead (~frame 10) while NO rVFC frame has
// been presented yet. The playhead must NOT follow currentTime here.
const leadingCurrentTimes = [0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35]
for (const ct of leadingCurrentTimes) {
clock += 50
video.currentTime = ct
act(() => {
flushRaf()
})
record()
}
expect(Math.max(...frames)).toBe(0) // Fix 1: no forward race from currentTime
// First presented frame arrives, lagging currentTime (frame 1).
act(() => {
video.fireVfc(1 / FPS)
})
record()
// Subsequent presented frames advance normally.
for (let f = 2; f <= 8; f++) {
clock += 33
act(() => {
flushRaf()
})
act(() => {
video.fireVfc(f / FPS)
})
record()
}
// The playhead must be monotonic non-decreasing throughout (never rewinds).
for (let i = 1; i < frames.length; i++) {
expect(frames[i]).toBeGreaterThanOrEqual(frames[i - 1])
}
expect(result.current.currentFrame).toBe(8)
})
it('still falls back to currentTime once rVFC has delivered and then stalls', () => {
const video = new FakeVideo()
const { result } = renderHook(() => useFramePlayer(makeRef(video), FPS, TOTAL))
act(() => {
video.paused = false
video.dispatchEvent(new Event('play'))
})
// rVFC delivers a few frames -> the session has "seen" the compositor.
for (let f = 1; f <= 3; f++) {
clock += 33
video.currentTime = f / FPS
act(() => {
flushRaf()
})
act(() => {
video.fireVfc(f / FPS)
})
}
expect(result.current.currentFrame).toBe(3)
// Video track ends: rVFC stops, but audio (currentTime) keeps advancing past
// the stall threshold. The RAF fallback should take over from currentTime.
clock += 200
video.currentTime = 10 / FPS
act(() => {
flushRaf()
})
expect(result.current.currentFrame).toBe(10)
})
it('locks the paused frame to the presented mediaTime, not the leading currentTime', () => {
const video = new FakeVideo()
const { result } = renderHook(() => useFramePlayer(makeRef(video), FPS, TOTAL))
act(() => {
video.paused = false
video.dispatchEvent(new Event('play'))
})
// Presented up to frame 16 via rVFC.
for (let f = 1; f <= 16; f++) {
clock += 33
act(() => {
flushRaf()
})
act(() => {
video.fireVfc(f / FPS)
})
}
expect(result.current.currentFrame).toBe(16)
// Safari's currentTime has raced ahead to frame 20's center.
video.currentTime = 20 / FPS + 1 / (2 * FPS)
// Pause while rVFC is still fresh.
act(() => {
video.pause()
})
// Fix 2: the paused frame follows the presented frame (16), not currentTime (20).
expect(result.current.currentFrame).toBe(16)
})
})

Some files were not shown because too many files have changed in this diff Show More