buildroot-v86/board/v86/rootfs_overlay/bin/js

@@ -22,7 +22,6 @@ OUTPUT=/mnt/run/$PID # com/isoterminal/feat/javascript.js writes output here
 touch $OUTPUT
 echo -n "PID=$PID; $javascript" > /dev/browser/js
 # todo watch file 
-sleep 0.1
 cat $OUTPUT 
 rm $OUTPUT
 

buildroot-v86/board/v86/rootfs_overlay/etc/profile

@@ -47,7 +47,7 @@ help_tips(){
 }
 
 export TERM=xterm-256color
-export PS1="\[\e[36m\]> \[\e\[0m\]"
+export PS1="\[\033[38;5;165m\]> \[\033[0m\]"
 
 # aliases
 alias ls='ls -ha -w100'

buildroot-v86/board/v86/rootfs_overlay/etc/profile.sh

@@ -1,14 +1,12 @@
 hook(){
   test -z "$1" && { echo "usage: hook <cmd_or_jsfunction> [args]"; return 0; } 
-  logger "$ hook $*"
   cmd=$1
   shift 
   test -d ~/hook.d/$cmd && {
-    find -L ~/hook.d/$cmd/ -type f -executable -maxdepth 1 | while read hook; do 
-      logger "    |+ hook $hook $*"
+    find ~/hook.d/$cmd/ -type f -executable | while read hook; do 
       { $hook "$@" || true; } |  awk '{ gsub(/\/root\/\//,"",$1); $1 = sprintf("%-40s", $1)} 1'
     done
-  } &> ~/hook.d/log.txt
+  }
 }
 
 alert(){
@@ -22,11 +20,7 @@ alert(){
 
 confirm(){
   test -z "$1" && { echo "usage: confirm <question>"; return 0; } 
-  if test -n "$BROWSER"; then
-    jsh confirm "$1"
-  else
-    read -p "$(printf "\033[0m")[?] $1 [y/n] $(printf "\033[0m")" y
-  fi
+  read -p "$(printf "\033[0m")[?] $1 [y/n] $(printf "\033[0m")" y
   test $y = y && echo true && return 0
   test $y = y || echo false 
   hook confirm $1 $y
@@ -35,11 +29,7 @@ confirm(){
 prompt(){
   test -z "$1" && { echo "usage: prompt <question> [answer_default]"; return 0; } 
   test -n "$2" && answer="[$2] " && answer_fallback="$2"
-  if test -n "$BROWSER"; then
-    jsh prompt "$1" "$answer_fallback"
-  else
-    read -p "$(printf "\033[0m")[?] $1: $answer $(printf "\033[0m")" answer
-  fi
+  read -p "$(printf "\033[0m")[?] $1: $answer $(printf "\033[0m")" answer
   test -z "$answer" && answer="$answer_fallback"
   echo "$answer"
   hook prompt $1 $answer

buildroot-v86/board/v86/rootfs_overlay/etc/profile.xrsh

@@ -9,13 +9,6 @@ test -d /dev/browser || {
     ln -fs /mnt/root /root
   }
 
-  setup_clipboard(){
-    test -d /mnt/clipboard || {
-      mkdir /mnt/clipboard
-      echo "files appear here when dragdropping- or copy/pasting a file into the 3D scene (minimize in non-immersive mode)" > /mnt/clipboard/README.md
-    }
-  }
-
   setup_links(){
     ln -fs /etc/motd ~/.motd 
     ln -fs /mnt/profile.browser ~/.profile.browser
@@ -57,7 +50,6 @@ test -d /dev/browser || {
 
   move_root_to_9pfs
   setup_browser_dev
-  setup_clipboard
   setup_links
   setup_network
   setup_overlayfs

buildroot-v86/board/v86/rootfs_overlay/root/.profile

@@ -1,3 +1,8 @@
+alias enterVR='js "document.querySelector(\"a-scene\").enterVR()"'
+alias enterAR='js "document.querySelector(\"a-scene\").enterAR()"'
+alias exitVR='js "document.querySelector(\"a-scene\").enterVR()"'
+alias exitAR='js "document.querySelector(\"a-scene\").enterAR()"'
+
 # (new)user friendlyness
 alias vi='echo -e "HINT: type :q (and press enter) to quit\n[press a key]";read;vi'; 
 alias mg='echo -e "HINT: type Ctrl+c Ctrl-x to quit\n[press a key]";read;mg'; 

buildroot-v86/board/v86/rootfs_overlay/root/bin/enter-ar

@@ -1,2 +0,0 @@
-#!/bin/js
-document.querySelector("a-scene").enterAR()

buildroot-v86/board/v86/rootfs_overlay/root/bin/enter-vr

@@ -1,2 +0,0 @@
-#!/bin/js
-document.querySelector("a-scene").enterVR()

buildroot-v86/board/v86/rootfs_overlay/root/bin/exit-ar

@@ -1,2 +0,0 @@
-#!/bin/js
-document.querySelector("a-scene").exitAR()

buildroot-v86/board/v86/rootfs_overlay/root/bin/exit-vr

@@ -1,2 +0,0 @@
-#!/bin/js
-document.querySelector("a-scene").exitVR()

buildroot-v86/board/v86/rootfs_overlay/root/bin/helloworld

@@ -1,2 +1,2 @@
 #!/bin/sh
-echo "$@"
+echo hook.d/alert/yo: yo $*

buildroot-v86/board/v86/rootfs_overlay/root/bin/helloworld.awk

@@ -1,4 +1,4 @@
 #!/usr/bin/awk -f
 BEGIN{
-  print( ARGV[0] " " ARGV[1] " " ARGV[2] )
+  print "hook.d/alert/yo.awk: yo " ARGV[1]
 }

buildroot-v86/board/v86/rootfs_overlay/root/bin/helloworld.js

@@ -1,4 +1,3 @@
 #!/bin/js 
-msg = args.join(' ')
-console.log(msg)
-//alert(msg)
+str = "hook.d/alert/yo.js yo"+args.slice(1).join(' ')
+alert(str)

buildroot-v86/board/v86/rootfs_overlay/root/bin/helloworld.lua

@@ -1,4 +1,2 @@
 #!/usr/bin/env lua
-local msg = table.concat( arg, " ")
-print( msg )                            -- to stdout
---os.execute( "logger '" .. msg .. "'") -- to logs (/var/logs/messages) 
+print("hook.d/alert/yo.lua: yo " .. args[1])

buildroot-v86/board/v86/rootfs_overlay/root/bin/helloworld.py

@@ -1,7 +1,3 @@
 #!/usr/bin/env micropython
 import sys
-import os
-msg = sys.argv[0] + ": " + " ".join(sys.argv)
-
-print(msg)                       # to stdout
-#os.system("logger '"+ msg +"'") # to logs (/var/log/messages)
+print("hook.d/alert/yo.py: "+sys.argv[1])

buildroot-v86/board/v86/rootfs_overlay/root/bin/upload

@@ -1,13 +0,0 @@
-#!/bin/js
-// this allows opening a file upload popup, to upload to the clipboard.
-// because not all input devices (handcontrols) present copy/paste contextmenus 
-// or file drag/drop functionality 
-//
-const isoterminal = document.querySelector('[isoterminal]').components.isoterminal
-const upload      = isoterminal.vt100.upload
-const scene       = document.querySelector('a-scene')
-
-// trigger file input
-scene.exitVR()
-upload.click()
-return "[i] files are uploaded in /mnt/clipboard\n"

buildroot-v86/board/v86/rootfs_overlay/root/bin/watchfs

@@ -1,9 +1,9 @@
 #!/bin/sh
 
-infinite inotifyd echo /root  | awk '
+infinite inotifyd echo /mnt/root  | awk '
 
   # listen for writes to rootdir and send them to DOM 
-  /^[wne] \/root index\.html/ { system("cat "$2"/"$3" | grep -vE \"^#!\" > /dev/browser/html") }
-  /^[wne] \/root index\.js/   { system("cat "$2"/"$3" | grep -vE \"^#!\" > /dev/browser/js") }
+  /^[ne] \/mnt\/root index\.html/ { system("cat "$2"/"$3" | grep -vE \"^#!\" > /dev/browser/html") }
+  /^[ne] \/mnt\/root index\.js/   { system("cat "$2"/"$3" | grep -vE \"^#!\" > /dev/browser/js") }
 
 '

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/clipboard/receive.awk

@@ -1 +0,0 @@
-../../bin/helloworld.awk

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/clipboard/receive.js

@@ -1 +0,0 @@
-../../bin/helloworld.js

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/clipboard/receive.lua

@@ -1 +0,0 @@
-../../bin/helloworld.lua

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/clipboard/receive.py

@@ -1 +0,0 @@
-../../bin/helloworld.py

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/clipboard/receive.sh

@@ -1,14 +0,0 @@
-#!/bin/sh 
-# usage: hook clipboard foo.mp3 [audio/mpeg]
-# this forwards the hook to mimetype or filetype
-source /etc/profile.sh
-
-file="$1"
-ext="${file##*.}"
-mimetype="$2"
-
-if test -n "$mimetype"; then 
-  hook mimetype/"$mimetype" "$file"
-else
-  hook filetype $ext "$file" 
-fi

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/filetype/txt/import-to-aframe

@@ -1,6 +0,0 @@
-#!/bin/sh
-# usage: import-to-aframe <textfile>
-
-str="$(cat "$1" | sed ':a;N;$!ba;s/\n/\\n/g' )" # escape linebreaks
-
-echo "<a-text value='${str}' position='-0.4 1.8 -3' grabbable></a-text>" >> /root/index.html 

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/audio/mpeg

@@ -1 +0,0 @@
-../../filetype/mp3

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/model/gltf-binary/import-to-aframe

@@ -1,6 +0,0 @@
-#!/bin/sh
-# usage: import-to-aframe <textfile>
-
-str="$(cat "$1" | sed ':a;N;$!ba;s/\n/\\n/g' )" # escape linebreaks
-
-echo "<a-text value='${str}' position='-0.4 1.8 -3' grabbable></a-text>" >> /root/index.html 

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/model/gltf-binary/import-to-scene

@@ -1,2 +0,0 @@
-#!/bin/sh
-logger "*TODO*: importing to scene"

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/text/aframe/import-to-aframe

@@ -1,5 +0,0 @@
-#!/bin/sh
-# usage: import-to-aframe <textfile>
-
-# *FIXME* need consent
-cat "$1" >> /root/index.html 

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/text/detect.aframe

@@ -1,9 +0,0 @@
-#!/bin/sh
-source /etc/profile.sh
-file="$1" 
-
-# naive javascript detector 
-grep '<a-' "$file" &> /dev/null && {
-  cat "$file" | grep -vE '(<script|iframe)' &> "$file".aframe 
-  hook mimetype/text/aframe "$file".aframe
-}

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/text/detect.html

@@ -1,8 +0,0 @@
-#!/bin/sh
-source /etc/profile.sh
-file="$1" 
-
-# naive html detector 
-grep -E '(<\/a>|<\/div>)' "$file" &> /dev/null && {
-  hook mimetype/text/html "$file"
-}

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/text/detect.javascript

@@ -1,8 +0,0 @@
-#!/bin/sh
-source /etc/profile.sh
-file="$1" 
-
-# naive javascript detector 
-grep -E '[a-zA-Z]\(' "$file" &> /dev/null && {
-  hook mimetype/text/javascript "$file"
-}

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/text/html/eval

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# warning: to activate below make this file executable at own risk
-
-cat $1 | grep -vE "(<script|<iframe)" >> /root/index.html

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/text/import-to-aframe

@@ -1 +0,0 @@
-plain/import-to-aframe

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/text/javascript/eval

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# warning: to activate below make this file executable at own risk
-
-js "$(cat $1)"

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/text/plain

@@ -1 +0,0 @@
-../../filetype/txt

buildroot-v86/board/v86/rootfs_overlay/root/hook.d/mimetype/video/mp4

@@ -1 +0,0 @@
-../../filetype/mp4

buildroot-v86/board/v86/rootfs_overlay/root/manual.md

@@ -71,12 +71,6 @@ The following files are loaded during boot (via `/etc/profile`)
 ```javascript
 const term = document.querySelector('[isoterminal]').components.isoterminal.term
 term.exec("ls -la")
-
-// interact directly with files 
-await term.worker.create_file("hello.txt", term.convert.toUint8Array("hello") )
-await term.worker.update_file("hello.txt", term.convert.toUint8Array("hi") )
-await term.worker.append_file("hello.txt", term.convert.toUint8Array("world") )
-const f = await term.worker.read_file("hello.txt")
 ```
 
 # Calling javascript from terminal 
@@ -88,43 +82,11 @@ Various options:
 3. Run `jsh alert hello` in the shell
 4. Run `jsh` to start an interactive shell
 
-# Hooks 
+# Hybrid Terminal/Browser Events
 
-Hooks are filebased events.
-Why filebased? Well first, because unixy is sexy.
-Second: it allows reacting to events in a hackable way via polyglot scripts. 
+Events are automatically triggering scripts in `/root/hook.d/{eventname}/*`
 
-> TLDR: events are automatically triggering scripts found in `/root/hook.d/{eventname}/*`
-
-**OS related hooks**
-
-| hook location           | when is this hook called?                             |
-|-------------------------|-------------------------------------------------------|
-| hook.d/wakeup/*         | restoring xrsh session from cache                     |
-| hook.d/save/*           | saving xrsh session to cache                          |
-| hook.d/alert/*          | when 'alert'-function is used in shell                |
-| hook.d/prompt/*         | when 'prompt'-function is used in shell               |
-| hook.d/confirm/*        | when 'confirm'-function is used in shell              |
-
-**Clipboard related hooks**
-
-| hook.d/clipboard/*      | user copy-pastes clipboard or (drops) file into scene |
-| hook.d/mimetype/*       | clipboard activity (hook.d/clipboard/forwarder)       |
-| hook.d/filetype/*       | clipboard activity (hook.d/clipboard/forwarder)       |
-
-**XR related hooks**
-
-| hook location           | when is this hook called?                             |
-|-------------------------|-------------------------------------------------------|
-| hook.d/exit-vr/*        | user exits immersive WebXR [VR] mode                  |
-| hook.d/enter-vr/*       | user enters immersive WebXR [VR] mode                 |
-| hook.d/exit-ar/*        | user exits immersive WebXR [AR] mode                  |
-| hook.d/enter-ar/*       | user enters immersive WebXR [AR] mode                 |
-
-> How to trigger them?
-
-Well the isoterminal-AFRAME component triggers them automatically for you. 
-But you can do it manually too:
+> They can be triggered by the following ways
 
 1. from shellscript: `hook myevent` (will trigger **executable** files in /root/hook.d/myevent)
 2. from javascript: `isoterminal.exec("hook myevent")` (idem)