From 55f32bddbb3695d5bb003386839545da2dcc95af Mon Sep 17 00:00:00 2001 From: "Tom (plebeius.eth)" Date: Tue, 1 Apr 2025 14:43:15 +0200 Subject: [PATCH] update script, logs --- electron/start-plebbit-rpc.cjs | 16 ++++++++-------- package.json | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/electron/start-plebbit-rpc.cjs b/electron/start-plebbit-rpc.cjs index af95ef22..af6e8d86 100755 --- a/electron/start-plebbit-rpc.cjs +++ b/electron/start-plebbit-rpc.cjs @@ -57,9 +57,9 @@ const startPlebbitRpcAutoRestart = async (port, defaultPlebbitOptions, plebbitRp (PlebbitRpcModule.default && PlebbitRpcModule.default.PlebbitWsServer); if (!PlebbitWsServer) { - (originalConsoleError || console.error)('Cannot find PlebbitWsServer in the imported module:', Object.keys(PlebbitRpcModule)); + console.error('Cannot find PlebbitWsServer in the imported module:', Object.keys(PlebbitRpcModule)); if (PlebbitRpcModule.default) { - (originalConsoleError || console.error)('Default export keys:', Object.keys(PlebbitRpcModule.default)); + console.error('Default export keys:', Object.keys(PlebbitRpcModule.default)); } throw new Error('PlebbitWsServer function not found in the imported module'); } @@ -70,20 +70,20 @@ const startPlebbitRpcAutoRestart = async (port, defaultPlebbitOptions, plebbitRp authKey: plebbitRpcAuthKey }); - plebbitWebSocketServer.on('error', (e) => (originalConsoleLog || console.log)('plebbit rpc error', e)); + plebbitWebSocketServer.on('error', (e) => console.log('plebbit rpc error', e)); - (originalConsoleLog || console.log)(`plebbit rpc: listening on ws://localhost:${port} (local connections only)`); - (originalConsoleLog || console.log)(`plebbit rpc: listening on ws://localhost:${port}/${plebbitRpcAuthKey} (secret auth key for remote connections)`); + console.log(`plebbit rpc: listening on ws://localhost:${port} (local connections only)`); + console.log(`plebbit rpc: listening on ws://localhost:${port}/${plebbitRpcAuthKey} (secret auth key for remote connections)`); plebbitWebSocketServer.ws.on('connection', (socket, request) => { - (originalConsoleLog || console.log)('plebbit rpc: new connection'); + console.log('plebbit rpc: new connection'); // debug raw JSON RPC messages in console if (isDev) { - socket.on('message', (message) => (originalConsoleLog || console.log)(`plebbit rpc: ${message.toString()}`)); + socket.on('message', (message) => console.log(`plebbit rpc: ${message.toString()}`)); } }); } } catch (e) { - (originalConsoleLog || console.log)('failed starting plebbit rpc server', e); + console.log('failed starting plebbit rpc server', e); } pendingStart = false; }; diff --git a/package.json b/package.json index ce9c4784..2d366b4c 100755 --- a/package.json +++ b/package.json @@ -59,9 +59,9 @@ "electron:no-delete-data": "yarn electron:before:download-ipfs && electron .", "electron:start": "concurrently \"cross-env BROWSER=none yarn start\" \"wait-on http://localhost:3000 && yarn electron\"", "electron:start:no-delete-data": "concurrently \"cross-env BROWSER=none yarn start\" \"wait-on http://localhost:3000 && yarn electron:no-delete-data\"", - "electron:build:linux": "electron-builder build --publish never -l", - "electron:build:windows": "electron-builder build --publish never -w", - "electron:build:mac": "electron-builder build --publish never -m", + "electron:build:linux": "yarn build && electron-builder build --publish never -l", + "electron:build:windows": "yarn build && electron-builder build --publish never -w", + "electron:build:mac": "yarn build && electron-builder build --publish never -m", "electron:before": "yarn electron:before:download-ipfs && yarn electron:before:delete-data", "electron:before:download-ipfs": "node electron/download-ipfs", "electron:before:delete-data": "rimraf .plebbit",