f-denkena/rclone-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checking on transfers, #141

Browse Source
This commit is contained in:
FTCHD
2026-01-30 01:20:47 +07:00
parent a89332d205
commit b38d96c68b
3 changed files with 73 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/rclone/api.ts
+51 -7
View File
@@ -117,6 +117,12 @@ export async function startCopy({
remotes?: Record<string, Record<string, FlagValue>>
}
}) {
console.log('[startCopy] starting', {
sources,
destination,
optionKeys: Object.keys(options),
})
for (const source of sources) {
const sourceExists = await hasStat(source)
if (!sourceExists) {
@@ -228,6 +234,7 @@ export async function startCopy({
pendingJobs.push(jobParams)
}
console.log('[startCopy] submitting batch', { jobCount: pendingJobs.length })
return startBatch(pendingJobs)
}
@@ -245,6 +252,12 @@ export async function startMove({
remotes?: Record<string, Record<string, FlagValue>>
}
}) {
console.log('[startMove] starting', {
sources,
destination,
optionKeys: Object.keys(options),
})
for (const source of sources) {
const sourceExists = await hasStat(source)
if (!sourceExists) {
@@ -345,6 +358,7 @@ export async function startMove({
pendingJobs.push(jobParams)
}
console.log('[startMove] submitting batch', { jobCount: pendingJobs.length })
return startBatch(pendingJobs)
}
@@ -365,6 +379,7 @@ async function fetchJob(jobId: number, transferred: Awaited<ReturnType<typeof fe
},
},
})
console.log('[fetchJob] job stats', jobId, JSON.stringify(job, null, 2))
const jobStatus = await rclone('/job/status', {
params: {
@@ -373,6 +388,7 @@ async function fetchJob(jobId: number, transferred: Awaited<ReturnType<typeof fe
},
},
})
console.log('[fetchJob] job status', jobId, JSON.stringify(jobStatus, null, 2))
let hasError = !!jobStatus?.error
@@ -438,13 +454,17 @@ async function fetchJob(jobId: number, transferred: Awaited<ReturnType<typeof fe
}
export async function listTransfers() {
console.log('[listTransfers]')
console.log('[listTransfers] starting')
const allStats = await rclone('/core/stats')
console.log('[listTransfers] allStats', JSON.stringify(allStats, null, 2))
const transferring = allStats?.transferring
const transferring = allStats?.transferring || []
console.log('[listTransfers] transferring count:', transferring.length)
const transferred = await fetchTransferred()
console.log('[listTransfers] transferred count:', transferred?.length || 0)
const jobs = {
active: [] as JobItem[],
@@ -479,6 +499,7 @@ export async function listTransfers() {
.filter((id) => !activeJobIds.has(id))
.sort((a, b) => a - b)
)
console.log('[listTransfers] inactive job IDs:', Array.from(inactiveJobIds))
for (const jobId of inactiveJobIds) {
const job = await fetchJob(jobId, transferred)
@@ -491,6 +512,13 @@ export async function listTransfers() {
}
}
console.log(
'[listTransfers] final result - active:',
jobs.active.length,
'inactive:',
jobs.inactive.length
)
return jobs
}
@@ -1090,7 +1118,11 @@ export async function startServe({
}
export async function startBatch(inputs: ({ _path: string } & Record<string, any>)[]) {
console.log('[startBatch] inputs', inputs)
console.log('[startBatch] starting batch operation', {
inputCount: inputs.length,
paths: inputs.map((i) => i._path),
})
console.log('[startBatch] inputs', JSON.stringify(inputs, null, 2))
const r = await pRetry(
async () =>
@@ -1105,6 +1137,8 @@ export async function startBatch(inputs: ({ _path: string } & Record<string, any
}
)
console.log('[startBatch] job created', { jobid: r.jobid })
await new Promise((resolve) => setTimeout(resolve, 1000))
const jobStatus = await pRetry(
@@ -1121,10 +1155,16 @@ export async function startBatch(inputs: ({ _path: string } & Record<string, any
}
).catch(null)
console.log('jobStatus', JSON.stringify(jobStatus, null, 2))
console.log('[startBatch] jobStatus', {
jobid: r.jobid,
finished: jobStatus?.finished,
success: jobStatus?.success,
error: jobStatus?.error,
})
console.log('[startBatch] jobStatus full', JSON.stringify(jobStatus, null, 2))
if (!jobStatus) {
console.error('Failed to start job:', r.jobid)
console.error('[startBatch] ERROR: job status is null', { jobid: r.jobid })
throw new Error('Failed to start operation')
}
@@ -1145,16 +1185,20 @@ export async function startBatch(inputs: ({ _path: string } & Record<string, any
})
.join('\n')
console.error('All batch operations failed:', errorMessages)
console.error('[startBatch] ERROR: all batch operations failed', {
jobid: r.jobid,
errorMessages,
})
throw new Error(errorMessages)
}
}
if (jobStatus.error) {
console.error('Failed to start job:', r.jobid, jobStatus.error)
console.error('[startBatch] ERROR: job failed', { jobid: r.jobid, error: jobStatus.error })
throw new Error(jobStatus.error)
}
console.log('[startBatch] SUCCESS', { jobid: r.jobid })
return r.jobid
}
lib/rclone/client.ts
+12 -10
View File
@@ -63,24 +63,27 @@ export default async function rclone<
path: Path,
...init: InitParam<Init>
): Promise<OpenApiMethodResponse<RCDClient, 'post', Path, Init>> {
console.log('[rclone] STARTING', path)
console.log('[rclone] REQUEST', path, {
params: init[0]?.params,
body: init[0]?.body,
})
const client = await pRetry(() => getClient(), {
'maxTimeout': 500,
}) //! for some reason this still fails sometimes
if (!client) {
console.error('[rclone] ERROR: Failed to get client after retries', path)
throw new Error('Failed to get client after retries')
}
console.log('[rclone] init', init)
const result = await client.POST(
path,
...(init as InitParam<OpenApiMaybeOptionalInit<Paths[Path], 'post'>>)
)
if (result?.error) {
console.log('[rclone] result?.error', result.error)
console.error('[rclone] ERROR', path, { error: result.error })
const message =
typeof result.error === 'string' ? result.error : JSON.stringify(result.error)
@@ -89,22 +92,21 @@ export default async function rclone<
const data = result.data as { error?: unknown } | undefined
if (data?.error) {
console.log('[rclone] data?.error', data.error)
console.error('[rclone] DATA ERROR', path, { error: data.error })
const message = typeof data.error === 'string' ? data.error : JSON.stringify(data.error)
throw new Error(message)
}
if (!result.response.ok) {
console.log(
'[rclone] !result.response.ok',
result.response.status,
result.response.statusText
)
console.error('[rclone] HTTP ERROR', path, {
status: result.response.status,
statusText: result.response.statusText,
})
throw new Error(`${result.response.status} ${result.response.statusText}`)
}
console.log('[rclone] ENDING', path)
console.log('[rclone] RESPONSE', path, { hasData: !!result.data })
return result.data as OpenApiMethodResponse<typeof client, 'post', Path, Init>
}
src/pages/Transfers.tsx
+10 -1
View File
@@ -59,7 +59,16 @@ export default function Transfers() {
[transfersQuery.data]
)
console.log('transfers', JSON.stringify(transfers, null, 2))
console.log('[Transfers] query state', {
isLoading: transfersQuery.isLoading,
isRefetching: transfersQuery.isRefetching,
isError: transfersQuery.isError,
error: transfersQuery.error,
activeCount: transfers.active.length,
inactiveCount: transfers.inactive.length,
checkingJobs: transfers.active.filter((j) => j.isChecking).length,
})
console.log('[Transfers] data', JSON.stringify(transfers, null, 2))
if (transfersQuery.isLoading) {
return (