.gitignore

@@ -1,4 +1,4 @@
 .vscode
 services.json
 .vscode/**/*
-.env
+

deploy.ts

@@ -1,19 +1,12 @@
-#!/usr/bin/env -S /root/.deno/bin/deno run --allow-env --allow-read --allow-sys --allow-run --allow-write
+#!/usr/bin/env -S /home/jaeung/.deno/bin/deno run --allow-env --allow-read --unstable --allow-sys --allow-run --allow-write
 
-import { printf } from "https://deno.land/std@0.170.0/fmt/printf.ts";
+import { printf } from "https://deno.land/std@0.158.0/fmt/printf.ts";
-import {brightGreen, brightMagenta} from "https://deno.land/std@0.170.0/fmt/colors.ts";
+import {brightGreen, brightMagenta} from "https://deno.land/std@0.160.0/fmt/colors.ts";
 import { Command } from "https://deno.land/x/cliffy@v0.25.2/command/mod.ts";
-import { getLogger } from "https://deno.land/std@0.170.0/log/mod.ts";
-
-
-class CommandError extends Error{}
-class ArgError extends CommandError {}
-class NginxError extends CommandError {}
 
 interface DeployedService{
   name: string,
-  port?: number,
+  port: number
-  unixSocketPath?: string,
 }
 
 async function saveService(services: DeployedService[]){
@@ -35,18 +28,8 @@ async function loadService(): Promise<DeployedService[]> {
 }
 
 interface NginxConfigOption {
+  port: number,
   name: string,
-  
-  /**
-   * port number
-   */
-  port?: number,
-  
-  /**
-   * unix socket path
-   */
-  unixSocket?: string,
-
   /**
    * megabyte unit
    */
@@ -63,25 +46,10 @@ interface NginxConfigOption {
   socketIO?: boolean,
 }
 
-function createNginxConfigContent({ port, unixSocket, name, clientMaxBodySize, proxyPass, socketIO }: NginxConfigOption) {
+function createNginxConfigContent({ port, name, clientMaxBodySize, proxyPass, socketIO }: NginxConfigOption) {
   clientMaxBodySize ??= 20;
   proxyPass ??= "127.0.0.1";
   socketIO ??= true;
-  if (!port && !unixSocket) {
-    throw new ArgError("Both port and unixSocket cannot be false.");
-  }
-  if ((!!port) && (!!unixSocket)){
-    throw new ArgError("Both port and unixSocket cannot be true.");
-  }
-  if (!!port && (isNaN(port) || !isFinite(port) )){
-    throw new ArgError("Port must be number.");
-  }
-  if (!!port && (port > 65535 || port < 0)){
-    throw new ArgError("Port cannnot be less than 0 or greater than 65535")
-  }
-  if (!!unixSocket && !unixSocket.startsWith("/")){
-    throw new ArgError("unix socket path must be absolute path.")
-  }
   const content = `# it created by deploy script.
 server {
   server_name ${name}.prelude.duckdns.org;
@@ -93,9 +61,7 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-NginX-Proxy true;
-    proxy_pass ${
+    proxy_pass http://${proxyPass}:${port};
-      port ? `http://${proxyPass}:${port}` : `http://unix:${unixSocket}/`
-    };
     proxy_redirect off;
     
     # client body size
@@ -119,58 +85,70 @@ function isRunAsRoot() {
 }
 
 async function NginxCheck() {
-  const c = new Deno.Command("nginx",{
+  const p = Deno.run({
-    args: ["-t"],
+    cmd: ["nginx", "-t"]
   });
-  const status = await c.output();
+  const status = (await p.status())
   return status.success && status.code == 0;
 }
 
 async function NginxReload() {
-  const c = new Deno.Command("nginx",{
+  const p = Deno.run({
-    args: ["-s", "reload"],
+    cmd: ["nginx", "-s","reload"]
   });
-  const status = await c.output();
+  const status = (await p.status())
   return status.success && status.code == 0;
 }
 
-interface DeployCommandOption{
-  port?: number;
-  proxy?: string;
-  disableSocket?: boolean;
-  clientMaxBodySize?: number;
-  unixSocket?: string;
-}
 
-function checkDomainName(name: string){
+if (import.meta.main) {
-  return /^[a-z0-9][a-z0-9_-]{0,61}[a-z0-9]?$/i.test(name);
+  const cmd = new Command()
-}
+    .name("deployNginx")
+    .version("1.0.1")
+    .description("CLI")
+    .action(()=>{
+      console.log("sub command required");
+    })
+    .command("deploy", "deploy app")
+    .option("-p, --port <port:number>","port for app",{
+      required: true
+    })
+    .option("--disableSocket","disable socket io")
+    .option("--clientMaxBodySize <clientMaxBodySize:number>","client max body size: MB Unit",{
+      default: 20
+    })
+    .option("--proxy <proxy:string>","proxy pass for app")
+    .arguments("<value:string>")
+    .action(async (options, name)=>{
+      const deployPort = options.port;
+      const deployName = name;
 
-async function deployCommand(deployName: string,
+      if(deployName.includes("/")){
-    options?: DeployCommandOption): Promise<void>{
+        console.log("name invalid");
-  options ??= {}
+        return;
-
-  if(!checkDomainName(deployName)){
-    throw new ArgError("name invalid")
       }
 
       if(!isRunAsRoot()){
-    getLogger().warning("It's not executed as root")
+        console.log("Warning! It's not executed as root");
+      }
+      else{
+        console.log("run as root");
       }
 
       const services = await loadService();
+    
       const dir = [...Deno.readDirSync("/etc/nginx/sites-available")]
     
       if (dir.map(x => x.name).includes(deployName)) {
-    throw new ArgError("duplicated name: please use other name.")
+        console.log("duplicate!")
+        Deno.exit(1);
       }
 
       const proxyPass = options.proxy;
       const socketIO = !options.disableSocket;
       const content = createNginxConfigContent({
-    port: options.port,
+        port: deployPort,
         name: deployName,
-    unixSocket: options.unixSocket,
         proxyPass: proxyPass,
         socketIO: socketIO,
         clientMaxBodySize: options.clientMaxBodySize
@@ -181,60 +159,25 @@ async function deployCommand(deployName: string,
       if(services.map(x=>x.name).includes(deployName)){
         const target = services.find(x=>x.name == deployName);
         if(target){
-      target.port = options.port;
+          target.port = deployPort;
-      target.unixSocketPath = options.unixSocket;
         }
       }
       else {
         services.push({
           name: deployName,
-      port: options.port,
+          port: deployPort,
-      unixSocketPath: options.unixSocket,
         });
       }
       await saveService(services);
       
       if(!await NginxCheck()){
-    throw new NginxError("nginx config grammar failed");
+        console.log("nginx config grammar failed");
+        Deno.exit(1);
       }
 
       if(!await NginxReload()){
-    throw new NginxError("nginx reload failed");
+        console.log("nginx reload failed");
-  }
+        Deno.exit(1);  
-}
-
-
-if (import.meta.main) {
-  const cmd = new Command()
-    .name("deployNginx")
-    .version("1.0.2")
-    .description("CLI")
-    .action(()=>{
-      console.log("sub command required");
-    })
-    .command("deploy", "deploy app")
-    .option("-p, --port <port:number>","port for app")
-    .option("--unixSocket <unixSocket:string>","unix socket path")
-    .option("--disableSocket","disable socket io")
-    .option("--clientMaxBodySize <clientMaxBodySize:number>","client max body size: MB Unit",{
-      default: 20
-    })
-    .option("--proxy <proxy:string>","proxy pass for app. you can bind unix socket like \"unix:<your unix socket path>\"")
-    .arguments("<value:string>")
-    .action(async (options, name)=>{
-      try {
-        await deployCommand(name,{
-          port: options.port,
-          unixSocket: options.unixSocket,
-          clientMaxBodySize: options.clientMaxBodySize,
-          disableSocket: options.disableSocket,
-          proxy: options.proxy
-        });
-      }
-      catch(e){
-        if (e instanceof Error){
-          console.log(e.message);
-        }
       }
     })
     .command("undeploy","undeploy app")
@@ -261,25 +204,23 @@ if (import.meta.main) {
     .command("list","list deployed service")
     .action(async ()=>{
       const services = await loadService();
-      if(!Deno.stdout.isTerminal()){
+      if(!Deno.isatty(Deno.stdout.rid)){
         for (const service of services) {
-          printf("%s %s\n",service.name, (service.port ?? service.unixSocketPath ?? "ERROR").toString());
+          printf("%s %s\n",service.name, service.port.toString());
         }
       }
       else {
-        const maxServiceNameLength = services.map(x=>x.name.length).reduce((x,y)=>Math.max(x,y), 0);
+        const maxServiceNameLength = services.length == 0 ? 0 : services.map(x=>x.name.length).reduce((x,y)=>Math.max(x,y));
         const maxPadLength = Math.max(6,maxServiceNameLength);
-        const maxServiceOrNumberLength = services.map(x=> Math.max((x.port ?? 0).toString().length, x.unixSocketPath?.length ?? 0)).reduce((x,y)=>Math.max(x,y), 0);
+
-        const maxPad2Length = Math.max("PORT OR SOCKET PATH".length, maxServiceOrNumberLength);
         const prettyPrint = (name: string, port: string) => {
-          printf("%s %s\n",brightGreen(name.padEnd(maxPadLength, " ")), 
+          printf("%s %s\n",brightGreen(name) + " ".repeat(maxPadLength - name.length), 
-            brightMagenta(port.padEnd(maxPad2Length)
+            brightMagenta(port.padStart(5 - port.length)));
-            ));
         }
 
-        prettyPrint("NAME","PORT OR SOCKET PATH");
+        prettyPrint("NAME","PORT");
         for (const service of services) {
-          prettyPrint(service.name,(service.port ?? service.unixSocketPath ?? "ERROR").toString());
+          prettyPrint(service.name,service.port.toString());
         }
       }
     });

renew_dns.ts

@@ -1,64 +0,0 @@
-#!/usr/bin/env -S /root/.deno/bin/deno run --allow-env --allow-read --unstable --allow-sys --allow-run --allow-write
-import {load} from "https://deno.land/std@0.214.0/dotenv/mod.ts";
-import { Command } from "https://deno.land/x/cliffy@v0.25.7/mod.ts";
-
-async function changeTextRecord(domain: string, token:string, text: string){
-    const url = `https://www.duckdns.org/update?domains=${domain}&token=${token}&txt=${text}`
-    const res = await fetch(url);
-    const c = await res.text()
-    return c === "OK"
-}
-
-
-const env = await load();
-const domain = env.DUCKDNS_DOMAIN;
-const token = env.DUCKDNS_TOKEN;
-/*
-sudo certbot certonly --manual --preferred-challenges dns --renew-by-default -d "*.pages.prelude.duckdns.org"
-*/
-if(import.meta.main){
-    if (!domain || !token){
-        console.log("Env not found!");
-        Deno.exit(1);
-    }
-
-    //const cmd = new Deno.Command("certbot",{
-    //    args:[
-    //        "certonly",
-    //        "--manual",
-    //        "--preferred-challenges", 
-    //        "dns",
-    //        "--renew-by-default",
-    //        "-d", "*.pages.prelude.duckdns.org"
-    //    ],
-    //    stdin: "piped",
-    //    stdout: "piped",       
-    //});
-//
-    //const proc = cmd.spawn();
-    //await proc.stdout.pipeTo(Deno.stdout.writable);
-
-    await new Command()
-        .name("renew_dns")
-        .description("Duckdns TXT Record renewer")
-        .version("v1.0.0")
-        .option("-q, --quiet", "disable output.")
-        .arguments("<text>")
-        .action(async ({quiet},text)=>{
-            const s = await changeTextRecord(domain, token, text);
-            if (s) {
-                if (!quiet){
-                    console.log("success!");
-                }
-                Deno.exit(0);
-            }
-            else {
-                if(!quiet){
-                    console.log("failed!");
-                }
-                Deno.exit(1);
-            }
-        })
-        .parse(Deno.args);
-
-}