chia-agent 14.0.0 → 14.2.0

package/config/index.js

@@ -7,7 +7,7 @@ const fs_1 = require("fs");
 const yaml_1 = require("yaml");
 // Suppress noisy YAML warning
 process.env.YAML_SILENCE_WARNINGS = "true";
-const defaultChiaRoot = path.resolve(os_1.homedir(), ".chia", "mainnet");
+const defaultChiaRoot = path.resolve((0, os_1.homedir)(), ".chia", "mainnet");
 exports.chiaRoot = process.env.CHIA_ROOT ? path.resolve(process.env.CHIA_ROOT) : defaultChiaRoot;
 // config 
 exports.configPath = path.resolve(exports.chiaRoot, "config", "config.yaml");
@@ -36,8 +36,8 @@ function getConfig(configFilePath) {
         return _config;
     }
     _lastConfigPath = configFilePath;
-    const file = fs_1.readFileSync(configFilePath || exports.configPath, "utf8");
-    const parsedYamlObj = yaml_1.parse(file);
+    const file = (0, fs_1.readFileSync)(configFilePath || exports.configPath, "utf8");
+    const parsedYamlObj = (0, yaml_1.parse)(file);
     return _config = buildConfigObj(parsedYamlObj);
 }
 exports.getConfig = getConfig;

package/daemon/connection.js

