diff --git a/javascript/sdppp-comfy.js b/javascript/sdppp-comfy.js index 7054da8..154a305 100644 --- a/javascript/sdppp-comfy.js +++ b/javascript/sdppp-comfy.js @@ -22,7 +22,7 @@ transports: ["websocket"], path: '/sd-ppp/', query: { - version: 1, + api_level: 2, type: 'comfyui' } }); diff --git a/javascript/sdppp-sd.js b/javascript/sdppp-sd.js index 53acdb1..b6bcc12 100644 --- a/javascript/sdppp-sd.js +++ b/javascript/sdppp-sd.js @@ -103,7 +103,7 @@ transports: ["websocket"], path: '/sd-ppp/', query: { - version: 1, + api_level: 2, type: 'sd' } }); diff --git a/photoshop/dist/index.js b/photoshop/dist/index.js index b20977f..7b141a5 100644 --- a/photoshop/dist/index.js +++ b/photoshop/dist/index.js @@ -99,6 +99,7 @@ class Main extends react__WEBPACK_IMPORTED_MODULE_0__.Component { backendURL: '', isConnected: false, isReconnecting: false, + lastConnectErrorMessage: '', pageInstances: [] }; componentDidMount() { @@ -108,7 +109,8 @@ class Main extends react__WEBPACK_IMPORTED_MODULE_0__.Component { this.setState({ isConnected: instance?.isConnected, isReconnecting: instance?.isReconnecting, - backendURL: instance ? instance.backendURL : '' + backendURL: instance ? instance.backendURL : '', + lastConnectErrorMessage: instance?.lastErrorMessage }); }); _system_ComfyConnection__WEBPACK_IMPORTED_MODULE_1__["default"].onPageInstancesChange(data => { @@ -153,7 +155,7 @@ class Main extends react__WEBPACK_IMPORTED_MODULE_0__.Component { className: "status-icon" }, "\u2B24"), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("div", { className: "status-text" - }, this.state.isConnected ? 'connected' : this.state.isReconnecting ? 'reconnecting...' : 'disconnected')), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("sp-button", { + }, this.state.isConnected ? 'connected' : this.state.isReconnecting ? 'reconnecting...' : this.state.lastConnectErrorMessage?.toString() || 'disconnected')), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("sp-button", { id: "connect-btn", variant: "primary", onClick: this.doConnectOrDisconnect.bind(this) @@ -249,6 +251,7 @@ class ComfyConnection { backendURL = ''; serverType = ''; interval = null; + lastErrorMessage = ''; constructor(backendURL) { ComfyConnection.instance = this; this.backendURL = backendURL.replace(/\/*$/, ''); @@ -275,7 +278,7 @@ class ComfyConnection { transports: ["websocket"], path: '/sd-ppp/', query: { - version: 1, + api_level: 2, type: 'photoshop' } }); @@ -286,10 +289,12 @@ class ComfyConnection { layers: allLayers }); }, 3000); + this.lastErrorMessage = ''; socket.on('connect_error', error => { if (socket.active) { console.error(`connect_error ${error} reconnecting...`); } else { + this.lastErrorMessage = error; console.error(`connect_error ${error} disconnected`); } ComfyConnection._callConnectStateChange(); diff --git a/photoshop/src/panels/Main.jsx b/photoshop/src/panels/Main.jsx index 4eaeda7..dc60e32 100644 --- a/photoshop/src/panels/Main.jsx +++ b/photoshop/src/panels/Main.jsx @@ -6,6 +6,7 @@ export default class Main extends React.Component { backendURL: '', isConnected: false, isReconnecting: false, + lastConnectErrorMessage: '', pageInstances: [] } @@ -16,7 +17,8 @@ export default class Main extends React.Component { this.setState({ isConnected: instance?.isConnected, isReconnecting: instance?.isReconnecting, - backendURL: instance ? instance.backendURL : '' + backendURL: instance ? instance.backendURL : '', + lastConnectErrorMessage: instance?.lastErrorMessage }) }); ComfyConnection.onPageInstancesChange((data) => { @@ -63,7 +65,7 @@ export default class Main extends React.Component {
{( this.state.isConnected ? 'connected' : ( this.state.isReconnecting ? 'reconnecting...' : - 'disconnected' + (this.state.lastConnectErrorMessage?.toString() || 'disconnected') ) )}
diff --git a/photoshop/src/system/ComfyConnection.js b/photoshop/src/system/ComfyConnection.js index dd5b965..bc8d6d5 100644 --- a/photoshop/src/system/ComfyConnection.js +++ b/photoshop/src/system/ComfyConnection.js @@ -50,6 +50,7 @@ class ComfyConnection { backendURL = ''; serverType = ''; interval = null; + lastErrorMessage = ''; constructor(backendURL) { ComfyConnection.instance = this; this.backendURL = backendURL.replace(/\/*$/, ''); @@ -78,7 +79,7 @@ class ComfyConnection { transports: ["websocket"], path: '/sd-ppp/', query: { - version: 1, + api_level: 2, type: 'photoshop' } }); @@ -90,10 +91,12 @@ class ComfyConnection { ) }, 3000) + this.lastErrorMessage = ''; socket.on('connect_error', (error) => { if (socket.active) { console.error(`connect_error ${error} reconnecting...`) } else { + this.lastErrorMessage = error console.error(`connect_error ${error} disconnected`) } ComfyConnection._callConnectStateChange(); diff --git a/sdppp_python/sdppp.py b/sdppp_python/sdppp.py index fbfc970..d1591a5 100644 --- a/sdppp_python/sdppp.py +++ b/sdppp_python/sdppp.py @@ -37,8 +37,10 @@ class SDPPP: qs = environ['QUERY_STRING'] qsobj = dict(x.split('=') for x in qs.split('&')) + if 'api_level' not in qsobj or qsobj['api_level'] != "2": + raise socketio.exceptions.ConnectionRefusedError('version mismatch, please reinstall PS plugin') if 'type' not in qsobj: - raise socketio.exceptions.ConnectionRefusedError('instance type missed in query') + raise socketio.exceptions.ConnectionRefusedError('instance type not recognized') elif qsobj['type'] == 'photoshop': if len(self.photoshop_instances) > 0: