@kubun/server 0.1.0 → 0.2.0

package/lib/data/automerge.d.ts

@@ -0,0 +1,5 @@
+import * as A from '@automerge/automerge/slim';
+import type { DocumentData } from '@kubun/protocol';
+export declare const automergeReady: PromiseLike<void>;
+export declare function automergeToData(doc: A.Doc<DocumentData>): DocumentData;
+//# sourceMappingURL=automerge.d.ts.map

package/lib/data/automerge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"automerge.d.ts","sourceRoot":"","sources":["../../src/data/automerge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,2BAA2B,CAAA;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAEnD,eAAO,MAAM,cAAc,mBAA0D,CAAA;AAErF,wBAAgB,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,YAAY,CAEtE"}

package/lib/data/automerge.js

@@ -0,0 +1,8 @@
+// @ts-ignore missing type definition
+import { automergeWasmBase64 } from '@automerge/automerge/automerge.wasm.base64.js';
+import * as A from '@automerge/automerge/slim';
+import { lazy } from '@enkaku/async';
+export const automergeReady = lazy(()=>A.initializeBase64Wasm(automergeWasmBase64));
+export function automergeToData(doc) {
+    return JSON.parse(JSON.stringify(doc));
+}

package/lib/data/graphql.d.ts

@@ -1,7 +1,7 @@
+import type { Document, DocumentData, QueryDocumentsParams } from '@kubun/db';
+import { SchemaBuilder, type SharedDefinitions } from '@kubun/graphql';
 import type { DocumentID } from '@kubun/id';
 import { type Connection, type ConnectionArguments } from 'graphql-relay';
