Merge pull request #1523 from solid/recursive-create-websocket

Triggers websocket when a folder is recursively created

Author: jaxoncreed

lib/handlers/patch.js

@@ -4,14 +4,16 @@ module.exports = handler
 
 const bodyParser = require('body-parser')
 const fs = require('fs')
-const fx = require('mkdir-recursive')
+const mkdirp = require('fs-extra').mkdirp
 const debug = require('../debug').handlers
 const error = require('../http-error')
 const $rdf = require('rdflib')
 const crypto = require('crypto')
 const overQuota = require('../utils').overQuota
 const getContentType = require('../utils').getContentType
 const withLock = require('../lock')
+const { promisify } = require('util')
+const pathUtility = require('path')
 
 // Patch parsers by request body content type
 const PATCH_PARSERS = {
@@ -60,7 +62,19 @@ async function patchHandler (req, res, next) {
     const pathSplit = path.split('/')
     const directory = pathSplit.slice(0, pathSplit.length - 1).join('/')
     if (!fs.existsSync(directory)) {
-      fx.mkdirSync(directory, { recursive: true })
+      const firstDirectoryRecursivelyCreated = await promisify(mkdirp)(directory)
+      if (ldp.live) {
+        // Get parent for the directory made
+        const parentDirectoryPath =
+          pathUtility.dirname(firstDirectoryRecursivelyCreated) + pathUtility.sep
+        // Get the url for the parent
+        const parentDirectoryUrl = (await ldp.resourceMapper.mapFileToUrl({
+          path: parentDirectoryPath,
+          hostname: req.hostname
+        })).url
+        // Update websockets
+        ldp.live(new URL(parentDirectoryUrl).pathname)
+      }
     }
 
     // Patch the graph and write it back to the file

lib/ldp.js

@@ -229,8 +229,10 @@ class LDP {
 
     // First check if we are above quota
     let isOverQuota
+    // Someone had a reason to make url actually a req sometimes but not
+    // all the time. So now we have to account for that, as done below.
+    const hostname = typeof url !== 'string' ? url.hostname : URL.parse(url).hostname
     try {
-      const { hostname } = URL.parse(url.url || url)
       isOverQuota = await overQuota(this.resourceMapper.resolveFilePath(hostname), this.serverUri)
     } catch (err) {
       throw error(500, 'Error finding user quota')
@@ -243,7 +245,19 @@ class LDP {
     const { path } = await this.resourceMapper.mapUrlToFile({ url, contentType, createIfNotExists: true })
     const dirName = dirname(path)
     try {
-      await promisify(mkdirp)(dirName)
+      const firstDirectoryRecursivelyCreated = await promisify(mkdirp)(dirName)
+      if (this.live && firstDirectoryRecursivelyCreated) {
+        // Get parent for the directory made
+        const parentDirectoryPath =
+          utilPath.dirname(firstDirectoryRecursivelyCreated) + utilPath.sep
+        // Get the url for the parent
+        const parentDirectoryUrl = (await this.resourceMapper.mapFileToUrl({
+          path: parentDirectoryPath,
+          hostname
+        })).url
+        // Update websockets
+        this.live(URL.parse(parentDirectoryUrl).pathname)
+      }
     } catch (err) {
       debug.handlers('PUT -- Error creating directory: ' + err)
       throw error(err,

package.json

@@ -86,7 +86,6 @@
     "li": "^1.3.0",
     "mashlib": "^1.6.6",
     "mime-types": "^2.1.27",
-    "mkdir-recursive": "^0.4.0",
     "negotiator": "^0.6.2",
     "node-fetch": "^2.6.1",
     "node-forge": "^0.10.0",