Skip to content

Recipe book #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wispem-wantex wants to merge 7 commits into
base: pre-beta
Choose a base branch
from
Draft

Recipe book #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f036e3
Add WIP mast and eyre channel neo additions
R-JG Jul 23, 2024
869fcdc
Split mast JS into separate file.
R-JG Jul 25, 2024
49decf5
initial task UI using mast
hanfel-dovned Jul 24, 2024
11862e0
tasks in mast
hanfel-dovned Jul 25, 2024
4428cc5
fix textbox
hanfel-dovned Jul 25, 2024
570e197
Recipe Book (2 build parties worth)
wispem-wantex Jul 28, 2024
b156059
Build party, Aug 9
Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 43 additions & 4 deletions pkg/arvo/app/neo.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@
%noun (on-noun q.vase)
%neo-raw-poke (on-move (poke:harden !<(raw-poke:neo vase)))
%handle-http-request (handle-http-request:sttp !<([@ta inbound-request:eyre] vase))
%json (handle-eyre-chan-request:sttp !<(json vase))
==
++ on-noun
|= non=*
Expand Down Expand Up @@ -322,6 +323,7 @@
[%sync rest=*] (on-peer-sync (pave:neo rest.pole) stop)
[%fetch rest=*] ?:(stop run (on-peer-fetch (pave:neo rest.pole)))
[%http-response *] run
[%eyre-chan *] run
==
::
++ on-peer-fetch
Expand Down Expand Up @@ -2312,10 +2314,11 @@
++ call
|= [src=pith:neo dst=pith:neo =note:neo]
?> ?=(%poke -.note) :: XX: all shanes should be virtualised and hand deliver acks
?+ p.pail.note ~|(bad-eyre-call/p.pail.note !!)
%ack run
%eyre-req (on-eyre-req !<(req:eyre:neo q.pail.note))
%eyre-sign (on-eyre-sign src !<(sign:eyre:neo q.pail.note))
?+ p.pail.note ~|(bad-eyre-call/p.pail.note !!)
%ack run
%eyre-req (on-eyre-req !<(req:eyre:neo q.pail.note))
%eyre-sign (on-eyre-sign src !<(sign:eyre:neo q.pail.note))
%eyre-chan-gift (on-eyre-chan-gift !<(chan-gift:eyre:neo q.pail.note))
==
+$ request-line
$: [ext=(unit @ta) site=(list @t)]
Expand Down Expand Up @@ -2348,6 +2351,13 @@
%data `http-response-data/!>(dat.gift)
%done ~
==
::
++ on-eyre-chan-gift
|= [sub=path dat=json]
^+ run
=/ cag=cage [%json !>(dat)]
(give %fact ~[sub] cag)
::
++ match-binding
=| test=(list @t)
|= site=(list @t)
Expand All @@ -2370,6 +2380,35 @@
=/ =card:neo [u.bin %poke eyre-task/!>(`task:eyre:neo`[eyre-id req])]
=/ =move:neo [#/[p/our.bowl]/$/eyre card]
(emit (do-move move))
::
++ handle-eyre-chan-request
|= jon=json
^+ run
=/ dst=(unit pith:neo)
?. &(?=(^ jon) ?=(%o -.jon))
~
=/ str=(unit json) (~(get by p.jon) 'pith')
?. &(?=(^ str) ?=(^ u.str) ?=(%s -.u.str))
~
:- ~
%+ turn (stab p.u.str)
|= i=@ta
%- iota
=+ v=(slay i)
?> &(?=(^ v) ?=(%$ -.u.v))
?: =(~.tas p.p.u.v)
q.p.u.v
p.u.v
?~ dst ~|(eyre-channel-req-missing-pith/jon !!)
=. jon
?. &(?=(^ jon) ?=(%o -.jon))
~
=/ dat=(unit json) (~(get by p.jon) 'data')
?~ dat ~
u.dat
=/ =card:neo [u.dst %poke eyre-chan-task/!>(`chan-task:eyre:neo`jon)]
=/ =move:neo [#/[p/our.bowl]/$/eyre card]
(emit (do-move move))
--

++ cttp
Expand Down
222 changes: 222 additions & 0 deletions pkg/arvo/neo/cod/std/src/fil/mast-js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
let pith;
let path;
let ship;
let app;
let channelMessageId = 0;
let eventSource;
const channelId = `${Date.now()}${Math.floor(Math.random() * 100)}`;
const channelPath = `${window.location.origin}/~/channel/${channelId}`;
addEventListener('DOMContentLoaded', async () => {
pith = document.documentElement.getAttribute('pith');
path = document.documentElement.getAttribute('path');
ship = document.documentElement.getAttribute('ship');
app = document.documentElement.getAttribute('app');
await connectToShip();
let eventElements = document.querySelectorAll('[event]');
eventElements.forEach(el => setEventListeners(el));
});
function setEventListeners(el) {
const eventTags = el.getAttribute('event');
const returnTags = el.getAttribute('return');
eventTags.split(/\s+/).forEach(eventStr => {
const eventType = eventStr.split('/', 2)[1];
el[`on${eventType}`] = (e) => pokeShip(e, eventStr, returnTags);
});
};
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, {
method: 'PUT',
body
});
eventSource = new EventSource(channelPath);
eventSource.addEventListener('message', handleChannelStream);
} catch (error) {
console.error(error);
};
};
function pokeShip(event, tagString, dataString) {
try {
let data = {};
if (dataString) {
const dataToReturn = dataString.split(/\s+/);
dataToReturn.forEach(dataTag => {
let splitDataTag = dataTag.split('/');
if (splitDataTag[0] === '') splitDataTag.shift();
const kind = splitDataTag[0];
const key = splitDataTag.pop();
if (kind === 'event') {
if (!(key in event)) {
console.error(`Property: ${key} does not exist on the event object`);
return;
};
data[dataTag] = String(event[key]);
} else if (kind === 'target') {
if (!(key in event.currentTarget)) {
console.error(`Property: ${key} does not exist on the target object`);
return;
};
data[dataTag] = String(event.currentTarget[key]);
} else {
const elementId = splitDataTag.join('/');
const linkedEl = document.getElementById(elementId);
if (!linkedEl) {
console.error(`No element found for id: ${kind}`);
return;
};
if (!(key in linkedEl)) {
console.error(`Property: ${key} does not exist on the object with id: ${elementId}`);
return;
};
data[dataTag] = String(linkedEl[key]);
};
});
};
fetch(channelPath, {
method: 'PUT',
body: JSON.stringify(makePokeBody({
path: tagString,
data
}))
});
} catch (error) {
console.error(error);
};
};
function handleChannelStream(event) {
try {
const streamResponse = JSON.parse(event.data);
if (streamResponse.response !== 'diff') return;
fetch(channelPath, {
method: 'PUT',
body: JSON.stringify(makeAck(streamResponse.id))
});
const htmlData = streamResponse.json;
if (!htmlData) return;
let container = document.createElement('template');
container.innerHTML = htmlData;
if (container.content.firstElementChild.childNodes.length === 0) return;
// const navUrl = container.content.firstElementChild.getAttribute('url');
// if (navUrl && (navUrl !== window.location.pathname)) {
// history.pushState({}, '', navUrl);
// };
while (container.content.firstElementChild.children.length > 0) {
let gustChild = container.content.firstElementChild.firstElementChild;
if (gustChild.tagName === 'D') {
for (const att of gustChild.attributes) {
const dkey = att.value;
document.querySelector(`[key="${dkey}"]`).remove();
};
gustChild.remove();
} else if (gustChild.tagName === 'N') {
const nodeKey = gustChild.firstElementChild.getAttribute('key');
const parentKey = gustChild.firstElementChild.getAttribute('pkey');
const appendIndex = gustChild.id;
let domParent = document.querySelector(`[key="${parentKey}"]`);
domParent.insertBefore(gustChild.firstElementChild, domParent.children[appendIndex]);
let appendedChild = domParent.querySelector(`[key="${nodeKey}"]`);
if (appendedChild.getAttribute('event')) {
setEventListeners(appendedChild);
};
if (appendedChild.childElementCount > 0) {
let needingListeners = appendedChild.querySelectorAll('[event]');
needingListeners.forEach(child => setEventListeners(child));
};
appendedChild = appendedChild.nextElementSibling;
gustChild.remove();
} else if (gustChild.tagName === 'M') {
const nodeKey = gustChild.getAttribute('key');
const nodeIndex = gustChild.id;
let existentNode = document.querySelector(`[key="${nodeKey}"]`);
let childAtIndex = existentNode.parentElement.children[nodeIndex];
if (existentNode.nextElementSibling
&& (existentNode.nextElementSibling.getAttribute('key')
=== childAtIndex.getAttribute('key'))) {
existentNode.parentElement.insertBefore(existentNode, childAtIndex.nextElementSibling);
} else {
existentNode.parentElement.insertBefore(existentNode, childAtIndex);
};
gustChild.remove();
} else if (gustChild.tagName === 'C') {
const nodeKey = gustChild.getAttribute('key');
const attToRem = gustChild.getAttribute('rem')?.slice(0, -1).split(' ') ?? [];
let existentNode = document.querySelector(`[key="${nodeKey}"]`);
attToRem.forEach(att => {
if (att === 'event') {
const eventType = existentNode.getAttribute('event').split('/', 2)[1];
existentNode[`on${eventType}`] = null;
};
existentNode.removeAttribute(att);
});
gustChild.removeAttribute('key');
gustChild.removeAttribute('rem');
for (const att of gustChild.attributes) {
existentNode.setAttribute(att.name, att.value);
if (att.name === 'event') {
const eventType = existentNode.getAttribute('event').split('/', 2)[1];
existentNode[`on${eventType}`] = null;
setEventListeners(existentNode);
};
};
gustChild.remove();
} else {
const nodeKey = gustChild.getAttribute('key');
let existentNode = document.querySelector(`[key="${nodeKey}"]`);
existentNode.replaceWith(gustChild);
let replacedNode = document.querySelector(`[key="${nodeKey}"]`);
if (replacedNode.getAttribute('event')) {
setEventListeners(replacedNode);
};
if (replacedNode.childElementCount > 0) {
let needingListeners = replacedNode.querySelectorAll('[event]');
needingListeners.forEach(child => setEventListeners(child));
};
};
};
} catch (error) {
console.error(error);
};
};
function makeSubscribeBody() {
channelMessageId++;
return [{
id: channelMessageId,
action: 'subscribe',
ship: ship,
app: app,
path: path
}];
};
function makePokeBody(jsonData) {
channelMessageId++;
return [{
id: channelMessageId,
action: 'poke',
ship: ship,
app: app,
mark: 'json',
json: { pith: pith, data: jsonData }
}];
};
function makeAck(eventId) {
channelMessageId++;
return [{
id: channelMessageId,
action: 'ack',
"event-id": eventId
}];
};
1 change: 1 addition & 0 deletions pkg/arvo/neo/cod/std/src/imp/food.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
~
46 changes: 46 additions & 0 deletions pkg/arvo/neo/cod/std/src/imp/foods.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/@ food
/@ foods-diff
::
^- kook:neo
|%
++ state pro/%sig
++ poke (sy %foods-diff %food ~)
++ kids
:+ ~ %y
%- ~(gas by *lads:neo)
:~ :- [|/%ux |] [pro/%food ~]
==
++ deps *deps:neo
++ form
^- form:neo
|_ [=bowl:neo =aeon:neo state=pail:neo]
++ init
|= old=(unit pail:neo)
^- (quip card:neo pail:neo)
:- ~ sig/!>(~)
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo pail:neo)
:_ sig/!>(~) :: There is no state
:~ ?+ stud !!
%food
:- (snoc here.bowl [%ux (mod eny.bowl (pow 16 16))])
[%make %food `food/vax ~]
%foods-diff
=/ poke !<(foods-diff vax)
?> =(our.bowl ship.src.bowl)
?- -.poke
%new-food
:- (snoc here.bowl [%ux (mod eny.bowl (pow 16 16))])
[%make %food `food/!>(food.poke) ~]
%put-food
:- (snoc here.bowl [%ux id.poke])
[%make %food `food/!>(food.poke) ~]
%del-food !!
:: :- (snoc here.bowl [%ux id.poke])
:: [%tomb %food ~]
==
==
==
--
--
1 change: 1 addition & 0 deletions pkg/arvo/neo/cod/std/src/imp/manx.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
~
Loading