'])
+ return
+ }
+ debug('_def:', schema._def)
+ }
+}
+
+const ZodField = ({ value, setValue, schema, path }) => {
+ if (schema._def.typeName === 'ZodString') {
+ return (
+
+ {path.at(-1)}
+
+ )
+ }
+ if (schema._def.typeName === 'ZodNumber') {
+ return (
+
+ {path.at(-1)}
+
+ )
+ }
+ if (schema._def.typeName === 'ZodBoolean') {
+ return (
+
+ {path.at(-1)}
+
+ )
+ }
+ if (schema._def.typeName === 'ZodDate') {
+ return (
+
+ {path.at(-1)}
+
+ )
+ }
+ if (schema._def.typeName === 'ZodObject') {
+ return (
+
+ {Object.entries(schema._def.shape()).map(([k, v]) => {
+ return (
+
+ )
+ }
+ if (schema._def.typeName === 'ZodArray') {
+ return (
+
+ {value.map((v, i) => {
+ return (
+ setValue(path, [...value, ''])}>Add
+
+ )
+ }
+ if (schema._def.typeName === 'ZodOptional') {
+ return (
+
+
+ )
+ }
+ if (schema._def.typeName === 'ZodLiteral') {
+ return (
+
+
+ )
+ }
+ if (schema._def.typeName === 'ZodUnion') {
+ return (
+
+ setValue(path, e.target.value)}>
+ {schema._def.options.map(option => {
+ return {option._def.value}
+ })}
+
+
+ )
+ }
+}
+
+const ZodObject = ({ value, setValue, schema, path }) => {
+ return (
+
+ {Object.entries(schema._def.shape()).map(([k, v]) => {
+ return (
+
+ )
+}
+
+const ZodArray = ({ value, setValue, schema, path }) => {
+ return (
+
+ {value.map((v, i) => {
+ return (
+ setValue(path, [...value, ''])}>Add
+
+ )
+}
+
+const ZodOptional = ({ value, setValue, schema, path }) => {
+ return (
+
+
+ )
+}
+
+const ZodLiteral = ({ value, setValue, schema, path }) => {
+ return (
+
+
+ )
+}
+
+const ZodUnion = ({ value, setValue, schema, path }) => {
+ return (
+
+ setValue(path, e.target.value)}>
+ {schema._def.options.map(option => {
+ return {option._def.value}
+ })}
+
+
+ )
+}
+
+export const ZodForm = ({ value, setValue, schema }) => {
+ return (
+
+ {schema._def.typeName === 'ZodObject' && (
+
+ )
+}
diff --git a/src/client/lib/utils.js b/src/client/lib/utils.js
new file mode 100644
index 0000000..b1b4f6d
--- /dev/null
+++ b/src/client/lib/utils.js
@@ -0,0 +1,21 @@
+export function durationToString(from, to) {
+ from = new Date(from)
+ to = new Date(to)
+
+ let s = to.getTime() - from.getTime()
+
+ const millis = s % 1000
+ s = (s - millis) / 1000
+ if (s === 0) return `${millis}ms`
+
+ const seconds = s % 60
+ s = (s - seconds) / 60
+ if (s === 0) return `${seconds}s${millis}ms`
+
+ const minutes = s % 60
+ s = (s - minutes) / 60
+ if (s === 0) return `${minutes}s${seconds}s`
+
+ const hours = s
+ return `${hours}h${minutes}m`
+}
diff --git a/src/components/Sidebar.astro b/src/components/Sidebar.astro
index f666854..9a92f06 100644
--- a/src/components/Sidebar.astro
+++ b/src/components/Sidebar.astro
@@ -5,20 +5,34 @@
home Home
-
view_list Containers
-
diff --git a/src/config.ts b/src/config.ts
index dbf4ec3..648a7e7 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,60 +1,75 @@
+import { Schema, ZodType, z } from 'zod'
+
import yaml from 'js-yaml'
import { readFile, writeFile } from 'fs/promises'
import { Mutex } from 'async-mutex'
-
-export type GitRef = { type: 'default' } | { type: 'branch' | 'tag' | 'commit'; value: string }
-
-export type BaseDeploy = { name: string }
-
-export type BaseGitDeploy = BaseDeploy & {
- url: string
- ref: GitRef
-}
-
-export type DockerDeploy = BaseDeploy & {
- type: 'docker'
- options: {
- image: string
- name?: string
- volumes?: string[]
- ports?: string[]
- env?: Record
- }
-}
-
-export type DockerfileDeploy = BaseGitDeploy & {
- type: 'dockerfile'
- options: {
- path?: string
-
- name?: string
- volumes?: string[]
- ports?: string[]
- env?: Record
- }
-}
-
-export type DockerComposeDeploy = BaseGitDeploy & {
- type: 'docker-compose'
- options: {
- path?: string
- }
-}
-
-export type ShellDeploy = BaseGitDeploy & {
- type: 'shell'
- options: {
- path?: string
- env?: Record
- }
-}
-
-export type Deploy = DockerDeploy | DockerfileDeploy | DockerComposeDeploy | ShellDeploy
-
-export type Config = {
- deploys: Deploy[]
-}
+import { debug } from './logger'
+
+export const GitRef = z.union([
+ z.object({ type: z.literal('default') }),
+ z.object({
+ type: z.union([z.literal('branch'), z.literal('branch'), z.literal('branch')]),
+ value: z.string(),
+ }),
+])
+
+export const GitDeploy = z.object({
+ name: z.string(),
+ url: z.string(),
+ ref: GitRef,
+})
+
+const DockerRunOptions = z.object({
+ name: z.string(),
+ volumes: z.tuple([z.string(), z.string()]).array(),
+ ports: z.tuple([z.string(), z.string()]).array(),
+ env: z.record(z.string()),
+})
+
+export const DockerDeploy = z.object({
+ name: z.string(),
+ type: z.literal('docker'),
+ options: DockerRunOptions.extend({
+ image: z.string(),
+ }),
+})
+
+export const DockerfileDeploy = GitDeploy.extend({
+ type: z.literal('dockerfile'),
+ options: DockerRunOptions.extend({
+ path: z.string().optional(),
+ }),
+})
+
+export const DockerComposeDeploy = GitDeploy.extend({
+ type: z.literal('docker-compose'),
+ options: z.object({
+ path: z.string().optional(),
+ }),
+})
+
+export const ShellDeploy = GitDeploy.extend({
+ type: z.literal('shell'),
+ options: z.object({
+ path: z.string().optional(),
+ env: z.record(z.string()),
+ }),
+})
+
+export const Deploy = z.union([DockerDeploy, DockerfileDeploy, DockerComposeDeploy, ShellDeploy])
+
+export type GitRef = z.infer
+export type GitDeploy = z.infer
+
+export type DockerDeploy = z.infer
+export type DockerfileDeploy = z.infer
+export type DockerComposeDeploy = z.infer
+export type ShellDeploy = z.infer
+
+export type Deploy = z.infer
+
+export type Config = { deploys: Deploy[] }
export const refToString = (ref: GitRef, defaultStr: string = '') => {
return ref.type === 'default' ? defaultStr : ref.value
diff --git a/src/deploys.ts b/src/deploys.ts
new file mode 100644
index 0000000..8b85fdd
--- /dev/null
+++ b/src/deploys.ts
@@ -0,0 +1,87 @@
+import type { Deploy, GitDeploy, GitRef, ShellDeploy } from '@/config'
+import type { Job, Worker } from '@/jobs'
+
+import path from 'path'
+
+import { exists, normalizeURL, sleep } from '@/lib/utils'
+
+import { runCommand } from '@/runners'
+import { debug } from '@/logger'
+
+const toSafePath = (target: string) => {
+ return '.' + path.posix.normalize('/' + target)
+}
+
+function getDeployDirectory(deploy: GitDeploy): string {
+ const { url, ref } = deploy
+
+ const repoSlug = url
+ .replace(/(^\w+:|^)\/\//, '') // strip protocol
+ .replace(/[^a-zA-Z]+/g, '-') // only keep letters, other symbols become dashes
+ .replace(/^\-|\-$/g, '') // remove leading or trailing dashes
+
+ const slug =
+ ref.type === 'default'
+ ? `${deploy.name}_${repoSlug}`
+ : `${deploy.name}_${repoSlug}@${ref.value}`
+
+ return `${import.meta.env.CLONE_PATH ?? `${import.meta.env.DATA_PATH}/clone`}/${slug}`
+}
+
+async function cloneOrUpdateRepo(deploy: Deploy & { url: string; ref: GitRef }) {
+ const repoDir = getDeployDirectory(deploy)
+
+ if (await exists(repoDir)) {
+ await runCommand(`git -C "${repoDir}" pull`)
+ } else {
+ await runCommand(`mkdir -p "${repoDir}"`)
+ await runCommand(`git clone "${normalizeURL(deploy.url)}" "${repoDir}"`)
+ }
+
+ if (deploy.ref.type !== 'default') {
+ await runCommand(`git -C "${repoDir}" checkout "${deploy.ref.value}"`)
+ }
+}
+
+export async function shellRunner(deploy: ShellDeploy) {
+ const { path, env } = deploy.options
+
+ const repoDir = getDeployDirectory(deploy)
+
+ await cloneOrUpdateRepo(deploy)
+
+ const script = [
+ // mode to correct directory
+ `cd ${repoDir}`,
+ // append env variables
+ Object.entries(env ?? {})
+ .map(([key, value]) => `export ${key}="${value.replace(/"/g, '\\"')}"`)
+ .join('\n'),
+ // launch program
+ toSafePath(path ?? './deploy.sh'),
+ ].join('\n\n')
+
+ await runCommand(script)
+}
+
+export function createDeployJob(deploy: Deploy, submitter: any): Job & Worker {
+ return {
+ name: deploy.name,
+
+ submitter,
+ submittedAt: new Date(),
+
+ async work() {
+ debug('[Runner]', `Deploying "${deploy.name}"`)
+ await sleep(1000)
+
+ // TODO: Add other deploy types
+ if (deploy.type === 'shell') await shellRunner(deploy)
+ else {
+ throw new Error(`deploy type "${deploy.type}" not yet implemented`)
+ }
+
+ debug('[Runner]', 'Finished deploy')
+ },
+ }
+}
diff --git a/src/forms.ts b/src/forms.ts
index 1df9e57..66b364a 100644
--- a/src/forms.ts
+++ b/src/forms.ts
@@ -1,5 +1,15 @@
import type { Deploy, GitRef } from './config'
+function splitBinding(pair: string): [string, string] {
+ const parts = pair.trim().split(':')
+ if (parts.length !== 2) {
+ throw new Error(`invalid binding format`)
+ }
+
+ const [external, internal] = parts
+ return [external, internal]
+}
+
function cutString(s: string, sep: string): [string, string] {
return [s.slice(0, s.indexOf(sep)), s.slice(s.indexOf(sep) + sep.length)]
}
@@ -38,8 +48,8 @@ export function parseDeploy(form: Record): Deploy {
image,
name: containerName,
env: Object.fromEntries(env.split(/\n/g).map(line => cutString(line.trim(), '='))),
- ports: ports.split(/\n/g).map(line => line.trim()),
- volumes: volumes.split(/\n/g).map(line => line.trim()),
+ ports: ports.split(/\n/g).map(splitBinding),
+ volumes: volumes.split(/\n/g).map(splitBinding),
},
}
}
@@ -67,6 +77,7 @@ export function parseDeploy(form: Record): Deploy {
const url = form['deploy-url'] as string
const ref = parseRef(form)
+ const containerName = form['deploy-options-name'] as string
const path = form['deploy-options-path'] as string
const ports = form['deploy-options-ports'] as string
const env = form['deploy-options-env'] as string
@@ -78,10 +89,11 @@ export function parseDeploy(form: Record): Deploy {
ref,
type: 'dockerfile',
options: {
+ name: containerName,
path,
env: Object.fromEntries(env.split(/\n/g).map(line => cutString(line.trim(), '='))),
- ports: ports.split(/\n/g).map(line => line.trim()),
- volumes: volumes.split(/\n/g).map(line => line.trim()),
+ ports: ports.split(/\n/g).map(splitBinding),
+ volumes: volumes.split(/\n/g).map(splitBinding),
},
}
}
diff --git a/src/jobs.ts b/src/jobs.ts
index 70691d5..0eb05a0 100644
--- a/src/jobs.ts
+++ b/src/jobs.ts
@@ -1,28 +1,148 @@
-const queue: (() => Promise)[] = []
+import { EventEmitter } from 'events'
-// to ensure that the while loop inside triggerProcessQueue is getting executed from only one call at a time
-let working = false
+import { debug } from './logger'
+
+import { createJsonDatabase } from './lib/file-db'
+
+import { randomUUID } from 'crypto'
+
+export type QueuedJob = {
+ uuid: string
+ name: string
+
+ submitter: any
+ submittedAt: Date
+}
+
+export type CompletedJob = {
+ uuid: string
+ name: string
+
+ successful: boolean
+ error?: any
+
+ submitter: any
+ submittedAt: string
+ startedAt: string
+ completedAt: string
+}
+
+export type Job = {
+ name: string
-export function runPendingJobs() {
- triggerProcessQueue()
+ submitter: any
+ submittedAt: Date
}
-async function triggerProcessQueue() {
+export type Worker = {
+ work: () => Promise
+}
+
+// Event emitter & Queue (runtime only)
+const emitter = new EventEmitter<{
+ 'job:add': [QueuedJob]
+ 'job:completed': [CompletedJob]
+}>()
+
+const queue: (QueuedJob & Worker)[] = []
+
+// Job db for logging purposes
+const jobsDB = createJsonDatabase(`${import.meta.env.DATA_PATH}/jobs.json`, [])
+
+// To ensure that the while loop inside "processQueue" is getting executed from
+// only one call at a time.
+let working = false
+
+async function processQueue() {
if (working) return
working = true
{
while (queue.length > 0) {
const job = queue.shift()!
- await job()
+
+ const startedAt = new Date().toISOString()
+ let error: string | undefined
+
+ debug(`[Jobs] Starting job "${job.name}"`)
+ try {
+ await job.work()
+ } catch (e) {
+ error = e!.toString()
+ }
+ debug(`[Jobs] Finished job`)
+
+ const completedAt = new Date().toISOString()
+
+ const completedJob = {
+ uuid: job.uuid,
+ name: job.name,
+
+ successful: error === undefined,
+ error,
+
+ submitter: job.submitter,
+ submittedAt: job.submittedAt.toISOString(),
+ startedAt,
+ completedAt,
+ }
+
+ await jobsDB.update(async jobs => {
+ jobs.push(completedJob)
+ })
+
+ emitter.emit('job:completed', completedJob)
}
}
working = false
}
-export function addJob(job: () => Promise) {
- queue.push(job)
+/**
+ * Use this function to add new jobs to the work queue
+ */
+export function enqueueJob(job: Job & Worker) {
+ const queueJob = { ...job, uuid: randomUUID() }
+
+ queue.push(queueJob)
+
+ emitter.emit('job:add', {
+ uuid: queueJob.uuid,
+ name: queueJob.name,
+ submitter: queueJob.submitter,
+ submittedAt: queueJob.submittedAt,
+ })
// starts concurrently a function to process jobs
- triggerProcessQueue()
+ processQueue()
+}
+
+export async function getQueuedJobs(): Promise {
+ return queue.map(({ uuid, name, submitter, submittedAt }) => ({
+ uuid,
+ name,
+ submitter,
+ submittedAt,
+ }))
+}
+
+export function getCompletedJobs(): Promise {
+ return jobsDB.load()
+}
+
+export const OnJobAdded = {
+ addListener(cb: (job: QueuedJob) => void) {
+ emitter.on('job:add', cb)
+ },
+ removeListener(cb: (job: QueuedJob) => void) {
+ emitter.off('job:add', cb)
+ },
+}
+
+export const OnJobCompleted = {
+ addListener(cb: (job: CompletedJob) => void) {
+ emitter.on('job:completed', cb)
+ },
+ removeListener(cb: (job: CompletedJob) => void) {
+ emitter.off('job:completed', cb)
+ },
}
diff --git a/src/lib/file-db.ts b/src/lib/file-db.ts
new file mode 100644
index 0000000..e0ed1fd
--- /dev/null
+++ b/src/lib/file-db.ts
@@ -0,0 +1,81 @@
+import { readFile, writeFile } from 'fs/promises'
+
+import { Mutex } from 'async-mutex'
+import { exists } from './utils'
+
+import yaml from 'js-yaml'
+
+export function createJsonDatabase(filename: string, initialValue: T) {
+ const mutex = new Mutex()
+
+ function ensureExists() {
+ return mutex.runExclusive(async () => {
+ if (!(await exists(filename))) {
+ await writeFile(filename, JSON.stringify(initialValue, null, 2))
+ }
+ })
+ }
+
+ return {
+ mutex,
+ async load(): Promise {
+ await ensureExists()
+
+ return await mutex.runExclusive(async () => {
+ const data = await readFile(filename, 'utf8')
+ return JSON.parse(data) as T
+ })
+ },
+ async update(fn: (value: T) => Promise) {
+ await ensureExists()
+
+ return await mutex.runExclusive(async () => {
+ const data = await readFile(filename, 'utf8')
+ const value = JSON.parse(data) as T
+
+ const result = await fn(value)
+
+ await writeFile(filename, JSON.stringify(value, null, 2))
+
+ return result
+ })
+ },
+ }
+}
+
+export function createYamlDatabase(filename: string, initialValue: T) {
+ const mutex = new Mutex()
+
+ function ensureExists() {
+ return mutex.runExclusive(async () => {
+ if (!(await exists(filename))) {
+ await writeFile(filename, yaml.dump(initialValue))
+ }
+ })
+ }
+
+ return {
+ async load(): Promise {
+ await ensureExists()
+
+ return await mutex.runExclusive(async () => {
+ const data = await readFile(filename, 'utf8')
+ return yaml.load(data) as T
+ })
+ },
+ async update(fn: (value: T) => Promise) {
+ await ensureExists()
+
+ return await mutex.runExclusive(async () => {
+ const data = await readFile(filename, 'utf8')
+ const value = yaml.load(data) as T
+
+ const result = await fn(value)
+
+ await writeFile(filename, yaml.dump(value))
+
+ return result
+ })
+ },
+ }
+}
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
new file mode 100644
index 0000000..40fe398
--- /dev/null
+++ b/src/lib/utils.ts
@@ -0,0 +1,38 @@
+import { access } from 'fs/promises'
+
+export const normalizeURL = (url: string) => {
+ if (!url.startsWith('/') && !url.startsWith('https://') && !url.startsWith('http://')) {
+ url = `https://${url}`
+ }
+
+ return url
+}
+
+export const clsx = (...args: any[]) =>
+ args
+ .filter(Boolean)
+ .flatMap(s => (typeof s === 'string' ? s.split(' ') : [s]))
+ .join(' ')
+
+/**
+ * Modern alternative to fs.existsSync
+ */
+export async function exists(path: string) {
+ try {
+ await access(path)
+ return true
+ } catch (err) {
+ // @ts-ignore
+ if (err.code === 'ENOENT') {
+ return false
+ } else {
+ throw err
+ }
+ }
+}
+
+export function sleep(timeout: number) {
+ return new Promise(resolve => {
+ setTimeout(resolve, timeout)
+ })
+}
diff --git a/src/logger.ts b/src/logger.ts
new file mode 100644
index 0000000..6ccab8f
--- /dev/null
+++ b/src/logger.ts
@@ -0,0 +1,8 @@
+import { inspect } from 'util'
+
+export const debugToString = (value: any) =>
+ typeof value === 'string' ? value : inspect(value, false, 5, true)
+
+export const debug = (...args: any[]) => {
+ process.stderr.write(args.map(arg => debugToString(arg)).join(' ') + '\n')
+}
diff --git a/src/pages/api/jobs.ts b/src/pages/api/jobs.ts
new file mode 100644
index 0000000..0f629c0
--- /dev/null
+++ b/src/pages/api/jobs.ts
@@ -0,0 +1,23 @@
+import { getCompletedJobs, getQueuedJobs } from '@/jobs'
+import { debug } from '@/logger'
+import type { APIRoute } from 'astro'
+
+export const GET: APIRoute = async ({ request, params }) => {
+ debug('[API] Jobs:', params)
+
+ const queuedJobs = await getQueuedJobs()
+ const completedJobs = await getCompletedJobs()
+
+ return new Response(
+ JSON.stringify({
+ queuedJobs,
+ completedJobs,
+ }),
+ {
+ status: 200,
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ }
+ )
+}
diff --git a/src/pages/api/sse.ts b/src/pages/api/sse.ts
new file mode 100644
index 0000000..19a72c2
--- /dev/null
+++ b/src/pages/api/sse.ts
@@ -0,0 +1,39 @@
+import { OnJobAdded, OnJobCompleted, type CompletedJob, type QueuedJob } from '@/jobs'
+import { debug } from '@/logger'
+import type { APIRoute } from 'astro'
+
+export const GET: APIRoute = async ({ request }) => {
+ let jobAddedEvent: any
+ let jobCompletedEvent: any
+
+ const stream = new ReadableStream({
+ start(controller) {
+ const sendEvent = (data: any) => {
+ controller.enqueue(`data: ${JSON.stringify(data)}\r\n\r\n`)
+ }
+
+ jobAddedEvent = (job: QueuedJob) => sendEvent({ type: 'added', job })
+ jobCompletedEvent = (job: CompletedJob) => sendEvent({ type: 'completed', job })
+
+ debug('[SSE] Registering client')
+
+ OnJobAdded.addListener(jobAddedEvent)
+ OnJobCompleted.addListener(jobCompletedEvent)
+ },
+ cancel() {
+ OnJobAdded.removeListener(jobAddedEvent)
+ OnJobCompleted.removeListener(jobCompletedEvent)
+
+ debug('[SSE] Un-registered client')
+ },
+ })
+
+ return new Response(stream, {
+ status: 200,
+ headers: {
+ 'Content-Type': 'text/event-stream',
+ 'Connection': 'keep-alive',
+ 'Cache-Control': 'no-cache',
+ },
+ })
+}
diff --git a/src/pages/api/webhook.ts b/src/pages/api/webhook.ts
index 0f816f8..e7b26c0 100644
--- a/src/pages/api/webhook.ts
+++ b/src/pages/api/webhook.ts
@@ -1,5 +1,12 @@
import type { APIRoute } from 'astro'
-import { loadConfig } from '../../config'
+
+import { loadConfig } from '@/config'
+
+import { debug } from '@/logger'
+import { normalizeURL } from '@/lib/utils'
+
+import { enqueueJob } from '@/jobs'
+import { createDeployJob } from '@/deploys'
export const POST: APIRoute = async ({ request }) => {
const body = await request.json()
@@ -11,9 +18,9 @@ export const POST: APIRoute = async ({ request }) => {
for (const deploy of deploys) {
if (deploy.type !== 'docker') {
- if (URLS.includes(deploy.url)) {
- // TODO: trigger deploy
- break
+ if (URLS.includes(normalizeURL(deploy.url))) {
+ debug(`[Webhook] Triggering deploy for "${deploy.url}"`)
+ enqueueJob(createDeployJob(deploy, { event: 'webhook', url: deploy.url }))
}
}
}
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 19c4509..fade4b0 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -3,5 +3,9 @@ import Layout from '../layouts/Layout.astro'
---
- Astro
+ phCD
+ Recent Deploys
+ Bla bla recent jobs
+ Containers
+ Bla bla container status and stats
diff --git a/src/pages/jobs/index.astro b/src/pages/jobs/index.astro
new file mode 100644
index 0000000..c6433d4
--- /dev/null
+++ b/src/pages/jobs/index.astro
@@ -0,0 +1,10 @@
+---
+import Layout from '@layouts/Layout.astro'
+
+import { JobsPage } from '@client/JobsPage.jsx'
+---
+
+
+ Jobs
+
diff --git a/src/runners.ts b/src/runners.ts
index f946a0b..434feed 100644
--- a/src/runners.ts
+++ b/src/runners.ts
@@ -1,46 +1,50 @@
-import { refToString, type GitRef, type ShellDeploy, type Deploy } from './config'
-
-import { existsSync } from 'fs'
-import { promisify } from 'util'
import child_process from 'child_process'
-const exec = promisify(child_process.exec)
+import { debug } from './logger'
-function getDeployDirectory(deploy: Deploy & { url: string; ref: GitRef }): string {
- const { url, ref } = deploy
+function onLine(stream: any, cb: (line: string) => void) {
+ let buffer = ''
- const repoSlug = url.replace(/(^\w+:|^)\/\//, '').replace(/[^a-zA-Z]+/g, '-')
- const slug =
- ref.type === 'default'
- ? `${deploy.name}_${repoSlug}`
- : `${deploy.name}_${repoSlug}@${ref.value}`
+ stream.on('data', (data: any) => {
+ buffer += data
+ let lines = buffer.split('\n')
+ buffer = lines.pop()!
+ lines.forEach(cb)
+ })
- return `${process.env.CLONE_PATH ?? './data.local/repos'}/${slug}`
+ stream.on('end', () => {
+ if (buffer) cb(buffer)
+ })
}
-async function cloneOrUpdateRepo(deploy: Deploy & { url: string; ref: GitRef }) {
- const repoDir = getDeployDirectory(deploy)
-
- if (existsSync(repoDir)) {
- await exec(`git -C ${repoDir} pull`)
+export async function runCommand(source: string): Promise {
+ if (!source.includes('\n')) {
+ debug('[Runner] Command:')
+ debug('[Runner]', ' |', source)
} else {
- await exec(`git clone ${deploy.url} ${repoDir}`)
+ debug('[Runner] Script:')
+ source.split('\n').forEach(line => {
+ debug('[Runner]', ' |', line)
+ })
}
-}
-
-export async function shellRunner(deploy: ShellDeploy) {
- const { url, ref, options } = deploy
- const { path, env } = options
-
- const projectName = url.split('/').slice(-1)[0].replace('.git', '')
- await cloneOrUpdateRepo(deploy)
-
- const envStr = Object.entries(env as any)
- .map(([key, value]) => `${key}=${value}`)
- .join(' ')
-
- return exec(`cd ${projectName} && ${envStr} ${path}`)
+ const child = child_process.exec(source)
+
+ onLine(child.stdout!, line => {
+ debug('[Runner]', ' >', line)
+ })
+
+ onLine(child.stderr!, line => {
+ debug('[Runner]', '!>', line)
+ })
+
+ return new Promise((resolve, reject) => {
+ child.on('close', code => {
+ if (code === 0) {
+ resolve()
+ } else {
+ reject(new Error(`Command failed with code ${code}`))
+ }
+ })
+ })
}
-
-
diff --git a/src/styles/main.scss b/src/styles/main.scss
index ca049fc..8d7e4c9 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -1,3 +1,6 @@
+$accent-400: #f8f5ff;
+$accent-500: #d8ccfa;
+
*,
*::before,
*::after {
@@ -301,9 +304,10 @@ body {
.sidebar {
grid-area: sidebar;
- min-width: 20vw;
+ min-width: 300px;
+ width: 20vw;
- background-color: #ededf0;
+ background: $accent-400;
color: #333;
display: flex;
@@ -352,7 +356,7 @@ body {
border-radius: 100px;
&:hover {
- background-color: #00000018;
+ background-color: $accent-500;
}
.material-symbols-outlined {
@@ -372,22 +376,6 @@ body {
padding: 5px;
position: relative;
-
- // &::before {
- // content: '';
- // background: #666;
-
- // position: absolute;
- // left: -0.5rem;
-
- // width: 5px;
- // height: 5px;
-
- // border-radius: 100%;
-
- // top: 50%;
- // transform: translate(0, calc(-50% + 1px));
- // }
}
}
@@ -413,7 +401,52 @@ body {
justify-self: center;
- width: 80ch;
- max-width: 100%;
+ width: 100%;
+ max-width: 80ch;
+
+ //
+ // Components
+ //
+
+ .list {
+ display: flex;
+ flex-direction: column;
+
+ width: 100%;
+ gap: 1rem;
+ }
+
+ .job {
+ padding: 1rem;
+ border-radius: 1rem;
+
+ width: 100%;
+
+ background: $accent-400;
+
+ display: grid;
+ grid-template-columns: 1fr;
+ grid-row: auto auto;
+
+ & > .name {
+ grid-column: span 3;
+
+ font-size: 18px;
+ font-weight: 600;
+ }
+
+ & > .footer {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ & .submitted-at {
+ font-size: 15px;
+ }
+ & .delta {
+ font-size: 15px;
+ }
+ }
}
}
diff --git a/src/utils.js b/src/utils.js
deleted file mode 100644
index 98e9ba9..0000000
--- a/src/utils.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const clsx = (...args) =>
- args
- .filter(Boolean)
- .flatMap(s => (typeof s === 'string' ? s.split(' ') : [s]))
- .join(' ')
diff --git a/tsconfig.json b/tsconfig.json
index 3641000..b475d87 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,14 @@
"strict": true,
"jsx": "react-jsx",
"jsxImportSource": "preact",
- "exactOptionalPropertyTypes": true
+ "exactOptionalPropertyTypes": true,
+ "baseUrl": ".",
+ "paths": {
+ "@/*": ["src/*"],
+ "@lib/*": ["src/lib/*"],
+ "@components/*": ["src/components/*"],
+ "@layouts/*": ["src/layouts/*"],
+ "@client/*": ["src/client/*"]
+ }
}
}