Rename Domains.network_mode to Domains.automatic_networking which is

what the existing domain-server code uses. Update documentation to remove "network_mode" and replace with "automatic_networking"
vircadia · Nov 3, 2020 · ec220c2 · ec220c2
1 parent 2928148
commit ec220c2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/docs/API-Domains.md b/docs/API-Domains.md
@@ -30,7 +30,7 @@ A request returns an array of domain descriptions:
                   "version": stringSoftwareVersion,
                   "protocol_version": stringProtocolVersion,
                   "network_address": stringNetworkAddress,
-                  "networking_mode": stringMode,  // one of "full", ...
+                  "automatic_networking": stringMode,  // one of "full", "ip", or "disabled"
                   "restricted": boolWhetherRestricted,
                   "num_users": intCurrentLoggedInUsers,
                   "anon_users": intCurrentAnonomousUsers,
@@ -141,7 +141,7 @@ The domain fields that can be fetched:
 | version       |    all   | domain     | string |
 | protocol      |    all   | domain     | string |
 | network_address |  all   | domain     | string |
-| networking_mode |  all   | domain     | string |
+| automatic_networking |  all   | domain     | string |
 | num_users     |    all   | domain     | string |
 | num_anon_users |   all   | domain     | string |
 | restricted    |    all   | domain sponsor admin | string |

diff --git a/src/Entities/DomainEntity.ts b/src/Entities/DomainEntity.ts
@@ -39,8 +39,7 @@ export class DomainEntity implements Entity {
   public protocol: string;     // Protocol version
   public networkAddr: string;  // reported network address
   public networkPort: string;  // reported network address
-  public networkingMode: string;   // one of "full", ?
-  public automaticNetworking: string;   // one of "disabled", ?
+  public networkingMode: string;   // one of "full", "ip", "disabled"
   public restricted: boolean;  // 'true' if restricted to users with accounts
   public numUsers: number;     // regular users logged in
   public anonUsers: number;    // number of anonymous users
@@ -191,17 +190,8 @@ export const domainFields: { [key: string]: FieldDefn } = {
     getter: simpleGetter
   },
   'automatic_networking': {
-    entity_field: 'automaticNetworking',
-    request_field_name: 'automatic_networking',
-    get_permissions: [ 'all' ],
-    set_permissions: [ 'domain' ],
-    validate: isStringValidator,
-    setter: simpleSetter,
-    getter: simpleGetter
-  },
-  'networking_mode': {
     entity_field: 'networkingMode',
-    request_field_name: 'networking_mode',
+    request_field_name: 'automatic_networking',
     get_permissions: [ 'all' ],
     set_permissions: [ 'domain' ],
     validate: isStringValidator,

diff --git a/src/route-tools/Util.ts b/src/route-tools/Util.ts
@@ -153,8 +153,7 @@ export async function buildDomainInfoV1(pDomain: DomainEntity): Promise<any> {
     'protocol_version': pDomain.protocol,
     'network_address': pDomain.networkAddr,
     'network_port': pDomain.networkPort,
-    'networking_mode': pDomain.networkingMode,
-    'automatic_networking': pDomain.automaticNetworking,
+    'automatic_networking': pDomain.networkingMode,
     'restricted': pDomain.restricted,
     'num_users': pDomain.numUsers,
     'anon_users': pDomain.anonUsers,