Major backend refactor (#599)

Backend refactor
This commit is contained in:
Zef Hemel
2023-12-13 17:52:56 +01:00
committed by GitHub
parent 60d7cc704a
commit 9f082c83a9
42 changed files with 959 additions and 503 deletions
+10 -5
View File
@@ -11,7 +11,6 @@ import { sleep } from "$sb/lib/async.ts";
import { determineDatabaseBackend } from "../server/db_backend.ts";
import { SpaceServerConfig } from "../server/instance.ts";
import { path } from "../common/deps.ts";
export async function serveCommand(
options: {
@@ -22,6 +21,7 @@ export async function serveCommand(
cert?: string;
key?: string;
reindex?: boolean;
syncOnly?: boolean;
},
folder?: string,
) {
@@ -29,7 +29,7 @@ export async function serveCommand(
"127.0.0.1";
const port = options.port ||
(Deno.env.get("SB_PORT") && +Deno.env.get("SB_PORT")!) || 3000;
const syncOnly = options.syncOnly || !!Deno.env.get("SB_SYNC_ONLY");
const app = new Application();
if (!folder) {
@@ -42,7 +42,6 @@ export async function serveCommand(
Deno.exit(1);
}
}
folder = path.resolve(Deno.cwd(), folder);
const baseKvPrimitives = await determineDatabaseBackend(folder);
@@ -59,11 +58,17 @@ To allow outside connections, pass -L 0.0.0.0 as a flag, and put a TLS terminato
const userAuth = options.user ?? Deno.env.get("SB_USER");
let userCredentials: { user: string; pass: string } | undefined;
if (userAuth) {
const [user, pass] = userAuth.split(":");
userCredentials = { user, pass };
}
const configs = new Map<string, SpaceServerConfig>();
configs.set("*", {
hostname,
namespace: "*",
auth: userAuth,
auth: userCredentials,
authToken: Deno.env.get("SB_AUTH_TOKEN"),
pagesPath: folder,
});
@@ -74,7 +79,7 @@ To allow outside connections, pass -L 0.0.0.0 as a flag, and put a TLS terminato
clientAssetBundle: new AssetBundle(clientAssetBundle as AssetJson),
plugAssetBundle: new AssetBundle(plugAssetBundle as AssetJson),
baseKvPrimitives,
syncOnly: baseKvPrimitives === undefined,
syncOnly,
keyFile: options.key,
certFile: options.cert,
configs,
+72
View File
@@ -0,0 +1,72 @@
import { SpaceSync, SyncStatusItem } from "../common/spaces/sync.ts";
import { MemoryKvPrimitives } from "../plugos/lib/memory_kv_primitives.ts";
import { determineStorageBackend } from "../server/storage_backend.ts";
export async function syncCommand(
options: {
snapshot?: string;
wipeSecondary?: boolean;
},
primary: string,
secondary: string,
) {
const memoryKv = new MemoryKvPrimitives();
console.log("Going to synchronize", primary, "and", secondary);
const primarySpacePrimitives = await determineStorageBackend(
memoryKv,
primary,
);
const secondarySpacePrimitives = await determineStorageBackend(
memoryKv,
secondary,
);
if (options.wipeSecondary) {
if (
!confirm(
`About to wipe the secondary storage at ${secondary}, are you sure?`,
)
) {
return;
}
const allFiles = await secondarySpacePrimitives.fetchFileList();
for (const file of allFiles) {
try {
console.log("Deleting", file.name);
await secondarySpacePrimitives.deleteFile(file.name);
} catch (e: any) {
console.warn("Failed to delete file", file.name, e.message);
}
}
console.log("Done wiping secondary storage.");
}
const sync = new SpaceSync(primarySpacePrimitives, secondarySpacePrimitives, {
conflictResolver: SpaceSync.primaryConflictResolver,
isSyncCandidate: () => true,
});
let snapshot = new Map<string, SyncStatusItem>();
if (options.snapshot) {
try {
snapshot = new Map(
Object.entries(JSON.parse(await Deno.readTextFile(options.snapshot))),
);
} catch (e) {
console.warn(
"Failed to read snapshot file",
e.message,
"using empty snapshot",
);
}
}
const operations = await sync.syncFiles(snapshot);
console.log("Sync completed, operations:", operations);
if (options.snapshot) {
await Deno.writeTextFile(
options.snapshot,
JSON.stringify(Object.fromEntries(snapshot.entries())),
);
}
}