wao 0.19.0 → 0.19.2

package/esm/hub/fs.js

@@ -0,0 +1,155 @@
+import chokidar from "chokidar"
+import { generateId } from "./utils.js"
+import WebSocket from "ws"
+const ws_server = new WebSocket.Server({ port: 9090 })
+import { keys, omit, isNil, mergeLeft } from "ramda"
+import { resolve } from "path"
+import { writeFileSync, readFileSync } from "fs"
+const _dir = process.argv[2] ?? "./"
+let sus = {}
+let cbs = {}
+let dir = null
+let _socket = null
+const cwd = process.cwd()
+ws_server.on("connection", socket => {
+  _socket = socket
+  const clientId = generateId()
+  console.log("new ws:", clientId)
+  sus[clientId] = {
+    socket,
+    su: false,
+    connections: {},
+    address: null,
+  }
+  socket.send(JSON.stringify({ type: "registered", id: clientId, dir }))
+  socket.on("message", message => {
+    const data = JSON.parse(message)
+    if (data.type === "save") {
+      writeFileSync(
+        resolve(cwd, _dir, data.path.replace(/^\//, "")),
+        data.content
+      )
+    } else if (data.type === "data") {
+      const content = readFileSync(
+        resolve(cwd, _dir, data.path.replace(/^\//, "")),
+        "utf8"
+      )
+      socket.send(
+        JSON.stringify({
+          content,
+          type: "msg",
+          path: data.path,
+          subtype: "content",
+        })
+      )
+    }
+  })
+
+  socket.on("close", () => {
+    console.log("ws disconnected", clientId)
+    delete sus[clientId]
+  })
+})
+const sendDir = () => {
+  if (_socket) {
+    _socket.send(
+      JSON.stringify({ type: "msg", subtype: "dir_change", dir: dir })
+    )
+  }
+}
+const sendContent = (content, path) => {
+  if (_socket) {
+    _socket.send(
+      JSON.stringify({
+        content,
+        type: "msg",
+        path,
+        subtype: "content",
+      })
+    )
+  }
+}
+
+console.log("WAO FS running on port 9090")
+const wd = resolve(cwd, _dir)
+console.log("Directory:", wd)
+chokidar
+  .watch(wd, {
+    ignored: (e, stats) => {
+      const _e = resolve(cwd, e)
+      return new RegExp(wd + "/node_modules").test(_e)
+    },
+  })
+  .on("change", (e, p) => {
+    const _e = resolve(cwd, e)
+    const rel = _e.replace(new RegExp(wd + "/"), "")
+    let paths = rel.split("/")
+    let _dir = dir
+    const content = readFileSync(resolve(cwd, _dir, _e), "utf8")
+    sendContent(content, e.replace(wd, ""))
+  })
+  .on("add", (e, p) => {
+    const _e = resolve(cwd, e)
+    const rel = _e.replace(new RegExp(wd + "/"), "")
+    let paths = rel.split("/")
+    let _dir = dir
+    while (paths.length > 0) {
+      const p = paths.shift()
+      if (paths.length === 0) {
+        _dir[p] = Date.now()
+      } else {
+        _dir = _dir[p]
+      }
+    }
+    sendDir()
+  })
+  .on("addDir", (e, p) => {
+    const _e = resolve(cwd, e)
+    if (_e === wd) {
+      dir = {}
+      return
+    }
+    const rel = _e.replace(new RegExp(wd + "/"), "")
+    let paths = rel.split("/")
+    let _dir = dir
+    while (paths.length > 0) {
+      const p = paths.shift()
+      _dir[p] ??= {}
+      _dir = _dir[p]
+    }
+    sendDir()
+  })
+  .on("unlink", (e, p) => {
+    const _e = resolve(cwd, e)
+    const rel = _e.replace(new RegExp(wd + "/"), "")
+    let paths = rel.split("/")
+    let _dir = dir
+    while (paths.length > 0) {
+      const p = paths.shift()
+      if (paths.length === 0) {
+        delete _dir[p]
+      } else {
+        _dir = _dir[p]
+      }
+    }
+    sendDir()
+  })
+  .on("unlinkDir", (e, p) => {
+    const _e = resolve(cwd, e)
+    if (_e === wd) {
+      dir = null
+      return null
+    }
+    const rel = _e.replace(new RegExp(wd + "/"), "")
+    let paths = rel.split("/")
+    let _dir = dir
+    while (paths.length > 0) {
+      const p = paths.shift()
+      if (paths.length === 0) {
+        delete _dir[p]
+      } else {
+        _dir = _dir[p]
+      }
+    }
+    sendDir()
+  })

package/esm/hub/index.js

@@ -0,0 +1,84 @@
+import express from "express"
+import cors from "cors"
+import bodyParser from "body-parser"
+import { keys, omit, isNil, mergeLeft } from "ramda"
+import { generateId, toANS104Request, parseSignatureInput } from "./utils.js"
+import bundler from "./bundler.js"
+import cu from "./cu.js"
+
+import WebSocket from "ws"
+const ws_server = new WebSocket.Server({ port: 8080 })
+
+let sus = {}
+let cbs = {}
+let hbs = {
+  O74OhzD1O_zE0uaKbaTQD1rfgTZEGMeXQ6M6M60TW_o: { update: Date.now() },
+}
+
+bundler(sus, cbs, hbs)
+cu(sus, cbs, hbs)
+
+ws_server.on("connection", socket => {
+  const clientId = generateId()
+  console.log("new ws:", clientId)
+  sus[clientId] = {
+    socket,
+    su: false,
+    connections: {},
+    address: null,
+    accept: {
+      pid: {},
+      hb: {},
+    },
+  }
+  socket.send(JSON.stringify({ type: "registered", id: clientId }))
+  socket.on("message", message => {
+    const data = JSON.parse(message)
+    if (data.type === "list") {
+      if (data.target === "hb") {
+        let hb = []
+        for (const k in hbs) {
+          hb.push({ address: k, update: hbs[k].update })
+        }
+        socket.send(JSON.stringify({ hb, type: "list" }))
+      } else {
+        socket.send(JSON.stringify({ error: "unknown target" }))
+      }
+    } else if (data.type === "subscribe") {
+      sus[clientId].accept = mergeLeft(data.accept, sus[clientId].accept)
+      socket.send(
+        JSON.stringify({ type: "subscribe", accept: sus[clientId].accept })
+      )
+    } else if (data.type === "msg") {
+      if (cbs[data.id]) {
+        cbs[data.id].status(data.status).send(data.msg)
+        delete cbs[data.id]
+      }
+    } else if (data.type === "register") {
+      sus[clientId].su = true
+    } else if (data.type === "sus") {
+      let keys = []
+      for (let k in sus) if (sus[k].su) keys.push(k)
+      socket.send(JSON.stringify({ type: "sus", ids: keys }))
+    } else if (data.type === "offer") {
+      sus[data.su].socket.send(
+        JSON.stringify({ type: "offer", id: clientId, offer: data.offer })
+      )
+    } else if (data.type === "answer") {
+      sus[data.client].socket.send(
+        JSON.stringify({
+          type: "answer",
+          id: data.clientId,
+          answer: data.answer,
+        })
+      )
+    }
+  })
+
+  socket.on("close", () => {
+    console.log("ws disconnected", clientId)
+    delete sus[clientId]
+  })
+})
+
+console.log("WAO hub running on port 8080")

package/esm/hub/utils.js

@@ -0,0 +1,64 @@
+import { keys, omit, isNil } from "ramda"
+
+function generateId() {
+  return Math.random().toString(36).substring(2, 15)
+}
+
+function toANS104Request(fields) {
+  const dataItem = {
+    target: fields.target,
+    anchor: fields.anchor ?? "",
+    tags: keys(
+      omit(
+        [
+          "Target",
+          "target",
+          "Anchor",
+          "anchor",
+          "Data",
+          "data",
+          "data-protocol",
+          "Data-Protocol",
+          "variant",
+          "Variant",
+          "dryrun",
+          "Dryrun",
+          "Type",
+          "type",
+          "path",
+          "method",
+        ],
+        fields
+      )
+    )
+      .map(function (key) {
+        return { name: key, value: fields[key] }
+      }, fields)
+      .concat([
+        { name: "Data-Protocol", value: "ao" },
+        { name: "Type", value: fields.Type ?? "Message" },
+        { name: "Variant", value: fields.Variant ?? "ao.N.1" },
+      ]),
+    data: fields?.data || "",
+  }
+  return {
+    headers: {
+      "Content-Type": "application/ans104",
+      "codec-device": "ans104@1.0",
+    },
+    item: dataItem,
+  }
+}
+
+function parseSignatureInput(input) {
+  const match = input.match(
+    /^([^=]+)=\(([^)]+)\);alg="([^"]+)";keyid="([^"]+)"$/
+  )
+  if (!match) throw new Error("Invalid signature-input format")
+
+  const [, label, fieldsStr, alg, keyid] = match
+  const fields = fieldsStr.split('" "').map(f => f.replace(/"/g, ""))
+  return { label, fields, alg, keyid }
+}
+
+export { toANS104Request, parseSignatureInput, generateId }

package/esm/hub/ws-proxy.js

@@ -0,0 +1,67 @@
+import yargs from "yargs"
+let { port = 7000 } = yargs(process.argv.slice(2)).argv
+import { Server } from "../test.js"
+import { generateId } from "./utils.js"
+import WebSocket from "ws"
+const ws_server = new WebSocket.Server({ port: 7070 })
+import { keys, omit, isNil, mergeLeft } from "ramda"
+import { resolve } from "path"
+import { writeFileSync, readFileSync } from "fs"
+let sus = {}
+let cbs = {}
+let _socket = null
+
+ws_server.on("connection", socket => {
+  _socket = socket
+  const clientId = generateId()
+  console.log("new ws:", clientId)
+  sus[clientId] = {
+    socket,
+    su: false,
+    connections: {},
+    address: null,
+  }
+  socket.send(JSON.stringify({ type: "registered", id: clientId }))
+  socket.on("message", message => {
+    const data = JSON.parse(message)
+    if (data.type === "msg") {
+      if (cbs[data.id]) {
+        cbs[data.id](data.res)
+        delete cbs[data.id]
+      }
+    }
+  })
+
+  socket.on("close", () => {
+    console.log("ws disconnected", clientId)
+    delete sus[clientId]
+  })
+})
+
+console.log("WAO FS running on port 7070")
+class Adaptor {
+  constructor({ hb_url, aoconnect, log = false, db } = {}) {}
+  async get(req, res) {
+    try {
+      if (_socket) {
+        const id = generateId()
+        cbs[id] = res
+        _socket.send(JSON.stringify({ type: "msg", req, id }))
+        setTimeout(() => {
+          if (cbs[id]) {
+            res({ status: 404, error: "error" })
+            delete cbs[id]
+          }
+        }, 3000)
+      } else {
+        res({ status: 404, error: "connection not found" })
+      }
+    } catch (e) {
+      res({ status: 404, error: "connection not found" })
+    }
+  }
+}
+
+const main = async () => new Server({ log: true, port, adaptor: new Adaptor() })
+
+main()

package/esm/run.js

@@ -10,6 +10,7 @@ let {
   db = ".cache",
   hb,
 } = yargs(process.argv.slice(2)).argv
+
 db = memory ? null : resolve(process.cwd(), db)
 if (reset) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.19.0",
+  "version": "0.19.2",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"
@@ -36,10 +36,10 @@
     "arjson": "^0.0.2",
     "arweave": "^1.15.1",
     "base64url": "^3.0.1",
-    "body-parser": "^1.20.3",
+    "body-parser": "^2.2.0",
     "buffer": "^6.0.3",
     "cors": "^2.8.5",
-    "express": "^4.21.2",
+    "express": "^5.1.0",
     "graphql": "^16.10.0",
     "http-message-signatures": "^1.0.4",
     "lmdb": "^3.2.2",
@@ -49,7 +49,8 @@
     "pm2": "^5.4.3",
     "ramda": "^0.30.1",
     "wasm-brotli": "^2.0.2",
-    "yargs": "^17.7.2"
+    "yargs": "^17.7.2",
+    "chokidar": "^4.0.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.8",