@@ -6,19 +6,18 @@ const config_1 = require("../config");
 const WS = require("ws");
 const logger_1 = require("../logger");
 function create(url) {
-    const config = config_1.getConfig();
-    const daemonCertPath = config_1.getPathFromConfig("/daemon_ssl/private_crt") || config_1.defaultDaemonCertPath;
-    const daemonKeyPath = config_1.getPathFromConfig("/daemon_ssl/private_key") || config_1.defaultDaemonKeyPath;
-    if (!fs_1.existsSync(daemonCertPath)) {
-        logger_1.getLogger().error("daemon cert file was not found at: " + daemonCertPath);
+    const daemonCertPath = (0, config_1.getPathFromConfig)("/daemon_ssl/private_crt") || config_1.defaultDaemonCertPath;
+    const daemonKeyPath = (0, config_1.getPathFromConfig)("/daemon_ssl/private_key") || config_1.defaultDaemonKeyPath;
+    if (!(0, fs_1.existsSync)(daemonCertPath)) {
+        (0, logger_1.getLogger)().error("daemon cert file was not found at: " + daemonCertPath);
         throw new Error("Cert file not found");
     }
-    if (!fs_1.existsSync(daemonCertPath)) {
-        logger_1.getLogger().error("daemon key file was not found at: " + daemonCertPath);
+    if (!(0, fs_1.existsSync)(daemonCertPath)) {
+        (0, logger_1.getLogger)().error("daemon key file was not found at: " + daemonCertPath);
         throw new Error("Key file not found");
     }
-    const cert = fs_1.readFileSync(daemonCertPath);
-    const key = fs_1.readFileSync(daemonKeyPath);
+    const cert = (0, fs_1.readFileSync)(daemonCertPath);
+    const key = (0, fs_1.readFileSync)(daemonKeyPath);
     const options = {
         cert,
         key,
@@ -34,7 +33,7 @@ function open(url, timeoutMs) {
         timeoutMs = typeof timeoutMs === "number" ? timeoutMs : defaultTimeoutInMs;
         timer = setTimeout(() => {
             timer = null;
-            logger_1.getLogger().error("Request to open connection timed out");
+            (0, logger_1.getLogger)().error("Request to open connection timed out");
             reject("Timeout");
         }, timeoutMs);
         ws.onopen = (openEvent) => {

package/daemon/index.d.ts

@@ -2,11 +2,11 @@ import type { CloseEvent, ErrorEvent, MessageEvent, Event } from "ws";
 import * as WS from "ws";
 import { WsMessage } from "../api/ws";
 import { WsRegisterServiceMessage } from "../api/ws/daemon";
-export declare type EventType = "open" | "message" | "error" | "close";
-export declare type WsEvent = Event | MessageEvent | ErrorEvent | CloseEvent;
-export declare type EventListener<T = WsEvent> = (ev: T) => unknown;
-declare 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 declare type MessageListener<D extends WsMessage> = (msg: D) => unknown;
+export type EventType = "open" | "message" | "error" | "close";
+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;
 declare class Daemon {
     protected _socket: WS | null;
@@ -57,5 +57,5 @@ declare class Daemon {
     protected onMessage(event: MessageEvent): void;
     protected onClose(event: CloseEvent): void;
 }
-export declare type TDaemon = InstanceType<typeof Daemon>;
+export type TDaemon = InstanceType<typeof Daemon>;
 export {};

package/daemon/index.js

@@ -33,7 +33,7 @@ const onProcessExit = () => {
     setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
         try {
             if (daemon && daemon.connected && !daemon.closing) {
-                logger_1.getLogger().debug("Detected Ctrl+C. Initiating shutdown...");
+                (0, logger_1.getLogger)().debug("Detected Ctrl+C. Initiating shutdown...");
                 yield daemon.close();
                 process.removeListener("SIGINT", onProcessExit);
                 process.kill(process.pid, "SIGINT");
@@ -47,6 +47,12 @@ const onProcessExit = () => {
 };
 process.addListener("SIGINT", onProcessExit);
 class Daemon {
+    get connected() {
+        return Boolean(this._connectedUrl);
+    }
+    get closing() {
+        return this._closing;
+    }
     constructor() {
         this._socket = null;
         this._connectedUrl = "";
@@ -63,12 +69,6 @@ class Daemon {
         this.onMessage = this.onMessage.bind(this);
         this.onClose = this.onClose.bind(this);
     }
-    get connected() {
-        return Boolean(this._connectedUrl);
-    }
-    get closing() {
-        return this._closing;
-    }
     /**
      * Connect to local daemon via websocket.
      * @param daemonServerURL
@@ -76,7 +76,7 @@ class Daemon {
     connect(daemonServerURL) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!daemonServerURL) {
-                const config = index_1.getConfig();
+                const config = (0, index_1.getConfig)();
                 const daemonHost = config["/ui/daemon_host"];
                 const daemonPort = config["/ui/daemon_port"];
                 daemonServerURL = `wss://${daemonHost}:${daemonPort}`;
@@ -85,11 +85,11 @@ class Daemon {
                 return true;
             }
             else if (this._connectedUrl) {
-                logger_1.getLogger().error("Connection is still active. Please close living connection first");
+                (0, logger_1.getLogger)().error("Connection is still active. Please close living connection first");
                 return false;
             }
-            logger_1.getLogger().debug(`Opening websocket connection to ${daemonServerURL}`);
-            const result = yield connection_1.open(daemonServerURL);
+            (0, logger_1.getLogger)().debug(`Opening websocket connection to ${daemonServerURL}`);
+            const result = yield (0, connection_1.open)(daemonServerURL);
             this._socket = result.ws;
             this._socket.onerror = this.onError;
             this._socket.onmessage = this.onMessage;
@@ -104,7 +104,7 @@ class Daemon {
                 if (this._closing || !this._socket) {
                     return;
                 }
-                logger_1.getLogger().debug("Closing web socket connection");
+                (0, logger_1.getLogger)().debug("Closing web socket connection");
                 this._socket.close();
                 this._closing = true;
                 this._onClosePromise = resolve; // Resolved in onClose function.
@@ -115,14 +115,14 @@ class Daemon {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 if (!this.connected || !this._socket) {
-                    logger_1.getLogger().error("Tried to send message without active connection");
+                    (0, logger_1.getLogger)().error("Tried to send message without active connection");
                     reject("Not connected");
                     return;
                 }
                 const message = this.createMessageTemplate(command, destination, data || {});
                 const reqId = message.request_id;
                 this._responseQueue[reqId] = resolve;
-                logger_1.getLogger().debug(`Sending message. dest=${destination} command=${command} reqId=${reqId}`);
+                (0, logger_1.getLogger)().debug(`Sending message. dest=${destination} command=${command} reqId=${reqId}`);
                 this._socket.send(JSON.stringify(message));
             });
         });
@@ -134,13 +134,13 @@ class Daemon {
             ack: false,
             origin: chia_agent_service,
             destination,
-            request_id: crypto_1.randomBytes(32).toString("hex"),
+            request_id: (0, crypto_1.randomBytes)(32).toString("hex"),
         };
     }
     subscribe(service) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.connected || !this._socket) {
-                logger_1.getLogger().error(`Tried to subscribe '${service}' without active connection`);
+                (0, logger_1.getLogger)().error(`Tried to subscribe '${service}' without active connection`);
                 throw new Error("Not connected");
             }
             if (this._subscriptions.findIndex(s => s === service) > -1) {
@@ -159,7 +159,7 @@ class Daemon {
                 return null;
             });
             if (error || !result) {
-                logger_1.getLogger().error("Failed to register agent service to daemon");
+                (0, logger_1.getLogger)().error("Failed to register agent service to daemon");
                 throw new Error("Subscribe failed");
             }
             this._subscriptions.push(service);
@@ -240,20 +240,20 @@ class Daemon {
     }
     onOpen(event, url) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.getLogger().info("ws connection opened");
+            (0, logger_1.getLogger)().info("ws connection opened");
             this._connectedUrl = url;
             this._openEventListeners.forEach(l => l(event));
             return this.subscribe(chia_agent_service);
         });
     }
     onError(error) {
-        logger_1.getLogger().error(`ws connection error: ${error.message}`);
+        (0, logger_1.getLogger)().error(`ws connection error: ${error.message}`);
         this._errorEventListeners.forEach(l => l(error));
     }
     onMessage(event) {
         const payload = JSON.parse(event.data);
         const { request_id, origin, command } = payload;
-        logger_1.getLogger().debug(`Arrived message. origin=${origin} command=${command} reqId=${request_id}`);
+        (0, logger_1.getLogger)().debug(`Arrived message. origin=${origin} command=${command} reqId=${request_id}`);
         const resolver = this._responseQueue[request_id];
         if (resolver) {
             delete this._responseQueue[request_id];
@@ -282,7 +282,7 @@ class Daemon {
         this._subscriptions = [];
         this._closeEventListeners.forEach(l => l(event));
         this.clearAllEventListeners();
-        logger_1.getLogger().info("Closed ws connection");
+        (0, logger_1.getLogger)().info("Closed ws connection");
         if (this._onClosePromise) {
             this._onClosePromise();
             this._onClosePromise = undefined;

package/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/logger.d.ts

@@ -1,6 +1,6 @@
-export declare type TLogLevel = "error" | "warning" | "info" | "debug" | "none";
-export declare type TDestination = "console";
-export declare type Writer = {
+export type TLogLevel = "error" | "warning" | "info" | "debug" | "none";
+export type TDestination = "console";
+export type Writer = {
     write: (message: string) => void;
 };
 export declare function getLogLevel(): TLogLevel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chia-agent",
-  "version": "14.0.0",
+  "version": "14.2.0",
   "author": "ChiaMineJP <admin@chiamine.jp>",
   "description": "chia rpc/websocket client library",
   "license": "MIT",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@chiamine/json-bigint": "^1.0.3",
-    "ws": "^8.5.0",
-    "yaml": "^2.2.2"
+    "ws": "^8.17.0",
+    "yaml": "^2.4.2"
   }
 }

package/rpc/index.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { Agent as HttpsAgent } from "https";
 import { Agent as HttpAgent } from "http";
 import { TConfig } from "../config/index";
 import { APIAgent } from "../agent/index";
-declare type TDestination = "farmer" | "harvester" | "full_node" | "wallet" | "data_layer" | "daemon" | "pool";
+type TDestination = "farmer" | "harvester" | "full_node" | "wallet" | "data_layer" | "daemon" | "pool";
 export declare function getConnectionInfoFromConfig(destination: TDestination, config: TConfig): {
     hostname: string;
     port: number;
@@ -14,7 +16,7 @@ export declare function loadCertFilesFromConfig(config: TConfig): {
     clientKey: Buffer;
     caCert: Buffer;
 };
-export declare type TRPCAgentProps = {
+export type TRPCAgentProps = {
     protocol: "https";
     host: string;
     port: number;
@@ -66,8 +68,8 @@ export declare class RPCAgent implements APIAgent {
     protected _agent: HttpsAgent | HttpAgent;
     protected _skip_hostname_verification: boolean;
     constructor(props: TRPCAgentProps);
-    sendMessage<M extends unknown>(destination: string, command: string, data?: Record<string, unknown>): Promise<M>;
+    sendMessage<M>(destination: string, command: string, data?: Record<string, unknown>): Promise<M>;
     request<R>(method: string, path: string, data?: any): Promise<R>;
 }
-export declare type TRPCAgent = APIAgent;
+export type TRPCAgent = APIAgent;
 export {};

package/rpc/index.js

@@ -50,7 +50,7 @@ function getConnectionInfoFromConfig(destination, config) {
             port = match[3] ? +match[3] : 80;
         }
         else {
-            logger_1.getLogger().error("Pool list was not found in config.yaml.");
+            (0, logger_1.getLogger)().error("Pool list was not found in config.yaml.");
             throw new Error("Pool list was not found in config.yaml");
         }
     }
@@ -62,26 +62,26 @@ function getConnectionInfoFromConfig(destination, config) {
 exports.getConnectionInfoFromConfig = getConnectionInfoFromConfig;
 function getConf(configPath) {
     configPath = configPath || index_1.configPath;
-    if (!fs_1.existsSync(configPath)) {
-        logger_1.getLogger().error(`chia config file does not exist at: ${configPath}`);
+    if (!(0, fs_1.existsSync)(configPath)) {
+        (0, logger_1.getLogger)().error(`chia config file does not exist at: ${configPath}`);
         throw new Error("chia config file Not Found.");
     }
-    return index_1.getConfig(configPath);
+    return (0, index_1.getConfig)(configPath);
 }
 exports.getConf = getConf;
 function loadCertFilesFromConfig(config) {
-    const clientCertPath = index_1.resolveFromChiaRoot([config["/daemon_ssl/private_crt"]]);
-    const clientKeyPath = index_1.resolveFromChiaRoot([config["/daemon_ssl/private_key"]]);
-    const caCertPath = index_1.resolveFromChiaRoot([config["/private_ssl_ca/crt"]]);
-    logger_1.getLogger().debug(`Loading client cert file from ${clientCertPath}`);
-    logger_1.getLogger().debug(`Loading client key file from ${clientKeyPath}`);
-    logger_1.getLogger().debug(`Loading ca cert file from ${caCertPath}`);
+    const clientCertPath = (0, index_1.resolveFromChiaRoot)([config["/daemon_ssl/private_crt"]]);
+    const clientKeyPath = (0, index_1.resolveFromChiaRoot)([config["/daemon_ssl/private_key"]]);
+    const caCertPath = (0, index_1.resolveFromChiaRoot)([config["/private_ssl_ca/crt"]]);
+    (0, logger_1.getLogger)().debug(`Loading client cert file from ${clientCertPath}`);
+    (0, logger_1.getLogger)().debug(`Loading client key file from ${clientKeyPath}`);
+    (0, logger_1.getLogger)().debug(`Loading ca cert file from ${caCertPath}`);
     const getCertOrKey = (path) => {
-        if (!fs_1.existsSync(path)) {
-            logger_1.getLogger().error(`ssl crt/key does not exist at: ${path}`);
+        if (!(0, fs_1.existsSync)(path)) {
+            (0, logger_1.getLogger)().error(`ssl crt/key does not exist at: ${path}`);
             throw new Error(`crt/key Not Found at ${path}`);
         }
-        return fs_1.readFileSync(path);
+        return (0, fs_1.readFileSync)(path);
     };
     const clientCert = getCertOrKey(clientCertPath);
     const clientKey = getCertOrKey(clientKeyPath);
@@ -171,7 +171,7 @@ class RPCAgent {
                 host = props.host ? props.host : info.hostname;
                 port = typeof props.port === "number" ? props.port : info.port;
             }
-            logger_1.getLogger().debug(`Picked ${host}:${port} for ${props.service}`);
+            (0, logger_1.getLogger)().debug(`Picked ${host}:${port} for ${props.service}`);
             const certs = loadCertFilesFromConfig(config);
             const { clientCert, clientKey, caCert } = certs;
             this._skip_hostname_verification = Boolean(props.skip_hostname_verification);
@@ -192,7 +192,7 @@ class RPCAgent {
     sendMessage(destination, command, data) {
         return __awaiter(this, void 0, void 0, function* () {
             // parameter `destination` is not used because target rpc server is determined by url.
-            logger_1.getLogger().debug(`Sending message. dest=${destination} command=${command}`);
+            (0, logger_1.getLogger)().debug(`Sending message. dest=${destination} command=${command}`);
             return this.request("POST", command, data);
         });
     }
@@ -225,7 +225,7 @@ class RPCAgent {
                         // Remove string after '?' on path to prevent duplication.
                         let p = options.path;
                         if (/\?/.test(p)) {
-                            logger_1.getLogger().warning("querystring in `path` is replaced by `data`");
+                            (0, logger_1.getLogger)().warning("querystring in `path` is replaced by `data`");
                             p.replace(/\?.*/, "");
                         }
                         p += "?";
@@ -238,15 +238,15 @@ class RPCAgent {
                     }
                 }
                 const transporter = this._protocol === "https" ? https_1.request : http_1.request;
-                logger_1.getLogger().debug(`Requesting to ${options.protocol}//${options.hostname}:${options.port}${options.path}`);
+                (0, logger_1.getLogger)().debug(`Requesting to ${options.protocol}//${options.hostname}:${options.port}${options.path}`);
                 const req = transporter(options, (res) => {
                     if (!res.statusCode || res.statusCode < 200 || res.statusCode >= 300) {
-                        logger_1.getLogger().error(`Status not ok: ${res.statusCode}`);
+                        (0, logger_1.getLogger)().error(`Status not ok: ${res.statusCode}`);
                         if (res.statusCode === 404) {
-                            logger_1.getLogger().error("Maybe the RPCAgent is connecting to different service against target rpc command.");
-                            logger_1.getLogger().error("For example, this happens when invoking 'new_farming_info' rpc command" +
+                            (0, logger_1.getLogger)().error("Maybe the RPCAgent is connecting to different service against target rpc command.");
+                            (0, logger_1.getLogger)().error("For example, this happens when invoking 'new_farming_info' rpc command" +
                                 " to 'full_node' service, which 'farm' service is correct");
-                            logger_1.getLogger().error("Check invoking command is correct and connecting service/host is right for the command");
+                            (0, logger_1.getLogger)().error("Check invoking command is correct and connecting service/host is right for the command");
                         }
                         return reject(new Error(`Status not ok: ${res.statusCode}`));
                     }
@@ -254,7 +254,7 @@ class RPCAgent {
                     res.on("data", chunk => {
                         chunks.push(chunk);
                         if (chunks.length === 0) {
-                            logger_1.getLogger().debug("The first response chunk data arrived");
+                            (0, logger_1.getLogger)().debug("The first response chunk data arrived");
                         }
                     });
                     res.on("end", () => {
@@ -264,15 +264,15 @@ class RPCAgent {
                                 const serializedData = entireChunks.toString();
                                 const d = JSONbig.parse(serializedData);
                                 if (typeof d !== "object" || !d) {
-                                    logger_1.getLogger().error(`Response is expected to be an object but received: ${serializedData}`);
+                                    (0, logger_1.getLogger)().error(`Response is expected to be an object but received: ${serializedData}`);
                                     return reject(new Error(`Unexpected response format: ${serializedData}`));
                                 }
                                 else if (!Object.prototype.hasOwnProperty.call(d, "success")) {
-                                    logger_1.getLogger().error("Response has no 'success' property");
+                                    (0, logger_1.getLogger)().error("Response has no 'success' property");
                                     return reject(new Error(`Response has no 'success' property: ${serializedData}`));
                                 }
                                 if (!d.success) {
-                                    logger_1.getLogger().error(`API failure: ${d.error}`);
+                                    (0, logger_1.getLogger)().error(`API failure: ${d.error}`);
                                     return reject(d);
                                 }
                                 return resolve(d);
@@ -280,13 +280,13 @@ class RPCAgent {
                             // RPC Server should return response like
                             // {origin: string; destination: string; request_id: string; data: any; ...}
                             // If no such response is returned, reject it.
-                            logger_1.getLogger().error("RPC Server returned no data. This is not expected.");
+                            (0, logger_1.getLogger)().error("RPC Server returned no data. This is not expected.");
                             reject(new Error("Server responded without expected data"));
                         }
                         catch (e) {
-                            logger_1.getLogger().error("Failed to parse response data");
+                            (0, logger_1.getLogger)().error("Failed to parse response data");
                             try {
-                                logger_1.getLogger().error(Buffer.concat(chunks).toString());
+                                (0, logger_1.getLogger)().error(Buffer.concat(chunks).toString());
                             }
                             catch (_) { /* Do nothing */ }
                             reject(new Error("Server responded without expected data"));
@@ -294,7 +294,7 @@ class RPCAgent {
                     });
                 });
                 req.on("error", error => {
-                    logger_1.getLogger().error(JSON.stringify(error));
+                    (0, logger_1.getLogger)().error(JSON.stringify(error));
                     reject(error);
                 });
                 if ((METHOD === "POST" || METHOD === "PUT" || METHOD === "DELETE") && body) {

package/api/chia/types/blockchain_format/serialized_program.d.ts

@@ -1,2 +0,0 @@
-import { str } from "../_python_types_";
-export declare type SerializedProgram = str;