@devscholar/node-with-gjs 0.0.0 → 0.0.2

package/hook.js

@@ -1,42 +1,44 @@
-// hook.js
-export async function resolve(specifier, context, nextResolve) {
-    if (specifier.startsWith('gi://')) {
-        return {
-            url: specifier,
-            shortCircuit: true,
-            format: 'module'
-        };
-    }
-    return nextResolve(specifier, context);
-}
-
-export async function load(url, context, nextLoad) {
-    if (url.startsWith('gi://')) {
-        // Safely parse 'gi://Gtk?version=4.0'
-        const bareUrl = url.replace('gi://', '');
-        const [namespacePart, queryPart] = bareUrl.split('?');
-        
-        const namespace = namespacePart;
-        let version = '';
-        
-        if (queryPart) {
-            const params = new URLSearchParams(queryPart);
-            version = params.get('version') || '';
-        }
-
-        const coreUrl = new URL('./src/index.ts', import.meta.url).href;
-        
-        const source = `
-            import { init, loadGiNamespace } from '${coreUrl}';
-            init();
-            export default loadGiNamespace('${namespace}', '${version}');
-        `;
-        
-        return {
-            format: 'module',
-            shortCircuit: true,
-            source: source
-        };
-    }
-    return nextLoad(url, context);
-}
+// hook.js - Node.js module loader hook for gi:// protocol
+export async function resolve(specifier, context, nextResolve) {
+    if (specifier.startsWith('gi://')) {
+        return {
+            url: specifier,
+            shortCircuit: true,
+            format: 'module'
+        };
+    }
+    return nextResolve(specifier, context, nextResolve);
+}
+
+export async function load(url, context, nextLoad) {
+    if (url.startsWith('gi://')) {
+        // Safely parse 'gi://Gtk?version=4.0'
+        const bareUrl = url.replace('gi://', '');
+        const [namespacePart, queryPart] = bareUrl.split('?');
+        
+        const namespace = namespacePart;
+        let version = '';
+        
+        if (queryPart) {
+            const params = new URLSearchParams(queryPart);
+            version = params.get('version') || '';
+        }
+
+        const coreUrl = new URL('./dist/index.js', import.meta.url).href;
+        
+        const source = `
+            import { init, imports } from '${coreUrl}';
+            init();
+            imports.gi.versions['${namespace}'] = '${version}';
+            const ns = imports.gi['${namespace}'];
+            export default ns;
+        `;
+        
+        return {
+            format: 'module',
+            shortCircuit: true,
+            source: source
+        };
+    }
+    return nextLoad(url, context, nextLoad);
+}

package/jest.config.js

@@ -0,0 +1,32 @@
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  testEnvironment: 'node',
+  extensionsToTreatAsEsm: ['.ts'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+  transform: {
+    '^.+\\.ts$': [
+      'ts-jest',
+      {
+        useESM: true,
+        tsconfig: {
+          module: 'ESNext',
+          moduleResolution: 'bundler',
+        },
+      },
+    ],
+  },
+  testMatch: [
+    '**/__tests__/**/*.ts',
+    '**/?(*.)+(spec|test).ts',
+  ],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.d.ts',
+  ],
+  coverageDirectory: 'coverage',
+  coverageReporters: ['text', 'lcov', 'html'],
+  testTimeout: 60000,
+  maxWorkers: 1,
+};

package/package.json

@@ -1,14 +1,23 @@
-{
-  "name": "@devscholar/node-with-gjs",
-  "version": "0.0.0",
-  "description": "Node.js IPC Bridge for GJS",
-  "main": "start.js",
-  "type": "module",
-  "scripts": {
-
-  },
-  "devDependencies": {
-    "@types/node": "^20.0.0",
-    "typescript": "^5.0.0"
-  }
-}
+{
+  "name": "@devscholar/node-with-gjs",
+  "version": "0.0.2",
+  "description": "Node.js IPC Bridge for GJS",
+  "main": "./dist/index.js",
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js"
+  },
+  "bin": {
+
+  },
+  "scripts": {
+    "build": "tsc",
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.0",
+    "typescript": "^5.0.0"
+  }
+}

