refactor: use new napi-rs codes

Author: oyyd

js/addon.d.ts

@@ -3,27 +3,34 @@
 
 /* auto-generated by NAPI-RS */
 
-export function seqCreateSocket(ee: object, fd?: number | undefined | null): void
-export function seqSetNapiBufSize(ee: object, size: number): void
-export function seqGetNapiBufSize(ee: object): number
-export function seqStartRecv(ee: object): void
-export function seqAddress(ee: object): string
-export function seqListen(ee: object, bindpath: string, backlog: number): void
-export function seqConnect(ee: object, serverPath: string): void
-export function seqWrite(ee: object, buf: Buffer, offset: number, length: number, cb?: (...args: any[]) => any | undefined | null): void
-export function seqClose(ee: object): void
-export function seqShutdownWhenFlushed(ee: object): void
-export function seqRef(ee: object): void
-export function seqUnref(ee: object): void
-export function dgramCreateSocket(ee: object): void
-export function dgramStartRecv(ee: object): void
-export function dgramClose(ee: object): void
-export function dgramBind(ee: object, bindpath: string): void
-export function dgramAddress(ee: object): string
-export function dgramGetRecvBufferSize(ee: object): number
-export function dgramSetRecvBufferSize(ee: object, size: number): void
-export function dgramGetSendBufferSize(ee: object): number
-export function dgramSetSendBufferSize(ee: object, size: number): void
-export function dgramSendTo(ee: object, buf: Buffer, offset: number, length: number, path: string, cb?: (...args: any[]) => any | undefined | null): void
 export function socketNewSoReuseportFd(domain: string, port: number, ip: string): number
 export function socketClose(fd: number): void
+export class SeqpacketSocketWrap {
+  constructor(ee: object, fd?: number | undefined | null)
+  init(thisObj: object): void
+  close(): void
+  shutdownWrite(): void
+  uvRefer(): void
+  uvUnrefer(): void
+  setReadBufSize(size: number): void
+  getReadBufSize(): number
+  startRecv(): void
+  address(): string
+  listen(bindpath: string, backlog: number): void
+  connect(serverPath: string): void
+  write(buf: Buffer, offset: number, length: number, cb?: (...args: any[]) => any | undefined | null): void
+  shutdownWhenFlushed(): void
+}
+export class DgramSocketWrap {
+  constructor(ee: object)
+  init(thisObj: object): void
+  startRecv(): void
+  bind(bindpath: string): void
+  address(): string
+  getRecvBufferSize(): number
+  setRecvBufferSize(size: number): void
+  getSendBufferSize(): number
+  setSendBufferSize(size: number): void
+  sendTo(buf: Buffer, offset: number, length: number, path: string, cb?: (...args: any[]) => any | undefined | null): void
+  close(): void
+}

js/dgram.ts

@@ -1,25 +1,11 @@
 import { EventEmitter } from 'events';
 import {
-  dgramAddress,
-  dgramBind,
-  dgramClose,
-  dgramCreateSocket,
-  dgramGetRecvBufferSize,
-  dgramGetSendBufferSize,
-  dgramSendTo,
-  dgramSetRecvBufferSize,
-  dgramSetSendBufferSize,
-  dgramStartRecv,
+  DgramSocketWrap
 } from './addon';
 
 type FnRecv = (err: undefined | Error, buf: Buffer) => void;
 export type SendCb = (err: undefined | Error) => void;
 
