Handle UTF8 strings better when JSON encoding

.github/workflows/playwright.yml

@@ -53,6 +53,7 @@ jobs:
         shell: 'script -q -e -c "bash {0}"'
         run: |
           docker ps
+          docker logs cosmos_openc3-cosmos-init_1
           docker logs cosmos_openc3-operator_1
         # Build a test plugin for playwright and a copy so we can 'upgrade'
       - name: Build plugin

openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/src/tools/ScriptRunner/ScriptRunner.vue

@@ -16,7 +16,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 -->
 
@@ -1664,7 +1664,8 @@ export default {
       this.showSaveAs = true
     },
     saveAsFilename(filename) {
-      this.filename = filename
+      this.filename = filename.split('*')[0]
+      this.currentFilename = null
       if (this.tempFilename) {
         Api.post(`/script-api/scripts/${this.tempFilename}/delete`)
         this.tempFilename = null

openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/FileOpenSaveDialog.vue

@@ -16,7 +16,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 -->
 
@@ -265,8 +265,8 @@ export default {
       return found
     },
     success: function () {
-      // Only process the success call if a file is selected
-      if (this.selectedFile !== null) {
+      // Only process the success call if a file is selected and no error
+      if ((this.selectedFile !== null) && (this.error === null)) {
         if (this.type === 'open') {
           this.openSuccess()
         } else {

openc3-cosmos-script-runner-api/app/models/running_script.rb

@@ -141,11 +141,12 @@ def start(procedure_name)
           # Use cached instrumentation
           instrumented_script = instrumented_cache
           cached = true
-          OpenC3::Store.publish(["script-api", "running-script-channel:#{RunningScript.instance.id}"].compact.join(":"), JSON.generate({ type: :file, filename: procedure_name, text: text, breakpoints: breakpoints }))
+          OpenC3::Store.publish(["script-api", "running-script-channel:#{RunningScript.instance.id}"].compact.join(":"), JSON.generate({ type: :file, filename: procedure_name, text: text.to_utf8, breakpoints: breakpoints }))
         else
           # Retrieve file
           text = ::Script.body(RunningScript.instance.scope, procedure_name)
-          OpenC3::Store.publish(["script-api", "running-script-channel:#{RunningScript.instance.id}"].compact.join(":"), JSON.generate({ type: :file, filename: procedure_name, text: text, breakpoints: breakpoints }))
+          raise "Unable to retrieve: #{procedure_name}" unless text
+          OpenC3::Store.publish(["script-api", "running-script-channel:#{RunningScript.instance.id}"].compact.join(":"), JSON.generate({ type: :file, filename: procedure_name, text: text.to_utf8, breakpoints: breakpoints }))
 
           # Cache instrumentation into RAM
           instrumented_script = RunningScript.instrument_script(text, path, true)
@@ -403,7 +404,7 @@ def initialize(id, scope, name, disconnect)
     breakpoints = @@breakpoints[filename]&.filter { |_, present| present }&.map { |line_number, _| line_number - 1 } # -1 because frontend lines are 0-indexed
     breakpoints ||= []
     OpenC3::Store.publish(["script-api", "running-script-channel:#{@id}"].compact.join(":"),
-                          JSON.generate({ type: :file, filename: @filename, scope: @scope, text: @body, breakpoints: breakpoints }))
+                          JSON.generate({ type: :file, filename: @filename, scope: @scope, text: @body.to_utf8, breakpoints: breakpoints }))
     if name.include?("suite")
       # Process the suite file in this context so we can load it
       # TODO: Do we need to worry about success or failure of the suite processing?
@@ -1300,12 +1301,12 @@ def load_file_into_script(filename)
     if cached
       # @active_script.setPlainText(cached.gsub("\r", ''))
       @body = cached
-      OpenC3::Store.publish(["script-api", "running-script-channel:#{@id}"].compact.join(":"), JSON.generate({ type: :file, filename: filename, text: @body, breakpoints: breakpoints }))
+      OpenC3::Store.publish(["script-api", "running-script-channel:#{@id}"].compact.join(":"), JSON.generate({ type: :file, filename: filename, text: @body.to_utf8, breakpoints: breakpoints }))
     else
       text = ::Script.body(@scope, filename)
       @@file_cache[filename] = text
       @body = text
-      OpenC3::Store.publish(["script-api", "running-script-channel:#{@id}"].compact.join(":"), JSON.generate({ type: :file, filename: filename, text: @body, breakpoints: breakpoints }))
+      OpenC3::Store.publish(["script-api", "running-script-channel:#{@id}"].compact.join(":"), JSON.generate({ type: :file, filename: filename, text: @body.to_utf8, breakpoints: breakpoints }))
     end
 
     # @active_script.stop_highlight

openc3/lib/openc3/io/json_rpc.rb

@@ -17,11 +17,12 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'json'
 require 'date'
+require 'openc3/core_ext/string'
 
 class Object
   def as_json(options = nil) #:nodoc:
@@ -57,10 +58,11 @@ class String
   NON_ASCII_PRINTABLE = /[^\x21-\x7e\s]/
 
   def as_json(options = nil)
-    if NON_ASCII_PRINTABLE.match?(self)
-      self.to_json_raw_object
+    as_utf8 = self.dup.force_encoding('UTF-8')
+    if as_utf8.valid_encoding?
+      return as_utf8
     else
-      self
+      return self.to_json_raw_object
     end
   end #:nodoc:
 end