Change to fsPromises

diff --git a/Listener.mjs b/Listener.mjs
index 0e7c383..e94b961 100644 (file)
--- a/Listener.mjs
+++ b/Listener.mjs
@@ -22,12 +22,9 @@
  */
 
 import assert from 'assert'
-import fs from 'fs'
+import fsPromises from 'fs/promises'
 import http from 'http'
 import https from 'https'
-import util from 'util'
-
-let fs_readFile = util.promisify(fs.readFile)
 
 let Listener = function(request_func, options, diag) {
   if (!this instanceof Listener)
@@ -53,8 +50,8 @@ Listener.prototype.start = async function() {
     case 'https:':
       server = https.createServer(
         {
-          cert: await fs_readFile(this.options.ssl_cert),
-          key: await fs_readFile(this.options.ssl_key)
+          cert: await fsPromises.readFile(this.options.ssl_cert),
+          key: await fsPromises.readFile(this.options.ssl_key)
         }
       )
       break

diff --git a/Server.mjs b/Server.mjs
index 3f2a2da..1612bd5 100644 (file)
--- a/Server.mjs
+++ b/Server.mjs
@@ -26,12 +26,8 @@ import Listener from './Listener.mjs'
 import Resources from './Resources.mjs'
 import Site from './Site.mjs'
 import assert from 'assert'
-import fs from 'fs'
 import jst_server from './index.mjs'
 import url from 'url'
-import util from 'util'
-
-let fs_readFile = util.promisify(fs.readFile)
 
 let Server = function(resources, options/*, prev_server*/) {
   if (!this instanceof Server)

diff --git a/Site.mjs b/Site.mjs
index 80f7f33..05ff9c6 100644 (file)
--- a/Site.mjs
+++ b/Site.mjs
@@ -36,11 +36,8 @@ import TextCache from '@ndcode/text_cache'
 import ZipCache from '@ndcode/zip_cache'
 import assert from 'assert'
 import fs from 'fs'
+import fsPromises from 'fs/promises'
 import jst_server from './index.mjs'
-import util from 'util'
-
-let fs_mkdir = util.promisify(fs.mkdir)
-let fs_stat = util.promisify(fs.stat)
 
 let Site = function(resources, root, options/*, prev_site*/) {
   if (!this instanceof Site)
@@ -309,7 +306,7 @@ Site.prototype.redirect = function(env, pathname, message) {
 
 Site.prototype.internal_ensure_dir = async function(pathname) {
   try {
-    await fs_mkdir(pathname)
+    await fsPromises.mkdir(pathname)
     console.log('create directory', pathname)
   }
   catch (err) {
@@ -526,7 +523,7 @@ Site.prototype.serve_fs = async function(env, pathname) {
   if (range !== undefined) {
     let stats
     try {
-      stats = await fs_stat(pathname)
+      stats = await fsPromises.stat(pathname)
     }
     catch (err) {
       if (!(err instanceof Error) || err.code !== 'ENOENT')
@@ -642,7 +639,7 @@ Site.prototype.serve_dir = async function(env, pathname, components) {
 
   let stats
   try {
-    stats = await fs_stat(pathname)
+    stats = await fsPromises.stat(pathname)
   }
   catch (err) {
     if (!(err instanceof Error) || err.code !== 'ENOENT')