@joinezco/codeblock 0.0.8 → 0.0.9

package/dist/workers/fs.worker.js

@@ -1,46 +1,43 @@
 import * as Comlink from "comlink";
 import { watchOptionsTransferHandler, asyncGeneratorTransferHandler } from '../rpc/serde';
 import { Snapshot } from "../utils";
+import { fs } from '@joinezco/memfs';
 Comlink.transferHandlers.set('asyncGenerator', asyncGeneratorTransferHandler);
 Comlink.transferHandlers.set('watchOptions', watchOptionsTransferHandler);
 let filesystems = [];
 export const mount = async ({ buffer, mountPoint = '/' }) => {
     let filesystem;
     try {
-        console.log('Importing memfs after FS mount...');
-        const { fs } = await import('@joinezco/memfs');
-        console.log("FS imported");
         try {
             if (buffer) {
-                console.log(`Mounting filesystem snapshot at [${mountPoint}]...`, buffer);
+                console.debug(`Mounting filesystem snapshot at [${mountPoint}]...`, buffer);
                 // Convert Node Buffer to ArrayBuffer if needed
                 const uint8 = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer);
                 const aligned = uint8.byteOffset === 0 && uint8.byteLength === uint8.buffer.byteLength
                     ? uint8.buffer
                     : uint8.buffer.slice(uint8.byteOffset, uint8.byteOffset + uint8.byteLength);
-                console.log('Aligned ArrayBuffer:', aligned);
                 await Snapshot.mount(new Uint8Array(aligned), {
                     // @ts-ignore
                     fs,
                 });
             }
             else {
-                console.log('Getting storage directory...');
+                console.debug('Getting storage directory...');
                 // const handle = await navigator.storage.getDirectory();
-                console.log('Got storage directory');
-                console.log('Attempting to remove directory...');
+                console.debug('Got storage directory');
+                console.debug('Attempting to remove directory...');
                 try {
                     // TODO: clear storage button
                     // @ts-ignore
                     // await handle.remove({ recursive: true });
-                    console.log('Successfully removed directory');
+                    console.debug('Successfully removed directory');
                 }
                 catch (removeErr) {
                     console.error('Error removing directory:', removeErr);
                     // Continue anyway, this might not be critical
                 }
             }
-            console.log('Returning proxy from worker', fs);
+            console.debug('Returning proxy from worker', fs);
             filesystem = Comlink.proxy({ fs });
             filesystems.push(filesystem);
         }
@@ -50,9 +47,9 @@ export const mount = async ({ buffer, mountPoint = '/' }) => {
         }
     }
     catch (e) {
-        console.error('Error importing memfs:', e);
+        console.error('Error using memfs:', e);
     }
