@vnejs/tools 0.0.29 → 0.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/tools",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "CLI tools of @vnejs",
   "source": "src/index.js",
   "main": "dist/index.js",

package/src/resize/audio.js

@@ -1,10 +1,12 @@
 const path = require("path");
 
 const { createDir, getFilesInDir, readDir } = require("../utils/filesystem");
-const { clear, ffmpeg } = require("./utils");
+const { clear, ffmpeg, Semaphore } = require("./utils");
 
 const gameDir = path.join(process.env.PWD, "game");
 
+const semaphore = new Semaphore(8);
+
 const resizeOne = async (toDirName, mediaDir, mediaTypes, quality, fromDirName, options) => {
   const promises = [];
 
@@ -46,14 +48,16 @@ const resizeOne = async (toDirName, mediaDir, mediaTypes, quality, fromDirName,
     })
   );
 
-  for (let i = 0; i < promises.length; i++) await promises[i]();
+  for (let i = 0; i < promises.length; i++) {
+    await semaphore.push(i, 1, promises[i]);
+  }
 };
 const resize = async (toDirName, mediaTypes, quality, fromDirName, options) => {
   const mods = await readDir(gameDir);
 
-  return Promise.all(
-    mods.map((mod) => resizeOne(toDirName, path.join(gameDir, mod, "media"), mediaTypes, quality, fromDirName, options))
-  );
+  for (let i = 0; i < mods.length; i++) {
+    await resizeOne(toDirName, path.join(gameDir, mods[i], "media"), mediaTypes, quality, fromDirName, options);
+  }
 };
 
 module.exports = async (options) => {
@@ -71,4 +75,5 @@ module.exports = async (options) => {
   addPromise(["128", "all"].includes(options.target), 128);
 
   for (let i = 0; i < promises.length; i++) await promises[i]();
+  await semaphore.waitAll();
 };

package/src/resize/image.js

@@ -2,10 +2,12 @@ const path = require("path");
 const sharp = require("sharp");
 
 const { createDir, getFilesInDir, readFile, readDir } = require("../utils/filesystem");
-const { clear } = require("./utils");
+const { clear, Semaphore } = require("./utils");
 
 const gameDir = path.join(process.env.PWD, "game");
 
+const semaphore = new Semaphore(8);
+
 const resizeOne = async (toDirName, mediaDir, mediaTypes, getSizes, fromDirName, options) => {
   const promises = [];
   const quality = options.web ? 80 : 100;
@@ -50,16 +52,16 @@ const resizeOne = async (toDirName, mediaDir, mediaTypes, getSizes, fromDirName,
     })
   );
 
-  for (let i = 0; i < promises.length; i++) await promises[i]();
+  for (let i = 0; i < promises.length; i++) {
+    await semaphore.push(i, 1, promises[i]);
+  }
 };
 const resize = async (toDirName, mediaTypes, getSizes, fromDirName, options) => {
   const mods = await readDir(gameDir);
 
-  return Promise.all(
-    mods.map((mod) =>
-      resizeOne(toDirName, path.join(gameDir, mod, "media"), mediaTypes, getSizes, fromDirName, options)
-    )
-  );
+  for (let i = 0; i < mods.length; i++) {
+    await resizeOne(toDirName, path.join(gameDir, mods[i], "media"), mediaTypes, getSizes, fromDirName, options);
+  }
 };
 
 module.exports = async (options) => {
@@ -69,10 +71,8 @@ module.exports = async (options) => {
       if (!c) return;
       const dirName = `${height}p`;
       await clear(dirName, options.media);
-      await Promise.all([
-        resize(dirName, options.media, (d) => [Math.round((d.width * height) / 1080)], "original", options),
-        resize(dirName, options.media, (d) => [Math.round((d.width * height) / 2160)], "original-4k", options),
-      ]);
+      await resize(dirName, options.media, (d) => [Math.round((d.width * height) / 1080)], "original", options);
+      await resize(dirName, options.media, (d) => [Math.round((d.width * height) / 2160)], "original-4k", options);
     });
 
   addPromise(["all", "mobile", "360"].includes(options.target), 360);
@@ -83,4 +83,5 @@ module.exports = async (options) => {
   addPromise(["all", "desktop", "2160"].includes(options.target), 2160);
 
   for (let i = 0; i < promises.length; i++) await promises[i]();
+  await semaphore.waitAll();
 };

package/src/resize/utils.js

@@ -16,3 +16,65 @@ const clear = async (dirName, mediaTypes) => {
 };
 
 module.exports = { clearOne, clear, ffmpeg };
