|
|
@@ -25,6 +25,7 @@
|
|
|
#include "img.h"
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
+#include <stdio.h>
|
|
|
#include <string.h>
|
|
|
|
|
|
#define DEFAULT_CFG_DATA "/data/CHAT.CFG"
|
|
|
@@ -52,6 +53,7 @@
|
|
|
#define CHAT_IMG_URL_MAX (UHTTP_HOST_MAX + UHTTP_PATH_MAX + 16)
|
|
|
#define CHAT_PIC_QUEUED 0
|
|
|
#define CHAT_PIC_READY 1
|
|
|
+#define CHAT_PIC_FETCHING 2
|
|
|
#define CHAT_PIC_FAILED (-1)
|
|
|
|
|
|
#define POLL_CONV_MS 2000
|
|
|
@@ -515,7 +517,8 @@ static struct chat_pic *chat_pic_slot(struct chat_pic *arr, int *count, int max,
|
|
|
(*count)++;
|
|
|
} else {
|
|
|
for (i = 0; i < *count; i++) {
|
|
|
- if (arr[i].state == CHAT_PIC_QUEUED)
|
|
|
+ if (arr[i].state == CHAT_PIC_QUEUED ||
|
|
|
+ arr[i].state == CHAT_PIC_FETCHING)
|
|
|
continue;
|
|
|
if (arr[i].last_used < best) {
|
|
|
best = arr[i].last_used;
|
|
|
@@ -618,7 +621,7 @@ static void chat_avatar_mask(unsigned char *alpha, unsigned int w,
|
|
|
static int chat_pic_store(struct chat_pic *p, unsigned int len, int avatar)
|
|
|
{
|
|
|
struct img_info info;
|
|
|
- struct img_options opt;
|
|
|
+ struct img_options opt = {0};
|
|
|
struct img_mem mem;
|
|
|
struct img_image decoded;
|
|
|
struct img_blit blit;
|
|
|
@@ -637,6 +640,8 @@ static int chat_pic_store(struct chat_pic *p, unsigned int len, int avatar)
|
|
|
return -1;
|
|
|
img_mem_init(&mem, arena, est);
|
|
|
opt.max_pixels = 4u * 1024u * 1024u;
|
|
|
+ opt.max_w = avatar ? CHAT_AVATAR : CHAT_IMG_W;
|
|
|
+ opt.max_h = avatar ? CHAT_AVATAR : CHAT_IMG_H;
|
|
|
r = img_decode(chat_fetch_buf, len, &opt, &mem, &decoded);
|
|
|
if (r != 0 || !decoded.w || !decoded.h)
|
|
|
return -1;
|
|
|
@@ -706,33 +711,325 @@ static int chat_pic_store(struct chat_pic *p, unsigned int len, int avatar)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static void chat_pic_load(struct chat_pic *p, int avatar)
|
|
|
+/* Install a message-image bitmap decoded by the fetch helper (the helper
|
|
|
+ * already applied the 480x320 bounds). Avatars are still decoded here at
|
|
|
+ * 32x32 so the circular mask sees the same square source as before. */
|
|
|
+static int chat_pic_store_px(struct chat_pic *p, unsigned char *buf,
|
|
|
+ unsigned int len, unsigned int dw,
|
|
|
+ unsigned int dh, int has_alpha)
|
|
|
{
|
|
|
- unsigned int len = 0;
|
|
|
- int st;
|
|
|
+ unsigned int npx = dw * dh, need;
|
|
|
+ unsigned short *px;
|
|
|
+ unsigned char *alpha = 0;
|
|
|
|
|
|
- if (!chat_fetch_buf)
|
|
|
- chat_fetch_buf = (unsigned char *)malloc(CHAT_IMG_FETCH_MAX);
|
|
|
- if (!chat_fetch_buf) {
|
|
|
- p->state = CHAT_PIC_FAILED;
|
|
|
+ if (!buf || !dw || !dh || len < npx * 2u)
|
|
|
+ return -1;
|
|
|
+ need = npx * 2u;
|
|
|
+ if (chat_image_room(need) != 0)
|
|
|
+ return -1;
|
|
|
+ px = (unsigned short *)malloc(need);
|
|
|
+ if (!px)
|
|
|
+ return -1;
|
|
|
+ memcpy(px, buf, need);
|
|
|
+ if (has_alpha && len >= need + npx) {
|
|
|
+ alpha = (unsigned char *)malloc(npx);
|
|
|
+ if (alpha)
|
|
|
+ memcpy(alpha, buf + need, npx);
|
|
|
+ }
|
|
|
+ p->img.format = 0;
|
|
|
+ p->img.w = dw;
|
|
|
+ p->img.h = dh;
|
|
|
+ p->img.px = px;
|
|
|
+ p->img.alpha = alpha;
|
|
|
+ p->img.flags = 0;
|
|
|
+ p->bytes = need;
|
|
|
+ chat_image_bytes += need;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+/* ---- asynchronous media fetch ----
|
|
|
+ *
|
|
|
+ * chat_http() blocks the UI for the whole body, so every image and avatar
|
|
|
+ * used to freeze the window for the download plus the decode. Media now
|
|
|
+ * goes through the same curl __serve helper as the browser: the chat loop
|
|
|
+ * submits a request file and polls a small done marker, while a private tty
|
|
|
+ * absorbs the helper's DNS/TLS log lines. Only the (short) decode runs on
|
|
|
+ * the chat thread. */
|
|
|
+static int chat_media_pid = -1;
|
|
|
+static int chat_media_tty = -1;
|
|
|
+static unsigned int chat_media_session;
|
|
|
+static unsigned int chat_media_seq;
|
|
|
+static unsigned int chat_media_deadline;
|
|
|
+static int chat_media_busy;
|
|
|
+static int chat_media_retried;
|
|
|
+static struct chat_pic *chat_media_pic;
|
|
|
+static int chat_media_avatar;
|
|
|
+static char chat_media_req[40], chat_media_body[40];
|
|
|
+static char chat_media_meta[40], chat_media_done[40];
|
|
|
+static char chat_media_px[40];
|
|
|
+
|
|
|
+static void chat_media_paths(void)
|
|
|
+{
|
|
|
+ if (chat_media_session)
|
|
|
+ return;
|
|
|
+ chat_media_session = ((unsigned int)u_getpid() << 16) ^
|
|
|
+ (u_ticks_ms() & 0xFFFFu);
|
|
|
+ if (!chat_media_session)
|
|
|
+ chat_media_session = 1;
|
|
|
+ snprintf(chat_media_req, sizeof(chat_media_req), "/share/bf%u_0req",
|
|
|
+ chat_media_session);
|
|
|
+ snprintf(chat_media_body, sizeof(chat_media_body), "/share/bf%u_0body",
|
|
|
+ chat_media_session);
|
|
|
+ snprintf(chat_media_meta, sizeof(chat_media_meta), "/share/bf%u_0meta",
|
|
|
+ chat_media_session);
|
|
|
+ snprintf(chat_media_done, sizeof(chat_media_done), "/share/bf%u_0done",
|
|
|
+ chat_media_session);
|
|
|
+ snprintf(chat_media_px, sizeof(chat_media_px), "/share/bf%u_0px",
|
|
|
+ chat_media_session);
|
|
|
+}
|
|
|
+
|
|
|
+static void chat_media_tty_drain(void)
|
|
|
+{
|
|
|
+ char sink[256];
|
|
|
+ int i;
|
|
|
+
|
|
|
+ if (chat_media_tty <= 0)
|
|
|
return;
|
|
|
+ for (i = 0; i < 8; i++)
|
|
|
+ if (u_tty_read(chat_media_tty, sink, sizeof(sink)) <= 0)
|
|
|
+ break;
|
|
|
+}
|
|
|
+
|
|
|
+static void chat_media_jar_sync(void)
|
|
|
+{
|
|
|
+ u_syscall3(SYS_WRITE_FILE, (int)"/share/bchat.jar", (int)&jar,
|
|
|
+ (int)sizeof(jar));
|
|
|
+}
|
|
|
+
|
|
|
+static int chat_media_start(void)
|
|
|
+{
|
|
|
+ char arg[64];
|
|
|
+ int t;
|
|
|
+
|
|
|
+ chat_media_paths();
|
|
|
+ if (chat_media_pid > 0 && u_alive((unsigned int)chat_media_pid))
|
|
|
+ return 0;
|
|
|
+ chat_media_pid = -1;
|
|
|
+ if (chat_media_tty == -1) {
|
|
|
+ t = u_tty_create();
|
|
|
+ chat_media_tty = t > 0 ? t : 0;
|
|
|
+ }
|
|
|
+ chat_media_jar_sync();
|
|
|
+ snprintf(arg, sizeof(arg), "__serve %u 0 /share/bchat.jar",
|
|
|
+ chat_media_session);
|
|
|
+ chat_media_pid = u_spawn("/ramfs/bin/curl", arg, chat_media_tty, "/");
|
|
|
+ if (chat_media_pid <= 0) {
|
|
|
+ chat_media_pid = -1;
|
|
|
+ return -1;
|
|
|
}
|
|
|
- http.jar = &jar;
|
|
|
- http.accept = "image/*,*/*";
|
|
|
- st = chat_http(&http, 0, p->url, 0, (char *)chat_fetch_buf,
|
|
|
- CHAT_IMG_FETCH_MAX, &len);
|
|
|
- if (st != 200 || len == 0 || chat_pic_store(p, len, avatar) != 0) {
|
|
|
- p->state = CHAT_PIC_FAILED;
|
|
|
- } else {
|
|
|
- p->state = CHAT_PIC_READY;
|
|
|
- p->last_used = ++chat_pic_clock;
|
|
|
- if (!avatar) {
|
|
|
- msgs_gen++;
|
|
|
- if (at_bottom)
|
|
|
- tl_scroll.offset = 1 << 28;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static void chat_media_stop(void)
|
|
|
+{
|
|
|
+ chat_media_tty_drain();
|
|
|
+ if (chat_media_pid > 0)
|
|
|
+ u_kill((unsigned int)chat_media_pid);
|
|
|
+ chat_media_pid = -1;
|
|
|
+}
|
|
|
+
|
|
|
+static void chat_media_fail(void)
|
|
|
+{
|
|
|
+ if (chat_media_pic)
|
|
|
+ chat_media_pic->state = CHAT_PIC_FAILED;
|
|
|
+ chat_media_pic = 0;
|
|
|
+ chat_media_busy = 0;
|
|
|
+ chat_media_retried = 0;
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_done);
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_meta);
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_body);
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_px);
|
|
|
+ ngui_invalidate(&ui);
|
|
|
+}
|
|
|
+
|
|
|
+static int chat_media_submit(struct chat_pic *p, int avatar)
|
|
|
+{
|
|
|
+ char req[512];
|
|
|
+ int n;
|
|
|
+
|
|
|
+ if (!chat_fetch_buf) {
|
|
|
+ chat_fetch_buf = (unsigned char *)malloc(CHAT_IMG_FETCH_MAX);
|
|
|
+ if (!chat_fetch_buf)
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+ chat_media_paths();
|
|
|
+ if (chat_media_start() != 0)
|
|
|
+ return -1;
|
|
|
+ chat_media_jar_sync();
|
|
|
+ chat_media_seq++;
|
|
|
+ if (!chat_media_seq)
|
|
|
+ chat_media_seq = 1;
|
|
|
+ chat_media_retried = 0;
|
|
|
+ if (!avatar)
|
|
|
+ n = snprintf(req, sizeof(req), "%u %u D %u %u %s\n",
|
|
|
+ chat_media_seq, CHAT_IMG_FETCH_MAX,
|
|
|
+ CHAT_IMG_W, CHAT_IMG_H, p->url);
|
|
|
+ else
|
|
|
+ n = snprintf(req, sizeof(req), "%u %u %s\n",
|
|
|
+ chat_media_seq, CHAT_IMG_FETCH_MAX, p->url);
|
|
|
+ if (n <= 0 || n >= (int)sizeof(req))
|
|
|
+ return -1;
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_done);
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_meta);
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_body);
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_px);
|
|
|
+ if (u_syscall3(SYS_WRITE_FILE, (int)chat_media_req, (int)req, n) < 0)
|
|
|
+ return -1;
|
|
|
+ p->state = CHAT_PIC_FETCHING;
|
|
|
+ chat_media_pic = p;
|
|
|
+ chat_media_avatar = avatar;
|
|
|
+ chat_media_busy = 1;
|
|
|
+ chat_media_deadline = u_ticks_ms() + 30000;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+/* 1 when the outstanding job finished (success or failure). */
|
|
|
+static unsigned int chat_meta_uint(char **pp)
|
|
|
+{
|
|
|
+ char *p = *pp;
|
|
|
+ unsigned int v = 0;
|
|
|
+
|
|
|
+ while (*p >= '0' && *p <= '9') {
|
|
|
+ v = v * 10 + (unsigned int)(*p - '0');
|
|
|
+ p++;
|
|
|
+ }
|
|
|
+ while (*p && *p != '\n')
|
|
|
+ p++;
|
|
|
+ if (*p)
|
|
|
+ p++;
|
|
|
+ *pp = p;
|
|
|
+ return v;
|
|
|
+}
|
|
|
+
|
|
|
+static int chat_media_poll(void)
|
|
|
+{
|
|
|
+ char done[24], meta[1200];
|
|
|
+ int rn, st = 0, err = 0;
|
|
|
+ unsigned int seq;
|
|
|
+ unsigned int dw = 0, dh = 0, nw = 0, nh = 0, alpha = 0;
|
|
|
+ unsigned int px_len = 0, dec_err = 0;
|
|
|
+
|
|
|
+ if (!chat_media_busy)
|
|
|
+ return 0;
|
|
|
+ chat_media_tty_drain();
|
|
|
+ rn = u_syscall3(SYS_READ_FILE, (int)chat_media_done, (int)done,
|
|
|
+ (int)(sizeof(done) - 1));
|
|
|
+ if (rn > 0) {
|
|
|
+ char *q;
|
|
|
+
|
|
|
+ done[rn] = '\0';
|
|
|
+ seq = (unsigned int)atoi(done);
|
|
|
+ if (seq != chat_media_seq)
|
|
|
+ return 0;
|
|
|
+ rn = u_syscall3(SYS_READ_FILE, (int)chat_media_meta, (int)meta,
|
|
|
+ (int)(sizeof(meta) - 1));
|
|
|
+ if (rn > 0) {
|
|
|
+ meta[rn] = '\0';
|
|
|
+ q = meta;
|
|
|
+ (void)chat_meta_uint(&q); /* seq */
|
|
|
+ st = (int)chat_meta_uint(&q);
|
|
|
+ err = (int)chat_meta_uint(&q);
|
|
|
+ (void)chat_meta_uint(&q); /* trunc */
|
|
|
+ while (*q && *q != '\n') /* encoding */
|
|
|
+ q++;
|
|
|
+ if (*q)
|
|
|
+ q++;
|
|
|
+ while (*q && *q != '\n') /* content type */
|
|
|
+ q++;
|
|
|
+ if (*q)
|
|
|
+ q++;
|
|
|
+ while (*q && *q != '\n') /* final URL */
|
|
|
+ q++;
|
|
|
+ if (*q)
|
|
|
+ q++;
|
|
|
+ (void)chat_meta_uint(&q); /* body bytes */
|
|
|
+ (void)chat_meta_uint(&q); /* open */
|
|
|
+ (void)chat_meta_uint(&q); /* first */
|
|
|
+ (void)chat_meta_uint(&q); /* total */
|
|
|
+ dw = chat_meta_uint(&q);
|
|
|
+ dh = chat_meta_uint(&q);
|
|
|
+ nw = chat_meta_uint(&q);
|
|
|
+ nh = chat_meta_uint(&q);
|
|
|
+ alpha = chat_meta_uint(&q);
|
|
|
+ px_len = chat_meta_uint(&q);
|
|
|
+ dec_err = chat_meta_uint(&q);
|
|
|
+ (void)chat_meta_uint(&q); /* dec ms */
|
|
|
}
|
|
|
+ if (st == 200 && !err && chat_media_pic) {
|
|
|
+ int stored = 0;
|
|
|
+
|
|
|
+ (void)nw;
|
|
|
+ (void)nh;
|
|
|
+ if (!chat_media_avatar && px_len && !dec_err &&
|
|
|
+ dw && dh && px_len <= CHAT_IMG_FETCH_MAX) {
|
|
|
+ rn = u_syscall3(SYS_READ_FILE, (int)chat_media_px,
|
|
|
+ (int)chat_fetch_buf,
|
|
|
+ (int)CHAT_IMG_FETCH_MAX);
|
|
|
+ if (rn == (int)px_len &&
|
|
|
+ chat_pic_store_px(chat_media_pic,
|
|
|
+ chat_fetch_buf, px_len,
|
|
|
+ dw, dh, (int)alpha) == 0)
|
|
|
+ stored = 1;
|
|
|
+ }
|
|
|
+ if (!stored) {
|
|
|
+ rn = u_syscall3(SYS_READ_FILE,
|
|
|
+ (int)chat_media_body,
|
|
|
+ (int)chat_fetch_buf,
|
|
|
+ (int)CHAT_IMG_FETCH_MAX);
|
|
|
+ if (rn > 0 &&
|
|
|
+ chat_pic_store(chat_media_pic,
|
|
|
+ (unsigned int)rn,
|
|
|
+ chat_media_avatar) == 0)
|
|
|
+ stored = 1;
|
|
|
+ }
|
|
|
+ if (stored) {
|
|
|
+ chat_media_pic->state = CHAT_PIC_READY;
|
|
|
+ chat_media_pic->last_used = ++chat_pic_clock;
|
|
|
+ if (!chat_media_avatar) {
|
|
|
+ msgs_gen++;
|
|
|
+ if (at_bottom)
|
|
|
+ tl_scroll.offset = 1 << 28;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ chat_media_pic->state = CHAT_PIC_FAILED;
|
|
|
+ }
|
|
|
+ } else if (chat_media_pic) {
|
|
|
+ chat_media_pic->state = CHAT_PIC_FAILED;
|
|
|
+ }
|
|
|
+ chat_media_pic = 0;
|
|
|
+ chat_media_busy = 0;
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_done);
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_meta);
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_body);
|
|
|
+ u_syscall1(SYS_UNLINK, (int)chat_media_px);
|
|
|
+ ngui_invalidate(&ui);
|
|
|
+ return 1;
|
|
|
}
|
|
|
- ngui_invalidate(&ui);
|
|
|
+ if (chat_media_pid > 0 && !u_alive((unsigned int)chat_media_pid)) {
|
|
|
+ chat_media_pid = -1;
|
|
|
+ if (!chat_media_retried && chat_media_start() == 0) {
|
|
|
+ chat_media_retried = 1;
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ chat_media_fail();
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ if ((int)(u_ticks_ms() - chat_media_deadline) >= 0) {
|
|
|
+ chat_media_stop();
|
|
|
+ chat_media_fail();
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static void chat_media_tick(void)
|
|
|
@@ -741,15 +1038,30 @@ static void chat_media_tick(void)
|
|
|
|
|
|
if (screen != SCR_MAIN || offline)
|
|
|
return;
|
|
|
+ if (chat_media_busy) {
|
|
|
+ chat_media_poll();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ /* Holding a helper keeps a TCP socket open, which pauses the board's
|
|
|
+ * net-dev watcher; release it when the window is not being used. */
|
|
|
+ if (!ui.focused) {
|
|
|
+ if (chat_media_pid > 0)
|
|
|
+ chat_media_stop();
|
|
|
+ return;
|
|
|
+ }
|
|
|
for (i = 0; i < nchat_images; i++) {
|
|
|
if (chat_images[i].state == CHAT_PIC_QUEUED) {
|
|
|
- chat_pic_load(&chat_images[i], 0);
|
|
|
+ if (chat_media_submit(&chat_images[i], 0) != 0)
|
|
|
+ chat_images[i].state = CHAT_PIC_FAILED;
|
|
|
+ ngui_invalidate(&ui);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
for (i = 0; i < nchat_avatars; i++) {
|
|
|
if (chat_avatars[i].state == CHAT_PIC_QUEUED) {
|
|
|
- chat_pic_load(&chat_avatars[i], 1);
|
|
|
+ if (chat_media_submit(&chat_avatars[i], 1) != 0)
|
|
|
+ chat_avatars[i].state = CHAT_PIC_FAILED;
|
|
|
+ ngui_invalidate(&ui);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
@@ -759,6 +1071,10 @@ static void chat_media_clear(void)
|
|
|
{
|
|
|
int i;
|
|
|
|
|
|
+ chat_media_stop();
|
|
|
+ chat_media_pic = 0;
|
|
|
+ chat_media_busy = 0;
|
|
|
+ chat_media_retried = 0;
|
|
|
for (i = 0; i < nchat_images; i++)
|
|
|
chat_pic_free(&chat_images[i]);
|
|
|
for (i = 0; i < nchat_avatars; i++)
|