wattetheria 0.3.4 → 0.3.5

package/README.md

@@ -557,10 +557,10 @@ native `wattetheria-client-cli`; installed release packages should not require R
 machine. The JS wrapper resolves `WATTETHERIA_CLI_BIN` first, then the matching optional native
 package such as `@wattetheria/cli-win32-x64`, then `bin/native/<platform>-<arch>/`, then `PATH`.
 `identity` and `wallet` are lightweight local setup commands for ServiceNet publishing and wallet
-binding when no local Wattetheria node identity or wallet exists. If a local node already has
-identity or wallet state, the wrapper refuses to create a separate local identity or wallet through
-those setup commands. ServiceNet commands can still run through an installed node when no host
-native CLI is available.
+binding before a local Wattetheria node is installed. If a local node deployment is already
+installed, the wrapper refuses `identity` and `wallet` commands so users do not create or modify a
+separate local identity or wallet outside the node. ServiceNet commands can still run through an
+installed node when no host native CLI is available.
 
 NPM publish flow:
 

package/lib/cli.js

@@ -1344,36 +1344,6 @@ function missingNativeCliError(commandName) {
   );
 }
 
-function forwardedSubcommand(rawArgv) {
-  for (let index = 1; index < rawArgv.length; index += 1) {
-    const arg = rawArgv[index];
-    if (arg.startsWith("-")) {
-      if (!arg.includes("=")) {
-        index += 1;
-      }
-      continue;
-    }
-    return arg;
-  }
-  return "";
-}
-
-function isIdentityWriteCommand(commandName, rawArgv) {
-  return commandName === "identity" && forwardedSubcommand(rawArgv) === "init";
-}
-
-function isWalletWriteCommand(commandName, rawArgv) {
-  if (commandName !== "wallet") {
-    return false;
-  }
-  return new Set([
-    "create-payment-account",
-    "import-payment-account",
-    "watch-payment-account",
-    "bind-payment-account"
-  ]).has(forwardedSubcommand(rawArgv));
-}
-
 function installedNodeArtifacts(deployment = deploymentState()) {
   return {
     identityPath: path.join(deployment.stateDir, "identity.json"),
@@ -1382,60 +1352,46 @@ function installedNodeArtifacts(deployment = deploymentState()) {
   };
 }
 
-function explicitDataDir(rawArgv) {
-  const option = parsePathOption(rawArgv, "--data-dir", 1);
-  if (!option) {
-    return "";
-  }
-  if (!option.value) {
-    throw new Error("Missing value for --data-dir");
-  }
-  return path.resolve(option.value);
-}
-
-function usesSeparateDataDir(rawArgv, deployment) {
-  const dataDir = explicitDataDir(rawArgv);
-  return Boolean(dataDir) && dataDir !== path.resolve(deployment.stateDir);
+function isLightweightLocalCommand(commandName) {
+  return commandName === "identity" || commandName === "wallet";
 }
 
-function ensureLightweightCommandAllowed(commandName, rawArgv) {
-  if (!(isIdentityWriteCommand(commandName, rawArgv) || isWalletWriteCommand(commandName, rawArgv))) {
+function ensureLightweightCommandAllowed(commandName) {
+  if (!isLightweightLocalCommand(commandName)) {
     return;
   }
   const deployment = deploymentState();
-  if (!deployment.installed || usesSeparateDataDir(rawArgv, deployment)) {
+  if (!deployment.installed) {
     return;
   }
   const artifacts = installedNodeArtifacts(deployment);
-  if (isIdentityWriteCommand(commandName, rawArgv) && fs.existsSync(artifacts.identityPath)) {
+  if (commandName === "identity") {
     throw new Error(
       [
-        "Refusing to initialize a separate local identity.",
+        "Refusing to run a separate local identity command.",
         "",
-        "A local Wattetheria node is already installed and has an identity at:",
+        fs.existsSync(artifacts.identityPath)
+          ? "A local Wattetheria node is already installed and has an identity at:"
+          : "A local Wattetheria node is already installed at:",
         deployment.stateDir,
         "",
-        "`wattetheria identity init` is only for lightweight local setup when no Wattetheria",
-        "node identity exists. Use the installed node's identity instead, or choose a separate",
-        "data directory only for isolated testing."
+        "`wattetheria identity` is only for lightweight local setup when no Wattetheria",
+        "node is installed. Use the installed node's identity instead."
       ].join("\n")
     );
   }
-  if (
-    isWalletWriteCommand(commandName, rawArgv)
-    && fs.existsSync(artifacts.walletMetadataPath)
-    && fs.existsSync(artifacts.walletKeystorePath)
-  ) {
+  if (commandName === "wallet") {
     throw new Error(
       [
-        "Refusing to modify a separate local wallet.",
+        "Refusing to run a separate local wallet command.",
         "",
-        "A local Wattetheria node is already installed and has wallet state at:",
+        fs.existsSync(artifacts.walletMetadataPath) && fs.existsSync(artifacts.walletKeystorePath)
+          ? "A local Wattetheria node is already installed and has wallet state at:"
+          : "A local Wattetheria node is already installed at:",
         deployment.stateDir,
         "",
-        "`wattetheria wallet` setup commands are only for lightweight local setup when no",
-        "Wattetheria node wallet exists. Use the installed node's wallet instead, or choose a",
-        "separate data directory only for isolated testing."
+        "`wattetheria wallet` is only for lightweight local setup when no Wattetheria",
+        "node is installed. Use the installed node's wallet instead."
       ].join("\n")
     );
   }
@@ -1670,7 +1626,7 @@ function runInstalledNodeCli(commandName, rawArgv, deployment) {
 }
 
 function forwardToRustBinary(commandName, rawArgv) {
-  ensureLightweightCommandAllowed(commandName, rawArgv);
+  ensureLightweightCommandAllowed(commandName);
 
   // Only the Rust binary name is allowed here. The bare `wattetheria` name
   // resolves to this JS shim on most user PATHs (via the npm bin link), so

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattetheria",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Wattetheria deployment CLI",
   "license": "Apache-2.0",
   "type": "commonjs",