@tsukilabs/nil-ffi 0.7.5 → 0.7.6

package/dist/index.d.ts

@@ -6,21 +6,20 @@ import * as ffi from "node:ffi";
 export * from './def';
 export * from './error';
 export type Handle = ffi.DynamicLibraryResult<typeof definitions>;
-export type { ErrorHandler } from './queue';
+export type { ErrorHandler, QueueOptions } from './queue';
 export declare const VERSION: string;
 export declare const USER_AGENT: string;
-export declare class Nil implements Disposable {
+export declare class Nil implements AsyncDisposable {
+    #private;
     readonly path: string;
     private readonly handle;
-    readonly functions: Handle["functions"];
+    private readonly functions;
     private readonly queue;
-    private disposed;
+    private closed;
+    private closePromise;
     private constructor();
-    static init(dll: string, options?: NilOptions): Promise<Nil>;
-    static initLatest(outDir?: Option<string>, options?: NilOptions): Promise<Nil>;
-    static downloadLatest(outDir?: Option<string>): Promise<string>;
-    [Symbol.dispose](): void;
-    close(): void;
+    [Symbol.asyncDispose](): Promise<void>;
+    close(): Promise<void>;
     isClosed(): boolean;
     authorize(req: AuthorizeRequest): Promise<string>;
     getClientVersion(): Promise<string>;
@@ -46,12 +45,19 @@ export declare class Nil implements Disposable {
     setUserAgent(userAgent: string): Promise<import('@tb-dev/utils').nil>;
     spawnPlayer(req: SpawnPlayerRequest): Promise<import('@tb-dev/utils').nil>;
     startServer(options: WorldOptions): Promise<LocalServer>;
-    startServerWithSavedata(path: string): Promise<LocalServer>;
+    startServerWithSavedata(savedataPath: string): Promise<LocalServer>;
     stopClient(): Promise<import('@tb-dev/utils').nil>;
     stopServer(): Promise<import('@tb-dev/utils').nil>;
     updateClient(options: ClientOptions): Promise<import('@tb-dev/utils').nil>;
     validateToken(req: ValidateTokenRequest): Promise<ValidateTokenResponse>;
+    static init(dll: string, options?: NilOptions): Promise<Nil>;
+    static initLatest(options?: InitLatestOptions): Promise<Nil>;
+    static downloadLatest(options?: DownloadLatestOptions): Promise<string>;
+}
+export interface NilOptions extends QueueOptions {
 }
-export interface NilOptions {
-    onError?: QueueOptions["onError"];
+export interface DownloadLatestOptions {
+    outDir?: Option<string>;
+    overwrite?: boolean;
 }
+export type InitLatestOptions = DownloadLatestOptions & NilOptions;

package/dist/index.js

@@ -1,11 +1,13 @@
 import * as ffi from "node:ffi";
+import * as path from "node:path";
 import * as process from "node:process";
 import { cwd } from "node:process";
+import { existsSync } from "node:fs";
+import * as fs from "node:fs/promises";
 import { ffi_Status } from "@tsukilabs/nil-bindings";
-import { writeFile } from "node:fs/promises";
+import { attemptAsync } from "es-toolkit/util";
 import { EventEmitter } from "node:events";
 import { isNil } from "es-toolkit/predicate";
-import { join, resolve } from "node:path";
 //#region src/def.ts
 //! Copyright (C) Call of Nil contributors
 //! SPDX-License-Identifier: AGPL-3.0-only
@@ -752,7 +754,7 @@ var Queue = class Queue {
 };
 //#endregion
 //#region package.json
-var version = "0.7.5";
+var version = "0.7.6";
 //#endregion
 //#region \0@oxc-project+runtime@0.139.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
@@ -769,43 +771,31 @@ var VERSION = version;
 var USER_AGENT = `nil-ffi-node/${VERSION}`;
 var Nil = class Nil {
 	constructor(dll, options) {
-		this.disposed = false;
+		this.closed = false;
 		if (!dll.endsWith(ffi.suffix)) dll = `${dll}.${ffi.suffix}`;
-		this.path = resolve(dll);
+		this.path = path.resolve(dll);
 		this.handle = ffi.dlopen(dll, definitions);
 		this.functions = this.handle.functions;
 		this.queue = new Queue(this.handle, options);
 	}
-	static async init(dll, options) {
-		const nil = new Nil(dll, options);
-		await nil.setUserAgent(USER_AGENT);
-		return nil;
-	}
-	static async initLatest(outDir, options) {
-		const dll = await this.downloadLatest(outDir);
-		return this.init(dll, options);
-	}
-	static async downloadLatest(outDir) {
-		const file = `libnil.${ffi.suffix}`;
-		const response = await fetch(`https://tsukilabs.dev.br/${file}`);
-		if (!response.ok) throw new Error(`failed to download ${file}: ${response.status} ${response.statusText}`);
-		const bytes = await response.bytes();
-		const path = join(outDir ?? cwd(), file);
-		await writeFile(path, bytes);
-		return resolve(path);
+	async [Symbol.asyncDispose]() {
+		await this.close();
 	}
-	[Symbol.dispose]() {
-		this.close();
-	}
-	close() {
-		if (this.disposed) return;
-		this.disposed = true;
+	async #close() {
+		if (this.closed) return;
+		this.closed = true;
+		await attemptAsync(this.stopClient.bind(this));
+		await attemptAsync(this.stopServer.bind(this));
 		this.queue[Symbol.dispose]();
 		this.functions.nil_ffi_shutdown();
 		this.handle[Symbol.dispose]();
 	}
+	async close() {
+		this.closePromise ??= this.#close();
+		return this.closePromise;
+	}
 	isClosed() {
-		return this.disposed;
+		return this.closed;
 	}
 	async authorize(req) {
 		return this.queue.request((requestId) => {
@@ -927,9 +917,9 @@ var Nil = class Nil {
 			this.functions.nil_start_server(requestId, JSON.stringify(options));
 		});
 	}
-	async startServerWithSavedata(path) {
+	async startServerWithSavedata(savedataPath) {
 		return this.queue.request((requestId) => {
-			this.functions.nil_start_server_with_savedata(requestId, JSON.stringify(path));
+			this.functions.nil_start_server_with_savedata(requestId, JSON.stringify(savedataPath));
 		});
 	}
 	async stopClient() {
@@ -952,6 +942,25 @@ var Nil = class Nil {
 			this.functions.nil_validate_token(requestId, JSON.stringify(req));
 		});
 	}
+	static async init(dll, options) {
+		const nil = new Nil(dll, options);
+		await nil.setUserAgent(USER_AGENT);
+		return nil;
+	}
+	static async initLatest(options) {
+		const dll = await this.downloadLatest(options);
+		return this.init(dll, options);
+	}
+	static async downloadLatest(options) {
+		const file = `libnil.${ffi.suffix}`;
+		const filePath = path.resolve(options?.outDir ?? cwd(), file);
+		if (!(options?.overwrite ?? true) && existsSync(filePath)) return filePath;
+		const response = await fetch(`https://tsukilabs.dev.br/download/nil/${file}`, { headers: { "User-Agent": USER_AGENT } });
+		if (!response.ok) throw new Error(`failed to download ${file}: ${response.status} ${response.statusText}`);
+		const bytes = await response.bytes();
+		await fs.writeFile(filePath, bytes);
+		return filePath;
+	}
 };
 __decorate([ThrowIfClosed], Nil.prototype, "authorize", null);
 __decorate([ThrowIfClosed], Nil.prototype, "getClientVersion", null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsukilabs/nil-ffi",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "FFI bindings for Call of Nil",
   "type": "module",
   "packageManager": "pnpm@11.18.0",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@tb-dev/utils": "^8.1.1",
-    "@tsukilabs/nil-bindings": "^0.7.4",
+    "@tsukilabs/nil-bindings": "^0.7.5",
     "es-toolkit": "^1.50.0"
   },
   "files": ["dist"],