nodes/rgthree-rgthree-comfy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove circular dependency for config service. Should help #81, issue 1.x

Browse Source
This commit is contained in:
rgthree
2024-01-30 07:42:40 -05:00
parent 62a6fea0c5
commit 05308342a3
6 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src_web/comfyui/config.ts
+4 -37
View File
@@ -1,13 +1,10 @@
// @ts-ignore
import { app } from "../../scripts/app.js";
// @ts-ignore
import { rgthreeConfig } from "rgthree/config.js";
import { RgthreeDialog, RgthreeDialogOptions } from "rgthree/common/dialog.js";
import { rgthreeApi } from "rgthree/common/rgthree_api.js";
import { getObjectValue, setObjectValue } from "rgthree/common/shared_utils.js";
import { createElement as $el, querySelectorAll as $$ } from "rgthree/common/utils_dom.js";
import { checkmark, logoRgthree } from "rgthree/common/media/svgs.js";
import { rgthree } from "./rgthree.js";
import { SERVICE as CONFIG_SERVICE } from "./config_service.js";
/** Types of config used as a hint for the form handling. */
enum ConfigType {
@@ -69,42 +66,12 @@ const CONFIGURABLE: { features: ConfigurationSchema[] } = {
],
};
/**
* A singleton service exported as `SERVICE` to handle configuration routines.
*/
class ConfigService extends EventTarget {
getConfigValue(key: string, def?: any) {
return getObjectValue(rgthreeConfig, key, def);
}
/**
* Given an object of key:value changes it will send to the server and wait for a successful
* response before setting the values on the local rgthreeConfig.
*/
async setConfigValues(changed: { [key: string]: any }) {
const body = new FormData();
body.append("json", JSON.stringify(changed));
const response = await rgthreeApi.fetchJson("/config", { method: "POST", body });
if (response.status === "ok") {
for (const [key, value] of Object.entries(changed)) {
setObjectValue(rgthreeConfig, key, value);
this.dispatchEvent(new CustomEvent("config-change", { detail: { key, value } }));
}
} else {
return false;
}
return true;
}
}
/** The ConfigService singleton. */
export const SERVICE = new ConfigService();
/**
* Creates a new fieldrow for main or sub configuration items.
*/
function fieldrow(item: ConfigurationSchema) {
const initialValue = SERVICE.getConfigValue(item.key);
const initialValue = CONFIG_SERVICE.getConfigValue(item.key);
const container = $el(`div.fieldrow.-type-${TYPE_TO_STRING[item.type]}`, {
dataset: {
name: item.key,
@@ -193,7 +160,7 @@ export class RgthreeConfigDialog extends RgthreeDialog {
this.close();
return;
}
const success = await SERVICE.setConfigValues(changed);
const success = await CONFIG_SERVICE.setConfigValues(changed);
if (success) {
this.close();
rgthree.showMessage({
@@ -216,7 +183,7 @@ export class RgthreeConfigDialog extends RgthreeDialog {
return $$("[data-name]", this.contentElement).reduce((acc: { [key: string]: any }, el) => {
const name = el.dataset["name"]!;
const type = el.dataset["type"]!;
const initialValue = getObjectValue(rgthreeConfig, name);
const initialValue = CONFIG_SERVICE.getConfigValue(name);
let currentValueEl = $$("input, textarea", el)[0] as HTMLInputElement;
let currentValue: any = null;
if (type === String(ConfigType.BOOLEAN)) {
src_web/comfyui/config_service.ts
+36
View File
@@ -0,0 +1,36 @@
// @ts-ignore
import { rgthreeConfig } from "rgthree/config.js";
import { getObjectValue, setObjectValue } from "rgthree/common/shared_utils.js";
import { rgthreeApi } from "rgthree/common/rgthree_api.js";
/**
* A singleton service exported as `SERVICE` to handle configuration routines.
*/
class ConfigService extends EventTarget {
getConfigValue(key: string, def?: any) {
return getObjectValue(rgthreeConfig, key, def);
}
/**
* Given an object of key:value changes it will send to the server and wait for a successful
* response before setting the values on the local rgthreeConfig.
*/
async setConfigValues(changed: { [key: string]: any }) {
const body = new FormData();
body.append("json", JSON.stringify(changed));
const response = await rgthreeApi.fetchJson("/config", { method: "POST", body });
if (response.status === "ok") {
for (const [key, value] of Object.entries(changed)) {
setObjectValue(rgthreeConfig, key, value);
this.dispatchEvent(new CustomEvent("config-change", { detail: { key, value } }));
}
} else {
return false;
}
return true;
}
}
/** The ConfigService singleton. */
export const SERVICE = new ConfigService();
src_web/comfyui/rgthree.ts
+1 -2
View File
@@ -11,8 +11,7 @@ import type {
import { app } from "../../scripts/app.js";
// @ts-ignore
import { api } from "../../scripts/api.js";
// @ts-ignore
import { SERVICE as CONFIG_SERVICE } from "./config.js";
import { SERVICE as CONFIG_SERVICE } from "./config_service.js";
import { fixBadLinks } from "rgthree/common/link_fixer.js";
import { wait } from "rgthree/common/shared_utils.js";
import { replaceNode, waitForCanvas, waitForGraph } from "./utils.js";
web/comfyui/config.js
+4 -27
View File
@@ -1,11 +1,9 @@
import { app } from "../../scripts/app.js";
import { rgthreeConfig } from "../../rgthree/config.js";
import { RgthreeDialog } from "../../rgthree/common/dialog.js";
import { rgthreeApi } from "../../rgthree/common/rgthree_api.js";
import { getObjectValue, setObjectValue } from "../../rgthree/common/shared_utils.js";
import { createElement as $el, querySelectorAll as $$ } from "../../rgthree/common/utils_dom.js";
import { checkmark, logoRgthree } from "../../rgthree/common/media/svgs.js";
import { rgthree } from "./rgthree.js";
import { SERVICE as CONFIG_SERVICE } from "./config_service.js";
var ConfigType;
(function (ConfigType) {
ConfigType[ConfigType["UNKNOWN"] = 0] = "UNKNOWN";
@@ -50,29 +48,8 @@ const CONFIGURABLE = {
},
],
};
class ConfigService extends EventTarget {
getConfigValue(key, def) {
return getObjectValue(rgthreeConfig, key, def);
}
async setConfigValues(changed) {
const body = new FormData();
body.append("json", JSON.stringify(changed));
const response = await rgthreeApi.fetchJson("/config", { method: "POST", body });
if (response.status === "ok") {
for (const [key, value] of Object.entries(changed)) {
setObjectValue(rgthreeConfig, key, value);
this.dispatchEvent(new CustomEvent("config-change", { detail: { key, value } }));
}
}
else {
return false;
}
return true;
}
}
export const SERVICE = new ConfigService();
function fieldrow(item) {
const initialValue = SERVICE.getConfigValue(item.key);
const initialValue = CONFIG_SERVICE.getConfigValue(item.key);
const container = $el(`div.fieldrow.-type-${TYPE_TO_STRING[item.type]}`, {
dataset: {
name: item.key,
@@ -151,7 +128,7 @@ export class RgthreeConfigDialog extends RgthreeDialog {
this.close();
return;
}
const success = await SERVICE.setConfigValues(changed);
const success = await CONFIG_SERVICE.setConfigValues(changed);
if (success) {
this.close();
rgthree.showMessage({
@@ -174,7 +151,7 @@ export class RgthreeConfigDialog extends RgthreeDialog {
return $$("[data-name]", this.contentElement).reduce((acc, el) => {
const name = el.dataset["name"];
const type = el.dataset["type"];
const initialValue = getObjectValue(rgthreeConfig, name);
const initialValue = CONFIG_SERVICE.getConfigValue(name);
let currentValueEl = $$("input, textarea", el)[0];
let currentValue = null;
if (type === String(ConfigType.BOOLEAN)) {
web/comfyui/config_service.js
+24
View File
@@ -0,0 +1,24 @@
import { rgthreeConfig } from "../../rgthree/config.js";
import { getObjectValue, setObjectValue } from "../../rgthree/common/shared_utils.js";
import { rgthreeApi } from "../../rgthree/common/rgthree_api.js";
class ConfigService extends EventTarget {
getConfigValue(key, def) {
return getObjectValue(rgthreeConfig, key, def);
}
async setConfigValues(changed) {
const body = new FormData();
body.append("json", JSON.stringify(changed));
const response = await rgthreeApi.fetchJson("/config", { method: "POST", body });
if (response.status === "ok") {
for (const [key, value] of Object.entries(changed)) {
setObjectValue(rgthreeConfig, key, value);
this.dispatchEvent(new CustomEvent("config-change", { detail: { key, value } }));
}
}
else {
return false;
}
return true;
}
}
export const SERVICE = new ConfigService();
web/comfyui/rgthree.js
+1 -1
View File
@@ -1,6 +1,6 @@
import { app } from "../../scripts/app.js";
import { api } from "../../scripts/api.js";
import { SERVICE as CONFIG_SERVICE } from "./config.js";
import { SERVICE as CONFIG_SERVICE } from "./config_service.js";
import { fixBadLinks } from "../../rgthree/common/link_fixer.js";
import { wait } from "../../rgthree/common/shared_utils.js";
import { replaceNode, waitForCanvas, waitForGraph } from "./utils.js";