Merge branch 'main' into zs/put-overwrite-policy

10 files changed, 236 insertions, 22 deletions

diff --git a/src/zenserver/frontend/html/indexer/cache.js b/src/zenserver/frontend/html/indexer/cache.js
index 390aa948d..b90194855 100644
--- a/src/zenserver/frontend/html/indexer/cache.js
+++ b/src/zenserver/frontend/html/indexer/cache.js
@@ -9,7 +9,7 @@ export class Cache
 	{
 		this._db_name = db_name;
 		this._store_names = store_names;
-		this._version = 1;
+		this._version = 2;
 		this._db = this._open();
 	}
 
diff --git a/src/zenserver/frontend/html/indexer/indexer.js b/src/zenserver/frontend/html/indexer/indexer.js
index 4412e3a57..688bc71b0 100644
--- a/src/zenserver/frontend/html/indexer/indexer.js
+++ b/src/zenserver/frontend/html/indexer/indexer.js
@@ -43,9 +43,10 @@ class Indexer
 
 	*search(needle)
 	{
+		var needleLwr = needle.toLowerCase();
 		for (const page of this._pages)
 			for (const [_, name] of page)
-				if (name.indexOf(needle) >= 0)
+				if (name.toLowerCase().indexOf(needleLwr) >= 0)
 					yield name;
 	}
 
@@ -60,7 +61,7 @@ class Indexer
 	{
 		for (const page of this._pages)
 			for (const [_, name, size, raw_size] of page)
-				yield [name, size|0, raw_size|0];
+				yield [name, size|0n, raw_size|0n];
 	}
 }
 
diff --git a/src/zenserver/frontend/html/indexer/worker.js b/src/zenserver/frontend/html/indexer/worker.js
index 25c8d7671..69ee234fa 100644
--- a/src/zenserver/frontend/html/indexer/worker.js
+++ b/src/zenserver/frontend/html/indexer/worker.js
@@ -77,11 +77,11 @@ async function map_id_to_key(project_id, oplog, start, end, page_size, stride)
 				continue;
 
 			var id = 0n;
-			var size = 0;
-			var raw_size = 0;
+			var size = 0n;
+			var raw_size = 0n;
 			for (const item of pkg_data.as_array())
 			{
-				var found = 0, pkg_id;
+				var found = 0, pkg_id = undefined;
 				for (const field of item.as_object())
 				{
 					if (!id && field.is_named("id"))	pkg_id = field.as_value();
diff --git a/src/zenserver/frontend/html/pages/entry.js b/src/zenserver/frontend/html/pages/entry.js
index 65a3ef39b..54fb11c18 100644
--- a/src/zenserver/frontend/html/pages/entry.js
+++ b/src/zenserver/frontend/html/pages/entry.js
@@ -59,6 +59,81 @@ export class Page extends ZenPage
 		}
 	}
 
+	_find_iohash_field(container, name)
+	{
+		const found_field = container.find(name);
+		if (found_field != undefined)
+		{
+			var found_value = found_field.as_value();
+			if (found_value instanceof Uint8Array)
+			{
+				var ret = "";
+				for (var x of found_value)
+					ret += x.toString(16).padStart(2, "0");
+				return ret;
+			}
+		}
+		return null;
+	}
+
+	async _build_meta(section, entry)
+	{
+		var tree = {}
+
+		for (const field of entry)
+		{
+			var visibleKey = undefined;
+			const name = field.get_name();
+			if (name == "CookPackageArtifacts")
+			{
+				visibleKey = name;
+			}
+			else if (name.startsWith("meta."))
+			{
+				visibleKey = name.slice(5);
+			}
+
+			if (visibleKey != undefined)
+			{
+				var found_value = field.as_value();
+				if (found_value instanceof Uint8Array)
+				{
+					var ret = "";
+					for (var x of found_value)
+						ret += x.toString(16).padStart(2, "0");
+					tree[visibleKey] = ret;
+				}
+			}
+
+		}
+
+		if (Object.keys(tree).length == 0)
+			return;
+
+		const sub_section = section.add_section("meta");
+
+		const table = sub_section.add_widget(
+			Table,
+			["name", "actions"], Table.Flag_PackRight
+		);
+		for (const key in tree)
+		{
+			const row = table.add_row(key);
+			const value = tree[key];
+
+			const project = this.get_param("project");
+			const oplog = this.get_param("oplog");
+			const link = row.get_cell(0).link(
+				"/" + ["prj", project, "oplog", oplog, value+".json"].join("/")
+			);
+
+			const action_tb = new Toolbar(row.get_cell(-1), true);
+			action_tb.left().add("copy-hash").on_click(async (v) => {
+				await navigator.clipboard.writeText(v);
+			}, value);
+		}
+	}
+
 	async _build_page()
 	{
 		var entry = await this._entry;
@@ -78,8 +153,16 @@ export class Page extends ZenPage
 
 			delete tree["$id"];
 
-			const sub_section = section.add_section("deps");
-			this._build_deps(sub_section, tree);
+			if (Object.keys(tree).length != 0)
+			{
+				const sub_section = section.add_section("deps");
+				this._build_deps(sub_section, tree);
+			}
+		}
+
+		// meta
+		{
+			this._build_meta(section, entry);
 		}
 
 		// data
