glib-web 2.6.3 → 2.6.5

package/action.js

@@ -52,7 +52,6 @@ import ActionsAnalyticsLogEvent from "./actions/analytics/logEvent";
 
 import ActionCommandsCopy from "./actions/commands/copy";
 import ActionCommandsCustom from "./actions/commands/custom";
-import ActionCommandsEnqueue from "./actions/commands/enqueue";
 
 import ActionToursStart from "./actions/tours/start";
 import ActionToursStop from "./actions/tours/stop";
@@ -112,7 +111,6 @@ const actions = {
 
   "commands/copy": ActionCommandsCopy,
   "commands/custom": ActionCommandsCustom,
-  "commands/enqueue": ActionCommandsEnqueue,
 
   "tours/start": ActionToursStart,
   "tours/stop": ActionToursStop,
@@ -126,6 +124,10 @@ export default class Action {
     if (!TypeUtils.isObject(spec)) {
       return;
     }
+    if (!TypeUtils.isObject(component)) {
+      console.warn("Action requires a component");
+      return;
+    }
 
     const name = spec.action;
     if (TypeUtils.isString(name)) {
@@ -134,28 +136,15 @@ export default class Action {
       } else {
         this.executeGlobal(name, spec, component, params);
       }
-
-      // const actionName = name.replace(/-v1$/, "");
-
-      // try {
-      //   const action = new actions[actionName]();
-      //   const logDisabled = action.logDisabled && action.logDisabled();
-      //   if (!logDisabled) {
-      //     console.log(`Executing "${actionName}"`);
-      //   }
-      //   action.execute(spec, null, component, params);
-      // } catch (e) {
-      //   console.log(`Failed executing command: "${e.message}"`);
-      // }
     } else {
-      console.log(`Invalid action: "${name}"`);
+      console.warn(`Invalid action: "${name}"`);
     }
   }
 
   static executeLocal(name, spec, component) {
     const methodName = name.replace(/^component\//, "");
     const componentName = GLib.component.vueName(component);
-    console.log(
+    console.debug(
       `Executing component action on ${componentName}: ${methodName}`
     );
     component[`action_${methodName}`](spec);
@@ -172,7 +161,7 @@ export default class Action {
       const action = new registry[actionName]();
       const logDisabled = action.logDisabled && action.logDisabled();
       if (!logDisabled) {
-        console.log(`Executing "${actionName}"`);
+        console.debug(`Executing "${actionName}"`);
       }
       action.execute(spec, component, params);
     } catch (e) {

package/actions/analytics/logEvent.js

@@ -14,10 +14,10 @@ export default class {
       const suffix = params.referer_group ? "w/ referer" : "w/o referer";
       params.build_env = Utils.settings.env;
       // params.build_version = Utils.settings.appVersion;
-      console.log(`Logging ${suffix}:`, properties.name, params);
+      console.debug(`Logging ${suffix}:`, properties.name, params);
       firebase.analytics().logEvent(properties.name, params);
     } else {
-      console.log("Waiting for firebase to be initialized...");
+      console.debug("Waiting for firebase to be initialized...");
       setTimeout(() => {
         this.execute(properties);
       }, 100);

package/actions/auth/saveCsrfToken.js

@@ -1,11 +1,5 @@
-// import Storage from '../../utils/storage'
-// import Keys from '../../keys'
-
 export default class {
   execute(properties, component) {
-    // console.log(properties['token'])
-    // Storage.setLocal(Keys.Db.csrfToken, properties['token'])
-
     Utils.dom.setCsrf(properties["token"]);
     Action.execute(properties["onSave"], component);
   }

package/actions/cables/push.js

@@ -4,7 +4,9 @@ export default class {
       const ws = window.vueApp.actionCable;
       const channel = ws.channels[channelName];
 
-      console.log("Pushing to", channel);
+      // TODO: Use logDisabled() that reads params from server to decide whether we want to print the log or not.
+      // This is because `push` action's logs are a bit sensitive.
+      console.debug("Pushing to", channel);
 
       Utils.type.ifString(properties.event, eventName => {
         if (channel) {

package/actions/http/get.js

@@ -1,18 +1,15 @@
 export default class {
   execute(properties, controller) {
     const currentUrl = window.location.href;
-    // const htmlUrl = Utils.url.htmlUrl(properties["url"]);
 
     GLib.http.execute(properties, "GET", controller, (page, response) => {
       Utils.type.ifString(properties.historyUrl, historyUrl => {
         const cleanUrl = Utils.url.htmlUrl(historyUrl);
         if (cleanUrl !== currentUrl) {
-          console.log("URL", cleanUrl, response.url, response);
           const data = Object.assign({}, window.vueApp.page, {
             replayGetResponse: page.onResponse
           });
 
-          // Utils.history.pushPage(data, historyUrl);
           Utils.history.pushPage(data, cleanUrl);
         }
       });

package/actions/panels/scrollTo.js

@@ -5,7 +5,7 @@ export default class {
       Utils.launch.dialog.closestBody(component) || Utils.history._pageBody;
 
     const selector = `#${properties.viewId}`;
-    console.log("Scrolling to", selector);
+    console.debug("Scrolling to", selector);
     const element = pageBody.querySelector(selector);
     element.scrollIntoView({
       behavior: properties["animate"] ? "smooth" : "auto"

package/actions/panels/scrollToBottom.js

@@ -4,7 +4,7 @@ export default class {
     // TODO: make this support any panelId
     const target = properties.panelId ? `_innerBody` : "_pageBody";
     const pageBody = Utils.history[target];
-    console.log(`Scrolling ${target} to bottom`);
+    console.debug(`Scrolling ${target} to bottom`);
     pageBody.scrollTo({
       top: pageBody.scrollHeight,
       behavior: properties["animate"] ? "smooth" : "auto"

package/actions/windows/closeWithReload.js

@@ -6,7 +6,7 @@ export default class {
     const data = Object.assign({}, properties);
     if (!Utils.history.back()) {
       data.url = fallbackUrl;
-      console.log("Use fallbackUrl", data.url);
+      console.debug("Use fallbackUrl", data.url);
     }
 
     // Allow time for history.back() to complete, which is important for actions that need

package/actions/ws/push.js

@@ -13,14 +13,14 @@ export default class {
           channel
             .push(eventName, payload)
             .receive("ok", resp => {
-              console.log(
+              console.debug(
                 `Push to '${topicName}/${eventName}' succeeded`,
                 resp
               );
               Utils.ws.handleResponse(resp.onResponse, component);
             })
             .receive("error", resp => {
-              console.log(`Push to '${topicName}/${eventName}' failed`, resp);
+              console.debug(`Push to '${topicName}/${eventName}' failed`, resp);
               Utils.ws.handleResponse(resp.onResponse, component);
             });
         } else {

package/app.vue

@@ -91,7 +91,7 @@ export default {
     }
   },
   created() {
-    console.log(
+    console.debug(
       `Version: ${Utils.settings.appVersion} (${Utils.settings.env})`
     );
     Utils.history.saveInitialContent(this.page);
@@ -145,7 +145,6 @@ export default {
       });
     },
     updateMainHeight() {
-      console.debug("Setting body height");
       this.mainHeight = window.innerHeight - this.$refs.appBar.$el.offsetHeight;
     }
   }
@@ -196,7 +195,7 @@ body,
   background: yellow !important;
 }
 // Don't override the default button's effect.
-.glib-clickable:not(.v-btn) {
+.glib-clickable:not(.v-btn):not(.disabled) {
   cursor: pointer;
 
   // // So that we can display a semi-transparent layer on hover (see below)

package/components/datetime.vue

@@ -34,10 +34,8 @@ export default {
       }
     },
     $tearDown() {
-      console.log("TimeTicker destroyed");
       if (this.timer != null) {
         clearInterval(this.timer);
-        console.log(`Timer stopped: ${this.timer}`);
       }
     },
     tick() {

package/components/fields/newRichText.vue

@@ -147,7 +147,7 @@ export default {
         upload.start((error, blob) => {
           if (error) {
             // Handle the error
-            console.log("Failed uploading image!");
+            console.warn("Failed uploading image!");
           } else {
             this.insertImage(file, blob, onComplete);
           }

package/components/fields/timer.vue

@@ -108,10 +108,9 @@ export default {
       }
     },
     $tearDown() {
-      console.log("Cleaning up timer...");
       if (this.timer != null) {
         clearInterval(this.timer);
-        console.log(`Timer stopped: ${this.timer}`);
+        console.debug(`Timer stopped: ${this.timer}`);
         this.timer == null;
       }
     },

package/components/image.vue

@@ -57,23 +57,15 @@ export default {
       let width, height;
       const aspectRatio = image.naturalWidth / image.naturalHeight;
 
-      console.log("FIT1");
-
       if (this.spec.width == "matchParent") {
-        console.log("FIT2");
-
         width = "100%";
         // This breaks the image height when displayed in a badge.
         // height = `${100 / aspectRatio}%`;
       } else {
         if (this.spec.width) {
-          console.log("FIT3");
-
           width = `${this.spec.width}px`;
           height = `${this.spec.width / aspectRatio}px`;
         } else if (this.spec.height) {
-          console.log("FIT4", this.spec.height);
-
           width = `${this.spec.height * aspectRatio}px`;
           height = `${this.spec.height}px`;
         }

package/components/label.vue

@@ -31,10 +31,14 @@ export default {
 
       this.text = this.spec.text;
     },
-    action_set(spec) {
-      if (spec.user_id !== spec.filterKey) {
-        this.text = spec.text;
-      }
+    // action_set(spec) {
+    //   if (spec.user_id !== spec.filterKey) {
+    //     this.text = spec.text;
+    //   }
+    // },
+    action_merge(mergedSpec) {
+      Object.assign(this.spec, mergedSpec);
+      this.$ready();
     }
   }
 };

package/components/markdown.vue

@@ -30,7 +30,7 @@ export default {
     $ready() {
       if (this.spec.previewVideo) {
         this.youtubeId = this.extractYoutubeId(this.spec.text);
-        console.log("Detected Youtube ID", this.youtubeId);
+        console.debug("Detected Youtube ID", this.youtubeId);
       }
       // Set all links to be openWeb or open in a new tab by default
       if (!this.spec.openWeb) {

package/components/mixins/generic.js

@@ -54,7 +54,7 @@ export default {
       const channel = ws.channels[topicName];
 
       if (!channel) {
-        console.log(`Topic not ready: '${topicName}'`);
+        console.debug(`Topic not ready: '${topicName}'`);
         setTimeout(() => {
           // Wait until $wsInitPhoenixSocket() has executed.
           this.$wsSubscribeEvents(spec);
@@ -63,7 +63,7 @@ export default {
       }
 
       for (const eventName of events) {
-        console.log(`Registering event '${eventName}'`);
+        console.debug(`Registering event '${eventName}'`);
         channel.on(eventName, payload => {
           console.debug(`Received '${eventName}' event`, payload);
           Utils.ws.handleResponse(payload.onResponse, this);

package/components/mixins/styles.js

@@ -65,12 +65,12 @@ export default {
         const topDialog = Utils.launch.dialog.topDialog();
         if (topDialog) {
           if (!topDialog.isFormDirty) {
-            console.log("Dialog form is now dirty");
+            console.debug("Dialog form is now dirty");
             topDialog.isFormDirty = true;
           }
         } else {
           if (!window.vueApp.isFormDirty) {
-            console.log("Window form is now dirty");
+            console.debug("Window form is now dirty");
             window.vueApp.isFormDirty = true;
           }
         }

package/components/mixins/ws/actionCable.js

@@ -19,13 +19,13 @@ export default {
             channel: channelName
           });
 
-          console.log("Connecting to channel", subscription);
+          console.debug("Connecting to channel", subscription);
 
           consumer.subscriptions.create(subscription, {
             connected() {
               const ws = window.vueApp.actionCable;
               ws.channels[channelName] = this;
-              console.log("Connected to channel", channelName);
+              console.debug("Connected to channel", channelName);
             },
 
             disconnected() {},

package/components/mixins/ws/phoenixSocket.js

@@ -12,7 +12,6 @@ export default {
       Utils.type.ifObject(
         spec,
         ws => {
-          console.log("Connecting socket...");
           Utils.launch.snackbar.indicator("Connecting...");
           Utils.http.startIndicator(this);
 
@@ -54,14 +53,14 @@ export default {
 
       this._wsSocket = socket;
       socket.onOpen(() => {
-        console.log("Connected socket");
+        console.debug("Connected socket");
         this._wsJoinChannel(socket, spec);
         Utils.http.stopIndicator(this);
       });
       socket.onError(() => {
         // Start the indicator again because this can trigger even after successfully connected.
         Utils.http.startIndicator(this);
-        console.log("Unable to connect socket");
+        console.debug("Unable to connect socket");
       });
       socket.connect();
     },
@@ -80,7 +79,7 @@ export default {
       const channel = socket.channel(topicName, {});
 
       for (const eventName of events) {
-        console.log(`Registering event '${eventName}'`);
+        console.debug(`Registering event '${eventName}'`);
         channel.on(eventName, payload => {
           console.debug(`Received '${eventName}' event`, payload);
           Utils.ws.handleResponse(payload.onResponse, this);
@@ -90,11 +89,11 @@ export default {
       channel
         .join()
         .receive("ok", resp => {
-          console.log(`Channel joined '${topicName}'`, resp);
+          console.debug(`Channel joined '${topicName}'`, resp);
           ws.channels[topicName] = channel;
         })
         .receive("error", resp => {
-          console.log(`Unable to join channel '${topicName}'`, resp);
+          console.debug(`Unable to join channel '${topicName}'`, resp);
           Utils.launch.snackbar.error(
             "Unable to connect. Please try again.",
             this
@@ -103,7 +102,7 @@ export default {
     },
     _wsDisconnectSocket() {
       if (this._wsSocket) {
-        console.log("Disconnecting socket");
+        console.debug("Disconnecting socket");
         // Sometimes this doesn't prevent errorneous socket from trying to reconnect. In this case,
         // the socket will keep attempting to connect.
         this._wsSocket.disconnect();

package/components/panels/custom.vue

@@ -58,6 +58,7 @@ export default {
     $ready() {
       const onClick = this.spec.onClick ? { onClick: this.spec.onClick } : {};
       this.customData = Object.assign(onClick, this.spec.data);
+      // Fix an issue where the panel doesn't get updated
       if (this.$refs.ccomp) {
         this.$refs.ccomp.$forceUpdate();
       }

package/components/panels/horizontal.vue

@@ -29,7 +29,6 @@
     >
       <!-- Using `item.id` as key is important to make sure the item gets updated
            when dragging ends. -->
-      <!-- TODO: This div is causing image issue -->
       <div
         v-for="(item, index) in childViews"
         :key="item.id || index"
@@ -132,7 +131,7 @@ export default {
 
       const targetRowIndex = event.newIndex;
       if (event.from == event.to && event.oldIndex == targetRowIndex) {
-        console.log("Reordering canceled");
+        console.debug("Reordering canceled");
         return;
       }
 

package/components/panels/list.vue

@@ -1,11 +1,5 @@
 <template>
-  <v-list
-    :two-line="twoLine"
-    :three-line="threeLine"
-    class="py-0"
-    :class="$classes()"
-    :style="$styles()"
-  >
+  <v-list class="py-0" :class="$classes()" :style="$styles()">
     <div ref="topAnchor">
       <div v-if="prevPageUrl" class="py-3 px-4">
         Loading...
@@ -28,9 +22,10 @@
         >
           <div
             v-for="(row, rowIndex) in section.rows"
-            :key="`${sectionIndex}_${rowIndex}`"
+            :key="row.id || `${sectionIndex}_${rowIndex}`"
             :ref="`row_${sectionIndex}_${rowIndex}`"
             :data-dragRowId="row.id"
+            class="row_container"
           >
             <!-- <v-divider v-if="!spec.responsiveCols && rowIndex == 0" /> -->
 
@@ -88,30 +83,6 @@ export default {
       dragSupport: null
     };
   },
-  computed: {
-    twoLine() {
-      for (const section of this.sections) {
-        const rows = section.rows || [];
-        for (const row of rows) {
-          if (row.subtitle) {
-            return true;
-          }
-        }
-      }
-      return false;
-    },
-    threeLine() {
-      for (const section of this.sections) {
-        const rows = section.rows || [];
-        for (const row of rows) {
-          if (row.subsubtitle) {
-            return true;
-          }
-        }
-      }
-      return false;
-    }
-  },
   methods: {
     $ready() {
       this.sections = this.spec.sections || [];
@@ -139,7 +110,6 @@ export default {
       return row;
     },
     action_loadNext(spec) {
-      console.log("TODO: load new comments and append to this list", spec);
       // TODO
       // - Load next rows/items from the Rails server
       //   - You can pass some parameters (e.g. currentItemId) for pagination
@@ -227,7 +197,7 @@ export default {
       const targetSectionedRowIndex = event.newIndex;
       // const sourceSectionedRowIndex = event.oldIndex;
       if (event.from == event.to && event.oldIndex == targetSectionedRowIndex) {
-        console.log("Reordering canceled");
+        console.debug("Reordering canceled");
         return;
       }
 
@@ -235,7 +205,6 @@ export default {
       this.$recursiveUpdate();
 
       const targetSectionIndex = this.getSectionIndex(event.to);
-      // const targetSection = this.getSection(targetSectionIndex);
 
       const targetAbsoluteIndex =
         this.previousSectionsRowCount(event.to) + targetSectionedRowIndex;
@@ -260,6 +229,27 @@ export default {
       });
 
       GLib.action.execute(mergedSpec, this);
+
+      this.hackLingeringHighlight();
+    },
+    hackLingeringHighlight() {
+      // After a row finished dragging, the row below it will automatically be
+      // "active&hover" for some reason, which will cause it to be incorrectly
+      // highlighted
+      // This seems to be a browser/library bug, so as a workaround, we temporarily
+      // apply the "disabled" class so the highlighting doesn't happen.
+      this.$el
+        .querySelectorAll(":active .row_container > .glib-clickable:hover")
+        .forEach(activeRow => {
+          activeRow.classList.add("disabled");
+          document.addEventListener(
+            "mousemove",
+            function() {
+              activeRow.classList.remove("disabled");
+            },
+            { once: true }
+          );
+        });
     },
     getSectionIndex(element) {
       return element.dataset.dragsectionindex;

package/components/panels/responsive.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- Use `display: contents` so this div doesn't intefere with the child's sizing behaviour. -->
   <div style="display: contents;">
     <!-- <common-responsive v-if="!hoverViewsSpec" :spec="spec" /> -->
     <v-menu

package/components/panels/scroll.vue

@@ -23,7 +23,6 @@ export default {
       // // Let the styles be handled by the child panel.
       // const outerSpec = {};
       // outerSpec["padding"] = this.spec["outerPadding"];
-      // console.log("outerSpec", outerSpec);
       // const styles = this.$styles(outerSpec);
       //
       // const styles = this.genericStyles();
@@ -36,8 +35,6 @@ export default {
       //   width: this.spec.width,
       //   height: this.spec.height
       // });
-      //
-      // console.log("styles", styles);
 
       // Let the specified styles be handled by the child panel.
       const styles = this.$styles({

package/components/panels/table.vue

@@ -139,9 +139,6 @@ export default {
       //     const createdAt = row[5]
       //     const activationState = row[14] ? 'active' : 'pending'
       //     count += 1
-      //     if (email.includes("'")) {
-      //       console.log("INVALID NAME", name)
-      //     }
       //     str += `{ name: "${name}".to_s, email: '${email}'.to_s, created_at: '${createdAt}', activation_state: '${activationState}'},\n`
       //   }
       // }

package/nav/dialog.vue

@@ -134,7 +134,7 @@ export default {
       });
     },
     $tearDown() {
-      console.log("Dialog destroyed");
+      console.debug("Dialog destroyed");
       this.stack.remove(this);
     },
     close() {
@@ -192,7 +192,6 @@ export default {
       this.model = true;
     },
     updateMainHeight() {
-      console.debug("Setting body height");
       this.mainHeight = window.innerHeight - 140;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glib-web",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "description": "",
   "main": "index.js",
   "scripts": {

package/utils/history.js

@@ -77,7 +77,7 @@ export default class {
       window.history.back();
       return true;
     } else {
-      console.log("Reached beginning of navigation stack");
+      console.debug("Reached beginning of navigation stack");
       return false;
     }
   }

package/utils/http.js

@@ -31,7 +31,8 @@ export default class {
     const formData = new FormData();
     var params = data || {};
     for (const key in params) {
-      formData.append(key, params[key]);
+      // formData.append(key, params[key]);
+      this._populateFormData(formData, key, params[key]);
     }
 
     if (needCsrfToken && !Type.isString(params["authenticity_token"])) {
@@ -40,8 +41,33 @@ export default class {
     return formData;
   }
 
+  static _populateFormData(formData, key, value) {
+    if (GLib.type.isArray(value)) {
+      for (const item of value) {
+        this._populateFormData(formData, `${key}[]`, item);
+      }
+    } else if (GLib.type.isObject(value)) {
+      for (const innerKey in value) {
+        this._populateFormData(
+          formData,
+          `${key}[${innerKey}]`,
+          value[innerKey]
+        );
+      }
+    } else {
+      formData.append(key, value);
+    }
+  }
+
   static load(properties, component) {
-    const url = new URL(properties["url"]);
+    const urlString = properties["url"];
+    let url;
+    try {
+      url = new URL(urlString);
+    } catch (e) {
+      console.warn("Invalid URL", urlString);
+      throw e;
+    }
     const domainMatched = window.location.hostname == url.hostname;
 
     // If this is an external domain, we rely on `onUnload()` instead.
@@ -134,18 +160,23 @@ export default class {
       url = Utils.url.appendParams(url, body);
       body = null;
     }
-    console.log(`${method} ${url}`);
+    console.debug(`${method} ${url}`);
 
     const request = new HttpRequest();
     let response = null;
     const vm = this;
 
     const analyticsHeaders = this.analyticsHeaders(component);
+    const headers = Object.assign(
+      { Accept: "text/html" },
+      analyticsHeaders,
+      GLib.settings.headerAugmenter(url, method)
+    );
 
     fetch(url, {
       method: method,
       body: body,
-      headers: Object.assign({ Accept: "text/html" }, analyticsHeaders),
+      headers: headers,
       // Make sure to pass cookies for same origin URLs.
       // Needed for some browsers, e.g. Edge and Android's native.
       credentials: "same-origin",

package/utils/private/ws.js

@@ -7,13 +7,13 @@ export default class {
     const ws = window.vueApp.webSocket;
     Utils.type.ifObject(payload.wsHeader, header => {
       Object.assign(ws.header, header);
-      console.log("New header: ", ws.header);
+      console.debug("New header: ", ws.header);
     });
 
     const actionName = payload.action;
     if (actionName.startsWith("component/")) {
       const methodName = actionName.replace(/^component\//, "");
-      console.log(`Executing component action: ${methodName}`);
+      console.debug(`Executing component action: ${methodName}`);
       component[`action_${methodName}`](payload);
     } else {
       GLib.action.execute(payload, component);

package/utils/public.js

@@ -5,11 +5,8 @@ import Type from "./type";
 import Form from "./form";
 import Component from "./component";
 import Hash from "./hash";
-import Queue from "./queue";
 import Settings from "./settings";
 
-const _queue = new Queue();
-
 export default class {
   static get action() {
     return Action;
@@ -35,7 +32,4 @@ export default class {
   static get settings() {
     return Settings;
   }
-  static get queue() {
-    return _queue;
-  }
 }

package/utils/settings.js

@@ -6,6 +6,10 @@ class MutableSettings {
     this.errorHandler = err => {
       console.error(err.message);
     };
+    this.headerAugmenter = (_url, _method) => {
+      // Set a custom augmenter to add custom HTTP headers.
+      return {};
+    };
   }
 }
 const settings = new MutableSettings();
@@ -24,6 +28,10 @@ export default class ImmutableSettings {
     return settings.errorHandler;
   }
 
+  static get headerAugmenter() {
+    return settings.headerAugmenter;
+  }
+
   static get env() {
     return process.env.NODE_ENV;
   }

package/actions/commands/enqueue.js

@@ -1,17 +0,0 @@
-// import Hash from "../../utils/hash";
-
-export default class {
-  // async executeJob(spec, component) {
-  //   console.log("Waiting for next job1...");
-  //   GLib.action.execute(spec.onExecute, component);
-  //   await this.sleep(2000);
-  //   console.log("Waiting for next job2...");
-  // }
-  execute(spec, component) {
-    GLib.queue.enqueue(() => {
-      GLib.action.execute(spec.onExecute, component);
-      // console.log("Waiting for next job0...");
-      // this.executeJob(spec, component);
-    });
-  }
-}

package/utils/queue.js

@@ -1,104 +0,0 @@
-// 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...");
-      }
-    }
-  }
-  [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);
-//   }
-// }