@enkaku/server 0.13.1 → 0.13.2

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

@@ -1 +1 @@
-{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/handlers/channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EACnB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,KAAK,EAGV,cAAc,EAGf,MAAM,aAAa,CAAA;AAGpB,MAAM,MAAM,gBAAgB,CAC1B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAEnE,wBAAgB,aAAa,CAC3B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EAEzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC7B,GAAG,EAAE,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,GACzC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAsEvB"}
+{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/handlers/channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EACnB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,KAAK,EAGV,cAAc,EAGf,MAAM,aAAa,CAAA;AAGpB,MAAM,MAAM,gBAAgB,CAC1B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAEnE,wBAAgB,aAAa,CAC3B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EAEzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC7B,GAAG,EAAE,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,GACzC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAgFvB"}

package/lib/handlers/channel.js

@@ -5,10 +5,19 @@ export function handleChannel(ctx, msg) {
     if (handler == null) {
         return new Error(`No handler for procedure: ${msg.payload.prc}`);
     }
-    ctx.logger.trace('handle channel {procedure} with ID {rid}', {
-        procedure: msg.payload.prc,
-        rid: msg.payload.rid
-    });
+    const param = msg.payload.prm;
+    if (param == null) {
+        ctx.logger.trace('handle channel {procedure} with ID {rid}', {
+            procedure: msg.payload.prc,
+            rid: msg.payload.rid
+        });
+    } else {
+        ctx.logger.trace('handle channel {procedure} with ID {rid} and param: {param}', {
+            procedure: msg.payload.prc,
+            rid: msg.payload.rid,
+            param
+        });
+    }
     const sendStream = createPipe();
     const controller = Object.assign(new AbortController(), {
         writer: sendStream.writable.getWriter()
@@ -22,9 +31,10 @@ export function handleChannel(ctx, msg) {
         if (controller.signal.aborted) {
             return;
         }
-        ctx.logger.trace('send value to channel {procedure} with ID {rid}', {
+        ctx.logger.trace('send value to channel {procedure} with ID {rid}: {val}', {
             procedure: msg.payload.prc,
-            rid: msg.payload.rid
+            rid: msg.payload.rid,
+            val
         });
         await ctx.send({
             typ: 'receive',
@@ -33,7 +43,7 @@ export function handleChannel(ctx, msg) {
         });
     }));
     const readable = sendStream.readable.pipeThrough(tap((value)=>{
-        ctx.logger.trace('received value from channel {procedure} with ID {rid}', {
+        ctx.logger.trace('received value from channel {procedure} with ID {rid}: {value}', {
             procedure: msg.payload.prc,
             rid: msg.payload.rid,
             value
@@ -41,7 +51,7 @@ export function handleChannel(ctx, msg) {
     }));
     const handlerContext = {
         message: msg,
-        param: msg.payload.prm,
+        param,
         readable,
         signal: controller.signal,
         writable: receiveStream.writable

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

@@ -1 +1 @@
-{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/handlers/event.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAGzF,OAAO,KAAK,EAAqC,cAAc,EAAE,MAAM,aAAa,CAAA;AAEpF,MAAM,MAAM,cAAc,CACxB,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAEjE,wBAAgB,WAAW,CACzB,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EACzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BhG"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/handlers/event.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAGzF,OAAO,KAAK,EAAqC,cAAc,EAAE,MAAM,aAAa,CAAA;AAEpF,MAAM,MAAM,cAAc,CACxB,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAEjE,wBAAgB,WAAW,CACzB,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EACzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ChG"}

package/lib/handlers/event.js

@@ -5,24 +5,38 @@ export function handleEvent(ctx, msg) {
     if (handler == null) {
         return new Error(`No handler for procedure: ${msg.payload.prc}`);
     }
-    ctx.logger.trace('handle event {procedure}', {
-        procedure: msg.payload.prc,
-        data: msg.payload.data
-    });
+    const data = msg.payload.data;
+    if (data == null) {
+        ctx.logger.trace('handle event {procedure} without data', {
+            procedure: msg.payload.prc
+        });
+    } else {
+        ctx.logger.trace('handle event {procedure} with data: {data}', {
+            procedure: msg.payload.prc,
+            data: msg.payload.data
+        });
+    }
     const handlerContext = {
         message: msg,
-        data: msg.payload.data
+        data
     };
     return toPromise(()=>handler(handlerContext)).catch((cause)=>{
         const error = HandlerError.from(cause, {
             code: 'EK01',
             message: cause.message ?? 'Handler execution failed'
         });
-        ctx.logger.debug('handler error for event {procedure}', {
-            procedure: msg.payload.prc,
-            data: msg.payload.data,
-            error
-        });
+        if (data == null) {
+            ctx.logger.debug('handler error for event {procedure} without data: {error}', {
+                procedure: msg.payload.prc,
+                error
+            });
+        } else {
+            ctx.logger.debug('handler error for event {procedure} with data {data}: {error}', {
+                procedure: msg.payload.prc,
+                data,
+                error
+            });
+        }
         ctx.events.emit('handlerError', {
             error,
             payload: msg.payload

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

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/handlers/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE3F,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,aAAa,CAAA;AAGjE,MAAM,MAAM,gBAAgB,CAC1B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAEnE,wBAAgB,aAAa,CAC3B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EAEzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC7B,GAAG,EAAE,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,GACzC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBvB"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/handlers/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE3F,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,aAAa,CAAA;AAGjE,MAAM,MAAM,gBAAgB,CAC1B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAEnE,wBAAgB,aAAa,CAC3B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EAEzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC7B,GAAG,EAAE,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,GACzC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BvB"}

package/lib/handlers/request.js

@@ -4,11 +4,19 @@ export function handleRequest(ctx, msg) {
     if (handler == null) {
         return new Error(`No handler for procedure: ${msg.payload.prc}`);
     }
-    ctx.logger.trace('handle request {procedure} with ID {rid}', {
-        procedure: msg.payload.prc,
-        rid: msg.payload.rid,
-        param: msg.payload.prm
-    });
+    const param = msg.payload.prm;
+    if (param == null) {
+        ctx.logger.trace('handle request {procedure} with ID {rid}', {
+            procedure: msg.payload.prc,
+            rid: msg.payload.rid
+        });
+    } else {
+        ctx.logger.trace('handle request {procedure} with ID {rid} and param: {param}', {
+            procedure: msg.payload.prc,
+            rid: msg.payload.rid,
+            param
+        });
+    }
     const controller = new AbortController();
     ctx.controllers[msg.payload.rid] = controller;
     const handlerContext = {

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

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/handlers/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EACb,kBAAkB,EAClB,eAAe,EAChB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,KAAK,EAAE,cAAc,EAA8B,MAAM,aAAa,CAAA;AAG7E,MAAM,MAAM,eAAe,CACzB,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAElE,wBAAgB,YAAY,CAC1B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EACzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDjG"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/handlers/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EACb,kBAAkB,EAClB,eAAe,EAChB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,KAAK,EAAE,cAAc,EAA8B,MAAM,aAAa,CAAA;AAG7E,MAAM,MAAM,eAAe,CACzB,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,QAAQ,GAAG,MAAM,IACjE,aAAa,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAElE,wBAAgB,YAAY,CAC1B,QAAQ,SAAS,kBAAkB,EACnC,SAAS,SAAS,MAAM,QAAQ,GAAG,MAAM,EACzC,GAAG,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CA8DjG"}

package/lib/handlers/stream.js

@@ -5,10 +5,19 @@ export function handleStream(ctx, msg) {
     if (handler == null) {
         return new Error(`No handler for procedure: ${msg.payload.prc}`);
     }
-    ctx.logger.trace('handle stream {procedure} with ID {rid}', {
-        procedure: msg.payload.prc,
-        rid: msg.payload.rid
-    });
+    const param = msg.payload.prm;
+    if (param == null) {
+        ctx.logger.trace('handle stream {procedure} with ID {rid}', {
+            procedure: msg.payload.prc,
+            rid: msg.payload.rid
+        });
+    } else {
+        ctx.logger.trace('handle stream {procedure} with ID {rid} and param: {param}', {
+            procedure: msg.payload.prc,
+            rid: msg.payload.rid,
+            param
+        });
+    }
     const controller = new AbortController();
     ctx.controllers[msg.payload.rid] = controller;
     const receiveStream = createPipe();
@@ -16,9 +25,10 @@ export function handleStream(ctx, msg) {
         if (controller.signal.aborted) {
             return;
         }
-        ctx.logger.trace('send value to stream {procedure} with ID {rid}', {
+        ctx.logger.trace('send value to stream {procedure} with ID {rid}: {val}', {
             procedure: msg.payload.prc,
-            rid: msg.payload.rid
+            rid: msg.payload.rid,
+            val
         });
         await ctx.send({
             typ: 'receive',

package/lib/utils.js

@@ -9,7 +9,7 @@ export async function executeHandler(context, payload, execute) {
     try {
         const val = await toPromise(execute);
         if (canSend(controller.signal)) {
-            context.logger.trace('send result to {type} {procedure} with ID {rid}', {
+            context.logger.trace('send result to {type} {procedure} with ID {rid}: {result}', {
                 type: payload.typ,
                 procedure: payload.prc,
                 rid: payload.rid,
@@ -27,7 +27,7 @@ export async function executeHandler(context, payload, execute) {
             message: 'Handler execution failed'
         });
         if (canSend(controller.signal)) {
-            context.logger.trace('send error to {type} {procedure} with ID {rid}', {
+            context.logger.trace('send error to {type} {procedure} with ID {rid}: {error}', {
                 type: payload.typ,
                 procedure: payload.prc,
                 rid: payload.rid,
@@ -35,7 +35,7 @@ export async function executeHandler(context, payload, execute) {
             });
             context.send(error.toPayload(payload.rid));
         } else {
-            context.logger.debug('handler error for {type} {procedure} with ID {rid} cannot be sent to client', {
+            context.logger.debug('handler error for {type} {procedure} with ID {rid} cannot be sent to client: {error}', {
                 type: payload.typ,
                 procedure: payload.prc,
                 rid: payload.rid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enkaku/server",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "license": "MIT",
   "homepage": "https://enkaku.dev",
   "description": "Server logic for Enkaku RPC",
@@ -27,12 +27,12 @@
   "dependencies": {
     "@enkaku/async": "^0.13.0",
     "@enkaku/capability": "^0.13.0",
-    "@enkaku/log": "^0.13.0",
     "@enkaku/event": "^0.13.0",
-    "@enkaku/schema": "^0.13.0",
+    "@enkaku/log": "^0.13.1",
     "@enkaku/protocol": "^0.13.0",
-    "@enkaku/token": "^0.13.0",
-    "@enkaku/stream": "^0.13.0"
+    "@enkaku/schema": "^0.13.0",
+    "@enkaku/stream": "^0.13.0",
+    "@enkaku/token": "^0.13.0"
   },
   "devDependencies": {
     "@enkaku/transport": "^0.13.1"