github-starred/acebase
2
0
Fork 0
mirror of https://github.com/appy-one/acebase.git synced 2026-06-30 06:02:02 -06:00
Code Issues 20 Projects Packages Wiki Activity Actions

Merge pull request #216 from appy-one/fix/cluster-ipc-breaking-browser-build

Browse source 
Fix socket IPC breaking browser build #215
This commit is contained in:
Ewout Stortenbeker 2023-04-17 10:23:07 +02:00 • committed by GitHub
commit 2b21ff84a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ipc/browser.ts
View file

@ -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,
};

1
src/ipc/index.ts
View file

@ -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]';

1
src/ipc/socket.ts
View file

@ -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]';

10
src/storage/index.ts
View file

@ -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) {