projects / henge / kiak.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 2fa4d84)
Merge branch 'master' of github.com:Jlavatai/strapp
authorJordan <jordanlavatai@gmail.com>
Thu, 13 Jul 2017 00:14:31 +0000 (00:14 +0000)
committerJordan <jordanlavatai@gmail.com>
Thu, 13 Jul 2017 00:14:31 +0000 (00:14 +0000)
client-test.js patch | blob | history

diff --git a/client-test.js b/client-test.js
index 503ac14..a0efaa4 100644 (file)
--- a/client-test.js
+++ b/client-test.js
@@ -220,3 +220,4 @@ document.addEventListener('DOMContentLoaded', () => {
   document.body.innerHTML = `<button> Setting up connection with host  </button>`
 
 });
+>>>>>>> 2fa4d84ec6b04eec92a8a1e76f8b33b2a04f3c58
kiak isn't a kernel, it's a json-based filesystem that runs in browser memory and provides filesystem abstractions for general i/o, webrtc, webcrypto and webgl. it also provides a node.js server bridge over a websocket, providing restricted server-side filesystem access. the node.js server acts as a router, using URLs to route messages to the bridged 'remote admin', who then may receive HTTP and TCP connections in the browser. any application written for the kiak browser environment may also run on the node.js server. developed for the HENGE engine, but also an independent project providing a multi-user application framework (e.g. for multiplayer web games, screen sharing, or pair programming). the web-client is also a kiak routing server, so it can act as a host for its own clients, who may recursively act as servers for their own clients over WebRTC, and so on.