diff --git a/server/components/LoadingButton.vue b/server/components/LoadingButton.vue
deleted file mode 100644
index b61303f4..00000000
--- a/server/components/LoadingButton.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
diff --git a/server/components/UploadFileDialog.vue b/server/components/UploadFileDialog.vue
index f44bc6b2..fd1dd77e 100644
--- a/server/components/UploadFileDialog.vue
+++ b/server/components/UploadFileDialog.vue
@@ -17,7 +17,7 @@
Upload
@@ -121,8 +118,8 @@ import {
TransitionChild,
TransitionRoot,
} from "@headlessui/vue";
-import { ExclamationTriangleIcon } from "@heroicons/vue/24/outline";
import { ArrowUpTrayIcon } from "@heroicons/vue/20/solid";
+import { XCircleIcon } from "@heroicons/vue/24/solid";
const open = defineModel();
diff --git a/server/composables/collection.ts b/server/composables/collection.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/server/composables/icons.ts b/server/composables/icons.ts
new file mode 100644
index 00000000..ca465ab0
--- /dev/null
+++ b/server/composables/icons.ts
@@ -0,0 +1,6 @@
+import { IconsLinuxLogo, IconsWindowsLogo } from "#components";
+
+export const PLATFORM_ICONS = {
+ [PlatformClient.Linux]: IconsLinuxLogo,
+ [PlatformClient.Windows]: IconsWindowsLogo,
+};
diff --git a/server/composables/task.ts b/server/composables/task.ts
index 7a0c8f27..77515ef2 100644
--- a/server/composables/task.ts
+++ b/server/composables/task.ts
@@ -2,45 +2,74 @@ import type { TaskMessage } from "~/server/internal/tasks";
import { WebSocketHandler } from "./ws";
const websocketHandler = new WebSocketHandler("/api/v1/task");
+const taskStates: { [key: string]: Ref } = {};
+
+function handleUpdateMessage(msg: TaskMessage) {
+ const taskStates = useTaskStates();
+ const state = taskStates[msg.id];
+ if (!state) return;
+ if (!state.value || msg.reset) {
+ state.value = msg;
+ return;
+ }
+ state.value.log.push(...msg.log);
+
+ Object.assign(state.value, { ...msg, log: state.value.log });
+}
websocketHandler.listen((message) => {
- const msg = JSON.parse(message) as TaskMessage;
- const taskStates = useTaskStates();
- const state = taskStates.value[msg.id];
- if (!state) return;
- state.value = msg;
+ try {
+ // If it's an object, it's an update message
+ const msg = JSON.parse(message) as TaskMessage;
+ handleUpdateMessage(msg);
+ } catch {
+ // Otherwise it's control message
+ const taskStates = useTaskStates();
+
+ const [action, ...data] = message.split("/");
+
+ switch (action) {
+ case "connect":
+ const taskReady = useTaskReady();
+ taskReady.value = true;
+ break;
+ case "disconnect":
+ const disconnectTaskId = data[0];
+ delete taskStates[disconnectTaskId];
+ console.log(`disconnected from ${disconnectTaskId}`);
+ break;
+ case "error":
+ const [taskId, title, description] = data;
+ taskStates[taskId].value ??= {
+ id: taskId,
+ name: "Unknown task",
+ success: false,
+ progress: 0,
+ error: undefined,
+ log: [],
+ };
+ taskStates[taskId].value.error = { title, description };
+ break;
+ }
+ }
});
-const useTaskStates = () =>
- useState<{ [key: string]: Ref }>("task-states", () => ({
- connect: useState("task-connect", () => ({
- id: "connect",
- name: "Connect",
- success: false,
- progress: 0,
- log: [],
- error: undefined,
- })),
- }));
+const useTaskStates = () => taskStates;
-export const useTaskReady = () => {
+export const useTaskReady = () => useState("taskready", () => false);
+
+export const useTask = (taskId: string): Ref => {
+ if (import.meta.server) return ref(undefined);
const taskStates = useTaskStates();
- return taskStates.value["connect"];
-};
+ if (
+ taskStates[taskId] &&
+ taskStates[taskId].value &&
+ !taskStates[taskId].value.error
+ )
+ return taskStates[taskId];
-export const useTask = (taskId: string): Ref => {
- if (import.meta.server) return {} as unknown as Ref;
- const taskStates = useTaskStates();
- if (taskStates.value[taskId]) return taskStates.value[taskId];
-
- taskStates.value[taskId] = useState(`task-${taskId}`, () => ({
- id: taskId,
- name: "loading...",
- success: false,
- progress: 0,
- error: undefined,
- log: [],
- }));
+ taskStates[taskId] = ref(undefined);
+ console.log("connecting to " + taskId);
websocketHandler.send(`connect/${taskId}`);
- return taskStates.value[taskId];
+ return taskStates[taskId];
};
diff --git a/server/deploy-template/compose.yml b/server/deploy-template/compose.yml
index ba696e77..d3011a6d 100644
--- a/server/deploy-template/compose.yml
+++ b/server/deploy-template/compose.yml
@@ -4,7 +4,7 @@ services:
ports:
- 5432:5432
healthcheck:
- test: ["CMD-SHELL", "pg_isready", "-d", "postgres"]
+ test: pg_isready -d drop -U drop
interval: 30s
timeout: 60s
retries: 5
diff --git a/server/drop-base b/server/drop-base
new file mode 160000
index 00000000..01fd41c6
--- /dev/null
+++ b/server/drop-base
@@ -0,0 +1 @@
+Subproject commit 01fd41c65ae288eb19bbc92b2625733afe51c101
diff --git a/server/layouts/admin.vue b/server/layouts/admin.vue
index aae898cb..52ca79fb 100644
--- a/server/layouts/admin.vue
+++ b/server/layouts/admin.vue
@@ -1,33 +1,72 @@
+
+
+
+
+ class="hidden lg:fixed lg:inset-y-0 lg:left-0 lg:z-50 lg:block lg:w-20 lg:overflow-y-auto lg:bg-zinc-950 lg:pb-4">
+
+
+
+
+ class="hidden lg:fixed lg:inset-y-0 lg:left-0 lg:z-50 lg:block lg:w-20 lg:overflow-y-auto lg:bg-zinc-950 lg:pb-4">
-
-