From 31abcb7a2157093fac385fa5e40ba2811bd9744b Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Sat, 31 Dec 2022 06:30:51 -0800 Subject: [PATCH] chore: refactor client from rpcService --- packages/daemon/src/server.ts | 2 +- packages/daemon/src/services/RpcService.ts | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/daemon/src/server.ts b/packages/daemon/src/server.ts index 7d311b18..911f8fdb 100644 --- a/packages/daemon/src/server.ts +++ b/packages/daemon/src/server.ts @@ -35,7 +35,7 @@ global.EventSource = require('eventsource') const client = await clientService(url) ftpService({}) - const rpcService = await createRpcService({ client }) + const rpcService = await createRpcService({}) const instanceService = await createInstanceService({ client, rpcService }) const proxyService = await createProxyService({ instanceManager: instanceService, diff --git a/packages/daemon/src/services/RpcService.ts b/packages/daemon/src/services/RpcService.ts index a005fe5b..f04cc0fe 100644 --- a/packages/daemon/src/services/RpcService.ts +++ b/packages/daemon/src/services/RpcService.ts @@ -12,7 +12,7 @@ import Bottleneck from 'bottleneck' import { default as knexFactory } from 'knex' import pocketbaseEs from 'pocketbase' import { AsyncReturnType, JsonObject } from 'type-fest' -import { PocketbaseClientApi } from '../db/PbClient' +import { clientService } from '../db/PbClient' export type RpcServiceApi = AsyncReturnType @@ -28,12 +28,11 @@ export type RpcRunner< TResult extends JsonObject > = (job: RpcFields) => Promise -export type RpcServiceConfig = { client: PocketbaseClientApi } +export type RpcServiceConfig = {} export const createRpcService = async (config: RpcServiceConfig) => { const { dbg, error } = logger().create('RpcService') - - const { client } = config + const client = await clientService() const limiter = new Bottleneck({ maxConcurrent: 1 })