Added a 'autoSave' method to the server to start the auto-save withou…

…t starting the HTTP server
OpenMarshal · Aug 19, 2017 · 481413d · 481413d
1 parent 8763396
commit 481413d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 8 deletions.
diff --git a/lib/server/v2/webDAVServer/StartStop.js b/lib/server/v2/webDAVServer/StartStop.js
@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var WebDAVRequest_1 = require("../WebDAVRequest");
 var Errors_1 = require("../../../Errors");
-var Persistence_1 = require("./Persistence");
 var https = require("https");
 var http = require("http");
 function start(port, callback) {
@@ -72,8 +71,7 @@ function start(port, callback) {
                 }
             });
         });
-        if (this.options.autoSave)
-            Persistence_1.autoSave.bind(this)(this.options.autoSave);
+        this.autoSave();
     }
     this.server.listen(_port, this.options.hostname, function () {
         if (_callback)

diff --git a/lib/server/v2/webDAVServer/WebDAVServer.d.ts b/lib/server/v2/webDAVServer/WebDAVServer.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ExternalRequestContext, RequestContextExternalOptions, RequestContext } from '../RequestContext';
-import { WebDAVServerOptions } from '../WebDAVServerOptions';
+import { WebDAVServerOptions, IAutoSave } from '../WebDAVServerOptions';
 import { HTTPMethod } from '../WebDAVRequest';
 import { HTTPAuthentication } from '../../../user/v2/authentication/HTTPAuthentication';
 import { PrivilegeManager } from '../../../user/v2/privilege/PrivilegeManager';
@@ -72,6 +72,16 @@ export declare class WebDAVServer {
     start(callback: WebDAVServerStartCallback): any;
     start(port: number, callback: WebDAVServerStartCallback): any;
     stop: typeof startStop.stop;
+    /**
+     * Start the auto-save feature of the server. Use the server's options as settings.
+     */
+    autoSave(): any;
+    /**
+     * Start the auto-save feature of the server.
+     *
+     * @param options Settings of the auto-save.
+     */
+    autoSave(options: IAutoSave): any;
     autoLoad: typeof persistence.autoLoad;
     load: typeof persistence.load;
     save: typeof persistence.save;

diff --git a/lib/server/v2/webDAVServer/WebDAVServer.js b/lib/server/v2/webDAVServer/WebDAVServer.js
@@ -10,7 +10,6 @@ var startStop = require("./StartStop");
 var WebDAVServer = (function () {
     function WebDAVServer(options) {
         this.stop = startStop.stop;
-        // Persistence
         this.autoLoad = persistence.autoLoad;
         this.load = persistence.load;
         this.save = persistence.save;
@@ -166,6 +165,13 @@ var WebDAVServer = (function () {
     WebDAVServer.prototype.start = function (port, callback) {
         startStop.start.bind(this)(port, callback);
     };
+    WebDAVServer.prototype.autoSave = function (options) {
+        var fn = persistence.autoSave.bind(this);
+        if (options)
+            fn(options);
+        else if (this.options.autoSave)
+            fn(this.options.autoSave);
+    };
     WebDAVServer.prototype.method = function (name, manager) {
         this.methods[this.normalizeMethodName(name)] = manager;
     };

diff --git a/src/server/v2/webDAVServer/StartStop.ts b/src/server/v2/webDAVServer/StartStop.ts
@@ -98,8 +98,7 @@ export function start(port ?: number | WebDAVServerStartCallback, callback ?: We
             })
         })
 
-        if(this.options.autoSave)
-            autoSave.bind(this)(this.options.autoSave);
+        this.autoSave();
     }
 
     this.server.listen(_port, this.options.hostname, () => {

diff --git a/src/server/v2/webDAVServer/WebDAVServer.ts b/src/server/v2/webDAVServer/WebDAVServer.ts
@@ -1,5 +1,5 @@
 import { HTTPRequestContext, ExternalRequestContext, RequestContextExternalOptions, RequestContext } from '../RequestContext'
-import { WebDAVServerOptions, setDefaultServerOptions } from '../WebDAVServerOptions'
+import { WebDAVServerOptions, setDefaultServerOptions, IAutoSave } from '../WebDAVServerOptions'
 import { HTTPCodes, HTTPMethod } from '../WebDAVRequest'
 import { HTTPAuthentication } from '../../../user/v2/authentication/HTTPAuthentication'
 import { PrivilegeManager } from '../../../user/v2/privilege/PrivilegeManager'
@@ -264,6 +264,25 @@ export class WebDAVServer
     stop = startStop.stop
 
     // Persistence
+    /**
+     * Start the auto-save feature of the server. Use the server's options as settings.
+     */
+    autoSave()
+    /**
+     * Start the auto-save feature of the server.
+     * 
+     * @param options Settings of the auto-save.
+     */
+    autoSave(options : IAutoSave)
+    autoSave(options ?: IAutoSave)
+    {
+        const fn = persistence.autoSave.bind(this);
+
+        if(options)
+            fn(options);
+        else if(this.options.autoSave)
+            fn(this.options.autoSave);
+    }
     autoLoad = persistence.autoLoad
     load = persistence.load
     save = persistence.save