add pnacl support for ceval

.gitmodules

@@ -44,3 +44,7 @@
  path = public/vendor/Sunsetter8
  url = https://github.com/niklasf/Sunsetter8
  branch = js
+[submodule "public/vendor/stockfish.pexe"]
+ path = public/vendor/stockfish.pexe
+ url = https://github.com/niklasf/stockfish.pexe
+ branch = ddugovic

ui/analyse/src/ceval/cevalCtrl.js

@@ -2,8 +2,8 @@ var m = require('mithril');
 var makePool = require('./cevalPool');
 var dict = require('./cevalDict');
 var util = require('../util');
-var stockfishWorker = require('./stockfishWorker');
-var sunsetterWorker = require('./sunsetterWorker');
+var stockfishProtocol = require('./stockfishProtocol');
+var sunsetterProtocol = require('./sunsetterProtocol');
 
 module.exports = function(possible, variant, emit) {
 
@@ -16,13 +16,22 @@ module.exports = function(possible, variant, emit) {
  var allowed = m.prop(true);
  var enabled = m.prop(possible() && allowed() && lichess.storage.get(storageKey) === '1');
  var started = false;
- var engine = variant.key !== 'crazyhouse' ? stockfishWorker : sunsetterWorker;
 
- var pool = makePool({
- minDepth: minDepth,
- maxDepth: maxDepth,
- variant: variant
- }, engine, nbWorkers);
+ var pool;
+ if (variant.key !== 'crazyhouse') {
+ pool = makePool(stockfishProtocol, {
+ asmjs: '/assets/vendor/stockfish.js/stockfish.js',
+ pnacl: '/assets/vendor/stockfish.pexe/nacl/stockfish.nmf'
+ }, {
+ minDepth: minDepth,
+ maxDepth: maxDepth,
+ variant: variant,
+ });
+ } else {
+ pool = makePool(sunsetterProtocol, {
+ asmjs: '/assets/vendor/Sunsetter8/sunsetter.js'
+ });
+ }
 
  // adjusts maxDepth based on nodes per second
  var npsRecorder = (function() {

ui/analyse/src/ceval/cevalPool.js

@@ -1,7 +1,65 @@
 var m = require('mithril');
 
-module.exports = function(opts, makeWorker, nb) {
+function makeHelper(makeWorker, terminateWorker, poolOpts, makeProtocol, protocolOpts) {
+ var worker, protocol, api;
 
+ var boot = function () {
+ worker = makeWorker(poolOpts);
+ protocol = makeProtocol(api, protocolOpts);
+ worker.addEventListener('message', function(e) {
+ protocol.received(e.data);
+ }, true);
+ };
+
+ var stop = function() {
+ var stopped = m.deferred(false);
+ setTimeout(function () {
+ stopped.reject();
+ }, 1000);
+ return protocol.stop(stopped);
+ };
+
+ api = {
+ send: function(text) {
+ worker.postMessage(text);
+ },
+ start: function (work) {
+ stop().then(function () {
+ protocol.start(work);
+ }, function () {
+ terminateWorker(worker);
+ boot();
+ });
+ },
+ stop: stop
+ };
+
+ boot();
+
+ return api;
+}
+
+function makeWebWorker(makeProtocol, poolOpts, protocolOpts) {
+ return makeHelper(function () {
+ return new Worker(poolOpts.asmjs);
+ }, function (worker) {
+ worker.terminate();
+ }, poolOpts, makeProtocol, protocolOpts);
+}
+
+function makePNaClModule(makeProtocol, poolOpts, protocolOpts) {
+ return makeHelper(function () {
+ var module = document.createElement('embed');
+ module.setAttribute('src', poolOpts.pnacl);
+ module.setAttribute('type', 'application/x-pnacl');
+ module.setAttribute('width', '0');
+ module.setAttribute('height', '0');
+ document.body.appendChild(module);
+ return module;
+ }, function () {}, poolOpts, makeProtocol, protocolOpts);
+}
+
+module.exports = function(makeProtocol, poolOpts, protocolOpts) {
  var workers = [];
  var token = -1;
 
@@ -12,9 +70,13 @@ module.exports = function(opts, makeWorker, nb) {
  };
 
  var initWorkers = function() {
- if (!workers.length)
- for (var i = 1; i <= nb; i++)
- workers.push(makeWorker(opts, 'W' + i));
+ if (workers.length) return;
+
+ if (poolOpts.pnacl && navigator.mimeTypes['application/x-pnacl'])
+ workers.push(makePNaClModule(makeProtocol, poolOpts, protocolOpts));
+ else
+ for (var i = 1; i <= 4; i++)
+ workers.push(makeWebWorker(makeProtocol, poolOpts, protocolOpts));
  }
 
  var stopAll = function() {

ui/analyse/src/ceval/stockfishProtocol.js

@@ -0,0 +1,75 @@
+var m = require('mithril');
+
+var legacyVariantMap = {
+ fromPosition: 'Chess960',
+ chess960: 'Chess960',
+ atomic: 'Atomic',
+ horde: 'Horde',
+ crazyhouse: 'House',
+ kingOfTheHill: 'KingOfTheHill',
+ racingKings: 'Race',
+ threeCheck: '3Check',
+ antichess: 'Anti'
+};
+
+module.exports = function(worker, opts) {
+
+ var work = null;
+ var stopped = m.deferred();
+
+ var legacyVariant = legacyVariantMap[opts.variant.key];
+ if (legacyVariant) worker.send('setoption name UCI_' + legacyVariant + ' value true');
+ else worker.send('uci');
+
+ // TODO: Modern variant selector
+
+ var processOutput = function(text) {
+ if (text.indexOf('bestmove ') === 0) {
+ stopped.resolve(true);
+ return;
+ }
+ if (!work) return;
+ if (/currmovenumber|lowerbound|upperbound/.test(text)) return;
+ var matches = text.match(/depth (\d+) .*score (cp|mate) ([-\d]+) .*nps (\d+) .*pv (.+)/);
+ if (!matches) return;
+ var depth = parseInt(matches[1]);
+ if (depth < opts.minDepth) return;
+ var cp, mate;
+ if (matches[2] === 'cp') cp = parseFloat(matches[3]);
+ else mate = parseFloat(matches[3]);
+ if (work.ply % 2 === 1) {
+ if (matches[2] === 'cp') cp = -cp;
+ else mate = -mate;
+ }
+ var best = matches[5].split(' ')[0];
+ work.emit({
+ work: work,
+ eval: {
+ depth: depth,
+ cp: cp,
+ mate: mate,
+ best: best,
+ nps: parseInt(matches[4])
+ },
+ name: name
+ });
+ };
+
+ return {
+ start: function(w) {
+ work = w;
+ worker.send(['position', 'fen', work.initialFen, 'moves'].concat(work.moves).join(' '));
+ worker.send('go depth ' + work.maxDepth);
+ },
+ stop: function(s) {
+ if (!work) s.resolve(true);
+ else {
+ work = null;
+ stopped = s;
+ worker.send('stop');
+ }
+ return s.promise;
+ },
+ received: processOutput
+ };
+};