diff --git a/public/index.html b/public/index.html
index 8b10f038a..6fb88abe5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -41,6 +41,7 @@
+
diff --git a/public/script.js b/public/script.js
index 8adc509d7..fca41f91d 100644
--- a/public/script.js
+++ b/public/script.js
@@ -107,7 +107,7 @@ import {
} from "./scripts/poe.js";
import { debounce, delay, restoreCaretPosition, saveCaretPosition, end_trim_to_sentence } from "./scripts/utils.js";
-import { extension_settings, getContext, loadExtensionSettings } from "./scripts/extensions.js";
+import { extension_settings, loadExtensionSettings } from "./scripts/extensions.js";
import { executeSlashCommands, getSlashCommandsHelp, registerSlashCommand } from "./scripts/slash-commands.js";
import {
tag_map,
@@ -126,6 +126,7 @@ import {
writeSecret
} from "./scripts/secrets.js";
import uniqolor from "./scripts/uniqolor.js";
+import { EventEmitter } from './scripts/eventemitter.js';
//exporting functions and vars for mods
export {
@@ -383,6 +384,12 @@ const system_messages = {
},
};
+export const event_types = {
+ EXTRAS_CONNECTED: 'extras_connected',
+}
+
+export const eventSource = new EventEmitter();
+
// refresh token
$(document).ajaxError(function myErrorHandler(_, xhr) {
if (xhr.status == 403) {
@@ -4489,6 +4496,8 @@ window["SillyTavern"].getContext = function () {
maxContext: Number(max_context),
chatMetadata: chat_metadata,
streamingProcessor,
+ eventSource: eventSource,
+ event_types: event_types,
addOneMessage: addOneMessage,
generate: Generate,
getTokenCount: getTokenCount,
diff --git a/public/scripts/eventemitter.js b/public/scripts/eventemitter.js
new file mode 100644
index 000000000..eacf7a23b
--- /dev/null
+++ b/public/scripts/eventemitter.js
@@ -0,0 +1,71 @@
+/* Polyfill indexOf. */
+var indexOf;
+
+if (typeof Array.prototype.indexOf === 'function') {
+ indexOf = function (haystack, needle) {
+ return haystack.indexOf(needle);
+ };
+} else {
+ indexOf = function (haystack, needle) {
+ var i = 0, length = haystack.length, idx = -1, found = false;
+
+ while (i < length && !found) {
+ if (haystack[i] === needle) {
+ idx = i;
+ found = true;
+ }
+
+ i++;
+ }
+
+ return idx;
+ };
+};
+
+
+/* Polyfill EventEmitter. */
+var EventEmitter = function () {
+ this.events = {};
+};
+
+EventEmitter.prototype.on = function (event, listener) {
+ if (typeof this.events[event] !== 'object') {
+ this.events[event] = [];
+ }
+
+ this.events[event].push(listener);
+};
+
+EventEmitter.prototype.removeListener = function (event, listener) {
+ var idx;
+
+ if (typeof this.events[event] === 'object') {
+ idx = indexOf(this.events[event], listener);
+
+ if (idx > -1) {
+ this.events[event].splice(idx, 1);
+ }
+ }
+};
+
+EventEmitter.prototype.emit = function (event) {
+ var i, listeners, length, args = [].slice.call(arguments, 1);
+
+ if (typeof this.events[event] === 'object') {
+ listeners = this.events[event].slice();
+ length = listeners.length;
+
+ for (i = 0; i < length; i++) {
+ listeners[i].apply(this, args);
+ }
+ }
+};
+
+EventEmitter.prototype.once = function (event, listener) {
+ this.on(event, function g () {
+ this.removeListener(event, g);
+ listener.apply(this, arguments);
+ });
+};
+
+export { EventEmitter }
\ No newline at end of file
diff --git a/public/scripts/extensions.js b/public/scripts/extensions.js
index 884e96968..49b834539 100644
--- a/public/scripts/extensions.js
+++ b/public/scripts/extensions.js
@@ -1,4 +1,4 @@
-import { callPopup, saveSettings, saveSettingsDebounced } from "../script.js";
+import { callPopup, eventSource, event_types, saveSettings, saveSettingsDebounced } from "../script.js";
import { isSubsetOf } from "./utils.js";
export {
getContext,
@@ -162,6 +162,7 @@ async function connectToApi(baseUrl) {
const data = await getExtensionsResult.json();
modules = data.modules;
await activateExtensions();
+ eventSource.emit(event_types.EXTRAS_CONNECTED, modules);
}
updateStatus(getExtensionsResult.ok);
diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index b2a098357..b658dca06 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -5,7 +5,9 @@ import {
hideSwipeButtons,
showSwipeButtons,
callPopup,
- getRequestHeaders
+ getRequestHeaders,
+ event_types,
+ eventSource
} from "../../../script.js";
import { getApiUrl, getContext, extension_settings, defaultRequestArgs, modules } from "../../extensions.js";
import { stringFormat, initScrollHeight, resetScrollHeight } from "../../utils.js";
@@ -611,6 +613,9 @@ jQuery(async () => {
initScrollHeight($("#sd_negative_prompt"));
})
- await loadSettings();
+ eventSource.on(event_types.EXTRAS_CONNECTED, async () => {
+ await Promise.all([loadSamplers(), loadModels()]);
+ });
+ await loadSettings();
});
\ No newline at end of file