janusweb 1.5.56 → 1.7.1

package/scripts/translators/peertube.js

@@ -0,0 +1,89 @@
+elation.require([], function() {
+  elation.component.add('janusweb.translators.peertube', function() {
+    this.init = function() {
+      this.description = "peertube website to 3D translator"
+    }
+    this.exec = function(args) {
+      return new Promise(elation.bind(this, function(resolve, reject) {
+
+        var room = this.room = args.room;
+
+        reject() // for now
+
+        this.setupEvents()
+        var datapath = elation.config.get('janusweb.datapath', '/media/janusweb');
+
+        var roomdata = {
+          assets: {
+            assetlist: [
+              // {assettype: 'model', name: 'scene', src: args.url},
+            ]
+          },
+          room: {
+            pos: [0,0,0],
+            xdir: "1 0 0",
+            zdir: "0 0 1",
+          },
+          object: [
+            // {id: 'scene', js_id: 0, pos: "0 0 0", xdir: "-1 0 0", zdir: "0 0 -1", lighting: "false"}
+          ],
+          link: []
+        };
+        resolve(roomdata);
+      }));
+    }
+
+    // translate XR Fragments microformat into JML
+    this.parseSource = async function(sourcecode, room){
+      this.room = room
+      const isJML = /<fireboxroom>[\s\S]*?<\/fireboxroom>/si;
+      const isPeertube         = /<meta\s+[^>]*property=['"]og:platform['"]\s+[^>]*content=['"]peertube['"][^>]*\/?>/si;
+      const isPeertubeVideo    = /<meta\s+[^>]*property=['"]og:type['"]\s+[^>]*content=['"]video['"][^>]*\/?>/si;
+      const isPeertubeInstance = /<meta\s+[^>]*property=['"]og:type['"]\s+[^>]*content=['"]website['"][^>]*\/?>/si;
+      const is = {
+        JML:              sourcecode.match(isJML),
+        peertube:         sourcecode.match(isPeertube),
+        peertubeVideo:    sourcecode.match(isPeertubeVideo),
+        peertubeInstance: sourcecode.match(isPeertubeInstance),
+      }
+      if( is.JML || !is.peertube ) return // JML takes precedence over microformats 
+      if( !is.peertubeVideo && !is.peertubeInstance ) return 
+      
+      // ok..peertube time: get domtree 
+      let el = document.createElement("div")
+      el.innerHTML = sourcecode
+
+      // try to fetch title + cover
+      const title = el.querySelector("title")
+      let logo    = el.querySelector("meta[property='og:image']")?.getAttribute("content")
+      logo        = logo ? logo : el.querySelector("meta[property='og:image:url']")?.getAttribute("content")
+
+      let url      = new URL( String(room.url) )
+      let instance = url?.origin
+      let search   = url?.search ? new URLSearchParams(url.search).get("search") : ""
+
+      // return JML
+      return room.parseSource(`
+        <title>${ title ? title.innerText.replace(/\n.*/g,'') : room.baseurl.split("/").pop() }</title>
+        <FireBoxRoom>
+            <Assets>
+              ${ logo ? `<assetimage src="${logo}" id="logo"/>` : ''}
+              <assetscript src="https://codeberg.org/coderofsalvation/janus-script-peertube/raw/branch/master/build/janus-script-peertube.js"/>
+              <assetobject src="https://codeberg.org/coderofsalvation/janus-script-peertube/raw/branch/master/build/asset/button.glb" id="button"/>
+              <assetobject src="https://codeberg.org/coderofsalvation/janus-script-peertube/raw/branch/master/build/asset/button.icon.glb"  id="icon"/>
+              <assetsound  src="https://codeberg.org/coderofsalvation/janus-script-peertube/raw/branch/master/build/asset/button.click.mp3" id="button-click"/>
+              <assetsound  src="https://codeberg.org/coderofsalvation/janus-script-peertube/raw/branch/master/build/asset/button.hover.mp3" id="button-hover"/>
+            </Assets>
+            <Room use_local_asset="room_2pedestal" pos="1.15 0 -5" rotation="0 1.5708 0" fwd="1 0 0">
+              ${ is.peertubeInstance ? `<peertube-app pos="4.55 2.71 -4.7" scale="2 2 1" rotation="0 90 0" js_id="mypeertube-app" instance="${instance}" ${search?`search="${search}"`:``} autoload="true"/>`
+                                     : `<peertube     pos="4.55 2.71 -4.7" scale="2 2 1" rotation="0 90 0" js_id="peertube" src="${room.url}" auto_play="true"/>` 
+               }
+              ${ logo ? `<image id="logo"/>` : ''}
+            </Room>
+        </FireBoxRoom>
+      `)
+    }
+    // peertube microformat heuristic: <meta property="og:platform" content="PeerTube">
+    this.parseSource.regex = /<meta\s+[^>]*property=['"]og:platform['"]\s+[^>]*content=['"]peertube['"][^>]*\/?>/si;
+  });
+});

package/scripts/translators/xrfragments.js

@@ -0,0 +1,93 @@
+elation.require([], function() {
+  elation.component.add('janusweb.translators.xrfragments', function() {
+    this.init = function() {
+      this.description = "this implements the https://xrfragment.org standard for immersive 3d file browsing"
+    }
+    this.exec = function(args) {
+      return new Promise(elation.bind(this, function(resolve, reject) {
+
+        var room = this.room = args.room;
+        this.setupEvents()
+
+        var datapath = elation.config.get('janusweb.datapath', '/media/janusweb');
+
+        var roomdata = {
+          assets: {
+            assetlist: [
+              {assettype: 'model', name: 'scene', src: args.url},
+            ]
+          },
+          room: {
+            gravity: 0,
+            pos: [0,0,0],
+            xdir: "1 0 0",
+            zdir: "0 0 1",
+          },
+          object: [
+            {id: 'scene', js_id: "scene", pos: "0 0 0", xdir: "-1 0 0", zdir: "0 0 -1"}
+          ],
+          link: []
+        };
+        resolve(roomdata);
+      }));
+    }
+
+    this.spawnUserAtFragment = function(source) {
+      // XR Fragments deeplink spec: explicit or default spawn
+      // https://xrfragment.org/#teleport%20camera
+      if( ! room.urlhash ) room.urlhash = 'spawn'
+      room.setPlayerPosition.apply(room)
+      console.log("[xrfragment] camera teleport")
+    }
+
+    this.setupEvents = function(){
+      elation.events.add(room._room, 'room_load_complete', this.spawnUserAtFragment.bind(this) )
+    }
+
+    // translate XR Fragments microformat into JML
+    this.parseSource = async function(sourcecode, room){
+      this.room = room
+      const isJML = /<fireboxroom>[\s\S]*?<\/fireboxroom>/si;
+      if( sourcecode.match(isJML) ) return // JML takes precedence over microformats 
+
+      // extract href/title value
+      let el = document.createElement("div")
+      el.innerHTML = sourcecode
+      const link = el.querySelector("link[as=spatial-entrypoint]")
+      if( !link ) return
+      const title = el.querySelector("title")
+      const href  = link.getAttribute("href")
+      if( !href ) return
+      console.log("[xrfragment] detected XRF microformat")
+      const hrefNoHash = href.replace(/#.*/,'')
+
+      // if microformat has xr fragment in URI, use it if room-url has no xr fragment 
+      if( href.match(/#/) && !room.urlhash ){
+        room.urlhash = href.replace(/.*#/,'')
+      }
+      // check if link exists
+      const hrefFull = hrefNoHash.match('://') ? hrefNoHash : String(room.baseurl+hrefNoHash)  
+      const exist    = await fetch( hrefFull ,{method:'HEAD'})
+      if( !exist.ok ) return console.warn(`[xrfragment] ${link.outerHTML} resolves to invalid url ${hrefFull}`)
+
+      // setup events
+      this.setupEvents()
+      // return JML
+      return room.parseSource(`
+        <title>${ title ? title.innerText.replace(/\n.*/g,'') : room.baseurl.split("/").pop() }</title>
+        <FireBoxRoom>
+            <Assets>
+              <assetobject id="scene" src="${hrefNoHash}"/>
+            </Assets>
+            <Room gravity="0">
+              <object pos="0 0 0" collision_id="scene" id="scene" />
+            </Room>
+        </FireBoxRoom>
+      `)
+    }
+    // microformat heuristic (https://xrfragment.org/#XRF%20microformat)
+    // example: <link rel="alternate" as="spatial-entrypoint" src="https://foo.org/bar.glb"> 
+    this.parseSource.regex = /<link\s+[^>]*rel=['"]spatial-entrypoint['"][^>]*\/?>/si;
+
+  });
+});

package/tests/room/paragraph.xml

@@ -0,0 +1,47 @@
+<html>
+  <body>
+    <style type="text/css">
+      body > div,
+      .paragraphcontainer {
+        background: linear-gradient(45deg,#73F7,#F377);
+        color: #FFF;
+        border:3px solid #73F;
+        border-radius:12px;
+        padding:7px;
+      }
+    </style>
+    <div class="section">
+      <b>hello from JML container document</b>
+      <br/>
+      This content is from the document<br/>
+      which embeds this Janus room JML.<br/>
+      <img src="https://janusxr.org/images/janusxr-logo.png" width="70"/>
+    </div>
+    <div class="section">
+      <b>container: Foo bar</b>
+      <br/>
+      So you're looking at an multidimensional<br/>
+      hypertext document 💪<br/>
+      <img src="https://janusxr.org/images/team/team_bai.jpg" width="70"/>
+    </div>
+  </body>
+  <fireboxroom>
+    <assets>
+    </assets>
+    <room pos="0 -1 -2">
+      <paragraph js_id="p1" lighting="false" scale="0.4 0.2 1" width="400" height="200" url="https://janusxr.org" selector=".infoText" rotation="0 180 0" position="-1 0 0"/>
+      <paragraph js_id="p2" lighting="false" scale="0.4 0.2 1" width="400" height="200" url="https://mastodon.online/@lvk.rss" selector="item description" rotation="0 180 0" pos="0 0 0"/>
+      <paragraph js_id="p3" lighting="false" scale="0.4 0.2 1" width="400" height="200" selector=".section" rotation="0 180 0" pos="1 0 0"/>
+      <paragraph js_id="p4" lighting="false" scale="0.4 0.2 1" width="400" height="200" selector=".info" rotation="0 180 0" pos="2 0 0" css=".paragraphcontainer{background:black;color:#A5F; border-radius:10px}" indexrotate="1700">
+        <![CDATA[
+        <div class="info">Clicking this &lt;div&gt; will cycle</div>
+          <div class="info">through all divs</div>
+          <div class="info">with class="info"</div>
+          <div class="info">this also works with RSS urls</div>
+          <div class="info">when you set the selector</div>
+          <div class="info">to selector="item description"</div>
+       ]]>
+      </paragraph>
+    </room>
+  </fireboxroom>
+</html>

package/utils/build.sh

@@ -9,6 +9,7 @@ if [ -z "$NODEJS" ]; then
   exit
 fi
 
+export PATH=$PATH:$(pwd)/node_modules/.bin # uglifyjs fix
 
 VERSION=$("$NODEJS" -pe "require('./package.json').version")
 BUILDROOT=$(pwd)/build

package/utils/clean-build.sh

@@ -2,3 +2,8 @@
 
 [ -e elation ] && rm -r elation
 [ -e node_modules ] && rm -r node_modules
+[ -d build ] && rm -r build
+read -p "[?] bleeding-edge dependencies? (y/n) " ok
+test "$ok" = y && rm package-lock.json
+npm install
+utils/build.sh

package/utils/dev-link.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+# Manage local npm links for janusweb's elation-family dependencies.
+#
+# Default workflow: `npm install` pulls published versions of these
+# packages into node_modules. Use this script to swap any of them for
+# a local checkout while developing, and swap back when done.
+#
+# Usage:
+#   utils/dev-link.sh link    <pkg> <path>   point node_modules/<pkg> at <path>
+#   utils/dev-link.sh unlink  <pkg>          remove the link and reinstall <pkg>
+#   utils/dev-link.sh status                 show link state for tracked packages
+
+set -e
+
+# Packages this script knows about, for the `status` listing. Linking
+# isn't restricted to these — `link <name> <path>` works for any name.
+TRACKED=(elation elation-engine cyclone-physics elation-share)
+
+JANUSWEB_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+
+usage() {
+  sed -n '2,12p' "$0" | sed 's/^# \?//'
+  exit 1
+}
+
+cmd_link() {
+  local name="$1" path="$2"
+  if [ -z "$name" ] || [ -z "$path" ]; then
+    echo "link requires <pkg> and <path>" >&2; usage
+  fi
+  if [ ! -d "$path" ]; then
+    echo "Source path not found: $path" >&2; exit 1
+  fi
+  path="$(cd "$path" && pwd)"
+  echo "==> Linking $name from $path"
+  (cd "$path" && npm link >/dev/null)
+  (cd "$JANUSWEB_DIR" && npm link "$name" >/dev/null)
+}
+
+cmd_unlink() {
+  local name="$1"
+  if [ -z "$name" ]; then
+    echo "unlink requires <pkg>" >&2; usage
+  fi
+  local target="$JANUSWEB_DIR/node_modules/$name"
+  if [ ! -L "$target" ]; then
+    echo "$name is not linked"; exit 0
+  fi
+  echo "==> Unlinking $name and reinstalling from registry"
+  (cd "$JANUSWEB_DIR" && npm unlink "$name" --no-save >/dev/null) || true
+  (cd "$JANUSWEB_DIR" && npm install "$name" --no-save >/dev/null)
+}
+
+cmd_status() {
+  for name in "${TRACKED[@]}"; do
+    local target="$JANUSWEB_DIR/node_modules/$name"
+    if [ -L "$target" ]; then
+      printf "  %-22s linked  -> %s\n" "$name" "$(readlink "$target")"
+    elif [ -d "$target" ]; then
+      local v
+      v=$(node -p "require('$target/package.json').version" 2>/dev/null || echo "?")
+      printf "  %-22s installed (%s)\n" "$name" "$v"
+    else
+      printf "  %-22s not installed\n" "$name"
+    fi
+  done
+}
+
+case "${1:-}" in
+  link)   shift; cmd_link   "$@" ;;
+  unlink) shift; cmd_unlink "$@" ;;
+  status) cmd_status ;;
+  -h|--help|help|'') usage ;;
+  *) echo "Unknown command: $1" >&2; echo; usage ;;
+esac

package/utils/release.binary.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+set -e
+
+VERSION=$( $(which node) -pe "require('./package.json').version")
+BUILD=build/$VERSION
+
+test -f "$BUILD/index.html" || { echo "[x] could not find $BUILD/index.html (run 'npm run build' first)"; exit 1;}
+
+download(){
+  rm $BUILD/*.com || true # delete old
+  url="https://redbean.dev/redbean-3.0.0.com"
+  checksum="382f1288bb96ace4bab5145e7df236846c33cc4f1be69233710682a9e71e7467  $BUILD/janusxr.com"
+  verify(){
+    echo "$checksum" > /tmp/checksum
+    sha256sum -c /tmp/checksum || { echo "psuedosecurity checksum failed"; exit 1; }
+    chmod +x $BUILD/janusxr.com
+  }
+  test -f $BUILD/janusxr.com || {
+    wget "$url" -O $BUILD/janusxr.com
+    verify
+  }
+}
+
+configure(){
+  cd $BUILD
+  ln -fs media/images/icons/janusweb-256x256.ico favicon.ico
+  sed -i 's|<janus-viewer src.*|<janus-viewer src="./index.html"></janus-viewer>|g' index.html
+  zip -r janusxr.com * -x janusweb.min.js
+  set -e
+  set -x
+  cd ../../janusxr.com
+  zip -r ../$BUILD/janusxr.com .args .init.lua *
+}
+
+download
+configure

package/utils/release.docker.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+VERSION=$( $(which node) -pe "require('./package.json').version")
+
+set -xe
+docker build -t janusxr --build-arg JANUSXR_VERSION=$VERSION .
+
+# push to registry
+docker login codeberg.org
+docker tag janusxr:latest codeberg.org/coderofsalvation/janusxr:$VERSION
+docker push codeberg.org/coderofsalvation/janusxr:$VERSION 
+