-function wrapSocket(obj: DgramSocket) {
-  obj.emit = obj.emit.bind(obj);
-  dgramCreateSocket(obj);
-}
-
 /**
  * DgramSocket is used to create a SOCK_DGRAM unix domain socket.
  * Currently DgramSocket doesn't work with `cluster` module.
@@ -42,11 +28,15 @@ function wrapSocket(obj: DgramSocket) {
  */
 export class DgramSocket extends EventEmitter {
   private closed: boolean = false;
+  private wrap: DgramSocketWrap;
 
   constructor() {
     super();
-    wrapSocket(this);
-    dgramStartRecv(this);
+    this.emit = this.emit.bind(this);
+    this.wrap = new DgramSocketWrap(this);
+    // TODO currently we can't get this object in rust side
+    this.wrap.init(this.wrap);
+    this.wrap.startRecv();
     this.on('_data', this.onData);
     this.on('_error', this.onError);
   }
@@ -74,7 +64,7 @@ export class DgramSocket extends EventEmitter {
    */
   bind(socketPath: string) {
     this.checkClosed();
-    dgramBind(this, socketPath);
+    this.wrap.bind(socketPath);
   }
 
   /**
@@ -93,14 +83,14 @@ export class DgramSocket extends EventEmitter {
     onWrite?: SendCb
   ) {
     this.checkClosed();
-    dgramSendTo(this, buf, offset, length, destPath, onWrite);
+    this.wrap.sendTo(buf, offset, length, destPath, onWrite);
   }
 
   /**
    * @returns the SO_RCVBUF socket receive buffer size in bytes.
    */
   getRecvBufferSize() {
-    return dgramGetRecvBufferSize(this);
+    return this.wrap.getRecvBufferSize();
   }
 
   /**
@@ -109,14 +99,14 @@ export class DgramSocket extends EventEmitter {
    * @returns
    */
   setRecvBufferSize(size: number) {
-    return dgramSetRecvBufferSize(this, size);
+    return this.wrap.setRecvBufferSize(size);
   }
 
   /**
    * @returns the SO_SNDBUF socket send buffer size in bytes.
    */
   getSendBufferSize() {
-    return dgramGetSendBufferSize(this);
+    return this.wrap.getSendBufferSize();
   }
 
   /**
@@ -125,15 +115,15 @@ export class DgramSocket extends EventEmitter {
    * @returns
    */
   setSendBufferSize(size: number) {
-    return dgramSetSendBufferSize(this, size);
+    return this.wrap.setSendBufferSize(size);
   }
 
   /**
    * Returns the bound address.
    * @returns
    */
   address(): string {
-    return dgramAddress(this);
+    return this.wrap.address();
   }
 
   /**
@@ -145,6 +135,6 @@ export class DgramSocket extends EventEmitter {
       return;
     }
     this.closed = true;
-    dgramClose(this);
+    this.wrap.close();
   }
 }

js/seqpacket.ts

@@ -1,26 +1,10 @@
 import { EventEmitter } from 'events';
 import {
-  seqAddress,
-  seqClose,
-  seqConnect,
-  seqCreateSocket,
-  seqListen,
-  seqSetNapiBufSize,
-  seqGetNapiBufSize,
-  seqShutdownWhenFlushed,
-  seqStartRecv,
-  seqWrite,
-  seqRef,
-  seqUnref,
+  SeqpacketSocketWrap
 } from './addon';
 
 export type NotifyCb = () => void;
 
-function wrapSocket(obj: EventEmitter, fd?: number) {
-  obj.emit = obj.emit.bind(obj);
-  seqCreateSocket(obj, fd);
-}
-
 /**
  * SeqpacketServer is used to create a SOCK_SEQPACKET server.
  * Note that sockets of SOCK_SEQPACKET don't works on MacOS and currently SeqpacketServer doesn't work with `cluster` module, i.e. you can share a SeqpacketServer across different Node.js processes.
@@ -44,10 +28,16 @@ function wrapSocket(obj: EventEmitter, fd?: number) {
  */
 export class SeqpacketServer extends EventEmitter {
   private closed: boolean = false;
+  private wrap: SeqpacketSocketWrap;
 
   constructor() {
     super();
-    wrapSocket(this);
+
+    this.emit = this.emit.bind(this);
+    this.wrap = new SeqpacketSocketWrap(this);
+    // TODO currently we can't get this object in rust side
+    this.wrap.init(this.wrap);
+
     this.on('_connection', this.onConnection);
     this.on('_error', this.onError);
   }
@@ -74,7 +64,7 @@ export class SeqpacketServer extends EventEmitter {
    */
   address(): string {
     this.checkClosed();
-    return seqAddress(this);
+    return this.wrap.address();
   }
 
   /**
@@ -88,7 +78,7 @@ export class SeqpacketServer extends EventEmitter {
       return;
     }
     this.closed = true;
-    seqClose(this);
+    this.wrap.close();
   }
 
   /**
@@ -98,21 +88,21 @@ export class SeqpacketServer extends EventEmitter {
    */
   listen(bindpath: string, backlog: number = 511) {
     this.checkClosed();
-    seqListen(this, bindpath, backlog);
+    this.wrap.listen(bindpath, backlog);
   }
 
   /**
    * Reference the server so that it will prevent Node.js process from exiting automatically.
    */
   ref() {
-    seqRef(this);
+    this.wrap.uvRefer();
   }
 
   /**
    * Unreference the server so that it won't prevent Node.js process from exiting automatically.
    */
   unref() {
-    seqUnref(this);
+    this.wrap.uvUnrefer();
   }
 }
 
@@ -141,6 +131,7 @@ export class SeqpacketServer extends EventEmitter {
  * Emitted once the socket is fully closed.
  */
 export class SeqpacketSocket extends EventEmitter {
+  private wrap: SeqpacketSocketWrap;
   private destroyed: boolean = false;
   private connectCb?: NotifyCb;
   private shutdownCb?: NotifyCb;
@@ -149,9 +140,14 @@ export class SeqpacketSocket extends EventEmitter {
 
   constructor(fd?: number) {
     super();
-    wrapSocket(this, fd);
+
+    this.emit = this.emit.bind(this);
+    this.wrap = new SeqpacketSocketWrap(this, fd);
+    // TODO currently we can't get this object in rust side
+    this.wrap.init(this.wrap);
+
     if (fd) {
-      seqStartRecv(this);
+      this.wrap.startRecv();
     }
     this.on('_data', this.onData);
     this.on('end', this.onEnd);
@@ -192,7 +188,7 @@ export class SeqpacketSocket extends EventEmitter {
   };
 
   private onConnect = () => {
-    seqStartRecv(this);
+    this.wrap.startRecv();
     this.emit('connect');
     if (this.connectCb) {
       this.connectCb();
@@ -222,7 +218,7 @@ export class SeqpacketSocket extends EventEmitter {
   connect(serverPath: string, connectCb?: NotifyCb) {
     this.checkDestroyed();
     this.connectCb = connectCb;
-    seqConnect(this, serverPath);
+    this.wrap.connect(serverPath);
   }
 
   /**
@@ -238,7 +234,7 @@ export class SeqpacketSocket extends EventEmitter {
       length = buf.length
     }
     this.checkDestroyed();
-    seqWrite(this, buf, offset, length, cb);
+    this.wrap.write(buf, offset, length, cb);
   }
 
   /**
@@ -247,7 +243,7 @@ export class SeqpacketSocket extends EventEmitter {
    */
   end(cb?: NotifyCb) {
     this.shutdownCb = cb;
-    seqShutdownWhenFlushed(this);
+    this.wrap.shutdownWhenFlushed();
   }
 
   /**
@@ -257,7 +253,7 @@ export class SeqpacketSocket extends EventEmitter {
    * @returns
    */
   getInternalReadBufferSize(): number {
-    return seqGetNapiBufSize(this);
+    return this.wrap.getReadBufSize();
   }
 
   /**
@@ -266,21 +262,21 @@ export class SeqpacketSocket extends EventEmitter {
    * @param size
    */
   setInternalReadBufferSize(size: number) {
-    seqSetNapiBufSize(this, size);
+    this.wrap.setReadBufSize(size);
   }
 
   /**
    * Reference the socket so that it will prevent Node.js process from exiting automatically.
    */
   ref() {
-    seqRef(this);
+    this.wrap.uvRefer();
   }
 
   /**
    * Unreference the socket so that it won't prevent Node.js process from exiting automatically.
    */
   unref() {
-    seqUnref(this);
+    this.wrap.uvUnrefer();
   }
 
   /**
@@ -291,6 +287,6 @@ export class SeqpacketSocket extends EventEmitter {
       return;
     }
     this.destroyed = true;
-    seqClose(this);
+    this.wrap.close();
   }
 }