Skip to content

Commit ef24e89

Browse files
committed
Rework to use async
1 parent 9b0aed5 commit ef24e89

File tree

4 files changed

+116
-200
lines changed

4 files changed

+116
-200
lines changed

coverage/lcov-report/index.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ <h1>All files</h1>
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26-
<span class="strong">96.25% </span>
26+
<span class="strong">98.61% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>154/160</span>
28+
<span class='fraction'>142/144</span>
2929
</div>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">95.12% </span>
33+
<span class="strong">100% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>39/41</span>
35+
<span class='fraction'>37/37</span>
3636
</div>
3737

3838

@@ -44,9 +44,9 @@ <h1>All files</h1>
4444

4545

4646
<div class='fl pad1y space-right2'>
47-
<span class="strong">96.25% </span>
47+
<span class="strong">98.61% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>154/160</span>
49+
<span class='fraction'>142/144</span>
5050
</div>
5151

5252

@@ -80,17 +80,17 @@ <h1>All files</h1>
8080
</thead>
8181
<tbody><tr>
8282
<td class="file high" data-value="index.js"><a href="index.js.html">index.js</a></td>
83-
<td data-value="96.25" class="pic high">
84-
<div class="chart"><div class="cover-fill" style="width: 96%"></div><div class="cover-empty" style="width: 4%"></div></div>
83+
<td data-value="98.61" class="pic high">
84+
<div class="chart"><div class="cover-fill" style="width: 98%"></div><div class="cover-empty" style="width: 2%"></div></div>
8585
</td>
86-
<td data-value="96.25" class="pct high">96.25%</td>
87-
<td data-value="160" class="abs high">154/160</td>
88-
<td data-value="95.12" class="pct high">95.12%</td>
89-
<td data-value="41" class="abs high">39/41</td>
86+
<td data-value="98.61" class="pct high">98.61%</td>
87+
<td data-value="144" class="abs high">142/144</td>
88+
<td data-value="100" class="pct high">100%</td>
89+
<td data-value="37" class="abs high">37/37</td>
9090
<td data-value="91.66" class="pct high">91.66%</td>
9191
<td data-value="12" class="abs high">11/12</td>
92-
<td data-value="96.25" class="pct high">96.25%</td>
93-
<td data-value="160" class="abs high">154/160</td>
92+
<td data-value="98.61" class="pct high">98.61%</td>
93+
<td data-value="144" class="abs high">142/144</td>
9494
</tr>
9595

9696
</tbody>
@@ -101,7 +101,7 @@ <h1>All files</h1>
101101
<div class='footer quiet pad2 space-top1 center small'>
102102
Code coverage generated by
103103
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
104-
at 2022-09-19T11:15:51.908Z
104+
at 2022-09-19T14:52:26.712Z
105105
</div>
106106
<script src="prettify.js"></script>
107107
<script>

coverage/lcov-report/index.js.html

Lines changed: 20 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ <h1><a href="index.html">All files</a> index.js</h1>
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26-
<span class="strong">96.25% </span>
26+
<span class="strong">98.61% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>154/160</span>
28+
<span class='fraction'>142/144</span>
2929
</div>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">95.12% </span>
33+
<span class="strong">100% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>39/41</span>
35+
<span class='fraction'>37/37</span>
3636
</div>
3737

3838

@@ -44,9 +44,9 @@ <h1><a href="index.html">All files</a> index.js</h1>
4444

4545

4646
<div class='fl pad1y space-right2'>
47-
<span class="strong">96.25% </span>
47+
<span class="strong">98.61% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>154/160</span>
49+
<span class='fraction'>142/144</span>
5050
</div>
5151

5252

