add promise api

Author: xxoo

index.d.ts

@@ -0,0 +1,32 @@
+'use strict';
+if (process.platform === 'win32') {
+	const fswin = require(`./${process.arch}/fswin.node`),
+		promisify = (fn, maxArgs, cbPos) => (...args) => new Promise((resolve, reject) => {
+			args.splice(maxArgs);
+			if (cbPos > args.length) {
+				args.push(...Array(cbPos - args.length), resolve);
+			} else {
+				args.splice(cbPos, 0, resolve);
+			}
+			fn(...args) || reject(Error('UNABLE_TO_QUEUE_JOB'));
+		});
+	fswin.convertPathAsync = promisify(fswin.convertPath, 2, 1);
+	fswin.ejectDriveAsync = promisify(fswin.ejectDrive, 2, 2);
+	fswin.findAsync = promisify(fswin.find, 1, 1);
+	fswin.getAttributesAsync = promisify(fswin.getAttributes, 1, 1);
+	fswin.getDeviceCapabilitiesAsync = promisify(fswin.getDeviceCapabilities, 1, 1);
+	fswin.getDriveDeviceAsync = promisify(fswin.getDriveDevice, 1, 1);
+	fswin.getLogicalDriveListAsync = promisify(fswin.getLogicalDriveList, 0, 0);
+	fswin.getStoragePropertiesAsync = promisify(fswin.getStorageProperties, 2, 2);
+	fswin.getVolumeInformationAsync = promisify(fswin.getVolumeInformation, 1, 1);
+	fswin.getVolumeSpaceAsync = promisify(fswin.getVolumeSpace, 1, 1);
+	fswin.setAttributesAsync = promisify(fswin.setAttributes, 2, 2);
+	fswin.setVolumeLabelAsync = promisify(fswin.setVolumeLabel, 2, 2);
+	fswin.ntfs.getCompressedSizeAsync = promisify(fswin.ntfs.getCompressedSize, 1, 1);
+	fswin.ntfs.setCompressionAsync = promisify(fswin.ntfs.setCompression, 3, 1);
+	fswin.ntfs.setShortNameAsync = promisify(fswin.ntfs.setShortName, 2, 2);
+	fswin.ntfs.setSparseAsync = promisify(fswin.ntfs.setSparse, 2, 1);
+	module.exports = fswin;
+} else {
+	module.exports = null;
+}

index.js

