glib-web 2.5.0 → 2.5.1

package/utils/mime_type.js

@@ -12,6 +12,7 @@ export default {
   css: "text/css",
   csv: "text/csv",
   doc: "application/msword",
+  docx: "application/msword",
   dll: "application/octet-stream",
   eot: "application/vnd.ms-fontobject",
   epub: "application/epub+zip",
@@ -43,6 +44,7 @@ export default {
   otf: "font/otf",
   png: "image/png",
   ppt: "application/vnd.ms-powerpoint",
+  pptx: "application/vnd.ms-powerpoint",
   rar: "application/x-rar-compressed",
   rtf: "application/rtf",
   sh: "application/x-sh",

package/utils/public.js

@@ -5,6 +5,9 @@ import Type from "./type";
 import Form from "./form";
 import Component from "./component";
 import Hash from "./hash";
+import Queue from "./queue";
+
+const _queue = new Queue();
 
 export default class {
   static get action() {
@@ -28,4 +31,7 @@ export default class {
   static get Hash() {
     return Hash;
   }
+  static get queue() {
+    return _queue;
+  }
 }

package/utils/queue.js

@@ -0,0 +1,112 @@
+// From https://stackoverflow.com/questions/47157428/how-to-implement-a-pseudo-blocking-async-queue-in-js-ts
+
+import Vue from "vue";
+
+// const jobQueue = [];
+export default class {
+  constructor() {
+    // invariant: at least one of the arrays is empty
+    this.resolvers = [];
+    this.promises = [];
+  }
+  _add() {
+    this.promises.push(
+      new Promise(resolve => {
+        this.resolvers.push(resolve);
+      })
+    );
+  }
+  enqueue(t) {
+    // if (this.resolvers.length) this.resolvers.shift()(t);
+    // else this.promises.push(Promise.resolve(t));
+    if (!this.resolvers.length) this._add();
+    this.resolvers.shift()(t);
+  }
+  dequeue() {
+    if (!this.promises.length) this._add();
+    return this.promises.shift();
+  }
+  // now some utilities:
+  isEmpty() {
+    // there are no values available
+    return !this.promises.length; // this.length <= 0
+  }
+  isBlocked() {
+    // it's waiting for values
+    return !!this.resolvers.length; // this.length < 0
+  }
+  get length() {
+    return this.promises.length - this.resolvers.length;
+  }
+  sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+  async start() {
+    // TODO: This is experimental
+    const delayBetweenJobs = 2000;
+
+    for await (const job of this) {
+      console.log("Executing job...");
+      job();
+      if (delayBetweenJobs) {
+        console.log("Waiting for next job1...");
+        await this.sleep(delayBetweenJobs);
+        console.log("Waiting for next job2...");
+      }
+    }
+    // console.log("JOB1");
+    // const job = this.dequeue();
+    // console.log("JOB2", job);
+    // job();
+    // Vue.nextTick(() => {
+    //   this.start();
+    // });
+    // await this.next();
+  }
+  [Symbol.asyncIterator]() {
+    // Todo: Use AsyncIterator.from()
+    return {
+      next: () => this.dequeue().then(value => ({ done: false, value })),
+      [Symbol.asyncIterator]() {
+        return this;
+      }
+    };
+  }
+}
+
+// export default class {
+//   constructor() {
+//     this.jobQueue = [];
+//     this.timerHandle = null;
+//   }
+//   // static get csrfElement() {
+//   //   return document.querySelector(`meta[name="csrf-token"]`);
+//   // }
+
+//   // static getCsrf() {
+//   //   return this.csrfElement.getAttribute("content");
+//   // }
+
+//   // static setCsrf(value) {
+//   //   return this.csrfElement.setAttribute("content", value);
+//   // }
+
+//   start(interval) {
+//     this.timerHandle = setInterval(() => {
+//       console.log("DEQUQE1");
+//       const oldestJob = this.jobQueue.shift();
+//       if (oldestJob) {
+//         console.log("DEQUQE2");
+//         oldestJob();
+//       }
+//     }, interval);
+//   }
+
+//   stop() {
+//     clearInterval(this.timerHandle);
+//   }
+
+//   enqueue(job) {
+//     this.jobQueue.push(job);
+//   }
+// }

package/utils/uploader.js

@@ -64,6 +64,9 @@ export default class Uploader {
       let validFileType = false;
       [spec.fileType].flat().forEach(key => {
         const acceptsRegex = new RegExp(mimeType[key]);
+        if (!mimeType[key]) {
+          console.error(`Mime type not found: ${key}`)
+        }
         if (acceptsRegex.test(this.file.type)) {
           validFileType = true;
         }