🚀 Launch cli npm package

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="ExceptionCaughtLocallyJS" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>

cli/.roadsignrc

@@ -0,0 +1,13 @@
+{
+  "sync": {
+    "region": "static-files",
+    "configPath": "test/static-files.toml"
+  },
+  "deployments": [
+    {
+      "path": "test/static-files",
+      "region": "static-files",
+      "site": "static-files-des"
+    }
+  ]
+}

cli/index.ts

@@ -1,4 +1,4 @@
-import { Cli } from "clipanion"
+import { Builtins, Cli } from "clipanion"
 import figlet from "figlet"
 import chalk from "chalk"
 
@@ -9,6 +9,8 @@ import { StatusCommand } from "./src/cmd/status.ts"
 import { InfoCommand } from "./src/cmd/info.ts"
 import { ProcessCommand } from "./src/cmd/process-info.ts"
 import { DeployCommand } from "./src/cmd/deploy.ts"
+import { SyncCommand } from "./src/cmd/sync.ts"
+import { ReloadCommand } from "./src/cmd/reload.ts"
 
 const [node, app, ...args] = process.argv
 
@@ -26,6 +28,8 @@ const cli = new Cli({
   binaryVersion: `1.0.0`
 })
 
+cli.register(Builtins.VersionCommand)
+cli.register(Builtins.HelpCommand)
 cli.register(LoginCommand)
 cli.register(LogoutCommand)
 cli.register(ListServerCommand)
@@ -33,4 +37,6 @@ cli.register(StatusCommand)
 cli.register(InfoCommand)
 cli.register(ProcessCommand)
 cli.register(DeployCommand)
+cli.register(SyncCommand)
+cli.register(ReloadCommand)
 cli.runExit(args)

cli/package.json