package/scripts/host.js

@@ -83,7 +83,9 @@ function ResolveArg(arg) {
 
 function executeCommand(cmd) {
     if (cmd.action === 'LoadNamespace') {
-        imports.gi.versions[cmd.namespace] = cmd.version;
+        if (cmd.version) {
+            imports.gi.versions[cmd.namespace] = cmd.version;
+        }
         const ns = imports.gi[cmd.namespace];
         return ConvertToProtocol(ns);
     }

package/src/index.ts

@@ -4,7 +4,7 @@ import * as path from 'node:path';
 import * as cp from 'node:child_process';
 import * as os from 'node:os';
 import { fileURLToPath } from 'node:url';
-import { IpcSync } from './ipc.ts';
+import { IpcSync } from './ipc.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -173,8 +173,46 @@ export function init() {
     initialize();
 }
 
-export function loadGiNamespace(namespace: string, version: string) {
+// Internal function - not exposed to users
+function loadGiNamespace(namespace: string, version: string | undefined) {
     initialize();
     const res = ipc!.send({ action: 'LoadNamespace', namespace, version });
     return createProxy(res);
 }
+
+// Namespace cache to avoid creating multiple proxies for the same namespace
+const namespaceCache = new Map<string, any>();
+
+// GI namespace versions
+const giVersions: Record<string, string> = {};
+
+// Create the gi proxy with lazy loading and caching
+const giProxy = new Proxy({} as any, {
+    get(_, namespace: string) {
+        if (namespace === 'versions') {
+            return new Proxy(giVersions, {
+                set(target, prop, value) {
+                    target[prop as string] = value;
+                    // Clear cache for this namespace when version changes
+                    const cacheKey = `${prop as string}@default`;
+                    namespaceCache.delete(cacheKey);
+                    return true;
+                }
+            });
+        }
+        
+        const version = giVersions[namespace];
+        const cacheKey = `${namespace}@${version || 'default'}`;
+        
+        if (!namespaceCache.has(cacheKey)) {
+            namespaceCache.set(cacheKey, loadGiNamespace(namespace, version));
+        }
+        
+        return namespaceCache.get(cacheKey);
+    }
+});
+
+// The main exports object - compatible with GJS imports
+export const imports = {
+    gi: giProxy
+};

package/tsconfig.json

@@ -1,11 +1,22 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true
-  }
-}
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "lib": ["ES2022"],
+    "moduleResolution": "bundler",
+    "declaration": true,
+    "declarationDir": "./types",
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": false,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": false,
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}

package/types/index.d.ts

@@ -0,0 +1,4 @@
+export declare function init(): void;
+export declare const imports: {
+    gi: any;
+};

package/types/ipc.d.ts

@@ -0,0 +1,10 @@
+export declare function readLineSync(fd: number): string | null;
+export declare class IpcSync {
+    private fdRead;
+    private fdWrite;
+    private onEvent;
+    private exited;
+    constructor(fdRead: number, fdWrite: number, onEvent: (msg: any) => any);
+    send(cmd: any): any;
+    close(): void;
+}

package/examples/adwaita/counter/counter.ts

