MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

1. Added addition native JS helpers

Browse Source 
2. Updated metadata
This commit is contained in:
Bryan Roe
2020-05-22 14:08:58 -07:00
parent a7b30fb729
commit 3c6d23faa2
4 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
microscript/ILibDuktape_Helpers.h
View File

@@ -96,6 +96,8 @@ char *Duktape_Duplicate_GetStringEx(duk_context *ctx, duk_idx_t i, duk_size_t *l
#define duk_array_shift(ctx, i) duk_dup(ctx, i);duk_get_prop_string(ctx, -1, "shift");duk_swap_top(ctx, -2);duk_call_method(ctx, 0);
#define duk_array_pop(ctx, i) duk_dup(ctx, i);duk_get_prop_string(ctx, -1, "pop");duk_swap_top(ctx, -2);duk_call_method(ctx, 0);
#define duk_array_push(ctx, i) duk_dup(ctx, i);duk_get_prop_string(ctx, -1, "push");duk_swap_top(ctx, -2);duk_dup(ctx,-3);duk_pcall_method(ctx, 1);duk_pop_2(ctx);
#define duk_array_join(ctx, i, str) duk_dup(ctx, i);duk_get_prop_string(ctx, -1, "join");duk_swap_top(ctx, -2);duk_push_string(ctx, str);duk_pcall_method(ctx, 1);
int Duktape_GetBooleanProperty(duk_context *ctx, duk_idx_t i, char *propertyName, int defaultValue);
struct sockaddr_in6* Duktape_IPAddress4_FromString(char* address, unsigned short port);

2
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

34
microscript/ILibDuktape_fs.c
View File

@@ -65,6 +65,7 @@ limitations under the License.
#define FS_PIPEMANAGER_PTR "\xFF_FSWatcher_PipeMgrPtr"
#define FS_NOTIFY_DISPATCH_PTR "\xFF_FSWatcher_NotifyDispatchPtr"
#define FS_CHAIN_PTR "\xFF_FSWatcher_ChainPtr"
#define FS_WATCH_PATH "\xFF_FSWatcher_Path"
#if defined(_POSIX) && !defined(__APPLE__)
typedef struct ILibDuktape_fs_linuxWatcher
@@ -72,6 +73,7 @@ typedef struct ILibDuktape_fs_linuxWatcher
ILibChain_Link chainLink;
ILibHashtable watchTable;
int fd;
void *ctx;
}ILibDuktape_fs_linuxWatcher;
#endif
@@ -1056,7 +1058,35 @@ duk_ret_t ILibDuktape_fs_watcher_finalizer(duk_context *ctx)
return 0;
}
void ILibDuktape_fs_notifyDispatcher_QueryEx(ILibHashtable sender, void *Key1, char* Key2, int Key2Len, void *Data, void *user)
{
ILibDuktape_fs_watcherData *data = (ILibDuktape_fs_watcherData*)Data;
int fd = (int)(uintptr_t)Key1;
duk_push_heapptr(data->ctx, user); // [array]
duk_push_heapptr(data->ctx, data->object); // [array][watcher]
duk_get_prop_string(data->ctx, -1, FS_WATCH_PATH); // [array][watcher][path]
duk_remove(data->ctx, -2); // [array][path]
duk_array_push(data->ctx, -2); // [array];
duk_pop(data->ctx); // ...
}
#if defined(_POSIX) && !defined(__APPLE__) && !defined(_FREEBSD)
char* ILibDuktape_fs_notifyDispatcher_Query(void* chain, void *object, int fd, size_t *dataLen)
{
ILibDuktape_fs_linuxWatcher *data = (ILibDuktape_fs_linuxWatcher*)object;
if (data->fd != fd) { return(((ILibChain_Link*)object)->MetaData); }
int top = duk_get_top(data->ctx);
duk_push_array(data->ctx); // [array]
ILibHashtable_Enumerate(data->watchTable, ILibDuktape_fs_notifyDispatcher_QueryEx, duk_get_heapptr(data->ctx, -1));
duk_array_join(data->ctx, -1, ", "); // [array][str]
duk_size_t tmpLen;
char *tmp = (char*)duk_get_lstring(data->ctx, -1, &tmpLen);
char *tmp2 = ILibMemory_AllocateTemp(chain, tmpLen + 12);
*dataLen = sprintf_s(tmp2, tmpLen + 12, "fs.watch(%s)", tmp);
duk_set_top(data->ctx, top);
return tmp2;
}
void ILibDuktape_fs_notifyDispatcher_PreSelect(void* object, fd_set *readset, fd_set *writeset, fd_set *errorset, int* blocktime)
{
ILibDuktape_fs_linuxWatcher *data = (ILibDuktape_fs_linuxWatcher*)object;
@@ -1323,8 +1353,10 @@ duk_ret_t ILibDuktape_fs_watch(duk_context *ctx)
notifyDispatcher->chainLink.PreSelectHandler = ILibDuktape_fs_notifyDispatcher_PreSelect;
notifyDispatcher->chainLink.PostSelectHandler = ILibDuktape_fs_notifyDispatcher_PostSelect;
notifyDispatcher->chainLink.DestroyHandler = ILibDuktape_fs_notifyDispatcher_Destroy;
notifyDispatcher->chainLink.QueryHandler = ILibDuktape_fs_notifyDispatcher_Query;
notifyDispatcher->watchTable = ILibHashtable_Create();
notifyDispatcher->fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
notifyDispatcher->ctx = ctx;
ILibAddToChain(chain, notifyDispatcher);
duk_push_pointer(ctx, notifyDispatcher); // [fs][ptr]
duk_put_prop_string(ctx, -2, FS_NOTIFY_DISPATCH_PTR); // [fs]
@@ -1365,7 +1397,7 @@ duk_ret_t ILibDuktape_fs_watch(duk_context *ctx)
data = (ILibDuktape_fs_watcherData*)Duktape_PushBuffer(ctx, sizeof(ILibDuktape_fs_watcherData));
duk_put_prop_string(ctx, -2, FS_WATCHER_DATA_PTR); // [FSWatcher]
duk_push_this(ctx); duk_put_prop_string(ctx, -2, FS_WATCHER_2_FS);
duk_dup(ctx, 0); duk_put_prop_string(ctx, -2, FS_WATCH_PATH);
data->emitter = ILibDuktape_EventEmitter_Create(ctx);
data->ctx = ctx;
data->object = duk_get_heapptr(ctx, -1);

2
modules/linux-dbus.js
View File

@@ -29,6 +29,8 @@ function dbus(address, uid, env)
.createEvent('signal');
Object.defineProperty(this, "uid", { value: uid });
this._child = require('child_process').execFile("/bin/sh", ["sh"], options);
this._child.descriptorMetadata = 'linux-dbus {uid: ' + uid + ', address: ' + address + '}';
if (uid != null)
{
this._child.stdin.write('dbus-monitor --session "type=\'signal\', interface=\'' + address + '\'" | ( while read X; do echo "$X"; done )\n');