Merge pull request #1930 from OpenC3/bigint

jmthomas · web-flow · commit 802ea9b0fd9e · 2025-03-01T15:01:33.000-07:00
Support 64 bit ints in CommandSender
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/cmd_tlm/inst_cmds.txt b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/cmd_tlm/inst_cmds.txt
@@ -33,6 +33,7 @@ COMMAND <%= target_name %> SETPARAMS BIG_ENDIAN "Sets numbered parameters"
     APPEND_PARAMETER VALUE<%= i %> 16 UINT 0 5 1 "Value <%= i %> setting" LITTLE_ENDIAN
     RELATED_ITEM <%= target_name %> PARAMS VALUE<%= i %>
   <% end %>
+  APPEND_PARAMETER BIGINT 64 UINT MIN MAX 0 "UINT 64 parameter"
   SCREEN <%= target_name %> PARAMS
 
   SELECT_PARAMETER VALUE5
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/cmd_tlm/inst_tlm.txt b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/cmd_tlm/inst_tlm.txt
@@ -136,11 +136,11 @@ TELEMETRY <%= target_name %> PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
       STATE BAD 1 RED
   <% end %>
   APPEND_ITEM IP_ADDRESS   32 UINT "Encoded IP Address"
-  APPEND_ITEM P_2.2,2      32 UINT "Test weird characters"
-  APPEND_ITEM P-3+3=3      32 UINT "Test weird characters"
-  APPEND_ITEM P4!@#$%^&*?  32 UINT "Test weird characters"
-  APPEND_ITEM P</5|\>      32 UINT "Test weird characters"
-  APPEND_ITEM P(:6;)       32 UINT "Test weird characters"
+  APPEND_ITEM P_2.2,2      64 INT "Test weird characters"
+  APPEND_ITEM P-3+3=3      64 INT "Test weird characters"
+  APPEND_ITEM P4!@#$%^&*?  64 UINT "Test weird characters"
+  APPEND_ITEM P</5|\>      64 UINT "Test weird characters"
+  APPEND_ITEM P(:6;)       64 UINT "Test weird characters"
   ITEM PACKET_TIME 0 0 DERIVED "Ruby time based on TIMESEC and TIMEUS"
     READ_CONVERSION unix_time_conversion.rb TIMESEC TIMEUS
 
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/lib/sim_inst.rb b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/lib/sim_inst.rb
@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2024, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -25,6 +25,7 @@
 require 'openc3'
 require 'stringio'
 require 'base64'
+require 'openc3/accessors/binary_accessor'
 
 module OpenC3
   # Simulated instrument for the demo. Populates several packets and cycles
@@ -111,11 +112,11 @@ def initialize(target_name)
       packet.value3 = 2
       packet.value4 = 1
       packet.value5 = 0
-      packet.write('P_2.2,2', 2)
-      packet.write('P-3+3=3', 3)
-      packet.write('P4!@#$%^&*?', 4)
-      packet.write('P</5|\>', 5)
-      packet.write('P(:6;)', 6)
+      packet.write('P_2.2,2', BinaryAccessor::MIN_INT64)
+      packet.write('P-3+3=3', BinaryAccessor::MAX_INT64)
+      packet.write('P4!@#$%^&*?', 0)
+      packet.write('P</5|\>', 1740684371613049856)
+      packet.write('P(:6;)', BinaryAccessor::MAX_UINT64)
 
       packet = @tlm_packets['IMAGE']
       packet.enable_method_missing
@@ -196,6 +197,7 @@ def write(packet)
         params_packet.value3 = packet.read('value3')
         params_packet.value4 = packet.read('value4')
         params_packet.value5 = packet.read('value5')
