@dodona/papyros 4.0.3 → 4.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/backend/Backend.js.map +1 -1
- package/dist/backend/workers/javascript/JavaScriptWorker.js +31 -21
- package/dist/backend/workers/javascript/JavaScriptWorker.js.map +1 -1
- package/dist/backend/workers/python/PythonWorker.js +4 -4
- package/dist/backend/workers/python/PythonWorker.js.map +1 -1
- package/dist/backend/workers/python/python_package.tar.gz.load_by_url +0 -0
- package/dist/communication/BackendEventQueue.js +5 -4
- package/dist/communication/BackendEventQueue.js.map +1 -1
- package/dist/communication/BackendManager.js +3 -2
- package/dist/communication/BackendManager.js.map +1 -1
- package/dist/communication/InputServiceWorker.js.map +1 -1
- package/dist/communication/InputWorker.js +3 -3
- package/dist/communication/InputWorker.js.map +1 -1
- package/dist/frontend/components/CodeRunner.js +2 -2
- package/dist/frontend/components/CodeRunner.js.map +1 -1
- package/dist/frontend/components/Debugger.js +22 -8
- package/dist/frontend/components/Debugger.js.map +1 -1
- package/dist/frontend/components/Input.js +5 -6
- package/dist/frontend/components/Input.js.map +1 -1
- package/dist/frontend/components/Output.js +24 -21
- package/dist/frontend/components/Output.js.map +1 -1
- package/dist/frontend/components/PapyrosElement.js.map +1 -1
- package/dist/frontend/components/app/App.js +13 -10
- package/dist/frontend/components/app/App.js.map +1 -1
- package/dist/frontend/components/app/ExamplePicker.js +10 -9
- package/dist/frontend/components/app/ExamplePicker.js.map +1 -1
- package/dist/frontend/components/app/LanguagePicker.js +8 -10
- package/dist/frontend/components/app/LanguagePicker.js.map +1 -1
- package/dist/frontend/components/app/ProgrammingLanguagePicker.js +12 -13
- package/dist/frontend/components/app/ProgrammingLanguagePicker.js.map +1 -1
- package/dist/frontend/components/app/examples/JavaScriptExamples.js +4 -4
- package/dist/frontend/components/app/examples/JavaScriptExamples.js.map +1 -1
- package/dist/frontend/components/app/examples/PythonExamples.js +12 -12
- package/dist/frontend/components/app/examples/PythonExamples.js.map +1 -1
- package/dist/frontend/components/app/themes/ThemePicker.js +10 -9
- package/dist/frontend/components/app/themes/ThemePicker.js.map +1 -1
- package/dist/frontend/components/app/themes/ThemedButton.js +15 -5
- package/dist/frontend/components/app/themes/ThemedButton.js.map +1 -1
- package/dist/frontend/components/code_mirror/BatchInputEditor.js +1 -4
- package/dist/frontend/components/code_mirror/BatchInputEditor.js.map +1 -1
- package/dist/frontend/components/code_mirror/CodeEditor.js +18 -24
- package/dist/frontend/components/code_mirror/CodeEditor.js.map +1 -1
- package/dist/frontend/components/code_mirror/CodeMirrorEditor.js +9 -6
- package/dist/frontend/components/code_mirror/CodeMirrorEditor.js.map +1 -1
- package/dist/frontend/components/code_mirror/Extensions.js +13 -18
- package/dist/frontend/components/code_mirror/Extensions.js.map +1 -1
- package/dist/frontend/components/code_mirror/MaterialTheme.js +8 -2
- package/dist/frontend/components/code_mirror/MaterialTheme.js.map +1 -1
- package/dist/frontend/components/code_runner/ButtonLint.js +14 -18
- package/dist/frontend/components/code_runner/ButtonLint.js.map +1 -1
- package/dist/frontend/components/code_runner/Code.js +6 -4
- package/dist/frontend/components/code_runner/Code.js.map +1 -1
- package/dist/frontend/components/code_runner/RunState.js +4 -4
- package/dist/frontend/components/code_runner/RunState.js.map +1 -1
- package/dist/frontend/components/input/BatchInput.js +1 -1
- package/dist/frontend/components/input/BatchInput.js.map +1 -1
- package/dist/frontend/components/input/InteractiveInput.js +9 -11
- package/dist/frontend/components/input/InteractiveInput.js.map +1 -1
- package/dist/frontend/state/Constants.d.ts +7 -7
- package/dist/frontend/state/Constants.js +26 -23
- package/dist/frontend/state/Constants.js.map +1 -1
- package/dist/frontend/state/Debugger.js +5 -3
- package/dist/frontend/state/Debugger.js.map +1 -1
- package/dist/frontend/state/I18n.js.map +1 -1
- package/dist/frontend/state/InputOutput.js +19 -6
- package/dist/frontend/state/InputOutput.js.map +1 -1
- package/dist/frontend/state/Papyros.d.ts +8 -0
- package/dist/frontend/state/Papyros.js +21 -0
- package/dist/frontend/state/Papyros.js.map +1 -1
- package/dist/frontend/state/Runner.js +29 -18
- package/dist/frontend/state/Runner.js.map +1 -1
- package/dist/frontend/state/Translations.js +156 -157
- package/dist/frontend/state/Translations.js.map +1 -1
- package/dist/frontend/state/themes/blue-dark.js +52 -51
- package/dist/frontend/state/themes/blue-dark.js.map +1 -1
- package/dist/frontend/state/themes/blue-light.js +52 -51
- package/dist/frontend/state/themes/blue-light.js.map +1 -1
- package/dist/frontend/state/themes/green-dark.js +52 -51
- package/dist/frontend/state/themes/green-dark.js.map +1 -1
- package/dist/frontend/state/themes/green-light.js +52 -51
- package/dist/frontend/state/themes/green-light.js.map +1 -1
- package/dist/frontend/state/themes/red-dark.js +52 -51
- package/dist/frontend/state/themes/red-dark.js.map +1 -1
- package/dist/frontend/state/themes/red-light.js +52 -51
- package/dist/frontend/state/themes/red-light.js.map +1 -1
- package/dist/util/Logging.js.map +1 -1
- package/package.json +7 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputOutput.js","sourceRoot":"","sources":["../../../src/frontend/state/InputOutput.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAgCpC,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IAClB,+BAAiB,CAAA;IACjB,+BAAiB,CAAA;IACjB,yBAAW,CAAA;AACf,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAQD,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACjB,4BAAe,CAAA;IACf,wCAA2B,CAAA;AAC/B,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAED,MAAM,OAAO,WAAY,SAAQ,KAAK;IAgBlC,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IACD,IAAI,WAAW,CAAC,KAAa;QACzB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,
|
|
1
|
+
{"version":3,"file":"InputOutput.js","sourceRoot":"","sources":["../../../src/frontend/state/InputOutput.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,12 +14,19 @@ export declare class Papyros extends State {
|
|
|
14
14
|
readonly examples: Examples;
|
|
15
15
|
readonly i18n: I18n;
|
|
16
16
|
readonly test: Test;
|
|
17
|
+
errorHandler: (error: Error) => void;
|
|
17
18
|
serviceWorkerName: string;
|
|
18
19
|
/**
|
|
19
20
|
* Launch this instance of Papyros, making it ready to run code
|
|
20
21
|
* @return {Promise<Papyros>} Promise of launching, chainable
|
|
21
22
|
*/
|
|
22
23
|
launch(): Promise<Papyros>;
|
|
24
|
+
/**
|
|
25
|
+
* Set an error handler in papyros. Papyros will pass any errors to this handler that should be investigated but don't bubble up naturally.
|
|
26
|
+
*
|
|
27
|
+
* @param handler An error handler (e.g. something that passes the error on to sentry)
|
|
28
|
+
*/
|
|
29
|
+
setErrorHandler(handler: (error: Error) => void): void;
|
|
23
30
|
/**
|
|
24
31
|
* Configure how user input is handled within Papyros
|
|
25
32
|
* By default, we will try to use SharedArrayBuffers
|
|
@@ -28,5 +35,6 @@ export declare class Papyros extends State {
|
|
|
28
35
|
* @return {Promise<boolean>} Promise of configuring input
|
|
29
36
|
*/
|
|
30
37
|
private configureInput;
|
|
38
|
+
private waitForActiveRegistration;
|
|
31
39
|
}
|
|
32
40
|
export declare const papyros: Papyros;
|
|
@@ -33,6 +33,7 @@ export class Papyros extends State {
|
|
|
33
33
|
this.examples = new Examples(this);
|
|
34
34
|
this.i18n = new I18n();
|
|
35
35
|
this.test = new Test(this);
|
|
36
|
+
this.errorHandler = () => { };
|
|
36
37
|
this.serviceWorkerName = "InputServiceWorker.js";
|
|
37
38
|
}
|
|
38
39
|
/**
|
|
@@ -57,6 +58,14 @@ export class Papyros extends State {
|
|
|
57
58
|
return this;
|
|
58
59
|
});
|
|
59
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* Set an error handler in papyros. Papyros will pass any errors to this handler that should be investigated but don't bubble up naturally.
|
|
63
|
+
*
|
|
64
|
+
* @param handler An error handler (e.g. something that passes the error on to sentry)
|
|
65
|
+
*/
|
|
66
|
+
setErrorHandler(handler) {
|
|
67
|
+
this.errorHandler = handler;
|
|
68
|
+
}
|
|
60
69
|
/**
|
|
61
70
|
* Configure how user input is handled within Papyros
|
|
62
71
|
* By default, we will try to use SharedArrayBuffers
|
|
@@ -73,6 +82,7 @@ export class Papyros extends State {
|
|
|
73
82
|
try {
|
|
74
83
|
yield navigator.serviceWorker.register(this.serviceWorkerName, { scope: "/" });
|
|
75
84
|
BackendManager.channel = makeChannel({ serviceWorker: { scope: "/" } });
|
|
85
|
+
yield this.waitForActiveRegistration();
|
|
76
86
|
}
|
|
77
87
|
catch (e) {
|
|
78
88
|
console.error("Error registering service worker:", e);
|
|
@@ -85,6 +95,17 @@ export class Papyros extends State {
|
|
|
85
95
|
return true;
|
|
86
96
|
});
|
|
87
97
|
}
|
|
98
|
+
waitForActiveRegistration() {
|
|
99
|
+
return __awaiter(this, arguments, void 0, function* (timeout = 5000) {
|
|
100
|
+
return new Promise((resolve, reject) => {
|
|
101
|
+
const timeoutHandle = setTimeout(() => reject(new Error("Timed out waiting for activated service worker")), timeout);
|
|
102
|
+
navigator.serviceWorker.ready.then(() => {
|
|
103
|
+
clearTimeout(timeoutHandle);
|
|
104
|
+
resolve();
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
});
|
|
108
|
+
}
|
|
88
109
|
}
|
|
89
110
|
__decorate([
|
|
90
111
|
stateProperty
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Papyros.js","sourceRoot":"","sources":["../../../src/frontend/state/Papyros.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,OAAO,OAAQ,SAAQ,KAAK;IAAlC;;QACa,aAAQ,GAAa,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxC,WAAM,GAAW,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QAClC,OAAE,GAAgB,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;QACxC,cAAS,GAAc,IAAI,SAAS,EAAE,CAAC;QACvC,aAAQ,GAAa,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxC,SAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAClB,SAAI,GAAS,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Papyros.js","sourceRoot":"","sources":["../../../src/frontend/state/Papyros.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,9 @@ export var RunState;
|
|
|
35
35
|
* Helper component to manage and visualize the current RunState
|
|
36
36
|
*/
|
|
37
37
|
export class Runner extends State {
|
|
38
|
-
get programmingLanguage() {
|
|
38
|
+
get programmingLanguage() {
|
|
39
|
+
return this._programmingLanguage;
|
|
40
|
+
}
|
|
39
41
|
set programmingLanguage(value) {
|
|
40
42
|
if (this._programmingLanguage !== value) {
|
|
41
43
|
this._programmingLanguage = value;
|
|
@@ -101,9 +103,9 @@ export class Runner extends State {
|
|
|
101
103
|
this.papyros = papyros;
|
|
102
104
|
this.backend = Promise.resolve({});
|
|
103
105
|
BackendManager.subscribe(BackendEventType.Input, () => this.setState(RunState.AwaitingInput));
|
|
104
|
-
BackendManager.subscribe(BackendEventType.Loading, e => this.onLoad(e));
|
|
105
|
-
BackendManager.subscribe(BackendEventType.Start, e => this.onStart(e));
|
|
106
|
-
BackendManager.subscribe(BackendEventType.End, e => this.onEnd(e));
|
|
106
|
+
BackendManager.subscribe(BackendEventType.Loading, (e) => this.onLoad(e));
|
|
107
|
+
BackendManager.subscribe(BackendEventType.Start, (e) => this.onStart(e));
|
|
108
|
+
BackendManager.subscribe(BackendEventType.End, (e) => this.onEnd(e));
|
|
107
109
|
BackendManager.subscribe(BackendEventType.Error, () => this.onError());
|
|
108
110
|
BackendManager.subscribe(BackendEventType.Stop, () => this.stop());
|
|
109
111
|
}
|
|
@@ -153,7 +155,8 @@ export class Runner extends State {
|
|
|
153
155
|
this.previousState = RunState.Loading;
|
|
154
156
|
BackendManager.publish({
|
|
155
157
|
type: BackendEventType.Start,
|
|
156
|
-
data: "StartClicked",
|
|
158
|
+
data: "StartClicked",
|
|
159
|
+
contentType: "text/plain",
|
|
157
160
|
});
|
|
158
161
|
let interrupted = false;
|
|
159
162
|
let terminated = false;
|
|
@@ -172,7 +175,8 @@ export class Runner extends State {
|
|
|
172
175
|
this.papyros.io.logError(error);
|
|
173
176
|
BackendManager.publish({
|
|
174
177
|
type: BackendEventType.End,
|
|
175
|
-
data: "RunError",
|
|
178
|
+
data: "RunError",
|
|
179
|
+
contentType: "text/plain",
|
|
176
180
|
});
|
|
177
181
|
}
|
|
178
182
|
}
|
|
@@ -185,7 +189,9 @@ export class Runner extends State {
|
|
|
185
189
|
yield this.launch();
|
|
186
190
|
}
|
|
187
191
|
if (interrupted || terminated) {
|
|
188
|
-
this.setState(RunState.Ready, this.papyros.i18n.t("Papyros.interrupted", {
|
|
192
|
+
this.setState(RunState.Ready, this.papyros.i18n.t("Papyros.interrupted", {
|
|
193
|
+
time: (new Date().getTime() - this.runStartTime) / 1000,
|
|
194
|
+
}));
|
|
189
195
|
}
|
|
190
196
|
}
|
|
191
197
|
});
|
|
@@ -199,13 +205,14 @@ export class Runner extends State {
|
|
|
199
205
|
this.setState(RunState.Stopping);
|
|
200
206
|
BackendManager.publish({
|
|
201
207
|
type: BackendEventType.End,
|
|
202
|
-
data: "User cancelled run",
|
|
208
|
+
data: "User cancelled run",
|
|
209
|
+
contentType: "text/plain",
|
|
203
210
|
});
|
|
204
211
|
const backend = yield this.backend;
|
|
205
212
|
yield backend.interrupt();
|
|
206
213
|
const startTime = new Date().getTime();
|
|
207
|
-
while (this.state === RunState.Stopping &&
|
|
208
|
-
yield new Promise(resolve => setTimeout(resolve, 100));
|
|
214
|
+
while (this.state === RunState.Stopping && new Date().getTime() - startTime < 5000) {
|
|
215
|
+
yield new Promise((resolve) => setTimeout(resolve, 100));
|
|
209
216
|
}
|
|
210
217
|
if (this.state === RunState.Stopping) {
|
|
211
218
|
console.warn("Deadlock while stopping, restarting backend");
|
|
@@ -227,10 +234,13 @@ export class Runner extends State {
|
|
|
227
234
|
if (fileNames.length === 0) {
|
|
228
235
|
return;
|
|
229
236
|
}
|
|
230
|
-
BackendManager.publish({
|
|
237
|
+
BackendManager.publish({
|
|
238
|
+
type: BackendEventType.Loading,
|
|
239
|
+
data: JSON.stringify({
|
|
231
240
|
modules: fileNames,
|
|
232
|
-
status: "loading"
|
|
233
|
-
})
|
|
241
|
+
status: "loading",
|
|
242
|
+
}),
|
|
243
|
+
});
|
|
234
244
|
const backend = yield this.backend;
|
|
235
245
|
yield backend.workerProxy.provideFiles(inlinedFiles, hrefFiles);
|
|
236
246
|
});
|
|
@@ -254,21 +264,22 @@ export class Runner extends State {
|
|
|
254
264
|
onLoad(e) {
|
|
255
265
|
const loadingData = parseData(e.data, e.contentType);
|
|
256
266
|
if (loadingData.status === "loading") {
|
|
257
|
-
loadingData.modules.forEach(m => {
|
|
267
|
+
loadingData.modules.forEach((m) => {
|
|
258
268
|
if (!this.loadingPackages.includes(m)) {
|
|
259
269
|
this.loadingPackages.push(m);
|
|
260
270
|
}
|
|
261
271
|
});
|
|
262
272
|
}
|
|
263
273
|
else if (loadingData.status === "loaded") {
|
|
264
|
-
loadingData.modules.forEach(m => {
|
|
274
|
+
loadingData.modules.forEach((m) => {
|
|
265
275
|
const index = this.loadingPackages.indexOf(m);
|
|
266
276
|
if (index !== -1) {
|
|
267
277
|
this.loadingPackages.splice(index, 1);
|
|
268
278
|
}
|
|
269
279
|
});
|
|
270
280
|
}
|
|
271
|
-
else {
|
|
281
|
+
else {
|
|
282
|
+
// failed
|
|
272
283
|
// If it is a true module, an Exception will be raised when running
|
|
273
284
|
// So this does not need to be handled here, as it is often an incomplete package-name
|
|
274
285
|
// that causes micropip to not find the correct wheel
|
|
@@ -277,7 +288,7 @@ export class Runner extends State {
|
|
|
277
288
|
if (this.loadingPackages.length > 0) {
|
|
278
289
|
const packageMessage = this.papyros.i18n.t("Papyros.loading", {
|
|
279
290
|
// limit amount of package names shown
|
|
280
|
-
packages: this.loadingPackages.slice(0, 3).join(", ")
|
|
291
|
+
packages: this.loadingPackages.slice(0, 3).join(", "),
|
|
281
292
|
});
|
|
282
293
|
this.setState(RunState.Loading, packageMessage);
|
|
283
294
|
}
|
|
@@ -303,7 +314,7 @@ export class Runner extends State {
|
|
|
303
314
|
}
|
|
304
315
|
updateRunModes() {
|
|
305
316
|
this.backend.then((backend) => __awaiter(this, void 0, void 0, function* () {
|
|
306
|
-
const proxy =
|
|
317
|
+
const proxy = backend.workerProxy;
|
|
307
318
|
if (proxy) {
|
|
308
319
|
this.runModes = yield proxy.runModes(this.code);
|
|
309
320
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Runner.js","sourceRoot":"","sources":["../../../src/frontend/state/Runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAW,OAAO,EAAoB,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAgB,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"Runner.js","sourceRoot":"","sources":["../../../src/frontend/state/Runner.ts"],"names":[],"mappings":"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"}
|