util refactor + milo bulk crafting

core/Follow.lua

@@ -89,6 +89,7 @@ local function follow(member)
   end
 
   member.snmp = Socket.connect(member.id, 161)
+  member.snmp.co = coroutine.running()
 
   local pt
 
@@ -109,8 +110,10 @@ end
 
 function swarm:onRemove(member, status, message)
   if member.socket then
-    member.turtle.set({ status = 'idle' })
-    member.turtle.abort(true)
+    pcall(function()
+      member.turtle.set({ status = 'idle' })
+      member.turtle.abort(true)
+    end)
   end
   if member.snmp then
     member.snmp:close()

core/apis/swarm.lua

@@ -1,7 +1,7 @@
 local class   = require('class')
 local Event   = require('event')
+local Map     = require('map')
 local Socket  = require('socket')
-local Util    = require('util')
 
 local function hijackTurtle(remoteId)
 	local socket, msg = Socket.connect(remoteId, 188)
@@ -10,8 +10,10 @@ local function hijackTurtle(remoteId)
 		error(msg)
 	end
 
+  socket.co = coroutine.running()
+
 	socket:write('turtle')
-	local methods = socket:read()
+	local methods = socket:read() or error('Timed out')
 
 	local hijack = { }
 	for _,method in pairs(methods) do
@@ -31,11 +33,11 @@ end
 local Swarm = class()
 function Swarm:init(args)
   self.pool = { }
-  Util.merge(self, args)
+  Map.merge(self, args)
 end
 
 function Swarm:add(id, args)
-  local member = Util.shallowCopy(args or { })
+  local member = Map.shallowCopy(args or { })
   member.id = id
   self.pool[id] = member
 end

core/multiMiner.lua

@@ -320,6 +320,7 @@ function page:scan()
       else
         queue[b.pkey] = nil
       end
+      return acc
 		end,
     { })