urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-09-11 12:25:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix eyre channel cleanup in the script

Browse Source
This commit is contained in:
Robin Guerrier 2024-08-05 19:54:25 -04:00
parent 37c59f7e5b
commit f5b7dc7314
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/arvo/neo/cod/std/src/fil/mast-js.js
View File

@ -3,11 +3,13 @@ let pith;
let path;
let ship;
let app;
let channelMessageId = 0;
let channelMessageId;
let subscriptionId;
let eventSource;
const channelId = `${Date.now()}${Math.floor(Math.random() * 100)}`;
const channelPath = `${window.location.origin}/~/channel/${channelId}`;
addEventListener('DOMContentLoaded', async () => {
channelMessageId = 0;
rope = Number(document.documentElement.getAttribute('rope'));
pith = document.documentElement.getAttribute('pith');
path = document.documentElement.getAttribute('path');
@ -18,30 +20,33 @@ addEventListener('DOMContentLoaded', async () => {
eventElements.forEach(el => setEventListeners(el));
});
async function connectToShip() {
try {
const storageKey = `${ship}${app}${path}`;
let storedId = localStorage.getItem(storageKey);
localStorage.setItem(storageKey, channelId);
if (storedId) {
const delPath = `${window.location.origin}/~/channel/${storedId}`;
await fetch(delPath, {
method: 'PUT',
body: JSON.stringify([{
id: channelMessageId,
action: 'delete'
}])
});
};
const body = JSON.stringify(makeSubscribeBody());
await fetch(channelPath, {
const storageKey = `${rope}${ship}`;
let storedStr = localStorage.getItem(storageKey);
localStorage.setItem(storageKey, `${channelMessageId} ${channelId}`);
if (storedStr) {
const storedIds = storedStr.split(' ');
const oldPath = `${window.location.origin}/~/channel/${storedIds[1]}`;
fetch(oldPath, {
method: 'PUT',
body
body: JSON.stringify([
{
id: channelMessageId,
action: 'unsubscribe',
subscription: Number(storedIds[0])
},
{
id: channelMessageId++,
action: 'delete'
}
])
});
eventSource = new EventSource(channelPath);
eventSource.addEventListener('message', handleChannelStream);
} catch (error) {
console.error(error);
};
await fetch(channelPath, {
method: 'PUT',
body: JSON.stringify(makeSubscribeBody(channelMessageId))
});
eventSource = new EventSource(channelPath);
eventSource.addEventListener('message', handleChannelStream);
};
function setEventListeners(el) {
const eventAttrVals = el.getAttribute('event');
@ -215,8 +220,7 @@ function handleChannelStream(event) {
};
});
};
function makeSubscribeBody() {
channelMessageId++;
function makeSubscribeBody(channelMessageId) {
return [{
id: channelMessageId,
action: 'subscribe',