|
|
|
@@ -1,3 +1,4 @@
|
|
|
|
|
import { encodeCopySnapshot, decodeCopySnapshot, copyRegistrySignature } from './copy-snapshot.ts';
|
|
|
|
|
import { planDuplicateAsync } from './duplicate.ts';
|
|
|
|
|
import { encodeDuplicateSource, prepareDuplicateImport, assertDuplicateExternal } from './import-duplicate.ts';
|
|
|
|
|
import { createImportJob, createImportRunner, createNdjsonImportSource, type ImportJob } from './imports.ts';
|
|
|
|
@@ -7,7 +8,7 @@ import type { Document, Id, Registry, Result, RunInput, RunApplyInput, RunCancel
|
|
|
|
|
import { createEditor, type EditorOptions, type Transaction } from '../canvas-core/editor.ts';
|
|
|
|
|
import { createDocument } from '../canvas-core/document.ts';
|
|
|
|
|
import { createSessions } from '../canvas-core/gestures.ts';
|
|
|
|
|
import { equal, fault, freeze, readMap, reject } from '../canvas-core/values.ts';
|
|
|
|
|
import { clone, equal, fault, freeze, readMap, reject } from '../canvas-core/values.ts';
|
|
|
|
|
import type { CanonicalProposal, EngineSnapshot, PersistencePort, RuntimeState } from './contracts.ts';
|
|
|
|
|
import { createRunTracker, validateRunInput, runContainsTarget, type RunPort, type RunRecord, type RunPage } from './runs.ts';
|
|
|
|
|
import { createNetworkGate } from './network.ts';
|
|
|
|
@@ -57,6 +58,7 @@ export async function openProjectEngine(options: EngineOptions) {
|
|
|
|
|
let staged: readonly ResourceRecord[] = [];
|
|
|
|
|
let applying: RunApplyInput | undefined;
|
|
|
|
|
let importing: { job: ImportJob; expectedGeneration: number } | undefined;
|
|
|
|
|
const preparationControllers=new Map<Id,AbortController>();
|
|
|
|
|
const copyPreparations=new Map<AbortController,Promise<Id>>();
|
|
|
|
|
const importRunners=new Map<Id,ReturnType<typeof createImportRunner>>(),importLoads=new Map<Id,Promise<void>>(),importHolds=new Map<symbol,Map<Id,()=>void>>();
|
|
|
|
|
let recovery: { controller: AbortController; release(): void; cancel():Promise<void> } | undefined;
|
|
|
|
@@ -318,17 +320,40 @@ export async function openProjectEngine(options: EngineOptions) {
|
|
|
|
|
assertWritable();const permission=options.policy?.({type:'changes.apply',changes:[]},editor.getSnapshot().document);if(permission&&!permission.enabled)throw fault(permission.code,permission.targets);
|
|
|
|
|
const result=editor.updateRuntime(previous=>{const imports=new Map(previous.imports??[]);if(imports.get(job.id)?.generation!==expectedGeneration)throw fault('stale_import_job');imports.set(job.id,job);return Object.freeze({...previous,imports:readMap(imports)});});if(result.status==='rejected')throw fault(result.code,result.targets);
|
|
|
|
|
}
|
|
|
|
|
function holdImports(){const token=Symbol(),releases=new Map<Id,()=>void>();importHolds.set(token,releases);for(const[id,runner]of importRunners)releases.set(id,runner.hold());return()=>{if(!importHolds.delete(token))return;for(const release of releases.values())release();if(!closing&&!closed)for(const job of editor.getSnapshot().runtime.imports?.values()??[])if(job.status==='running'&&!importRunners.has(job.id))void loadImport(job.id);};}
|
|
|
|
|
function holdImports(){const token=Symbol(),releases=new Map<Id,()=>void>();importHolds.set(token,releases);for(const controller of preparationControllers.values())controller.abort();for(const[id,runner]of importRunners)releases.set(id,runner.hold());return()=>{if(!importHolds.delete(token))return;for(const release of releases.values())release();if(!closing&&!closed)for(const job of editor.getSnapshot().runtime.imports?.values()??[])if(['running','preparing'].includes(job.status)&&!importRunners.has(job.id))void loadImport(job.id);};}
|
|
|
|
|
async function materializeCopy(id:Id,bytes:Blob,controller:AbortController){
|
|
|
|
|
const admitted=getImport(id),preparation=admitted.preparation;
|
|
|
|
|
if(!preparation||admitted.source?.kind!=='duplicate-snapshot')throw fault('invalid_copy_preparation');
|
|
|
|
|
const check=()=>{const job=getImport(id);if(controller.signal.aborted||closing||closed||importHolds.size||job.status!=='preparing'||job.sourceFingerprint!==admitted.sourceFingerprint)throw fault('copy_aborted');return job;};
|
|
|
|
|
await persist();check();const document=await decodeCopySnapshot(bytes,options.scope.projectId,options.registry,controller.signal);
|
|
|
|
|
if(copyRegistrySignature(document,options.registry)!==preparation.registrySignature)throw fault('copy_interpreter_changed');
|
|
|
|
|
const allocationIds=[...preparation.allocationIds];let cursor=0;
|
|
|
|
|
const plan=await planDuplicateAsync(document,options.registry,preparation.selection,{worldOffset:preparation.worldOffset,createId:()=>{const index=cursor++;if(index<allocationIds.length)return allocationIds[index];const id=createId();allocationIds.push(id);return id;}},{signal:controller.signal,checkpoint:async steps=>{
|
|
|
|
|
const job=check(),previous=job.preparation!;
|
|
|
|
|
if(steps<=previous.steps&&allocationIds.length===previous.allocationIds.length)return;
|
|
|
|
|
publishImport(freeze({...job,generation:job.generation+1,preparation:{...previous,steps:Math.max(previous.steps,steps),allocationIds:[...allocationIds]}}),job.generation);await persist();check();
|
|
|
|
|
}});
|
|
|
|
|
check();if(cursor!==allocationIds.length)throw fault('copy_interpreter_changed');
|
|
|
|
|
const encoded=await encodeDuplicateSource(document,options.registry,plan,controller.signal),job=check();assertWritable();assertNativeImportTarget(job,editor.getSnapshot().document);
|
|
|
|
|
const permission=options.policy?.({type:'changes.apply',changes:plan.changes},editor.getSnapshot().document);if(permission&&!permission.enabled)throw fault(permission.code,permission.targets);
|
|
|
|
|
const fileId=createId(),runtime=editor.getSnapshot().runtime;if(!fileId||fileWrites.has(fileId)||runtime.resources.has(fileId)||[...(runtime.imports?.values()??[])].some(job=>job.source?.fileId===fileId))throw fault('import_identity_conflict');
|
|
|
|
|
const stableIds=Object.fromEntries([...Object.entries(plan.elementIds).map(([old,id])=>[`element:${old}`,id]),...Object.entries(plan.canvasIds).map(([old,id])=>[`canvas:${old}`,id])]);
|
|
|
|
|
const next={...job,generation:job.generation+1,status:'running' as const,stableIds,sourceFingerprint:`local-file:${fileId}:${encoded.size}`,source:{...job.source!,kind:'duplicate-ndjson' as const,fileId,byteLength:encoded.size,copy:{sourceRevision:job.source!.copy!.sourceRevision,roots:plan.roots}}};delete next.preparation;delete next.error;
|
|
|
|
|
fileWrites.set(fileId,encoded);try{publishImport(freeze(next),job.generation);}catch(error){fileWrites.delete(fileId);throw error;}
|
|
|
|
|
return{job:getImport(id),bytes:encoded};
|
|
|
|
|
}
|
|
|
|
|
function loadImport(id:Id):Promise<void>{
|
|
|
|
|
if(importLoads.has(id))return importLoads.get(id)!;
|
|
|
|
|
if(importRunners.has(id)){void importRunners.get(id)!.start();return Promise.resolve();}
|
|
|
|
|
const expectedFingerprint=getImport(id).sourceFingerprint;
|
|
|
|
|
let expectedFingerprint=getImport(id).sourceFingerprint;
|
|
|
|
|
const preparationController=new AbortController();if(getImport(id).source?.kind==='duplicate-snapshot')preparationControllers.set(id,preparationController);
|
|
|
|
|
const task=(async()=>{
|
|
|
|
|
const job=getImport(id),source=job.source;if(!source||!['native-ndjson','duplicate-ndjson'].includes(source.kind)||job.parserVersion!==1)throw fault('import_interpreter_unavailable');
|
|
|
|
|
const bytes=fileWrites.get(source.fileId)??await options.storage.readFile(leader,source.fileId);
|
|
|
|
|
let job=getImport(id),source=job.source;if(!source||!['native-ndjson','duplicate-ndjson','duplicate-snapshot'].includes(source.kind)||job.parserVersion!==1)throw fault('import_interpreter_unavailable');
|
|
|
|
|
let bytes=fileWrites.get(source.fileId)??await options.storage.readFile(leader,source.fileId);
|
|
|
|
|
if(closing||closed)return;
|
|
|
|
|
const latest=getImport(id);if(latest.sourceFingerprint!==job.sourceFingerprint||latest.source?.fileId!==source.fileId||['completed','partial','cancelled'].includes(latest.status))return;
|
|
|
|
|
if(!bytes)throw fault('import_source_unavailable');if(bytes.size!==source.byteLength)throw fault('import_source_changed');
|
|
|
|
|
if(source.kind==='duplicate-snapshot'){if(preparationController.signal.aborted||importHolds.size||latest.status!=='preparing')return;const materialized=await materializeCopy(id,bytes,preparationController);job=materialized.job;source=job.source!;bytes=materialized.bytes;expectedFingerprint=job.sourceFingerprint;}
|
|
|
|
|
const runner=createImportRunner({optimisticLocal:true,source:createNdjsonImportSource({bytes,fingerprint:job.sourceFingerprint}),getJob:()=>getImport(id),createId,
|
|
|
|
|
publish:publishImport,prepare:(line,job,reserve)=>job.source?.kind==='duplicate-ndjson'?prepareDuplicateImport(line,job,reserve):prepareNativeImport(line,job,reserve,editor.getSnapshot().document,options.registry),persist,onError:report,
|
|
|
|
|
commit(units,next,expected){
|
|
|
|
@@ -340,7 +365,7 @@ export async function openProjectEngine(options: EngineOptions) {
|
|
|
|
|
});
|
|
|
|
|
importRunners.set(id,runner);for(const releases of importHolds.values())releases.set(id,runner.hold());
|
|
|
|
|
if(getImport(id).status==='running')void runner.start();
|
|
|
|
|
})().catch(error=>{if(!closing&&!closed){try{const job=getImport(id);if(job.sourceFingerprint!==expectedFingerprint||['completed','partial','cancelled'].includes(job.status))return;publishImport(freeze({...job,generation:job.generation+1,status:'paused',error:(error as {code?:string}).code??'import_failed'}),job.generation);}catch{/* Recovery/identity fences retain the original job. */}report(error);}}).finally(()=>{importLoads.delete(id);});
|
|
|
|
|
})().catch(error=>{if(preparationController.signal.aborted)return;if(!closing&&!closed){try{const job=getImport(id);if(job.sourceFingerprint!==expectedFingerprint||['completed','partial','cancelled','paused'].includes(job.status))return;publishImport(freeze({...job,generation:job.generation+1,status:'paused',error:(error as {code?:string}).code??'import_failed'}),job.generation);}catch{/* Recovery/identity fences retain the original job. */}report(error);}}).finally(()=>{preparationControllers.delete(id);importLoads.delete(id);});
|
|
|
|
|
importLoads.set(id,task);return task;
|
|
|
|
|
}
|
|
|
|
|
const imports=Object.freeze({
|
|
|
|
@@ -356,30 +381,28 @@ export async function openProjectEngine(options: EngineOptions) {
|
|
|
|
|
},
|
|
|
|
|
async duplicate(selection:readonly Target[],settings:{readonly worldOffset?:Point;readonly signal?:AbortSignal;readonly viewCanvasId?:Id}={}):Promise<Id>{
|
|
|
|
|
assertWritable();const permission=options.policy?.({type:'changes.apply',changes:[]},editor.getSnapshot().document);if(permission&&!permission.enabled)throw fault(permission.code,permission.targets);const captured=editor.getSnapshot(),target=settings.viewCanvasId??(selection[0]?captured.document.elements.get(selection[0].id)?.ownerCanvasId:undefined),signal=settings.signal,controller=new AbortController(),abort=()=>controller.abort();
|
|
|
|
|
const targets=freeze(clone(selection)),offset=freeze(clone(settings.worldOffset??{x:32,y:32}));
|
|
|
|
|
for(const selected of targets){const element=captured.document.elements.get(selected.id);if(!element||element.incarnation!==selected.incarnation)throw fault('stale_incarnation',[selected.id]);}if(![offset.x,offset.y].every(Number.isFinite))throw fault('invalid_copy_offset');
|
|
|
|
|
signal?.addEventListener('abort',abort,{once:true});if(signal?.aborted)controller.abort();
|
|
|
|
|
const task=(async()=>{
|
|
|
|
|
const plan=await planDuplicateAsync(captured.document,options.registry,selection,{createId,worldOffset:settings.worldOffset},{signal:controller.signal});
|
|
|
|
|
const bytes=await encodeDuplicateSource(captured.document,options.registry,plan,controller.signal);
|
|
|
|
|
assertWritable();if(controller.signal.aborted)throw fault('copy_aborted');const permission=options.policy?.({type:'changes.apply',changes:plan.changes},editor.getSnapshot().document);if(permission&&!permission.enabled)throw fault(permission.code,permission.targets);
|
|
|
|
|
// Task belongs to the initiating view; copied records retain their mapped document owners.
|
|
|
|
|
if(!target)throw fault('empty_copy_selection');
|
|
|
|
|
const canvas=editor.getSnapshot().document.canvases.get(target);if(!canvas)throw fault('copy_external_changed',[target]);
|
|
|
|
|
if(!target||!targets.length)throw fault('empty_copy_selection');
|
|
|
|
|
const bytes=await encodeCopySnapshot(captured.document,controller.signal);assertWritable();if(controller.signal.aborted)throw fault('copy_aborted');
|
|
|
|
|
const canvas=captured.document.canvases.get(target);if(!canvas)throw fault('canvas_not_loaded',[target]);
|
|
|
|
|
const id=createId(),fileId=createId(),current=editor.getSnapshot().runtime;
|
|
|
|
|
if(!id||!fileId||id===fileId||current.imports?.has(id)||current.resources.has(fileId)||fileWrites.has(fileId)||[...(current.imports?.values()??[])].some(job=>job.source?.fileId===fileId))throw fault('import_identity_conflict');
|
|
|
|
|
const entry=canvas.parent?editor.getSnapshot().document.elements.get(canvas.parent.entryElementId)!:undefined;
|
|
|
|
|
const stableIds=Object.fromEntries([...Object.entries(plan.elementIds).map(([old,id])=>[`element:${old}`,id]),...Object.entries(plan.canvasIds).map(([old,id])=>[`canvas:${old}`,id])]);
|
|
|
|
|
const job=freeze({...createImportJob({id,projectId:options.scope.projectId,sourceFingerprint:`local-file:${fileId}:${bytes.size}`,parserVersion:1,source:{kind:'duplicate-ndjson',name:'复制选中内容',fileId,byteLength:bytes.size,targetCanvasId:target,copy:{sourceRevision:captured.revision,roots:plan.roots},...(entry?{targetEntry:{id:entry.id,incarnation:entry.incarnation}}:{})}}),stableIds,status:'running' as const});
|
|
|
|
|
const entry=canvas.parent?captured.document.elements.get(canvas.parent.entryElementId)!:undefined;
|
|
|
|
|
const job=freeze({...createImportJob({id,projectId:options.scope.projectId,sourceFingerprint:`local-file:${fileId}:${bytes.size}`,parserVersion:1,source:{kind:'duplicate-snapshot',name:'复制选中内容',fileId,byteLength:bytes.size,targetCanvasId:target,copy:{sourceRevision:captured.revision,roots:[]},...(entry?{targetEntry:{id:entry.id,incarnation:entry.incarnation}}:{})}}),status:'preparing' as const,preparation:{version:1 as const,registrySignature:copyRegistrySignature(captured.document,options.registry),selection:targets,worldOffset:offset,allocationIds:[],steps:0}});
|
|
|
|
|
fileWrites.set(fileId,bytes);const result=editor.updateRuntime(previous=>{const jobs=new Map(previous.imports??[]);jobs.set(id,job);return Object.freeze({...previous,imports:readMap(jobs)});});
|
|
|
|
|
if(result.status==='rejected'){fileWrites.delete(fileId);throw fault(result.code,result.targets);}void loadImport(id);return id;
|
|
|
|
|
})();
|
|
|
|
|
copyPreparations.set(controller,task);void task.finally(()=>{copyPreparations.delete(controller);signal?.removeEventListener('abort',abort);}).catch(()=>{});return task;
|
|
|
|
|
},
|
|
|
|
|
async pause(id:Id){assertWritable();const runner=importRunners.get(id);if(runner)await runner.pause();else{const job=getImport(id);if(job.status==='running'){publishImport(freeze({...job,generation:job.generation+1,status:'paused'}),job.generation);await persist();}}},
|
|
|
|
|
async resume(id:Id){assertWritable();const job=getImport(id);if(['completed','partial','cancelled'].includes(job.status))return;if(job.status==='running'){await loadImport(id);return;}await importRunners.get(id)?.settle();await persist();await scheduler.resume();assertWritable();const current=getImport(id);if(current.status!=='paused')return;const next={...current,generation:current.generation+1,status:'running' as const};delete next.error;publishImport(freeze(next),current.generation);await loadImport(id);},
|
|
|
|
|
async cancel(id:Id){assertWritable();const runner=importRunners.get(id);if(runner)await runner.cancel();else{const job=getImport(id);if(['running','paused'].includes(job.status)){const next={...job,generation:job.generation+1,status:'cancelled' as const};delete next.error;publishImport(freeze(next),job.generation);await persist();}}},
|
|
|
|
|
async pause(id:Id){assertWritable();const runner=importRunners.get(id);if(runner)await runner.pause();else{const job=getImport(id);if(['running','preparing'].includes(job.status)){preparationControllers.get(id)?.abort();publishImport(freeze({...job,generation:job.generation+1,status:'paused'}),job.generation);await persist();}}},
|
|
|
|
|
async resume(id:Id){assertWritable();const job=getImport(id);if(['completed','partial','cancelled'].includes(job.status))return;if(['running','preparing'].includes(job.status)){await loadImport(id);return;}await importLoads.get(id);await importRunners.get(id)?.settle();await persist();await scheduler.resume();assertWritable();const current=getImport(id);if(current.status!=='paused')return;const next={...current,generation:current.generation+1,status:current.source?.kind==='duplicate-snapshot'?'preparing' as const:'running' as const};delete next.error;publishImport(freeze(next),current.generation);await loadImport(id);},
|
|
|
|
|
async cancel(id:Id){assertWritable();const runner=importRunners.get(id);if(runner)await runner.cancel();else{const job=getImport(id);if(['running','preparing','paused'].includes(job.status)){preparationControllers.get(id)?.abort();const next={...job,generation:job.generation+1,status:'cancelled' as const};delete next.error;publishImport(freeze(next),job.generation);await persist();}}},
|
|
|
|
|
});
|
|
|
|
|
scheduler.start(); prepareDigests(); runTracker.notify([...initial.runs.keys()]);
|
|
|
|
|
for(const job of initial.imports?.values()??[])if(job.status==='running')void loadImport(job.id);
|
|
|
|
|
for(const job of initial.imports?.values()??[])if(['running','preparing'].includes(job.status))void loadImport(job.id);
|
|
|
|
|
return Object.freeze({
|
|
|
|
|
editor, sessions, imports,
|
|
|
|
|
/** Read/preview under a scheduling hold. No request is rewritten or declared resolved here. */
|
|
|
|
@@ -546,7 +569,7 @@ export async function openProjectEngine(options: EngineOptions) {
|
|
|
|
|
async settle() { await Promise.resolve();await Promise.allSettled([...copyPreparations.values()]);while(importLoads.size)await Promise.all([...importLoads.values()]);await Promise.all([...importRunners.values()].map(runner=>runner.settle())); while (digestTasks.size) await Promise.all([...digestTasks.values()]); await scheduler.settle(); await runTracker.settle(); await persist(); },
|
|
|
|
|
async close() {
|
|
|
|
|
if (closed) return;
|
|
|
|
|
closing = true;for(const controller of copyPreparations.keys())controller.abort();await Promise.allSettled([...copyPreparations.values()]); sessions.dispose(); scheduler.stop(); runTracker.stop();
|
|
|
|
|
closing = true;for(const controller of preparationControllers.values())controller.abort();for(const controller of copyPreparations.keys())controller.abort();await Promise.allSettled([...copyPreparations.values()]); sessions.dispose(); scheduler.stop(); runTracker.stop();
|
|
|
|
|
await Promise.all([...importRunners.values()].map(runner=>runner.close()));while(importLoads.size)await Promise.all([...importLoads.values()]);
|
|
|
|
|
recovery?.controller.abort();recovery?.release();
|
|
|
|
|
for (const release of [...displays]) release();
|
|
|
|
|