@@ -1,66 +0,0 @@
-// Run: node start.js examples/adwaita/counter/counter.ts
-import { loadGi } from '../../../gi-loader.ts';
-
-const Gtk = loadGi('Gtk', '4.0');
-const Adw = loadGi('Adw', '1');
-
-let clickCount = 0;
-
-console.log("--- Adwaita Counter ---");
-
-const app = new Adw.Application({ application_id: 'org.adwaita.counter' });
-
-app.connect('activate', () => {
-    const window = new Adw.ApplicationWindow({
-        application: app,
-        title: 'Adwaita Counter App',
-        default_width: 400,
-        default_height: 300
-    });
-
-    const toolbarView = new Adw.ToolbarView();
-
-    const headerBar = new Adw.HeaderBar({
-        title_widget: new Gtk.Label({ label: 'Adwaita Counter App' })
-    });
-    toolbarView.add_top_bar(headerBar);
-
-    const box = new Gtk.Box({
-        orientation: Gtk.Orientation.VERTICAL,
-        spacing: 10,
-        halign: Gtk.Align.CENTER,
-        valign: Gtk.Align.CENTER
-    });
-    box.set_margin_start(20);
-    box.set_margin_end(20);
-    box.set_margin_top(20);
-    box.set_margin_bottom(20);
-
-    const label = new Gtk.Label({
-        label: 'Clicks: 0',
-        css_classes: ['title-1']
-    });
-
-    const button = new Gtk.Button({
-        label: 'Click to Add',
-        css_classes: ['suggested-action']
-    });
-
-    button.connect('clicked', () => {
-        clickCount++;
-        const message = `Clicked ${clickCount} times`;
-        label.set_label(message);
-        console.log(message);
-    });
-
-    box.append(label);
-    box.append(button);
-
-    toolbarView.set_content(box);
-    window.set_content(toolbarView);
-    window.present();
-
-    console.log("Click the button to increase the counter...");
-});
-
-app.run([]);

package/examples/console/await-delay/await-delay.ts

@@ -1,11 +0,0 @@
-// Run: node start.js examples/console/await-delay/await-delay.ts
-import { loadGi } from '../../../gi-loader.ts';
-
-loadGi('GLib', '2.0');
-
-print('0s');
-await new Promise(resolve => setTimeout(resolve, 1000));
-print("1s");
-await new Promise(resolve => setTimeout(resolve, 1000));
-print("2s");
-await new Promise(resolve => setTimeout(resolve, 1000));

package/examples/console/console-input/console-input.ts

@@ -1,27 +0,0 @@
-// Run: node start.js examples/console/console-input/console-input.ts
-import { loadGi } from '../../../gi-loader.ts';
-
-const Gio = loadGi('Gio', '2.0');
-
-let GioUnix;
-try {
-    GioUnix = loadGi('GioUnix', '2.0');
-} catch {
-    GioUnix = Gio;
-}
-
-print("=== Greeting Program ===");
-print("Please enter your name: ");
-
-const stdin = new GioUnix.InputStream({ fd: 0, close_fd: false });
-const dataInput = new Gio.DataInputStream({ base_stream: stdin });
-
-const [name] = dataInput.read_line_utf8(null);
-
-if (name && name.trim() !== "") {
-    print(`Hello, ${name}! Welcome to this program!`);
-} else {
-    print("Hello, friend! Welcome to this program!");
-}
-
-print("Program ended.");

package/examples/gtk/counter/counter.ts

@@ -1,62 +0,0 @@
-// Run: node start.js examples/gtk/counter/counter.ts
-import { loadGi } from '../../../gi-loader.ts';
-
-const Gtk = loadGi('Gtk', '4.0');
-
-let clickCount = 0;
-
-console.log("--- GTK4 Counter ---");
-
-const app = new Gtk.Application({ application_id: 'org.gtk.counter' });
-
-app.connect('activate', () => {
-    const window = new Gtk.ApplicationWindow({
-        application: app,
-        title: 'GTK Counter App',
-        default_width: 400,
-        default_height: 300
-    });
-
-    window.connect('close-request', () => {
-        app.quit();
-        return false;
-    });
-
-    const box = new Gtk.Box({
-        orientation: Gtk.Orientation.VERTICAL,
-        spacing: 10,
-        halign: Gtk.Align.CENTER,
-        valign: Gtk.Align.CENTER
-    });
-    box.set_margin_start(20);
-    box.set_margin_end(20);
-    box.set_margin_top(20);
-    box.set_margin_bottom(20);
-
-    const label = new Gtk.Label({
-        label: 'Clicks: 0',
-        css_classes: ['title-1']
-    });
-
-    const button = new Gtk.Button({
-        label: 'Click to Add',
-        css_classes: ['suggested-action']
-    });
-
-    button.connect('clicked', () => {
-        clickCount++;
-        const message = `Clicked ${clickCount} times`;
-        label.set_label(message);
-        console.log(message);
-    });
-
-    box.append(label);
-    box.append(button);
-
-    window.set_child(box);
-    window.present();
-
-    console.log("Click the button to increase the counter...");
-});
-
-app.run([]);

