max/nodes
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: max:a99040f42e9a2e418f51dcff6f047a998b745cf4
Branches Tags
max:main
max:feat/svelte-5
..
compare: max:05e89704755660956e2745d10ea6eece16973899
Branches Tags
max:main
max:feat/svelte-5

No commits in common. "a99040f42e9a2e418f51dcff6f047a998b745cf4" and "05e89704755660956e2745d10ea6eece16973899" have entirely different histories.
a99040f42e ... 05e8970475

2 changed files with 68 additions and 77 deletions
Show Stats Expand all files Collapse all files

2
app/src/routes/+page.svelte
View File

@ -34,7 +34,7 @@
const registryCache = new IndexDBCache("node-registry"); const registryCache = new IndexDBCache("node-registry");
const nodeRegistry = new RemoteNodeRegistry( const nodeRegistry = new RemoteNodeRegistry(
"https://node-store.app.max-richter.dev", "https://node-store.app.max-richter.dev",
/// "http://localhost:8000", // "http://localhost:8000",
registryCache, registryCache,
); );
const workerRuntime = new WorkerRuntimeExecutor(); const workerRuntime = new WorkerRuntimeExecutor();

143
store/src/routes/node/node.service.ts
View File

@ -53,17 +53,21 @@ export async function createNode(
} }
export async function getNodeDefinitionsByUser(userName: string) { export async function getNodeDefinitionsByUser(userName: string) {
const nodes = await db const nodes = await db.select({
.select({ definition: nodeTable.definition,
definition: nodeTable.definition, hash: nodeTable.hash,
hash: nodeTable.hash, }).from(
}) nodeTable,
.from(nodeTable) )
.where(and(eq(nodeTable.userId, userName))); .where(
and(
eq(nodeTable.userId, userName),
),
);
return nodes.map((n) => ({ return nodes.map((n) => ({
...n.definition, ...n.definition,
// id: n.definition.id + "@" + n.hash, id: n.definition.id + "@" + n.hash,
})); }));
} }
@ -79,18 +83,16 @@ export async function getNodesBySystem(
.from(nodeTable) .from(nodeTable)
.where( .where(
and(eq(nodeTable.systemId, systemId), eq(nodeTable.userId, username)), and(eq(nodeTable.systemId, systemId), eq(nodeTable.userId, username)),
) ).orderBy(nodeTable.userId, nodeTable.systemId, nodeTable.nodeId);
.orderBy(nodeTable.userId, nodeTable.systemId, nodeTable.nodeId);
const definitions = nodes const definitions = nodes
.map( .map((node) =>
(node) => [NodeDefinitionSchema.safeParse(node.definition), node.hash] as const
[NodeDefinitionSchema.safeParse(node.definition), node.hash] as const,
) )
.filter(([v]) => v.success) .filter(([v]) => v.success)
.map(([v, hash]) => ({ .map(([v, hash]) => ({
...v.data, ...v.data,
// id: v?.data?.id + "@" + hash, id: v?.data?.id + "@" + hash,
})); }));
return definitions; return definitions;
@ -101,9 +103,7 @@ export async function getNodeWasmById(
systemId: string, systemId: string,
nodeId: string, nodeId: string,
) { ) {
const node = await db const node = await db.select({ content: nodeTable.content }).from(nodeTable)
.select({ content: nodeTable.content })
.from(nodeTable)
.where( .where(
and( and(
eq(nodeTable.userId, userName), eq(nodeTable.userId, userName),
@ -126,19 +126,18 @@ export async function getNodeDefinitionById(
systemId: string, systemId: string,
nodeId: string, nodeId: string,
) { ) {
const node = await db const node = await db.select({
.select({ definition: nodeTable.definition,
definition: nodeTable.definition, hash: nodeTable.hash,
hash: nodeTable.hash, }).from(
}) nodeTable,
.from(nodeTable) ).where(
.where( and(
and( eq(nodeTable.userId, userName),
eq(nodeTable.userId, userName), eq(nodeTable.systemId, systemId),
eq(nodeTable.systemId, systemId), eq(nodeTable.nodeId, nodeId),
eq(nodeTable.nodeId, nodeId), ),
), )
)
.orderBy(asc(nodeTable.createdAt)) .orderBy(asc(nodeTable.createdAt))
.limit(1); .limit(1);
@ -152,10 +151,7 @@ export async function getNodeDefinitionById(
throw new InvalidNodeDefinitionError(); throw new InvalidNodeDefinitionError();
} }
return { return { ...definition.data, id: definition.data.id + "@" + node[0].hash };
...definition.data,
// id: definition.data.id + "@" + node[0].hash
};
} }
export async function getNodeVersions( export async function getNodeVersions(
@ -163,24 +159,23 @@ export async function getNodeVersions(
system: string, system: string,
nodeId: string, nodeId: string,
) { ) {
const nodes = await db const nodes = await db.select({
.select({ definition: nodeTable.definition,
definition: nodeTable.definition, hash: nodeTable.hash,
hash: nodeTable.hash, }).from(
}) nodeTable,
.from(nodeTable) ).where(
.where( and(
and( eq(nodeTable.userId, user),
eq(nodeTable.userId, user), eq(nodeTable.systemId, system),
eq(nodeTable.systemId, system), eq(nodeTable.nodeId, nodeId),
eq(nodeTable.nodeId, nodeId), ),
), )
)
.orderBy(asc(nodeTable.createdAt)); .orderBy(asc(nodeTable.createdAt));
return nodes.map((node) => ({ return nodes.map((node) => ({
...node.definition, ...node.definition,
// id: node.definition.id + "@" + node.hash, id: node.definition.id + "@" + node.hash,
})); }));
} }
@ -190,20 +185,18 @@ export async function getNodeVersion(
nodeId: string, nodeId: string,
hash: string, hash: string,
) { ) {
const nodes = await db const nodes = await db.select({
.select({ definition: nodeTable.definition,
definition: nodeTable.definition, }).from(
}) nodeTable,
.from(nodeTable) ).where(
.where( and(
and( eq(nodeTable.userId, user),
eq(nodeTable.userId, user), eq(nodeTable.systemId, system),
eq(nodeTable.systemId, system), eq(nodeTable.nodeId, nodeId),
eq(nodeTable.nodeId, nodeId), eq(nodeTable.hash, hash),
eq(nodeTable.hash, hash), ),
), ).limit(1);
)
.limit(1);
if (nodes.length === 0) { if (nodes.length === 0) {
throw new NodeNotFoundError(); throw new NodeNotFoundError();
@ -218,20 +211,18 @@ export async function getNodeVersionWasm(
nodeId: string, nodeId: string,
hash: string, hash: string,
) { ) {
const node = await db const node = await db.select({
.select({ content: nodeTable.content,
content: nodeTable.content, }).from(
}) nodeTable,
.from(nodeTable) ).where(
.where( and(
and( eq(nodeTable.userId, user),
eq(nodeTable.userId, user), eq(nodeTable.systemId, system),
eq(nodeTable.systemId, system), eq(nodeTable.nodeId, nodeId),
eq(nodeTable.nodeId, nodeId), eq(nodeTable.hash, hash),
eq(nodeTable.hash, hash), ),
), ).limit(1);
)
.limit(1);
if (node.length === 0) { if (node.length === 0) {
throw new NodeNotFoundError(); throw new NodeNotFoundError();