aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOmar Rizwan <omar.rizwan@gmail.com>2020-12-01 21:46:21 -0800
committerOmar Rizwan <omar.rizwan@gmail.com>2020-12-01 21:47:05 -0800
commitadf4330f5437dcc655936120a3538967c781391e (patch)
tree99e43827d05c2efb85d532424467289057a21c6a
parent976c5ef20aba6be4591824b7ee5e4451b29d9ac6 (diff)
start refactor to use frozen instead of cJSON; I can list dirs, but can't read file yet
also (... at the same time ...) more work on refactoring background.js to eliminate middle layer, I guess
-rw-r--r--.gitmodules5
-rw-r--r--extension/background.js16
m---------fs/frozen0
-rw-r--r--fs/tabfs.c304
4 files changed, 213 insertions, 112 deletions
diff --git a/.gitmodules b/.gitmodules
index 3308a11..83e5456 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,7 @@
url = https://github.com/DaveGamble/cJSON.git
[submodule "fs/base64"]
path = fs/base64
- url = https://github.com/zhicheng/base64.git \ No newline at end of file
+ url = https://github.com/zhicheng/base64.git
+[submodule "fs/frozen"]
+ path = fs/frozen
+ url = https://github.com/cesanta/frozen.git
diff --git a/extension/background.js b/extension/background.js
index 3fe2341..643b43b 100644
--- a/extension/background.js
+++ b/extension/background.js
@@ -155,7 +155,7 @@ router["/tabs/by-id/*/resources"] = {
}
};
router["/tabs/by-id/*/resources/*"] = {
- async getattr(path) {
+ async getattr({path}) {
const tabId = parseInt(pathComponent(path, -3));
const suffix = pathComponent(path, -1);
@@ -182,10 +182,10 @@ router["/tabs/by-id/*/resources/*"] = {
}
}
},
- async open(path) {
-
+ async open({path}) {
+ // FIXME: cache the file
},
- async read(path, fh, size, offset) {
+ async read({path, fh, size, offset}) {
const tabId = parseInt(pathComponent(path, -3));
const suffix = pathComponent(path, -1);
@@ -210,7 +210,7 @@ router["/tabs/by-id/*/resources/*"] = {
}
throw new UnixError(unix.ENOENT);
},
- async release(path, fh) {
+ async release({path, fh}) {
return {};
}
};
@@ -412,12 +412,12 @@ function findRoute(path) {
let port;
async function onMessage(req) {
- /* console.log('req', req);*/
+ console.log('req', req);
let response = { op: req.op, error: unix.EIO };
/* console.time(req.op + ':' + req.path);*/
try {
- console.log(req.path, req.op, findRoute(req.path)[req.op]);
+ console.log(findRoute(req.path)[req.op]);
response = await findRoute(req.path)[req.op](req);
response.op = req.op;
@@ -430,7 +430,7 @@ async function onMessage(req) {
}
/* console.timeEnd(req.op + ':' + req.path);*/
- /* console.log('resp', response);*/
+ console.log('resp', response);
port.postMessage(response);
};
diff --git a/fs/frozen b/fs/frozen
new file mode 160000
+Subproject 365a7dddd0beba7dbef43dc405a6c5ffa5bddf0
diff --git a/fs/tabfs.c b/fs/tabfs.c
index 1342481..274656c 100644
--- a/fs/tabfs.c
+++ b/fs/tabfs.c
@@ -14,21 +14,32 @@
#include "cJSON/cJSON.h"
#include "cJSON/cJSON.c"
+#include "frozen/frozen.h"
+#include "frozen/frozen.c"
+
#include "base64/base64.h"
#include "base64/base64.c"
FILE* l;
-static cJSON *send_request_then_await_response(cJSON *req) {
- char *request_data = cJSON_Print(req);
- unsigned int request_len = strlen(request_data);
+static void send_request(const char *fmt, ...) {
+ va_list args; va_start(args, fmt);
+
+ char request_data[1024*1024]; // max size of native->Chrome message
+ struct json_out out = JSON_OUT_BUF(request_data, sizeof(request_data));
+ unsigned int request_len = json_vprintf(&out, fmt, args);
+
+ va_end(args);
+
write(1, (char *) &request_len, 4); // stdout
unsigned int bytes_written = 0;
while (bytes_written < request_len) {
bytes_written += write(1, request_data, request_len);
}
/* fprintf(l, "req[%s]\n", request_data); fflush(l); */
+}
+static int await_response(char **resp) {
unsigned int response_len;
read(0, (char *) &response_len, 4); // stdin
char *response_data = malloc(response_len);
@@ -39,14 +50,14 @@ static cJSON *send_request_then_await_response(cJSON *req) {
/* fprintf(l, "resp(%d; expected %d)[%s]\n", bytes_read, response_len, response_data); fflush(l); */
if (response_data == NULL) {
// Connection is dead.
- return cJSON_Parse("{ \"error\": 5 }");
+ *resp = "{ \"error\": 5 }";
+ return strlen(*resp);
}
- cJSON *resp = cJSON_Parse((const char *) response_data);
- free(response_data);
-
- return resp;
+ *resp = response_data;
+ return response_len;
}
+
// This helper macro is used to implement all the FUSE fs operations.
//
// It constructs a JSON object to represent the incoming request, then
@@ -95,138 +106,225 @@ static cJSON *send_request_then_await_response(cJSON *req) {
LVALUE = cJSON_GetObjectItemCaseSensitive(resp, KEY)->valueint; \
} while (0)
+#define receive_response(fmt, ...) \
+ do { \
+ char *resp; int resp_len; \
+ resp_len = await_response(&resp); \
+ if (!resp_len) return -EIO; \
+ \
+ int err; \
+ if (json_scanf(resp, resp_len, "{error: %d}", &err) && err) { \
+ free(resp); return -err; \
+ } \
+ \
+ json_scanf(resp, resp_len, fmt, __VA_ARGS__); \
+ free(resp); \
+ } while (0)
+
static int tabfs_getattr(const char *path, struct stat *stbuf) {
+ send_request("{op: %Q, path: %Q}", "getattr", path);
+
memset(stbuf, 0, sizeof(struct stat));
+ receive_response("{st_mode: %d, st_nlink: %d, st_size: %d}",
+ &stbuf->st_mode, &stbuf->st_nlink, &stbuf->st_size);
+ return 0;
+
+ /* MAKE_REQ("getattr", { */
+
- MAKE_REQ("getattr", {
- cJSON_AddStringToObject(req, "path", path);
- }, {
- JSON_GET_PROP_INT(stbuf->st_mode, "st_mode");
- JSON_GET_PROP_INT(stbuf->st_nlink, "st_nlink");
- JSON_GET_PROP_INT(stbuf->st_size, "st_size");
+ /* /\* cJSON_AddStringToObject(req, "path", path); *\/ */
- ret = 0;
- });
+ /* }, { */
+ /* JSON_GET_PROP_INT(stbuf->st_mode, "st_mode"); */
+ /* JSON_GET_PROP_INT(stbuf->st_nlink, "st_nlink"); */
+ /* JSON_GET_PROP_INT(stbuf->st_size, "st_size"); */
+
+ /* ret = 0; */
+ /* }); */
}
static int tabfs_readlink(const char *path, char *buf, size_t size) {
- MAKE_REQ("readlink", {
- cJSON_AddStringToObject(req, "path", path);
- }, {
- cJSON *resp_buf_item = cJSON_GetObjectItemCaseSensitive(resp, "buf");
- // FIXME: fix
- char *resp_buf = cJSON_GetStringValue(resp_buf_item);
- size_t resp_buf_size = strlen(resp_buf) + 1;
- size = resp_buf_size < size ? resp_buf_size : size;
-
- memcpy(buf, resp_buf, size);
-
- ret = 0;
- });
+ send_request("{op: %Q, path: %Q}", "readlink", path);
+
+ char *scan_buf; receive_response("{buf: %Q}", &scan_buf);
+ snprintf(buf, size, "%s", scan_buf); free(scan_buf);
+
+ return 0;
+
+ /* MAKE_REQ("readlink", { */
+ /* cJSON_AddStringToObject(req, "path", path); */
+ /* }, { */
+ /* cJSON *resp_buf_item = cJSON_GetObjectItemCaseSensitive(resp, "buf"); */
+ /* // FIXME: fix */
+ /* char *resp_buf = cJSON_GetStringValue(resp_buf_item); */
+ /* size_t resp_buf_size = strlen(resp_buf) + 1; */
+ /* size = resp_buf_size < size ? resp_buf_size : size; */
+
+ /* memcpy(buf, resp_buf, size); */
+
+ /* ret = 0; */
+ /* }); */
}
static int tabfs_open(const char *path, struct fuse_file_info *fi) {
- MAKE_REQ("open", {
- cJSON_AddStringToObject(req, "path", path);
- cJSON_AddNumberToObject(req, "flags", fi->flags);
- }, {
- cJSON *fh_item = cJSON_GetObjectItemCaseSensitive(resp, "fh");
- if (fh_item) fi->fh = fh_item->valueint;
-
- ret = 0;
- });
+ send_request("{op: %Q, path: %Q, flags: %d}", "open", path, fi->flags);
+
+ receive_response("{fh: %d}", &fi->fh);
+
+ return 0;
+
+ /* MAKE_REQ("open", { */
+ /* cJSON_AddStringToObject(req, "path", path); */
+ /* cJSON_AddNumberToObject(req, "flags", fi->flags); */
+ /* }, { */
+ /* cJSON *fh_item = cJSON_GetObjectItemCaseSensitive(resp, "fh"); */
+ /* if (!fh_item) return -EIO; */
+ /* fi->fh = fh_item->valueint; */
+
+ /* ret = 0; */
+ /* }); */
}
static int
tabfs_read(const char *path, char *buf, size_t size, off_t offset,
struct fuse_file_info *fi) {
- MAKE_REQ("read", {
- cJSON_AddStringToObject(req, "path", path);
- cJSON_AddNumberToObject(req, "size", size);
- cJSON_AddNumberToObject(req, "offset", offset);
-
- cJSON_AddNumberToObject(req, "fh", fi->fh);
- cJSON_AddNumberToObject(req, "flags", fi->flags);
- }, {
- cJSON *resp_buf_item = cJSON_GetObjectItemCaseSensitive(resp, "buf");
- if (!resp_buf_item) return -EIO;
-
- char *resp_buf = cJSON_GetStringValue(resp_buf_item);
- if (!resp_buf) return -EIO;
- size_t resp_buf_len = strlen(resp_buf);
-
- cJSON *base64_encoded_item = cJSON_GetObjectItemCaseSensitive(resp, "base64Encoded");
- if (base64_encoded_item && cJSON_IsTrue(base64_encoded_item)) {
- size = base64_decode(resp_buf, resp_buf_len, (unsigned char *) buf);
- } else {
- size = resp_buf_len < size ? resp_buf_len : size;
- memcpy(buf, resp_buf, size);
- }
- ret = size;
- });
+ send_request("{op: %Q, path: %Q, size: %d, offset: %d, fh: %d, flags: %d}",
+ "read", path, size, offset, fi->fh, fi->flags);
+
+ char *scan_buf; receive_response("{buf: %Q}", &scan_buf);
+ snprintf(buf, size, "%s", scan_buf); free(scan_buf);
+
+ return 0;
+
+ /* MAKE_REQ("read", { */
+ /* cJSON_AddStringToObject(req, "path", path); */
+ /* cJSON_AddNumberToObject(req, "size", size); */
+ /* cJSON_AddNumberToObject(req, "offset", offset); */
+
+ /* cJSON_AddNumberToObject(req, "fh", fi->fh); */
+ /* cJSON_AddNumberToObject(req, "flags", fi->flags); */
+ /* }, { */
+ /* cJSON *resp_buf_item = cJSON_GetObjectItemCaseSensitive(resp, "buf"); */
+ /* if (!resp_buf_item) return -EIO; */
+
+ /* char *resp_buf = cJSON_GetStringValue(resp_buf_item); */
+ /* if (!resp_buf) return -EIO; */
+ /* size_t resp_buf_len = strlen(resp_buf); */
+
+ /* cJSON *base64_encoded_item = cJSON_GetObjectItemCaseSensitive(resp, "base64Encoded"); */
+ /* if (base64_encoded_item && cJSON_IsTrue(base64_encoded_item)) { */
+ /* size = base64_decode(resp_buf, resp_buf_len, (unsigned char *) buf); */
+ /* } else { */
+ /* size = resp_buf_len < size ? resp_buf_len : size; */
+ /* memcpy(buf, resp_buf, size); */
+ /* } */
+ /* ret = size; */
+ /* }); */
}
static int
tabfs_write(const char *path, const char *buf, size_t size, off_t offset,
struct fuse_file_info *fi) {
- MAKE_REQ("write", {
- cJSON_AddStringToObject(req, "path", path);
+
+ send_request("{op: %Q, path: %Q, buf: %V, offset: %d, fh: %d, flags: %d}",
+ "write", path, size, buf, offset, fi->fh, fi->flags);
+
+ int ret; receive_response("{size: %d}", &ret); return ret;
- char base64_buf[size + 1]; // ughh.
- base64_encode((const unsigned char *) buf, size, base64_buf);
+ /* MAKE_REQ("write", { */
+ /* cJSON_AddStringToObject(req, "path", path); */
- cJSON_AddStringToObject(req, "buf", base64_buf);
- cJSON_AddNumberToObject(req, "offset", offset);
- }, {
- ret = size;
- });
+ /* char base64_buf[size + 1]; // ughh. */
+ /* base64_encode((const unsigned char *) buf, size, base64_buf); */
+
+ /* cJSON_AddStringToObject(req, "buf", base64_buf); */
+ /* cJSON_AddNumberToObject(req, "offset", offset); */
+ /* }, { */
+ /* ret = size; */
+ /* }); */
}
static int tabfs_release(const char *path, struct fuse_file_info *fi) {
- MAKE_REQ("release", {
- cJSON_AddStringToObject(req, "path", path);
- cJSON_AddNumberToObject(req, "fh", fi->fh);
- }, {
- ret = 0;
- });
+ send_request("{op: %Q, path: %Q, fh: %d}",
+ "release", path, fi->fh);
+
+ receive_response("{}", NULL);
+
+ return 0;
+
+ /* MAKE_REQ("release", { */
+ /* cJSON_AddStringToObject(req, "path", path); */
+ /* cJSON_AddNumberToObject(req, "fh", fi->fh); */
+ /* }, { */
+ /* ret = 0; */
+ /* }); */
}
static int tabfs_opendir(const char *path, struct fuse_file_info *fi) {
- MAKE_REQ("opendir", {
- cJSON_AddStringToObject(req, "path", path);
- cJSON_AddNumberToObject(req, "flags", fi->flags);
- }, {
- cJSON *fh_item = cJSON_GetObjectItemCaseSensitive(resp, "fh");
- if (fh_item) fi->fh = fh_item->valueint;
-
- ret = 0;
- });
+ send_request("{op: %Q, path: %Q, flags: %d}",
+ "opendir", path, fi->flags);
+
+ receive_response("{fh: %d}", &fi->fh);
+
+ return 0;
+
+ /* MAKE_REQ("opendir", { */
+ /* cJSON_AddStringToObject(req, "path", path); */
+ /* cJSON_AddNumberToObject(req, "flags", fi->flags); */
+ /* }, { */
+ /* cJSON *fh_item = cJSON_GetObjectItemCaseSensitive(resp, "fh"); */
+ /* if (fh_item) fi->fh = fh_item->valueint; */
+
+ /* ret = 0; */
+ /* }); */
}
static int
tabfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
off_t offset, struct fuse_file_info *fi) {
- MAKE_REQ("readdir", {
- cJSON_AddStringToObject(req, "path", path);
- }, {
- cJSON *entries = cJSON_GetObjectItemCaseSensitive(resp, "entries");
- cJSON *entry;
- cJSON_ArrayForEach(entry, entries) {
- filler(buf, cJSON_GetStringValue(entry), NULL, 0);
- }
-
- ret = 0;
- });
+ send_request("{op: %Q, path: %Q, offset: %d}",
+ "readdir", path, offset);
+
+ char *resp; int resp_len;
+ resp_len = await_response(&resp);
+ if (!resp_len) return -EIO;
+
+ struct json_token t;
+ for (int i = 0; json_scanf_array_elem(resp, resp_len, ".entries", i, &t) > 0; i++) {
+ char entry[t.len + 1]; snprintf(entry, t.len + 1, "%.*s", t.len, t.ptr);
+ filler(buf, entry, NULL, 0);
+ }
+
+ free(resp);
+ return 0;
+
+ /* MAKE_REQ("readdir", { */
+ /* cJSON_AddStringToObject(req, "path", path); */
+ /* }, { */
+ /* cJSON *entries = cJSON_GetObjectItemCaseSensitive(resp, "entries"); */
+ /* cJSON *entry; */
+ /* cJSON_ArrayForEach(entry, entries) { */
+ /* filler(buf, cJSON_GetStringValue(entry), NULL, 0); */
+ /* } */
+
+ /* ret = 0; */
+ /* }); */
}
static int
tabfs_releasedir(const char *path, struct fuse_file_info *fi) {
- MAKE_REQ("releasedir", {
- cJSON_AddStringToObject(req, "path", path);
- cJSON_AddNumberToObject(req, "fh", fi->fh);
- }, {
- ret = 0;
- });
+ send_request("{op: %Q, path: %Q, fh: %d}",
+ "release", path, fi->fh);
+
+ receive_response("{}", NULL);
+
+ return 0;
+ /* MAKE_REQ("releasedir", { */
+ /* cJSON_AddStringToObject(req, "path", path); */
+ /* cJSON_AddNumberToObject(req, "fh", fi->fh); */
+ /* }, { */
+ /* ret = 0; */
+ /* }); */
}
static struct fuse_operations tabfs_filesystem_operations = {