build - fix vite rel path

Dev

.github/workflows/publish_action.yml

@@ -0,0 +1,20 @@
+name: Publish to Comfy registry
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - "pyproject.toml"
+
+jobs:
+  publish-node:
+    name: Publish Custom Node to registry
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Publish Custom Node
+        uses: Comfy-Org/publish-node-action@main
+        with:
+          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }} ## Add your own personal access token to your Github Repository secrets and reference it here.

.gitignore

@@ -11,6 +11,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 ui/node_modules
+# ui/src/utils/encryptUtils.ts
 db
 dist-ssr
 *.local

README.md

@@ -2,14 +2,19 @@
 
 A ComfyUI workflow and model manager extension to **organize and manage all your workflows, models and generated images in one place**. Seamlessly switch between workflows, track version history and image generation history, 1 click install models from Civit ai, browse/update your installed models
 
-If you have questions or suggestions, please [join our Discord](https://discord.gg/HHvfEurv2Z)!
+If you have questions or suggestions, please [join our Discord](https://discord.gg/HHvfEurv2Z)! 
 
-[New!] we're building a comfyui custom nodes library wiki like Pypi: https://www.nodecafe.org/
-welcome any feedbacks!
+✨We have a new platform to turn your comfyui workflow to runnable web app: www.nodecafe.co please check it out! 🥳
 
-🔴‼️ If you updated or cloned this repo between March 14-17, 2024, please update it again to latest verison, there were some bugs that may cause you lose changes in Auto Save mode.
+[6-25] ⚠️ Please update workspace manager to latest version if it's not showing up for you after updating ComfyUI
 
-‼️ [3-23-2024]**search and install models from civitai is not working in previous versions**, because civitai changed something in their api. **Please update to the latest version** if you are seeing blank screen in Install Models dialog
+[6-21] ‼️please upgrade to V2 and enable twoway sync if you haven't already. I will stop supporting V1 soon and will forcefully turn on twoway sync later. (twoway sync means that your workflow are twoway synced with your disk files /my_workflows directly)
+
+[6-21] ‼️ Auto-save mode will be removed comopoletely from next version. Because there are reports that autosave mode sometimes overwrite workflows mistakenly. Therefore, please **manual save** your workflows always.
+
+[New!] We provide 👭**team workspace** now! If you need to **share workflows, backup workflow versions for enterprise and teams**, please contact me about our team/enterprise product at weixuanfu01@gmail.com or join discord and DM me @briefpeach 
+
+[5-23-2024]**search and install models from civitai is not working in previous versions**, **Please update to the latest version** if you are seeing blank screen in Install Models dialog
 
 <img width="610" alt="Screenshot 2024-03-08 at 6 41 18 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/30455eb1-3d12-4930-bb81-28b33148fbaa">
 
@@ -21,15 +26,26 @@ Simply search for “ComfyUI Workspace Manager”, install, and restart ComfyUI.
 
 ### [Option 2] via git
 
-Like any other custom node installation, in your ComfyUI root folder
+Like any other custom node installation, in your ComfyUI root folder run command and restart your ComfyUI.
 
 ```
 cd custom_nodes && git clone https://github.com/11cafe/comfyui-workspace-manager.git
 ```
 
-and restart your ComfyUI.
 
-It is recommended to do git clone than downloading zip folder, because you can get latest updates by `git pull`!
+Please upgrade to V2 asap, you should see an **unicorn🦄** here instead of ☕️ (V1). I will stop supporting V1 soon.
+
+<img width="136" alt="Screenshot 2024-05-31 at 5 39 58 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/f52a83f2-4679-4a40-95ed-e75584516ec5">
+
+Recommanded settings for V2 (Do not use these settings if you are on V1):
+ - Enable two way sync (‼️ Will stop supporting non-two-way sync mode starting next version)
+ - Make sure My Workspace Save Directory is valid path
+
+<img width="202" alt="Screenshot 2024-05-30 at 6 34 39 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/67020966-c190-48cb-bffc-b715449d5c99">
+
+<img width="377" alt="335530039-10002a3f-ea2f-4bd1-8597-0ae1443d9851" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/6001a7f1-93f2-48ef-86c6-95c9560030ef">
+
+
 
 ## Features
 
@@ -37,11 +53,11 @@ It is recommended to do git clone than downloading zip folder, because you can g
 
 - 🔁Switch between different workflows easily. 1click open workflow in multiple browser tabs.
 - 🤏**Drag and drop** to insert subworkflows into current flow.
-- 🗂️Organize workflows with folders, tags.
+- 🗂️Organize workflows with folders (tags are deprecated, please use folders to organize)
 - 📂Save and sync all your workflows in a local folder (by default under `/ComfyUI/my_workflows` customize in Settings)
   - **Save workflow by pressing the 💾 button, or ⌨Shift+S shortcut** (customize in Settings).
   - Every time you save, it will create a new record in **Version History**. You can easily revert to any version.
-  - **Enable/disable autosave workflow** (please disable autosave if you are experiencing UI lagging)
+  - **Enable/disable autosave workflow** (please disable autosave if you are experiencing UI slowing)
   - You can move files using OS File Explorer and it will be **two-way synced** with workspace.
 - 🕛**Version control** of workflow, create/switch versions
 - Bulk import workflows into your workspace
@@ -63,31 +79,11 @@ Recommend using Chrome browser for the best experience. Safari doesn't work well
 
 [中文版教程](https://www.uisdc.com/workspace-manager) &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [Roadmap](https://github.com/orgs/11cafe/projects/1/views/1)
 
-# <<<<<<< HEAD
+## Updates
 
-🚧🔴 Drag and drop to insert subworkflow is not working. I have debugged for many hours but just can't make it work perfectly. If anyone is interested here is the code:
-https://github.com/11cafe/comfyui-workspace-manager/blob/d2d2f0c1f1ace35236e73fa5074e9feb83342773/ui/src/utils.tsx#L192
-I would really appreciate it if someone can find a solution to insert a subworkflow to current canvas given the json object.
-
-### 🦄v2.0 beta: Two-way sync with local folder, select model install path, cloud sync workflows
-
-> > > > > > > dev
-
-**🦩v2.1 New gallery coming soon! Inspect image metadata, search image by prompt, model/lora used**
-
-<img width="700" alt="Screenshot 2024-03-23 at 12 58 38 AM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/5bac9793-7491-4131-b850-037094d03823">
-
-Control+P quick spotlight search (like VSCode)
-
-<img width="500" alt="Screenshot 2024-03-27 at 3 49 35 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/47c14904-180c-4c52-a644-223d0936c9fa">
-
-**🦄v2.0 Two-way sync with local folder, select model install path, cloud sync workflows**
-
-- Two-way sync with selected local folder so you can move files using File Explore or Finder to sync them with workspace!
-- **Models manager support external models path like Automatic1111**! Choose models downloading folder from added external paths.
-- Add models thumbnails image by putting a image file with the same name in models folder like A1111
-- One click sharing to cloud to backup your workflows to cloud
-  v2.0 demo: https://youtu.be/7Hht_BMe844
+**🦄v2.0 Two-way sync with local folder, models manager support external models path like Automatic1111, cloud sync workflows**
+  
+v2.0 demo: https://youtu.be/7Hht_BMe844
 
 **v1.7 ComfyUI model manager, view your installed models, install models from civit ai, open workflow in multiple browser tabs**
 
@@ -97,7 +93,7 @@ Control+P quick spotlight search (like VSCode)
 
 <img width="200" alt="Screenshot 2024-01-23 at 12 26 56 AM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/d29d0831-a15a-4597-acf6-facee4dbc76e">
 
-<img width="460" alt="gallery" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/2b7886c9-2d4a-46c6-adac-429720f74f11">
+## Usage
 
 switch between flows:
 
@@ -111,10 +107,6 @@ Bulk import flows:
 
 <img width="400" alt="Screenshot 2024-01-02 at 10 22 45 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/884c8852-73c7-41d6-9179-7fb1fcea9d04">
 
-add tags to flow:
-
-<img width="400" alt="Screenshot 2023-12-13 at 1 54 04 AM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/6bf4d22b-f52a-4d23-8882-4a31162616f3">
-
 Workflow operations: Manual Save, Download, Discard unsaved changes:
 
 <img width="500" alt="Screenshot 2023-12-29 at 9 59 57 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/88c82672-ebf2-4feb-bf5b-74b447843c2c">

__init__.py

@@ -5,24 +5,26 @@ import folder_paths
 import shutil
 import os
 import sys
-import subprocess  # don't remove this
-from urllib.parse import urlparse
+import subprocess 
 import subprocess
 import os
 import json
-from .service.model_manager.model_installer import download_url_with_wget
-from .service.model_manager.model_list import get_model_list
 from .service.media_service import *
 from .service.file_sync_service import *
-from .service.db_service import get_my_workflows_dir
 from .service.node_service import *
+from .service.setting_service import *
+from .service.model_manager.model_installer import *
+try:
+    from send2trash import send2trash
+except ImportError:
+    send2trash = None
 
 WEB_DIRECTORY = "entry"
 NODE_CLASS_MAPPINGS = {}
 __all__ = ['NODE_CLASS_MAPPINGS']
-version = "V1.0.0"
+version = "V2.1.0"
 
-print(f"### Loading: Workspace Manager ({version})")
+print(f"🦄🦄Loading: Workspace Manager ({version})")
 workspace_path = os.path.join(os.path.dirname(__file__))
 comfy_path = os.path.dirname(folder_paths.__file__)
 db_dir_path = os.path.join(workspace_path, "db")
@@ -32,39 +34,8 @@ if os.path.exists(dist_path):
     server.PromptServer.instance.app.add_routes([
         web.static('/workspace_web/', dist_path),
     ])
-
-BACKUP_DIR = os.path.join(workspace_path, "backup")
-MAX_BACKUP_FILES = 20
-
-@server.PromptServer.instance.routes.post("/workspace/list_backup")
-async def list_backup(request):
-    try:
-        data = await request.json()
-        dir_path = os.path.join(BACKUP_DIR, data.get('dir'))
-        # List all files in the directory
-        files = os.listdir(dir_path)
-
-        # Filter out .json files and sort them by filename (which starts with Unix timestamp)
-        json_files = sorted(
-            [file for file in files if file.endswith('.json')],
-            key=lambda x: x,  # Assuming the format is 'timestamp_filename.json'
-            reverse=True
-        )
-
-        # Select the 10 most recent files
-        recent_json_files = json_files[:10]
-
-        # Read the contents of each JSON file
-        file_contents = []
-        for file in recent_json_files:
-            with open(os.path.join(dir_path, file), 'r') as f:
-                content = json.load(f)
-                file_contents.append({"fileName": file, "jsonStr": content})
-
-        return web.Response(text=json.dumps(file_contents), content_type='application/json')
-    except Exception as e:
-        return web.Response(text=json.dumps({"error": str(e)}), status=500)
-
+else:
+    print(f"🦄🦄🔴🔴Error: Web directory not found: {dist_path}")
 
 @server.PromptServer.instance.routes.post("/workspace/get_system_dir")
 async def get_system_dir(request):
@@ -112,31 +83,28 @@ async def update_file(request):
     await asyncio.to_thread(write_json_to_file, json_str)
     return web.Response(text="File updated successfully")
 
-
 @server.PromptServer.instance.routes.post("/workspace/delete_file")
 async def delete_file(request):
     data = await request.json()
     file_path = data['file_path']
-    delete_empty_folder = data['deleteEmptyFolder']
 
-    def sync_delete_file(file_path, delete_empty_folder):
+    def sync_delete_file(file_path):
         my_workflows_dir = get_my_workflows_dir()
         full_path = os.path.join(my_workflows_dir, file_path)
 
         if os.path.exists(full_path):
-            os.remove(full_path)
-            directory = os.path.dirname(full_path)
-            if delete_empty_folder and not os.listdir(directory):
-                # If the directory is empty, remove the directory
-                os.rmdir(directory)
-                return "File and empty directory deleted successfully"
+            if send2trash:
+                send2trash(full_path)
             else:
-                return "File deleted successfully"
+                os.remove(full_path)
+                print("❌⛔️send2trash is not available. Deleting file permanently. Please `pip install send2trash`")
+
+            return "File deleted successfully"
         else:
             return "File not found"
 
     # Run the synchronous file operation in a separate thread
-    response_text = await asyncio.to_thread(sync_delete_file, file_path, delete_empty_folder)
+    response_text = await asyncio.to_thread(sync_delete_file, file_path)
     
     if response_text == "File not found":
         return web.Response(text=response_text, status=404)

dist/workspace_web/AppIsDirtyEventListener-JPtpDmVk.js

@@ -0,0 +1 @@
+import{r as l,N as n}from"./input.js";import{W as S,ag as w,w as d,E as p,ah as _,ai as C}from"./App-iAk7mY0h.js";import{u as D}from"./useDebounceFn-ld478fd0.js";function L(){const{isDirty:f,setIsDirty:h,setRoute:g,saveCurWorkflow:v,setCurFlowIDAndName:k}=l.useContext(S),m=l.useRef(f);l.useEffect(()=>{m.current=f},[f]),l.useEffect(()=>{const c=e=>{var s;if(document.visibilityState==="hidden")return;const t=C(e);if(t)switch(t===p.openSpotlightSearch&&e.preventDefault(),window.dispatchEvent(new CustomEvent(_,{detail:{shortcutType:t}})),t){case p.SAVE:v();break;case p.SAVE_AS:g("saveAsModal");break;case p.openSpotlightSearch:g("spotlightSearch");break}else(s=e.target)!=null&&s.matches("input, textarea")&&Object.keys(n.canvas.selected_nodes??{}).length&&E()},u=async()=>{var t,s,a,i;if(!((t=n)!=null&&t.graph)){console.error("🦄 Error in workspace manager! app.graph is not available in restoreCurWorkflow()");return}const e=(a=(s=n.graph.extra)==null?void 0:s[w])==null?void 0:a.id;if(console.log("🦄 Restoring workflow... id=",e),e){const r=await((i=d)==null?void 0:i.get(e));console.log("🦄 Restored workflow",(r==null?void 0:r.parentFolderID)+"/"+(r==null?void 0:r.name)),r&&k(r),!(r!=null&&r.saveLock)&&r&&r.json!==JSON.stringify(n.graph.serialize())&&h(!0)}},o=n.graph.onConfigure;return n.graph.onConfigure=function(){o==null||o.apply(this,arguments),setTimeout(()=>{var t,s,a,i;const e=(s=(t=n.graph.extra)==null?void 0:t[w])==null?void 0:s.id;(e==null||e!=((i=(a=d)==null?void 0:a.curWorkflow)==null?void 0:i.id))&&k(null)},500)},document.addEventListener("click",e=>{Object.keys(n.canvas.selected_nodes??{}).length&&(n.canvas.node_over!=null||n.canvas.node_capturing_input!=null||n.canvas.node_widget!=null)&&E()}),document.addEventListener("keydown",c),u(),()=>{document.removeEventListener("keydown",c)}},[]);const y=async()=>{var u,o,e,t;if((o=(u=d)==null?void 0:u.curWorkflow)!=null&&o.saveLock||m.current)return;const c=n.graph.serialize();JSON.stringify(c)!==((t=(e=d)==null?void 0:e.curWorkflow)==null?void 0:t.json)&&h(!0)},[E,b]=D(y,900);return null}export{L as default};

dist/workspace_web/IconCopy-JJxyTsor.js

@@ -0,0 +1 @@
+import{d as a}from"./App-iAk7mY0h.js";var p=a("copy","IconCopy",[["path",{d:"M7 7m0 2.667a2.667 2.667 0 0 1 2.667 -2.667h8.666a2.667 2.667 0 0 1 2.667 2.667v8.666a2.667 2.667 0 0 1 -2.667 2.667h-8.666a2.667 2.667 0 0 1 -2.667 -2.667z",key:"svg-0"}],["path",{d:"M4.012 16.737a2.005 2.005 0 0 1 -1.012 -1.737v-10c0 -1.1 .9 -2 2 -2h10c.75 0 1.158 .385 1.5 1",key:"svg-1"}]]);export{p as I};

dist/workspace_web/IconSearch-WxwWPclo.js

@@ -0,0 +1 @@
+import{d as a}from"./App-iAk7mY0h.js";var r=a("search","IconSearch",[["path",{d:"M10 10m-7 0a7 7 0 1 0 14 0a7 7 0 1 0 -14 0",key:"svg-0"}],["path",{d:"M21 21l-6 -6",key:"svg-1"}]]);export{r as I};

dist/workspace_web/assets/App-JXePnJiV.css

@@ -0,0 +1 @@
+.dragPanelIcon{display:none!important}.workspaceManagerPanel:hover .dragPanelIcon{display:block!important}

dist/workspace_web/assets/ModelManagerTopbar--iv3sdjQ.css

@@ -0,0 +1 @@
+.drag-model-manager-top-bar-icon{visibility:hidden!important}.model-manager-top-bar:hover .drag-model-manager-top-bar-icon{visibility:visible!important}

dist/workspace_web/chunk-3RSXBRAN-Q94DIGI-.js

@@ -0,0 +1 @@
+import{f as x,j as l,g as i,e as w,k as C,o as E,l as I,r as f,a5 as P}from"./input.js";import{ab as z}from"./App-iAk7mY0h.js";var v=x(function(o,s){const{children:t,placeholder:n,className:r,...a}=o;return l.jsxs(i.select,{...a,ref:s,className:w("chakra-select",r),children:[n&&l.jsx("option",{value:"",children:n}),t]})});v.displayName="SelectField";function F(e,o){const s={},t={};for(const[n,r]of Object.entries(e))o.includes(n)?s[n]=r:t[n]=r;return[s,t]}var H=x((e,o)=>{var s;const t=C("Select",e),{rootProps:n,placeholder:r,icon:a,color:c,height:_,h:d,minH:h,minHeight:y,iconColor:p,iconSize:u,...j}=E(e),[g,N]=F(j,P),m=z(N),k={width:"100%",height:"fit-content",position:"relative",color:c},b={paddingEnd:"2rem",...t.field,_focus:{zIndex:"unset",...(s=t.field)==null?void 0:s._focus}};return l.jsxs(i.div,{className:"chakra-select__wrapper",__css:k,...g,...n,children:[l.jsx(v,{ref:o,height:d??_,minH:h??y,placeholder:r,...m,__css:b,children:e.children}),l.jsx(S,{"data-disabled":I(m.disabled),...(p||c)&&{color:p||c},__css:t.icon,...u&&{fontSize:u},children:a})]})});H.displayName="Select";var M=e=>l.jsx("svg",{viewBox:"0 0 24 24",...e,children:l.jsx("path",{fill:"currentColor",d:"M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"})}),R=i("div",{baseStyle:{position:"absolute",display:"inline-flex",alignItems:"center",justifyContent:"center",pointerEvents:"none",top:"50%",transform:"translateY(-50%)"}}),S=e=>{const{children:o=l.jsx(M,{}),...s}=e,t=f.cloneElement(o,{role:"presentation",className:"chakra-select__icon",focusable:!1,"aria-hidden":!0,style:{width:"1em",height:"1em",color:"currentColor"}});return l.jsx(R,{...s,className:"chakra-select__icon-wrapper",children:f.isValidElement(o)?t:null})};S.displayName="SelectIcon";export{H as S};

dist/workspace_web/chunk-JARCRF6W-J5on1Gsw.js

@@ -0,0 +1 @@
+import{b as D,r as h,j as t,g as i,a2 as v,f as j,k as T,o as B,H as E,e as $}from"./input.js";import{u as z}from"./chunk-7D6N5TE5-8Zf7TGGG.js";var[Z,F]=D({name:"CheckboxGroupContext",strict:!1});function M(o){const[s,n]=h.useState(o),[e,r]=h.useState(!1);return o!==s&&(r(!0),n(o)),e}function W(o){return t.jsx(i.svg,{width:"1.2em",viewBox:"0 0 12 10",style:{fill:"none",strokeWidth:2,stroke:"currentColor",strokeDasharray:16},...o,children:t.jsx("polyline",{points:"1.5 6 4.5 9 10.5 1"})})}function X(o){return t.jsx(i.svg,{width:"1.2em",viewBox:"0 0 24 24",style:{stroke:"currentColor",strokeWidth:4},...o,children:t.jsx("line",{x1:"21",x2:"3",y1:"12",y2:"12"})})}function H(o){const{isIndeterminate:s,isChecked:n,...e}=o,r=s?X:W;return n||s?t.jsx(i.div,{style:{display:"flex",alignItems:"center",justifyContent:"center",height:"100%"},children:t.jsx(r,{...e})}):null}var L={display:"inline-flex",alignItems:"center",justifyContent:"center",verticalAlign:"top",userSelect:"none",flexShrink:0},O={cursor:"pointer",display:"inline-flex",alignItems:"center",verticalAlign:"top",position:"relative"},q=v({from:{opacity:0,strokeDashoffset:16,transform:"scale(0.95)"},to:{opacity:1,strokeDashoffset:0,transform:"scale(1)"}}),J=v({from:{opacity:0},to:{opacity:1}}),K=v({from:{transform:"scaleX(0.65)"},to:{transform:"scaleX(1)"}}),Q=j(function(s,n){const e=F(),r={...e,...s},a=T("Checkbox",r),c=B(s),{spacing:x="0.5rem",className:C,children:m,iconColor:u,iconSize:d,icon:k=t.jsx(H,{}),isChecked:f,isDisabled:g=e==null?void 0:e.isDisabled,onChange:p,inputProps:w,..._}=c;let y=f;e!=null&&e.value&&c.value&&(y=e.value.includes(c.value));let b=p;e!=null&&e.onChange&&c.value&&(b=E(e.onChange,p));const{state:l,getInputProps:A,getCheckboxProps:S,getLabelProps:G,getRootProps:P}=z({..._,isDisabled:g,isChecked:y,onChange:b}),I=M(l.isChecked),R=h.useMemo(()=>({animation:I?l.isIndeterminate?`${J} 20ms linear, ${K} 200ms linear`:`${q} 200ms linear`:void 0,fontSize:d,color:u,...a.icon}),[u,d,I,l.isIndeterminate,a.icon]),N=h.cloneElement(k,{__css:R,isIndeterminate:l.isIndeterminate,isChecked:l.isChecked});return t.jsxs(i.label,{__css:{...O,...a.container},className:$("chakra-checkbox",C),...P(),children:[t.jsx("input",{className:"chakra-checkbox__input",...A(w,n)}),t.jsx(i.span,{__css:{...L,...a.control},className:"chakra-checkbox__control",...S(),children:N}),m&&t.jsx(i.span,{className:"chakra-checkbox__label",...G(),__css:{marginStart:x,...a.label},children:m})]})});Q.displayName="Checkbox";var U=j(function(s,n){const{templateAreas:e,gap:r,rowGap:a,columnGap:c,column:x,row:C,autoFlow:m,autoRows:u,templateRows:d,autoColumns:k,templateColumns:f,...g}=s,p={display:"grid",gridTemplateAreas:e,gridGap:r,gridRowGap:a,gridColumnGap:c,gridAutoColumns:k,gridColumn:x,gridRow:C,gridAutoFlow:m,gridAutoRows:u,gridTemplateRows:d,gridTemplateColumns:f};return t.jsx(i.div,{ref:n,__css:p,...g})});U.displayName="Grid";export{Q as C,U as G};

dist/workspace_web/chunk-NTCQBYKE-a1mju5OW.js

@@ -0,0 +1 @@
+import{f as t}from"./App-iAk7mY0h.js";import{f as o,j as s}from"./input.js";var e=o((a,r)=>s.jsx(t,{align:"center",...a,direction:"column",ref:r}));e.displayName="VStack";export{e as V};

dist/workspace_web/chunk-VTV6N5LE-_5o2YPCq.js

@@ -0,0 +1 @@
+import{f as l,n as f,o as h,j as e,g as n,e as m,k as y,r as o}from"./input.js";import{u as w}from"./chunk-7D6N5TE5-8Zf7TGGG.js";var N=l(function(a,i){const s=f("Link",a),{className:c,isExternal:t,...r}=h(a);return e.jsx(n.a,{target:t?"_blank":void 0,rel:t?"noopener":void 0,ref:i,className:m("chakra-link",c),...r,__css:s})});N.displayName="Link";var j=l(function(a,i){const s=y("Switch",a),{spacing:c="0.5rem",children:t,...r}=h(a),{getIndicatorProps:u,getInputProps:p,getCheckboxProps:x,getRootProps:_,getLabelProps:g}=w(r),b=o.useMemo(()=>({display:"inline-block",position:"relative",verticalAlign:"middle",lineHeight:0,...s.container}),[s.container]),S=o.useMemo(()=>({display:"inline-flex",flexShrink:0,justifyContent:"flex-start",boxSizing:"content-box",cursor:"pointer",...s.track}),[s.track]),d=o.useMemo(()=>({userSelect:"none",marginStart:c,...s.label}),[c,s.label]);return e.jsxs(n.label,{..._(),className:m("chakra-switch",a.className),__css:b,children:[e.jsx("input",{className:"chakra-switch__input",...p({},i)}),e.jsx(n.span,{...x(),className:"chakra-switch__track",__css:S,children:e.jsx(n.span,{__css:s.thumb,className:"chakra-switch__thumb",...u()})}),t&&e.jsx(n.span,{className:"chakra-switch__label",...g(),__css:d,children:t})]})});j.displayName="Switch";export{N as L,j as S};

dist/workspace_web/civitUtils-Q9XxZABL.js

@@ -0,0 +1 @@
+import{h as m}from"./App-iAk7mY0h.js";const r="WORKSPACE_CIVIT_API_KEY_STORAGE_KEY";function h(){return localStorage.getItem(r)}function g(e){localStorage.setItem(r,e)}function v(e){return`https://civitai.com/api/download/models/${e}`}async function w(e){var s,a,n;try{const l=`https://civitai.com/api/v1/model-versions/by-hash/${e}`,t=await(await fetch(l)).json();let i;if(await((s=m)==null?void 0:s.getSetting("showNsfwModelThumbnail"))===!0)i=(n=(a=t==null?void 0:t.images)==null?void 0:a[0])==null?void 0:n.url;else if(!t.model.nsfw){const o=t.images.find(c=>c.nsfwLevel==1);i=o==null?void 0:o.url}return{modelName:t.model.name,civitModelID:String(t.modelId),civitModelVersionID:String(t.id),imageUrl:i??void 0}}catch{return{}}}export{v as a,w as f,h as g,g as s};

dist/workspace_web/useDebounceFn-ld478fd0.js

@@ -0,0 +1 @@
+import{r}from"./input.js";function a(u,c){const e=r.useRef(0),t=r.useCallback(()=>{e.current!==null&&(clearTimeout(e.current),e.current=0)},[]),n=r.useCallback((...o)=>{t(),e.current=setTimeout(()=>u(...o),c)},[u,c,t]);return r.useEffect(()=>()=>{t()},[]),[n,t]}export{a as u};

entry/entry.js

@@ -1,27 +1,6 @@
-const targetNode = document.body;
+//@ts-ignore
+import { api } from "../../scripts/api.js";
 
-// Options for the observer (which mutations to observe)
-const config = { childList: true, subtree: true };
-const api_base = window.location.pathname.split("/").slice(0, -1).join("/");
-
-// @ts-ignore
-const callback = function (mutationsList, observer) {
-  for (const mutation of mutationsList) {
-    if (mutation.type === "childList") {
-      // @ts-ignore
-      mutation.addedNodes.forEach((node) => {
-        if (node.nodeName === "CANVAS") {
-          // @ts-ignore
-          import(api_base + "/workspace_web/input.js");
-          observer.disconnect();
-        }
-      });
-    }
-  }
-};
-
-// Create an instance of the MutationObserver
-const observer = new MutationObserver(callback);
-
-// Start observing the target node for configured mutations
-observer.observe(targetNode, config);
+setTimeout(() => {
+  import(api.api_base + "/workspace_web/input.js");
+}, 500);

pyproject.toml

@@ -0,0 +1,13 @@
+[project]
+name = "comfyui-workspace-manager"
+description = "A ComfyUI custom node for project management to centralize the management of all your workflows in one place. Seamlessly switch between workflows, create and update them within a single workspace, like Google Docs."
+version = "1.0.0"
+license = "LICENSE"
+
+[project.urls]
+Repository = "https://github.com/11cafe/comfyui-workspace-manager"
+
+[tool.comfy]
+PublisherId = "weixuan11"
+DisplayName = "comfyui-workspace-manager"
+Icon = ""

requirements.txt

@@ -0,0 +1 @@
+send2trash

service/db_service.py

@@ -51,22 +51,3 @@ async def get_workspace(request):
     table = request.query.get('table')
     data = await asyncio.to_thread(read_table, table)
     return web.json_response(data)
-
-def get_my_workflows_dir():
-    data = read_table('userSettings')
-    if (data):
-        records = json.loads(data)
-
-        if DEFAULT_USER in records and 'myWorkflowsDir' in records[DEFAULT_USER]:  
-            curDir = records[DEFAULT_USER]['myWorkflowsDir']  
-        elif 'myWorkflowsDir' in records:  
-            curDir = records['myWorkflowsDir']
-        
-        # this is to be compatible of a bug that a dict is stored in userSettings.myWorkflowsDir
-        # should not be needed once all users refresh their settings
-        if not isinstance(curDir, str):
-            curDir = curDir.get('path', None)
-
-        if curDir and os.path.exists(curDir):
-            return curDir
-    return os.path.join(comfy_path, 'my_workflows')

service/file_sync_service.py

@@ -1,8 +1,6 @@
 import asyncio
 import folder_paths
 from datetime import datetime
-import platform
-import tempfile
 import server
 import os
 from aiohttp import web
@@ -136,7 +134,11 @@ def read_workflow_file(path, id):
 
 def check_and_update_workflow_id(file_path, seen_ids):
     with open(file_path, "r", encoding="utf-8") as f:
-        json_data = json.load(f)
+        try:
+                json_data = json.load(f)
+        except json.JSONDecodeError as e:
+            print(f"Error reading JSON from {file_path}: {e}")
+            return
         if (
             "extra" in json_data
             and "workspace_info" in json_data["extra"]
@@ -172,7 +174,10 @@ def dedupe_workflow_ids():
             if not file.endswith(".json"):
                 continue
             file_path = os.path.join(root, file)
-            check_and_update_workflow_id(file_path, seen_ids)
+            try:
+                check_and_update_workflow_id(file_path, seen_ids)
+            except Exception as e:
+                print(f"Error while processing file {file_path}: {e}")
 
 @server.PromptServer.instance.routes.get('/workspace/deduplicate_workflow_ids')
 async def deduplicate_workflow_ids(request):

service/media_service.py

@@ -6,10 +6,11 @@ from aiohttp import FormData, web, ClientSession
 import folder_paths
 import os
 from .model_manager.model_preview import get_thumbnail_for_image_file
+from .setting_service import get_settings
 
 image_extensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp']
 video_extensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv']
-API_URL = 'https://www.nodecafe.org/api/image/upload'
+
 def view_media(filename, isPreview = False, isInput = False):
     if not filename:
         return web.Response(status=404)
@@ -62,6 +63,9 @@ async def view_file(request):
 
 @server.PromptServer.instance.routes.post("/workspace/upload_image")  # Handle POST requests
 async def upload_image_handler(request):
+    settings = get_settings()
+    cloudHost = settings.get("cloudHost", 'https://www.nodecafe.co')
+    API_URL = cloudHost + '/api/image/upload'
     data = await request.json()
     image_paths = data.get("images")
     if not image_paths:

service/model_manager/model_list.py

@@ -18,7 +18,7 @@ if not os.path.exists(FILE_HASH_DICT_FOLDER_PATH):
     os.makedirs(FILE_HASH_DICT_FOLDER_PATH)
 
 # Early open shelve for better performance
-with shelve.open(FILE_HASH_DICT_PATH) as file_hash_dict:
+with shelve.open(FILE_HASH_DICT_PATH) as file_hash_dict_early_open:
     print(f"Workspace manager - Openning file hash dict")
 
 file_list = []

service/scan_my_workflows_folder.py

@@ -3,11 +3,16 @@ from aiohttp import web
 import asyncio
 import json
 import os
-import glob
+import traceback
+import logging
 from threading import Lock
 import server
 import uuid
-from .db_service import get_my_workflows_dir
+from .setting_service import get_my_workflows_dir
+
+@server.PromptServer.instance.routes.get('/workspace/get_os')
+async def scan_my_workflows_files(request):
+    return web.Response(text= json.dumps({'os': platform.system()}), content_type='application/json')
 
 @server.PromptServer.instance.routes.post('/workspace/file/scan_my_workflows_folder')
 async def scan_my_workflows_files(request):
@@ -33,6 +38,7 @@ def folder_handle(path, recursive, metaInfoOnly, fileList=None):
                 createTime, updateTime = getFileCreateTime(item_path)
                 fileList.append({
                     'name': item,
+                    'path': item_path,
                     'type': 'folder',
                     'createTime': createTime,
                     'updateTime': updateTime
@@ -41,7 +47,7 @@ def folder_handle(path, recursive, metaInfoOnly, fileList=None):
                 if recursive:
                     folder_handle(item_path, recursive, metaInfoOnly, fileList)
         except Exception as e:
-            print(f"Error scanning item {item}: {e}")
+            logging.error(f"Error scan workflow {item_path}: {e}, {traceback.format_exc()}")
     return fileList
 
 def file_handle(name, fileList, file_path, metaInfoOnly):
@@ -51,6 +57,9 @@ def file_handle(name, fileList, file_path, metaInfoOnly):
     createTime, updateTime = getFileCreateTime(file_path)
     workspace_info = json_data.get('extra', {}).get('workspace_info', {})   
     workflow_id = workspace_info.get('id', str(uuid.uuid4())) 
+    saveLock = workspace_info.get('saveLock', False) 
+    cloudID = workspace_info.get('cloudID', None) 
+    coverMediaPath = workspace_info.get('coverMediaPath', None) 
     # Update JSON data with new ID if needed and write back to file
     if 'id' not in workspace_info:
         if 'extra' not in json_data:
@@ -65,6 +74,10 @@ def file_handle(name, fileList, file_path, metaInfoOnly):
             'name': name,
             'type': "workflow",
             'id': workflow_id,
+            'path': file_path,
+            'saveLock': saveLock,
+            'cloudID': cloudID,
+            'coverMediaPath': coverMediaPath,
             'createTime': createTime,
             'updateTime': updateTime
         }

service/setting_service.py

@@ -0,0 +1,60 @@
+
+import server
+import os
+import folder_paths
+import json
+import asyncio
+from aiohttp import web
+from .db_service import DEFAULT_USER, read_table, db_dir_path
+
+comfy_path = os.path.dirname(folder_paths.__file__)
+
+@server.PromptServer.instance.routes.get("/workspace/get_settings")
+def get_settings_endpoint(request):
+    settings = get_settings()
+    return web.json_response(text=json.dumps(settings), content_type='application/json')
+
+def get_settings():
+    new_settings_path = os.path.join(db_dir_path, 'settings.json')
+    if os.path.exists(new_settings_path):
+        # to deprecate and remove legacy settings file
+        # if os.path.exists(f'{db_dir_path}/useSettings.json'):
+        #     os.remove(f'{db_dir_path}/useSettings.json')
+        with open(new_settings_path, 'r') as file:
+            return json.load(file)
+    data = read_table('userSettings')
+    if (data):
+        records = json.loads(data)
+        if DEFAULT_USER in records and 'myWorkflowsDir' in records[DEFAULT_USER]:  
+            return records[DEFAULT_USER]
+    return None
+
+@server.PromptServer.instance.routes.post("/workspace/save_settings")
+async def save_settings(request):
+    data = await request.json()
+    json_data = data
+    file_name = f'{db_dir_path}/settings.json'
+    # Offload file writing to a separate thread
+    def write_json_string_to_db(file_name, json_data):
+        if not os.path.exists(db_dir_path):
+            os.makedirs(db_dir_path)
+        # Write the JSON data to the specified file
+        with open(file_name, 'w') as file:
+            file.write(json.dumps(json_data, indent=4))
+    await asyncio.to_thread(write_json_string_to_db, file_name, json_data)
+    return web.Response(text=f"JSON saved to {file_name}")
+
+def get_my_workflows_dir():
+    data = get_settings()
+    if (data):
+        if 'myWorkflowsDir' in data:  
+            curDir = data['myWorkflowsDir']  
+        
+        # this is to be compatible of a bug that a dict is stored in userSettings.myWorkflowsDir
+        # should not be needed once all users refresh their settings
+        if not isinstance(curDir, str):
+            curDir = curDir.get('path', None)
+
+        if curDir and os.path.exists(curDir):
+            return curDir
+    return os.path.join(comfy_path, 'my_workflows')

service/twoway_sync_folder_service.py

@@ -4,7 +4,11 @@ from aiohttp import web
 import os
 from pathlib import Path
 import server
-from .db_service import get_my_workflows_dir
+from .setting_service import get_my_workflows_dir
+try:
+    from send2trash import send2trash
+except ImportError:
+    send2trash = None
 
 @server.PromptServer.instance.routes.post('/workspace/folder/create')
 async def create_folder(request):
@@ -31,7 +35,11 @@ def delete_folder_sync(reqJson):
     folder_path = reqJson.get('path')
     folder_path = os.path.join(get_my_workflows_dir(), folder_path)
     try:
-        shutil.rmtree(folder_path)
+        if send2trash:
+            send2trash(folder_path)
+        else:
+            shutil.rmtree(folder_path)
+            print("❌⛔️send2trash is not available. Deleting file permanently. Please `pip install send2trash`")
         return {"success": True}
     except Exception as e:
         return {"success": False, "error": str(e)}

ui/package.json

@@ -8,7 +8,7 @@
     "build": "vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview",
-    "setupGithooks": "node ../scripts/setupGithooks"
+    "setupGithooks": "node ../scripts/setupGitHooks"
   },
   "dependencies": {
     "@chakra-ui/react": "^2.8.2",

ui/src/Api.ts

@@ -1,10 +1,22 @@
 import { Table } from "./db-tables/WorkspaceDB";
 import type { ModelsListRespItem } from "./model-manager/types";
+import { api } from "./utils/comfyapp";
+
+export function fetchApi(
+  route: string,
+  options?: RequestInit,
+): Promise<Response> {
+  if (api == null) {
+    console.error("api is null!");
+    throw new Error("api is null!");
+  }
+  return api.fetchApi(route, options);
+}
 
 export async function getDB(table: Table): Promise<string | undefined> {
   console.warn("[workspace deprecated] getDB is deprecated", table);
   try {
-    const response = await fetch(`/workspace/get_db?table=${table}`);
+    const response = await fetchApi(`/workspace/get_db?table=${table}`);
     if (!response.ok) {
       return undefined;
     }
@@ -18,7 +30,7 @@ export async function getDB(table: Table): Promise<string | undefined> {
 
 export async function saveDB(table: Table, jsonData: string) {
   try {
-    const response = await fetch("/workspace/save_db", {
+    const response = await fetchApi("/workspace/save_db", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -34,7 +46,7 @@ export async function saveDB(table: Table, jsonData: string) {
 
 export async function updateFile(file_path: string, jsonData: string) {
   try {
-    const response = await fetch("/workspace/update_file", {
+    const response = await fetchApi("/workspace/update_file", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -54,7 +66,7 @@ export async function updateFile(file_path: string, jsonData: string) {
 
 export async function deleteFile(file_path: string, deleteEmptyFolder = false) {
   try {
-    const response = await fetch("/workspace/delete_file", {
+    const response = await fetchApi("/workspace/delete_file", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -71,27 +83,9 @@ export async function deleteFile(file_path: string, deleteEmptyFolder = false) {
   }
 }
 
-export async function listBackup(dir: string) {
-  try {
-    const response = await fetch("/workspace/list_backup", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        dir: dir,
-      }),
-    });
-    const result = await response.text();
-    return result;
-  } catch (error) {
-    console.error("Error saving workspace:", error);
-  }
-}
-
 export async function getSystemDir(root?: string) {
   try {
-    const response = await fetch("/workspace/get_system_dir", {
+    const response = await fetchApi("/workspace/get_system_dir", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -109,7 +103,7 @@ export async function getSystemDir(root?: string) {
 
 export async function openWorkflowsFolder() {
   try {
-    const response = await fetch("/workspace/open_workflow_file_browser", {
+    const response = await fetchApi("/workspace/open_workflow_file_browser", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -123,7 +117,7 @@ export async function openWorkflowsFolder() {
 }
 
 export async function fetchMyWorkflowsDir() {
-  const resp = await fetch("/workspace/get_my_workflows_dir");
+  const resp = await fetchApi("/workspace/get_my_workflows_dir");
   const res = (await resp.json()) as {
     path?: string;
     error?: string;
@@ -137,7 +131,7 @@ export async function fetchMyWorkflowsDir() {
 
 export async function getAllModelsList() {
   try {
-    const response = await fetch("/model_manager/get_model_list", {
+    const response = await fetchApi("/model_manager/get_model_list", {
       method: "GET",
       headers: {
         "Content-Type": "application/json",
@@ -152,7 +146,7 @@ export async function getAllModelsList() {
 
 export async function getAllFoldersList() {
   try {
-    const response = await fetch("/model_manager/get_folder_list", {
+    const response = await fetchApi("/model_manager/get_folder_list", {
       method: "GET",
       headers: {
         "Content-Type": "application/json",
@@ -167,7 +161,7 @@ export async function getAllFoldersList() {
 
 export async function deleteLocalDiskFolder(folderPath: string) {
   try {
-    const response = await fetch("/workspace/delete_folder", {
+    const response = await fetchApi("/workspace/delete_folder", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -185,7 +179,7 @@ export async function deleteLocalDiskFolder(folderPath: string) {
 
 export async function cancelDownload(savePath: string) {
   try {
-    const response = await fetch("/model_manager/cancel_installation", {
+    const response = await fetchApi("/model_manager/cancel_installation", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -206,7 +200,7 @@ export async function copyFlowsToNewDirectory(
   dstDir: string,
 ) {
   try {
-    const response = await fetch("/workspace/copy_json_files", {
+    const response = await fetchApi("/workspace/copy_json_files", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",

ui/src/App.tsx

@@ -1,15 +1,4 @@
-import {
-  Suspense,
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-  DragEvent,
-} from "react";
-// @ts-ignore
-import { app } from "/scripts/app.js";
-// @ts-ignore
-import { api } from "/scripts/api.js";
+import { Suspense, useCallback, useEffect, useRef, useState } from "react";
 import { Box, Portal, useToast } from "@chakra-ui/react";
 import {
   loadDBs,
@@ -38,12 +27,14 @@ const GalleryModal = React.lazy(() => import("./gallery/GalleryModal"));
 import { IconExternalLink } from "@tabler/icons-react";
 import { DRAWER_Z_INDEX, UPGRADE_TO_2WAY_SYNC_KEY } from "./const";
 import ServerEventListener from "./model-manager/hooks/ServerEventListener";
-import { nanoid } from "nanoid";
-import { WorkspaceRoute } from "./types/types";
+import { Session, WorkspaceRoute } from "./types/types";
 import { useStateRef } from "./customHooks/useStateRef";
 import { indexdb } from "./db-tables/indexdb";
 import EnableTwowaySyncConfirm from "./settings/EnableTwowaySyncConfirm";
-import { deepJsonDiffCheck } from "./utils/deepJsonDiffCheck";
+import { api, app } from "./utils/comfyapp";
+import { fetchApi } from "./Api";
+import { serverInfo } from "./utils/OsPathUtils";
+import { decodeKey } from "./utils/encryptUtils";
 
 export default function App() {
   const [curFlowName, setCurFlowName] = useState<string | null>(null);
@@ -51,7 +42,7 @@ export default function App() {
   const [loadingDB, setLoadingDB] = useState(true);
   const [flowID, setFlowID] = useState<string | null>(null);
   const curFlowID = useRef<string | null>(null);
-
+  const [session, setSession] = useState<Session | null>(null);
   const [isDirty, setIsDirty] = useState(false);
   const workspaceContainerRef = useRef(null);
   const { showDialog } = useDialog();
@@ -60,7 +51,8 @@ export default function App() {
   const toast = useToast();
   const [curVersion, setCurVersion] = useStateRef<WorkflowVersion | null>(null);
   const saveCurWorkflow = useCallback(async (force = false) => {
-    if (curFlowID.current) {
+    const curWorkflow = workflowsTable?.curWorkflow;
+    if (curWorkflow) {
       if (!force && workflowsTable?.curWorkflow?.saveLock) {
         toast({
           title: "The workflow is locked and cannot be saved",
@@ -71,31 +63,20 @@ export default function App() {
       }
       const graphJson = JSON.stringify(app.graph.serialize());
       await Promise.all([
-        workflowsTable?.updateFlow(curFlowID.current, {
+        workflowsTable?.updateFlow(curWorkflow.id, {
           json: graphJson,
         }),
         changelogsTable?.create({
-          workflowID: curFlowID.current,
+          workflowID: curWorkflow.id,
           json: graphJson,
           isAutoSave: false,
         }),
       ]);
-      userSettingsTable?.settings?.autoSave &&
-        toast({
-          title: "Saved",
-          status: "success",
-          duration: 1000,
-          isClosable: true,
-        });
       setIsDirty(false);
     }
   }, []);
 
   const discardUnsavedChanges = async () => {
-    if (userSettingsTable?.settings?.autoSave) {
-      alert("You cannot discard unsaved changes when auto save is enabled");
-      return;
-    }
     const userInput = confirm(
       "Are you sure you want to discard unsaved changes? This will revert current workflow to your last saved version. You will lose all changes made since your last save.",
     );
@@ -150,77 +131,71 @@ export default function App() {
     try {
       await loadDBs();
     } catch (error) {
-      console.error("error loading db", error);
+      console.error("🦄Workspace Manager - Error loading db", error);
     }
     setLoadingDB(false);
 
-    let latestWfID = null;
-    latestWfID = getWorkflowIdInUrlHash();
-    if (latestWfID == null) {
-      latestWfID = localStorage.getItem("curFlowID");
+    const urlWorkflowID = getWorkflowIdInUrlHash();
+    if (urlWorkflowID != null) {
+      loadWorkflowIDImpl(urlWorkflowID);
     }
-    if (latestWfID) {
-      loadWorkflowIDImpl(latestWfID);
-    }
-    fetch("/workspace/deduplicate_workflow_ids");
-    const twoway = await userSettingsTable?.getSetting("twoWaySync");
-    !twoway &&
-      indexdb.cache.get(UPGRADE_TO_2WAY_SYNC_KEY).then(async (value) => {
-        if (value?.value !== "true") {
-          const workflowsCount = await indexdb.workflows.count();
-          if (workflowsCount == 0) {
-            // empty workflows, enable 2way sync
-            await userSettingsTable?.upsert({ twoWaySync: true });
-            await indexdb.cache.put({
-              id: UPGRADE_TO_2WAY_SYNC_KEY,
-              value: "true",
-            });
-            return;
-          }
-          const myWorkflowsDir =
-            await userSettingsTable?.getSetting("myWorkflowsDir");
-          showDialog(
-            <EnableTwowaySyncConfirm
-              myWorkflowsDir={myWorkflowsDir ?? "undefined"}
-            />,
-            [
-              {
-                label: "I have downloaded all my workflows and ready to enable",
-                onClick: async () => {
-                  await userSettingsTable?.upsert({ twoWaySync: true });
-                  if (await userSettingsTable?.getSetting("twoWaySync")) {
-                    indexdb.cache.put({
-                      id: UPGRADE_TO_2WAY_SYNC_KEY,
-                      value: "true",
-                    });
-                    location.reload();
-                  }
-                },
-                colorScheme: "red",
-              },
-            ],
-            {
-              closeOnOverlayClick: false,
-            },
-          );
+    fetchApi("/workspace/deduplicate_workflow_ids");
+    fetchApi("/workspace/get_os")
+      .then((resp) => resp.json())
+      .then((data) => {
+        if (data.os) {
+          serverInfo.os = data.os;
         }
       });
-  };
+    const twoway = await userSettingsTable?.getSetting("twoWaySync");
 
-  const checkIsDirty = () => {
-    if (curFlowID.current == null) return false;
-    const curflow = workflowsTable?.curWorkflow;
-    if (curflow == null) return false;
-    if (curflow.json == null) return true;
-    const graphJson = app.graph.serialize() ?? {};
-    let lastSaved = {};
-    try {
-      lastSaved = curflow?.json ? JSON.parse(curflow?.json) : {};
-    } catch (e) {
-      console.error("error parsing json", e);
+    if (!twoway) {
+      const workflowsCount = await indexdb.workflows.count();
+      if (workflowsCount == 0) {
+        // empty workflows, enable 2way sync
+        await userSettingsTable?.upsert({ twoWaySync: true });
+        await indexdb.cache.put({
+          id: UPGRADE_TO_2WAY_SYNC_KEY,
+          value: "true",
+        });
+        return;
+      }
+      const myWorkflowsDir =
+        await userSettingsTable?.getSetting("myWorkflowsDir");
+      showDialog(
+        <EnableTwowaySyncConfirm
+          myWorkflowsDir={myWorkflowsDir ?? "undefined"}
+        />,
+        [
+          {
+            label: "I have downloaded all my workflows and ready to enable",
+            onClick: async () => {
+              await userSettingsTable?.upsert({ twoWaySync: true });
+              if (await userSettingsTable?.getSetting("twoWaySync")) {
+                indexdb.cache.put({
+                  id: UPGRADE_TO_2WAY_SYNC_KEY,
+                  value: "true",
+                });
+                location.reload();
+              }
+            },
+            colorScheme: "red",
+          },
+        ],
+        {
+          closeOnOverlayClick: false,
+        },
+      );
+    }
+    const encodedKey = localStorage.getItem("workspace_manager_shareKey");
+    if (encodedKey) {
+      const shareKey = decodeKey(encodedKey);
+      shareKey &&
+        setSession({
+          shareKey: shareKey,
+          username: null,
+        });
     }
-    const equal = deepJsonDiffCheck(graphJson, lastSaved);
-    return !equal;
   };
 
   const loadWorkflowIDImpl = async (id: string, versionID?: string | null) => {
@@ -269,8 +244,8 @@ export default function App() {
     if (
       !isDirty ||
       forceLoad ||
-      userSettingsTable?.settings?.autoSave ||
-      workflowsTable?.curWorkflow == null
+      workflowsTable?.curWorkflow == null ||
+      userSettingsTable?.settings?.disableUnsavedWarning
     ) {
       loadWorkflowIDImpl(id, versionID);
       return;
@@ -352,7 +327,6 @@ export default function App() {
       json: workflow.json,
       name: newFlowName || workflow.name,
       parentFolderID: workflow.parentFolderID,
-      tags: workflow.tags,
     });
     flow && (await loadWorkflowID(flow.id));
   };
@@ -390,37 +364,6 @@ export default function App() {
     graphAppSetup();
     setLoadChild(true);
 
-    const fileInput = document.getElementById(
-      "comfy-file-input",
-    ) as HTMLInputElement;
-    const fileInputListener = async () => {
-      if (fileInput && fileInput.files && fileInput.files.length > 0) {
-        const newFlow: Workflow = {
-          id: nanoid(),
-          name: fileInput.files[0].name,
-          json: JSON.stringify(defaultGraph),
-          updateTime: Date.now(),
-          createTime: Date.now(),
-        };
-        setCurFlowIDAndName(newFlow);
-        await workflowsTable?.createFlow(newFlow);
-      }
-    };
-    fileInput?.addEventListener("change", fileInputListener);
-
-    const handleBeforeUnload = (e: BeforeUnloadEvent) => {
-      const autoSaveEnabled = userSettingsTable?.settings?.autoSave ?? true;
-      if (workflowsTable?.curWorkflow?.saveLock) return;
-      const isDirty = checkIsDirty();
-
-      if (!autoSaveEnabled && isDirty) {
-        e.preventDefault(); // For modern browsers
-        e.returnValue = "You have unsaved changes!"; // For older browsers
-        showSaveOrDiscardCurWorkflowDialog();
-      }
-    };
-    window.addEventListener("beforeunload", handleBeforeUnload);
-
     const handleExecuted = (e: any) => {
       e.detail?.output?.images?.forEach(
         (im: { filename: string; subfolder: string; type: string }) => {
@@ -439,35 +382,8 @@ export default function App() {
     };
     api.addEventListener("executed", handleExecuted);
 
-    const handleDrop = async (event: DragEvent) => {
-      const fileName = event.dataTransfer?.files[0]?.name;
-      const n = app.dragOverNode;
-      if (n && n.onDragDrop) {
-        return;
-      }
-      const overwriteFlow =
-        (await userSettingsTable?.getSetting(
-          "overwriteCurWorkflowWhenDroppingFileToCanvas",
-        )) ?? false;
-      if (!overwriteFlow && fileName) {
-        const newFlow: Workflow = {
-          id: nanoid(),
-          name: fileName,
-          json: JSON.stringify(defaultGraph),
-          updateTime: Date.now(),
-          createTime: Date.now(),
-        };
-        setCurFlowIDAndName(newFlow);
-        await workflowsTable?.createFlow(newFlow);
-      }
-    };
-    app.canvasEl.addEventListener("drop", handleDrop);
-
     return () => {
-      window.removeEventListener("change", fileInputListener);
-      window.removeEventListener("beforeunload", handleBeforeUnload);
       window.removeEventListener("executed", handleExecuted);
-      app.canvasEl.removeEventListener("drop", handleDrop);
     };
   }, []);
 
@@ -491,6 +407,9 @@ export default function App() {
         route: route,
         curVersion: curVersion,
         setCurVersion: setCurVersion,
+        setCurFlowIDAndName: setCurFlowIDAndName,
+        session: session,
+        updateSession: setSession,
       }}
     >
       <div ref={workspaceContainerRef} className="workspace_manager">

ui/src/RecentFilesDrawer/FilesListFolderItem.tsx

@@ -18,6 +18,7 @@ import FilesListFolderItemRightClickMenu from "./FilesListFolderItemRightClickMe
 import { ESortTypes, sortTypeLocalStorageKey } from "./types";
 import { Folder, Workflow } from "../types/dbTypes";
 import ItemsList from "./ItemsList";
+import { getPathSep } from "../utils/OsPathUtils";
 
 type Props = {
   folder: Folder;
@@ -82,8 +83,8 @@ export default memo(function FilesListFolderItem({ folder }: Props) {
   }, [isCollapsed]);
   useEffect(() => {
     const cur = workflowsTable?.curWorkflow;
-    const curWorkflowPath = cur?.parentFolderID + "/";
-    const folderPath = folder.id + "/";
+    const curWorkflowPath = cur?.parentFolderID + getPathSep();
+    const folderPath = folder.id + getPathSep();
     const childreHasCurworkflow = curWorkflowPath.startsWith(folderPath);
     if (childreHasCurworkflow) {
       setIsCollapsed(false);

ui/src/RecentFilesDrawer/MoreActionMenu.tsx

@@ -12,15 +12,21 @@ import {
   IconCopy,
   IconDotsVertical,
   IconExternalLink,
+  IconLink,
   IconLock,
   IconLockOpen,
   IconUpload,
 } from "@tabler/icons-react";
-import AddTagToWorkflowPopover from "./AddTagToWorkflowPopover";
 import { Workflow } from "../types/dbTypes";
-import { mediaTable, workflowsTable } from "../db-tables/WorkspaceDB";
+import {
+  mediaTable,
+  userSettingsTable,
+  workflowsTable,
+} from "../db-tables/WorkspaceDB";
 import { WorkspaceContext } from "../WorkspaceContext";
 import { openWorkflowInNewTab } from "../utils";
+import { fetchApi } from "../Api";
+import CopyShareLinkMenuItem from "../components/CopyShareLinkMenuItem";
 
 type Props = {
   workflow: Workflow;
@@ -55,7 +61,7 @@ export default function MoreActionMenu({ workflow }: Props) {
       body.append(`images[${index}]`, file, file.name);
     });
     body.append("subfolder", "workspace_manager");
-    await fetch("/workspace/images/save", {
+    await fetchApi("/workspace/images/save", {
       method: "POST",
       body,
     });
@@ -114,6 +120,7 @@ export default function MoreActionMenu({ workflow }: Props) {
               {isLocked ? "Unlock" : "Lock"}
             </MenuItem>
           </Tooltip>
+          <CopyShareLinkMenuItem curFlow={workflow} />
           <MenuItem
             icon={<IconUpload />}
             onClick={() => {

ui/src/RecentFilesDrawer/RecentFilesDrawer.tsx

@@ -30,8 +30,6 @@ import RecentFilesDrawerMenu from "./RecentFilesDrawerMenu";
 import { insertWorkflowToCanvas, sortFileItem } from "../utils";
 import MultipleSelectionOperation from "./MultipleSelectionOperation";
 import { ESortTypes, sortTypeLocalStorageKey } from "./types";
-// @ts-expect-error ComfyUI import
-import { app } from "/scripts/app.js";
 import { useDebounce } from "../customHooks/useDebounce";
 import SearchInput from "../components/SearchInput";
 import { openWorkflowsFolder } from "../Api";
@@ -40,6 +38,7 @@ import MyTagsRow from "./MyTagsRow";
 import ImportFlowsFileInput from "./ImportFlowsFileInput";
 import ItemsList from "./ItemsList";
 import { DRAWER_Z_INDEX } from "../const";
+import { app } from "../utils/comfyapp";
 
 type Props = {
   onClose: () => void;
@@ -258,22 +257,18 @@ export default function RecentFilesDrawer({ onClose, onClickNewFlow }: Props) {
             />
             <HStack mb={2} mt={2} p={0} justifyContent="space-between">
               <HStack>
-                {allFlowsRef.current.length > 0 ? (
-                  <MultipleSelectionOperation
-                    multipleState={multipleState}
-                    changeMultipleState={(state) => {
-                      setMultipleState(state);
-                      !state && setSelectedKeys([]);
-                    }}
-                    selectedKeys={selectedKeys}
-                    isSelectedAll={
-                      selectedKeys.length === allFlowsRef.current.length
-                    }
-                    batchOperationCallback={batchOperationCallback}
-                  />
-                ) : (
-                  <Box />
-                )}
+                <MultipleSelectionOperation
+                  multipleState={multipleState}
+                  changeMultipleState={(state) => {
+                    setMultipleState(state);
+                    !state && setSelectedKeys([]);
+                  }}
+                  selectedKeys={selectedKeys}
+                  isSelectedAll={
+                    selectedKeys.length === allFlowsRef.current.length
+                  }
+                  batchOperationCallback={batchOperationCallback}
+                />
                 {!multipleState && (
                   <Tooltip hasArrow label="New folder" placement="bottom-start">
                     <IconButton

ui/src/RecentFilesDrawer/RecentFilesDrawerMenu.tsx

@@ -11,9 +11,7 @@ import {
   IconMoon,
   IconSettings,
   IconSun,
-  IconTag,
 } from "@tabler/icons-react";
-import ManageTagsModal from "./ManageTagsModal";
 import { useState } from "react";
 import WorkspaceSettingsModal from "./WorkspaceSettingsModal";
 const ICON_SIZE = 16;
@@ -21,7 +19,6 @@ type Props = {
   //   onclose: () => void;
 };
 export default function RecentFilesDrawerMenu({}: Props) {
-  const [isManageTagsOpen, setIsManageTagsOpen] = useState(false);
   const [isSettingsOpen, setIsSettingsOpen] = useState(false);
   const { colorMode, toggleColorMode } = useColorMode();
 
@@ -43,13 +40,6 @@ export default function RecentFilesDrawerMenu({}: Props) {
           >
             Settings
           </MenuItem>
-          <MenuItem
-            onClick={() => setIsManageTagsOpen(true)}
-            icon={<IconTag size={ICON_SIZE} />}
-            fontSize={16}
-          >
-            Manage Tags
-          </MenuItem>
           <MenuItem
             onClick={toggleColorMode}
             icon={
@@ -65,9 +55,6 @@ export default function RecentFilesDrawerMenu({}: Props) {
           </MenuItem>
         </MenuList>
       </Menu>
-      {isManageTagsOpen && (
-        <ManageTagsModal onclose={() => setIsManageTagsOpen(false)} />
-      )}
       {isSettingsOpen && (
         <WorkspaceSettingsModal onClose={() => setIsSettingsOpen(false)} />
       )}

ui/src/RecentFilesDrawer/WorkflowListItem.tsx

@@ -89,7 +89,7 @@ export default memo(function WorkflowListItem({ workflow }: Props) {
       w={"100%"}
       justify={"space-between"}
       borderBottom={"1px solid"}
-      borderColor={colorMode == "dark" ? "gray.900" : "gray.200"}
+      borderColor={colorMode == "dark" ? "gray.700" : "gray.200"}
       onMouseEnter={() => setIsHovering(true)}
       onMouseLeave={() => setIsHovering(false)}
     >
@@ -111,7 +111,7 @@ export default memo(function WorkflowListItem({ workflow }: Props) {
             {isHovering ? (
               <WorkflowListItemActionButtons workflow={workflow} />
             ) : (
-              <Text color={"GrayText"} ml={"2px"} fontSize={"sm"}>
+              <Text color={"GrayText"} fontSize={"sm"}>
                 {formatTimestamp(workflow.updateTime, false, false, "/")}
               </Text>
             )}

ui/src/RecentFilesDrawer/WorkspaceSettingsModal.tsx

@@ -10,12 +10,12 @@ import {
   VStack,
 } from "@chakra-ui/react";
 import { ShortcutSettings } from "../settings/ShortcutSettings";
-import FolderOnTopSettings from "../settings/FolderOnTopSettings";
 import TwoWaySyncSettings from "../settings/TwoWaySyncSettings";
 import CommonCheckboxSettings from "../settings/CommonCheckboxSettings";
 import SelectMyWorkflowsDir from "../settings/SelectMyWorkflowsDir";
 import { CommonNumberSetting } from "../settings/CommonNumberSetting";
-import AutosaveSetting from "../settings/AutosaveSetting";
+import CloudHostSetting from "../settings/CloudHostSetting";
+import SharekeySetting from "../settings/SharekeySetting";
 
 export default function WorkspaceSettingsModal({
   onClose,
@@ -38,13 +38,12 @@ export default function WorkspaceSettingsModal({
                 w="100%"
               >
                 <SelectMyWorkflowsDir />
-                <AutosaveSetting />
                 <ShortcutSettings />
                 <TwoWaySyncSettings />
-                <FolderOnTopSettings />
+                <SharekeySetting />
                 <CommonCheckboxSettings
-                  settingKey="overwriteCurWorkflowWhenDroppingFileToCanvas"
-                  text="Overwrite current workflow when drag and drop workflow file to canvas"
+                  settingKey="foldersOnTop"
+                  text={`Folders always on top`}
                 />
                 <CommonNumberSetting
                   label={`Maximum number of save change history to store. This does not include
@@ -52,10 +51,16 @@ export default function WorkspaceSettingsModal({
         and has no limit.`}
                   settingKey="maximumChangelogNumber"
                 />
+                <CommonCheckboxSettings
+                  settingKey="disableUnsavedWarning"
+                  text={`Disable the "Save or Discard" warning when closing a workflow with unsaved changes. ⛔️Be careful, if you disable this reminder and forget to save your workflow, you will lose your changes.`}
+                />
+
                 <CommonCheckboxSettings
                   settingKey="hideCoverImage"
                   text="Hide thumbnail image in workflow list"
                 />
+                <CloudHostSetting />
               </VStack>
             </HStack>
           </ModalBody>

ui/src/WorkspaceContext.ts

@@ -1,6 +1,6 @@
 import { createContext } from "react";
 import { Folder, Workflow, WorkflowVersion } from "./types/dbTypes";
-import { WorkspaceRoute } from "./types/types";
+import { Session, WorkspaceRoute } from "./types/types";
 export type JsonDiff = {
   old: Object;
   new: Object;
@@ -24,6 +24,9 @@ export const WorkspaceContext = createContext<{
   route: WorkspaceRoute;
   curVersion: WorkflowVersion | null;
   setCurVersion: (version: WorkflowVersion | null) => void;
+  setCurFlowIDAndName: (workflow: Workflow | null) => void;
+  session: Session | null;
+  updateSession: (session: Session) => void;
 }>({
   curFlowID: null,
   loadWorkflowID: () => {},
@@ -37,6 +40,9 @@ export const WorkspaceContext = createContext<{
   curVersion: null,
   setIsDirty: () => {},
   setCurVersion: () => {},
+  setCurFlowIDAndName: () => {},
+  session: null,
+  updateSession: () => {},
 });
 
 export const RecentFilesContext = createContext<{

ui/src/apis/TwowaySyncApi.ts

@@ -1,3 +1,4 @@
+import { fetchApi } from "../Api";
 import { COMFYSPACE_TRACKING_FIELD_NAME } from "../const";
 import { indexdb } from "../db-tables/indexdb";
 import { Workflow } from "../types/dbTypes";
@@ -13,7 +14,7 @@ export namespace TwowaySyncAPI {
     newParentFolderRelPath: string,
   ) {
     try {
-      const response = await fetch("/workspace/file/move", {
+      const response = await fetchApi("/workspace/file/move", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -39,7 +40,7 @@ export namespace TwowaySyncAPI {
     parentFolderID: string | null,
   ): Promise<string | null> {
     try {
-      const response = await fetch("/workspace/file/gen_unique_name", {
+      const response = await fetchApi("/workspace/file/gen_unique_name", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -65,7 +66,7 @@ export namespace TwowaySyncAPI {
     newName: string,
   ) {
     try {
-      const response = await fetch("/workspace/file/rename", {
+      const response = await fetchApi("/workspace/file/rename", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -85,16 +86,6 @@ export namespace TwowaySyncAPI {
       console.error("Error deleting file:", error);
     }
   }
-
-  interface DuplicatesResponse {
-    duplicates: {
-      [id: string]: Array<{
-        path: string;
-        createTime: number;
-      }>;
-    };
-  }
-
   export async function saveWorkflow(workflow: Workflow) {
     const json = workflow.json;
     const flow = JSON.parse(json);
@@ -102,7 +93,12 @@ export namespace TwowaySyncAPI {
       flow.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {};
     }
     flow.extra[COMFYSPACE_TRACKING_FIELD_NAME].id = workflow.id;
-    const response = await fetch("/workspace/file/save", {
+    flow.extra[COMFYSPACE_TRACKING_FIELD_NAME].saveLock = workflow.saveLock;
+    flow.extra[COMFYSPACE_TRACKING_FIELD_NAME].cloudID = workflow.cloudID;
+    flow.extra[COMFYSPACE_TRACKING_FIELD_NAME].coverMediaPath =
+      workflow.coverMediaPath;
+
+    const response = await fetchApi("/workspace/file/save", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -125,7 +121,7 @@ export namespace TwowaySyncAPI {
   }
   export async function deleteWorkflow(workflow: Workflow) {
     try {
-      const response = await fetch("/workspace/delete_file", {
+      const response = await fetchApi("/workspace/delete_file", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -142,12 +138,8 @@ export namespace TwowaySyncAPI {
       console.error("Error deleting file:", error);
     }
   }
-  export async function createWorkflow({
-    parentFolderID,
-    name,
-    json,
-    id,
-  }: Workflow) {
+  export async function createWorkflow(workflow: Workflow) {
+    const { parentFolderID, name, json, id } = workflow;
     let jsonObj: any = JSON.parse(json);
     if (jsonObj.extra == null) {
       jsonObj.extra = {};
@@ -156,6 +148,10 @@ export namespace TwowaySyncAPI {
       jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {};
     }
     jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME].id = id; // to avoid overwriting deps
+    jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME].saveLock = workflow.saveLock;
+    jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME].cloudID = workflow.cloudID;
+    jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME].coverMediaPath =
+      workflow.coverMediaPath;
     const input: { parentFolderPath: string; name: string; json: string } = {
       parentFolderPath: sanitizeRelPath(parentFolderID ?? ""),
       name: name,
@@ -163,7 +159,7 @@ export namespace TwowaySyncAPI {
     };
 
     try {
-      const response = await fetch("/workspace/create_workflow_file", {
+      const response = await fetchApi("/workspace/create_workflow_file", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -195,12 +191,23 @@ export namespace TwowaySyncAPI {
     id: string;
     name: string;
   }): Promise<{
-    json?: Object;
+    json?: {
+      extra: {
+        [COMFYSPACE_TRACKING_FIELD_NAME]: {
+          id: string;
+          saveLock: boolean;
+          cloudID: string | null;
+          coverMediaPath: string | null;
+        };
+      };
+    };
+    createTime?: number;
+    updateTime?: number;
     error?: string;
   }> {
     const relPath = joinRelPath(parentFolderID ?? "", name + ".json");
     try {
-      const response = await fetch("/workspace/get_workflow_file", {
+      const response = await fetchApi("/workspace/get_workflow_file", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -234,7 +241,11 @@ export type ScanLocalFile = {
   type: "workflow";
   name: string;
   id: string;
+  path: string;
   json: string;
+  saveLock: boolean;
+  cloudID: string | null;
+  coverMediaPath: string | null;
   createTime: number;
   updateTime: number;
   lastOpenedTime?: number;
@@ -243,6 +254,7 @@ export type ScanLocalFolder = {
   id: string;
   type: "folder";
   name: string;
+  path: string;
   parentFolderID: string;
 };
 export async function scanLocalFiles(
@@ -251,17 +263,20 @@ export async function scanLocalFiles(
   metaInfoOnly = false,
 ): Promise<Array<ScanLocalFile | ScanLocalFolder>> {
   try {
-    const response = await fetch("/workspace/file/scan_my_workflows_folder", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
+    const response = await fetchApi(
+      "/workspace/file/scan_my_workflows_folder",
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          path: sanitizeRelPath(path),
+          recursive,
+          metaInfoOnly,
+        }),
       },
-      body: JSON.stringify({
-        path: sanitizeRelPath(path),
-        recursive,
-        metaInfoOnly,
-      }),
-    });
+    );
     const result = await response.json();
     return result;
   } catch (error) {

ui/src/apis/TwowaySyncFolderApi.ts

@@ -1,3 +1,4 @@
+import { fetchApi } from "../Api";
 import { Folder } from "../types/dbTypes";
 import { sanitizeRelPath } from "../utils/OsPathUtils";
 
@@ -13,7 +14,7 @@ export namespace TwowayFolderSyncAPI {
   }
 
   export async function createFolder(folder: Folder) {
-    await fetch("/workspace/folder/create", {
+    await fetchApi("/workspace/folder/create", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -27,7 +28,7 @@ export namespace TwowayFolderSyncAPI {
     folderToBeMoved: string,
     newParentPath: string,
   ) {
-    const resp = await fetch("/workspace/folder/move", {
+    const resp = await fetchApi("/workspace/folder/move", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -45,7 +46,7 @@ export namespace TwowayFolderSyncAPI {
   }
   export async function deleteFolder(relPath: string) {
     try {
-      const response = await fetch("/workspace/folder/delete", {
+      const response = await fetchApi("/workspace/folder/delete", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -65,7 +66,7 @@ export namespace TwowayFolderSyncAPI {
     folderRelPath: string,
   ): Promise<number | null> {
     try {
-      const response = await fetch("/workspace/file/count_files", {
+      const response = await fetchApi("/workspace/file/count_files", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -90,7 +91,7 @@ export namespace TwowayFolderSyncAPI {
     newName: string,
   ): Promise<void> {
     try {
-      const response = await fetch("/workspace/folder/rename", {
+      const response = await fetchApi("/workspace/folder/rename", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",

ui/src/auth/authUtils.ts

@@ -1,19 +0,0 @@
-import { COMFYSPACE_AUTH_REDIRECT_URL } from "../const";
-
-const COGNITO_DOMAIN = import.meta.env.VITE_AWS_COGNITO_DOMAIN;
-const CLIENT_ID = import.meta.env.VITE_AWS_COGNITO_CLIENT_ID;
-const redirectUri = encodeURIComponent(COMFYSPACE_AUTH_REDIRECT_URL);
-
-export function openCognitoPopup() {
-  const cognitoUrl = `${COGNITO_DOMAIN}/login`;
-  const responseType = "token";
-
-  const popupUrl = `${cognitoUrl}?response_type=${responseType}&client_id=${CLIENT_ID}&redirect_uri=${redirectUri}`;
-  const popupWindow = window.open(
-    popupUrl,
-    "ComfyspaceLogin",
-    "width=800,height=600",
-  );
-
-  popupWindow?.focus();
-}

ui/src/components/CopyShareLinkMenuItem.tsx

@@ -0,0 +1,58 @@
+import { HStack, MenuItem, Spinner, useToast } from "@chakra-ui/react";
+import { IconLink } from "@tabler/icons-react";
+import { useContext, useState } from "react";
+import { WorkspaceContext } from "../WorkspaceContext";
+import { copySharelink } from "./copySharelink";
+import { Workflow } from "../types/dbTypes";
+
+export default function CopyShareLinkMenuItem({
+  curFlow,
+}: {
+  curFlow: Workflow;
+}) {
+  const { session } = useContext(WorkspaceContext);
+  const toast = useToast();
+  const [loading, setloading] = useState(false);
+
+  return (
+    <MenuItem
+      onClick={async () => {
+        if (!curFlow) {
+          return;
+        }
+        if (!session?.shareKey) {
+          alert(
+            "Please set your share key first in Settings to enable cloud share.",
+          );
+          return;
+        }
+        setloading(true);
+        const res = await copySharelink(session.shareKey, curFlow!);
+        if (res?.link) {
+          navigator.clipboard.writeText(res.link);
+          toast({
+            title: "Link copied",
+            status: "success",
+            duration: 2000,
+          });
+        } else {
+          toast({
+            title: "Failed to copy link",
+            status: "error",
+            description: res?.error,
+            duration: null,
+          });
+        }
+        setloading(false);
+      }}
+      icon={loading ? <Spinner /> : <IconLink size={20} />}
+      iconSpacing={1}
+      alignItems={"center"}
+      isDisabled={loading}
+    >
+      <HStack>
+        <p>Copy share link</p>
+      </HStack>
+    </MenuItem>
+  );
+}

ui/src/components/CreateVersionDialog.tsx

@@ -1,9 +1,7 @@
 import {
   Button,
   Modal,
-  ModalOverlay,
   ModalContent,
-  ModalHeader,
   ModalCloseButton,
   ModalBody,
   ModalFooter,
@@ -11,20 +9,30 @@ import {
   FormLabel,
   FormErrorMessage,
   Input,
+  Stack,
+  useToast,
 } from "@chakra-ui/react";
-import { workflowVersionsTable } from "../db-tables/WorkspaceDB";
-import { useState, ChangeEvent } from "react";
-// @ts-ignore
-import { app } from "/scripts/app.js";
+import { userSettingsTable, workflowsTable } from "../db-tables/WorkspaceDB";
+import { useState, ChangeEvent, useContext } from "react";
+import { WorkspaceContext } from "../WorkspaceContext";
+import CreateVersionLogin from "../versionHistory/CreateVersionLogin";
+import { ShareWorkflowData } from "../types/types";
+import { app } from "../utils/comfyapp";
+import { EWorkflowPrivacy } from "../types/dbTypes";
+import { getCurDateString, getNodeDefs } from "../share/shareUtils";
 
 interface Props {
   workflowId: string;
   onClose: () => void;
 }
-export default function CreateVersionDialog({ workflowId, onClose }: Props) {
-  const [newVersionName, setNewVersionName] = useState("");
+export default function CreateVersionDialog({ onClose }: Props) {
+  const [newVersionName, setNewVersionName] = useState(
+    "v" + getCurDateString(),
+  );
   const [submitError, setSubmitError] = useState("");
-
+  const { session } = useContext(WorkspaceContext);
+  const toast = useToast();
+  const [submitting, setSubmitting] = useState(false);
   const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
     setNewVersionName(event.target.value);
     submitError && setSubmitError("");
@@ -33,31 +41,81 @@ export default function CreateVersionDialog({ workflowId, onClose }: Props) {
   const onSubmit = async () => {
     const trimName = newVersionName.trim();
     setNewVersionName(trimName);
-    const versionList =
-      (await workflowVersionsTable?.listByWorkflowID(workflowId)) ?? [];
-    if (versionList.some((version) => version.name === trimName)) {
-      setSubmitError(
-        "The name is duplicated, please modify it and submit again.",
-      );
-    } else {
-      const graphJson = JSON.stringify(app.graph.serialize());
-      await workflowVersionsTable?.add({
-        name: newVersionName,
-        workflowID: workflowId,
-        createTime: Date.now(),
-        json: graphJson,
-      });
-      onClose();
+    if (!workflowsTable?.curWorkflow) {
+      throw new Error("No workflow selected");
     }
+    setSubmitting(true);
+    const prompt = await app.graphToPrompt();
+    const graph = app.graph.serialize();
+    if (!graph.extra) {
+      graph.extra = {};
+    }
+    graph.extra.apiPrompt = prompt.output ?? null;
+    const input: ShareWorkflowData = {
+      workflow: {
+        name: workflowsTable?.curWorkflow?.name,
+        cloudID: workflowsTable?.curWorkflow?.cloudID,
+      },
+      version: {
+        name: trimName,
+        json: JSON.stringify(graph),
+      },
+      nodeDefs: getNodeDefs(),
+      privacy: EWorkflowPrivacy.PRIVATE,
+    };
+    const data = await fetch(
+      userSettingsTable?.settings?.cloudHost + "/api/createCloudflow",
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${session?.shareKey}`,
+        },
+        body: JSON.stringify(input),
+      },
+    )
+      .then((resp) => resp.json())
+      .then(async (data) => {
+        if (data?.data) {
+          const cloudID = data.data.workflowID;
+          await workflowsTable?.updateMetaInfo(
+            workflowsTable?.curWorkflow?.id!,
+            {
+              cloudID,
+            },
+          );
+          toast({
+            title: "Version created",
+            status: "success",
+            duration: 3000,
+          });
+          onClose();
+        } else {
+          setSubmitError("Failed to create version. " + (data?.error ?? ""));
+        }
+      })
+      .catch((e) => {
+        setSubmitError("Failed to create version");
+        return null;
+      });
+    setSubmitting(false);
   };
-
+  if (!session?.shareKey) {
+    return <CreateVersionLogin onClose={onClose} />;
+  }
+  const domain = new URL(userSettingsTable!.settings!.cloudHost).hostname;
   return (
     <Modal isOpen={true} onClose={onClose}>
-      <ModalOverlay />
       <ModalContent>
-        <ModalHeader>Create Version</ModalHeader>
         <ModalCloseButton />
         <ModalBody>
+          <Stack mb={5}>
+            <p style={{ fontSize: 20, fontWeight: "bold" }}>Create Version</p>
+            <p style={{ color: "GrayText" }}>
+              Saving to{" "}
+              <a href={userSettingsTable?.settings?.cloudHost}> {domain}</a>
+            </p>
+          </Stack>
           <FormControl isInvalid={!!submitError}>
             <FormLabel>Name</FormLabel>
             <Input
@@ -79,7 +137,8 @@ export default function CreateVersionDialog({ workflowId, onClose }: Props) {
             colorScheme="teal"
             mr={3}
             onClick={onSubmit}
-            isDisabled={!newVersionName || !!submitError}
+            isDisabled={!newVersionName}
+            isLoading={submitting}
           >
             Create
           </Button>

ui/src/components/DropdownTitle.tsx

@@ -26,6 +26,7 @@ import {
   DarkMode,
   Tag,
   HStack,
+  useToast,
 } from "@chakra-ui/react";
 import {
   IconArrowBackUpDouble,
@@ -43,11 +44,11 @@ import { Workflow } from "../types/dbTypes";
 import CreateVersionDialog from "./CreateVersionDialog";
 import HoverMenu from "./HoverMenu";
 const ShareDialog = lazy(() => import("../share/ShareDialog"));
-// @ts-ignore
-import { app } from "/scripts/app.js";
 import { TOPBAR_BUTTON_HEIGHT } from "../const";
-import DownloadSpaceJsonDialog from "../spacejson/DownloadSpaceJsonDialog";
 import { downloadJsonFile } from "../utils/downloadJsonFile";
+import { SharedTopbarButton } from "../share/SharedTopbarButton";
+import { app } from "../utils/comfyapp";
+import CopyShareLinkMenuItem from "./CopyShareLinkMenuItem";
 
 export default function DropdownTitle() {
   const {
@@ -57,6 +58,7 @@ export default function DropdownTitle() {
     saveCurWorkflow,
     setRoute,
     route,
+    session,
   } = useContext(WorkspaceContext);
 
   const [isOpenNewVersion, setIsOpenNewVersion] = useState(false);
@@ -84,7 +86,7 @@ export default function DropdownTitle() {
     setNewFlowName(event.target.value);
     submitError && setSubmitError("");
   };
-
+  const toast = useToast();
   const onSubmit = async () => {
     if (!curFlowID) {
       alert("Flow ID is required");
@@ -146,17 +148,15 @@ export default function DropdownTitle() {
               >
                 Save
               </MenuItem>
-              {!userSettingsTable?.settings?.autoSave && (
-                <Tooltip label="Revert workflow to your last saved version. You will lose all changes made since your last save.">
-                  <MenuItem
-                    onClick={discardUnsavedChanges}
-                    icon={<IconArrowBackUpDouble size={20} />}
-                    iconSpacing={1}
-                  >
-                    Discard unsaved changes
-                  </MenuItem>
-                </Tooltip>
-              )}
+              <Tooltip label="Revert workflow to your last saved version. You will lose all changes made since your last save.">
+                <MenuItem
+                  onClick={discardUnsavedChanges}
+                  icon={<IconArrowBackUpDouble size={20} />}
+                  iconSpacing={1}
+                >
+                  Discard unsaved changes
+                </MenuItem>
+              </Tooltip>
               <MenuItem
                 onClick={handleDownload}
                 icon={<IconDownload size={20} />}
@@ -186,23 +186,20 @@ export default function DropdownTitle() {
               >
                 Versions History
               </MenuItem>
-              {/* <MenuItem
-                onClick={() => setRoute("downloadSpaceJson")}
-                icon={<IconDownload size={20} />}
-                iconSpacing={1}
-              >
-                Save runnable workflow🧪
-              </MenuItem> */}
               <MenuItem
-                onClick={() => setRoute("downloadSpaceJson")}
+                onClick={() => setRoute("share")}
                 icon={<IconShare2 size={20} />}
                 iconSpacing={1}
                 alignItems={"center"}
               >
                 <HStack>
                   <p>Share</p> <Tag size={"sm"}>🧪beta</Tag>
+                  <SharedTopbarButton />
                 </HStack>
               </MenuItem>
+              {workflowsTable?.curWorkflow && (
+                <CopyShareLinkMenuItem curFlow={workflowsTable?.curWorkflow} />
+              )}
             </MenuList>
           </Menu>
         }
@@ -211,7 +208,6 @@ export default function DropdownTitle() {
       {route == "versionHistory" && (
         <VersionHistoryDrawer onClose={() => setRoute("root")} />
       )}
-      {route == "downloadSpaceJson" && <DownloadSpaceJsonDialog />}
       {route === "saveAsModal" && (
         <Modal isOpen={true} onClose={handleOnCloseModal}>
           <ModalOverlay />

ui/src/components/EditFlowName.tsx

@@ -81,7 +81,7 @@ export default function EditFlowName({
           as="div"
           color="white"
           onClick={startEdit}
-          maxW={200}
+          maxW={160}
           fontWeight={500}
           whiteSpace="nowrap"
           overflow="hidden"

ui/src/components/MediaPreview.tsx

@@ -52,35 +52,5 @@ export default function MediaPreview({
       src={`/workspace/view_media?filename=${mediaLocalPath}`}
       alt="workflow image renamed or moved from output folder"
     />
-  ) : (
-    <div
-      style={{
-        width: size + "px",
-        height: size + `px`,
-        overflow: "hidden",
-        position: "relative",
-      }}
-    >
-      <video
-        width={size}
-        height={size}
-        src={`/workspace/view_media?filename=${mediaLocalPath}`}
-        loop={true}
-        autoPlay={autoPlay ?? false}
-        muted={true}
-        style={{
-          // for video to crop to center
-          objectFit: "cover",
-          width: "100%",
-          height: "100%",
-          // position: "absolute",
-          // top: "50%", // Align the center of the video with the center of the container vertically
-          // left: "50%", // Align the center of the video with the center of the container horizontally
-          // transform: "translate(-50%, -50%)", // Offset the video to ensure it is centered
-        }}
-      >
-        <track kind="captions" />
-      </video>
-    </div>
-  );
+  ) : null;
 }

ui/src/components/VersionHistoryDrawer.tsx

@@ -21,26 +21,28 @@ import {
 import { IconX } from "@tabler/icons-react";
 import {
   changelogsTable,
+  userSettingsTable,
   workflowsTable,
   workflowVersionsTable,
 } from "../db-tables/WorkspaceDB";
 import { useContext, useEffect, useState } from "react";
 import { WorkspaceContext } from "../WorkspaceContext";
-import { formatTimestamp } from "../utils";
-// @ts-ignore
-import { app } from "/scripts/app.js";
 import { Changelog, WorkflowVersion } from "../types/dbTypes";
 import DeleteConfirm from "./DeleteConfirm";
+import { app } from "../utils/comfyapp";
 
 export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
-  const toast = useToast();
-  const { curFlowID, isDirty, loadWorkflowID, curVersion } =
+  const { isDirty, loadWorkflowID, curVersion, session } =
     useContext(WorkspaceContext);
   const [active, setActive] = useState(0); // 0: version、1: changelog
   const [selectedVersion, setSelectedVersion] = useState<string | null>(null);
   const [changelogs, setChangelogs] = useState<Changelog[]>([]);
-  const [versions, setVersions] = useState<WorkflowVersion[]>([]);
-
+  const [versions, setVersions] = useState<
+    (WorkflowVersion & { isCloud?: boolean })[]
+  >([]);
+  const curFlow = workflowsTable?.curWorkflow;
+  const cloudHost = userSettingsTable?.settings?.cloudHost;
+  const [loading, setLoading] = useState(false);
   const loadChangeLogs = async (flowId: string) => {
     const workflow = await workflowsTable?.get(flowId);
     const changelogs = await changelogsTable?.listByWorkflowID(flowId);
@@ -53,8 +55,38 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
   };
 
   const loadVersions = async () => {
-    const vers =
-      (await workflowVersionsTable?.listByWorkflowID(curFlowID!)) ?? [];
+    let vers =
+      (await workflowVersionsTable?.listByWorkflowID(curFlow!.id)) ?? [];
+    if (session?.shareKey && curFlow?.cloudID) {
+      setLoading(true);
+      await fetch(
+        userSettingsTable?.settings?.cloudHost! +
+          "/api/listWorkflowVersionsByWorkflowID?workflowID=" +
+          curFlow?.cloudID,
+        {
+          headers: {
+            authorization: `Bearer ${session?.shareKey}`,
+          },
+        },
+      )
+        .then((resp) => resp.json())
+        .then((data) => {
+          if (data.items) {
+            const cloudVers = data.items.map((v: any) => {
+              return {
+                ...v,
+                isCloud: true,
+              };
+            });
+            vers = vers.concat(cloudVers as WorkflowVersion[]);
+          }
+        })
+        .catch((e) => {
+          console.error(e);
+        });
+      setLoading(false);
+    }
+
     setVersions(vers);
   };
 
@@ -70,7 +102,7 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
         loadVersions();
         break;
       case 1:
-        loadChangeLogs(curFlowID!);
+        loadChangeLogs(curFlow!.id);
         break;
     }
   }, [active]);
@@ -117,7 +149,16 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
           </TabList>
           <TabPanels>
             <TabPanel>
+              {session?.shareKey && (
+                <Text color="GrayText" mb={3}>
+                  Connected to{" "}
+                  <a href={cloudHost} target="_blank">
+                    {cloudHost}
+                  </a>
+                </Text>
+              )}
               <Stack divider={<StackDivider />} spacing={2}>
+                {loading && <Text>Loading...</Text>}
                 {versions?.map((version) => {
                   return (
                     <Flex
@@ -131,11 +172,27 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
                       borderRadius={4}
                     >
                       <Stack textAlign={"left"} gap={0}>
-                        <Text fontWeight={"500"}>
-                          {version.name ?? "untitled"}
-                        </Text>
+                        {version.isCloud ? (
+                          <a
+                            target="_blank"
+                            href={`${cloudHost}/workflow/${version.workflowID}/${version.id}`}
+                          >
+                            {version.name ?? "untitled"}
+                          </a>
+                        ) : (
+                          <Text fontWeight={"500"}>
+                            {version.name ?? "untitled"}
+                          </Text>
+                        )}
+
                         <Text color={"GrayText"} fontSize={"sm"}>
-                          Created: {formatTimestamp(version.createTime)}
+                          Created:{" "}
+                          {new Date(
+                            version.createTime ??
+                              version.createdAt ??
+                              version.created_at ??
+                              "",
+                          ).toLocaleString()}
                         </Text>
                       </Stack>
                       <Flex alignItems="center" gap={2}>
@@ -149,18 +206,19 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
                               return;
                             }
                             app.loadGraphData(JSON.parse(version.json));
-                            loadWorkflowID(curFlowID!, version.id);
                             onClose();
                           }}
                         >
                           Load
                         </Button>
-                        <DeleteConfirm
-                          promptMessage="Are you sure you want to delete this version?"
-                          onDelete={() => {
-                            onDelete(version.id);
-                          }}
-                        />
+                        {!version.isCloud && (
+                          <DeleteConfirm
+                            promptMessage="Are you sure you want to delete this version?"
+                            onDelete={() => {
+                              onDelete(version.id);
+                            }}
+                          />
+                        )}
                       </Flex>
                     </Flex>
                   );
@@ -185,9 +243,6 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
                             return;
                           }
                           app.loadGraphData(JSON.parse(c.json));
-                          workflowsTable?.updateFlow(curFlowID!, {
-                            json: c.json,
-                          });
                           onClose();
                         }}
                         isActive={c.id === selectedVersion}

ui/src/components/copySharelink.tsx

@@ -0,0 +1,76 @@
+import { userSettingsTable, workflowsTable } from "../db-tables/WorkspaceDB";
+import { getNodeDefs } from "../share/shareUtils";
+import { EWorkflowPrivacy, Workflow } from "../types/dbTypes";
+import { ShareWorkflowData } from "../types/types";
+import { app } from "../utils/comfyapp";
+
+export async function copySharelink(
+  shareKey: string,
+  curWorkflow: Workflow,
+): Promise<{
+  link?: string | null;
+  error?: string | null;
+} | null> {
+  if (curWorkflow.cloudID) {
+    const link =
+      userSettingsTable?.settings?.cloudHost +
+      "/workflow/" +
+      curWorkflow.cloudID;
+    return {
+      link,
+    };
+  }
+  const prompt = await app.graphToPrompt();
+  const graph = app.graph.serialize();
+  if (!graph.extra) {
+    graph.extra = {};
+  }
+  graph.extra.apiPrompt = prompt.output ?? null;
+  const input: ShareWorkflowData = {
+    workflow: {
+      name: curWorkflow?.name ?? "Untitled",
+      cloudID: curWorkflow?.cloudID,
+    },
+    version: {
+      name: "v1",
+      json: JSON.stringify(graph),
+    },
+    nodeDefs: getNodeDefs(),
+    privacy: EWorkflowPrivacy.UNLISTED,
+  };
+  return await fetch(
+    userSettingsTable?.settings?.cloudHost + "/api/createCloudflow",
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${shareKey}`,
+      },
+      body: JSON.stringify(input),
+    },
+  )
+    .then((resp) => resp.json())
+    .then((data) => {
+      if (data?.data) {
+        const cloudID = data.data.workflowID;
+        workflowsTable?.updateMetaInfo(curWorkflow?.id!, {
+          cloudID,
+        });
+
+        const link =
+          userSettingsTable?.settings?.cloudHost + "/workflow/" + cloudID;
+        return {
+          link,
+        };
+      } else {
+        return {
+          error: "Failed to create version. " + (data?.error ?? ""),
+        };
+      }
+    })
+    .catch((e) => {
+      return {
+        error: "Failed to create version. " + (e?.error ?? ""),
+      };
+    });
+}

ui/src/db-tables/ChangelogsTable.ts

@@ -44,9 +44,8 @@ export class ChangelogsTable extends TableBase<Changelog> {
       createTime: Date.now(),
       isAutoSave: input.isAutoSave,
     };
-    await this.deleteLogsExceedLimit(input.workflowID);
     await indexdb.changelogs.add(change);
-    await this.saveDiskDB();
+    await this.deleteLogsExceedLimit(input.workflowID);
     return change;
   }
   async deleteLogsExceedLimit(workflowID: string) {

ui/src/db-tables/DiskFileUtils.ts

@@ -1,59 +1,6 @@
-import { deleteFile, updateFile } from "../Api";
 import { foldersTable, workflowsTable, userSettingsTable } from "./WorkspaceDB";
-import {
-  COMFYSPACE_TRACKING_FIELD_NAME,
-  LEGACY_COMFYSPACE_TRACKING_FIELD_NAME,
-} from "../const";
-import { toFileNameFriendly } from "../utils";
-import { Folder, Workflow } from "../types/dbTypes";
 import { TwowayFolderSyncAPI } from "../apis/TwowaySyncFolderApi";
 
-export async function saveJsonFileMyWorkflows(workflow: Workflow) {
-  const file_path = await generateFilePath(workflow);
-  if (file_path == null) {
-    return;
-  }
-  const fullPath = await generateFilePathAbsolute(workflow);
-  await workflowsTable?.updateMetaInfo(workflow.id, {
-    filePath: fullPath ?? undefined,
-  });
-  const json = workflow.json;
-  const flow = JSON.parse(json);
-  flow.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {
-    id: workflow.id,
-    name: workflow.name,
-  };
-  delete flow.extra[LEGACY_COMFYSPACE_TRACKING_FIELD_NAME];
-
-  await updateFile(file_path, JSON.stringify(flow));
-}
-
-export async function deleteJsonFileMyWorkflows(workflow: Workflow) {
-  if (workflow.name == null) {
-    return;
-  }
-  const file_path = await generateFilePath(workflow);
-  file_path != null && deleteFile(file_path);
-}
-
-export async function generateFilePath(
-  workflow: Workflow,
-): Promise<string | null> {
-  let filePath = toFileNameFriendly(workflow.name) + ".json";
-  let curFolderID = workflow.parentFolderID;
-  while (curFolderID != null) {
-    const folder = await foldersTable?.get(curFolderID);
-    if (folder == null) {
-      break;
-    }
-    const folderName = folder.name;
-    filePath = `${folderName}/${filePath}`;
-    curFolderID = folder.parentFolderID ?? undefined;
-  }
-
-  return filePath ?? null;
-}
-
 export async function genFolderRelPath(
   folderId: string | null,
 ): Promise<string> {
@@ -71,46 +18,6 @@ export async function genFolderRelPath(
 
   return filePath;
 }
-export async function generateFilePathAbsolute(
-  workflow: Workflow,
-): Promise<string | null> {
-  const subPath = await generateFilePath(workflow);
-  let myWorkflowsDir = await userSettingsTable?.getSetting("myWorkflowsDir");
-  if (!myWorkflowsDir) {
-    console.error("myWorkflowsDir is not set");
-    return null;
-  }
-  if (!myWorkflowsDir.endsWith("/")) {
-    myWorkflowsDir = myWorkflowsDir + "/";
-  }
-  return myWorkflowsDir + subPath;
-}
-
-export async function generateFolderPath(id: string): Promise<string | null> {
-  const folder = await foldersTable?.get(id);
-  let parentFolderID = folder?.parentFolderID;
-  let folderPath = folder?.name;
-  while (parentFolderID) {
-    const folder = await foldersTable?.get(parentFolderID);
-    if (folder == null) {
-      break;
-    }
-    folderPath = `${folder.name}/${folderPath}`;
-    parentFolderID = folder.parentFolderID ?? undefined;
-  }
-
-  let myWorkflowsDir = await userSettingsTable?.getSetting("myWorkflowsDir");
-
-  if (!myWorkflowsDir) {
-    console.error("myWorkflowsDir is not set");
-    return null;
-  }
-
-  if (!myWorkflowsDir.endsWith("/")) {
-    myWorkflowsDir = myWorkflowsDir + "/";
-  }
-  return myWorkflowsDir + folderPath;
-}
 
 export async function getFileCountInFolder(folderId: string): Promise<number> {
   const twoWaySyncEnabled = await userSettingsTable?.getSetting("twoWaySync");

ui/src/db-tables/FoldersTable.ts

@@ -1,6 +1,5 @@
 import { userSettingsTable, workflowsTable } from "./WorkspaceDB";
 import { EFlowOperationType, Folder } from "../types/dbTypes";
-import { validateOrSaveAllJsonFileMyWorkflows } from "../utils";
 import { nanoid } from "nanoid";
 import { TableBase } from "./TableBase";
 import { indexdb } from "./indexdb";
@@ -84,11 +83,6 @@ export class FoldersTable extends TableBase<Folder> {
     }
     await indexdb.folders.update(id, input);
     this.saveDiskDB();
-
-    // folder moved or renamed - move all workflows to the right directory(not required when folded state changes)
-    if (nameChanged || parentFolderChanged) {
-      validateOrSaveAllJsonFileMyWorkflows(true);
-    }
     return newRecord;
   }
   public async deleteFolder(

ui/src/db-tables/MediaTable.ts

@@ -2,7 +2,6 @@ import { Table, workflowsTable } from "./WorkspaceDB";
 import { TableBase } from "./TableBase";
 import { Media } from "../types/dbTypes";
 import { indexdb } from "./indexdb";
-import { getMetadataFromUrl } from "../gallery/utils.ts";
 
 export class MediaTable extends TableBase<Media> {
   static readonly TABLE_NAME: Table = "media";
@@ -25,28 +24,17 @@ export class MediaTable extends TableBase<Media> {
     const format = input.localPath.split(".").pop();
     if (format == null) return null;
 
-    const res = await getMetadataFromUrl(
-      `/workspace/view_media?filename=${input.localPath}`,
-    ).catch((e) => {
-      console.error("get meta error:", e);
-      return { prompt: "" };
-    });
-
     const md: Media = {
       id: input.localPath,
       localPath: input.localPath,
       workflowID: input.workflowID,
       createTime: Date.now(),
-      workflowJSON: JSON.stringify(res?.prompt),
-      format: format,
     };
     await workflowsTable?.updateMetaInfo(input.workflowID, {
       latestImage: md.localPath,
     });
     // save indexdb
     indexdb.media.put(md);
-    // save disk file db
-    this.saveDiskDB();
     return md;
   }
 

ui/src/db-tables/TableBase.ts

@@ -12,6 +12,8 @@ export class TableBase<T extends TableBaseModel> {
     this.tableName = tableName;
   }
   protected async saveDiskDB() {
+    // diable save diskdb
+    return;
     const objs = (await indexdb[this.tableName].toArray()) as TableBaseModel[];
     const backup: Record<string, TableBaseModel> = {};
     objs.forEach((f) => {
@@ -43,23 +45,19 @@ export class TableBase<T extends TableBaseModel> {
       newItem.createTime = Date.now();
     }
     await indexdb[this.tableName].add(newItem as any);
-    await this.saveDiskDB();
     return newItem as T;
   }
 
   public async put(newItem: T): Promise<T> {
     await indexdb[this.tableName].put(newItem as any);
-    await this.saveDiskDB();
     return newItem;
   }
   public async bulkPut(newItems: T[]): Promise<void> {
     // @ts-ignore
     await indexdb[this.tableName].bulkPut(newItems as any);
-    this.saveDiskDB();
   }
   public async update(id: string, changes: Partial<T>): Promise<T | null> {
     await indexdb[this.tableName].update(id, changes);
-    this.saveDiskDB();
     return (await this.get(id)) ?? null;
   }
 
@@ -106,7 +104,6 @@ export class TableBase<T extends TableBaseModel> {
 
   public async delete(id: string) {
     await indexdb[this.tableName].delete(id);
-    this.saveDiskDB();
   }
   public async listByIndex(index: keyof T, value: string): Promise<T[]> {
     const list = await indexdb[this.tableName]

ui/src/db-tables/UserSettingsTable.ts

@@ -1,29 +1,19 @@
 import type { UserSettings } from "../types/dbTypes";
 import { TableBase } from "./TableBase";
 import { MODEL_TYPE_TO_FOLDER_MAPPING } from "../model-manager/install-models/util/modelTypes";
-import { fetchMyWorkflowsDir } from "../Api";
+import { fetchApi, fetchMyWorkflowsDir } from "../Api";
 
 export class UserSettingsTable extends TableBase<UserSettings> {
   public defaultSettings: UserSettings;
   public readonly DEFAULT_USER = "guest";
   static readonly TABLE_NAME = "userSettings";
 
-  /**
-   * Because in App.js we will use window.addEventListener("beforeunload", handleBeforeUnload); to remind the user to save the workflow when the user leaves the page.
-   * The autoSave needs to be obtained in the handleBeforeUnload function. If it is obtained through getSetting, the handleBeforeUnload function will become an async function, which will cause the "beforeunload" event to fail.
-   * So we maintain an autoSave here that is always up to date.
-   */
-  private _autoSave: boolean = false;
   private _settings: UserSettings | undefined = undefined;
 
   get settings() {
     return this._settings;
   }
 
-  get autoSave() {
-    return this._autoSave;
-  }
-
   constructor() {
     super("userSettings");
     this.defaultSettings = {
@@ -43,8 +33,7 @@ export class UserSettingsTable extends TableBase<UserSettings> {
       autoSaveDuration: 3,
       twoWaySync: false,
       foldersOnTop: false,
-      cloudHost: "https://www.nodecafe.org",
-      overwriteCurWorkflowWhenDroppingFileToCanvas: false,
+      cloudHost: "https://www.nodecafe.co",
       maximumChangelogNumber: 80,
       hideCoverImage: false,
       disableUnsavedWarning: false,
@@ -65,6 +54,14 @@ export class UserSettingsTable extends TableBase<UserSettings> {
     }
     return currentUserSettings?.[key] ?? this.defaultSettings[key];
   }
+  public async get(_id: string): Promise<UserSettings | undefined> {
+    const obj = await fetchApi("/workspace/get_settings", {
+      headers: {
+        "Content-Type": "application/json",
+      },
+    }).then((res) => res.json());
+    return obj as any;
+  }
 
   public async upsert(newPairs: Partial<UserSettings>) {
     const oldSettings =
@@ -73,7 +70,13 @@ export class UserSettingsTable extends TableBase<UserSettings> {
       ...oldSettings,
       ...newPairs,
     };
-    await this.put(newSettings);
+    await fetchApi("/workspace/save_settings", {
+      method: "POST",
+      body: JSON.stringify(newSettings),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
     this._settings = {
       ...this.defaultSettings,
       ...newSettings,
@@ -87,16 +90,20 @@ export class UserSettingsTable extends TableBase<UserSettings> {
     instance.defaultSettings.myWorkflowsDir = myWorkflowsDir.path!;
 
     await instance.get(instance.DEFAULT_USER).then((res) => {
-      instance._autoSave = res?.autoSave ?? false;
       instance._settings = {
         ...instance.defaultSettings,
         ...res,
       };
     });
-    // overwrite legacy comfyspace.art
-    await instance.upsert({
-      cloudHost: instance.defaultSettings.cloudHost,
-    });
+    if (
+      instance._settings?.cloudHost?.includes("nodecafe.org") ||
+      instance._settings?.cloudHost?.includes("comfyspace.art")
+    ) {
+      // overwrite legacy comfyspace.art
+      await instance.upsert({
+        cloudHost: instance.defaultSettings.cloudHost,
+      });
+    }
     return instance;
   }
 }

ui/src/db-tables/WorkflowsTable.ts

@@ -8,10 +8,6 @@ import { sortFileItem } from "../utils";
 import { nanoid } from "nanoid";
 import { TableBase } from "./TableBase";
 import { indexdb } from "./indexdb";
-import {
-  deleteJsonFileMyWorkflows,
-  saveJsonFileMyWorkflows,
-} from "./DiskFileUtils";
 import { ESortTypes, ImportWorkflow } from "../RecentFilesDrawer/types";
 import { defaultGraph } from "../defaultGraph";
 import { scanMyWorkflowsDir } from "../utils/twowaySyncUtils";
@@ -51,11 +47,7 @@ export class WorkflowsTable extends TableBase<Workflow> {
   }
 
   /**
-   * Check whether the currently opened workflow is the latest version and is consistent with the DB.
-   * Through updateTime comparison, if it is inconsistent, it means that a newer version already exists in the DB.
-   * If the automatic save function is turned on at this time, the latest version in the DB will be overwritten.
-   * Therefore, the user needs to confirm whether to continue to enable automatic saving.
-   * @returns boolean
+   * Check whether the currently opened workflow is the latest version and is consistent with the DB
    */
   public async latestVersionCheck() {
     if (this._curWorkflow) {
@@ -139,15 +131,11 @@ export class WorkflowsTable extends TableBase<Workflow> {
     };
     //add to IndexDB
     await indexdb.workflows.add(newWorkflow);
-    // add to disk file db
-    this.saveDiskDB();
     // add to my_workflows/
     const twoWaySyncEnabled = await userSettingsTable?.getSetting("twoWaySync");
     if (twoWaySyncEnabled) {
       await TwowaySyncAPI.createWorkflow(newWorkflow);
       return await this.get(newWorkflow.id);
-    } else {
-      saveJsonFileMyWorkflows(newWorkflow);
     }
     return newWorkflow;
   }
@@ -184,7 +172,6 @@ export class WorkflowsTable extends TableBase<Workflow> {
     if (this._curWorkflow && this._curWorkflow.id === id) {
       this._curWorkflow = newWorkflow;
     }
-    this.saveDiskDB();
     return newWorkflow;
   }
 
@@ -197,15 +184,6 @@ export class WorkflowsTable extends TableBase<Workflow> {
     }
     if (twoWaySyncEnabled) {
       await TwowaySyncAPI.moveWorkflow(oldWorkflow, change.parentFolderID!);
-    } else {
-      await saveJsonFileMyWorkflows(newWorkflow);
-      await deleteJsonFileMyWorkflows(oldWorkflow);
-      // update parent folder updateTime
-      if (newWorkflow?.parentFolderID != null) {
-        await indexdb.folders?.update(newWorkflow.parentFolderID, {
-          updateTime: Date.now(),
-        });
-      }
     }
   }
   public async genLastManualSavedJson(id: string) {
@@ -240,8 +218,6 @@ export class WorkflowsTable extends TableBase<Workflow> {
     const twoWaySyncEnabled = await userSettingsTable?.getSetting("twoWaySync");
     if (twoWaySyncEnabled) {
       after && (await TwowaySyncAPI.saveWorkflow(after));
-    } else {
-      after && (await saveJsonFileMyWorkflows(after));
     }
   }
 
@@ -294,13 +270,10 @@ export class WorkflowsTable extends TableBase<Workflow> {
         } catch (e) {
           console.error("batchCreateFlows error", e);
         }
-      } else {
-        await saveJsonFileMyWorkflows(newWorkflow);
       }
     }
     try {
       await indexdb.workflows.bulkAdd(newWorkflows);
-      this.saveDiskDB();
     } catch (e) {
       console.error("batchCreateFlows error", e);
     }
@@ -314,13 +287,10 @@ export class WorkflowsTable extends TableBase<Workflow> {
         await userSettingsTable?.getSetting("twoWaySync");
       if (twoWaySyncEnabled) {
         await TwowaySyncAPI.deleteWorkflow(workflow);
-      } else {
-        deleteJsonFileMyWorkflows({ ...workflow });
       }
     }
     //add to IndexDB
     await indexdb.workflows.delete(id);
-    this.saveDiskDB();
   }
 
   public async batchDeleteFlow(ids: string[]) {
@@ -331,12 +301,9 @@ export class WorkflowsTable extends TableBase<Workflow> {
         await userSettingsTable?.getSetting("twoWaySync");
       if (twoWaySyncEnabled) {
         await TwowaySyncAPI.deleteWorkflow(flow);
-      } else {
-        deleteJsonFileMyWorkflows({ ...flow });
       }
     }
     await indexdb.workflows.bulkDelete(ids);
-    this.saveDiskDB();
   }
 
   public async listFolderContent(

ui/src/db-tables/WorkspaceDB.ts

@@ -61,86 +61,4 @@ export async function loadDBs() {
     loadMedia(),
     loadWorkflowVersions(),
   ]);
-  if (localStorage.getItem("WORKSPACE_INDEXDB_BACKFILL") !== "true") {
-    await backfillIndexdb();
-    localStorage.setItem("WORKSPACE_INDEXDB_BACKFILL", "true");
-  }
-}
-
-export async function backfillIndexdb() {
-  const backfillWorkflows = async () => {
-    try {
-      const all = await workflowsTable?.getRecords();
-      all && (await indexdb.workflows.bulkPut(Object.values(all)));
-    } catch (error) {
-      console.error(error);
-    }
-  };
-  const backfillFolders = async () => {
-    try {
-      const all = await foldersTable?.getRecords();
-      all && (await indexdb.folders.bulkPut(Object.values(all)));
-    } catch (error) {
-      console.error(error);
-    }
-  };
-  const backfillMedia = async () => {
-    try {
-      const all = await mediaTable?.getRecords();
-      all && (await indexdb.media.bulkPut(Object.values(all)));
-    } catch (error) {
-      console.error(error);
-    }
-  };
-  const backfillChangelogs = async () => {
-    try {
-      const all = await changelogsTable?.getRecords();
-      all && (await indexdb.changelogs.bulkPut(Object.values(all)));
-    } catch (error) {
-      console.error(error);
-    }
-  };
-  const backfillTags = async () => {
-    try {
-      const all = await tagsTable?.getRecords();
-      all && (await indexdb.tags.bulkPut(Object.values(all)));
-    } catch (error) {
-      console.error(error);
-    }
-  };
-  const backfillUserSettings = async () => {
-    try {
-      const tableInstance = userSettingsTable!;
-      const backupData = await tableInstance.getRecords().then((data) => {
-        if (!data[tableInstance.DEFAULT_USER]) {
-          // legacy
-          return data;
-        }
-        return data[tableInstance.DEFAULT_USER];
-      });
-      await indexdb.userSettings.put({
-        ...tableInstance.defaultSettings,
-        ...backupData,
-      });
-    } catch (error) {
-      console.error(error);
-    }
-  };
-  const backfillWorkflowVersions = async () => {
-    try {
-      const all = await workflowVersionsTable?.getRecords();
-      all && (await indexdb.workflowVersions.bulkPut(Object.values(all)));
-    } catch (error) {
-      console.error(error);
-    }
-  };
-  await Promise.all([
-    backfillWorkflows(),
-    backfillFolders(),
-    backfillMedia(),
-    backfillChangelogs(),
-    backfillTags(),
-    backfillUserSettings(),
-    backfillWorkflowVersions(),
-  ]);
 }

ui/src/gallery/GalleryModal.tsx

@@ -1,8 +1,5 @@
-// @ts-expect-error ComfyUI import
-import { app } from "/scripts/app.js";
 import {
   Checkbox,
-  Flex,
   Heading,
   HStack,
   IconButton,

ui/src/gallery/components/FormItem/SelectBase.tsx

@@ -1,6 +1,5 @@
 import { FC } from "react";
 import { Flex, Select } from "@chakra-ui/react";
-import { FormItem } from "./types.ts";
 import { PromptNodeInputItem } from "../MetaBox/utils.ts";
 
 export const SelectBase: FC<

ui/src/gallery/components/MetaBox/MetadataForm.tsx

@@ -1,9 +1,9 @@
-import { MetaData, getMetadataFromUrl } from "../../utils.ts";
+import { getMetadataFromUrl } from "../../utils.ts";
 import { Flex, HStack, Switch } from "@chakra-ui/react";
 import { Media } from "../../../types/dbTypes.ts";
 import TopForm from "../TopForm/TopForm.tsx";
 import AllPromptForm from "../AllPromptForm/AllPromptForm.tsx";
-import { useContext, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { FormItem } from "../FormItem/types.ts";
 import {
   calcInputListRecursive,
@@ -11,10 +11,7 @@ import {
   PromptNodeInputItem,
 } from "./utils.ts";
 import { MetaBoxContext } from "./metaBoxContext.ts";
-import { workflowsTable } from "../../../db-tables/WorkspaceDB.ts";
-import { WorkspaceContext } from "../../../WorkspaceContext.ts";
-// @ts-ignore
-import { app } from "/scripts/app.js";
+import { app } from "../../../utils/comfyapp.ts";
 export type TopFieldType = {
   promptKey: string | number;
   class_type?: string;
@@ -35,7 +32,6 @@ export const isInTopField = (
 
 export default function MetadataForm({ media }: { media: Media | null }) {
   const [calcInputList, setCalcInputList] = useState<PromptNodeInputItem[]>([]);
-  const { curFlowID } = useContext(WorkspaceContext);
   const [imagePrompt, setImagePrompt] = useState<ImagePrompt>();
   const [showAllInputs, setShowAllInputs] = useState(true);
   const [showNodeName, setShowNodeName] = useState(true);
@@ -64,18 +60,6 @@ export default function MetadataForm({ media }: { media: Media | null }) {
 
   const [topFields, setTopFields] = useState<TopFieldType[]>([]);
 
-  useEffect(() => {
-    (async () => {
-      if (curFlowID) {
-        const topFieldsConfig = (await workflowsTable?.get(curFlowID))
-          ?.topFieldsConfig;
-        if (topFieldsConfig) {
-          setTopFields(topFieldsConfig);
-          setShowAllInputs(false);
-        }
-      }
-    })();
-  }, [curFlowID]);
   const updateTopField = (field: TopFieldType) => {
     if (
       isInTopField(topFields, {
@@ -88,19 +72,9 @@ export default function MetadataForm({ media }: { media: Media | null }) {
         (v) => v.name !== field.name || v.promptKey !== field.promptKey,
       );
       setTopFields(topFieldsConfig);
-      if (curFlowID) {
-        workflowsTable?.updateTopFields(curFlowID, {
-          topFieldsConfig,
-        });
-      }
     } else {
       const topFieldsConfig = [...topFields, field];
       setTopFields(topFieldsConfig);
-      if (curFlowID) {
-        workflowsTable?.updateTopFields(curFlowID, {
-          topFieldsConfig,
-        });
-      }
     }
   };
 

ui/src/main.tsx

@@ -1,12 +1,11 @@
 import React, { Suspense } from "react";
 import ReactDOM from "react-dom/client";
-import { ColorModeScript } from "@chakra-ui/react";
+import { ColorModeScript, type StyleFunctionProps } from "@chakra-ui/react";
 import { ChakraProvider, extendTheme } from "@chakra-ui/react";
 import { AlertDialogProvider } from "./components/AlertDialogProvider.tsx";
 import CSSReset from "./MyCSSReset.tsx";
+import { waitForApp } from "./utils/comfyapp.ts";
 
-const topbar = document.createElement("div");
-document.body.append(topbar);
 const App = React.lazy(() =>
   import("./App.tsx").then(({ default: App }) => ({
     default: App,
@@ -35,23 +34,22 @@ const zIndices = {
 };
 
 const theme = extendTheme({
+  config: {
+    initialColorMode: "dark",
+    useSystemColorMode: false,
+  },
   zIndices,
+  components: {
+    Card: {
+      baseStyle: (props: StyleFunctionProps) => ({
+        container: {
+          backgroundColor: props.colorMode === "dark" ? "#171B21" : "#F6F8FA",
+        },
+      }),
+    },
+  },
 });
 
-ReactDOM.createRoot(topbar).render(
-  <React.StrictMode>
-    <ChakraProvider resetCSS={false} disableGlobalStyle={true} theme={theme}>
-      <CSSReset scope=".workspace_manager" />
-      <ColorModeScript initialColorMode="dark" />
-      <AlertDialogProvider>
-        <Suspense>
-          <App />
-        </Suspense>
-      </AlertDialogProvider>
-    </ChakraProvider>
-  </React.StrictMode>,
-);
-
 // hacky fix for chakra add extra className (chakra-ui-light) into body
 // and resulted in user unable to copy new nodes into clipboard, because of this check: e.target.className === "litegraph"
 // (https://github.com/comfyanonymous/ComfyUI/blob/57926635e8d84ae9eea4a0416cc75e363f5ede45/web/scripts/app.js#L861)
@@ -83,3 +81,40 @@ const callback = function (
 };
 const observer = new MutationObserver(callback);
 observer.observe(targetNode, observerConfig);
+
+function waitForDocumentBody() {
+  return new Promise((resolve) => {
+    if (document.body) {
+      return resolve(document.body);
+    }
+
+    document.addEventListener("DOMContentLoaded", () => {
+      resolve(document.body);
+    });
+  });
+}
+
+// wait for document.body to load so that the top menu is loaded and my react component has a place to mount
+waitForDocumentBody()
+  .then(() => waitForApp())
+  .then(() => {
+    const topbar = document.createElement("div");
+    document.body.append(topbar);
+    ReactDOM.createRoot(topbar).render(
+      <React.StrictMode>
+        <ChakraProvider
+          resetCSS={false}
+          disableGlobalStyle={true}
+          theme={theme}
+        >
+          <CSSReset scope=".workspace_manager" />
+          <ColorModeScript initialColorMode="dark" />
+          <AlertDialogProvider>
+            <Suspense>
+              <App />
+            </Suspense>
+          </AlertDialogProvider>
+        </ChakraProvider>
+      </React.StrictMode>,
+    );
+  });

ui/src/model-manager/install-models/InstallModelsModal.tsx

@@ -59,11 +59,8 @@ export default function InatallModelsModal({
   >(MODEL_TYPE_TO_FOLDER_MAPPING);
   const loadData = useCallback(async () => {
     setLoading(true);
-    // if (!searchQuery) {
-    //   const models = await getModelFromCivitAPi(modelType);
-    //   setModels(models);
-    // } else {
-    const models = await getModelFromSearch(searchQuery, modelType);
+    const models = await getModelFromCivitAPi(modelType, searchQuery);
+    // const models = await getModelFromSearch(searchQuery, modelType);
     setModels(models);
     const folders_list = await getAllFoldersList();
     folders_list && setFoldersList(folders_list);

ui/src/model-manager/install-models/InstallProgress.tsx

@@ -1,5 +1,4 @@
 // @ts-ignore
-import { api } from "/scripts/api.js";
 import {
   Button,
   HStack,
@@ -11,6 +10,7 @@ import {
 } from "@chakra-ui/react";
 import { useState, useEffect } from "react";
 import { cancelDownload } from "../../Api";
+import { api } from "../../utils/comfyapp";
 
 type Queue = { save_path: string; progress: number };
 

ui/src/model-manager/install-models/util/getModelFromCivitAPI.ts

@@ -1,4 +1,3 @@
-import { userSettingsTable } from "../../../db-tables/WorkspaceDB";
 import { indexdb } from "../../../db-tables/indexdb";
 import { CivitiModel } from "../../types";
 import { CACHE_EXPIRY_DAYS, MODEL_TYPE } from "./modelTypes";
@@ -7,20 +6,19 @@ type CivitModelQueryParams = {
   types?: MODEL_TYPE;
   query?: string;
   limit?: string;
-  nsfw?: boolean;
 };
 
 export async function getModelFromCivitAPi(
   types?: MODEL_TYPE,
+  query?: string,
 ): Promise<CivitiModel[]> {
-  const showNsfwThumbnail = await userSettingsTable?.getSetting(
-    "showNsfwModelThumbnail",
-  );
   const params: CivitModelQueryParams = {
     limit: "30",
-    nsfw: showNsfwThumbnail ?? false,
     types,
   };
+  if (query) {
+    params.query = query;
+  }
 
   const queryString = new URLSearchParams(params).toString();
   const fullURL = `https://civitai.com/api/v1/models?${queryString}`;

ui/src/model-manager/install-models/util/getModelFromSearch.ts

@@ -9,7 +9,7 @@ export async function getModelFromSearch(
     queries: [
       {
         q: q,
-        indexUid: "models_v8",
+        indexUid: "models_v9",
         facets: [
           "category.name",
           "checkpointType",

ui/src/model-manager/missing-models-drawer/MissingModelItem.tsx

@@ -12,13 +12,12 @@ import {
 import { IconExternalLink } from "@tabler/icons-react";
 import { useEffect, useState } from "react";
 import { COMFYSPACE_TRACKING_FIELD_NAME } from "../../const";
-// @ts-ignore
-import { app } from "/scripts/app.js";
 import type {
   DepsResult,
-  ModelFile,
+  ModelDep,
 } from "../../spacejson/handleDownloadSpaceJson";
 import { indexdb } from "../../db-tables/indexdb";
+import { app } from "../../utils/comfyapp";
 
 const HF_LOGO =
   "https://huggingface.co/datasets/huggingface/brand-assets/resolve/main/hf-logo.png";
@@ -33,8 +32,8 @@ export interface MissingModel {
 
 interface Props {
   model: MissingModel;
-  setSelectedModelDeps: (deps: ModelFile[]) => void;
-  selectedModelDeps: ModelFile[];
+  setSelectedModelDeps: (deps: ModelDep[]) => void;
+  selectedModelDeps: ModelDep[];
   foldersList: Record<string, string[]>;
   setFoldersList: (folders: Record<string, string[]>) => void;
 }
@@ -47,7 +46,7 @@ export default function MissingModelItem({
   setFoldersList,
 }: Props) {
   const [suggestedModel, setSuggestedModel] = useState<
-    ModelFile | { existingModel: string }
+    ModelDep | { existingModel: string }
   >();
   const modelDeps: DepsResult["models"] =
     app.graph.extra?.[COMFYSPACE_TRACKING_FIELD_NAME]?.deps?.models;
@@ -77,7 +76,7 @@ export default function MissingModelItem({
 
   const selectedModelNames = selectedModelDeps.map((dep) => dep.filename);
   function isExistingModel(
-    model: ModelFile | { existingModel: string },
+    model: ModelDep | { existingModel: string },
   ): model is { existingModel: string } {
     return (model as { existingModel: string }).existingModel != null;
   }

ui/src/model-manager/missing-models-drawer/MissingModelsListDrawer.tsx

@@ -10,15 +10,14 @@ import {
   useToast,
 } from "@chakra-ui/react";
 import { useCallback, useContext, useEffect, useState } from "react";
-// @ts-ignore
-import { app } from "/scripts/app.js";
 import MissingModelItem from "./MissingModelItem";
 import { DRAWER_Z_INDEX } from "../../const";
-import type { ModelFile } from "../../spacejson/handleDownloadSpaceJson";
+import type { ModelDep } from "../../spacejson/handleDownloadSpaceJson";
 import { getAllFoldersList } from "../../Api";
 import { installModelsApi } from "../api/modelsApi";
 import { getCivitApiKey } from "../../utils/civitUtils";
 import { WorkspaceContext } from "../../WorkspaceContext";
+import { app } from "../../utils/comfyapp";
 
 export interface MissingModel {
   class_type: string;
@@ -41,7 +40,7 @@ export default function MissingModelsListDrawer({
       app.canvasEl.removeEventListener("click", onClose);
     };
   }, []);
-  const [selectedModelDeps, setSelectedModelDeps] = useState<ModelFile[]>([]);
+  const [selectedModelDeps, setSelectedModelDeps] = useState<ModelDep[]>([]);
   const [foldersList, setFoldersList] = useState<Record<string, string[]>>({});
   const { setRoute } = useContext(WorkspaceContext);
   const loadData = useCallback(async () => {
@@ -78,7 +77,7 @@ export default function MissingModelsListDrawer({
       }
       installModelsApi({
         file_hash: model.fileHash ?? undefined,
-        filename: model.filename,
+        filename: model.name,
         save_path: foldersList[model.fileFolder][0],
         url,
         force_filename: true,

ui/src/model-manager/models-list-drawer/ModelsListDrawer.tsx

@@ -13,8 +13,6 @@ import Fuse from "fuse.js/min-basic";
 import { useEffect, useState } from "react";
 import { ModelsTags } from "./ModelsTags";
 import { ModelsList } from "./ModelsList";
-// @ts-expect-error ComfyUI imports
-import { app } from "/scripts/app.js";
 import InstallModelsButton from "../install-models/InstallModelsButton";
 import { type ModelsListRespItem } from "../types";
 import { useUpdateModels } from "../hooks/useUpdateModels";
@@ -23,6 +21,7 @@ import ShowNsfwModelThumbnailSettings from "../../settings/ShowNsfwModelThumbnai
 import { indexdb } from "../../db-tables/indexdb";
 import { type Model } from "../../types/dbTypes";
 import ModelDropEventListener from "../topbar/ModelDropEventListener";
+import { app } from "../../utils/comfyapp";
 interface Props {
   onClose: () => void;
 }

ui/src/model-manager/topbar/InstallMissingModelsButton.tsx

@@ -1,13 +1,12 @@
 import { Button } from "@chakra-ui/react";
 // @ts-ignore
-import { app } from "/scripts/app.js";
-// @ts-ignore
 import { api } from "/scripts/api.js";
 import { useEffect, useState } from "react";
 import MissingModelsListDrawer, {
   MissingModel,
 } from "../missing-models-drawer/MissingModelsListDrawer";
 import { COMFYSPACE_TRACKING_FIELD_NAME } from "../../const";
+import { app } from "../../utils/comfyapp";
 interface Props {}
 
 interface NodeError {

ui/src/model-manager/topbar/ModelDropEventListener.tsx

@@ -1,6 +1,5 @@
 import { useEffect, DragEvent } from "react";
-// @ts-ignore
-import { app } from "/scripts/app.js";
+import { app } from "../../utils/comfyapp";
 
 export default function ModelDropEventListener() {
   const handleModelDrop = async (

ui/src/model-manager/topbar/ModelManagerTopbar.tsx

@@ -1,8 +1,6 @@
 import { Button, DarkMode, Stack } from "@chakra-ui/react";
-import { lazy, useEffect, DragEvent, useContext, Suspense } from "react";
+import { lazy, useEffect, useContext, Suspense } from "react";
 import ModelsListDrawer from "../models-list-drawer/ModelsListDrawer";
-// @ts-ignore
-import { app } from "/scripts/app.js";
 import "./index.css";
 import { WorkspaceContext } from "../../WorkspaceContext";
 // @ts-ignore
@@ -15,30 +13,10 @@ import type { ModelsListRespItemFromApi } from "../types";
 import InatallModelsModal from "../install-models/InstallModelsModal";
 import { TOPBAR_BUTTON_HEIGHT } from "../../const";
 
-const AddMissingModelsButton = lazy(
-  () => import("./InstallMissingModelsButton"),
-);
-
 export default function ModelManagerTopbar() {
   const { setRoute, route } = useContext(WorkspaceContext);
-  const handleModelDrop = async (
-    e: DragEvent<HTMLCanvasElement> & { canvasX: number; canvasY: number },
-  ) => {
-    const eventName = e.dataTransfer.getData("eventName");
-    if (eventName !== "WorkspaceManagerAddNode") {
-      return;
-    }
-    const modelRelativePath = e.dataTransfer.getData("modelRelativePath");
-    const nodeType = e.dataTransfer.getData("nodeType");
-    // @ts-ignore
-    const node = LiteGraph.createNode(nodeType);
-    node.pos = [e.canvasX, e.canvasY];
-    node.configure({ widgets_values: [modelRelativePath] });
-    app.graph.add(node);
-  };
 
   useEffect(() => {
-    app.canvasEl.addEventListener("drop", handleModelDrop);
     api.addEventListener(
       "model_list",
       async (e: { detail: ModelsListRespItemFromApi[] }) => {
@@ -77,30 +55,22 @@ export default function ModelManagerTopbar() {
         window.dispatchEvent(new CustomEvent("model_list_updated"));
       },
     );
-    return () => {
-      app.canvasEl.removeEventListener("drop", handleModelDrop);
-    };
   }, []);
 
   return (
     <Stack style={{ position: "relative" }}>
-      <DarkMode>
-        <Button
-          size={"sm"}
-          backgroundColor={"#434554"}
-          aria-label="My models"
-          onClick={() => setRoute("modelList")}
-          px={1}
-          height={TOPBAR_BUTTON_HEIGHT + "px"}
-        >
-          Models
-        </Button>
-      </DarkMode>
-      <div style={{ position: "absolute", top: "38px", left: "0px" }}>
-        <Suspense>
-          <AddMissingModelsButton />
-        </Suspense>
-      </div>
+      <Button
+        size={"sm"}
+        backgroundColor={"#434554"}
+        color={"white"}
+        colorScheme="blue"
+        aria-label="My models"
+        onClick={() => setRoute("modelList")}
+        px={1}
+        height={TOPBAR_BUTTON_HEIGHT + "px"}
+      >
+        Models
+      </Button>
       {route === "modelList" && (
         <ModelsListDrawer onClose={() => setRoute("root")} />
       )}

ui/src/model-manager/utils.tsx

@@ -1,8 +1,5 @@
 // @ts-ignore
 import { deleteFile } from "./Api";
-// @ts-ignore
-import { app, ComfyApp } from "/scripts/app.js";
-
 export function formatTimestamp(
   unixTimestamp: number,
   showSec: boolean = false,

ui/src/settings/CloudHostSetting.tsx

@@ -0,0 +1,59 @@
+import { Input, Stack, useToast, Text, Flex, Button } from "@chakra-ui/react";
+import { useEffect, useState } from "react";
+import { userSettingsTable } from "../db-tables/WorkspaceDB";
+
+export default function CloudHostSetting() {
+  const toast = useToast();
+  const [text, setText] = useState("");
+
+  const getSettings = () => {
+    userSettingsTable?.getSetting("cloudHost").then((res) => {
+      setText(res ?? "");
+    });
+  };
+
+  useEffect(() => {
+    getSettings();
+  }, []);
+  const submitChange = async (text: string) => {
+    text = text.trim();
+    if (text.endsWith("/")) text = text.slice(0, -1);
+    await userSettingsTable?.upsert({ cloudHost: text });
+    getSettings();
+    toast({
+      title: "Setting saved. Please refresh to see the changes.",
+      status: "success",
+      duration: 4000,
+    });
+  };
+
+  return (
+    <Stack>
+      <Text>
+        For enterprise paid user only. Hosting site of the shared workflow.
+      </Text>
+      <Flex gap={2} alignItems={"center"}>
+        <Input
+          value={text}
+          onChange={(e) => setText(e.target.value)}
+          onBlur={() => submitChange(text)}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              submitChange(text);
+            }
+          }}
+        />
+        <Button
+          size={"sm"}
+          onClick={() => {
+            const cloudHost = userSettingsTable?.defaultSettings.cloudHost!;
+            setText(cloudHost);
+            submitChange(cloudHost);
+          }}
+        >
+          Reset
+        </Button>
+      </Flex>
+    </Stack>
+  );
+}

ui/src/settings/CommonCheckboxSettings.tsx

@@ -32,6 +32,7 @@ export default function CommonCheckboxSettings({
       <Checkbox
         isChecked={checked}
         onChange={async (e) => {
+          setChecked(e.target.checked);
           await userSettingsTable?.upsert({ [settingKey]: e.target.checked });
           getSetting();
           toast({

ui/src/settings/SelectMyWorkflowsDir.tsx

@@ -108,6 +108,13 @@ export default function SelectMyWorkflowsDir() {
     setCurrentDirectory(getNewPath);
     isManualEntry && setNoPermission(false);
     onCloseEditDirectory();
+    toast({
+      title: "Directory saved successfully. Please refresh the page.",
+      status: "success",
+      duration: 4000,
+      position: "top",
+      isClosable: true,
+    });
   };
 
   const onSubmit = async (manualEntry?: string) => {

ui/src/settings/SharekeySetting.tsx

@@ -0,0 +1,58 @@
+import { Input, Stack, useToast, Text, Flex, Button } from "@chakra-ui/react";
+import { useContext, useEffect, useState } from "react";
+import { userSettingsTable } from "../db-tables/WorkspaceDB";
+import { WorkspaceContext } from "../WorkspaceContext";
+import { saveShareKey } from "../utils/saveShareKey";
+
+export default function SharekeySetting() {
+  const toast = useToast();
+  const { session, updateSession } = useContext(WorkspaceContext);
+  const [text, setText] = useState("");
+  const cloudDomain = new URL(userSettingsTable?.settings?.cloudHost!).hostname;
+
+  useEffect(() => {
+    setText(session?.shareKey ?? "");
+  }, [session]);
+  const submitChange = async (text: string) => {
+    saveShareKey(text);
+    updateSession({ username: session?.username ?? null, shareKey: text });
+    toast({
+      title: "Setting saved. Please refresh to see the changes.",
+      status: "success",
+      duration: 4000,
+    });
+  };
+
+  return (
+    <Stack gap={3}>
+      <p style={{ fontWeight: "bold" }}>Cloud Backup [Beta]</p>
+      <p>
+        <a
+          href={userSettingsTable?.settings?.cloudHost + "/auth/shareKey"}
+          target="_blank"
+          style={{ textDecoration: "underline" }}
+        >
+          <Button size={"sm"}>👉Copy your share key from here</Button>
+        </a>{" "}
+        and paste it below to start saving workflow versions to cloud at{" "}
+        <a href={userSettingsTable?.settings?.cloudHost!} target="_blank">
+          {cloudDomain}
+        </a>
+      </p>
+
+      <Flex alignItems={"center"}>
+        <Input
+          value={text}
+          placeholder="Paste your share key here"
+          onChange={(e) => setText(e.target.value)}
+          onBlur={() => submitChange(text)}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              submitChange(text);
+            }
+          }}
+        />
+      </Flex>
+    </Stack>
+  );
+}

ui/src/settings/TwoWaySyncSettings.tsx

@@ -49,9 +49,8 @@ export default function TwoWaySyncSettings() {
   return (
     <Stack>
       <Text>
-        Only for legacy two way sync users to get back their data. Do not
-        disable two way sync if you have already enabled it. It may cause some
-        unexpected issues.
+        Only for legacy two way sync users to get back their data. [DO NOT
+        DISABLE]
       </Text>
       <Checkbox isChecked={checked} onChange={onTwoWaySyncChange}>
         Enable two way sync

ui/src/share/ShareDialog.tsx

@@ -10,88 +10,98 @@ import {
   ModalContent,
   ModalHeader,
   ModalOverlay,
-  Radio,
   RadioGroup,
   Stack,
+  Switch,
   Tag,
   Text,
   useToast,
 } from "@chakra-ui/react";
-import { Workflow, WorkflowPrivacy, WorkflowVersion } from "../types/dbTypes";
-import { useEffect, useRef, useState } from "react";
-import CustomSelector from "../components/CustomSelector";
-import { IconCloud, IconCopy, IconExternalLink } from "@tabler/icons-react";
 import {
-  userSettingsTable,
-  workflowVersionsTable,
-  workflowsTable,
-} from "../db-tables/WorkspaceDB";
+  EWorkflowPrivacy,
+  WorkflowPrivacy,
+  WorkflowVersion,
+} from "../types/dbTypes";
+import { useContext, useEffect, useState } from "react";
+import CustomSelector from "../components/CustomSelector";
+import { IconCopy, IconExternalLink } from "@tabler/icons-react";
+import { userSettingsTable, workflowsTable } from "../db-tables/WorkspaceDB";
 // @ts-ignore
 import { api } from "/scripts/api.js";
-// @ts-ignore
-import { app } from "/scripts/app.js";
 import {
   PrivacyLabel,
   fetchCloudWorkflowPrivacy,
   generateRandomKey,
+  getCurDateString,
   getNodeDefs,
   privacyOptions,
 } from "./shareUtils";
 
-import ShareDialogWorkflowVersionRadio from "./ShareDialogWorkflowVersionRadio";
+import ResourceDepsForm from "../spacejson/ResourceDepsForm";
+import { app } from "../utils/comfyapp";
+import { useStateRef } from "../customHooks/useStateRef";
+import { WorkspaceContext } from "../WorkspaceContext";
+import {
+  DepsResult,
+  WorkspaceInfoDeps,
+  extractAndFetchFileNames,
+} from "../spacejson/handleDownloadSpaceJson";
+import { fetchApi } from "../Api";
+import { COMFYSPACE_TRACKING_FIELD_NAME } from "../const";
+import { ShareWorkflowData } from "../types/types";
 
 interface Props {
   onClose: () => void;
 }
 
 export default function ShareDialog({ onClose }: Props) {
-  const [versionName, setVersionName] = useState("v" + getCurDateString());
-  const [localVersions, setLocalVersions] = useState<WorkflowVersion[]>([]);
+  const [versionName, setVersionName, versionNameRef] = useStateRef(
+    "v" + getCurDateString(),
+  );
+  const { saveCurWorkflow } = useContext(WorkspaceContext);
+  const [deps, setDeps] = useState<DepsResult>();
+  const [uploadingImage, setUploadingImage] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [cloudHost, setCloudHost] = useState("");
-  const [privacy, setPrivacy] = useState<WorkflowPrivacy>("PRIVATE");
+  const cloudHost = userSettingsTable?.settings?.cloudHost;
+  const [privacy, setPrivacy, privacyRef] =
+    useStateRef<WorkflowPrivacy>("PRIVATE");
   const [selectedVersion, setSelectedVersion] = useState<
     string | "new_version"
   >("new_version");
-  const cloudHostRef = useRef("");
-  const [workflow, setWorkflow] = useState<Workflow>();
+  const workflow = workflowsTable?.curWorkflow;
   const toast = useToast();
+  const [enableDeps, setEnableDeps] = useState(true);
   const handleShareWorkflowSuccess = async (event: MessageEvent) => {
     const detail = event.data;
     if (
-      event.origin !== cloudHostRef.current ||
-      detail.type !== "share_workflow_success"
+      // event.origin !== cloudHostRef.current ||
+      detail.type !== "share_workflow_success" ||
+      !workflow
     ) {
       return;
     }
 
-    const localID = detail.localWorkflowID;
-    const localVerID = detail.localVersionID;
     const cloudVersionID = detail.version.id;
     const cloudID = detail.version.workflowID;
 
     cloudID &&
-      localID &&
-      (await workflowsTable?.updateMetaInfo(localID, {
+      (await workflowsTable?.updateMetaInfo(workflow.id, {
         cloudID: cloudID,
-        cloudOrigin: event.origin,
-        privacy: privacy,
-      }));
-    localVerID &&
-      cloudVersionID &&
-      (await workflowVersionsTable?.update(localVerID, {
-        cloudID: cloudVersionID,
-        cloudOrigin: event.origin,
       }));
+
     loadData();
     window.open(
-      cloudHostRef.current + "/workflow/" + cloudID + "/" + cloudVersionID,
+      cloudHost + "/workflow/" + cloudID + "/" + cloudVersionID,
       "_blank",
     );
     setLoading(false);
   };
   useEffect(() => {
     loadData();
+    const graph = app.graph.serialize();
+    extractAndFetchFileNames(graph.nodes ?? []).then((depsRes) => {
+      setDeps(depsRes);
+    });
     window.addEventListener("message", handleShareWorkflowSuccess);
     return () => {
       window.removeEventListener("message", handleShareWorkflowSuccess);
@@ -99,24 +109,11 @@ export default function ShareDialog({ onClose }: Props) {
   }, []);
 
   const loadData = async () => {
-    const host =
-      import.meta.env.MODE === "production"
-        ? await userSettingsTable?.getSetting("cloudHost")
-        : "http://localhost:3000";
-    if (host) {
-      setCloudHost(host);
-      cloudHostRef.current = host;
-    }
-    const workflow = workflowsTable?.curWorkflow ?? undefined;
-    setWorkflow(workflow);
     if (workflow?.cloudID && workflow.cloudOrigin) {
       fetchCloudWorkflowPrivacy(workflow).then((privacy) => {
         setPrivacy(privacy);
       });
     }
-    workflowVersionsTable?.listByWorkflowID(workflow!.id).then((vers) => {
-      setLocalVersions(vers);
-    });
   };
   const copyTextToClipboard = (text: string) => {
     navigator.clipboard
@@ -133,7 +130,24 @@ export default function ShareDialog({ onClose }: Props) {
         console.error("Failed to copy text: ", err);
       });
   };
-  const onShare = async () => {
+  const pushToCloud = async (imageDeps?: DepsResult["images"]) => {
+    const graph = app.graph.serialize();
+    (graph.extra ||= {})[COMFYSPACE_TRACKING_FIELD_NAME] ||= {};
+    graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].deps = {
+      models: deps?.models ?? {},
+      images: imageDeps ?? {},
+      nodeRepos: deps?.nodeRepos ?? [],
+    } as WorkspaceInfoDeps;
+
+    await saveCurWorkflow();
+
+    await app
+      .graphToPrompt(app.graph)
+      .then((data: { output: any; workflow: any }) => {
+        graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].apiPrompt = data.output;
+        return data.output;
+      });
+    const jsonToShare = JSON.stringify(graph);
     setLoading(true);
     const secretKey = generateRandomKey(32);
     const host =
@@ -141,30 +155,11 @@ export default function ShareDialog({ onClose }: Props) {
         ? ((await userSettingsTable?.getSetting("cloudHost")) as string)
         : "http://localhost:3000";
     let nodeDefs: Object;
-    let version: WorkflowVersion | undefined;
-    try {
-      nodeDefs = getNodeDefs();
-      if (selectedVersion === "new_version") {
-        version = await workflowVersionsTable?.add({
-          workflowID: workflow!.id,
-          name: versionName,
-          createTime: Date.now(),
-          json: JSON.stringify(app.graph.serialize()),
-        });
-      } else {
-        version = await workflowVersionsTable?.get(selectedVersion);
-      }
-      if (!version) {
-        alert(`Failed to find version: ${selectedVersion}, please try again.`);
-        setLoading(false);
-        return;
-      }
-    } catch (e) {
-      console.error(e);
-      setLoading(false);
-      alert("Failed to share workflow, please try again.");
-      return;
-    }
+    nodeDefs = getNodeDefs();
+    const version: Omit<WorkflowVersion, "id" | "workflowID" | "createTime"> = {
+      name: versionNameRef.current,
+      json: jsonToShare ?? JSON.stringify(app.graph.serialize()),
+    };
     const protocol = window.location.protocol;
     const baseHost = window.location.host;
     const baseUrl = `${protocol}//${baseHost}`;
@@ -178,28 +173,84 @@ export default function ShareDialog({ onClose }: Props) {
     const handleChildReady = (event: MessageEvent) => {
       if (event.origin === host && event.data === "child_ready") {
         const curWorkflow = workflowsTable?.curWorkflow;
-        // Send data to the new window after it loads
-        sharePopup!.postMessage(
-          {
-            workflow: curWorkflow,
-            version: version,
-            nodeDefs: nodeDefs,
-            privacy: privacy,
+        if (!curWorkflow) {
+          return;
+        }
+        const input: ShareWorkflowData = {
+          workflow: {
+            name: curWorkflow.name,
+            cloudID: curWorkflow.cloudID,
           },
-          host,
-        );
+          version: {
+            name: versionNameRef.current,
+            json: jsonToShare,
+          },
+          nodeDefs: nodeDefs,
+          privacy: privacyRef.current as EWorkflowPrivacy,
+        };
+        // Send data to the new window after it loads
+        sharePopup!.postMessage(input, host);
         window.removeEventListener("message", handleChildReady);
       }
     };
     window.addEventListener("message", handleChildReady);
   };
 
+  const onShare = async () => {
+    const imageDeps = deps?.images ?? {};
+    if (enableDeps) {
+      // upload images
+      setUploadingImage(true);
+      const imageDepsToUpload = Object.values(deps?.images ?? {})
+        // .filter((i) => !i.url)
+        .map((i) => i.filename);
+      if (imageDepsToUpload.length) {
+        try {
+          const uploadResp = await fetchApi("/workspace/upload_image", {
+            method: "POST",
+            body: JSON.stringify({
+              images: imageDepsToUpload,
+            }),
+          });
+          const json = (await uploadResp.json()) as Record<string, string>;
+          Object.keys(json).forEach((key) => {
+            if (imageDeps?.[key]) {
+              imageDeps[key].url = json[key];
+            }
+          });
+        } catch (error) {
+          console.error("Error uploading images:", error);
+        }
+      }
+      setUploadingImage(false);
+    }
+
+    pushToCloud(imageDeps);
+  };
+
   const cloudWorkflowID = workflowsTable?.curWorkflow?.cloudID;
   return (
     <Modal isOpen={true} onClose={onClose} size={"lg"}>
       <ModalOverlay />
       <ModalContent width={["98%", "90%", "50%"]} maxWidth={"600px"}>
-        <ModalHeader>Share "{workflow?.name}"</ModalHeader>
+        <ModalHeader>
+          <Flex justifyContent={"space-between"}>
+            <p>Share "{workflow?.name}"</p>
+            <Button
+              colorScheme="teal"
+              onClick={onShare}
+              size={"sm"}
+              isDisabled={loading}
+            >
+              {loading ? "Sharing" : "Share"}
+            </Button>
+          </Flex>
+          {cloudHost && (
+            <Text fontSize={16} color={"GrayText"} fontWeight={400}>
+              Share to {new URL(cloudHost).host}
+            </Text>
+          )}
+        </ModalHeader>
         <ModalBody pb={10}>
           <Stack gap={5}>
             {cloudWorkflowID == null ? (
@@ -248,7 +299,6 @@ export default function ShareDialog({ onClose }: Props) {
                 </Button>
               </HStack>
             )}
-            <Text>Choose a version to share:</Text>
             <RadioGroup
               gap={4}
               onChange={(val) => {
@@ -258,7 +308,6 @@ export default function ShareDialog({ onClose }: Props) {
             >
               <Stack>
                 <HStack mb={5} alignItems={"center"}>
-                  <Radio key={"new_version"} value="new_version" />
                   <Input
                     value={versionName}
                     width={"60%"}
@@ -270,39 +319,37 @@ export default function ShareDialog({ onClose }: Props) {
                     }}
                   />
                   <Flex color="green">
-                    <Badge colorScheme="purple">New version</Badge>
+                    <Badge colorScheme="purple">Version Name</Badge>
                   </Flex>
                 </HStack>
-
-                {localVersions.slice(0, 4).map((ver) => {
-                  return (
-                    <ShareDialogWorkflowVersionRadio
-                      key={ver.id}
-                      version={ver}
-                      cloudHost={cloudHost}
-                      cloudWorkflowID={cloudWorkflowID ?? null}
-                    />
-                  );
-                })}
               </Stack>
             </RadioGroup>
+            {Object.keys(deps?.images ?? {}).length > 0 && (
+              <Stack borderRadius={6} borderWidth={"1px"} p={2}>
+                <Switch
+                  isChecked={enableDeps}
+                  onChange={() => setEnableDeps(!enableDeps)}
+                  fontWeight={"600"}
+                >
+                  Share input images
+                </Switch>
+
+                <span style={{ color: "GrayText" }}>
+                  If enabled your input images will be uploaded and shared to{" "}
+                  {cloudHost}
+                </span>
+                {enableDeps && (
+                  <ResourceDepsForm
+                    deps={deps ?? null}
+                    setDeps={setDeps}
+                    uploadingImage={uploadingImage}
+                  />
+                )}
+              </Stack>
+            )}
           </Stack>
-          <HStack justifyContent={"flex-end"} mt={16}>
-            <Button colorScheme="teal" onClick={onShare} isDisabled={loading}>
-              {loading ? "Sharing" : "Share"}
-            </Button>
-          </HStack>
         </ModalBody>
       </ModalContent>
     </Modal>
   );
 }
-
-function getCurDateString() {
-  const currentDate = new Date();
-  const year = currentDate.getFullYear();
-  const month = String(currentDate.getMonth() + 1).padStart(2, "0"); // Months are 0-based in JS
-  const day = String(currentDate.getDate()).padStart(2, "0");
-
-  return `${year}-${month}-${day}`;
-}

ui/src/share/shareUtils.tsx

@@ -1,8 +1,8 @@
 import { IconLink, IconLock, IconWorld } from "@tabler/icons-react";
 import { CustomSelectorOption } from "../components/CustomSelector";
 import { Workflow, WorkflowPrivacy } from "../types/dbTypes";
-// @ts-expect-error
-import { app } from "/scripts/app.js";
+import { app } from "../utils/comfyapp";
+import { userSettingsTable } from "../db-tables/WorkspaceDB";
 
 export function generateRandomKey(length: number) {
   // Generate a random array of bytes
@@ -61,10 +61,7 @@ export const getNodeDefs = () => {
 export async function fetchCloudWorkflowPrivacy(
   workflow: Workflow,
 ): Promise<WorkflowPrivacy> {
-  const cloudOrigin = workflow.cloudOrigin;
-  if (!cloudOrigin) {
-    throw Error("cloudURL is required");
-  }
+  const cloudOrigin = userSettingsTable?.settings?.cloudHost;
   return fetch(cloudOrigin + `/api/getWorkflow?id=${workflow.cloudID}`)
     .then((res) => res.json())
     .then((json) => {
@@ -100,3 +97,12 @@ export function PrivacyLabel({
   }
   return <span>{text}</span>;
 }
+
+export function getCurDateString() {
+  const currentDate = new Date();
+  // const year = currentDate.getFullYear();
+  const month = String(currentDate.getMonth() + 1).padStart(2, "0"); // Months are 0-based in JS
+  const day = String(currentDate.getDate()).padStart(2, "0");
+
+  return `${month}-${day}`;
+}

ui/src/spacejson/DownloadSpaceJsonDialog.tsx

@@ -1,56 +0,0 @@
-import { useContext, useRef } from "react";
-import { WorkspaceContext } from "../WorkspaceContext";
-import {
-  Badge,
-  Button,
-  HStack,
-  Heading,
-  Modal,
-  ModalBody,
-  ModalContent,
-  Text,
-  Tooltip,
-} from "@chakra-ui/react";
-// @ts-ignore
-import { app } from "/scripts/app.js";
-import { IconInfoCircle } from "@tabler/icons-react";
-import ResourceDepsForm from "./ResourceDepsForm";
-
-export default function DownloadSpaceJsonDialog() {
-  const { setRoute } = useContext(WorkspaceContext);
-  const formRef = useRef<HTMLFormElement>(null);
-  return (
-    <Modal isOpen={true} onClose={() => setRoute("root")} size={"xl"}>
-      <ModalContent>
-        <ModalBody p={5} gap={5}>
-          <HStack>
-            <Heading size={"md"}>Add Resouce Dependencies</Heading>
-            <Tooltip
-              label="runnable workflows include all resource dependecy download urls
-              (models, cursom nodes, input images) and can be one-click
-              installed and run in any ComfyUI with workpace-manager installed."
-            >
-              <Badge borderRadius={10}>
-                <IconInfoCircle size={20} />
-              </Badge>
-            </Tooltip>
-          </HStack>
-          <Text color={"GrayText"}>Export runnable workflow</Text>
-          <ResourceDepsForm ref={formRef} />
-          <HStack justifyContent={"flex-end"}>
-            <Button
-              colorScheme="teal"
-              size="sm"
-              onClick={() => formRef.current?.requestSubmit()}
-            >
-              Next
-            </Button>
-            <Button size="sm" onClick={() => setRoute("share")}>
-              Skip
-            </Button>
-          </HStack>
-        </ModalBody>
-      </ModalContent>
-    </Modal>
-  );
-}

ui/src/spacejson/ResourceDepsForm.tsx

@@ -1,332 +1,44 @@
-import {
-  forwardRef,
-  useCallback,
-  useContext,
-  useEffect,
-  useState,
-} from "react";
-import { WorkspaceContext } from "../WorkspaceContext";
-import {
-  Button,
-  Flex,
-  HStack,
-  Heading,
-  IconButton,
-  Image,
-  Input,
-  Spinner,
-  Stack,
-  Tag,
-  Text,
-  Tooltip,
-} from "@chakra-ui/react";
-import {
-  DepsResult,
-  ModelFile,
-  WorkspaceInfoDeps,
-  extractAndFetchFileNames,
-} from "./handleDownloadSpaceJson";
-// @ts-ignore
-import { app } from "/scripts/app.js";
-import { IconExternalLink, IconPencil, IconRefresh } from "@tabler/icons-react";
-import { getHgModelInfoUrlFromDownloadUrl } from "../utils/civitUtils";
-import { getAllModelsList } from "../Api";
-import { COMFYSPACE_TRACKING_FIELD_NAME } from "../const";
-import { indexdb } from "../db-tables/indexdb";
+import { HStack, Heading, Image, Spinner, Stack } from "@chakra-ui/react";
+import { DepsResult } from "./handleDownloadSpaceJson";
 
-export default forwardRef<HTMLFormElement>(
-  function ResourceDepsForm(_props, ref) {
-    const { saveCurWorkflow, setRoute } = useContext(WorkspaceContext);
-    const [deps, setDeps] = useState<DepsResult>();
-    const [errors, setErrors] = useState<Record<string, string>>({});
-    const [uploadingImage, setUploadingImage] = useState(false);
-
-    const init = useCallback(async () => {
-      const graph = app.graph.serialize();
-      extractAndFetchFileNames(graph.nodes ?? []).then((depsRes) => {
-        setDeps(depsRes);
-      });
-    }, []);
-
-    const onRefreshModelsList = useCallback(async () => {
-      setDeps(undefined);
-      await getAllModelsList();
-      window.addEventListener("model_list_updated", () => {
-        init();
-        window.removeEventListener("model_list_updated", () => {});
-      });
-    }, []);
-
-    useEffect(() => {
-      init();
-    }, []);
-
-    const validateURL = (url: string) => {
-      const pattern = new RegExp(
-        "^(https?:\\/\\/)?" +
-          "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" +
-          "((\\d{1,3}\\.){3}\\d{1,3}))" +
-          "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" +
-          "(\\?[;&a-z\\d%_.~+=-]*)?" +
-          "(\\#[-a-z\\d_]*)?$",
-        "i",
-      );
-      return !!pattern.test(url);
-    };
-
-    const handleSubmit = async (event: any) => {
-      event.preventDefault();
-      event.stopPropagation();
-
-      const formData = new FormData(event.target);
-      // validate model deps and save model urls to db
-      const saveModelUrlDBPromises: Promise<ModelFile>[] =
-        Object.values(deps?.models ?? {}).map(async (model) => {
-          const inputDownloadUrl = formData.get(model.filename)?.toString();
-          if (inputDownloadUrl?.length) {
-            // because the models table is storing filename without extension as id, which should be migrated
-            const baseName = getBaseFileName(model.filename);
-            await indexdb.models.update(baseName + "@" + model.fileFolder, {
-              downloadUrl: inputDownloadUrl,
-            });
-          }
-          const infoUrl = model.infoUrl?.length
-            ? model.infoUrl
-            : inputDownloadUrl
-              ? getHgModelInfoUrlFromDownloadUrl(inputDownloadUrl)
-              : null;
-          return {
-            filename: model.filename,
-            nodeType: model.nodeType,
-            fileHash: model.fileHash,
-            fileFolder: model.fileFolder,
-            downloadUrl: inputDownloadUrl ?? model.downloadUrl ?? null,
-            infoUrl: infoUrl ?? null,
-            inputName: model.inputName,
-          };
-        }) ?? [];
-      const modelDepsArr = await Promise.all(saveModelUrlDBPromises);
-      if (!validateModelDeps(modelDepsArr)) {
-        return;
-      }
-      setErrors({});
-
-      // upload images
-      setUploadingImage(true);
-      const imageDepsToUpload = Object.values(deps?.images ?? {})
-        .filter((i) => !i.url)
-        .map((i) => i.filename);
-      const imageDeps = deps?.images ?? {};
-
-      if (imageDepsToUpload.length) {
-        const uploadResp = await fetch("/workspace/upload_image", {
-          method: "POST",
-          body: JSON.stringify({
-            images: imageDepsToUpload,
-          }),
-        });
-        const json = (await uploadResp.json()) as Record<string, string>;
-        Object.keys(json).forEach((key) => {
-          if (imageDeps?.[key]) {
-            imageDeps[key].url = json[key];
-          }
-        });
-      }
-      setUploadingImage(false);
-
-      // save deps to graph
-      const modelDeps: WorkspaceInfoDeps["models"] = {};
-      modelDepsArr.forEach((model) => {
-        modelDeps[model.filename] = model;
-      });
-      const graph = app.graph.serialize();
-      (graph.extra ||= {})[COMFYSPACE_TRACKING_FIELD_NAME] ||= {};
-      graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].deps = {
-        models: modelDeps,
-        images: imageDeps ?? {},
-        nodeRepos: deps?.nodeRepos ?? [],
-      } as WorkspaceInfoDeps;
-      await app
-        .graphToPrompt(app.graph)
-        .then((data: { output: any; workflow: any }) => {
-          graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].apiPrompt = data.output;
-        });
-
-      await saveCurWorkflow();
-      console.log("graph", graph);
-      setRoute("share");
-    };
-
-    const validateModelDeps = useCallback((modelDeps: ModelFile[]) => {
-      let isValid = true;
-      modelDeps.forEach((model) => {
-        const key = model.filename;
-        if (!model.downloadUrl) {
-          setErrors((prev) => ({
-            ...prev,
-            [key]: "Invalid URL",
-          }));
-          isValid = false;
-          return;
-        }
-        if (!validateURL(model.downloadUrl)) {
-          setErrors((prev) => ({ ...prev, [key]: "Invalid URL" }));
-          isValid = false;
-          return;
-        }
-        if (!model.fileFolder) {
-          setErrors((prev) => ({
-            ...prev,
-            [key]: "Model file not found, please re-scan models folder",
-          }));
-          isValid = false;
-          return;
-        }
-      });
-      return isValid;
-    }, []);
-
-    const imageDepsArr = Object.values(deps?.images ?? {});
-    const modelDepsArr = Object.values(deps?.models ?? []);
-    if (!deps) {
-      return <Spinner size="md" color="teal.400" />;
-    }
-
-    return (
-      <form onSubmit={handleSubmit} ref={ref}>
-        <Stack gap={5} mt={5}>
-          <Stack>
-            <Heading size={"sm"}>Models ({modelDepsArr.length})</Heading>
-            {modelDepsArr.map((modelFile, index) => (
-              <ModelDepsItem
-                modelFile={modelFile}
-                key={index}
-                errors={errors}
-                onClickRefetchModelList={onRefreshModelsList}
-              />
-            ))}
-          </Stack>
-
-          {imageDepsArr.length > 0 && (
-            <Stack>
-              <HStack>
-                <Heading size={"sm"}>Images ({imageDepsArr.length})</Heading>
-                {/* <Tag colorScheme="yellow">Will be uploaded as url</Tag> */}
-                <p style={{ color: "GrayText" }}>Will be uploaded as url</p>
-              </HStack>
-              {uploadingImage && (
-                <span>
-                  <Spinner size="md" color="teal.400" /> Uploading
-                </span>
-              )}
-              {imageDepsArr.map((image) => (
-                <Stack key={image.filename}>
-                  <p>{image.filename}</p>
-                  <Image
-                    width={250}
-                    src={`/workspace/view_media?filename=${image.filename}&isPreview=true&isInput=true`}
-                  />
-                </Stack>
-              ))}
-            </Stack>
-          )}
-        </Stack>
-      </form>
-    );
-  },
-);
-
-function getBaseFileName(filename: string) {
-  const parts = filename.split(".");
-  if (parts.length > 1) {
-    parts.pop();
-    return parts.join(".");
-  } else {
-    return filename;
-  }
-}
-
-function ModelDepsItem({
-  modelFile,
-  errors,
-  onClickRefetchModelList,
+export default function ResourceDepsForm({
+  deps,
+  uploadingImage,
 }: {
-  modelFile: DepsResult["models"][0];
-  errors: Record<string, string>;
-  onClickRefetchModelList: () => void;
+  deps: DepsResult | null;
+  setDeps: (deps: DepsResult) => void;
+  uploadingImage: boolean;
 }) {
-  const inputKey = modelFile.filename;
-  const [isEditing, setIsEditing] = useState(!modelFile.downloadUrl);
-
-  if (!modelFile.fileFolder) {
-    return (
-      <Stack>
-        <Flex gap={2}>
-          <p>{modelFile.filename}</p>
-          <Tag size={"sm"} colorScheme={"red"}>
-            Model file not found
-          </Tag>
-        </Flex>
-        <Button
-          size={"sm"}
-          leftIcon={<IconRefresh />}
-          width={"fit-content"}
-          borderColor={"red"}
-          borderWidth={errors[inputKey] != null ? 2 : 0}
-          onClick={onClickRefetchModelList}
-        >
-          Fetch model file
-        </Button>
-      </Stack>
-    );
+  const imageDepsArr = Object.values(deps?.images ?? {});
+  if (!deps) {
+    return <Spinner size="md" color="teal.400" />;
   }
+
   return (
-    <Stack ml={2}>
-      <Flex key={modelFile.filename + modelFile.nodeType} gap={2}>
-        <Tag height={"fit-content"} colorScheme={"teal"}>
-          {modelFile.fileFolder}
-        </Tag>
-
-        {modelFile.downloadUrl ? (
+    <Stack gap={5}>
+      {imageDepsArr.length > 0 && (
+        <Stack>
           <HStack>
-            <a
-              href={modelFile.infoUrl ?? modelFile.downloadUrl}
-              target="_blank"
-            >
-              {modelFile.filename}
-            </a>
-            <IconExternalLink size={18} />
-            <IconButton
-              ml={3}
-              aria-label="edit"
-              icon={<IconPencil size={18} />}
-              size={"xs"}
-              onClick={() => setIsEditing(!isEditing)}
-            />
+            <Heading size={"sm"}>Images ({imageDepsArr.length})</Heading>
+            {/* <Tag colorScheme="yellow">Will be uploaded as url</Tag> */}
+            <p style={{ color: "GrayText" }}>Will be uploaded as url</p>
           </HStack>
-        ) : (
-          <Stack>
+          {uploadingImage && (
             <span>
-              {modelFile.filename} <span>❓</span>
+              <Spinner size="md" color="teal.400" /> Uploading
             </span>
-          </Stack>
-        )}
-      </Flex>
-
-      <Stack style={{ display: isEditing ? "block" : "none" }}>
-        <Tooltip
-          label={"Model download link, supports Huggingface and Civitai"}
-        >
-          <Input
-            name={inputKey}
-            defaultValue={modelFile.downloadUrl ?? ""}
-            size={"sm"}
-            isInvalid={errors[inputKey] != null}
-            placeholder={"https://civitai.com/api/download/models/324524"}
-          />
-        </Tooltip>
-      </Stack>
-      <Text color={"red.400"}>{errors[inputKey]}</Text>
+          )}
+          {imageDepsArr.map((image) => (
+            <Stack key={image.filename}>
+              <p>{image.filename}</p>
+              <Image
+                width={250}
+                src={`/workspace/view_media?filename=${image.filename}&isPreview=true&isInput=true`}
+              />
+            </Stack>
+          ))}
+        </Stack>
+      )}
     </Stack>
   );
 }

ui/src/spacejson/handleDownloadSpaceJson.ts

@@ -5,8 +5,7 @@ import {
   getCivitModelPageUrl,
   getHgModelInfoUrlFromDownloadUrl,
 } from "../utils/civitUtils";
-// @ts-ignore
-import { app } from "/scripts/app.js";
+import { app } from "../utils/comfyapp";
 
 type LiteNode = {
   id: number;
@@ -14,13 +13,18 @@ type LiteNode = {
   widgets_values?: Array<string | number>;
 };
 
-export type ModelFile = {
-  filename: string;
-  fileFolder: string | null;
-  fileHash: string | null;
-  downloadUrl: string | null;
+export type ModelDep = {
+  name: string;
+  folder: string | null;
+  hash: string | null;
+  url: string | null;
+  // TODO: will be deperecated
+  filename?: string;
+  fileFolder?: string | null;
+  fileHash?: string | null;
+  downloadUrl?: string | null;
   // optional info
-  infoUrl: string | null;
+  infoUrl?: string | null;
   nodeType?: string;
   inputName?: string;
 };
@@ -41,12 +45,12 @@ export type DepsResult = {
   nodeRepos: NodeRepo[];
 };
 
-export type DepsResultModel = ModelFile & {
+export type DepsResultModel = ModelDep & {
   length: number;
 };
 
 export type WorkspaceInfoDeps = {
-  models: Record<string, ModelFile>;
+  models: Record<string, ModelDep>;
   images: DepsResult["images"];
   nodeRepos: DepsResult["nodeRepos"];
 };
@@ -60,18 +64,15 @@ async function fetchModelData(
     (await indexdb.models.where("fileName").equals(filename).toArray()) ?? [];
   const first = res.at(0);
   const modelFile: DepsResultModel = {
-    filename,
+    name: filename,
     nodeType,
-    fileHash: first?.fileHash ?? null,
-    fileFolder: first?.fileFolder ?? null,
-    downloadUrl: first?.civitModelVersionID
+    hash: first?.fileHash ?? null,
+    folder: first?.fileFolder ?? null,
+    url: first?.civitModelVersionID
       ? getCivitModelDownloadUrl(first.civitModelVersionID)
       : first?.downloadUrl ?? null,
     inputName: inputName,
     length: res.length,
-    infoUrl: first?.civitModelID
-      ? getCivitModelPageUrl(first.civitModelID, first.civitModelVersionID)
-      : getHgModelInfoUrlFromDownloadUrl(first?.downloadUrl ?? "") ?? null,
   };
   return modelFile;
 }
@@ -95,13 +96,9 @@ export async function extractAndFetchFileNames(
           if (typeof value != "string") return;
           // Check if it's a model file
           if (modelFileExtensions.some((ext) => value.endsWith(ext))) {
-            // if (curDeps?.models?.[value]) {
-            // modelPromises.push(Promise.resolve(curDeps.models[value]));
-            // } else {
             modelPromises.push(
               fetchModelData(value, node.class_type, inputName),
             );
-            // }
           }
           // Check if it's an image file
           if (imageFileExtensions.some((ext) => value.endsWith(ext))) {
@@ -135,10 +132,7 @@ export async function extractAndFetchFileNames(
   const models = await Promise.all(modelPromises);
   const modelsMap: Record<string, DepsResultModel> = {};
   models.forEach((model) => {
-    // if (model.nodeType) {
-    //   model.gitRepo = reposMapping[model.nodeType];
-    // }
-    modelsMap[model.filename] = model;
+    modelsMap[model.name] = model;
   });
   const nodeRepos: Record<string, NodeRepo> = {};
   Object.values(reposMapping).forEach((repo) => {

ui/src/topbar/AppIsDirtyEventListener.tsx

@@ -1,33 +1,31 @@
-import { useContext, useEffect, useRef, useState } from "react";
-// @ts-expect-error
-import { app } from "/scripts/app.js";
+import { useContext, useEffect, useRef } from "react";
 import { WorkspaceContext } from "../WorkspaceContext";
-import {
-  changelogsTable,
-  userSettingsTable,
-  workflowsTable,
-} from "../db-tables/WorkspaceDB";
-import { Tag, Tooltip, useToast } from "@chakra-ui/react";
+import { workflowsTable } from "../db-tables/WorkspaceDB";
 import { matchShortcut } from "../utils";
 import { EShortcutKeys } from "../types/dbTypes";
 import useDebounceFn from "../customHooks/useDebounceFn";
-import { deepJsonDiffCheck } from "../utils/deepJsonDiffCheck";
-import { SHORTCUT_TRIGGER_EVENT } from "../const";
+import {
+  COMFYSPACE_TRACKING_FIELD_NAME,
+  SHORTCUT_TRIGGER_EVENT,
+} from "../const";
+import { app } from "../utils/comfyapp";
 
 export default function AppIsDirtyEventListener() {
-  const { isDirty, setIsDirty, setRoute, saveCurWorkflow } =
-    useContext(WorkspaceContext);
+  const {
+    isDirty,
+    setIsDirty,
+    setRoute,
+    saveCurWorkflow,
+    setCurFlowIDAndName,
+  } = useContext(WorkspaceContext);
   const isDirtRef = useRef(isDirty);
-  const [isOutdated, setIsOutdated] = useState(false);
-  const toast = useToast();
-  const autoSaveTimer = useRef<number | null>(null);
 
   useEffect(() => {
     isDirtRef.current = isDirty;
   }, [isDirty]);
 
   useEffect(() => {
-    const shortcutListener = (event: KeyboardEvent) => {
+    const keydownListener = (event: KeyboardEvent) => {
       if (document.visibilityState === "hidden") return;
       const matchResult = matchShortcut(event);
       if (matchResult) {
@@ -60,11 +58,32 @@ export default function AppIsDirtyEventListener() {
         debounceOnIsDirty();
       }
     };
-    const originalOnAfterChange = app.canvas.onAfterChange;
-    app.graph.onAfterChange = function () {
-      // Call the original onAfterChange method
-      originalOnAfterChange?.apply(this, arguments);
-      debounceOnIsDirty();
+
+    const restoreCurWorkflow = async () => {
+      if (!app?.graph) {
+        console.error(
+          "🦄 Error in workspace manager! app.graph is not available in restoreCurWorkflow()",
+        );
+        return;
+      }
+      const id = app.graph.extra?.[COMFYSPACE_TRACKING_FIELD_NAME]?.id;
+      console.log("🦄 Restoring workflow... id=", id);
+      if (id) {
+        const flow = await workflowsTable?.get(id);
+        console.log(
+          "🦄 Restored workflow",
+          flow?.parentFolderID + "/" + flow?.name,
+        );
+        flow && setCurFlowIDAndName(flow);
+
+        if (
+          !flow?.saveLock &&
+          flow &&
+          flow.json !== JSON.stringify(app.graph.serialize())
+        ) {
+          setIsDirty(true);
+        }
+      }
     };
 
     const originalOnConfigure = app.graph.onConfigure;
@@ -72,14 +91,11 @@ export default function AppIsDirtyEventListener() {
       originalOnConfigure?.apply(this, arguments);
       // delay check diff json cuz it takes time for graph.serialize() to settle up and return the correct json
       setTimeout(() => {
-        const deepCheck = deepJsonDiffCheck(
-          app.graph.serialize(),
-          JSON.parse(workflowsTable?.curWorkflow?.json ?? "{}"),
-        );
-        if (!deepCheck) {
-          debounceOnIsDirty();
+        const id = app.graph.extra?.[COMFYSPACE_TRACKING_FIELD_NAME]?.id;
+        if (id == null || id != workflowsTable?.curWorkflow?.id) {
+          setCurFlowIDAndName(null);
         }
-      }, 1000);
+      }, 500);
     };
 
     document.addEventListener("click", (e) => {
@@ -92,63 +108,23 @@ export default function AppIsDirtyEventListener() {
         debounceOnIsDirty();
       }
     });
-    document.addEventListener("keydown", shortcutListener);
-
-    if (
-      userSettingsTable?.settings?.autoSave &&
-      userSettingsTable.settings.autoSaveDuration
-    ) {
-      autoSaveTimer.current = setInterval(() => {
-        // auto save workflow every 5s
-        autoSaveWorkflow();
-      }, userSettingsTable.settings.autoSaveDuration * 1000);
-    }
+    document.addEventListener("keydown", keydownListener);
 
+    restoreCurWorkflow();
     return () => {
-      document.removeEventListener("keydown", shortcutListener);
-      autoSaveTimer.current && clearInterval(autoSaveTimer.current);
+      document.removeEventListener("keydown", keydownListener);
     };
   }, []);
-  const autoSaveWorkflow = async () => {
-    // autosave workflow if enabled
-    if (
-      workflowsTable?.curWorkflow?.saveLock ||
-      !workflowsTable?.curWorkflow?.id ||
-      !isDirtRef.current
-    ) {
-      return;
-    }
-    const graphJson = JSON.stringify(app.graph.serialize());
-    await workflowsTable?.updateFlow(workflowsTable.curWorkflow.id, {
-      json: graphJson,
-    });
-    changelogsTable?.create({
-      workflowID: workflowsTable.curWorkflow.id,
-      isAutoSave: true,
-      json: graphJson,
-    });
-    setIsDirty(false);
-  };
 
   const onIsDirty = async () => {
     if (workflowsTable?.curWorkflow?.saveLock || isDirtRef.current) return;
-    setIsDirty(true);
-    if (
-      userSettingsTable?.settings?.autoSave &&
-      workflowsTable?.curWorkflow?.id &&
-      !isOutdated
-    ) {
-      const isLatest = await workflowsTable?.latestVersionCheck();
-      if (!isLatest) {
-        setIsOutdated(true);
-      }
+    const graph = app.graph.serialize();
+    if (JSON.stringify(graph) === workflowsTable?.curWorkflow?.json) {
+      return;
     }
+    setIsDirty(true);
   };
   const [debounceOnIsDirty, _] = useDebounceFn(onIsDirty, 900);
 
-  return isOutdated ? (
-    <Tooltip label="This workflow was changed by another tab, so you are not working on the latest version. Please refresh page to see the latest version of this workflow.">
-      <Tag colorScheme="yellow">⚠️Outdated version</Tag>
-    </Tooltip>
-  ) : null;
+  return null;
 }

ui/src/topbar/Topbar.tsx

@@ -5,7 +5,6 @@ import {
   IconFolder,
   IconGripVertical,
   IconPhoto,
-  IconPlus,
   IconTriangleInvertedFilled,
   IconLock,
 } from "@tabler/icons-react";
@@ -22,10 +21,10 @@ import EditFlowName from "../components/EditFlowName";
 import { WorkspaceContext } from "../WorkspaceContext";
 import { PanelPosition } from "../types/dbTypes";
 import "./Topbar.css";
-import { SharedTopbarButton } from "../share/SharedTopbarButton";
 import VersionNameTopbar from "./VersionNameTopbar";
 import { userSettingsTable, workflowsTable } from "../db-tables/WorkspaceDB";
 import { TOPBAR_BUTTON_HEIGHT } from "../const";
+import TopbarNewWorkflowButton from "./TopbarNewWorkflowButton";
 const AppIsDirtyEventListener = lazy(() => import("./AppIsDirtyEventListener"));
 const ModelManagerTopbar = lazy(
   () => import("../model-manager/topbar/ModelManagerTopbar"),
@@ -37,14 +36,8 @@ interface Props {
   setCurFlowName: (newName: string) => void;
 }
 export function Topbar({ curFlowName, setCurFlowName }: Props) {
-  const {
-    isDirty,
-    loadNewWorkflow,
-    saveCurWorkflow,
-    setRoute,
-    curFlowID,
-    route,
-  } = useContext(WorkspaceContext);
+  const { isDirty, saveCurWorkflow, setRoute, curFlowID, route } =
+    useContext(WorkspaceContext);
   const [positionStyle, setPositionStyle] = useState<PanelPosition>();
   const updatePanelPosition: (
     position?: PanelPosition,
@@ -116,21 +109,7 @@ export function Topbar({ curFlowName, setCurFlowName }: Props) {
         <Suspense fallback={<div style={{ width: "60px" }} />}>
           <ModelManagerTopbar />
         </Suspense>
-        <Tooltip label="New workflow">
-          <Button
-            size={"sm"}
-            variant={"outline"}
-            colorScheme="teal"
-            aria-label="new workflow"
-            height={TOPBAR_BUTTON_HEIGHT + "px"}
-            onClick={() => loadNewWorkflow()}
-            px={1}
-          >
-            <HStack gap={0}>
-              <IconPlus size={16} color={"white"} />
-            </HStack>
-          </Button>
-        </Tooltip>
+        <TopbarNewWorkflowButton />
         <EditFlowName
           isDirty={isDirty}
           displayName={curFlowName ?? ""}
@@ -172,7 +151,6 @@ export function Topbar({ curFlowName, setCurFlowName }: Props) {
         ) : (
           <div style={{ width: 1 }} />
         )}
-        <SharedTopbarButton />
         <VersionNameTopbar />
         <AppIsDirtyEventListener />
         <IconGripVertical

ui/src/topbar/TopbarNewWorkflowButton.tsx

@@ -0,0 +1,49 @@
+import { Tooltip, Button } from "@chakra-ui/react";
+import { IconDeviceFloppy } from "@tabler/icons-react";
+import { useContext } from "react";
+import { WorkspaceContext } from "../WorkspaceContext";
+import { COMFYSPACE_TRACKING_FIELD_NAME, TOPBAR_BUTTON_HEIGHT } from "../const";
+import { app } from "../utils/comfyapp";
+import { workflowsTable } from "../db-tables/WorkspaceDB";
+import { nanoid } from "nanoid";
+
+export default function TopbarNewWorkflowButton() {
+  const { setCurFlowIDAndName, curFlowID } = useContext(WorkspaceContext);
+  const saveNewWorkflow = async () => {
+    const workflowName = prompt("Enter workflow name", "Untitled");
+    if (!workflowName) return;
+    const id = nanoid();
+    const graph = app.graph.serialize();
+    if (!graph.extra) {
+      graph.extra = {};
+    }
+    if (!graph.extra[COMFYSPACE_TRACKING_FIELD_NAME]) {
+      graph.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {};
+    }
+    graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].id = id;
+    const flow = await workflowsTable?.createFlow({
+      id,
+      json: JSON.stringify(graph),
+      name: workflowName,
+    });
+    flow && setCurFlowIDAndName(flow);
+  };
+  if (curFlowID) {
+    return null;
+  }
+  return (
+    <Tooltip label={"Save workflow"}>
+      <Button
+        size={"sm"}
+        variant={"outline"}
+        colorScheme="teal"
+        aria-label="new workflow"
+        height={TOPBAR_BUTTON_HEIGHT + "px"}
+        onClick={() => saveNewWorkflow()}
+        px={1}
+      >
+        <IconDeviceFloppy size={16} color={"white"} />
+      </Button>
+    </Tooltip>
+  );
+}

ui/src/types/dbTypes.ts

@@ -10,17 +10,17 @@ export interface SortableItem {
 export interface Workflow extends SortableItem {
   id: string;
   json: string;
-  lastSavedJson?: string; // TODO will be deprecated
   name: string;
+  coverMediaPath?: string | null;
+  saveLock?: boolean;
+  cloudID?: string | null;
   createTime: number;
-  filePath?: string; // TODO will be deprecated
+
+  // will be deprecated
   privacy?: WorkflowPrivacy;
   tags?: string[];
   parentFolderID?: string | null; //TODO remove undefined, use null only
-  coverMediaPath?: string;
-  cloudID?: string; // TODO will be deprecated
   cloudOrigin?: string;
-  saveLock?: boolean;
   latestImage?: string;
   topFieldsConfig?: TopFieldType[];
 }
@@ -66,9 +66,9 @@ export type WorkflowVersion = {
   name: string;
   workflowID: string;
   json: string;
-  createTime: number;
-  cloudID?: string;
-  cloudOrigin?: string;
+  createTime?: number;
+  createdAt?: string;
+  created_at?: string;
   authorID?: string;
   nodeDefs?: string; //for cloud workflow version
 };
@@ -96,7 +96,6 @@ export type UserSettings = {
   foldersOnTop?: boolean;
   showNsfwModelThumbnail?: boolean;
   cloudHost: string;
-  overwriteCurWorkflowWhenDroppingFileToCanvas: boolean;
   defaultFolders: Record<MODEL_TYPE, string>;
   maximumChangelogNumber: number;
   hideCoverImage: boolean;
@@ -131,7 +130,6 @@ export type Media = {
   workflowJSON?: string;
   createTime: number;
   localPath: string;
-  format: string;
 };
 
 /**

ui/src/types/types.ts

@@ -1,3 +1,5 @@
+import { EWorkflowPrivacy } from "./dbTypes";
+
 export type WorkspaceRoute =
   | "root"
   | "customNodes"
@@ -10,3 +12,21 @@ export type WorkspaceRoute =
   | "downloadSpaceJson"
   | "installModels"
   | "share";
+
+export type Session = {
+  username: string | null;
+  shareKey: string;
+};
+
+export type ShareWorkflowData = {
+  version: {
+    name: string;
+    json: string;
+  };
+  workflow: {
+    name: string;
+    cloudID?: string | null;
+  };
+  nodeDefs: Object;
+  privacy: EWorkflowPrivacy;
+};

ui/src/utils.tsx

@@ -1,22 +1,7 @@
-import { deleteFile, updateFile } from "./Api";
 import { ESortTypes } from "./RecentFilesDrawer/types";
-import { workflowsTable, userSettingsTable } from "./db-tables/WorkspaceDB";
-import {
-  generateFilePathAbsolute,
-  saveJsonFileMyWorkflows,
-} from "./db-tables/DiskFileUtils";
-import {
-  Workflow,
-  EShortcutKeys,
-  EOtherKeys,
-  SortableItem,
-} from "./types/dbTypes";
-// @ts-expect-error ComfyUI import
-import { app } from "/scripts/app.js";
-import {
-  COMFYSPACE_TRACKING_FIELD_NAME,
-  LEGACY_COMFYSPACE_TRACKING_FIELD_NAME,
-} from "./const";
+import { userSettingsTable } from "./db-tables/WorkspaceDB";
+import { Workflow, EShortcutKeys, SortableItem } from "./types/dbTypes";
+import { app } from "./utils/comfyapp";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare let LiteGraph: any, LGraph: any, LGraphCanvas: any;
@@ -156,22 +141,6 @@ export function sortFlows(
 
   return copyFlows;
 }
-export async function validateOrSaveAllJsonFileMyWorkflows(
-  deleteEmptyFolder = false,
-) {
-  const twoWaySync = await userSettingsTable?.getSetting("twoWaySync");
-  if (twoWaySync) return; // disable this function in two way sync mode
-  const flowList = (await workflowsTable?.listAll()) ?? [];
-  for (const workflow of flowList) {
-    const fullPath = await generateFilePathAbsolute(workflow);
-    if (workflow.filePath != fullPath) {
-      // file path changed
-      workflow.filePath != null &&
-        (await deleteFile(workflow.filePath, deleteEmptyFolder));
-      await saveJsonFileMyWorkflows(workflow);
-    }
-  }
-}
 
 export const sortFileItem = <T extends SortableItem>(
   items: T[],
@@ -341,21 +310,3 @@ export const openWorkflowInNewTab = (workflowID: string) => {
   const newHash = generateUrlHashWithFlowId(workflowID);
   window.open(`${window.location.origin}/#${newHash}`);
 };
-
-export async function rewriteAllLocalFiles() {
-  const flowList = (await workflowsTable?.listAll()) ?? [];
-  for (const workflow of flowList) {
-    try {
-      const fullPath = await generateFilePathAbsolute(workflow);
-      const flow = JSON.parse(workflow.json);
-      flow.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {
-        id: workflow.id,
-        name: workflow.name,
-      };
-      delete flow.extra[LEGACY_COMFYSPACE_TRACKING_FIELD_NAME];
-      fullPath && (await updateFile(fullPath, JSON.stringify(flow)));
-    } catch (error) {
-      console.error(error);
-    }
-  }
-}

ui/src/utils/OsPathUtils.ts

@@ -1,5 +1,13 @@
 import type { Workflow } from "../types/dbTypes";
 
+export const serverInfo: {
+  os: "Windows" | "Linux" | "Darwin" | "Java" | null;
+} = {
+  os: null,
+};
+
+export const getPathSep = () => (serverInfo.os === "Windows" ? "\\" : "/");
+
 export function joinRelPath(...segments: string[]) {
   const rel = segments.filter((segment) => segment !== "").join("/");
   return sanitizeRelPath(rel);
@@ -15,6 +23,10 @@ export function sanitizeRelPath(path: string) {
   // Remove leading slashes to ensure the path is treated as relative
   sanitizedPath = sanitizedPath.replace(/^\/+/, "");
 
+  if (serverInfo.os === "Windows") {
+    sanitizedPath = segments.replace(/\//g, "\\");
+  }
+
   return sanitizedPath;
 }
 

ui/src/utils/comfyapp.ts

@@ -1,7 +1,17 @@
 // @ts-ignore
-export const app = window.app;
+export let app: any | null = null;
 const api_base = location.pathname.split("/").slice(0, -1).join("/");
 
-export const api = import(api_base + "/scripts/app.js").then((api) => {
-  return api;
-});
+export let api: any | null = null;
+
+export async function waitForApp() {
+  await Promise.all([
+    import(api_base + "/scripts/api.js").then((apiJs) => {
+      api = apiJs?.api;
+    }),
+
+    import(api_base + "/scripts/app.js").then((appJs) => {
+      app = appJs?.app;
+    }),
+  ]);
+}

ui/src/utils/encryptUtils.ts

@@ -0,0 +1,18 @@
+// utils/encryptUtils
+const defaultSalt = import.meta.env.VITE_SHARE_KEY_ENCODE_KEY;
+
+export function encodeKey(text: string, salt: string = defaultSalt): string {
+  const randomLength = Math.floor(Math.random() * 13) + 1; // Random length between 1 and 13
+  const randomPadding = Math.random()
+    .toString(36)
+    .substring(2, 2 + randomLength);
+  const input = randomPadding + salt + text;
+  return btoa(encodeURIComponent(input));
+}
+
+export function decodeKey(encoded: string, salt: string = defaultSalt): string {
+  const decoded = decodeURIComponent(atob(encoded));
+  const saltIndex = decoded.indexOf(salt);
+  if (saltIndex === -1) throw new Error("Invalid encoded string or salt");
+  return decoded.slice(saltIndex + salt.length);
+}

ui/src/utils/saveShareKey.ts

@@ -0,0 +1,6 @@
+import { encodeKey } from "./encryptUtils";
+
+export function saveShareKey(sharekey: string) {
+  const key = encodeKey(sharekey);
+  localStorage.setItem("workspace_manager_shareKey", key);
+}

ui/src/utils/twowaySyncUtils.ts

@@ -4,7 +4,7 @@ import {
   ScanLocalFolder,
   scanLocalFiles,
 } from "../apis/TwowaySyncApi";
-import { isFolder, userSettingsTable } from "../db-tables/WorkspaceDB";
+import { isFolder } from "../db-tables/WorkspaceDB";
 import { indexdb } from "../db-tables/indexdb";
 import { Folder, Workflow } from "../types/dbTypes";
 import { sortFileItem } from "../utils";
@@ -34,12 +34,23 @@ export async function scanMyWorkflowsDir(
       return folder;
     } else {
       // is workflow
-      const existingWorkflow = (await indexdb.workflows?.get(file.id)) ?? {
-        createTime: Date.now(),
-        updateTime: Date.now(),
-      };
+
+      const existingWorkflow = await indexdb.workflows
+        ?.get(file.id)
+        .catch((err) => {
+          console.error(
+            "Error getting workflow from indexdb",
+            file.id,
+            relPath,
+            err,
+          );
+          return null;
+        });
 
       const newWorkflow: Workflow = {
+        cloudID: file.cloudID,
+        coverMediaPath: file.coverMediaPath,
+        saveLock: file.saveLock,
         ...existingWorkflow,
         id: file.id,
         json: file.json ?? "{}",
@@ -48,7 +59,7 @@ export async function scanMyWorkflowsDir(
         createTime: file.createTime,
         // setting updateTime will result latestVersionChcek() always fail if in
         // workflow.get() not pull updateTime from file
-        // updateTime: file.updateTime,
+        updateTime: file.updateTime,
       };
       return newWorkflow;
     }

ui/src/versionHistory/CreateVersionLogin.tsx

@@ -0,0 +1,85 @@
+import {
+  Button,
+  Flex,
+  Input,
+  Modal,
+  ModalBody,
+  ModalContent,
+  Stack,
+  useToast,
+} from "@chakra-ui/react";
+import { userSettingsTable } from "../db-tables/WorkspaceDB";
+import { useContext } from "react";
+import { WorkspaceContext } from "../WorkspaceContext";
+import { saveShareKey } from "../utils/saveShareKey";
+
+export default function CreateVersionLogin({
+  onClose,
+}: {
+  onClose: () => void;
+}) {
+  const cloudHost = userSettingsTable?.settings?.cloudHost;
+  const toast = useToast();
+  const { updateSession } = useContext(WorkspaceContext);
+  return (
+    <Modal isOpen={true} onClose={onClose} size={"xl"}>
+      <ModalContent width={"90vw"}>
+        <ModalBody>
+          <Stack p={"10px 10px"} gap={3}>
+            <h2
+              style={{
+                fontSize: "1.2rem",
+                fontWeight: "bold",
+              }}
+            >
+              ✨New Version Control Exprience [beta]
+            </h2>
+            <p>
+              We have a new version control experience. Now your versions will
+              be stored <b>privately</b> and securely in cloud at{" "}
+              <a href="www.nodecafe.co">www.nodecafe.co</a>
+            </p>
+            <h3 style={{ fontWeight: "bold" }}>Why cloud?</h3>
+            <p>
+              Previously workflow versions are stored locally in your browser
+              storage. But people reported inconsistent versions when they
+              switched browser or device. Therefore we are moving to cloud. So
+              you can view your workflow versions from any devices, even your
+              phone.
+            </p>
+            <h3 style={{ fontWeight: "bold" }}>🤩Get Started</h3>
+            <Flex alignItems={"center"} gap={2} mb={3}>
+              <a href={cloudHost + "/auth/shareKey"} target="_blank">
+                <Button colorScheme="blue">Login</Button>
+              </a>
+              <p> then copy your share key to below</p>
+            </Flex>
+            <Input
+              placeholder="Paste your share key here"
+              onChange={(e) => {
+                if (
+                  !e.target.value ||
+                  e.target.value === "" ||
+                  e.target.value.length < 20
+                ) {
+                  return;
+                }
+
+                saveShareKey(e.target.value);
+                updateSession({
+                  shareKey: e.target.value,
+                  username: null,
+                });
+                toast({
+                  title: "Share key saved. You can create versions now.",
+                  status: "success",
+                  duration: 5000,
+                });
+              }}
+            />
+          </Stack>
+        </ModalBody>
+      </ModalContent>
+    </Modal>
+  );
+}

ui/vite.config.ts

@@ -22,6 +22,7 @@ const rewriteImportPlugin = ({ isDev }) => {
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => ({
+  base: "./",
   envDir: ".",
   build: {
     watch: {