Add slash command for dice rolls. Create class for worker wrappers

public/scripts/extensions.js

@@ -8,12 +8,38 @@ export {
     defaultRequestArgs,
     modules,
     extension_settings,
+    ModuleWorkerWrapper,
 };
 
 let extensionNames = [];
 let manifests = [];
 const defaultUrl = "http://localhost:5100";
 
+// Disables parallel updates
+class ModuleWorkerWrapper {
+    constructor(callback) {
+        this.isBusy = false;
+        this.callback = callback;
+    }
+
+    // Called by the extension
+    async update() {
+        // Don't touch me I'm busy...
+        if (this.isBusy) {
+            return;
+        }
+
+        // I'm free. Let's update!
+        try {
+            this.isBusy = true;
+            await this.callback();
+        }
+        finally {
+            this.isBusy = false;
+        }
+    }
+}
+
 const extension_settings = {
     apiUrl: defaultUrl,
     autoConnect: false,

public/scripts/extensions/caption/index.js

@@ -6,11 +6,7 @@ const MODULE_NAME = 'caption';
 const UPDATE_INTERVAL = 1000;
 
 async function moduleWorker() {
-    const context = getContext();
+    $('#send_picture').toggle(getContext().onlineStatus !== 'no_connection');
-
-    context.onlineStatus === 'no_connection'
-        ? $('#send_picture').hide(200)
-        : $('#send_picture').show(200);
 }
 
 async function setImageIcon() {

public/scripts/extensions/dice/index.js

@@ -1,21 +1,20 @@
 import { callPopup } from "../../../script.js";
 import { getContext } from "../../extensions.js";
+import { registerSlashCommand } from "../../slash-commands.js";
 export { MODULE_NAME };
 
 const MODULE_NAME = 'dice';
 const UPDATE_INTERVAL = 1000;
 
-function setDiceIcon() {
+async function doDiceRoll(customDiceFormula) {
-    const sendButton = document.getElementById('roll_dice');
+    let value = typeof customDiceFormula === 'string' ? customDiceFormula.trim() : $(this).data('value');
-    /* sendButton.style.backgroundImage = `url(/img/dice-solid.svg)`; */
-    //sendButton.classList.remove('spin');
-}
-
-async function doDiceRoll() {
-    let value = $(this).data('value');
 
     if (value == 'custom') {
-        value = await callPopup('Enter the dice formula:<br><i>(for example, <tt>2d6</tt>)</i>', 'input');
+        value = await callPopup('Enter the dice formula:<br><i>(for example, <tt>2d6</tt>)</i>', 'input');x
+    }
+
+    if (!value) {
+        return;
     }
 
     const isValid = droll.validate(value);
@@ -24,6 +23,8 @@ async function doDiceRoll() {
         const result = droll.roll(value);
         const context = getContext();
         context.sendSystemMessage('generic', `${context.name1} rolls a ${value}. The result is: ${result.total} (${result.rolls})`, { isSmallSys: true });
+    } else {
+        toastr.warning('Invalid dice formula');
     }
 }
 
@@ -84,17 +85,13 @@ function addDiceScript() {
 }
 
 async function moduleWorker() {
-    const context = getContext();
+    $('#roll_dice').toggle(getContext().onlineStatus !== 'no_connection');
-
-    context.onlineStatus === 'no_connection'
-        ? $('#roll_dice').hide(200)
-        : $('#roll_dice').show(200);
 }
 
-$(document).ready(function () {
+jQuery(function () {
     addDiceScript();
     addDiceRollButton();
-    setDiceIcon();
     moduleWorker();
     setInterval(moduleWorker, UPDATE_INTERVAL);
+    registerSlashCommand('roll', (_, value) => doDiceRoll(value), [], "<span class='monospace'>(dice formula)</span> – roll the dice. For example, /roll 2d6", false, true);
 });

public/scripts/extensions/expressions/index.js

@@ -1,5 +1,5 @@
 import { callPopup, getRequestHeaders, saveSettingsDebounced } from "../../../script.js";
-import { getContext, getApiUrl, modules, extension_settings } from "../../extensions.js";
+import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper } from "../../extensions.js";
 export { MODULE_NAME };
 
 const MODULE_NAME = 'expressions';
@@ -58,24 +58,6 @@ function onExpressionsShowDefaultInput() {
     }
 }
 
-let isWorkerBusy = false;
-
-async function moduleWorkerWrapper() {
-    // Don't touch me I'm busy...
-    if (isWorkerBusy) {
-        return;
-    }
-
-    // I'm free. Let's update!
-    try {
-        isWorkerBusy = true;
-        await moduleWorker();
-    }
-    finally {
-        isWorkerBusy = false;
-    }
-}
-
 async function moduleWorker() {
     const context = getContext();
 
@@ -509,6 +491,7 @@ async function onClickExpressionDelete(event) {
 
     addExpressionImage();
     addSettings();
-    setInterval(moduleWorkerWrapper, UPDATE_INTERVAL);
+    const wrapper = new ModuleWorkerWrapper(moduleWorker);
-    moduleWorkerWrapper();
+    setInterval(wrapper.update.bind(wrapper), UPDATE_INTERVAL);
+    moduleWorker();
 })();

public/scripts/extensions/floating-prompt/index.js

@@ -1,5 +1,5 @@
 import { chat_metadata, saveSettingsDebounced } from "../../../script.js";
-import { extension_settings, getContext } from "../../extensions.js";
+import { ModuleWorkerWrapper, extension_settings, getContext } from "../../extensions.js";
 import { registerSlashCommand } from "../../slash-commands.js";
 import { debounce } from "../../utils.js";
 export { MODULE_NAME };
@@ -110,24 +110,6 @@ function loadSettings() {
     $('#extension_floating_default').val(extension_settings.note.default);
 }
 
-let isWorkerBusy = false;
-
-async function moduleWorkerWrapper() {
-    // Don't touch me I'm busy...
-    if (isWorkerBusy) {
-        return;
-    }
-
-    // I'm free. Let's update!
-    try {
-        isWorkerBusy = true;
-        await moduleWorker();
-    }
-    finally {
-        isWorkerBusy = false;
-    }
-}
-
 async function moduleWorker() {
     const context = getContext();
 
@@ -226,7 +208,8 @@ async function moduleWorker() {
     }
 
     addExtensionsSettings();
-    setInterval(moduleWorkerWrapper, UPDATE_INTERVAL);
+    const wrapper = new ModuleWorkerWrapper(moduleWorker);
+    setInterval(wrapper.update.bind(wrapper), UPDATE_INTERVAL);
     registerSlashCommand('note', setNoteTextCommand, [], "<span class='monospace'>(text)</span> – sets an author's note for the currently selected chat", true, true);
     registerSlashCommand('depth', setNoteDepthCommand, [], "<span class='monospace'>(number)</span> – sets an author's note depth for in-chat positioning", true, true);
     registerSlashCommand('freq', setNoteIntervalCommand, ['interval'], "<span class='monospace'>(number)</span> – sets an author's note insertion frequency", true, true);

public/scripts/extensions/memory/index.js

@@ -1,5 +1,5 @@
 import { getStringHash, debounce } from "../../utils.js";
-import { getContext, getApiUrl, extension_settings } from "../../extensions.js";
+import { getContext, getApiUrl, extension_settings, ModuleWorkerWrapper } from "../../extensions.js";
 import { extension_prompt_types, is_send_press, saveSettingsDebounced } from "../../../script.js";
 export { MODULE_NAME };
 
@@ -129,24 +129,6 @@ function getLatestMemoryFromChat(chat) {
     return '';
 }
 
-let isWorkerBusy = false;
-
-async function moduleWorkerWrapper() {
-    // Don't touch me I'm busy...
-    if (isWorkerBusy) {
-        return;
-    }
-
-    // I'm free. Let's update!
-    try {
-        isWorkerBusy = true;
-        await moduleWorker();
-    }
-    finally {
-        isWorkerBusy = false;
-    }
-}
-
 async function moduleWorker() {
     const context = getContext();
     const chat = context.chat;
@@ -384,5 +366,6 @@ $(document).ready(function () {
 
     addExtensionControls();
     loadSettings();
-    setInterval(moduleWorkerWrapper, UPDATE_INTERVAL);
+    const wrapper = new ModuleWorkerWrapper(moduleWorker);
+    setInterval(wrapper.update.bind(wrapper), UPDATE_INTERVAL);
 });

public/scripts/extensions/tts/index.js

@@ -1,5 +1,5 @@
 import { callPopup, cancelTtsPlay, eventSource, event_types, isMultigenEnabled, is_send_press, saveSettingsDebounced } from '../../../script.js'
-import { extension_settings, getContext } from '../../extensions.js'
+import { ModuleWorkerWrapper, extension_settings, getContext } from '../../extensions.js'
 import { getStringHash } from '../../utils.js'
 import { ElevenLabsTtsProvider } from './elevenlabs.js'
 import { SileroTtsProvider } from './silerotts.js'
@@ -38,24 +38,6 @@ async function onNarrateOneMessage() {
     moduleWorker();
 }
 
-let isWorkerBusy = false;
-
-async function moduleWorkerWrapper() {
-    // Don't touch me I'm busy...
-    if (isWorkerBusy) {
-        return;
-    }
-
-    // I'm free. Let's update!
-    try {
-        isWorkerBusy = true;
-        await moduleWorker();
-    }
-    finally {
-        isWorkerBusy = false;
-    }
-}
-
 async function moduleWorker() {
     // Primarily determining when to add new chat to the TTS queue
     const enabled = $('#tts_enabled').is(':checked')
@@ -661,6 +643,7 @@ $(document).ready(function () {
     loadSettings() // Depends on Extension Controls and loadTtsProvider
     loadTtsProvider(extension_settings.tts.currentProvider) // No dependencies
     addAudioControl() // Depends on Extension Controls
-    setInterval(moduleWorkerWrapper, UPDATE_INTERVAL) // Init depends on all the things
+    const wrapper = new ModuleWorkerWrapper(moduleWorker);
+    setInterval(wrapper.update.bind(wrapper), UPDATE_INTERVAL) // Init depends on all the things
     eventSource.on(event_types.MESSAGE_SWIPED, resetTtsPlayback);
 })