JavaScript logs

FreeAPS/Resources/javascript/prepare/autosens.js

@@ -1,5 +1,9 @@
 // для settings/autosens.json параметры: monitor/glucose.json monitor/pumphistory-24h-zoned.json settings/basal_profile.json settings/profile.json monitor/carbhistory.json settings/temptargets.json
-var printLog = function(...args) {};
+var console = {
+    log: function(...args) { _consoleLog(args); },
+    error: function(...args) { _consoleLog(args); }
+};
+var printLog = function(...args) { console.log(args); };
 var process = { stderr: { write: printLog } };
 
 function generate(glucose_data, pumphistory_data, basalprofile, profile_data, carb_data = {}, temptarget_data = {}) {

FreeAPS/Resources/javascript/prepare/autotune-core.js

@@ -1,3 +1,8 @@
+var console = {
+    log: function(...args) { _consoleLog(args); },
+    error: function(...args) { _consoleLog(args); }
+};
+
 function generate(prepped_glucose_data,previous_autotune_data,pumpprofile_data){
   if (!pumpprofile_data.useCustomPeakTime) {
       previous_autotune_data.dia = pumpprofile_data.dia;

FreeAPS/Resources/javascript/prepare/autotune-prep.js

@@ -1,3 +1,8 @@
+var console = {
+    log: function(...args) { _consoleLog(args); },
+    error: function(...args) { _consoleLog(args); }
+};
+
 function generate(pumphistory_data,profile_data,glucose_data,pumpprofile_data,carb_data={ },categorize_uam_as_basal=false,tune_insulin_curve=false){
     if ( typeof(profile_data.carb_ratio) === 'undefined' || profile_data.carb_ratio < 2 ) {
         if ( typeof(pumpprofile_data.carb_ratio) === 'undefined' || pumpprofile_data.carb_ratio < 2 ) {

FreeAPS/Resources/javascript/prepare/determine-basal.js

@@ -1,5 +1,9 @@
 //для enact/smb-suggested.json параметры: monitor/iob.json monitor/temp_basal.json monitor/glucose.json settings/profile.json settings/autosens.json --meal monitor/meal.json --microbolus --reservoir monitor/reservoir.json
-var printLog = function(...args) {};
+var console = {
+    log: function(...args) { _consoleLog(args); },
+    error: function(...args) { _consoleLog(args); }
+};
+var printLog = function(...args) { console.log(args); };
 var process = { stderr: { write: printLog } };
 
 

FreeAPS/Resources/javascript/prepare/iob.js

@@ -1,4 +1,9 @@
 //для monitor/iob.json параметры: monitor/pumphistory-24h-zoned.json settings/profile.json monitor/clock-zoned.json settings/autosens.json
+var console = {
+    log: function(...args) { _consoleLog(args); },
+    error: function(...args) { _consoleLog(args); }
+};
+
 function generate(pumphistory_data, profile_data, clock_data, autosens_data = null){
     var inputs = {
         history: pumphistory_data

FreeAPS/Resources/javascript/prepare/meal.js

@@ -1,4 +1,9 @@
 //для monitor/meal.json параметры: monitor/pumphistory-24h-zoned.json settings/profile.json monitor/clock-zoned.json monitor/glucose.json settings/basal_profile.json monitor/carbhistory.json
+var console = {
+    log: function(...args) { _consoleLog(args); },
+    error: function(...args) { _consoleLog(args); }
+};
+
 function generate(pumphistory_data, profile_data, clock_data, glucose_data, basalprofile_data, carbhistory = false){
     if ( typeof(profile_data.carb_ratio) === 'undefined' || profile_data.carb_ratio < 3 ) {
         return {"error":"Error: carb_ratio " + profile_data.carb_ratio + " out of bounds"};

FreeAPS/Resources/javascript/prepare/profile.js

@@ -1,5 +1,10 @@
 //для pumpprofile.json параметры: settings/settings.json settings/bg_targets.json settings/insulin_sensitivities.json settings/basal_profile.json preferences.json settings/carb_ratios.json settings/temptargets.json settings/model.json
 //для profile.json параметры: settings/settings.json settings/bg_targets.json settings/insulin_sensitivities.json settings/basal_profile.json preferences.json settings/carb_ratios.json settings/temptargets.json settings/model.json settings/autotune.json
+var console = {
+    log: function(...args) { _consoleLog(args); },
+    error: function(...args) { _consoleLog(args); }
+};
+
 function generate(pumpsettings_data, bgtargets_data, isf_data, basalprofile_data, preferences_input = false, carbratio_input = false, temptargets_input = false, model_input = false, autotune_input = false){
     if (bgtargets_data.units !== 'mg/dL') {
         if (bgtargets_data.units === 'mmol/L') {

FreeAPS/Sources/APS/OpenAPS/JavaScriptWorker.swift

@@ -19,6 +19,14 @@ final class JavaScriptWorker {
                 warning(.openAPS, "JavaScript Error: \(error)")
             }
         }
+        let consoleLog: @convention(block) (String) -> Void = { message in
+            debug(.openAPS, "JavaScript log: \(message)")
+        }
+
+        context.setObject(
+            consoleLog,
+            forKeyedSubscript: "_consoleLog" as NSString
+        )
         return context
     }
 

FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -15,6 +15,7 @@ final class OpenAPS {
     func determineBasal(currentTemp: TempBasal, clock: Date = Date()) -> Future<Suggestion?, Never> {
         Future { promise in
             self.processQueue.async {
+                debug(.openAPS, "Start determineBasal")
                 // clock
                 self.storage.save(clock, as: Monitor.clock)
 
@@ -80,6 +81,7 @@ final class OpenAPS {
     func autosense() -> Future<Autosens?, Never> {
         Future { promise in
             self.processQueue.async {
+                debug(.openAPS, "Start autosens")
                 let pumpHistory = self.loadFileFromStorage(name: OpenAPS.Monitor.pumpHistory)
                 let carbs = self.loadFileFromStorage(name: Monitor.carbHistory)
                 let glucose = self.loadFileFromStorage(name: Monitor.glucose)
@@ -110,6 +112,7 @@ final class OpenAPS {
     func autotune(categorizeUamAsBasal: Bool = false, tuneInsulinCurve: Bool = false) -> Future<Autotune?, Never> {
         Future { promise in
             self.processQueue.async {
+                debug(.openAPS, "Start autotune")
                 let pumpHistory = self.loadFileFromStorage(name: OpenAPS.Monitor.pumpHistory)
                 let glucose = self.loadFileFromStorage(name: Monitor.glucose)
                 let profile = self.loadFileFromStorage(name: Settings.profile)
@@ -146,6 +149,7 @@ final class OpenAPS {
 
     func makeProfiles(useAutotune: Bool) -> Future<Autotune?, Never> {
         Future { promise in
+            debug(.openAPS, "Start makeProfiles")
             self.processQueue.async {
                 var preferences = self.loadFileFromStorage(name: Settings.preferences)
                 if preferences.isEmpty {