.*)")}$`))
- return location.pathname.match(regex)
- },
-
- onChange() {
- for (const r of routes) {
- const match = this.match(r.path)
- if (match) {
- current.value = { route: r, params: match.groups ?? {} }
- return
- }
- }
-
- this.navigate(routes[0].path, true)
- },
-
- get currentRoute() {
- return current.value.route
- },
-
- get params() {
- return current.value.params
- },
-}
-
-addEventListener("popstate", () => router.onChange())
-router.onChange()
diff --git a/src/app/settings/Api.tsx b/src/app/settings/Api.tsx
deleted file mode 100644
index 62097b7..0000000
--- a/src/app/settings/Api.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import { Alert, Markdown } from "../_components"
-import { API_URL } from "../_hooks"
-import { SettingsPage } from "./SettingsPage"
-
-export const Api = () => {
- return (
-
-
- This feature is experimental.
- The API is not yet stable and may change in the future.
-
-
-
-
- )
-}
diff --git a/src/app/settings/DownloadModal.tsx b/src/app/settings/DownloadModal.tsx
deleted file mode 100644
index e206b52..0000000
--- a/src/app/settings/DownloadModal.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Button, Modal } from "../_components"
-import { basename, humanSize } from "../_util"
-
-export const DownloadModal = ({ url, size, progress, onCancel }) => {
- const percent = (progress.value / size) * 100
-
- return (
-
-
- Downloading {basename(url)}
- {percent.toFixed(2)}%
-
-
-
-
-
-
- {humanSize(progress.value)} / {humanSize(size)}
-
-
-
-
- )
-}
diff --git a/src/app/settings/License.tsx b/src/app/settings/License.tsx
deleted file mode 100644
index 4b5ecf9..0000000
--- a/src/app/settings/License.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useSignal } from "@preact/signals"
-import { SettingsPage } from "./SettingsPage"
-import { useEffect } from "preact/hooks"
-import { Markdown } from "../_components"
-
-export const License = () => {
- const license = useSignal("Loading...")
-
- useEffect(() => {
- fetch("/LICENSE.md")
- .then(r => r.text())
- .then(text => (license.value = text))
- }, [])
-
- return (
-
- License
-
-
-
-
- Open Source acknowledgement
-
- This Software, incorporates and uses open-source software components. The use of these components is
- acknowledged, and their respective licenses are included in the LICENSES.md file which is shown above.
-
-
- )
-}
diff --git a/src/app/settings/ModelCatalog.tsx b/src/app/settings/ModelCatalog.tsx
deleted file mode 100644
index 4a9ee9b..0000000
--- a/src/app/settings/ModelCatalog.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Button, Table } from "../_components"
-import { useApi } from "../_hooks"
-import { basename, humanSize } from "../_util"
-import { downloadModel } from "./download"
-
-export const ModelCatalog = () => {
- const { data: models = [] } = useApi("models")
-
- return (
- <>
- Catalog
-
-
-
- | Model |
- Uploader |
- Size |
- |
-
-
-
- {catalog.map(m => (
-
- | {basename(m.url.slice(0, -5))} |
- {m.url.split("/")[3]} |
- {humanSize(m.size)} |
-
- {models.find(({ name }) => name === basename(m.url).slice(0, -5)) ? (
- Installed
- ) : (
-
- )}
- |
-
- ))}
-
-
-
-
-
- Different models may have different licenses. Always check the license of each model before using it.
-
-
-
- )
-}
-
-const catalog = [
- {
- url: "https://huggingface.co/TheBloke/WizardLM-13B-V1.2-GGUF/resolve/main/wizardlm-13b-v1.2.Q4_K_M.gguf",
- size: 7865956224,
- },
- {
- url: "https://huggingface.co/TheBloke/MythoMax-L2-13B-GGUF/resolve/main/mythomax-l2-13b.Q4_K_M.gguf",
- size: 7865956224,
- },
- {
- url: "https://huggingface.co/TheBloke/zephyr-7B-beta-GGUF/resolve/main/zephyr-7b-beta.Q4_K_M.gguf",
- size: 4368438976,
- },
- {
- url: "https://huggingface.co/TheBloke/Airoboros-L2-7B-2.2-GGUF/resolve/main/airoboros-l2-7b-2.2.Q4_K_M.gguf",
- size: 4081004256,
- },
- {
- url: "https://huggingface.co/TheBloke/rocket-3B-GGUF/resolve/main/rocket-3b.Q4_K_M.gguf",
- size: 1708595136,
- },
-]
diff --git a/src/app/settings/ModelImporter.tsx b/src/app/settings/ModelImporter.tsx
deleted file mode 100644
index eb18d28..0000000
--- a/src/app/settings/ModelImporter.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Alert, Button } from "../_components"
-import { useApi, useLocalStorage } from "../_hooks"
-import { useEffect } from "preact/hooks"
-import { basename } from "../_util"
-
-export const ModelImporter = () => {
- const { data: system } = useApi("system-info")
- const { data: models, post } = useApi("models")
- const path = useLocalStorage("importer.path", "")
-
- useEffect(() => {
- if (system && !path.value) path.value = system.user_downloads
- }, [system])
-
- const handleImport = async () => {
- // TODO: use getApiContext() but make sure the invalidate() does not do GET afterwards
- const res = await fetch("/api/find-models", { method: "POST", body: JSON.stringify(path.value) })
- const data = await res.json()
-
- // Import only models that are not already there
- for (const { path } of data) {
- if (!models?.find((m: any) => m.path === path)) {
- await post({ name: basename(path), path, imported: true })
- }
- }
- }
-
- return (
-
- Import models
- If you already have some GGUF files, you can import them here:
-
- (path.value = e.target!.value)} />
-
-
-
- )
-}
diff --git a/src/app/settings/Models.tsx b/src/app/settings/Models.tsx
deleted file mode 100644
index 96fb0ce..0000000
--- a/src/app/settings/Models.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Button, Table } from "../_components"
-import { SettingsPage } from "./SettingsPage"
-import { DownloadModal } from "./DownloadModal"
-import { useApi, useConfirm } from "../_hooks"
-import { humanSize } from "../_util"
-import { abortCurrent, current } from "./download"
-import { ModelImporter } from "./ModelImporter"
-import { ModelCatalog } from "./ModelCatalog"
-
-export const Models = () => {
- const { data: models = [], del } = useApi("models")
-
- const handleDelete = useConfirm("Are you sure you want to delete this model?", del)
-
- return (
-
- {current.value && }
-
-
-
- Installed models
-
-
-
- | Model |
- Size |
- |
-
-
-
- {!models.length && (
-
- | No models installed. Download one from the catalog below. |
-
- )}
-
- {models.map(m => (
-
- | {m.name} |
- {humanSize(m.size)} |
-
- {m.imported ? (
-
- ) : (
-
- )}
- |
-
- ))}
-
-
-
-
-
- )
-}
diff --git a/src/app/settings/SettingsPage.tsx b/src/app/settings/SettingsPage.tsx
deleted file mode 100644
index 440fb6c..0000000
--- a/src/app/settings/SettingsPage.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NavLink, Page, Tabs } from "../_components"
-
-export const SettingsPage = ({ children }) => {
- return (
-
-
-
-
- Models
-
- System
- API
- License
-
-
-
- {children}
-
- )
-}
diff --git a/src/app/settings/System.tsx b/src/app/settings/System.tsx
deleted file mode 100644
index a71ac94..0000000
--- a/src/app/settings/System.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Value } from "../_components"
-import { useApi } from "../_hooks"
-import { SettingsPage } from "./SettingsPage"
-
-export const System = () => {
- const { data: system } = useApi("system-info")
- const { data: log } = useApi("log")
-
- return (
-
- System info
-
-
-
-
-
-
-
-
- Log
- {log}
-
- )
-}
diff --git a/src/app/settings/download.ts b/src/app/settings/download.ts
deleted file mode 100644
index f7e2b27..0000000
--- a/src/app/settings/download.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { effect, signal, Signal } from "@preact/signals"
-import { getApiContext } from "../_hooks"
-import { basename, jsonLines } from "../_util"
-
-type DownloadItem = { url: string; size: number }
-
-export const queue = signal([])
-export const current = signal<{ url: string; size: number; progress: Signal; ctrl: AbortController } | null>(null)
-export const downloadModel = (item: DownloadItem) => (queue.value = [...queue.value, item])
-
-const startDownload = async ({ url, size }) => {
- const ctrl = new AbortController()
- const progress = signal(0)
-
- current.value = {
- url,
- size,
- progress,
- ctrl,
- }
-
- try {
- const res = await fetch("/api/download", {
- method: "POST",
- body: JSON.stringify(url),
- signal: ctrl.signal,
- })
-
- for await (const d of jsonLines(res.body!.getReader())) {
- if ("error" in d) {
- throw new Error(`Unexpected error: ${d.error}`)
- }
-
- if ("progress" in d) {
- progress.value = d.progress
- }
-
- if ("path" in d) {
- await getApiContext("models").post({ name: basename(url.slice(0, -5)), path: d.path })
- }
- }
- } catch (e) {
- if (e.code !== DOMException.ABORT_ERR) {
- throw e
- }
- } finally {
- current.value = null
- }
-}
-
-export const abortCurrent = () => {
- current.value?.ctrl.abort()
- current.value = null
-}
-
-effect(() => {
- if (!current.value && queue.value.length) {
- const [next, ...rest] = queue.value
- queue.value = rest
- startDownload(next)
- }
-})
diff --git a/src/app/theme.tsx b/src/app/theme.tsx
deleted file mode 100644
index dd088f9..0000000
--- a/src/app/theme.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { options } from "preact"
-import { tw, install, css, TwindUserConfig } from "@twind/core"
-import presetTailwind, { TailwindTheme } from "@twind/preset-tailwind/base"
-import * as radix from "@twind/preset-radix-ui/colors"
-import darkColor from "@twind/preset-radix-ui/darkColor"
-
-const colors = {
- ...radix,
- primary: radix.blue,
- primaryDark: radix.blueDark,
- warning: radix.yellow,
- warningDark: radix.yellowDark,
- neutral: radix.sand,
- neutralDark: radix.slateDark,
-}
-
-const autoprefix = ({ stringify }) => ({
- stringify: (prop, value, ctx) => {
- const prefix = CSS.supports(`${prop}: unset`) ? "" : "-webkit-"
- return prefix + stringify(prop, value, ctx)
- },
-})
-
-const globals = () => ({
- preflight: css`
- input:not([type="checkbox"]):not([type="range"]),
- select,
- textarea,
- .form-control {
- @apply inline-block appearance-none text(ellipsis neutral-12) px-2 py-[5px] bg-neutral-1 border(1 neutral-8) rounded-md resize-none;
- }
-
- :focus {
- @apply !border-transparent outline(& [3px] primary-7);
- }
-
- th {
- text-align: left;
- }
- `,
-})
-
-const macos = () => ({
- preflight:
- "webkit" in window
- ? css`
- html.oof #app {
- opacity: 0.7;
- filter: grayscale(0.85) contrast(0.9);
- }
-
- *:not([draggable]),
- a,
- button {
- cursor: default;
- user-select: none;
- user-drag: none;
- }
-
- a,
- button {
- white-space: nowrap;
- }
- `
- : "",
-})
-
-const cfg: TwindUserConfig = {
- presets: [autoprefix, presetTailwind({ colors }), globals, macos],
- darkColor,
- rules: [
- // mini-bootstrap
- ["hstack", "flex(& row) items-center"],
- ["vstack", "flex(& col)"],
-
- // custom
- ["shadow-thin", { boxShadow: "0 1px 1px 0 rgba(0, 0, 0, 0.3)" }],
- ],
- variants: [
- // out-of-focus (TODO: maybe opacity is enough?)
- // or maybe just define few color classes and override them in dark mode
- // ["oof", "&:is(.oof *)"],
- ],
- theme: {
- fontFamily: {
- sans: `ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"`,
- },
-
- fontSize: {
- xs: ["12px", "1rem"],
- sm: ["13px", "1rem"],
- base: ["14px", "1.25rem"],
- lg: ["16px", "1.5rem"],
- xl: ["18px", "1.5rem"],
- "2xl": ["20px", "1.5rem"],
- },
- },
-}
-
-install(cfg, false)
-
-options.vnode = vnode => {
- if ("class" in vnode.props) vnode.props.class = tw(vnode.props.class as any)
-}
-
-addEventListener("blur", () => document.documentElement.classList.add("oof"))
-addEventListener("focus", () => document.documentElement.classList.remove("oof"))
diff --git a/src/app/workflow/Workflow.tsx b/src/app/workflow/Workflow.tsx
deleted file mode 100644
index 3098128..0000000
--- a/src/app/workflow/Workflow.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { createContext } from "preact"
-import { useContext } from "preact/hooks"
-import { useSignal } from "@preact/signals"
-import { Clock, Cloud, MousePointerSquare, Play, Repeat2, TableProperties, Wand2 } from "lucide"
-import { Field, Form, FormGrid, Icon, IconButton, Page } from "../_components"
-import { err, humanDuration, humanize } from "../_util"
-import { examples } from "./_examples"
-import { handlers, runWorkflow, stepDefaults } from "./runner"
-
-const SelectionContext = createContext({ selection: null, select: null } as any)
-
-export const Workflow = ({ params }) => {
- const workflow = examples.find(w => w.id === +params.id) ?? err("Unknown workflow") // TODO: useApi()
-
- const ctx = {
- selection: useSignal(null as any),
- select: step => (ctx.selection.value = step),
- }
-
- return (
-
-
- runWorkflow(workflow)} />
-
-
-
- {!workflow.steps.length && Add steps from the right to build your workflow.
}
-
-
- {workflow.steps.map(s => (
-
- ))}
-
-
-
-
-
-
-
-
- )
-}
-
-const Step = ({ step }) => {
- const { selection, select } = useContext(SelectionContext)
- const [[kind, props]] = Object.entries(step)
- const [title, icon, subtitle] = renderers[kind](props)
-
- const selected = selection?.value === step
-
- return (
- select(step)}
- draggable
- >
-
-
-
-
-
- {step ? Object.keys(step)[0] : "No step selected"}
-
-
-
- {step ? (
-
- ) : (
-
Click on a step to edit its properties, or drag a step from the sidebar to add it to the workflow.
- )}
-
-
Step Catalog
-
-
- {Object.keys(handlers).map(k => (
-
- ))}
-
-
- No changes are saved to the database
-
-
-
-
-
- | Name |
- Kind |
-
-
-
- {examples.map(w => (
-
- |
-
- {w.name}
-
- |
- Manual |
- {/* TODO: Automatic when the first action is a trigger/cron */}
-
- ))}
-
-
-
-
- )
-}
diff --git a/src/app/workflow/_examples.ts b/src/app/workflow/_examples.ts
deleted file mode 100644
index a2f52aa..0000000
--- a/src/app/workflow/_examples.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-export const examples = [
- {
- id: 1,
- name: "Chuck Norris Jokes Explained",
- steps: [
- { http_request: { method: "GET", url: "https://api.chucknorris.io/jokes/random" } },
- { instruction: { instruction: "Extract the value part." } },
- { instruction: { instruction: "Explain the joke, reason step by step." } },
- ],
- },
-
- {
- id: 2,
- name: "Local Llama Top Posts",
- steps: [
- { http_request: { method: "GET", url: "https://old.reddit.com/r/LocalLLaMA/top/" } },
- { query_selector: { selector: ".thing" } },
- { instruction: { instruction: "Extract the title and url and respond with valid JSON." } },
- ],
- },
-
- {
- id: 3,
- name: "Scrape Hacker News Jobs",
- steps: [
- { wait: { duration: 2 } },
- { http_request: { method: "GET", url: "https://hn.svelte.dev/jobs/1" } },
- { query_selector: { selector: "main article", limit: 5 } },
- {
- instruction: {
- instruction: "Extract the job title, company and expected skills for the role. Respond with valid JSON.",
- },
- },
- ],
- },
-]
diff --git a/src/app/workflow/runner.ts b/src/app/workflow/runner.ts
deleted file mode 100644
index b2a2af6..0000000
--- a/src/app/workflow/runner.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { signal } from "@preact/signals"
-import { generate } from "../_hooks/useGenerate"
-import { parseHTML } from "../_util"
-
-export type Step = (typeof stepDefaults)[keyof typeof stepDefaults]
-
-// TODO: this should be retrieved from the server
-export const stepDefaults = {
- wait: { duration: 1 },
- generate: {}, // TODO: opts for sampling, etc.
- instruction: { instruction: "" },
- http_request: { method: "GET", url: "" },
- query_selector: { selector: "", limit: 2, clean: true },
-}
-
-type Handlers = {
- [k in keyof typeof stepDefaults]: (opts: (typeof stepDefaults)[k], input: string) => string | Promise
-}
-
-// TODO: this should be implemented on the server side
-export const handlers: Handlers = {
- wait: ({ duration }) => {
- return new Promise(resolve => setTimeout(resolve, duration * 1000))
- },
-
- generate: (opts, input) => {
- const result = signal("")
- const status = signal(null)
-
- return generate({ ...opts, prompt: input }, result, status)
- },
-
- instruction: ({ instruction, ...opts }, input) => {
- return handlers.generate(opts, `ASSISTANT: ${input}\n\nUSER: ${instruction}\n\nASSISTANT: Sure!`)
- },
-
- http_request: ({ url }) => {
- return fetch("/api/proxy", { method: "POST", body: JSON.stringify(url) }).then(res => res.text())
- },
-
- query_selector: ({ selector, limit = 2, clean = true }, input) => {
- return [...parseHTML(input, clean).querySelectorAll(selector)]
- .slice(0, limit)
- .map(el => el.innerHTML)
- .join("")
- },
-}
-
-export const runWorkflow = async workflow => {
- const runStep = async (step, input) => {
- for (const k in handlers) {
- if (k in step) {
- const res = await handlers[k](step[k], input)
-
- return res
- }
- }
-
- throw new Error(`No handler found for step ${JSON.stringify(step)}`)
- }
-
- let input = null
- for (const step of workflow.steps) {
- input = await runStep(step, input)
- }
-}
diff --git a/src/cli.zig b/src/cli.zig
deleted file mode 100644
index 721d2e7..0000000
--- a/src/cli.zig
+++ /dev/null
@@ -1,26 +0,0 @@
-const std = @import("std");
-const ava = @import("main.zig");
-
-// This is only used for the headless build
-pub fn main() !void {
- std.log.debug("Starting the server", .{});
- try ava.start();
-
- const banner =
- \\
- \\ /\ \ / /\ Server running
- \\ /--\ \/ /--\ http://{}
- \\ _____________________________________________
- \\
- \\
- ;
-
- std.debug.print(banner, .{
- ava.server.?.http.socket.listen_address,
- });
-
- ava.server.?.thread.join();
-
- std.log.debug("Stopping the server", .{});
- _ = ava.ava_stop();
-}
diff --git a/src/db.zig b/src/db.zig
deleted file mode 100644
index 2e165fd..0000000
--- a/src/db.zig
+++ /dev/null
@@ -1,88 +0,0 @@
-const std = @import("std");
-const util = @import("util.zig");
-const sqlite = @import("ava-sqlite");
-
-pub const Model = struct {
- id: u32,
- name: []const u8,
- path: []const u8,
- imported: bool,
-};
-
-pub const Prompt = struct {
- id: u32,
- name: []const u8,
- prompt: []const u8,
-};
-
-pub const Chat = struct {
- id: u32,
- name: []const u8,
- prompt: ?[]const u8,
-};
-
-pub const ChatMessage = struct {
- id: u32,
- chat_id: u32,
- role: []const u8,
- content: []const u8,
-};
-
-var db: sqlite.SQLite3 = undefined;
-
-pub fn init(allocator: std.mem.Allocator) !void {
- const db_file = try util.getWritableHomePath(allocator, &.{"db"});
- defer allocator.free(db_file);
-
- db = try sqlite.SQLite3.open(db_file);
- try sqlite.migrate(allocator, &db, @embedFile("db_schema.sql"));
-}
-
-pub fn deinit() void {
- db.close();
-}
-
-pub fn exec(sql: []const u8, args: anytype) !void {
- return db.exec(sql, args);
-}
-
-pub fn query(sql: []const u8, args: anytype) !sqlite.Statement {
- return db.query(sql, args);
-}
-
-pub fn get(comptime T: type, sql: []const u8, args: anytype) !T {
- return db.get(T, sql, args);
-}
-
-pub fn getString(allocator: std.mem.Allocator, sql: []const u8, args: anytype) ![]const u8 {
- return db.getString(allocator, sql, args);
-}
-
-// TODO: later
-// pub fn insert(comptime T: type, values: anytype) !std.meta.FieldType(T, .id) {
-// comptime var fields: []const u8 = "";
-// comptime var placeholders: []const u8 = "";
-//
-// inline for (std.meta.fields(T), 0..) |f, i| {
-// if (i != 0) {
-// fields = fields ++ ", ";
-// placeholders = placeholders ++ ", ";
-// }
-//
-// fields = fields ++ f.name;
-// placeholders = placeholders ++ "?";
-// }
-//
-// var stmt = try db.query(comptime "INSERT INTO " ++ tableName(T) ++ "(" ++ fields ++ ") VALUES(" ++ placeholders ++ ") RETURNING id", values);
-// defer stmt.deinit();
-//
-// return stmt.read(std.meta.FieldType(T, .id));
-// }
-//
-// pub fn delete(comptime T: type, id: std.meta.FieldType(T, .id)) !void {
-// return exec("DELETE FROM " ++ tableName(T) ++ " WHERE id = ?", .{id});
-// }
-//
-// fn tableName(comptime T: type) []const u8 {
-// return std.fs.path.extension(@typeName(T))[1..];
-// }
diff --git a/src/db_schema.sql b/src/db_schema.sql
deleted file mode 100644
index d83a8d4..0000000
--- a/src/db_schema.sql
+++ /dev/null
@@ -1,30 +0,0 @@
---
--- IMPORTANT:
--- Table names need to be quoted in order to work with our migration tool.
---
-CREATE Table "Model" (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- name TEXT NOT NULL,
- path TEXT NOT NULL,
- imported INTEGER NOT NULL DEFAULT 0
-) STRICT;
-
-CREATE TABLE "Prompt" (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- name TEXT NOT NULL,
- prompt TEXT NOT NULL
-) STRICT;
-
-CREATE TABLE "Chat" (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- name TEXT NOT NULL,
- prompt TEXT
-) STRICT;
-
-CREATE TABLE "ChatMessage" (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- chat_id INTEGER NOT NULL,
- role TEXT NOT NULL,
- content TEXT NOT NULL,
- FOREIGN KEY (chat_id) REFERENCES Chat(id) ON DELETE CASCADE
-) STRICT;
\ No newline at end of file
diff --git a/src/llama.zig b/src/llama.zig
deleted file mode 100644
index 4b3898c..0000000
--- a/src/llama.zig
+++ /dev/null
@@ -1,497 +0,0 @@
-const std = @import("std");
-const builtin = @import("builtin");
-const log = std.log.scoped(.llama);
-
-const c = @cImport({
- @cDefine("GGML_UNREACHABLE", "unreachable");
- @cInclude("llama.h");
-});
-
-pub const Token = c.llama_token;
-
-pub const SamplingParams = struct {
- top_k: u32 = 40,
- top_p: f32 = 0.5,
- temperature: f32 = 0.7,
- repeat_n_last: usize = 256,
- repeat_penalty: f32 = 1.05,
- presence_penalty: f32 = 0,
- freq_penalty: f32 = 0,
- add_bos: bool = true,
- stop_eos: bool = true,
- stop: []const []const u8 = &.{},
- json: bool = false,
-};
-
-pub fn init(allocator: std.mem.Allocator) void {
- const H = struct {
- fn trampoline(_: c.enum_ggml_log_level, data: [*c]const u8, _: ?*anyopaque) callconv(.C) void {
- log.debug("{s}", .{data});
- }
- };
-
- c.llama_backend_init(false);
- c.llama_log_set(H.trampoline, null);
- Pool.init(allocator);
-}
-
-pub fn deinit() void {
- Pool.deinit();
- c.llama_backend_free();
-}
-
-/// A single-model, single-context, thread-safe pool.
-pub const Pool = struct {
- var allocator: std.mem.Allocator = undefined;
- var mutex = std.Thread.Mutex{};
- var model: ?Model = null;
- var context: ?Context = null;
-
- /// Initializes the pool.
- pub fn init(ally: std.mem.Allocator) void {
- allocator = ally;
- }
-
- /// Deinitializes the pool.
- pub fn deinit() void {
- if (context != null) {
- context.?.deinit();
- context = null;
-
- model.?.deinit();
- model = null;
- }
- }
-
- /// Returns a context for the given model. The context must be released
- /// after use. This function is thread-safe. Fails if the context is busy
- /// for more than `timeout` milliseconds.
- pub fn get(model_path: []const u8, timeout: u64) !*Context {
- const start = std.time.milliTimestamp();
-
- while (!mutex.tryLock()) {
- if (std.time.milliTimestamp() - start > timeout) return error.ContextBusy;
- std.time.sleep(100_000_000);
- }
- errdefer mutex.unlock();
-
- // Reset if the model has changed.
- if (model != null and !std.mem.eql(u8, model.?.path, model_path)) {
- context.?.deinit();
- context = null;
-
- model.?.deinit();
- model = null;
- }
-
- if (model == null) {
- model = try Model.loadFromFile(allocator, model_path);
- context = try Context.init(
- allocator,
- &model.?,
- (std.Thread.getCpuCount() catch 8) / 2, // TODO: make this configurable (in global settings)
- );
- }
-
- return &context.?;
- }
-
- /// Releases the context so that it can be used by other threads.
- pub fn release(ctx: *Context) void {
- if (ctx == &context.?) {
- mutex.unlock();
- }
- }
-};
-
-pub const Model = struct {
- allocator: std.mem.Allocator,
- path: []const u8,
- params: c.llama_model_params,
- ptr: *c.llama_model,
-
- /// Loads a model from a file.
- pub fn loadFromFile(allocator: std.mem.Allocator, path: []const u8) !Model {
- const pathZ = try getShortPath(allocator, path);
- defer allocator.free(pathZ);
- var params = c.llama_model_default_params();
-
- // It seems Metal never worked on Intel-based macs.
- // see https://github.com/ggerganov/llama.cpp/issues/3423#issuecomment-1745511586
- //
- // TODO: now even macos can do a split, so we should make it configurable (and/or detect)
- // https://github.com/ggerganov/llama.cpp/blob/master/llama.cpp#L9643
- params.n_gpu_layers = if (builtin.os.tag == .macos and builtin.cpu.arch == .aarch64) 999 else 0;
- log.debug("n_gpu_layers = {}", .{params.n_gpu_layers});
-
- // Load the model
- const ptr = c.llama_load_model_from_file(pathZ.ptr, params) orelse return error.InvalidModel;
-
- return .{
- .allocator = allocator,
- .path = try allocator.dupe(u8, path), // save original, long path
- .params = params,
- .ptr = ptr,
- };
- }
-
- /// Deinitializes the model.
- pub fn deinit(self: *Model) void {
- c.llama_free_model(self.ptr);
- self.allocator.free(self.path);
- }
-
- /// Returns a list of tokens for the given input.
- pub fn tokenize(self: *Model, allocator: std.mem.Allocator, input: []const u8, max_tokens: usize, add_bos: bool) !std.ArrayList(Token) {
- var tokens = try std.ArrayList(Token).initCapacity(allocator, max_tokens);
- errdefer tokens.deinit();
-
- const n_tokens = c.llama_tokenize(
- self.ptr,
- input.ptr,
- @intCast(input.len),
- tokens.items.ptr,
- @intCast(max_tokens),
- add_bos,
- true,
- );
-
- if (n_tokens >= 0) {
- tokens.items.len = @intCast(n_tokens);
- } else {
- return error.FailedToTokenize;
- }
-
- return tokens;
- }
-
- fn getShortPath(allocator: std.mem.Allocator, path: []const u8) ![:0]const u8 {
- // llama.cpp is using fopen() and it does not support UTF-8 paths on Windows
- // so what we need to do is to call GetShortPathName() to get the short path
- // and it should work
- if (comptime builtin.os.tag == .windows) {
- const w = struct {
- extern "kernel32" fn GetShortPathNameW(lpszLongPath: ?[*:0]const u16, lpszShortPath: ?[*:0]u16, cchBuffer: u32) callconv(std.os.windows.WINAPI) u32;
- };
-
- const wpath = try std.unicode.utf8ToUtf16LeWithNull(allocator, path);
- defer allocator.free(wpath);
-
- var buf: [260:0]u16 = undefined;
- _ = w.GetShortPathNameW(wpath, &buf, buf.len);
-
- return std.unicode.utf16leToUtf8AllocZ(allocator, &buf);
- }
-
- return allocator.dupeZ(u8, path);
- }
-};
-
-pub const Context = struct {
- model: *Model,
- params: c.llama_context_params,
- ptr: *c.llama_context,
- grammar: ?*c.llama_grammar = null,
- tokens: std.ArrayList(Token),
- n_past: usize = 0,
- candidates: std.ArrayList(c.llama_token_data),
- buf: std.ArrayList(u8),
-
- /// Initializes the context.
- pub fn init(allocator: std.mem.Allocator, model: *Model, n_threads: usize) !Context {
- var params = c.llama_context_default_params();
- params.n_ctx = 2048; // TODO: make this configurable
- params.n_batch = 64; // 512; // TODO: @min(512, xxx)
- params.n_threads = @intCast(n_threads);
-
- return .{
- .model = model,
- .params = params,
- .ptr = c.llama_new_context_with_model(model.ptr, params) orelse return error.UnexpectedError,
- .tokens = std.ArrayList(Token).init(allocator),
- .candidates = std.ArrayList(c.llama_token_data).init(allocator),
- .buf = std.ArrayList(u8).init(allocator),
- };
- }
-
- /// Deinitializes the context.
- pub fn deinit(self: *Context) void {
- if (self.grammar) |g| {
- c.llama_grammar_free(g);
- }
-
- c.llama_free(self.ptr);
- self.tokens.deinit();
- self.candidates.deinit();
- self.buf.deinit();
- }
-
- /// Prepares the context for inference.
- pub fn prepare(self: *Context, prompt: []const u8, params: *const SamplingParams) !void {
- const tokens = try self.model.tokenize(self.tokens.allocator, prompt, @intCast(c.llama_n_ctx(self.ptr)), params.add_bos);
- self.buf.shrinkRetainingCapacity(0);
-
- // Find the common part and set n_past accordingly.
- var n_past: usize = 0;
-
- for (0..@min(self.tokens.items.len, tokens.items.len)) |i| {
- if (self.tokens.items[i] != tokens.items[i]) break;
- n_past = i;
- }
-
- if (self.grammar) |g| {
- c.llama_grammar_free(g);
- self.grammar = null;
- }
-
- if (params.json) {
- self.grammar = c.llama_grammar_init(@constCast(grammar.JSON_RULES.ptr), grammar.JSON_RULES.len, 0);
- }
-
- log.debug("{} tokens, n_past = {}", .{ tokens.items.len, n_past });
-
- self.tokens.deinit();
- self.tokens = tokens;
- self.n_past = n_past;
- }
-
- /// Runs the inference.
- /// Does nothing if the context is already up-to-date.
- pub fn eval(self: *Context) !void {
- while (try self.evalOnce() > 0) {}
- }
-
- /// Runs one step of inference.
- /// Does nothing if the context is already up-to-date.
- /// Returns the number of tokens evaluated.
- pub fn evalOnce(self: *Context) !usize {
- const n_eval = @min(
- @as(usize, @intCast(self.params.n_batch)),
- self.tokens.items.len - self.n_past,
- );
-
- if (n_eval > 0) {
- const toks = self.tokens.items[self.n_past..];
-
- if (c.llama_eval(
- self.ptr,
- toks.ptr,
- @intCast(n_eval),
- @intCast(self.n_past),
- ) != 0) {
- return error.FailedToEval;
- }
-
- self.n_past += n_eval;
- }
-
- return n_eval;
- }
-
- /// Generates next utf-8 valid chunk of text.
- pub fn generate(self: *Context, params: *const SamplingParams) !?[]const u8 {
- const start = self.buf.items.len;
-
- // Keep generating until we have valid chunk, but not more than 32 times.
- for (0..32) |_| {
- const token = try self.generateToken(params) orelse return null;
- const piece = std.mem.span(c.llama_token_get_text(self.model.ptr, token));
-
- switch (c.llama_token_get_type(self.model.ptr, token)) {
- c.LLAMA_TOKEN_TYPE_NORMAL => {
- // Replace \xe2\x96\x81 (Lower One Eighth Block) with space
- if (c.llama_vocab_type(self.model.ptr) == c.LLAMA_VOCAB_TYPE_SPM) {
- const n = std.mem.replace(u8, piece, "▁", " ", try self.buf.addManyAsSlice(piece.len));
- self.buf.items.len -= n * 2; // ▁ is 3 bytes, space is 1 byte, so we need to remove 2 bytes
- } else if (c.llama_vocab_type(self.model.ptr) == c.LLAMA_VOCAB_TYPE_BPE) {
- try appendBPE(&self.buf, piece);
- } else {
- try self.buf.appendSlice(piece);
- }
- },
- c.LLAMA_TOKEN_TYPE_UNKNOWN => try self.buf.appendSlice("▅"),
- c.LLAMA_TOKEN_TYPE_BYTE => try self.buf.append(try std.fmt.parseInt(u8, piece[3..5], 16)),
- else => {},
- }
-
- const chunk = self.buf.items[start..];
-
- if (std.unicode.utf8ValidateSlice(chunk)) {
- // Handle stop tokens.
- for (params.stop) |s| {
- // Stop if the chunk contains the stop suffix.
- if (std.mem.indexOf(u8, chunk, s) != null) {
- return null;
- }
-
- // Current chunk might be a start of the stop suffix, so let's generate one more token.
- if (std.mem.startsWith(u8, s, chunk)) {
- break;
- }
- } else return chunk;
- }
- }
-
- // Discard the invalid chunk.
- self.buf.shrinkRetainingCapacity(start);
- return null;
- }
-
- /// Generates a token using the given sampler and appends it to the context.
- pub fn generateToken(self: *Context, params: *const SamplingParams) !?Token {
- if (self.tokens.items.len >= c.llama_n_ctx(self.ptr)) {
- // Truncate input if it's too long but keep some empty space for
- // new tokens.
- const cutoff: usize = @intCast(@divTrunc(c.llama_n_ctx(self.ptr), 2));
- for (self.tokens.items[cutoff..], 0..) |t, i| {
- self.tokens.items[i] = t;
- }
- self.tokens.items.len = cutoff;
- self.n_past = 0;
-
- log.debug("truncated input to {}", .{cutoff});
- }
-
- try self.eval();
-
- const token = try self.sampleToken(params) orelse return null;
- try self.tokens.append(token);
- return token;
- }
-
- /// Samples a token from the context.
- pub fn sampleToken(self: *Context, params: *const SamplingParams) !?Token {
- const logits = c.llama_get_logits(self.ptr);
- try self.candidates.resize(@intCast(c.llama_n_vocab(self.model.ptr)));
-
- for (self.candidates.items, 0..) |*candidate, i| {
- candidate.* = .{
- .id = @intCast(i),
- .logit = logits[i],
- .p = 0,
- };
- }
-
- var candidates: c.llama_token_data_array = .{
- .data = self.candidates.items.ptr,
- .size = self.candidates.items.len,
- .sorted = false,
- };
-
- if (self.grammar != null) {
- c.llama_sample_grammar(self.ptr, &candidates, self.grammar);
- }
-
- // Apply repetition penalties.
- const last_n = @min(self.tokens.items.len, params.repeat_n_last);
- c.llama_sample_repetition_penalties(self.ptr, &candidates, &self.tokens.items[self.tokens.items.len - last_n], @intCast(last_n), params.repeat_penalty, params.presence_penalty, params.freq_penalty);
-
- if (params.temperature >= 0) {
- c.llama_sample_top_k(self.ptr, &candidates, @intCast(params.top_k), 1);
- c.llama_sample_top_p(self.ptr, &candidates, params.top_p, 1);
- c.llama_sample_temperature(self.ptr, &candidates, params.temperature);
- }
-
- const res = if (params.temperature >= 0) c.llama_sample_token(self.ptr, &candidates) else c.llama_sample_token_greedy(self.ptr, &candidates);
-
- if (self.grammar != null) {
- c.llama_grammar_accept_token(self.ptr, self.grammar, res);
- }
-
- if (params.stop_eos and res == c.llama_token_eos(self.model.ptr)) {
- return null;
- }
-
- return res;
- }
-
- /// Appends a BPE piece to the buffer.
- pub fn appendBPE(buf: *std.ArrayList(u8), piece: []const u8) !void {
- try buf.ensureUnusedCapacity(piece.len);
- var iter = (try std.unicode.Utf8View.init(piece)).iterator();
-
- while (iter.nextCodepoint()) |cp| {
- try buf.append(@intCast(switch (cp) {
- '!'...'~', '¡'...'¬', '®'...'ÿ' => cp,
- 'Ā'...'Ġ' => cp - 256,
- 'ġ'...'ł' => cp - 162,
- 'Ń' => 173,
- else => {
- log.debug("Invalid BPE? {s} cp: {}", .{ piece, cp });
- continue;
- },
- }));
- }
- }
-};
-
-const grammar = struct {
- const JSON_RULES = rulePtrs(&.{
- &.{ ref(1), end(0) },
- &.{ ch('{'), ref(7), ref(11), ch('}'), end(0) }, // ref(7), end(0) },
- &.{ ref(1), alt(0), ref(3), alt(0), ref(4), alt(0), ref(5), alt(0), ref(6), ref(7), end(0) },
- &.{ ch('['), ref(7), ref(15), ch(']'), ref(7), end(0) },
- &.{ ch('"'), ref(18), ch('"'), ref(7), end(0) },
- &.{ ref(19), ref(25), ref(29), ref(7), end(0) },
- &.{ ch('t'), ch('r'), ch('u'), ch('e'), alt(0), ch('f'), ch('a'), ch('l'), ch('s'), ch('e'), alt(0), ch('n'), ch('u'), ch('l'), ch('l'), end(0) },
- &.{ ref(31), end(0) },
- &.{ ref(4), ch(':'), ref(7), ref(2), ref(10), end(0) },
- &.{ ch(','), ref(7), ref(4), ch(':'), ref(7), ref(2), end(0) },
- &.{ ref(9), ref(10), alt(0), end(0) },
- &.{ ref(8), alt(0), end(0) },
- &.{ ref(2), ref(14), end(0) },
- &.{ ch(','), ref(7), ref(2), end(0) },
- &.{ ref(13), ref(14), alt(0), end(0) },
- &.{ ref(12), alt(0), end(0) },
- &.{ chNot('"'), chAlt('\\'), alt(0), ch('\\'), ref(17), end(0) },
- &.{ ch('"'), chAlt('\\'), chAlt('/'), chAlt('b'), chAlt('f'), chAlt('n'), chAlt('r'), chAlt('t'), alt(0), ch('u'), ch('0'), chRnu('9'), chAlt('a'), chRnu('f'), chAlt('A'), chRnu('F'), ch('0'), chRnu('9'), chAlt('a'), chRnu('f'), chAlt('A'), chRnu('F'), ch('0'), chRnu('9'), chAlt('a'), chRnu('f'), chAlt('A'), chRnu('F'), ch('0'), chRnu('9'), chAlt('a'), chRnu('f'), chAlt('A'), chRnu('F'), end(0) },
- &.{ ref(16), ref(18), alt(0), end(0) },
- &.{ ref(20), ref(21), end(0) },
- &.{ ch('-'), alt(0), end(0) },
- &.{ ch('0'), chRnu('9'), alt(0), ch('1'), chRnu('9'), ref(22), end(0) },
- &.{ ch('0'), chRnu('9'), ref(22), alt(0), end(0) },
- &.{ ch('.'), ref(24), end(0) },
- &.{ ch('0'), chRnu('9'), ref(24), alt(0), ch('0'), chRnu('9'), end(0) },
- &.{ ref(23), alt(0), end(0) },
- &.{ ch('e'), chAlt('E'), ref(27), ref(28), end(0) },
- &.{ ch('-'), chAlt('+'), alt(0), end(0) },
- &.{ ch('0'), chRnu('9'), ref(28), alt(0), ch('0'), chRnu('9'), end(0) },
- &.{ ref(26), alt(0), end(0) },
- &.{ ch(' '), chAlt('\u{0009}'), chAlt('\u{000A}'), ref(7), end(0) },
- &.{ ref(30), alt(0), end(0) },
- });
-
- fn rulePtrs(comptime rules: []const []const c.llama_grammar_element) []const [*c]const c.llama_grammar_element {
- var ptrs: [rules.len][*]const c.llama_grammar_element = undefined;
- for (rules, 0..) |rule, i| ptrs[i] = rule.ptr;
- return &ptrs;
- }
-
- fn ref(i: usize) c.llama_grammar_element {
- return .{ .type = c.LLAMA_GRETYPE_RULE_REF, .value = @intCast(i) };
- }
-
- fn end(i: usize) c.llama_grammar_element {
- return .{ .type = c.LLAMA_GRETYPE_END, .value = @intCast(i) };
- }
-
- fn ch(v: u8) c.llama_grammar_element {
- return .{ .type = c.LLAMA_GRETYPE_CHAR, .value = @intCast(v) };
- }
-
- fn chNot(v: u8) c.llama_grammar_element {
- return .{ .type = c.LLAMA_GRETYPE_CHAR_NOT, .value = @intCast(v) };
- }
-
- fn chAlt(v: u8) c.llama_grammar_element {
- return .{ .type = c.LLAMA_GRETYPE_CHAR_ALT, .value = @intCast(v) };
- }
-
- fn chRnu(v: u8) c.llama_grammar_element {
- return .{ .type = c.LLAMA_GRETYPE_CHAR_RNG_UPPER, .value = @intCast(v) };
- }
-
- fn alt(i: usize) c.llama_grammar_element {
- return .{ .type = c.LLAMA_GRETYPE_ALT, .value = @intCast(i) };
- }
-};
diff --git a/src/macos/BuildMacos.zig b/src/macos/BuildMacos.zig
deleted file mode 100644
index def837b..0000000
--- a/src/macos/BuildMacos.zig
+++ /dev/null
@@ -1,99 +0,0 @@
-const std = @import("std");
-const root = @import("../../build.zig");
-const BuildMacos = @This();
-
-pub const Options = struct {
- name: []const u8,
- root_source_file: std.Build.LazyPath,
- target: std.Build.ResolvedTarget,
- optimize: std.builtin.OptimizeMode,
- strip: bool,
-};
-
-owner: *std.Build,
-object: *std.Build.Step.Compile,
-root_module: *std.Build.Module,
-swiftc: *std.Build.Step.Run,
-out: std.Build.LazyPath,
-sdk: []const u8,
-
-pub fn create(owner: *std.Build, options: Options) *BuildMacos {
- const self = owner.allocator.create(@This()) catch @panic("OOM");
-
- const object = owner.addObject(.{
- .name = options.name,
- .root_source_file = options.root_source_file,
- .target = options.target,
- .optimize = options.optimize,
- .strip = options.strip,
- });
- object.bundle_compiler_rt = true;
-
- const swiftc = owner.addSystemCommand(&.{
- "swiftc",
- if (options.optimize == .Debug) "-Onone" else "-O",
- "-import-objc-header",
- "include/ava.h",
- "-lc++",
- "-lsqlite3",
- "-target",
- owner.fmt("{s}-apple-macosx{}", .{ @tagName(options.target.result.cpu.arch), options.target.result.os.version_range.semver.min }),
- "-o",
- });
-
- const out = swiftc.addOutputFileArg(options.name);
-
- swiftc.addArg("-Xlinker");
- swiftc.addFileArg(object.getEmittedBin());
-
- if (options.optimize == .Debug) {
- swiftc.addArgs(&.{ "-D", "DEBUG" });
- }
-
- swiftc.addFileArg(.{ .path = "src/macos/entry.swift" });
- swiftc.addFileArg(.{ .path = "src/macos/webview.swift" });
-
- swiftc.step.dependOn(&object.step);
-
- self.* = .{
- .owner = owner,
- .object = object,
- .root_module = &object.root_module,
- .swiftc = swiftc,
- .out = out,
- .sdk = std.zig.system.darwin.getSdk(owner.allocator, options.target.result) orelse @panic("No suitable SDK found"),
- };
-
- self.applySDK(object);
-
- return self;
-}
-
-pub fn rootModuleTarget(self: *BuildMacos) std.Target {
- return self.object.rootModuleTarget();
-}
-
-pub fn getEmittedBin(self: *BuildMacos) std.Build.LazyPath {
- return self.out;
-}
-
-pub fn addIncludePath(self: *BuildMacos, path: std.Build.LazyPath) void {
- self.object.addIncludePath(path);
-}
-
-pub fn addObject(self: *BuildMacos, object: *std.Build.Step.Compile) void {
- self.swiftc.addArg("-Xlinker");
- self.swiftc.addFileArg(object.getEmittedBin());
-}
-
-pub fn linkFramework(self: *BuildMacos, name: []const u8) void {
- self.object.linkFramework(name);
-}
-
-pub fn applySDK(self: *BuildMacos, step: anytype) void {
- std.log.debug("Using macOS SDK {s} for step {s}", .{ self.sdk, step.name });
-
- step.addSystemIncludePath(.{ .path = self.owner.fmt("{s}/usr/include", .{self.sdk}) });
- step.addFrameworkPath(.{ .path = self.owner.fmt("{s}/System/Library/Frameworks", .{self.sdk}) });
- step.addLibraryPath(.{ .path = self.owner.fmt("{s}/usr/lib", .{self.sdk}) });
-}
diff --git a/src/macos/Info.plist b/src/macos/Info.plist
deleted file mode 100644
index 48ee638..0000000
--- a/src/macos/Info.plist
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- en
- CFBundleExecutable
- ava
- CFBundleIdentifier
- com.avapls.Ava-PLS
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- Ava PLS
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- 1.0
- CFBundleSupportedPlatforms
-
- MacOSX
-
- CFBundleVersion
- 1
- CFBundleIconFile
- favicon.ico
- NSMainNibFile
- MainMenu
- NSPrincipalClass
- NSApplication
-
-
diff --git a/src/macos/create_dmg.sh b/src/macos/create_dmg.sh
deleted file mode 100755
index 610b89e..0000000
--- a/src/macos/create_dmg.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# Variables
-APP_NAME="Ava"
-ZIG_OUT="$(dirname "$0")/../../zig-out"
-APP_PATH="$ZIG_OUT/${APP_NAME}.app"
-DMG_TMP_PATH="$ZIG_OUT/${APP_NAME}_tmp.dmg"
-DMG_FINAL_PATH="$ZIG_OUT/${APP_NAME}_$(date +%Y-%m-%d).dmg"
-
-# Clean
-rm -rf "$ZIG_OUT"
-
-# Build JS, x86_64, aarch64, and universal binary
-npm run build \
-&& zig build -Doptimize=ReleaseSafe -Dtarget=x86_64-macos.12.6 \
-&& zig build -Doptimize=ReleaseSafe -Dtarget=aarch64-macos.12.6 \
-&& lipo -create "$ZIG_OUT/bin/ava_aarch64" "$ZIG_OUT/bin/ava_x86_64" -output "$ZIG_OUT/bin/ava"
-
-if [ $? -ne 0 ]; then
- echo "Build failed"
- exit 1;
-fi
-
-mkdir -p "${APP_PATH}/Contents/MacOS" \
-&& mkdir -p "${APP_PATH}/Contents/Resources" \
-&& cp ./src/macos/Info.plist "${APP_PATH}/Contents/" \
-&& cp "$ZIG_OUT/bin/ava" "${APP_PATH}/Contents/MacOS/" \
-&& cp ./src/app/favicon.ico ./llama.cpp/ggml-metal.metal "${APP_PATH}/Contents/Resources/"
-
-if [ $? -ne 0 ]; then
- echo "Copy failed"
- exit 1;
-fi
-
-# Sign app
-# Note it still needs to be notarized
-codesign -fs "Developer ID Application: KAMIL TOMSIK (RYT4H286GA)" --deep --options=runtime --timestamp "${APP_PATH}"
-
-if [ $? -ne 0 ]; then
- echo "Signing failed"
- exit 1;
-fi
-
-# Create temp DMG and perform some customizations
-# Adapted from https://stackoverflow.com/questions/96882/how-do-i-create-a-nice-looking-dmg-for-mac-os-x-using-command-line-tools
-hdiutil create -srcfolder "${APP_PATH}" -volname "${APP_NAME}" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size 512000k "${DMG_TMP_PATH}"
-MOUNT_RESULT=$(hdiutil attach -readwrite -noverify -noautoopen "${DMG_TMP_PATH}")
-DEVICE_PATH=$(echo "${MOUNT_RESULT}" | egrep '^/dev/' | sed 1q | awk '{print $1}')
-echo '
- tell application "Finder"
- tell disk "'${APP_NAME}'"
- open
- set current view of container window to icon view
- set the bounds of container window to {400, 100, 885, 430}
- set theViewOptions to the icon view options of container window
- set arrangement of theViewOptions to not arranged
- set icon size of theViewOptions to 72
- make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
- set position of item "'${APP_NAME}'" of container window to {100, 100}
- set position of item "Applications" of container window to {375, 100}
- update without registering applications
- delay 5
- close
- end tell
- end tell
-' | osascript
-hdiutil detach "${DEVICE_PATH}"
-
-# Create final DMG
-hdiutil convert "${DMG_TMP_PATH}" -format UDZO -imagekey zlib-level=9 -o "${DMG_FINAL_PATH}"
-rm "${DMG_TMP_PATH}"
-
-echo "DMG created at ${DMG_FINAL_PATH}"
-
-# Notarize (if run with --notarize)
-if [ "$1" != "--notarize" ]; then exit 0; fi
-xcrun notarytool submit --wait --keychain-profile "KAMIL TOMSIK" "${DMG_FINAL_PATH}"
diff --git a/src/macos/entry.swift b/src/macos/entry.swift
deleted file mode 100644
index a1d6d02..0000000
--- a/src/macos/entry.swift
+++ /dev/null
@@ -1,49 +0,0 @@
-import SwiftUI
-
-@main
-struct Main: App {
- @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
- @StateObject var state = AppState.shared
-
- var body: some Scene {
- WindowGroup {
- WebViewContent(url: "http://127.0.0.1:\(state.port)/")
- .frame(
- minWidth: 700, idealWidth: 900,
- minHeight: 480, idealHeight: 800)
- .edgesIgnoringSafeArea(.top)
- }
- .windowStyle(.hiddenTitleBar)
- }
-}
-
-final class AppDelegate: NSObject, NSApplicationDelegate {
- func applicationWillFinishLaunching(_ notification: Notification) {
- NSApp.setActivationPolicy(.regular)
- NSApp.activate(ignoringOtherApps: true)
-
- if (ava_start() != 0 || ava_get_port() < 0) {
- exit(1)
- }
-
- signal(SIGPIPE) { _ in
- // Ignore SIGPIPE which is sent when the client closes the connection (which is normal)
- }
-
- AppState.shared.port = ava_get_port()
- }
-
- func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
- true
- }
-
- func applicationWillTerminate(_ notification: Notification) {
- ava_stop()
- }
-}
-
-final class AppState: ObservableObject {
- static let shared = AppState()
-
- @Published var port: Int32 = -1
-}
diff --git a/src/macos/webview.swift b/src/macos/webview.swift
deleted file mode 100644
index e32c252..0000000
--- a/src/macos/webview.swift
+++ /dev/null
@@ -1,119 +0,0 @@
-import SwiftUI
-import WebKit
-
-struct WebViewContent: View {
- var url: String?
-
- var body: some View {
- (url != nil)
- ?AnyView(WebView(url: url!))
- :AnyView(ProgressView())
- }
-}
-
-struct WebView: NSViewRepresentable {
- var url: String
-
- private let navigationDelegate = NavigationDelegate()
- private let scriptMessageHandler = ScriptMessageHandler()
- private let uiDelegate = WebViewUIDelegate()
-
- func makeNSView(context: Context) -> WKWebView {
- let cfg = WKWebViewConfiguration()
- cfg.userContentController.add(self.scriptMessageHandler, name: "event")
-
- #if DEBUG
- cfg.preferences.setValue(true, forKey: "developerExtrasEnabled")
- #endif
-
- let webview = WKWebView(frame: .zero, configuration: cfg)
- webview.navigationDelegate = self.navigationDelegate
- webview.uiDelegate = self.uiDelegate
-
- DispatchQueue.main.async {
- scriptMessageHandler.window = webview.window
- }
-
- return webview
- }
-
- func updateNSView(_ uiView: WKWebView, context: Context) {
- navigationDelegate.url = url
-
- uiView.load(URLRequest(url: URL(string: url)!))
- }
-}
-
-final class ScriptMessageHandler: NSObject, WKScriptMessageHandler {
- var window: NSWindow!
-
- func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
- switch message.body as? String {
- case "mousedown":
- if !window.styleMask.contains(.fullScreen) {
- window.performDrag(with:NSApp.currentEvent!)
- }
- case "dblclick":
- window.performZoom(nil)
- default:
- break
- }
- }
-}
-
-final class NavigationDelegate: NSObject, WKNavigationDelegate {
- var url: String = ""
-
- func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
- // TODO: Show initial loading indicator until this method is called
- }
-
- func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
- print("Error: \(error)")
- }
-
- func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy)->Void) {
- if let url = navigationAction.request.url?.absoluteString {
- if url.starts(with: "file://") {
- decisionHandler(.cancel)
- } else if url.starts(with: self.url) {
- decisionHandler(.allow)
- } else {
- decisionHandler(.cancel)
- NSWorkspace.shared.open(URL(string: url)!)
- }
- }
- }
-}
-
-final class WebViewUIDelegate: NSObject, WKUIDelegate {
- func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame: WKFrameInfo,
- completionHandler: @escaping (Bool) -> Void) {
- let alert = NSAlert()
- alert.messageText = message
- alert.addButton(withTitle: "OK")
- alert.addButton(withTitle: "Cancel")
- alert.beginSheetModal(for: webView.window!) { response in
- completionHandler(response == .alertFirstButtonReturn)
- }
- }
-
- func webView(_ webView: WKWebView, runJavaScriptTextInputPanelWithPrompt prompt: String, defaultText: String?, initiatedByFrame: WKFrameInfo,
- completionHandler: @escaping (String?) -> Void) {
- let textField = NSTextField(frame: NSRect(x: 0, y: 0, width: 300, height: 24))
- textField.stringValue = defaultText ?? ""
- let alert = NSAlert()
- alert.messageText = prompt
- alert.accessoryView = textField
- alert.addButton(withTitle: "OK")
- alert.addButton(withTitle: "Cancel")
- alert.beginSheetModal(for: webView.window!) { response in
- if response == .alertFirstButtonReturn {
- completionHandler(textField.stringValue)
- } else {
- completionHandler(nil)
- }
- }
- alert.window.makeFirstResponder(textField)
- }
-}
\ No newline at end of file
diff --git a/src/main.zig b/src/main.zig
deleted file mode 100644
index 74e2f31..0000000
--- a/src/main.zig
+++ /dev/null
@@ -1,53 +0,0 @@
-const builtin = @import("builtin");
-const std = @import("std");
-const db = @import("db.zig");
-const llama = @import("llama.zig");
-const Server = @import("server.zig").Server;
-const util = @import("util.zig");
-
-var gpa = std.heap.GeneralPurposeAllocator(.{}){};
-const allocator = if (builtin.mode == .Debug) gpa.allocator() else std.heap.c_allocator;
-
-pub var server: ?*Server = null;
-
-pub const std_options = struct {
- pub const log_level = .debug;
- pub const logFn = util.Logger.log;
-};
-
-pub fn start() !void {
- if (server != null) {
- return error.ServerAlreadyStarted;
- }
-
- llama.init(allocator);
- try db.init(allocator);
-
- server = try Server.start(allocator, "127.0.0.1", 3002);
-}
-
-pub export fn ava_start() c_int {
- start() catch |e| {
- std.log.err("Unexpected error: {}", .{e});
- return 1;
- };
-
- server.?.thread.detach();
-
- return 0;
-}
-
-pub export fn ava_get_port() c_int {
- return if (server == null) -1 else server.?.http.socket.listen_address.getPort();
-}
-
-pub export fn ava_stop() c_int {
- if (server == null) return 1;
-
- server.?.deinit();
- db.deinit();
- llama.deinit();
- if (builtin.mode == .Debug) _ = gpa.deinit();
- server = null;
- return 0;
-}
diff --git a/src/server.zig b/src/server.zig
deleted file mode 100644
index 3711559..0000000
--- a/src/server.zig
+++ /dev/null
@@ -1,304 +0,0 @@
-const std = @import("std");
-const builtin = @import("builtin");
-const api = @import("api.zig");
-const log = std.log.scoped(.server);
-
-/// A context for handling a request.
-pub const Context = struct {
- arena: std.mem.Allocator,
- res: std.http.Server.Response,
- path: []const u8,
- query: ?[]const u8,
-
- pub fn deinit(self: *Context) void {
- _ = self.res.reset();
- self.res.deinit();
-
- var arena: *std.heap.ArenaAllocator = @ptrCast(@alignCast(self.arena.ptr));
- arena.deinit();
- arena.child_allocator.destroy(arena);
- }
-
- pub fn match(self: *const Context, pattern: []const u8) ?Params {
- return Params.match(pattern, self.path);
- }
-
- pub fn router(self: *Context, comptime routes: type) !void {
- inline for (@typeInfo(routes).Struct.decls) |d| {
- const method = comptime d.name[0 .. std.mem.indexOfScalar(u8, d.name, ' ') orelse unreachable];
- const pattern = d.name[method.len + 1 ..];
-
- if (self.res.request.method == @field(std.http.Method, method)) {
- if (self.match(pattern)) |params| {
- const handler = comptime @field(api, d.name);
-
- var args: std.meta.ArgsTuple(@TypeOf(handler)) = undefined;
- args[0] = self;
- inline for (1..args.len) |i| {
- const V = @TypeOf(args[i]);
- args[i] = try if (comptime @typeInfo(V) == .Struct) self.readJson(V) else params.get(i - 1, V);
- }
-
- return @call(.auto, handler, args);
- }
- }
- }
-
- return error.NotFound;
- }
-
- /// Reads the request body as JSON.
- pub fn readJson(self: *Context, comptime T: type) !T {
- var reader = std.json.reader(self.arena, self.res.reader());
-
- return std.json.parseFromTokenSourceLeaky(
- T,
- self.arena,
- &reader,
- .{ .ignore_unknown_fields = true },
- );
- }
-
- /// Sends a chunk of data. Automatically sets the transfer encoding to
- /// chunked if it hasn't been set yet.
- pub fn sendChunk(self: *Context, chunk: []const u8) !void {
- if (self.res.state == .waited) {
- self.res.transfer_encoding = .chunked;
- try self.res.send();
- }
-
- // Response.write() will always write all of the data when the transfer
- // encoding is chunked
- _ = try self.res.write(chunk);
- }
-
- /// Sends a chunk of JSON. The chunk always ends with a newline.
- /// Supports values, slices and iterators.
- pub fn sendJson(self: *Context, body: anytype) !void {
- if (self.res.state == .waited) {
- try self.res.headers.append("Content-Type", "application/json");
- }
-
- var list = std.ArrayList(u8).init(self.arena);
- var writer = list.writer();
- defer list.deinit();
-
- if (comptime std.meta.hasFn(@TypeOf(body), "next")) {
- var copy = body;
- var i: usize = 0;
-
- try writer.writeAll("[");
- while (try copy.next()) |item| : (i += 1) {
- if (i != 0) try writer.writeAll(",");
- try std.json.stringify(item, .{}, writer);
- }
- try writer.writeAll("]");
- } else {
- try std.json.stringify(body, .{}, writer);
- }
-
- try list.appendSlice("\r\n");
- try self.sendChunk(list.items);
- }
-
- /// Sends a static resource. The resource is embedded in release builds.
- pub fn sendResource(self: *Context, comptime path: []const u8) !void {
- try self.res.headers.append("Content-Type", comptime mime(std.fs.path.extension(path)) ++ "; charset=utf-8");
- try self.noCache();
-
- try self.sendChunk(if (comptime builtin.mode != .Debug) @embedFile("../" ++ path) else blk: {
- var f = try std.fs.cwd().openFile(path, .{});
- defer f.close();
- break :blk try f.readToEndAlloc(self.arena, std.math.maxInt(usize));
- });
- }
-
- /// Sends an empty response.
- pub fn noContent(self: *Context) !void {
- self.res.status = .no_content;
- try self.res.send();
- }
-
- /// Adds no-cache headers to the response.
- pub fn noCache(self: *Context) !void {
- try self.res.headers.append("Cache-Control", "no-cache, no-store, must-revalidate");
- try self.res.headers.append("Pragma", "no-cache");
- try self.res.headers.append("Expires", "0");
- }
-};
-
-/// An instance of our HTTP server.
-pub const Server = struct {
- allocator: std.mem.Allocator,
- http: std.http.Server,
- thread: std.Thread,
- status: std.atomic.Value(enum(u8) { starting, started, stopping, stopped }) = .{ .raw = .starting },
-
- pub fn start(allocator: std.mem.Allocator, hostname: []const u8, port: u16) !*Server {
- const self = try allocator.create(Server);
- errdefer allocator.destroy(self);
-
- var http = std.http.Server.init(.{ .reuse_address = true });
- errdefer http.deinit();
-
- const address = try std.net.Address.parseIp(hostname, port);
- try http.listen(address);
-
- self.* = .{
- .allocator = allocator,
- .http = http,
- .thread = try std.Thread.spawn(.{}, run, .{self}),
- };
-
- return self;
- }
-
- pub fn deinit(self: *Server) void {
- self.status.store(.stopping, .Release);
-
- if (std.net.tcpConnectToAddress(self.http.socket.listen_address)) |conn| {
- conn.close();
- } else |e| log.err("stop err: {}", .{e});
-
- while (self.status.load(.Acquire) == .stopping) {
- std.time.sleep(100_000_000);
- }
-
- self.http.deinit();
- self.allocator.destroy(self);
- }
-
- fn run(self: *Server) !void {
- self.status.store(.started, .Release);
- defer self.status.store(.stopped, .Release);
-
- while (self.status.load(.Acquire) == .started) {
- // accidental moving/copying would invalidate pointers inside
- var arena = try self.allocator.create(std.heap.ArenaAllocator);
- errdefer self.allocator.destroy(arena);
- arena.* = std.heap.ArenaAllocator.init(self.allocator);
- errdefer arena.deinit();
-
- const res = try self.http.accept(.{
- .allocator = arena.allocator(),
- .header_strategy = .{ .dynamic = 10_000 },
- });
-
- // Sent from Server.deinit() to awake the thread
- if (self.status.load(.Acquire) == .stopping) return;
-
- var thread = try std.Thread.spawn(.{}, runInThread, .{res});
- thread.detach();
- }
- }
-
- fn runInThread(res: std.http.Server.Response) !void {
- var ctx = Context{
- .arena = res.allocator,
- .res = res,
- .path = undefined,
- .query = undefined,
- };
- defer ctx.deinit();
-
- // Keep it simple
- try ctx.res.headers.append("Connection", "close");
-
- // Wait for the request to be fully read
- try ctx.res.wait();
- const uri = try std.Uri.parseWithoutScheme(ctx.res.request.target);
- ctx.path = uri.path;
- ctx.query = uri.query;
-
- defer {
- if (ctx.res.state == .waited) ctx.res.send() catch {};
- ctx.res.finish() catch {};
- log.debug("{s} {s} {}", .{ @tagName(ctx.res.request.method), ctx.res.request.target, @intFromEnum(ctx.res.status) });
- }
-
- handleRequest(&ctx) catch |e| {
- if (e == error.OutOfMemory) return e;
-
- log.debug("handleRequest: {}", .{e});
-
- ctx.res.status = switch (e) {
- error.NotFound => .not_found,
- else => .internal_server_error,
- };
-
- ctx.sendJson(.{ .@"error" = e }) catch {};
- };
- }
-
- fn handleRequest(ctx: *Context) anyerror!void {
- // handle API requests
- if (ctx.match("/api/*")) |_| {
- ctx.path = ctx.path[4..];
- return ctx.router(api);
- }
-
- // TODO: should be .get() but it's not implemented yet
- if (ctx.match("/LICENSE.md")) |_| return ctx.sendResource("LICENSE.md");
- if (ctx.match("/favicon.ico")) |_| return ctx.sendResource("src/app/favicon.ico");
- if (ctx.match("/app.js")) |_| return ctx.sendResource("zig-out/app/main.js");
-
- // disable source maps in production
- if (ctx.match("*.map")) |_| return ctx.sendChunk("{}");
-
- // HTML5 fallback
- try ctx.sendResource("src/app/index.html");
- }
-};
-
-const Params = struct {
- matches: [16][]const u8 = undefined,
- len: usize = 0,
-
- fn match(pattern: []const u8, path: []const u8) ?Params {
- var res = Params{};
- var pattern_parts = std.mem.tokenizeScalar(u8, pattern, '/');
- var path_parts = std.mem.tokenizeScalar(u8, path, '/');
-
- while (true) {
- const pat = pattern_parts.next() orelse return if (pattern[pattern.len - 1] == '*' or path_parts.next() == null) res else null;
- const pth = path_parts.next() orelse return null;
- const dynamic = pat[0] == ':' or pat[0] == '*';
-
- if (std.mem.indexOfScalar(u8, pat, '.')) |i| {
- const j = (if (dynamic) std.mem.lastIndexOfScalar(u8, pth, '.') else std.mem.indexOfScalar(u8, pth, '.')) orelse return null;
-
- if (match(pat[i + 1 ..], pth[j + 1 ..])) |ch| {
- for (ch.matches, res.len..) |s, l| res.matches[l] = s;
- res.len += ch.len;
- } else return null;
- }
-
- if (!dynamic and !std.mem.eql(u8, pat, pth)) return null;
-
- if (pat[0] == ':') {
- res.matches[res.len] = pth;
- res.len += 1;
- }
- }
- }
-
- fn get(self: *const Params, index: usize, comptime T: type) !T {
- const s = if (index < self.len) self.matches[index] else return error.NoMatch;
-
- return switch (@typeInfo(T)) {
- .Int => std.fmt.parseInt(T, s, 10),
- else => s,
- };
- }
-};
-
-fn mime(comptime ext: []const u8) []const u8 {
- const mime_types = std.ComptimeStringMap([]const u8, .{
- .{ ".html", "text/html" },
- .{ ".css", "text/css" },
- .{ ".js", "text/javascript" },
- .{ ".md", "text/markdown" },
- });
-
- return mime_types.get(ext) orelse "application/octet-stream";
-}
diff --git a/src/util.zig b/src/util.zig
deleted file mode 100644
index bd081e1..0000000
--- a/src/util.zig
+++ /dev/null
@@ -1,82 +0,0 @@
-const builtin = @import("builtin");
-const std = @import("std");
-
-pub fn getHome(allocator: std.mem.Allocator) ![]const u8 {
- return std.fs.getAppDataDir(allocator, "AvaPLS");
-}
-
-pub fn getHomePath(allocator: std.mem.Allocator, paths: []const []const u8) ![:0]const u8 {
- const home = try getHome(allocator);
- defer allocator.free(home);
-
- const arr = try allocator.alloc([]const u8, paths.len + 1);
- defer allocator.free(arr);
- arr[0] = home;
- for (paths, 1..) |p, i| arr[i] = p;
-
- return std.fs.path.joinZ(allocator, arr);
-}
-
-pub fn getWritableHomePath(allocator: std.mem.Allocator, paths: []const []const u8) ![:0]const u8 {
- const res = try getHomePath(allocator, paths);
- std.fs.makeDirAbsolute(std.fs.path.dirname(res).?) catch {};
-
- return res;
-}
-
-pub fn getFileSize(path: []const u8) !u64 {
- const file = try std.fs.openFileAbsolute(path, .{ .mode = .read_only });
- defer file.close();
-
- return (try file.stat()).size;
-}
-
-pub const Logger = struct {
- var mutex: std.Thread.Mutex = .{};
- var file: ?std.fs.File = null;
-
- const PATH = &.{"log.txt"};
-
- fn writer() std.fs.File.Writer {
- if (file == null) {
- if (comptime builtin.mode == .Debug) {
- file = std.io.getStdErr();
- } else {
- const path = getWritableHomePath(std.heap.page_allocator, PATH) catch @panic("Failed to get log path");
- var f = std.fs.createFileAbsolute(path, .{ .read = true }) catch @panic("Failed to open log file");
- f.setEndPos(0) catch {};
-
- file = f;
- }
- }
-
- return file.?.writer();
- }
-
- pub fn log(
- comptime level: std.log.Level,
- comptime scope: @Type(.EnumLiteral),
- comptime format: []const u8,
- args: anytype,
- ) void {
- mutex.lock();
- defer mutex.unlock();
-
- const t = @mod(@as(u64, @intCast(std.time.timestamp())), 86_400);
- const s = @mod(t, 60);
- const m = @divTrunc(@mod(t, 3_600), 60);
- const h = @divTrunc(t, 3_600);
-
- writer().print("{:0>2}:{:0>2}:{:0>2} " ++ level.asText() ++ " " ++ @tagName(scope) ++ ": " ++ format ++ "\n", .{ h, m, s } ++ args) catch return;
- }
-
- pub fn dump(allocator: std.mem.Allocator) ![]const u8 {
- const path = try getHomePath(allocator, PATH);
- defer allocator.free(path);
-
- var f = try std.fs.openFileAbsolute(path, .{});
- defer f.close();
-
- return f.readToEndAlloc(allocator, std.math.maxInt(usize));
- }
-};
diff --git a/src/windows/BuildWindows.zig b/src/windows/BuildWindows.zig
deleted file mode 100644
index 2b0f6bd..0000000
--- a/src/windows/BuildWindows.zig
+++ /dev/null
@@ -1,39 +0,0 @@
-const std = @import("std");
-
-pub const Options = struct {
- name: []const u8,
- root_source_file: std.Build.LazyPath,
- target: std.Build.ResolvedTarget,
- optimize: std.builtin.OptimizeMode,
- strip: bool,
-};
-
-pub fn create(owner: *std.Build, options: Options) *std.Build.Step.Compile {
- const download_deps = owner.addSystemCommand(&.{ "bash", "src/windows/download_deps.sh" });
- download_deps.has_side_effects = true;
-
- const exe = owner.addExecutable(.{
- .name = options.name,
- .root_source_file = options.root_source_file,
- .target = options.target,
- .optimize = options.optimize,
- .strip = options.strip,
- .win32_manifest = .{ .path = "src/windows/winmain.manifest" },
- });
-
- if (options.optimize != .Debug) {
- exe.subsystem = .Windows;
- }
-
- exe.addIncludePath(.{ .path = "include" });
- exe.linkSystemLibrary("ole32");
- exe.linkSystemLibrary("ws2_32");
- exe.linkSystemLibrary("crypt32");
-
- exe.addLibraryPath(.{ .path = "zig-out/webview2_loader/x64" });
- exe.linkSystemLibrary("WebView2Loader.dll");
-
- exe.step.dependOn(&download_deps.step);
-
- return exe;
-}
diff --git a/src/windows/amazon1.cer b/src/windows/amazon1.cer
deleted file mode 100644
index 86b7dcd..0000000
Binary files a/src/windows/amazon1.cer and /dev/null differ
diff --git a/src/windows/com.zig b/src/windows/com.zig
deleted file mode 100644
index f2a183d..0000000
--- a/src/windows/com.zig
+++ /dev/null
@@ -1,196 +0,0 @@
-const std = @import("std");
-const c = struct {
- usingnamespace std.os.windows;
-
- extern "ole32" fn CoTaskMemFree(pv: c.LPVOID) callconv(c.WINAPI) void;
- extern "ole32" fn CoUninitialize() callconv(c.WINAPI) void;
- extern "ole32" fn CoGetCurrentProcess() callconv(c.WINAPI) c.DWORD;
- extern "ole32" fn CoInitialize(pvReserved: ?c.LPVOID) callconv(c.WINAPI) c.HRESULT;
- extern "ole32" fn CoInitializeEx(pvReserved: ?c.LPVOID, dwCoInit: c.DWORD) callconv(c.WINAPI) c.HRESULT;
-};
-
-pub const ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler = Object(extern struct {
- Invoke: *const fn (self: *ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler, res: c.HRESULT, env: *ICoreWebView2Environment) callconv(c.WINAPI) c.HRESULT,
-});
-
-pub const ICoreWebView2Environment = Object(extern struct {
- CreateCoreWebView2Controller: *const fn (self: *ICoreWebView2Environment, parentWin: c.HWND, handler: *ICoreWebView2CreateCoreWebView2ControllerCompletedHandler) callconv(c.WINAPI) c.HRESULT,
-});
-
-pub const ICoreWebView2CreateCoreWebView2ControllerCompletedHandler = Object(extern struct {
- Invoke: *const fn (self: *ICoreWebView2CreateCoreWebView2ControllerCompletedHandler, res: c.HRESULT, ctrl: *ICoreWebView2Controller) callconv(c.WINAPI) c.HRESULT,
-});
-
-pub const ICoreWebView2Controller = Object(extern struct {
- get_IsVisible: *const anyopaque,
- put_IsVisible: *const anyopaque,
- get_Bounds: *const anyopaque,
- put_Bounds: *const fn (self: *ICoreWebView2Controller, bounds: c.RECT) callconv(c.WINAPI) c.HRESULT,
- get_ZoomFactor: *const anyopaque,
- put_ZoomFactor: *const anyopaque,
- add_ZoomFactorChanged: *const anyopaque,
- remove_ZoomFactorChanged: *const anyopaque,
- SetBoundsAndZoomFactor: *const anyopaque,
- MoveFocus: *const anyopaque,
- add_MoveFocusRequested: *const anyopaque,
- remove_MoveFocusRequested: *const anyopaque,
- add_GotFocus: *const anyopaque,
- remove_GotFocus: *const anyopaque,
- add_LostFocus: *const anyopaque,
- remove_LostFocus: *const anyopaque,
- add_AcceleratorKeyPressed: *const anyopaque,
- remove_AcceleratorKeyPressed: *const anyopaque,
- get_ParentWindow: *const anyopaque,
- put_ParentWindow: *const anyopaque,
- NotifyParentWindowPositionChanged: *const anyopaque,
- Close: *const anyopaque,
- get_CoreWebView2: *const fn (self: *ICoreWebView2Controller, webview: **ICoreWebView2) callconv(c.WINAPI) c.HRESULT,
-});
-
-pub const ICoreWebView2 = Object(extern struct {
- get_Settings: *const fn (self: *ICoreWebView2, settings: **ICoreWebView2Settings) callconv(c.WINAPI) c.HRESULT,
- get_Source: *const anyopaque,
- Navigate: *const fn (self: *ICoreWebView2, uri: [*:0]const u16) callconv(c.WINAPI) c.HRESULT,
- NavigateToString: *const anyopaque,
- add_NavigationStarting: *const anyopaque,
- remove_NavigationStarting: *const anyopaque,
- add_ContentLoading: *const anyopaque,
- remove_ContentLoading: *const anyopaque,
- add_SourceChanged: *const anyopaque,
- remove_SourceChanged: *const anyopaque,
- add_HistoryChanged: *const anyopaque,
- remove_HistoryChanged: *const anyopaque,
- add_NavigationCompleted: *const anyopaque,
- remove_NavigationCompleted: *const anyopaque,
- add_FrameNavigationStarting: *const anyopaque,
- remove_FrameNavigationStarting: *const anyopaque,
- add_FrameNavigationCompleted: *const anyopaque,
- remove_FrameNavigationCompleted: *const anyopaque,
- add_ScriptDialogOpening: *const anyopaque,
- remove_ScriptDialogOpening: *const anyopaque,
- add_PermissionRequested: *const anyopaque,
- remove_PermissionRequested: *const anyopaque,
- add_ProcessFailed: *const anyopaque,
- remove_ProcessFailed: *const anyopaque,
- AddScriptToExecuteOnDocumentCreated: *const anyopaque,
- RemoveScriptToExecuteOnDocumentCreated: *const anyopaque,
- ExecuteScript: *const anyopaque,
- CapturePreview: *const anyopaque,
- Reload: *const anyopaque,
- PostWebMessageAsJson: *const anyopaque,
- PostWebMessageAsString: *const anyopaque,
- add_WebMessageReceived: *const anyopaque,
- remove_WebMessageReceived: *const anyopaque,
- CallDevToolsProtocolMethod: *const anyopaque,
- get_BrowserProcessId: *const anyopaque,
- get_CanGoBack: *const anyopaque,
- get_CanGoForward: *const anyopaque,
- GoBack: *const anyopaque,
- GoForward: *const anyopaque,
- GetDevToolsProtocolEventReceiver: *const anyopaque,
- Stop: *const anyopaque,
- add_NewWindowRequested: *const anyopaque,
- remove_NewWindowRequested: *const anyopaque,
- add_DocumentTitleChanged: *const anyopaque,
- remove_DocumentTitleChanged: *const anyopaque,
- get_DocumentTitle: *const anyopaque,
- AddHostObjectToScript: *const anyopaque,
- RemoveHostObjectFromScript: *const anyopaque,
- OpenDevToolsWindow: *const anyopaque,
- add_ContainsFullScreenElementChanged: *const anyopaque,
- remove_ContainsFullScreenElementChanged: *const anyopaque,
- get_ContainsFullScreenElement: *const anyopaque,
- add_WebResourceRequested: *const anyopaque,
- remove_WebResourceRequested: *const anyopaque,
- AddWebResourceRequestedFilter: *const anyopaque,
- RemoveWebResourceRequestedFilter: *const anyopaque,
- add_WindowCloseRequested: *const anyopaque,
- remove_WindowCloseRequested: *const anyopaque,
-});
-
-pub const ICoreWebView2Settings = Object(extern struct {
- get_IsScriptEnabled: *const anyopaque,
- put_IsScriptEnabled: *const anyopaque,
- get_IsWebMessageEnabled: *const anyopaque,
- put_IsWebMessageEnabled: *const anyopaque,
- get_AreDefaultScriptDialogsEnabled: *const anyopaque,
- put_AreDefaultScriptDialogsEnabled: *const anyopaque,
- get_IsStatusBarEnabled: *const anyopaque,
- put_IsStatusBarEnabled: *const anyopaque,
- get_AreDevToolsEnabled: *const anyopaque,
- put_AreDevToolsEnabled: *const fn (self: *ICoreWebView2Settings, value: c.BOOL) callconv(c.WINAPI) c.HRESULT,
- get_AreDefaultContextMenusEnabled: *const anyopaque,
- put_AreDefaultContextMenusEnabled: *const anyopaque,
- get_AreHostObjectsAllowed: *const anyopaque,
- put_AreHostObjectsAllowed: *const anyopaque,
- get_IsZoomControlEnabled: *const anyopaque,
- put_IsZoomControlEnabled: *const anyopaque,
- get_IsBuiltInErrorPageEnabled: *const anyopaque,
- put_IsBuiltInErrorPageEnabled: *const anyopaque,
-});
-
-pub fn Object(comptime T: type) type {
- return extern struct {
- const Self = @This();
-
- pub const Inner = T;
-
- pub const VTable = extern struct {
- QueryInterface: *const anyopaque,
- AddRef: *const fn (self: *Self) callconv(c.WINAPI) c.ULONG,
- Release: *const fn (self: *Self) callconv(c.WINAPI) c.ULONG,
- inner: T,
- };
-
- vtable: *const VTable,
-
- pub fn AddRef(self: *Self) c.ULONG {
- return self.vtable.AddRef(self);
- }
-
- pub fn Release(self: *Self) c.ULONG {
- return self.vtable.Release(self);
- }
-
- pub fn call(self: *Self, comptime fun: @TypeOf(.EnumLiteral), args: anytype) c.HRESULT {
- const res: c.HRESULT = @call(.auto, @field(self.vtable.inner, @tagName(fun)), .{self} ++ args);
-
- if (res != c.S_OK) {
- std.log.err("Failed to call COM function {s} with error {d}\n", .{ @tagName(fun), res });
- return res;
- }
-
- return res;
- }
- };
-}
-
-pub fn Callback(comptime T: type, comptime F: std.meta.FieldType(T.Inner, .Invoke)) *T {
- // I think this might be enough, because we only support "static" callbacks
- const Helper = struct {
- var STATIC: T = .{
- .vtable = &.{
- .QueryInterface = QueryInterface,
- .AddRef = AddRef,
- .Release = Release,
- .inner = .{ .Invoke = F },
- },
- };
-
- pub fn QueryInterface(_: *anyopaque, _: *const c.GUID, _: **anyopaque) callconv(c.WINAPI) c.HRESULT {
- return c.S_OK;
- }
-
- pub fn AddRef(_: *T) callconv(c.WINAPI) c.ULONG {
- return 1;
- }
-
- pub fn Release(_: *T) callconv(c.WINAPI) c.ULONG {
- return 1;
- }
- };
-
- return &Helper.STATIC;
-}
-
-extern "ole32" fn CoCreateInstance(rclsid: ?*const c.GUID, pUnkOuter: ?*anyopaque, dwClsContext: c.DWORD, riid: ?*const c.GUID, ppv: **anyopaque) callconv(c.WINAPI) c.HRESULT;
diff --git a/src/windows/create_zip.sh b/src/windows/create_zip.sh
deleted file mode 100755
index 3edc558..0000000
--- a/src/windows/create_zip.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-ZIG_OUT="$(dirname "$0")/../../zig-out"
-ZIP_FILE="$ZIG_OUT/ava_x86_64_$(date +%Y-%m-%d).zip"
-
-# Clean
-rm -rf "$ZIG_OUT"
-
-# Build JS, x86_64
-npm run build \
-&& zig build -Doptimize=ReleaseSafe -Dtarget=x86_64-windows
-
-if [ $? -ne 0 ]; then
- echo "Build failed"
- exit 1;
-fi
-
-# Create zip
-zip -j -9 "$ZIP_FILE" "$ZIG_OUT/bin/ava_x86_64.exe" "$ZIG_OUT/webview2_loader/x64/WebView2Loader.dll"
-
-if [ $? -ne 0 ]; then
- echo "Zip failed"
- exit 1;
-fi
-
-echo "Created $ZIP_FILE"
diff --git a/src/windows/download_deps.sh b/src/windows/download_deps.sh
deleted file mode 100755
index 124b160..0000000
--- a/src/windows/download_deps.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# This script downloads the dependencies for the Windows build.
-# It is called automatically by the `zig build` command.
-
-ZIG_OUT="$(dirname "$0")/../../zig-out"
-WEBVIEW_LOADER="$ZIG_OUT/webview2_loader"
-SQLITE="$ZIG_OUT/sqlite"
-
-if (test -d "$WEBVIEW_LOADER"); then
- echo "WebView2Loader found in $WEBVIEW_LOADER"
-else
- echo "Downloading WebView2Loader to $WEBVIEW_LOADER"
- mkdir -p $WEBVIEW_LOADER
- curl -sSL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2" | tar -xf - -C $WEBVIEW_LOADER --strip-components=2 "build/native/include" "build/native/x64"
-fi
diff --git a/src/windows/util.h b/src/windows/util.h
deleted file mode 100644
index e9ee3b9..0000000
--- a/src/windows/util.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Do one tick of the message loop
-int tick() {
- MSG msg;
- if (GetMessage(&msg, NULL, 0, 0) > 0) {
- TranslateMessage(&msg);
- DispatchMessage(&msg);
-
- return (msg.message == WM_QUIT) ? 0 : 1;
- } else {
- return 0;
- }
-}
-
-// Show a message box with an error message
-int ShowError(LPCTSTR msg) {
- MessageBox(NULL, msg, _T("Error"), NULL);
- return 1;
-}
-
-// COM wrapper for a callback
-template
-class Callback : public T {
-public:
- Callback(std::function fun): m_fun(fun) {}
-
- STDMETHODIMP QueryInterface(REFIID riid, void** ppv) {
- // TODO: check riid
- *ppv = static_cast(this);
- AddRef();
- return S_OK;
- }
-
- STDMETHODIMP_(ULONG) AddRef() {
- return InterlockedIncrement(&m_refCount);
- }
-
- STDMETHODIMP_(ULONG) Release() {
- ULONG refCount = InterlockedDecrement(&m_refCount);
- if (refCount == 0) delete this;
- return refCount;
- }
-
- STDMETHODIMP_(HRESULT) Invoke(A a, B b) {
- return m_fun(a, b);
- }
-
- T* Get() {
- return static_cast(this);
- }
-
-private:
- ULONG m_refCount = 1;
- std::function m_fun;
-};
-
diff --git a/src/windows/winmain.manifest b/src/windows/winmain.manifest
deleted file mode 100644
index 352c226..0000000
--- a/src/windows/winmain.manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
- system, unaware
-
-
-
diff --git a/src/windows/winmain.zig b/src/windows/winmain.zig
deleted file mode 100644
index a39b555..0000000
--- a/src/windows/winmain.zig
+++ /dev/null
@@ -1,217 +0,0 @@
-const std = @import("std");
-const com = @import("com.zig");
-const util = @import("../util.zig");
-const L = std.unicode.utf8ToUtf16LeStringLiteral;
-const c = struct {
- usingnamespace std.os.windows;
- usingnamespace std.os.windows.kernel32;
-
- usingnamespace @cImport({
- @cInclude("ava.h");
- });
-
- const WNDCLASSEXW = extern struct { cbSize: c.UINT = @sizeOf(WNDCLASSEXW), style: c.UINT, lpfnWndProc: WNDPROC, cbClsExtra: i32 = 0, cbWndExtra: i32 = 0, hInstance: c.HINSTANCE, hIcon: ?c.HICON, hCursor: ?c.HCURSOR, hbrBackground: ?c.HBRUSH, lpszMenuName: ?[*:0]const u16, lpszClassName: [*:0]const u16, hIconSm: ?c.HICON };
- const MSG = extern struct { hWnd: ?c.HWND, message: c.UINT, wParam: c.WPARAM, lParam: c.LPARAM, time: c.DWORD, pt: c.POINT, lPrivate: c.DWORD };
- const WNDPROC = *const fn (hwnd: c.HWND, uMsg: c.UINT, wParam: c.WPARAM, lParam: c.LPARAM) callconv(c.WINAPI) c.LRESULT;
- const WS_OVERLAPPEDWINDOW = 0xcf0000;
- const CW_USEDEFAULT: i32 = @bitCast(@as(u32, 0x80000000));
- const SW_SHOW = 5;
- const WM_QUIT = 0x0012;
- const WM_DESTROY = 0x0002;
- const WM_SIZE = 0x0005;
- const WM_PAINT = 0x000F;
- const MB_OK = 0x00000000;
- const PAINTSTRUCT = extern struct { hdc: ?c.HDC, fErase: c.BOOL, rcPaint: c.RECT, fRestore: c.BOOL, fIncUpdate: c.BOOL, rgbReserved: [32]u8 };
- extern "user32" fn PostQuitMessage(nExitCode: i32) callconv(c.WINAPI) void;
- extern "user32" fn MessageBoxA(hWnd: ?c.HWND, lpText: [*:0]const u8, lpCaption: [*:0]const u8, uType: c.UINT) callconv(c.WINAPI) c.INT;
- extern "user32" fn DefWindowProcW(hWnd: c.HWND, Msg: c.UINT, wParam: c.WPARAM, lParam: c.LPARAM) callconv(c.WINAPI) c.LRESULT;
- extern "user32" fn GetMessageW(lpMsg: *c.MSG, hWnd: ?c.HWND, wMsgFilterMin: c.UINT, wMsgFilterMax: c.UINT) callconv(c.WINAPI) c.BOOL;
- extern "user32" fn TranslateMessage(lpMsg: *c.MSG) callconv(c.WINAPI) c.BOOL;
- extern "user32" fn DispatchMessageW(lpMsg: *c.MSG) callconv(c.WINAPI) c.LRESULT;
- extern "user32" fn RegisterClassExW(*const WNDCLASSEXW) callconv(c.WINAPI) c.ATOM;
- extern "user32" fn CreateWindowExW(dwExStyle: c.DWORD, lpClassName: [*:0]const u16, lpWindowName: [*:0]const u16, dwStyle: c.DWORD, X: i32, Y: i32, nWidth: i32, nHeight: i32, hWindParent: ?c.HWND, hMenu: ?c.HMENU, hInstance: c.HINSTANCE, lpParam: ?c.LPVOID) callconv(c.WINAPI) ?c.HWND;
- extern "user32" fn ShowWindow(hWnd: c.HWND, nCmdShow: i32) callconv(c.WINAPI) c.BOOL;
- extern "user32" fn UpdateWindow(hWnd: c.HWND) callconv(c.WINAPI) c.BOOL;
- extern "user32" fn GetClientRect(hWnd: ?c.HWND, lpRect: ?*c.RECT) callconv(c.WINAPI) c.BOOL;
- extern "user32" fn GetUpdateRect(hWnd: ?c.HWND, lpRect: ?*c.RECT, erase: c.BOOL) callconv(c.WINAPI) c.BOOL;
- extern "user32" fn BeginPaint(hWnd: ?c.HWND, lpPaint: ?*c.PAINTSTRUCT) callconv(c.WINAPI) c.HDC;
- extern "user32" fn DrawTextA(hdc: ?c.HDC, lpchText: [*:0]const u8, cchText: i32, lprc: ?*c.RECT, format: u32) callconv(c.WINAPI) i32;
- extern "user32" fn EndPaint(hWnd: ?c.HWND, lpPaint: ?*c.PAINTSTRUCT) callconv(c.WINAPI) c.BOOL;
- extern "WebView2Loader.dll" fn CreateCoreWebView2EnvironmentWithOptions(browser_folder: ?c.PCWSTR, data_folder: ?c.PCWSTR, options: ?*anyopaque, handler: *com.ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler) callconv(c.WINAPI) c.HRESULT;
-};
-const allocator = std.heap.page_allocator;
-
-// Globals
-var window: c.HWND = undefined;
-var webview: *com.ICoreWebView2 = undefined;
-var controller: *com.ICoreWebView2Controller = undefined;
-var webview_initialized = std.atomic.Value(bool).init(false);
-
-pub fn main() !u8 {
- errdefer |e| showError(e);
-
- std.log.debug("Starting the server", .{});
- if (c.ava_start() > 0) return error.FailedToStartServer;
-
- std.log.debug("Creating the window", .{});
- try createWindow();
-
- std.log.debug("Creating the webview", .{});
- try createWebView();
-
- std.log.debug("Navigating to the webui", .{});
- // TODO: ava_port()
- _ = webview.call(.Navigate, .{L("http://127.0.0.1:3002")});
-
- std.log.debug("Entering the main loop", .{});
- while (tick() > 0) {}
-
- std.log.debug("Stopping the server", .{});
- _ = c.ava_stop();
-
- std.log.debug("Releasing COM objects", .{});
- _ = webview.Release();
- _ = controller.Release();
- return 0;
-}
-
-fn createWindow() !void {
- const CLASS_NAME = L("AvaPLS");
- const TITLE = L("Ava PLS");
-
- var wc = std.mem.zeroes(c.WNDCLASSEXW);
- wc.cbSize = @sizeOf(c.WNDCLASSEXW);
- wc.hInstance = @ptrCast(c.GetModuleHandleW(null) orelse return error.FailedToGetModuleHandle);
- wc.lpszClassName = CLASS_NAME;
- wc.lpfnWndProc = handleMessage;
-
- if (c.RegisterClassExW(&wc) == 0) {
- return error.FailedToRegisterWindowClass;
- }
-
- const hWnd = c.CreateWindowExW(
- 0,
- CLASS_NAME,
- TITLE,
- c.WS_OVERLAPPEDWINDOW,
- c.CW_USEDEFAULT,
- c.CW_USEDEFAULT,
- c.CW_USEDEFAULT,
- c.CW_USEDEFAULT,
- null,
- null,
- wc.hInstance,
- null,
- ) orelse return error.FailedToCreateWindow;
-
- _ = c.ShowWindow(hWnd, c.SW_SHOW);
- _ = c.UpdateWindow(hWnd);
-
- window = hWnd;
-}
-
-// Window handler
-fn handleMessage(hWnd: c.HWND, message: c.UINT, wParam: c.WPARAM, lParam: c.LPARAM) callconv(c.WINAPI) c.LRESULT {
- switch (message) {
- c.WM_QUIT => return 0,
- c.WM_DESTROY => {
- c.PostQuitMessage(0);
- return 0;
- },
- c.WM_SIZE => resize(),
- c.WM_PAINT => {
- if (!webview_initialized.load(.Acquire)) {
- var rect: c.RECT = undefined;
- if (c.GetUpdateRect(window, &rect, c.FALSE) == 0) return 0;
-
- var ps: c.PAINTSTRUCT = undefined;
- const dc = c.BeginPaint(window, &ps);
- _ = c.GetClientRect(window, &rect);
- _ = c.DrawTextA(dc, "Loading...", -1, &rect, 1 | 4 | 32);
- _ = c.EndPaint(window, &ps);
- return 0;
- }
- },
- else => {},
- }
-
- return c.DefWindowProcW(hWnd, message, wParam, lParam);
-}
-
-fn createWebView() !void {
- const data_folder = try util.getWritableHomePath(allocator, &.{"webview"});
- defer allocator.free(data_folder);
-
- const data_folder_w = try std.unicode.utf8ToUtf16LeWithNull(allocator, data_folder);
- defer allocator.free(data_folder_w);
-
- _ = c.CreateCoreWebView2EnvironmentWithOptions(
- null,
- data_folder_w.ptr,
- null,
- com.Callback(com.ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler, environmentCompleted),
- );
-
- // Wait for the environment to be created
- while (!webview_initialized.load(.Acquire) and tick() > 0) {}
-}
-
-fn environmentCompleted(_: *com.ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler, res: c.HRESULT, env: *com.ICoreWebView2Environment) callconv(c.WINAPI) c.HRESULT {
- if (res != c.S_OK) {
- showError(error.FailedToCreateWebViewEnvironment);
- return res;
- }
-
- return env.call(.CreateCoreWebView2Controller, .{ window, com.Callback(com.ICoreWebView2CreateCoreWebView2ControllerCompletedHandler, controllerCompleted) });
-}
-
-fn controllerCompleted(_: *com.ICoreWebView2CreateCoreWebView2ControllerCompletedHandler, res: c.HRESULT, ctrl: *com.ICoreWebView2Controller) callconv(c.WINAPI) c.HRESULT {
- if (res == c.S_OK) {
- controller = ctrl;
-
- if (ctrl.call(.get_CoreWebView2, .{&webview}) == c.S_OK) {
- _ = ctrl.AddRef();
- _ = webview.AddRef();
-
- // Disable dev tools
- var settings: *com.ICoreWebView2Settings = undefined;
- _ = webview.call(.get_Settings, .{&settings});
- _ = settings.call(.put_AreDevToolsEnabled, .{c.FALSE});
- }
- }
-
- webview_initialized.store(true, .Release);
-
- std.log.debug("Resizing", .{});
- resize();
-
- return res;
-}
-
-fn resize() void {
- if (!webview_initialized.load(.Acquire)) return;
- var bounds: c.RECT = undefined;
- _ = c.GetClientRect(window, &bounds);
- _ = controller.call(.put_Bounds, .{bounds});
-}
-
-// Do one tick of the message loop
-fn tick() c.LRESULT {
- var msg: c.MSG = undefined;
-
- if (c.GetMessageW(&msg, null, 0, 0) >= 0) {
- _ = c.TranslateMessage(&msg);
- const res = c.DispatchMessageW(&msg);
-
- return if (msg.message == c.WM_QUIT) res else 1;
- }
-
- return 0;
-}
-
-// Show a message box with an error message
-fn showError(err: anytype) void {
- const msg = std.fmt.allocPrintZ(std.heap.page_allocator, "Unexpected error: {any}", .{err}) catch "OOM";
-
- _ = c.MessageBoxA(null, msg, "Error", c.MB_OK);
-}
diff --git a/tsconfig.json b/tsconfig.json
deleted file mode 100644
index 94c3218..0000000
--- a/tsconfig.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "compilerOptions": {
- "target": "ES2021",
- "module": "ESNext",
- "lib": ["ES2023", "DOM", "DOM.Iterable"],
- "skipLibCheck": true,
- "allowSyntheticDefaultImports": true,
- "moduleResolution": "bundler",
- "noEmit": true,
- "jsx": "react-jsx",
- "jsxImportSource": "preact",
- "strictNullChecks": true
- },
- "include": ["src/app"]
-}