export protobuf types

README.md

@@ -28,7 +28,7 @@ await alice.disconnect();
 
 ## TypeDocs
 
-See haveno-ts [typedocs](https://haveno-dex.github.io/haveno-ts/classes/HavenoClient.HavenoClient-1.html).
+See [typedocs](https://haveno-dex.github.io/haveno-ts/classes/HavenoClient.HavenoClient-1.html).
 
 ## Run tests
 

dist/HavenoClient.d.ts

@@ -3,7 +3,7 @@ import { GetVersionClient, AccountClient, MoneroConnectionsClient, DisputesClien
 import { MarketPriceInfo, MarketDepthInfo, XmrBalanceInfo, OfferInfo, TradeInfo, XmrTx, XmrDestination, NotificationMessage, UrlConnection } from "./protobuf/grpc_pb";
 import { PaymentMethod, PaymentAccount, Attachment, DisputeResult, Dispute, ChatMessage, MoneroNodeSettings } from "./protobuf/pb_pb";
 /**
- * Haveno daemon client using gRPC.
+ * Haveno daemon client.
  */
 export default class HavenoClient {
     _appName: string | undefined;

dist/HavenoClient.js

@@ -5,7 +5,7 @@ import { GetVersionClient, AccountClient, MoneroConnectionsClient, DisputesClien
 import { GetVersionRequest, IsAppInitializedRequest, RegisterDisputeAgentRequest, MarketPriceRequest, MarketPricesRequest, MarketDepthRequest, GetBalancesRequest, GetMyOfferRequest, GetOffersRequest, GetPaymentMethodsRequest, GetPaymentAccountFormRequest, CreatePaymentAccountRequest, GetPaymentAccountsRequest, CreateCryptoCurrencyPaymentAccountRequest, CreateOfferRequest, CancelOfferRequest, TakeOfferRequest, GetTradeRequest, GetTradesRequest, GetNewDepositAddressRequest, ConfirmPaymentStartedRequest, ConfirmPaymentReceivedRequest, GetXmrTxsRequest, CreateXmrTxRequest, RelayXmrTxRequest, CreateAccountRequest, AccountExistsRequest, DeleteAccountRequest, OpenAccountRequest, IsAccountOpenRequest, CloseAccountRequest, ChangePasswordRequest, BackupAccountRequest, RestoreAccountRequest, StopRequest, NotificationMessage, RegisterNotificationListenerRequest, SendNotificationRequest, UrlConnection, AddConnectionRequest, RemoveConnectionRequest, GetConnectionRequest, GetConnectionsRequest, SetConnectionRequest, CheckConnectionRequest, CheckConnectionsRequest, StartCheckingConnectionsRequest, StopCheckingConnectionsRequest, GetBestAvailableConnectionRequest, SetAutoSwitchRequest, GetDisputeRequest, GetDisputesRequest, OpenDisputeRequest, ResolveDisputeRequest, SendDisputeChatMessageRequest, SendChatMessageRequest, GetChatMessagesRequest, StartMoneroNodeRequest, StopMoneroNodeRequest, IsMoneroNodeRunningRequest, GetMoneroNodeSettingsRequest } from "./protobuf/grpc_pb";
 import { AvailabilityResult } from "./protobuf/pb_pb";
 /**
- * Haveno daemon client using gRPC.
+ * Haveno daemon client.
  */
 export default class HavenoClient {
     /**

dist/index.d.ts

@@ -1,3 +1,6 @@
 import HavenoClient from "./HavenoClient";
 import HavenoUtils from "./utils/HavenoUtils";
-export { HavenoClient, HavenoUtils };
+export { HavenoClient };
+export { HavenoUtils };
+export * from "./protobuf/grpc_pb";
+export * from "./protobuf/pb_pb";

dist/index.js

@@ -1,4 +1,9 @@
 import HavenoClient from "./HavenoClient";
 import HavenoUtils from "./utils/HavenoUtils";
-export { HavenoClient, HavenoUtils };
+export { HavenoClient };
+export { HavenoUtils };
+export * from "./protobuf/grpc_pb";
+export * from "./protobuf/pb_pb";
+//export { GetVersionRequest, GetVersionReply, IsAppInitializedRequest, IsAppInitializedReply, RegisterDisputeAgentRequest, MarketPriceRequest, MarketPriceReply, MarketPricesRequest, MarketPricesReply, MarketPriceInfo, MarketDepthRequest, MarketDepthReply, MarketDepthInfo, GetBalancesRequest, GetBalancesReply, XmrBalanceInfo, GetMyOfferRequest, GetMyOfferReply, GetOffersRequest, GetOffersReply, OfferInfo, GetPaymentMethodsRequest, GetPaymentMethodsReply, GetPaymentAccountFormRequest, CreatePaymentAccountRequest, CreatePaymentAccountReply, GetPaymentAccountFormReply, GetPaymentAccountsRequest, GetPaymentAccountsReply, CreateCryptoCurrencyPaymentAccountRequest, CreateCryptoCurrencyPaymentAccountReply, CreateOfferRequest, CreateOfferReply, CancelOfferRequest, TakeOfferRequest, TakeOfferReply, TradeInfo, GetTradeRequest, GetTradeReply, GetTradesRequest, GetTradesReply, GetNewDepositAddressRequest, GetNewDepositAddressReply, ConfirmPaymentStartedRequest, ConfirmPaymentReceivedRequest, XmrTx, GetXmrTxsRequest, GetXmrTxsReply, XmrDestination, CreateXmrTxRequest, CreateXmrTxReply, RelayXmrTxRequest, RelayXmrTxReply, CreateAccountRequest, AccountExistsRequest, AccountExistsReply, DeleteAccountRequest, OpenAccountRequest, IsAccountOpenRequest, IsAccountOpenReply, CloseAccountRequest, ChangePasswordRequest, BackupAccountRequest, BackupAccountReply, RestoreAccountRequest, StopRequest, NotificationMessage, RegisterNotificationListenerRequest, SendNotificationRequest, UrlConnection, AddConnectionRequest, RemoveConnectionRequest, GetConnectionRequest, GetConnectionsRequest, SetConnectionRequest, CheckConnectionRequest, CheckConnectionsReply, CheckConnectionsRequest, StartCheckingConnectionsRequest, StopCheckingConnectionsRequest, GetBestAvailableConnectionRequest, SetAutoSwitchRequest, CheckConnectionReply, GetConnectionsReply, GetConnectionReply, GetBestAvailableConnectionReply, GetDisputeRequest, GetDisputeReply, GetDisputesRequest, GetDisputesReply, OpenDisputeRequest, ResolveDisputeRequest, SendDisputeChatMessageRequest, SendChatMessageRequest, GetChatMessagesRequest, GetChatMessagesReply, StartMoneroNodeRequest, StopMoneroNodeRequest, IsMoneroNodeRunningRequest, IsMoneroNodeRunningReply, GetMoneroNodeSettingsRequest, GetMoneroNodeSettingsReply } from "./protobuf/grpc_pb";
+//export { PaymentMethod, PaymentAccount, AvailabilityResult, Attachment, DisputeResult, Dispute, ChatMessage, MoneroNodeSettings } from "./protobuf/pb_pb";
 //# sourceMappingURL=index.js.map

dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,WAAW,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,YAAY,EAAE,WAAW,EAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,WAAW,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,CAAC;AACvB,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,8vEAA8vE;AAC9vE,4JAA4J"}

package.json

@@ -8,7 +8,7 @@
   "scripts": {
     "prepare": "scripts/build_protobuf.sh",
     "pretest": "scripts/build_protobuf.sh",
-    "build": "tsc",
+    "build": "./scripts/build_dist.sh",
     "test": "jest ",
     "eslint": "eslint .",
     "eslintfix": "eslint src/* --fix",

scripts/build_dist.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# run typescript compiler
+tsc
+
+# copy protobuf models to dist
+mkdir -p dist/protobuf || exit 1
+cp src/protobuf/grpc_pb.d.ts dist/protobuf/grpc_pb.d.ts || exit 1
+cp src/protobuf/grpc_pb.js dist/protobuf/grpc_pb.js || exit 1
+cp src/protobuf/pb_pb.d.ts dist/protobuf/pb_pb.d.ts || exit 1
+cp src/protobuf/pb_pb.js dist/protobuf/pb_pb.js || exit 1

src/HavenoClient.test.ts

@@ -196,7 +196,7 @@ beforeAll(async () => {
   await arbitrator.registerDisputeAgent("arbitrator", TestConfig.devPrivilegePrivKey);
 
   // connect monero clients
-  monerod = await monerojs.connectToDaemonRpc(TestConfig.monerod.url, TestConfig.monerod.username, TestConfig.monerod.password);
+  monerod = await monerojs.connectToDaemonRpc(TestConfig.monerod.url, TestConfig.monerod.username, TestConfig.monerod.password, undefined, undefined, false);
   aliceWallet = await monerojs.connectToWalletRpc(TestConfig.startupHavenods[1].walletUrl, TestConfig.defaultHavenod.walletUsername, TestConfig.startupHavenods[1].accountPasswordRequired ? TestConfig.startupHavenods[1].accountPassword : TestConfig.defaultHavenod.walletDefaultPassword);
   bobWallet = await monerojs.connectToWalletRpc(TestConfig.startupHavenods[2].walletUrl, TestConfig.defaultHavenod.walletUsername, TestConfig.startupHavenods[2].accountPasswordRequired ? TestConfig.startupHavenods[2].accountPassword : TestConfig.defaultHavenod.walletDefaultPassword);
   
@@ -212,7 +212,6 @@ beforeEach(async () => {
 });
 
 afterAll(async () => {
-  monerod.worker.terminate(); // TODO (woodser): support terminating daemon and full wallet worker, e.g. daemon.disconnect()
   const promises = [];
   for (const havenod of startupHavenods) {
     if (havenod.getProcess()) promises.push(releaseHavenoProcess(havenod));

src/HavenoClient.ts

@@ -7,7 +7,7 @@ import { GetVersionRequest, GetVersionReply, IsAppInitializedRequest, IsAppIniti
 import { PaymentMethod, PaymentAccount, AvailabilityResult, Attachment, DisputeResult, Dispute, ChatMessage, MoneroNodeSettings } from "./protobuf/pb_pb";
 
 /**
- * Haveno daemon client using gRPC.
+ * Haveno daemon client.
  */
 export default class HavenoClient {
 

src/index.ts

@@ -1,4 +1,7 @@
 import HavenoClient from "./HavenoClient";
 import HavenoUtils from "./utils/HavenoUtils";
 
-export {HavenoClient, HavenoUtils}
+export { HavenoClient };
+export { HavenoUtils };
+export * from "./protobuf/grpc_pb";
+export * from "./protobuf/pb_pb";

tsconfig.json

@@ -22,6 +22,6 @@
     "isolatedModules": true,
     "jsx": "react-jsx"
   },
-  "include": ["src"],
+  "include": ["src/index.ts"],
   "exclude": ["node_modules", "**/*.test.ts"]
 }