+        params_packet.write('P4!@#$%^&*?', packet.read('bigint'))
       when 'ASCIICMD'
         hs_packet.cmd_acpt_cnt += 1
         hs_packet.asciicmd = packet.read('string')
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/cmd_tlm/inst_cmds.txt b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/cmd_tlm/inst_cmds.txt
@@ -33,6 +33,7 @@ COMMAND <%= target_name %> SETPARAMS BIG_ENDIAN "Sets numbered parameters"
     APPEND_PARAMETER VALUE<%= i %> 16 UINT 0 5 1 "Value <%= i %> setting" LITTLE_ENDIAN
     RELATED_ITEM <%= target_name %> PARAMS VALUE<%= i %>
   <% end %>
+  APPEND_PARAMETER BIGINT 64 UINT MIN MAX 0 "UINT 64 parameter"
   SCREEN <%= target_name %> PARAMS
 
   SELECT_PARAMETER VALUE5
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/cmd_tlm/inst_tlm.txt b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/cmd_tlm/inst_tlm.txt
@@ -128,11 +128,11 @@ TELEMETRY <%= target_name %> PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
       STATE BAD 1 RED
   <% end %>
   APPEND_ITEM IP_ADDRESS   32 UINT "Encoded IP Address"
-  APPEND_ITEM P_2.2,2      32 UINT "Test weird characters"
-  APPEND_ITEM P-3+3=3      32 UINT "Test weird characters"
-  APPEND_ITEM P4!@#$%^&*?  32 UINT "Test weird characters"
-  APPEND_ITEM P</5|\>      32 UINT "Test weird characters"
-  APPEND_ITEM P(:6;)       32 UINT "Test weird characters"
+  APPEND_ITEM P_2.2,2      64 INT "Test weird characters"
+  APPEND_ITEM P-3+3=3      64 INT "Test weird characters"
+  APPEND_ITEM P4!@#$%^&*?  64 UINT "Test weird characters"
+  APPEND_ITEM P</5|\>      64 UINT "Test weird characters"
+  APPEND_ITEM P(:6;)       64 UINT "Test weird characters"
   ITEM PACKET_TIME 0 0 DERIVED "Python time based on TIMESEC and TIMEUS"
     READ_CONVERSION openc3/conversions/unix_time_conversion.py TIMESEC TIMEUS
 
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/lib/sim_inst.py b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/lib/sim_inst.py
@@ -1,4 +1,4 @@
-# Copyright 2024 OpenC3, Inc.
+# Copyright 2025 OpenC3, Inc.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -25,6 +25,7 @@
 from openc3.packets.packet import Packet
 from openc3.system.system import System
 from openc3.top_level import kill_thread
+from openc3.accessors.binary_accessor import BinaryAccessor
 
 
 # Simulated instrument for the demo. Populates several packets and cycles
@@ -114,11 +115,11 @@ def __init__(self, target_name):
         packet.write("value3", 2)
         packet.write("value4", 1)
         packet.write("value5", 0)
-        packet.write('P_2.2,2', 2)
-        packet.write('P-3+3=3', 3)
-        packet.write('P4!@#$%^&*?', 4)
-        packet.write('P</5|\>', 5)
-        packet.write('P(:6;)', 6)
+        packet.write('P_2.2,2', BinaryAccessor.MIN_INT64)
+        packet.write('P-3+3=3', BinaryAccessor.MAX_INT64)
+        packet.write('P4!@#$%^&*?', 0)
+        packet.write('P</5|\>', 1740684371613049856)
+        packet.write('P(:6;)', BinaryAccessor.MAX_UINT64)
 
         packet = self.tlm_packets["IMAGE"]
         packet.write("CcsdsSeqFlags", "NOGROUP")
@@ -187,6 +188,7 @@ def write(self, packet):
                 params_packet.write("value3", packet.read("value3"))
                 params_packet.write("value4", packet.read("value4"))
                 params_packet.write("value5", packet.read("value5"))
+                params_packet.write('P4!@#$%^&*?', packet.read('bigint'))
             case "ASCIICMD":
                 hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
                 hs_packet.write("asciicmd", packet.read("string"))
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/src/tools/CommandSender/CommandSender.vue b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/src/tools/CommandSender/CommandSender.vue
@@ -13,7 +13,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2024, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -184,7 +184,9 @@
         <v-card-text class="mt-6">
           Warning: Command {{ hazardousCommand }} is Hazardous. Send?
           <br />