package/examples/gtk/drag-box/drag-box.ts

@@ -1,77 +0,0 @@
-// Run: node start.js examples/gtk/drag-box/drag-box.ts
-import { loadGi } from '../../../gi-loader.ts';
-
-const Gtk = loadGi('Gtk', '4.0');
-
-console.log("--- GTK4 Flicker-free Draggable Square (Cairo) ---");
-
-const app = new Gtk.Application({ application_id: 'org.gtk.dragbox' });
-
-app.connect('activate', () => {
-    const window = new Gtk.ApplicationWindow({
-        application: app,
-        title: 'Drag Example (High Frequency IPC) ',
-        default_width: 600,
-        default_height: 400
-    });
-
-    const fixed = new Gtk.Fixed();
-    fixed.set_hexpand(true);
-    fixed.set_vexpand(true);
-
-    const squareSize = 80;
-    const drawingArea = new Gtk.DrawingArea();
-    drawingArea.set_size_request(squareSize, squareSize);
-
-    const drawFunction = (area: any, cr: any, width: number, height: number) => {
-        cr.setSourceRGB(1.0, 0.2, 0.2);
-        cr.rectangle(0, 0, width, height);
-        cr.fill();
-    };
-
-    drawingArea.set_draw_func(drawFunction);
-
-    let currentX = 260;
-    let currentY = 160;
-    fixed.put(drawingArea, currentX, currentY);
-
-    const drag = new Gtk.GestureDrag();
-    
-    let isDragging = false;
-    let dragStartX = 0;
-    let dragStartY = 0;
-
-    drag.connect('drag-begin', (gesture: any, startX: number, startY: number) => {
-        if (startX >= currentX && startX <= currentX + squareSize &&
-            startY >= currentY && startY <= currentY + squareSize) {
-            isDragging = true;
-            dragStartX = currentX;
-            dragStartY = currentY;
-            console.log(`✅ Drag started at: (${startX}, ${startY})`);
-        }
-    });
-
-    drag.connect('drag-update', (gesture: any, offsetX: number, offsetY: number) => {
-        if (!isDragging) return;
-        const newX = dragStartX + offsetX;
-        const newY = dragStartY + offsetY;
-        fixed.move(drawingArea, newX, newY);
-    });
-
-    drag.connect('drag-end', (gesture: any, offsetX: number, offsetY: number) => {
-        if (!isDragging) return;
-        isDragging = false;
-        currentX = dragStartX + offsetX;
-        currentY = dragStartY + offsetY;
-        console.log(`🛑 Drag ended at position: (${currentX}, ${currentY})`);
-    });
-
-    fixed.add_controller(drag);
-
-    window.set_child(fixed);
-    window.present();
-
-    console.log("Window loaded. Try dragging the red square smoothly!");
-});
-
-app.run([]);

package/examples/gtk-webkit/counter/counter.html

