@phreshos/node 0.1.2 → 0.1.3

package/dist/main.d.ts

@@ -1,4 +1,5 @@
 export { gatewayAddress } from "./address.js";
-export { Client, Endpoint, Process, Program, Server, System, type ProgramProcessRunEvent, type ProgramProcessRunOptions } from "./system.js";
+export { Client, ClientService, Endpoint, Process, Program, Server, ServerService, System, type ProgramProcessRunEvent, type ProgramProcessRunOptions } from "./system.js";
+export { Service, type ClientServiceChannel, type ServerServiceChannel, type ServiceChannel, type ServiceKey, type ServiceLifecycleEvents } from "@phreshos/core";
 export { resolveHome } from "./home.js";
 export { Project, type Manifest, type PackedProject, type ProjectMode, type ProjectOptions, type ProjectRunOptions } from "./project.js";

package/dist/main.js

@@ -1,4 +1,5 @@
 export { gatewayAddress } from "./address.js";
-export { Client, Endpoint, Process, Program, Server, System } from "./system.js";
+export { Client, ClientService, Endpoint, Process, Program, Server, ServerService, System } from "./system.js";
+export { Service } from "@phreshos/core";
 export { resolveHome } from "./home.js";
 export { Project } from "./project.js";

package/dist/system.d.ts

@@ -1,4 +1,4 @@
-import { Client as CoreClient, ClientServiceHandler as CoreClientServiceHandler, Endpoint as CoreEndpoint, Process as CoreProcess, Program as CoreProgram, Server as CoreServer, ServerServiceHandler as CoreServerServiceHandler, type ClientDeclaration, type ClientServiceChannel, type EndpointDeclaration, type Launch, type LaunchClient, type Position, type ProgramDefinition, type ProgramCommandChunk, type ServerServiceChannel, type ServiceKey, type Size, type System as CoreSystem, type SystemClientEntity, type SystemEndpointEntity, type SystemProcessEntity, type SystemProcess, type SystemProgram, type SystemProgramEntity, type SystemProgramProcessEvents, type SystemServerEntity, type SystemUploads, type WritableAppearance, type Window, type WindowEvents, type WindowGeometry } from "@phreshos/core";
+import { Client as CoreClient, ClientService as CoreClientService, Endpoint as CoreEndpoint, Process as CoreProcess, Program as CoreProgram, Server as CoreServer, ServerService as CoreServerService, type ClientDeclaration, type EndpointDeclaration, type Launch, type LaunchClient, type Position, type ProgramDefinition, type ProgramCommandChunk, type ServiceKey, type Size, type System as CoreSystem, type SystemClientEntity, type SystemEndpointEntity, type SystemProcessEntity, type SystemProcess, type SystemProgram, type SystemProgramEntity, type SystemProgramProcessEvents, type SystemServerEntity, type SystemUploads, type WritableAppearance, type Window, type WindowEvents, type WindowGeometry } from "@phreshos/core";
 import Events from "./events.js";
 import { type TransportEvent } from "./transport.js";
 export type ProgramProcessRunOptions = Readonly<{
@@ -193,25 +193,13 @@ declare class SystemWindow extends Events<WindowEvents> implements Window {
     private snapshot;
     private change;
 }
-declare class ServerService<EventsMap extends object = {}> extends CoreServerServiceHandler<EventsMap> {
-    readonly name: string;
-    readonly channel: ServerServiceChannel<EventsMap>;
-    private readonly base;
-    constructor(system: System, key: ServiceKey & {
-        endpoint: "server";
-    });
-    enabled(): Promise<boolean>;
-    waitReady(timeout?: number): Promise<void>;
+/** Node-SDK handle for a Service provided by a Server Endpoint. */
+export declare class ServerService<EventsMap extends object = {}> extends CoreServerService<EventsMap> {
+    protected constructor();
 }
-declare class ClientService<EventsMap extends object = {}> extends CoreClientServiceHandler<EventsMap> {
-    readonly name: string;
-    readonly channel: ClientServiceChannel<EventsMap>;
-    private readonly base;
-    constructor(system: System, key: ServiceKey & {
-        endpoint: "client";
-    });
-    enabled(): Promise<boolean>;
-    waitReady(timeout?: number): Promise<void>;
+/** Node-SDK handle for a Service provided by a Client Endpoint. */
+export declare class ClientService<EventsMap extends object = {}> extends CoreClientService<EventsMap> {
+    protected constructor();
 }
 interface ProgramSnapshot {
     reference: string;

package/dist/system.js

@@ -1,4 +1,4 @@
-import { Client as CoreClient, ClientServiceHandler as CoreClientServiceHandler, Endpoint as CoreEndpoint, Process as CoreProcess, Program as CoreProgram, Server as CoreServer, ServerServiceHandler as CoreServerServiceHandler } from "@phreshos/core";
+import { Client as CoreClient, ClientService as CoreClientService, Endpoint as CoreEndpoint, Process as CoreProcess, Program as CoreProgram, Server as CoreServer, ServerService as CoreServerService, isServiceKey } from "@phreshos/core";
 import { homedir } from "node:os";
 import { gatewayAddress } from "./address.js";
 import Events from "./events.js";
@@ -65,9 +65,13 @@ export class System {
     }
     service(key) {
         this.requireConnected();
-        return key.endpoint === "server"
-            ? new ServerService(this, key)
-            : new ClientService(this, key);
+        if (!isServiceKey(key))
+            throw new Error("A complete service key is required");
+        const normalized = Object.freeze({ program: key.program, endpoint: key.endpoint, name: key.name });
+        const identity = JSON.stringify([normalized.program, normalized.endpoint, normalized.name]);
+        return this.handles.obtain(`service:${identity}`, () => normalized.endpoint === "server"
+            ? new ServerServiceHandle(this, normalized)
+            : new ClientServiceHandle(this, normalized));
     }
     programHandle(snapshot) {
         const handle = this.handles.obtain(`program:${snapshot.reference}`, () => new ProgramHandle(this, snapshot));
@@ -502,7 +506,11 @@ class ServiceBase extends Events {
     async enabled() { return await this.system.transport.api({ capability: "service", operation: "enabled", key: this.key }); }
     async waitReady(timeout) { await this.system.transport.api({ capability: "service", operation: "waitReady", key: this.key, timeout }); }
 }
-class ServerService extends CoreServerServiceHandler {
+/** Node-SDK handle for a Service provided by a Server Endpoint. */
+export class ServerService extends CoreServerService {
+    constructor() { super(); }
+}
+class ServerServiceHandle extends ServerService {
     name;
     channel;
     base;
@@ -516,7 +524,11 @@ class ServerService extends CoreServerServiceHandler {
     enabled() { return this.base.enabled(); }
     waitReady(timeout) { return this.base.waitReady(timeout); }
 }
-class ClientService extends CoreClientServiceHandler {
+/** Node-SDK handle for a Service provided by a Client Endpoint. */
+export class ClientService extends CoreClientService {
+    constructor() { super(); }
+}
+class ClientServiceHandle extends ClientService {
     name;
     channel;
     base;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phreshos/node",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Node.js access to PhreshOS and Program projects.",
   "type": "module",
   "main": "dist/main.js",
@@ -32,7 +32,7 @@
     "prepack": "node --run build"
   },
   "dependencies": {
-    "@phreshos/core": "^0.1.23",
+    "@phreshos/core": "^0.1.24",
     "adm-zip": "^0.6.0",
     "jiti": "^2.7.0"
   },