@bakit/service 3.1.0 → 3.2.1

package/dist/index.d.ts

@@ -22,6 +22,7 @@ interface BaseClientDriver extends EventBus<BaseClientDriverEvents> {
 	send(message: Serializable): void;
 	connect(): void;
 	disconnect(): void;
+	readonly ready: boolean;
 }
 
 interface BaseServerDriver extends EventBus<BaseServerDriverEvents> {
@@ -85,6 +86,7 @@ interface IPCSocketConnection extends EventBus<IPCClientEvents>, IPCSocketMessag
     reconnect: () => void;
     write: (chunk: Buffer) => void;
     readonly state: SocketState;
+    readonly ready: boolean;
 }
 interface IPCSocketMessageHandler extends BaseClientDriver {
     handleData: (chunk: Buffer) => void;
@@ -166,6 +168,7 @@ interface TransportClient extends TransportClientProtocol, EventBus<TransportCli
     send: BaseServerDriver["send"];
     connect: BaseClientDriver["connect"];
     disconnect: BaseClientDriver["disconnect"];
+    readonly ready: boolean;
 }
 interface TransportServer extends TransportServerProtocol, EventBus<TransportServerEvents> {
     broadcast: BaseServerDriver["broadcast"];
@@ -217,6 +220,8 @@ interface ServiceOptions {
 interface Service {
     readonly name: string;
     readonly role: ServiceRole;
+    initialize?: FunctionLike<[], Awaitable<void>>;
+    onReady?: FunctionLike<[], Awaitable<void>>;
     define<F extends ServiceFunction>(method: string, handler: F): Promisify<F>;
 }
 type ServiceFunction = FunctionLike<any[], Awaitable<any>>;
@@ -243,6 +248,9 @@ interface ServiceInteral {
     bind(role: "client" | "server"): void;
 }
 declare function createService(options: ServiceOptions): Service;
+declare function startServiceServer(service: Service): Promise<void>;
+declare function assertRuntimeClient(service: Service, runtime: MutableRuntime): asserts runtime is ServiceClientRuntime;
+declare function assertRuntimeServer(service: Service, runtime: MutableRuntime): asserts runtime is ServiceServerRuntime;
 declare function getInternalService(service: Service): ServiceInteral;
 
-export { type BaseClientDriver, type BaseClientDriverEvents, type BaseServerDriver, type BaseServerDriverEvents, DEFAULT_IPC_SOCKET_CONNECTION_OPTIONS, type IPCClientEvents, type IPCClientOptions, type IPCServer, type IPCServerEvents, type IPCServerOptions, IPCServerState, type IPCSocketConnection, type IPCSocketConnectionOptions, type IPCSocketMessageHandler, type IPCSocketMessageHandlerOptions, type MutableRuntime, RPCError, type RPCErrorPayload, type RPCHandler, type RPCRequestMessage, type RPCResponseMessage, type Serializable, type Service, type ServiceClientRuntime, type ServiceFunction, type ServiceInteral, type ServiceOptions, ServiceRole, type ServiceRuntime, type ServiceServerRuntime, SocketState, type TransportClient, type TransportClientDriverSpecificOptions, type TransportClientEvents, type TransportClientOptions, type TransportClientProtocol, TransportDriver, type TransportServer, type TransportServerDriverSpecificOptions, type TransportServerEvents, type TransportServerOptions, type TransportServerProtocol, createIPCClient, createIPCServer, createIPCSocketConnection, createIPCSocketMessageHandler, createService, createTransportClient, createTransportClientProtocol, createTransportServer, createTransportServerProtocol, deserializeRPCError, getIPCPath, getInternalService, serializeRPCError };
+export { type BaseClientDriver, type BaseClientDriverEvents, type BaseServerDriver, type BaseServerDriverEvents, DEFAULT_IPC_SOCKET_CONNECTION_OPTIONS, type IPCClientEvents, type IPCClientOptions, type IPCServer, type IPCServerEvents, type IPCServerOptions, IPCServerState, type IPCSocketConnection, type IPCSocketConnectionOptions, type IPCSocketMessageHandler, type IPCSocketMessageHandlerOptions, type MutableRuntime, RPCError, type RPCErrorPayload, type RPCHandler, type RPCRequestMessage, type RPCResponseMessage, type Serializable, type Service, type ServiceClientRuntime, type ServiceFunction, type ServiceInteral, type ServiceOptions, ServiceRole, type ServiceRuntime, type ServiceServerRuntime, SocketState, type TransportClient, type TransportClientDriverSpecificOptions, type TransportClientEvents, type TransportClientOptions, type TransportClientProtocol, TransportDriver, type TransportServer, type TransportServerDriverSpecificOptions, type TransportServerEvents, type TransportServerOptions, type TransportServerProtocol, assertRuntimeClient, assertRuntimeServer, createIPCClient, createIPCServer, createIPCSocketConnection, createIPCSocketMessageHandler, createService, createTransportClient, createTransportClientProtocol, createTransportServer, createTransportServerProtocol, deserializeRPCError, getIPCPath, getInternalService, serializeRPCError, startServiceServer };

package/dist/index.js

@@ -104,6 +104,9 @@ function createIPCSocketConnection(socketPath, options = {}) {
     write,
     get state() {
       return state;
+    },
+    get ready() {
+      return state === SocketState.Connected;
     }
   });
   function connect() {
@@ -239,7 +242,10 @@ function createTransportClient(options) {
     ...createTransportClientProtocol(driver),
     send: driver.send,
     connect: driver.connect,
-    disconnect: driver.disconnect
+    disconnect: driver.disconnect,
+    get ready() {
+      return driver.ready;
+    }
   }, self = attachEventBus(base);
   return driver.on("connect", () => self.emit("connect")), driver.on("disconnect", () => self.emit("disconnect")), driver.on("error", (error) => self.emit("error", error)), self;
 }
@@ -268,17 +274,12 @@ function createTransportClientProtocol(driver) {
   function isResponseMessage(message) {
     if (!isPlainObject(message))
       return false;
-    let hasType = "type" in message && message.type === "response", hasId = "id" in message && typeof message.id == "string", hasResult = "result" in message && message.result !== void 0, hasError = "error" in message && message.error !== void 0;
+    let hasType = "type" in message && message.type === "response", hasId = "id" in message && typeof message.id == "string", hasResult = "result" in message, hasError = "error" in message && message.error !== void 0;
     return hasType && hasId && hasResult !== hasError;
   }
   function request(method, ...args) {
     let requestId = randomUUID();
-    return driver.send({
-      type: "request",
-      id: requestId,
-      method,
-      args
-    }), new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       let timeout = setTimeout(() => {
         let request2 = requests.get(requestId);
         request2 && (request2.reject(new Error("RPC timeout")), requests.delete(requestId));
@@ -290,6 +291,11 @@ function createTransportClientProtocol(driver) {
         reject: (e) => {
           clearTimeout(timeout), reject(e);
         }
+      }), driver.send({
+        type: "request",
+        id: requestId,
+        method,
+        args
       });
     });
   }
@@ -363,15 +369,11 @@ function createService(options) {
     return handlers.set(method, handler), (async (...args) => {
       if (ensureClientBound(), runtime.role === "unknown")
         throw new Error(`Service "${options.name}" is not bound (method "${method}")`);
-      return runtime.role === "server" ? handler(...args) : (assertClient(runtime), runtime.transport.request(method, ...args));
+      return runtime.role === "server" ? handler(...args) : (assertRuntimeClient(service, runtime), runtime.transport.request(method, ...args));
     });
   }
   function ensureClientBound() {
-    runtime.role !== "unknown" || process.env.BAKIT_SERVICE_NAME === options.name || bind(ServiceRole.Client);
-  }
-  function assertClient(runtime2) {
-    if (runtime2.role !== "client")
-      throw new Error(`Service "${options.name}" is not a client`);
+    runtime.role !== "unknown" || process.env.BAKIT_SERVICE_NAME === options.name || (bind(ServiceRole.Client), assertRuntimeClient(service, runtime), runtime.transport.ready || runtime.transport.connect());
   }
   function bind(role) {
     if (runtime.role !== "unknown")
@@ -380,10 +382,10 @@ function createService(options) {
       let server = createTransportServer(options.transport);
       for (let [method, handler] of handlers)
         server.handle(method, handler);
-      runtime.role = "server", runtime.transport = server, server.listen();
+      runtime.role = "server", runtime.transport = server;
     } else if (role === "client") {
       let client = createTransportClient(options.transport);
-      runtime.role = "client", runtime.transport = client, client.connect();
+      runtime.role = "client", runtime.transport = client;
     }
   }
   return Object.defineProperty(service, SERVICE_INTERNAL, {
@@ -397,8 +399,24 @@ function createService(options) {
     }
   }), service;
 }
