@kitsuned/webos-service 1.0.7 → 1.2.0

package/dist/index.d.ts

@@ -1,20 +1,9 @@
+import { LunaClient, type LunaResponse } from '@kitsuned/webos-luna-isomorphic-client';
 import { Message } from './message';
 type AnyRecord = Record<string, any>;
-export type LunaErrorResponse = {
-    returnValue: false;
-    errorCode?: number;
-    errorText: string;
-};
-export type LunaSuccessResponse<T> = {
-    returnValue?: true;
-} & T;
-export type LunaResponse<T extends AnyRecord> = LunaSuccessResponse<T> | LunaErrorResponse;
 export type Executor<TReq extends AnyRecord, TResp extends AnyRecord | void, TNext extends AnyRecord> = (payload: TReq, message: Message<TReq>) => AsyncGenerator<TNext, TResp> | Promise<TResp> | TResp;
-export type Client = Pick<Service, 'oneshot' | 'subscribe' | 'stream'> & {
-    id: string | null;
-};
 export declare const isLegacyBus: boolean;
-export declare class Service {
+export declare class Service extends LunaClient {
     readonly id: string;
     private readonly handleOutbound;
     private readonly handlePublic;
@@ -27,8 +16,6 @@ export declare class Service {
         bus?: 'public' | 'private' | 'both';
     }): void;
     subscribe<T extends AnyRecord>(uri: string, params: AnyRecord, callback: (response: LunaResponse<T>) => void): () => void;
-    stream<T extends AnyRecord>(uri: string, params?: AnyRecord): AsyncGenerator<LunaResponse<T>, void>;
-    oneshot<T extends AnyRecord>(uri: string, params?: AnyRecord): Promise<LunaResponse<T>>;
     unregister(): void;
     private drainExecutor;
     private handleRequest;

package/dist/index.js

@@ -7,7 +7,7 @@ exports.Service = exports.isLegacyBus = void 0;
 const palmbus_1 = __importDefault(require("palmbus"));
 const fs_1 = require("fs");
 const path_1 = require("path");
-const async_utils_1 = require("@kitsuned/async-utils");
+const webos_luna_isomorphic_client_1 = require("@kitsuned/webos-luna-isomorphic-client");
 const message_1 = require("./message");
 const idle_timer_1 = require("./idle-timer");
 function extractMethodPath(path) {
@@ -32,7 +32,7 @@ function readServiceIdFromConfig() {
     return config.id;
 }
 exports.isLegacyBus = (0, fs_1.existsSync)('/var/run/ls2/ls-hubd.private.pid');
-class Service {
+class Service extends webos_luna_isomorphic_client_1.LunaClient {
     id;
     handleOutbound;
     handlePublic;
@@ -41,20 +41,21 @@ class Service {
     methods = new Map();
     pending = new Map();
     constructor(serviceId, idleTimeout = null, publicBus = true) {
+        super();
         this.idleTimer = new idle_timer_1.IdleTimer(idleTimeout, this.handleQuit.bind(this));
         this.id = serviceId ?? readServiceIdFromConfig();
+        const register = (...params) => {
+            const handle = new palmbus_1.default.Handle(...params);
+            handle.addListener('request', this.handleRequest.bind(this));
+            handle.addListener('cancel', this.handleCancel.bind(this));
+            return handle;
+        };
         if (exports.isLegacyBus) {
-            this.handlePublic = new palmbus_1.default.Handle(this.id, true);
-            this.handlePublic.addListener('request', this.handleRequest.bind(this));
-            this.handlePublic.addListener('cancel', this.handleCancel.bind(this));
-            this.handlePrivate = new palmbus_1.default.Handle(this.id, false);
-            this.handlePrivate.addListener('request', this.handleRequest.bind(this));
-            this.handlePrivate.addListener('cancel', this.handleCancel.bind(this));
+            this.handlePublic = register(this.id, true);
+            this.handlePrivate = register(this.id, false);
         }
         else {
-            const handle = new palmbus_1.default.Handle(this.id);
-            handle.addListener('request', this.handleRequest.bind(this));
-            handle.addListener('cancel', this.handleCancel.bind(this));
+            const handle = register(this.id);
             this.handlePublic = handle;
             this.handlePrivate = handle;
         }
@@ -83,22 +84,6 @@ class Service {
         });
         return () => subscription.cancel();
     }
-    async *stream(uri, params = { subscribe: true }) {
-        const sink = new async_utils_1.AsyncSink();
-        const cancel = this.subscribe(uri, params, payload => sink.push(payload));
-        try {
-            yield* sink;
-        }
-        finally {
-            cancel();
-        }
-    }
-    async oneshot(uri, params = {}) {
-        const generator = this.stream(uri, params);
-        const { value } = await generator.next();
-        await generator.return();
-        return value;
-    }
     unregister() {
         this.pending.clear();
         this.handleOutbound.unregister();
@@ -149,7 +134,7 @@ class Service {
             console.error('webos-service: handleRequest:', e);
             message.respond({
                 returnValue: false,
-                errorCode: -1,
+                errorCode: -100,
                 errorText: e instanceof Error ? e.message : String(e),
                 errorStack: 'stack' in e.stack ? String(e.stack) : null,
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitsuned/webos-service",
-  "version": "1.0.7",
+  "version": "1.2.0",
   "license": "MIT",
   "scripts": {
     "build": "tsc"
@@ -13,7 +13,7 @@
     "types": "./dist/index.d.ts"
   },
   "dependencies": {
-    "@kitsuned/async-utils": "^1.0.0"
+    "@kitsuned/webos-luna-isomorphic-client": "^1.0.0"
   },
   "devDependencies": {
     "@types/node": "25.4.0",