yeow-api 0.2.54 → 0.2.56

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "yeow-api",
-    "version": "0.2.54",
+    "version": "0.2.56",
     "description": "Yeow API",
     "type": "module",
     "main": "./src/index.ts",

package/src/service.ts

@@ -23,28 +23,27 @@ export async function registerService(refName: string, onRequest: (path: string,
   return r;
 }
 
-export async function registerNativeService(refName: string, platforms: Record<string, string>, isPublic = true): Promise<ServiceResult> {
-  const r = $send('service', { t: 'registerNative', refName, platforms, public: isPublic }) as ServiceResult;
+export async function registerNativeService(refName: string, platforms: Record<string, string>, isPublic = true): Promise<{ serviceId: string }> {
+  const r = $send('service', { t: 'registerNative', refName, platforms, public: isPublic }) as { serviceId: string };
   return r;
 }
 
 // ── Request ──
 
 export function request(serviceId: string, path: string, body?: any): Promise<any> {
-  const reqId = 'svcreq_' + (++_reqSeq);
   return new Promise((resolve, reject) => {
-    _registerCallback((result: any) => {
+    const cbId = _registerCallback((result: any) => {
       if (result?.err) { reject(new Error(result.err)); } else resolve(result);
     });
-    $send('service', { t: 'request', serviceId, path, body: body || {}, requestId: reqId });
+    $send('service', { t: 'request', serviceId, path, body: body || {}, requestId: cbId });
   });
 }
 
 // ── Subscribe ──
 
-export function subscribe(serviceId: string, eventPath: string, handler: (eventPath: string, body: any) => void): () => void {
+export function subscribe(serviceId: string, eventPath: string, handler: (body: any, eventPath: string) => void): () => void {
   const cbId = _registerCallback((payload: any) => {
-    handler(payload.eventPath, payload.body);
+    handler(payload.body, payload.eventPath);
   }, { persistent: true });
   $send('service', { t: 'subscribe', serviceId, eventPath, cb: cbId });
   return () => {