@kubun/server 0.2.4 → 0.3.1

package/lib/data/graphql.d.ts

@@ -1,20 +1,19 @@
-import type { Document, DocumentData, ListDocumentsParams, 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';
-export type Context = {
-    createDocument: (modelID: string, data: DocumentData) => Promise<Document>;
-    listDocuments: (params: ListDocumentsParams) => Promise<Array<Document>>;
-    loadDocument: (id: DocumentID | string) => Promise<Document | null>;
-    queryDocuments: (params: QueryDocumentsParams) => Promise<Connection<Document>>;
+import type { KubunDB } from '@kubun/db';
+import type { Context } from '@kubun/graphql';
+import type { DocumentNode } from '@kubun/protocol';
+import { type ExecutionArgs, type GraphQLSchema, type OperationTypeNode } from 'graphql';
+export type ExecutionContext = {
+    db: KubunDB;
     viewerDID: string;
-    mutatedDocuments?: Record<string, Document>;
+    mutatedDocuments?: Record<string, DocumentNode>;
 };
-export declare class ServerSchemaBuilder extends SchemaBuilder<Document, Context> {
-    getViewer(ctx: Context): string;
-    loadDocument(id: string, ctx: Context): Promise<Document | null>;
-    resolveConnection(model: string, args: ConnectionArguments, ctx: Context): Promise<Connection<Document>>;
-    resolveList(model: string, docIDs: Array<string>, ctx: Context): Promise<Array<Document>>;
-    buildMutations(id: string, definitions: SharedDefinitions<Document, Context>): void;
-}
+export declare function createContext(ctx: ExecutionContext): Context;
+export type ExecuteGraphQLParams = {
+    context: ExecutionContext;
+    schema: GraphQLSchema;
+    text: string;
+    type: OperationTypeNode;
+    variables: Record<string, unknown>;
+};
+export declare function getExecutionArgs(params: ExecuteGraphQLParams): ExecutionArgs;
 //# sourceMappingURL=graphql.d.ts.map

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,QAAQ,EAAE,YAAY,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAClG,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,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,mBAAmB,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;IACxE,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,EACb,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAI1B,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAI/F,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,IAAI;CAiEpF"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/data/graphql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAsB,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAuB,MAAM,gBAAgB,CAAA;AAElE,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,aAAa,EAElB,KAAK,iBAAiB,EAEvB,MAAM,SAAS,CAAA;AAGhB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,OAAO,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAChD,CAAA;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAsK5D;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,gBAAgB,CAAA;IACzB,MAAM,EAAE,aAAa,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,iBAAiB,CAAA;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACnC,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,oBAAoB,GAAG,aAAa,CAiB5E"}

package/lib/data/graphql.js

@@ -1,109 +1,152 @@
-import { PatchOperation, SchemaBuilder, toList } from '@kubun/graphql';
-import { GraphQLID, GraphQLNonNull } from 'graphql';
-import { mutationWithClientMutationId } from 'graphql-relay';
-export class ServerSchemaBuilder extends SchemaBuilder {
-    getViewer(ctx) {
-        return ctx.viewerDID;
-    }
-    async loadDocument(id, ctx) {
-        return await ctx.loadDocument(id);
-    }
-    async resolveConnection(model, args, ctx) {
-        return await ctx.queryDocuments({
-            ...args,
-            modelIDs: this.getModelIDs(model)
-        });
-    }
-    async resolveList(model, docIDs, ctx) {
-        return await ctx.listDocuments({
-            modelIDs: this.getModelIDs(model),
-            docIDs
+import { defer } from '@enkaku/async';
+import { DocumentID } from '@kubun/id';
+import { Kind, parse } from 'graphql';
+export function createContext(ctx) {
+    function createEventGenerator(filter, transform) {
+        let isDone = false;
+        let pending = null;
+        const queue = [];
+        const stop = ctx.db.events.on('document:saved', (event)=>{
+            if (filter(event)) {
+                const toPush = transform(event);
+                if (pending == null) {
+                    queue.push(toPush);
+                } else {
+                    pending.resolve(toPush);
+                    pending = null;
+                }
+            }
         });
-    }
-    buildMutations(id, definitions) {
-        const model = this._record[id];
-        if (model == null) {
-            throw new Error(`Could not find model id: ${id}`);
-        }
-        const name = this._aliases[id];
-        switch(model.behavior){
-            case 'interface':
-                // Interfaces don't have mutations
-                return;
-            case 'default':
-                {
-                    this._mutations[`create${name}`] = mutationWithClientMutationId({
-                        name: `Create${name}`,
-                        inputFields: ()=>({
-                                data: {
-                                    type: new GraphQLNonNull(this._inputObjects[id])
-                                }
-                            }),
-                        outputFields: ()=>({
-                                ...definitions.queryFields,
-                                document: {
-                                    type: new GraphQLNonNull(this._types[id])
-                                }
-                            }),
-                        mutateAndGetPayload: async (_input, ctx, info)=>{
-                            const document = ctx.mutatedDocuments?.[info.path.key];
-                            return {
-                                document
-                            };
-                        }
+        const setDone = ()=>{
+            stop();
+            isDone = true;
+            return Promise.resolve({
+                done: true,
+                value: undefined
+            });
+        };
+        return {
+            [Symbol.asyncIterator] () {
+                return this;
+            },
+            next: ()=>{
+                if (isDone) {
+                    return Promise.resolve({
+                        done: true,
+                        value: undefined
                     });
-                    break;
                 }
-            case 'unique':
-                {
-                    this._mutations[`set${name}`] = mutationWithClientMutationId({
-                        name: `Set${name}`,
-                        inputFields: ()=>({
-                                data: {
-                                    type: new GraphQLNonNull(this._inputObjects[id])
-                                }
-                            }),
-                        outputFields: ()=>({
-                                ...definitions.queryFields,
-                                document: {
-                                    type: new GraphQLNonNull(this._types[id])
-                                }
-                            }),
-                        mutateAndGetPayload: async (_input, ctx, info)=>{
-                            const document = ctx.mutatedDocuments?.[info.path.key];
-                            return {
-                                document
-                            };
-                        }
+                const value = queue.shift();
+                if (value != null) {
+                    return Promise.resolve({
+                        value,
+                        done: false
                     });
-                    break;
                 }
+                pending = defer();
+                return pending.promise.then((value)=>({
+                        value,
+                        done: false
+                    }));
+            },
+            return: setDone,
+            throw: setDone
+        };
+    }
+    function getMutationDocument(info) {
+        return ctx.mutatedDocuments?.[info.path.key];
+    }
+    return {
+        getViewer () {
+            return ctx.viewerDID;
+        },
+        async loadDocument (id) {
+            return await ctx.db.getDocument(typeof id === 'string' ? DocumentID.fromString(id) : id);
+        },
+        async resolveConnection (modelIDs, args) {
+            // TODO: access control filtering
+            const { entries, hasMore } = await ctx.db.queryDocuments({
+                ...args,
+                modelIDs
+            });
+            return {
+                edges: entries.map((e)=>({
+                        cursor: e.cursor,
+                        node: e.document
+                    })),
+                pageInfo: {
+                    hasNextPage: args.first ? hasMore : false,
+                    hasPreviousPage: args.first ? false : hasMore,
+                    endCursor: entries.at(-1)?.cursor ?? null,
+                    startCursor: entries.at(0)?.cursor ?? null
+                }
+            };
+        },
+        async resolveList (modelIDs, docIDs) {
+            return await ctx.db.listDocuments({
+                modelIDs,
+                docIDs
+            });
+        },
+        subscribeToDocumentCreated (modelIDs) {
+            return createEventGenerator((event)=>event.type === 'create' && modelIDs.includes(event.document.model), (event)=>event.document);
+        },
+        subscribeToDocumentChanged (id) {
+            return createEventGenerator((event)=>{
+                return event.type === 'update' && event.document.id === id && event.document.data !== null;
+            }, (event)=>event.document);
+        },
+        subscribeToDocumentRemoved () {
+            return createEventGenerator((event)=>event.type === 'update' && event.document.data === null, (event)=>event.document.id);
+        },
+        subscribeToDocumentEdgeAdded (modelIDs, hasRelation) {
+            return createEventGenerator((event)=>{
+                return(// document has data
+                event.document.data !== null && // document model is one of the target models
+                modelIDs.includes(event.document.model) && // relation field targets the expected document
+                hasRelation(event.document.data) && // new document or new relation to document
+                (event.type === 'create' || event.previous.data !== null && hasRelation(event.previous.data)));
+            }, (event)=>({
+                    cursor: event.getCursor(),
+                    node: event.document
+                }));
+        },
+        subscribeToDocumentEdgeRemoved (modelIDs, hasRelation) {
+            return createEventGenerator((event)=>{
+                return event.type === 'update' && // document model is one of the target models
+                modelIDs.includes(event.document.model) && // relation existed in previous version
+                event.previous.data !== null && hasRelation(event.previous.data) && // relation is removed
+                (event.document.data === null || !hasRelation(event.document.data));
+            }, (event)=>event.document.id);
+        },
+        async executeCreateMutation (modelID, data, info) {
+            return getMutationDocument(info);
+        },
+        async executeSetMutation (modelID, unique, data, info) {
+            return getMutationDocument(info);
+        },
+        async executeUpdateMutation (input, info) {
+            return getMutationDocument(info);
+        },
+        async executeRemoveMutation (id, info) {
+        // no-op
         }
-        this._mutations[`update${name}`] = mutationWithClientMutationId({
-            name: `Update${name}`,
-            inputFields: ()=>({
-                    id: {
-                        type: new GraphQLNonNull(GraphQLID)
-                    },
-                    patch: {
-                        type: new GraphQLNonNull(toList(PatchOperation))
-                    },
-                    from: {
-                        type: this._inputObjects[`${id}-update`]
-                    }
-                }),
-            outputFields: ()=>({
-                    ...definitions.queryFields,
-                    document: {
-                        type: this._types[id]
-                    }
-                }),
-            mutateAndGetPayload: async (_input, ctx, info)=>{
-                const document = ctx.mutatedDocuments?.[info.path.key];
-                return {
-                    document
-                };
-            }
-        });
+    };
+}
+export function getExecutionArgs(params) {
+    const document = parse(params.text);
+    const definition = document.definitions[0];
+    if (definition == null) {
+        throw new Error('Missing GraphQL document definition');
+    }
+    // Ensure the operation matching the expected type
+    if (definition.kind !== Kind.OPERATION_DEFINITION || definition.operation !== params.type) {
+        throw new Error(`Invalid GraphQL document definition: expected ${params.type} operation`);
     }
+    return {
+        document,
+        schema: params.schema,
+        variableValues: params.variables,
+        contextValue: createContext(params.context)
+    };
 }

package/lib/data/mutations.d.ts

@@ -1,6 +1,6 @@
 import { type Validator } from '@enkaku/schema';
-import type { Document, KubunDB } from '@kubun/db';
-import { type DocumentData } from '@kubun/protocol';
+import type { KubunDB } from '@kubun/db';
+import { type DocumentData, type DocumentNode } from '@kubun/protocol';
 type DocumentValidator = Validator<DocumentData>;
 type ValidatorsRecord = Record<string, Promise<DocumentValidator>>;
 export type MutationContext = {
@@ -8,6 +8,6 @@ export type MutationContext = {
     validators: ValidatorsRecord;
 };
 export declare function getDocumentValidator(ctx: MutationContext, id: string): Promise<DocumentValidator>;
-export declare function applyMutation(ctx: MutationContext, token: string): Promise<Document>;
+export declare function applyMutation(ctx: MutationContext, token: string): Promise<DocumentNode>;
 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":"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"}
+{"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,OAAO,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,YAAY,EAElB,MAAM,iBAAiB,CAAA;AAMxB,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,YAAY,CAAC,CAiF9F"}

package/lib/data/mutations.js

@@ -38,6 +38,7 @@ export async function applyMutation(ctx, token) {
                 if (mutation.data === null) {
                     return await ctx.db.saveDocument({
                         id,
+                        existing: doc,
                         data: null,
                         state: null
                     });
@@ -60,6 +61,7 @@ export async function applyMutation(ctx, token) {
                 const data = asType(validator, automergeToData(newDoc));
                 return await ctx.db.saveDocument({
                     id,
+                    existing: doc,
                     data,
                     state: A.save(newDoc)
                 });
@@ -92,6 +94,7 @@ export async function applyMutation(ctx, token) {
                 }
                 return await ctx.db.saveDocument({
                     id,
+                    existing: doc,
                     data,
                     state: mergeDoc ? A.save(mergeDoc) : null
                 });

package/lib/handlers/graph.d.ts

@@ -1,6 +1,6 @@
 import type { ProcedureHandlers } from '@enkaku/server';
 import type { KubunDB } from '@kubun/db';
-import { type GraphProtocol } from '@kubun/protocol';
+import type { GraphProtocol } from '@kubun/protocol';
 export type CreateHandlersParams = {
     db: KubunDB;
 };

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

@@ -1 +1 @@
-{"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;AAOxB,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAcD,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,iBAAiB,CAAC,aAAa,CAAC,CAyJlC"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/handlers/graph.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAEvD,OAAO,KAAK,EAA4B,OAAO,EAAE,MAAM,WAAW,CAAA;AAGlE,OAAO,KAAK,EAKV,aAAa,EACd,MAAM,iBAAiB,CAAA;AAsBxB,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAED,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,iBAAiB,CAAC,aAAa,CAAC,CA4IlC"}

package/lib/handlers/graph.js

@@ -1,9 +1,18 @@
 import { fromB64, toB64 } from '@enkaku/codec';
-import { AttachmentID, DocumentID } from '@kubun/id';
+import { consume } from '@enkaku/generator';
+import { createSchema } from '@kubun/graphql';
+import { AttachmentID } from '@kubun/id';
 import { GraphModel } from '@kubun/protocol';
-import { Kind, OperationTypeNode, execute, parse } from 'graphql';
-import { ServerSchemaBuilder } from '../data/graphql.js';
+import { OperationTypeNode, execute, subscribe } from 'graphql';
+import { getExecutionArgs } from '../data/graphql.js';
 import { applyMutation } from '../data/mutations.js';
+function toGraphResult(result) {
+    return {
+        data: result.data,
+        errors: result.errors?.map((err)=>err.toJSON()),
+        extensions: result.extensions
+    };
+}
 export function createHandlers(handlersParams) {
     const { db } = handlersParams;
     const graphModels = {};
@@ -22,69 +31,16 @@ export function createHandlers(handlersParams) {
     async function getGraphQLSchema(id) {
         if (schemas[id] == null) {
             schemas[id] = getGraphModels(id).then((record)=>{
-                const schema = new ServerSchemaBuilder({
-                    record
-                }).build();
+                const schema = createSchema(record);
                 // console.log(printSchema(schema))
                 return schema;
             });
         }
         return await schemas[id];
     }
-    function createContext(contextParams) {
-        async function createDocument(modelID, data) {
-            throw new Error('Not supported');
-        }
-        async function loadDocument(id) {
-            return await db.getDocument(typeof id === 'string' ? DocumentID.fromString(id) : id);
-        }
-        // TODO: access control filtering
-        async function queryDocuments(params) {
-            const { entries, hasMore } = await db.queryDocuments(params);
-            return {
-                edges: entries.map((e)=>({
-                        cursor: e.cursor,
-                        node: e.document
-                    })),
-                pageInfo: {
-                    hasNextPage: params.first ? hasMore : false,
-                    hasPreviousPage: params.first ? false : hasMore,
-                    endCursor: entries.at(-1)?.cursor ?? null,
-                    startCursor: entries.at(0)?.cursor ?? null
-                }
-            };
-        }
-        return {
-            createDocument,
-            listDocuments: async (params)=>await db.listDocuments(params),
-            loadDocument,
-            queryDocuments,
-            mutatedDocuments: contextParams.mutatedDocuments,
-            viewerDID: contextParams.viewerDID
-        };
-    }
     async function executeGraphQL(params) {
-        const schema = await getGraphQLSchema(params.schemaID);
-        const document = parse(params.text);
-        const definition = document.definitions[0];
-        if (definition == null) {
-            throw new Error('Missing GraphQL document definition');
-        }
-        // Ensure the operation matching the expected type
-        if (definition.kind !== Kind.OPERATION_DEFINITION || definition.operation !== params.type) {
-            throw new Error(`Invalid GraphQL document definition: expected ${params.type} operation`);
-        }
-        const executionResult = await execute({
-            document,
-            schema,
-            variableValues: params.variables,
-            contextValue: createContext(params)
-        });
-        return {
-            data: executionResult.data,
-            errors: executionResult.errors?.map((err)=>err.toJSON()),
-            extensions: executionResult.extensions
-        };
+        const result = await execute(getExecutionArgs(params));
+        return toGraphResult(result);
     }
     return {
         'graph/deploy': async (ctx)=>{
@@ -115,19 +71,6 @@ export function createHandlers(handlersParams) {
                 models: await getGraphModels(ctx.param.id)
             };
         },
-        'graph/query': async (ctx)=>{
-            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.param.id,
-                text: ctx.param.text,
-                variables: ctx.param.variables ?? {},
-                viewerDID
-            });
-        },
         'graph/mutate': async (ctx)=>{
             const attachments = Object.entries(ctx.param.attachments ?? {}).map(([key, value])=>{
                 const aid = AttachmentID.fromString(key);
@@ -153,13 +96,66 @@ export function createHandlers(handlersParams) {
             // also add token capabilities check
             const viewerDID = payload.iss;
             return await executeGraphQL({
+                schema: await getGraphQLSchema(ctx.param.id),
                 type: OperationTypeNode.MUTATION,
-                schemaID: ctx.param.id,
                 text: ctx.param.text,
                 variables: ctx.param.variables ?? {},
-                mutatedDocuments,
-                viewerDID
+                context: {
+                    db,
+                    mutatedDocuments,
+                    viewerDID
+                }
+            });
+        },
+        'graph/query': async (ctx)=>{
+            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({
+                schema: await getGraphQLSchema(ctx.param.id),
+                type: OperationTypeNode.QUERY,
+                text: ctx.param.text,
+                variables: ctx.param.variables ?? {},
+                context: {
+                    db,
+                    viewerDID
+                }
             });
+        },
+        'graph/subscribe': async (ctx)=>{
+            const payload = ctx.message.payload;
+            const viewerDID = payload.iss;
+            const args = getExecutionArgs({
+                schema: await getGraphQLSchema(ctx.param.id),
+                type: OperationTypeNode.SUBSCRIPTION,
+                text: ctx.param.text,
+                variables: ctx.param.variables ?? {},
+                context: {
+                    db,
+                    viewerDID
+                }
+            });
+            const subscription = await subscribe(args);
+            if (ctx.signal.aborted) {
+                return null;
+            }
+            if ('errors' in subscription) {
+                return toGraphResult(subscription);
+            }
+            const writer = ctx.writable.getWriter();
+            try {
+                await consume(subscription, async (value)=>{
+                    await writer.write(toGraphResult(value));
+                }, ctx.signal);
+            } catch (reason) {
+                if (reason !== 'Close') {
+                    throw reason;
+                }
+            } finally{
+                await writer.close();
+            }
+            return null;
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/server",
-  "version": "0.2.4",
+  "version": "0.3.1",
   "license": "see LICENSE.md",
   "keywords": [],
   "type": "module",
@@ -16,24 +16,26 @@
   "sideEffects": false,
   "dependencies": {
     "@automerge/automerge": "^2.2.8",
-    "@enkaku/async": "^0.11.0",
-    "@enkaku/codec": "^0.11.0",
-    "@enkaku/schema": "^0.11.1",
-    "@enkaku/server": "^0.11.0",
-    "@enkaku/token": "^0.11.0",
-    "@enkaku/transport": "^0.11.0",
+    "@enkaku/async": "^0.12.0",
+    "@enkaku/codec": "^0.12.0",
+    "@enkaku/generator": "^0.12.0",
+    "@enkaku/schema": "^0.12.0",
+    "@enkaku/server": "^0.12.0",
+    "@enkaku/token": "^0.12.0",
+    "@enkaku/transport": "^0.12.0",
     "graphql": "^16.9.0",
-    "graphql-relay": "^0.10.2",
-    "@kubun/graphql": "^0.2.5",
-    "@kubun/client": "^0.2.3",
-    "@kubun/db": "^0.2.2",
-    "@kubun/protocol": "^0.2.5",
-    "@kubun/id": "^0.2.0"
+    "@kubun/client": "^0.3.1",
+    "@kubun/graphql": "^0.3.1",
+    "@kubun/protocol": "^0.3.1",
+    "@kubun/id": "^0.3.0",
+    "@kubun/db": "^0.3.1"
   },
   "devDependencies": {
     "@databases/pg-test": "^3.1.2",
-    "@kubun/db-postgres": "^0.2.0",
-    "@kubun/db-sqlite": "^0.2.0"
+    "@enkaku/stream": "^0.12.0",
+    "graphql-relay": "^0.10.2",
+    "@kubun/db-postgres": "^0.3.1",
+    "@kubun/db-sqlite": "^0.3.1"
   },
   "scripts": {
     "build:clean": "del lib",