* [Major] Introduce a new `Ref` and `Path` type
This introduces a new `Ref` and `Path` type, which try to be as lightweight and rigorous as possible. More description in the PR
* [Minor] Updated Syntax
* [Minor] Updated Type
* [Minor] Renamed file
* [Minor] Updated type
* [Minor] Updated Syntax
* [Major] Rename css classes for wiki links
Previously all the parts of a wiki link were tagged with `sb-wiki-link-page`. This didn't make a whole lot of sense. Also the tag `sb-wiki-link` was could never render, because of the way `HighlightStyle` works. Now every part of a wiki link will be tagged with `sb-wiki-link` (i.e. the link, the alias, the dimensions). Invalid and missing links will be styled separately in a later commit.
* [Minor] Adjust to new API
* [Minor] Small changes
* [Minor] Function and file renames
* [Major] Syscall adjusments
Change behavior of `getCurrentPath` to actually return what's now considered a `Path`. `getCurrentPage(Meta)` now also correctly returns for documents. We could consider a rename to get rid of the `page` association
* [Major] Rework `Client`
Mostly minor adjustments for the new API. Some major changes in `navigateWithinPage` and some unecessary checks removed now
* [Major] Errors on navigate
This now throws an error when the user tries to navigate to a link that is invalid
* [Major] Minor adjustments and remove some old bulk
This does the typicall adjustments to the new API. A thing to consider is that invalid links aren't indexed. Also removed old code about template and query stuff. And reused a regex instead of copy pasting it.
* [Minor] Cleanup editor ui
* [Minor] Adjust to new API
* [Minor] Adjust to new API and reduce ugly regex
* [Minor] New API
* [Minor] Rework link cm plugin
* [Major] Rework wiki links
A lot of code cleanup, reworked for new APIs and also introduces "invalid links"
* [Minor] Part of the editor ui rework
* [Major] Adjust to new API
This also removes the `looksLikePathWithExtension` check. I don't think it was necessary.
* [Minor] PArt of editor ui rewrite
* [Minor] Adjust to new API
* [Major] Adjust renderer to new API
Invalid links now link to `#`
* [Major] Rewrite navigator
This still needs major rework, currently in a "got it working" state
* [Minor] Adjust file name
* [Minor] Mistake during rebase
* [Minor] Navigate to end of header
* [Minor] Remove `tweakEditorDOM` and use proper CM extensions
* [Major] Heavily clean up the navigation code
* [Minor] Make `PageNavigator` closable again
* [Minor] Small fixes to reduce errors bubbling up
* [Minor] Show error message if navigate fails
* [Major] Remove legacy `navigate({ kind = ` syntax
This removes the old navigation syntax. It's still supported but the user will be warned then using it. I also added some validation to editor.navigate for user provided refs.
* [Minor] Make notifications errors
* [Minor] Don't fail if header isn't found
* [Minor] Typo
* [Major] Remove cleanPageRef
* [Minor] Small bug
* [Minor] Align behavior between render and editor
* [Major] Remove `PageRef`. Pretty sure it's obsolete
* [Major] Remove pos from header as it's an invalid ref
* [Minor] Align with original behavior
* [Minor] Get tests working again
* [Minor] check that indexPage is valid
* [Major] Rewrite `resolve.ts` file
* [Minor] More tests, more fixes
* [Minor] Don't just append .md this is weird
* [Minor] More edge cases
* [Minor] Version bumping hono somehow fixes the `/` case
* [Minor] Smaller TODOs
* [Major] We can be a littler looser on the restrictions
* [Major] Change header indexing, to index with pos
* [Minor] More fixes for headers
* [Minor] Rename for clarity
* [Minor] Change more regexes to named groups
* [Major] Inline content rewrite
* [Minor] Fix TODO
* [Minor] Bump index version
* [Major] New Space Primitive to check paths
* [Minor] Fix #1214
* [Minor] Fix #1169
* [Minor] Remove TODO
This check is probably not needed anymore. Unsure. May look into it later
* [Minor] small bug
* [Minor] Not a good rebase without me needing to fix it afterwards
* [Minor] Improve fallback for file upload
* [Minor] Some fixes on the for resolving
* [Minor] Removed doubled test case
* [Minor] Resolve #860
* [Minor] Turn flash notification into an error
* [Minor] Change handling of `.` paths
* [Minor] Show empty URL for index page
* [Minor] Push correct ref to history
* [Major] Capture mini editor events in capture phase
This fixes the issue were when pressing arrowup or arrowdown changed the cursor position inside the editor
* [Major] Add prefix to `FilterList`
This now fixes issues were if you had a prefixed page you con't properly search for it, because the search considered the prefix as part of the name
* [Minor] A little rigor for empty headers
* [Major] Fix #1404
* [Minor] `parseInt` returns `NaN` handle that
* [Minor] Use `fileName`
* [Minor] Fix comment
* [Minor] Fixes
* [Major] disallow `foo.png.md` and `/../`, etc. cases
* [Major] Change name of conflicted pages
* [Minor] Remove unecessary check
* [Minor] Remove some split code
* [Minor] Allow deletion of invalid files
* [Minor] Bug in the regex
* [Minor] Give some possibility of fixing incorrect names
* [Minor] Tiny bug with header completion
* [Major] Docs
* [Minor] Ignore errors for navigation inside of a page
This could be a problem when SB e.g. cached a scrollTop for a page, which, because e.g. the file is now deleted, doesn't exist anymore and thus CM throws an error, when trying to navigate
* Update conflicted copy regex in Maintenance.md
---------
Co-authored-by: Zef Hemel <zef@zef.me>
380 lines
11 KiB
TypeScript
380 lines
11 KiB
TypeScript
import type { SpacePrimitives } from "./space_primitives.ts";
|
|
import { EventEmitter } from "../plugos/event.ts";
|
|
import { plugPrefix } from "./constants.ts";
|
|
import type { FileMeta } from "../../type/index.ts";
|
|
|
|
type SyncHash = number;
|
|
|
|
// Tuple where the first value represents a lastModified timestamp for the primary space
|
|
// and the second item the lastModified value of the secondary space
|
|
export type SyncStatusItem = [SyncHash, SyncHash];
|
|
|
|
export type SyncStatus = {
|
|
filesProcessed: number;
|
|
totalFiles: number;
|
|
snapshot: Map<string, SyncStatusItem>;
|
|
};
|
|
|
|
export type SyncOptions = {
|
|
conflictResolver: (
|
|
name: string,
|
|
snapshot: Map<string, SyncStatusItem>,
|
|
primarySpace: SpacePrimitives,
|
|
secondarySpace: SpacePrimitives,
|
|
) => Promise<number>;
|
|
isSyncCandidate?: (path: string) => boolean;
|
|
// Used to track progress, may want to pass more specific info later
|
|
onSyncProgress?: (syncStatus: SyncStatus) => void;
|
|
};
|
|
|
|
type SyncDirection = "primary->secondary" | "secondary->primary";
|
|
export type SyncEvents = {
|
|
fileSynced: (meta: FileMeta, direction: SyncDirection) => void;
|
|
};
|
|
|
|
// Implementation of this algorithm https://unterwaditzer.net/2016/sync-algorithm.html
|
|
export class SpaceSync extends EventEmitter<SyncEvents> {
|
|
constructor(
|
|
private primary: SpacePrimitives,
|
|
private secondary: SpacePrimitives,
|
|
readonly options: SyncOptions,
|
|
) {
|
|
super();
|
|
}
|
|
|
|
// Strategy: Primary wins
|
|
public static async primaryConflictResolver(
|
|
name: string,
|
|
snapshot: Map<string, SyncStatusItem>,
|
|
primary: SpacePrimitives,
|
|
secondary: SpacePrimitives,
|
|
): Promise<number> {
|
|
console.log("[sync]", "Starting conflict resolution for", name);
|
|
const filePieces = name.split(".");
|
|
const fileNameBase = filePieces.slice(0, -1).join(".");
|
|
const fileNameExt = filePieces[filePieces.length - 1];
|
|
const pageData1 = await primary.readFile(name);
|
|
const pageData2 = await secondary.readFile(name);
|
|
|
|
let byteWiseMatch = true;
|
|
const arrayBuffer1 = pageData1.data;
|
|
const arrayBuffer2 = pageData2.data;
|
|
if (arrayBuffer1.byteLength !== arrayBuffer2.byteLength) {
|
|
byteWiseMatch = false;
|
|
}
|
|
if (byteWiseMatch) {
|
|
// Byte-wise comparison
|
|
for (let i = 0; i < arrayBuffer1.byteLength; i++) {
|
|
if (arrayBuffer1[i] !== arrayBuffer2[i]) {
|
|
byteWiseMatch = false;
|
|
break;
|
|
}
|
|
}
|
|
// Byte wise they're still the same, so no confict
|
|
if (byteWiseMatch) {
|
|
console.log("[sync]", "Files are the same, no conflict");
|
|
|
|
snapshot.set(name, [
|
|
pageData1.meta.lastModified,
|
|
pageData2.meta.lastModified,
|
|
]);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
let operations = 0;
|
|
const revisionFileName = filePieces.length === 1
|
|
? `${name}.conflicted:${pageData2.meta.lastModified}`
|
|
: `${fileNameBase}.conflicted:${pageData2.meta.lastModified}.${fileNameExt}`;
|
|
console.log(
|
|
"[sync]",
|
|
"Going to create conflicting copy",
|
|
revisionFileName,
|
|
);
|
|
|
|
// Copy secondary to conflict copy
|
|
const localConflictMeta = await primary.writeFile(
|
|
revisionFileName,
|
|
pageData2.data,
|
|
);
|
|
operations++;
|
|
const remoteConflictMeta = await secondary.writeFile(
|
|
revisionFileName,
|
|
pageData2.data,
|
|
);
|
|
operations++;
|
|
|
|
// Write replacement on top
|
|
const writeMeta = await secondary.writeFile(
|
|
name,
|
|
pageData1.data,
|
|
true,
|
|
);
|
|
operations++;
|
|
|
|
// Updating snapshot
|
|
snapshot.set(revisionFileName, [
|
|
localConflictMeta.lastModified,
|
|
remoteConflictMeta.lastModified,
|
|
]);
|
|
|
|
snapshot.set(name, [pageData1.meta.lastModified, writeMeta.lastModified]);
|
|
return operations;
|
|
}
|
|
|
|
async syncFiles(
|
|
snapshot: Map<string, SyncStatusItem>,
|
|
isSyncCandidate = this.options.isSyncCandidate,
|
|
): Promise<number> {
|
|
let operations = 0;
|
|
console.log("[sync]", "Performing a full sync cycle...");
|
|
|
|
// Not try-catching this because this one's local and shouldn't fail (famous last words)
|
|
const primaryAllPages = this.syncCandidates(
|
|
await this.primary.fetchFileList(),
|
|
);
|
|
|
|
try {
|
|
const secondaryAllPages = this.syncCandidates(
|
|
await this.secondary.fetchFileList(),
|
|
);
|
|
|
|
const primaryFileMap = new Map<string, SyncHash>(
|
|
primaryAllPages.map((m) => [m.name, m.lastModified]),
|
|
);
|
|
const secondaryFileMap = new Map<string, SyncHash>(
|
|
secondaryAllPages.map((m) => [m.name, m.lastModified]),
|
|
);
|
|
|
|
const allFilesToProcess = new Set([
|
|
...snapshot.keys(),
|
|
...primaryFileMap.keys(),
|
|
...secondaryFileMap.keys(),
|
|
]);
|
|
|
|
const sortedFilenames = [...allFilesToProcess];
|
|
sortedFilenames.sort((a) => {
|
|
// Just make sure that _plug/ files appear first
|
|
// This is important for the initial sync: plugs are loaded the moment they are pulled into the space,
|
|
// which would activate e.g. any indexing logic for the remaining space content
|
|
return a.startsWith(plugPrefix) ? -1 : 1;
|
|
});
|
|
// console.log("[sync]", "Iterating over all files");
|
|
let filesProcessed = 0;
|
|
for (const name of sortedFilenames) {
|
|
if (isSyncCandidate && !isSyncCandidate(name)) {
|
|
continue;
|
|
}
|
|
try {
|
|
operations += await this.syncFile(
|
|
snapshot,
|
|
name,
|
|
primaryFileMap.get(name),
|
|
secondaryFileMap.get(name),
|
|
);
|
|
filesProcessed++;
|
|
// Only report something significant
|
|
if (operations > 1 && this.options.onSyncProgress) {
|
|
this.options.onSyncProgress({
|
|
filesProcessed,
|
|
totalFiles: sortedFilenames.length,
|
|
snapshot,
|
|
});
|
|
}
|
|
} catch (e: any) {
|
|
console.log("error", "Error syncing file", name, e.message);
|
|
}
|
|
}
|
|
} catch (e: any) {
|
|
console.log("error", "General sync error:", e.message);
|
|
throw e;
|
|
}
|
|
console.log("[sync]", "Sync complete, operations performed", operations);
|
|
|
|
return operations;
|
|
}
|
|
|
|
async syncFile(
|
|
snapshot: Map<string, SyncStatusItem>,
|
|
name: string,
|
|
primaryHash: SyncHash | undefined,
|
|
secondaryHash: SyncHash | undefined,
|
|
): Promise<number> {
|
|
if (this.options.isSyncCandidate && !this.options.isSyncCandidate(name)) {
|
|
return 0;
|
|
}
|
|
// console.log("Syncing", name, primaryHash, secondaryHash);
|
|
let operations = 0;
|
|
|
|
if (
|
|
primaryHash !== undefined && secondaryHash === undefined &&
|
|
!snapshot.has(name)
|
|
) {
|
|
// New file, created on primary, copy from primary to secondary
|
|
console.log(
|
|
"[sync]",
|
|
"New file created on primary, copying to secondary",
|
|
name,
|
|
);
|
|
const { data, meta } = await this.primary.readFile(name);
|
|
const writtenMeta = await this.secondary.writeFile(
|
|
name,
|
|
data,
|
|
false,
|
|
meta,
|
|
);
|
|
snapshot.set(name, [
|
|
primaryHash,
|
|
writtenMeta.lastModified,
|
|
]);
|
|
operations++;
|
|
await this.emit("fileSynced", writtenMeta, "primary->secondary");
|
|
} else if (
|
|
secondaryHash !== undefined && primaryHash === undefined &&
|
|
!snapshot.has(name)
|
|
) {
|
|
// New file, created on secondary, copy from secondary to primary
|
|
console.log(
|
|
"[sync]",
|
|
"New file created on secondary, copying from secondary to primary",
|
|
name,
|
|
);
|
|
const { data, meta } = await this.secondary.readFile(name);
|
|
const writtenMeta = await this.primary.writeFile(
|
|
name,
|
|
data,
|
|
false,
|
|
meta,
|
|
);
|
|
snapshot.set(name, [
|
|
writtenMeta.lastModified,
|
|
secondaryHash,
|
|
]);
|
|
operations++;
|
|
await this.emit("fileSynced", writtenMeta, "secondary->primary");
|
|
} else if (
|
|
primaryHash !== undefined && snapshot.has(name) &&
|
|
secondaryHash === undefined
|
|
) {
|
|
// File deleted on B
|
|
console.log(
|
|
"[sync]",
|
|
"File deleted on secondary, deleting from primary",
|
|
name,
|
|
);
|
|
await this.primary.deleteFile(name);
|
|
snapshot.delete(name);
|
|
operations++;
|
|
} else if (
|
|
secondaryHash !== undefined && snapshot.has(name) &&
|
|
primaryHash === undefined
|
|
) {
|
|
// File deleted on A
|
|
console.log(
|
|
"[sync]",
|
|
"File deleted on primary, deleting from secondary",
|
|
name,
|
|
);
|
|
await this.secondary.deleteFile(name);
|
|
snapshot.delete(name);
|
|
operations++;
|
|
} else if (
|
|
snapshot.has(name) && primaryHash === undefined &&
|
|
secondaryHash === undefined
|
|
) {
|
|
// File deleted on both sides, :shrug:
|
|
console.log(
|
|
"[sync]",
|
|
"File deleted on both ends, deleting from status",
|
|
name,
|
|
);
|
|
snapshot.delete(name);
|
|
operations++;
|
|
} else if (
|
|
primaryHash !== undefined && secondaryHash !== undefined &&
|
|
snapshot.get(name) &&
|
|
primaryHash !== snapshot.get(name)![0] &&
|
|
secondaryHash === snapshot.get(name)![1]
|
|
) {
|
|
// File has changed on primary, but not secondary: copy from primary to secondary
|
|
console.log(
|
|
"[sync]",
|
|
"File changed on primary, copying to secondary",
|
|
name,
|
|
);
|
|
const { data, meta } = await this.primary.readFile(name);
|
|
const writtenMeta = await this.secondary.writeFile(
|
|
name,
|
|
data,
|
|
false,
|
|
meta,
|
|
);
|
|
snapshot.set(name, [
|
|
primaryHash,
|
|
writtenMeta.lastModified,
|
|
]);
|
|
operations++;
|
|
await this.emit("fileSynced", writtenMeta, "primary->secondary");
|
|
} else if (
|
|
primaryHash !== undefined && secondaryHash !== undefined &&
|
|
snapshot.get(name) &&
|
|
secondaryHash !== snapshot.get(name)![1] &&
|
|
primaryHash === snapshot.get(name)![0]
|
|
) {
|
|
// File has changed on secondary, but not primary: copy from secondary to primary
|
|
console.log(
|
|
"[sync]",
|
|
"File has changed on secondary, but not primary: copy from secondary to primary",
|
|
name,
|
|
);
|
|
const { data, meta } = await this.secondary.readFile(name);
|
|
const writtenMeta = await this.primary.writeFile(
|
|
name,
|
|
data,
|
|
false,
|
|
meta,
|
|
);
|
|
snapshot.set(name, [
|
|
writtenMeta.lastModified,
|
|
secondaryHash,
|
|
]);
|
|
operations++;
|
|
await this.emit("fileSynced", writtenMeta, "secondary->primary");
|
|
} else if (
|
|
( // File changed on both ends, but we don't have any info in the snapshot (resync scenario?): have to run through conflict handling
|
|
primaryHash !== undefined && secondaryHash !== undefined &&
|
|
!snapshot.has(name)
|
|
) ||
|
|
( // File changed on both ends, CONFLICT!
|
|
primaryHash && secondaryHash &&
|
|
snapshot.get(name) &&
|
|
secondaryHash !== snapshot.get(name)![1] &&
|
|
primaryHash !== snapshot.get(name)![0]
|
|
)
|
|
) {
|
|
console.log(
|
|
"[sync]",
|
|
"File changed on both ends, potential conflict",
|
|
name,
|
|
);
|
|
operations += await this.options.conflictResolver!(
|
|
name,
|
|
snapshot,
|
|
this.primary,
|
|
this.secondary,
|
|
);
|
|
} else {
|
|
// Nothing needs to happen
|
|
}
|
|
return operations;
|
|
}
|
|
|
|
syncCandidates(files: FileMeta[]): FileMeta[] {
|
|
if (this.options.isSyncCandidate) {
|
|
return files.filter((meta) => this.options.isSyncCandidate!(meta.name));
|
|
} else {
|
|
return files;
|
|
}
|
|
}
|
|
}
|