Compare commits

...

12 Commits

Author SHA1 Message Date
HouYunFei 8aa3fad684 chore: update Docker image names to reflect new repository ownership 2026-06-08 15:30:08 +08:00
HouYunFei 22f256d1be chore: update changelog for v0.2.5 release and bump version to v0.2.5 2026-06-08 15:27:33 +08:00
HouYunFei 8d0b5ecdb8 feat(video): implement video generation task creation and polling mechanism 2026-06-08 15:26:35 +08:00
HouYunFei 373229a04a fix(canvas): resolve text node editing issues and improve textarea rendering 2026-06-08 15:11:16 +08:00
HouYunFei 39a1e859b1 feat(webdav): add WebDAV synchronization configuration and functionality 2026-06-08 14:59:30 +08:00
kunkun dd9347e85d Merge pull request #47 from YuSaZh/main
ci: 增加 ARM 架构 Docker 镜像自动构建
2026-06-08 11:30:16 +08:00
YuSaZh 13418a4d26 ci: build docker images on native runners 2026-06-07 22:25:30 +09:00
YuSaZh 506378c308 ci: publish multi-arch docker images 2026-06-07 21:46:01 +09:00
HouYunFei 81b9a207b9 feat(toolbar): add image splitting feature to toolbar for generating sub-images 2026-06-07 12:25:52 +08:00
kunkun 3667557dc2 Merge pull request #37 from 1847123733/main
添加图像节点双击放大预览功能
2026-06-04 17:41:54 +08:00
1847123733 eb050fc08a Merge branch 'basketikun:main' into main 2026-06-04 17:15:17 +08:00
王鑫凯 72024c8138 feat(canvas): 添加图像节点预览功能
- 在CanvasNode组件中添加onViewImage回调属性
- 实现图像节点点击时触发预览功能
- 修复事件冒泡问题,确保图像预览操作不会触发其他交互
2026-06-04 17:13:28 +08:00
21 changed files with 1412 additions and 105 deletions
+89 -15
View File
@@ -9,9 +9,37 @@ permissions:
contents: read
packages: write
env:
IMAGE_NAME: ghcr.io/basketikun/infinite-canvas
jobs:
build:
meta:
runs-on: ubuntu-latest
outputs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
steps:
- id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.IMAGE_NAME }}
tags: |
type=ref,event=tag
type=sha,prefix=
build:
needs: meta
runs-on: ${{ matrix.runner }}
strategy:
fail-fast: false
matrix:
include:
- platform: linux/amd64
arch: amd64
runner: ubuntu-latest
- platform: linux/arm64
arch: arm64
runner: ubuntu-24.04-arm
steps:
- uses: actions/checkout@v4
@@ -23,19 +51,65 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}
tags: |
type=ref,event=tag
type=sha,prefix=
- uses: docker/build-push-action@v6
- id: build
uses: docker/build-push-action@v6
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
platforms: ${{ matrix.platform }}
labels: ${{ needs.meta.outputs.labels }}
outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
cache-from: type=gha,scope=app-${{ matrix.arch }}
cache-to: type=gha,mode=max,scope=app-${{ matrix.arch }}
- name: Export digest
shell: bash
run: |
mkdir -p "$RUNNER_TEMP/digests"
digest="${{ steps.build.outputs.digest }}"
touch "$RUNNER_TEMP/digests/${digest#sha256:}"
- uses: actions/upload-artifact@v4
with:
name: digests-${{ matrix.arch }}
path: ${{ runner.temp }}/digests/*
if-no-files-found: error
retention-days: 1
merge:
needs:
- meta
- build
runs-on: ubuntu-latest
steps:
- uses: docker/setup-buildx-action@v3
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/download-artifact@v4
with:
path: ${{ runner.temp }}/digests
pattern: digests-*
merge-multiple: true
- name: Create multi-arch manifest
shell: bash
env:
TAGS: ${{ needs.meta.outputs.tags }}
run: |
tag_args=()
while IFS= read -r tag; do
if [ -n "$tag" ]; then
tag_args+=("-t" "$tag")
fi
done <<< "$TAGS"
digest_args=()
while IFS= read -r digest_file; do
digest_args+=("${IMAGE_NAME}@sha256:${digest_file}")
done < <(find "$RUNNER_TEMP/digests" -type f -printf '%f\n' | sort)
docker buildx imagetools create "${tag_args[@]}" "${digest_args[@]}"
+90 -16
View File
@@ -9,9 +9,38 @@ permissions:
contents: read
packages: write
env:
IMAGE_NAME: ghcr.io/basketikun/infinite-canvas-docs
jobs:
build:
meta:
runs-on: ubuntu-latest
outputs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
steps:
- id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.IMAGE_NAME }}
tags: |
type=raw,value=latest
type=ref,event=tag
type=sha,prefix=
build:
needs: meta
runs-on: ${{ matrix.runner }}
strategy:
fail-fast: false
matrix:
include:
- platform: linux/amd64
arch: amd64
runner: ubuntu-latest
- platform: linux/arm64
arch: arm64
runner: ubuntu-24.04-arm
steps:
- uses: actions/checkout@v4
@@ -23,21 +52,66 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}-docs
tags: |
type=raw,value=latest
type=ref,event=tag
type=sha,prefix=
- uses: docker/build-push-action@v6
- id: build
uses: docker/build-push-action@v6
with:
context: .
file: ./docs/Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=docs
cache-to: type=gha,mode=max,scope=docs
platforms: ${{ matrix.platform }}
labels: ${{ needs.meta.outputs.labels }}
outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
cache-from: type=gha,scope=docs-${{ matrix.arch }}
cache-to: type=gha,mode=max,scope=docs-${{ matrix.arch }}
- name: Export digest
shell: bash
run: |
mkdir -p "$RUNNER_TEMP/digests"
digest="${{ steps.build.outputs.digest }}"
touch "$RUNNER_TEMP/digests/${digest#sha256:}"
- uses: actions/upload-artifact@v4
with:
name: docs-digests-${{ matrix.arch }}
path: ${{ runner.temp }}/digests/*
if-no-files-found: error
retention-days: 1
merge:
needs:
- meta
- build
runs-on: ubuntu-latest
steps:
- uses: docker/setup-buildx-action@v3
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/download-artifact@v4
with:
path: ${{ runner.temp }}/digests
pattern: docs-digests-*
merge-multiple: true
- name: Create multi-arch manifest
shell: bash
env:
TAGS: ${{ needs.meta.outputs.tags }}
run: |
tag_args=()
while IFS= read -r tag; do
if [ -n "$tag" ]; then
tag_args+=("-t" "$tag")
fi
done <<< "$TAGS"
digest_args=()
while IFS= read -r digest_file; do
digest_args+=("${IMAGE_NAME}@sha256:${digest_file}")
done < <(find "$RUNNER_TEMP/digests" -type f -printf '%f\n' | sort)
docker buildx imagetools create "${tag_args[@]}" "${digest_args[@]}"
+6
View File
@@ -2,6 +2,12 @@
## Unreleased
## v0.2.5 - 2026-06-08
+ [新增] 新增图片切图功能。
+ [新增] 支持webdav同步数据。
+ [修复] 修复画布文字节点错误问题。
## v0.2.4 - 2026-06-04
+ [新增] 新增图片反推提示词功能。
+1 -1
View File
@@ -1 +1 @@
v0.2.4
v0.2.5
@@ -5,6 +5,10 @@ description: 当前版本已实现但仍需人工验证的变更项
# 待测试
- 视频创作台创建视频任务成功后会立即写入左侧生成记录,状态显示为“生成中”;刷新页面后会读取本地任务 ID 继续轮询,任务成功或失败后更新同一条记录,需要验证 OpenAI 视频接口和 Seedance 任务接口的刷新恢复。
- 修复画布文字节点编辑时双击进入编辑、全选文本出现重影和错位的问题;文字节点内容编辑框改为使用原生 textarea 文本渲染,仍保留 `@` 资源候选插入,需要验证编辑态选区、展示态文字换行和右上角“生图”按钮避让都正常。
- 配置弹窗新增 WebDAV 同步配置,可填写 WebDAV 地址、远程目录、用户名和密码/应用密码,并选择“前端直连”或“Next.js 转发”;远端会按 `canvas/`、`assets/`、`image-workbench/`、`video-workbench/` 四个业务目录分别写入 `manifest.json` 清单和 `files/` 媒体目录,会合并画布项目、我的素材、生图/视频生成记录和引用到的本地媒体文件,四个业务分区会并发同步,并在同步中显示读取远端、检查媒体、上传新增媒体、上传清单等阶段和文件计数进度条;WebDAV 请求会做超时提示,目录已存在但 `MKCOL` 返回 `423 Locked` 时会复查目录存在后继续同步,需要在支持 CORS 的 NAS/WebDAV 服务和不支持 CORS 的 Koofr 转发模式下验证首次上传、第二台设备拉取合并、再次同步和认证失败提示。
- 图片节点悬浮工具栏新增“切图”入口;点击后可输入行数和列数,预览切分网格,并在确认后把原图切成对应数量的图片子节点,按原图网格排列到画布右侧且自动与原图连线。
- 画布生成配置节点的“生成配置/组装提示词”改为在节点下方打开独立输入浮层;浮层支持输入 `@` 从已连接图片、文本、视频、音频中选择引用,引用会以图片缩略图或文本标记展示,图片引用可放大预览;生成时再按当前引用解析为实际素材编号,不再提供或读取输入排序。
- 图片节点悬浮工具栏新增“局部编辑”入口,打开后可在图片上用画笔/擦除工具绘制遮罩区域、填写局部修改要求,并通过图片编辑接口携带同尺寸 PNG mask 生成新图片节点;结果节点会放在原图右侧并自动连线,原图保持不变。
- 图片节点悬浮工具栏新增“反推提示词”入口;点击后会在原图右侧创建包含反推预设提示词的文本节点,并继续创建一个已切到“文本”模式的生成配置节点,图片节点和文本节点都会自动连到该配置节点,配置节点会预填包含原图和文本节点引用的组装提示词并自动打开,用户可自行点击配置节点开始生成。
@@ -19,7 +19,7 @@ import { canvasThemes, type CanvasBackgroundMode } from "@/lib/canvas-theme";
import { UserStatusActions } from "@/components/layout/user-status-actions";
import { useAssetStore } from "@/stores/use-asset-store";
import { useThemeStore } from "@/stores/use-theme-store";
import { cropDataUrl, upscaleDataUrl } from "../utils/canvas-image-data";
import { cropDataUrl, splitDataUrl, upscaleDataUrl } from "../utils/canvas-image-data";
import { fitNodeSize, nodeSizeFromRatio } from "../utils/canvas-node-size";
import { App, Button, Dropdown, Modal } from "antd";
import { NODE_DEFAULT_SIZE, getNodeSpec } from "../constants";
@@ -31,6 +31,7 @@ import { CanvasNodeContextMenu } from "../components/canvas-context-menu";
import { CanvasNodeAngleDialog, type CanvasImageAngleParams } from "../components/canvas-node-angle-dialog";
import { CanvasNodeCropDialog, type CanvasImageCropRect } from "../components/canvas-node-crop-dialog";
import { CanvasNodeMaskEditDialog, type CanvasImageMaskEditPayload } from "../components/canvas-node-mask-edit-dialog";
import { CanvasNodeSplitDialog, type CanvasImageSplitParams } from "../components/canvas-node-split-dialog";
import { CanvasNodeUpscaleDialog, type CanvasImageUpscaleParams } from "../components/canvas-node-upscale-dialog";
import { buildNodeChatMessages, buildNodeGenerationContext, buildNodeGenerationInputs, hydrateNodeGenerationContext, type NodeGenerationInput } from "../components/canvas-node-generation";
import { CanvasNodeHoverToolbar, CanvasNodeInfoModal } from "../components/canvas-node-hover-toolbar";
@@ -282,6 +283,7 @@ function InfiniteCanvasPage() {
const [infoNodeId, setInfoNodeId] = useState<string | null>(null);
const [cropNodeId, setCropNodeId] = useState<string | null>(null);
const [maskEditNodeId, setMaskEditNodeId] = useState<string | null>(null);
const [splitNodeId, setSplitNodeId] = useState<string | null>(null);
const [upscaleNodeId, setUpscaleNodeId] = useState<string | null>(null);
const [superResolveNodeId, setSuperResolveNodeId] = useState<string | null>(null);
const [angleNodeId, setAngleNodeId] = useState<string | null>(null);
@@ -586,6 +588,7 @@ function InfiniteCanvasPage() {
const infoNode = infoNodeId ? nodeById.get(infoNodeId) || null : null;
const cropNode = cropNodeId ? nodeById.get(cropNodeId) || null : null;
const maskEditNode = maskEditNodeId ? nodeById.get(maskEditNodeId) || null : null;
const splitNode = splitNodeId ? nodeById.get(splitNodeId) || null : null;
const upscaleNode = upscaleNodeId ? nodeById.get(upscaleNodeId) || null : null;
const superResolveNode = superResolveNodeId ? nodeById.get(superResolveNodeId) || null : null;
const angleNode = angleNodeId ? nodeById.get(angleNodeId) || null : null;
@@ -1519,6 +1522,44 @@ function InfiniteCanvasPage() {
setCropNodeId(null);
}, []);
const splitImageNode = useCallback(
async (node: CanvasNodeData, params: CanvasImageSplitParams) => {
if (!node.metadata?.content) return;
setSplitNodeId(null);
const pieces = await splitDataUrl(node.metadata.content, params);
const gap = 16;
const cellWidth = node.width / params.columns;
const cellHeight = node.height / params.rows;
const startX = node.position.x + node.width + 96;
const startY = node.position.y;
const childNodes = await Promise.all(
pieces.map(async (piece) => {
const image = await uploadImage(piece.dataUrl);
const id = nanoid();
return {
id,
type: CanvasNodeType.Image,
title: `${node.title || "图片"} ${piece.row + 1}-${piece.column + 1}`,
position: { x: startX + piece.column * (cellWidth + gap), y: startY + piece.row * (cellHeight + gap) },
width: cellWidth,
height: cellHeight,
metadata: {
...imageMetadata(image),
prompt: node.metadata?.prompt,
},
} satisfies CanvasNodeData;
}),
);
setNodes((prev) => [...prev, ...childNodes]);
setConnections((prev) => [...prev, ...childNodes.map((child) => ({ id: nanoid(), fromNodeId: node.id, toNodeId: child.id }))]);
setSelectedNodeIds(new Set(childNodes.map((child) => child.id)));
setSelectedConnectionId(null);
setDialogNodeId(null);
message.success(`已切分为 ${childNodes.length} 个子节点`);
},
[message],
);
const maskEditImageNode = useCallback(
async (node: CanvasNodeData, payload: CanvasImageMaskEditPayload) => {
if (!node.metadata?.content) return;
@@ -2396,6 +2437,7 @@ function InfiniteCanvasPage() {
onSetBatchPrimary={setBatchPrimary}
onRetry={(node) => void handleRetryNode(node)}
onGenerateImage={generateImageFromTextNode}
onViewImage={(node) => setPreviewNodeId(node.id)}
onContextMenu={(event, id) => {
event.preventDefault();
event.stopPropagation();
@@ -2436,6 +2478,7 @@ function InfiniteCanvasPage() {
onSaveAsset={(node) => void saveNodeAsset(node)}
onMaskEdit={(node) => setMaskEditNodeId(node.id)}
onCrop={(node) => setCropNodeId(node.id)}
onSplit={(node) => setSplitNodeId(node.id)}
onUpscale={(node) => setUpscaleNodeId(node.id)}
onSuperResolve={(node) => setSuperResolveNodeId(node.id)}
onAngle={(node) => setAngleNodeId(node.id)}
@@ -2507,6 +2550,8 @@ function InfiniteCanvasPage() {
{maskEditNode?.metadata?.content ? <CanvasNodeMaskEditDialog dataUrl={maskEditNode.metadata.content} open={Boolean(maskEditNode)} onClose={() => setMaskEditNodeId(null)} onConfirm={(payload) => void maskEditImageNode(maskEditNode!, payload)} /> : null}
{splitNode?.metadata?.content ? <CanvasNodeSplitDialog dataUrl={splitNode.metadata.content} open={Boolean(splitNode)} onClose={() => setSplitNodeId(null)} onConfirm={(params) => void splitImageNode(splitNode!, params)} /> : null}
{upscaleNode?.metadata?.content ? <CanvasNodeUpscaleDialog dataUrl={upscaleNode.metadata.content} open={Boolean(upscaleNode)} onClose={() => setUpscaleNodeId(null)} onConfirm={(params) => void upscaleImageNode(upscaleNode!, params)} /> : null}
<Modal title="AI 超分" open={Boolean(superResolveNode?.metadata?.content)} centered footer={null} onCancel={() => setSuperResolveNodeId(null)}>
@@ -1,11 +1,11 @@
"use client";
import type { ReactNode } from "react";
import { Brush, Camera, Copy, FileText, Lock, LockOpen, Maximize2, Scissors, Sparkles, Upload, ZoomIn } from "lucide-react";
import { Brush, Camera, Copy, FileText, Grid2x2, Lock, LockOpen, Maximize2, Scissors, Sparkles, Upload, ZoomIn } from "lucide-react";
import type { CanvasNodeData } from "../types";
export type ImageNodeActionToolId = "copyPrompt" | "reversePrompt" | "replace" | "resize" | "maskEdit" | "crop" | "upscale" | "superResolve" | "angle" | "view";
export type ImageNodeActionToolId = "copyPrompt" | "reversePrompt" | "replace" | "resize" | "maskEdit" | "crop" | "split" | "upscale" | "superResolve" | "angle" | "view";
export type ImageQuickToolId = "info" | "delete" | "saveAsset" | "download" | "edit" | ImageNodeActionToolId;
export type ImageToolHandlers = {
@@ -13,6 +13,7 @@ export type ImageToolHandlers = {
onToggleFreeResize: (node: CanvasNodeData) => void;
onMaskEdit: (node: CanvasNodeData) => void;
onCrop: (node: CanvasNodeData) => void;
onSplit: (node: CanvasNodeData) => void;
onUpscale: (node: CanvasNodeData) => void;
onSuperResolve: (node: CanvasNodeData) => void;
onAngle: (node: CanvasNodeData) => void;
@@ -37,7 +38,7 @@ export type ImageQuickToolsConfig = {
showLabels: boolean;
};
export const IMAGE_QUICK_TOOLS_STORAGE_KEY = "canvas-image-quick-tools-v5";
export const IMAGE_QUICK_TOOLS_STORAGE_KEY = "canvas-image-quick-tools-v6";
const defaultBaseToolIds: ImageQuickToolId[] = ["info", "delete", "saveAsset", "download", "edit"];
@@ -97,6 +98,15 @@ export const imageToolDefinitions: ImageToolDefinition[] = [
icon: () => <Scissors className="size-4" />,
run: (node, handlers) => handlers.onCrop(node),
},
{
id: "split",
defaultVisible: true,
panelLabel: "切图",
label: "切图",
title: "按行列切分图片",
icon: () => <Grid2x2 className="size-4" />,
run: (node, handlers) => handlers.onSplit(node),
},
{
id: "upscale",
defaultVisible: true,
@@ -28,6 +28,7 @@ type CanvasNodeHoverToolbarProps = {
onSaveAsset: (node: CanvasNodeData) => void;
onMaskEdit: (node: CanvasNodeData) => void;
onCrop: (node: CanvasNodeData) => void;
onSplit: (node: CanvasNodeData) => void;
onUpscale: (node: CanvasNodeData) => void;
onSuperResolve: (node: CanvasNodeData) => void;
onAngle: (node: CanvasNodeData) => void;
@@ -64,6 +65,7 @@ export function CanvasNodeHoverToolbar({
onSaveAsset,
onMaskEdit,
onCrop,
onSplit,
onUpscale,
onSuperResolve,
onAngle,
@@ -121,7 +123,7 @@ export function CanvasNodeHoverToolbar({
}
copyText(prompt, "提示词已复制");
};
const imageTools = buildImageToolbarTools(node, { onUpload, onToggleFreeResize, onMaskEdit, onCrop, onUpscale, onSuperResolve, onAngle, onViewImage, onCopyPrompt: copyImagePrompt, onReversePrompt });
const imageTools = buildImageToolbarTools(node, { onUpload, onToggleFreeResize, onMaskEdit, onCrop, onSplit, onUpscale, onSuperResolve, onAngle, onViewImage, onCopyPrompt: copyImagePrompt, onReversePrompt });
function openImageToolSettings() {
onKeep(node.id);
@@ -0,0 +1,104 @@
"use client";
import { useEffect, useState } from "react";
import { Button, InputNumber, Modal } from "antd";
import { Grid2x2 } from "lucide-react";
import { readImageMeta } from "@/lib/image-utils";
import type { ImageSplitParams } from "../utils/canvas-image-data";
export type CanvasImageSplitParams = ImageSplitParams;
const defaultParams: CanvasImageSplitParams = { rows: 2, columns: 2 };
const maxGridSize = 12;
export function CanvasNodeSplitDialog({ dataUrl, open, onClose, onConfirm }: { dataUrl: string; open: boolean; onClose: () => void; onConfirm: (params: CanvasImageSplitParams) => void }) {
const [params, setParams] = useState(defaultParams);
const [image, setImage] = useState<{ width: number; height: number } | null>(null);
const total = params.rows * params.columns;
const pieceSize = image ? { width: Math.max(1, Math.floor(image.width / params.columns)), height: Math.max(1, Math.floor(image.height / params.rows)) } : null;
useEffect(() => {
if (!open) return;
setParams(defaultParams);
setImage(null);
}, [dataUrl, open]);
useEffect(() => {
if (!open) return;
void readImageMeta(dataUrl).then(setImage);
}, [dataUrl, open]);
const update = (key: keyof CanvasImageSplitParams, value: string | number | null) => {
setParams((current) => ({ ...current, [key]: clampGrid(value ?? current[key]) }));
};
return (
<Modal title={null} open={open && Boolean(dataUrl)} onCancel={onClose} footer={null} width={780} centered destroyOnHidden>
<div className="space-y-5">
<div>
<h2 className="text-xl font-semibold"></h2>
<p className="mt-1 text-sm opacity-60"> {total} </p>
</div>
<div className="grid gap-6 md:grid-cols-[minmax(260px,1fr)_280px]">
<div className="rounded-xl border p-4">
<div className="grid min-h-[300px] place-items-center rounded-lg bg-black/5">
<div className="relative inline-block max-w-full overflow-hidden rounded-lg bg-black shadow-xl">
<img src={dataUrl} alt="" className="block max-h-[340px] max-w-full object-contain opacity-95" draggable={false} />
<SplitGrid rows={params.rows} columns={params.columns} />
</div>
</div>
<div className="mt-3 flex items-center justify-between text-sm">
<span className="opacity-60"></span>
<span className="font-semibold">{image ? `${image.width} x ${image.height} px` : "读取中"}</span>
</div>
</div>
<div className="space-y-5 py-2">
<NumberField label="行数" value={params.rows} onChange={(value) => update("rows", value)} />
<NumberField label="列数" value={params.columns} onChange={(value) => update("columns", value)} />
<div className="rounded-xl border px-4 py-3 text-sm">
<div className="flex items-center justify-between">
<span className="opacity-60"></span>
<span className="font-semibold">{total} </span>
</div>
<div className="mt-2 flex items-center justify-between">
<span className="opacity-60"></span>
<span className="font-semibold">{pieceSize ? `${pieceSize.width} x ${pieceSize.height}` : "未知"}</span>
</div>
</div>
<Button type="primary" size="large" className="w-full" icon={<Grid2x2 className="size-4" />} onClick={() => onConfirm(params)}>
</Button>
</div>
</div>
</div>
</Modal>
);
}
function NumberField({ label, value, onChange }: { label: string; value: number; onChange: (value: string | number | null) => void }) {
return (
<label className="block space-y-2">
<span className="font-medium opacity-75">{label}</span>
<InputNumber className="w-full" min={1} max={maxGridSize} precision={0} value={value} onChange={onChange} />
</label>
);
}
function SplitGrid({ rows, columns }: CanvasImageSplitParams) {
return (
<div className="pointer-events-none absolute inset-0">
{Array.from({ length: columns - 1 }).map((_, index) => (
<div key={`column-${index}`} className="absolute inset-y-0 border-l border-white/90 shadow-[0_0_0_1px_rgba(0,0,0,.35)]" style={{ left: `${((index + 1) / columns) * 100}%` }} />
))}
{Array.from({ length: rows - 1 }).map((_, index) => (
<div key={`row-${index}`} className="absolute inset-x-0 border-t border-white/90 shadow-[0_0_0_1px_rgba(0,0,0,.35)]" style={{ top: `${((index + 1) / rows) * 100}%` }} />
))}
</div>
);
}
function clampGrid(value: string | number) {
const numberValue = Number(value);
return Math.min(maxGridSize, Math.max(1, Math.round(Number.isFinite(numberValue) ? numberValue : 1)));
}
@@ -45,6 +45,7 @@ type CanvasNodeProps = {
onSetBatchPrimary?: (node: CanvasNodeData) => void;
onRetry?: (node: CanvasNodeData) => void;
onGenerateImage?: (node: CanvasNodeData) => void;
onViewImage?: (node: CanvasNodeData) => void;
onContextMenu: (event: React.MouseEvent, nodeId: string) => void;
};
@@ -99,6 +100,7 @@ export const CanvasNode = React.memo(function CanvasNode({
onSetBatchPrimary,
onRetry,
onGenerateImage,
onViewImage,
onContextMenu,
}: CanvasNodeProps) {
const theme = canvasThemes[useThemeStore((state) => state.theme)];
@@ -269,6 +271,11 @@ export const CanvasNode = React.memo(function CanvasNode({
onToggleBatch?.(data.id);
return;
}
if (data.type === CanvasNodeType.Image && hasImageContent) {
event.stopPropagation();
onViewImage?.(data);
return;
}
if (data.type !== CanvasNodeType.Text) return;
event.stopPropagation();
setIsEditingContent(true);
@@ -334,7 +341,7 @@ function NodeContent(props: NodeContentRendererProps) {
if (props.node.metadata?.status === "error") return <ErrorContent node={props.node} theme={props.theme} onRetry={props.onRetry} />;
const Renderer = nodeContentRenderers[props.node.type];
return <Renderer {...props} />;
return Renderer ? <Renderer {...props} /> : <UnknownNodeContent theme={props.theme} />;
}
const nodeContentRenderers = {
@@ -375,7 +382,18 @@ function ErrorContent({ node, theme, onRetry }: Pick<NodeContentRendererProps, "
);
}
function UnknownNodeContent({ theme }: Pick<NodeContentRendererProps, "theme">) {
return (
<div className="flex h-full w-full items-center justify-center text-sm" style={{ color: theme.node.placeholder }}>
</div>
);
}
function TextContent({ node, theme, isEditingContent, textareaRef, mentionReferences, onContentChange, onStopEditing, onGenerateImage }: NodeContentRendererProps) {
const fontSize = node.metadata?.fontSize || 14;
const textStyle = { fontSize: `${fontSize}px`, lineHeight: `${Math.round(fontSize * 1.65)}px`, color: theme.node.text, boxSizing: "border-box" } as React.CSSProperties;
return (
<div className="flex h-full w-full flex-col overflow-hidden pt-8">
<button
@@ -397,10 +415,11 @@ function TextContent({ node, theme, isEditingContent, textareaRef, mentionRefere
{isEditingContent ? (
<CanvasResourceMentionTextarea
ref={textareaRef}
className="thin-scrollbar block h-full w-full resize-none overflow-y-auto whitespace-pre-wrap break-words border-none bg-transparent pl-4 pr-14 pt-0 pb-4 m-0 font-mono leading-relaxed outline-none select-text appearance-none"
style={{ fontSize: `${node.metadata?.fontSize || 14}px`, color: theme.node.text }}
className="thin-scrollbar block h-full w-full resize-none overflow-y-auto whitespace-pre-wrap break-words border-none bg-transparent pl-4 pr-14 pt-0 pb-4 m-0 font-mono outline-none select-text appearance-none"
style={textStyle}
value={node.metadata?.content || ""}
references={mentionReferences}
highlightLabels={false}
onChange={(value) => onContentChange(node.id, value)}
onBlur={onStopEditing}
onKeyDown={(event) => {
@@ -412,8 +431,8 @@ function TextContent({ node, theme, isEditingContent, textareaRef, mentionRefere
/>
) : (
<div
className="thin-scrollbar block h-full w-full overflow-y-auto whitespace-pre-wrap break-words bg-transparent pl-4 pr-14 pt-0 pb-4 font-mono leading-relaxed"
style={{ fontSize: `${node.metadata?.fontSize || 14}px`, color: theme.node.text }}
className="thin-scrollbar block h-full w-full overflow-y-auto whitespace-pre-wrap break-words bg-transparent pl-4 pr-14 pt-0 pb-4 font-mono"
style={textStyle}
onWheel={(event) => event.stopPropagation()}
>
{node.metadata?.content || <span style={{ color: theme.node.placeholder }}></span>}
@@ -20,14 +20,16 @@ type Props = Omit<TextareaHTMLAttributes<HTMLTextAreaElement>, "onChange" | "val
onChange: (value: string) => void;
onSubmit?: () => void;
containerClassName?: string;
highlightLabels?: boolean;
};
export const CanvasResourceMentionTextarea = forwardRef<HTMLTextAreaElement, Props>(function CanvasResourceMentionTextarea({ value, references, onChange, onSubmit, onKeyDown, className, containerClassName, style, ...props }, forwardedRef) {
export const CanvasResourceMentionTextarea = forwardRef<HTMLTextAreaElement, Props>(function CanvasResourceMentionTextarea({ value, references, onChange, onSubmit, onKeyDown, className, containerClassName, style, highlightLabels = true, ...props }, forwardedRef) {
const theme = canvasThemes[useThemeStore((state) => state.theme)];
const textareaRef = useRef<HTMLTextAreaElement | null>(null);
const overlayRef = useRef<HTMLDivElement | null>(null);
const [mention, setMention] = useState<MentionState | null>(null);
const [activeIndex, setActiveIndex] = useState(0);
const [hasSelection, setHasSelection] = useState(false);
const candidates = useMemo(() => {
if (!mention) return [];
const query = mention.query.trim().toLowerCase();
@@ -35,7 +37,7 @@ export const CanvasResourceMentionTextarea = forwardRef<HTMLTextAreaElement, Pro
if (!query) return activeReferences;
return activeReferences.filter((item) => `${item.label} ${item.title} ${item.kind} ${item.text || ""}`.toLowerCase().includes(query));
}, [mention, references]);
const activeLabels = useMemo(() => Array.from(new Set(references.filter((item) => item.active).map((item) => item.label))).sort((a, b) => b.length - a.length), [references]);
const activeLabels = useMemo(() => (highlightLabels ? Array.from(new Set(references.filter((item) => item.active).map((item) => item.label))).sort((a, b) => b.length - a.length) : []), [highlightLabels, references]);
const updateValue = (next: string, selectionStart?: number) => {
onChange(next);
@@ -78,17 +80,23 @@ export const CanvasResourceMentionTextarea = forwardRef<HTMLTextAreaElement, Pro
overlayRef.current.scrollLeft = textareaRef.current.scrollLeft;
};
const updateSelectionState = () => {
const textarea = textareaRef.current;
setHasSelection(Boolean(textarea && textarea.selectionStart !== textarea.selectionEnd));
};
const showOverlay = Boolean(activeLabels.length && !hasSelection);
const mergedStyle = {
...(style || {}),
color: activeLabels.length ? "transparent" : style?.color,
color: showOverlay ? "transparent" : style?.color,
caretColor: style?.color || theme.node.text,
...(activeLabels.length ? { background: "transparent", backgroundColor: "transparent" } : {}),
...(showOverlay ? { background: "transparent", backgroundColor: "transparent" } : {}),
} as CSSProperties;
const menu = mention && candidates.length && textareaRef.current ? <MentionMenu textarea={textareaRef.current} references={candidates} activeIndex={Math.min(activeIndex, candidates.length - 1)} theme={theme} onSelect={insertReference} /> : null;
return (
<div className={`relative h-full w-full ${containerClassName || ""}`}>
{activeLabels.length ? (
{showOverlay ? (
<div ref={overlayRef} className={`${className || ""} pointer-events-none absolute inset-0 overflow-hidden whitespace-pre-wrap break-words`} style={{ ...style, color: theme.node.text }}>
<MentionHighlightText value={value || props.placeholder?.toString() || ""} labels={activeLabels} placeholder={!value} />
</div>
@@ -107,7 +115,22 @@ export const CanvasResourceMentionTextarea = forwardRef<HTMLTextAreaElement, Pro
const next = event.target.value;
onChange(next);
syncMention(next, event.target.selectionStart);
requestAnimationFrame(syncOverlayScroll);
requestAnimationFrame(() => {
syncOverlayScroll();
updateSelectionState();
});
}}
onSelect={(event) => {
updateSelectionState();
props.onSelect?.(event);
}}
onKeyUp={(event) => {
updateSelectionState();
props.onKeyUp?.(event);
}}
onPointerUp={(event) => {
updateSelectionState();
props.onPointerUp?.(event);
}}
onKeyDown={(event) => {
if (mention && candidates.length) {
@@ -144,6 +167,7 @@ export const CanvasResourceMentionTextarea = forwardRef<HTMLTextAreaElement, Pro
props.onScroll?.(event);
}}
onBlur={(event) => {
setHasSelection(false);
window.setTimeout(closeMention, 120);
props.onBlur?.(event);
}}
@@ -28,6 +28,7 @@ type CanvasStore = {
openProject: (id: string) => CanvasProject | null;
renameProject: (id: string, title: string) => void;
deleteProjects: (ids: string[]) => void;
replaceProjects: (projects: CanvasProject[]) => void;
updateProject: (id: string, patch: Partial<Pick<CanvasProject, "nodes" | "connections" | "chatSessions" | "activeChatId" | "backgroundMode" | "showImageInfo" | "viewport">>) => void;
};
@@ -112,6 +113,7 @@ export const useCanvasStore = create<CanvasStore>()(
const projects = state.projects.filter((project) => !ids.includes(project.id));
return { projects };
}),
replaceProjects: (projects) => set({ projects }),
updateProject: (id, patch) =>
set((state) => ({
projects: state.projects.map((project) => (project.id === id ? { ...project, ...patch, updatedAt: new Date().toISOString() } : project)),
@@ -23,6 +23,17 @@ export type ImageUpscaleParams = {
algorithm: ImageUpscaleAlgorithm;
};
export type ImageSplitParams = {
rows: number;
columns: number;
};
export type ImageSplitPiece = {
row: number;
column: number;
dataUrl: string;
};
export async function cropDataUrl(dataUrl: string, crop?: ImageCropRect) {
const image = await loadImage(dataUrl);
if (crop) {
@@ -34,6 +45,25 @@ export async function cropDataUrl(dataUrl: string, crop?: ImageCropRect) {
return drawCrop(image, sx, sy, size, size);
}
export async function splitDataUrl(dataUrl: string, params: ImageSplitParams): Promise<ImageSplitPiece[]> {
const image = await loadImage(dataUrl);
const rows = Math.max(1, Math.floor(params.rows));
const columns = Math.max(1, Math.floor(params.columns));
const pieces: ImageSplitPiece[] = [];
for (let row = 0; row < rows; row += 1) {
const sy = Math.floor((row * image.height) / rows);
const sh = Math.floor(((row + 1) * image.height) / rows) - sy;
for (let column = 0; column < columns; column += 1) {
const sx = Math.floor((column * image.width) / columns);
const sw = Math.floor(((column + 1) * image.width) / columns) - sx;
pieces.push({ row, column, dataUrl: drawCrop(image, sx, sy, sw, sh) });
}
}
return pieces;
}
export async function transformAngleDataUrl(dataUrl: string, params: ImageAngleTransform) {
const image = await loadImage(dataUrl);
const canvas = document.createElement("canvas");
+78 -24
View File
@@ -16,7 +16,7 @@ import { formatBytes, formatDuration } from "@/lib/image-utils";
import { boolConfig, isSeedanceVideoConfig, normalizeSeedanceRatio, seedanceReferenceLabel, seedanceVideoReferenceError, seedanceVideoReferenceHint, SEEDANCE_REFERENCE_LIMITS } from "@/lib/seedance-video";
import { deleteStoredMedia, resolveMediaUrl, uploadMediaFile } from "@/services/file-storage";
import { resolveImageUrl, uploadImage } from "@/services/image-storage";
import { requestVideoGeneration, storeGeneratedVideo } from "@/services/api/video";
import { createVideoGenerationTask, pollVideoGenerationTask, storeGeneratedVideo, type VideoGenerationTask } from "@/services/api/video";
import { useAssetStore } from "@/stores/use-asset-store";
import { useConfigStore, useEffectiveConfig, type AiConfig } from "@/stores/use-config-store";
import { useThemeStore } from "@/stores/use-theme-store";
@@ -56,7 +56,8 @@ type GenerationLog = {
size: string;
resolution: string;
seconds: string;
status: "成功" | "失败";
status: "生成中" | "成功" | "失败";
task?: VideoGenerationTask;
video?: GeneratedVideo;
error?: string;
};
@@ -71,6 +72,7 @@ const logStore = localforage.createInstance({ name: "infinite-canvas", storeName
export default function VideoPage() {
const { message } = App.useApp();
const fileInputRef = useRef<HTMLInputElement>(null);
const activeLogIdsRef = useRef<Set<string>>(new Set());
const config = useConfigStore((state) => state.config);
const effectiveConfig = useEffectiveConfig();
const updateConfig = useConfigStore((state) => state.updateConfig);
@@ -174,26 +176,15 @@ export default function VideoPage() {
const batchStartedAt = performance.now();
setStartedAt(batchStartedAt);
try {
const stored = await storeGeneratedVideo(await requestVideoGeneration(snapshot.config, snapshot.text, snapshot.references, snapshot.videoReferences, snapshot.audioReferences));
const nextVideo: GeneratedVideo = {
id: nanoid(),
url: stored.url,
storageKey: stored.storageKey,
durationMs: performance.now() - batchStartedAt,
width: stored.width || 1280,
height: stored.height || 720,
bytes: stored.bytes,
mimeType: stored.mimeType,
};
setResults([{ id: nextVideo.id, status: "success", video: nextVideo }]);
saveLog(buildLog({ prompt: snapshot.text, model, config: snapshot.config, references: snapshot.references, videoReferences: snapshot.videoReferences, audioReferences: snapshot.audioReferences, durationMs: nextVideo.durationMs, status: "成功", video: nextVideo }));
message.success("视频已生成");
const task = await createVideoGenerationTask(snapshot.config, snapshot.text, snapshot.references, snapshot.videoReferences, snapshot.audioReferences);
const log = buildLog({ prompt: snapshot.text, model, config: snapshot.config, references: snapshot.references, videoReferences: snapshot.videoReferences, audioReferences: snapshot.audioReferences, durationMs: 0, status: "生成中", task });
await saveLog(log);
void pollGenerationLog(log, snapshot.config);
} catch (error) {
const errorMessage = error instanceof Error ? error.message : "生成失败";
setResults([{ id: nanoid(), status: "failed", error: errorMessage }]);
saveLog(buildLog({ prompt: snapshot.text, model, config: snapshot.config, references: snapshot.references, videoReferences: snapshot.videoReferences, audioReferences: snapshot.audioReferences, durationMs: performance.now() - batchStartedAt, status: "失败", error: errorMessage }));
await saveLog(buildLog({ prompt: snapshot.text, model, config: snapshot.config, references: snapshot.references, videoReferences: snapshot.videoReferences, audioReferences: snapshot.audioReferences, durationMs: performance.now() - batchStartedAt, status: "失败", error: errorMessage }));
message.error(errorMessage);
} finally {
setRunning(false);
}
};
@@ -276,11 +267,68 @@ export default function VideoPage() {
setDeleteConfirmOpen(false);
};
const saveLog = (log: GenerationLog) => {
void logStore.setItem(log.id, serializeLog(log)).then(refreshLogs);
const saveLog = async (log: GenerationLog) => {
await logStore.setItem(log.id, serializeLog(log));
await refreshLogs();
};
const refreshLogs = async () => setLogs(await readStoredLogs());
const refreshLogs = async () => {
const nextLogs = await readStoredLogs();
setLogs(nextLogs);
resumePendingLogs(nextLogs);
return nextLogs;
};
const resumePendingLogs = (items: GenerationLog[]) => {
for (const log of items) {
if (log.status === "生成中" && log.task) void pollGenerationLog(log);
}
};
const pollGenerationLog = async (log: GenerationLog, configOverride?: AiConfig) => {
if (!log.task || activeLogIdsRef.current.has(log.id)) return;
activeLogIdsRef.current.add(log.id);
setRunning(true);
setStartedAt((value) => value || performance.now());
setResults((value) => (value.length ? value : [{ id: log.id, status: "pending" }]));
const taskConfig = buildVideoConfig({ ...effectiveConfig, ...log.config }, log.task.model || log.model);
try {
for (let attempt = 0; attempt < 120; attempt += 1) {
const state = await pollVideoGenerationTask(configOverride || taskConfig, log.task);
if (state.status === "completed") {
const stored = await storeGeneratedVideo(state.result);
const nextVideo: GeneratedVideo = {
id: nanoid(),
url: stored.url,
storageKey: stored.storageKey,
durationMs: Date.now() - log.createdAt,
width: stored.width || 1280,
height: stored.height || 720,
bytes: stored.bytes,
mimeType: stored.mimeType,
};
setResults([{ id: nextVideo.id, status: "success", video: nextVideo }]);
await saveLog({ ...log, status: "成功", durationMs: nextVideo.durationMs, video: nextVideo, error: undefined });
message.success("视频已生成");
return;
}
if (state.status === "failed") throw new Error(state.error);
if (attempt === 119) throw new Error("视频生成超时,请稍后重试");
await delay(log.task.provider === "seedance" ? 5000 : 2500);
}
} catch (error) {
const errorMessage = error instanceof Error ? error.message : "生成失败";
setResults([{ id: log.id, status: "failed", error: errorMessage }]);
await saveLog({ ...log, status: "失败", durationMs: Date.now() - log.createdAt, error: errorMessage });
message.error(errorMessage);
} finally {
activeLogIdsRef.current.delete(log.id);
if (!activeLogIdsRef.current.size) {
setRunning(false);
setStartedAt(0);
}
}
};
const previewGenerationLog = (log: GenerationLog) => {
setPreviewLog(log);
@@ -295,7 +343,7 @@ export default function VideoPage() {
if (log.config.videoSeconds) updateConfig("videoSeconds", log.config.videoSeconds);
if (log.config.videoGenerateAudio) updateConfig("videoGenerateAudio", log.config.videoGenerateAudio);
if (log.config.videoWatermark) updateConfig("videoWatermark", log.config.videoWatermark);
setResults(log.video ? [{ id: log.video.id, status: "success", video: log.video }] : [{ id: log.id, status: "failed", error: log.error || "生成失败" }]);
setResults(log.status === "生成中" ? [{ id: log.id, status: "pending" }] : log.video ? [{ id: log.video.id, status: "success", video: log.video }] : [{ id: log.id, status: "failed", error: log.error || "生成失败" }]);
};
return (
@@ -608,7 +656,7 @@ function LogCard({ log, selected, active, onSelectedChange, onClick }: { log: Ge
</div>
</div>
<div className="grid justify-items-end gap-2">
<Tag className="m-0 flex h-6 items-center rounded-md px-1.5 text-xs leading-none" color={log.status === "成功" ? "blue" : "red"}>
<Tag className="m-0 flex h-6 items-center rounded-md px-1.5 text-xs leading-none" color={log.status === "成功" ? "blue" : log.status === "生成中" ? "processing" : "red"}>
{log.status}
</Tag>
<Tag className="m-0 flex h-6 items-center rounded-md px-1.5 text-xs leading-none" color="green">
@@ -670,6 +718,7 @@ async function normalizeLog(log: Partial<GenerationLog>): Promise<GenerationLog>
resolution: normalizeResolution(log.resolution || config.vquality || ""),
seconds: log.seconds || config.videoSeconds || "",
status: log.status || "成功",
task: log.task,
video,
error: log.error,
};
@@ -739,7 +788,7 @@ function normalizeLogConfig(log: Partial<GenerationLog>): GenerationLogConfig {
};
}
function buildLog({ prompt, model, config, references, videoReferences, audioReferences, durationMs, status, video, error }: { prompt: string; model: string; config: AiConfig; references: ReferenceImage[]; videoReferences: ReferenceVideo[]; audioReferences: ReferenceAudio[]; durationMs: number; status: GenerationLog["status"]; video?: GeneratedVideo; error?: string }): GenerationLog {
function buildLog({ prompt, model, config, references, videoReferences, audioReferences, durationMs, status, task, video, error }: { prompt: string; model: string; config: AiConfig; references: ReferenceImage[]; videoReferences: ReferenceVideo[]; audioReferences: ReferenceAudio[]; durationMs: number; status: GenerationLog["status"]; task?: VideoGenerationTask; video?: GeneratedVideo; error?: string }): GenerationLog {
const logConfig = {
model: config.model,
videoModel: config.videoModel,
@@ -765,6 +814,7 @@ function buildLog({ prompt, model, config, references, videoReferences, audioRef
resolution: logConfig.vquality,
seconds: logConfig.videoSeconds,
status,
task,
video,
error,
};
@@ -797,3 +847,7 @@ function normalizeVideoSize(value: string) {
function normalizeResolution(value: string) {
return normalizeVideoResolutionValue(value);
}
function delay(ms: number) {
return new Promise((resolve) => setTimeout(resolve, ms));
}
+59
View File
@@ -0,0 +1,59 @@
import { NextRequest } from "next/server";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
const WEBDAV_PROXY_TIMEOUT_MS = 120000;
export async function POST(request: NextRequest) {
const target = request.headers.get("x-webdav-target") || "";
const method = (request.headers.get("x-webdav-method") || "GET").toUpperCase();
if (!target) return new Response("Missing x-webdav-target", { status: 400 });
let url: URL;
try {
url = new URL(target);
} catch {
return new Response("Invalid x-webdav-target", { status: 400 });
}
if (url.protocol !== "http:" && url.protocol !== "https:") return new Response("Unsupported WebDAV target", { status: 400 });
const headers = new Headers();
copyHeader(request, headers, "x-webdav-authorization", "Authorization");
copyHeader(request, headers, "x-webdav-depth", "Depth");
copyHeader(request, headers, "x-webdav-destination", "Destination");
copyHeader(request, headers, "x-webdav-overwrite", "Overwrite");
copyHeader(request, headers, "x-webdav-content-type", "Content-Type");
const controller = new AbortController();
const timer = setTimeout(() => controller.abort(), WEBDAV_PROXY_TIMEOUT_MS);
try {
const body = method === "GET" || method === "HEAD" ? undefined : await request.arrayBuffer();
console.log(`[webdav-proxy] ${method} ${url.href} ${body?.byteLength || 0}B`);
const response = await fetch(url, { method, headers, body: body?.byteLength ? body : undefined, signal: controller.signal });
console.log(`[webdav-proxy] ${method} ${url.href} -> ${response.status}`);
return new Response(method === "HEAD" ? null : response.body, {
status: response.status,
headers: responseHeaders(response.headers),
});
} catch (error) {
if (error instanceof Error && error.name === "AbortError") return new Response("WebDAV proxy timeout", { status: 504 });
return new Response(error instanceof Error ? error.message : "WebDAV proxy error", { status: 502 });
} finally {
clearTimeout(timer);
}
}
function copyHeader(request: NextRequest, headers: Headers, from: string, to: string) {
const value = request.headers.get(from);
if (value) headers.set(to, value);
}
function responseHeaders(headers: Headers) {
const result = new Headers();
["content-type", "etag", "last-modified", "dav"].forEach((key) => {
const value = headers.get(key);
if (value) result.set(key, value);
});
return result;
}
+184 -1
View File
@@ -1,10 +1,13 @@
"use client";
import { App, Button, Form, Input, Modal, Segmented, Select } from "antd";
import { App, Button, Form, Input, Modal, Progress, Segmented, Select } from "antd";
import { Cloud, RefreshCw, Wifi } from "lucide-react";
import { useState } from "react";
import { ModelPicker } from "@/components/model-picker";
import { fetchImageModels } from "@/services/api/image";
import { syncAppDataToWebdav, type AppSyncDomainKey, type AppSyncProgressEvent } from "@/services/app-sync";
import { testWebdavConnection, WEBDAV_MANIFEST_FILE_NAME } from "@/services/webdav-sync";
import { audioFormatOptions, audioVoiceOptions, normalizeAudioSpeedValue } from "@/lib/audio-generation";
import { filterModelsByCapability, useConfigStore, useEffectiveConfig, type AiConfig, type ModelCapability } from "@/stores/use-config-store";
@@ -16,6 +19,14 @@ type ModelGroup = {
optionsLabel: string;
};
type WebdavDomainProgress = {
label: string;
stage: string;
current?: number;
total?: number;
status?: "active" | "success" | "exception";
};
const modelGroups: ModelGroup[] = [
{ capability: "image", modelKey: "imageModel", modelsKey: "imageModels", defaultLabel: "默认生图模型", optionsLabel: "生图模型可选项" },
{ capability: "video", modelKey: "videoModel", modelsKey: "videoModels", defaultLabel: "默认视频模型", optionsLabel: "视频模型可选项" },
@@ -23,11 +34,35 @@ const modelGroups: ModelGroup[] = [
{ capability: "audio", modelKey: "audioModel", modelsKey: "audioModels", defaultLabel: "默认音频模型", optionsLabel: "音频模型可选项" },
];
const webdavDomainKeys: AppSyncDomainKey[] = ["canvas", "assets", "image-workbench", "video-workbench"];
const webdavDomainLabels: Record<AppSyncDomainKey, string> = {
canvas: "画布",
assets: "我的素材",
"image-workbench": "生图工作台",
"video-workbench": "视频创作台",
};
function createWebdavDomainProgress(): Record<AppSyncDomainKey, WebdavDomainProgress> {
return webdavDomainKeys.reduce(
(progress, key) => ({
...progress,
[key]: { label: webdavDomainLabels[key], stage: "等待同步" },
}),
{} as Record<AppSyncDomainKey, WebdavDomainProgress>,
);
}
export function AppConfigModal() {
const { message } = App.useApp();
const [loadingModels, setLoadingModels] = useState(false);
const [testingWebdav, setTestingWebdav] = useState(false);
const [syncingWebdav, setSyncingWebdav] = useState(false);
const [webdavSyncStatus, setWebdavSyncStatus] = useState("");
const [webdavDomainProgress, setWebdavDomainProgress] = useState(createWebdavDomainProgress);
const config = useConfigStore((state) => state.config);
const webdav = useConfigStore((state) => state.webdav);
const updateConfig = useConfigStore((state) => state.updateConfig);
const updateWebdavConfig = useConfigStore((state) => state.updateWebdavConfig);
const isConfigOpen = useConfigStore((state) => state.isConfigOpen);
const shouldPromptContinue = useConfigStore((state) => state.shouldPromptContinue);
const setConfigDialogOpen = useConfigStore((state) => state.setConfigDialogOpen);
@@ -39,6 +74,7 @@ export function AppConfigModal() {
const effectiveMode = allowCustomChannel ? config.channelMode : "remote";
const modelConfig = effectiveMode === "remote" ? effectiveConfig : config;
const modelOptions = config.models.map((model) => ({ label: model, value: model }));
const webdavReady = Boolean(webdav.url.trim());
const finishConfig = () => {
setConfigDialogOpen(false);
@@ -89,6 +125,57 @@ export function AppConfigModal() {
if (!next.includes(config[group.modelKey])) updateConfig(group.modelKey, next[0] || "");
};
const testWebdav = async () => {
if (!webdavReady) {
message.error("请先填写 WebDAV 地址");
return;
}
setTestingWebdav(true);
try {
await testWebdavConnection(webdav);
message.success("WebDAV 连接可用");
} catch (error) {
message.error(error instanceof Error ? error.message : "WebDAV 连接测试失败");
} finally {
setTestingWebdav(false);
}
};
const updateWebdavProgress = (event: AppSyncProgressEvent) => {
setWebdavSyncStatus(event.stage);
if (!event.domain) return;
setWebdavDomainProgress((current) => ({
...current,
[event.domain as AppSyncDomainKey]: {
label: event.label || webdavDomainLabels[event.domain as AppSyncDomainKey],
stage: event.stage,
current: event.current,
total: event.total,
status: event.status,
},
}));
};
const syncWebdav = async () => {
if (!webdavReady) {
message.error("请先填写 WebDAV 地址");
return;
}
setSyncingWebdav(true);
setWebdavDomainProgress(createWebdavDomainProgress());
setWebdavSyncStatus("准备同步");
try {
const result = await syncAppDataToWebdav(webdav, updateWebdavProgress);
updateWebdavConfig("lastSyncedAt", result.syncedAt);
message.success(`同步完成:${result.projects} 个画布,${result.assets} 个素材,${result.imageLogs + result.videoLogs} 条记录,本次上传 ${result.uploadedFiles} 个文件 ${formatBytes(result.uploadedBytes)}`);
} catch (error) {
setWebdavSyncStatus(error instanceof Error ? error.message : "WebDAV 同步失败");
message.error(error instanceof Error ? error.message : "WebDAV 同步失败");
} finally {
setSyncingWebdav(false);
}
};
return (
<Modal
title={
@@ -218,6 +305,72 @@ export function AppConfigModal() {
<Input.TextArea rows={3} value={config.systemPrompt} placeholder="例如:你是一位擅长电影感写实摄影的视觉导演。" onChange={(event) => updateConfig("systemPrompt", event.target.value)} />
</Form.Item>
) : null}
<section className="mt-5 rounded-lg border border-stone-200 p-3 dark:border-stone-800">
<div className="mb-3 flex flex-wrap items-start justify-between gap-3">
<div>
<div className="flex items-center gap-2 text-sm font-semibold">
<Cloud className="size-4" />
WebDAV
</div>
<div className="mt-1 text-xs text-stone-500"> AI API Key CORS Next.js </div>
</div>
<div className="text-xs text-stone-500">{webdav.lastSyncedAt ? `上次同步 ${formatWebdavTime(webdav.lastSyncedAt)}` : "尚未同步"}</div>
</div>
<div className="grid gap-4 md:grid-cols-2">
<Form.Item label="连接方式" className="mb-4 md:col-span-2">
<Segmented
block
value={webdav.proxyMode}
onChange={(value) => updateWebdavConfig("proxyMode", value as typeof webdav.proxyMode)}
options={[
{ label: "前端直连", value: "direct" },
{ label: "Next.js 转发", value: "nextjs" },
]}
/>
</Form.Item>
<Form.Item label="WebDAV 地址" className="mb-4">
<Input value={webdav.url} placeholder="https://nas.example.com/webdav" onChange={(event) => updateWebdavConfig("url", event.target.value)} />
</Form.Item>
<Form.Item label="远程目录" extra={`会在该目录下分业务目录保存,每个目录包含 ${WEBDAV_MANIFEST_FILE_NAME} 和 files/`} className="mb-4">
<Input value={webdav.directory} placeholder="infinite-canvas" onChange={(event) => updateWebdavConfig("directory", event.target.value)} />
</Form.Item>
<Form.Item label="用户名" className="mb-0">
<Input value={webdav.username} autoComplete="username" onChange={(event) => updateWebdavConfig("username", event.target.value)} />
</Form.Item>
<Form.Item label="密码 / 应用密码" className="mb-0">
<Input.Password value={webdav.password} autoComplete="current-password" onChange={(event) => updateWebdavConfig("password", event.target.value)} />
</Form.Item>
</div>
<div className="mt-4 flex flex-wrap items-center gap-2">
<Button icon={<Wifi className="size-4" />} disabled={!webdavReady || syncingWebdav} loading={testingWebdav} onClick={() => void testWebdav()}>
</Button>
<Button type="primary" icon={<RefreshCw className="size-4" />} disabled={!webdavReady || testingWebdav} loading={syncingWebdav} onClick={() => void syncWebdav()}>
{syncingWebdav ? "同步中" : "立即同步"}
</Button>
{webdavSyncStatus ? <span className="text-xs text-stone-500">{webdavSyncStatus}</span> : null}
</div>
{syncingWebdav || webdavSyncStatus ? (
<div className="mt-3 grid gap-2">
{webdavDomainKeys.map((key) => {
const item = webdavDomainProgress[key];
const count = item.total ? `${item.current || 0}/${item.total}` : "";
return (
<div key={key} className="rounded-md border border-stone-200 px-3 py-2 dark:border-stone-800">
<div className="mb-1 flex min-w-0 items-center justify-between gap-3 text-xs">
<span className="shrink-0 font-medium text-stone-700 dark:text-stone-200">{item.label}</span>
<span className="min-w-0 truncate text-right text-stone-500">
{item.stage}
{count ? ` · ${count}` : ""}
</span>
</div>
<Progress percent={getWebdavProgressPercent(item)} size="small" status={getWebdavProgressStatus(item)} showInfo={false} />
</div>
);
})}
</div>
) : null}
</section>
</Form>
</div>
</Modal>
@@ -237,3 +390,33 @@ function resolveNextCapabilityModels(current: string[], suggested: string[], all
function uniqueModels(models: string[]) {
return Array.from(new Set(models.map((model) => model.trim()).filter(Boolean)));
}
function formatWebdavTime(value: string) {
return new Date(value).toLocaleString("zh-CN", { month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
}
function getWebdavProgressPercent(item: WebdavDomainProgress) {
if (item.status === "success") return 100;
if (item.total) return Math.min(100, Math.round(((item.current || 0) / item.total) * 100));
if (item.status === "exception") return 100;
if (item.stage === "等待同步") return 0;
if (item.stage === "读取远端清单") return 12;
if (item.stage === "读取本地数据") return 24;
if (item.stage === "下载缺失媒体") return 36;
if (item.stage === "写入本地合并结果") return 58;
if (item.stage === "上传新增媒体") return 66;
if (item.stage === "媒体已齐全" || item.stage === "媒体无需上传") return 74;
if (item.stage.startsWith("上传清单")) return 90;
return item.status === "active" ? 30 : 0;
}
function getWebdavProgressStatus(item: WebdavDomainProgress): "normal" | "active" | "success" | "exception" {
if (item.status === "success" || item.status === "exception") return item.status;
return item.status === "active" ? "active" : "normal";
}
function formatBytes(bytes: number) {
if (bytes < 1024) return `${bytes}B`;
if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
return `${(bytes / 1024 / 1024).toFixed(1)}MB`;
}
+60 -30
View File
@@ -21,6 +21,8 @@ type ApiEnvelope<T> = T | { code?: number; data?: T | null; msg?: string };
type ReferenceMediaUploadResponse = { id: string; url: string; mimeType: string; bytes: number };
export type VideoGenerationResult = { blob?: Blob; url?: string; mimeType?: string };
export type VideoGenerationTask = { id: string; provider: "openai" | "seedance"; model: string };
export type VideoGenerationTaskState = { status: "pending" } | { status: "completed"; result: VideoGenerationResult } | { status: "failed"; error: string };
function aiApiUrl(config: AiConfig, path: string) {
return config.channelMode === "remote" ? `/api/v1${path}` : buildApiUrl(config.baseUrl, path);
@@ -44,15 +46,33 @@ function refreshRemoteUser(config: AiConfig) {
}
export async function requestVideoGeneration(config: AiConfig, prompt: string, references: ReferenceImage[] = [], videoReferences: ReferenceVideo[] = [], audioReferences: ReferenceAudio[] = []): Promise<VideoGenerationResult> {
const task = await createVideoGenerationTask(config, prompt, references, videoReferences, audioReferences);
const delayMs = task.provider === "seedance" ? 5000 : 2500;
for (let attempt = 0; attempt < 120; attempt += 1) {
const state = await pollVideoGenerationTask(config, task);
if (state.status === "completed") return state.result;
if (state.status === "failed") throw new Error(state.error);
if (attempt === 119) throw new Error(`${task.provider === "seedance" ? "Seedance " : ""}视频生成超时,请稍后重试`);
await delay(delayMs);
}
throw new Error("视频生成超时,请稍后重试");
}
export async function createVideoGenerationTask(config: AiConfig, prompt: string, references: ReferenceImage[] = [], videoReferences: ReferenceVideo[] = [], audioReferences: ReferenceAudio[] = []): Promise<VideoGenerationTask> {
const model = (config.model || config.videoModel).trim();
assertVideoConfig(config, model);
if (isSeedanceVideoConfig({ ...config, model })) {
return requestSeedanceGeneration(config, model, prompt, references, videoReferences, audioReferences);
return createSeedanceTask(config, model, prompt, references, videoReferences, audioReferences);
}
if (videoReferences.length || audioReferences.length) {
throw new Error("当前视频接口不支持参考视频或参考音频,请切换到 Seedance 2.0 / 火山 Agent Plan 模型,或移除参考素材");
}
return requestOpenAIVideoGeneration(config, model, prompt, references);
return createOpenAIVideoTask(config, model, prompt, references);
}
export async function pollVideoGenerationTask(config: AiConfig, task: VideoGenerationTask): Promise<VideoGenerationTaskState> {
assertVideoConfig(config, task.model);
return task.provider === "seedance" ? pollSeedanceTask(config, task) : pollOpenAIVideoTask(config, task);
}
export async function storeGeneratedVideo(result: VideoGenerationResult): Promise<UploadedFile> {
@@ -61,7 +81,7 @@ export async function storeGeneratedVideo(result: VideoGenerationResult): Promis
throw new Error("视频接口没有返回可播放的视频");
}
async function requestOpenAIVideoGeneration(config: AiConfig, model: string, prompt: string, references: ReferenceImage[]) {
async function createOpenAIVideoTask(config: AiConfig, model: string, prompt: string, references: ReferenceImage[]): Promise<VideoGenerationTask> {
const body = new FormData();
body.append("model", model);
body.append("prompt", prompt);
@@ -74,23 +94,29 @@ async function requestOpenAIVideoGeneration(config: AiConfig, model: string, pro
try {
const created = unwrapVideoResponse((await axios.post<ApiVideoResponse>(aiApiUrl(config, "/videos"), body, { headers: aiHeaders(config) })).data);
if (!created.id) throw new Error("视频接口没有返回任务 ID");
for (let attempt = 0; attempt < 120; attempt += 1) {
const video = unwrapVideoResponse((await axios.get<ApiVideoResponse>(aiApiUrl(config, `/videos/${created.id}`), { headers: aiHeaders(config), params: config.channelMode === "remote" ? { model } : undefined })).data);
if (video.status === "completed") break;
if (video.status === "failed" || video.status === "cancelled") throw new Error(video.error?.message || "视频生成失败");
if (attempt === 119) throw new Error("视频生成超时,请稍后重试");
await delay(2500);
}
const content = await axios.get<Blob>(aiApiUrl(config, `/videos/${created.id}/content`), { headers: aiHeaders(config), params: config.channelMode === "remote" ? { model } : undefined, responseType: "blob" });
await assertVideoBlob(content.data);
refreshRemoteUser(config);
return { blob: content.data };
return { id: created.id, provider: "openai", model };
} catch (error) {
throw new Error(readAxiosError(error, "视频生成失败"));
throw new Error(readAxiosError(error, "视频任务创建失败"));
}
}
async function requestSeedanceGeneration(config: AiConfig, model: string, prompt: string, references: ReferenceImage[], videoReferences: ReferenceVideo[], audioReferences: ReferenceAudio[]) {
async function pollOpenAIVideoTask(config: AiConfig, task: VideoGenerationTask): Promise<VideoGenerationTaskState> {
try {
const video = unwrapVideoResponse((await axios.get<ApiVideoResponse>(aiApiUrl(config, `/videos/${task.id}`), { headers: aiHeaders(config), params: config.channelMode === "remote" ? { model: task.model } : undefined })).data);
if (video.status === "completed") {
const content = await axios.get<Blob>(aiApiUrl(config, `/videos/${task.id}/content`), { headers: aiHeaders(config), params: config.channelMode === "remote" ? { model: task.model } : undefined, responseType: "blob" });
await assertVideoBlob(content.data);
refreshRemoteUser(config);
return { status: "completed", result: { blob: content.data } };
}
if (video.status === "failed" || video.status === "cancelled") return { status: "failed", error: video.error?.message || "视频生成失败" };
return { status: "pending" };
} catch (error) {
throw new Error(readAxiosError(error, "视频任务查询失败"));
}
}
async function createSeedanceTask(config: AiConfig, model: string, prompt: string, references: ReferenceImage[], videoReferences: ReferenceVideo[], audioReferences: ReferenceAudio[]): Promise<VideoGenerationTask> {
if (audioReferences.length && !references.length && !videoReferences.length) {
throw new Error("Seedance 参考音频不能单独使用,请同时添加参考图或参考视频");
}
@@ -111,21 +137,25 @@ async function requestSeedanceGeneration(config: AiConfig, model: string, prompt
try {
const created = unwrapSeedanceTask((await axios.post<ApiEnvelope<SeedanceTask>>(seedanceApiUrl(config), payload, { headers: aiHeaders(config, "application/json") })).data);
if (!created.id) throw new Error("Seedance 接口没有返回任务 ID");
for (let attempt = 0; attempt < 120; attempt += 1) {
const task = unwrapSeedanceTask((await axios.get<ApiEnvelope<SeedanceTask>>(seedanceApiUrl(config, created.id), { headers: aiHeaders(config), params: config.channelMode === "remote" ? { model } : undefined })).data);
if (task.status === "succeeded") {
const url = task.content?.video_url;
if (!url) throw new Error("Seedance 任务成功但没有返回视频 URL");
refreshRemoteUser(config);
return videoResultFromUrl(url);
}
if (task.status === "failed" || task.status === "cancelled" || task.status === "expired") throw new Error(task.error?.message || `Seedance 视频生成${task.status === "expired" ? "超时" : "失败"}`);
if (attempt === 119) throw new Error("Seedance 视频生成超时,请稍后重试");
await delay(5000);
}
throw new Error("Seedance 视频生成超时,请稍后重试");
return { id: created.id, provider: "seedance", model };
} catch (error) {
throw new Error(readAxiosError(error, "Seedance 视频生成失败"));
throw new Error(readAxiosError(error, "Seedance 任务创建失败"));
}
}
async function pollSeedanceTask(config: AiConfig, task: VideoGenerationTask): Promise<VideoGenerationTaskState> {
try {
const state = unwrapSeedanceTask((await axios.get<ApiEnvelope<SeedanceTask>>(seedanceApiUrl(config, task.id), { headers: aiHeaders(config), params: config.channelMode === "remote" ? { model: task.model } : undefined })).data);
if (state.status === "succeeded") {
const url = state.content?.video_url;
if (!url) return { status: "failed", error: "Seedance 任务成功但没有返回视频 URL" };
refreshRemoteUser(config);
return { status: "completed", result: await videoResultFromUrl(url) };
}
if (state.status === "failed" || state.status === "cancelled" || state.status === "expired") return { status: "failed", error: state.error?.message || `Seedance 视频生成${state.status === "expired" ? "超时" : "失败"}` };
return { status: "pending" };
} catch (error) {
throw new Error(readAxiosError(error, "Seedance 任务查询失败"));
}
}
+394
View File
@@ -0,0 +1,394 @@
"use client";
import localforage from "localforage";
import { getMediaBlob, resolveMediaUrl, setMediaBlob } from "@/services/file-storage";
import { getImageBlob, resolveImageUrl, setImageBlob } from "@/services/image-storage";
import { downloadWebdavFile, uploadWebdavFile, WEBDAV_MANIFEST_FILE_NAME } from "@/services/webdav-sync";
import type { Asset } from "@/stores/use-asset-store";
import { useAssetStore } from "@/stores/use-asset-store";
import type { WebdavSyncConfig } from "@/stores/use-config-store";
import type { CanvasProject } from "@/app/(user)/canvas/stores/use-canvas-store";
import { useCanvasStore } from "@/app/(user)/canvas/stores/use-canvas-store";
type StoredLog = Record<string, unknown> & { id?: string };
export type AppSyncDomainKey = "canvas" | "assets" | "image-workbench" | "video-workbench";
type DomainKey = AppSyncDomainKey;
type CanvasDomainData = { projects: CanvasProject[] };
type AssetDomainData = { assets: Asset[] };
type LogDomainData = { logs: StoredLog[] };
type AppSyncFile = {
storageKey: string;
path: string;
mimeType: string;
bytes: number;
};
type DomainManifest<T> = {
app: "infinite-canvas";
version: 1;
domain: DomainKey;
exportedAt: string;
data: T;
files: AppSyncFile[];
};
type SyncDomainOptions<T> = {
key: DomainKey;
label: string;
localData: () => Promise<T>;
emptyData: T;
mergeData: (local: T, remote: T) => T;
applyData?: (data: T) => Promise<void>;
};
type SyncDomainResult<T> = {
data: T;
mergedRemote: boolean;
files: number;
manifestBytes: number;
uploadedFiles: number;
uploadedBytes: number;
};
export type AppSyncResult = {
syncedAt: string;
mergedRemote: boolean;
projects: number;
assets: number;
imageLogs: number;
videoLogs: number;
files: number;
manifestBytes: number;
uploadedFiles: number;
uploadedBytes: number;
};
export type AppSyncProgressEvent = {
domain?: AppSyncDomainKey;
label?: string;
stage: string;
current?: number;
total?: number;
status?: "active" | "success" | "exception";
};
export type AppSyncProgress = (event: AppSyncProgressEvent) => void;
const FILE_CONCURRENCY = 3;
const imageLogStore = localforage.createInstance({ name: "infinite-canvas", storeName: "image_generation_logs" });
const videoLogStore = localforage.createInstance({ name: "infinite-canvas", storeName: "video_generation_logs" });
type LogStore = typeof imageLogStore;
const storageKeyPattern = /^(image|video|audio|file|video-reference|audio-reference):/;
export async function syncAppDataToWebdav(config: WebdavSyncConfig, onProgress?: AppSyncProgress): Promise<AppSyncResult> {
emitProgress(onProgress, { stage: "等待本地数据加载" });
await Promise.all([waitForHydration(useCanvasStore), waitForHydration(useAssetStore)]);
const [canvas, assets, imageLogs, videoLogs] = await Promise.all([
syncDomain<CanvasDomainData>(config, onProgress, {
key: "canvas",
label: "画布",
emptyData: { projects: [] },
localData: async () => ({ projects: useCanvasStore.getState().projects }),
mergeData: (local, remote) => ({ projects: mergeById(local.projects, remote.projects, "updatedAt") }),
applyData: async (data) => useCanvasStore.getState().replaceProjects(data.projects),
}),
syncDomain<AssetDomainData>(config, onProgress, {
key: "assets",
label: "我的素材",
emptyData: { assets: [] },
localData: async () => ({ assets: useAssetStore.getState().assets }),
mergeData: (local, remote) => ({ assets: mergeById(local.assets, remote.assets, "updatedAt") }),
applyData: async (data) => useAssetStore.getState().replaceAssets(await Promise.all(data.assets.map(hydrateAsset))),
}),
syncDomain<LogDomainData>(config, onProgress, {
key: "image-workbench",
label: "生图工作台",
emptyData: { logs: [] },
localData: async () => ({ logs: await readStoredLogs(imageLogStore) }),
mergeData: (local, remote) => ({ logs: mergeById(local.logs, remote.logs, "createdAt") }),
applyData: async (data) => replaceStoredLogs(imageLogStore, data.logs),
}),
syncDomain<LogDomainData>(config, onProgress, {
key: "video-workbench",
label: "视频创作台",
emptyData: { logs: [] },
localData: async () => ({ logs: await readStoredLogs(videoLogStore) }),
mergeData: (local, remote) => ({ logs: mergeById(local.logs, remote.logs, "createdAt") }),
applyData: async (data) => replaceStoredLogs(videoLogStore, data.logs),
}),
]);
const result = {
syncedAt: new Date().toISOString(),
mergedRemote: [canvas, assets, imageLogs, videoLogs].some((item) => item.mergedRemote),
projects: canvas.data.projects.length,
assets: assets.data.assets.length,
imageLogs: imageLogs.data.logs.length,
videoLogs: videoLogs.data.logs.length,
files: canvas.files + assets.files + imageLogs.files + videoLogs.files,
manifestBytes: canvas.manifestBytes + assets.manifestBytes + imageLogs.manifestBytes + videoLogs.manifestBytes,
uploadedFiles: canvas.uploadedFiles + assets.uploadedFiles + imageLogs.uploadedFiles + videoLogs.uploadedFiles,
uploadedBytes: canvas.uploadedBytes + assets.uploadedBytes + imageLogs.uploadedBytes + videoLogs.uploadedBytes,
};
emitProgress(onProgress, { stage: "同步完成", status: "success" });
return result;
}
async function syncDomain<T>(config: WebdavSyncConfig, onProgress: AppSyncProgress | undefined, options: SyncDomainOptions<T>): Promise<SyncDomainResult<T>> {
try {
emitProgress(onProgress, { domain: options.key, label: options.label, stage: "读取远端清单", status: "active" });
const remoteManifest = await readDomainManifest(config, options.key, options.emptyData);
emitProgress(onProgress, { domain: options.key, label: options.label, stage: "读取本地数据", status: "active" });
const localData = await options.localData();
const mergedData = remoteManifest ? options.mergeData(localData, remoteManifest.data) : localData;
if (remoteManifest) {
emitProgress(onProgress, { domain: options.key, label: options.label, stage: "下载缺失媒体", status: "active" });
await downloadMissingFiles(config, options.key, mergedData, remoteManifest.files, onProgress);
emitProgress(onProgress, { domain: options.key, label: options.label, stage: "写入本地合并结果", status: "active" });
await options.applyData?.(mergedData);
}
emitProgress(onProgress, { domain: options.key, label: options.label, stage: "上传新增媒体", status: "active" });
const uploaded = await uploadChangedFiles(config, options.key, mergedData, remoteManifest?.files || [], onProgress);
const manifest: DomainManifest<T> = { app: "infinite-canvas", version: 1, domain: options.key, exportedAt: new Date().toISOString(), data: mergedData, files: uploaded.files };
const manifestFile = new Blob([JSON.stringify(manifest, null, 2)], { type: "application/json" });
emitProgress(onProgress, { domain: options.key, label: options.label, stage: `上传清单 ${formatBytes(manifestFile.size)}`, status: "active" });
await uploadWebdavFile(config, domainPath(options.key, WEBDAV_MANIFEST_FILE_NAME), manifestFile, "application/json");
emitProgress(onProgress, { domain: options.key, label: options.label, stage: "完成", current: 1, total: 1, status: "success" });
return {
data: mergedData,
mergedRemote: Boolean(remoteManifest),
files: uploaded.files.length,
manifestBytes: manifestFile.size,
uploadedFiles: uploaded.uploadedFiles,
uploadedBytes: uploaded.uploadedBytes,
};
} catch (error) {
emitProgress(onProgress, { domain: options.key, label: options.label, stage: error instanceof Error ? error.message : "同步失败", status: "exception" });
throw error;
}
}
async function readDomainManifest<T>(config: WebdavSyncConfig, domain: DomainKey, emptyData: T): Promise<DomainManifest<T> | null> {
const file = await downloadWebdavFile(config, domainPath(domain, WEBDAV_MANIFEST_FILE_NAME));
if (!file) return null;
const data = JSON.parse(await file.text()) as DomainManifest<T>;
if (data.app !== "infinite-canvas" || data.domain !== domain) throw new Error(`${domain} 同步清单不是当前应用的数据`);
return {
app: "infinite-canvas",
version: 1,
domain,
exportedAt: data.exportedAt || new Date().toISOString(),
data: data.data || emptyData,
files: Array.isArray(data.files) ? data.files : [],
};
}
async function downloadMissingFiles<T>(config: WebdavSyncConfig, domain: DomainKey, data: T, remoteFiles: AppSyncFile[], onProgress?: AppSyncProgress) {
const remoteFileMap = new Map(remoteFiles.map((item) => [item.storageKey, item]));
const tasks: AppSyncFile[] = [];
const storageKeys = collectStorageKeys(data);
let scanned = 0;
for (const storageKey of storageKeys) {
const localBlob = storageKey.startsWith("image:") ? await getImageBlob(storageKey) : await getMediaBlob(storageKey);
scanned += 1;
if (localBlob) {
emitProgress(onProgress, { domain, label: domainLabel(domain), stage: "检查缺失媒体", current: scanned, total: storageKeys.length, status: "active" });
continue;
}
const remoteFile = remoteFileMap.get(storageKey);
if (remoteFile) tasks.push(remoteFile);
emitProgress(onProgress, { domain, label: domainLabel(domain), stage: "检查缺失媒体", current: scanned, total: storageKeys.length, status: "active" });
}
if (!tasks.length) {
emitProgress(onProgress, { domain, label: domainLabel(domain), stage: "媒体已齐全", current: 1, total: 1, status: "active" });
return;
}
let downloaded = 0;
await runWithConcurrency(tasks, FILE_CONCURRENCY, async (remoteFile) => {
const blob = await downloadWebdavFile(config, remoteFile.path);
if (!blob) return;
const typedBlob = blob.type ? blob : blob.slice(0, blob.size, remoteFile.mimeType);
await (remoteFile.storageKey.startsWith("image:") ? setImageBlob(remoteFile.storageKey, typedBlob) : setMediaBlob(remoteFile.storageKey, typedBlob));
downloaded += 1;
emitProgress(onProgress, { domain, label: domainLabel(domain), stage: "下载媒体", current: downloaded, total: tasks.length, status: "active" });
});
}
async function uploadChangedFiles<T>(config: WebdavSyncConfig, domain: DomainKey, data: T, remoteFiles: AppSyncFile[], onProgress?: AppSyncProgress) {
const remoteFileMap = new Map(remoteFiles.map((item) => [item.storageKey, item]));
const files: AppSyncFile[] = [];
const tasks: Array<{ item: AppSyncFile; blob: Blob }> = [];
let uploadedFiles = 0;
let uploadedBytes = 0;
const storageKeys = collectStorageKeys(data);
let scanned = 0;
for (const storageKey of storageKeys) {
const blob = storageKey.startsWith("image:") ? await getImageBlob(storageKey) : await getMediaBlob(storageKey);
const remoteFile = remoteFileMap.get(storageKey);
if (!blob) {
if (remoteFile) files.push(remoteFile);
scanned += 1;
emitProgress(onProgress, { domain, label: domainLabel(domain), stage: "检查本地媒体", current: scanned, total: storageKeys.length, status: "active" });
continue;
}
const item: AppSyncFile = {
storageKey,
path: remoteFile?.path || domainPath(domain, `files/${safeFileName(storageKey)}.${fileExtension(blob.type, storageKey)}`),
mimeType: blob.type || remoteFile?.mimeType || "application/octet-stream",
bytes: blob.size,
};
files.push(item);
if (!remoteFile || remoteFile.bytes !== blob.size) tasks.push({ item, blob });
scanned += 1;
emitProgress(onProgress, { domain, label: domainLabel(domain), stage: "检查本地媒体", current: scanned, total: storageKeys.length, status: "active" });
}
if (!tasks.length) {
emitProgress(onProgress, { domain, label: domainLabel(domain), stage: "媒体无需上传", current: 1, total: 1, status: "active" });
return { files, uploadedFiles, uploadedBytes };
}
await runWithConcurrency(tasks, FILE_CONCURRENCY, async ({ item, blob }) => {
await uploadWebdavFile(config, item.path, blob, item.mimeType);
uploadedFiles += 1;
uploadedBytes += blob.size;
emitProgress(onProgress, { domain, label: domainLabel(domain), stage: `上传媒体 ${formatBytes(blob.size)}`, current: uploadedFiles, total: tasks.length, status: "active" });
});
return { files, uploadedFiles, uploadedBytes };
}
async function hydrateAsset(asset: Asset): Promise<Asset> {
if (asset.kind === "image" && asset.data.storageKey) {
const dataUrl = await resolveImageUrl(asset.data.storageKey, asset.data.dataUrl);
return { ...asset, coverUrl: asset.coverUrl.startsWith("blob:") ? dataUrl : asset.coverUrl, data: { ...asset.data, dataUrl } };
}
if (asset.kind === "video" && asset.data.storageKey) {
const url = await resolveMediaUrl(asset.data.storageKey, asset.data.url);
return { ...asset, coverUrl: asset.coverUrl.startsWith("blob:") ? url : asset.coverUrl, data: { ...asset.data, url } };
}
return asset;
}
async function readStoredLogs(store: LogStore) {
const logs: StoredLog[] = [];
await store.iterate<StoredLog, void>((value) => {
if (value && typeof value === "object") logs.push(value);
});
return logs;
}
async function replaceStoredLogs(store: LogStore, logs: StoredLog[]) {
await store.clear();
await runWithConcurrency(logs, FILE_CONCURRENCY, async (log) => {
const id = getStringField(log, "id");
if (id) await store.setItem(id, log);
});
}
function mergeById<T extends { id?: string }>(local: T[], remote: T[], timeKey: string) {
const items = new Map<string, T>();
remote.forEach((item) => {
const id = item.id || "";
if (id) items.set(id, item);
});
local.forEach((item) => {
const id = item.id || "";
if (!id) return;
const current = items.get(id);
if (!current || getTime(item as Record<string, unknown>, timeKey) >= getTime(current as Record<string, unknown>, timeKey)) items.set(id, item);
});
return Array.from(items.values()).sort((a, b) => getTime(b as Record<string, unknown>, timeKey) - getTime(a as Record<string, unknown>, timeKey));
}
function collectStorageKeys(value: unknown, keys = new Set<string>()) {
if (typeof value === "string") {
if (storageKeyPattern.test(value)) keys.add(value);
return [...keys];
}
if (!value || typeof value !== "object") return [...keys];
if ("storageKey" in value && typeof value.storageKey === "string" && storageKeyPattern.test(value.storageKey)) keys.add(value.storageKey);
Object.values(value).forEach((item) => (Array.isArray(item) ? item.forEach((child) => collectStorageKeys(child, keys)) : collectStorageKeys(item, keys)));
return [...keys];
}
function domainPath(domain: DomainKey, path: string) {
return `${domain}/${path}`;
}
function domainLabel(domain: DomainKey) {
if (domain === "canvas") return "画布";
if (domain === "assets") return "我的素材";
if (domain === "image-workbench") return "生图工作台";
return "视频创作台";
}
function emitProgress(onProgress: AppSyncProgress | undefined, event: AppSyncProgressEvent) {
onProgress?.(event);
}
function getStringField(item: Record<string, unknown>, key: string) {
const value = item[key];
return typeof value === "string" ? value : "";
}
function getTime(item: Record<string, unknown>, key: string) {
const value = item[key];
if (typeof value === "number") return value;
if (typeof value === "string") return Date.parse(value) || 0;
return 0;
}
function safeFileName(value: string) {
return value.replace(/[\\/:*?"<>|]/g, "_");
}
function fileExtension(mimeType: string, storageKey: string) {
if (mimeType.includes("png")) return "png";
if (mimeType.includes("jpeg")) return "jpg";
if (mimeType.includes("webp")) return "webp";
if (mimeType.includes("gif")) return "gif";
if (mimeType.includes("mp4")) return "mp4";
if (mimeType.includes("webm")) return "webm";
if (mimeType.includes("wav")) return "wav";
if (mimeType.includes("mpeg") || mimeType.includes("mp3")) return "mp3";
return storageKey.startsWith("image:") ? "png" : "bin";
}
function waitForHydration<T extends { hydrated: boolean }>(store: { getState: () => T; subscribe: (listener: (state: T) => void) => () => void }) {
if (store.getState().hydrated) return Promise.resolve();
return new Promise<void>((resolve) => {
const unsubscribe = store.subscribe((state) => {
if (!state.hydrated) return;
unsubscribe();
resolve();
});
});
}
async function runWithConcurrency<T, R>(items: T[], limit: number, worker: (item: T, index: number) => Promise<R>) {
const results = new Array<R>(items.length);
let nextIndex = 0;
await Promise.all(
Array.from({ length: Math.min(limit, items.length) }, async () => {
while (nextIndex < items.length) {
const index = nextIndex++;
results[index] = await worker(items[index], index);
}
}),
);
return results;
}
function formatBytes(bytes: number) {
if (bytes < 1024) return `${bytes}B`;
if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
return `${(bytes / 1024 / 1024).toFixed(1)}MB`;
}
+155
View File
@@ -0,0 +1,155 @@
"use client";
import type { WebdavSyncConfig } from "@/stores/use-config-store";
export const WEBDAV_MANIFEST_FILE_NAME = "manifest.json";
const WEBDAV_REQUEST_TIMEOUT_MS = 120000;
const ensuredDirectories = new Set<string>();
export async function testWebdavConnection(config: WebdavSyncConfig) {
await ensureWebdavDirectory(config);
const response = await webdavFetch(config, "", { method: "PROPFIND", headers: { Depth: "0" } });
if (response.ok || response.status === 207) return;
await throwWebdavError(response, "WebDAV 连接测试失败");
}
export async function downloadWebdavSyncFile(config: WebdavSyncConfig) {
return downloadWebdavFile(config, WEBDAV_MANIFEST_FILE_NAME);
}
export async function downloadWebdavFile(config: WebdavSyncConfig, path: string) {
await ensureWebdavDirectory(config);
const response = await webdavFetch(config, path, { method: "GET" });
if (response.status === 404) return null;
if (!response.ok) await throwWebdavError(response, "读取 WebDAV 同步文件失败");
const file = await withTimeout(response.blob(), "读取 WebDAV 同步文件超时");
return file.size ? file : null;
}
export async function uploadWebdavSyncFile(config: WebdavSyncConfig, file: Blob) {
return uploadWebdavFile(config, WEBDAV_MANIFEST_FILE_NAME, file, "application/json");
}
export async function uploadWebdavFile(config: WebdavSyncConfig, path: string, file: Blob, contentType = "application/octet-stream") {
if (!file.size) throw new Error("上传文件为空,已取消上传");
await ensureWebdavDirectory(config);
await ensureWebdavSubdirectory(config, path);
const response = await webdavFetch(config, path, {
method: "PUT",
headers: { "Content-Type": contentType },
body: file,
});
if (!response.ok) await throwWebdavError(response, "上传 WebDAV 同步文件失败");
}
async function ensureWebdavDirectory(config: WebdavSyncConfig) {
assertWebdavConfig(config);
await ensureWebdavDirectoryPath(config, config.directory);
}
async function ensureWebdavSubdirectory(config: WebdavSyncConfig, path: string) {
const directory = normalizePath(path).split("/").slice(0, -1).join("/");
if (!directory) return;
await ensureWebdavDirectoryPath(config, [config.directory, directory].filter(Boolean).join("/"));
}
async function ensureWebdavDirectoryPath(config: WebdavSyncConfig, directory: string) {
const parts = normalizePath(directory).split("/").filter(Boolean);
const cacheKey = `${config.proxyMode}:${config.url}:${parts.join("/")}`;
if (ensuredDirectories.has(cacheKey)) return;
let path = "";
for (const part of parts) {
path = path ? `${path}/${part}` : part;
const response = await webdavFetch({ ...config, directory: "" }, path, { method: "MKCOL" });
if (response.ok || ((response.status === 405 || response.status === 423) && (await webdavDirectoryExists(config, path)))) continue;
await throwWebdavError(response, "创建 WebDAV 远程目录失败");
}
ensuredDirectories.add(cacheKey);
}
async function webdavDirectoryExists(config: WebdavSyncConfig, path: string) {
const response = await webdavFetch({ ...config, directory: "" }, path, { method: "PROPFIND", headers: { Depth: "0" } });
return response.ok || response.status === 207;
}
async function webdavFetch(config: WebdavSyncConfig, path: string, init: RequestInit) {
const headers = new Headers(init.headers);
if (config.username || config.password) headers.set("Authorization", `Basic ${encodeBasicAuth(`${config.username}:${config.password}`)}`);
const controller = new AbortController();
const timer = window.setTimeout(() => controller.abort(), WEBDAV_REQUEST_TIMEOUT_MS);
try {
const url = buildWebdavUrl(config, path);
if (config.proxyMode === "nextjs") return await fetch("/webdav-proxy", { method: "POST", headers: proxyHeaders(url, init.method || "GET", headers), body: proxyBody(init), signal: controller.signal });
return await fetch(url, { ...init, headers, signal: controller.signal });
} catch (error) {
if (error instanceof Error && error.name === "AbortError") throw new Error("WebDAV 请求超时,请检查网络、代理或远端服务状态");
if (error instanceof TypeError) throw new Error("无法连接 WebDAV,请检查地址、HTTPS 证书、CORS 或网络状态");
throw error;
} finally {
window.clearTimeout(timer);
}
}
function proxyHeaders(target: string, method: string, headers: Headers) {
const proxyHeaders = new Headers({
"x-webdav-target": target,
"x-webdav-method": method,
});
copyProxyHeader(headers, proxyHeaders, "Authorization", "x-webdav-authorization");
copyProxyHeader(headers, proxyHeaders, "Depth", "x-webdav-depth");
copyProxyHeader(headers, proxyHeaders, "Destination", "x-webdav-destination");
copyProxyHeader(headers, proxyHeaders, "Overwrite", "x-webdav-overwrite");
copyProxyHeader(headers, proxyHeaders, "Content-Type", "x-webdav-content-type");
const contentType = headers.get("Content-Type");
if (contentType) proxyHeaders.set("Content-Type", contentType);
return proxyHeaders;
}
function copyProxyHeader(from: Headers, to: Headers, source: string, target: string) {
const value = from.get(source);
if (value) to.set(target, value);
}
function proxyBody(init: RequestInit) {
const method = (init.method || "GET").toUpperCase();
if (method === "GET" || method === "HEAD") return undefined;
return init.body || undefined;
}
function buildWebdavUrl(config: WebdavSyncConfig, path: string) {
const baseUrl = config.url.trim().replace(/\/+$/, "");
const remotePath = [normalizePath(config.directory), normalizePath(path)].filter(Boolean).join("/");
if (!remotePath) return baseUrl;
return `${baseUrl}/${remotePath.split("/").map(encodeURIComponent).join("/")}`;
}
function normalizePath(path: string) {
return path.trim().replace(/^\/+|\/+$/g, "");
}
function assertWebdavConfig(config: WebdavSyncConfig) {
if (!config.url.trim()) throw new Error("请先填写 WebDAV 地址");
}
async function throwWebdavError(response: Response, fallback: string): Promise<never> {
const detail = await response.text().catch(() => "");
if (response.status === 401 || response.status === 403) throw new Error("WebDAV 认证失败,请检查用户名、密码或应用密码");
if (response.status === 404) throw new Error("WebDAV 路径不存在,请检查地址和远程目录");
throw new Error(`${fallback}${response.status}${detail ? ` ${detail.slice(0, 120)}` : ""}`);
}
function encodeBasicAuth(value: string) {
const bytes = new TextEncoder().encode(value);
let binary = "";
bytes.forEach((byte) => {
binary += String.fromCharCode(byte);
});
return btoa(binary);
}
function withTimeout<T>(promise: Promise<T>, message: string) {
return new Promise<T>((resolve, reject) => {
const timer = window.setTimeout(() => reject(new Error(message)), WEBDAV_REQUEST_TIMEOUT_MS);
promise.then(resolve, reject).finally(() => window.clearTimeout(timer));
});
}
+7
View File
@@ -28,10 +28,12 @@ type AssetBase<T extends AssetKind> = {
};
type AssetStore = {
hydrated: boolean;
assets: Asset[];
addAsset: (asset: Omit<Asset, "id" | "createdAt" | "updatedAt">) => string;
updateAsset: (id: string, patch: Partial<Omit<Asset, "id" | "createdAt">>) => void;
removeAsset: (id: string) => void;
replaceAssets: (assets: Asset[]) => void;
cleanupImages: (extra?: unknown) => void;
};
@@ -66,6 +68,7 @@ const assetStorage: PersistStorage<AssetStore> = {
export const useAssetStore = create<AssetStore>()(
persist(
(set, get) => ({
hydrated: false,
assets: [],
addAsset: (asset) => {
const now = new Date().toISOString();
@@ -83,6 +86,7 @@ export const useAssetStore = create<AssetStore>()(
get().cleanupImages({ assets });
return { assets };
}),
replaceAssets: (assets) => set({ assets }),
cleanupImages: (extra) => {
window.setTimeout(async () => {
const { useCanvasStore } = await import("@/app/(user)/canvas/stores/use-canvas-store");
@@ -95,6 +99,9 @@ export const useAssetStore = create<AssetStore>()(
name: ASSET_STORE_KEY,
storage: assetStorage,
partialize: (state) => ({ assets: state.assets }) as StorageValue<AssetStore>["state"],
onRehydrateStorage: () => () => {
useAssetStore.setState({ hydrated: true });
},
},
),
);
+33 -2
View File
@@ -36,6 +36,15 @@ export type AiConfig = {
canvasImageCount: string;
};
export type WebdavSyncConfig = {
proxyMode: "direct" | "nextjs";
url: string;
username: string;
password: string;
directory: string;
lastSyncedAt: string;
};
export const CONFIG_STORE_KEY = "infinite-canvas:ai_config_store";
export type ModelCapability = "image" | "video" | "text" | "audio";
@@ -68,13 +77,24 @@ export const defaultConfig: AiConfig = {
canvasImageCount: "3",
};
export const defaultWebdavSyncConfig: WebdavSyncConfig = {
proxyMode: "direct",
url: "",
username: "",
password: "",
directory: "infinite-canvas",
lastSyncedAt: "",
};
type ConfigStore = {
config: AiConfig;
webdav: WebdavSyncConfig;
publicSettings: AdminPublicSettings | null;
isPublicSettingsLoading: boolean;
isConfigOpen: boolean;
shouldPromptContinue: boolean;
updateConfig: <K extends keyof AiConfig>(key: K, value: AiConfig[K]) => void;
updateWebdavConfig: <K extends keyof WebdavSyncConfig>(key: K, value: WebdavSyncConfig[K]) => void;
loadPublicSettings: () => Promise<void>;
isAiConfigReady: (config: AiConfig, model: string) => boolean;
openConfigDialog: (shouldPromptContinue?: boolean) => void;
@@ -168,6 +188,7 @@ export const useConfigStore = create<ConfigStore>()(
persist(
(set, get) => ({
config: defaultConfig,
webdav: defaultWebdavSyncConfig,
publicSettings: null,
isPublicSettingsLoading: false,
isConfigOpen: false,
@@ -179,6 +200,13 @@ export const useConfigStore = create<ConfigStore>()(
[key]: value,
},
})),
updateWebdavConfig: (key, value) =>
set((state) => ({
webdav: {
...state.webdav,
[key]: value,
},
})),
loadPublicSettings: async () => {
if (get().isPublicSettingsLoading) return;
set({ isPublicSettingsLoading: true });
@@ -195,12 +223,15 @@ export const useConfigStore = create<ConfigStore>()(
}),
{
name: CONFIG_STORE_KEY,
partialize: (state) => ({ config: state.config }),
partialize: (state) => ({ config: state.config, webdav: state.webdav }),
merge: (persisted, current) => {
const persistedConfig = ((persisted as Partial<ConfigStore>).config || {}) as Partial<AiConfig>;
const persistedState = (persisted || {}) as Partial<ConfigStore>;
const persistedConfig = (persistedState.config || {}) as Partial<AiConfig>;
const persistedWebdav = (persistedState.webdav || {}) as Partial<WebdavSyncConfig>;
const config = { ...defaultConfig, ...persistedConfig };
return {
...current,
webdav: { ...defaultWebdavSyncConfig, ...persistedWebdav },
config: {
...config,
channelMode: config.channelMode || "remote",