Some more bank interfaces

benbernard · Oct 9, 2019 · cb5925a · cb5925a
1 parent d4c1a02
commit cb5925a
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 18 deletions.
diff --git a/netrun/bernard/bank-io.js b/netrun/bernard/bank-io.js
@@ -5,25 +5,52 @@ import {convertStrToMoney} from "./utils.js";
 class ThisScript extends TK.Script {
   async perform() {
     let bank = new BankMessaging(this.ns);
+    this.bank = bank;
 
     let action = this.pullFirstArg();
 
     if (action === "info") {
       let response = await bank.walletInfo(this.args[0]);
-      this.tlog(
-        `Wallet: ${response.name}, portion: ${
-          response.portion
-        }, amount: ${this.cFormat(response.amount)}`
-      );
+      this.tlog(this.formatWallet(response));
     } else if (action === "deposit") {
       let wallet = this.args[0];
       let amount = convertStrToMoney(this.args[1]);
 
       this.tlog(`Depositing Amount: ${this.cFormat(amount)} to: ${wallet}`);
       let response = await bank.deposit(wallet, amount);
       this.tlog(`Deposit Response: ${JSON.stringify(response)}`);
+    } else if (action === "set") {
+      let sets = [];
+      for (let arg of this.args) {
+        let [name, amount] = arg.split("=");
+        sets.push([name, convertStrToMoney(amount)]);
+      }
+      let response = await bank.setBalances(sets);
+      this.tlog(`Set Balance Response: ${JSON.stringify(response)}`);
+      await this.printAllWallets();
+    } else if (action === "all" || action === "infos") {
+      await this.printAllWallets();
+    } else if (action === "clear" || action === "infos") {
+      let response = await bank.clear();
+      this.tlog(`Clear response: ${JSON.stringify(response)}`);
+      await this.printAllWallets();
+    } else {
+      this.tlog(`Unkown bank request: ${action}`);
     }
   }
+
+  async printAllWallets() {
+    let wallets = (await this.bank.allWallets()).wallets;
+    wallets.forEach(wallet => {
+      this.tlog(this.formatWallet(wallet));
+    });
+  }
+
+  formatWallet(wallet) {
+    return `Wallet: ${wallet.name}, portion: ${
+      wallet.portion
+    }, amount: ${this.cFormat(wallet.amount)}`;
+  }
 }
 
 export let main = ThisScript.runner();
diff --git a/netrun/bernard/bank.js b/netrun/bernard/bank.js
@@ -86,6 +86,29 @@ class ThisScript extends TK.Script {
       let wallet = this.wallet(req.data.wallet);
       let amount = req.data.amount;
       this.deposit(wallet, amount, req);
+    } else if (type === BankMessaging.SET_BALANCES) {
+      let amountSum = this.walletTotal();
+      for (let [name, amount] of req.data.sets) {
+        let wallet = this.wallet(name);
+        amountSum = amountSum - wallet.amount + amount;
+      }
+
+      let success = false;
+      if (amountSum < this.actualMoney()) {
+        success = true;
+
+        for (let [name, amount] of req.data.sets) {
+          let wallet = this.wallet(name);
+          wallet.amount = amount;
+        }
+      }
+
+      this.messaging.sendResponse(req, {success});
+    } else if (type === BankMessaging.ALL_WALLETS) {
+      return this.messaging.sendResponse(req, {wallets: this.wallets});
+    } else if (type === BankMessaging.CLEAR) {
+      this.initializeState();
+      this.messaging.sendResponse(req, {success: true});
     } else {
       this.tlog(`Bank received unknown message type: ${type}`);
     }
@@ -102,8 +125,12 @@ class ThisScript extends TK.Script {
     this.messaging.sendResponse(req, {success: true});
   }
 
+  walletTotal() {
+    return this.wallets.reduce((sum, e) => e.amount + sum, 0);
+  }
+
   unallocatedMoney() {
-    let walletTotal = this.wallets.reduce((sum, e) => e.amount + sum, 0);
+    let walletTotal = this.walletTotal();
     return this.actualMoney() - walletTotal;
   }
 

diff --git a/netrun/bernard/baseScript.js b/netrun/bernard/baseScript.js
@@ -20,6 +20,17 @@ export class NSObject {
     }
   }
 
+  uuid() {
+    return (
+      Math.random()
+        .toString(36)
+        .substring(2, 15) +
+      Math.random()
+        .toString(36)
+        .substring(2, 15)
+    );
+  }
+
   tlog(...msgs) {
     this.ns.tprint(msgs.join(" "));
   }

diff --git a/netrun/bernard/gangs.js b/netrun/bernard/gangs.js
@@ -34,7 +34,7 @@ export class Gang extends GangNSObject {
   }
 
   recruit() {
-    let name = `Member-${this.memberCount()}`;
+    let name = `Member-${this.uuid()}`;
     let result = this.gang.recruitMember(name);
     if (!result) throw new Error(`Could not recruit ${name}`);
 

diff --git a/netrun/bernard/messaging.js b/netrun/bernard/messaging.js
@@ -18,17 +18,6 @@ export class Messaging extends NSObject {
     return this.ns.getPortHandle(this.responsePort);
   }
 
-  uuid() {
-    return (
-      Math.random()
-        .toString(36)
-        .substring(2, 15) +
-      Math.random()
-        .toString(36)
-        .substring(2, 15)
-    );
-  }
-
   createMessage(data, metadata = {}) {
     return {
       uuid: this.uuid(),
@@ -114,9 +103,29 @@ export class BankMessaging extends Messaging {
       amount,
     });
   }
+
+  // Pairs of wallet name and amount to set to
+  setBalances(pairs) {
+    return this.sendAndWait({
+      type: BankMessaging.SET_BALANCES,
+      sets: pairs,
+    });
+  }
+
+  allWallets() {
+    return this.sendAndWait({type: BankMessaging.ALL_WALLETS});
+  }
+
+  clear() {
+    return this.sendAndWait({type: BankMessaging.CLEAR});
+  }
 }
 
+// Message types
 BankMessaging.WALLET_INFO = "wallet_info";
 BankMessaging.PURCHASE_SERVER = "purchase_server";
 BankMessaging.PURCHASE_EQUIPMENT = "purchase_equipment";
 BankMessaging.DEPOSIT = "deposit";
+BankMessaging.SET_BALANCES = "set_balances";
+BankMessaging.ALL_WALLETS = "all_wallets";
+BankMessaging.CLEAR = "clear";