chia-agent 14.3.2 → 14.3.3

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [14.3.3]
+### Changed
+- The default service name which [`Daemon`](./src/daemon/index.ts) client tries to register is now `wallet_ui`.  
+  Previously `chia_agent` service and optionally `wallet_ui` service were registered to `chia-blockchain`'s `Daemon`.  
+
 ## [14.3.2]
 ### Changed
 - Error logs are generated when
@@ -1715,6 +1720,7 @@ daemon.sendMessage(destination, get_block_record_by_height_command, data);
 Initial release.
 
 <!-- [Unreleased]: https://github.com/Chia-Mine/chia-agent/compare/v0.0.1...v0.0.2 -->
+[14.3.3]: https://github.com/Chia-Mine/chia-agent/compare/v14.3.2...v14.3.3
 [14.3.2]: https://github.com/Chia-Mine/chia-agent/compare/v14.3.1...v14.3.2
 [14.3.1]: https://github.com/Chia-Mine/chia-agent/compare/v14.3.0...v14.3.1
 [14.3.0]: https://github.com/Chia-Mine/chia-agent/compare/v14.2.2...v14.3.0

package/daemon/connection.js

@@ -42,16 +42,16 @@ function open(url, timeoutMs) {
                 reject(err);
             }
         };
-        ws.addEventListener("open", (openEvent) => {
+        ws.on("open", (openEvent) => {
             opened = true;
-            ws.removeEventListener("error", onOpenError);
+            ws.off("error", onOpenError);
             if (timer !== null) {
                 clearTimeout(timer);
                 timer = null;
                 resolve({ ws, openEvent });
             }
         });
-        ws.addEventListener("error", onOpenError);
+        ws.on("error", onOpenError);
     });
 }
 exports.open = open;

package/daemon/index.d.ts

@@ -7,7 +7,7 @@ export type WsEvent = Event | MessageEvent | ErrorEvent | CloseEvent;
 export type EventListener<T = WsEvent> = (ev: T) => unknown;
 type EventListenerOf<T> = T extends "open" ? EventListener<Event> : T extends "message" ? EventListener<MessageEvent> : T extends "error" ? EventListener<ErrorEvent> : T extends "close" ? EventListener<CloseEvent> : never;
 export type MessageListener<D extends WsMessage> = (msg: D) => unknown;
-export declare function getDaemon(): Daemon;
+export declare function getDaemon(serviceName?: string): Daemon;
 declare class Daemon {
     protected _socket: WS | null;
     protected _connectedUrl: string;
@@ -22,9 +22,10 @@ declare class Daemon {
     protected _closing: boolean;
     protected _onClosePromise: (() => unknown) | undefined;
     protected _subscriptions: string[];
+    protected _serviceName: string;
     get connected(): boolean;
     get closing(): boolean;
-    constructor();
+    constructor(serviceName?: string);
     /**
      * Connect to local daemon via websocket.
      * @param daemonServerURL

package/daemon/index.js

@@ -14,13 +14,13 @@ const crypto_1 = require("crypto");
 const logger_1 = require("../logger");
 const connection_1 = require("./connection");
 const index_1 = require("../config/index");
-const chia_agent_service = "chia_agent";
+const DEFAULT_SERVICE_NAME = "wallet_ui";
 let daemon = null;
-function getDaemon() {
+function getDaemon(serviceName) {
     if (daemon) {
         return daemon;
     }
-    return daemon = new Daemon();
+    return daemon = new Daemon(serviceName);
 }
 exports.getDaemon = getDaemon;
 // Gracefully disconnect from remote daemon server on Ctrl+C.
@@ -53,7 +53,7 @@ class Daemon {
     get closing() {
         return this._closing;
     }
-    constructor() {
+    constructor(serviceName) {
         this._socket = null;
         this._connectedUrl = "";
         this._responseQueue = {};
@@ -64,12 +64,16 @@ class Daemon {
         this._messageListeners = {};
         this._closing = false;
         this._subscriptions = [];
+        this._serviceName = DEFAULT_SERVICE_NAME;
         this.onOpen = this.onOpen.bind(this);
         this.onError = this.onError.bind(this);
         this.onMessage = this.onMessage.bind(this);
         this.onClose = this.onClose.bind(this);
         this.onPing = this.onPing.bind(this);
         this.onPong = this.onPong.bind(this);
+        if (serviceName) {
+            this._serviceName = serviceName;
+        }
     }
     /**
      * Connect to local daemon via websocket.
@@ -94,11 +98,11 @@ class Daemon {
             (0, logger_1.getLogger)().debug(`Opening websocket connection to ${daemonServerURL}`);
             const result = yield (0, connection_1.open)(daemonServerURL, timeoutMs);
             this._socket = result.ws;
-            this._socket.addEventListener("error", this.onError);
+            this._socket.on("error", this.onError);
             this._socket.addEventListener("message", this.onMessage);
-            this._socket.addEventListener("close", this.onClose);
-            this._socket.addListener("ping", this.onPing);
-            this._socket.addListener("pong", this.onPong);
+            this._socket.on("close", this.onClose);
+            this._socket.on("ping", this.onPing);
+            this._socket.on("pong", this.onPong);
             yield this.onOpen(result.openEvent, daemonServerURL);
             return true;
         });
@@ -143,7 +147,7 @@ class Daemon {
             command,
             data,
             ack: false,
-            origin: chia_agent_service,
+            origin: this._serviceName,
             destination,
             request_id: (0, crypto_1.randomBytes)(32).toString("hex"),
         };
@@ -160,7 +164,7 @@ class Daemon {
                     data: { success: true },
                     ack: true,
                     origin: "daemon",
-                    destination: chia_agent_service,
+                    destination: service,
                     request_id: "",
                 };
             }
@@ -254,7 +258,7 @@ class Daemon {
             (0, logger_1.getLogger)().info("ws connection opened");
             this._connectedUrl = url;
             this._openEventListeners.forEach(l => l(event));
-            return this.subscribe(chia_agent_service);
+            return this.subscribe(this._serviceName);
         });
     }
     onError(error) {
@@ -294,11 +298,11 @@ class Daemon {
     }
     onClose(event) {
         if (this._socket) {
-            this._socket.removeEventListener("error", this.onError);
+            this._socket.off("error", this.onError);
             this._socket.removeEventListener("message", this.onMessage);
-            this._socket.removeEventListener("close", this.onClose);
-            this._socket.removeListener("ping", this.onPing);
-            this._socket.removeListener("pong", this.onPong);
+            this._socket.off("close", this.onClose);
+            this._socket.off("ping", this.onPing);
+            this._socket.off("pong", this.onPong);
             this._socket = null;
         }
         this._closing = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chia-agent",
-  "version": "14.3.2",
+  "version": "14.3.3",
   "author": "ChiaMineJP <admin@chiamine.jp>",
   "description": "chia rpc/websocket client library",
   "license": "MIT",