@@ -128,7 +211,6 @@ export class Page extends ZenPage
 					);
 					link.first_child().attr("download", `${io_hash}_${base_name}`);
 
-					const do_nothing = () => void(0);
 					const action_tb = new Toolbar(row.get_cell(-1), true);
 					action_tb.left().add("copy-hash").on_click(async (v) => {
 						await navigator.clipboard.writeText(v);
@@ -147,8 +229,11 @@ export class Page extends ZenPage
 
 	_display_unsupported(section, entry)
 	{
+		const replacer = (key, value) =>
+			typeof value === "bigint" ? { $bigint: value.toString() } : value;
+		
 		const object = entry.to_js_object();
-		const text = JSON.stringify(object, null, "  ");
+		const text = JSON.stringify(object, replacer, "  ");
 		section.tag("pre").text(text);
 	}
 
diff --git a/src/zenserver/frontend/html/pages/oplog.js b/src/zenserver/frontend/html/pages/oplog.js
index f22c2a58f..bef5bacce 100644
--- a/src/zenserver/frontend/html/pages/oplog.js
+++ b/src/zenserver/frontend/html/pages/oplog.js
@@ -142,9 +142,12 @@ export class Page extends ZenPage
 
 	async _search(needle)
 	{
-		needle = needle.trim();
-		if (needle.length < 3)
+		if (needle.length == 0)
+		{
+			this._build_table(this._index_start);
 			return;
+		}
+		needle = needle.trim();
 
 		this._entry_table.clear(this._index_start);
 
diff --git a/src/zenserver/frontend/html/pages/start.js b/src/zenserver/frontend/html/pages/start.js
index 8c9df62f9..d1c13ccc7 100644
--- a/src/zenserver/frontend/html/pages/start.js
+++ b/src/zenserver/frontend/html/pages/start.js
@@ -5,6 +5,7 @@
 import { ZenPage } from "./page.js"
 import { Fetcher } from "../util/fetcher.js"
 import { Friendly } from "../util/friendly.js"
+import { Modal } from "../util/modal.js"
 import { Table, Toolbar } from "../util/widgets.js"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -40,6 +41,41 @@ export class Page extends ZenPage
 			action_tb.left().add("drop").on_click((x) => this.drop_project(x), project.Id);
 		}
 
+		// cache
+		var section = this.add_section("z$");
+		columns = [
+			"namespace",
+			"dir",
+			"buckets",
+			"entries",
+			"size disk",
+			"size mem",
+			"actions",
+		]
+		var zcache_info = new Fetcher().resource("/z$/").json();
+		const cache_table = section.add_widget(Table, columns, Table.Flag_FitLeft|Table.Flag_PackRight);
+		for (const namespace of (await zcache_info)["Namespaces"])
+		{
+			new Fetcher().resource(`/z$/${namespace}/`).json().then((data) => {
+				const row = cache_table.add_row(
+					"",
+					data["Configuration"]["RootDir"],
+					data["Buckets"].length,
+					data["EntryCount"],
+					Friendly.kib(data["StorageSize"].DiskSize),
+					Friendly.kib(data["StorageSize"].MemorySize)
+				);
+				var cell = row.get_cell(0);
+				cell.tag().text(namespace).on_click(() => this.view_zcache(namespace));
+				row.get_cell(1).tag().text(namespace);
+
+				cell = row.get_cell(-1);
+				const action_tb = new Toolbar(cell, true);
+				action_tb.left().add("view").on_click(() => this.view_zcache(namespace));
+				action_tb.left().add("drop").on_click(() => this.drop_zcache(namespace));
+			});
+		}
+
 		// stats
 		section = this.add_section("stats");
 		columns = [
@@ -91,4 +127,23 @@ export class Page extends ZenPage
 			.option("Yes", () => drop())
 			.option("No");
 	}
+
+	view_zcache(namespace)
+	{
+		window.location = "?page=zcache&namespace=" + namespace;
+	}
+
+	drop_zcache(namespace)
+	{
+		const drop = async () => {
+			await new Fetcher().resource("z$", namespace).delete();
+			this.reload();
+		};
+
+		new Modal()
+			.title("Confirmation")
+			.message(`Drop zcache '${namespace}'?`)
+			.option("Yes", () => drop())
+			.option("No");
+	}
 }
diff --git a/src/zenserver/frontend/html/pages/zcache.js b/src/zenserver/frontend/html/pages/zcache.js
new file mode 100644
index 000000000..974893b21
--- /dev/null
+++ b/src/zenserver/frontend/html/pages/zcache.js
@@ -0,0 +1,70 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+"use strict";
+
+import { ZenPage } from "./page.js"
+import { Fetcher } from "../util/fetcher.js"
+import { Friendly } from "../util/friendly.js"
+import { Modal } from "../util/modal.js"
+import { Table, PropTable, Toolbar } from "../util/widgets.js"
+
+////////////////////////////////////////////////////////////////////////////////
+export class Page extends ZenPage
+{
+	async main()
+	{
+		const namespace = this.get_param("namespace");
+
+		var info = new Fetcher().resource(`/z$/${namespace}/`).json();
+
+		this.set_title("cache - " + namespace);
+
+		var section = this.add_section("info");
+		var cfg_table = section.add_section("config").add_widget(PropTable);
+		var storage_table = section.add_section("storage").add_widget(PropTable);
+
+		info = await info;
+
+		cfg_table.add_object(info["Configuration"], true);
+
+		storage_table.add_property("disk", Friendly.kib(info["StorageSize"]["DiskSize"]));
+		storage_table.add_property("mem", Friendly.kib(info["StorageSize"]["MemorySize"]));
+		storage_table.add_property("entries", Friendly.sep(info["EntryCount"]));
+
+		var column_names = ["name", "disk", "mem", "entries", "actions"];
+		var bucket_table = this.add_section("buckets").add_widget(
+			Table,
+			column_names,
+			Table.Flag_BiasLeft
+		);
+		for (const bucket of info["Buckets"])
+		{
+			const row = bucket_table.add_row(bucket);
+			new Fetcher().resource(`/z$/${namespace}/${bucket}`).json().then((data) => {
+				row.get_cell(1).text(Friendly.kib(data["StorageSize"]["DiskSize"]));
+				row.get_cell(2).text(Friendly.kib(data["StorageSize"]["MemorySize"]));
+				row.get_cell(3).text(Friendly.sep(data["DiskEntryCount"]));
+
+				const cell = row.get_cell(-1);
+				const action_tb = new Toolbar(cell, true);
+				action_tb.left().add("view")
+				action_tb.left().add("drop").on_click(() => this.drop_bucket(bucket));
+			});
+		}
+	}
+
+	drop_bucket(bucket)
+	{
+		const drop = async () => {
+			const namespace = this.get_param("namespace");
+			await new Fetcher().resource("z$", namespace, bucket).delete();
+			this.reload();
+		};
+
+		new Modal()
+			.title("Confirmation")
+			.message(`Drop bucket '${bucket}'?`)
+			.option("Yes", () => drop())
+			.option("No");
+	}
+}
diff --git a/src/zenserver/frontend/html/util/compactbinary.js b/src/zenserver/frontend/html/util/compactbinary.js
index 366ec6aff..90e4249f6 100644
--- a/src/zenserver/frontend/html/util/compactbinary.js
+++ b/src/zenserver/frontend/html/util/compactbinary.js
@@ -284,7 +284,7 @@ CbFieldView.prototype.as_array = function()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-CbFieldView.prototype.as_value = function(int_type=Number)
+CbFieldView.prototype.as_value = function(int_type=BigInt)
 {
 	switch (CbFieldTypeOps.get_type(this.get_type()))
 	{
@@ -388,8 +388,8 @@ CbObjectView.prototype.to_js_object = function()
 		}
 
 		if (node.is_string())	return node.as_value();
-		if (node.is_float())	return node.as_value();
 		if (node.is_integer())	return node.as_value();
+		if (node.is_float())	return node.as_value();
 
 		var ret = node.as_value();
 		if (ret instanceof Uint8Array)
diff --git a/src/zenserver/frontend/html/util/friendly.js b/src/zenserver/frontend/html/util/friendly.js
index b27721964..a15252faf 100644
--- a/src/zenserver/frontend/html/util/friendly.js
+++ b/src/zenserver/frontend/html/util/friendly.js
@@ -7,17 +7,17 @@ export class Friendly
 {
 	static sep(value, prec=0)
 	{
-		return (+value).toLocaleString("en", {
+		return (+Number(value)).toLocaleString("en", {
 			style: "decimal",
 			minimumFractionDigits : prec,
 			maximumFractionDigits : prec,
 		});
 	}
 
-	static k(x, p=0)	{ return Friendly.sep((x + 999)  / Math.pow(10, 3)|0, p) + "K"; }
-	static m(x, p=1)	{ return Friendly.sep( x         / Math.pow(10, 6),   p) + "M"; }
-	static g(x, p=2)	{ return Friendly.sep( x         / Math.pow(10, 9),   p) + "G"; }
-	static kib(x, p=0)	{ return Friendly.sep((x + 1023) / (1 << 10)|0, p) + " KiB"; }
-	static mib(x, p=1)	{ return Friendly.sep( x         / (1 << 20),   p) + " MiB"; }
-	static gib(x, p=2)	{ return Friendly.sep( x         / (1 << 30),   p) + " GiB"; }
+	static k(x, p=0)	{ return Friendly.sep((BigInt(x) + 999n)  / BigInt(Math.pow(10, 3))|0n, p) + "K"; }
+	static m(x, p=1)	{ return Friendly.sep( BigInt(x)         / BigInt(Math.pow(10, 6)),   p) + "M"; }
+	static g(x, p=2)	{ return Friendly.sep( BigInt(x)         / BigInt(Math.pow(10, 9)),   p) + "G"; }
+	static kib(x, p=0)	{ return Friendly.sep((BigInt(x) + 1023n) / (1n << 10n)|0n, p) + " KiB"; }
+	static mib(x, p=1)	{ return Friendly.sep( BigInt(x)         / (1n << 20n),   p) + " MiB"; }
+	static gib(x, p=2)	{ return Friendly.sep( BigInt(x)         / (1n << 30n),   p) + " GiB"; }
 }
diff --git a/src/zenserver/frontend/html/util/widgets.js b/src/zenserver/frontend/html/util/widgets.js
index d4f9875cd..32a3f4d28 100644
--- a/src/zenserver/frontend/html/util/widgets.js
+++ b/src/zenserver/frontend/html/util/widgets.js
@@ -173,7 +173,7 @@ export class PropTable extends Table
 					continue;
 				}
 
-				if (friendly && typeof value == "number")
+				if (friendly && ((typeof value == "number") || (typeof value == "bigint")))
 				{
 					if (key.indexOf("memory") >= 0)		value = Friendly.kib(value);
 					else if (key.indexOf("disk") >= 0)	value = Friendly.kib(value);