update esm and tests

Author: CI Fix

index.mjs

@@ -1,6 +1,9 @@
 import createApp from './lib/create-app.mjs'
 import createServer from './lib/create-server.mjs'
-import startCli from './bin/lib/cli.js'
+// import startCli from './bin/lib/cli.js'
+import { createRequire } from 'module'
+const require = createRequire(import.meta.url)
+const startCli = require('./bin/lib/cli.js')
 
 export default createApp
-export { createServer, startCli }
+export { createServer, startCli } 

lib/create-server.mjs

@@ -5,7 +5,7 @@ import http from 'http'
 import SolidWs from 'solid-ws'
 import createApp from './create-app.mjs'
 import globalTunnel from 'global-tunnel-ng'
-import { handlers as debug } from './debug.mjs'
+import { settings as debugSettings } from './debug.mjs'
 import { createRequire } from 'module'
 
 function createServer (argv, app) {
@@ -20,7 +20,7 @@ function createServer (argv, app) {
     mount = mount.slice(0, -1)
   }
   app.use(mount, ldpApp)
-  debug.settings('Base URL (--mount): ' + mount)
+  debugSettings('Base URL (--mount): ' + mount)
 
   if (argv.idp) {
     console.warn('The idp configuration option has been renamed to multiuser.')
@@ -37,8 +37,8 @@ function createServer (argv, app) {
   if (!needsTLS) {
     server = http.createServer(app)
   } else {
-    debug.settings('SSL Private Key path: ' + argv.sslKey)
-    debug.settings('SSL Certificate path: ' + argv.sslCert)
+    debugSettings('SSL Private Key path: ' + argv.sslKey)
+    debugSettings('SSL Certificate path: ' + argv.sslCert)
 
     if (!argv.sslCert && !argv.sslKey) {
       throw new Error('Missing SSL cert and SSL key to enable WebIDs')

lib/debug.mjs

@@ -15,4 +15,23 @@ export const accounts = debug('solid:accounts')
 export const email = debug('solid:email')
 export const ldp = debug('solid:ldp')
 export const fs = debug('solid:fs')
-export const prep = debug('solid:prep')
+export const prep = debug('solid:prep')
+
+export default {
+  handlers,
+  errors,
+  ACL,
+  cache,
+  parse,
+  metadata,
+  authentication,
+  settings,
+  server,
+  subscription,
+  container,
+  accounts,
+  email,
+  ldp,
+  fs,
+  prep
+}

lib/handlers/index.mjs

@@ -3,7 +3,8 @@
 import path from 'path'
 import { createRequire } from 'module'
 const require = createRequire(import.meta.url)
-const debug = require('debug')('solid:index')
+import debugModule from 'debug'
+const debug = debugModule('solid:index')
 const Negotiator = require('negotiator')
 import url from 'url'
 const URI = require('urijs')

lib/handlers/put.mjs

@@ -1,11 +1,10 @@
 import bodyParser from 'body-parser'
 import debugModule from 'debug'
-const debug = debugModule('solid:put')
+const debugPut = debugModule('solid:put')
 import { getContentType, stringToStream } from '../utils.mjs'
 import HTTPError from '../http-error.mjs'
 
 export default async function handler (req, res, next) {
-  debug(req.originalUrl)
   // deprecated kept for compatibility
   res.header('MS-Author-Via', 'SPARQL') // is this needed ?
   const contentType = req.get('content-type')
@@ -35,7 +34,7 @@ function isAuxiliary (req) {
 }
 
 async function putValidRdf (req, res, next) {
-  debug('Parsing RDF for ' + req.originalUrl)
+  debugPut('Parsing RDF for ' + req.originalUrl)
   const ldp = req.app.locals.ldp
   const contentType = getContentType(req.headers) || 'text/turtle'
 
@@ -44,16 +43,16 @@ async function putValidRdf (req, res, next) {
     req.body = stringToStream(req.body)
     return putResource(req, res, next)
   } catch (err) {
-    debug(`Invalid RDF file: ${req.originalUrl} - ${err}`)
+    debugPut(`Invalid RDF file: ${req.originalUrl} - ${err}`)
     return next(HTTPError(400, `Invalid RDF file: ${err}`))
   }
 }
 
 async function putResource (req, res, next) {
   const ldp = req.app.locals.ldp
   const contentType = getContentType(req.headers)
-  debug('Request ' + req.originalUrl)
-  debug('content-type is', contentType)
+  debugPut('Request ' + req.originalUrl)
+  debugPut('content-type is', contentType)
 
   // check whether a folder or resource with same name exists
   try {
@@ -65,23 +64,24 @@ async function putResource (req, res, next) {
     const stream = req
     const result = await putStream(ldp, req, res, stream, contentType)
     res.set('MS-Author-Via', 'SPARQL') // ??? really?
+    console.log('PUT result code:', result)
     if (result === 201) {
-      debug('new file created')
+      debugPut('new file created')
       res.sendStatus(result)
     } else {
-      debug('file updated')
+      debugPut('file updated')
       res.sendStatus(result)
     }
     next()
   } catch (e) {
-    debug('putResource error:' + e.status + ' ' + e.message)
+    debugPut('putResource error:' + e.status + ' ' + e.message)
     next(e)
   }
 }
 
-function putStream (ldp, req, res, stream, contentType) {
+async function putStream (ldp, req, res, stream, contentType) {
   const uri = res.locals.target.url
-  return new Promise((resolve, reject) => {
+  /* return new Promise((resolve, reject) => {
     ldp.put(req, res, uri, contentType, stream, (err, result) => {
       if (err) {
         debug('putResource error:' + err.status + ' ' + err.message)
@@ -91,5 +91,14 @@ function putStream (ldp, req, res, stream, contentType) {
       }
       resolve(result)
     })
-  })
+  }) */
+  try {
+    return await ldp.put(uri, stream, contentType);
+  } catch (err) {
+    debugPut('putResource error:' + err.status + ' ' + err.message);
+        err.status = err.status || 500
+        err.message = err.message || 'Unknown error'
+    throw err
+  }
+
 }

lib/ldp.mjs

@@ -8,7 +8,7 @@ import url from 'url'
 import fs from 'fs'
 const $rdf = require('rdflib')
 const { mkdirp } = require('fs-extra')
-const uuid = require('uuid')
+import uuid from'uuid' // there seem to be an esm module
 import debug from './debug.mjs'
 import error from './http-error.mjs'
 import { stringToStream, serialize, overQuota, getContentType, parse } from './utils.mjs'
@@ -183,6 +183,7 @@ class LDP {
       createIfNotExists: true,
       searchIndex: false
     })
+    debug.handlers('PUT -- Mapped url to file: ' + path)
 
     return await this.putResource(url, stream, contentType, path)
   }

lib/rdf-notification-template.mjs

@@ -1,6 +1,6 @@
 import { createRequire } from 'module'
 const require = createRequire(import.meta.url)
-const uuid = require('uuid')
+import uuid from 'uuid'
 
 const CONTEXT_ACTIVITYSTREAMS = 'https://www.w3.org/ns/activitystreams'
 const CONTEXT_NOTIFICATION = 'https://www.w3.org/ns/solid/notification/v1'