From 82deba55a3870878ed3dd3018bbd797012c2deb9 Mon Sep 17 00:00:00 2001 From: Mark Nadal Date: Thu, 29 Nov 2018 02:03:38 -0800 Subject: [PATCH] turn SEA on by default & make shim deps not optional via @danfinlay @kumavis --- lib/server.js | 1 + package.json | 2 +- sea.js | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/server.js b/lib/server.js index 0c698be1..7870006c 100644 --- a/lib/server.js +++ b/lib/server.js @@ -12,6 +12,7 @@ require('./store'); require('./rs3'); require('./wire'); + try{require('../sea');}catch(e){} //try{require('../axe');}catch(e){} require('./file'); require('./evict'); diff --git a/package.json b/package.json index 58fc8219..62f4c2f9 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "dependencies": { "@trust/webcrypto": "^0.9.2", "text-encoding": "^0.6.4", + "node-webcrypto-ossl": "^1.0.38", "ws": "~>5.2.0" }, "devDependencies": { @@ -58,7 +59,6 @@ "express": ">=4.15.2", "ip": "^1.1.5", "mocha": ">=3.2.0", - "node-webcrypto-ossl": "^1.0.38", "panic-manager": "^1.2.0", "panic-server": "^1.1.1", "uglify-js": ">=2.8.22" diff --git a/sea.js b/sea.js index 3d5b0fb2..e710cb1d 100644 --- a/sea.js +++ b/sea.js @@ -301,6 +301,7 @@ return r; } catch(e) { SEA.err = e; + if(SEA.throw){ throw e } if(cb){ cb() } return; }}); @@ -320,6 +321,7 @@ } catch(e) { console.log(e); SEA.err = e; + if(SEA.throw){ throw e } if(cb){ cb() } return; }}); @@ -374,6 +376,7 @@ } catch(e) { console.log(e); SEA.err = e; + if(SEA.throw){ throw e } if(cb){ cb() } return; }}); @@ -415,6 +418,7 @@ } catch(e) { console.log(e); SEA.err = e; + if(SEA.throw){ throw e } if(cb){ cb() } return; }}); @@ -456,6 +460,7 @@ } catch(e) { console.log(e); // mismatched owner FOR MARTTI SEA.err = e; + if(SEA.throw){ throw e } if(cb){ cb() } return; }}); @@ -506,6 +511,7 @@ return r; } catch(e) { SEA.err = e; + if(SEA.throw){ throw e } if(cb){ cb() } return; }}); @@ -537,6 +543,7 @@ return r; } catch(e) { SEA.err = e; + if(SEA.throw){ throw e } if(cb){ cb() } return; }}); @@ -575,6 +582,7 @@ return r; } catch(e) { SEA.err = e; + if(SEA.throw){ throw e } if(cb){ cb() } return; }});