Add poll for async call

Author: yne

examples/http_client.js

@@ -3,24 +3,25 @@
 /// <reference path="../doc/globals.d.ts" />
 /// <reference path="../doc/os.d.ts" />
 import * as os from "os";
+const spam = ()=>console.log("spam", os.setTimeout(spam, 1000))
+/** @param {os.FileDescriptor} fd @param {string} str */
+const send = (fd, str) => os.send(fd, Uint8Array.from(str, c => c.charCodeAt(0)).buffer);
 /** @template T @param {os.Result<T>} result @returns {T} */
 function must(result) {
     if (typeof result === "number" && result < 0) throw result;
     return /** @type {T} */ (result)
 }
-/** @param {os.FileDescriptor} fd @param {string[]} lines */
-function sendLines(fd, lines) {
-    const buf = Uint8Array.from(lines.join('\r\n'), c => c.charCodeAt(0));
-    os.write(fd, buf.buffer, 0, buf.byteLength);
-}
+
 const [host = "example.com", port = "80"] = scriptArgs.slice(1);
 const ai = os.getaddrinfo(host, port).filter(ai => ai.family == os.AF_INET && ai.port); // TODO too much/invalid result
 if (!ai.length) throw `Unable to getaddrinfo(${host}, ${port})`;
 const sockfd = must(os.socket(os.AF_INET, os.SOCK_STREAM));
-must(os.connect(sockfd, ai[0]))
-sendLines(sockfd, ["GET / HTTP/1.0", `Host: ${host}`, "Connection: close", "", ""]);
+//spam();
+const c = await os.connect(sockfd, { addr: "127.0.0.1", port: 80});
+console.log({ c });
+//const s = await send(sockfd, ["GET / HTTP/1.0", `Host: ${host}`, "Connection: close", "", ""].join('\r\n'));
+//console.log({ s });
 
-const chunk = new Uint8Array(4096);
-while (os.read(sockfd, chunk.buffer, 0, chunk.byteLength) > 0) {
-    console.log(String.fromCharCode(...chunk));
-}
+//const chunk = new Uint8Array(4096);
+//const r = await os.recv(sockfd, chunk.buffer);
+//console.log({ r });

examples/http_server.js

@@ -21,10 +21,10 @@ function must(result) {
     return /** @type {T} */ (result)
 }
 /**@param {os.FileDescriptor} fd */
-function* recvLines(fd) {
+async function* recvLines(fd) {
     const chunk = new Uint8Array(1);
     let line = '';
-    while (os.read(fd, chunk.buffer, 0, chunk.byteLength) > 0) {
+    while (await os.recv(fd, chunk.buffer) > 0) {
         const char = String.fromCharCode(...chunk);
         if (char == '\n') {
             yield line;
@@ -36,7 +36,7 @@ function* recvLines(fd) {
 /** @param {os.FileDescriptor} fd @param {string[]} lines */
 function sendLines(fd, lines) {
     const buf = Uint8Array.from(lines.join('\r\n'), c => c.charCodeAt(0));
-    os.write(fd, buf.buffer, 0, buf.byteLength);
+    os.send(fd, buf.buffer);
 }
 //USAGE: qjs http_server.js [PORT=8080 [HOST=localhost]]
 const [port = "8080", host = "localhost"] = scriptArgs.slice(1);
@@ -47,19 +47,20 @@ const sock_srv = must(os.socket(os.AF_INET, os.SOCK_STREAM));
 must(os.setsockopt(sock_srv, os.SO_REUSEADDR, new Uint32Array([1]).buffer));
 must(os.bind(sock_srv, ai[0]));
 must(os.listen(sock_srv));
-
-console.log(`Listening on http://${ai[0].addr}:${ai[0].port} ...`);
-
+//os.signal(os.SIGINT, ()=>os.close(sock_srv)); // don't work
+console.log(`Listening on http://${host}:${port} (${ai[0].addr}:${ai[0].port}) ...`);
+const openCmd = { linux: "xdg-open", darwin: "open", win32: "start" }[os.platform];
+if (openCmd) os.exec([openCmd, `http://${host}:${port}`]);
 while (true) { // TODO: break on SIG*
-    const [sock_cli] = os.accept(sock_srv);
+    const [sock_cli] = await os.accept(sock_srv);
 
     const lines = recvLines(sock_cli);
-    const [method, path, http_ver] = (lines.next().value || '').split(' ');
+    const [method, path, http_ver] = ((await lines.next()).value || '').split(' ');
     let safe_path = '.' + path.replaceAll(/\.+/g, '.'); // may += index.html later
     console.log(method, safe_path, http_ver);
 
     const headers = new Map()
-    for (const line of lines) {
+    for await (const line of lines) {
         const header = line.trimEnd();
         if (!header) break;
         const sepIdx = header.indexOf(': ');
@@ -86,11 +87,9 @@ while (true) { // TODO: break on SIG*
         const fd = must(os.open(safe_path));
         const fbuf = new Uint8Array(4096);
         for (let got = 0; (got = os.read(fd, fbuf.buffer, 0, fbuf.byteLength)) > 0;) {
-            os.write(sock_cli, fbuf.buffer, 0, got);
+            os.send(sock_cli, fbuf.buffer, got);
         }
     }
 
     os.close(sock_cli);
 }
-
-os.close(sock_srv);