@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Counter</title>
-    <meta charset="UTF-8">
-    <style>
-        body { font-family: Arial, sans-serif; padding: 20px; text-align: center; }
-        h1 { color: #333; }
-        #display { font-size: 24px; margin: 20px 0; }
-        button { padding: 10px 20px; font-size: 16px; cursor: pointer; }
-    </style>
-    <script>
-        (function() {
-            const originalConsole = window.console;
-            window.console = {
-                log: function(...args) {
-                    window.webkit.messageHandlers.console.postMessage(args.join(' '));
-                },
-                error: function(...args) {
-                    window.webkit.messageHandlers.console.postMessage('[ERROR] ' + args.join(' '));
-                },
-                warn: function(...args) {
-                    window.webkit.messageHandlers.console.postMessage('[WARN] ' + args.join(' '));
-                }
-            };
-        })();
-    </script>
-</head>
-<body>
-    <h1>Counter App (WebKit)</h1>
-    <p id="display">Clicks: 0</p>
-    <button id="btn">Click to Add</button>
-
-    <script>
-        let clickCount = 0;
-        const display = document.getElementById('display');
-        const button = document.getElementById('btn');
-
-        button.addEventListener('click', function() {
-            clickCount++;
-            const message = 'Button clicked ' + clickCount + ' times';
-            display.textContent = message;
-            console.log(message);
-        });
-    </script>
-</body>
-</html>

package/examples/gtk-webkit/counter/counter.ts

@@ -1,101 +0,0 @@
-// Run: node start.js examples/gtk-webkit/counter/counter.ts
-import { loadGi } from '../../../gi-loader.ts';
-import * as path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const Gtk = loadGi('Gtk', '4.0');
-const WebKit = loadGi('WebKit', '6.0');
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-console.log('--- GTK4 WebKit Counter ---');
-
-const app = new Gtk.Application({ application_id: 'org.gtk.webkitcounter' });
-
-app.connect('activate', () => {
-    const window = new Gtk.ApplicationWindow({
-        application: app,
-        title: 'WebKit Counter App',
-        default_width: 500,
-        default_height: 400
-    });
-
-    const box = new Gtk.Box({
-        orientation: Gtk.Orientation.VERTICAL,
-        spacing: 0
-    });
-
-    const toolbar = new Gtk.Box({
-        orientation: Gtk.Orientation.HORIZONTAL,
-        spacing: 5
-    });
-    toolbar.set_margin_start(5);
-    toolbar.set_margin_end(5);
-    toolbar.set_margin_top(5);
-    toolbar.set_margin_bottom(5);
-
-    const htmlPath = path.join(__dirname, 'counter.html');
-    const htmlUri = 'file://' + htmlPath;
-
-    const backButton = new Gtk.Button({ label: '← Back' });
-    const forwardButton = new Gtk.Button({ label: 'Forward →' });
-    const urlEntry = new Gtk.Entry({
-        placeholder_text: 'Enter URL or use default',
-        text: htmlUri,
-        hexpand: true
-    });
-
-    toolbar.append(backButton);
-    toolbar.append(forwardButton);
-    toolbar.append(urlEntry);
-
-    const contentManager = new WebKit.UserContentManager();
-    
-    contentManager.connect('script-message-received', (manager, value) => {
-        const message = value.to_string();
-        if (message) print(`[WebView] ${message}`);
-    });
-    contentManager.register_script_message_handler('console', null);
-
-    const webView = new WebKit.WebView({
-        vexpand: true,
-        hexpand: true,
-        user_content_manager: contentManager
-    });
-
-    webView.load_uri(htmlUri);
-
-    webView.connect('load-changed', (webview, loadEvent) => {
-        if (loadEvent === WebKit.LoadEvent.FINISHED) {
-            console.log('Page Loaded Successfully');
-            urlEntry.set_text(webview.get_uri() || '');
-        }
-    });
-
-    backButton.connect('clicked', () => {
-        if (webView.can_go_back()) webView.go_back();
-    });
-
-    forwardButton.connect('clicked', () => {
-        if (webView.can_go_forward()) webView.go_forward();
-    });
-
-    urlEntry.connect('activate', () => {
-        let uri = urlEntry.get_text();
-        if (!uri.startsWith('http://') && !uri.startsWith('https://') && !uri.startsWith('file://')) {
-            uri = 'https://' + uri;
-        }
-        webView.load_uri(uri);
-    });
-
-    box.append(toolbar);
-    box.append(webView);
-
-    window.set_child(box);
-    window.present();
-
-    console.log("Click the button in the web view to increase the counter...");
-});
-
-app.run([]);