Move browser and node http fs into seporate imports

Author: samwillis

packages/pglite/examples/httpfs-worker.js

@@ -1,6 +1,6 @@
 import { PGlite } from "../dist/index.js";
 import { worker } from "../dist/worker/index.js";
-import { HttpFs } from "../dist/fs/http.js";
+import { HttpFs } from "../dist/fs/http/browser.js";
 
 console.log("Starting worker...");
 

packages/pglite/examples/httpfs.js

@@ -1,5 +1,5 @@
 import { PGlite } from "../dist/index.js";
-import { HttpFs } from "../dist/fs/http.js";
+import { HttpFs } from "../dist/fs/http/node.js";
 
 console.log("Starting PGLite...");
 const pg = await PGlite.create({

packages/pglite/package.json

@@ -54,10 +54,15 @@
       "require": "./dist/fs/opfs-ahp.cjs",
       "types": "./dist/fs/opfs-ahp.d.ts"
     },
-    "./httpfs": {
-      "import": "./dist/fs/http.js",
-      "require": "./dist/fs/http.cjs",
-      "types": "./dist/fs/http.d.ts"
+    "./httpfs/browser": {
+      "import": "./dist/fs/http/browser.js",
+      "require": "./dist/fs/http/browser.cjs",
+      "types": "./dist/fs/http/browser.d.ts"
+    },
+    "./httpfs/node": {
+      "import": "./dist/fs/http/node.js",
+      "require": "./dist/fs/http/node.cjs",
+      "types": "./dist/fs/http/node.d.ts"
     },
     "./contrib/*": {
       "import": "./dist/contrib/*.js",
@@ -120,6 +125,9 @@
     "crypto": false,
     "ws": false,
     "child_process": false,
-    "module": false
+    "module": false,
+    "worker_threads": false,
+    "http": false,
+    "https": false
   }
 }

packages/pglite/src/fs/http.ts packages/pglite/src/fs/http/base.ts

@@ -1,8 +1,8 @@
-import type { PGlite } from '../pglite.js'
-import type { PostgresMod } from '../postgresMod.js'
-import { BaseFilesystem, FsStats, ERRNO_CODES } from './base.js'
-import type { TarIndex, TarIndexFile } from './tarUtils.js'
-import { makeSyncFetch, type SyncFetch } from '../sync-fetch/index.js'
+import type { PGlite } from '../../pglite.js'
+import type { PostgresMod } from '../../postgresMod.js'
+import { SyncFetch } from '../../sync-fetch/index.js'
+import { BaseFilesystem, FsStats, ERRNO_CODES } from '../base.js'
+import type { TarIndex, TarIndexFile } from '../tarUtils.js'
 
 type Node = TarIndexFile & {
   isDir: boolean
@@ -34,14 +34,14 @@ export interface HttpFsOptions {
  * Requires an index.json file at the root of the filesystem with a list of
  * files available to fetch
  */
-export class HttpFs extends BaseFilesystem {
+export abstract class HttpFsBase extends BaseFilesystem {
   index?: TarIndex
   tree?: Node
   httpPaths = new Set<string>()
   #handleMap: Map<number, Node> = new Map()
   #handleCounter = 0
   fetchGranularity: FetchGranularity
-  fetch?: SyncFetch
+  abstract fetch: SyncFetch
 
   constructor(
     baseUrl: string,
@@ -53,7 +53,6 @@ export class HttpFs extends BaseFilesystem {
 
   async init(pg: PGlite, opts: Partial<PostgresMod>) {
     await this.#init()
-    this.fetch = await makeSyncFetch()
     return super.init(pg, opts)
   }
 

packages/pglite/src/fs/http/browser.ts

@@ -0,0 +1,6 @@
+import { HttpFsBase } from './base.js'
+import { syncFetchBrowser } from '../../sync-fetch/browser.js'
+
+export class HttpFs extends HttpFsBase {
+  fetch = syncFetchBrowser
+}

packages/pglite/src/fs/http/node.ts

@@ -0,0 +1,6 @@
+import { HttpFsBase } from './base.js'
+import { syncFetchNode } from '../../sync-fetch/node.js'
+
+export class HttpFs extends HttpFsBase {
+  fetch = syncFetchNode
+}

packages/pglite/src/sync-fetch/node-worker.ts

@@ -1,7 +1,6 @@
 import { workerData } from 'worker_threads'
 import * as http from 'http'
 import * as https from 'https'
-import { URL } from 'url'
 
 function fetch(
   url: string,

packages/pglite/tsup.config.ts

@@ -20,7 +20,8 @@ const entryPoints = [
   'src/index.ts',
   'src/fs/nodefs.ts',
   'src/fs/opfs-ahp.ts',
-  'src/fs/http.ts',
+  'src/fs/http/browser.ts',
+  'src/fs/http/node.ts',
   'src/templating.ts',
   'src/live/index.ts',
   'src/vector/index.ts',