-    console.log('mounting fs', { buffer, mountPoint });
+    console.debug('mounting fs', { buffer, mountPoint });
     return filesystem;
 };
 /**
@@ -63,8 +60,7 @@ export const mount = async ({ buffer, mountPoint = '/' }) => {
 export const mountFromUrl = async ({ url, mountPoint = '/' }) => {
     let filesystem;
     try {
-        const { fs } = await import('@joinezco/memfs');
-        console.log(`Loading and mounting filesystem snapshot from URL: ${url} at [${mountPoint}]...`);
+        console.debug(`Loading and mounting filesystem snapshot from URL: ${url} at [${mountPoint}]...`);
         const startTime = performance.now();
         await Snapshot.loadAndMount(url, {
             // @ts-ignore
@@ -72,8 +68,8 @@ export const mountFromUrl = async ({ url, mountPoint = '/' }) => {
             path: mountPoint
         });
         const endTime = performance.now();
-        console.log(`Snapshot loaded and mounted in ${Math.round(endTime - startTime)}ms`);
-        console.log('Returning proxy from worker', fs);
+        console.debug(`Snapshot loaded and mounted in ${Math.round(endTime - startTime)}ms`);
+        console.debug('Returning proxy from worker', fs);
         filesystem = Comlink.proxy({ fs });
         filesystems.push(filesystem);
     }
@@ -85,9 +81,9 @@ export const mountFromUrl = async ({ url, mountPoint = '/' }) => {
 };
 onconnect = async function (event) {
     const [port] = event.ports;
-    console.log('workers/fs connected on port: ', port);
+    console.debug('workers/fs connected on port: ', port);
     port.addEventListener('close', () => {
-        console.log('fs port closed');
+        console.debug('fs port closed');
     });
     Comlink.expose({ mount, mountFromUrl }, port);
 };

package/dist/workers/javascript.worker.js

@@ -2,19 +2,21 @@ import * as Comlink from 'comlink';
 import { createLanguageServer } from '../lsps/typescript';
 import { createConnection } from 'vscode-languageserver/browser';
 import { BrowserMessageReader, BrowserMessageWriter } from '@volar/language-server/browser';
-// TODO: get rid of this
-// instead, create language specific workers (with a smarter client)
-// i.e typescript.worker.ts / rust.worker.ts / ...
 onconnect = async (event) => {
     const [port] = event.ports;
-    console.debug('LSP worker connected on port: ', port);
-    const reader = new BrowserMessageReader(port);
-    const writer = new BrowserMessageWriter(port);
+    // Use a MessageChannel to separate Comlink RPC from LSP protocol.
+    // Both Comlink and BrowserMessageReader listen on the same port's
+    // 'message' event, so Comlink messages get misinterpreted as LSP messages.
+    const { port1: lspPort, port2: clientLspPort } = new MessageChannel();
+    lspPort.start();
+    const reader = new BrowserMessageReader(lspPort);
+    const writer = new BrowserMessageWriter(lspPort);
     const connection = createConnection(reader, writer);
     connection.listen();
-    const proxy = async ({ fs }) => {
-        console.log('creating language server');
-        await createLanguageServer({ fs, connection });
+    const proxy = async (fsProxy, libFiles) => {
+        await createLanguageServer({ fs: fsProxy, connection, libFiles });
+        // Return the LSP port for the client to use (separate from Comlink port)
+        return Comlink.transfer(clientLspPort, [clientLspPort]);
     };
     Comlink.expose({ createLanguageServer: proxy }, port);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joinezco/codeblock",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "type": "module",
   "module": "dist/index.js",
   "main": "dist/index.js",
@@ -26,6 +26,7 @@
     "@types/sharedworker": "^0.0.181",
     "multimatch": "^7.0.0",
     "process": "^0.11.10",
+    "puppeteer-core": "^24.37.5",
     "tsx": "^4.19.4",
     "vite": "^7.0.6",
     "vitest": "^3.2.4"
@@ -58,7 +59,7 @@
     "@jsonjoy.com/json-pack": "^1.2.0",
     "@jsonjoy.com/util": "^1.6.0",
     "@lezer/highlight": "^1.2.1",
-    "@open-rpc/client-js": "^1.8.1",
+    "@m234/nerd-fonts": "^0.5.0",
     "@typescript/vfs": "^1.6.1",
     "@uiw/codemirror-theme-vscode": "^4.23.12",
     "@volar/language-server": "2.4.13",
@@ -82,8 +83,8 @@
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
-    "@marimo-team/codemirror-languageserver": "1.16.0",
     "@joinezco/jswasi": "0.0.1",
+    "@codemirror/lsp-client": "6.2.2",
     "@joinezco/memfs": "4.23.0"
   },
   "scripts": {

package/dist/assets/fs.worker-BwEqZcql.ts

@@ -1,109 +0,0 @@
-import * as Comlink from "comlink";
-import { watchOptionsTransferHandler, asyncGeneratorTransferHandler } from '../rpc/serde';
-import { MountArgs, MountResult } from "../types";
-import type { SnapshotNode } from '@ezdevlol/memfs/snapshot';
-import type { CborUint8Array } from "@jsonjoy.com/json-pack/lib/cbor/types";
-import { Snapshot } from "../utils";
-
-Comlink.transferHandlers.set('asyncGenerator', asyncGeneratorTransferHandler)
-Comlink.transferHandlers.set('watchOptions', watchOptionsTransferHandler)
-
-let filesystems = [];
-
-export const mount = async ({ buffer, mountPoint = '/' }: MountArgs): Promise<MountResult> => {
-    let filesystem;
-
-    try {
-        console.log('Importing memfs after FS mount...');
-        const { fs } = await import('@ezdevlol/memfs');
-        console.log("FS imported")
-
-        try {
-            if (buffer) {
-                console.log(`Mounting filesystem snapshot at [${mountPoint}]...`, buffer);
-                // Convert Node Buffer to ArrayBuffer if needed
-                const uint8 = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer);
-                const aligned = uint8.byteOffset === 0 && uint8.byteLength === uint8.buffer.byteLength
-                    ? uint8.buffer
-                    : uint8.buffer.slice(uint8.byteOffset, uint8.byteOffset + uint8.byteLength);
-                console.log('Aligned ArrayBuffer:', aligned);
-
-                await Snapshot.mount(new Uint8Array(aligned) as CborUint8Array<SnapshotNode>, {
-                    // @ts-ignore
-                    fs,
-                });
-            } else {
-                console.log('Getting storage directory...');
-                // const handle = await navigator.storage.getDirectory();
-                console.log('Got storage directory');
-
-                console.log('Attempting to remove directory...');
-                try {
-                    // TODO: clear storage button
-                    // @ts-ignore
-                    // await handle.remove({ recursive: true });
-                    console.log('Successfully removed directory');
-                } catch (removeErr) {
-                    console.error('Error removing directory:', removeErr);
-                    // Continue anyway, this might not be critical
-                }
-            }
-            console.log('Returning proxy from worker', fs);
-            filesystem = Comlink.proxy({ fs });
-            filesystems.push(filesystem);
-        } catch (e) {
-            console.error('Worker initialization failed with error:', e);
-            throw e; // Make sure error propagates
-        }
-    } catch (e) {
-        console.error('Error importing memfs:', e);
-    }
-    console.log('mounting fs', { buffer, mountPoint });
-    return filesystem;
-}
-
-/**
- * Optimized mount function that loads snapshots directly from URLs.
- * This is much more efficient for large snapshots as it avoids transferring
- * data through the main thread.
- */
-export const mountFromUrl = async ({ url, mountPoint = '/' }: {
-    url: string;
-    mountPoint?: string;
-}): Promise<MountResult> => {
-    let filesystem;
-
-    try {
-        const { fs } = await import('@ezdevlol/memfs');
-
-        console.log(`Loading and mounting filesystem snapshot from URL: ${url} at [${mountPoint}]...`);
-        const startTime = performance.now();
-        await Snapshot.loadAndMount(url, {
-            // @ts-ignore
-            fs,
-            path: mountPoint
-        });
-
-        const endTime = performance.now();
-        console.log(`Snapshot loaded and mounted in ${Math.round(endTime - startTime)}ms`);
-
-        console.log('Returning proxy from worker', fs);
-        filesystem = Comlink.proxy({ fs });
-        filesystems.push(filesystem);
-
-    } catch (e) {
-        console.error('Error loading snapshot from URL:', e);
-        throw e;
-    }
-
-    return filesystem;
-}
-
-onconnect = async function (event) {
-    const [port] = event.ports;
-    console.log('workers/fs connected on port: ', port);
-    port.addEventListener('close', () => {
-        console.log('fs port closed')
-    });
-    Comlink.expose({ mount, mountFromUrl }, port);
-}