yeow-api 0.2.58 → 0.2.59

package/package.json

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

package/src/command.ts

@@ -33,13 +33,21 @@ export function registerCommand(name: string, options: CommandOptions): boolean
   const completer = options.completer;
   const pluginName = __plugin?.name || 'unknown';
 
-  const cbId = _registerCallback((payload: CommandPayload) => {
-    const sender = payload.sender;
+  function decorateSender(sender: CommandSender): CommandSender {
     if (sender?.uuid && sender.isPlayer) {
       (sender as any).sendMessage = (msg: string) => {
         call('player.sendMessage', { uuid: sender.uuid, message: msg });
       };
+    } else {
+      (sender as any).sendMessage = (msg: string) => {
+        $send('log', { level: 'INFO', message: msg });
+      };
     }
+    return sender;
+  }
+
+  const cbId = _registerCallback((payload: CommandPayload) => {
+    (payload as any).sender = decorateSender(payload.sender);
     executor(payload);
   }, { persistent: true });
 
@@ -56,6 +64,7 @@ export function registerCommand(name: string, options: CommandOptions): boolean
 
     compCbId = _registerCallback((data: any) => {
       try {
+        const sender = decorateSender(data.sender);
         if (manualRelease) {
           const complete = (result: string[]) => {
             $send('task', {
@@ -64,9 +73,9 @@ export function registerCommand(name: string, options: CommandOptions): boolean
               cb: '',
             });
           };
-          completerFn(data.sender, data.args, complete);
+          completerFn(sender, data.args, complete);
         } else {
-          const result = completerFn(data.sender, data.args);
+          const result = completerFn(sender, data.args);
           if (result && typeof result.then === 'function') {
             $send('task', {
               type: 'command.tabComplete',

package/src/service.ts

@@ -5,9 +5,17 @@ export interface ServiceResult {
   token: string;
 }
 
+export interface NativeTerminateInfo {
+  serviceId: string;
+  reason: string;
+  exitCode?: number;
+  output?: string;
+}
+
 export interface NativeServiceResult {
   serviceId: string;
   ready: () => Promise<void>;
+  onTerminate: (handler: (info: NativeTerminateInfo) => void) => void;
 }
 
 // ── Register Plugin Service ──
@@ -22,7 +30,13 @@ export async function registerService(refName: string, onRequest: (path: string,
     }
   }, { persistent: true });
 
-  const r = $send('service', { t: 'register', refName, onRequest: svcCbId, public: isPublic }) as ServiceResult;
+  const r = $send('service', { t: 'register', refName, onRequest: svcCbId, public: isPublic }) as ServiceResult & { err?: string; serviceId?: string };
+  if (r?.err) {
+    _unregisterCallback(svcCbId);
+    const e: any = new Error(r.err);
+    if (r.serviceId) e.serviceId = r.serviceId;
+    throw e;
+  }
   return r;
 }
 
@@ -52,10 +66,20 @@ function _serviceReady(serviceId: string): Promise<void> {
 
 export async function registerNativeService(refName: string, platforms: NativePlatforms, isPublic = true): Promise<NativeServiceResult> {
   const r = $send('service', { t: 'registerNative', refName, platforms, public: isPublic }) as { serviceId: string; err?: string };
-  if (r.err) throw new Error(r.err);
+  if (r.err) {
+    const e: any = new Error(r.err);
+    if ((r as any).serviceId) e.serviceId = (r as any).serviceId;
+    throw e;
+  }
+  let terminateCb: string | null = null;
   return {
     serviceId: r.serviceId,
     ready: () => _serviceReady(r.serviceId),
+    onTerminate(handler) {
+      if (terminateCb) _unregisterCallback(terminateCb);
+      terminateCb = _registerCallback((info: unknown) => handler(info as NativeTerminateInfo), { persistent: true });
+      $send('service', { t: 'registerNativeTerminate', serviceId: r.serviceId, cb: terminateCb });
+    },
   };
 }