yeow-api 0.2.57 → 0.2.59

package/package.json

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

package/src/assets-path.d.ts

@@ -0,0 +1,3 @@
+declare module '__yeow-assets' {
+    export function getPath(path: string): string;
+}

package/src/assets-path.ts

@@ -0,0 +1,7 @@
+/// <reference path="assets-path.d.ts" />
+
+import { getPath as _getPath } from '__yeow-assets';
+
+export function getAssetsPath(path: string): string {
+    return _getPath(path);
+}

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/index.ts

@@ -41,6 +41,7 @@ export {
 export { assets, read as assetsRead, readSync as assetsReadSync,
     readBase64 as assetsReadBase64, readBase64Sync as assetsReadBase64Sync,
     extract as assetsExtract, extractSync as assetsExtractSync } from './assets.js';
+export { getAssetsPath } from './assets-path.js';
 export { path } from './path.js';
 export { listen, respond, close, request } from './http.js';
 export { logError } from './log-error.js';
@@ -80,5 +81,5 @@ export { createBoard as createScoreboard, deleteBoard as deleteScoreboard,
 export { getMaterials, getBlocks, getItems } from './material.js';
 export type { MaterialInfo } from './material.js';
 export { registerService, registerNativeService, request as serviceRequest, subscribe as serviceSubscribe, publish as servicePublish } from './service.js';
-export type { ServiceResult } from './service.js';
+export type { ServiceResult, NativeServiceResult } from './service.js';
 export { log, Logger } from './log.js';

package/src/log.ts

@@ -3,15 +3,20 @@ function _sendLog(level: string, prefix: string, ...args: unknown[]): void {
   $send('log', { level, message: msg });
 }
 
+function _pluginPrefix(): string {
+  return (typeof __plugin !== 'undefined' && __plugin?.name)
+    ? '[' + __plugin.name + '] ' : '';
+}
+
 export const log = {
   info(...args: unknown[]): void {
-    _sendLog('INFO', '', ...args);
+    _sendLog('INFO', _pluginPrefix(), ...args);
   },
   warn(...args: unknown[]): void {
-    _sendLog('WARN', '', ...args);
+    _sendLog('WARN', _pluginPrefix(), ...args);
   },
   error(...args: unknown[]): void {
-    _sendLog('ERROR', '', ...args);
+    _sendLog('ERROR', _pluginPrefix(), ...args);
   },
 };
 

package/src/service.ts

@@ -5,7 +5,18 @@ export interface ServiceResult {
   token: string;
 }
 
-let _reqSeq = 0;
+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 ──
 
@@ -19,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;
 }
 
@@ -28,9 +45,42 @@ export async function registerService(refName: string, onRequest: (path: string,
 type NativePlatform = string | { file: string } | { dir: string; entry: string };
 type NativePlatforms = Record<string, NativePlatform>;
 
-export async function registerNativeService(refName: string, platforms: NativePlatforms, isPublic = true): Promise<{ serviceId: string }> {
-  const r = $send('service', { t: 'registerNative', refName, platforms, public: isPublic }) as { serviceId: string };
-  return r;
+function _serviceReady(serviceId: string): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const cbId = _registerCallback((result: any) => {
+      if (result?.err) {
+        const info = result.err;
+        if (typeof info === 'string') {
+          reject(new Error(info));
+        } else {
+          const e = new Error(info.message || 'Unknown error');
+          (e as any).exitCode = info.exitCode;
+          (e as any).output = info.output || '';
+          reject(e);
+        }
+      } else resolve();
+    });
+    $send('service', { t: 'awaitReady', serviceId, cb: cbId });
+  });
+}
+
+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) {
+    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 });
+    },
+  };
 }
 
 // ── Request ──