@seriousme/opifex 1.1.0 → 1.2.1

package/dist/wrapNodeSocket-BAJm059T.js

@@ -0,0 +1,115 @@
+import { argv } from "node:process";
+import { Writable } from "node:stream";
+
+function formatValue(key, value, boolean, string) {
+  if (key === "__proto__" || key === "constructor") {
+    throw new Error(`Invalid argument: ${key}`);
+  }
+  if (boolean.includes(key)) {
+    if (value !== "false") {
+      return true;
+    }
+    return false;
+  }
+  if (!string.includes(key)) {
+    const num = Number(value);
+    if (!Number.isNaN(num)) {
+      return num;
+    }
+  }
+  return value;
+}
+function parseKeyValue(arg, alias) {
+  if (arg.startsWith("--no-")) {
+    const key = arg.slice(5);
+    return [key, false];
+  }
+  if (arg.startsWith("--")) {
+    const [key, value] = arg.slice(2).split("=", 2);
+    return [key, value];
+  }
+  if (arg.startsWith("-")) {
+    const [flag, value] = arg.slice(1).split("=", 2);
+    const key = alias[flag] || flag;
+    return [key, value];
+  }
+  return ["_", arg];
+}
+function parseArgs(args, opts = {}) {
+  const { alias = {}, boolean = [], string = [], default: defaults = {} } =
+    opts;
+  const result = { ...defaults };
+  result["_"] = [];
+  for (let i = 0; i < args.length; i++) {
+    const [key, value] = parseKeyValue(args[i], alias);
+    if (key === "_") {
+      result["_"].push(formatValue(key, value, boolean, string));
+      continue;
+    }
+    if (value === void 0) {
+      const nextArg = args[i + 1];
+      if (
+        nextArg !== void 0 && !nextArg.startsWith("-") && !boolean.includes(key)
+      ) {
+        result[key] = formatValue(key, nextArg, boolean, string);
+        i++;
+      } else {
+        result[key] = formatValue(key, value, boolean, string);
+      }
+      continue;
+    }
+    result[key] = formatValue(key, value, boolean, string);
+  }
+  return result;
+}
+
+function getArgs() {
+  return argv.slice(2);
+}
+
+function closer(sock) {
+  if (!sock.closed) {
+    sock.end();
+  }
+}
+function wrapNodeSocket(socket) {
+  const readable = new ReadableStream(
+    {
+      type: "bytes",
+      start(controller) {
+        socket.on("data", (data) => {
+          controller.enqueue(data);
+          const desiredSize = controller.desiredSize ?? 0;
+          if (desiredSize <= 0) {
+            socket.pause();
+          }
+        });
+        socket.on("error", (err) => controller.error(err));
+        socket.on("end", () => {
+          controller.byobRequest?.respond(1);
+          controller.close();
+        });
+      },
+      pull: () => {
+        socket.resume();
+      },
+      cancel: () => {
+        socket.end();
+      },
+    },
+  );
+  const writable = Writable.toWeb(socket);
+  const remoteAddr = {
+    hostname: socket.remoteAddress || "",
+    port: socket.remotePort || 0,
+  };
+  const conn = {
+    readable,
+    writable,
+    closer: () => closer(socket),
+    remoteAddr,
+  };
+  return conn;
+}
+
+export { getArgs as g, parseArgs as p, wrapNodeSocket as w };

package/node/README.md

@@ -5,7 +5,9 @@ Opifex on Deno see the [instructions](../deno/README.md)
 
 ## Playing around
 
-Make sure you have NodeJS with a version > 22.6.0 installed.
+Make sure you have NodeJS with a version > 22.6.0 installed if you want to run
+Typescript directly. Alternatively there is a version transpiled to Javascript
+in the `/dist` folder which should work on any supported version of NodeJS.
 
 ### Server
 

package/node/wrapNodeSocket.ts

@@ -24,10 +24,10 @@ export function wrapNodeSocket(socket: Socket): SockConn {
         });
         socket.on("error", (err: unknown) => controller.error(err));
         socket.on("end", () => {
-          // unlock the last BYOB read request
-          controller.byobRequest?.respond(1);
-          // and close the controller
+          // close the controller
           controller.close();
+          // and unlock the last BYOB read request
+          controller.byobRequest?.respond(0);
         });
       },
       pull: () => {

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@seriousme/opifex",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "MQTT client & server for Deno & NodeJS",
   "type": "module",
-  "main": "index.js",
   "scripts": {
-    "test": "node --experimental-strip-types --test --test-skip-pattern='/^Deno/'"
+    "test": "node --experimental-strip-types --test --test-skip-pattern='/^Deno/'",
+    "build": "npx pkgroll --clean-dist --src .",
+    "postbuild": "deno fmt"
   },
   "keywords": [
     "MQTT",
@@ -13,8 +14,12 @@
     "mqtt-broker"
   ],
   "bin": {
-    "mqtt": "bin/mqtt.ts",
-    "demoServer": "bin/demoServer.ts"
+    "mqtt": "dist/bin/mqtt.js",
+    "demoServer": "dist/bin/demoServer.js"
+  },
+  "exports": {
+    "./server": "./dist/server/mod.js",
+    "./client": "./dist/client/mod.js"
   },
   "author": "Hans Klunder",
   "license": "MIT",
@@ -26,10 +31,7 @@
     "url": "https://github.com/seriousme/opifex/issues"
   },
   "homepage": "https://github.com/seriousme/opifex#readme",
-  "engines": {
-    "node": ">=22.6.0"
-  },
-  "dependencies": {
+  "devDependencies": {
     "@types/node": "^22.8.6"
   }
 }

package/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    // Node 18
+    "target": "ES2022",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "strict": true,
+    "outDir": "dist",
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "skipLibCheck": true
+  },
+  "exclude": [
+    "dist",
+    "deno",
+    "node_modules"
+  ]
+}