@@ -207,23 +207,7 @@ <h1><a href="index.html">All files</a> index.js</h1>
207207
<a name='L142'></a><a href='#L142'>142</a>
208208
<a name='L143'></a><a href='#L143'>143</a>
209209
<a name='L144'></a><a href='#L144'>144</a>
210-
<a name='L145'></a><a href='#L145'>145</a>
211-
<a name='L146'></a><a href='#L146'>146</a>
212-
<a name='L147'></a><a href='#L147'>147</a>
213-
<a name='L148'></a><a href='#L148'>148</a>
214-
<a name='L149'></a><a href='#L149'>149</a>
215-
<a name='L150'></a><a href='#L150'>150</a>
216-
<a name='L151'></a><a href='#L151'>151</a>
217-
<a name='L152'></a><a href='#L152'>152</a>
218-
<a name='L153'></a><a href='#L153'>153</a>
219-
<a name='L154'></a><a href='#L154'>154</a>
220-
<a name='L155'></a><a href='#L155'>155</a>
221-
<a name='L156'></a><a href='#L156'>156</a>
222-
<a name='L157'></a><a href='#L157'>157</a>
223-
<a name='L158'></a><a href='#L158'>158</a>
224-
<a name='L159'></a><a href='#L159'>159</a>
225-
<a name='L160'></a><a href='#L160'>160</a>
226-
<a name='L161'></a><a href='#L161'>161</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
210+
<a name='L145'></a><a href='#L145'>145</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
227211
<span class="cline-any cline-yes">1x</span>
228212
<span class="cline-any cline-yes">1x</span>
229213
<span class="cline-any cline-yes">1x</span>
@@ -301,14 +285,8 @@ <h1><a href="index.html">All files</a> index.js</h1>
301285
<span class="cline-any cline-yes">6x</span>
302286
<span class="cline-any cline-yes">6x</span>
303287
<span class="cline-any cline-yes">6x</span>
304-
<span class="cline-any cline-yes">1x</span>
305-
<span class="cline-any cline-yes">1x</span>
306-
<span class="cline-any cline-yes">5x</span>
307-
<span class="cline-any cline-yes">5x</span>
308-
<span class="cline-any cline-yes">5x</span>
309-
<span class="cline-any cline-yes">5x</span>
310-
<span class="cline-any cline-yes">5x</span>
311-
<span class="cline-any cline-yes">5x</span>
288+
<span class="cline-any cline-yes">6x</span>
289+
<span class="cline-any cline-yes">6x</span>
312290
<span class="cline-any cline-yes">5x</span>
313291
<span class="cline-any cline-yes">5x</span>
314292
<span class="cline-any cline-yes">5x</span>
@@ -353,7 +331,6 @@ <h1><a href="index.html">All files</a> index.js</h1>
353331
<span class="cline-any cline-yes">5x</span>
354332
<span class="cline-any cline-yes">5x</span>
355333
<span class="cline-any cline-yes">5x</span>
356-
<span class="cline-any cline-yes">5x</span>
357334
<span class="cline-any cline-yes">4x</span>
358335
<span class="cline-any cline-yes">1x</span>
359336
<span class="cline-any cline-yes">1x</span>
@@ -364,21 +341,12 @@ <h1><a href="index.html">All files</a> index.js</h1>
364341
<span class="cline-any cline-yes">5x</span>
365342
<span class="cline-any cline-yes">5x</span>
366343
<span class="cline-any cline-yes">5x</span>
367-
<span class="cline-any cline-yes">5x</span>
368-
<span class="cline-any cline-yes">5x</span>
369344
<span class="cline-any cline-yes">4x</span>
370-
<span class="cline-any cline-no">&nbsp;</span>
371-
<span class="cline-any cline-no">&nbsp;</span>
372345
<span class="cline-any cline-yes">4x</span>
373346
<span class="cline-any cline-yes">4x</span>
374-
<span class="cline-any cline-no">&nbsp;</span>
375-
<span class="cline-any cline-no">&nbsp;</span>
376-
<span class="cline-any cline-yes">4x</span>
377-
<span class="cline-any cline-yes">4x</span>
378-
<span class="cline-any cline-yes">5x</span>
379347
<span class="cline-any cline-yes">6x</span>
380-
<span class="cline-any cline-yes">1x</span>
381-
<span class="cline-any cline-yes">1x</span>
348+
<span class="cline-any cline-yes">2x</span>
349+
<span class="cline-any cline-yes">2x</span>
382350
<span class="cline-any cline-yes">6x</span>
383351
<span class="cline-any cline-yes">1x</span>
384352
<span class="cline-any cline-yes">1x</span>
@@ -390,7 +358,7 @@ <h1><a href="index.html">All files</a> index.js</h1>
390358
const path = require('path');
391359
const events = require('events');
392360
const crypto = require('crypto');
393-
const { callbackify, promisify } = require('util');
361+
const { promisify } = require('util');
394362
&nbsp;
395363
function argify(f) {
396364
return promisify((...args) =&gt; {
@@ -459,16 +427,10 @@ <h1><a href="index.html">All files</a> index.js</h1>
459427
cb(err);
460428
}
461429
&nbsp;
462-
crypto.randomBytes(64, (err, uid) =&gt; {
463-
if (err) {
464-
return error(err);
465-
}
466-
&nbsp;
430+
(async () =&gt; {
467431
try {
468-
uid = uid.toString('hex');
469-
&nbsp;
470432
let init_err;
471-
&nbsp;
433+
const uid = (await promisify(crypto.randomBytes)(64)).toString('hex');
472434
const gt = {
473435
crypto: require('crypto'),
474436
performance: require('perf_hooks').performance,
@@ -509,7 +471,6 @@ <h1><a href="index.html">All files</a> index.js</h1>
509471
};
510472
&nbsp;
511473
const wasm_file = path.join(__dirname, 'webauthn4js.wasm');
512-
&nbsp;
513474
require('./wasm_exec.js')(gt);
514475
const go = new gt.Go();
515476
go.argv = [ wasm_file, uid ];
@@ -523,23 +484,14 @@ <h1><a href="index.html">All files</a> index.js</h1>
523484
webauthn.emit('exit', n);
524485
};
525486
&nbsp;
526-
fs.readFile(
527-
wasm_file,
528-
(err, data) =&gt; {
529-
if (err) <span class="branch-0 cbranch-no" title="branch not covered" >{</span>
530-
<span class="cstat-no" title="statement not covered" > return error(err);</span>
531-
<span class="cstat-no" title="statement not covered" > }</span>
532-
callbackify(WebAssembly.instantiate)(data, go.importObject, (err, result) =&gt; {
533-
if (err) <span class="branch-0 cbranch-no" title="branch not covered" >{</span>
534-
<span class="cstat-no" title="statement not covered" > return error(err);</span>
535-
<span class="cstat-no" title="statement not covered" > }</span>
536-
go.run(result.instance);
537-
});
538-
});
487+
const data = await fs.promises.readFile(wasm_file);
488+
const result = await WebAssembly.instantiate(data, go.importObject);
489+
&nbsp;
490+
go.run(result.instance);
539491
} catch (ex) {
540492
error(ex);
541493
}
542-
});
494+
})();
543495
});
544496
&nbsp;
545497
module.exports.schemas = require('./schemas/schemas.json');
@@ -550,7 +502,7 @@ <h1><a href="index.html">All files</a> index.js</h1>
550502
<div class='footer quiet pad2 space-top1 center small'>
551503
Code coverage generated by
552504
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
553-
at 2022-09-19T11:15:51.908Z
505+
at 2022-09-19T14:52:26.712Z
554506
</div>
555507
<script src="prettify.js"></script>
556508
<script>

0 commit comments

Comments
 (0)