node-netlink 0.0.5 → 0.0.6

package/dist/lib/message.d.ts

@@ -19,14 +19,14 @@ declare const nlmsgAlign: ({ length }: {
 declare const parseMessages: ({ data, structures }: {
     data: Uint8Array;
     structures: TNetlinkStructures;
-}) => {};
+}) => TNetlinkMessage[];
 /**
  * Formats a netlink message, nlmsg_len is calculated from the payload.
  */
 declare const formatMessage: ({ message, structures }: {
     message: TNetlinkMessage;
     structures: TNetlinkStructures;
-}) => any;
+}) => Uint8Array;
 /**
  * Whether the message terminates a request: NLMSG_ERROR (including acknowledgements) or NLMSG_DONE.
  */
@@ -40,6 +40,6 @@ declare const isTerminatingMessage: ({ message }: {
 declare const errnoOfMessage: ({ message, structures }: {
     message: TNetlinkMessage;
     structures: TNetlinkStructures;
-}) => number;
+}) => number | undefined;
 export { nlmsgAlign, parseMessages, formatMessage, errnoOfMessage, isTerminatingMessage, };
 export type { TNetlinkHeader, TNetlinkMessage, };

package/dist/lib/message.js

@@ -46,7 +46,7 @@ const parseOneMessage = ({ data, structures }/*: { data: Uint8Array, structures:
  * Splits a received datagram into its netlink messages.
  * Throws if the datagram is malformed.
  */
-const parseMessages = ({ data, structures }/*: { data: Uint8Array, structures: TNetlinkStructures }*/) => {
+const parseMessages = ({ data, structures }/*: { data: Uint8Array, structures: TNetlinkStructures }*/)/*: TNetlinkMessage[]*/ => {
   let messages/*: TNetlinkMessage[]*/ = [];
   let remaining = data;
 
@@ -62,7 +62,7 @@ const parseMessages = ({ data, structures }/*: { data: Uint8Array, structures: T
 /**
  * Formats a netlink message, nlmsg_len is calculated from the payload.
  */
-const formatMessage = ({ message, structures }/*: { message: TNetlinkMessage, structures: TNetlinkStructures }*/) => {
+const formatMessage = ({ message, structures }/*: { message: TNetlinkMessage, structures: TNetlinkStructures }*/)/*: Uint8Array*/ => {
   const { header, payload } = message;
 
   const headerAsBuffer = structures.nlmsghdr.format({
@@ -95,7 +95,7 @@ const readInt32 = ({ payload, structures }/*: { payload: Uint8Array, structures:
  * Extracts the errno of an NLMSG_ERROR or NLMSG_DONE message.
  * Returns `undefined` for an acknowledgement (error 0) and for other message types.
  */
-const errnoOfMessage = ({ message, structures }/*: { message: TNetlinkMessage, structures: TNetlinkStructures }*/) => {
+const errnoOfMessage = ({ message, structures }/*: { message: TNetlinkMessage, structures: TNetlinkStructures }*/)/*: number | undefined*/ => {
   if (!isTerminatingMessage({ message })) {
     return undefined;
   }

package/dist/lib/structures.d.ts

@@ -1,4 +1,4 @@
-import { type TAbi } from "ya-struct";
+import { define, type TAbi } from "ya-struct";
 declare const sockaddrNlDefinition: {
     readonly type: "struct";
     readonly packed: false;
@@ -142,21 +142,24 @@ declare const nlmsgerrDefinition: {
         };
     }];
 };
-declare const createNetlinkStructuresFor: ({ abi }: {
-    abi: TAbi;
-}) => {
+declare const sockaddrNl: ReturnType<typeof define<typeof sockaddrNlDefinition>>;
+declare const nlmsghdr: ReturnType<typeof define<typeof nlmsghdrDefinition>>;
+declare const nlmsgerr: ReturnType<typeof define<typeof nlmsgerrDefinition>>;
+type TParserOf<T extends {
+    parser: (args: {
+        abi: TAbi;
+    }) => object;
+}> = ReturnType<T["parser"]>;
+type TNetlinkStructures = {
     abi: TAbi;
-    sockaddrNl: any;
-    nlmsghdr: any;
-    nlmsgerr: any;
+    sockaddrNl: TParserOf<typeof sockaddrNl>;
+    nlmsghdr: TParserOf<typeof nlmsghdr>;
+    nlmsgerr: TParserOf<typeof nlmsgerr>;
 };
-type TNetlinkStructures = ReturnType<typeof createNetlinkStructuresFor>;
-declare const hostStructures: {
+declare const createNetlinkStructuresFor: ({ abi }: {
     abi: TAbi;
-    sockaddrNl: any;
-    nlmsghdr: any;
-    nlmsgerr: any;
-};
+}) => TNetlinkStructures;
+declare const hostStructures: TNetlinkStructures;
 /**
  * Formats a struct sockaddr_nl, e.g. to bind() a netlink socket.
  */
@@ -166,6 +169,6 @@ declare const formatNetlinkAddress: ({ address, structures }: {
         nl_groups: bigint;
     };
     structures?: TNetlinkStructures;
-}) => any;
+}) => Uint8Array;
 export { sockaddrNlDefinition, nlmsghdrDefinition, nlmsgerrDefinition, createNetlinkStructuresFor, hostStructures, formatNetlinkAddress, };
 export type { TNetlinkStructures, };

package/dist/lib/structures.js

@@ -40,11 +40,21 @@ const nlmsgerrDefinition = {
   ],
 } /*as const*/;
 
-const sockaddrNl = define({ definition: sockaddrNlDefinition });
-const nlmsghdr = define({ definition: nlmsghdrDefinition });
-const nlmsgerr = define({ definition: nlmsgerrDefinition });
+// spelled out, as the declaration files are generated per file and could not infer these types
+const sockaddrNl/*: ReturnType<typeof define<typeof sockaddrNlDefinition>>*/ = define({ definition: sockaddrNlDefinition });
+const nlmsghdr/*: ReturnType<typeof define<typeof nlmsghdrDefinition>>*/ = define({ definition: nlmsghdrDefinition });
+const nlmsgerr/*: ReturnType<typeof define<typeof nlmsgerrDefinition>>*/ = define({ definition: nlmsgerrDefinition });
 
-const createNetlinkStructuresFor = ({ abi }/*: { abi: TAbi }*/) => {
+/*type TParserOf<T extends { parser: (args: { abi: TAbi }) => object }> = ReturnType<T["parser"]>;*/
+
+/*type TNetlinkStructures = {
+  abi: TAbi;
+  sockaddrNl: TParserOf<typeof sockaddrNl>;
+  nlmsghdr: TParserOf<typeof nlmsghdr>;
+  nlmsgerr: TParserOf<typeof nlmsgerr>;
+};*/
+
+const createNetlinkStructuresFor = ({ abi }/*: { abi: TAbi }*/)/*: TNetlinkStructures*/ => {
   return {
     abi,
     sockaddrNl: sockaddrNl.parser({ abi }),
@@ -53,8 +63,6 @@ const createNetlinkStructuresFor = ({ abi }/*: { abi: TAbi }*/) => {
   };
 };
 
-/*type TNetlinkStructures = ReturnType<typeof createNetlinkStructuresFor>;*/
-
 const hostStructures = createNetlinkStructuresFor({ abi: hostAbi });
 
 /**
@@ -63,7 +71,7 @@ const hostStructures = createNetlinkStructuresFor({ abi: hostAbi });
 const formatNetlinkAddress = ({ address, structures = hostStructures }/*: {
   address: { nl_pid: bigint, nl_groups: bigint },
   structures?: TNetlinkStructures,
-}*/) => {
+}*/)/*: Uint8Array*/ => {
   return structures.sockaddrNl.format({
     value: {
       nl_family: AF_NETLINK,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.5",
+  "version": "0.0.6",
   "name": "node-netlink",
   "type": "module",
   "description": "The netlink protocol for Node.js on Linux, on top of sockets you own",