Merge branch 'develop'

packages/api/src/utility/JsonLinesDatastore.js

@@ -2,7 +2,6 @@ const fs = require('fs');
 const os = require('os');
 const rimraf = require('rimraf');
 const path = require('path');
-const lineReader = require('line-reader');
 const AsyncLock = require('async-lock');
 const lock = new AsyncLock();
 const stableStringify = require('json-stable-stringify');
@@ -11,23 +10,7 @@ const requirePluginFunction = require('./requirePluginFunction');
 const esort = require('external-sorting');
 const uuidv1 = require('uuid/v1');
 const { jsldir } = require('./directories');
-
-function fetchNextLineFromReader(reader) {
-  return new Promise((resolve, reject) => {
-    if (!reader.hasNextLine()) {
-      resolve(null);
-      return;
-    }
-
-    reader.nextLine((err, line) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(line);
-      }
-    });
-  });
-}
+const LineReader = require('./LineReader');
 
 class JsonLinesDatastore {
   constructor(file, formatterFunction) {
@@ -74,7 +57,7 @@ class JsonLinesDatastore {
     await new Promise(resolve => rimraf(tempDir, resolve));
   }
 
-  _closeReader() {
+  async _closeReader() {
     // console.log('CLOSING READER', this.reader);
     if (!this.reader) return;
     const reader = this.reader;
@@ -84,7 +67,7 @@ class JsonLinesDatastore {
     // this.firstRowToBeReturned = null;
     this.currentFilter = null;
     this.currentSort = null;
-    return new Promise(resolve => reader.close(resolve));
+    await reader.close();
   }
 
   async notifyChanged(callback) {
@@ -100,12 +83,9 @@ class JsonLinesDatastore {
   async _openReader(fileName) {
     // console.log('OPENING READER', fileName);
     // console.log(fs.readFileSync(fileName, 'utf-8'));
-    return new Promise((resolve, reject) =>
-      lineReader.open(fileName, (err, reader) => {
-        if (err) reject(err);
-        resolve(reader);
-      })
-    );
+
+    const fileStream = fs.createReadStream(fileName);
+    return new LineReader(fileStream);
   }
 
   parseLine(line) {
@@ -120,7 +100,7 @@ class JsonLinesDatastore {
     //   return res;
     // }
     for (;;) {
-      const line = await fetchNextLineFromReader(this.reader);
+      const line = await this.reader.readLine();
       if (!line) {
         // EOF
         return null;
@@ -240,6 +220,7 @@ class JsonLinesDatastore {
       // console.log(JSON.stringify(this.currentFilter, undefined, 2));
       for (let i = 0; i < limit; i += 1) {
         const line = await this._readLine(true);
+        // console.log('READED LINE', i);
         if (line == null) break;
         res.push(line);
       }

packages/api/src/utility/LineReader.js

@@ -0,0 +1,88 @@
+const readline = require('readline');
+
+class Queue {
+  constructor() {
+    this.elements = {};
+    this.head = 0;
+    this.tail = 0;
+  }
+  enqueue(element) {
+    this.elements[this.tail] = element;
+    this.tail++;
+  }
+  dequeue() {
+    const item = this.elements[this.head];
+    delete this.elements[this.head];
+    this.head++;
+    return item;
+  }
+  peek() {
+    return this.elements[this.head];
+  }
+  getLength() {
+    return this.tail - this.head;
+  }
+  isEmpty() {
+    return this.getLength() === 0;
+  }
+}
+
+class LineReader {
+  constructor(input) {
+    this.input = input;
+    this.queue = new Queue();
+    this.resolve = null;
+    this.isEnded = false;
+    this.rl = readline.createInterface({
+      input,
+    });
+    this.input.pause();
+
+    this.rl.on('line', line => {
+      this.input.pause();
+      if (this.resolve) {
+        const resolve = this.resolve;
+        this.resolve = null;
+        resolve(line);
+        return;
+      }
+      this.queue.enqueue(line);
+    });
+
+    this.rl.on('close', () => {
+      if (this.resolve) {
+        const resolve = this.resolve;
+        this.resolve = null;
+        this.isEnded = true;
+        resolve(null);
+        return;
+      }
+      this.queue.enqueue(null);
+    });
+  }
+
+  readLine() {
+    if (this.isEnded) {
+      return Promise.resolve(null);
+    }
+
+    if (!this.queue.isEmpty()) {
+      const res = this.queue.dequeue();
+      if (res == null) this.isEnded = true;
+      return Promise.resolve(res);
+    }
+
+    this.input.resume();
+
+    return new Promise(resolve => {
+      this.resolve = resolve;
+    });
+  }
+
+  close() {
+    this.isEnded = true;
+    return new Promise(resolve => this.input.close(resolve));
+  }
+}
+
+module.exports = LineReader;

packages/api/src/utility/directories.js

@@ -42,18 +42,23 @@ function datadir() {
   return dir;
 }
 
-const dirFunc = (dirname, clean) => () => {
-  const dir = path.join(datadir(), dirname);
-  ensureDirectory(dir, clean);
+const dirFunc =
+  (dirname, clean, subdirs = []) =>
+  () => {
+    const dir = path.join(datadir(), dirname);
+    ensureDirectory(dir, clean);
+    for (const subdir of subdirs) {
+      ensureDirectory(path.join(dir, subdir), false);
+    }
 
-  return dir;
-};
+    return dir;
+  };
 
 const jsldir = dirFunc('jsl', true);
 const rundir = dirFunc('run', true);
 const uploadsdir = dirFunc('uploads', true);
 const pluginsdir = dirFunc('plugins');
-const archivedir = dirFunc('archive');
+const archivedir = dirFunc('archive', false, ['default']);
 const appdir = dirFunc('apps');
 const filesdir = dirFunc('files');
 const logsdir = dirFunc('logs', 3600 * 24 * 7);

packages/api/src/utility/freeTableStorage.js

@@ -1,15 +0,0 @@
-const fs = require('fs-extra');
-
-async function saveFreeTableData(file, data) {
-  const { structure, rows } = data;
-  const fileStream = fs.createWriteStream(file);
-  await fileStream.write(JSON.stringify({ __isStreamHeader: true, ...structure }) + '\n');
-  for (const row of rows) {
-    await fileStream.write(JSON.stringify(row) + '\n');
-  }
-  await fileStream.close();
-}
-
-module.exports = {
-  saveFreeTableData,
-};