From 5d5536f9f9efc95d9d3a1995d0b67c8edf67f767 Mon Sep 17 00:00:00 2001
From: Ewout Stortenbeker <me@appy.one>
Date: Mon, 17 Apr 2023 10:15:04 +0200
Subject: [PATCH] Fix cluster IPC breaking browser build #215

---
 src/ipc/browser.ts   |  6 +++++-
 src/ipc/index.ts     |  1 +
 src/ipc/socket.ts    |  1 +
 src/storage/index.ts | 10 ++++------
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/ipc/browser.ts b/src/ipc/browser.ts
index 7ec14ab..fbdd8bc 100644
--- a/src/ipc/browser.ts
+++ b/src/ipc/browser.ts
@@ -161,4 +161,8 @@ export class IPCPeer extends AceBaseIPCPeer {
 /**
  * Not supported in browser context
  */
-export class RemoteIPCPeer extends NotSupported {}
+export {
+    NotSupported as RemoteIPCPeer,
+    NotSupported as IPCSocketPeer,
+    NotSupported as NetIPCServer,
+};
diff --git a/src/ipc/index.ts b/src/ipc/index.ts
index 0586ab3..adb8046 100644
--- a/src/ipc/index.ts
+++ b/src/ipc/index.ts
@@ -3,6 +3,7 @@ import { Storage } from '../storage';
 import * as Cluster from 'cluster';
 const cluster: typeof Cluster = (Cluster as any).default ?? Cluster; // ESM and CJS compatible approach
 export { RemoteIPCPeer, RemoteIPCServerConfig } from './remote';
+export { IPCSocketPeer, NetIPCServer } from './socket';
 
 const masterPeerId = '[master]';
 
diff --git a/src/ipc/socket.ts b/src/ipc/socket.ts
index d270363..a535c02 100644
--- a/src/ipc/socket.ts
+++ b/src/ipc/socket.ts
@@ -6,6 +6,7 @@ import { Storage } from '../storage';
 import { ID, Transport } from 'acebase-core';
 import { getSocketPath, MSG_DELIMITER } from './service/shared';
 import { startServer } from './service';
+export { Server as NetIPCServer } from 'net';
 
 const masterPeerId = '[master]';
 
diff --git a/src/storage/index.ts b/src/storage/index.ts
index f6c2129..9aff6f3 100644
--- a/src/storage/index.ts
+++ b/src/storage/index.ts
@@ -2,15 +2,13 @@ import { Utils, DebugLogger, PathInfo, ID, PathReference, ascii85, SimpleEventEm
 import { VALUE_TYPES } from '../node-value-types';
 import { NodeRevisionError } from '../node-errors';
 import { NodeInfo } from '../node-info';
-import { IPCPeer, RemoteIPCPeer } from '../ipc';
+import { IPCPeer, RemoteIPCPeer, IPCSocketPeer, NetIPCServer } from '../ipc';
 import { pfs } from '../promise-fs';
 // const { IPCTransactionManager } = require('./node-transaction');
 import { DataIndex } from '../data-index'; // Indexing might not be available: the browser dist bundle doesn't include it because fs is not available: browserify --i ./src/data-index.js
 import { createIndex, CreateIndexOptions } from './indexes';
 import { IndexesContext } from './context';
 import { assert } from '../assert';
-import { IPCSocketPeer } from '../ipc/socket';
-import { Server } from 'net';
 
 const { compareValues, getChildValues, encodeString, defer } = Utils;
 
@@ -114,7 +112,7 @@ export class StorageSettings {
      * IPC settings if you are using AceBase in pm2 or cloud-based clusters, or (NEW) `'socket'` to connect
      * to an automatically spawned IPC service ("daemon") on this machine
      */
-    ipc?: IPCClientSettings | 'socket' | Server;
+    ipc?: IPCClientSettings | 'socket' | NetIPCServer;
 
     /**
      * Settings for optional transaction logging
@@ -172,8 +170,8 @@ export class Storage extends SimpleEventEmitter {
 
         // Setup IPC to allow vertical scaling (multiple threads sharing locks and data)
         const ipcName = name + (typeof settings.type === 'string' ? `_${settings.type}` : '');
-        if (settings.ipc === 'socket' || settings.ipc instanceof Server) {
-            const ipcSettings = { ipcName, server: settings.ipc instanceof Server ? settings.ipc : null };
+        if (settings.ipc === 'socket' || settings.ipc instanceof NetIPCServer) {
+            const ipcSettings = { ipcName, server: settings.ipc instanceof NetIPCServer ? settings.ipc : null };
             this.ipc = new IPCSocketPeer(this, ipcSettings);
         }
         else if (settings.ipc) {