ima2-gen 1.1.7 → 1.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +56 -27
- package/bin/commands/annotate.js +137 -0
- package/bin/commands/annotate.ts +118 -0
- package/bin/commands/cancel.js +37 -33
- package/bin/commands/cancel.ts +45 -0
- package/bin/commands/canvas-versions.js +91 -0
- package/bin/commands/canvas-versions.ts +80 -0
- package/bin/commands/cardnews.js +293 -0
- package/bin/commands/cardnews.ts +248 -0
- package/bin/commands/comfy.js +63 -0
- package/bin/commands/comfy.ts +54 -0
- package/bin/commands/config.js +270 -0
- package/bin/commands/config.ts +265 -0
- package/bin/commands/edit.js +97 -72
- package/bin/commands/edit.ts +116 -0
- package/bin/commands/gen.js +140 -118
- package/bin/commands/gen.ts +176 -0
- package/bin/commands/history.js +164 -0
- package/bin/commands/history.ts +145 -0
- package/bin/commands/ls.js +60 -42
- package/bin/commands/ls.ts +60 -0
- package/bin/commands/metadata.js +45 -0
- package/bin/commands/metadata.ts +36 -0
- package/bin/commands/multimode.js +159 -0
- package/bin/commands/multimode.ts +146 -0
- package/bin/commands/node.js +176 -0
- package/bin/commands/node.ts +157 -0
- package/bin/commands/observability.js +201 -0
- package/bin/commands/observability.ts +176 -0
- package/bin/commands/ping.js +26 -20
- package/bin/commands/ping.ts +29 -0
- package/bin/commands/prompt.js +506 -0
- package/bin/commands/prompt.ts +421 -0
- package/bin/commands/ps.js +78 -71
- package/bin/commands/ps.ts +78 -0
- package/bin/commands/session.js +308 -0
- package/bin/commands/session.ts +265 -0
- package/bin/commands/show.js +75 -40
- package/bin/commands/show.ts +69 -0
- package/bin/ima2.js +324 -310
- package/bin/ima2.ts +444 -0
- package/bin/lib/args.js +75 -66
- package/bin/lib/args.ts +73 -0
- package/bin/lib/browser-id.js +15 -0
- package/bin/lib/browser-id.ts +16 -0
- package/bin/lib/client.js +91 -83
- package/bin/lib/client.ts +109 -0
- package/bin/lib/error-hints.js +14 -17
- package/bin/lib/error-hints.ts +23 -0
- package/bin/lib/files.js +26 -28
- package/bin/lib/files.ts +39 -0
- package/bin/lib/output.js +44 -42
- package/bin/lib/output.ts +58 -0
- package/bin/lib/platform.js +60 -56
- package/bin/lib/platform.ts +97 -0
- package/bin/lib/sse.js +73 -0
- package/bin/lib/sse.ts +73 -0
- package/bin/lib/star-prompt.js +69 -76
- package/bin/lib/star-prompt.ts +97 -0
- package/bin/lib/storage-doctor.js +34 -35
- package/bin/lib/storage-doctor.ts +38 -0
- package/config.js +147 -190
- package/config.ts +331 -0
- package/docs/API.md +48 -8
- package/docs/CLI.md +190 -0
- package/docs/FAQ.ko.md +5 -5
- package/docs/FAQ.md +5 -5
- package/docs/README.ja.md +71 -25
- package/docs/README.ko.md +61 -24
- package/docs/README.zh-CN.md +73 -27
- package/lib/assetLifecycle.js +130 -130
- package/lib/assetLifecycle.ts +142 -0
- package/lib/canvasVersionStore.js +135 -153
- package/lib/canvasVersionStore.ts +181 -0
- package/lib/cardNewsGenerator.js +127 -142
- package/lib/cardNewsGenerator.ts +162 -0
- package/lib/cardNewsJobStore.js +78 -84
- package/lib/cardNewsJobStore.ts +107 -0
- package/lib/cardNewsManifestStore.js +88 -93
- package/lib/cardNewsManifestStore.ts +112 -0
- package/lib/cardNewsPlanner.js +157 -152
- package/lib/cardNewsPlanner.ts +180 -0
- package/lib/cardNewsPlannerClient.js +101 -98
- package/lib/cardNewsPlannerClient.ts +114 -0
- package/lib/cardNewsPlannerPrompt.js +56 -56
- package/lib/cardNewsPlannerPrompt.ts +60 -0
- package/lib/cardNewsPlannerSchema.js +231 -223
- package/lib/cardNewsPlannerSchema.ts +259 -0
- package/lib/cardNewsRoleTemplateStore.js +39 -41
- package/lib/cardNewsRoleTemplateStore.ts +47 -0
- package/lib/cardNewsTemplateStore.js +171 -175
- package/lib/cardNewsTemplateStore.ts +210 -0
- package/lib/codexDetect.js +44 -47
- package/lib/codexDetect.ts +69 -0
- package/lib/comfyBridge.js +164 -184
- package/lib/comfyBridge.ts +214 -0
- package/lib/db.js +41 -51
- package/lib/db.ts +166 -0
- package/lib/errorClassify.js +62 -78
- package/lib/errorClassify.ts +100 -0
- package/lib/generationErrors.js +140 -103
- package/lib/generationErrors.ts +125 -0
- package/lib/historyList.js +149 -147
- package/lib/historyList.ts +164 -0
- package/lib/imageMetadata.js +86 -89
- package/lib/imageMetadata.ts +111 -0
- package/lib/imageMetadataStore.js +46 -51
- package/lib/imageMetadataStore.ts +67 -0
- package/lib/imageModels.js +38 -45
- package/lib/imageModels.ts +52 -0
- package/lib/inflight.js +131 -150
- package/lib/inflight.ts +204 -0
- package/lib/localImportStore.js +105 -0
- package/lib/localImportStore.ts +111 -0
- package/lib/logger.js +105 -112
- package/lib/logger.ts +150 -0
- package/lib/nodeStore.js +65 -64
- package/lib/nodeStore.ts +81 -0
- package/lib/oauthLauncher.js +61 -59
- package/lib/oauthLauncher.ts +64 -0
- package/lib/oauthNormalize.js +15 -19
- package/lib/oauthNormalize.ts +30 -0
- package/lib/oauthProxy.js +834 -832
- package/lib/oauthProxy.ts +995 -0
- package/lib/openDirectory.js +41 -40
- package/lib/openDirectory.ts +45 -0
- package/lib/pngInfo.js +18 -20
- package/lib/pngInfo.ts +26 -0
- package/lib/promptImport/curatedSources.js +135 -0
- package/lib/promptImport/curatedSources.ts +139 -0
- package/lib/promptImport/discoveryRegistry.js +218 -0
- package/lib/promptImport/discoveryRegistry.ts +236 -0
- package/lib/promptImport/errors.js +10 -10
- package/lib/promptImport/errors.ts +18 -0
- package/lib/promptImport/githubDiscovery.js +238 -0
- package/lib/promptImport/githubDiscovery.ts +248 -0
- package/lib/promptImport/githubFolder.js +302 -0
- package/lib/promptImport/githubFolder.ts +308 -0
- package/lib/promptImport/githubSource.js +194 -171
- package/lib/promptImport/githubSource.ts +239 -0
- package/lib/promptImport/gptImageHints.js +61 -0
- package/lib/promptImport/gptImageHints.ts +68 -0
- package/lib/promptImport/parsePromptCandidates.js +110 -112
- package/lib/promptImport/parsePromptCandidates.ts +153 -0
- package/lib/promptImport/promptIndex.js +230 -0
- package/lib/promptImport/promptIndex.ts +248 -0
- package/lib/promptImport/rankPromptCandidates.js +52 -0
- package/lib/promptImport/rankPromptCandidates.ts +49 -0
- package/lib/providerOptions.js +31 -0
- package/lib/providerOptions.ts +41 -0
- package/lib/referenceImageCompress.js +51 -62
- package/lib/referenceImageCompress.ts +75 -0
- package/lib/refs.js +93 -81
- package/lib/refs.ts +117 -0
- package/lib/requestLogger.js +32 -38
- package/lib/requestLogger.ts +48 -0
- package/lib/responsesImageAdapter.js +351 -0
- package/lib/responsesImageAdapter.ts +352 -0
- package/lib/runtimePorts.js +71 -73
- package/lib/runtimePorts.ts +93 -0
- package/lib/sessionStore.js +179 -230
- package/lib/sessionStore.ts +272 -0
- package/lib/storageMigration.js +247 -245
- package/lib/storageMigration.ts +284 -0
- package/lib/styleSheet.js +86 -90
- package/lib/styleSheet.ts +128 -0
- package/lib/systemTrash.js +18 -0
- package/lib/systemTrash.ts +20 -0
- package/package.json +26 -10
- package/routes/annotations.js +76 -79
- package/routes/annotations.ts +95 -0
- package/routes/canvasVersions.js +50 -54
- package/routes/canvasVersions.ts +64 -0
- package/routes/cardNews.js +158 -171
- package/routes/cardNews.ts +183 -0
- package/routes/comfy.js +23 -31
- package/routes/comfy.ts +39 -0
- package/routes/edit.js +183 -214
- package/routes/edit.ts +230 -0
- package/routes/generate.js +269 -291
- package/routes/generate.ts +309 -0
- package/routes/health.js +102 -107
- package/routes/health.ts +114 -0
- package/routes/history.js +136 -144
- package/routes/history.ts +153 -0
- package/routes/imageImport.js +33 -0
- package/routes/imageImport.ts +33 -0
- package/routes/index.js +18 -16
- package/routes/index.ts +35 -0
- package/routes/metadata.js +60 -64
- package/routes/metadata.ts +71 -0
- package/routes/multimode.js +228 -263
- package/routes/multimode.ts +280 -0
- package/routes/nodes.js +378 -424
- package/routes/nodes.ts +455 -0
- package/routes/promptImport.js +291 -152
- package/routes/promptImport.ts +354 -0
- package/routes/prompts.js +333 -360
- package/routes/prompts.ts +379 -0
- package/routes/sessions.js +277 -285
- package/routes/sessions.ts +292 -0
- package/routes/storage.js +29 -31
- package/routes/storage.ts +39 -0
- package/server.js +189 -196
- package/server.ts +235 -0
- package/ui/dist/.vite/manifest.json +101 -0
- package/ui/dist/assets/CardNewsWorkspace-BJOCey7Z.js +2 -0
- package/ui/dist/assets/NodeCanvas-BZV40eAE.css +1 -0
- package/ui/dist/assets/NodeCanvas-C3dzYNsk.js +7 -0
- package/ui/dist/assets/PromptImportDialog-Dqu1VpUh.js +2 -0
- package/ui/dist/assets/PromptImportDiscoverySection-Dg8T9X0L.js +1 -0
- package/ui/dist/assets/PromptImportFolderSection-DBaqsFO4.js +1 -0
- package/ui/dist/assets/PromptLibraryPanel-p5QqR97M.js +2 -0
- package/ui/dist/assets/SettingsWorkspace-B5bSAZ6u.js +1 -0
- package/ui/dist/assets/index-C9cXwiWE.js +25 -0
- package/ui/dist/assets/index-CGMIkZXn.css +1 -0
- package/ui/dist/assets/index-Cvld7dUZ.js +1 -0
- package/ui/dist/index.html +6 -3
- package/assets/screenshot.png +0 -0
- package/assets/screenshots/classic-generate-light.png +0 -0
- package/assets/screenshots/node-graph-branching.png +0 -0
- package/assets/screenshots/settings-oauth-generation.png +0 -0
- package/assets/screenshots/settings-workspace.png +0 -0
- package/assets/screenshots/style-sheet-editor.png +0 -0
- package/integrations/comfyui/ima2_gen_bridge/__pycache__/__init__.cpython-313.pyc +0 -0
- package/integrations/comfyui/ima2_gen_bridge/__pycache__/nodes.cpython-313.pyc +0 -0
- package/ui/dist/assets/index-DARPdT4Q.css +0 -1
- package/ui/dist/assets/index-ht80GMq4.js +0 -31
- package/ui/dist/assets/index-ht80GMq4.js.map +0 -1
package/lib/sessionStore.js
CHANGED
|
@@ -1,272 +1,221 @@
|
|
|
1
1
|
import { ulid } from "ulid";
|
|
2
2
|
import { getDb } from "./db.js";
|
|
3
|
-
|
|
4
3
|
function now() {
|
|
5
|
-
|
|
4
|
+
return Date.now();
|
|
6
5
|
}
|
|
7
|
-
|
|
8
6
|
export function createSession({ title = "Untitled" } = {}) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
).run(id, title, t, t);
|
|
15
|
-
return { id, title, createdAt: t, updatedAt: t, graphVersion: 0 };
|
|
7
|
+
const db = getDb();
|
|
8
|
+
const id = "s_" + ulid();
|
|
9
|
+
const t = now();
|
|
10
|
+
db.prepare("INSERT INTO sessions (id, title, created_at, updated_at, graph_version) VALUES (?, ?, ?, ?, 0)").run(id, title, t, t);
|
|
11
|
+
return { id, title, createdAt: t, updatedAt: t, graphVersion: 0 };
|
|
16
12
|
}
|
|
17
|
-
|
|
18
13
|
export function listSessions() {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
)
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.get(r.id).c,
|
|
30
|
-
}));
|
|
14
|
+
const db = getDb();
|
|
15
|
+
const rows = db
|
|
16
|
+
.prepare("SELECT id, title, created_at AS createdAt, updated_at AS updatedAt, graph_version AS graphVersion FROM sessions ORDER BY updated_at DESC")
|
|
17
|
+
.all();
|
|
18
|
+
return rows.map((r) => ({
|
|
19
|
+
...r,
|
|
20
|
+
nodeCount: db
|
|
21
|
+
.prepare("SELECT COUNT(*) AS c FROM nodes WHERE session_id = ?")
|
|
22
|
+
.get(r.id).c,
|
|
23
|
+
}));
|
|
31
24
|
}
|
|
32
|
-
|
|
33
25
|
export function getSession(id) {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
)
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
data: safeParse(e.data),
|
|
26
|
+
const db = getDb();
|
|
27
|
+
const session = db
|
|
28
|
+
.prepare("SELECT id, title, created_at AS createdAt, updated_at AS updatedAt, graph_version AS graphVersion FROM sessions WHERE id = ?")
|
|
29
|
+
.get(id);
|
|
30
|
+
if (!session)
|
|
31
|
+
return null;
|
|
32
|
+
const nodes = db
|
|
33
|
+
.prepare("SELECT id, x, y, data FROM nodes WHERE session_id = ?")
|
|
34
|
+
.all(id)
|
|
35
|
+
.map((n) => ({ id: n.id, x: n.x, y: n.y, data: safeParse(n.data) }));
|
|
36
|
+
const edges = db
|
|
37
|
+
.prepare("SELECT id, source, target, data FROM edges WHERE session_id = ?")
|
|
38
|
+
.all(id)
|
|
39
|
+
.map((e) => ({
|
|
40
|
+
id: e.id,
|
|
41
|
+
source: e.source,
|
|
42
|
+
target: e.target,
|
|
43
|
+
data: safeParse(e.data),
|
|
53
44
|
}));
|
|
54
|
-
|
|
45
|
+
return { ...session, nodes, edges };
|
|
55
46
|
}
|
|
56
|
-
|
|
57
47
|
export function getSessionTitleMap(ids = []) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
48
|
+
const cleanIds = [...new Set(ids.filter((id) => typeof id === "string" && id.length > 0))];
|
|
49
|
+
if (cleanIds.length === 0)
|
|
50
|
+
return new Map();
|
|
51
|
+
const placeholders = cleanIds.map(() => "?").join(", ");
|
|
52
|
+
const rows = getDb()
|
|
53
|
+
.prepare(`SELECT id, title FROM sessions WHERE id IN (${placeholders})`)
|
|
54
|
+
.all(...cleanIds);
|
|
55
|
+
return new Map(rows.map((row) => [row.id, row.title]));
|
|
65
56
|
}
|
|
66
|
-
|
|
67
57
|
export function renameSession(id, title) {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
58
|
+
const db = getDb();
|
|
59
|
+
const res = db
|
|
60
|
+
.prepare("UPDATE sessions SET title = ?, updated_at = ? WHERE id = ?")
|
|
61
|
+
.run(title, now(), id);
|
|
62
|
+
return res.changes > 0;
|
|
73
63
|
}
|
|
74
|
-
|
|
75
64
|
export function deleteSession(id) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
65
|
+
const db = getDb();
|
|
66
|
+
const res = db.prepare("DELETE FROM sessions WHERE id = ?").run(id);
|
|
67
|
+
return res.changes > 0;
|
|
79
68
|
}
|
|
80
|
-
|
|
81
69
|
const MAX_STR = 10_000;
|
|
82
|
-
|
|
83
70
|
function cleanStr(v) {
|
|
84
|
-
|
|
85
|
-
|
|
71
|
+
if (typeof v !== "string")
|
|
72
|
+
return "";
|
|
73
|
+
return v.length > MAX_STR ? v.slice(0, MAX_STR) : v;
|
|
86
74
|
}
|
|
87
|
-
|
|
88
75
|
function cleanData(v) {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
76
|
+
try {
|
|
77
|
+
const json = JSON.stringify(v ?? {});
|
|
78
|
+
return json.length > MAX_STR * 10 ? "{}" : json;
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
return "{}";
|
|
82
|
+
}
|
|
95
83
|
}
|
|
96
|
-
|
|
97
84
|
function normalizeGraphPayload(nodes, edges) {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
85
|
+
const nodeIds = new Set(nodes.map((n) => n?.id).filter(Boolean).map(String));
|
|
86
|
+
const cleanEdges = edges.filter((e) => e?.id && e?.source && e?.target && nodeIds.has(String(e.source)) && nodeIds.has(String(e.target)));
|
|
87
|
+
const incomingByTarget = new Map();
|
|
88
|
+
for (const edge of cleanEdges) {
|
|
89
|
+
const target = String(edge.target);
|
|
90
|
+
if (incomingByTarget.has(target)) {
|
|
91
|
+
const err = new Error(`Node ${target} has multiple parent edges`);
|
|
92
|
+
err.code = "GRAPH_PARENT_CONFLICT";
|
|
93
|
+
err.status = 409;
|
|
94
|
+
throw err;
|
|
95
|
+
}
|
|
96
|
+
incomingByTarget.set(target, edge);
|
|
110
97
|
}
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
: {};
|
|
120
|
-
nodeDataById.set(String(node.id), data);
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
const normalizedNodes = nodes.map((node) => {
|
|
124
|
-
if (!node?.id) return node;
|
|
125
|
-
const id = String(node.id);
|
|
126
|
-
const data = { ...(nodeDataById.get(id) ?? {}) };
|
|
127
|
-
const incoming = incomingByTarget.get(id);
|
|
128
|
-
if (!incoming) {
|
|
129
|
-
data.parentServerNodeId = null;
|
|
130
|
-
} else {
|
|
131
|
-
const parentData = nodeDataById.get(String(incoming.source)) ?? {};
|
|
132
|
-
data.parentServerNodeId = typeof parentData.serverNodeId === "string"
|
|
133
|
-
? parentData.serverNodeId
|
|
134
|
-
: null;
|
|
98
|
+
const nodeDataById = new Map();
|
|
99
|
+
for (const node of nodes) {
|
|
100
|
+
if (!node?.id)
|
|
101
|
+
continue;
|
|
102
|
+
const data = node.data && typeof node.data === "object" && !Array.isArray(node.data)
|
|
103
|
+
? { ...node.data }
|
|
104
|
+
: {};
|
|
105
|
+
nodeDataById.set(String(node.id), data);
|
|
135
106
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
107
|
+
const normalizedNodes = nodes.map((node) => {
|
|
108
|
+
if (!node?.id)
|
|
109
|
+
return node;
|
|
110
|
+
const id = String(node.id);
|
|
111
|
+
const data = { ...(nodeDataById.get(id) ?? {}) };
|
|
112
|
+
const incoming = incomingByTarget.get(id);
|
|
113
|
+
if (!incoming) {
|
|
114
|
+
data.parentServerNodeId = null;
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
const parentData = nodeDataById.get(String(incoming.source)) ?? {};
|
|
118
|
+
data.parentServerNodeId = typeof parentData.serverNodeId === "string"
|
|
119
|
+
? parentData.serverNodeId
|
|
120
|
+
: null;
|
|
121
|
+
}
|
|
122
|
+
return { ...node, data };
|
|
123
|
+
});
|
|
124
|
+
return { nodes: normalizedNodes, edges: cleanEdges };
|
|
140
125
|
}
|
|
141
|
-
|
|
142
126
|
export function saveGraph(sessionId, { nodes = [], edges = [], expectedVersion = null }) {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
}
|
|
153
|
-
|
|
154
|
-
const versionRow = db
|
|
155
|
-
.prepare("SELECT graph_version AS graphVersion FROM sessions WHERE id = ?")
|
|
156
|
-
.get(sessionId);
|
|
157
|
-
const currentVersion = versionRow?.graphVersion ?? 0;
|
|
158
|
-
if (
|
|
159
|
-
typeof expectedVersion === "number" &&
|
|
160
|
-
Number.isFinite(expectedVersion) &&
|
|
161
|
-
expectedVersion !== currentVersion
|
|
162
|
-
) {
|
|
163
|
-
const err = new Error(
|
|
164
|
-
`Graph version conflict for session ${sessionId}: expected ${expectedVersion}, got ${currentVersion}`,
|
|
165
|
-
);
|
|
166
|
-
err.code = "GRAPH_VERSION_CONFLICT";
|
|
167
|
-
err.status = 409;
|
|
168
|
-
err.currentVersion = currentVersion;
|
|
169
|
-
throw err;
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
const normalized = normalizeGraphPayload(nodes, edges);
|
|
173
|
-
|
|
174
|
-
const tx = db.transaction(() => {
|
|
175
|
-
db.prepare("DELETE FROM nodes WHERE session_id = ?").run(sessionId);
|
|
176
|
-
db.prepare("DELETE FROM edges WHERE session_id = ?").run(sessionId);
|
|
177
|
-
|
|
178
|
-
const insNode = db.prepare(
|
|
179
|
-
"INSERT INTO nodes (session_id, id, x, y, data) VALUES (?, ?, ?, ?, ?)",
|
|
180
|
-
);
|
|
181
|
-
for (const n of normalized.nodes) {
|
|
182
|
-
if (!n?.id) continue;
|
|
183
|
-
const x = Number(n.x ?? n.position?.x ?? 0);
|
|
184
|
-
const y = Number(n.y ?? n.position?.y ?? 0);
|
|
185
|
-
insNode.run(
|
|
186
|
-
sessionId,
|
|
187
|
-
cleanStr(String(n.id)),
|
|
188
|
-
Number.isFinite(x) ? x : 0,
|
|
189
|
-
Number.isFinite(y) ? y : 0,
|
|
190
|
-
cleanData(n.data),
|
|
191
|
-
);
|
|
127
|
+
const db = getDb();
|
|
128
|
+
const sessionExists = db
|
|
129
|
+
.prepare("SELECT 1 FROM sessions WHERE id = ?")
|
|
130
|
+
.get(sessionId);
|
|
131
|
+
if (!sessionExists) {
|
|
132
|
+
const err = new Error(`Session not found: ${sessionId}`);
|
|
133
|
+
err.code = "SESSION_NOT_FOUND";
|
|
134
|
+
err.status = 404;
|
|
135
|
+
throw err;
|
|
192
136
|
}
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
137
|
+
const versionRow = db
|
|
138
|
+
.prepare("SELECT graph_version AS graphVersion FROM sessions WHERE id = ?")
|
|
139
|
+
.get(sessionId);
|
|
140
|
+
const currentVersion = versionRow?.graphVersion ?? 0;
|
|
141
|
+
if (typeof expectedVersion === "number" &&
|
|
142
|
+
Number.isFinite(expectedVersion) &&
|
|
143
|
+
expectedVersion !== currentVersion) {
|
|
144
|
+
const err = new Error(`Graph version conflict for session ${sessionId}: expected ${expectedVersion}, got ${currentVersion}`);
|
|
145
|
+
err.code = "GRAPH_VERSION_CONFLICT";
|
|
146
|
+
err.status = 409;
|
|
147
|
+
err.currentVersion = currentVersion;
|
|
148
|
+
throw err;
|
|
205
149
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
150
|
+
const normalized = normalizeGraphPayload(nodes, edges);
|
|
151
|
+
const tx = db.transaction(() => {
|
|
152
|
+
db.prepare("DELETE FROM nodes WHERE session_id = ?").run(sessionId);
|
|
153
|
+
db.prepare("DELETE FROM edges WHERE session_id = ?").run(sessionId);
|
|
154
|
+
const insNode = db.prepare("INSERT INTO nodes (session_id, id, x, y, data) VALUES (?, ?, ?, ?, ?)");
|
|
155
|
+
for (const n of normalized.nodes) {
|
|
156
|
+
if (!n?.id)
|
|
157
|
+
continue;
|
|
158
|
+
const x = Number(n.x ?? n.position?.x ?? 0);
|
|
159
|
+
const y = Number(n.y ?? n.position?.y ?? 0);
|
|
160
|
+
insNode.run(sessionId, cleanStr(String(n.id)), Number.isFinite(x) ? x : 0, Number.isFinite(y) ? y : 0, cleanData(n.data));
|
|
161
|
+
}
|
|
162
|
+
const insEdge = db.prepare("INSERT INTO edges (session_id, id, source, target, data) VALUES (?, ?, ?, ?, ?)");
|
|
163
|
+
for (const e of normalized.edges) {
|
|
164
|
+
insEdge.run(sessionId, cleanStr(String(e.id)), cleanStr(String(e.source)), cleanStr(String(e.target)), cleanData(e.data));
|
|
165
|
+
}
|
|
166
|
+
db.prepare("UPDATE sessions SET updated_at = ?, graph_version = graph_version + 1 WHERE id = ?").run(now(), sessionId);
|
|
167
|
+
return db
|
|
168
|
+
.prepare("SELECT graph_version AS graphVersion FROM sessions WHERE id = ?")
|
|
169
|
+
.get(sessionId).graphVersion;
|
|
170
|
+
});
|
|
171
|
+
const nextVersion = tx();
|
|
172
|
+
return { ok: true, graphVersion: nextVersion };
|
|
219
173
|
}
|
|
220
|
-
|
|
221
174
|
function safeParse(json) {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
175
|
+
try {
|
|
176
|
+
return JSON.parse(json);
|
|
177
|
+
}
|
|
178
|
+
catch {
|
|
179
|
+
return {};
|
|
180
|
+
}
|
|
227
181
|
}
|
|
228
|
-
|
|
229
182
|
export function ensureDefaultSession() {
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
183
|
+
const sessions = listSessions();
|
|
184
|
+
if (sessions.length > 0)
|
|
185
|
+
return sessions[0];
|
|
186
|
+
return createSession({ title: "My first graph" });
|
|
233
187
|
}
|
|
234
|
-
|
|
235
188
|
// ── Style sheet (0.10) ───────────────────────────────────────────────────
|
|
236
189
|
export function getStyleSheet(sessionId) {
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
)
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
190
|
+
const db = getDb();
|
|
191
|
+
const row = db
|
|
192
|
+
.prepare("SELECT style_sheet AS styleSheet, style_sheet_enabled AS styleSheetEnabled FROM sessions WHERE id = ?")
|
|
193
|
+
.get(sessionId);
|
|
194
|
+
if (!row)
|
|
195
|
+
return null;
|
|
196
|
+
let parsed = null;
|
|
197
|
+
if (row.styleSheet) {
|
|
198
|
+
try {
|
|
199
|
+
parsed = JSON.parse(row.styleSheet);
|
|
200
|
+
}
|
|
201
|
+
catch {
|
|
202
|
+
parsed = null;
|
|
203
|
+
}
|
|
250
204
|
}
|
|
251
|
-
|
|
252
|
-
return { styleSheet: parsed, enabled: !!row.styleSheetEnabled };
|
|
205
|
+
return { styleSheet: parsed, enabled: !!row.styleSheetEnabled };
|
|
253
206
|
}
|
|
254
|
-
|
|
255
207
|
export function setStyleSheet(sessionId, sheet) {
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
208
|
+
const db = getDb();
|
|
209
|
+
const json = sheet == null ? null : JSON.stringify(sheet);
|
|
210
|
+
const res = db
|
|
211
|
+
.prepare("UPDATE sessions SET style_sheet = ?, updated_at = ? WHERE id = ?")
|
|
212
|
+
.run(json, now(), sessionId);
|
|
213
|
+
return res.changes > 0;
|
|
262
214
|
}
|
|
263
|
-
|
|
264
215
|
export function setStyleSheetEnabled(sessionId, enabled) {
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
.run(enabled ? 1 : 0, now(), sessionId);
|
|
271
|
-
return res.changes > 0;
|
|
216
|
+
const db = getDb();
|
|
217
|
+
const res = db
|
|
218
|
+
.prepare("UPDATE sessions SET style_sheet_enabled = ?, updated_at = ? WHERE id = ?")
|
|
219
|
+
.run(enabled ? 1 : 0, now(), sessionId);
|
|
220
|
+
return res.changes > 0;
|
|
272
221
|
}
|