From 71f281b208e71014fa61c23a943b1b326272556e Mon Sep 17 00:00:00 2001
From: Holden Rohrer <hr@hrhr.dev>
Date: Sat, 18 Jan 2020 17:26:33 -0500
Subject: jarvis externalized identify()

---
 examples/jarvis.js | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

(limited to 'examples/jarvis.js')

diff --git a/examples/jarvis.js b/examples/jarvis.js
index 2c39385..a8373ce 100644
--- a/examples/jarvis.js
+++ b/examples/jarvis.js
@@ -9,11 +9,12 @@ const comb = require('../utils/comb');
 const Search = require('../tools/search');
 const sched = require('../tools/schedule');
 const ri = require('../utils/rectintersect');
+const id = require('../utils/ident');
 
 //// Basic handling on open and close of the socket
 var main = new Socket();
 
-main.on('open', open);
+id(main, initOnce, init);
 main.on('close', deinit);
 
 //// tileUpdates require knowledge of the prog's identity (sender)
@@ -37,30 +38,6 @@ function initOnce(){
 var funcs = [protectArea, detectPrompt];
 
 //// Management utilities
-// "Pings" the server with a cursor location which is then detected
-function open(){
-  console.log('socket opened');
-  let coords = [Math.floor(Math.random()*100000+16),Math.floor(Math.random()*100000+16)];
-  main.cursor(coords);
-  main.on('cursor', detect);
-  function detect(pos, send){
-    if (vec.equals(pos[0],coords)){
-      main.off('cursor', detect);
-      identity(send);
-    }
-  }
-}
-
-// identity records the identity discovered from the cursor and calls configurable init and initOnce functions
-var initialized = false; //"Initialize once" strategy
-function identity(send){
-  console.log('identity activated');
-  if (! initialized){
-    initialized = true;
-    initOnce();
-  }
-  init(send);
-}
 
 // When a tile changes, processes data into usable form and runs every function in `funcs` w/ that data.
 // Note that functions can edit inputs
-- 
cgit