From 2c91e3376f2721af52d4cb528e88fde7714efa22 Mon Sep 17 00:00:00 2001 From: Sami Fouad Date: Wed, 14 Oct 2026 18:46:56 -0600 Subject: [PATCH] Import finish answers at once: import refs, summary and re-indexing run after the response (they outlasted the importer's wait, so every import ended 'failed'). 0.7.9 --- package-lock.json | 4 ++-- package.json | 2 +- src/server/api/imports.ts | 17 ++++++++++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19adbef..1e99593 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gildforge/kit", - "version": "0.7.8", + "version": "0.7.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gildforge/kit", - "version": "0.7.8", + "version": "0.7.9", "license": "Apache-2.0", "dependencies": { "diff": "8", diff --git a/package.json b/package.json index 80c0d69..44eba1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gildforge/kit", - "version": "0.7.8", + "version": "0.7.9", "description": "The shared engine, views and server behind gild: the git forge for agents on Cloudflare.", "license": "Apache-2.0", "type": "module", diff --git a/src/server/api/imports.ts b/src/server/api/imports.ts index 1730311..c7fc23d 100644 --- a/src/server/api/imports.ts +++ b/src/server/api/imports.ts @@ -97,13 +97,20 @@ export async function apiImports(c:Context):Promise { return {data:{ok:true}} } if(id==='importFinish') { + if(!b.error && b.default_branch) {const state=await st.settings.state(`${owner}/${repo}`);await st.settings.putState({...state,defaultBranch:b.default_branch})} + const finished=await job.finish(token,b.warnings,b.error,b.summary) + // The repository is all there: finishing its import refs and summary and + // re-indexing take tens of seconds, longer than an importer waits for an + // answer, so they run after it (a failure is logged; the data stays). if(!b.error) { - if(b.default_branch) {const state=await st.settings.state(`${owner}/${repo}`);await st.settings.putState({...state,defaultBranch:b.default_branch})} - const { finishImportRefs } = await import('../import/finish.js') - await finishImportRefs(owner,repo,active.internalPrefix??'import/pr',{url:active.source,mirror:active.mirror,readOnly:false,warnings:b.warnings,summary:b.summary}) - await scheduleIndex(owner,repo) + const work=(async()=>{ + const { finishImportRefs } = await import('../import/finish.js') + await finishImportRefs(owner,repo,active.internalPrefix??'import/pr',{url:active.source,mirror:active.mirror,readOnly:false,warnings:b.warnings,summary:b.summary}) + await scheduleIndex(owner,repo) + })().catch(e=>console.error('Import finishing failed',owner,repo,e instanceof Error?e.message:e)) + ;(await getCloudflareContext()).ctx.waitUntil(work) } - return {data:await job.finish(token,b.warnings,b.error,b.summary)} + return {data:finished} } void active throw new ApiError(404,'Not Found')