MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-15 07:43:50 +00:00
Code Issues Releases Wiki Activity

Updated file access, so the db can be queried while an agent is still active

Browse Source
This commit is contained in:
Bryan Roe
2019-02-25 21:43:48 -08:00
parent 683852f70a
commit 382ea03135
4 changed files with 77 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
microscript/ILibDuktape_SimpleDataStore.c
View File

@@ -193,6 +193,8 @@ duk_ret_t ILibDuktape_SimpleDataStore_Create(duk_context *ctx)
{ {
ILibSimpleDataStore dataStore; ILibSimpleDataStore dataStore;
char *filePath; char *filePath;
int nargs = duk_get_top(ctx);
int rdonly = (nargs > 1 && duk_is_object(ctx, 1)) ? Duktape_GetIntPropertyValue(ctx, 1, "readOnly", 0) : 0;
duk_push_this(ctx); // [DataStore] duk_push_this(ctx); // [DataStore]
duk_push_object(ctx); // [DataStore][RetVal] duk_push_object(ctx); // [DataStore][RetVal]
@@ -216,7 +218,7 @@ duk_ret_t ILibDuktape_SimpleDataStore_Create(duk_context *ctx)
else else
{ {
filePath = (char*)duk_require_string(ctx, 0); filePath = (char*)duk_require_string(ctx, 0);
dataStore = ILibSimpleDataStore_Create(filePath); dataStore = ILibSimpleDataStore_CreateEx2(filePath, 0, rdonly);
duk_pop_2(ctx); // [DataStore][RetVal] duk_pop_2(ctx); // [DataStore][RetVal]
ILibDuktape_CreateFinalizer(ctx, ILibDuktape_SimpleDataStore_Finalizer); ILibDuktape_CreateFinalizer(ctx, ILibDuktape_SimpleDataStore_Finalizer);
} }
@@ -224,11 +226,14 @@ duk_ret_t ILibDuktape_SimpleDataStore_Create(duk_context *ctx)
duk_push_pointer(ctx, dataStore); // [DataStore][RetVal][ds] duk_push_pointer(ctx, dataStore); // [DataStore][RetVal][ds]
duk_put_prop_string(ctx, -2, ILibDuktape_DataStore_PTR);// [DataStore][RetVal] duk_put_prop_string(ctx, -2, ILibDuktape_DataStore_PTR);// [DataStore][RetVal]
ILibDuktape_CreateInstanceMethod(ctx, "Delete", ILibDuktape_SimpleDataStore_Delete, 1); if (rdonly == 0)
ILibDuktape_CreateInstanceMethod(ctx, "Put", ILibDuktape_SimpleDataStore_Put, 2); {
ILibDuktape_CreateInstanceMethod(ctx, "Delete", ILibDuktape_SimpleDataStore_Delete, 1);
ILibDuktape_CreateInstanceMethod(ctx, "Put", ILibDuktape_SimpleDataStore_Put, 2);
ILibDuktape_CreateInstanceMethod(ctx, "Compact", ILibDuktape_SimpleDataStore_Compact, 0);
}
ILibDuktape_CreateInstanceMethod(ctx, "Get", ILibDuktape_SimpleDataStore_Get, DUK_VARARGS); ILibDuktape_CreateInstanceMethod(ctx, "Get", ILibDuktape_SimpleDataStore_Get, DUK_VARARGS);
ILibDuktape_CreateInstanceMethod(ctx, "GetBuffer", ILibDuktape_SimpleDataStore_GetRaw, DUK_VARARGS); ILibDuktape_CreateInstanceMethod(ctx, "GetBuffer", ILibDuktape_SimpleDataStore_GetRaw, DUK_VARARGS);
ILibDuktape_CreateInstanceMethod(ctx, "Compact", ILibDuktape_SimpleDataStore_Compact, 0);
ILibDuktape_CreateEventWithGetter(ctx, "Keys", ILibDuktape_SimpleDataStore_Keys); ILibDuktape_CreateEventWithGetter(ctx, "Keys", ILibDuktape_SimpleDataStore_Keys);
return 1; return 1;
@@ -237,7 +242,7 @@ duk_ret_t ILibDuktape_SimpleDataStore_Create(duk_context *ctx)
void ILibDuktape_SimpleDataStore_PUSH(duk_context *ctx, void *chain) void ILibDuktape_SimpleDataStore_PUSH(duk_context *ctx, void *chain)
{ {
duk_push_object(ctx); // [DataStore] duk_push_object(ctx); // [DataStore]
ILibDuktape_CreateInstanceMethodWithIntProperty(ctx, "_shared", 0, "Create", ILibDuktape_SimpleDataStore_Create, 1); ILibDuktape_CreateInstanceMethodWithIntProperty(ctx, "_shared", 0, "Create", ILibDuktape_SimpleDataStore_Create, DUK_VARARGS);
ILibDuktape_CreateInstanceMethodWithIntProperty(ctx, "_shared", 1, "Shared", ILibDuktape_SimpleDataStore_Create, 0); ILibDuktape_CreateInstanceMethodWithIntProperty(ctx, "_shared", 1, "Shared", ILibDuktape_SimpleDataStore_Create, 0);
} }

54
microstack/ILibSimpleDataStore.c
View File

@@ -21,6 +21,7 @@ limitations under the License.
#include <unistd.h> #include <unistd.h>
#else #else
#include <io.h> #include <io.h>
#include <fcntl.h>
#endif #endif
#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(_MINCORE) #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(_MINCORE)
@@ -321,28 +322,63 @@ void ILibSimpleDataStore_RebuildKeyTable(ILibSimpleDataStore_Root *root)
} }
// Open the data store file // Open the data store file
FILE* ILibSimpleDataStore_OpenFileEx(char* filePath, int forceTruncateIfNonZero) FILE* ILibSimpleDataStore_OpenFileEx2(char* filePath, int forceTruncateIfNonZero, int readonly)
{ {
FILE* f = NULL; FILE* f = NULL;
#ifdef WIN32 #ifdef WIN32
if (forceTruncateIfNonZero !=0 || fopen_s(&f, filePath, "rb+N") != 0) if (readonly == 0)
{ {
fopen_s(&f, filePath, "wb+N"); HANDLE h = NULL;
if (forceTruncateIfNonZero != 0)
{
h = CreateFile(filePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, TRUNCATE_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (h == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND)
{
h = CreateFile(filePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
}
}
else
{
h = CreateFile(filePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (h == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND)
{
h = CreateFile(filePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
}
}
int fd = _open_osfhandle((intptr_t)h, _O_RDWR);
if (fd == -1) { CloseHandle(h); return(NULL); }
f = _fdopen(fd, "wb+N");
if (f == NULL) { CloseHandle(h); return(NULL); }
}
else
{
HANDLE h = CreateFile(filePath, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (h == INVALID_HANDLE_VALUE)
{
int err = GetLastError();
return(NULL);
}
int fd = _open_osfhandle((intptr_t)h, _O_RDONLY);
if (fd == -1) { CloseHandle(h); return(NULL); }
f = _fdopen(fd, "rb");
if (f == NULL) { CloseHandle(h); return(NULL); }
} }
#else #else
if (forceTruncateIfNonZero != 0 || (f = fopen(filePath, "rb+")) == NULL) char *flag = readonly == 0 ? "rb+": "rb";
if (forceTruncateIfNonZero != 0 || (f = fopen(filePath, flag)) == NULL)
{ {
f = fopen(filePath, "wb+"); f = fopen(filePath, "wb+");
} }
if (f == NULL) { return NULL; } // If we failed to open the file, stop now. if (f == NULL) { return NULL; } // If we failed to open the file, stop now.
if (flock(fileno(f), LOCK_EX | LOCK_NB) != 0) { fclose(f); return NULL; } // Request exclusive lock on this file, no blocking. if (readonly == 0 && flock(fileno(f), LOCK_EX | LOCK_NB) != 0) { fclose(f); return NULL; } // Request exclusive lock on this file, no blocking.
#endif #endif
return f; return f;
} }
#define ILibSimpleDataStore_OpenFile(filePath) ILibSimpleDataStore_OpenFileEx(filePath, 0) #define ILibSimpleDataStore_OpenFile(filePath) ILibSimpleDataStore_OpenFileEx2(filePath, 0, 0)
#define ILibSimpleDataStore_OpenFileEx(filePath, forceTruncate) ILibSimpleDataStore_OpenFileEx2(filePath, forceTruncate, 0)
int ILibSimpleDataStore_Exists(char *filePath) int ILibSimpleDataStore_Exists(char *filePath)
{ {
#ifdef WIN32 #ifdef WIN32
@@ -352,12 +388,12 @@ int ILibSimpleDataStore_Exists(char *filePath)
#endif #endif
} }
// Open the data store file. Optionally allocate spare user memory // Open the data store file. Optionally allocate spare user memory
__EXPORT_TYPE ILibSimpleDataStore ILibSimpleDataStore_CreateEx(char* filePath, int userExtraMemorySize) __EXPORT_TYPE ILibSimpleDataStore ILibSimpleDataStore_CreateEx2(char* filePath, int userExtraMemorySize, int readonly)
{ {
ILibSimpleDataStore_Root* retVal = (ILibSimpleDataStore_Root*)ILibMemory_Allocate(ILibMemory_SimpleDataStore_CONTAINERSIZE, userExtraMemorySize, NULL, NULL); ILibSimpleDataStore_Root* retVal = (ILibSimpleDataStore_Root*)ILibMemory_Allocate(ILibMemory_SimpleDataStore_CONTAINERSIZE, userExtraMemorySize, NULL, NULL);
retVal->filePath = ILibString_Copy(filePath, (int)strnlen_s(filePath, ILibSimpleDataStore_MaxFilePath)); retVal->filePath = ILibString_Copy(filePath, (int)strnlen_s(filePath, ILibSimpleDataStore_MaxFilePath));
retVal->dataFile = ILibSimpleDataStore_OpenFile(retVal->filePath); retVal->dataFile = ILibSimpleDataStore_OpenFileEx2(retVal->filePath, 0, readonly);
if (retVal->dataFile == NULL) if (retVal->dataFile == NULL)
{ {

6
microstack/ILibSimpleDataStore.h
View File

@@ -41,8 +41,10 @@ const extern int ILibMemory_SimpleDataStore_CONTAINERSIZE;
typedef void(*ILibSimpleDataStore_KeyEnumerationHandler)(ILibSimpleDataStore sender, char* Key, int KeyLen, void *user); typedef void(*ILibSimpleDataStore_KeyEnumerationHandler)(ILibSimpleDataStore sender, char* Key, int KeyLen, void *user);
// Create the data store. // Create the data store.
__EXPORT_TYPE ILibSimpleDataStore ILibSimpleDataStore_CreateEx(char* filePath, int userExtraMemorySize); __EXPORT_TYPE ILibSimpleDataStore ILibSimpleDataStore_CreateEx2(char* filePath, int userExtraMemorySize, int readonly);
#define ILibSimpleDataStore_Create(filePath) ILibSimpleDataStore_CreateEx(filePath, 0) #define ILibSimpleDataStore_Create(filePath) ILibSimpleDataStore_CreateEx2(filePath, 0, 0)
#define ILibSimpleDataStore_CreateEx(filePath, userExtraMemorySize) ILibSimpleDataStore_CreateEx2(filePath, userExtraMemorySize, 0)
// Check if the data store exists // Check if the data store exists
int ILibSimpleDataStore_Exists(char *filePath); int ILibSimpleDataStore_Exists(char *filePath);

20
modules/dbTool.js
View File

@@ -16,13 +16,29 @@ limitations under the License.
var db; var db;
var readonlyDb = true;
if (process.argv.length > 1)
{
switch (process.argv[1])
{
case 'compact':
case 'put':
case 'putx':
case 'delete':
case 'import':
readonlyDb = false;
break;
}
}
if (process.platform == 'win32') if (process.platform == 'win32')
{ {
db = require('SimpleDataStore').Create(process.execPath.replace('.exe', '.db')); db = require('SimpleDataStore').Create(process.execPath.replace('.exe', '.db'), { readOnly: readonlyDb });
} }
else else
{ {
db = require('SimpleDataStore').Create(process.execPath + '.db'); db = require('SimpleDataStore').Create(process.execPath + '.db', { readOnly: readonlyDb });
} }