From 859e7b55441f8488c2a5d9dcd7c64f25500f4eb0 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Thu, 31 Oct 2019 12:38:53 -0700 Subject: [PATCH] fix(LOADING): make flag available to CapTP, but not home --- lib/ag-solo/bundle.js | 4 ++-- lib/ag-solo/vats/vat-http.js | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/ag-solo/bundle.js b/lib/ag-solo/bundle.js index bfa9e041ffa..55c269fda56 100644 --- a/lib/ag-solo/bundle.js +++ b/lib/ag-solo/bundle.js @@ -22,7 +22,7 @@ const sendJSON = (ws, obj) => { if (ws.readyState !== ws.OPEN) { return; } - // console.log('sending', obj); + //console.log('sending', obj); ws.send(JSON.stringify(obj)); }; @@ -98,9 +98,9 @@ export default async function bundle(insistIsBasedir, args) { sendJSON(ws, obj), ); ws.on('message', data => { - // console.log(data); try { const obj = JSON.parse(data); + // console.log('receiving', obj); if (obj.type === 'CTP_ERROR') { throw obj.error; } diff --git a/lib/ag-solo/vats/vat-http.js b/lib/ag-solo/vats/vat-http.js index a360a24956a..4093e743024 100644 --- a/lib/ag-solo/vats/vat-http.js +++ b/lib/ag-solo/vats/vat-http.js @@ -122,9 +122,15 @@ function build(E, D) { }, setPresences(ps, privateObjects) { - exportedToCapTP = { READY: exportedToCapTP.READY, ...ps, ...privateObjects }; + exportedToCapTP = { + LOADING: loaded.p, + READY: exportedToCapTP.READY, + ...ps, + ...privateObjects, + }; Object.assign(homeObjects, ps, privateObjects); loaded.res('chain bundle loaded'); + delete homeObjects.LOADING; if (ps.canvasStatePublisher) { const subscriber = harden({ notify(m) {