Compare commits

...
51 Commits
Author SHA1 Message Date
yiling 3737418ec3 Release v0.1.2 2026-06-25 19:43:07 +08:00
Yiling-J 6d47ea7466 Update AWS_ENDPOINT_URL_S3 explanation in README
Clarified the default value for AWS_ENDPOINT_URL_S3 and its usage with custom host/port.
2026-06-25 19:15:11 +08:00
Yiling-J 84d96ff83a Revise README for environment variable setup
Updated environment variable configuration instructions for clarity and added optional settings for S3-compatible storage.
2026-06-25 19:11:39 +08:00
Yiling-J 6e985aed61 Merge pull request #155 from shumaiOne/refactor/s3-endpoint
refactor(s3): remove automatic port appending to AWS_ENDPOINT_URL_S3
2026-06-25 18:56:49 +08:00
yiling 8347a9ca15 docs(docker): document SHUMAI_SERVER_PORT and update local docker-compose env 2026-06-25 18:50:29 +08:00
yiling ab9b33320d docs(s3): document SHUMAI_SERVER_PORT and S3 endpoint port configurations 2026-06-25 18:48:23 +08:00
yiling efd6163238 refactor(s3): remove automatic port appending to AWS_ENDPOINT_URL_S3 2026-06-25 18:46:14 +08:00
yiling 0e4bdec0e3 Release v0.1.1 2026-06-23 10:32:41 +08:00
yiling 0eb03b16a4 chore(docker): add AWS_ENDPOINT_URL_S3 to local docker-compose 2026-06-23 10:27:18 +08:00
Yiling-J b216773044 Merge pull request #151 from shumaiOne/docker/entrypoint-privilege-dropping
feat(docker): add root entrypoint with privilege dropping for data volumes
2026-06-23 10:09:57 +08:00
yiling 92801ba14a fix(core): make version stack sort index lookup deterministic
When creating a version stack, the sortIndex was previously extracted
by taking files[0] from the database query result. Because findMany
without orderBy is non-deterministic, this resulted in flakiness
where the sortIndex would sometimes be null (from file2) instead of
'abc' (from file1), causing tests to fail.

We now look up the first file specifically based on the ordered
fileIds array parameter.
2026-06-23 10:02:01 +08:00
yiling 661e836f06 fix(docker): support non-root/restricted container environments in entrypoint
Checks if the container is running as root (UID 0) before executing
chown and gosu. If running directly as a non-root user (e.g. in hardened
environments like Kubernetes runAsNonRoot or via docker run --user),
it directly execs the command, preventing EACCES and permission errors.
2026-06-23 09:56:31 +08:00
yiling fb5c7ecabe chore(docker): ignore dist and data directories in .dockerignore
This adds the `dist` and `data` folders to `.dockerignore` to prevent
them from being transferred as part of the Docker build context.
This reduces the build context size by over 1.5GB+, making the build
much faster.
2026-06-23 09:53:00 +08:00
yiling a390643458 feat(docker): add root entrypoint with privilege dropping for data volumes
This updates the Dockerfile and adds a scripts/docker-entrypoint.sh script.
Under native Linux (like Debian), when docker-compose mounts a host folder
as a volume (e.g. `./data:/app/data`), and the folder doesn't exist, the
docker daemon creates the folder as root-owned (`root:root`).

Because the container runs as a non-root user `bun`, it gets permission
denied (`EACCES`) when trying to write to the data directory.

To resolve this in a beginner-friendly way without manual host-side
permissions updates:
1. The runner stage now installs `gosu`.
2. At the end of the Dockerfile, the user switches back to `root` so the
   container launches as root.
3. On launch, the entrypoint script executes. Since it runs as root, it
   automatically changes ownership of `/app/data` to `bun:bun`.
4. The entrypoint script then uses `gosu` to drop privileges and launch the
   actual server processes as the non-root `bun` user.