-import { SchemaBuilder, type SharedDefinitions } from '../../../graphql/lib/schema.js';
-import type { Document, DocumentData, QueryDocumentsParams } from './types.js';
 export type ContextListDocumentsParams = {
     model: string | null;
     ids: Array<string>;
@@ -11,11 +11,11 @@ export type Context = {
     listDocuments: (params: ContextListDocumentsParams) => Promise<Array<Document>>;
     loadDocument: (id: DocumentID | string) => Promise<Document | null>;
     queryDocuments: (params: QueryDocumentsParams) => Promise<Connection<Document>>;
-    viewerDID: string | null;
+    viewerDID: string;
     mutatedDocuments?: Record<string, Document>;
 };
 export declare class ServerSchemaBuilder extends SchemaBuilder<Document, Context> {
-    getViewer(ctx: Context): string | null;
+    getViewer(ctx: Context): string;
     loadDocument(id: string, ctx: Context): Promise<Document | null>;
     resolveConnection(model: string | null, args: ConnectionArguments, ctx: Context): Promise<Connection<Document>>;
     resolveList(model: string | null, ids: Array<string>, ctx: Context): Promise<Array<Document>>;

package/lib/data/graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/data/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE3C,OAAO,EACL,KAAK,UAAU,EACf,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAEtF,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAE9E,MAAM,MAAM,0BAA0B,GAAG;IACvC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC1E,aAAa,EAAE,CAAC,MAAM,EAAE,0BAA0B,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/E,YAAY,EAAE,CAAC,EAAE,EAAE,UAAU,GAAG,MAAM,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;IACnE,cAAc,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/E,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CAC5C,CAAA;AAED,qBAAa,mBAAoB,SAAQ,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC;IACvE,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IAIhC,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAIhE,iBAAiB,CACrB,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAI1B,WAAW,CACf,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAClB,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAI3B,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,IAAI;CAgEpF"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/data/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAC7E,OAAO,EAAkB,aAAa,EAAE,KAAK,iBAAiB,EAAU,MAAM,gBAAgB,CAAA;AAC9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE3C,OAAO,EACL,KAAK,UAAU,EACf,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAA;AAEtB,MAAM,MAAM,0BAA0B,GAAG;IACvC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC1E,aAAa,EAAE,CAAC,MAAM,EAAE,0BAA0B,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/E,YAAY,EAAE,CAAC,EAAE,EAAE,UAAU,GAAG,MAAM,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;IACnE,cAAc,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/E,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CAC5C,CAAA;AAED,qBAAa,mBAAoB,SAAQ,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC;IACvE,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IAIzB,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAIhE,iBAAiB,CACrB,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAI1B,WAAW,CACf,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAClB,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAI3B,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,IAAI;CAiEpF"}

package/lib/data/graphql.js

@@ -1,6 +1,6 @@
+import { PatchOperation, SchemaBuilder, toList } from '@kubun/graphql';
 import { GraphQLID, GraphQLNonNull } from 'graphql';
 import { mutationWithClientMutationId } from 'graphql-relay';
-import { SchemaBuilder } from '../../../graphql/lib/schema.js';
 export class ServerSchemaBuilder extends SchemaBuilder {
     getViewer(ctx) {
         return ctx.viewerDID;
@@ -30,7 +30,7 @@ export class ServerSchemaBuilder extends SchemaBuilder {
             case 'interface':
                 // Interfaces don't have mutations
                 return;
-            case 'list':
+            case 'default':
                 {
                     this._mutations[`create${name}`] = mutationWithClientMutationId({
                         name: `Create${name}`,
@@ -54,7 +54,7 @@ export class ServerSchemaBuilder extends SchemaBuilder {
                     });
                     break;
                 }
-            case 'set':
+            case 'unique':
                 {
                     this._mutations[`set${name}`] = mutationWithClientMutationId({
                         name: `Set${name}`,
@@ -85,7 +85,10 @@ export class ServerSchemaBuilder extends SchemaBuilder {
                     id: {
                         type: new GraphQLNonNull(GraphQLID)
                     },
-                    data: {
+                    patch: {
+                        type: new GraphQLNonNull(toList(PatchOperation))
+                    },
+                    from: {
                         type: this._inputObjects[`${id}-update`]
                     }
                 }),

package/lib/data/mutations.d.ts

@@ -1,4 +1,13 @@
-import type { KubunDB } from './db.js';
-import type { Document } from './types.js';
-export declare function applyMutation(db: KubunDB, token: string): Promise<Document>;
+import { type Validator } from '@enkaku/schema';
+import type { Document, KubunDB } from '@kubun/db';
+import { type DocumentData } from '@kubun/protocol';
+type DocumentValidator = Validator<DocumentData>;
+type ValidatorsRecord = Record<string, Promise<DocumentValidator>>;
+export type MutationContext = {
+    db: KubunDB;
+    validators: ValidatorsRecord;
+};
+export declare function getDocumentValidator(ctx: MutationContext, id: string): Promise<DocumentValidator>;
+export declare function applyMutation(ctx: MutationContext, token: string): Promise<Document>;
+export {};
 //# sourceMappingURL=mutations.d.ts.map

package/lib/data/mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../../src/data/mutations.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAoB1C,wBAAsB,aAAa,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAqDjF"}
+{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../../src/data/mutations.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,gBAAgB,CAAA;AAExE,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAElD,OAAO,EAAE,KAAK,YAAY,EAA2C,MAAM,iBAAiB,CAAA;AAM5F,KAAK,iBAAiB,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;AAChD,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAElE,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,OAAO,CAAA;IACX,UAAU,EAAE,gBAAgB,CAAA;CAC7B,CAAA;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAOjG;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CA4E1F"}

package/lib/data/mutations.js

@@ -1,45 +1,68 @@
-import * as A from '@automerge/automerge';
+// @ts-ignore missing type definition
+import * as A from '@automerge/automerge/slim';
 import { fromB64 } from '@enkaku/codec';
-import { verifyToken } from '@enkaku/jwt';
-import { createSchemaType } from '@enkaku/schema';
+import { asType, createValidator } from '@enkaku/schema';
+import { verifyToken } from '@enkaku/token';
 import { DocumentID } from '@kubun/id';
 import { documentMutation } from '@kubun/protocol';
-function automergeToData(doc) {
-    return JSON.parse(JSON.stringify(doc));
-}
-function createFromAutomerge(bytes) {
-    return automergeToData(A.load(bytes));
-}
-function mergeChanges(doc, changes, incremental = false) {
-    const current = A.from(doc);
-    const updated = incremental ? A.loadIncremental(current, changes) : A.merge(current, A.load(changes));
-    return automergeToData(updated);
+import { automergeReady, automergeToData } from './automerge.js';
+const validateMutation = createValidator(documentMutation);
+export function getDocumentValidator(ctx, id) {
+    if (ctx.validators[id] == null) {
+        ctx.validators[id] = ctx.db.getDocumentModel(id).then((model)=>createValidator({
+                ...model.schema,
+                $id: id
+            }));
+    }
+    return ctx.validators[id];
 }
-const mutationType = createSchemaType(documentMutation);
-export async function applyMutation(db, token) {
-    const verified = await verifyToken(token);
-    const mutation = mutationType.cast(verified.payload);
+export async function applyMutation(ctx, token) {
+    const [verified] = await Promise.all([
+        verifyToken(token),
+        automergeReady
+    ]);
+    const mutation = asType(validateMutation, verified.payload);
     switch(mutation.typ){
         case 'change':
             {
                 const id = DocumentID.fromString(mutation.sub);
-                const doc = await db.getDocument(id);
+                const docID = id.toString();
+                const doc = await ctx.db.getDocument(id);
                 if (doc == null) {
-                    throw new Error(`Document not found: ${id.toString()}`);
+                    throw new Error(`Document not found: ${docID}`);
                 }
                 if (mutation.iss !== doc.owner) {
                     // TODO: verify capabilities if issuer is not owner
                     throw new Error('Invalid mutation issuer');
                 }
                 if (mutation.data === null) {
-                    return await db.saveDocument(id, null);
+                    return await ctx.db.saveDocument({
+                        id,
+                        data: null,
+                        state: null
+                    });
                 }
                 if (doc.data === null) {
-                    throw new Error(`Cannot apply changes to empty document: ${id.toString()}`);
+                    throw new Error(`Cannot apply changes to empty document: ${docID}`);
                 }
-                const data = mergeChanges(doc.data, fromB64(mutation.data), mutation.inc);
-                // TODO: content validation using model's schema
-                return await db.saveDocument(id, data);
+                const [docStates, validator] = await Promise.all([
+                    ctx.db.getDocumentStates([
+                        docID
+                    ]),
+                    getDocumentValidator(ctx, id.model.toString())
+                ]);
+                // Create doc from data object if state is not present
+                const currentDoc = docStates[docID] ? A.load(docStates[docID]) : A.from(doc.data);
+                const changes = fromB64(mutation.data);
+                // Apply incremental changes or full merge
+                const newDoc = mutation.inc ? A.loadIncremental(currentDoc, changes) : A.merge(currentDoc, A.load(changes));
+                // Validate merged data
+                const data = asType(validator, automergeToData(newDoc));
+                return await ctx.db.saveDocument({
+                    id,
+                    data,
+                    state: A.save(newDoc)
+                });
             }
         case 'set':
             {
@@ -49,16 +72,29 @@ export async function applyMutation(db, token) {
                     throw new Error('Invalid mutation issuer');
                 }
                 const id = DocumentID.fromString(mutation.sub);
-                const data = mutation.data === null ? null : createFromAutomerge(fromB64(mutation.data));
-                const doc = await db.getDocument(id);
+                const [doc, validator] = await Promise.all([
+                    ctx.db.getDocument(id),
+                    getDocumentValidator(ctx, id.model.toString())
+                ]);
+                const mergeDoc = mutation.data === null ? null : A.load(fromB64(mutation.data));
+                const data = mergeDoc ? asType(validator, automergeToData(mergeDoc)) : null;
                 if (doc === null) {
-                    return await db.createDocument(id, owner, data, fromB64(mutation.unq));
+                    return await ctx.db.createDocument({
+                        id,
+                        owner,
+                        data,
+                        state: mergeDoc ? A.save(mergeDoc) : null,
+                        unique: fromB64(mutation.unq)
+                    });
                 }
                 if (doc.owner !== owner) {
                     throw new Error(`Cannot change owner from ${doc.owner} to ${owner} in document: ${id.toString()}`);
                 }
-                // TODO: content validation using model's schema
-                return await db.saveDocument(id, data);
+                return await ctx.db.saveDocument({
+                    id,
+                    data,
+                    state: mergeDoc ? A.save(mergeDoc) : null
+                });
             }
         default:
             throw new Error('Unsupported mutation type');

package/lib/handlers/document.d.ts

@@ -0,0 +1,8 @@
+import type { ProcedureHandlers } from '@enkaku/server';
+import type { KubunDB } from '@kubun/db';
+import type { DocumentProtocol } from '@kubun/protocol';
+export type CreateHandlersParams = {
+    db: KubunDB;
+};
+export declare function createHandlers(handlersParams: CreateHandlersParams): ProcedureHandlers<DocumentProtocol>;
+//# sourceMappingURL=document.d.ts.map

package/lib/handlers/document.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../src/handlers/document.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAIvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAED,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,iBAAiB,CAAC,gBAAgB,CAAC,CA+BrC"}

package/lib/handlers/document.js

@@ -0,0 +1,30 @@
+// import * as A from '@automerge/automerge/slim'
+import { toB64 } from '@enkaku/codec';
+export function createHandlers(handlersParams) {
+    const { db } = handlersParams;
+    return {
+        'document/sync': async (ctx)=>{
+            const ids = Object.keys(ctx.param.documents);
+            // const [loadedStates] = await Promise.all([db.getDocumentStates(ids), automergeReady])
+            const loadedStates = await db.getDocumentStates(ids);
+            const states = ids.reduce((acc, id)=>{
+                const loaded = loadedStates[id];
+                if (loaded == null) {
+                    acc[id] = null;
+                    return acc;
+                }
+                const provided = ctx.param.documents[id];
+                if (provided == null) {
+                    acc[id] = toB64(loaded);
+                } else {
+                    // TODO: send diff rather than full doc state
+                    acc[id] = toB64(loaded);
+                }
+                return acc;
+            }, {});
+            return {
+                states
+            };
+        }
+    };
+}

package/lib/handlers/graph.d.ts

@@ -1,8 +1,8 @@
-import type { CommandHandlers } from '@enkaku/server';
-import { type GraphCommands } from '@kubun/protocol';
-import type { KubunDB } from '../data/db.js';
+import type { ProcedureHandlers } from '@enkaku/server';
+import type { KubunDB } from '@kubun/db';
+import { type GraphProtocol } from '@kubun/protocol';
 export type CreateHandlersParams = {
     db: KubunDB;
 };
-export declare function createHandlers(handlersParams: CreateHandlersParams): CommandHandlers<GraphCommands>;
+export declare function createHandlers(handlersParams: CreateHandlersParams): ProcedureHandlers<GraphProtocol>;
 //# sourceMappingURL=graph.d.ts.map

package/lib/handlers/graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/handlers/graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,OAAO,EAGL,KAAK,aAAa,EAEnB,MAAM,iBAAiB,CAAA;AAKxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAc5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAcD,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,eAAe,CAAC,aAAa,CAAC,CAwKhC"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/handlers/graph.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAEvD,OAAO,KAAK,EAIV,OAAO,EAER,MAAM,WAAW,CAAA;AAElB,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,iBAAiB,CAAA;AAWxB,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAcD,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,iBAAiB,CAAC,aAAa,CAAC,CA0LlC"}

package/lib/handlers/graph.js

@@ -1,7 +1,7 @@
+import { fromB64, toB64 } from '@enkaku/codec';
 import { AttachmentID, DocumentID } from '@kubun/id';
 import { GraphModel } from '@kubun/protocol';
 import { Kind, OperationTypeNode, execute, parse } from 'graphql';
-import { fromB64 } from '@enkaku/codec';
 import { ServerSchemaBuilder } from '../data/graphql.js';
 import { applyMutation } from '../data/mutations.js';
 export function createHandlers(handlersParams) {
@@ -9,7 +9,12 @@ export function createHandlers(handlersParams) {
     const graphModels = {};
     async function getGraphModels(id) {
         if (graphModels[id] == null) {
-            graphModels[id] = db.getGraph(id);
+            graphModels[id] = db.getGraph(id).then((graph)=>{
+                if (graph == null) {
+                    throw new Error(`Graph not found: ${id}`);
+                }
+                return graph.record;
+            });
         }
         return await graphModels[id];
     }
@@ -88,7 +93,7 @@ export function createHandlers(handlersParams) {
             loadDocument,
             queryDocuments,
             mutatedDocuments: contextParams.mutatedDocuments,
-            viewerDID: contextParams.viewerDID ?? null
+            viewerDID: contextParams.viewerDID
         };
     }
     async function executeGraphQL(params) {
@@ -115,12 +120,13 @@ export function createHandlers(handlersParams) {
         };
     }
     return {
-        'graph/create': async (ctx)=>{
-            const model = GraphModel.fromClusters({
-                clusters: ctx.params.clusters
+        'graph/deploy': async (ctx)=>{
+            const model = await GraphModel.fromClusters({
+                clusters: ctx.param.clusters
             });
             const id = await db.createGraph({
-                name: ctx.params.name,
+                id: ctx.param.id,
+                name: ctx.param.name,
                 record: model.record
             });
             return {
@@ -128,28 +134,38 @@ export function createHandlers(handlersParams) {
                 models: model.record
             };
         },
+        'graph/list': async ()=>{
+            const graphs = await db.listGraphs();
+            return {
+                graphs: graphs.map((graph)=>({
+                        id: graph.id,
+                        name: graph.name
+                    }))
+            };
+        },
         'graph/load': async (ctx)=>{
             return {
-                models: await getGraphModels(ctx.params.id)
+                models: await getGraphModels(ctx.param.id)
             };
         },
         'graph/query': async (ctx)=>{
-            // TODO(enkaku): request should be JWT:
-            // schema ID is token subject
-            // viewer ID is token audience or fallback to the issuer
+            const payload = ctx.message.payload;
+            // TODO: viewerDID is token subject or fallback to the issuer
             // also add token capabilities check
+            const viewerDID = payload.iss;
             return await executeGraphQL({
                 type: OperationTypeNode.QUERY,
-                schemaID: ctx.params.id,
-                text: ctx.params.text,
-                variables: ctx.params.variables
+                schemaID: ctx.param.id,
+                text: ctx.param.text,
+                variables: ctx.param.variables ?? {},
+                viewerDID
             });
         },
         'graph/mutate': async (ctx)=>{
-            const attachments = Object.entries(ctx.params.attachments ?? {}).map(([key, value])=>{
+            const attachments = Object.entries(ctx.param.attachments ?? {}).map(([key, value])=>{
                 const aid = AttachmentID.fromString(key);
                 return {
-                    id: aid.cid.toString(),
+                    id: toB64(aid.digest),
                     data: fromB64(value)
                 };
             });
@@ -158,16 +174,24 @@ export function createHandlers(handlersParams) {
             }
             // Apply mutations and make the documents available to the GraphQL resolvers in the context
             const mutatedDocuments = {};
-            await Promise.all(Object.entries(ctx.params.mutations).map(async ([key, mutation])=>{
-                mutatedDocuments[key] = await applyMutation(db, mutation);
+            const validators = {};
+            await Promise.all(Object.entries(ctx.param.mutations).map(async ([key, mutation])=>{
+                mutatedDocuments[key] = await applyMutation({
+                    db,
+                    validators
+                }, mutation);
             }));
+            const payload = ctx.message.payload;
+            // TODO: viewerDID is token subject or fallback to the issuer
+            // also add token capabilities check
+            const viewerDID = payload.iss;
             return await executeGraphQL({
                 type: OperationTypeNode.MUTATION,
-                schemaID: ctx.params.id,
-                text: ctx.params.text,
-                variables: ctx.params.variables,
-                // viewerDID: input.invocation.issuer.did(),
-                mutatedDocuments
+                schemaID: ctx.param.id,
+                text: ctx.param.text,
+                variables: ctx.param.variables ?? {},
+                mutatedDocuments,
+                viewerDID
             });
         }
     };

package/lib/handlers/index.d.ts

@@ -1,9 +1,9 @@
-import type { CommandHandlers } from '@enkaku/server';
-import type { GraphCommands } from '@kubun/protocol';
-import type { KubunDB } from '../data/db.js';
+import type { ProcedureHandlers } from '@enkaku/server';
+import type { KubunDB } from '@kubun/db';
+import type { Protocol } from '@kubun/protocol';
 export type CreateHandlersParams = {
     db: KubunDB;
 };
-export type Handlers = CommandHandlers<GraphCommands>;
+export type Handlers = ProcedureHandlers<Protocol>;
 export declare function createHandlers(params: CreateHandlersParams): Handlers;
 //# sourceMappingURL=index.d.ts.map

package/lib/handlers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/handlers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAEpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAI5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,CAAC,CAAA;AAErD,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,QAAQ,CAErE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/handlers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAK/C,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;AAElD,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,QAAQ,CAKrE"}

package/lib/handlers/index.js

@@ -1,4 +1,8 @@
+import { createHandlers as documentHandlers } from './document.js';
 import { createHandlers as graphHandlers } from './graph.js';
 export function createHandlers(params) {
-    return graphHandlers(params);
+    return {
+        ...documentHandlers(params),
+        ...graphHandlers(params)
+    };
 }

package/lib/index.d.ts

@@ -1,3 +1,3 @@
-export { KubunDB, type KubunDBParams } from './data/db.js';
-export { KubunServer, type ServerParams } from './server.js';
+export { type CreateHandlersParams, createHandlers } from './handlers/index.js';
+export { type CreateClientParams, KubunServer, type ServerParams } from './server.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAA;AAC1D,OAAO,EAAE,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,oBAAoB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,KAAK,kBAAkB,EAAE,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAA"}

package/lib/index.js

@@ -1,2 +1,2 @@
-export { KubunDB } from './data/db.js';
+export { createHandlers } from './handlers/index.js';
 export { KubunServer } from './server.js';

package/lib/server.d.ts

@@ -1,18 +1,20 @@
-import type { Signer } from '@enkaku/jwt';
 import { type Server } from '@enkaku/server';
-import { KubunClient } from '@kubun/client';
-import type { ServerTransport } from '@kubun/protocol';
-import { KubunDB, type KubunDBParams } from './data/db.js';
+import { type ClientParams, KubunClient } from '@kubun/client';
+import { type DBParams, KubunDB } from '@kubun/db';
+import type { Protocol, ServerTransport } from '@kubun/protocol';
 export type ServerParams = {
-    db: KubunDB | KubunDBParams;
-    signer: Signer;
+    access?: Record<string, boolean | Array<string>>;
+    db: KubunDB | DBParams;
+    id: string;
+};
+export type CreateClientParams = Omit<ClientParams, 'serverID' | 'transport'> & {
+    signal?: AbortSignal;
 };
 export declare class KubunServer {
     #private;
     constructor(params: ServerParams);
-    get client(): KubunClient;
     get db(): KubunDB;
-    createClient(signer: Signer, signal?: AbortSignal): KubunClient;
-    serve(transport: ServerTransport, signal?: AbortSignal): Server;
+    createClient(params: CreateClientParams): KubunClient;
+    serve(transport: ServerTransport, signal?: AbortSignal): Server<Protocol>;
 }
 //# sourceMappingURL=server.d.ts.map

package/lib/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,KAAK,MAAM,EAAS,MAAM,gBAAgB,CAAA;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAgC,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEpF,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAA;AAG1D,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,OAAO,GAAG,aAAa,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,qBAAa,WAAW;;gBAMV,MAAM,EAAE,YAAY;IAOhC,IAAI,MAAM,IAAI,WAAW,CAKxB;IAED,IAAI,EAAE,IAAI,OAAO,CAEhB;IAED,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,WAAW;IAM/D,KAAK,CAAC,SAAS,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,MAAM;CAGhE"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAS,MAAM,gBAAgB,CAAA;AAEnD,OAAO,EAAE,KAAK,YAAY,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,KAAK,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,KAAK,EAAiB,QAAQ,EAAiB,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAI9F,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IAChD,EAAE,EAAE,OAAO,GAAG,QAAQ,CAAA;IACtB,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,WAAW,CAAC,GAAG;IAC9E,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,qBAAa,WAAW;;gBAMV,MAAM,EAAE,YAAY;IAQhC,IAAI,EAAE,IAAI,OAAO,CAEhB;IAED,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW;IAOrD,KAAK,CAAC,SAAS,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC;CAS1E"}

package/lib/server.js

@@ -1,43 +1,42 @@
 import { serve } from '@enkaku/server';
-import { createDirectTransports } from '@enkaku/transport';
+import { DirectTransports } from '@enkaku/transport';
 import { KubunClient } from '@kubun/client';
-import { KubunDB } from './data/db.js';
+import { KubunDB } from '@kubun/db';
 import { createHandlers } from './handlers/index.js';
 export class KubunServer {
-    #client;
+    #access;
     #db;
     #handlers;
-    #signer;
+    #id;
     constructor(params){
-        const { db, signer } = params;
+        const { access, db, id } = params;
+        this.#access = access ?? {};
         this.#db = db instanceof KubunDB ? db : new KubunDB(db);
         this.#handlers = createHandlers({
             db: this.#db
         });
-        this.#signer = signer;
-    }
-    get client() {
-        if (this.#client == null) {
-            this.#client = this.createClient(this.#signer);
-        }
-        return this.#client;
+        this.#id = id;
     }
     get db() {
         return this.#db;
     }
-    createClient(signer, signal) {
-        const transports = createDirectTransports({
+    createClient(params) {
+        const { signal, ...clientParams } = params;
+        const transports = new DirectTransports({
             signal
         });
         this.serve(transports.server, signal);
         return new KubunClient({
-            signer,
-            transport: transports.client
+            serverID: this.#id,
+            transport: transports.client,
+            ...clientParams
         });
     }
     serve(transport, signal) {
         return serve({
+            access: this.#access,
             handlers: this.#handlers,
+            id: this.#id,
             signal,
             transport
         });