@bakit/service 3.0.0 → 3.1.0

package/dist/index.d.ts

@@ -223,23 +223,26 @@ type ServiceFunction = FunctionLike<any[], Awaitable<any>>;
 declare const ServiceRole: {
     readonly Client: "client";
     readonly Server: "server";
-    readonly Unknown: "unknown";
 };
 type ServiceRole = ValueOf<typeof ServiceRole>;
-type ServiceRuntime = {
-    role: "unknown";
-} | {
-    role: "client";
+interface ServiceClientRuntime {
+    role: typeof ServiceRole.Client;
     transport: TransportClient;
-} | {
-    role: "server";
+}
+interface ServiceServerRuntime {
+    role: typeof ServiceRole.Server;
     transport: TransportServer;
-};
+}
+type ServiceRuntime = ServiceClientRuntime | ServiceServerRuntime;
+interface MutableRuntime {
+    role: ServiceRole | "unknown";
+    transport?: TransportClient | TransportServer;
+}
 interface ServiceInteral {
     runtime: ServiceRuntime;
     bind(role: "client" | "server"): void;
 }
 declare function createService(options: ServiceOptions): Service;
-declare function getInteralService(service: Service): ServiceInteral;
+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, RPCError, type RPCErrorPayload, type RPCHandler, type RPCRequestMessage, type RPCResponseMessage, type Serializable, type Service, type ServiceFunction, type ServiceInteral, type ServiceOptions, ServiceRole, type ServiceRuntime, 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, getInteralService, 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, createIPCClient, createIPCServer, createIPCSocketConnection, createIPCSocketMessageHandler, createService, createTransportClient, createTransportClientProtocol, createTransportServer, createTransportServerProtocol, deserializeRPCError, getIPCPath, getInternalService, serializeRPCError };

package/dist/index.js

@@ -343,8 +343,7 @@ function createTransportServerProtocol(driver) {
 }
 var ServiceRole = {
   Client: "client",
-  Server: "server",
-  Unknown: "unknown"
+  Server: "server"
 }, SERVICE_INTERNAL = Symbol("service-internal");
 function createService(options) {
   let handlers = new Collection(), runtime = { role: "unknown" }, service = {
@@ -352,6 +351,8 @@ function createService(options) {
       return options.name;
     },
     get role() {
+      if (runtime.role === "unknown")
+        throw new Error(`Service "${options.name}" is not bound`);
       return runtime.role;
     },
     define
@@ -360,11 +361,18 @@ function createService(options) {
     if (handlers.has(method))
       throw new Error(`Service method "${method}" already defined`);
     return handlers.set(method, handler), (async (...args) => {
-      if (runtime.role === "unknown")
+      if (ensureClientBound(), runtime.role === "unknown")
         throw new Error(`Service "${options.name}" is not bound (method "${method}")`);
-      return runtime.role === "server" ? handler(...args) : runtime.transport.request(method, ...args);
+      return runtime.role === "server" ? handler(...args) : (assertClient(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`);
+  }
   function bind(role) {
     if (runtime.role !== "unknown")
       throw new Error(`Service "${options.name}" already bound`);
@@ -372,29 +380,25 @@ function createService(options) {
       let server = createTransportServer(options.transport);
       for (let [method, handler] of handlers)
         server.handle(method, handler);
-      runtime = {
-        role,
-        transport: server
-      }, server.listen();
+      runtime.role = "server", runtime.transport = server, server.listen();
     } else if (role === "client") {
       let client = createTransportClient(options.transport);
-      runtime = {
-        role,
-        transport: client
-      }, client.connect();
+      runtime.role = "client", runtime.transport = client, client.connect();
     }
   }
   return Object.defineProperty(service, SERVICE_INTERNAL, {
     value: {
       get runtime() {
+        if (runtime.role === "unknown")
+          throw new Error(`Service "${options.name}" is not bound`);
         return runtime;
       },
       bind
     }
   }), service;
 }
-function getInteralService(service) {
+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, getInteralService, serializeRPCError };
+export { DEFAULT_IPC_SOCKET_CONNECTION_OPTIONS, IPCServerState, RPCError, ServiceRole, SocketState, TransportDriver, createIPCClient, createIPCServer, createIPCSocketConnection, createIPCSocketMessageHandler, createService, createTransportClient, createTransportClientProtocol, createTransportServer, createTransportServerProtocol, deserializeRPCError, getIPCPath, getInternalService, serializeRPCError };

package/package.json

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