From 66a58c41a871a8b3fd661b55db47abd7a86963c0 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 30 Nov 2023 10:51:32 +0100 Subject: [PATCH] First lint pass --- src/index.ts | 4 +-- src/web_worker_kernel.ts | 21 ++++++++-------- src/worker.ts | 54 +++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 42 deletions(-) diff --git a/src/index.ts b/src/index.ts index aeff7d2..43a0229 100644 --- a/src/index.ts +++ b/src/index.ts @@ -36,7 +36,7 @@ console.log(kernel_dir); // fetch kernel spec for each kernel const kernel_specs = kernel_dir.map(kernel_dir => { - let spec: any = getPkgJson('kernels/' + kernel_dir + '/kernel.json'); + const spec: any = getPkgJson('kernels/' + kernel_dir + '/kernel.json'); spec.name = kernel_dir; spec.dir = kernel_dir; spec.resources = { @@ -49,7 +49,7 @@ const kernel_specs = kernel_dir.map(kernel_dir => { console.log(kernel_specs); const server_kernels = kernel_specs.map(spec => { - let server_kernel: JupyterLiteServerPlugin = { + const server_kernel: JupyterLiteServerPlugin = { // use name from spec id: `@jupyterlite/${spec.name}-extension:kernel`, autoStart: true, diff --git a/src/web_worker_kernel.ts b/src/web_worker_kernel.ts index b82fb63..d0d1eb4 100644 --- a/src/web_worker_kernel.ts +++ b/src/web_worker_kernel.ts @@ -29,17 +29,14 @@ export class WebWorkerKernel implements IKernel { * * @param options The instantiation options for a new WebWorkerKernel */ - constructor( - options: WebWorkerKernel.IOptions, - spec: any, - ) { - const { id, name, sendMessage, location} = options; + constructor(options: WebWorkerKernel.IOptions, spec: any) { + const { id, name, sendMessage, location } = options; this._id = id; this._name = name; this._location = location; this._spec = spec; this._sendMessage = sendMessage; - this._worker = new Worker(new URL(`./worker.js`, import.meta.url), { + this._worker = new Worker(new URL('./worker.js', import.meta.url), { type: 'module' }); @@ -48,10 +45,12 @@ export class WebWorkerKernel implements IKernel { }; this._remote = wrap(this._worker); this._remote.processMessage({ - msg:{header: { - msg_type: 'initialize', - }}, - spec : this._spec + msg: { + header: { + msg_type: 'initialize' + } + }, + spec: this._spec }); this.initFileSystem(options); } @@ -215,4 +214,4 @@ export namespace WebWorkerKernel { export interface IOptions extends IKernel.IOptions { mountDrive: boolean; } -} \ No newline at end of file +} diff --git a/src/worker.ts b/src/worker.ts index 8d10416..e770ce4 100644 --- a/src/worker.ts +++ b/src/worker.ts @@ -97,13 +97,9 @@ async function get_stdin() { (self as any).get_stdin = get_stdin; - - - class XeusKernel { constructor(resolve: any) { this._resolve = resolve; - } async ready(): Promise { @@ -141,8 +137,7 @@ class XeusKernel { async processMessage(event: any): Promise { const msg_type = event.msg.header.msg_type; - if(msg_type === 'initialize') { - + if (msg_type === 'initialize') { const spec = event.spec; this._spec = spec; await this.initialize(); @@ -150,7 +145,6 @@ class XeusKernel { return; } - await this.ready(); if ( @@ -163,7 +157,6 @@ class XeusKernel { globalThis.toplevel_promise = null; } - if (msg_type === 'input_reply') { resolveInputReply(event.msg); } else { @@ -188,19 +181,26 @@ class XeusKernel { } }); try { - await this.waitRunDependency(); console.log(globalThis.Module); - if(globalThis.Module['async_init'] !== undefined) { + if (globalThis.Module['async_init'] !== undefined) { console.log('!!!async_init!!!!'); - const kernel_root_url=`kernels/${dir}` - const pkg_root_url = `kernel_packages` - console.log("with kernel_root_url", kernel_root_url, "and pkg_root_url", pkg_root_url); + const kernel_root_url = `kernels/${dir}`; + const pkg_root_url = 'kernel_packages'; + console.log( + 'with kernel_root_url', + kernel_root_url, + 'and pkg_root_url', + pkg_root_url + ); const verbose = true; - await globalThis.Module['async_init'](kernel_root_url,pkg_root_url, verbose); - } - else{ + await globalThis.Module['async_init']( + kernel_root_url, + pkg_root_url, + verbose + ); + } else { console.log('!!!NO async_init!!!!'); } @@ -214,17 +214,15 @@ class XeusKernel { console.log('!!!start!!!'); this._raw_xkernel.start(); console.log('!!!start-DONE!!!'); - } - catch (e) { - if( typeof e === 'number' ) { - const msg = globalThis.Module.get_exception_message(e); - console.error(msg); - throw new Error(msg); - } - else { - console.error(e); - throw(e); - } + } catch (e) { + if (typeof e === 'number') { + const msg = globalThis.Module.get_exception_message(e); + console.error(msg); + throw new Error(msg); + } else { + console.error(e); + throw e; + } } this._resolve(); } @@ -255,5 +253,3 @@ class XeusKernel { globalThis.ready = new Promise(resolve => { expose(new XeusKernel(resolve)); }); - -