Skip to content
This repository was archived by the owner on Jan 4, 2021. It is now read-only.

Commit 6c17a31

Browse files
RomainCscnRomainCscn
committed
[DEV] Improve error management
1 parent 841da7b commit 6c17a31

File tree

72 files changed

+55739
-47376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+55739
-47376
lines changed

‎dist/myscript.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/myscript.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/ast/source/Editor.js.json

+27,978-23,257
Large diffs are not rendered by default.

‎docs/ast/source/recognizer/websocket/v4/Cdkv4WSBuilder.js.json

+134-203
Large diffs are not rendered by default.

‎docs/ast/source/recognizer/websocket/v4/Cdkv4WSIInkRecognizer.js.json

+26,205-22,950
Large diffs are not rendered by default.

‎docs/badge.svg

+2-2
Loading

‎docs/class/src/Editor.js~Editor.html

+131-60
Large diffs are not rendered by default.

‎docs/coverage.json

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"coverage": "91.53%",
3-
"expectCount": 248,
2+
"coverage": "90.8%",
3+
"expectCount": 250,
44
"actualCount": 227,
55
"files": {
66
"src/model/RecognizerContext.js": {
@@ -9,19 +9,20 @@
99
"undocumentLines": []
1010
},
1111
"src/Editor.js": {
12-
"expectCount": 59,
12+
"expectCount": 60,
1313
"actualCount": 53,
1414
"undocumentLines": [
15-
413,
16-
408,
17-
492,
18-
442,
19-
593,
20-
594
15+
425,
16+
420,
17+
504,
18+
931,
19+
454,
20+
605,
21+
606
2122
]
2223
},
2324
"src/recognizer/websocket/v4/Cdkv4WSIInkRecognizer.js": {
24-
"expectCount": 27,
25+
"expectCount": 28,
2526
"actualCount": 19,
2627
"undocumentLines": [
2728
98,
@@ -31,7 +32,8 @@
3132
68,
3233
204,
3334
211,
34-
218
35+
218,
36+
459
3537
]
3638
},
3739
"src/renderer/canvas/symbols/MathSymbolCanvasRenderer.js": {
@@ -196,11 +198,6 @@
196198
"actualCount": 1,
197199
"undocumentLines": []
198200
},
199-
"src/renderer/canvas/symbols/StrokeSymbolCanvasRenderer.js": {
200-
"expectCount": 1,
201-
"actualCount": 1,
202-
"undocumentLines": []
203-
},
204201
"src/renderer/svg/symbols/StrokeSymbolSVGRenderer.js": {
205202
"expectCount": 1,
206203
"actualCount": 1,
@@ -216,6 +213,11 @@
216213
"actualCount": 2,
217214
"undocumentLines": []
218215
},
216+
"src/renderer/canvas/symbols/StrokeSymbolCanvasRenderer.js": {
217+
"expectCount": 1,
218+
"actualCount": 1,
219+
"undocumentLines": []
220+
},
219221
"src/callback/EventCallback.js": {
220222
"expectCount": 1,
221223
"actualCount": 1,
@@ -231,7 +233,7 @@
231233
"actualCount": 3,
232234
"undocumentLines": []
233235
},
234-
"src/recognizer/common/v3/Cdkv3CommonTextRecognizer.js": {
236+
"src/recognizer/common/CdkCommonUtil.js": {
235237
"expectCount": 1,
236238
"actualCount": 1,
237239
"undocumentLines": []
@@ -241,7 +243,7 @@
241243
"actualCount": 4,
242244
"undocumentLines": []
243245
},
244-
"src/recognizer/common/CdkCommonUtil.js": {
246+
"src/recognizer/common/v3/Cdkv3CommonTextRecognizer.js": {
245247
"expectCount": 1,
246248
"actualCount": 1,
247249
"undocumentLines": []

‎docs/dump.json

+731-624
Large diffs are not rendered by default.

‎docs/file/src/Editor.js.html

+20-3
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>
@@ -428,18 +429,19 @@
428429
const handleResult = (err, res, ...types) =&gt; {
429430
if (err) {
430431
logger.error(&apos;Error while firing the recognition&apos;, err.stack || err); // Handle any error from all above steps
431-
if ((err.message === &apos;Wrong application key&apos;) || (err.message === &apos;Invalid HMAC&apos;) ||
432+
if ((err.message === &apos;Invalid application key.&apos;) || (err.message === &apos;Invalid HMAC&apos;) ||
432433
(err.error &amp;&amp;
433434
err.error.result &amp;&amp;
434435
err.error.result.error &amp;&amp;
435436
(err.error.result.error === &apos;InvalidApplicationKeyException&apos; || err.error.result.error === &apos;InvalidHMACSignatureException&apos;)
436437
)) {
437438
editorRef.error.innerText = Constants.Error.WRONG_CREDENTIALS;
438-
} else {
439+
} else if (editorRef.error.style.display === &apos;none&apos;) {
439440
editorRef.error.innerText = Constants.Error.NOT_REACHABLE;
440441
}
441-
if (err.message === &apos;Session is too old. Max Session Duration Reached&apos; &amp;&amp; RecognizerContext.canReconnect(editor.recognizerContext)) {
442+
if ((err.message === &apos;Session is too old. Max Session Duration Reached&apos; || err.code === 1006) &amp;&amp; RecognizerContext.canReconnect(editor.recognizerContext)) {
442443
logger.info(&apos;Reconnection is available&apos;, err.stack || err);
444+
editorRef.error.style.display = &apos;none&apos;;
443445
} else {
444446
editorRef.error.style.display = &apos;initial&apos;;
445447
triggerCallbacks(editor, err, Constants.EventType.ERROR, ...types);
@@ -487,6 +489,17 @@
487489
editorRef.smartGuide = SmartGuide.launchSmartGuide(editor.smartGuide, exports);
488490
}
489491

492+
function launchRestoreSession(editor, model) {
493+
if (editor.recognizer &amp;&amp; editor.recognizer.restoreSession) {
494+
editor.recognizerContext.initPromise
495+
.then(() =&gt; {
496+
editor.recognizer.restoreSession(editor.recognizerContext, model, editor.domElement, (err, res, ...types) =&gt; {
497+
recognizerCallback(editor, err, res, ...types);
498+
});
499+
});
500+
}
501+
}
502+
490503
/**
491504
* Launch ink import.
492505
* @param {Editor} editor
@@ -1180,6 +1193,10 @@
11801193
launchImport(this, this.model, !(data instanceof Blob) ? new Blob([data], { type: mimetype }) : data);
11811194
}
11821195

1196+
restoreSession() {
1197+
launchRestoreSession(this, this.model);
1198+
}
1199+
11831200
/**
11841201
* pointer events
11851202
* @param {PointerEvents} events

‎docs/file/src/EditorFacade.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/callback/EventCallback.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/Constants.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/DefaultBehaviors.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/DefaultConfiguration.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/DefaultPenStyle.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/DefaultTheme.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/configuration/LoggerConfig.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/grabber/PointerEventGrabber.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

‎docs/file/src/model/InkModel.js.html

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-pointerEvents">pointerEvents</a></span></span></li>
205205
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-redo">redo</a></span></span></li>
206206
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-resize">resize</a></span></span></li>
207+
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-restoreSession">restoreSession</a></span></span></li>
207208
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyle">setPenStyle</a></span></span></li>
208209
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setPenStyleClasses">setPenStyleClasses</a></span></span></li>
209210
<li data-ice="doc"><span data-ice="kind" class="kind-function">F</span><span data-ice="name"><span><a href="function/index.html#static-function-setTheme">setTheme</a></span></span></li>

0 commit comments

Comments
 (0)