2026-06-23 09:46:56 +08:00
yiling 9325c71b51 Release v0.1.0 2026-06-22 21:45:39 +08:00
Yiling-J 2f746d3ce8 Merge pull request #150 from shumaiOne/feat/secure-share-info
feat(share): secure share info API and fix wrong password feedback
2026-06-22 20:53:56 +08:00
yiling bdceda4cb6 refactor(share): use custom strongly-typed error classes 2026-06-22 20:48:47 +08:00
yiling df6e392bf6 feat(share): expose raw password on settings page 2026-06-22 20:32:46 +08:00
yiling 48b2047a84 feat(share): secure share info API and fix wrong password feedback 2026-06-22 20:21:44 +08:00
yiling 2b360b2b2c chore(docker): update shumai image tag to latest 2026-06-22 15:52:00 +08:00
Yiling-J 5d19e6ddfa Merge pull request #149 from shumaiOne/fix-sidebar-overflow
fix(webui): truncate long folder, collection, and share link names in sidebar
2026-06-22 15:46:18 +08:00
yiling 5e70b6f3ee docs: add note blocks for running binaries under Bun runtime 2026-06-22 15:39:47 +08:00
yiling 8eab02ab28 fix(webui): truncate long folder, collection, and share link names in sidebar 2026-06-22 15:22:44 +08:00
yiling 7aa347df92 Release v0.0.11 2026-06-22 14:38:28 +08:00
Yiling-J 5d6462adf0 Merge pull request #148 from shumaiOne/rename-npm-cli-package
chore(cli): rename npm package to @shumai-one/shumai-cli
2026-06-22 14:21:59 +08:00
yiling 5f1e0c1823 chore(cli): rename npm package to @shumai-one/shumai-cli 2026-06-22 14:16:47 +08:00
Yiling-J d8381dff21 Merge pull request #147 from shumaiOne/feat/user-custom-fields
feat(metadata): add single user and multiple user custom fields
2026-06-22 12:01:41 +08:00
yiling b6519431db docs(metadata): document new user custom field types 2026-06-22 11:55:53 +08:00
yiling 02fddf8ebd chore: ignore generated prisma folder in prettier 2026-06-22 11:54:56 +08:00
yiling f4c52d9273 chore(db): migrate generate script to root package.json under db:generate 2026-06-22 11:49:53 +08:00
yiling 77093aa294 fix(webui): lock user-field height and suppress benign ResizeObserver limit warnings 2026-06-22 11:40:48 +08:00
yiling 4806c63906 feat(metadata): add single user and multiple user custom fields 2026-06-22 11:27:00 +08:00
Yiling-J 14d04e9d77 Merge pull request #146 from shumaiOne/feat/auto-expand-folders
feat(folders): auto expand folder tree in left sidebar on navigation
2026-06-22 11:02:14 +08:00
yiling 342cdcdd06 style(folders): fix selection highlight overlap by increasing padding 2026-06-22 10:52:25 +08:00
yiling 98a76e913b style(folders): use Shadcn ScrollArea in left sidebar containers 2026-06-22 10:44:07 +08:00
yiling 2240901d55 feat(folders): auto expand folder tree in left sidebar on navigation 2026-06-22 10:27:21 +08:00
Yiling-J 6892967993 Merge pull request #145 from shumaiOne/feat/agent-settings-singular-ui
feat(settings): use singular headers and remove collapse/counters for single agent types
2026-06-22 10:10:16 +08:00
yiling 7ea5345c52 refactor(settings): dynamically render thinkingLevel dropdown from schema options 2026-06-22 10:04:51 +08:00
yiling bea81a207a fix(settings): support type-safe thinkingLevel and propagate to AgentHarness 2026-06-22 09:58:35 +08:00
yiling c20ef0e4b6 fix(settings): prioritize actual agent type when editing agent configurations 2026-06-22 09:27:37 +08:00
yiling 754131f13a feat(settings): support singular headers and remove collapse/counters for single agent types 2026-06-22 09:23:13 +08:00
Yiling-J 6981706e13 Merge pull request #144 from shumaiOne/feat/shumai-cli
feat(cli): add shumai-cli and token authentication
2026-06-21 23:16:39 +08:00
yiling 280c06b68c docs(cli): move CLI section to the bottom of the root README 2026-06-21 21:56:52 +08:00
yiling 4e21becbe0 docs(cli): add CLI documentation and link to it in root README 2026-06-21 21:54:45 +08:00
yiling 86c1d964a3 feat(cli): add create-version command 2026-06-21 20:14:26 +08:00
yiling 87fc10b62f fix(cli): resolve upload status and CLI progress tracker bugs 2026-06-21 20:06:06 +08:00
yiling 7d91d70a14 feat(cli): add @shumai/tableprinter package to handle terminal-friendly table layouts 2026-06-21 19:28:31 +08:00
yiling 1c994adce9 build(cli): bundle hono and ulid directly into the CLI script for zero dependency distribution 2026-06-21 19:15:41 +08:00
yiling afd55eca85 chore(cli): add @shumai-one/cli to local release testing script 2026-06-21 19:06:12 +08:00
yiling 29e3d3ae03 refactor(cli): rename shumai-cli folder to cli and integrate packaging script 2026-06-21 19:00:38 +08:00
yiling 90ef063d43 feat(cli): add shumai-cli and token authentication 2026-06-21 12:35:12 +08:00
106 changed files with 5989 additions and 573 deletions
+2
View File
@@ -1,4 +1,6 @@
node_modules
dist
data
Dockerfile*
docker-compose*
.dockerignore
+1
View File
@@ -2,4 +2,5 @@ node_modules
dist
.bun
src/generated
packages/db/src/generated
src/ui/components/ui
+8
View File
@@ -47,6 +47,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
socat \
ca-certificates \
bubblewrap \
gosu \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
@@ -69,5 +70,12 @@ COPY --chown=bun:bun --from=builder /app/prisma.config.ts.prod ./prisma.config.t
# Expose port (Bun Hono defaults to 3000)
EXPOSE 3000
# Switch back to root at the end so the container runs the entrypoint as root
USER root
COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
ENTRYPOINT ["docker-entrypoint.sh"]
# Default command: run migrations and start API server
CMD ["sh", "-c", "bun prisma migrate deploy && bun index.js"]
+35 -6
View File
@@ -49,13 +49,32 @@ Docker Compose is the fastest way to get Shumai running. You do not need to clon
```bash
curl -o docker-compose.yaml https://raw.githubusercontent.com/shumaiOne/shumai/main/docker-compose/local/docker-compose.yaml
```
3. **Configure Environment Variables (Remote Deployments only):**
If deploying Shumai to a remote server (e.g., AWS EC2, VPS), edit docker-compose.yaml and add AWS_ENDPOINT_URL_S3 under the environment section, setting it to your server's public IP address or domain name (e.g., http://12.34.56.78).
4. Start the services in detached mode:
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.
```
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:
```bash
AWS_ENDPOINT_URL_S3=http://12.34.56.78:12345
```
This value must be reachable from client browsers and should include the externally exposed port.
5. Start the services in detached mode:
```bash
docker compose up -d
```
5. Open your browser and access Shumai at `http://localhost:3000` (or `http://<your-server-ip>:3000` for remote deployments).
6. Open your browser and access Shumai at `http://localhost:3000` (or `http://<your-server-ip>:3000` for remote deployments).
### Option 2: Install via NPM / Package Manager
@@ -126,14 +145,18 @@ DATABASE_URL=postgresql://shumai:shumai_password@localhost:5432/shumai_db?schema
BETTER_AUTH_SECRET=ySxs7DxzHDZBbeeHNPEwBuspYwipBqz5Gk5XdBjNhWw=
STORAGE_BACKEND=local
SHUMAI_SERVER_PORT=3000
AWS_ENDPOINT_URL_S3=http://localhost
AWS_ENDPOINT_URL_S3=http://localhost:3000
```
> [!NOTE]
> If deploying on a remote server, update `AWS_ENDPOINT_URL_S3` from `http://localhost` to your server's public IP address or domain name.
> `SHUMAI_SERVER_PORT` sets the port the server starts on, while `AWS_ENDPOINT_URL_S3` is used by the browser to build file upload URLs.
> If deploying on a remote server (e.g. `http://123.456.7.8`) with a mapped port (e.g. `12345:3000` in docker-compose), set `AWS_ENDPOINT_URL_S3` to `http://123.456.7.8:12345`.
#### Step 6: Run Shumai
> [!IMPORTANT]
> **For Bun Users:** Since the published package binaries contain a `#!/usr/bin/env node` shebang, running the global command directly (e.g., `shumai`) will execute under Node.js. If you installed with Bun and want to run under the Bun runtime, you must prefix all commands with `bun run --bun` (e.g., `bun run --bun shumai`, `bun run --bun shumai -d`, `bun run --bun shumai stop`).
Start the application from your workspace folder:
```bash
@@ -185,3 +208,9 @@ To set up Shumai locally for development:
```
---
## Command Line Interface (CLI)
Shumai provides a Command Line Interface (CLI) tool to manage projects, folders, and assets, upload files/folders, and create new versions directly from your terminal.
For more details on installation and usage, see the [CLI Readme](apps/cli/README.md).
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/agent-app",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"bin": {
+100
View File
@@ -0,0 +1,100 @@
# Shumai CLI
A Command Line Interface (CLI) tool for interacting with your Shumai instance.
The CLI allows you to view projects, list folder contents, create folders, upload files and directories, and create new versions of existing files directly from the terminal.
---
## Installation
The CLI package is bundled inside the Shumai workspace.
### Environment Setup
Before using the CLI, you must set the following environment variables to authenticate with your Shumai instance:
```bash
# The endpoint of your Shumai API server (e.g. http://localhost:3000)
export SHUMAI_API_SERVER="http://localhost:3000"
# Your personal API Token (Generate this in the WebUI via Settings -> Developer tab)
export SHUMAI_API_KEY="your-developer-api-token"
```
---
## Usage
> [!IMPORTANT]
> **For Bun Users:** Since the package binary contains a `#!/usr/bin/env node` shebang, running `shumai-cli` directly will run under Node.js. If you wish to run it using Bun, prefix the command with `bun run --bun` (e.g., `bun run --bun shumai-cli project ls`).
Run `shumai-cli` or query specific commands:
```bash
shumai-cli <command> [arguments] [options]
```
### Commands
#### 1. List Projects
List all projects you have access to. Returns the project ID, name, and its root folder ID.
```bash
shumai-cli project ls
```
#### 2. List Directory Contents
List direct children (folders and files) of a parent folder.
```bash
shumai-cli ls -p <parentId>
```
- **Options:**
- `-p`, `--parent <id>`: The parent folder ID (required).
#### 3. Create a New Folder
Create a new folder under a parent folder.
```bash
shumai-cli mkdir <name> -p <parentId>
```
- **Options:**
- `-p`, `--parent <id>`: The parent folder ID (required).
#### 4. Upload Files or Folders
Upload a local file or folder to a target parent folder. File sizes and paths are mapped, and uploads are streamed chunk-by-chunk with a progress bar.
```bash
shumai-cli upload <localPath> -p <parentId>
```
- **Options:**
- `-p`, `--parent <id>`: The parent folder ID (required).
#### 5. Create a New Version of a File
Upload a local file as a new version of an existing asset (which must be a file or a version stack). This wraps the assets into a version stack dynamically on the server.
```bash
shumai-cli create-version <localFilePath> -p <parentAssetId>
```
- **Options:**
- `-p`, `--parent <id>`: The parent asset ID (file or version stack) to version (required).
---
## Development
To run the CLI in development mode inside the repository source code:
```bash
bun run apps/cli/src/index.ts project ls
```
+17
View File
@@ -0,0 +1,17 @@
{
"name": "@shumai/cli",
"version": "0.1.2",
"private": true,
"type": "module",
"bin": {
"shumai-cli": "./src/index.ts"
},
"dependencies": {
"@shumai/api": "workspace:*",
"@shumai/core": "workspace:*",
"@shumai/dtos": "workspace:*",
"@shumai/tableprinter": "workspace:*",
"hono": "4.12.23",
"ulid": "^3.0.2"
}
}
+25
View File
@@ -0,0 +1,25 @@
import { hc } from 'hono/client'
import type { AppType } from '@shumai/api'
export function getClient() {
const apiKey = process.env.SHUMAI_API_KEY
const apiServer = process.env.SHUMAI_API_SERVER
if (!apiServer) {
console.error('Error: SHUMAI_API_SERVER environment variable is not set.')
process.exit(1)
}
if (!apiKey) {
console.error(
'Error: SHUMAI_API_KEY environment variable is not set. Please generate a token in the Settings -> Developer tab.',
)
process.exit(1)
}
return hc<AppType>(apiServer, {
headers: {
Authorization: `Bearer ${apiKey}`,
},
})
}
+364
View File
@@ -0,0 +1,364 @@
import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'
import { projectLs } from './project'
import { ls } from './ls'
import { mkdir } from './mkdir'
import { getClient } from '../client'
import { upload } from './upload'
import { createVersion } from './create-version'
import fs from 'node:fs'
import http from 'node:http'
vi.mock('../client', () => ({
getClient: vi.fn(),
}))
vi.mock('node:http', () => ({
default: {
request: vi.fn(),
},
}))
describe('CLI Commands', () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let logSpy: any
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let writeSpy: any
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let errorSpy: any
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let exitSpy: any
const mockClient = {
api: {
projects: {
$get: vi.fn(),
':projectId': {
$get: vi.fn(),
},
},
folders: {
$post: vi.fn(),
':folderId': {
$get: vi.fn(),
children: {
$get: vi.fn(),
},
},
},
teams: {
':teamId': {
upload: {
tasks: {
$post: vi.fn(),
':taskId': {
$patch: vi.fn(),
},
},
},
},
},
},
}
beforeEach(() => {
vi.resetAllMocks()
logSpy = vi.spyOn(console, 'log').mockImplementation(() => {})
writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true)
errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
exitSpy = vi
.spyOn(process, 'exit')
.mockImplementation((code?: string | number | null): never => {
throw new Error(`process.exit(${code})`)
})
// eslint-disable-next-line @typescript-eslint/no-explicit-any
vi.mocked(getClient).mockReturnValue(mockClient as any)
})
afterEach(() => {
logSpy.mockRestore()
writeSpy.mockRestore()
errorSpy.mockRestore()
exitSpy.mockRestore()
})
describe('project ls', () => {
it('prints list of projects correctly', async () => {
mockClient.api.projects.$get.mockResolvedValue({
ok: true,
json: async () => ({
data: [
{ id: 'p1', name: 'Proj 1', rootFolder: 'root1' },
{ id: 'p2', name: 'Proj 2', rootFolder: 'root2' },
],
}),
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
await projectLs()
expect(mockClient.api.projects.$get).toHaveBeenCalledWith({
query: { first: '200' },
})
expect(writeSpy).toHaveBeenCalledWith(expect.stringContaining('Proj 1'))
expect(writeSpy).toHaveBeenCalledWith(expect.stringContaining('Proj 2'))
})
})
describe('ls', () => {
it('queries folders and files and displays table', async () => {
mockClient.api.folders[':folderId'].children.$get
.mockResolvedValueOnce({
ok: true,
json: async () => ({
data: [{ id: 'subfolder1', name: 'Sub 1', type: 'folder', sizeByte: 0 }],
}),
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
.mockResolvedValueOnce({
ok: true,
json: async () => ({
data: [{ id: 'file1', name: 'doc.pdf', type: 'file', sizeByte: 1024 }],
}),
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
await ls('parentId123')
expect(mockClient.api.folders[':folderId'].children.$get).toHaveBeenCalledTimes(2)
expect(writeSpy).toHaveBeenCalledWith(expect.stringContaining('Sub 1'))
expect(writeSpy).toHaveBeenCalledWith(expect.stringContaining('doc.pdf'))
})
})
describe('mkdir', () => {
it('calls POST /folders and prints the folder ID', async () => {
mockClient.api.folders.$post.mockResolvedValue({
ok: true,
json: async () => ({ id: 'new_folder_ulid' }),
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
await mkdir('NewFolder', 'parent_ulid')
expect(mockClient.api.folders.$post).toHaveBeenCalledWith({
json: { name: 'NewFolder', parentId: 'parent_ulid' },
})
expect(logSpy).toHaveBeenCalledWith('Created folder with ID: new_folder_ulid')
})
})
describe('upload', () => {
it('uploads a file successfully and confirms the task', async () => {
const tempFile = 'temp-test-file.txt'
fs.writeFileSync(tempFile, 'hello world')
mockClient.api.folders[':folderId'].$get.mockResolvedValue({
ok: true,
json: async () => ({ projectId: 'p123' }),
// We use any here because we are mocking the hono client response shape in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
mockClient.api.projects[':projectId'].$get.mockResolvedValue({
ok: true,
json: async () => ({ teamId: 't123' }),
// We use any here because we are mocking the hono client response shape in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
mockClient.api.teams[':teamId'].upload.tasks.$post.mockImplementation(
async (req: unknown) => {
const rootNodeId = (req as { json: { files: { id: string }[] } }).json.files[0].id
return {
ok: true,
json: async () => ({
taskId: 'task123',
presignedUrls: [
{ id: rootNodeId, fileId: 'file-123', url: 'http://localhost/upload' },
],
createdAssets: [{ tempId: rootNodeId, assetId: 'file-123' }],
}),
// We use any here because we are mocking the hono client response shape in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any
},
)
mockClient.api.teams[':teamId'].upload.tasks[':taskId'].$patch.mockResolvedValue({
ok: true,
// We use any here because we are mocking the hono client response shape in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
const mockRes = {
statusCode: 200,
resume: vi.fn(),
}
let mockReqCallback: ((res: { statusCode: number; resume: () => void }) => void) | null = null
const mockReq = {
on: vi.fn().mockImplementation(() => {
return mockReq
}),
write: vi.fn(),
end: vi.fn().mockImplementation(() => {
if (mockReqCallback) {
mockReqCallback(mockRes)
}
}),
destroy: vi.fn(),
}
vi.mocked(http.request).mockImplementation(((
_options: unknown,
callback: (res: { statusCode: number; resume: () => void }) => void,
) => {
mockReqCallback = callback
return mockReq
// We use any here because we are mocking the http request function in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
}) as any)
await upload(tempFile, 'folder-123')
expect(mockClient.api.folders[':folderId'].$get).toHaveBeenCalledWith({
param: { folderId: 'folder-123' },
})
expect(mockClient.api.projects[':projectId'].$get).toHaveBeenCalledWith({
param: { projectId: 'p123' },
})
expect(mockClient.api.teams[':teamId'].upload.tasks.$post).toHaveBeenCalled()
expect(mockClient.api.teams[':teamId'].upload.tasks[':taskId'].$patch).toHaveBeenCalledWith({
param: { teamId: 't123', taskId: 'task123' },
json: { fileId: 'file-123' },
})
try {
fs.unlinkSync(tempFile)
} catch {
// Ignore if file doesn't exist
}
})
})
describe('create-version', () => {
it('fails if local path is a directory', async () => {
const tempDir = 'temp-test-dir'
fs.mkdirSync(tempDir, { recursive: true })
await expect(createVersion(tempDir, 'file-123')).rejects.toThrow('process.exit(1)')
try {
fs.rmdirSync(tempDir)
} catch {
// Ignore
}
})
it('fails if parent asset is not file or version_stack', async () => {
const tempFile = 'temp-test-file-ver.txt'
fs.writeFileSync(tempFile, 'hello ver')
mockClient.api.folders[':folderId'].$get.mockResolvedValue({
ok: true,
json: async () => ({ type: 'folder', projectId: 'p123' }),
// We use any here because we are mocking the hono client response shape in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
await expect(createVersion(tempFile, 'folder-123')).rejects.toThrow('process.exit(1)')
try {
fs.unlinkSync(tempFile)
} catch {
// Ignore
}
})
it('succeeds if parent asset is a file', async () => {
const tempFile = 'temp-test-file-ver.txt'
fs.writeFileSync(tempFile, 'hello ver')
mockClient.api.folders[':folderId'].$get.mockResolvedValue({
ok: true,
json: async () => ({ type: 'file', projectId: 'p123' }),
// We use any here because we are mocking the hono client response shape in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
mockClient.api.projects[':projectId'].$get.mockResolvedValue({
ok: true,
json: async () => ({ teamId: 't123' }),
// We use any here because we are mocking the hono client response shape in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
mockClient.api.teams[':teamId'].upload.tasks.$post.mockImplementation(
async (req: unknown) => {
const rootNodeId = (req as { json: { files: { id: string }[] } }).json.files[0].id
return {
ok: true,
json: async () => ({
taskId: 'task123',
presignedUrls: [
{ id: rootNodeId, fileId: 'file-123', url: 'http://localhost/upload' },
],
createdAssets: [{ tempId: rootNodeId, assetId: 'file-123' }],
}),
// We use any here because we are mocking the hono client response shape in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any
},
)
mockClient.api.teams[':teamId'].upload.tasks[':taskId'].$patch.mockResolvedValue({
ok: true,
// We use any here because we are mocking the hono client response shape in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
const mockRes = {
statusCode: 200,
resume: vi.fn(),
}
let mockReqCallback: ((res: { statusCode: number; resume: () => void }) => void) | null = null
const mockReq = {
on: vi.fn().mockImplementation(() => {
return mockReq
}),
write: vi.fn(),
end: vi.fn().mockImplementation(() => {
if (mockReqCallback) {
mockReqCallback(mockRes)
}
}),
destroy: vi.fn(),
}
vi.mocked(http.request).mockImplementation(((
_options: unknown,
callback: (res: { statusCode: number; resume: () => void }) => void,
) => {
mockReqCallback = callback
return mockReq
// We use any here because we are mocking the http request function in a unit test context
// eslint-disable-next-line @typescript-eslint/no-explicit-any
}) as any)
await createVersion(tempFile, 'file-123')
expect(mockClient.api.folders[':folderId'].$get).toHaveBeenCalledWith({
param: { folderId: 'file-123' },
})
expect(mockClient.api.teams[':teamId'].upload.tasks.$post).toHaveBeenCalledWith({
param: { teamId: 't123' },
json: expect.objectContaining({ parentId: 'file-123' }),
})
try {
fs.unlinkSync(tempFile)
} catch {
// Ignore
}
})
})
})
+155
View File
@@ -0,0 +1,155 @@
import fs from 'node:fs'
import path from 'node:path'
import { ulid } from 'ulid'
import { getClient } from '../client'
import { getMediaType, ProgressTracker, uploadFileWithProgress } from './upload'
export async function createVersion(localPath: string, parentId: string) {
if (!localPath) {
console.error('Error: Local file path is required.')
process.exit(1)
}
if (!parentId) {
console.error('Error: Parent ID (-p/--parent) is required.')
process.exit(1)
}
const resolvedPath = path.resolve(localPath)
if (!fs.existsSync(resolvedPath)) {
console.error(`Error: Local path "${resolvedPath}" does not exist.`)
process.exit(1)
}
const stat = fs.statSync(resolvedPath)
if (stat.isDirectory()) {
console.error(
`Error: Local path "${resolvedPath}" is a directory. create-version only supports uploading single files.`,
)
process.exit(1)
}
const client = getClient()
try {
console.log(`Checking parent asset ${parentId}...`)
const assetRes = await client.api.folders[':folderId'].$get({
param: { folderId: parentId },
})
if (!assetRes.ok) {
const err = (await assetRes.json().catch(() => ({ error: 'Unknown error' }))) as {
error?: string
}
console.error(`Error fetching parent asset details: ${err.error || 'Failed'}`)
process.exit(1)
}
const parentAsset = await assetRes.json()
if (parentAsset.type !== 'file' && parentAsset.type !== 'version_stack') {
console.error(
`Error: Parent asset must be a file or a version_stack (got "${parentAsset.type}").`,
)
process.exit(1)
}
const projectId = parentAsset.projectId
if (!projectId) {
console.error('Error: Parent asset does not belong to any project.')
process.exit(1)
}
const projectRes = await client.api.projects[':projectId'].$get({
param: { projectId },
})
if (!projectRes.ok) {
const err = (await projectRes.json().catch(() => ({ error: 'Unknown error' }))) as {
error?: string
}
console.error(`Error fetching project details: ${err.error || 'Failed'}`)
process.exit(1)
}
const project = await projectRes.json()
const teamId = project.teamId
const name = path.basename(resolvedPath)
const mediaType = getMediaType(name)
const fileNode = {
name,
id: ulid(),
size: stat.size,
children: [],
type: 'file',
mediaType,
}
console.log(`Creating new version task...`)
const taskRes = await client.api.teams[':teamId'].upload.tasks.$post({
param: { teamId },
json: {
parentId,
files: [fileNode],
},
})
if (!taskRes.ok) {
const err = (await taskRes.json().catch(() => ({ error: 'Unknown error' }))) as {
error?: string
}
console.error(`Error creating version task: ${err.error || 'Failed'}`)
process.exit(1)
}
const { taskId, presignedUrls, createdAssets } = await taskRes.json()
if (!presignedUrls || presignedUrls.length === 0) {
console.error('Error: Server did not return presigned upload URLs.')
process.exit(1)
}
const urlObj = presignedUrls[0]
const progress = new ProgressTracker()
progress.addUpload(urlObj.id, name, stat.size)
try {
await uploadFileWithProgress(urlObj.url, resolvedPath, mediaType, (bytes) => {
progress.updateProgress(urlObj.id, bytes)
})
const confirmRes = await client.api.teams[':teamId'].upload.tasks[':taskId'].$patch({
param: { teamId, taskId },
json: { fileId: urlObj.fileId },
})
if (!confirmRes.ok) {
throw new Error('Failed to confirm upload')
}
} catch (err) {
console.error(`\nFailed to upload ${name}:`, err instanceof Error ? err.message : err)
await client.api.teams[':teamId'].upload.tasks[':taskId']
.$patch({
param: { teamId, taskId },
json: {
fileId: urlObj.fileId,
errorMessage: err instanceof Error ? err.message : String(err),
},
})
.catch(() => {})
process.exit(1)
}
console.log('\nVersion upload completed!')
if (createdAssets && createdAssets.length > 0) {
console.log('Created version asset ID:')
for (const asset of createdAssets) {
if (asset.tempId === fileNode.id) {
console.log(`- ${asset.assetId}`)
}
}
}
} catch (err) {
console.error('\nError connecting to API server:', err instanceof Error ? err.message : err)
process.exit(1)
}
}
+87
View File
@@ -0,0 +1,87 @@
import { newTablePrinter, withTruncate } from '@shumai/tableprinter'
import type { AssetInfo } from '@shumai/dtos'
import { getClient } from '../client'
function formatSize(bytes: number): string {
if (bytes === 0) return '-'
const k = 1024
const sizes = ['B', 'KB', 'MB', 'GB', 'TB']
const i = Math.floor(Math.log(bytes) / Math.log(k))
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]
}
export async function ls(parentId: string) {
if (!parentId) {
console.error('Error: Parent ID (-p/--parent) is required.')
process.exit(1)
}
const client = getClient()
try {
const [foldersRes, filesRes] = await Promise.all([
client.api.folders[':folderId'].children.$get({
param: { folderId: parentId },
query: { assetType: 'folder', first: '200' },
}),
client.api.folders[':folderId'].children.$get({
param: { folderId: parentId },
query: { assetType: 'file', first: '200' },
}),
])
if (!foldersRes.ok) {
const err = (await foldersRes.json().catch(() => ({ error: 'Unknown error' }))) as {
error?: string
}
console.error(`Error: ${err.error || 'Failed to list folders'}`)
process.exit(1)
}
if (!filesRes.ok) {
const err = (await filesRes.json().catch(() => ({ error: 'Unknown error' }))) as {
error?: string
}
console.error(`Error: ${err.error || 'Failed to list files'}`)
process.exit(1)
}
const foldersData = await foldersRes.json()
const filesData = await filesRes.json()
const folders = foldersData.data || []
const files = filesData.data || []
const items = [
...folders.map((f: AssetInfo) => ({ ...f, typeDisplay: 'folder' as const })),
...files.map((f: AssetInfo) => ({ ...f, typeDisplay: 'file' as const })),
]
if (items.length === 0) {
console.log('No assets found in this folder.')
return
}
const isTty = process.stdout.isTTY
const maxWidth = process.stdout.columns || 80
const tp = newTablePrinter(process.stdout, isTty, maxWidth)
tp.addHeader(['ID', 'Name', 'Type', 'Size'])
for (const item of items) {
tp.addField(item.id || '', withTruncate(null))
tp.addField(item.name || '')
tp.addField(item.typeDisplay, withTruncate(null))
tp.addField(
item.typeDisplay === 'folder' ? '-' : formatSize(item.sizeByte || 0),
withTruncate(null),
)
tp.endRow()
}
tp.render()
} catch (err) {
console.error('Error connecting to API server:', err instanceof Error ? err.message : err)
process.exit(1)
}
}
+32
View File
@@ -0,0 +1,32 @@
import { getClient } from '../client'
export async function mkdir(name: string, parentId: string) {
if (!name) {
console.error('Error: Folder name is required.')
process.exit(1)
}
if (!parentId) {
console.error('Error: Parent ID (-p/--parent) is required.')
process.exit(1)
}
const client = getClient()
try {
const res = await client.api.folders.$post({
json: { name, parentId },
})
if (!res.ok) {
const err = (await res.json().catch(() => ({ error: 'Unknown error' }))) as { error?: string }
console.error(`Error: ${err.error || 'Failed to create folder'}`)
process.exit(1)
}
const created = await res.json()
console.log(`Created folder with ID: ${created.id}`)
} catch (err) {
console.error('Error connecting to API server:', err instanceof Error ? err.message : err)
process.exit(1)
}
}
+42
View File
@@ -0,0 +1,42 @@
import { newTablePrinter } from '@shumai/tableprinter'
import { getClient } from '../client'
export async function projectLs() {
const client = getClient()
try {
const res = await client.api.projects.$get({
query: { first: '200' },
})
if (!res.ok) {
const err = (await res.json().catch(() => ({ error: 'Unknown error' }))) as { error?: string }
console.error(`Error: ${err.error || 'Failed to list projects'}`)
process.exit(1)
}
const { data: projects } = await res.json()
if (projects.length === 0) {
console.log('No projects found.')
return
}
const isTty = process.stdout.isTTY
const maxWidth = process.stdout.columns || 80
const tp = newTablePrinter(process.stdout, isTty, maxWidth)
tp.addHeader(['ID', 'Name', 'Root Folder ID'])
for (const p of projects) {
tp.addField(p.id || '')
tp.addField(p.name || '')
tp.addField(p.rootFolder || '')
tp.endRow()
}
tp.render()
} catch (err) {
console.error('Error connecting to API server:', err instanceof Error ? err.message : err)
process.exit(1)
}
}
+332
View File
@@ -0,0 +1,332 @@
import fs from 'node:fs'
import fsPromises from 'node:fs/promises'
import http from 'node:http'
import https from 'node:https'
import path from 'node:path'
import { ulid } from 'ulid'
import { getClient } from '../client'
interface CliFileNode {
name: string
id: string
size: number
children: CliFileNode[]
type: 'file' | 'folder'
mediaType?: string
}
export function getMediaType(filename: string): string {
const ext = path.extname(filename).toLowerCase()
const mimeMap: Record<string, string> = {
'.png': 'image/png',
'.jpg': 'image/jpeg',
'.jpeg': 'image/jpeg',
'.gif': 'image/gif',
'.svg': 'image/svg+xml',
'.webp': 'image/webp',
'.mp4': 'video/mp4',
'.mkv': 'video/x-matroska',
'.mov': 'video/quicktime',
'.avi': 'video/x-msvideo',
'.webm': 'video/webm',
'.mp3': 'audio/mpeg',
'.wav': 'audio/wav',
'.ogg': 'audio/ogg',
'.txt': 'text/plain',
'.json': 'application/json',
'.pdf': 'application/pdf',
'.zip': 'application/zip',
'.tar': 'application/x-tar',
'.gz': 'application/gzip',
}
return mimeMap[ext] || 'application/octet-stream'
}
async function buildFileTree(
localPath: string,
fileMap: Map<string, { path: string; name: string; size: number; mediaType: string }>,
): Promise<CliFileNode> {
const stat = await fsPromises.stat(localPath)
const name = path.basename(localPath)
const id = ulid()
if (stat.isDirectory()) {
const childrenNames = await fsPromises.readdir(localPath)
const children: CliFileNode[] = []
for (const childName of childrenNames) {
if (childName.startsWith('.')) continue
const childNode = await buildFileTree(path.join(localPath, childName), fileMap)
children.push(childNode)
}
return {
name,
id,
size: 0,
children,
type: 'folder',
}
} else {
const mediaType = getMediaType(name)
fileMap.set(id, { path: localPath, name, size: stat.size, mediaType })
return {
name,
id,
size: stat.size,
children: [],
type: 'file',
mediaType,
}
}
}
export class ProgressTracker {
private uploads = new Map<string, { name: string; size: number; uploadedBytes: number }>()
private isTty = process.stdout.isTTY
private linesPrinted = 0
addUpload(id: string, name: string, size: number) {
this.uploads.set(id, { name, size, uploadedBytes: 0 })
if (this.isTty) {
console.log(`${name.padEnd(30)} [${'░'.repeat(20)}] 0%`)
this.linesPrinted++
console.log('')
this.linesPrinted++
}
}
updateProgress(id: string, uploadedBytes: number) {
const item = this.uploads.get(id)
if (!item) return
item.uploadedBytes = uploadedBytes
if (this.isTty) {
process.stdout.write('\x1B[' + this.linesPrinted + 'A')
this.linesPrinted = 0
for (const upload of this.uploads.values()) {
const pct =
upload.size > 0
? Math.min(Math.round((upload.uploadedBytes / upload.size) * 100), 100)
: 100
const barLength = 20
const filledLength = Math.round((pct / 100) * barLength)
const bar = '█'.repeat(filledLength) + '░'.repeat(barLength - filledLength)
console.log(`${upload.name.padEnd(30)} [${bar}] ${pct}%`)
this.linesPrinted++
console.log('')
this.linesPrinted++
}
} else {
const pct = item.size > 0 ? Math.min(Math.round((uploadedBytes / item.size) * 100), 100) : 100
if (pct === 100 || uploadedBytes === 0 || pct % 25 === 0) {
console.log(`Uploading ${item.name}: ${pct}%`)
}
}
}
}
export async function uploadFileWithProgress(
url: string,
filePath: string,
contentType: string,
onProgress: (bytesUploaded: number) => void,
) {
const stat = fs.statSync(filePath)
const totalSize = stat.size
const parsedUrl = new URL(url)
const isHttps = parsedUrl.protocol === 'https:'
const requestModule = isHttps ? https : http
const options = {
method: 'PUT',
hostname: parsedUrl.hostname,
port: parsedUrl.port || (isHttps ? 443 : 80),
path: parsedUrl.pathname + parsedUrl.search,
headers: {
'Content-Type': contentType,
'Content-Length': totalSize.toString(),
},
}
return new Promise<void>((resolve, reject) => {
const req = requestModule.request(options, (res) => {
res.resume()
if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
resolve()
} else {
reject(new Error(`Failed to upload to S3: ${res.statusCode} ${res.statusMessage}`))
}
})
req.on('error', (err) => {
reject(err)
})
const fileStream = fs.createReadStream(filePath)
let bytesUploaded = 0
fileStream.on('data', (chunk) => {
bytesUploaded += chunk.length
onProgress(bytesUploaded)
req.write(chunk)
})
fileStream.on('end', () => {
req.end()
})
fileStream.on('error', (err) => {
req.destroy()
reject(err)
})
})
}
export async function upload(localPath: string, parentId: string) {
if (!localPath) {
console.error('Error: Local file/folder path is required.')
process.exit(1)
}
if (!parentId) {
console.error('Error: Parent ID (-p/--parent) is required.')
process.exit(1)
}
const resolvedPath = path.resolve(localPath)
if (!fs.existsSync(resolvedPath)) {
console.error(`Error: Local path "${resolvedPath}" does not exist.`)
process.exit(1)
}
const client = getClient()
try {
const parentRes = await client.api.folders[':folderId'].$get({
param: { folderId: parentId },
})
if (!parentRes.ok) {
const err = (await parentRes.json().catch(() => ({ error: 'Unknown error' }))) as {
error?: string
}
console.error(`Error fetching parent folder details: ${err.error || 'Failed'}`)
process.exit(1)
}
const parentFolder = await parentRes.json()
const projectId = parentFolder.projectId
if (!projectId) {
console.error('Error: Parent folder does not belong to any project.')
process.exit(1)
}
const projectRes = await client.api.projects[':projectId'].$get({
param: { projectId },
})
if (!projectRes.ok) {
const err = (await projectRes.json().catch(() => ({ error: 'Unknown error' }))) as {
error?: string
}
console.error(`Error fetching project details: ${err.error || 'Failed'}`)
process.exit(1)
}
const project = await projectRes.json()
const teamId = project.teamId
const fileMap = new Map<
string,
{ path: string; name: string; size: number; mediaType: string }
>()
const rootNode = await buildFileTree(resolvedPath, fileMap)
console.log(`Starting upload task for ${fileMap.size} files...`)
const taskRes = await client.api.teams[':teamId'].upload.tasks.$post({
param: { teamId },
json: {
parentId,
files: [rootNode],
},
})
if (!taskRes.ok) {
const err = (await taskRes.json().catch(() => ({ error: 'Unknown error' }))) as {
error?: string
}
console.error(`Error creating upload task: ${err.error || 'Failed'}`)
process.exit(1)
}
const { taskId, presignedUrls, createdAssets } = await taskRes.json()
const progress = new ProgressTracker()
for (const urlObj of presignedUrls) {
const fileMeta = fileMap.get(urlObj.id)
if (fileMeta) {
progress.addUpload(urlObj.id, fileMeta.name, fileMeta.size)
}
}
const concurrencyLimit = 3
const queue = [...presignedUrls]
const activeUploads: Promise<void>[] = []
const uploadNext = async (): Promise<void> => {
if (queue.length === 0) return
const urlObj = queue.shift()!
const fileMeta = fileMap.get(urlObj.id)!
try {
await uploadFileWithProgress(urlObj.url, fileMeta.path, fileMeta.mediaType, (bytes) => {
progress.updateProgress(urlObj.id, bytes)
})
const confirmRes = await client.api.teams[':teamId'].upload.tasks[':taskId'].$patch({
param: { teamId, taskId },
json: { fileId: urlObj.fileId },
})
if (!confirmRes.ok) {
throw new Error('Failed to confirm upload')
}
} catch (err) {
console.error(
`\nFailed to upload ${fileMeta.name}:`,
err instanceof Error ? err.message : err,
)
await client.api.teams[':teamId'].upload.tasks[':taskId']
.$patch({
param: { teamId, taskId },
json: {
fileId: urlObj.fileId,
errorMessage: err instanceof Error ? err.message : String(err),
},
})
.catch(() => {})
}
return uploadNext()
}
for (let i = 0; i < Math.min(concurrencyLimit, presignedUrls.length); i++) {
activeUploads.push(uploadNext())
}
await Promise.all(activeUploads)
console.log('\nUpload completed!')
if (createdAssets && createdAssets.length > 0) {
console.log('Uploaded asset IDs:')
const topLevelTempIds = new Set<string>()
topLevelTempIds.add(rootNode.id)
for (const asset of createdAssets) {
if (topLevelTempIds.has(asset.tempId)) {
console.log(`- ${asset.assetId}`)
}
}
}
} catch (err) {
console.error('\nError connecting to API server:', err instanceof Error ? err.message : err)
process.exit(1)
}
}
+104
View File
@@ -0,0 +1,104 @@
import { projectLs } from './commands/project'
import { ls } from './commands/ls'
import { mkdir } from './commands/mkdir'
import { upload } from './commands/upload'
import { createVersion } from './commands/create-version'
function printHelp() {
console.log(`
Usage: shumai-cli <command> [arguments] [options]
Commands:
project ls List all projects (returns id, name, root folder id)
ls -p <parentId> List direct children of a parent folder (returns id, name, type, size)
mkdir <name> -p <parentId> Create a new folder in a parent folder
upload <path> -p <parentId> Upload a local file or folder to a parent folder
create-version <path> -p <id> Create a new version of an existing file or version stack
Options:
-p, --parent <id> The parent folder/asset ID (required for ls, mkdir, upload, create-version)
-h, --help Show help details
`)
}
async function main() {
const args = process.argv.slice(2)
if (args.length === 0 || args.includes('-h') || args.includes('--help')) {
printHelp()
process.exit(0)
}
const cmd = args[0]
let parentId = ''
const parentIdx = args.findIndex((a) => a === '-p' || a === '--parent')
if (parentIdx !== -1 && parentIdx + 1 < args.length) {
parentId = args[parentIdx + 1]
}
const cleanArgs: string[] = []
for (let i = 0; i < args.length; i++) {
if (args[i] === '-p' || args[i] === '--parent') {
i++
} else {
cleanArgs.push(args[i])
}
}
if (cmd === 'project' && cleanArgs[1] === 'ls') {
await projectLs()
} else if (cmd === 'ls') {
if (!parentId) {
console.error('Error: Option -p/--parent <parentId> is required.')
process.exit(1)
}
await ls(parentId)
} else if (cmd === 'mkdir') {
const name = cleanArgs[1]
if (!name) {
console.error(
'Error: Folder name is required. Usage: shumai-cli mkdir <folderName> -p <parentId>',
)
process.exit(1)
}
if (!parentId) {
console.error('Error: Option -p/--parent <parentId> is required.')
process.exit(1)
}
await mkdir(name, parentId)
} else if (cmd === 'upload') {
const localPath = cleanArgs[1]
if (!localPath) {
console.error(
'Error: File/folder path is required. Usage: shumai-cli upload <localPath> -p <parentId>',
)
process.exit(1)
}
if (!parentId) {
console.error('Error: Option -p/--parent <parentId> is required.')
process.exit(1)
}
await upload(localPath, parentId)
} else if (cmd === 'create-version') {
const localPath = cleanArgs[1]
if (!localPath) {
console.error(
'Error: Local file path is required. Usage: shumai-cli create-version <localPath> -p <parentAssetId>',
)
process.exit(1)
}
if (!parentId) {
console.error('Error: Option -p/--parent <parentAssetId> is required.')
process.exit(1)
}
await createVersion(localPath, parentId)
} else {
console.error(`Error: Unknown command "${cmd}". Run "shumai-cli --help" for usage.`)
process.exit(1)
}
}
main().catch((err) => {
console.error('Unexpected error:', err)
process.exit(1)
})
+4
View File
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"]
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/transcode-app",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"bin": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/web-app",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"dependencies": {
+34 -11
View File
@@ -32,7 +32,7 @@
},
"apps/agent": {
"name": "@shumai/agent-app",
"version": "0.0.6",
"version": "0.0.10",
"bin": {
"shumai-agent": "./src/index.ts",
},
@@ -42,9 +42,24 @@
"@shumai/workflow-core": "workspace:*",
},
},
"apps/cli": {
"name": "@shumai/cli",
"version": "0.0.10",
"bin": {
"shumai-cli": "./src/index.ts",
},
"dependencies": {
"@shumai/api": "workspace:*",
"@shumai/core": "workspace:*",
"@shumai/dtos": "workspace:*",
"@shumai/tableprinter": "workspace:*",
"hono": "4.12.23",
"ulid": "^3.0.2",
},
},
"apps/transcode": {
"name": "@shumai/transcode-app",
"version": "0.0.6",
"version": "0.0.10",
"bin": {
"shumai-transcode": "./src/index.ts",
},
@@ -56,7 +71,7 @@
},
"apps/web": {
"name": "@shumai/web-app",
"version": "0.0.6",
"version": "0.0.10",
"dependencies": {
"@shumai/agent": "workspace:*",
"@shumai/api": "workspace:*",
@@ -71,7 +86,7 @@
},
"packages/agent": {
"name": "@shumai/agent",
"version": "0.0.6",
"version": "0.0.10",
"dependencies": {
"@anthropic-ai/sandbox-runtime": "0.0.52",
"@earendil-works/pi-agent-core": "0.78.0",
@@ -95,7 +110,7 @@
},
"packages/api": {
"name": "@shumai/api",
"version": "0.0.6",
"version": "0.0.10",
"dependencies": {
"@hono/zod-validator": "0.7.6",
"@shumai/core": "workspace:*",
@@ -109,7 +124,7 @@
},
"packages/core": {
"name": "@shumai/core",
"version": "0.0.6",
"version": "0.0.10",
"dependencies": {
"@shumai/db": "workspace:*",
"@shumai/dtos": "workspace:*",
@@ -136,7 +151,7 @@
},
"packages/db": {
"name": "@shumai/db",
"version": "0.0.6",
"version": "0.0.10",
"dependencies": {
"@earendil-works/pi-agent-core": "0.78.0",
"@prisma/adapter-pg": "7.8.0",
@@ -152,14 +167,18 @@
},
"packages/dtos": {
"name": "@shumai/dtos",
"version": "0.0.6",
"version": "0.0.10",
"dependencies": {
"zod": "4.4.3",
},
},
"packages/tableprinter": {
"name": "@shumai/tableprinter",
"version": "0.0.10",
},
"packages/transcode": {
"name": "@shumai/transcode",
"version": "0.0.6",
"version": "0.0.10",
"dependencies": {
"@shumai/core": "workspace:*",
"@shumai/db": "workspace:*",
@@ -173,7 +192,7 @@
},
"packages/webui": {
"name": "@shumai/webui",
"version": "0.0.6",
"version": "0.0.10",
"dependencies": {
"@base-ui/react": "1.5.0",
"@dnd-kit/abstract": "0.4.0",
@@ -273,7 +292,7 @@
},
"packages/workflow-core": {
"name": "@shumai/workflow-core",
"version": "0.0.6",
"version": "0.0.10",
"dependencies": {
"@shumai/core": "workspace:*",
"@shumai/db": "workspace:*",
@@ -968,12 +987,16 @@
"@shumai/api": ["@shumai/api@workspace:packages/api"],
"@shumai/cli": ["@shumai/cli@workspace:apps/cli"],
"@shumai/core": ["@shumai/core@workspace:packages/core"],
"@shumai/db": ["@shumai/db@workspace:packages/db"],
"@shumai/dtos": ["@shumai/dtos@workspace:packages/dtos"],
"@shumai/tableprinter": ["@shumai/tableprinter@workspace:packages/tableprinter"],
"@shumai/transcode": ["@shumai/transcode@workspace:packages/transcode"],
"@shumai/transcode-app": ["@shumai/transcode-app@workspace:apps/transcode"],
+5 -1
View File
@@ -17,7 +17,7 @@ services:
retries: 5
shumai:
image: shumaione/shumai:main
image: shumaione/shumai:latest
container_name: shumai_app
ports:
- '3000:3000'
@@ -27,8 +27,12 @@ services:
# 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=
+22 -10
View File
@@ -37,16 +37,28 @@ Shumai is configured via environment variables. You can define these variables i
Shumai supports storing files locally or on S3-compatible endpoints.
| Variable | Description | Example / Default |
| :------------------------- | :------------------------------------------------------------------------------------------------ | :--------------------------- |
| `STORAGE_BACKEND` | Storage type. Use `local` for local file system storage, or `s3` for S3-compatible cloud storage. | `local` (default) or `s3` |
| `AWS_ENDPOINT_URL_S3` | Custom endpoint for S3 storage. Must change to public domain/IP if deploying remotely. | `http://localhost` (default) |
| `S3_BUCKET` | S3 bucket name. | `shumai` (default) |
| `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) |
| Variable | Description | Example / Default |
| :------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------ | :------------------------------------------------------------------------ |
| `STORAGE_BACKEND` | Storage type. Use `local` for local file system storage, or `s3` for S3-compatible cloud storage. | `local` (default) or `s3` |
| `AWS_ENDPOINT_URL_S3` | Endpoint for S3 storage or local storage. Used by the browser to build file upload URLs. Must include port if deploying remotely or using custom ports. | `http://localhost:3000` (respects `SHUMAI_SERVER_PORT` fallback if unset) |
| `S3_BUCKET` | S3 bucket name. | `shumai` (default) |
| `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
When `STORAGE_BACKEND` is set to `local` (default):
- `SHUMAI_SERVER_PORT` configures the port on which the Shumai web server starts and listens.
- `AWS_ENDPOINT_URL_S3` configures the public/external endpoint used by client browsers to upload and download files. It must include the scheme and port.
For example, if you deploy Shumai on a remote server at `http://123.456.7.8` and configure port mapping `12345:3000` (exposing port 3000 internally as port 12345 externally) in Docker Compose:
- Set `SHUMAI_SERVER_PORT` to `3000`.
- Set `AWS_ENDPOINT_URL_S3` to `http://123.456.7.8:12345`.
---
+3
View File
@@ -80,3 +80,6 @@ Run this on your sandboxed agent execution nodes (requires sandbox dependencies
npm install -g @shumai-one/shumai-agent
shumai-agent
```
> [!IMPORTANT]
> **For Bun Users:** Since the worker package binaries contain a `#!/usr/bin/env node` shebang, running `shumai-transcode` or `shumai-agent` directly will run under Node.js. If you wish to run them using Bun, prefix the commands with `bun run --bun` (e.g., `bun run --bun shumai-transcode` or `bun run --bun shumai-agent`).
+13 -1
View File
@@ -61,20 +61,32 @@ To handle media processing and security isolation, the host machine must have th
```
3. **Configure Environment Variables**:
Create a new directory, navigate into it, and create a `.env` file:
```bash
mkdir shumai && cd shumai
```
Create a `.env` file with the following variables:
```env
DATABASE_URL=postgresql://shumai:shumai_password@localhost:5432/shumai_db?schema=public
BETTER_AUTH_SECRET=your-random-32-character-secret-key
STORAGE_BACKEND=local
AWS_ENDPOINT_URL_S3=http://localhost
AWS_ENDPOINT_URL_S3=http://localhost:3000
```
> [!TIP]
> `AWS_ENDPOINT_URL_S3` must include the scheme and port (e.g. `http://localhost:3000`) where Shumai is publicly accessible. This URL is used directly by client browsers for file uploads.
4. **Start Shumai**:
> [!IMPORTANT]
> **For Bun Users:** Since the published package binaries contain a `#!/usr/bin/env node` shebang, running `shumai` directly will execute under Node.js. If you installed using Bun and want to run it under the Bun runtime, prefix the command with `bun run --bun` (e.g., `bun run --bun shumai`).
```bash
shumai
```
Open your browser to `http://localhost:3000`.
---
+2
View File
@@ -29,6 +29,8 @@ When building or editing your metadata schema, you can choose from these custom
- **Number**: A numeric field supporting custom decimal precision (from 0 to 3 decimal places) for values like frame rates, counts, or scores.
- **Checkbox (Toggle)**: A simple Yes/No switch for binary indicators (e.g., "VFX Required").
- **Date**: A calendar date selector with support for custom display formats (Local, ISO, USA, Euro, Friendly) and optional time tracking.
- **Single User**: A dropdown select field populated dynamically with team members, displaying their name and avatar.
- **Multiple User**: A multi-choice user select field populated dynamically with team members, allowing you to assign multiple team members.
![Asset Metadata Fields](../metafields.webp)
+2 -1
View File
@@ -1,6 +1,6 @@
{
"name": "shumai",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"repository": {
@@ -19,6 +19,7 @@
"format": "prettier --write .",
"db:migrate": "bun run prisma migrate dev",
"db:deploy": "bun run prisma migrate deploy",
"db:generate": "cd packages/db && bunx prisma generate",
"generate-providers": "bun run scripts/generate-builtin-providers.ts",
"worker:agent": "bun apps/agent/src/index.ts",
"worker:transcode": "bun apps/transcode/src/index.ts",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/agent",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"main": "./src/index.ts",
@@ -127,6 +127,54 @@ describe('Agent Activities', () => {
expect(res.text).toBe('Error: API key not valid')
})
it('should pass thinkingLevel from agent config to createAgentSession', async () => {
const mockHarness = {
prompt: vi.fn().mockResolvedValue({
content: [],
usage: { input: 0, output: 0 },
}),
getThinkingLevel: vi.fn().mockReturnValue('high'),
}
const mockSession = {
getEntries: vi.fn().mockResolvedValue([]),
getStorage: vi.fn().mockReturnValue({ sessionId: 'mock-session-id' }),
}
vi.mocked(piAgent.createAgentSession).mockResolvedValue({
session: mockSession as unknown as Session<DatabaseSessionMetadata>,
harness: mockHarness as unknown as AgentHarness,
})
const context = {
agent: {
id: 'b1',
provider: { name: 'google' },
modelRef: { modelId: 'gemini' },
config: { thinkingLevel: 'high' },
},
dbProviders: [],
teamSkills: [],
allowedDomains: [],
} as unknown as AgentExecutionContext
await agentChatActivity({
teamId: 't1',
agentId: 'b1',
message: 'Hi',
imageUrls: [],
projectId: 'p1',
folderId: 'f1',
sessionId: 'mock-session-id',
context,
})
expect(piAgent.createAgentSession).toHaveBeenCalledWith(
expect.objectContaining({
thinkingLevel: 'high',
}),
)
})
it('should call autofillAiActivity and run autofill tool', async () => {
const mockHarness = {
prompt: vi.fn().mockResolvedValue({
+4
View File
@@ -97,12 +97,16 @@ If you need to create files in the local filesystem (for example, a temporary fi
systemPrompt += `\n\nYour current model supports the following input types: ${modelConfig.input.join(', ')}.`
}
const agentConfig = agent.config as PrismaJson.AgentConfig | null | undefined
const thinkingLevel = agentConfig?.thinkingLevel || 'off'
const { session, harness } = await createAgentSession({
teamId: params.teamId,
agentId: params.agentId,
providerName,
modelId,
systemPrompt,
thinkingLevel,
teamSkills: teamSkills.map((s) => ({
id: s.id,
name: s.name,
+72
View File
@@ -257,4 +257,76 @@ describe('Sandbox Network isolation integration', () => {
resetSpy.mockRestore()
}
})
it('should pass thinkingLevel to AgentHarness and default to off', async () => {
const team = await prisma.team.create({
data: { name: 'Test Team' },
})
await prisma.user.create({
data: {
id: 'test-agent-1',
name: 'Agent 1',
email: 'agent1@test.com',
type: 'agent',
},
})
await prisma.agent.create({
data: {
id: 'test-agent-1',
teamId: team.id,
type: 'chat',
config: { provider: 'google', model: 'gemini' },
},
})
await prisma.user.create({
data: {
id: 'test-agent-2',
name: 'Agent 2',
email: 'agent2@test.com',
type: 'agent',
},
})
await prisma.agent.create({
data: {
id: 'test-agent-2',
teamId: team.id,
type: 'chat',
config: { provider: 'google', model: 'gemini' },
},
})
const initializeSpy = vi.spyOn(SandboxManager, 'initialize').mockResolvedValue()
try {
// Call createAgentSession with thinkingLevel
const { harness: harnessHigh } = await createAgentSession({
teamId: team.id,
agentId: 'test-agent-1',
providerName: 'google',
modelId: 'gemini',
systemPrompt: 'prompt',
teamSkills: [],
allowedDomains: [],
providers: [],
thinkingLevel: 'high',
})
expect(harnessHigh.getThinkingLevel()).toBe('high')
// Call createAgentSession without thinkingLevel
const { harness: harnessDefault } = await createAgentSession({
teamId: team.id,
agentId: 'test-agent-2',
providerName: 'google',
modelId: 'gemini',
systemPrompt: 'prompt',
teamSkills: [],
allowedDomains: [],
providers: [],
})
expect(harnessDefault.getThinkingLevel()).toBe('off')
} finally {
initializeSpy.mockRestore()
}
})
})
+9 -1
View File
@@ -1,5 +1,10 @@
import { SandboxManager } from '@anthropic-ai/sandbox-runtime'
import { AgentHarness, Session, type AgentTool } from '@earendil-works/pi-agent-core'
import {
AgentHarness,
Session,
type AgentTool,
type ThinkingLevel,
} from '@earendil-works/pi-agent-core'
import { NodeExecutionEnv } from '@earendil-works/pi-agent-core/node'
import { getModel } from '@earendil-works/pi-ai'
import { Type, type TSchema } from '@sinclair/typebox'
@@ -29,6 +34,7 @@ export interface CreateAgentSessionParams {
userId?: string
userCommentId?: string | null
customTools?: AgentTool[]
thinkingLevel?: string
providers: Array<{
name: string
config: PrismaJson.ProviderConfig
@@ -53,6 +59,7 @@ export async function createAgentSession(params: CreateAgentSessionParams) {
userId,
userCommentId: passedUserCommentId,
customTools = [],
thinkingLevel,
} = params
const storage = await DatabaseSessionStorage.create({
@@ -233,6 +240,7 @@ export async function createAgentSession(params: CreateAgentSessionParams) {
env: new NodeExecutionEnv({ cwd: process.cwd() }),
session,
model,
thinkingLevel: (thinkingLevel || 'off') as ThinkingLevel,
systemPrompt: async () => {
let prompt = systemPrompt
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/api",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"main": "./src/index.ts",
+3 -3
View File
@@ -39,7 +39,7 @@ const route = new Hono<{ Variables: { user: User } }>()
avatar: (await getAvatarUrl(agent.user.image)) || undefined,
providerId: agent.providerId || undefined,
modelId: agent.modelId || undefined,
thinkingLevel: config.thinkingLevel || '',
thinkingLevel: config.thinkingLevel || 'off',
systemPrompt: config.systemPrompt,
soul: agent.soul || undefined,
skills: agent.skills.map((s) => ({
@@ -81,7 +81,7 @@ const route = new Hono<{ Variables: { user: User } }>()
avatar: (await getAvatarUrl(agent.user.image)) || undefined,
providerId: agent.providerId || undefined,
modelId: agent.modelId || undefined,
thinkingLevel: config.thinkingLevel || '',
thinkingLevel: config.thinkingLevel || 'off',
systemPrompt: config.systemPrompt,
soul: agent.soul || undefined,
skills: agent.skills.map((s) => ({
@@ -119,7 +119,7 @@ const route = new Hono<{ Variables: { user: User } }>()
avatar: (await getAvatarUrl(agent.user.image)) || undefined,
providerId: agent.providerId || undefined,
modelId: agent.modelId || undefined,
thinkingLevel: config.thinkingLevel || '',
thinkingLevel: config.thinkingLevel || 'off',
systemPrompt: config.systemPrompt,
soul: agent.soul || undefined,
skills: agent.skills.map((s) => ({
+11 -1
View File
@@ -9,6 +9,7 @@ import folderRoute from './folder'
import inviteRoute from './invite'
import metadataRoute from './metadata'
import { authMiddleware } from './middleware/auth'
import { tokenAuthMiddleware } from './middleware/tokenAuth'
import notificationRoute from './notification'
import projectRoute from './project'
import providerRoute from './provider'
@@ -18,7 +19,7 @@ import s3Route from './s3'
import shareRoute from './share'
import skillRoute from './skill'
import teamRoute from './team'
import uploadRoute from './upload'
import uploadRoute, { localUploadRoute } from './upload'
import versionStackRoute from './versionStack'
type User = Prisma.UserGetPayload<Record<string, never>>
@@ -30,6 +31,15 @@ const apiRoute = new Hono<{ Variables: { user: User } }>()
.route('/', authnRoute)
.route('/', publicInviteRoute)
.route('/', publicShareRoute)
.route('/', localUploadRoute)
// Selected routes supporting API token authentication
.use('/projects', tokenAuthMiddleware)
.use('/projects/*', tokenAuthMiddleware)
.use('/folders', tokenAuthMiddleware)
.use('/folders/*', tokenAuthMiddleware)
.use('/teams/:teamId/upload/tasks', tokenAuthMiddleware)
.use('/teams/:teamId/upload/tasks/*', tokenAuthMiddleware)
// Protected Routes
.use('*', authMiddleware)
+5
View File
@@ -10,6 +10,11 @@ export const authMiddleware = createMiddleware<{
user: User
}
}>(async (c, next) => {
if (c.get('user')) {
await next()
return
}
const session = await auth.api.getSession({
headers: c.req.raw.headers,
})
@@ -0,0 +1,100 @@
import { describe, expect, it, vi, beforeEach } from 'vitest'
import { Hono } from 'hono'
import { tokenAuthMiddleware } from './tokenAuth'
import { prisma } from '@shumai/db'
vi.mock('@shumai/db', () => ({
prisma: {
apiToken: {
findUnique: vi.fn(),
},
},
}))
describe('tokenAuthMiddleware', () => {
const app = new Hono().use('*', tokenAuthMiddleware).get('/test', (c) => {
const user = c.get('user')
if (user) {
return c.text(`user:${user.id}`)
}
return c.text('no-user')
})
beforeEach(() => {
vi.resetAllMocks()
})
it('proceeds with no user if no token is provided', async () => {
const res = await app.request('/test')
expect(res.status).toBe(200)
expect(await res.text()).toBe('no-user')
})
it('sets user when valid Authorization Bearer token is provided', async () => {
vi.mocked(prisma.apiToken.findUnique).mockResolvedValue({
id: 'token1',
token: 'ulid_token_123',
name: 'cli-key',
userId: 'user123',
createdAt: new Date(),
updatedAt: new Date(),
user: {
id: 'user123',
name: 'John Doe',
email: 'john@example.com',
},
// Mocking the complex PrismaPromise return type of findUnique is not feasible without any here.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
const res = await app.request('/test', {
headers: {
Authorization: 'Bearer ulid_token_123',
},
})
expect(res.status).toBe(200)
expect(await res.text()).toBe('user:user123')
expect(prisma.apiToken.findUnique).toHaveBeenCalledWith({
where: { token: 'ulid_token_123' },
include: { user: true },
})
})
it('sets user when valid x-api-key header is provided', async () => {
vi.mocked(prisma.apiToken.findUnique).mockResolvedValue({
id: 'token1',
token: 'ulid_token_123',
name: 'cli-key',
userId: 'user123',
createdAt: new Date(),
updatedAt: new Date(),
user: {
id: 'user123',
name: 'John Doe',
email: 'john@example.com',
},
// Mocking the complex PrismaPromise return type of findUnique is not feasible without any here.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
const res = await app.request('/test', {
headers: {
'x-api-key': 'ulid_token_123',
},
})
expect(res.status).toBe(200)
expect(await res.text()).toBe('user:user123')
})
it('returns 401 when invalid token is provided', async () => {
vi.mocked(prisma.apiToken.findUnique).mockResolvedValue(null)
const res = await app.request('/test', {
headers: {
Authorization: 'Bearer invalid_token',
},
})
expect(res.status).toBe(401)
expect(await res.json()).toEqual({ error: 'Unauthorized: Invalid API Key' })
})
})
+32
View File
@@ -0,0 +1,32 @@
import type { Prisma } from '@shumai/db'
import { prisma } from '@shumai/db'
import { createMiddleware } from 'hono/factory'
type User = Prisma.UserGetPayload<Record<string, never>>
export const tokenAuthMiddleware = createMiddleware<{
Variables: {
user: User
}
}>(async (c, next) => {
const authHeader = c.req.header('Authorization')
const token =
authHeader && authHeader.startsWith('Bearer ')
? authHeader.substring(7)
: c.req.header('x-api-key') || null
if (token) {
const apiToken = await prisma.apiToken.findUnique({
where: { token },
include: { user: true },
})
if (!apiToken) {
return c.json({ error: 'Unauthorized: Invalid API Key' }, 401)
}
c.set('user', apiToken.user)
}
await next()
})
+53
View File
@@ -18,6 +18,16 @@ vi.mock('./middleware/auth', () => ({
vi.mock('@shumai/core/src/authz/authz')
vi.mock('@shumai/core/src/project/project')
vi.mock('@shumai/core/src/asset/asset')
vi.mock('@shumai/db', () => ({
prisma: {
teamMember: {
findMany: vi.fn(),
},
project: {
findMany: vi.fn(),
},
},
}))
describe('project api', () => {
const app = new Hono<{ Variables: { user: { id: string; name: string } } }>()
@@ -246,4 +256,47 @@ describe('project api', () => {
})
expect(projectService.getProjectMe).toHaveBeenCalledWith('p1', 'user1')
})
it('GET /projects', async () => {
const { prisma } = await import('@shumai/db')
vi.mocked(prisma.teamMember.findMany).mockResolvedValue([
{ id: 'tm1', teamId: 'team1', userId: 'user1', scope: 'team' },
// Mocking complex Prisma client returns requires any here
// eslint-disable-next-line @typescript-eslint/no-explicit-any
] as any)
vi.mocked(prisma.project.findMany).mockResolvedValue([
{
id: 'proj1',
name: 'My Project',
teamId: 'team1',
rootFolderId: 'folder1',
enableNotification: true,
updatedAt: new Date('2026-06-21T00:00:00.000Z'),
},
// Mocking complex Prisma client returns requires any here
// eslint-disable-next-line @typescript-eslint/no-explicit-any
] as any)
const res = await app.request('/projects?first=10')
expect(res.status).toBe(200)
const json = await res.json()
expect(json.data).toHaveLength(1)
expect(json.data[0]).toEqual({
id: 'proj1',
name: 'My Project',
teamId: 'team1',
rootFolder: 'folder1',
enableNotification: true,
updatedAt: '2026-06-21T00:00:00.000Z',
})
expect(prisma.teamMember.findMany).toHaveBeenCalledWith({
where: { userId: 'user1' },
})
expect(prisma.project.findMany).toHaveBeenCalledWith({
where: { teamId: 'team1' },
orderBy: { id: 'desc' },
take: 10,
})
})
})
+45 -1
View File
@@ -12,12 +12,56 @@ import {
updateProjectMemberRoleRequestSchema,
addProjectMemberRequestSchema,
} from '@shumai/dtos'
import { listMembersQuerySchema } from '@shumai/dtos'
import { listMembersQuerySchema, paginationParamsSchema } from '@shumai/dtos'
import type { Prisma } from '@shumai/db'
import { prisma } from '@shumai/db'
type User = Prisma.UserGetPayload<Record<string, never>>
const route = new Hono<{ Variables: { user: User } }>()
.get('/projects', zValidator('query', paginationParamsSchema), async (c) => {
const user = c.get('user')
const req = c.req.valid('query')
const limit = req.first ? Math.min(req.first, 200) : 200
const teamMembers = await prisma.teamMember.findMany({
where: { userId: user.id },
})
type ProjectType = Prisma.ProjectGetPayload<Record<string, never>>
const allProjects: ProjectType[] = []
for (const member of teamMembers) {
const where: Prisma.ProjectWhereInput = {
teamId: member.teamId,
}
if (member.scope === 'project') {
where.members = {
some: { teamMemberId: member.id },
}
}
const teamProjects = await prisma.project.findMany({
where,
orderBy: { id: 'desc' },
take: limit - allProjects.length,
})
allProjects.push(...teamProjects)
if (allProjects.length >= limit) {
break
}
}
return c.json({
data: allProjects.map((p) => ({
id: p.id,
name: p.name,
teamId: p.teamId,
rootFolder: p.rootFolderId || undefined,
enableNotification: p.enableNotification,
updatedAt: p.updatedAt.toISOString(),
})),
})
})
.post('/teams/:teamId/projects', zValidator('json', createProjectRequestSchema), async (c) => {
const teamId = c.req.param('teamId')
const user = c.get('user')
+31 -41
View File
@@ -1,4 +1,5 @@
import { Hono } from 'hono'
import type { Context } from 'hono'
import { zValidator } from '@hono/zod-validator'
import { shareService } from '@shumai/core/src/share/share'
import { assetService } from '@shumai/core/src/asset/asset'
@@ -11,6 +12,12 @@ import { auth } from '@shumai/core/src/auth/auth'
import { prisma } from '@shumai/db'
import { createCommentRequestSchema } from '@shumai/dtos'
import { notificationService } from '@shumai/core/src/notification/notification'
import {
ShareLinkNotFoundError,
ShareLinkDisabledError,
ShareLinkExpiredError,
ShareLinkPasswordInvalidError,
} from '@shumai/core/src/share/errors'
const app = new Hono()
@@ -30,6 +37,22 @@ function toFieldInfo(
}
}
export function handlePublicShareError(c: Context, err: unknown) {
if (err instanceof ShareLinkPasswordInvalidError) {
return c.json({ error: 'Unauthorized' }, 401)
}
if (err instanceof ShareLinkExpiredError || err instanceof ShareLinkDisabledError) {
const msg = err instanceof Error ? err.message : String(err)
return c.json({ error: msg }, 403)
}
if (err instanceof ShareLinkNotFoundError) {
const msg = err instanceof Error ? err.message : String(err)
return c.json({ error: msg }, 404)
}
const msg = err instanceof Error ? err.message : String(err)
return c.json({ error: msg }, 500)
}
const sharedChildrenRequestSchema = paginationParamsSchema.extend({
assetType: z.string().optional(),
})
@@ -37,8 +60,10 @@ const sharedChildrenRequestSchema = paginationParamsSchema.extend({
const route = app
.get('/shares/:shareId/info', async (c) => {
const shareId = c.req.param('shareId')
const password = c.req.header('x-share-password')
try {
const shareLink = await shareService.getShareLink(shareId)
await shareService.verifyPublicAccess(shareLink.rootFolderId, password)
return c.json({
id: shareLink.id,
name: shareLink.name,
@@ -52,7 +77,7 @@ const route = app
defaultSortOrder: shareLink.defaultSortOrder,
})
} catch (err) {
return c.json({ error: (err as Error).message }, 404)
return handlePublicShareError(c, err)
}
})
.get('/shares/:shareId/fields', async (c) => {
@@ -72,14 +97,7 @@ const route = app
.map((f) => toFieldInfo(f.field, f.visible)),
)
} catch (err) {
const msg = (err as Error).message
if (msg === 'Invalid password for share link') {
return c.json({ error: 'Unauthorized' }, 401)
}
if (msg === 'Share link has expired' || msg === 'Share link is disabled') {
return c.json({ error: msg }, 403)
}
return c.json({ error: msg }, 500)
return handlePublicShareError(c, err)
}
})
.get(
@@ -112,14 +130,7 @@ const route = app
return c.json(res)
} catch (err) {
const msg = (err as Error).message
if (msg === 'Invalid password for share link') {
return c.json({ error: 'Unauthorized' }, 401)
}
if (msg === 'Share link has expired' || msg === 'Share link is disabled') {
return c.json({ error: msg }, 403)
}
return c.json({ error: msg }, 500)
return handlePublicShareError(c, err)
}
},
)
@@ -133,14 +144,7 @@ const route = app
const asset = await assetService.getAsset({ assetId: fileId })
return c.json(asset)
} catch (err) {
const msg = (err as Error).message
if (msg === 'Invalid password for share link') {
return c.json({ error: 'Unauthorized' }, 401)
}
if (msg === 'Share link has expired' || msg === 'Share link is disabled') {
return c.json({ error: msg }, 403)
}
return c.json({ error: msg }, 500)
return handlePublicShareError(c, err)
}
})
.get(
@@ -158,14 +162,7 @@ const route = app
const res = await assetService.listComments(targetFileId, req)
return c.json(res)
} catch (err) {
const msg = (err as Error).message
if (msg === 'Invalid password for share link') {
return c.json({ error: 'Unauthorized' }, 401)
}
if (msg === 'Share link has expired' || msg === 'Share link is disabled') {
return c.json({ error: msg }, 403)
}
return c.json({ error: msg }, 500)
return handlePublicShareError(c, err)
}
},
)
@@ -237,14 +234,7 @@ const route = app
return c.json(comment, 201)
} catch (err) {
const msg = (err as Error).message
if (msg === 'Invalid password for share link') {
return c.json({ error: 'Unauthorized' }, 401)
}
if (msg === 'Share link has expired' || msg === 'Share link is disabled') {
return c.json({ error: msg }, 403)
}
return c.json({ error: msg }, 500)
return handlePublicShareError(c, err)
}
},
)
+60
View File
@@ -6,6 +6,7 @@ import { authMiddleware } from './middleware/auth'
import { shareService } from '@shumai/core/src/share/share'
import { assetService } from '@shumai/core/src/asset/asset'
import { authzService, Permission, ResourceType } from '@shumai/core/src/authz/authz'
import { ShareLinkPasswordInvalidError, ShareLinkExpiredError } from '@shumai/core/src/share/errors'
vi.mock('./middleware/auth', () => ({
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -57,15 +58,74 @@ describe('Share API', () => {
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
})
vi.spyOn(shareService, 'verifyPublicAccess').mockResolvedValue({
id: 'share1',
name: 'Public Share',
rootFolderId: 'folder1',
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
const res = await app.request('/shares/share1/info', {
method: 'GET',
headers: { 'x-share-password': 'pass' },
})
expect(res.status).toBe(200)
const body = await res.json()
expect(body.name).toBe('Public Share')
expect(body.hasPassword).toBe(true)
expect(shareService.verifyPublicAccess).toHaveBeenCalledWith('folder1', 'pass')
})
test('Unauthorized', async () => {
vi.spyOn(shareService, 'getShareLink').mockResolvedValue({
id: 'share1',
name: 'Public Share',
isDisabled: false,
isExpired: false,
hasPassword: true,
rootFolderId: 'folder1',
projectId: 'project1',
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
})
vi.spyOn(shareService, 'verifyPublicAccess').mockRejectedValue(
new ShareLinkPasswordInvalidError('Invalid password for share link'),
)
const res = await app.request('/shares/share1/info', {
method: 'GET',
headers: { 'x-share-password': 'wrong' },
})
expect(res.status).toBe(401)
const body = await res.json()
expect(body.error).toBe('Unauthorized')
})
test('Expired/Disabled', async () => {
vi.spyOn(shareService, 'getShareLink').mockResolvedValue({
id: 'share1',
name: 'Public Share',
isDisabled: false,
isExpired: false,
hasPassword: true,
rootFolderId: 'folder1',
projectId: 'project1',
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
})
vi.spyOn(shareService, 'verifyPublicAccess').mockRejectedValue(
new ShareLinkExpiredError('Share link has expired'),
)
const res = await app.request('/shares/share1/info', {
method: 'GET',
})
expect(res.status).toBe(403)
const body = await res.json()
expect(body.error).toBe('Share link has expired')
})
})
+87
View File
@@ -29,6 +29,14 @@ vi.mock('./middleware/auth', () => ({
},
}))
vi.mock('@shumai/core/src/user/api-token', () => ({
apiTokenService: {
listTokens: vi.fn(),
createToken: vi.fn(),
deleteToken: vi.fn(),
},
}))
describe('team api', () => {
const app = new Hono().use('*', authMiddleware).route('/', teamRoute)
let mockCreateTeam: any // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -317,4 +325,83 @@ describe('team api', () => {
pendingDomains: ['new-pending.com'],
})
})
describe('API Tokens', () => {
it('GET /teams/:teamId/api-tokens', async () => {
const { apiTokenService } = await import('@shumai/core/src/user/api-token')
const mockDate = new Date('2026-06-21T00:00:00.000Z')
vi.mocked(apiTokenService.listTokens).mockResolvedValue([
{
id: 'token1',
token: 'ulid1',
name: 'cli-key',
userId: 'user1',
createdAt: mockDate,
updatedAt: mockDate,
},
// Mocking return value of listTokens is simpler with any casting
// eslint-disable-next-line @typescript-eslint/no-explicit-any
] as any)
const res = await app.request('/teams/t1/api-tokens')
expect(res.status).toBe(200)
const data = await res.json()
expect(data).toHaveLength(1)
expect(data[0]).toEqual({
id: 'token1',
token: 'ulid1',
name: 'cli-key',
createdAt: '2026-06-21T00:00:00.000Z',
})
expect(apiTokenService.listTokens).toHaveBeenCalledWith('user1')
})
it('POST /teams/:teamId/api-tokens', async () => {
const { apiTokenService } = await import('@shumai/core/src/user/api-token')
const mockDate = new Date('2026-06-21T00:00:00.000Z')
vi.mocked(apiTokenService.createToken).mockResolvedValue({
id: 'token1',
token: 'ulid1',
name: 'cli-key',
userId: 'user1',
createdAt: mockDate,
updatedAt: mockDate,
// Mocking return value of createToken is simpler with any casting
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any)
const res = await app.request('/teams/t1/api-tokens', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ name: 'cli-key' }),
})
expect(res.status).toBe(200)
const data = await res.json()
expect(data).toEqual({
id: 'token1',
token: 'ulid1',
name: 'cli-key',
createdAt: '2026-06-21T00:00:00.000Z',
})
expect(apiTokenService.createToken).toHaveBeenCalledWith('user1', 'cli-key')
})
it('DELETE /teams/:teamId/api-tokens/:tokenId', async () => {
const { apiTokenService } = await import('@shumai/core/src/user/api-token')
// Mocking return value of deleteToken is simpler with any casting
// eslint-disable-next-line @typescript-eslint/no-explicit-any
vi.mocked(apiTokenService.deleteToken).mockResolvedValue({} as any)
const res = await app.request('/teams/t1/api-tokens/token1', {
method: 'DELETE',
})
expect(res.status).toBe(200)
const data = await res.json()
expect(data).toEqual({ success: true })
expect(apiTokenService.deleteToken).toHaveBeenCalledWith('user1', 'token1')
})
})
})
+58
View File
@@ -13,8 +13,10 @@ import {
updateSandboxSettingsRequestSchema,
updateMeRequestSchema,
updateTeamMemberRoleRequestSchema,
createApiTokenRequestSchema,
} from '@shumai/dtos'
import { updateUserMetadataRequestSchema } from '@shumai/dtos'
import { apiTokenService } from '@shumai/core/src/user/api-token'
import type { Prisma } from '@shumai/db'
type User = Prisma.UserGetPayload<Record<string, never>>
@@ -255,5 +257,61 @@ const route = new Hono<{ Variables: { user: User } }>()
return c.json({ key: metadata.key, value: metadata.value })
},
)
.get('/teams/:teamId/api-tokens', async (c) => {
const user = c.get('user')
const teamId = c.req.param('teamId')
await authzService.hasPermission({
user,
permission: Permission.Read,
type: ResourceType.Team,
id: teamId,
})
const tokens = await apiTokenService.listTokens(user.id)
return c.json(
tokens.map((t) => ({
id: t.id,
token: t.token,
name: t.name,
createdAt: t.createdAt.toISOString(),
})),
)
})
.post('/teams/:teamId/api-tokens', zValidator('json', createApiTokenRequestSchema), async (c) => {
const user = c.get('user')
const teamId = c.req.param('teamId')
const req = c.req.valid('json')
await authzService.hasPermission({
user,
permission: Permission.Read,
type: ResourceType.Team,
id: teamId,
})
const token = await apiTokenService.createToken(user.id, req.name)
return c.json({
id: token.id,
token: token.token,
name: token.name,
createdAt: token.createdAt.toISOString(),
})
})
.delete('/teams/:teamId/api-tokens/:tokenId', async (c) => {
const user = c.get('user')
const teamId = c.req.param('teamId')
const tokenId = c.req.param('tokenId')
await authzService.hasPermission({
user,
permission: Permission.Read,
type: ResourceType.Team,
id: teamId,
})
await apiTokenService.deleteToken(user.id, tokenId)
return c.json({ success: true })
})
export default route
+8 -3
View File
@@ -15,8 +15,10 @@ import type { Prisma } from '@shumai/db'
type User = Prisma.UserGetPayload<Record<string, never>>
const route = new Hono<{ Variables: { user: User } }>()
.put('/upload/local', zValidator('query', localUploadQuerySchema), async (c) => {
export const localUploadRoute = new Hono().put(
'/upload/local',
zValidator('query', localUploadQuerySchema),
async (c) => {
const { bucket, key, Signature } = c.req.valid('query')
if (!verifyLocalUrlSignature(bucket, key, Signature)) {
@@ -46,7 +48,10 @@ const route = new Hono<{ Variables: { user: User } }>()
await s3Service.putObject(bucket, key, buffer, size, finalContentType)
return c.json({ success: true })
})
},
)
const route = new Hono<{ Variables: { user: User } }>()
.get('/teams/:teamId/upload/tasks', zValidator('query', paginationParamsSchema), async (c) => {
const teamId = c.req.param('teamId')
const user = c.get('user')
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/core",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"main": "./src/index.ts",
+1
View File
@@ -1628,6 +1628,7 @@ export class AssetService {
createdAt: a.createdAt.toISOString(),
updatedAt: a.updatedAt.toISOString(),
deletedAt: a.deletedAt ? a.deletedAt.toISOString() : null,
projectId: a.projectId,
creator,
fieldValues,
sortIndex: a.sortIndex,
@@ -204,4 +204,61 @@ describe('MetadataService', () => {
})
expect(val?.stringValue).toBe('some value')
})
it('should save and retrieve user and userMulti metadata fields', 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 asset = await prisma.asset.create({
data: {
name: 'test-asset',
project: { connect: { id: project.id } },
type: 'file',
status: 'uploaded',
sizeByte: 100,
},
})
const userField = await prisma.metadataField.create({
data: {
key: 'assigned_user',
scope: 'PROJECT',
project: { connect: { id: project.id } },
config: { name: 'Assigned User', type: 'user' },
},
})
const userMultiField = await prisma.metadataField.create({
data: {
key: 'reviewers',
scope: 'PROJECT',
project: { connect: { id: project.id } },
config: { name: 'Reviewers', type: 'userMulti' },
},
})
const singleUserId = 'user_ulid_123'
const multiUserIds = ['user_ulid_456', 'user_ulid_789']
const reqs = [
{ key: userField.key, value: singleUserId },
{ key: userMultiField.key, value: multiUserIds },
]
await metadataService.updateAssetMetadata(asset.id, reqs)
const values = await prisma.assetMetadataValue.findMany({
where: { assetId: asset.id },
})
expect(values).toHaveLength(2)
const singleVal = values.find((v) => v.fieldKey === userField.key)
expect(singleVal?.stringValue).toBe(singleUserId)
const multiVal = values.find((v) => v.fieldKey === userMultiField.key)
expect(multiVal?.jsonValue).toEqual(multiUserIds)
})
})
+1
View File
@@ -385,6 +385,7 @@ export class ProjectService {
const pi: ProjectInfo = {
id: p.id,
name: p.name,
teamId: p.teamId,
enableNotification: p.enableNotification ?? true,
coverImageKey: p.coverImageKey || undefined,
updatedAt: p.updatedAt,
+35
View File
@@ -191,4 +191,39 @@ describe('S3Service implementations', () => {
await expect(localS3.presign('b', 'k', 'POST')).rejects.toThrow()
})
})
describe('s3Service initialization', () => {
let originalEnv: NodeJS.ProcessEnv
beforeEach(() => {
originalEnv = { ...process.env }
})
afterEach(() => {
process.env = originalEnv
})
it('should initialize LocalStorageService with default localhost and SHUMAI_SERVER_PORT when AWS_ENDPOINT_URL_S3 is not set', async () => {
process.env.STORAGE_BACKEND = 'local'
delete process.env.AWS_ENDPOINT_URL_S3
process.env.SHUMAI_SERVER_PORT = '4567'
vi.resetModules()
const { s3Service } = await import('./s3')
const url = await s3Service.presign('bucket', 'key', 'GET')
expect(url).toContain('http://localhost:4567')
})
it('should initialize LocalStorageService with exact AWS_ENDPOINT_URL_S3 when it is set', async () => {
process.env.STORAGE_BACKEND = 'local'
process.env.AWS_ENDPOINT_URL_S3 = 'http://123.456.7.8:12345'
process.env.SHUMAI_SERVER_PORT = '4567'
vi.resetModules()
const { s3Service } = await import('./s3')
const url = await s3Service.presign('bucket', 'key', 'GET')
expect(url).toContain('http://123.456.7.8:12345')
expect(url).not.toContain('4567')
})
})
})
+2 -2
View File
@@ -452,7 +452,7 @@ export class LocalStorageService implements S3Service {
const storageBackend = process.env.STORAGE_BACKEND || 'local'
const port = process.env.SHUMAI_SERVER_PORT || '3000'
const s3Endpoint = process.env.AWS_ENDPOINT_URL_S3 || 'http://localhost'
const s3Endpoint = process.env.AWS_ENDPOINT_URL_S3 || `http://localhost:${port}`
export const s3Service: S3Service =
storageBackend === 's3'
@@ -464,4 +464,4 @@ export const s3Service: S3Service =
process.env.S3_USE_SSL === 'true',
process.env.S3_REGION || 'auto',
)
: new LocalStorageService(`${s3Endpoint}:${port}`)
: new LocalStorageService(s3Endpoint)
+31
View File
@@ -0,0 +1,31 @@
export class ShareLinkNotFoundError extends Error {
constructor(message: string) {
super(message)
this.name = 'ShareLinkNotFoundError'
Object.setPrototypeOf(this, ShareLinkNotFoundError.prototype)
}
}
export class ShareLinkDisabledError extends Error {
constructor(message: string) {
super(message)
this.name = 'ShareLinkDisabledError'
Object.setPrototypeOf(this, ShareLinkDisabledError.prototype)
}
}
export class ShareLinkExpiredError extends Error {
constructor(message: string) {
super(message)
this.name = 'ShareLinkExpiredError'
Object.setPrototypeOf(this, ShareLinkExpiredError.prototype)
}
}
export class ShareLinkPasswordInvalidError extends Error {
constructor(message: string) {
super(message)
this.name = 'ShareLinkPasswordInvalidError'
Object.setPrototypeOf(this, ShareLinkPasswordInvalidError.prototype)
}
}
+13 -6
View File
@@ -9,6 +9,12 @@ import {
} from '@shumai/dtos'
import { PaginatedData, paginateQuery } from '@shumai/core/src/pagination'
import { getAvatarUrl } from '@shumai/core/src/user/avatar'
import {
ShareLinkNotFoundError,
ShareLinkDisabledError,
ShareLinkExpiredError,
ShareLinkPasswordInvalidError,
} from './errors'
export class ShareService {
async createShareLink(
@@ -143,7 +149,7 @@ export class ShareService {
where: { id: shareLinkId },
include: { creator: true },
})
if (!shareLink) throw new Error('Share link not found')
if (!shareLink) throw new ShareLinkNotFoundError('Share link not found')
return await this.toShareLinkInfo(shareLink)
}
@@ -264,7 +270,7 @@ export class ShareService {
`
if (rows.length === 0) {
throw new Error('Asset is not shared')
throw new ShareLinkNotFoundError('Asset is not shared')
}
const shareRootId = rows[0].shareRootId
@@ -273,19 +279,19 @@ export class ShareService {
})
if (!shareLink) {
throw new Error('Share link not found for this asset')
throw new ShareLinkNotFoundError('Share link not found for this asset')
}
if (shareLink.isDisabled) {
throw new Error('Share link is disabled')
throw new ShareLinkDisabledError('Share link is disabled')
}
if (shareLink.expireAt && shareLink.expireAt < new Date()) {
throw new Error('Share link has expired')
throw new ShareLinkExpiredError('Share link has expired')
}
if (shareLink.password && shareLink.password !== providedPassword) {
throw new Error('Invalid password for share link')
throw new ShareLinkPasswordInvalidError('Invalid password for share link')
}
return shareLink
@@ -301,6 +307,7 @@ export class ShareService {
expireAt: l.expireAt?.toISOString(),
isDisabled: l.isDisabled,
hasPassword: !!l.password,
password: l.password,
defaultSortOrder: l.defaultSortOrder,
viewMode: l.viewMode,
fieldVisibility: l.fieldVisibility as Record<string, boolean> | undefined,
+10
View File
@@ -67,6 +67,8 @@ export class UploadService {
const isParentFile = parentAsset.type === AssetType.file
const targetParentId = isParentFile ? parentAsset.parentId! : parentAsset.id
const createdAssets: { tempId: string; assetId: string }[] = []
await this.prismaClient.$transaction(async (tx) => {
const ids = await this.createAssetsRecursively(
tx,
@@ -76,6 +78,7 @@ export class UploadService {
targetParentId,
req.files,
presignedUrls,
createdAssets,
)
if (isParentFile && ids.length > 0) {
@@ -97,6 +100,7 @@ export class UploadService {
return {
taskId: task.id,
presignedUrls: presignedUrls,
createdAssets: createdAssets,
}
}
@@ -108,6 +112,7 @@ export class UploadService {
parentId: string,
files: FileNode[],
presignedUrls: PresignedUrl[],
createdAssets: { tempId: string; assetId: string }[],
): Promise<string[]> {
const firstFile = await tx.asset.findFirst({
where: { parentId },
@@ -144,6 +149,10 @@ export class UploadService {
},
})
createdIds.push(newAsset.id)
createdAssets.push({
tempId: file.id,
assetId: newAsset.id,
})
if (assetType === AssetType.folder && parentId) {
await tx.asset.update({
@@ -161,6 +170,7 @@ export class UploadService {
newAsset.id,
file.children,
presignedUrls,
createdAssets,
)
} else if (assetType === AssetType.file && key) {
const url = await s3Service.presign(process.env.S3_BUCKET || 'shumai', key, 'PUT')
+39
View File
@@ -0,0 +1,39 @@
import { describe, expect, it } from 'vitest'
import { setupTestDbHooks } from '@shumai/db/test'
import { prisma } from '@shumai/db'
import { apiTokenService } from './api-token'
describe('ApiTokenService', () => {
setupTestDbHooks()
it('can create, list, validate, and delete api tokens', async () => {
const user = await prisma.user.create({
data: {
name: 'Test Dev',
email: 'dev@shumai.com',
password: 'password',
},
})
const token = await apiTokenService.createToken(user.id, 'My CLI Key')
expect(token.id).toBeDefined()
expect(token.token).toBeDefined()
expect(token.name).toBe('My CLI Key')
expect(token.userId).toBe(user.id)
const tokens = await apiTokenService.listTokens(user.id)
expect(tokens.length).toBe(1)
expect(tokens[0].id).toBe(token.id)
const validatedUser = await apiTokenService.validateToken(token.token)
expect(validatedUser).toBeDefined()
expect(validatedUser?.id).toBe(user.id)
await apiTokenService.deleteToken(user.id, token.id)
const tokensAfterDelete = await apiTokenService.listTokens(user.id)
expect(tokensAfterDelete.length).toBe(0)
const validatedAfterDelete = await apiTokenService.validateToken(token.token)
expect(validatedAfterDelete).toBeNull()
})
})
+38
View File
@@ -0,0 +1,38 @@
import { prisma } from '@shumai/db'
export class ApiTokenService {
async listTokens(userId: string) {
return prisma.apiToken.findMany({
where: { userId },
orderBy: { id: 'desc' },
})
}
async createToken(userId: string, name: string) {
return prisma.apiToken.create({
data: {
userId,
name,
},
})
}
async deleteToken(userId: string, tokenId: string) {
return prisma.apiToken.delete({
where: {
id: tokenId,
userId,
},
})
}
async validateToken(tokenString: string) {
const apiToken = await prisma.apiToken.findUnique({
where: { token: tokenString },
include: { user: true },
})
return apiToken ? apiToken.user : null
}
}
export const apiTokenService = new ApiTokenService()
@@ -58,7 +58,7 @@ export class VersionStackService {
throw new Error('parent not found')
}
const firstFile = files[0]
const firstFile = files.find((f) => f.id === fileIds[0])
const sortIndex = firstFile?.sortIndex || null
const stack = await tx.asset.create({
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/db",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"main": "./src/index.ts",
@@ -0,0 +1,17 @@
-- CreateTable
CREATE TABLE "api_tokens" (
"id" TEXT NOT NULL,
"token" TEXT NOT NULL,
"name" TEXT NOT NULL,
"user_id" TEXT NOT NULL,
"created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updated_at" TIMESTAMP(3) NOT NULL,
CONSTRAINT "api_tokens_pkey" PRIMARY KEY ("id")
);
-- CreateIndex
CREATE UNIQUE INDEX "api_tokens_token_key" ON "api_tokens"("token");
-- AddForeignKey
ALTER TABLE "api_tokens" ADD CONSTRAINT "api_tokens_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+13
View File
@@ -147,6 +147,7 @@ model User {
userMetadata UserMetadata[] @relation("UserToUserMetadata")
collections Collection[] @relation("UserToCollection")
shareLinks ShareLink[] @relation("UserToShareLink")
apiTokens ApiToken[] @relation("UserToApiToken")
@@map("users")
}
@@ -778,3 +779,15 @@ model Collection {
@@index([projectId, createdAt(sort: Desc)])
@@map("collections")
}
model ApiToken {
id String @id @default(ulid())
token String @unique @default(ulid())
name String
userId String @map("user_id")
user User @relation("UserToApiToken", fields: [userId], references: [id], onDelete: Cascade)
createdAt DateTime @default(now()) @map("created_at")
updatedAt DateTime @updatedAt @map("updated_at")
@@map("api_tokens")
}
@@ -176,3 +176,8 @@ export type Provider = Prisma.ProviderModel
*
*/
export type Collection = Prisma.CollectionModel
/**
* Model ApiToken
*
*/
export type ApiToken = Prisma.ApiTokenModel
@@ -204,3 +204,8 @@ export type Provider = Prisma.ProviderModel
*
*/
export type Collection = Prisma.CollectionModel
/**
* Model ApiToken
*
*/
export type ApiToken = Prisma.ApiTokenModel
File diff suppressed because one or more lines are too long
@@ -407,6 +407,7 @@ export const ModelName = {
Model: 'Model',
Provider: 'Provider',
Collection: 'Collection',
ApiToken: 'ApiToken',
} as const
export type ModelName = (typeof ModelName)[keyof typeof ModelName]
@@ -459,6 +460,7 @@ export type TypeMap<
| 'model'
| 'provider'
| 'collection'
| 'apiToken'
txIsolationLevel: TransactionIsolationLevel
}
model: {
@@ -2844,6 +2846,80 @@ export type TypeMap<
}
}
}
ApiToken: {
payload: Prisma.$ApiTokenPayload<ExtArgs>
fields: Prisma.ApiTokenFieldRefs
operations: {
findUnique: {
args: Prisma.ApiTokenFindUniqueArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload> | null
}
findUniqueOrThrow: {
args: Prisma.ApiTokenFindUniqueOrThrowArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload>
}
findFirst: {
args: Prisma.ApiTokenFindFirstArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload> | null
}
findFirstOrThrow: {
args: Prisma.ApiTokenFindFirstOrThrowArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload>
}
findMany: {
args: Prisma.ApiTokenFindManyArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload>[]
}
create: {
args: Prisma.ApiTokenCreateArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload>
}
createMany: {
args: Prisma.ApiTokenCreateManyArgs<ExtArgs>
result: BatchPayload
}
createManyAndReturn: {
args: Prisma.ApiTokenCreateManyAndReturnArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload>[]
}
delete: {
args: Prisma.ApiTokenDeleteArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload>
}
update: {
args: Prisma.ApiTokenUpdateArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload>
}
deleteMany: {
args: Prisma.ApiTokenDeleteManyArgs<ExtArgs>
result: BatchPayload
}
updateMany: {
args: Prisma.ApiTokenUpdateManyArgs<ExtArgs>
result: BatchPayload
}
updateManyAndReturn: {
args: Prisma.ApiTokenUpdateManyAndReturnArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload>[]
}
upsert: {
args: Prisma.ApiTokenUpsertArgs<ExtArgs>
result: runtime.Types.Utils.PayloadToResult<Prisma.$ApiTokenPayload>
}
aggregate: {
args: Prisma.ApiTokenAggregateArgs<ExtArgs>
result: runtime.Types.Utils.Optional<Prisma.AggregateApiToken>
}
groupBy: {
args: Prisma.ApiTokenGroupByArgs<ExtArgs>
result: runtime.Types.Utils.Optional<Prisma.ApiTokenGroupByOutputType>[]
}
count: {
args: Prisma.ApiTokenCountArgs<ExtArgs>
result: runtime.Types.Utils.Optional<Prisma.ApiTokenCountAggregateOutputType> | number
}
}
}
}
} & {
other: {
@@ -3333,6 +3409,18 @@ export const CollectionScalarFieldEnum = {
export type CollectionScalarFieldEnum =
(typeof CollectionScalarFieldEnum)[keyof typeof CollectionScalarFieldEnum]
export const ApiTokenScalarFieldEnum = {
id: 'id',
token: 'token',
name: 'name',
userId: 'userId',
createdAt: 'createdAt',
updatedAt: 'updatedAt',
} as const
export type ApiTokenScalarFieldEnum =
(typeof ApiTokenScalarFieldEnum)[keyof typeof ApiTokenScalarFieldEnum]
export const SortOrder = {
asc: 'asc',
desc: 'desc',
@@ -3813,6 +3901,7 @@ export type GlobalOmitConfig = {
model?: Prisma.ModelOmit
provider?: Prisma.ProviderOmit
collection?: Prisma.CollectionOmit
apiToken?: Prisma.ApiTokenOmit
}
/* Types for Logging */
@@ -80,6 +80,7 @@ export const ModelName = {
Model: 'Model',
Provider: 'Provider',
Collection: 'Collection',
ApiToken: 'ApiToken',
} as const
export type ModelName = (typeof ModelName)[keyof typeof ModelName]
@@ -548,6 +549,18 @@ export const CollectionScalarFieldEnum = {
export type CollectionScalarFieldEnum =
(typeof CollectionScalarFieldEnum)[keyof typeof CollectionScalarFieldEnum]
export const ApiTokenScalarFieldEnum = {
id: 'id',
token: 'token',
name: 'name',
userId: 'userId',
createdAt: 'createdAt',
updatedAt: 'updatedAt',
} as const
export type ApiTokenScalarFieldEnum =
(typeof ApiTokenScalarFieldEnum)[keyof typeof ApiTokenScalarFieldEnum]
export const SortOrder = {
asc: 'asc',
desc: 'desc',
@@ -39,4 +39,5 @@ export type * from './models/UserMetadata.ts'
export type * from './models/Model.ts'
export type * from './models/Provider.ts'
export type * from './models/Collection.ts'
export type * from './models/ApiToken.ts'
export type * from './commonInputTypes.ts'
File diff suppressed because it is too large Load Diff
@@ -239,6 +239,7 @@ export type UserWhereInput = {
userMetadata?: Prisma.UserMetadataListRelationFilter
collections?: Prisma.CollectionListRelationFilter
shareLinks?: Prisma.ShareLinkListRelationFilter
apiTokens?: Prisma.ApiTokenListRelationFilter
}
export type UserOrderByWithRelationInput = {
@@ -268,6 +269,7 @@ export type UserOrderByWithRelationInput = {
userMetadata?: Prisma.UserMetadataOrderByRelationAggregateInput
collections?: Prisma.CollectionOrderByRelationAggregateInput
shareLinks?: Prisma.ShareLinkOrderByRelationAggregateInput
apiTokens?: Prisma.ApiTokenOrderByRelationAggregateInput
}
export type UserWhereUniqueInput = Prisma.AtLeast<
@@ -301,6 +303,7 @@ export type UserWhereUniqueInput = Prisma.AtLeast<
userMetadata?: Prisma.UserMetadataListRelationFilter
collections?: Prisma.CollectionListRelationFilter
shareLinks?: Prisma.ShareLinkListRelationFilter
apiTokens?: Prisma.ApiTokenListRelationFilter
},
'id' | 'email'
>
@@ -366,6 +369,7 @@ export type UserCreateInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateInput = {
@@ -395,6 +399,7 @@ export type UserUncheckedCreateInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserUpdateInput = {
@@ -424,6 +429,7 @@ export type UserUpdateInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateInput = {
@@ -453,6 +459,7 @@ export type UserUncheckedUpdateInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateManyInput = {
@@ -973,6 +980,32 @@ export type UserUpdateOneWithoutCollectionsNestedInput = {
>
}
export type UserCreateNestedOneWithoutApiTokensInput = {
create?: Prisma.XOR<
Prisma.UserCreateWithoutApiTokensInput,
Prisma.UserUncheckedCreateWithoutApiTokensInput
>
connectOrCreate?: Prisma.UserCreateOrConnectWithoutApiTokensInput
connect?: Prisma.UserWhereUniqueInput
}
export type UserUpdateOneRequiredWithoutApiTokensNestedInput = {
create?: Prisma.XOR<
Prisma.UserCreateWithoutApiTokensInput,
Prisma.UserUncheckedCreateWithoutApiTokensInput
>
connectOrCreate?: Prisma.UserCreateOrConnectWithoutApiTokensInput
upsert?: Prisma.UserUpsertWithoutApiTokensInput
connect?: Prisma.UserWhereUniqueInput
update?: Prisma.XOR<
Prisma.XOR<
Prisma.UserUpdateToOneWithWhereWithoutApiTokensInput,
Prisma.UserUpdateWithoutApiTokensInput
>,
Prisma.UserUncheckedUpdateWithoutApiTokensInput
>
}
export type UserCreateWithoutSessionsInput = {
id?: string
type?: $Enums.UserType
@@ -999,6 +1032,7 @@ export type UserCreateWithoutSessionsInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutSessionsInput = {
@@ -1027,6 +1061,7 @@ export type UserUncheckedCreateWithoutSessionsInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutSessionsInput = {
@@ -1083,6 +1118,7 @@ export type UserUpdateWithoutSessionsInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutSessionsInput = {
@@ -1111,6 +1147,7 @@ export type UserUncheckedUpdateWithoutSessionsInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutAccountsInput = {
@@ -1139,6 +1176,7 @@ export type UserCreateWithoutAccountsInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutAccountsInput = {
@@ -1167,6 +1205,7 @@ export type UserUncheckedCreateWithoutAccountsInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutAccountsInput = {
@@ -1223,6 +1262,7 @@ export type UserUpdateWithoutAccountsInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutAccountsInput = {
@@ -1251,6 +1291,7 @@ export type UserUncheckedUpdateWithoutAccountsInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutAuthTokensInput = {
@@ -1279,6 +1320,7 @@ export type UserCreateWithoutAuthTokensInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutAuthTokensInput = {
@@ -1307,6 +1349,7 @@ export type UserUncheckedCreateWithoutAuthTokensInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutAuthTokensInput = {
@@ -1363,6 +1406,7 @@ export type UserUpdateWithoutAuthTokensInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutAuthTokensInput = {
@@ -1391,6 +1435,7 @@ export type UserUncheckedUpdateWithoutAuthTokensInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutTeamMembersInput = {
@@ -1419,6 +1464,7 @@ export type UserCreateWithoutTeamMembersInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutTeamMembersInput = {
@@ -1447,6 +1493,7 @@ export type UserUncheckedCreateWithoutTeamMembersInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutTeamMembersInput = {
@@ -1503,6 +1550,7 @@ export type UserUpdateWithoutTeamMembersInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutTeamMembersInput = {
@@ -1531,6 +1579,7 @@ export type UserUncheckedUpdateWithoutTeamMembersInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutShareLinksInput = {
@@ -1559,6 +1608,7 @@ export type UserCreateWithoutShareLinksInput = {
agentSessions?: Prisma.AgentSessionCreateNestedManyWithoutUserInput
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutShareLinksInput = {
@@ -1587,6 +1637,7 @@ export type UserUncheckedCreateWithoutShareLinksInput = {
agentSessions?: Prisma.AgentSessionUncheckedCreateNestedManyWithoutUserInput
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutShareLinksInput = {
@@ -1643,6 +1694,7 @@ export type UserUpdateWithoutShareLinksInput = {
agentSessions?: Prisma.AgentSessionUpdateManyWithoutUserNestedInput
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutShareLinksInput = {
@@ -1671,6 +1723,7 @@ export type UserUncheckedUpdateWithoutShareLinksInput = {
agentSessions?: Prisma.AgentSessionUncheckedUpdateManyWithoutUserNestedInput
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutAssetsInput = {
@@ -1699,6 +1752,7 @@ export type UserCreateWithoutAssetsInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutAssetsInput = {
@@ -1727,6 +1781,7 @@ export type UserUncheckedCreateWithoutAssetsInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutAssetsInput = {
@@ -1783,6 +1838,7 @@ export type UserUpdateWithoutAssetsInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutAssetsInput = {
@@ -1811,6 +1867,7 @@ export type UserUncheckedUpdateWithoutAssetsInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutCommentsInput = {
@@ -1839,6 +1896,7 @@ export type UserCreateWithoutCommentsInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutCommentsInput = {
@@ -1867,6 +1925,7 @@ export type UserUncheckedCreateWithoutCommentsInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutCommentsInput = {
@@ -1923,6 +1982,7 @@ export type UserUpdateWithoutCommentsInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutCommentsInput = {
@@ -1951,6 +2011,7 @@ export type UserUncheckedUpdateWithoutCommentsInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutCreatedInvitesInput = {
@@ -1979,6 +2040,7 @@ export type UserCreateWithoutCreatedInvitesInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutCreatedInvitesInput = {
@@ -2007,6 +2069,7 @@ export type UserUncheckedCreateWithoutCreatedInvitesInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutCreatedInvitesInput = {
@@ -2063,6 +2126,7 @@ export type UserUpdateWithoutCreatedInvitesInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutCreatedInvitesInput = {
@@ -2091,6 +2155,7 @@ export type UserUncheckedUpdateWithoutCreatedInvitesInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutCreatedNotificationsInput = {
@@ -2119,6 +2184,7 @@ export type UserCreateWithoutCreatedNotificationsInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutCreatedNotificationsInput = {
@@ -2147,6 +2213,7 @@ export type UserUncheckedCreateWithoutCreatedNotificationsInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutCreatedNotificationsInput = {
@@ -2183,6 +2250,7 @@ export type UserCreateWithoutNotificationsInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutNotificationsInput = {
@@ -2211,6 +2279,7 @@ export type UserUncheckedCreateWithoutNotificationsInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutNotificationsInput = {
@@ -2267,6 +2336,7 @@ export type UserUpdateWithoutCreatedNotificationsInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutCreatedNotificationsInput = {
@@ -2295,6 +2365,7 @@ export type UserUncheckedUpdateWithoutCreatedNotificationsInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserUpsertWithoutNotificationsInput = {
@@ -2343,6 +2414,7 @@ export type UserUpdateWithoutNotificationsInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutNotificationsInput = {
@@ -2371,6 +2443,7 @@ export type UserUncheckedUpdateWithoutNotificationsInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutTasksInput = {
@@ -2399,6 +2472,7 @@ export type UserCreateWithoutTasksInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutTasksInput = {
@@ -2427,6 +2501,7 @@ export type UserUncheckedCreateWithoutTasksInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutTasksInput = {
@@ -2480,6 +2555,7 @@ export type UserUpdateWithoutTasksInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutTasksInput = {
@@ -2508,6 +2584,7 @@ export type UserUncheckedUpdateWithoutTasksInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutAgentInput = {
@@ -2536,6 +2613,7 @@ export type UserCreateWithoutAgentInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutAgentInput = {
@@ -2564,6 +2642,7 @@ export type UserUncheckedCreateWithoutAgentInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutAgentInput = {
@@ -2617,6 +2696,7 @@ export type UserUpdateWithoutAgentInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutAgentInput = {
@@ -2645,6 +2725,7 @@ export type UserUncheckedUpdateWithoutAgentInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutAgentSessionsInput = {
@@ -2673,6 +2754,7 @@ export type UserCreateWithoutAgentSessionsInput = {
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutAgentSessionsInput = {
@@ -2701,6 +2783,7 @@ export type UserUncheckedCreateWithoutAgentSessionsInput = {
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutAgentSessionsInput = {
@@ -2757,6 +2840,7 @@ export type UserUpdateWithoutAgentSessionsInput = {
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutAgentSessionsInput = {
@@ -2785,6 +2869,7 @@ export type UserUncheckedUpdateWithoutAgentSessionsInput = {
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutUserMetadataInput = {
@@ -2813,6 +2898,7 @@ export type UserCreateWithoutUserMetadataInput = {
agentSessions?: Prisma.AgentSessionCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutUserMetadataInput = {
@@ -2841,6 +2927,7 @@ export type UserUncheckedCreateWithoutUserMetadataInput = {
agentSessions?: Prisma.AgentSessionUncheckedCreateNestedManyWithoutUserInput
collections?: Prisma.CollectionUncheckedCreateNestedManyWithoutCreatorInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutUserMetadataInput = {
@@ -2897,6 +2984,7 @@ export type UserUpdateWithoutUserMetadataInput = {
agentSessions?: Prisma.AgentSessionUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutUserMetadataInput = {
@@ -2925,6 +3013,7 @@ export type UserUncheckedUpdateWithoutUserMetadataInput = {
agentSessions?: Prisma.AgentSessionUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutCollectionsInput = {
@@ -2953,6 +3042,7 @@ export type UserCreateWithoutCollectionsInput = {
agentSessions?: Prisma.AgentSessionCreateNestedManyWithoutUserInput
userMetadata?: Prisma.UserMetadataCreateNestedManyWithoutUserInput
shareLinks?: Prisma.ShareLinkCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenCreateNestedManyWithoutUserInput
}
export type UserUncheckedCreateWithoutCollectionsInput = {
@@ -2981,6 +3071,7 @@ export type UserUncheckedCreateWithoutCollectionsInput = {
agentSessions?: Prisma.AgentSessionUncheckedCreateNestedManyWithoutUserInput
userMetadata?: Prisma.UserMetadataUncheckedCreateNestedManyWithoutUserInput
shareLinks?: Prisma.ShareLinkUncheckedCreateNestedManyWithoutCreatorInput
apiTokens?: Prisma.ApiTokenUncheckedCreateNestedManyWithoutUserInput
}
export type UserCreateOrConnectWithoutCollectionsInput = {
@@ -3037,6 +3128,7 @@ export type UserUpdateWithoutCollectionsInput = {
agentSessions?: Prisma.AgentSessionUpdateManyWithoutUserNestedInput
userMetadata?: Prisma.UserMetadataUpdateManyWithoutUserNestedInput
shareLinks?: Prisma.ShareLinkUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUpdateManyWithoutUserNestedInput
}
export type UserUncheckedUpdateWithoutCollectionsInput = {
@@ -3065,6 +3157,151 @@ export type UserUncheckedUpdateWithoutCollectionsInput = {
agentSessions?: Prisma.AgentSessionUncheckedUpdateManyWithoutUserNestedInput
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
apiTokens?: Prisma.ApiTokenUncheckedUpdateManyWithoutUserNestedInput
}
export type UserCreateWithoutApiTokensInput = {
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
}
export type UserUncheckedCreateWithoutApiTokensInput = {
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
}
export type UserCreateOrConnectWithoutApiTokensInput = {
where: Prisma.UserWhereUniqueInput
create: Prisma.XOR<
Prisma.UserCreateWithoutApiTokensInput,
Prisma.UserUncheckedCreateWithoutApiTokensInput
>
}
export type UserUpsertWithoutApiTokensInput = {
update: Prisma.XOR<
Prisma.UserUpdateWithoutApiTokensInput,
Prisma.UserUncheckedUpdateWithoutApiTokensInput
>
create: Prisma.XOR<
Prisma.UserCreateWithoutApiTokensInput,
Prisma.UserUncheckedCreateWithoutApiTokensInput
>
where?: Prisma.UserWhereInput
}
export type UserUpdateToOneWithWhereWithoutApiTokensInput = {
where?: Prisma.UserWhereInput
data: Prisma.XOR<
Prisma.UserUpdateWithoutApiTokensInput,
Prisma.UserUncheckedUpdateWithoutApiTokensInput
>
}
export type UserUpdateWithoutApiTokensInput = {
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
}
export type UserUncheckedUpdateWithoutApiTokensInput = {
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
sessions?: Prisma.SessionUncheckedUpdateManyWithoutUserNestedInput
accounts?: Prisma.AccountUncheckedUpdateManyWithoutUserNestedInput
agent?: Prisma.AgentUncheckedUpdateOneWithoutUserNestedInput
agentSessions?: Prisma.AgentSessionUncheckedUpdateManyWithoutUserNestedInput
userMetadata?: Prisma.UserMetadataUncheckedUpdateManyWithoutUserNestedInput
collections?: Prisma.CollectionUncheckedUpdateManyWithoutCreatorNestedInput
shareLinks?: Prisma.ShareLinkUncheckedUpdateManyWithoutCreatorNestedInput
}
/**
@@ -3086,6 +3323,7 @@ export type UserCountOutputType = {
userMetadata: number
collections: number
shareLinks: number
apiTokens: number
}
export type UserCountOutputTypeSelect<
@@ -3105,6 +3343,7 @@ export type UserCountOutputTypeSelect<
userMetadata?: boolean | UserCountOutputTypeCountUserMetadataArgs
collections?: boolean | UserCountOutputTypeCountCollectionsArgs
shareLinks?: boolean | UserCountOutputTypeCountShareLinksArgs
apiTokens?: boolean | UserCountOutputTypeCountApiTokensArgs
}
/**
@@ -3245,6 +3484,15 @@ export type UserCountOutputTypeCountShareLinksArgs<
where?: Prisma.ShareLinkWhereInput
}
/**
* UserCountOutputType without action
*/
export type UserCountOutputTypeCountApiTokensArgs<
ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs,
> = {
where?: Prisma.ApiTokenWhereInput
}
export type UserSelect<
ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs,
> = runtime.Types.Extensions.GetSelect<
@@ -3275,6 +3523,7 @@ export type UserSelect<
userMetadata?: boolean | Prisma.User$userMetadataArgs<ExtArgs>
collections?: boolean | Prisma.User$collectionsArgs<ExtArgs>
shareLinks?: boolean | Prisma.User$shareLinksArgs<ExtArgs>
apiTokens?: boolean | Prisma.User$apiTokensArgs<ExtArgs>
_count?: boolean | Prisma.UserCountOutputTypeDefaultArgs<ExtArgs>
},
ExtArgs['result']['user']
@@ -3366,6 +3615,7 @@ export type UserInclude<
userMetadata?: boolean | Prisma.User$userMetadataArgs<ExtArgs>
collections?: boolean | Prisma.User$collectionsArgs<ExtArgs>
shareLinks?: boolean | Prisma.User$shareLinksArgs<ExtArgs>
apiTokens?: boolean | Prisma.User$apiTokensArgs<ExtArgs>
_count?: boolean | Prisma.UserCountOutputTypeDefaultArgs<ExtArgs>
}
export type UserIncludeCreateManyAndReturn<
@@ -3395,6 +3645,7 @@ export type $UserPayload<
userMetadata: Prisma.$UserMetadataPayload<ExtArgs>[]
collections: Prisma.$CollectionPayload<ExtArgs>[]
shareLinks: Prisma.$ShareLinkPayload<ExtArgs>[]
apiTokens: Prisma.$ApiTokenPayload<ExtArgs>[]
}
scalars: runtime.Types.Extensions.GetPayloadResult<
{
@@ -4084,6 +4335,17 @@ export interface Prisma__UserClient<
>
| Null
>
apiTokens<T extends Prisma.User$apiTokensArgs<ExtArgs> = {}>(
args?: Prisma.Subset<T, Prisma.User$apiTokensArgs<ExtArgs>>,
): Prisma.PrismaPromise<
| runtime.Types.Result.GetResult<
Prisma.$ApiTokenPayload<ExtArgs>,
T,
'findMany',
GlobalOmitOptions
>
| Null
>
/**
* Attaches callbacks for the resolution and/or rejection of the Promise.
* @param onfulfilled The callback to execute when the Promise is resolved.
@@ -4940,6 +5202,32 @@ export type User$shareLinksArgs<
distinct?: Prisma.ShareLinkScalarFieldEnum | Prisma.ShareLinkScalarFieldEnum[]
}
/**
* User.apiTokens
*/
export type User$apiTokensArgs<
ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs,
> = {
/**
* Select specific fields to fetch from the ApiToken
*/
select?: Prisma.ApiTokenSelect<ExtArgs> | null
/**
* Omit specific fields from the ApiToken
*/
omit?: Prisma.ApiTokenOmit<ExtArgs> | null
/**
* Choose, which related nodes to fetch as well
*/
include?: Prisma.ApiTokenInclude<ExtArgs> | null
where?: Prisma.ApiTokenWhereInput
orderBy?: Prisma.ApiTokenOrderByWithRelationInput | Prisma.ApiTokenOrderByWithRelationInput[]
cursor?: Prisma.ApiTokenWhereUniqueInput
take?: number
skip?: number
distinct?: Prisma.ApiTokenScalarFieldEnum | Prisma.ApiTokenScalarFieldEnum[]
}
/**
* User without action
*/
+8 -1
View File
@@ -27,7 +27,7 @@ declare global {
export interface AgentConfig {
provider: string
model: string
thinkingLevel?: string
thinkingLevel?: 'off' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh'
systemPrompt?: string
appendSystemPrompt?: string[]
}
@@ -173,6 +173,8 @@ declare global {
| 'number'
| 'toggle'
| 'date'
| 'user'
| 'userMulti'
export interface SelectOption {
id: string
@@ -208,6 +210,9 @@ declare global {
timeFormat: string // 'twelve_hour' | 'twenty_four_hour'
}
export type UserConfig = Record<string, never>
export type UserMultiConfig = Record<string, never>
export interface FieldConfig {
name: string
type: FieldType
@@ -219,6 +224,8 @@ declare global {
number?: NumberConfig
toggle?: ToggleConfig
date?: DateConfig
user?: UserConfig
userMulti?: UserMultiConfig
}
// ----------------------------------------------------------------------
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/dtos",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"main": "./src/index.ts",
+5 -2
View File
@@ -3,6 +3,9 @@ import { z } from 'zod'
export const agentTypeSchema = z.enum(['chat', 'autofill', 'embedding'])
export type AgentType = z.infer<typeof agentTypeSchema>
export const thinkingLevelSchema = z.enum(['off', 'minimal', 'low', 'medium', 'high', 'xhigh'])
export type ThinkingLevel = z.infer<typeof thinkingLevelSchema>
export const agentSkillSchema = z.object({
id: z.string().optional(),
skillId: z.string(),
@@ -23,7 +26,7 @@ export const agentInfoSchema = z.object({
avatar: z.string().optional(),
providerId: z.string().optional(),
modelId: z.string().optional(),
thinkingLevel: z.string().optional().default(''),
thinkingLevel: thinkingLevelSchema.optional().default('off'),
systemPrompt: z.string().optional(),
soul: z.string().optional(),
skills: z.array(agentSkillSchema).optional(),
@@ -37,7 +40,7 @@ const baseAgentRequest = z.object({
avatar: z.string().optional(),
providerId: z.string().optional(),
modelId: z.string().optional(),
thinkingLevel: z.string().optional().default(''),
thinkingLevel: thinkingLevelSchema.optional().default('off'),
systemPrompt: z.string().optional(),
soul: z.string().optional(),
skills: z.array(z.string()).optional(),
+1
View File
@@ -64,6 +64,7 @@ export const assetInfoSchema = z.object({
createdAt: z.string(),
updatedAt: z.string(),
deletedAt: z.string().nullable().optional(),
projectId: z.string().optional().nullable(),
creator: assetUserInfoSchema.nullable().optional(),
fieldValues: z.array(fieldValueInfoSchema).optional(),
sortIndex: z.string().optional().nullable(),
+13
View File
@@ -5,3 +5,16 @@ export const signupInfoResponseSchema = z.object({
})
export type SignupInfoResponse = z.infer<typeof signupInfoResponseSchema>
export const createApiTokenRequestSchema = z.object({
name: z.string().min(1, 'Name is required').max(100, 'Name is too long'),
})
export type CreateApiTokenRequest = z.infer<typeof createApiTokenRequestSchema>
export const apiTokenResponseSchema = z.object({
id: z.string(),
token: z.string(),
name: z.string(),
createdAt: z.string(),
})
export type ApiTokenResponse = z.infer<typeof apiTokenResponseSchema>
+16 -1
View File
@@ -9,6 +9,8 @@ export const FieldType = {
number: 'number',
toggle: 'toggle',
date: 'date',
user: 'user',
userMulti: 'userMulti',
} as const
export type FieldType = (typeof FieldType)[keyof typeof FieldType]
@@ -22,7 +24,18 @@ export type SelectOption = z.infer<typeof selectOptionSchema>
export const fieldConfigSchema = z.object({
name: z.string(),
type: z.enum(['text', 'longText', 'select', 'selectMulti', 'rating', 'number', 'toggle', 'date']),
type: z.enum([
'text',
'longText',
'select',
'selectMulti',
'rating',
'number',
'toggle',
'date',
'user',
'userMulti',
]),
text: z.any().optional(),
longText: z.any().optional(),
select: z.any().optional(),
@@ -31,6 +44,8 @@ export const fieldConfigSchema = z.object({
number: z.any().optional(),
toggle: z.any().optional(),
date: z.any().optional(),
user: z.any().optional(),
userMulti: z.any().optional(),
})
export const createFieldRequestSchema = z.object({
+1
View File
@@ -18,6 +18,7 @@ export type UpdateProjectRequest = z.infer<typeof updateProjectRequestSchema>
export const projectInfoSchema = z.object({
id: z.string(),
name: z.string(),
teamId: z.string(),
rootFolder: z.string().optional(),
coverImage: z.string().optional(),
coverImageKey: z.string().optional(),
+1
View File
@@ -7,6 +7,7 @@ export interface ShareLinkInfo {
expireAt?: string
isDisabled: boolean
hasPassword: boolean
password?: string | null
defaultSortOrder?: string
viewMode?: string
fieldVisibility?: Record<string, boolean>
+8
View File
@@ -36,6 +36,14 @@ export type PresignedUrl = z.infer<typeof presignedUrlSchema>
export const createUploadTaskResponseSchema = z.object({
taskId: z.string(),
presignedUrls: z.array(presignedUrlSchema),
createdAssets: z
.array(
z.object({
tempId: z.string(),
assetId: z.string(),
}),
)
.optional(),
})
export type CreateUploadTaskResponse = z.infer<typeof createUploadTaskResponseSchema>
+9
View File
@@ -0,0 +1,9 @@
{
"name": "@shumai/tableprinter",
"version": "0.1.2",
"private": true,
"type": "module",
"main": "./src/index.ts",
"types": "./src/index.ts",
"dependencies": {}
}
+106
View File
@@ -0,0 +1,106 @@
import { describe, expect, it } from 'vitest'
import { newTablePrinter, withTruncate, withColor } from './index'
class StringWriter {
content = ''
write(s: string) {
this.content += s
}
}
describe('tableprinter', () => {
it('tsv mode', () => {
const writer = new StringWriter()
const tp = newTablePrinter(writer, false, 80)
tp.addHeader(['ID', 'Name', 'Size'])
tp.addField('1')
tp.addField('apple')
tp.addField('10')
tp.endRow()
tp.addField('2')
tp.addField('banana')
tp.addField('20')
tp.endRow()
tp.render()
expect(writer.content).toBe('1\tapple\t10\n2\tbanana\t20\n')
})
it('tty mode - no truncation', () => {
const writer = new StringWriter()
const tp = newTablePrinter(writer, true, 80)
tp.addHeader(['ID', 'Name', 'Size'])
tp.addField('1')
tp.addField('apple')
tp.addField('10')
tp.endRow()
tp.addField('2')
tp.addField('banana')
tp.addField('20')
tp.endRow()
tp.render()
const lines = writer.content.split('\n')
expect(lines[0]).toBe('ID Name Size')
expect(lines[1]).toBe('1 apple 10')
expect(lines[2]).toBe('2 banana 20')
})
it('tty mode - dynamic truncation to fit viewport', () => {
const writer = new StringWriter()
// Very narrow viewport
const tp = newTablePrinter(writer, true, 20)
tp.addHeader(['ID', 'LongName'])
tp.addField('01KV')
tp.addField('YTDown_YouTube_Ed-Sheeran-Pokemon-Celestial')
tp.endRow()
tp.render()
const lines = writer.content.split('\n').filter(Boolean)
// Avail width for columns: 20 - 2 (delimiter size) = 18.
// ID column is 4 chars, leaving 14 chars for LongName.
// LongName has truncate by default.
expect(lines[0]).toBe('ID LongName')
expect(lines[1]).toBe('01KV YTDown_YouT...')
})
it('tty mode - disabled truncation option', () => {
const writer = new StringWriter()
// Narrow viewport
const tp = newTablePrinter(writer, true, 25)
// Disable truncation on the first column, keep default on the second
tp.addHeader(['ID', 'LongName'], withTruncate(null))
tp.addField('01KVFW2HD6CK9D9H77A341HQP1', withTruncate(null))
tp.addField('YTDown_YouTube_Ed-Sheeran-Pokemon')
tp.endRow()
tp.render()
const lines = writer.content.split('\n').filter(Boolean)
// First column is 26 characters and must not be truncated since truncation is disabled.
expect(lines[1].startsWith('01KVFW2HD6CK9D9H77A341HQP1')).toBe(true)
})
it('tty mode - color preservation and display width measurement', () => {
const writer = new StringWriter()
const tp = newTablePrinter(writer, true, 80)
// Red colored title
const coloredName = '\u001b[31mapple\u001b[0m'
tp.addHeader(['ID', 'Name'])
tp.addField('1')
tp.addField(
coloredName,
withColor((s) => `\u001b[31m${s}\u001b[0m`),
)
tp.endRow()
tp.render()
const lines = writer.content.split('\n')
// Display width of coloredName should be 5 despite escape sequences.
expect(lines[0]).toBe('ID Name')
})
})
+239
View File
@@ -0,0 +1,239 @@
import { displayWidth, padRight, truncate } from './text'
export interface TableField {
text: string
truncateFunc?: (width: number, val: string) => string
paddingFunc?: (width: number, val: string) => string
colorFunc?: (val: string) => string
}
export type FieldOption = (field: TableField) => void
export interface TablePrinter {
addHeader(columns: string[], ...opts: FieldOption[]): void
addField(s: string, ...opts: FieldOption[]): void
endRow(): void
render(): void
}
export function withTruncate(fn: ((width: number, val: string) => string) | null): FieldOption {
return (f: TableField) => {
f.truncateFunc = fn ?? undefined
}
}
export function withPadding(fn: ((width: number, val: string) => string) | null): FieldOption {
return (f: TableField) => {
f.paddingFunc = fn ?? undefined
}
}
export function withColor(fn: (val: string) => string): FieldOption {
return (f: TableField) => {
f.colorFunc = fn
}
}
export interface Writer {
write(s: string): void
}
export function newTablePrinter(w: Writer, isTty: boolean, maxWidth: number): TablePrinter {
if (isTty) {
return new TtyTablePrinter(w, maxWidth)
}
return new TsvTablePrinter(w)
}
class TtyTablePrinter implements TablePrinter {
private hasHeaders = false
private rows: TableField[][] = []
constructor(
private out: Writer,
private maxWidth: number,
) {}
addHeader(columns: string[], ...opts: FieldOption[]): void {
if (this.hasHeaders) return
this.hasHeaders = true
for (const column of columns) {
this.addField(column, ...opts)
}
this.endRow()
}
addField(s: string, ...opts: FieldOption[]): void {
if (this.rows.length === 0) {
this.rows.push([])
}
const rowI = this.rows.length - 1
const field: TableField = {
text: s,
truncateFunc: truncate,
}
for (const opt of opts) {
opt(field)
}
this.rows[rowI].push(field)
}
endRow(): void {
this.rows.push([])
}
render(): void {
// Filter out trailing empty rows if any
const activeRows = this.rows.filter((row) => row.length > 0)
if (activeRows.length === 0) return
const delim = ' '
const numCols = activeRows[0].length
const colWidths = this.calculateColumnWidths(activeRows, delim.length)
for (const row of activeRows) {
for (let col = 0; col < row.length; col++) {
if (col >= numCols) break
const field = row[col]
if (col > 0) {
this.out.write(delim)
}
let truncVal = field.text
if (field.truncateFunc) {
truncVal = field.truncateFunc(colWidths[col], field.text)
}
if (field.paddingFunc) {
truncVal = field.paddingFunc(colWidths[col], truncVal)
} else if (col < numCols - 1) {
truncVal = padRight(colWidths[col], truncVal)
}
if (field.colorFunc) {
truncVal = field.colorFunc(truncVal)
}
this.out.write(truncVal)
}
if (row.length > 0) {
this.out.write('\n')
}
}
}
private calculateColumnWidths(activeRows: TableField[][], delimSize: number): number[] {
const numCols = activeRows[0].length
const maxColWidths = new Array(numCols).fill(0)
const colWidths = new Array(numCols).fill(0)
for (const row of activeRows) {
for (let col = 0; col < row.length; col++) {
if (col >= numCols) break
const field = row[col]
const w = displayWidth(field.text)
if (w > maxColWidths[col]) {
maxColWidths[col] = w
}
// if this field has disabled truncating, ensure that the column is wide enough
if (field.truncateFunc === undefined && w > colWidths[col]) {
colWidths[col] = w
}
}
}
const getAvailWidth = (): number => {
let setWidths = 0
for (let col = 0; col < numCols; col++) {
setWidths += colWidths[col]
}
return this.maxWidth - delimSize * (numCols - 1) - setWidths
}
const getNumFixedCols = (): number => {
let fixedCols = 0
for (let col = 0; col < numCols; col++) {
if (colWidths[col] > 0) {
fixedCols++
}
}
return fixedCols
}
// set the widths of short columns
let w = getAvailWidth()
if (w > 0) {
const numFlexColumns = numCols - getNumFixedCols()
if (numFlexColumns > 0) {
const perColumn = Math.floor(w / numFlexColumns)
for (let col = 0; col < numCols; col++) {
if (colWidths[col] === 0) {
const max = maxColWidths[col]
if (max < perColumn) {
colWidths[col] = max
}
}
}
}
}
// truncate long columns to the remaining available width
w = getAvailWidth()
const numFlexColsCount = numCols - getNumFixedCols()
if (numFlexColsCount > 0) {
const perColumn = Math.floor(w / numFlexColsCount)
for (let col = 0; col < numCols; col++) {
if (colWidths[col] === 0) {
const max = maxColWidths[col]
if (max < perColumn) {
colWidths[col] = max
} else if (perColumn > 0) {
colWidths[col] = perColumn
}
}
}
}
// add the remainder to truncated columns
w = getAvailWidth()
if (w > 0) {
for (let col = 0; col < numCols; col++) {
const d = maxColWidths[col] - colWidths[col]
let toAdd = w
if (d < toAdd) {
toAdd = d
}
colWidths[col] += toAdd
w -= toAdd
if (w <= 0) {
break
}
}
}
return colWidths
}
}
class TsvTablePrinter implements TablePrinter {
private currentCol = 0
constructor(private out: Writer) {}
addHeader(): void {}
addField(s: string): void {
if (this.currentCol > 0) {
this.out.write('\t')
}
this.out.write(s)
this.currentCol++
}
endRow(): void {
this.out.write('\n')
this.currentCol = 0
}
render(): void {}
}
+85
View File
@@ -0,0 +1,85 @@
/* eslint-disable no-control-regex */
export function stripAnsi(str: string): string {
return str.replace(
/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
'',
)
}
export function displayWidth(str: string): number {
const stripped = stripAnsi(str)
let width = 0
for (let i = 0; i < stripped.length; i++) {
const code = stripped.charCodeAt(i)
// Basic detection for CJK Unified Ideographs, Hangul, Hiragana, Katakana, Fullwidth
if (
(code >= 0x3000 && code <= 0x9fff) || // CJK symbols, Hiragana, Katakana, Unified Ideographs
(code >= 0xff00 && code <= 0xffef) || // Fullwidth forms
(code >= 0x1100 && code <= 0x11ff) || // Hangul Jamo
(code >= 0xac00 && code <= 0xd7af) // Hangul Syllables
) {
width += 2
} else {
width += 1
}
}
return width
}
export function truncate(width: number, s: string): string {
const stripped = stripAnsi(s)
const visualWidth = displayWidth(stripped)
if (visualWidth <= width) {
return s
}
// If width is too small, return part of ellipses
if (width <= 3) {
return '.'.repeat(width)
}
const targetWidth = width - 3 // save space for "..."
let currentWidth = 0
let cutIndex = 0
for (let i = 0; i < s.length; i++) {
// If we hit an ANSI escape sequence, skip it in width calculation but keep it in output
if (s[i] === '\u001b') {
// Find end of ANSI sequence
const match = s
.slice(i)
.match(/^[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/)
if (match) {
i += match[0].length - 1
continue
}
}
const code = s.charCodeAt(i)
const charWidth =
(code >= 0x3000 && code <= 0x9fff) ||
(code >= 0xff00 && code <= 0xffef) ||
(code >= 0x1100 && code <= 0x11ff) ||
(code >= 0xac00 && code <= 0xd7af)
? 2
: 1
if (currentWidth + charWidth > targetWidth) {
cutIndex = i
break
}
currentWidth += charWidth
}
const sliced = s.slice(0, cutIndex)
const resetCode = s.includes('\u001b') ? '\u001b[0m' : ''
return sliced + '...' + resetCode
}
export function padRight(width: number, s: string): string {
const currentWidth = displayWidth(s)
if (currentWidth >= width) {
return s
}
return s + ' '.repeat(width - currentWidth)
}
+4
View File
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"]
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/transcode",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"main": "./src/index.ts",
@@ -8,6 +8,8 @@ import SelectField from './fields/select-field'
import SelectMultiField from './fields/select-multi-field'
import TextField from './fields/text-field'
import ToggleField from './fields/toggle-field'
import UserField from './fields/user-field'
import UserMultiField from './fields/user-multi-field'
interface FieldRendererProps {
config: FieldInfo['config']
@@ -85,6 +87,22 @@ const FieldRenderer: React.FC<FieldRendererProps> = (props) => {
onSave={props.onSave as (value: string) => void}
/>
)
case 'user':
return (
<UserField
{...props}
value={props.value as string}
onSave={props.onSave as (value: string) => void}
/>
)
case 'userMulti':
return (
<UserMultiField
{...props}
value={props.value as string[]}
onSave={props.onSave as (value: string[]) => void}
/>
)
default:
return <div>Unknown Field Type</div>
}
@@ -86,6 +86,8 @@ import {
ToggleLeft,
Type,
X,
User,
Users,
} from 'lucide-react'
import { useMemo, useState, useEffect } from 'react'
@@ -98,6 +100,8 @@ export const FIELD_TYPE_ICONS: Record<FieldType, React.ComponentType<{ className
[FieldType.number]: Hash,
[FieldType.toggle]: ToggleLeft,
[FieldType.date]: Calendar,
[FieldType.user]: User,
[FieldType.userMulti]: Users,
}
type SortableFieldItemProps = {
@@ -0,0 +1,111 @@
import type { UserInfo } from '@shumai/dtos'
import { ChevronDown, X } from 'lucide-react'
import React, { useEffect, useState } from 'react'
import type { FieldProps } from './field-types'
import { Popover, PopoverContent, PopoverTrigger } from '@/ui/components/ui/popover'
import { useMemberStore } from '@/ui/stores/members'
import { useTeamId } from '@/ui/hooks/use-team-id'
import { Avatar, AvatarFallback, AvatarImage } from '@/ui/components/ui/avatar'
const UserField: React.FC<FieldProps<string>> = ({ value, onSave, readOnly }) => {
const teamId = useTeamId()
const { members, fetchMembers } = useMemberStore()
const [isEditing, setIsEditing] = useState(false)
useEffect(() => {
if (teamId) {
fetchMembers(teamId)
}
}, [teamId, fetchMembers])
const selectedUser = members.find((m) => m.id === value)
const handleStartEdit = () => {
if (!readOnly) {
setIsEditing(true)
}
}
const handleSelect = (userId: string) => {
onSave(userId)
setIsEditing(false)
}
const handleOpenChange = (open: boolean) => {
if (readOnly) return
setIsEditing(open)
}
const getInitials = (name: string) => {
return name
.split(' ')
.map((n) => n[0])
.slice(0, 2)
.join('')
.toUpperCase()
}
const renderUserBadge = (user: UserInfo | undefined) => {
if (!user) return <span className="text-muted-foreground italic text-sm">Select user</span>
return (
<span className="inline-flex items-center gap-1.5 px-2 py-0.5 rounded-full text-xs font-medium bg-muted text-foreground border h-[22px]">
<Avatar className="w-4 h-4">
<AvatarImage src={user.image} alt={user.name} className="object-cover" />
<AvatarFallback className="text-[8px] bg-rose-400 text-black font-semibold">
{getInitials(user.name)}
</AvatarFallback>
</Avatar>
<span className="truncate max-w-[120px]">{user.name}</span>
</span>
)
}
return (
<div className="relative w-full" onClick={(e) => e.stopPropagation()}>
<Popover open={!readOnly && isEditing} onOpenChange={handleOpenChange}>
<PopoverTrigger asChild>
<div
onClick={handleStartEdit}
className={`flex items-center justify-between w-full h-[28px] px-2 rounded border border-transparent transition-colors ${
!readOnly ? 'cursor-pointer hover:bg-accent hover:border-border group' : ''
}`}
>
{renderUserBadge(selectedUser)}
{!readOnly && (
<ChevronDown className="w-4 h-4 text-muted-foreground opacity-0 group-hover:opacity-100" />
)}
</div>
</PopoverTrigger>
<PopoverContent
className="p-1 w-[--radix-popover-trigger-width] min-w-[200px] max-h-60 overflow-auto bg-popover border border-border rounded-lg shadow-lg"
align="start"
>
<div
onClick={() => handleSelect('')}
className="px-3 py-2 text-sm text-muted-foreground hover:bg-accent cursor-pointer flex items-center gap-2 rounded-sm"
>
<X className="w-3 h-3" /> Clear
</div>
{members.map((user) => (
<div
key={user.id}
onClick={() => handleSelect(user.id)}
className="px-3 py-2 hover:bg-accent cursor-pointer flex items-center gap-2 rounded-sm"
>
<Avatar className="w-5 h-5">
<AvatarImage src={user.image} alt={user.name} className="object-cover" />
<AvatarFallback className="text-[10px] bg-rose-400 text-black font-semibold">
{getInitials(user.name)}
</AvatarFallback>
</Avatar>
<span className="text-sm font-medium text-foreground">{user.name}</span>
</div>
))}
</PopoverContent>
</Popover>
</div>
)
}
export default UserField
@@ -0,0 +1,209 @@
import type { UserInfo } from '@shumai/dtos'
import { Check } from 'lucide-react'
import React, { useEffect, useLayoutEffect, useRef, useState } from 'react'
import type { FieldProps } from './field-types'
import { Popover, PopoverContent, PopoverTrigger } from '@/ui/components/ui/popover'
import { useMemberStore } from '@/ui/stores/members'
import { useTeamId } from '@/ui/hooks/use-team-id'
import { Avatar, AvatarFallback, AvatarImage } from '@/ui/components/ui/avatar'
const UserMultiField: React.FC<FieldProps<string[]>> = ({ value = [], onSave, readOnly }) => {
const teamId = useTeamId()
const { members, fetchMembers } = useMemberStore()
const containerRef = useRef<HTMLDivElement>(null)
const [isEditing, setIsEditing] = useState(false)
const [expanded, setExpanded] = useState(false)
const [visibleCount, setVisibleCount] = useState(value.length)
useEffect(() => {
if (teamId) {
fetchMembers(teamId)
}
}, [teamId, fetchMembers])
const selectedUsers = members.filter((m) => (value || []).includes(m.id))
const getInitials = (name: string) => {
return name
.split(' ')
.map((n) => n[0])
.slice(0, 2)
.join('')
.toUpperCase()
}
// Dynamic calculation for how many items fit in one line
useLayoutEffect(() => {
if (isEditing || expanded) {
setVisibleCount(selectedUsers.length)
return
}
if (containerRef.current) {
const containerWidth = containerRef.current.offsetWidth
const canvas = document.createElement('canvas')
const context = canvas.getContext('2d')
if (context) {
context.font = '12px ui-sans-serif, system-ui, sans-serif'
let currentWidth = 0
let count = 0
const moreBadgeWidth = 28
const maxAvailableWidth = containerWidth - moreBadgeWidth
for (let i = 0; i < selectedUsers.length; i++) {
const textWidth = context.measureText(selectedUsers[i].name).width
// 16px padding + 16px avatar + 6px gap + 4px extra gap
const badgeWidth = textWidth + 42
if (currentWidth + badgeWidth > maxAvailableWidth && i < selectedUsers.length - 1) {
break
}
if (i === selectedUsers.length - 1) {
if (currentWidth + badgeWidth <= containerWidth) {
count++
}
break
}
currentWidth += badgeWidth
count++
}
setVisibleCount(count)
}
}
}, [selectedUsers, isEditing, expanded, value])
const toggleUser = (userId: string) => {
const currentVal = value || []
let newVal
if (currentVal.includes(userId)) {
newVal = currentVal.filter((id) => id !== userId)
} else {
newVal = [...currentVal, userId]
}
onSave(newVal)
}
const handlePlaceholderClick = (e: React.MouseEvent) => {
e.stopPropagation()
if (isEditing) return
const hiddenCount = selectedUsers.length - visibleCount
if (!expanded && hiddenCount > 0) {
setExpanded(true)
} else {
if (!readOnly) {
setIsEditing(true)
}
}
}
const handleOverlayClick = (e: React.MouseEvent) => {
e.stopPropagation()
if (!readOnly) {
setIsEditing(true)
}
}
const hiddenCount = selectedUsers.length - visibleCount
const isOpen = (expanded && !isEditing) || isEditing
const handleOpenChange = (open: boolean) => {
if (readOnly) return
if (!open) {
setExpanded(false)
setIsEditing(false)
}
}
const renderUserBadge = (user: UserInfo) => {
return (
<span
key={user.id}
className="inline-flex items-center gap-1.5 px-2 py-0.5 rounded-full text-xs font-medium bg-muted text-foreground border whitespace-nowrap h-[22px]"
>
<Avatar className="w-4 h-4">
<AvatarImage src={user.image} alt={user.name} className="object-cover" />
<AvatarFallback className="text-[8px] bg-rose-400 text-black font-semibold">
{getInitials(user.name)}
</AvatarFallback>
</Avatar>
<span className="truncate max-w-[100px]">{user.name}</span>
</span>
)
}
return (
<div className="relative w-full" onClick={(e) => e.stopPropagation()}>
<Popover open={!readOnly && isOpen} onOpenChange={handleOpenChange}>
<PopoverTrigger asChild>
<div
ref={containerRef}
onClick={handlePlaceholderClick}
className={`w-full px-1 py-1 flex flex-wrap gap-1 rounded border border-transparent transition-all box-border h-[32px] overflow-hidden ${
!readOnly || hiddenCount > 0
? 'cursor-pointer hover:bg-accent hover:border-border'
: ''
}`}
>
{selectedUsers.length === 0 && (
<span className="text-muted-foreground text-sm italic px-1 pt-0.5">Empty</span>
)}
{selectedUsers.slice(0, visibleCount).map(renderUserBadge)}
{hiddenCount > 0 && (
<span className="inline-flex items-center px-1.5 py-0.5 rounded-full text-xs font-medium bg-muted text-muted-foreground h-[22px]">
+{hiddenCount}
</span>
)}
</div>
</PopoverTrigger>
<PopoverContent
className={`p-1 bg-popover border rounded-lg shadow-xl max-h-60 overflow-auto ${
expanded && !isEditing
? 'w-[--radix-popover-trigger-width] min-w-[200px] flex flex-wrap gap-1 border-ring min-h-[32px] h-auto cursor-pointer'
: 'w-64 border-border'
}`}
align="start"
onClick={expanded && !isEditing ? handleOverlayClick : undefined}
>
{expanded && !isEditing ? (
<>
{selectedUsers.length === 0 && (
<span className="text-muted-foreground text-sm italic px-1 pt-0.5">Empty</span>
)}
{selectedUsers.map(renderUserBadge)}
</>
) : (
members.map((user) => {
const isSelected = (value || []).includes(user.id)
return (
<div
key={user.id}
onClick={() => toggleUser(user.id)}
className="px-3 py-2 hover:bg-accent cursor-pointer flex items-center justify-between rounded-sm"
>
<div className="flex items-center gap-2">
<Avatar className="w-5 h-5">
<AvatarImage src={user.image} alt={user.name} className="object-cover" />
<AvatarFallback className="text-[10px] bg-rose-400 text-black font-semibold">
{getInitials(user.name)}
</AvatarFallback>
</Avatar>
<span className="text-sm font-medium text-foreground">{user.name}</span>
</div>
{isSelected && <Check className="w-4 h-4 text-primary" />}
</div>
)
})
)}
</PopoverContent>
</Popover>
</div>
)
}
export default UserMultiField
@@ -448,6 +448,7 @@ export default function FileSystemManager({
projectName={projectName}
rootFolderId={rootFolderId}
dragState={dragState}
ancestorFolders={folderInfo?.ancestorFolders ?? []}
/>
</div>
<ResizeHandle
+235 -202
View File
@@ -26,10 +26,17 @@ import {
DropdownMenuSeparator,
} from '@/ui/components/ui/dropdown-menu'
import { Input } from '@/ui/components/ui/input'
import { ScrollArea } from '@/ui/components/ui/scroll-area'
import { usePermissions } from '@/ui/hooks/use-permissions'
import { cn } from '@/ui/lib/utils'
import { useDraggable, useDroppable } from '@dnd-kit/react'
import type { AssetInfo, AssetInfoPaginatedList, CollectionInfo, ShareLinkInfo } from '@shumai/dtos'
import type {
AssetInfo,
AssetInfoPaginatedList,
CollectionInfo,
ShareLinkInfo,
AncestorFolder,
} from '@shumai/dtos'
import { useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { useMatch, useNavigate, useParams } from '@tanstack/react-router'
import {
@@ -65,6 +72,7 @@ interface FolderTreeProps {
selectedFolderId?: string
hideCollections?: boolean
hideShares?: boolean
ancestorFolders?: AncestorFolder[]
}
export function FolderTree({
@@ -77,6 +85,7 @@ export function FolderTree({
selectedFolderId,
hideCollections,
hideShares,
ancestorFolders,
}: FolderTreeProps) {
const navigate = useNavigate()
const queryClient = useQueryClient()
@@ -458,71 +467,75 @@ export function FolderTree({
</div>
</header>
<div
<ScrollArea
className={cn(
'flex-1 overflow-y-auto min-h-0 space-y-0.5 pr-1 transition-all duration-300 ease-in-out',
'flex-1 min-h-0 transition-all duration-300 ease-in-out [&>div>div]:block!',
isAssetsExpanded
? 'opacity-100 visible pointer-events-auto'
: 'opacity-0 invisible pointer-events-none h-0',
)}
>
<FolderTreeItem
key={rootFolderId}
teamId={teamId}
projectId={projectId}
folder={{
id: rootFolderId,
name: projectName,
type: 'folder',
sizeByte: 0,
fileCount: 0,
status: 'processed',
mediaType: null,
createdAt: '',
updatedAt: '',
}}
level={0}
isRoot={true}
dragState={dragState}
onSelect={onSelect}
selectedFolderId={selectedFolderId}
canEdit={canEdit}
onRenameTrigger={(id, currentName) => {
setRenameId(id)
setRenameType('folder')
setRenameName(currentName)
setIsRenameOpen(true)
}}
onDeleteTrigger={(id) => {
setDeleteId(id)
setDeleteType('folder')
setIsDeleteOpen(true)
}}
onDownloadTrigger={(id) => {
handleDownloadFolder(id)
}}
/>
<div className="space-y-0.5 pr-3">
<FolderTreeItem
key={rootFolderId}
teamId={teamId}
projectId={projectId}
folder={{
id: rootFolderId,
name: projectName,
type: 'folder',
sizeByte: 0,
fileCount: 0,
status: 'processed',
mediaType: null,
createdAt: '',
updatedAt: '',
}}
level={0}
isRoot={true}
dragState={dragState}
onSelect={onSelect}
selectedFolderId={selectedFolderId}
canEdit={canEdit}
onRenameTrigger={(id, currentName) => {
setRenameId(id)
setRenameType('folder')
setRenameName(currentName)
setIsRenameOpen(true)
}}
onDeleteTrigger={(id) => {
setDeleteId(id)
setDeleteType('folder')
setIsDeleteOpen(true)
}}
onDownloadTrigger={(id) => {
handleDownloadFolder(id)
}}
ancestorFolders={ancestorFolders}
/>
{canEdit && (
<div
className={cn(
'group flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',
isRecentlyDeleted && 'bg-sidebar-accent text-sidebar-accent-foreground font-medium',
)}
onClick={() =>
navigate({
to: '/projects/$projectId/recently-deleted',
params: { projectId },
})
}
>
<div className="flex h-4 w-4 items-center justify-center">
<Trash2 className="h-4 w-4 text-sidebar-primary" />
{canEdit && (
<div
className={cn(
'group flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',
isRecentlyDeleted &&
'bg-sidebar-accent text-sidebar-accent-foreground font-medium',
)}
onClick={() =>
navigate({
to: '/projects/$projectId/recently-deleted',
params: { projectId },
})
}
>
<div className="flex h-4 w-4 items-center justify-center">
<Trash2 className="h-4 w-4 text-sidebar-primary" />
</div>
<span className="flex-1 truncate text-sidebar-foreground">Recently Deleted</span>
</div>
<span className="flex-1 truncate text-sidebar-foreground">Recently Deleted</span>
</div>
)}
</div>
)}
</div>
</ScrollArea>
</div>
{!hideCollections && (
@@ -554,106 +567,108 @@ export function FolderTree({
)}
</header>
<div
<ScrollArea
className={cn(
'flex-1 overflow-y-auto min-h-0 space-y-0.5 pr-1 transition-all duration-300 ease-in-out',
'flex-1 min-h-0 transition-all duration-300 ease-in-out [&>div>div]:block!',
isCollectionsExpanded
? 'opacity-100 visible pointer-events-auto'
: 'opacity-0 invisible pointer-events-none h-0',
)}
>
<div
className="group flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
onClick={() =>
navigate({
to: '/projects/$projectId/collections',
params: { projectId },
})
}
>
<div className="flex h-4 w-4 items-center justify-center">
<LayoutGrid className="h-4 w-4 text-sidebar-primary" />
</div>
<span className="flex-1 truncate text-sidebar-foreground">
All Collections ({collectionsData?.pages[0]?.pageInfo?.total || 0})
</span>
</div>
{collections.map((collection) => {
const isColActive = params?.collectionId === collection.id
return (
<div
key={collection.id}
className={cn(
'group flex cursor-pointer items-center justify-between rounded-md px-2 py-1 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',
isColActive && 'bg-sidebar-accent text-sidebar-accent-foreground font-medium',
)}
onClick={() =>
navigate({
to: '/projects/$projectId/collections/$collectionId',
params: { projectId, collectionId: collection.id },
})
}
>
<div className="flex items-center gap-2 min-w-0 flex-1">
<div className="flex h-4 w-4 items-center justify-center shrink-0">
<Bookmark className="h-4 w-4 text-sidebar-primary" />
</div>
<span className="truncate text-sidebar-foreground flex-1">
{collection.name}
</span>
</div>
{canEdit && (
<div
className="opacity-0 group-hover:opacity-100 transition-opacity"
onClick={(e) => e.stopPropagation()}
>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button
variant="ghost"
size="icon-sm"
className="h-6 w-6 shrink-0 hover:bg-muted hover:text-muted-foreground p-0"
>
<MoreHorizontal className="h-3.5 w-3.5" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-32">
<DropdownMenuItem
onClick={() => {
setRenameId(collection.id)
setRenameType('collection')
setRenameName(collection.name)
setIsRenameOpen(true)
}}
>
Rename
</DropdownMenuItem>
<DropdownMenuItem
className="text-destructive focus:text-destructive focus:bg-destructive/10"
onClick={() => {
setDeleteId(collection.id)
setDeleteType('collection')
setIsDeleteOpen(true)
}}
>
Delete
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
)}
<div className="space-y-0.5 pr-3">
<div
className="group flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
onClick={() =>
navigate({
to: '/projects/$projectId/collections',
params: { projectId },
})
}
>
<div className="flex h-4 w-4 items-center justify-center">
<LayoutGrid className="h-4 w-4 text-sidebar-primary" />
</div>
)
})}
<div ref={collectionsInViewRef} className="h-1" />
{isFetchingNextCollections && (
<div className="flex justify-center p-2">
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
<span className="flex-1 truncate text-sidebar-foreground">
All Collections ({collectionsData?.pages[0]?.pageInfo?.total || 0})
</span>
</div>
)}
</div>
{collections.map((collection) => {
const isColActive = params?.collectionId === collection.id
return (
<div
key={collection.id}
className={cn(
'group flex cursor-pointer items-center justify-between rounded-md px-2 py-1 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground min-w-0',
isColActive && 'bg-sidebar-accent text-sidebar-accent-foreground font-medium',
)}
onClick={() =>
navigate({
to: '/projects/$projectId/collections/$collectionId',
params: { projectId, collectionId: collection.id },
})
}
>
<div className="flex items-center gap-2 min-w-0 flex-1">
<div className="flex h-4 w-4 items-center justify-center shrink-0">
<Bookmark className="h-4 w-4 text-sidebar-primary" />
</div>
<span className="truncate text-sidebar-foreground flex-1">
{collection.name}
</span>
</div>
{canEdit && (
<div
className="opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
onClick={(e) => e.stopPropagation()}
>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button
variant="ghost"
size="icon-sm"
className="h-6 w-6 shrink-0 hover:bg-muted hover:text-muted-foreground p-0"
>
<MoreHorizontal className="h-3.5 w-3.5" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-32">
<DropdownMenuItem
onClick={() => {
setRenameId(collection.id)
setRenameType('collection')
setRenameName(collection.name)
setIsRenameOpen(true)
}}
>
Rename
</DropdownMenuItem>
<DropdownMenuItem
className="text-destructive focus:text-destructive focus:bg-destructive/10"
onClick={() => {
setDeleteId(collection.id)
setDeleteType('collection')
setIsDeleteOpen(true)
}}
>
Delete
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
)}
</div>
)
})}
<div ref={collectionsInViewRef} className="h-1" />
{isFetchingNextCollections && (
<div className="flex justify-center p-2">
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
</div>
)}
</div>
</ScrollArea>
</div>
)}
@@ -688,58 +703,60 @@ export function FolderTree({
)}
</header>
<div
<ScrollArea
className={cn(
'flex-1 overflow-y-auto min-h-0 space-y-0.5 pr-1 transition-all duration-300 ease-in-out',
'flex-1 min-h-0 transition-all duration-300 ease-in-out [&>div>div]:block!',
isSharesExpanded
? 'opacity-100 visible pointer-events-auto'
: 'opacity-0 invisible pointer-events-none h-0',
)}
>
<div
className="group flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
onClick={() =>
navigate({
to: '/projects/$projectId/shares',
params: { projectId },
})
}
>
<div className="flex h-4 w-4 items-center justify-center">
<LayoutGrid className="h-4 w-4 text-sidebar-primary" />
<div className="space-y-0.5 pr-3">
<div
className="group flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
onClick={() =>
navigate({
to: '/projects/$projectId/shares',
params: { projectId },
})
}
>
<div className="flex h-4 w-4 items-center justify-center">
<LayoutGrid className="h-4 w-4 text-sidebar-primary" />
</div>
<span className="flex-1 truncate text-sidebar-foreground">
All Share Links ({shareLinksData?.pages[0]?.pageInfo?.total || 0})
</span>
</div>
<span className="flex-1 truncate text-sidebar-foreground">
All Share Links ({shareLinksData?.pages[0]?.pageInfo?.total || 0})
</span>
</div>
{shareLinks.map((link) => (
<ShareLinkItem
key={link.id}
link={link}
projectId={projectId}
dragState={dragState}
canEdit={canEdit}
onRenameTrigger={(id, currentName) => {
setRenameId(id)
setRenameType('share')
setRenameName(currentName)
setIsRenameOpen(true)
}}
onDeleteTrigger={(id) => {
setDeleteId(id)
setDeleteType('share')
setIsDeleteOpen(true)
}}
/>
))}
<div ref={sharesInViewRef} className="h-1" />
{isFetchingNextShareLinks && (
<div className="flex justify-center p-2">
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
</div>
)}
</div>
{shareLinks.map((link) => (
<ShareLinkItem
key={link.id}
link={link}
projectId={projectId}
dragState={dragState}
canEdit={canEdit}
onRenameTrigger={(id, currentName) => {
setRenameId(id)
setRenameType('share')
setRenameName(currentName)
setIsRenameOpen(true)
}}
onDeleteTrigger={(id) => {
setDeleteId(id)
setDeleteType('share')
setIsDeleteOpen(true)
}}
/>
))}
<div ref={sharesInViewRef} className="h-1" />
{isFetchingNextShareLinks && (
<div className="flex justify-center p-2">
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
</div>
)}
</div>
</ScrollArea>
</div>
)}
@@ -941,7 +958,7 @@ function ShareLinkItem({
<div
ref={setDroppableRef}
className={cn(
'group flex cursor-pointer items-center justify-between rounded-md px-2 py-1 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',
'group flex cursor-pointer items-center justify-between rounded-md px-2 py-1 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground min-w-0',
isActive && 'bg-sidebar-accent text-sidebar-accent-foreground font-medium',
isOver && isValidDropTarget && 'bg-sidebar-accent ring-2 ring-primary ring-inset',
)}
@@ -961,7 +978,7 @@ function ShareLinkItem({
{canEdit && (
<div
className="opacity-0 group-hover:opacity-100 transition-opacity"
className="opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
onClick={(e) => e.stopPropagation()}
>
<DropdownMenu modal={false}>
@@ -1011,6 +1028,7 @@ interface FolderTreeItemProps {
onRenameTrigger: (id: string, name: string) => void
onDeleteTrigger: (id: string) => void
onDownloadTrigger: (id: string) => void
ancestorFolders?: AncestorFolder[]
}
function FolderTreeItem({
@@ -1026,8 +1044,19 @@ function FolderTreeItem({
onRenameTrigger,
onDeleteTrigger,
onDownloadTrigger,
ancestorFolders,
}: FolderTreeItemProps) {
const [isExpanded, setIsExpanded] = useState(isRoot || false)
const isAncestor = useMemo(() => {
return ancestorFolders?.some((f) => f.id === folder.id) ?? false
}, [ancestorFolders, folder.id])
const [isExpanded, setIsExpanded] = useState(isRoot || isAncestor)
useEffect(() => {
if (isAncestor) {
setIsExpanded(true)
}
}, [isAncestor])
const navigate = useNavigate()
const params = useParams({
from: '/projects/$projectId/folders/$folderId',
@@ -1147,7 +1176,7 @@ function FolderTreeItem({
<div
ref={setNodeRef}
className={cn(
'group flex cursor-pointer items-center gap-1 rounded-md px-2 py-1.5 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',
'group flex cursor-pointer items-center gap-1 rounded-md px-2 py-1.5 text-sm transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground min-w-0',
(isActive || isSelected) &&
'bg-sidebar-accent text-sidebar-accent-foreground font-medium',
isDragging && 'opacity-50',
@@ -1159,7 +1188,10 @@ function FolderTreeItem({
onClick={handleFolderClick}
>
{!isRoot && (
<button onClick={handleToggleExpand} className="flex h-4 w-4 items-center justify-center">
<button
onClick={handleToggleExpand}
className="flex h-4 w-4 items-center justify-center shrink-0"
>
{isExpanded ? (
<ChevronDown className="h-3 w-3" />
) : (
@@ -1168,15 +1200,15 @@ function FolderTreeItem({
</button>
)}
{isRoot ? (
<Clapperboard className="h-4 w-4 text-sidebar-primary" />
<Clapperboard className="h-4 w-4 text-sidebar-primary shrink-0" />
) : (
<Folder className="h-4 w-4 text-sidebar-primary" />
<Folder className="h-4 w-4 text-sidebar-primary shrink-0" />
)}
<span className="flex-1 truncate text-sidebar-foreground">{folder.name}</span>
{canEdit && !isRoot && (
<div
className="opacity-0 group-hover:opacity-100 transition-opacity"
className="opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
onClick={(e) => e.stopPropagation()}
>
<DropdownMenu modal={false}>
@@ -1246,6 +1278,7 @@ function FolderTreeItem({
onRenameTrigger={onRenameTrigger}
onDeleteTrigger={onDeleteTrigger}
onDownloadTrigger={onDownloadTrigger}
ancestorFolders={ancestorFolders}
/>
))}
{hasNextPage && (
+173 -116
View File
@@ -21,48 +21,81 @@ import type { Annotation } from '@/ui/types'
import { useNavigate } from '@tanstack/react-router'
interface PublicShareManagerProps {
shareInfo: {
id: string
name: string
expireAt: string | null
isDisabled: boolean
isExpired: boolean
hasPassword: boolean
rootFolderId: string
projectId: string
viewMode?: string | null
defaultSortOrder?: string | null
}
shareId: string
initialFolderId?: string
initialFileId?: string
startTime?: number
}
interface PublicShareInfo {
id: string
name: string
expireAt: string | null
isDisabled: boolean
isExpired: boolean
hasPassword: boolean
rootFolderId: string
projectId: string
viewMode?: string | null
defaultSortOrder?: string | null
}
export function PublicShareManager({
shareInfo,
shareId,
initialFolderId,
initialFileId,
startTime,
}: PublicShareManagerProps) {
const navigate = useNavigate()
const [password, setPassword] = useState(() => {
return localStorage.getItem(`share_pwd_${shareInfo.id}`) || ''
return localStorage.getItem(`share_pwd_${shareId}`) || ''
})
const [passwordInput, setPasswordInput] = useState('')
const [isPasswordValid, setIsPasswordValid] = useState(!shareInfo.hasPassword || !!password)
const currentFolderId = initialFolderId || shareInfo.rootFolderId
const {
data: shareInfo,
error: shareInfoError,
isLoading: isShareInfoLoading,
} = useQuery<PublicShareInfo>({
queryKey: ['share-info', shareId, password],
queryFn: async () => {
const res = await client.api.shares[':shareId'].info.$get(
{
param: { shareId },
},
{
headers: {
'x-share-password': password,
},
},
)
if (res.status === 401) {
throw new Error('Unauthorized')
}
if (res.status === 403) {
const body = (await res.json()) as { error?: string }
throw new Error(body.error || 'Forbidden')
}
if (!res.ok) {
throw new Error('Failed to fetch share info')
}
return (await res.json()) as unknown as PublicShareInfo
},
retry: false,
})
const currentFolderId = initialFolderId || shareInfo?.rootFolderId
const viewingFileId = initialFileId || null
const [ancestorFolders, setAncestorFolders] = useState<AncestorFolder[]>([])
// Fetch ancestors for breadcrumb
const { data: folderInfo } = useQuery({
queryKey: ['public-share-folder', shareInfo.id, currentFolderId, password],
queryKey: ['public-share-folder', shareId, currentFolderId, password],
queryFn: async () => {
const res = await client.api.shares[':shareId'].files[':fileId'].$get(
{
param: { shareId: shareInfo.id, fileId: currentFolderId },
param: { shareId, fileId: currentFolderId! },
},
{
headers: {
@@ -73,11 +106,11 @@ export function PublicShareManager({
if (res.status === 401) throw new Error('Unauthorized')
return (await res.json()) as unknown as AssetInfo
},
enabled: isPasswordValid && !shareInfo.isExpired && !shareInfo.isDisabled,
enabled: !!shareInfo && !!currentFolderId,
})
useEffect(() => {
if (folderInfo?.ancestorFolders) {
if (folderInfo?.ancestorFolders && shareInfo) {
// Filter ancestors to only those within the share root
const rootIndex = folderInfo.ancestorFolders.findIndex((f) => f.id === shareInfo.rootFolderId)
if (rootIndex !== -1) {
@@ -86,7 +119,7 @@ export function PublicShareManager({
setAncestorFolders([])
}
}
}, [folderInfo, shareInfo.rootFolderId, currentFolderId])
}, [folderInfo, shareInfo, currentFolderId])
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
const [rightSidebarWidth, setRightSidebarWidth] = useState(360)
@@ -103,11 +136,11 @@ export function PublicShareManager({
isFetchingNextPage: isFetchingNextFoldersPage,
error: foldersError,
} = useInfiniteQuery<AssetInfoPaginatedList>({
queryKey: ['public-share-children', shareInfo.id, currentFolderId, 'folder', password],
queryKey: ['public-share-children', shareId, currentFolderId, 'folder', password],
queryFn: async ({ pageParam }) => {
const res = await client.api.shares[':shareId'].folders[':folderId'].children.$get(
{
param: { shareId: shareInfo.id, folderId: currentFolderId },
param: { shareId, folderId: currentFolderId! },
query: {
assetType: 'folder',
after: pageParam as string,
@@ -123,7 +156,7 @@ export function PublicShareManager({
if (res.status === 403) throw new Error('Expired')
return (await res.json()) as unknown as AssetInfoPaginatedList
},
enabled: isPasswordValid && !shareInfo.isExpired && !shareInfo.isDisabled,
enabled: !!shareInfo && !!currentFolderId,
initialPageParam: '',
getNextPageParam: (lastPage) => lastPage.pageInfo?.cursor || undefined,
retry: false,
@@ -135,11 +168,11 @@ export function PublicShareManager({
hasNextPage: hasNextPageFiles,
isFetchingNextPage: isFetchingNextFilesPage,
} = useInfiniteQuery<AssetInfoPaginatedList>({
queryKey: ['public-share-children', shareInfo.id, currentFolderId, 'file', password],
queryKey: ['public-share-children', shareId, currentFolderId, 'file', password],
queryFn: async ({ pageParam }) => {
const res = await client.api.shares[':shareId'].folders[':folderId'].children.$get(
{
param: { shareId: shareInfo.id, folderId: currentFolderId },
param: { shareId, folderId: currentFolderId! },
query: {
assetType: 'file',
after: pageParam as string,
@@ -155,18 +188,18 @@ export function PublicShareManager({
if (res.status === 403) throw new Error('Expired')
return (await res.json()) as unknown as AssetInfoPaginatedList
},
enabled: isPasswordValid && !shareInfo.isExpired && !shareInfo.isDisabled,
enabled: !!shareInfo && !!currentFolderId,
initialPageParam: '',
getNextPageParam: (lastPage) => lastPage.pageInfo?.cursor || undefined,
retry: false,
})
const { data: publicFields } = useQuery({
queryKey: ['public-share-fields', shareInfo.id, password],
queryKey: ['public-share-fields', shareId, password],
queryFn: async () => {
const res = await client.api.shares[':shareId'].fields.$get(
{
param: { shareId: shareInfo.id },
param: { shareId },
},
{
headers: {
@@ -177,15 +210,15 @@ export function PublicShareManager({
if (res.status === 401) throw new Error('Unauthorized')
return (await res.json()) as unknown as FieldInfo[]
},
enabled: isPasswordValid && !shareInfo.isExpired && !shareInfo.isDisabled,
enabled: !!shareInfo,
})
const { data: viewingFileData, isLoading: isViewingFileLoading } = useQuery({
queryKey: ['public-share-file', shareInfo.id, viewingFileId, password],
queryKey: ['public-share-file', shareId, viewingFileId, password],
queryFn: async () => {
const res = await client.api.shares[':shareId'].files[':fileId'].$get(
{
param: { shareId: shareInfo.id, fileId: viewingFileId! },
param: { shareId, fileId: viewingFileId! },
},
{
headers: {
@@ -196,16 +229,15 @@ export function PublicShareManager({
if (res.status === 401) throw new Error('Unauthorized')
return (await res.json()) as unknown as AssetInfo
},
enabled: !!viewingFileId && isPasswordValid && !shareInfo.isExpired && !shareInfo.isDisabled,
enabled: !!viewingFileId && !!shareInfo,
})
useEffect(() => {
if (foldersError?.message === 'Unauthorized') {
setIsPasswordValid(false)
setPassword('')
localStorage.removeItem(`share_pwd_${shareInfo.id}`)
localStorage.removeItem(`share_pwd_${shareId}`)
}
}, [foldersError, shareInfo.id])
}, [foldersError, shareId])
const folders = useMemo(
() => foldersData?.pages.flatMap((page) => page.data ?? []) ?? [],
@@ -226,21 +258,20 @@ export function PublicShareManager({
const handlePasswordSubmit = (e: React.FormEvent) => {
e.preventDefault()
setPassword(passwordInput)
setIsPasswordValid(true)
localStorage.setItem(`share_pwd_${shareInfo.id}`, passwordInput)
localStorage.setItem(`share_pwd_${shareId}`, passwordInput)
}
const handleItemDoubleClick = (item: AssetInfo) => {
if (item.type === 'folder' || item.targetType === 'folder') {
navigate({
to: '/share/$shareId/folders/$folderId',
params: { shareId: shareInfo.id, folderId: item.id! },
params: { shareId, folderId: item.id! },
})
} else {
navigate({
to: '/share/$shareId/files/$fileId',
params: {
shareId: shareInfo.id,
shareId,
fileId: item.versionStack ? item.versionStack.id : item.id!,
},
})
@@ -249,17 +280,18 @@ export function PublicShareManager({
}
const handleBreadcrumbClick = (folderId: string) => {
if (!shareInfo) return
const targetId = folderId === 'root' ? shareInfo.rootFolderId : folderId
if (targetId === shareInfo.rootFolderId) {
navigate({
to: '/share/$shareId',
params: { shareId: shareInfo.id },
params: { shareId },
})
} else {
navigate({
to: '/share/$shareId/folders/$folderId',
params: { shareId: shareInfo.id, folderId: targetId },
params: { shareId, folderId: targetId },
})
}
setSelectedIds(new Set())
@@ -294,7 +326,7 @@ export function PublicShareManager({
const { setProjectState, clearProjectState } = useTopNavStore()
useEffect(() => {
if (isPasswordValid && !shareInfo.isExpired && !shareInfo.isDisabled) {
if (shareInfo && currentFolderId) {
const currentFolderName =
currentFolderId === shareInfo.rootFolderId
? shareInfo.name
@@ -315,7 +347,7 @@ export function PublicShareManager({
},
isRootFolder: currentFolderId === shareInfo.rootFolderId && !viewingFileId,
isPublic: true,
shareId: shareInfo.id,
shareId,
fileId: viewingFileId || undefined,
onFolderClick: handleBreadcrumbClick,
isRightSidebarCollapsed,
@@ -325,7 +357,6 @@ export function PublicShareManager({
return () => clearProjectState()
}, [
isPasswordValid,
shareInfo,
currentFolderId,
folders,
@@ -339,49 +370,73 @@ export function PublicShareManager({
let content
if (shareInfo.isExpired || shareInfo.isDisabled) {
if (isShareInfoLoading && !shareInfoError) {
content = (
<div className="flex flex-1 items-center justify-center p-4">
<Card className="w-full max-w-md">
<CardHeader className="text-center">
<div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-destructive/10">
<AlertCircle className="h-6 w-6 text-destructive" />
</div>
<CardTitle>Share {shareInfo.isDisabled ? 'Disabled' : 'Expired'}</CardTitle>
</CardHeader>
<CardContent className="text-center text-muted-foreground">
{shareInfo.isDisabled
? 'This share link has been disabled by the owner.'
: 'This share link has expired and is no longer accessible.'}
</CardContent>
</Card>
<div className="flex flex-1 items-center justify-center bg-background">
<Loader2 className="h-8 w-8 animate-spin text-foreground" />
</div>
)
} else if (!isPasswordValid) {
} else if (shareInfoError) {
if (shareInfoError.message === 'Unauthorized') {
const isPasswordWrong = password !== ''
content = (
<div className="flex flex-1 items-center justify-center p-4">
<Card className="w-full max-w-md">
<CardHeader className="text-center">
<div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-primary/10">
<Lock className="h-6 w-6 text-primary" />
</div>
<CardTitle>Password Protected</CardTitle>
</CardHeader>
<CardContent>
<form onSubmit={handlePasswordSubmit} className="space-y-4">
<div className="space-y-2">
<Input
type="password"
placeholder="Enter password"
value={passwordInput}
onChange={(e) => setPasswordInput(e.target.value)}
autoFocus
/>
{isPasswordWrong && (
<p className="text-sm font-medium text-destructive">
Incorrect password. Please try again.
</p>
)}
</div>
<Button type="submit" className="w-full">
Access Share
</Button>
</form>
</CardContent>
</Card>
</div>
)
} else {
const isExpired = shareInfoError.message.includes('expired')
const isDisabled = shareInfoError.message.includes('disabled')
content = (
<div className="flex flex-1 items-center justify-center p-4">
<Card className="w-full max-w-md">
<CardHeader className="text-center">
<div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-destructive/10">
<AlertCircle className="h-6 w-6 text-destructive" />
</div>
<CardTitle>
{isExpired ? 'Share Expired' : isDisabled ? 'Share Disabled' : 'Error'}
</CardTitle>
</CardHeader>
<CardContent className="text-center text-muted-foreground">
{shareInfoError.message}
</CardContent>
</Card>
</div>
)
}
} else if (!shareInfo) {
content = (
<div className="flex flex-1 items-center justify-center p-4">
<Card className="w-full max-w-md">
<CardHeader className="text-center">
<div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-primary/10">
<Lock className="h-6 w-6 text-primary" />
</div>
<CardTitle>Password Protected</CardTitle>
</CardHeader>
<CardContent>
<form onSubmit={handlePasswordSubmit} className="space-y-4">
<Input
type="password"
placeholder="Enter password"
value={passwordInput}
onChange={(e) => setPasswordInput(e.target.value)}
autoFocus
/>
<Button type="submit" className="w-full">
Access Share
</Button>
</form>
</CardContent>
</Card>
<div className="flex flex-1 items-center justify-center bg-background">
<Loader2 className="h-8 w-8 animate-spin text-foreground" />
</div>
)
} else {
@@ -406,37 +461,39 @@ export function PublicShareManager({
)}
</div>
) : (
<FileBrowser
teamId=""
projectId={shareInfo.projectId}
assetId={currentFolderId}
folders={folders}
files={files}
selectedItem={null}
selectedIds={selectedIds}
onItemSelect={(item, e) => {
if (e.metaKey || e.ctrlKey) {
const next = new Set(selectedIds)
if (next.has(item.id!)) next.delete(item.id!)
else next.add(item.id!)
setSelectedIds(next)
} else {
setSelectedIds(new Set([item.id!]))
}
}}
onItemDoubleClick={handleItemDoubleClick}
onSaveField={() => {}}
displayStyle={(shareInfo.viewMode as 'card' | 'list') ?? 'card'}
onClearSelection={() => setSelectedIds(new Set())}
fetchNextFoldersPage={fetchNextFoldersPage}
hasNextFoldersPage={hasNextPageFolders}
isFetchingNextFoldersPage={isFetchingNextFoldersPage}
fetchNextFilesPage={fetchNextFilesPage}
hasNextFilesPage={hasNextPageFiles}
isFetchingNextFilesPage={isFetchingNextFilesPage}
isShareView={true}
isPublic={true}
/>
currentFolderId && (
<FileBrowser
teamId=""
projectId={shareInfo.projectId}
assetId={currentFolderId}
folders={folders}
files={files}
selectedItem={null}
selectedIds={selectedIds}
onItemSelect={(item, e) => {
if (e.metaKey || e.ctrlKey) {
const next = new Set(selectedIds)
if (next.has(item.id!)) next.delete(item.id!)
else next.add(item.id!)
setSelectedIds(next)
} else {
setSelectedIds(new Set([item.id!]))
}
}}
onItemDoubleClick={handleItemDoubleClick}
onSaveField={() => {}}
displayStyle={(shareInfo.viewMode as 'card' | 'list') ?? 'card'}
onClearSelection={() => setSelectedIds(new Set())}
fetchNextFoldersPage={fetchNextFoldersPage}
hasNextFoldersPage={hasNextPageFolders}
isFetchingNextFoldersPage={isFetchingNextFoldersPage}
fetchNextFilesPage={fetchNextFilesPage}
hasNextFilesPage={hasNextPageFiles}
isFetchingNextFilesPage={isFetchingNextFilesPage}
isShareView={true}
isPublic={true}
/>
)
)}
{!isRightSidebarCollapsed && (
@@ -457,7 +514,7 @@ export function PublicShareManager({
publicFields={publicFields}
onCommentSelect={handleCommentSelect}
isPublic={true}
shareId={shareInfo.id}
shareId={shareId}
currentTime={currentTime}
onTyping={() => {
if (videoRef.current) {
@@ -15,6 +15,9 @@ import { type FieldInfo } from '@shumai/dtos'
import { Check, ChevronDown, Trash2 } from 'lucide-react'
import { getOptionStyle } from '../fields-manager'
import RatingField from '../fields/rating-field'
import { useEffect, useMemo } from 'react'
import { useMemberStore } from '@/ui/stores/members'
import { useTeamId } from '@/ui/hooks/use-team-id'
interface FilterPanelProps {
fields: FieldInfo[]
@@ -40,13 +43,33 @@ export function FilterPanel({
excludeFields,
hidePrefix,
}: FilterPanelProps) {
const teamId = useTeamId()
const { members, fetchMembers } = useMemberStore()
useEffect(() => {
if (teamId) {
fetchMembers(teamId)
}
}, [teamId, fetchMembers])
const memberOptions = useMemo(() => {
return members.map((m) => ({
id: m.id,
displayName: m.name,
color: 'system',
}))
}, [members])
const allFields = [
...SYSTEM_FIELDS,
...fields.map((f) => ({
id: f.id!,
label: f.config?.name || f.description || 'Unknown',
type: getFieldType(f),
options: f.config?.select?.options || f.config?.selectMulti?.options,
options:
f.config?.type === 'user' || f.config?.type === 'userMulti'
? memberOptions
: f.config?.select?.options || f.config?.selectMulti?.options,
config: f.config,
})),
].filter((f) => !excludeFields?.includes(f.id))
@@ -187,8 +210,9 @@ export function FilterPanel({
}
function getFieldType(field: FieldInfo): string {
if (field.config?.type === 'select') return 'select'
if (field.config?.type === 'selectMulti') return 'selectMulti'
if (field.config?.type === 'select' || field.config?.type === 'user') return 'select'
if (field.config?.type === 'selectMulti' || field.config?.type === 'userMulti')
return 'selectMulti'
if (field.config?.type === 'number') return 'number'
if (field.config?.type === 'date') return 'date'
if (field.config?.type === 'rating') return 'rating'
@@ -24,7 +24,7 @@ import { useForm, useStore } from '@tanstack/react-form'
import { Loader2, Puzzle } from 'lucide-react'
import { useEffect, useMemo } from 'react'
import { toast } from 'sonner'
import { AgentInfo, AgentType } from '@shumai/dtos'
import { AgentInfo, AgentType, ThinkingLevel, thinkingLevelSchema } from '@shumai/dtos'
import { Textarea } from '@/ui/components/ui/textarea'
import { ScrollArea } from '@/ui/components/ui/scroll-area'
import { z } from 'zod'
@@ -47,7 +47,7 @@ const agentFormSchema = z.object({
providerId: z.string().optional(),
modelId: z.string().optional(),
soul: z.string().optional(),
thinkingLevel: z.string().optional(),
thinkingLevel: thinkingLevelSchema.optional(),
systemPrompt: z.string().optional(),
skills: z.array(z.string()).optional(),
})
@@ -116,12 +116,12 @@ export function AgentFormDialog({
const form = useForm({
defaultValues: {
name: initialValues?.name || '',
type: type || initialValues?.type || 'chat',
type: initialValues?.type || type || 'chat',
avatar: initialValues?.avatar || AVAILABLE_AVATARS[0],
providerId: initialValues?.providerId || '',
modelId: initialValues?.modelId || '',
soul: initialValues?.soul || '',
thinkingLevel: initialValues?.thinkingLevel || 'medium',
thinkingLevel: initialValues?.thinkingLevel || 'off',
systemPrompt: initialValues?.systemPrompt || '',
skills: initialValues?.skills?.map((s) => s.skillId) || ([] as string[]),
} as AgentFormValues,
@@ -400,14 +400,19 @@ export function AgentFormDialog({
children={(field) => (
<Field>
<FieldLabel>Thinking Level</FieldLabel>
<Select value={field.state.value} onValueChange={field.handleChange}>
<Select
value={field.state.value}
onValueChange={(val) => field.handleChange(val as ThinkingLevel)}
>
<SelectTrigger>
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="low">Low (Fast)</SelectItem>
<SelectItem value="medium">Medium (Balanced)</SelectItem>
<SelectItem value="high">High (Reasoning)</SelectItem>
{thinkingLevelSchema.options.map((level) => (
<SelectItem key={level} value={level}>
{level.charAt(0).toUpperCase() + level.slice(1)}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
@@ -16,7 +16,7 @@ import {
} from 'lucide-react'
import { useState } from 'react'
import { toast } from 'sonner'
import { AgentInfo, AgentType } from '@shumai/dtos'
import { AgentInfo, AgentType, ThinkingLevel } from '@shumai/dtos'
import { AgentFormDialog } from './AgentFormDialog'
import {
DropdownMenu,
@@ -104,7 +104,7 @@ export function AgentsSettings({ teamId }: AgentsSettingsProps) {
avatar?: string
providerId?: string
modelId?: string
thinkingLevel?: string
thinkingLevel?: ThinkingLevel
systemPrompt?: string
soul?: string
skills?: string[]
@@ -206,6 +206,7 @@ export function AgentsSettings({ teamId }: AgentsSettingsProps) {
{AGENT_TYPES.map((section) => {
const typeAgents = agents.filter((a) => a.type === section.type)
const Icon = section.icon
const isSingleAgentType = section.type === 'autofill' || section.type === 'embedding'
return (
<div
@@ -213,20 +214,24 @@ export function AgentsSettings({ teamId }: AgentsSettingsProps) {
className="bg-card rounded-xl border border-border overflow-hidden"
>
<div
className="px-6 py-4 flex items-center justify-between cursor-pointer hover:bg-muted/50 transition-colors"
onClick={() => toggleSection(section.type)}
className={cn(
'px-6 py-4 flex items-center justify-between',
!isSingleAgentType && 'cursor-pointer hover:bg-muted/50 transition-colors',
)}
onClick={!isSingleAgentType ? () => toggleSection(section.type) : undefined}
>
<div className="flex items-center gap-2">
<h3 className="font-semibold text-foreground">{section.label} Agents</h3>
<Badge variant="secondary" className="h-5 px-1.5 min-w-[1.25rem] text-[10px]">
{typeAgents.length}
</Badge>
<h3 className="font-semibold text-foreground">
{section.label} {isSingleAgentType ? 'Agent' : 'Agents'}
</h3>
{!isSingleAgentType && (
<Badge variant="secondary" className="h-5 px-1.5 min-w-[1.25rem] text-[10px]">
{typeAgents.length}
</Badge>
)}
</div>
<div className="flex items-center gap-2">
{!(
(section.type === 'autofill' || section.type === 'embedding') &&
typeAgents.length > 0
) && (
{!(isSingleAgentType && typeAgents.length > 0) && (
<Button
variant="ghost"
size="icon"
@@ -240,16 +245,18 @@ export function AgentsSettings({ teamId }: AgentsSettingsProps) {
<Plus className="w-4 h-4" />
</Button>
)}
<ChevronDown
className={cn(
'w-5 h-5 text-muted-foreground transition-transform duration-200',
expandedSections[section.type] ? 'rotate-180' : '',
)}
/>
{!isSingleAgentType && (
<ChevronDown
className={cn(
'w-5 h-5 text-muted-foreground transition-transform duration-200',
expandedSections[section.type] ? 'rotate-180' : '',
)}
/>
)}
</div>
</div>
{expandedSections[section.type] && (
{(isSingleAgentType || expandedSections[section.type]) && (
<div className="px-6 pb-6 pt-2 space-y-3">
<div className="grid grid-cols-1 gap-4">
{typeAgents.map((agent) => (
@@ -338,7 +345,7 @@ export function AgentsSettings({ teamId }: AgentsSettingsProps) {
<Icon className="w-5 h-5 text-muted-foreground" />
</div>
<p className="text-sm text-muted-foreground">
No {section.label} agents found
No {section.label} {isSingleAgentType ? 'agent' : 'agents'} found
</p>
<Button
variant="link"
@@ -0,0 +1,190 @@
import { useState } from 'react'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { client } from '@/ui/api/client'
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/ui/components/ui/card'
import { Input } from '@/ui/components/ui/input'
import { Button } from '@/ui/components/ui/button'
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from '@/ui/components/ui/table'
import { Loader2, Plus, Trash2, Copy, Check } from 'lucide-react'
import { toast } from 'sonner'
import type { ApiTokenResponse } from '@shumai/dtos'
export function DeveloperSettings({ teamId }: { teamId: string }) {
const queryClient = useQueryClient()
const [tokenName, setTokenName] = useState('')
const [copiedId, setCopiedId] = useState<string | null>(null)
const { data: tokens, isLoading } = useQuery<ApiTokenResponse[]>({
queryKey: ['teams', teamId, 'api-tokens'],
queryFn: async () => {
const res = await client.api.teams[':teamId']['api-tokens'].$get({
param: { teamId },
})
if (!res.ok) throw new Error('Failed to fetch API tokens')
return (await res.json()) as ApiTokenResponse[]
},
})
const { mutate: createToken, isPending: isCreating } = useMutation({
mutationFn: async (name: string) => {
const res = await client.api.teams[':teamId']['api-tokens'].$post({
param: { teamId },
json: { name },
})
if (!res.ok) throw new Error('Failed to create API token')
return (await res.json()) as ApiTokenResponse
},
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['teams', teamId, 'api-tokens'] })
setTokenName('')
toast.success('API token generated successfully')
},
onError: (err) => {
toast.error(err instanceof Error ? err.message : 'Failed to generate token')
},
})
const { mutate: deleteToken } = useMutation({
mutationFn: async (tokenId: string) => {
const res = await client.api.teams[':teamId']['api-tokens'][':tokenId'].$delete({
param: { teamId, tokenId },
})
if (!res.ok) throw new Error('Failed to delete API token')
return await res.json()
},
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['teams', teamId, 'api-tokens'] })
toast.success('API token revoked successfully')
},
onError: (err) => {
toast.error(err instanceof Error ? err.message : 'Failed to revoke token')
},
})
const handleGenerate = (e: React.FormEvent) => {
e.preventDefault()
if (!tokenName.trim()) return
createToken(tokenName.trim())
}
const handleCopy = (id: string, token: string) => {
navigator.clipboard.writeText(token)
setCopiedId(id)
toast.success('Copied API token to clipboard')
setTimeout(() => setCopiedId(null), 2000)
}
if (isLoading) {
return (
<div className="flex justify-center items-center p-8">
<Loader2 className="w-8 h-8 animate-spin text-muted-foreground" />
</div>
)
}
return (
<div className="space-y-6">
<Card>
<CardHeader>
<CardTitle>API Tokens</CardTitle>
<CardDescription>
Generate and manage API tokens. These tokens allow you or your agents to run terminal
commands via shumai-cli.
</CardDescription>
</CardHeader>
<CardContent className="space-y-6">
<form onSubmit={handleGenerate} className="flex gap-4 items-end max-w-md">
<div className="flex-1 space-y-2">
<label htmlFor="tokenName" className="text-sm font-medium text-muted-foreground">
Token Name
</label>
<Input
id="tokenName"
value={tokenName}
onChange={(e) => setTokenName(e.target.value)}
placeholder="e.g. My CLI token"
required
/>
</div>
<Button type="submit" disabled={isCreating || !tokenName.trim()}>
{isCreating ? (
<Loader2 className="w-4 h-4 animate-spin mr-2" />
) : (
<Plus className="w-4 h-4 mr-2" />
)}
Generate
</Button>
</form>
<div className="border rounded-lg overflow-hidden">
<Table>
<TableHeader>
<TableRow>
<TableHead>Name</TableHead>
<TableHead>Token</TableHead>
<TableHead>Created At</TableHead>
<TableHead className="w-[100px] text-right">Actions</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{!tokens || tokens.length === 0 ? (
<TableRow>
<TableCell
colSpan={4}
className="text-center py-6 text-muted-foreground text-sm"
>
No API tokens found. Generate one above to get started.
</TableCell>
</TableRow>
) : (
tokens.map((token) => (
<TableRow key={token.id}>
<TableCell className="font-medium">{token.name}</TableCell>
<TableCell className="font-mono text-sm max-w-[200px] truncate">
<div className="flex items-center gap-2">
<span>{token.token.substring(0, 8)}...</span>
<Button
variant="ghost"
size="icon"
className="h-7 w-7"
onClick={() => handleCopy(token.id, token.token)}
>
{copiedId === token.id ? (
<Check className="h-3.5 w-3.5 text-green-500" />
) : (
<Copy className="h-3.5 w-3.5" />
)}
</Button>
</div>
</TableCell>
<TableCell className="text-muted-foreground">
{new Date(token.createdAt).toLocaleDateString()}
</TableCell>
<TableCell className="text-right">
<Button
variant="ghost"
size="icon"
className="h-8 w-8 text-red-500 hover:text-red-600 hover:bg-red-50"
onClick={() => deleteToken(token.id)}
>
<Trash2 className="h-4 w-4" />
</Button>
</TableCell>
</TableRow>
))
)}
</TableBody>
</Table>
</div>
</CardContent>
</Card>
</div>
)
}
@@ -45,10 +45,14 @@ export function ShareSettingsSidebar({
onSortOrderChange,
}: ShareSettingsSidebarProps) {
const queryClient = useQueryClient()
const [password, setPassword] = useState('')
const [password, setPassword] = useState(shareLink.password || '')
const [expireAt, setExpireAt] = useState<Date | undefined>(
shareLink.expireAt ? new Date(shareLink.expireAt) : undefined,
)
React.useEffect(() => {
setPassword(shareLink.password || '')
}, [shareLink.password])
const [isPasswordEnabled, setIsPasswordEnabled] = useState(shareLink.hasPassword)
const [isExpireEnabled, setIsExpireEnabled] = useState(!!shareLink.expireAt)
@@ -146,10 +150,10 @@ export function ShareSettingsSidebar({
{isPasswordEnabled && (
<div className="flex gap-2 animate-in fade-in slide-in-from-top-1 duration-200">
<Input
type="password"
type="text"
value={password}
onChange={(e) => setPassword(e.target.value)}
placeholder={shareLink.hasPassword ? '••••••••' : 'Set password'}
placeholder="Enter password"
className="text-xs"
/>
<Button size="sm" onClick={() => updateShare({ password })}>
+12
View File
@@ -5,6 +5,18 @@ import ReactDOM from 'react-dom/client'
import { ThemeProvider } from './components/theme-provider'
import { routeTree } from './routeTree.gen'
if (typeof window !== 'undefined') {
const resizeObserverErrorNames = [
'ResizeObserver loop limit exceeded',
'ResizeObserver loop completed with undelivered notifications.',
]
window.addEventListener('error', (e) => {
if (resizeObserverErrorNames.includes(e.message)) {
e.stopImmediatePropagation()
}
})
}
const queryClient = new QueryClient()
// Set up a Router instance
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@shumai/webui",
"version": "0.0.10",
"version": "0.1.2",
"private": true,
"type": "module",
"main": "./index.html",
-34
View File
@@ -1,43 +1,9 @@
import { client } from '@/ui/api/client'
import { ProjectFolderSkeleton } from '@/ui/components/loading-skeletons'
import { useQuery } from '@tanstack/react-query'
import { createFileRoute, Outlet } from '@tanstack/react-router'
function ShareLayout() {
const { shareId } = Route.useParams()
const {
data: shareInfo,
isLoading,
error,
} = useQuery({
queryKey: ['share-info', shareId],
queryFn: async () => {
const res = await client.api.shares[':shareId'].info.$get({
param: { shareId },
})
if (!res.ok) throw new Error('Failed to fetch share info')
return await res.json()
},
})
if (isLoading) return <ProjectFolderSkeleton />
if (error || !shareInfo)
return (
<div className="flex h-screen items-center justify-center text-destructive">
Share not found or inaccessible.
</div>
)
return <Outlet />
}
export const Route = createFileRoute('/share/$shareId')({
component: ShareLayout,
beforeLoad: ({ params: { shareId } }) => {
return {
password: localStorage.getItem(`share_pwd_${shareId}`) || '',
}
},
})
@@ -1,36 +1,11 @@
import { client } from '@/ui/api/client'
import { PublicShareManager } from '@/ui/components/public-share-manager'
import { useQuery } from '@tanstack/react-query'
import { createFileRoute } from '@tanstack/react-router'
function PublicShareFilePage() {
const { shareId, fileId } = Route.useParams()
const { start } = Route.useSearch()
const { data: shareInfo } = useQuery({
queryKey: ['share-info', shareId],
queryFn: async () => {
const res = await client.api.shares[':shareId'].info.$get({
param: { shareId },
})
if (!res.ok) throw new Error('Failed to fetch share info')
return await res.json()
},
})
if (!shareInfo) return null
return (
<PublicShareManager
shareInfo={{
...shareInfo,
expireAt: shareInfo.expireAt ?? null,
isDisabled: shareInfo.isDisabled ?? false,
}}
initialFileId={fileId}
startTime={start}
/>
)
return <PublicShareManager shareId={shareId} initialFileId={fileId} startTime={start} />
}
export const Route = createFileRoute('/share/$shareId/files/$fileId')({
@@ -1,34 +1,10 @@
import { client } from '@/ui/api/client'
import { PublicShareManager } from '@/ui/components/public-share-manager'
import { useQuery } from '@tanstack/react-query'
import { createFileRoute } from '@tanstack/react-router'
function PublicShareFolderPage() {
const { shareId, folderId } = Route.useParams()
const { data: shareInfo } = useQuery({
queryKey: ['share-info', shareId],
queryFn: async () => {
const res = await client.api.shares[':shareId'].info.$get({
param: { shareId },
})
if (!res.ok) throw new Error('Failed to fetch share info')
return await res.json()
},
})
if (!shareInfo) return null
return (
<PublicShareManager
shareInfo={{
...shareInfo,
expireAt: shareInfo.expireAt ?? null,
isDisabled: shareInfo.isDisabled ?? false,
}}
initialFolderId={folderId}
/>
)
return <PublicShareManager shareId={shareId} initialFolderId={folderId} />
}
export const Route = createFileRoute('/share/$shareId/folders/$folderId')({
+1 -25
View File
@@ -1,34 +1,10 @@
import { client } from '@/ui/api/client'
import { PublicShareManager } from '@/ui/components/public-share-manager'
import { useQuery } from '@tanstack/react-query'
import { createFileRoute } from '@tanstack/react-router'
function PublicShareIndexPage() {
const { shareId } = Route.useParams()
const { data: shareInfo } = useQuery({
queryKey: ['share-info', shareId],
queryFn: async () => {
const res = await client.api.shares[':shareId'].info.$get({
param: { shareId },
})
if (!res.ok) throw new Error('Failed to fetch share info')
return await res.json()
},
})
if (!shareInfo) return null
return (
<PublicShareManager
shareInfo={{
...shareInfo,
expireAt: shareInfo.expireAt ?? null,
isDisabled: shareInfo.isDisabled ?? false,
}}
initialFolderId={shareInfo.rootFolderId}
/>
)
return <PublicShareManager shareId={shareId} />
}
export const Route = createFileRoute('/share/$shareId/')({
@@ -5,11 +5,12 @@ import { ProvidersSettings } from '@/ui/components/settings/ProvidersSettings'
import { SandboxSettings } from '@/ui/components/settings/SandboxSettings'
import { SkillsConfigCard } from '@/ui/components/settings/SkillsConfigCard'
import { NotificationSettings } from '@/ui/components/settings/NotificationSettings'
import { DeveloperSettings } from '@/ui/components/settings/DeveloperSettings'
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/ui/components/ui/card'
import { cn } from '@/ui/lib/utils'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { createFileRoute } from '@tanstack/react-router'
import { Bot, Cpu, Film, Loader2, Puzzle, Shield, User, Bell } from 'lucide-react'
import { Bot, Cpu, Film, Loader2, Puzzle, Shield, User, Bell, Key } from 'lucide-react'
import { useState, useRef, useEffect } from 'react'
import { Avatar, AvatarFallback, AvatarImage } from '@/ui/components/ui/avatar'
import { Input } from '@/ui/components/ui/input'
@@ -25,6 +26,7 @@ type SettingsTab =
| 'agents'
| 'sandbox'
| 'notifications'
| 'developer'
function TeamSettingsPage() {
const { teamId } = Route.useParams()
@@ -267,6 +269,22 @@ function TeamSettingsPage() {
)}
</button>
<button
onClick={() => setActiveTab('developer')}
className={cn(
'w-full flex items-center gap-3 px-4 py-3 text-sm font-medium rounded-lg transition-all',
activeTab === 'developer'
? 'bg-sidebar-accent text-sidebar-accent-foreground ring-1 ring-sidebar-border'
: 'text-sidebar-foreground/75 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',
)}
>
<Key className="w-5 h-5" />
API Tokens
{activeTab === 'developer' && (
<div className="ml-auto w-1.5 h-1.5 rounded-full bg-sidebar-primary" />
)}
</button>
{me?.role === 'owner' && (
<>
<div className="mt-6 mb-2 px-4 text-xs font-semibold text-sidebar-foreground/60 uppercase tracking-wider pt-4 border-t border-sidebar-border">
@@ -354,6 +372,7 @@ function TeamSettingsPage() {
{activeTab === 'agents' && 'AI Agents'}
{activeTab === 'sandbox' && 'Agent Sandbox Settings'}
{activeTab === 'notifications' && 'Notification Settings'}
{activeTab === 'developer' && 'Developer Settings'}
</h2>
<p className="text-sm text-muted-foreground mt-1">
{activeTab === 'general' && 'View your personal information and team role.'}
@@ -367,6 +386,8 @@ function TeamSettingsPage() {
'Configure security and network restrictions for the AI agent.'}
{activeTab === 'notifications' &&
'Configure your personal notification preferences for this team.'}
{activeTab === 'developer' &&
'Generate and manage API keys for developers and automated workflows.'}
</p>
</div>
</div>
@@ -559,6 +580,8 @@ function TeamSettingsPage() {
)}
{activeTab === 'notifications' && <NotificationSettings teamId={teamId} />}
{activeTab === 'developer' && <DeveloperSettings teamId={teamId} />}
</div>
</div>
</main>

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