fs/co: add fs.exists and wait for promise on co.clearInterval.

YusukeShimizu · Oct 18, 2017 · 1c1e429 · 1c1e429
1 parent aeb3d8f
commit 1c1e429
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/lib/utils/co.js b/lib/utils/co.js
@@ -208,18 +208,24 @@ async function every(jobs) {
 function startInterval(func, time, self) {
   const ctx = {
     timer: null,
-    stopped: false
+    stopped: false,
+    running: false,
+    resolve: null
   };
 
   const cb = async () => {
     assert(ctx.timer != null);
     ctx.timer = null;
 
     try {
+      ctx.running = true;
       await func.call(self);
     } finally {
+      ctx.running = false;
       if (!ctx.stopped)
         ctx.timer = setTimeout(cb, time);
+      else if (ctx.resolve)
+        ctx.resolve();
     }
   };
 
@@ -235,11 +241,21 @@ function startInterval(func, time, self) {
 
 function stopInterval(ctx) {
   assert(ctx);
+
   if (ctx.timer != null) {
     clearTimeout(ctx.timer);
     ctx.timer = null;
   }
+
   ctx.stopped = true;
+
+  if (ctx.running) {
+    return new Promise((r) => {
+      ctx.resolve = r;
+    });
+  }
+
+  return Promise.resolve();
 }
 
 /**

diff --git a/lib/utils/fs.js b/lib/utils/fs.js
@@ -22,8 +22,26 @@ exports.closeSync = fs.closeSync;
 exports.constants = fs.constants;
 exports.createReadStream = fs.createReadStream;
 exports.createWriteStream = fs.createWriteStream;
-exports.exists = co.promisify(fs.exists);
-exports.existsSync = fs.existsSync;
+exports.exists = async (file) => {
+  try {
+    await exports.stat(file);
+    return true;
+  } catch (e) {
+    if (e.code === 'ENOENT')
+      return false;
+    throw e;
+  }
+};
+exports.existsSync = (file) => {
+  try {
+    exports.statSync(file);
+    return true;
+  } catch (e) {
+    if (e.code === 'ENOENT')
+      return false;
+    throw e;
+  }
+};
 exports.fchmod = co.promisify(fs.fchmod);
 exports.fchmodSync = fs.fchmodSync;
 exports.fchown = co.promisify(fs.fchown);