@@ -1,6 +1,6 @@
 {
 	"name": "fswin",
-	"version": "3.24.829",
+	"version": "3.25.1108",
 	"description": "nodejs fs extensions for windows",
 	"main": "index.js",
 	"types": "index.d.ts",

package.json

@@ -124,7 +124,7 @@ class convertPath {
 		napi_value cb, self, argv;
 		napi_get_reference_value(env, d->cb, &cb);
 		napi_get_reference_value(env, d->self, &self);
-		if (status == napi_ok && d->result) {
+		if (d->result) {
 			napi_create_string_utf16(env, (char16_t*)d->result, wcslen(d->result), &argv);
 			delete[]d->result;
 		} else {

src/convertPath.h

@@ -11,7 +11,8 @@ class ejectDrive {
 				wchar_t* devid = getDriveDevice::getDevInstIdByDevInst(DevInst);
 				if (devid) {
 					if (method == 1) {
-						DWORD cap = getDeviceCapabilities::func(devid);
+						DWORD cap;
+						getDeviceCapabilities::func(devid, &cap);
 						if (cap & CM_DEVCAP_SURPRISEREMOVALOK) {
 							if (cap & CM_DEVCAP_DOCKDEVICE) {
 								ensurePrivilege("SeLoadDriverPrivilege");

src/ejectDrive.h

@@ -54,7 +54,7 @@ class find {
 		return result;
 	}
 	static DWORD funcWithCallback(const wchar_t* path, const findResultCall callback, void* data) {//data could be anything that will directly pass to the callback
-		WIN32_FIND_DATAW info;
+		WIN32_FIND_DATAW info{};
 		CHAR bak;
 		if (RtlSetThreadPlaceholderCompatibilityMode) {
 			bak = RtlSetThreadPlaceholderCompatibilityMode(2);
@@ -502,7 +502,7 @@ class find {
 		}
 		if (finish) {
 			if (finish > 1) {
-				napi_value argv[2];
+				napi_value argv[2]{};
 				napi_create_string_latin1(env, "FAILED", NAPI_AUTO_LENGTH, &argv[0]);
 				napi_create_int64(env, (int64_t)d->count, &argv[1]);
 				napi_call_function(env, self, cb, 2, (napi_value*)&argv, NULL);

src/find.h

@@ -19,7 +19,7 @@
 
 NAPI_MODULE_INIT() {
 	napi_value o;
-	napi_create_string_latin1(env, "3.24.829", NAPI_AUTO_LENGTH, &o);
+	napi_create_string_latin1(env, "3.25.1108", NAPI_AUTO_LENGTH, &o);
 	napi_set_named_property(env, exports, "version", o);
 	napi_set_named_property(env, exports, "dirWatcher", dirWatcher::init(env));
 	napi_set_named_property(env, exports, "splitPath", splitPath::init(env));

src/fsWin.cpp

@@ -14,7 +14,8 @@ class getAttributes {
 		napi_ref self;
 		napi_ref cb;
 		wchar_t* path;
-		BY_HANDLE_FILE_INFORMATION* result;
+		BY_HANDLE_FILE_INFORMATION result;
+		bool success;
 	};
 	static napi_value sync(napi_env env, napi_callback_info info) {
 		napi_value result;
@@ -168,16 +169,12 @@ class getAttributes {
 	}
 	static void execute(napi_env env, void* data) {
 		cbdata* d = (cbdata*)data;
-		d->result = new BY_HANDLE_FILE_INFORMATION;
 		CHAR bak;
 		if (RtlSetThreadPlaceholderCompatibilityMode) {
 			bak = RtlSetThreadPlaceholderCompatibilityMode(2);
 		}
 		HANDLE h = CreateFileW(d->path, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, NULL);
-		if (!GetFileInformationByHandle(h, d->result)) {
-			delete d->result;
-			d->result = NULL;
-		}
+		d->success = GetFileInformationByHandle(h, &d->result);
 		if (h != INVALID_HANDLE_VALUE) {
 			CloseHandle(h);
 		}
@@ -191,9 +188,8 @@ class getAttributes {
 		napi_value cb, self, argv;
 		napi_get_reference_value(env, d->cb, &cb);
 		napi_get_reference_value(env, d->self, &self);
-		if (status == napi_ok && d->result) {
-			argv = convert(env, d->result);
-			delete d->result;
+		if (d->success) {
+			argv = convert(env, &d->result);
 		} else {
 			napi_get_null(env, &argv);
 		}

src/getAttributes.h

@@ -3,13 +3,12 @@
 
 class getCompressedSize {
 public:
-	static ULONGLONG func(const wchar_t* path) {
-		ULARGE_INTEGER u;
-		u.LowPart = GetCompressedFileSizeW(path, &u.HighPart);
-		if (u.LowPart == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) {
-			u.QuadPart = 0;
+	static bool func(const wchar_t* path, ULARGE_INTEGER* u) {
+		u->LowPart = GetCompressedFileSizeW(path, &u->HighPart);
+		if (u->LowPart == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) {
+			return false;
 		}
-		return u.QuadPart;
+		return true;
 	}
 	static napi_value init(napi_env env, bool isSync = false) {
 		napi_value f;
@@ -22,7 +21,8 @@ class getCompressedSize {
 		napi_ref self;
 		napi_ref cb;
 		wchar_t* path;
-		ULONGLONG result;
+		ULARGE_INTEGER result;
+		bool success;
 	};
 	static napi_value sync(napi_env env, napi_callback_info info) {
 		napi_value result;
@@ -44,7 +44,12 @@ class getCompressedSize {
 				str_len += 1;
 				wchar_t* str = new wchar_t[str_len];
 				napi_get_value_string_utf16(env, tmp, (char16_t*)str, str_len, NULL);
-				napi_create_int64(env, func(str), &result);
+				ULARGE_INTEGER u;
+				if (func(str, &u)) {
+					napi_create_int64(env, u.QuadPart, &result);
+				} else {
+					napi_get_null(env, &result);
+				}
 				delete[]str;
 			}
 		}
@@ -96,16 +101,16 @@ class getCompressedSize {
 	}
 	static void execute(napi_env env, void* data) {
 		cbdata* d = (cbdata*)data;
-		d->result = func(d->path);
-		delete[]d->path;
+		d->success = func(d->path, &d->result);
 	}
 	static void complete(napi_env env, napi_status status, void* data) {
 		cbdata* d = (cbdata*)data;
+		delete[]d->path;
 		napi_value cb, self, argv;
 		napi_get_reference_value(env, d->cb, &cb);
 		napi_get_reference_value(env, d->self, &self);
-		if (status == napi_ok) {
-			napi_create_int64(env, d->result, &argv);
+		if (d->success) {
+			napi_create_int64(env, d->result.QuadPart, &argv);
 		} else {
 			napi_get_null(env, &argv);
 		}

src/getCompressedSize.h

@@ -3,16 +3,18 @@
 
 class getDeviceCapabilities {
 public:
-	static DWORD func(wchar_t* devid) {
+	static bool func(wchar_t* devid, DWORD* cap) {
 		HDEVINFO hDevInfo = SetupDiGetClassDevsW(NULL, devid, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE | DIGCF_ALLCLASSES);
-		DWORD cap = 0;
-		SP_DEVINFO_DATA spdd;
-		spdd.cbSize = sizeof(SP_DEVINFO_DATA);
-		if (SetupDiEnumDeviceInfo(hDevInfo, 0, &spdd)) {
-			SetupDiGetDeviceRegistryPropertyA(hDevInfo, &spdd, SPDRP_CAPABILITIES, NULL, (BYTE*)&cap, sizeof(DWORD), NULL);
+		if (hDevInfo != INVALID_HANDLE_VALUE) {
+			SP_DEVINFO_DATA spdd{};
+			spdd.cbSize = sizeof(SP_DEVINFO_DATA);
+			if (SetupDiEnumDeviceInfo(hDevInfo, 0, &spdd)) {
+				SetupDiGetDeviceRegistryPropertyA(hDevInfo, &spdd, SPDRP_CAPABILITIES, NULL, (BYTE*)cap, sizeof(DWORD), NULL);
+			}
+			SetupDiDestroyDeviceInfoList(hDevInfo);
+			return true;
 		}
-		SetupDiDestroyDeviceInfoList(hDevInfo);
-		return cap;
+		return false;
 	}
 	static napi_value init(napi_env env, bool isSync = false) {
 		napi_value f;
@@ -26,6 +28,7 @@ class getDeviceCapabilities {
 		napi_ref cb;
 		wchar_t* DevInstId;
 		DWORD result;
+		bool success;
 	};
 	static napi_value convert(napi_env env, DWORD data) {
 		napi_value tmp, result;
@@ -72,7 +75,12 @@ class getDeviceCapabilities {
 				str_len += 1;
 				wchar_t* DevInstId = new wchar_t[str_len];
 				napi_get_value_string_utf16(env, tmp, (char16_t*)DevInstId, str_len, NULL);
-				result = convert(env, func(DevInstId));
+				DWORD cap = 0;
+				if (func(DevInstId, &cap)) {
+					result = convert(env, cap);
+				} else {
+					napi_get_null(env, &result);
+				}
 			}
 		}
 		return result;
@@ -123,18 +131,23 @@ class getDeviceCapabilities {
 	}
 	static void execute(napi_env env, void* data) {
 		cbdata* d = (cbdata*)data;
-		d->result = func(d->DevInstId);
+		d->success = func(d->DevInstId, &d->result);
 	}
 	static void complete(napi_env env, napi_status status, void* data) {
 		cbdata* d = (cbdata*)data;
-		napi_value cb, self, argv = convert(env, d->result);
+		delete[]d->DevInstId;
+		napi_value cb, self, argv;
+		if (d->success) {
+			argv = convert(env, d->result);
+		} else {
+			napi_get_null(env, &argv);
+		}
 		napi_get_reference_value(env, d->cb, &cb);
 		napi_get_reference_value(env, d->self, &self);
 		napi_call_function(env, self, cb, 1, &argv, NULL);
 		napi_delete_reference(env, d->cb);
 		napi_delete_reference(env, d->self);
 		napi_delete_async_work(env, d->work);
-		delete[]d->DevInstId;
 		delete d;
 	}
 };