Merge pull request #395 from permaweb/twilson63/fix-add-inbox-msg-boo…

…tloader

Twilson63/fix add inbox msg bootloader

README.md

@@ -6,9 +6,9 @@
 
 
 Version: 2.0.1
-Module: `oKBlsMP3UWrAUURWUzGO4ZGEqlurAL5UkidMLrYo8EM`
+Module: `Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM`
 
-Sqlite-Module: `9VBLtu07DtUhPNdIqnw0Z_QJ_GKQqNXHpzumG8DY-J4`
+Sqlite-Module: `GuzQrkf50rBUqz3uUgjOIFOL1XmW9nSNysTBC-wyiWM`
 
 ## Requirements
 

package.json

@@ -31,8 +31,8 @@
     "yargs": "^17.7.2"
   },
   "aos": {
-    "module": "oKBlsMP3UWrAUURWUzGO4ZGEqlurAL5UkidMLrYo8EM",
-    "sqlite": "9VBLtu07DtUhPNdIqnw0Z_QJ_GKQqNXHpzumG8DY-J4",
+    "module": "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",
+    "sqlite": "GuzQrkf50rBUqz3uUgjOIFOL1XmW9nSNysTBC-wyiWM",
     "llama": "7eiZkMWDUQmY1SBIpumzYR5_XhVMbnjmA27Xbyt4QxU",
     "version": "2.0.1"
   },

process/boot.lua

@@ -31,6 +31,9 @@ end
 return function (ao)
   local eval = require(".eval")(ao)
   return function (msg)
+    if #Inbox == 0 then
+      table.insert(Inbox, msg)
+    end
     if msg.Tags['On-Boot'] == nil then
       return
     end

process/package.json

@@ -11,6 +11,7 @@
     "build": "ao build",
     "test": "node --test --experimental-wasm-memory64",
     "deploy": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 1-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.1 -t Name -v aos-lg-2.0.1",
+    "deploy-test": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 1-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.1 -t Name -v aos-test",
     "deploy-sqlite": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 1-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.1 -t Name -v sqlite-lg-2.0.1",
     "deploy-llama": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 16-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.1 -t Name -v llama-xxl-2.0.1 -t Extension -v WeaveDrive"
   }

process/process.lua

@@ -363,7 +363,7 @@ function process.handle(msg, _)
   -- See: https://github.com/permaweb/aos/issues/342
   Handlers.once("_boot",
     function (msg)
-      return msg.Tags.Type == "Process" and Owner == msg.From
+      return msg.Tags.Type == "Process" and Owner == msg.From 
     end,
     require('.boot')(ao)
   )
@@ -449,24 +449,34 @@ function process.handle(msg, _)
     HANDLER_PRINT_LOGS = {} -- clear logs
     return response
   elseif msg.Tags.Type == "Process" and Owner == msg.From then 
-    local response = nil
+    local response = ao.result({ 
+      Output = {
+        data = table.concat(HANDLER_PRINT_LOGS, "\n"),
+        prompt = Prompt(),
+        print = true
+      }
+    })
+    HANDLER_PRINT_LOGS = {} -- clear logs
+    return response
+
+    -- local response = nil
 
-    -- detect if there was any output from the boot loader call
-    for _, value in pairs(HANDLER_PRINT_LOGS) do
-      if value ~= "" then
-        -- there was output from the Boot Loader eval so we want to print it
-        response = ao.result({ Output = { data = table.concat(HANDLER_PRINT_LOGS, "\n"), prompt = Prompt(), print = true } })
-        break
-      end
-    end
+    -- -- detect if there was any output from the boot loader call
+    -- for _, value in pairs(HANDLER_PRINT_LOGS) do
+    --   if value ~= "" then
+    --     -- there was output from the Boot Loader eval so we want to print it
+    --     response = ao.result({ Output = { data = table.concat(HANDLER_PRINT_LOGS, "\n"), prompt = Prompt(), print = true } })
+    --     break
+    --   end
+    -- end
 
-    if response == nil then 
-      -- there was no output from the Boot Loader eval, so we shouldn't print it
-      response = ao.result({ Output = { data = "", prompt = Prompt() } })
-    end
+    -- if response == nil then 
+    --   -- there was no output from the Boot Loader eval, so we shouldn't print it
+    --   response = ao.result({ Output = { data = "", prompt = Prompt() } })
+    -- end
 
-    HANDLER_PRINT_LOGS = {} -- clear logs
-    return response
+    -- HANDLER_PRINT_LOGS = {} -- clear logs
+    -- return response
   else
     local response = ao.result({ Output = { data = table.concat(HANDLER_PRINT_LOGS, "\n"), prompt = Prompt(), print = true } })
     HANDLER_PRINT_LOGS = {} -- clear logs

src/services/connect.js

@@ -160,7 +160,7 @@ export async function live(id, watch) {
         if (cursor) {
           params["from"] = cursor
         } else {
-          params["limit"] = 1
+          params["limit"] = 5
           params["sort"] = "DESC"
         }