boiler plating

move vite-plugin-html into devDependencies
add vite-plugin-ejs
2025-03-02 17:04:31 -05:00 · 2025-03-02 16:04:28 -05:00 · 2025-03-02 15:36:01 -05:00 · 2025-03-02 02:39:49 -05:00 · 2025-03-02 02:39:46 -05:00 · 2025-03-01 00:29:03 -05:00
23 changed files with 262 additions and 217 deletions
--- a/package.json
+++ b/package.json
@ -9,9 +9,10 @@
 		"preview": "vite preview"
 	},
 	"devDependencies": {
-		"sass": "^1.85.0",
-		"typescript": "^5.7.3",
-		"vite": "^6.1.1",
-		"vite-plugin-html": "^3.2.2"
+		"sass": "^1.85.1",
+		"typescript": "^5.8.2",
+		"vite": "^6.2.0",
+		"vite-plugin-html": "^3.2.2",
+		"vite-plugin-ejs": "^1.7.0"
 	}
 }
--- a/src/html/footer.html
+++ b/src/html/footer.html
@ -0,0 +1,11 @@
+<p class="raw-text" id="time">00:00:00</p>
+<section>
+	<p class="raw-text" id="column-line">0, 0</p>
+	<button id="toggle-monospace">Monospace</button>
+	<button id="toggle-term-mode">UNIX</button>
+</section>
+<noscript>
+	<style>
+		#toggle-monospace, .raw-text { display: none }
+	</style>
+</noscript>
--- a/src/html/header.html
+++ b/src/html/header.html
@ -0,0 +1,14 @@
+<button class="header-left">
+	<a href="https://rhpidfyre.io/" class="header-button">[rhpidfyre.io]</a>
+</button>
+<section class="header-right">
+	<button>
+		<a href="https://git.rhpidfyre.io/" class="header-button">GIT</a>
+	</button>
+	<button>
+		<a href="https://files.rhpidfyre.io/" class="header-button">CLOUD</a>
+	</button>
+	<button>
+		<a href="https://gsm.rhpidfyre.io/" class="header-button">GSM</a>
+	</button>
+</section>
--- a/src/html/motd.html
+++ b/src/html/motd.html
@ -0,0 +1,17 @@
+<p>Welcome to rhpidfyre.io!</p>
+<div class="return"></div>
+<p>This is a personal website by rhpidfyre / Brandon.</p>
+<p>You can find my services here or learn about me.</p>
+<div class="return"></div>
+<p>You can also contribute or view the source code of my website via the links:</p>
+<p>&lt;<a href="https://git.rhpidfyre.io/rhpidfyre/rhpidfyre.io" target="_blank">https://git.rhpidfyre.io/rhpidfyre/rhpidfyre.io</a>&gt;.</p>
+<p>&lt;<a href="https://github.com/unixtensor/rhpidfyre.io" target="_blank">https://github.com/unixtensor/rhpidfyre.io</a>&gt;.</p>
+<div class="return"></div>
+<p>You can get started with the command: <span class="bold">help</span></p>
+<div class="return"></div>
+<noscript>
+	<p><span class="red">=================================================</span></p>
+	<p><span class="red">JavaScript is disabled, functionality will be limited. :(</span></p>
+	<p><span class="red">But, you will not be limited at exploring my services which you can find by navigating towards the top-right.</span></p>
+	<p><span class="red">=================================================</span></p>
+</noscript>
--- a/src/index.ejs
+++ b/src/index.ejs
@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="UTF-8"/>
+	<meta name="viewport" content="width=device-width"/>
+	<link rel="icon" type="image/png" href="/logo.png"/>
+	<link rel="stylesheet" href="./scss/global.scss"/>
+	<title>rhpidfyre.io</title>
+</head>
+<body>
+	<header>
+		<%- inlineHtml("header") %>
+	</header>
+	<main>
+		<%- inlineHtml("motd") %>
+	</main>
+	<footer>
+		<%- inlineHtml("footer") %>
+	</footer>
+	<script type="module" src="./rt/emulator/terminal.ts"></script>
+</body>
+</html>
--- a/src/index.html
+++ b/src/index.html
@ -1,61 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="UTF-8"/>
-	<meta name="viewport" content="width=device-width"/>
-	<link rel="icon" type="image/png" href="/logo.png"/>
-	<link rel="stylesheet" href="./scss/global.scss"/>
-	<title>rhpidfyre.io</title>
-</head>
-<body>
-	<header>
-		<button class="header-left">
-			<a href="https://rhpidfyre.io/" class="header-button">[rhpidfyre.io]</a>
-		</button>
-		<section class="header-right">
-			<button>
-				<a href="https://git.rhpidfyre.io/" class="header-button">GIT</a>
-			</button>
-			<button>
-				<a href="https://files.rhpidfyre.io/" class="header-button">CLOUD</a>
-			</button>
-			<button>
-				<a href="https://gsm.rhpidfyre.io/" class="header-button">GSM</a>
-			</button>
-		</section>
-	</header>
-	<main>
-		<p>Welcome to rhpidfyre.io!</p>
-		<div class="return"></div>
-		<p>This is a personal website by rhpidfyre / Brandon.</p>
-		<p>You can find my services here or learn about me.</p>
-		<div class="return"></div>
-		<p>You can also contribute or view the source code of my website via the links:</p>
-		<p>&lt;<a href="https://git.rhpidfyre.io/rhpidfyre/rhpidfyre.io" target="_blank">https://git.rhpidfyre.io/rhpidfyre/rhpidfyre.io</a>&gt;.</p>
-		<p>&lt;<a href="https://github.com/unixtensor/rhpidfyre.io" target="_blank">https://github.com/unixtensor/rhpidfyre.io</a>&gt;.</p>
-		<div class="return"></div>
-		<p>You can get started with the command: <span class="bold">help</span></p>
-		<div class="return"></div>
-		<noscript>
-			<p><span class="red">=================================================</span></p>
-			<p><span class="red">JavaScript is disabled, functionality will be limited. :(</span></p>
-			<p><span class="red">But, you will not be limited at exploring my services which you can find by navigating towards the top-right.</span></p>
-			<p><span class="red">=================================================</span></p>
-		</noscript>
-	</main>
-	<footer>
-		<p class="raw-text" id="time">00:00:00</p>
-		<section>
-			<p class="raw-text" id="column-line">0, 0</p>
-			<button id="toggle-monospace">Monospace</button>
-			<button id="toggle-term-mode">UNIX</button>
-		</section>
-		<noscript>
-			<style>
-				#toggle-monospace, .raw-text { display: none }
-			</style>
-		</noscript>
-	</footer>
-	<script type="module" src="./rt/terminal.ts"></script>
-</body>
-</html>
--- a/src/public/logo.png
+++ b/src/public/logo.png
--- a/src/rt/elements/prompt.ts
+++ b/src/rt/elements/prompt.ts
@ -1,5 +1,5 @@
 import { cyan, green } from "../shell/color"
-import { get_working_dir_name } from "../shell/fs/fn"
+import { get_working_dir_name } from "../rfwfs/library"

 import create from "./create"

--- a/src/rt/elements/stdout.ts
+++ b/src/rt/elements/stdout.ts
@ -26,6 +26,12 @@ function stdout_grid<T extends HTMLElement>(left: string[], right: string[], hea
 	return wrap_indicator
 }

+function stdout_horizontal_elements<T extends HTMLElement>(elements: T[]) {
+	const h_elements_out = horizontal()
+	h_elements_out.append(...elements)
+	return h_elements_out
+}
+
 function stdout_horizontal(strs: string[]) {
 	const p = create("p")
 	strs.forEach((str, i) => {
@ -48,7 +54,8 @@ export default function stdout(str: string) {
 }

 export {
-	stdout_grid,
+	stdout_horizontal_elements,
 	stdout_horizontal,
+	stdout_grid,
 	stdout_bold
 }
--- a/src/rt/emulator/keys.ts
+++ b/src/rt/emulator/keys.ts
@ -1,5 +1,5 @@
-import run from "./shell/command/command"
-import history from "./shell/history"
+import run from "../shell/command/command"
+import history from "../shell/history"

 type InputClosure = (key_event: KeyboardEvent) => void
 interface EnterArgs {
--- a/src/rt/emulator/terminal.ts
+++ b/src/rt/emulator/terminal.ts
@ -1,5 +1,5 @@
-import history from "./shell/history"
-import prompt from "./elements/prompt"
+import history from "../shell/history"
+import prompt from "../elements/prompt"
 import keys from "./keys"

 const term_win_unsafe = document.querySelector("main")
--- a/src/rt/rfwfs/collection.ts
+++ b/src/rt/rfwfs/collection.ts
@ -0,0 +1,46 @@
+import { type Entry } from "./main"
+
+import entry_search from "./index"
+
+type Files<T> = Entry<T>[]
+
+interface EntryCollectionManipulate {
+	pop: <T extends Entry<T>>(file_name: string) => Entry<T> | undefined,
+	get: <T extends Entry<T>>(file_name: string) => Entry<T> | undefined
+	push: <T extends Entry<T>>(entry: Entry<T>) => boolean,
+	sort: () => void,
+}
+interface EntryCollection<T> extends EntryCollectionManipulate {
+	readonly inner: Files<T>
+}
+
+function entry_trait<T extends Entry<T>>() {
+	const trait = {} as EntryCollection<T>
+	trait.sort = function() {
+		this.inner.sort((a,z) => a.name.localeCompare(z.name))
+	}
+	trait.push = function(entry) {
+		const no_duplicates = entry_search(this.inner, entry.name)
+		if (!no_duplicates) {
+			this.push(entry)
+			this.sort()
+			return true
+		}
+		return false
+	}
+	trait.pop = function(file_name) {
+		const file_search = entry_search(this.inner, file_name)
+		if (file_search) {
+			this.inner.splice(file_search.index, 1)
+			return file_search.result
+		}
+		return
+	}
+	return trait
+}
+
+export {
+	entry_trait,
+	type EntryCollection,
+	type Files,
+}
--- a/src/rt/rfwfs/index.ts
+++ b/src/rt/rfwfs/index.ts
@ -0,0 +1,28 @@
+import { type Entry } from "./main"
+import { type Files } from "./collection"
+
+interface SearchResult<T> {
+	readonly result: T,
+	readonly index: number
+}
+function wrap_result<T>(result: T, index: number): SearchResult<T> {
+	return { result: result, index: index }
+}
+
+export default function entry_search<T>(cloned_file_collection: Files<T>, file_name: string): SearchResult<Entry<T>> | undefined {
+	let start = 0
+	let end = cloned_file_collection.length-1
+	while (start<=end) {
+		const median = (start+end)>>1
+		const median_name = cloned_file_collection[median].name
+
+		if (median_name == file_name) { //left == right && (T == U) is not necessary
+			return wrap_result(cloned_file_collection[median], median)
+		} else if (median_name<file_name) {
+			start = median+1
+		} else {
+			end = median-1
+		}
+	}
+	return undefined
+}
--- a/src/rt/rfwfs/main.ts
+++ b/src/rt/rfwfs/main.ts
@ -0,0 +1,47 @@
+import { type EntryCollection } from "./collection"
+
+const enum EntryType {
+	Directory,
+	File
+}
+const enum Permissions {
+	r,
+	w,
+	rw,
+	none
+}
+
+interface Entry<T> {
+	readonly name: string,
+	readonly type: EntryType,
+	readonly inner: T,
+	readonly timestamp: number,
+	readonly collection?: EntryCollection<T>,
+	readonly permissions: Permissions,
+}
+interface Rfwfs {
+	new_entry: <T extends Entry<T>>(name: string, permissions: Permissions, timestamp: number, inner: T) => Entry<T>,
+	entry_trait: <T extends Entry<T>>(inner: T) => EntryCollection<T>
+	new_entry_tree: <T>(files: T) => T,
+}
+
+const rfwfs = {} as Rfwfs
+
+rfwfs.new_entry = function(name, permissions, timestamp, inner) {
+	const file_type = typeof inner == "object" ? EntryType.Directory : EntryType.File
+	return {
+		name: name,
+		type: file_type,
+		inner: inner,
+		timestamp: timestamp ? timestamp : Math.floor(Date.now()/1000),
+		collection: file_type === EntryType.Directory ? this.entry_trait(inner) : undefined,
+		permissions: permissions,
+	}
+}
+
+export {
+	EntryType,
+	Permissions,
+	type EntryCollection,
+	type Entry,
+}
--- a/src/rt/shell/command/builtin/cd.ts
+++ b/src/rt/shell/command/builtin/cd.ts
@ -1,13 +1,15 @@
-import { set_working_dir, SetDirStatus } from "../../fs/fn"
+import { set_working_dir, SetDirStatus } from "../../../rfwfs/library"
 import type { Args, Term } from "../list"

+import stdout from "../../../elements/stdout"
+
 export default function cd(term: Term, args: Args): boolean {
 	const new_dir_status = set_working_dir(args[1])

 	if (new_dir_status === SetDirStatus.NotADirectory) {
-		// return <p>{"cd: \""}{bold(args[1])}{"\" is not a directory"}</p>
+		term.appendChild(stdout(`cd: "${args[1]}" is not a directory`))
 	} else if (new_dir_status === SetDirStatus.NotFound) {
-		// return <p>{"cd: The directory \""}{bold(args[1])}{"\" does not exist"}</p>
+		term.appendChild(stdout(`cd: The directory "${args[1]}" does not exist`))
 	}
 	return true
 }
--- a/src/rt/shell/command/builtin/history.ts
+++ b/src/rt/shell/command/builtin/history.ts
@ -7,7 +7,7 @@ import history from "../../history";
 const history_command = new SubCommand("Show and manipulate command history")

 history_command.add("show", "Show the history", function(term: Term, _args: Args) {
-	history.file.inner.forEach((entry, ind) => term.appendChild(stdout(`${ind} ${entry}`)))
+	history.file.inner.forEach((entry, ind) => term.appendChild(stdout(`${ind+1} ${entry}`)))
 })

 history_command.add("clear", "Delete the entire command history", function(term: Term, _args: Args) {
--- a/src/rt/shell/command/builtin/ls.ts
+++ b/src/rt/shell/command/builtin/ls.ts
@ -1,11 +1,30 @@
 import type { Args, Term } from "../list";
+import { blue } from "../../color";
+import { get_working_dir_entries } from "../../../rfwfs/library";
+import { EntryType, FsEntry } from "../../../rfwfs/core";
+
+import stdout, { stdout_horizontal_elements } from "../../../elements/stdout";
+import create from "../../../elements/create";
+
+const element_collection = <T extends HTMLElement>(): T[] => []
+
+function show_directory(entry: FsEntry) {
+	const p = create("p")
+	p.append(blue(entry.name, true), "/")
+	return p
+}

 export default function ls(term: Term, args: Args): boolean {
-	// if (args[1] === undefined) {
-	// 	for (const dir_name in working_dir) {
-
-	// 	}
-	// 	return <p>{`${working_dir}`}</p>
-	// }
+	const ls_elements = element_collection()
+	if (args[1] === undefined) {
+		get_working_dir_entries().forEach(entry => {
+			if (entry.type === EntryType.Directory) {
+				ls_elements.push(show_directory(entry))
+			} else if (entry.type === EntryType.File) {
+				ls_elements.push(stdout(entry.name))
+			}
+		})
+	}
+	term.appendChild(stdout_horizontal_elements(ls_elements))
 	return true
 }
--- a/src/rt/shell/command/builtin/pwd.ts
+++ b/src/rt/shell/command/builtin/pwd.ts
@ -1,4 +1,4 @@
-import { get_working_dir_name_full } from "../../fs/fn";
+import { get_working_dir_name_full } from "../../../rfwfs/library";
 import type { Args, Term } from "../list";

 import stdout from "../../../elements/stdout";
--- a/src/rt/shell/fs/fn.ts
+++ b/src/rt/shell/fs/fn.ts
@ -1,75 +0,0 @@
-import { EntryType, fs, type FsEntrySignature } from "./fs"
-
-let working_dir = ["/", "home", "user"]
-
-function get_working_dir_name() {
-	return working_dir[working_dir.length-1]
-}
-
-function get_working_dir_name_full(): string {
-	const w_dir_clone = [...working_dir]
-	const root = w_dir_clone.shift()
-	if (root) {
-		return root+w_dir_clone.join("/")
-	}
-	return "shift-error"
-}
-
-const enum SetDirStatus {
-	Valid,
-	NotFound,
-	NotADirectory
-}
-interface FsIterEntry {
-	readonly entry: FsEntrySignature | null,
-	readonly status: SetDirStatus
-}
-function iter_fs_to_goal(w_dir_clone: string[]): FsIterEntry {
-	let next_iter = fs[0]
-
-	for (const w_dir of w_dir_clone) {
-		if (w_dir === "/") { continue }
-		if (next_iter && next_iter.inner) {
-			const found = next_iter.inner.find(entry => entry.name === w_dir)
-
-			if (!found) {
-				return { entry: null, status: SetDirStatus.NotFound }
-			}
-			if (found.type !== EntryType.Directory) {
-				return { entry: null, status: SetDirStatus.NotADirectory }
-			}
-			if (found.name === w_dir_clone[w_dir_clone.length-1]) {
-				return { entry: next_iter, status: SetDirStatus.Valid }
-			} else {
-				next_iter = found.inner as FsEntrySignature
-			}
-		}
-	}
-	return { entry: null, status: SetDirStatus.NotFound }
-}
-
-function set_working_dir(name: string): SetDirStatus {
-	if (name === ".") { return SetDirStatus.Valid }
-
-	const w_dir_clone = [...working_dir]
-	if (name === "..") { w_dir_clone.pop() } else { w_dir_clone.push(name) }
-
-	const iter_status = iter_fs_to_goal(w_dir_clone)
-	if (iter_status.status === SetDirStatus.Valid) {
-		working_dir = w_dir_clone
-	}
-	return iter_status.status
-}
-
-function working_dir_entries() {
-	const w_dir_clone = [...working_dir]
-	const iter_status = iter_fs_to_goal(w_dir_clone)
-
-}
-
-export {
-	get_working_dir_name,
-	get_working_dir_name_full,
-	set_working_dir,
-	SetDirStatus
-}
--- a/src/rt/shell/fs/fs.ts
+++ b/src/rt/shell/fs/fs.ts
@ -1,51 +0,0 @@
-const enum EntryType {
-	Directory,
-	File
-}
-const enum Permissions {
-	r,
-	w,
-	rw
-}
-
-type FsEntrySignature = Entry<Entry<{}>[]> //I did this!
-
-const user = [
-	Entry("about_me.txt", "about me inside", Permissions.rw),
-	Entry("services.txt", "services inside", Permissions.rw),
-	Entry("hi", [], Permissions.rw)
-]
-const home = [
-	Entry("user", user, Permissions.rw)
-]
-const root = [
-	Entry("home", home, Permissions.r),
-	Entry("bin", {}, Permissions.r),
-]
-const fs = [
-	Entry("/", root, Permissions.r)
-]
-
-type File = string
-interface Entry<T = File> {
-	readonly inner?: T,
-	readonly name: string,
-	readonly type: EntryType,
-	readonly permissions: Permissions
-}
-function Entry<T = File>(name: string, inner: T, permissions: Permissions): Entry<T> {
-	return {
-		type: typeof inner == "object" ? EntryType.Directory : EntryType.File,
-		inner: inner,
-		name: name,
-		permissions: permissions
-	}
-}
-
-export {
-	fs,
-	type FsEntrySignature,
-	EntryType,
-	Permissions,
-	Entry
-}
--- a/src/scss/elements/terminal.scss
+++ b/src/scss/elements/terminal.scss
@ -1,3 +1,5 @@
+@use "../variables.scss";
+
@mixin text-styles {
 	.red   { color: rgb(var(--color-red)) }
 	.green { color: rgb(var(--color-green)) }
@ -30,17 +32,13 @@
@mixin formatting {
 	@include stdout-layouts;
 	@include term-elements;
+	@include text-styles;

+	p, a, span {
+		font-size: variables.$default-font-size
+	}
 	p {
-		@include text-styles;
-
-		font-size: 1.2rem;
 		margin: 5px;
-
-		span { font-size: inherit; }
-		a {
-			font-size: inherit;
-			&:hover { text-decoration: underline; }
-		}
+		a:hover { text-decoration: underline; }
 	}
 }
--- a/src/scss/variables.scss
+++ b/src/scss/variables.scss
@ -1,3 +1,5 @@
+$default-font-size: 1.2rem;
+
 $header-Y: 30px;
 $footer-Y: 30px;
 $component-padding: 20px;
--- a/vite.config.js
+++ b/vite.config.js
@ -1,9 +1,27 @@
 import { defineConfig } from 'vite'
 import { createHtmlPlugin } from 'vite-plugin-html'
+import { ViteEjsPlugin } from 'vite-plugin-ejs'
+
+import fs from "fs"
+import path from "path"
+
+const html_dir = path.join(__dirname, "src", "html")
+
+function inlineHtml(html_file_name) {
+	try {
+		const html_path = path.resolve(path.join(html_dir, html_file_name+".html"))
+		return fs.readFileSync(html_path, "utf-8")
+	} catch(read_err) {
+		return "[INLINE-ERROR], "+read_err
+	}
+}

 export default defineConfig({
 	plugins: [
 		createHtmlPlugin({minify: true}),
+		ViteEjsPlugin({
+			inlineHtml: inlineHtml
+		})
 	],
 	root: "src",
 	build: {
Author	SHA1	Message	Date
rhpidfyre	d26a88628b	boiler plating	2025-03-02 17:04:31 -05:00
rhpidfyre	d499e013f5	move `vite-plugin-html` into devDependencies	2025-03-02 16:04:28 -05:00
rhpidfyre	b64ccd6975	add `vite-plugin-ejs`	2025-03-02 15:36:01 -05:00
rhpidfyre	c994698e2d	update ts	2025-03-02 02:39:49 -05:00
rhpidfyre	fd1675f57a	new structure and library structure	2025-03-02 02:39:46 -05:00
rhpidfyre	3865a79dbc	new logo	2025-03-01 00:29:03 -05:00
rhpidfyre	f228d86e0b	experimenting with entry	2025-02-27 00:34:53 -05:00
rhpidfyre	596a21f49d	move `terminal.ts` and `keys.ts` into the emulator folder	2025-02-26 16:48:51 -05:00
rhpidfyre	e09891482e	not necessary	2025-02-26 14:24:25 -05:00
rhpidfyre	f7e678190d	move `rfwfs` into `rt`	2025-02-26 14:18:05 -05:00
rhpidfyre	22df34ed43	binary searching for files WIP	2025-02-26 02:03:07 -05:00
rhpidfyre	2ea415a20e	fs is now named rfwfs rhpidfyre's web file system	2025-02-26 00:53:55 -05:00
rhpidfyre	d59ea8d8a7	search.ts -> index.ts	2025-02-25 23:24:10 -05:00
rhpidfyre	4f3df58ff4	move the fs tree into `tree.ts` out of `core.ts`	2025-02-25 21:13:08 -05:00
rhpidfyre	db31f20d24	`binary_nsort` for no automatic sorting	2025-02-25 19:03:10 -05:00
rhpidfyre	9de5ddcfbf	update deps	2025-02-25 18:32:16 -05:00
rhpidfyre	474345a204	search module for fs	2025-02-25 18:32:08 -05:00
rhpidfyre	d1fc53206c	fs.ts -> core.ts, fn.ts -> library.ts	2025-02-23 23:20:35 -05:00
rhpidfyre	20d7bd09a3	history show is now 1 based	2025-02-23 23:14:47 -05:00
rhpidfyre	3640f022f6	working on the file system cd can now display folders in blue	2025-02-23 23:13:05 -05:00