@enkaku/client 0.18.0 → 0.18.1

package/lib/client.js

@@ -1,8 +1,9 @@
+import { createTracer, EnkakuAttributeKeys, EnkakuSpanNames } from '@enkaku/otel';
 import { createUnsignedToken, isSigningIdentity } from '@kokuin/token';
 import { Disposer, defer } from '@sozai/async';
 import { EventEmitter } from '@sozai/event';
 import { getLogger } from '@sozai/log';
-import { AttributeKeys, createTracer, injectTraceContext as otelInjectTraceContext, SpanNames, SpanStatusCode, setSpanOnContext, withActiveContext, withSpan } from '@sozai/otel';
+import { AttributeKeys, injectTraceContext as otelInjectTraceContext, SpanStatusCode, setSpanOnContext, withActiveContext, withSpan } from '@sozai/otel';
 import { createRuntime } from '@sozai/runtime';
 import { createPipe, writeTo } from '@sozai/stream';
 import { RequestError } from './error.js';
@@ -165,8 +166,8 @@ export class Client extends Disposer {
             delete this.#spans[meta.rid];
         }, (error)=>{
             if (error instanceof RequestError) {
-                span.setAttribute(AttributeKeys.ERROR_CODE, error.code);
-                span.setAttribute(AttributeKeys.ERROR_MESSAGE, error.message);
+                span.setAttribute(EnkakuAttributeKeys.ERROR_CODE, error.code);
+                span.setAttribute(EnkakuAttributeKeys.ERROR_MESSAGE, error.message);
             }
             span.setStatus({
                 code: SpanStatusCode.ERROR,
@@ -251,7 +252,7 @@ export class Client extends Disposer {
                         const receiveSpan = this.#spans[msg.payload.rid];
                         if (receiveSpan != null) {
                             receiveSpan.addEvent('stream.message.received', {
-                                [AttributeKeys.MESSAGE_DIRECTION]: 'receive'
+                                [EnkakuAttributeKeys.MESSAGE_DIRECTION]: 'receive'
                             });
                         }
                         void controller.receive?.write(msg.payload.val).catch(()=>{});
@@ -347,7 +348,7 @@ export class Client extends Disposer {
     }
     async sendEvent(procedure, ...args) {
         const config = args[0] ?? {};
-        return withSpan(this.#tracer, SpanNames.CLIENT_CALL, {
+        return withSpan(this.#tracer, EnkakuSpanNames.CLIENT_CALL, {
             attributes: {
                 [AttributeKeys.RPC_SYSTEM]: 'enkaku',
                 [AttributeKeys.RPC_PROCEDURE]: procedure,
@@ -379,7 +380,7 @@ export class Client extends Disposer {
     request(procedure, ...args) {
         const config = args[0] ?? {};
         const rid = config.id ?? this.#runtime.getRandomID();
-        const span = this.#tracer.startSpan(SpanNames.CLIENT_CALL, {
+        const span = this.#tracer.startSpan(EnkakuSpanNames.CLIENT_CALL, {
             attributes: {
                 [AttributeKeys.RPC_SYSTEM]: 'enkaku',
                 [AttributeKeys.RPC_PROCEDURE]: procedure,
@@ -456,7 +457,7 @@ export class Client extends Disposer {
     createStream(procedure, ...args) {
         const config = args[0] ?? {};
         const rid = config.id ?? this.#runtime.getRandomID();
-        const span = this.#tracer.startSpan(SpanNames.CLIENT_CALL, {
+        const span = this.#tracer.startSpan(EnkakuSpanNames.CLIENT_CALL, {
             attributes: {
                 [AttributeKeys.RPC_SYSTEM]: 'enkaku',
                 [AttributeKeys.RPC_PROCEDURE]: procedure,
@@ -540,7 +541,7 @@ export class Client extends Disposer {
     createChannel(procedure, ...args) {
         const config = args[0] ?? {};
         const rid = config.id ?? this.#runtime.getRandomID();
-        const span = this.#tracer.startSpan(SpanNames.CLIENT_CALL, {
+        const span = this.#tracer.startSpan(EnkakuSpanNames.CLIENT_CALL, {
             attributes: {
                 [AttributeKeys.RPC_SYSTEM]: 'enkaku',
                 [AttributeKeys.RPC_PROCEDURE]: procedure,
@@ -622,7 +623,7 @@ export class Client extends Disposer {
             const channelSpan = this.#spans[rid];
             if (channelSpan != null) {
                 channelSpan.addEvent('channel.message.sent', {
-                    [AttributeKeys.MESSAGE_DIRECTION]: 'send'
+                    [EnkakuAttributeKeys.MESSAGE_DIRECTION]: 'send'
                 });
             }
             this.#logger.trace('send value to channel {procedure} with ID {rid}: {value}', {

package/lib/error.d.ts

@@ -1,5 +1,4 @@
 import type { ErrorReplyPayload } from '@enkaku/protocol';
-export { type ErrorCode, ErrorCodes } from '@enkaku/protocol';
 export type ErrorObjectType<Code extends string = string, Data extends Record<string, unknown> = Record<string, unknown>> = {
     code: Code;
     message: string;

package/lib/error.js

@@ -1,4 +1,3 @@
-export { ErrorCodes } from '@enkaku/protocol';
 export class RequestError extends Error {
     static fromPayload(payload) {
         return new RequestError({

package/lib/index.d.ts

@@ -11,5 +11,5 @@
  */
 export type { ChannelCall, ChannelDefinitionsType, ClientDefinitionsType, ClientParams, EventDefinitionsType, RequestCall, RequestDefinitionsType, StreamCall, StreamDefinitionsType, } from './client.js';
 export { Client } from './client.js';
-export { type ErrorCode, ErrorCodes, type ErrorObjectType, RequestError, type RequestErrorParams, } from './error.js';
+export { type ErrorObjectType, RequestError, type RequestErrorParams, } from './error.js';
 export type { ClientEmitter, ClientEvents, ClientRequestStatus } from './events.js';

package/lib/index.js

@@ -9,4 +9,4 @@
  *
  * @module client
  */ export { Client } from './client.js';
-export { ErrorCodes, RequestError } from './error.js';
+export { RequestError } from './error.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enkaku/client",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "license": "MIT",
   "homepage": "https://enkaku.dev",
   "description": "Enkaku RPC client",
@@ -26,18 +26,19 @@
   ],
   "sideEffects": false,
   "dependencies": {
+    "@kokuin/token": "^0.1.1",
     "@sozai/async": "^0.1.0",
     "@sozai/event": "^0.1.0",
     "@sozai/execution": "^0.1.0",
     "@sozai/log": "^0.1.0",
+    "@sozai/otel": "^0.2.0",
     "@sozai/runtime": "^0.1.0",
-    "@sozai/otel": "^0.1.0",
     "@sozai/stream": "^0.1.0",
-    "@kokuin/token": "^0.1.0"
+    "@enkaku/otel": "^0.18.1"
   },
   "devDependencies": {
-    "@enkaku/protocol": "^0.18.0",
-    "@enkaku/transport": "^0.18.0"
+    "@enkaku/protocol": "^0.18.1",
+    "@enkaku/transport": "^0.18.1"
   },
   "scripts": {
     "build:clean": "del lib",