@gjsify/resolve-npm 0.1.15 → 0.3.0

package/lib/globals-map.mjs

@@ -45,9 +45,11 @@ export const GJS_GLOBALS_GROUPS = {
         'ErrorEvent', 'CloseEvent', 'ProgressEvent', 'UIEvent',
         'MouseEvent', 'PointerEvent', 'KeyboardEvent', 'WheelEvent', 'FocusEvent',
         'EventSource',
+        'WebSocket',
         'DOMException',
         'performance', 'PerformanceObserver',
         'XMLHttpRequest',
+        'XMLHttpRequestUpload',
         'DOMParser',
         'AudioContext', 'webkitAudioContext', 'Audio', 'HTMLAudioElement',
         'GamepadEvent',
@@ -68,6 +70,16 @@ export const GJS_GLOBALS_MAP = {
     // --- Node.js globals (granular register subpaths) ----------------------
     Buffer:               '@gjsify/node-globals/register/buffer',
     process:              '@gjsify/node-globals/register/process',
+    // setTimeout / setInterval ARE provided natively by GJS, but their return
+    // value is a GLib.Source BoxedInstance whose deferred-GC finalize calls
+    // g_source_unref on a possibly-freed source — silent SIGSEGV ~10 s after
+    // any third-party library uses them. Our `register/timers` replacement
+    // returns numeric IDs instead. Listing them here forces auto-globals to
+    // inject the override on every bundle that calls setTimeout.
+    setTimeout:           '@gjsify/node-globals/register/timers',
+    setInterval:          '@gjsify/node-globals/register/timers',
+    clearTimeout:         '@gjsify/node-globals/register/timers',
+    clearInterval:        '@gjsify/node-globals/register/timers',
     setImmediate:         '@gjsify/node-globals/register/timers',
     clearImmediate:       '@gjsify/node-globals/register/timers',
     queueMicrotask:       '@gjsify/node-globals/register/microtask',
@@ -126,6 +138,12 @@ export const GJS_GLOBALS_MAP = {
     FocusEvent:           'dom-events/register/ui-events',
     EventSource:          'eventsource/register',
 
+    // --- WebSocket ---------------------------------------------------------
+    // Single register module sets globalThis.{WebSocket,MessageEvent,CloseEvent}.
+    // MessageEvent is shared with dom-events in practice — whichever register
+    // runs first installs it; both guard with typeof === 'undefined'.
+    WebSocket:            'websocket/register',
+
     // --- Performance -------------------------------------------------------
     performance:          '@gjsify/web-globals/register/performance',
     PerformanceObserver:  '@gjsify/web-globals/register/performance',
@@ -133,8 +151,9 @@ export const GJS_GLOBALS_MAP = {
     // --- DOMException ------------------------------------------------------
     DOMException:         'dom-exception/register',
 
-    // --- XMLHttpRequest + URL.createObjectURL ------------------------------
-    XMLHttpRequest:       '@gjsify/xmlhttprequest/register',
+    // --- XMLHttpRequest (implemented in @gjsify/fetch) ---------------------
+    XMLHttpRequest:       'fetch/register/xhr',
+    XMLHttpRequestUpload: 'fetch/register/xhr',
 
     // --- DOMParser ---------------------------------------------------------
     DOMParser:            '@gjsify/domparser/register',

package/lib/index.mjs

@@ -70,6 +70,19 @@ export const ALIASES_GENERAL_FOR_GJS = {
     // @gjsify/domparser, so jsdom and its whatwg-url/webidl-conversions
     // deps (which use SharedArrayBuffer — unavailable in GJS) are never needed.
     'jsdom': '@gjsify/empty',
+
+    // engine.io-client ships both polling-xhr.node.js (uses xmlhttprequest-ssl /
+    // Node http.request) and polling-xhr.js (uses globalThis.XMLHttpRequest).
+    // The package.json `browser` field maps .node.js → .js for browser builds, but
+    // esbuild with platform:neutral does not apply browser-field path maps.
+    // We apply them explicitly here: the aliasPlugin matches the relative import
+    // specifier exactly (since onResolve args.path = the original import string)
+    // and resolves ./polling-xhr.js relative to the importer's directory.
+    // @gjsify/fetch provides a proper XMLHttpRequest on globalThis via register/xhr.
+    './polling-xhr.node.js': './polling-xhr.js',
+    './websocket.node.js': './websocket.js',
+    './globals.node.js': './globals.js',
+
 }
 
 /** Record of Node.js modules (build in or not) and his replacement for Gjs */
@@ -132,6 +145,25 @@ export const ALIASES_NODE_FOR_GJS = {
 
     // Third party Node Modules
     'node-fetch': '@gjsify/fetch',
+    // `ws` npm package — drop-in CLIENT+SERVER wrapper. The client side
+    // delegates to globalThis.WebSocket (Soup.WebsocketConnection via
+    // @gjsify/websocket); the server side wraps Soup.Server. Aliasing
+    // `ws` here replaces the broken browser-field stub in the upstream
+    // package ("ws does not work in the browser") that esbuild's
+    // "browser" condition would otherwise load. Consumer code like
+    //   import ws, { WebSocket, WebSocketServer } from 'ws'
+    // resolves to @gjsify/ws unchanged, including the `typeof ws ===
+    // 'function'` heuristic used by @thaunknown/simple-websocket and
+    // similar transitive users.
+    'ws': '@gjsify/ws',
+
+    // isomorphic-ws's browser.js is literally `module.exports = WebSocket`
+    // — just the native class. On GJS that native class is @gjsify/websocket
+    // (Soup.WebsocketConnection), so skip the @gjsify/ws ws-API wrapper
+    // entirely and route isomorphic-ws directly to @gjsify/websocket.
+    // Consumers who do `import WS from 'isomorphic-ws'` get our class
+    // unchanged — one less delegation hop than going through @gjsify/ws.
+    'isomorphic-ws': '@gjsify/websocket',
 }
 
 /** Record of Web modules and his replacement for Gjs */
@@ -160,8 +192,10 @@ export const ALIASES_WEB_FOR_GJS = {
     'dom-events/register/ui-events': '@gjsify/dom-events/register/ui-events',
     'dom-exception/register': '@gjsify/dom-exception/register',
     'eventsource/register': '@gjsify/eventsource/register',
+    'websocket/register': '@gjsify/websocket/register',
     'fetch/register': '@gjsify/fetch/register',
     'fetch/register/fetch': '@gjsify/fetch/register/fetch',
+    'fetch/register/xhr': '@gjsify/fetch/register/xhr',
     'webcrypto/register': '@gjsify/webcrypto/register',
     'web-streams/register': '@gjsify/web-streams/register',
     'web-streams/register/readable': '@gjsify/web-streams/register/readable',
@@ -170,9 +204,11 @@ export const ALIASES_WEB_FOR_GJS = {
     'web-streams/register/text-streams': '@gjsify/web-streams/register/text-streams',
     'web-streams/register/queuing': '@gjsify/web-streams/register/queuing',
 
-    // xmlhttprequest + DOMParser
-    'xmlhttprequest': '@gjsify/xmlhttprequest',
-    'xmlhttprequest/register': '@gjsify/xmlhttprequest/register',
+    // xmlhttprequest (implemented in @gjsify/fetch)
+    'xmlhttprequest': '@gjsify/fetch',
+    'xmlhttprequest/register': '@gjsify/fetch/register/xhr',
+    '@gjsify/xmlhttprequest': '@gjsify/fetch',
+    '@gjsify/xmlhttprequest/register': '@gjsify/fetch/register/xhr',
     'domparser': '@gjsify/domparser',
     'domparser/register': '@gjsify/domparser/register',
 
@@ -224,7 +260,11 @@ export const ALIASES_WEB_FOR_NODE = {
     'dom-events': '@gjsify/dom-events/globals',
     'dom-exception': '@gjsify/dom-exception/globals',
     'eventsource': '@gjsify/eventsource/globals',
-    'fetch': '@gjsify/fetch/globals',
+    // 'fetch' bare specifier is intentionally not aliased on Node:
+    // fetch/Headers/Request/Response/FormData are native globals since Node 18,
+    // so specs / app code should read them off globalThis. Users who need the
+    // value form should `import { fetch } from '@gjsify/fetch'` explicitly.
+    // 'fetch': '@gjsify/fetch/globals',
     'formdata': '@gjsify/formdata/globals',
     'html-image-element': '@gjsify/html-image-element',
     'webcrypto': '@gjsify/webcrypto/globals',
@@ -241,8 +281,10 @@ export const ALIASES_WEB_FOR_NODE = {
     'dom-events/register/ui-events': '@gjsify/empty',
     'dom-exception/register': '@gjsify/empty',
     'eventsource/register': '@gjsify/empty',
+    'websocket/register': '@gjsify/empty',
     'fetch/register': '@gjsify/empty',
     'fetch/register/fetch': '@gjsify/empty',
+    'fetch/register/xhr': '@gjsify/empty',
     'webcrypto/register': '@gjsify/empty',
     'web-streams/register': '@gjsify/empty',
     'web-streams/register/readable': '@gjsify/empty',
@@ -258,8 +300,10 @@ export const ALIASES_WEB_FOR_NODE = {
     '@gjsify/dom-events/register/ui-events': '@gjsify/empty',
     '@gjsify/dom-exception/register': '@gjsify/empty',
     '@gjsify/eventsource/register': '@gjsify/empty',
+    '@gjsify/websocket/register': '@gjsify/empty',
     '@gjsify/fetch/register': '@gjsify/empty',
     '@gjsify/fetch/register/fetch': '@gjsify/empty',
+    '@gjsify/fetch/register/xhr': '@gjsify/empty',
     '@gjsify/webcrypto/register': '@gjsify/empty',
     '@gjsify/web-streams/register': '@gjsify/empty',
     '@gjsify/web-streams/register/readable': '@gjsify/empty',
@@ -281,6 +325,7 @@ export const ALIASES_WEB_FOR_NODE = {
     // xmlhttprequest + DOMParser — no-op on Node
     'xmlhttprequest': '@gjsify/empty',
     'xmlhttprequest/register': '@gjsify/empty',
+    '@gjsify/xmlhttprequest': '@gjsify/empty',
     '@gjsify/xmlhttprequest/register': '@gjsify/empty',
     'domparser': '@gjsify/empty',
     'domparser/register': '@gjsify/empty',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/resolve-npm",
-  "version": "0.1.15",
+  "version": "0.3.0",
   "description": "Resolve NPM package aliases",
   "type": "module",
   "main": "lib/index.mjs",