+async function startServiceServer(service) {
+  let internal = getInternalService(service);
+  return internal.bind(ServiceRole.Server), await service.initialize?.(), await new Promise((resolve) => {
+    assertRuntimeServer(service, internal.runtime), internal.runtime.transport.once("listen", async () => {
+      resolve(), await service.onReady?.();
+    }), internal.runtime.transport.listen();
+  });
+}
+function assertRuntimeClient(service, runtime) {
+  if (runtime.role !== "client")
+    throw new Error(`Service "${service.name}" is not a client`);
+}
+function assertRuntimeServer(service, runtime) {
+  if (runtime.role !== "server")
+    throw new Error(`Service "${service.name}" is not a server`);
+}
 function getInternalService(service) {
   return service[SERVICE_INTERNAL];
 }
 
-export { DEFAULT_IPC_SOCKET_CONNECTION_OPTIONS, IPCServerState, RPCError, ServiceRole, SocketState, TransportDriver, createIPCClient, createIPCServer, createIPCSocketConnection, createIPCSocketMessageHandler, createService, createTransportClient, createTransportClientProtocol, createTransportServer, createTransportServerProtocol, deserializeRPCError, getIPCPath, getInternalService, serializeRPCError };
+export { DEFAULT_IPC_SOCKET_CONNECTION_OPTIONS, IPCServerState, RPCError, ServiceRole, SocketState, TransportDriver, assertRuntimeClient, assertRuntimeServer, createIPCClient, createIPCServer, createIPCSocketConnection, createIPCSocketMessageHandler, createService, createTransportClient, createTransportClientProtocol, createTransportServer, createTransportServerProtocol, deserializeRPCError, getIPCPath, getInternalService, serializeRPCError, startServiceServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakit/service",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "description": "Service manager for bakit framework",
   "type": "module",
   "exports": {