1.1.187-Beta

Author: ITHitBuild

FileSystem/Storage/Document.pages renamed to FileSystem/App_Data/Storage/Document.pages

@@ -0,0 +1 @@
+My notes file text

FileSystem/App_Data/Storage/General.docx

@@ -5,7 +5,7 @@ const path_1 = require("path");
 const DavFile_1 = require("./DavFile");
 const DavFolder_1 = require("./DavFolder");
 /**
- * Implementation of {@link DavContext}.
+ * Implementation of {@link DavContextBase}.
  * Resolves hierarchy items by paths.
  */
 class DavContext extends DavContextBase_1.DavContextBase {
@@ -22,14 +22,23 @@ class DavContext extends DavContextBase_1.DavContextBase {
      * @param prefixes Http listener prefixes.
      * @param repositoryPath Local path to repository.
      */
-    constructor(listenerContext, prefixes, principal, repositoryPath, logger) {
+    constructor(listenerContext, prefixes, principal, repositoryPath, logger, socketService) {
         super(listenerContext, prefixes);
         this.logger = logger;
         this.repositoryPath = repositoryPath;
+        this.socketService = socketService;
         if (principal !== null) {
             this.identity = principal;
         }
     }
+    /**
+     * Can trim any character or set of characters from the ends of a string.
+     * Uses a Regex escapement to replace them with empty.
+     * @param source
+     * @param chars A string or array of characters desired to be trimmed.
+     * @param ignoreCase
+     * @returns {string}
+     */
     trim(source, chars, ignoreCase) {
         if (chars === '') {
             return source;
@@ -66,14 +75,5 @@ class DavContext extends DavContextBase_1.DavContextBase {
         return null;
         //  no hierarchy item that corresponds to path parameter was found in the repository
     }
-    //$>
-    /**
-     * Returns the physical file path that corresponds to the specified virtual path on the Web server.
-     * @param relativePath Path relative to WebDAV root folder.
-     * @returns  Corresponding path in file system.
-     */
-    mapPath(relativePath) {
-        return this.repositoryPath;
-    }
 }
 exports.DavContext = DavContext;

FileSystem/Storage/Introduction.pptx renamed to FileSystem/App_Data/Storage/Introduction.pptx

@@ -6,9 +6,10 @@ import { ILogger } from "ithit.webdav.server/ILogger";
 import { sep } from "path";
 import { DavFile } from "./DavFile";
 import { DavFolder } from "./DavFolder";
+import { WebSocketsService } from "./WebSocketsService";
 
 /**
- * Implementation of {@link DavContext}.
+ * Implementation of {@link DavContextBase}.
  * Resolves hierarchy items by paths.
  */
 export class DavContext extends DavContextBase {
@@ -18,6 +19,8 @@ export class DavContext extends DavContextBase {
      */
     public repositoryPath: string;
 
+    public socketService: WebSocketsService;
+
     /**
      * Gets WebDAV Logger instance.
      */
@@ -44,17 +47,26 @@ export class DavContext extends DavContextBase {
      * @param prefixes Http listener prefixes.
      * @param repositoryPath Local path to repository.
      */
-    constructor(listenerContext: DavRequest, prefixes: DavResponse, principal: any, repositoryPath: string, logger: ILogger) {
+    constructor(listenerContext: DavRequest, prefixes: DavResponse, principal: any, repositoryPath: string, logger: ILogger, socketService: WebSocketsService) {
         super(listenerContext, prefixes);
         this.logger = logger;
         this.repositoryPath = repositoryPath;
+        this.socketService = socketService;
         if (principal !== null) {
             this.identity = principal;
         }
 
     }
 
-    public trim(source: string, chars?: string | string[], ignoreCase?: boolean): string {
+    /**
+     * Can trim any character or set of characters from the ends of a string.
+     * Uses a Regex escapement to replace them with empty.
+     * @param source
+     * @param chars A string or array of characters desired to be trimmed.
+     * @param ignoreCase
+     * @returns {string}
+     */
+    private trim(source: string, chars?: string | string[], ignoreCase?: boolean): string {
         if (chars === '') {
             return source;
         }
@@ -95,14 +107,4 @@ export class DavContext extends DavContextBase {
         //  no hierarchy item that corresponds to path parameter was found in the repository
     }
 	//$>
-
-    /**
-     * Returns the physical file path that corresponds to the specified virtual path on the Web server.
-     * @param relativePath Path relative to WebDAV root folder.
-     * @returns  Corresponding path in file system.
-     */
-    public mapPath(relativePath: string): string {
-
-        return this.repositoryPath;
-    }
 }

FileSystem/Storage/Library/Content.txt renamed to FileSystem/App_Data/Storage/Library/Content.txt

@@ -19,7 +19,7 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
      * Gets content type.
      */
     get contentType() {
-        let conType = String(mime_types_1.lookup(this.directory));
+        let conType = String(mime_types_1.lookup(this.fullPath));
         if (!conType) {
             conType = `application/octet-stream`;
         }
@@ -65,7 +65,7 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
      * @returns  File instance or null if physical file is not found in file system.
      */
     static async getFile(context, path) {
-        const filePath = EncodeUtil_1.EncodeUtil.decodeUrlPart(context.mapPath(path) + path_1.sep + path);
+        const filePath = EncodeUtil_1.EncodeUtil.decodeUrlPart(context.repositoryPath + path_1.sep + path);
         try {
             await util_1.promisify(fs_1.access)(filePath, constants_1.F_OK);
         }
@@ -78,8 +78,8 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
             return null;
         }
         const davFile = new DavFile(filePath, context, path, file);
-        davFile.serialNumber = Number(await FileSystemInfoExtension_1.FileSystemInfoExtension.getExtendedAttribute(davFile.directory, "SerialNumber"));
-        davFile.totalContentLength = Number(await FileSystemInfoExtension_1.FileSystemInfoExtension.getExtendedAttribute(davFile.directory, "TotalContentLength"));
+        davFile.serialNumber = Number(await FileSystemInfoExtension_1.FileSystemInfoExtension.getExtendedAttribute(davFile.fullPath, "SerialNumber"));
+        davFile.totalContentLength = Number(await FileSystemInfoExtension_1.FileSystemInfoExtension.getExtendedAttribute(davFile.fullPath, "TotalContentLength"));
         return davFile;
     }
     /**
@@ -103,8 +103,8 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
         if (this.containsDownloadParam(this.context.request.rawUrl)) {
             this.addContentDisposition(this.name);
         }
-        const fd = await util_1.promisify(fs_1.open)(this.directory, 'r');
-        const fileStream = fs_1.createReadStream(this.directory, {
+        const fd = await util_1.promisify(fs_1.open)(this.fullPath, 'r');
+        const fileStream = fs_1.createReadStream(this.fullPath, {
             flags: 'r',
             fd: fd,
             start: startIndex,
@@ -159,16 +159,26 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
         if (this.fileInfo.size < startIndex) {
             throw new DavException_1.DavException("Previous piece of file was not uploaded.", undefined, DavStatus_1.DavStatus.PRECONDITION_FAILED);
         }
-        await FileSystemInfoExtension_1.FileSystemInfoExtension.setExtendedAttribute(this.directory, "TotalContentLength", Number(totalFileSize));
-        await FileSystemInfoExtension_1.FileSystemInfoExtension.setExtendedAttribute(this.directory, "SerialNumber", (this.serialNumber || 0) + 1);
-        const fd = await util_1.promisify(fs_1.open)(this.directory, 'r+');
-        await util_1.promisify(fs_1.ftruncate)(fd, 0);
-        const fileStream = fs_1.createWriteStream(this.directory, {
+        await FileSystemInfoExtension_1.FileSystemInfoExtension.setExtendedAttribute(this.fullPath, "TotalContentLength", Number(totalFileSize));
+        await FileSystemInfoExtension_1.FileSystemInfoExtension.setExtendedAttribute(this.fullPath, "SerialNumber", (this.serialNumber || 0) + 1);
+        const fd = await util_1.promisify(fs_1.open)(this.fullPath, 'r+');
+        if (startIndex == 0 && this.fileInfo.size > 0) {
+            await util_1.promisify(fs_1.ftruncate)(fd, 0);
+        }
+        const fileStream = fs_1.createWriteStream(this.fullPath, {
             flags: 'r+',
-            fd
+            fd,
+            start: startIndex
+        });
+        await new Promise((resolve, reject) => {
+            fileStream.on('error', (error) => reject(error));
+            content.on('close', () => fileStream.end());
+            content.on('finish', () => resolve());
+            content.on('end', () => resolve());
+            content.on('error', (error) => reject(error));
+            content.pipe(fileStream);
+            content.resume();
         });
-        content.pipe(fileStream);
-        content.resume();
         return true;
     }
     //$>
@@ -182,10 +192,10 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
      */
     async copyTo(destFolder, destName, deep, multistatus) {
         const targetFolder = destFolder;
-        if (targetFolder == null || !await util_1.promisify(fs_1.exists)(targetFolder.directory)) {
+        if (targetFolder == null || !await util_1.promisify(fs_1.exists)(targetFolder.fullPath)) {
             throw new DavException_1.DavException("Target directory doesn't exist", undefined, DavStatus_1.DavStatus.CONFLICT);
         }
-        const newFilePath = path_1.join(targetFolder.directory, destName);
+        const newFilePath = path_1.join(targetFolder.fullPath, destName);
         const targetPath = (targetFolder.path + EncodeUtil_1.EncodeUtil.encodeUrlPart(destName));
         //  If an item with the same name exists - remove it.
         try {
@@ -201,7 +211,8 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
         }
         //  Copy the file togather with all extended attributes (custom props and locks).
         try {
-            await util_1.promisify(fs_1.copyFile)(this.directory, newFilePath);
+            await util_1.promisify(fs_1.copyFile)(this.fullPath, newFilePath);
+            this.context.socketService.notifyRefresh(targetFolder.path.replace(/\\/g, '/').replace(/\/$/, ""));
         }
         catch (err) {
             /*if(err.errno && err.errno === EACCES) {
@@ -225,10 +236,10 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
     async moveTo(destFolder, destName, multistatus) {
         await this.requireHasToken();
         const targetFolder = destFolder;
-        if (targetFolder == null || !await util_1.promisify(fs_1.exists)(targetFolder.directory)) {
+        if (targetFolder == null || !await util_1.promisify(fs_1.exists)(targetFolder.fullPath)) {
             throw new DavException_1.DavException("Target directory doesn't exist", undefined, DavStatus_1.DavStatus.CONFLICT);
         }
-        const newDirPath = path_1.join(targetFolder.directory, destName);
+        const newDirPath = path_1.join(targetFolder.fullPath, destName);
         const targetPath = (targetFolder.path + EncodeUtil_1.EncodeUtil.encodeUrlPart(destName));
         // If an item with the same name exists in target directory - remove it.
         try {
@@ -243,18 +254,22 @@ class DavFile extends DavHierarchyItem_1.DavHierarchyItem {
             return;
         }
         // Move the file.
-        await util_1.promisify(fs_1.rename)(this.directory, newDirPath);
+        await util_1.promisify(fs_1.rename)(this.fullPath, newDirPath);
         // Locks should not be copied, delete them.
         await FileSystemInfoExtension_1.FileSystemInfoExtension.setExtendedAttribute(newDirPath, "Locks", {});
+        this.context.socketService.notifyRefresh(targetFolder.path.replace(/\\/g, '/').replace(/\/$/, ""));
+        this.context.socketService.notifyRefresh(this.getParentPath(this.path));
     }
     //$>
     //$<IHierarchyItem.Delete
     /**
      * Called whan this file is being deleted.
      * @param multistatus Information about items that failed to delete.
      */
-    delete(multistatus) {
-        return util_1.promisify(fs_1.unlink)(this.directory);
+    async delete(multistatus) {
+        await util_1.promisify(fs_1.unlink)(this.fullPath);
+        this.context.socketService.notifyRefresh(this.getParentPath(this.path));
+        return;
     }
     //$>
     //$<IResumableUpload.CancelUpload	

FileSystem/Storage/Library/General.doc renamed to FileSystem/App_Data/Storage/Library/General.doc

@@ -28,7 +28,7 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
      * Gets content type.
      */
     get contentType(): string {
-        let conType = String(lookup(this.directory));
+        let conType = String(lookup(this.fullPath));
         if (!conType) {
             conType = `application/octet-stream`;
         }
@@ -103,7 +103,7 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
      * @returns  File instance or null if physical file is not found in file system.
      */
     public static async getFile(context: DavContext, path: string): Promise<DavFile | null> {
-        const filePath = EncodeUtil.decodeUrlPart(context.mapPath(path) + sep + path);
+        const filePath = EncodeUtil.decodeUrlPart(context.repositoryPath + sep + path);
         try {
             await promisify(access)(filePath, F_OK);
         } catch(err) {
@@ -118,9 +118,9 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
 
         const davFile: DavFile = new DavFile(filePath, context, path, file);
 
-        davFile.serialNumber = Number(await FileSystemInfoExtension.getExtendedAttribute<number>(davFile.directory, "SerialNumber"));
+        davFile.serialNumber = Number(await FileSystemInfoExtension.getExtendedAttribute<number>(davFile.fullPath, "SerialNumber"));
         davFile.totalContentLength = Number(await FileSystemInfoExtension.getExtendedAttribute<number>(
-            davFile.directory,
+            davFile.fullPath,
             "TotalContentLength"
         ));
 
@@ -150,8 +150,8 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
             this.addContentDisposition(this.name);
         }
 
-        const fd = await promisify(open)(this.directory, 'r');
-        const fileStream = createReadStream(this.directory, {
+        const fd = await promisify(open)(this.fullPath, 'r');
+        const fileStream = createReadStream(this.fullPath, {
             flags: 'r',
             fd: fd,
             start: startIndex,
@@ -212,16 +212,28 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
             throw new DavException("Previous piece of file was not uploaded.", undefined, DavStatus.PRECONDITION_FAILED);
         }
 
-        await FileSystemInfoExtension.setExtendedAttribute(this.directory, "TotalContentLength", Number(totalFileSize));
-        await FileSystemInfoExtension.setExtendedAttribute(this.directory, "SerialNumber", (this.serialNumber || 0) + 1);
-        const fd = await promisify(open)(this.directory, 'r+');
-        await promisify(ftruncate)(fd, 0);
-        const fileStream = createWriteStream(this.directory, {
+        await FileSystemInfoExtension.setExtendedAttribute(this.fullPath, "TotalContentLength", Number(totalFileSize));
+        await FileSystemInfoExtension.setExtendedAttribute(this.fullPath, "SerialNumber", (this.serialNumber || 0) + 1);
+        const fd = await promisify(open)(this.fullPath, 'r+');
+        if (startIndex == 0 && this.fileInfo.size > 0) {
+            await promisify(ftruncate)(fd, 0);
+        }
+
+        const fileStream = createWriteStream(this.fullPath, {
             flags: 'r+',
-            fd
+            fd,
+            start: startIndex
+        });
+
+        await new Promise((resolve, reject) => {
+            fileStream.on('error', (error) => reject(error));
+            content.on('close', () => fileStream.end());
+            content.on('finish', () => resolve());
+            content.on('end', () => resolve());
+            content.on('error', (error) => reject(error));
+            content.pipe(fileStream);
+            content.resume();
         });
-        content.pipe(fileStream);
-        content.resume();
 
         return true;
     }
@@ -237,11 +249,11 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
      */
     public async copyTo(destFolder: IItemCollection, destName: string, deep: boolean, multistatus: MultistatusException): Promise<void> {
         const targetFolder = destFolder as DavFolder;
-        if (targetFolder == null || !await promisify(exists)(targetFolder.directory)) {
+        if (targetFolder == null || !await promisify(exists)(targetFolder.fullPath)) {
             throw new DavException("Target directory doesn't exist", undefined, DavStatus.CONFLICT);
         }
 
-        const newFilePath = join(targetFolder.directory, destName);
+        const newFilePath = join(targetFolder.fullPath, destName);
         const targetPath = (targetFolder.path + EncodeUtil.encodeUrlPart(destName));
         //  If an item with the same name exists - remove it.
         try {
@@ -260,7 +272,8 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
 
         //  Copy the file togather with all extended attributes (custom props and locks).
         try {
-            await promisify(copyFile)(this.directory, newFilePath);            
+            await promisify(copyFile)(this.fullPath, newFilePath);
+            this.context.socketService.notifyRefresh(targetFolder.path.replace(/\\/g, '/').replace(/\/$/, ""));
         } catch (err) {
             /*if(err.errno && err.errno === EACCES) {
                 const ex = new NeedPrivilegesException("Not enough privileges");
@@ -285,11 +298,11 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
     public async moveTo(destFolder: IItemCollection, destName: string, multistatus: MultistatusException): Promise<void> {
         await this.requireHasToken();
         const targetFolder = destFolder as DavFolder;
-         if (targetFolder == null || !await promisify(exists)(targetFolder.directory)) {
+         if (targetFolder == null || !await promisify(exists)(targetFolder.fullPath)) {
             throw new DavException("Target directory doesn't exist", undefined, DavStatus.CONFLICT);
         }
 
-        const newDirPath = join(targetFolder.directory, destName);
+        const newDirPath = join(targetFolder.fullPath, destName);
         const targetPath = (targetFolder.path + EncodeUtil.encodeUrlPart(destName));
 
         // If an item with the same name exists in target directory - remove it.
@@ -307,10 +320,13 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
         }
 
         // Move the file.
-        await promisify(rename)(this.directory, newDirPath);
+        await promisify(rename)(this.fullPath, newDirPath);
 
         // Locks should not be copied, delete them.
         await FileSystemInfoExtension.setExtendedAttribute(newDirPath, "Locks", {});
+
+        this.context.socketService.notifyRefresh(targetFolder.path.replace(/\\/g, '/').replace(/\/$/, ""));
+        this.context.socketService.notifyRefresh(this.getParentPath(this.path));
     }
 	//$>
 
@@ -319,8 +335,11 @@ export class DavFile extends DavHierarchyItem implements IFile, IResumableUpload
      * Called whan this file is being deleted.
      * @param multistatus Information about items that failed to delete.
      */
-    public delete(multistatus: MultistatusException): Promise<void> {
-        return promisify(unlink)(this.directory);
+    public async delete(multistatus: MultistatusException): Promise<void> {
+        await promisify(unlink)(this.fullPath);
+        this.context.socketService.notifyRefresh(this.getParentPath(this.path));
+
+        return;
     }
 	//$>