-          <span class="openc3-yellow"> Description: {{ commandDescription }} </span>
+          <span class="openc3-yellow">
+            Description: {{ commandDescription }}
+          </span>
         </v-card-text>
         <v-card-actions class="px-2">
           <v-spacer />
@@ -491,7 +493,13 @@ export default {
           } else if (this.isFloat(str)) {
             return parseFloat(str)
           } else if (this.isInt(str)) {
-            return parseInt(str)
+            // If this is a number that is too large for a JS number
+            // then we convert it to a BigInt which gets serialized in openc3Api.js
+            if (!Number.isSafeInteger(Number(str))) {
+              return BigInt(str)
+            } else {
+              return parseInt(str)
+            }
           } else if (this.isArray(str)) {
             return eval(str)
           } else {
@@ -576,10 +584,14 @@ export default {
                     // This is basically to handle the FLOAT MIN and MAX so they
                     // don't print out the huge exponential
                     if (parameter.minimum < -1e6) {
-                      parameter.minimum = parameter.minimum.toExponential(3)
+                      if (Number.isSafeInteger(parameter.minimum)) {
+                        parameter.minimum = parameter.minimum.toExponential(3)
+                      }
                     }
                     if (parameter.maximum > 1e6) {
-                      parameter.maximum = parameter.maximum.toExponential(3)
+                      if (Number.isSafeInteger(parameter.maximum)) {
+                        parameter.maximum = parameter.maximum.toExponential(3)
+                      }
                     }
                   }
                   range = `${parameter.minimum}..${parameter.maximum}`
diff --git a/openc3-cosmos-init/plugins/packages/openc3-js-common/package.json b/openc3-cosmos-init/plugins/packages/openc3-js-common/package.json
@@ -51,7 +51,8 @@
     "sass": "1.85.0",
     "sortablejs": "1.15.6",
     "sprintf-js": "1.1.3",
-    "uplot": "1.6.31"
+    "uplot": "1.6.31",
+    "lossless-json": "4.0.2"
   },
   "devDependencies": {
     "eslint": "9.20.1",
diff --git a/openc3-cosmos-init/plugins/packages/openc3-js-common/src/services/openc3Api.js b/openc3-cosmos-init/plugins/packages/openc3-js-common/src/services/openc3Api.js
@@ -21,7 +21,12 @@
 */
 
 import axios from './axios.js'
+import { parse, stringify, isSafeNumber } from 'lossless-json'
 
+// parse huge integer values into a bigint, and use a regular number otherwise
+export function customNumberParser(value) {
+  return isSafeNumber(value) ? parseFloat(value) : BigInt(value)
+}
 export default class OpenC3Api {
   id = 1
 
@@ -67,6 +72,19 @@ export default class OpenC3Api {
             ...headerOptions,
           },
           timeout: timeout,
+          transformRequest: [
+            (data, headers) => {
+              // stringify the data with lossless-json
+              return stringify(data)
+            },
+          ],
+          transformResponse: [
+            (data) => {
+              // parse the data with lossless-json ensuring that large numbers are parsed as BigInts
+              // but all other numbers are parsed as regular numbers
+              return parse(data, undefined, customNumberParser)
+            },
+          ],
         },
       )
       // let data = response.data
diff --git a/openc3/spec/api/router_api_spec.rb b/openc3/spec/api/router_api_spec.rb
@@ -71,7 +71,7 @@ class ApiTest
         expect(router).to be_a Hash
         expect(router['name']).to eql "ROUTE_INT"
         # Verify it also includes the status
-        expect(router['state']).to eql "CONNECTED"
+        expect(router['state']).to match(/CONNECTED|ATTEMPTING/)
         expect(router['clients']).to eql 0
       end
     end
diff --git a/playwright/tests/command-sender.spec.ts b/playwright/tests/command-sender.spec.ts
