@dodona/papyros 0.1.922-tar → 0.1.923-tar

package/dist/Backend.d.ts

@@ -34,25 +34,19 @@ export interface WorkerAutocompleteContext {
         text: string;
     } | null;
 }
-export declare abstract class Backend {
-    protected syncExtras: SyncExtras;
+export declare abstract class Backend<Extras extends SyncExtras = SyncExtras> {
+    protected extras: Extras;
     protected onEvent: (e: BackendEvent) => any;
     /**
-     *  Constructor is limited as it is meant to be used as a WebWorker
-     *  These are then exposed via Comlink. Proper initialization occurs
-     *  in the launch method when the worker is started
-     * @param {Array<string>} syncMethods The methods to expose
+     * Constructor is limited as it is meant to be used as a WebWorker
+     * Proper initialization occurs in the launch method when the worker is started
+     * Synchronously exposing methods should be done here
      */
-    constructor(syncMethods?: string[]);
+    constructor();
     /**
      * @return {any} The function to expose methods for Comsync to allow interrupting
      */
     protected syncExpose(): any;
-    /**
-     * Expose all the methods that should support being interrupted
-     * @param {Array<string>} syncMethods The names of the methods to expose
-     */
-    protected exposeMethods(syncMethods: Array<string>): void;
     /**
      * Initialize the backend by doing all setup-related work
      * @param {function(BackendEvent):void} onEvent Callback for when events occur
@@ -61,10 +55,11 @@ export declare abstract class Backend {
     launch(onEvent: (e: BackendEvent) => void): Promise<void>;
     /**
      * Executes the given code
+     * @param {Extras} extras Helper properties to run code
      * @param {string} code The code to run
      * @return {Promise<void>} Promise of execution
      */
-    abstract runCode(extras: SyncExtras, code: string): Promise<void>;
+    abstract runCode(extras: Extras, code: string): Promise<void>;
     /**
      * Converts the context to a cloneable object containing useful properties
      * to generate autocompletion suggestions with

package/dist/BackendManager.d.ts

@@ -8,29 +8,37 @@ import { SyncClient } from "comsync";
  * @param {BackendEvent} e The published event
  */
 declare type BackendEventListener = (e: BackendEvent) => void;
-declare class Cacheable<T> {
-    private cached;
-    private createFn;
-    constructor(createFn: () => T);
-    get(): T;
-}
 /**
  * Abstract class to implement the singleton pattern
  * Static methods group functionality
  */
 export declare abstract class BackendManager {
-    static createWorkerMap: Map<ProgrammingLanguage, Cacheable<SyncClient<Backend>>>;
-    static channel: Channel;
+    /**
+     * Map programming languages to Backend constructors
+     */
+    private static createBackendMap;
+    /**
+     * Map to cache Backends per ProgrammingLanguage
+     */
+    private static backendMap;
     /**
      * Map an event type to interested subscribers
      * Uses an Array to maintain order of subscription
      */
     static subscriberMap: Map<BackendEventType, Array<BackendEventListener>>;
-    private static buildSyncClientMap;
     /**
-     * Start a backend for the given language, while storing the worker
+     * The channel used to communicate with the SyncClients
+     */
+    static channel: Channel;
+    /**
+     * @param {ProgrammingLanguage} language The language to support
+     * @param {Function} backendCreator The constructor for a SyncClient
+     */
+    static registerBackend(language: ProgrammingLanguage, backendCreator: () => SyncClient<Backend>): void;
+    /**
+     * Start a backend for the given language and cache for reuse
      * @param {ProgrammingLanguage} language The programming language supported by the backend
-     * @return {Remote<Backend>} A Comlink proxy for the Backend
+     * @return {SyncClient<Backend>} A SyncClient for the Backend
      */
     static startBackend(language: ProgrammingLanguage): SyncClient<Backend>;
     /**

package/dist/Library.d.ts

@@ -4,7 +4,6 @@ import { InputManager, InputMode } from "./InputManager";
 import { OutputManager } from "./OutputManager";
 import { Papyros } from "./Papyros";
 import { CodeRunner, RunState } from "./CodeRunner";
-import { InputWorker } from "./workers/input/InputWorker";
 export * from "./ProgrammingLanguage";
 export type { BackendEvent };
-export { Papyros, CodeEditor, RunState, CodeRunner, InputManager, InputMode, OutputManager, InputWorker };
+export { Papyros, CodeEditor, RunState, CodeRunner, InputManager, InputMode, OutputManager, };

package/dist/workers/python/PythonWorker.worker.d.ts

@@ -1,4 +1,2 @@
-import { Pyodide } from "./Pyodide";
-export declare function getPyodide(): Promise<Pyodide>;
 declare const _default: any;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dodona/papyros",
-  "version": "0.1.922-tar",
+  "version": "0.1.923-tar",
   "private": false,
   "homepage": ".",
   "devDependencies": {
@@ -52,16 +52,17 @@
     "@codemirror/search": "^0.19.3",
     "@codemirror/state": "^0.19.6",
     "comlink": "^4.3.1",
-    "comsync": "^0.0.6",
+    "comsync": "^0.0.7",
     "escape-html": "^1.0.3",
     "i18n-js": "^3.8.0",
-    "pyodide-worker-runner": "^0.0.7",
+    "pyodide-worker-runner": "^0.0.8",
     "sync-message": "^0.0.9"
   },
   "scripts": {
     "start": "yarn setup && webpack serve --mode development",
     "setup": "bash scripts/setup.sh",
-    "build": "bash scripts/build_package.sh",
+    "build:app": "bash scripts/build_package.sh development",
+    "build:library": "bash scripts/build_package.sh production",
     "test": "echo No tests defined yet",
     "lint": "eslint  --ext '.js' --ext '.ts' src",
     "validate:translations": "node scripts/ValidateTranslations.js"

package/dist/InputWorker.js

@@ -1 +0,0 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.Papyros=t():e.Papyros=t()}(self,(function(){return(()=>{var e={137:e=>{self,e.exports=(()=>{"use strict";var e={d:(t,r)=>{for(var n in r)e.o(r,n)&&!e.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:r[n]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};e.r(t),e.d(t,{serviceWorkerFetchListener:()=>s,asyncSleep:()=>i,ServiceWorkerError:()=>u,writeMessageAtomics:()=>a,writeMessageServiceWorker:()=>c,writeMessage:()=>f,makeChannel:()=>l,makeAtomicsChannel:()=>d,makeServiceWorkerChannel:()=>y,readMessage:()=>m,syncSleep:()=>h,uuidv4:()=>v});var r=function(e,t,r,n){return new(r||(r=Promise))((function(o,s){function i(e){try{a(n.next(e))}catch(e){s(e)}}function u(e){try{a(n.throw(e))}catch(e){s(e)}}function a(e){var t;e.done?o(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(i,u)}a((n=n.apply(e,t||[])).next())}))};const n="__SyncMessageServiceWorkerInput__",o="__sync-message-v2__";function s(){const e={},t={};return s=>{const{url:i}=s.request;return!!i.includes(n)&&(s.respondWith(function(){return r(this,void 0,void 0,(function*(){function r(e){const t={message:e,version:o};return new Response(JSON.stringify(t),{status:200})}if(i.endsWith("/read")){const{messageId:n,timeout:o}=yield s.request.json(),i=e[n];return i?(delete e[n],r(i)):yield new Promise((e=>{t[n]=e,setTimeout((function(){delete t[n],e(new Response("",{status:408}))}),o)}))}if(i.endsWith("/write")){const{message:n,messageId:o}=yield s.request.json(),i=t[o];return i?(i(r(n)),delete t[o]):e[o]=n,r({early:!i})}if(i.endsWith("/version"))return new Response(o,{status:200})}))}()),!0)}}function i(e){return new Promise((t=>setTimeout(t,e)))}class u extends Error{constructor(e,t){super(`Received status ${t} from ${e}. Ensure the service worker is registered and active.`),this.url=e,this.status=t,this.type="ServiceWorkerError",Object.setPrototypeOf(this,u.prototype)}}function a(e,t){const r=(new TextEncoder).encode(JSON.stringify(t)),{data:n,meta:o}=e;if(r.length>n.length)throw new Error("Message is too big, increase bufferSize when making channel.");n.set(r,0),Atomics.store(o,0,r.length),Atomics.store(o,1,1),Atomics.notify(o,1)}function c(e,t,n){return r(this,void 0,void 0,(function*(){yield navigator.serviceWorker.ready;const r=e.baseUrl+"/write",s=Date.now();for(;;){const a={message:t,messageId:n},c=yield fetch(r,{method:"POST",body:JSON.stringify(a)});if(200===c.status&&(yield c.json()).version===o)return;if(!(Date.now()-s<e.timeout))throw new u(r,c.status);yield i(100)}}))}function f(e,t,n){return r(this,void 0,void 0,(function*(){"atomics"===e.type?a(e,t):yield c(e,t,n)}))}function l(e={}){return"undefined"!=typeof SharedArrayBuffer?d(e.atomics):"serviceWorker"in navigator?y(e.serviceWorker):null}function d({bufferSize:e}={}){return{type:"atomics",data:new Uint8Array(new SharedArrayBuffer(e||131072)),meta:new Int32Array(new SharedArrayBuffer(2*Int32Array.BYTES_PER_ELEMENT))}}function y(e={}){return{type:"serviceWorker",baseUrl:(e.scope||"/")+n,timeout:e.timeout||5e3}}function p(e,t){return e>0?+e:t}function m(e,t,{checkInterrupt:r,checkTimeout:n,timeout:s}={}){const i=performance.now();n=p(n,r?100:5e3);const a=p(s,Number.POSITIVE_INFINITY);let c;if("atomics"===e.type){const{data:t,meta:r}=e;c=()=>{if("timed-out"===Atomics.wait(r,1,0,n))return null;{const e=Atomics.exchange(r,0,0),n=t.slice(0,e);Atomics.store(r,1,0);const o=(new TextDecoder).decode(n);return JSON.parse(o)}}}else c=()=>{const r=new XMLHttpRequest,s=e.baseUrl+"/read";r.open("POST",s,!1);const a={messageId:t,timeout:n};r.send(JSON.stringify(a));const{status:c}=r;if(408===c)return null;if(200===c){const e=JSON.parse(r.responseText);return e.version!==o?null:e.message}if(performance.now()-i<e.timeout)return null;throw new u(s,c)};for(;;){const e=a-(performance.now()-i);if(e<=0)return null;n=Math.min(n,e);const t=c();if(null!==t)return t;if(null==r?void 0:r())return null}}function h(e,t){if(e=p(e,0))if("undefined"!=typeof SharedArrayBuffer){const t=new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT));t[0]=0,Atomics.wait(t,0,0,e)}else m(t,`sleep ${e} ${v()}`,{timeout:e})}let v;return v="randomUUID"in crypto?function(){return crypto.randomUUID()}:function(){return"10000000-1000-4000-8000-100000000000".replace(/[018]/g,(e=>{const t=Number(e);return(t^crypto.getRandomValues(new Uint8Array(1))[0]&15>>t/4).toString(16)}))},t})()}},t={};function r(n){var o=t[n];if(void 0!==o)return o.exports;var s=t[n]={exports:{}};return e[n](s,s.exports,r),s.exports}r.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var n={};return(()=>{"use strict";r.r(n),r.d(n,{InputWorker:()=>s});var e=r(137),t=function(e,t,r,n){return new(r||(r=Promise))((function(o,s){function i(e){try{a(n.next(e))}catch(e){s(e)}}function u(e){try{a(n.throw(e))}catch(e){s(e)}}function a(e){var t;e.done?o(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(i,u)}a((n=n.apply(e,t||[])).next())}))},o=function(e,t){var r,n,o,s,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return s={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(s[Symbol.iterator]=function(){return this}),s;function u(s){return function(u){return function(s){if(r)throw new TypeError("Generator is already executing.");for(;i;)try{if(r=1,n&&(o=2&s[0]?n.return:s[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,s[1])).done)return o;switch(n=0,o&&(s=[2&s[0],o.value]),s[0]){case 0:case 1:o=s;break;case 4:return i.label++,{value:s[1],done:!1};case 5:i.label++,n=s[1],s=[0];continue;case 7:s=i.ops.pop(),i.trys.pop();continue;default:if(!(o=i.trys,(o=o.length>0&&o[o.length-1])||6!==s[0]&&2!==s[0])){i=0;continue}if(3===s[0]&&(!o||s[1]>o[0]&&s[1]<o[3])){i.label=s[1];break}if(6===s[0]&&i.label<o[1]){i.label=o[1],o=s;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(s);break}o[2]&&i.ops.pop(),i.trys.pop();continue}s=t.call(e,i)}catch(e){s=[6,e],n=0}finally{r=o=0}if(5&s[0])throw s[1];return{value:s[0]?s[1]:void 0,done:!0}}([s,u])}}},s=function(){function r(t){this.hostName=t,this.syncMessageListener=(0,e.serviceWorkerFetchListener)()}return r.prototype.handleInputRequest=function(e){return t(this,void 0,void 0,(function(){return o(this,(function(t){return this.syncMessageListener(e)?[2,!0]:e.request.url.includes(this.hostName)?(e.respondWith(fetch(e.request).then((function(e){var t=new Headers(e.headers);return t.set("Cross-Origin-Embedder-Policy","require-corp"),t.set("Cross-Origin-Opener-Policy","same-origin"),t.set("Cross-Origin-Resource-Policy","cross-origin"),new Response(e.body,{status:e.status||200,statusText:e.statusText,headers:t})}))),[2,!0]):[2,!1]}))}))},r}()})(),n})()}));