整理结构

masx200 · Jun 7, 2021 · 34e728b · 34e728b
1 parent 5fad2d6
commit 34e728b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/dist/webdav-cli.cli.js b/dist/webdav-cli.cli.js
@@ -80,8 +80,7 @@ const config = {
 };
 const run = async () => {
     const webdavCli = new webdav_cli_server_1.WebdavCli(config);
-    const webdavCliServer = await webdavCli.start();
-    console.log(webdavCliServer.config);
+    await webdavCli.start();
 };
 run();
 process_1.default.on("unhandledRejection", (e) => {

diff --git a/dist/webdav-cli.server.d.ts b/dist/webdav-cli.server.d.ts
@@ -1,7 +1,10 @@
-import { WebdavCliServer, WebdavCliConfig } from "./webdav-cli.interfaces";
+import { v2 as webdav } from "webdav-server";
+import { WebdavCliConfig } from "./webdav-cli.interfaces";
 export declare class WebdavCli {
     config: WebdavCliConfig;
+    server: webdav.WebDAVServer;
     constructor(config: Partial<WebdavCliConfig>);
     getConfig(config: Partial<WebdavCliConfig>): WebdavCliConfig;
-    start(): Promise<WebdavCliServer>;
+    init(): webdav.WebDAVServer;
+    start(): Promise<void>;
 }
diff --git a/dist/webdav-cli.server.js b/dist/webdav-cli.server.js
@@ -51,8 +51,10 @@ const webdav_cli_utils_1 = require("./webdav-cli.utils");
 const webdav_cli_constants_1 = require("./webdav-cli.constants");
 class WebdavCli {
     config;
+    server;
     constructor(config) {
         this.config = this.getConfig(config);
+        this.server = this.init();
     }
     getConfig(config) {
         const selfSignedKey = path_1.join(
@@ -107,7 +109,7 @@ class WebdavCli {
             directory,
         };
     }
-    async start() {
+    init() {
         const config = this.config;
         const userManager = new webdav_server_1.v2.SimpleUserManager();
         const user = userManager.addUser(
@@ -147,7 +149,6 @@ class WebdavCli {
             port: config.port,
             hostname: config.host,
         });
-        server.config = config;
         server.beforeRequest(async (ctx, next) => {
             const { url, headers, method } = ctx.request;
             console.log(">> ", { method, url }, headers);
@@ -168,6 +169,12 @@ class WebdavCli {
             console.log(log);
             next();
         });
+        return server;
+    }
+    async start() {
+        const config = this.config;
+        const { server } = this;
+        console.log(config);
         await server.setFileSystemAsync(
             "/",
             new webdav_server_1.v2.PhysicalFileSystem(config.path),
@@ -183,7 +190,6 @@ class WebdavCli {
             "Run with --help to print help",
         ];
         console.log(logs.join("\n"));
-        return server;
     }
 }
 exports.WebdavCli = WebdavCli;
diff --git a/src/webdav-cli.cli.ts b/src/webdav-cli.cli.ts
@@ -88,9 +88,8 @@ const config = {
 const run = async () => {
     const webdavCli = new WebdavCli(config);
 
-    const webdavCliServer = await webdavCli.start();
-    // webdavCliServer.on('log', (ctx, fs, path, log) => console.log(log));
-    console.log(webdavCliServer.config);
+    //  console.log(webdavCli.config);
+    await webdavCli.start();
 };
 
 run();

diff --git a/src/webdav-cli.server.ts b/src/webdav-cli.server.ts
@@ -11,9 +11,10 @@ import {
 
 export class WebdavCli {
     config: WebdavCliConfig;
-
+    server: webdav.WebDAVServer;
     constructor(config: Partial<WebdavCliConfig>) {
         this.config = this.getConfig(config);
+        this.server = this.init();
     }
 
     getConfig(config: Partial<WebdavCliConfig>): WebdavCliConfig {
@@ -70,7 +71,7 @@ export class WebdavCli {
         };
     }
 
-    async start(): Promise<WebdavCliServer> {
+    init(): webdav.WebDAVServer {
         const config = this.config;
 
         const userManager = new webdav.SimpleUserManager();
@@ -110,9 +111,9 @@ export class WebdavCli {
                 : undefined,
             port: config.port,
             hostname: config.host,
-        }) as WebdavCliServer;
+        });
 
-        server.config = config;
+        //  server.config = config;
 
         server.beforeRequest(async (ctx, next) => {
             /*  if (config.directory) {
@@ -154,6 +155,12 @@ export class WebdavCli {
             next();
         });
 
+        return server;
+    }
+    async start() {
+        const config = this.config;
+        const { server } = this;
+        console.log(config);
         await server.setFileSystemAsync(
             "/",
             new webdav.PhysicalFileSystem(config.path),
@@ -171,7 +178,5 @@ export class WebdavCli {
         ];
 
         console.log(logs.join("\n"));
-
-        return server;
     }
 }