Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Cleanup message data structures |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
fbd7109fedd0252cc9d2ac9e8d5091ee |
User & Date: | bernd 2019-06-19 23:24:31.312 |
Context
2019-06-20
| ||
12:29 | More rework on messaging check-in: eb85b0b273 user: bernd tags: trunk | |
2019-06-19
| ||
23:24 | Cleanup message data structures check-in: fbd7109fed user: bernd tags: trunk | |
21:24 | Somewhat repair older presentations check-in: 99af21523b user: bernd tags: trunk | |
Changes
Changes to classes.fs.
︙ | ︙ | |||
129 130 131 132 133 134 135 136 137 138 139 140 141 142 | end-class ack-class cmd-class class field: silent-last# end-class msging-class cmd-class class{ msg $value: id$ field: peers[] field: keys[] field: log[] field: mode \ mode bits: 0 5 bits: otr# chain# redate# lock# visible# | > | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | end-class ack-class cmd-class class field: silent-last# end-class msging-class cmd-class class{ msg $value: name$ \ group name $value: id$ field: peers[] field: keys[] field: log[] field: mode \ mode bits: 0 5 bits: otr# chain# redate# lock# visible# |
︙ | ︙ |
Changes to dvcs.fs.
︙ | ︙ | |||
938 939 940 941 942 943 944 | log !time end-with dvcs-join, get-ip end-code ; : dvcs-connect ( addr u -- ) dvcs-bufs# chat#-connect? IF 2 dvcs-request# ! dvcs-greet THEN ; : dvcs-connect-key ( addr u -- ) key>group ?load-msgn | < | 938 939 940 941 942 943 944 945 946 947 948 949 950 951 | log !time end-with dvcs-join, get-ip end-code ; : dvcs-connect ( addr u -- ) dvcs-bufs# chat#-connect? IF 2 dvcs-request# ! dvcs-greet THEN ; : dvcs-connect-key ( addr u -- ) key>group ?load-msgn 2dup search-connect ?dup-IF >o +group rdrop 2drop EXIT THEN \ check for disconnected here or in pk-peek? 2dup pk-peek? IF dvcs-connect ELSE 2drop THEN ; : dvcs-connects? ( -- flag ) chat-keys ['] dvcs-connect-key $[]map dvcs-request# @ 0> ; |
︙ | ︙ |
Changes to helper.fs.
︙ | ︙ | |||
116 117 118 119 120 121 122 | end-code| -setip net2o:send-replace announced on ; \ NAT retraversal Forward insert-addr ( o -- ) : renat ( -- ) | | | | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | end-code| -setip net2o:send-replace announced on ; \ NAT retraversal Forward insert-addr ( o -- ) : renat ( -- ) msg-group# [: cell+ $@ drop cell+ .msg:peers[] bounds ?DO I @ >o o-beacon pings \ !!FIXME!! should maybe do a re-lookup? ret-addr $10 erase dest-0key dest-0key> ! punch-addrs $@ bounds ?DO I @ insert-addr IF o to connection net2o-code new-request true gen-punchload gen-punch |
︙ | ︙ |
Changes to msg.fs.
︙ | ︙ | |||
22 23 24 25 26 27 28 | Forward pk-peek? ( addr u0 -- flag ) : ?hash ( addr u hash -- ) >r 2dup r@ #@ d0= IF "" 2swap r> #! ELSE 2drop rdrop THEN ; : >group ( addr u -- ) 2dup msg-group# #@ d0= IF | > | > | > | | | | > < | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | Forward pk-peek? ( addr u0 -- flag ) : ?hash ( addr u hash -- ) >r 2dup r@ #@ d0= IF "" 2swap r> #! ELSE 2drop rdrop THEN ; : >group ( addr u -- ) 2dup msg-group# #@ d0= IF net2o:new-msg >o 2dup to msg:name$ o o> cell- [ msg-class >osize @ cell+ ]L 2over msg-group# #! THEN last# cell+ $@ drop cell+ to msg-group-o 2drop ; also msg : avalanche-msg ( msg u1 o:connect -- ) \G forward message to all next nodes of that message group { d: msg } msg-group-o .peers[] $@ bounds ?DO I @ o <> IF msg I @ .avalanche-to THEN cell +LOOP ; previous Variable msg-group$ Variable msg-logs Variable otr-mode Variable chain-mode Variable redate-mode Variable lock-mode Variable msg-keys[] User replay-mode |
︙ | ︙ | |||
188 189 190 191 192 193 194 | msgt ['] msg:display catch IF ." invalid entry" cr 2drop THEN o> ; Forward silent-join \ !!FIXME!! should use an asynchronous "do-when-connected" thing | | | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 | msgt ['] msg:display catch IF ." invalid entry" cr 2drop THEN o> ; Forward silent-join \ !!FIXME!! should use an asynchronous "do-when-connected" thing : +unique-con ( -- ) o msg-group-o .msg:peers[] +unique$ ; Forward +chat-control : chat-silent-join ( -- ) reconnect( ." silent join " o hex. connection hex. cr ) o to connection ?msg-context >o silent-last# @ to last# o> reconnect( ." join: " last# $. cr ) |
︙ | ︙ | |||
660 661 662 663 664 665 666 | $> >group ; +net2o: msg-join ( $:group -- ) \g join a chat group $> >load-group parent >o +unique-con +chat-control wait-task @ ?dup-IF <hide> THEN o> ; +net2o: msg-leave ( $:group -- ) \g leave a chat group | | < | 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 | $> >group ; +net2o: msg-join ( $:group -- ) \g join a chat group $> >load-group parent >o +unique-con +chat-control wait-task @ ?dup-IF <hide> THEN o> ; +net2o: msg-leave ( $:group -- ) \g leave a chat group $> >group parent msg-group-o .msg:peers[] del$cell ; +net2o: msg-reconnect ( $:pubkey+addr -- ) \g rewire distribution tree $> $make <event last-msg 2@ e$, elit, o elit, last# elit, :>chat-reconnect parent .wait-task @ ?query-task over select event> ; +net2o: msg-last? ( start end n -- ) 64>n msg:last? ; +net2o: msg-last ( $:[tick0,msgs,..tickn] n -- ) 64>n msg:last ; |
︙ | ︙ | |||
997 998 999 1000 1001 1002 1003 | : send-leave ( -- ) connection .data-rmap IF net2o-code expect-msg leave, end-code| THEN ; : send-silent-leave ( -- ) connection .data-rmap IF net2o-code expect-msg silent-leave, end-code| THEN ; : [group] ( xt -- flag ) | | | < | 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 | : send-leave ( -- ) connection .data-rmap IF net2o-code expect-msg leave, end-code| THEN ; : send-silent-leave ( -- ) connection .data-rmap IF net2o-code expect-msg silent-leave, end-code| THEN ; : [group] ( xt -- flag ) msg-group-o .msg:peers[] $@len IF msg-group-o .execute true ELSE 0 .execute false THEN ; : .chat ( addr u -- ) [: last# >r o IF 2dup do-msg-nestsig ELSE 2dup display-one-msg THEN r> to last# 0 .avalanche-msg ;] [group] drop notify- ; |
︙ | ︙ | |||
1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 | version-string forth:type '-' forth:emit machine forth:type ; forward avalanche-text false value away? also net2o-base scope: /chat : /me ( addr u -- ) \U me <action> send string as action \G me: send remaining string as action [: $, msg-action ;] send-avalanche ; | > > > | 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 | version-string forth:type '-' forth:emit machine forth:type ; forward avalanche-text false value away? : group#map ( xt -- ) msg-group# swap [{: xt: xt :}l cell+ $@ drop cell+ .xt ;] #map ; also net2o-base scope: /chat : /me ( addr u -- ) \U me <action> send string as action \G me: send remaining string as action [: $, msg-action ;] send-avalanche ; |
︙ | ︙ | |||
1341 1342 1343 1344 1345 1346 1347 | ." chain mode ===" ELSE <err> ." only 'chain on|off' are allowed" rdrop THEN <default> forth:cr ; : /peers ( addr u -- ) 2drop \U peers list peers \G peers: list peers in all groups | | | | | | | 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 | ." chain mode ===" ELSE <err> ." only 'chain on|off' are allowed" rdrop THEN <default> forth:cr ; : /peers ( addr u -- ) 2drop \U peers list peers \G peers: list peers in all groups [: msg:name$ .group ." : " msg:peers[] $@ bounds ?DO space I @ >o .con-id space ack@ .rtdelay 64@ 64>f 1n f* (.time) o> cell +LOOP forth:cr ;] group#map ; : /gps ( addr u -- ) 2drop \U gps send coordinates \G gps: send your coordinates coord! coord@ 2dup 0 -skip nip 0= IF 2drop ELSE [: $, msg-coord ;] send-avalanche |
︙ | ︙ | |||
1372 1373 1374 1375 1376 1377 1378 | \U invitations handle invitations \G invitations: handle invitations: accept, ignore or block invitations 2drop .invitations ; : /chats ( addr u -- ) 2drop ." ===== chats: " \U chats list chats \G chats: list all chats | < | | | | | | | | | | 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 | \U invitations handle invitations \G invitations: handle invitations: accept, ignore or block invitations 2drop .invitations ; : /chats ( addr u -- ) 2drop ." ===== chats: " \U chats list chats \G chats: list all chats [: msg:name$ msg-group$ $@ str= IF ." *" THEN msg:name$ .group ." [" msg:peers[] $[]# 0 .r ." ]#" msg:name$ msg-logs #@ nip cell/ u. ;] group#map ." =====" forth:cr ; : /nat ( addr u -- ) 2drop \U nat list NAT info \G nat: list nat traversal information of all peers in all groups \U renat redo NAT traversal \G renat: redo nat traversal [: ." ===== Group: " msg:name$ .group ." =====" forth:cr msg:peers[] $@ bounds ?DO ." --- " I @ >o .con-id ." : " return-address .addr-path ." ---" forth:cr .nat-addrs o> cell +LOOP ;] group#map ; : /myaddrs ( addr u -- ) \U myaddrs list my addresses \G myaddrs: list my own local addresses (debugging) 2drop ." ===== all =====" forth:cr .my-addr$s ." ===== public =====" forth:cr .pub-addr$s |
︙ | ︙ | |||
1425 1426 1427 1428 1429 1430 1431 | \U n2o <cmd> execute n2o command \G n2o: Execute normal n2o command : /sync ( addr u -- ) \U sync [+date] [-date] synchronize logs \G sync: synchronize chat logs, starting and/or ending at specific \G sync: time/date | | < | | 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 | \U n2o <cmd> execute n2o command \G n2o: Execute normal n2o command : /sync ( addr u -- ) \U sync [+date] [-date] synchronize logs \G sync: synchronize chat logs, starting and/or ending at specific \G sync: time/date msg-group-o .msg:peers[] $@ 0= IF drop EXIT THEN @ to connection ." === sync ===" forth:cr net2o-code expect-msg [: msg-group last?, ;] [msg,] end-code o> ; : /version ( addr u -- ) \U version version string \G version: print version string 2drop .n2o-version space .gforth-version forth:cr ; |
︙ | ︙ | |||
1546 1547 1548 1549 1550 1551 1552 | [: parse-text ;] send-avalanche ; previous : load-msgn ( addr u n -- ) >r 2dup load-msg ?msg-log r> display-lastn ; | | < < < < < | 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 | [: parse-text ;] send-avalanche ; previous : load-msgn ( addr u n -- ) >r 2dup load-msg ?msg-log r> display-lastn ; : +group ( -- ) +unique-con ; : msg-timeout ( -- ) packets2 @ connected-timeout packets2 @ <> IF reply( ." Resend to " pubkey $@ key>nick type cr ) timeout-expired? IF timeout( <err> ." Excessive timeouts from " pubkey $@ key>nick type ." : " |
︙ | ︙ | |||
1591 1592 1593 1594 1595 1596 1597 | \G return a bit mask for the control key pressed 1 key dup bl < >r lshift r> and ; : wait-key ( -- ) BEGIN key-ctrlbit [ 1 ctrl L lshift 1 ctrl Z lshift or ]L and 0= UNTIL ; | | | < < < < < < < | | | 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 | \G return a bit mask for the control key pressed 1 key dup bl < >r lshift r> and ; : wait-key ( -- ) BEGIN key-ctrlbit [ 1 ctrl L lshift 1 ctrl Z lshift or ]L and 0= UNTIL ; : chats# ( -- n ) 0 [: msg:peers[] $[]# 1 max + ;] group#map ; : wait-chat ( -- ) chat-keys [: @/2 dup 0= IF 2drop EXIT THEN 2dup keysize2 safe/string tuck <info> type IF '.' emit THEN .key-id space ;] $[]map ." is not online. press key to recheck." [: 0 to connection -56 throw ;] is do-disconnect [: false chat-keys [: @/2 key| pubkey $@ key| str= or ;] $[]map IF bl inskey THEN up@ wait-task ! ;] is do-connect wait-key cr [: up@ wait-task ! ;] IS do-connect ; : search-connect ( key u -- o/0 ) key| 0 [: drop 2dup pubkey $@ key| str= o and dup 0= ;] search-context nip nip dup to connection ; : search-peer ( -- chat ) false chat-keys [: @/2 key| rot dup 0= IF drop search-connect ELSE nip nip THEN ;] $[]map ; : key>group ( addr u -- pk u ) @/ 2swap tuck msg-group$ $! 0= IF 2dup key| msg-group$ $! THEN ; \ 1:1 chat-group=key : ?load-msgn ( -- ) msg-group$ $@ msg-logs #@ d0= IF msg-group$ $@ rows load-msgn THEN ; : chat-connects ( -- ) chat-keys [: key>group ?load-msgn dup 0= IF 2drop msg-group$ $@ >group EXIT THEN 2dup search-connect ?dup-IF >o +group greet o> 2drop EXIT THEN 2dup pk-peek? IF chat-connect ELSE 2drop THEN ;] $[]map ; : ?wait-chat ( -- addr u ) #0. /chat:/chats BEGIN chats# 0= WHILE wait-chat chat-connects REPEAT msg-group$ $@ ; \ stub scope{ /chat : /chat ( addr u -- ) \U chat [group][@user] switch/connect chat \G chat: switch to chat with user or group chat-keys $[]off nick>chat 0 chat-keys $[]@ key>group msg-group$ $@ >group msg-group-o .msg:peers[] $@ dup 0= IF 2drop nip IF chat-connects ELSE ." That chat isn't active" forth:cr THEN ELSE bounds ?DO 2dup I @ .pubkey $@ key2| str= 0= WHILE cell +LOOP 2drop chat-connects ELSE UNLOOP 2drop THEN THEN #0. /chats ; }scope |
︙ | ︙ | |||
1670 1671 1672 1673 1674 1675 1676 | $, msg-reconnect ; : reconnects, ( group -- ) cell+ $@ cell safe/string bounds U+DO I @ .reconnect, cell +LOOP ; | | | | | | | | | | | | | | | < | | | < | | | | | | | | | | | 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 | $, msg-reconnect ; : reconnects, ( group -- ) cell+ $@ cell safe/string bounds U+DO I @ .reconnect, cell +LOOP ; : send-reconnects ( o:group -- ) net2o-code expect-msg [: msg:name$ ?destpk $, msg-leave sign[ msg-start "left" $, msg-action msg-otr> reconnects, ;] [msg,] end-code| ; : send-reconnect1 ( o:group -- ) net2o-code expect-msg [: msg:name$ ?destpk $, msg-leave sign[ msg-start "left" $, msg-action msg-otr> .reconnect, ;] [msg,] end-code| ; previous : send-reconnect ( o:group -- ) msg:peers[] $@ case 0 of 2drop endof cell of @ >o o to connection send-leave o> endof @ to connection send-reconnects 0 endcase ; : send-silent-reconnect ( o:group -- ) msg:peers[] $@ case 0 of drop endof cell of @ >o o to connection send-silent-leave o> endof o swap @ .send-reconnects 0 endcase ; : disconnect-group ( o:group -- ) msg:peers[] get-stack 0 ?DO >o o to connection disconnect-me o> LOOP ; : disconnect-all ( o:group -- ) msg:peers[] get-stack 0 ?DO >o o to connection send-leave disconnect-me o> LOOP ; : leave-chat ( o:group -- ) send-reconnect disconnect-group ; : silent-leave-chat ( o:group -- ) send-silent-reconnect disconnect-group ; : leave-chats ( -- ) ['] leave-chat group#map ; : split-load ( o:group -- ) msg:peers[] >r 0 BEGIN dup 1+ r@ $[]# u< WHILE dup r@ $[] 2@ .send-reconnect1 1+ dup r@ $[] @ >o o to connection disconnect-me o> REPEAT drop rdrop ; scope{ /chat : /split ( addr u -- ) 2drop \U split split load \G split: reduce distribution load by reconnecting msg-group$ $@ >group msg-group-o .split-load ; }scope \ chat toplevel : do-chat ( addr u -- ) get-order n>r chat-history ['] /chat >body 1 set-order |
︙ | ︙ |
Changes to net2o.fs.
︙ | ︙ | |||
413 414 415 416 417 418 419 | 2 Value flybursts# $100 Value flybursts-max# $20 cells Value resend-size# #50.000.000 d>64 64Constant init-delay# \ 50ms initial timeout step #60.000.000.000 d>64 64Constant connect-timeout# \ 60s connect timeout Variable init-context# | < | 413 414 415 416 417 418 419 420 421 422 423 424 425 426 | 2 Value flybursts# $100 Value flybursts-max# $20 cells Value resend-size# #50.000.000 d>64 64Constant init-delay# \ 50ms initial timeout step #60.000.000.000 d>64 64Constant connect-timeout# \ 60s connect timeout Variable init-context# hash: msg-group# ( hash for group objects ) UValue msg-group-o UValue connection in net2o : new-log ( -- o ) cmd-class new >o log-table @ token-table ! o o> ; in net2o : new-ack ( -- o ) |
︙ | ︙ | |||
1653 1654 1655 1656 1657 1658 1659 | \ dispose context : unlink-ctx ( next hit ptr -- ) next-context @ o contexts BEGIN 2dup @ <> WHILE @ dup .next-context swap 0= UNTIL 2drop drop EXIT THEN nip ! ; : ungroup-ctx ( -- ) | | | 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 | \ dispose context : unlink-ctx ( next hit ptr -- ) next-context @ o contexts BEGIN 2dup @ <> WHILE @ dup .next-context swap 0= UNTIL 2drop drop EXIT THEN nip ! ; : ungroup-ctx ( -- ) msg-group# [: cell+ $@ drop cell+ .msg:peers[] o swap del$cell ;] #map ; Defer extra-dispose ' noop is extra-dispose in net2o : dispose-context ( o:addr -- o:addr ) [: cmd( ." Disposing context... " o hex. cr ) timeout( ." Disposing context... " o hex. ." task: " task# ? cr ) o-timeout o-chunks extra-dispose |
︙ | ︙ |