@kubun/server 0.3.0 → 0.3.1

package/lib/data/graphql.d.ts

@@ -1,12 +1,13 @@
-import type { Document, KubunDB } from '@kubun/db';
-import type { ContextType } from '@kubun/graphql';
+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 function createContext(ctx: ExecutionContext): ContextType<Document>;
+export declare function createContext(ctx: ExecutionContext): Context;
 export type ExecuteGraphQLParams = {
     context: ExecutionContext;
     schema: GraphQLSchema;

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

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/data/graphql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAY,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,gBAAgB,CAAA;AAGtE,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,QAAQ,CAAC,CAAA;CAC5C,CAAA;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,gBAAgB,GAAG,WAAW,CAAC,QAAQ,CAAC,CAmK1E;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"}
+{"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/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,CAiF1F"}
+{"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/handlers/graph.d.ts.map

@@ -1 +1 @@
-{"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,EAAsC,OAAO,EAAE,MAAM,WAAW,CAAA;AAG5E,OAAO,KAAK,EAIV,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,CAqJlC"}
+{"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,5 +1,5 @@
-import { defer } from '@enkaku/async';
 import { fromB64, toB64 } from '@enkaku/codec';
+import { consume } from '@enkaku/generator';
 import { createSchema } from '@kubun/graphql';
 import { AttachmentID } from '@kubun/id';
 import { GraphModel } from '@kubun/protocol';
@@ -143,29 +143,19 @@ export function createHandlers(handlersParams) {
             if ('errors' in subscription) {
                 return toGraphResult(subscription);
             }
-            const generator = subscription;
-            let aborted = false;
-            const done = defer();
-            ctx.signal.addEventListener('abort', ()=>{
-                aborted = true;
-                generator.return(null);
-                if (ctx.signal.reason === 'Close') {
-                    done.resolve(null);
-                } else {
-                    done.reject(ctx.signal.reason);
-                }
-            });
             const writer = ctx.writable.getWriter();
-            async function pull() {
-                const { done, value } = await generator.next();
-                if (aborted || done) {
-                    return;
+            try {
+                await consume(subscription, async (value)=>{
+                    await writer.write(toGraphResult(value));
+                }, ctx.signal);
+            } catch (reason) {
+                if (reason !== 'Close') {
+                    throw reason;
                 }
-                await writer.write(toGraphResult(value));
-                void pull();
+            } finally{
+                await writer.close();
             }
-            void pull();
-            return done.promise;
+            return null;
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/server",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "license": "see LICENSE.md",
   "keywords": [],
   "type": "module",
@@ -18,23 +18,24 @@
     "@automerge/automerge": "^2.2.8",
     "@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",
-    "@kubun/protocol": "^0.3.0",
-    "@kubun/client": "^0.3.0",
+    "@kubun/client": "^0.3.1",
+    "@kubun/graphql": "^0.3.1",
+    "@kubun/protocol": "^0.3.1",
     "@kubun/id": "^0.3.0",
-    "@kubun/graphql": "^0.3.0",
-    "@kubun/db": "^0.3.0"
+    "@kubun/db": "^0.3.1"
   },
   "devDependencies": {
     "@databases/pg-test": "^3.1.2",
     "@enkaku/stream": "^0.12.0",
     "graphql-relay": "^0.10.2",
-    "@kubun/db-postgres": "^0.3.0",
-    "@kubun/db-sqlite": "^0.3.0"
+    "@kubun/db-postgres": "^0.3.1",
+    "@kubun/db-sqlite": "^0.3.1"
   },
   "scripts": {
     "build:clean": "del lib",