@kubun/server 0.3.12 → 0.3.13

package/lib/handlers/document.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../src/handlers/document.ts"],"names":[],"mappings":"AACA,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;AAEvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAED,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,iBAAiB,CAAC,gBAAgB,CAAC,CA8BrC"}
+{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../src/handlers/document.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAEvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,iBAAiB,CAAC,gBAAgB,CAAC,CA8BrC"}

package/lib/handlers/graph.d.ts

@@ -1,8 +1,5 @@
 import type { ProcedureHandlers } from '@enkaku/server';
-import type { KubunDB } from '@kubun/db';
 import type { GraphProtocol } from '@kubun/protocol';
-export type CreateHandlersParams = {
-    db: KubunDB;
-};
+import type { CreateHandlersParams } from './types.js';
 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":"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"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/handlers/graph.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAKvD,OAAO,KAAK,EAKV,aAAa,EACd,MAAM,iBAAiB,CAAA;AAcxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAUtD,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,iBAAiB,CAAC,aAAa,CAAC,CAsJlC"}

package/lib/handlers/graph.js

@@ -15,14 +15,21 @@ function toGraphResult(result) {
     };
 }
 export function createHandlers(handlersParams) {
-    const { db } = handlersParams;
+    const { db, logger } = handlersParams;
     const graphModels = {};
     async function getGraphModels(id) {
         if (graphModels[id] == null) {
             graphModels[id] = db.getGraph(id).then((graph)=>{
                 if (graph == null) {
+                    logger.warn('graph {id} not found', {
+                        id
+                    });
+                    delete graphModels[id];
                     throw new Error(`Graph not found: ${id}`);
                 }
+                logger.debug('cached model for graph {id}', {
+                    id
+                });
                 return graph.record;
             });
         }
@@ -33,8 +40,14 @@ export function createHandlers(handlersParams) {
         if (schemas[id] == null) {
             schemas[id] = getGraphModels(id).then((record)=>{
                 const schema = createSchema(record);
+                logger.debug('cached schema for graph {id}', {
+                    id
+                });
                 // console.log(printSchema(schema))
                 return schema;
+            }).catch((err)=>{
+                delete schemas[id];
+                throw err;
             });
         }
         return await schemas[id];
@@ -53,6 +66,9 @@ export function createHandlers(handlersParams) {
                 name: ctx.param.name,
                 record: model.record
             });
+            logger.info('deployed graph {id}', {
+                id
+            });
             return {
                 id,
                 models: model.record

package/lib/handlers/index.d.ts

@@ -1,9 +1,6 @@
 import type { ProcedureHandlers } from '@enkaku/server';
-import type { KubunDB } from '@kubun/db';
 import type { Protocol } from '@kubun/protocol';
-export type CreateHandlersParams = {
-    db: KubunDB;
-};
+import type { CreateHandlersParams } from './types.js';
 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,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"}
+{"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,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAI/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,MAAM,MAAM,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;AAElD,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,QAAQ,CAKrE"}

package/lib/handlers/types.d.ts

@@ -0,0 +1,7 @@
+import type { KubunDB } from '@kubun/db';
+import type { Logger } from '@kubun/logger';
+export type CreateHandlersParams = {
+    db: KubunDB;
+    logger: Logger;
+};
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/handlers/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAE3C,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;CACf,CAAA"}

package/lib/handlers/types.js

@@ -0,0 +1 @@
+export { };

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 export { createContext, type ExecutionContext } from './data/graphql.js';
-export { type CreateHandlersParams, createHandlers } from './handlers/index.js';
+export { createHandlers } from './handlers/index.js';
+export type { CreateHandlersParams } from './handlers/types.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,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACxE,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,YAAY,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAA"}

package/lib/server.d.ts

@@ -1,11 +1,13 @@
 import { type Server } from '@enkaku/server';
 import { type ClientParams, KubunClient } from '@kubun/client';
 import { type DBParams, KubunDB } from '@kubun/db';
+import { type Logger } from '@kubun/logger';
 import type { Protocol, ServerTransport } from '@kubun/protocol';
 export type ServerParams = {
     access?: Record<string, boolean | Array<string>>;
     db: KubunDB | DBParams;
     id: string;
+    logger?: Logger;
 };
 export type CreateClientParams = Omit<ClientParams, 'serverID' | 'transport'> & {
     signal?: AbortSignal;

package/lib/server.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"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,EAAkB,KAAK,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3D,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;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,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;;gBAOV,MAAM,EAAE,YAAY;IAUhC,IAAI,EAAE,IAAI,OAAO,CAEhB;IAED,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW;IAkBrD,KAAK,CAAC,SAAS,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC;CAU1E"}

package/lib/server.js

@@ -2,20 +2,27 @@ import { serve } from '@enkaku/server';
 import { DirectTransports } from '@enkaku/transport';
 import { KubunClient } from '@kubun/client';
 import { KubunDB } from '@kubun/db';
+import { getKubunLogger } from '@kubun/logger';
 import { createHandlers } from './handlers/index.js';
 export class KubunServer {
     #access;
     #db;
     #handlers;
     #id;
+    #logger;
     constructor(params){
         const { access, db, id } = params;
+        const logger = params.logger ?? getKubunLogger('server', {
+            serverID: id
+        });
         this.#access = access ?? {};
         this.#db = db instanceof KubunDB ? db : new KubunDB(db);
         this.#handlers = createHandlers({
-            db: this.#db
+            db: this.#db,
+            logger
         });
         this.#id = id;
+        this.#logger = logger;
     }
     get db() {
         return this.#db;
@@ -26,7 +33,11 @@ export class KubunServer {
             signal
         });
         this.serve(transports.server, signal);
+        const logger = params.logger ?? this.#logger.getChild('client').with({
+            clientID: params.getRandomID?.() ?? crypto.randomUUID()
+        });
         return new KubunClient({
+            logger,
             serverID: this.#id,
             transport: transports.client,
             ...clientParams
@@ -37,6 +48,7 @@ export class KubunServer {
             access: this.#access,
             handlers: this.#handlers,
             id: this.#id,
+            logger: this.#logger,
             signal,
             transport
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/server",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "license": "see LICENSE.md",
   "keywords": [],
   "type": "module",
@@ -19,22 +19,23 @@
     "@enkaku/codec": "^0.12.0",
     "@enkaku/generator": "^0.12.1",
     "@enkaku/schema": "^0.12.1",
-    "@enkaku/server": "^0.12.1",
+    "@enkaku/server": "^0.12.2",
     "@enkaku/token": "0.12.3",
     "@enkaku/transport": "0.12.0",
     "graphql": "^16.12.0",
-    "@kubun/client": "^0.3.7",
-    "@kubun/protocol": "^0.3.9",
-    "@kubun/db": "^0.3.6",
+    "@kubun/client": "^0.3.8",
+    "@kubun/logger": "^0.3.0",
+    "@kubun/graphql": "^0.3.14",
+    "@kubun/db": "^0.3.7",
+    "@kubun/protocol": "^0.3.10",
     "@kubun/id": "^0.3.1",
-    "@kubun/mutation": "^0.3.3",
-    "@kubun/graphql": "^0.3.14"
+    "@kubun/mutation": "^0.3.3"
   },
   "devDependencies": {
     "@databases/pg-test": "^3.1.2",
     "@enkaku/stream": "^0.12.1",
-    "@kubun/test-utils": "^0.3.0",
-    "@kubun/db-postgres": "^0.3.2"
+    "@kubun/db-postgres": "^0.3.2",
+    "@kubun/test-utils": "^0.3.0"
   },
   "scripts": {
     "build:clean": "del lib",