@@ -1,16 +1,33 @@
 {
   "name": "roadsign-cli",
   "module": "index.ts",
+  "version": "1.0.0",
+  "repository": "https://github.com/solsynth/roadsign",
   "type": "module",
+  "scripts": {
+    "build": "rimraf dist && rollup -c rollup.config.js"
+  },
+  "bin": {
+    "rdcli": "./dist/index.cjs"
+  },
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@rollup/plugin-typescript": "^12.1.0",
     "@types/bun": "latest",
-    "@types/figlet": "^1.5.8"
+    "@types/cli-progress": "^3.11.6",
+    "@types/figlet": "^1.5.8",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.24.0",
+    "rollup-plugin-typescript2": "^0.36.0"
   },
   "peerDependencies": {
-    "typescript": "^5.0.0"
+    "typescript": "^5.6.2"
   },
   "dependencies": {
     "chalk": "^5.3.0",
+    "cli-progress": "^3.12.0",
     "cli-table3": "^0.6.5",
     "clipanion": "^4.0.0-rc.4",
     "figlet": "^1.7.0",

cli/rollup.config.js

@@ -0,0 +1,22 @@
+import resolve from "@rollup/plugin-node-resolve"
+import commonjs from "@rollup/plugin-commonjs"
+import typescript from "@rollup/plugin-typescript"
+import json from "@rollup/plugin-json"
+
+export default {
+  input: "index.ts",
+  output: {
+    banner: "#!/usr/bin/env node",
+    file: "dist/index.cjs",
+    format: "cjs",
+    inlineDynamicImports: true,
+  },
+  plugins: [
+    resolve(),
+    commonjs(),
+    json(),
+    typescript({
+      tsconfig: "./tsconfig.json"
+    })
+  ],
+}

cli/src/cmd/deploy.ts

@@ -6,6 +6,7 @@ import * as fs from "node:fs"
 import * as child_process from "node:child_process"
 import * as path from "node:path"
 import { createAuthHeader } from "../utils/auth.ts"
+import { RsLocalConfig } from "../utils/config-local.ts"
 
 export class DeployCommand extends Command {
   static paths = [[`deploy`]]
@@ -13,54 +14,53 @@ export class DeployCommand extends Command {
     category: `Building`,
     description: `Deploying App / Static Site onto RoadSign`,
     details: `Deploying an application or hosting a static site via RoadSign, you need preconfigured the RoadSign, or sync the configurations via sync command.`,
-    examples: [["Deploying to RoadSign", `deploy <server> <site> <slug> <file / directory>`]]
+    examples: [
+      ["Deploying to RoadSign", `deploy <server> <region> <site> <file / directory>`],
+      ["Deploying to RoadSign with .roadsignrc file", `deploy <server>`]
+    ]
   }
 
   server = Option.String({ required: true })
-  site = Option.String({ required: true })
-  upstream = Option.String({ required: true })
-  input = Option.String({ required: true })
+  region = Option.String({ required: false })
+  site = Option.String({ required: false })
+  input = Option.String({ required: false })
 
-  async execute() {
-    const config = await RsConfig.getInstance()
-
-    const server = config.config.servers.find(item => item.label === this.server)
+  async deploy(serverLabel: string, region: string, site: string, input: string) {
+    const cfg = await RsConfig.getInstance()
+    const server = cfg.config.servers.find(item => item.label === serverLabel)
     if (server == null) {
       this.context.stdout.write(chalk.red(`Server with label ${chalk.bold(this.server)} was not found.\n`))
       return
     }
 
-    if (!fs.existsSync(this.input)) {
+    if (!fs.existsSync(input)) {
       this.context.stdout.write(chalk.red(`Input file ${chalk.bold(this.input)} was not found.\n`))
       return
     }
 
     let isDirectory = false
-    if (fs.statSync(this.input).isDirectory()) {
-      if (this.input.endsWith("/")) {
-        this.input = this.input.slice(0, -1)
-      }
-      this.input += "/*"
+    if (fs.statSync(input).isDirectory()) {
+      input = path.join(input, "*")
 
       const compressPrefStart = performance.now()
-      const compressSpinner = ora(`Compressing ${chalk.bold(this.input)}...`).start()
+      const compressSpinner = ora(`Compressing ${chalk.bold(input)}...`).start()
       const destName = `${Date.now()}-roadsign-archive.zip`
-      child_process.execSync(`zip -rj ${destName} ${this.input}`)
+      child_process.execSync(`zip -rj ${destName} ${input}`)
       const compressPrefTook = performance.now() - compressPrefStart
       compressSpinner.succeed(`Compressing completed in ${(compressPrefTook / 1000).toFixed(2)}s 🎉`)
-      this.input = destName
+      input = destName
       isDirectory = true
     }
 
-    const destBreadcrumb = [this.site, this.upstream].join(" ➜ ")
+    const destBreadcrumb = [region, site].join(" ➜ ")
     const spinner = ora(`Deploying ${chalk.bold(destBreadcrumb)} to ${chalk.bold(this.server)}...`).start()
 
     const prefStart = performance.now()
 
     try {
       const payload = new FormData()
-      payload.set("attachments", await fs.openAsBlob(this.input), isDirectory ? "dist.zip" : path.basename(this.input))
-      const res = await fetch(`${server.url}/webhooks/publish/${this.site}/${this.upstream}?mimetype=application/zip`, {
+      payload.set("attachments", await fs.openAsBlob(input), isDirectory ? "dist.zip" : path.basename(input))
+      const res = await fetch(`${server.url}/webhooks/publish/${region}/${site}?mimetype=application/zip`, {
         method: "PUT",
         body: payload,
         headers: {
@@ -76,10 +76,37 @@ export class DeployCommand extends Command {
       this.context.stdout.write(`Failed to deploy to remote: ${e}\n`)
       spinner.fail(`Server with label ${chalk.bold(this.server)} is not running! 😢`)
     } finally {
-      if (isDirectory && this.input.endsWith(".zip")) {
-        fs.unlinkSync(this.input)
+      if (isDirectory && input.endsWith(".zip")) {
+        fs.unlinkSync(input)
       }
     }
+  }
+
+  async execute() {
+    if (this.region && this.site && this.input) {
+      await this.deploy(this.server, this.region, this.site, this.input)
+    } else {
+      let localCfg: RsLocalConfig
+      try {
+        localCfg = await RsLocalConfig.getInstance()
+      } catch (e) {
+        this.context.stdout.write(chalk.red(`Unable to load .roadsignrc: ${e}\n`))
+        return
+      }
+
+      if (!localCfg.config.deployments) {
+        this.context.stdout.write(chalk.red(`No deployments found in .roadsignrc, exiting...\n`))
+        return
+      }
+
+      let idx = 0
+      for (const deployment of localCfg.config.deployments ?? []) {
+        this.context.stdout.write(chalk.cyan(`Deploying ${idx + 1} out of ${localCfg.config.deployments.length} deployments...\n`))
+        await this.deploy(this.server, deployment.region, deployment.site, deployment.path)
+      }
+
+      this.context.stdout.write(chalk.green(`All deployments has been deployed!\n`))
+    }
 
     process.exit(0)
   }

cli/src/cmd/info.ts

@@ -1,5 +1,5 @@
 import { Command, Option, type Usage } from "clipanion"
-import { RsConfig } from "../utils/config.ts"
+import { RsConfig, type RsConfigServerData } from "../utils/config.ts"
 import { createAuthHeader } from "../utils/auth.ts"
 import chalk from "chalk"
 import ora from "ora"
@@ -37,6 +37,77 @@ export class InfoCommand extends Command {
     return uptimeParts.join(", ")
   }
 
+  async fetchOverview(server: RsConfigServerData) {
+    try {
+      const res = await fetch(`${server.url}/cgi/stats`, {
+        headers: {
+          Authorization: createAuthHeader(server.credential)
+        }
+      })
+      if (res.status !== 200) {
+        throw new Error(await res.text())
+      }
+
+      const data: any = await res.json()
+      this.context.stdout.write('\n')
+      this.context.stdout.write(`\nServer stats of ${chalk.bold(this.label)}\n`)
+      this.context.stdout.write(` • Uptime: ${chalk.bold(InfoCommand.formatUptime(data["uptime"]))}\n`)
+      this.context.stdout.write(` • Traffic since last startup: ${chalk.bold(data["traffic"]["total"])}\n`)
+      this.context.stdout.write(` • Unique clients since last startup: ${chalk.bold(data["traffic"]["unique_client"])}\n`)
+      this.context.stdout.write(`\nServer info of ${chalk.bold(this.label)}\n`)
+      this.context.stdout.write(` • Warden Applications: ${chalk.bold(data["applications"])}\n`)
+      this.context.stdout.write(` • Destinations: ${chalk.bold(data["destinations"])}\n`)
+      this.context.stdout.write(` • Locations: ${chalk.bold(data["locations"])}\n`)
+      this.context.stdout.write(` • Regions: ${chalk.bold(data["regions"])}\n`)
+      this.context.stdout.write('\n')
+    } catch (e) {
+      return
+    }
+  }
+
+  async fetchTrace(server: RsConfigServerData) {
+    const res = await fetch(`${server.url}/cgi/traces`, {
+      headers: {
+        Authorization: createAuthHeader(server.credential)
+      }
+    })
+    if (res.status !== 200) {
+      throw new Error(await res.text())
+    }
+
+    const data: any = await res.json()
+    for (const trace of data) {
+      const ts = new Date(trace["timestamp"]).toLocaleString()
+      const path = [trace["region"], trace["location"], trace["destination"]].join(" ➜ ")
+      const uri = trace["uri"].split("?").length == 1 ? trace["uri"] : trace["uri"].split("?")[0] + ` ${chalk.grey(`w/ query parameters`)}`
+      this.context.stdout.write(`${chalk.bgGrey(`[${ts}]`)} ${chalk.bold(path)} ${chalk.cyan(trace["ip_address"])} ${uri}\n`)
+    }
+  }
+
+  async fetchRegions(server: RsConfigServerData) {
+    const res = await fetch(`${server.url}/cgi/regions`, {
+      headers: {
+        Authorization: createAuthHeader(server.credential)
+      }
+    })
+    if (res.status !== 200) {
+      throw new Error(await res.text())
+    }
+
+    const data: any = await res.json()
+    this.context.stdout.write("\n\n")
+    for (const region of data) {
+      this.context.stdout.write(` • ${chalk.bgGrey('region#')}${chalk.bold(region.id)} ${chalk.gray(`(${region.locations.length} locations)`)}\n`)
+      for (const location of region.locations) {
+        this.context.stdout.write(`   • ${chalk.bgGrey('location#')} ${chalk.bold(location.id)} ${chalk.gray(`(${location.destinations.length} destinations)`)}\n`)
+        for (const destination of location.destinations) {
+          this.context.stdout.write(`     • ${chalk.bgGrey('destination#')}${chalk.bold(destination.id)}\n`)
+        }
+      }
+      this.context.stdout.write("\n")
+    }
+  }
+
   async execute() {
     const config = await RsConfig.getInstance()
 
@@ -56,55 +127,21 @@ export class InfoCommand extends Command {
     switch (this.area) {
       case "overview":
         try {
-          const res = await fetch(`${server.url}/cgi/stats`, {
-            headers: {
-              Authorization: createAuthHeader(server.credential)
-            }
-          })
-          if (res.status !== 200) {
-            throw new Error(await res.text())
-          }
+          await this.fetchOverview(server)
           const prefTook = performance.now() - prefStart
           spinner.succeed(`Fetching completed in ${(prefTook / 1000).toFixed(2)}s 🎉`)
-
-          const data = await res.json()
-          this.context.stdout.write(`\nServer stats of ${chalk.bold(this.label)}\n`)
-          this.context.stdout.write(`Uptime: ${chalk.bold(InfoCommand.formatUptime(data["uptime"]))}\n`)
-          this.context.stdout.write(`Traffic since last startup: ${chalk.bold(data["traffic"]["total"])}\n`)
-          this.context.stdout.write(`Unique clients since last startup: ${chalk.bold(data["traffic"]["unique_client"])}\n`)
-          this.context.stdout.write(`\nServer info of ${chalk.bold(this.label)}\n`)
-          this.context.stdout.write(`Warden Applications: ${chalk.bold(data["applications"])}\n`)
-          this.context.stdout.write(`Destinations: ${chalk.bold(data["destinations"])}\n`)
-          this.context.stdout.write(`Locations: ${chalk.bold(data["locations"])}\n`)
-          this.context.stdout.write(`Regions: ${chalk.bold(data["regions"])}\n`)
         } catch (e) {
           spinner.fail(`Server with label ${chalk.bold(this.label)} is not running! 😢`)
-          return
         }
         break
       case "trace":
         while (true) {
           try {
-            const res = await fetch(`${server.url}/cgi/traces`, {
-              headers: {
-                Authorization: createAuthHeader(server.credential)
-              }
-            })
-            if (res.status !== 200) {
-              throw new Error(await res.text())
-            }
+            await this.fetchTrace(server)
             const prefTook = performance.now() - prefStart
             if (!this.loop) {
               spinner.succeed(`Fetching completed in ${(prefTook / 1000).toFixed(2)}s 🎉`)
             }
-
-            const data = await res.json()
-            for (const trace of data) {
-              const ts = new Date(trace["timestamp"]).toLocaleString()
-              const path = [trace["region"], trace["location"], trace["destination"]].join(" ➜ ")
-              const uri = trace["uri"].split("?").length == 1 ? trace["uri"] : trace["uri"].split("?")[0] + ` ${chalk.grey(`w/ query parameters`)}`
-              this.context.stdout.write(`${chalk.bgGrey(`[${ts}]`)} ${chalk.bold(path)} ${chalk.cyan(trace["ip_address"])} ${uri}\n`)
-            }
           } catch (e) {
             spinner.fail(`Server with label ${chalk.bold(this.label)} is not running! 😢`)
             return
@@ -113,12 +150,22 @@ export class InfoCommand extends Command {
           if (!this.loop) {
             break
           } else {
-            spinner.text = 'Updating...'
+            spinner.text = "Updating..."
             await new Promise(resolve => setTimeout(resolve, 3000))
-            this.context.stdout.write('\x1Bc')
+            this.context.stdout.write("\x1Bc")
           }
         }
         break
+      case "regions":
+        try {
+          await this.fetchRegions(server)
+          const prefTook = performance.now() - prefStart
+          spinner.succeed(`Fetching completed in ${(prefTook / 1000).toFixed(2)}s 🎉`)
+        } catch (e) {
+          spinner.fail(`Server with label ${chalk.bold(this.label)} is not running! 😢`)
+          return
+        }
+        break
       default:
         spinner.fail(chalk.red(`Info area was not exists ${chalk.bold(this.area)}...`))
     }

cli/src/cmd/login.ts

@@ -36,7 +36,7 @@ export class LoginCommand extends Command {
       if (pingRes.status !== 200) {
         throw new Error(await pingRes.text())
       } else {
-        const info = await pingRes.json()
+        const info: any = await pingRes.json()
         spinner.succeed(`Connected to ${this.host}, remote version ${info["version"]}`)
 
         config.config.servers.push({

cli/src/cmd/process-info.ts

@@ -57,7 +57,7 @@ export class ProcessCommand extends Command {
 
         const statusMapping = ["Created", "Starting", "Started", "Exited", "Failed"]
 
-        const data = await res.json()
+        const data: any = await res.json()
         for (const app of data) {
           table.push([app["id"], statusMapping[app["status"]], app["command"].join(" ")])
         }

cli/src/cmd/reload.ts

@@ -0,0 +1,53 @@
+import { RsConfig } from "../utils/config.ts"
+import { Command, Option, type Usage } from "clipanion"
+import chalk from "chalk"
+import ora from "ora"
+import * as fs from "node:fs"
+import { createAuthHeader } from "../utils/auth.ts"
+import { RsLocalConfig } from "../utils/config-local.ts"
+
+export class ReloadCommand extends Command {
+  static paths = [[`reload`]]
+  static usage: Usage = {
+    category: `Building`,
+    description: `Reload configuration on RoadSign`,
+    details: `Reload configuration on remote RoadSign to make changes applied.`,
+    examples: [
+      ["Reload an connected server", `reload <server>`],
+    ]
+  }
+
+  server = Option.String({ required: true })
+
+  async execute() {
+    const cfg = await RsConfig.getInstance()
+    const server = cfg.config.servers.find(item => item.label === this.server)
+    if (server == null) {
+      this.context.stdout.write(chalk.red(`Server with label ${chalk.bold(this.server)} was not found.\n`))
+      return
+    }
+
+    const spinner = ora(`Reloading server ${chalk.bold(this.server)}...`).start()
+
+    const prefStart = performance.now()
+
+    try {
+      const res = await fetch(`${server.url}/cgi/reload`, {
+        method: "POST",
+        headers: {
+          Authorization: createAuthHeader(server.credential)
+        }
+      })
+      if (res.status !== 200) {
+        throw new Error(await res.text())
+      }
+      const prefTook = performance.now() - prefStart
+      spinner.succeed(`Reloading completed in ${(prefTook / 1000).toFixed(2)}s 🎉`)
+    } catch (e) {
+      this.context.stdout.write(`Failed to reload remote: ${e}\n`)
+      spinner.fail(`Server with label ${chalk.bold(this.server)} is not running! 😢`)
+    }
+
+    process.exit(0)
+  }
+}

cli/src/cmd/sync.ts

@@ -0,0 +1,87 @@
+import { RsConfig } from "../utils/config.ts"
+import { Command, Option, type Usage } from "clipanion"
+import chalk from "chalk"
+import ora from "ora"
+import * as fs from "node:fs"
+import { createAuthHeader } from "../utils/auth.ts"
+import { RsLocalConfig } from "../utils/config-local.ts"
+
+export class SyncCommand extends Command {
+  static paths = [[`sync`]]
+  static usage: Usage = {
+    category: `Building`,
+    description: `Sync configuration to RoadSign over Sideload`,
+    details: `Update remote RoadSign configuration with local ones.`,
+    examples: [
+      ["Sync to RoadSign", `sync <server> <region> <file>`],
+      ["Sync to RoadSign with .roadsignrc file", `sync <server>`]
+    ]
+  }
+
+  server = Option.String({ required: true })
+  region = Option.String({ required: false })
+  input = Option.String({ required: false })
+
+  async sync(serverLabel: string, region: string, input: string) {
+    const cfg = await RsConfig.getInstance()
+    const server = cfg.config.servers.find(item => item.label === serverLabel)
+    if (server == null) {
+      this.context.stdout.write(chalk.red(`Server with label ${chalk.bold(this.server)} was not found.\n`))
+      return
+    }
+
+    if (!fs.existsSync(input)) {
+      this.context.stdout.write(chalk.red(`Input file ${chalk.bold(this.input)} was not found.\n`))
+      return
+    }
+    if (!fs.statSync(input).isFile()) {
+      this.context.stdout.write(chalk.red(`Input file ${chalk.bold(this.input)} is not a file.\n`))
+      return
+    }
+
+    const spinner = ora(`Syncing ${chalk.bold(region)} to ${chalk.bold(this.server)}...`).start()
+
+    const prefStart = performance.now()
+
+    try {
+      const res = await fetch(`${server.url}/webhooks/sync/${region}`, {
+        method: "PUT",
+        body: fs.readFileSync(input, "utf8"),
+        headers: {
+          Authorization: createAuthHeader(server.credential)
+        }
+      })
+      if (res.status !== 200) {
+        throw new Error(await res.text())
+      }
+      const prefTook = performance.now() - prefStart
+      spinner.succeed(`Syncing completed in ${(prefTook / 1000).toFixed(2)}s 🎉`)
+    } catch (e) {
+      this.context.stdout.write(`Failed to sync to remote: ${e}\n`)
+      spinner.fail(`Server with label ${chalk.bold(this.server)} is not running! 😢`)
+    }
+  }
+
+  async execute() {
+    if (this.region && this.input) {
+      await this.sync(this.server, this.region, this.input)
+    } else {
+      let localCfg: RsLocalConfig
+      try {
+        localCfg = await RsLocalConfig.getInstance()
+      } catch (e) {
+        this.context.stdout.write(chalk.red(`Unable to load .roadsignrc: ${e}\n`))
+        return
+      }
+
+      if (!localCfg.config.sync) {
+        this.context.stdout.write(chalk.red(`No sync configuration found in .roadsignrc, exiting...\n`))
+        return
+      }
+
+      await this.sync(this.server, localCfg.config.sync.region, localCfg.config.sync.configPath)
+    }
+
+    process.exit(0)
+  }
+}

cli/src/utils/config-local.ts

@@ -0,0 +1,60 @@
+import * as path from "node:path"
+import * as fs from "node:fs"
+
+interface RsLocalConfigData {
+  sync?: RsLocalConfigSyncData
+  deployments?: RsLocalConfigDeploymentData[]
+}
+
+interface RsLocalConfigSyncData {
+  configPath: string
+  region: string
+}
+
+interface RsLocalConfigDeploymentData {
+  path: string
+  region: string
+  site: string
+  autoBuild?: RsLocalConfigDeploymentAutoBuildData
+}
+
+interface RsLocalConfigDeploymentAutoBuildData {
+  command: string
+  environment?: string[]
+}
+
+class RsLocalConfig {
+  private static instance: RsLocalConfig
+
+  public config: RsLocalConfigData = {}
+
+  private constructor() {
+  }
+
+  public static async getInstance(): Promise<RsLocalConfig> {
+    if (!RsLocalConfig.instance) {
+      RsLocalConfig.instance = new RsLocalConfig()
+      await RsLocalConfig.instance.readConfig()
+    }
+    return RsLocalConfig.instance
+  }
+
+  public async readConfig() {
+    const basepath = process.cwd()
+    const filepath = path.join(basepath, ".roadsignrc")
+    if (!fs.existsSync(filepath)) {
+      throw new Error(`.roadsignrc file was not found at ${filepath}`)
+    }
+
+    const data = fs.readFileSync(filepath, "utf8")
+    this.config = JSON.parse(data)
+  }
+
+  public async writeConfig() {
+    const basepath = process.cwd()
+    const filepath = path.join(basepath, ".roadsignrc")
+    fs.writeFileSync(filepath, JSON.stringify(this.config))
+  }
+}
+
+export { RsLocalConfig, type RsLocalConfigData }

cli/src/utils/config.ts

@@ -1,6 +1,6 @@
 import * as os from "node:os"
 import * as path from "node:path"
-import * as fs from "node:fs/promises"
+import * as fs from "node:fs"
 
 interface RsConfigData {
   servers: RsConfigServerData[]
@@ -33,18 +33,18 @@ class RsConfig {
   public async readConfig() {
     const basepath = os.homedir()
     const filepath = path.join(basepath, ".roadsignrc")
-    if (!await fs.exists(filepath)) {
-      await fs.writeFile(filepath, JSON.stringify(this.config))
+    if (!fs.existsSync(filepath)) {
+      fs.writeFileSync(filepath, JSON.stringify(this.config))
     }
 
-    const data = await fs.readFile(filepath, "utf8")
+    const data = fs.readFileSync(filepath, "utf8")
     this.config = JSON.parse(data)
   }
 
   public async writeConfig() {
     const basepath = os.homedir()
     const filepath = path.join(basepath, ".roadsignrc")
-    await fs.writeFile(filepath, JSON.stringify(this.config))
+    fs.writeFileSync(filepath, JSON.stringify(this.config))
   }
 }
 

cli/test/static-files.toml

@@ -0,0 +1,9 @@
+id = "static-files-num2"
+
+[[locations]]
+id = "static-files-loc-num2"
+hosts = ["127.0.0.1:8000"]
+paths = ["/"]
+[[locations.destinations]]
+id = "static-files-des-num2"
+uri = "files://../data/static-files"

cli/tsconfig.json

@@ -1,18 +1,17 @@
 {
   "compilerOptions": {
-    // Enable latest features
-    "lib": ["ESNext", "DOM"],
+    "lib": ["ESNext"],
     "target": "ESNext",
-    "module": "ESNext",
-    "moduleDetection": "force",
-    "jsx": "react-jsx",
+    "module": "NodeNext",
     "allowJs": true,
 
     // Bundler mode
-    "moduleResolution": "bundler",
+    "esModuleInterop": true,
+    "moduleResolution": "NodeNext",
     "allowImportingTsExtensions": true,
     "verbatimModuleSyntax": true,
     "noEmit": true,
+    "resolveJsonModule": true,
 
     // Best practices
     "strict": true,
@@ -22,6 +21,7 @@
     // Some stricter flags (disabled by default)
     "noUnusedLocals": false,
     "noUnusedParameters": false,
-    "noPropertyAccessFromIndexSignature": false
+    "noPropertyAccessFromIndexSignature": false,
+    "useUnknownInCatchVariables": false,
   }
 }

pkg/cmd/rdc/conn/commands.go

@@ -1,89 +0,0 @@
-package conn
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/rs/zerolog/log"
-	"github.com/samber/lo"
-	"github.com/spf13/viper"
-	"github.com/urfave/cli/v2"
-)
-
-var CliCommands = []*cli.Command{
-	{
-		Name:        "list",
-		Aliases:     []string{"ls"},
-		Description: "List all connected remote server",
-		Action: func(ctx *cli.Context) error {
-			var servers []CliConnection
-			raw, _ := json.Marshal(viper.Get("servers"))
-			_ = json.Unmarshal(raw, &servers)
-
-			log.Info().Msgf("There are %d server(s) connected in total.", len(servers))
-			for idx, server := range servers {
-				log.Info().Msgf("%d) %s: %s", idx+1, server.ID, server.Url)
-			}
-
-			return nil
-		},
-	},
-	{
-		Name:        "connect",
-		Aliases:     []string{"add"},
-		Description: "Connect and save configuration of remote server",
-		ArgsUsage:   "<id> <server url> <credential>",
-		Action: func(ctx *cli.Context) error {
-			if ctx.Args().Len() < 3 {
-				return fmt.Errorf("must have three arguments: <id> <server url> <credential>")
-			}
-
-			c := CliConnection{
-				ID:         ctx.Args().Get(0),
-				Url:        ctx.Args().Get(1),
-				Credential: ctx.Args().Get(2),
-			}
-
-			if err := c.CheckConnectivity(); err != nil {
-				return fmt.Errorf("couldn't connect server: %s", err.Error())
-			} else {
-				var servers []CliConnection
-				raw, _ := json.Marshal(viper.Get("servers"))
-				_ = json.Unmarshal(raw, &servers)
-				viper.Set("servers", append(servers, c))
-
-				if err := viper.WriteConfig(); err != nil {
-					return err
-				} else {
-					log.Info().Msg("Successfully connected a new remote server, enter \"rds ls\" to get more info.")
-					return nil
-				}
-			}
-		},
-	},
-	{
-		Name:        "disconnect",
-		Aliases:     []string{"remove"},
-		Description: "Remove a remote server configuration",
-		ArgsUsage:   "<id>",
-		Action: func(ctx *cli.Context) error {
-			if ctx.Args().Len() < 1 {
-				return fmt.Errorf("must have more one arguments: <server url>")
-			}
-
-			var servers []CliConnection
-			raw, _ := json.Marshal(viper.Get("servers"))
-			_ = json.Unmarshal(raw, &servers)
-			viper.Set("servers", lo.Filter(servers, func(item CliConnection, idx int) bool {
-				return item.ID != ctx.Args().Get(0)
-			}))
-
-			if err := viper.WriteConfig(); err != nil {
-				return err
-			} else {
-				log.Info().Msg("Successfully disconnected a remote server, enter \"rds ls\" to get more info.")
-				return nil
-			}
-		},
-	},
-}

pkg/cmd/rdc/conn/connect.go

@@ -1,42 +0,0 @@
-package conn
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	roadsign "git.solsynth.dev/goatworks/roadsign/pkg"
-	"github.com/gofiber/fiber/v2"
-	"github.com/rs/zerolog/log"
-)
-
-type CliConnection struct {
-	ID         string `json:"id"`
-	Url        string `json:"url"`
-	Credential string `json:"credential"`
-}
-
-func (v CliConnection) CheckConnectivity() error {
-	client := fiber.Get(v.Url + "/cgi/metadata")
-	client.BasicAuth("RoadSign CLI", v.Credential)
-
-	if status, data, err := client.Bytes(); len(err) > 0 {
-		return fmt.Errorf("couldn't connect to server: %q", err)
-	} else if status != 200 {
-		return fmt.Errorf("server rejected request, may cause by invalid credential")
-	} else {
-		var resp fiber.Map
-		if err := json.Unmarshal(data, &resp); err != nil {
-			return err
-		} else if resp["server"] != "RoadSign" {
-			return fmt.Errorf("remote server isn't roadsign")
-		} else if resp["version"] != roadsign.AppVersion {
-			if strings.Contains(roadsign.AppVersion, "#") {
-				return fmt.Errorf("remote server version mismatch client version, update or downgrade client required")
-			} else {
-				log.Warn().Msg("RoadSign CLI didn't complied with vcs information, compatibility was disabled. To enable it, reinstall cli with -buildvcs flag.")
-			}
-		}
-	}
-	return nil
-}

pkg/cmd/rdc/conn/directory.go

@@ -1,17 +0,0 @@
-package conn
-
-import (
-	"encoding/json"
-
-	"github.com/samber/lo"
-	"github.com/spf13/viper"
-)
-
-func GetConnection(id string) (CliConnection, bool) {
-	var servers []CliConnection
-	raw, _ := json.Marshal(viper.Get("servers"))
-	_ = json.Unmarshal(raw, &servers)
-	return lo.Find(servers, func(item CliConnection) bool {
-		return item.ID == id
-	})
-}

pkg/cmd/rdc/deploy/commands.go

@@ -1,98 +0,0 @@
-package deploy
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	jsoniter "github.com/json-iterator/go"
-
-	"git.solsynth.dev/goatworks/roadsign/pkg/cmd/rdc/conn"
-	"github.com/gofiber/fiber/v2"
-	"github.com/rs/zerolog/log"
-	"github.com/urfave/cli/v2"
-)
-
-var DeployCommands = []*cli.Command{
-	{
-		Name:      "deploy",
-		Aliases:   []string{"dp"},
-		ArgsUsage: "<server> <site> <upstream> [path]",
-		Action: func(ctx *cli.Context) error {
-			if ctx.Args().Len() < 4 {
-				return fmt.Errorf("must have four arguments: <server> <site> <upstream> <path>")
-			}
-
-			if !strings.HasSuffix(ctx.Args().Get(3), ".zip") {
-				return fmt.Errorf("input file must be a zip file and ends with .zip")
-			}
-
-			server, ok := conn.GetConnection(ctx.Args().Get(0))
-			if !ok {
-				return fmt.Errorf("server was not found, use \"rds connect\" add one first")
-			} else if err := server.CheckConnectivity(); err != nil {
-				return fmt.Errorf("couldn't connect server: %s", err.Error())
-			}
-
-			// Send request
-			log.Info().Msg("Now publishing to remote server...")
-
-			url := fmt.Sprintf("/webhooks/publish/%s/%s?mimetype=%s", ctx.Args().Get(1), ctx.Args().Get(2), "application/zip")
-			client := fiber.Put(server.Url+url).
-				SendFile(ctx.Args().Get(3), "attachments").
-				MultipartForm(nil).
-				BasicAuth("RoadSign CLI", server.Credential)
-
-			if status, data, err := client.Bytes(); len(err) > 0 {
-				return fmt.Errorf("failed to publish to remote: %q", err)
-			} else if status != 200 {
-				return fmt.Errorf("server rejected request, status code %d, response %s", status, string(data))
-			}
-
-			log.Info().Msg("Well done! Your site is successfully published! 🎉")
-
-			return nil
-		},
-	},
-	{
-		Name:      "sync",
-		ArgsUsage: "<server> <site> <configuration path>",
-		Action: func(ctx *cli.Context) error {
-			if ctx.Args().Len() < 3 {
-				return fmt.Errorf("must have three arguments: <server> <site> <configuration path>")
-			}
-
-			server, ok := conn.GetConnection(ctx.Args().Get(0))
-			if !ok {
-				return fmt.Errorf("server was not found, use \"rds connect\" add one first")
-			} else if err := server.CheckConnectivity(); err != nil {
-				return fmt.Errorf("couldn't connect server: %s", err.Error())
-			}
-
-			var raw []byte
-			if file, err := os.Open(ctx.Args().Get(2)); err != nil {
-				return err
-			} else {
-				raw, _ = io.ReadAll(file)
-			}
-
-			url := fmt.Sprintf("/webhooks/sync/%s", ctx.Args().Get(1))
-			client := fiber.Put(server.Url+url).
-				JSONEncoder(jsoniter.ConfigCompatibleWithStandardLibrary.Marshal).
-				JSONDecoder(jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal).
-				Body(raw).
-				BasicAuth("RoadSign CLI", server.Credential)
-
-			if status, data, err := client.Bytes(); len(err) > 0 {
-				return fmt.Errorf("failed to sync to remote: %q", err)
-			} else if status != 200 {
-				return fmt.Errorf("server rejected request, status code %d, response %s", status, string(data))
-			}
-
-			log.Info().Msg("Well done! Your site configuration is up-to-date! 🎉")
-
-			return nil
-		},
-	},
-}

pkg/cmd/rdc/main.go

@@ -1,48 +0,0 @@
-package main
-
-import (
-	"os"
-
-	roadsign "git.solsynth.dev/goatworks/roadsign/pkg"
-	"git.solsynth.dev/goatworks/roadsign/pkg/cmd/rdc/conn"
-	"git.solsynth.dev/goatworks/roadsign/pkg/cmd/rdc/deploy"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
-	"github.com/spf13/viper"
-	"github.com/urfave/cli/v2"
-)
-
-func init() {
-	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout})
-}
-
-func main() {
-	// Configure settings
-	viper.AddConfigPath("$HOME")
-	viper.SetConfigName(".roadsignrc")
-	viper.SetConfigType("toml")
-
-	// Load settings
-	if err := viper.ReadInConfig(); err != nil {
-		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
-			viper.SafeWriteConfig()
-			viper.ReadInConfig()
-		} else {
-			log.Panic().Err(err).Msg("An error occurred when loading settings.")
-		}
-	}
-
-	// Configure CLI
-	app := &cli.App{
-		Name:     "RoadSign CLI",
-		Version:  roadsign.AppVersion,
-		Suggest:  true,
-		Commands: append(append([]*cli.Command{}, conn.CliCommands...), deploy.DeployCommands...),
-	}
-
-	// Run CLI
-	if err := app.Run(os.Args); err != nil {
-		log.Fatal().Err(err).Msg("An error occurred when running cli.")
-	}
-}

pkg/cmd/server/main.go

@@ -25,6 +25,7 @@ func main() {
 	// Configure settings
 	viper.AddConfigPath(".")
 	viper.AddConfigPath("..")
+	viper.AddConfigPath("/")
 	viper.SetConfigName("settings")
 	viper.SetConfigType("toml")
 

pkg/sideload/regions.go

@@ -38,8 +38,11 @@ func doSync(c *fiber.Ctx) error {
 	if file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755); err != nil {
 		return fiber.NewError(fiber.ErrInternalServerError.Code, err.Error())
 	} else {
-		raw, _ := toml.Marshal(req)
-		file.Write(raw)
+		var testOut map[string]any
+		if err := toml.Unmarshal([]byte(req), &testOut); err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("invalid configuration: %v", err))
+		}
+		_, _ = file.Write([]byte(req))
 		defer file.Close()
 	}