+
+const getPromiseField = (e) => e.promise;
+const onlyNotInProcessWithResolve = (e) => !e.inProcess && e.resolve;
+const byWeight = (a, b) => b.weight - a.weight;
+const race = (e) => (e.length ? Promise.race(e.map(getPromiseField)) : new Promise(setImmediate));
+
+class Semaphore {
+  queue = {};
+  queueCurrent = [];
+  queueSorted = [];
+  length = 0;
+  weight = 0;
+  maxWeight = 999;
+  isQueueStarted = false;
+  constructor(maxWeight) {
+    this.maxWeight = maxWeight;
+  }
+
+  push = (key, weight, func) => {
+    const element = this.queue[key];
+    if (element) {
+      if (element.weight > weight && !element.inProcess) Object.assign(element, { weight, func });
+      return element.promise;
+    }
+    const obj = { key, weight, func, inProcess: false };
+    const promise = new Promise((resolve) => (obj.resolve = resolve));
+    obj.promise = promise;
+    this.queueSorted = [];
+    this.queue[key] = obj;
+    this.length++;
+    !this.isQueueStarted && this._startQueue();
+    return promise;
+  };
+
+  waitAll = () => Promise.all(this.queueCurrent.map(getPromiseField));
+
+  _startQueue = async () => {
+    this.isQueueStarted = true;
+    while (this.length) {
+      this.queueSorted = this.queueSorted.length ? this.queueSorted : this._recalcSortedQueue();
+      while (this._isCanAddNewElement(this.queueSorted)) this._start(this.queueSorted.pop());
+      await race(this.queueCurrent);
+    }
+    this.isQueueStarted = false;
+  };
+  _start = (e) => {
+    this.weight += e.weight;
+    e.inProcess = true;
+    this.queueCurrent.push(e);
+    e.func().then(() => {
+      this.weight -= e.weight;
+      this.queueCurrent = this.queueCurrent.filter((a) => a.key !== e.key);
+      this.length--;
+      delete this.queue[e.key];
+      e.resolve();
+    });
+  };
+  _isCanAddNewElement = (queue) => queue.length && this.maxWeight >= this.weight + queue[queue.length - 1].weight;
+  _recalcSortedQueue = () => Object.values(this.queue).filter(onlyNotInProcessWithResolve).sort(byWeight);
+}
+
+module.exports.Semaphore = Semaphore;

package/src/resize/video.js

@@ -1,10 +1,12 @@
 const path = require("path");
 
 const { createDir, getFilesInDir, readDir } = require("../utils/filesystem");
-const { clear, ffmpeg } = require("./utils");
+const { clear, ffmpeg, Semaphore } = require("./utils");
 
 const gameDir = path.join(process.env.PWD, "game");
 
+const semaphore = new Semaphore(8);
+
 const resizeOne = async (toDirName, mediaDir, mediaTypes, height, fromDirName, options) => {
   const promises = [];
 
@@ -46,14 +48,16 @@ const resizeOne = async (toDirName, mediaDir, mediaTypes, height, fromDirName, o
     })
   );
 
-  for (let i = 0; i < promises.length; i++) await promises[i]();
+  for (let i = 0; i < promises.length; i++) {
+    await semaphore.push(i, 1, promises[i]);
+  }
 };
 const resize = async (toDirName, mediaTypes, height, fromDirName, options) => {
   const mods = await readDir(gameDir);
 
-  return Promise.all(
-    mods.map((mod) => resizeOne(toDirName, path.join(gameDir, mod, "media"), mediaTypes, height, fromDirName, options))
-  );
+  for (let i = 0; i < mods.length; i++) {
+    await resizeOne(toDirName, path.join(gameDir, mods[i], "media"), mediaTypes, height, fromDirName, options);
+  }
 };
 
 module.exports = async (options) => {
@@ -64,14 +68,10 @@ module.exports = async (options) => {
 
       const dirName = `${height}p`;
       await clear(dirName, options.media);
-      await Promise.all([
-        resize(dirName, options.media, height, "original", options),
-        resize(dirName, options.media, height, "original-4k", options),
-      ]);
+      await resize(dirName, options.media, height, "original", options);
+      await resize(dirName, options.media, height, "original-4k", options);
     });
 
-  console.log(9999);
-
   addPromise(["all", "mobile", "360"].includes(options.target), 360);
   addPromise(["all", "mobile", "540"].includes(options.target), 540);
   addPromise(["all", "mobile", "desktop", "test", "720"].includes(options.target), 720);
@@ -80,4 +80,5 @@ module.exports = async (options) => {
   addPromise(["all", "desktop", "2160"].includes(options.target), 2160);
 
   for (let i = 0; i < promises.length; i++) await promises[i]();
+  await semaphore.waitAll();
 };