@automata-network/pom-socket - npm Package Compare versions

Comparing version 0.0.14 to 0.0.17

dist/index.js

@@ -1,2 +0,2 @@
-"use strict";var e,t=require("socket.io-client"),s=require("./encryption.js");exports.SocketStatus=void 0,(e=exports.SocketStatus||(exports.SocketStatus={}))[e.Disconnected=1]="Disconnected",e[e.Connecting=2]="Connecting",e[e.Connected=3]="Connected";const n=new Error("shared secret is not exist"),o=new Error("socket is not connected"),c=new Error("socket connect to server failed"),i=new Error("session is expired"),r=new Error("message salt is missing"),a=new Error("message type is unknown");var h;!function(e){e.KeyExchange="key-exchange",e.EncryptedMessage="encrypted-message"}(h||(h={}));class d{aesKey;manualReconnectionCount=0;connectedEventReceived=!1;connectedEventListener;keyExchangeEventListener;listeners={};ecdh;socket;constructor(e,n){this.ecdh=s.generateECDHKeys(),this.socket=t.io(e,{...n||{},autoConnect:!1,reconnection:!0,reconnectionAttempts:60,reconnectionDelay:5e3})}getSocketStatus(){return this.socket.connected&&this.aesKey&&this.connectedEventReceived?exports.SocketStatus.Connected:this.socket.disconnected?exports.SocketStatus.Disconnected:exports.SocketStatus.Connecting}connect(){let e,t;const n="object"==typeof this.socket.auth&&!!this.socket.auth.sessionID,o=s.createRandomString(32),c=e=>{try{const t=E({message:e});t.type===h.KeyExchange&&(this.generateAESKey(t.data,o),this.socket.off("data",c),this.keyExchangeEventListener&&this.keyExchangeEventListener.resolve())}catch(e){this.keyExchangeEventListener&&this.keyExchangeEventListener.reject(e),this.socket.off("data",c)}},r=()=>{this.connectedEventReceived=!0,this.connectedEventListener&&(this.connectedEventListener.resolve(),this.connectedEventListener=void 0),this.socket.off("connected",r)};return new Promise(((s,a)=>{const h=()=>{n?f({dhSharedPublicNumber:this.ecdh.publicKey.buffer.toString("hex"),sessionId:this.socket.auth.sessionID,hkdfSalt:o}):e?f({dhSharedPublicNumber:this.ecdh?.publicKey.buffer.toString("hex"),sessionId:e,hkdfSalt:o}):t=!0,this.socket.off("connect",h)},d=s=>{t?f({dhSharedPublicNumber:this.ecdh.publicKey.buffer.toString("hex"),sessionId:s,hkdfSalt:o}):e=s,this.socket.off("setupSession",d)},u=e=>{"io server disconnect"===e?k(i):this.manualReconnectionCount<3?(this.manualReconnectionCount+=1,this.connect().then((e=>{f(e)})).catch((e=>{k(e)}))):(this.manualReconnectionCount=0,k(new Error(e))),this.socket.off("disconnect",d)},E=e=>{const t=e?.message,s=e?.description,n=e?.context;k("invalid session or expired!"===t?new Error(`session id: ${this.socket.id||"-"}, error: ${i}, description: ${s}, context: ${n}`):new Error(`session id: ${this.socket.id||"-"}, error: ${t}, description: ${s}, context: ${n}`)),this.socket.off("connect_error",E)},k=e=>{this.socket.off("connect",h),this.socket.off("setupSession",d),this.socket.off("disconnect",u),this.socket.off("connect_error",E),a(e)},f=e=>{this.socket.off("connect",h),this.socket.off("setupSession",d),this.socket.off("disconnect",u),this.socket.off("connect_error",E),s(e)};this.socket.on("connect",h),this.socket.on("disconnect",u),this.socket.on("connect_error",E),n||this.socket.on("setupSession",d),this.socket.on("connected",r),this.socket.on("data",c),this.socket.connect()}))}generateAESKey(e,t){const n=s.generateECDHPubKey(e),o=this.ecdh.privateKey.deriveSharedSecret(n);this.aesKey=s.generateAESKey(new Uint8Array(o),t)}async waitForConnectedEvent(){return this.connectedEventReceived?Promise.resolve():new Promise(((e,t)=>{this.connectedEventListener={resolve:e,reject:t}}))}async waitForKeyExchangeEvent(){return this.aesKey?Promise.resolve():new Promise(((e,t)=>{this.keyExchangeEventListener={resolve:e,reject:t}}))}emitSharedPublicKey(){const e=k({type:h.KeyExchange,data:this.ecdh.publicKey.buffer.toString("hex")});this.socket.emit("data",e)}disconnect(){this.connectedEventReceived=!1,this.aesKey=void 0,this.ecdh=s.generateECDHKeys(),this.socket.disconnect()}onDisconnect(e){const t=t=>{"io client disconnect"===t||"io server disconnect"===t?e():(this.socket.once("connect",(()=>{s.countdownTimer&&clearTimeout(s.countdownTimer)})),s.countdownTimer=setTimeout((()=>{e()}),3e5))},s={handler:t,cb:e,countdownTimer:void 0};this.listeners.disconnect=this.listeners.disconnect||[],this.listeners.disconnect.push(s),this.socket.on("disconnect",t)}offDisconnect(e){const t=this.listeners.disconnect;if(!t||0===t.length)return;const s=t.findIndex((t=>t.cb===e));if(-1!==s){const e=t[s];this.socket.off("disconnect",e.handler),e.countdownTimer&&clearTimeout(e.countdownTimer),t.splice(s,1)}}on(e){const t=t=>{u({message:t,key:this.aesKey,cb:e})};this.listeners.data=this.listeners.data||[],this.listeners.data.push({handler:t,cb:e}),this.socket.on("data",t)}off(e){const t=this.listeners.data;if(!t||0===t.length)return;const s=t.findIndex((t=>t.cb===e));-1!==s&&(this.socket.off("data",t[s].handler),t.splice(s,1))}once(e){const t=t=>{u({message:t,key:this.aesKey,cb:e}),this.off(e)};this.listeners.data=this.listeners.data||[],this.listeners.data.push({handler:t,cb:e}),this.socket.on("data",t)}send(e){if(!this.aesKey)throw n;if(this.getSocketStatus()!==exports.SocketStatus.Connected)throw o;this.socket.emit("data",k({type:h.EncryptedMessage,data:e,key:this.aesKey}))}}function u(e){const{message:t,key:s,cb:n}=e;try{const e=E({message:t,key:s});n.success(e.data)}catch(e){n.error(e)}}function E(e){const{message:t,key:o}=e,c=JSON.parse(t),i=c.t;switch(i){case h.KeyExchange:return{type:i,data:c.d};case h.EncryptedMessage:if(!c.s)throw r;if(!o)throw n;return{type:i,data:s.decryptMessage(c.d,o,c.s).decryptedMessage};default:throw a}}function k(e){const{type:t,data:o,key:c}=e,i={t:t,d:o};switch(t){case h.KeyExchange:break;case h.EncryptedMessage:if(!c)throw n;const e=s.encryptMessage(o,c);i.d=e.encryptedMessage,i.s=e.iv;break;default:throw a}return JSON.stringify(i)}exports.createRandomString=s.createRandomString,exports.ERR_MESSAGE_SALT_IS_MISSING=r,exports.ERR_MESSAGE_TYPE_IS_UNKNOWN=a,exports.ERR_SESSION_IS_EXPIRED=i,exports.ERR_SHARED_SECRET_NOT_EXIST=n,exports.ERR_SOCKET_CONNECT_TO_SERVER_FAILED=c,exports.ERR_SOCKET_IS_NOT_CONNECTED=o,exports.POMSocket=d,exports.getSocket=function(e,t){return new d(e,t)};
+"use strict";var e,t=require("socket.io-client"),s=require("./encryption.js");exports.SocketStatus=void 0,(e=exports.SocketStatus||(exports.SocketStatus={}))[e.Disconnected=1]="Disconnected",e[e.Connecting=2]="Connecting",e[e.Connected=3]="Connected";const n=new Error("shared secret is not exist"),o=new Error("socket is not connected"),c=new Error("socket connect to server failed"),i=new Error("session is expired"),r=new Error("message salt is missing"),a=new Error("message type is unknown");var h;!function(e){e.KeyExchange="key-exchange",e.EncryptedMessage="encrypted-message"}(h||(h={}));class d{aesKey;manualReconnectionCount=0;connectedEventReceived=!1;connectedEventListener;keyExchangeEventListener;listeners={};ecdh;socket;constructor(e,n){this.ecdh=s.generateECDHKeys(),this.socket=t.io(e,{...n||{},transports:["websocket","polling"],autoConnect:!1,reconnection:!0,reconnectionAttempts:60,reconnectionDelay:5e3})}getSocketStatus(){return this.socket.connected&&this.aesKey&&this.connectedEventReceived?exports.SocketStatus.Connected:this.socket.disconnected?exports.SocketStatus.Disconnected:exports.SocketStatus.Connecting}connect(){let e,t;const n="object"==typeof this.socket.auth&&!!this.socket.auth.sessionID,o=s.createRandomString(32),c=e=>{try{const t=k({message:e});t.type===h.KeyExchange&&(this.generateAESKey(t.data,o),this.socket.off("data",c),this.keyExchangeEventListener&&this.keyExchangeEventListener.resolve())}catch(e){this.keyExchangeEventListener&&this.keyExchangeEventListener.reject(e),this.socket.off("data",c)}},r=()=>{this.connectedEventReceived=!0,this.connectedEventListener&&(this.connectedEventListener.resolve(),this.connectedEventListener=void 0),this.socket.off("connected",r)};return new Promise(((s,a)=>{const h=()=>{n?f({dhSharedPublicNumber:this.ecdh.publicKey.buffer.toString("hex"),sessionId:this.socket.auth.sessionID,hkdfSalt:o}):e?f({dhSharedPublicNumber:this.ecdh?.publicKey.buffer.toString("hex"),sessionId:e,hkdfSalt:o}):t=!0,this.socket.off("connect",h)},d=s=>{t?f({dhSharedPublicNumber:this.ecdh.publicKey.buffer.toString("hex"),sessionId:s,hkdfSalt:o}):e=s,this.socket.off("setupSession",d)},u=e=>{"io server disconnect"===e?E(i):this.manualReconnectionCount<3?(this.manualReconnectionCount+=1,this.connect().then((e=>{f(e)})).catch((e=>{E(e)}))):(this.manualReconnectionCount=0,E(new Error(e))),this.socket.off("disconnect",d)},k=e=>{const t=e?.message,s=e?.description,n=e?.context;E("invalid session or expired!"===t?new Error(`session id: ${this.socket.id||"-"}, error: ${i}, description: ${s}, context: ${n}`):new Error(`session id: ${this.socket.id||"-"}, error: ${t}, description: ${s}, context: ${n}`)),this.socket.off("connect_error",k)},E=e=>{this.socket.off("connect",h),this.socket.off("setupSession",d),this.socket.off("disconnect",u),this.socket.off("connect_error",k),a(e)},f=e=>{this.socket.off("connect",h),this.socket.off("setupSession",d),this.socket.off("disconnect",u),this.socket.off("connect_error",k),s(e)};this.socket.on("connect",h),this.socket.on("disconnect",u),this.socket.on("connect_error",k),n||this.socket.on("setupSession",d),this.socket.on("connected",r),this.socket.on("data",c),this.socket.connect()}))}generateAESKey(e,t){const n=s.generateECDHPubKey(e),o=this.ecdh.privateKey.deriveSharedSecret(n);this.aesKey=s.generateAESKey(new Uint8Array(o),t)}async waitForConnectedEvent(){return this.connectedEventReceived?Promise.resolve():new Promise(((e,t)=>{this.connectedEventListener={resolve:e,reject:t}}))}async waitForKeyExchangeEvent(){return this.aesKey?Promise.resolve():new Promise(((e,t)=>{this.keyExchangeEventListener={resolve:e,reject:t}}))}emitSharedPublicKey(){const e=E({type:h.KeyExchange,data:this.ecdh.publicKey.buffer.toString("hex")});this.socket.emit("data",e)}disconnect(){this.connectedEventReceived=!1,this.aesKey=void 0,this.ecdh=s.generateECDHKeys(),this.socket.disconnect()}onDisconnect(e){const t=t=>{"io client disconnect"===t||"io server disconnect"===t?e():(this.socket.once("connect",(()=>{s.countdownTimer&&clearTimeout(s.countdownTimer)})),s.countdownTimer=setTimeout((()=>{e()}),3e5))},s={handler:t,cb:e,countdownTimer:void 0};this.listeners.disconnect=this.listeners.disconnect||[],this.listeners.disconnect.push(s),this.socket.on("disconnect",t)}offDisconnect(e){const t=this.listeners.disconnect;if(!t||0===t.length)return;const s=t.findIndex((t=>t.cb===e));if(-1!==s){const e=t[s];this.socket.off("disconnect",e.handler),e.countdownTimer&&clearTimeout(e.countdownTimer),t.splice(s,1)}}on(e){const t=t=>{u({message:t,key:this.aesKey,cb:e})};this.listeners.data=this.listeners.data||[],this.listeners.data.push({handler:t,cb:e}),this.socket.on("data",t)}off(e){const t=this.listeners.data;if(!t||0===t.length)return;const s=t.findIndex((t=>t.cb===e));-1!==s&&(this.socket.off("data",t[s].handler),t.splice(s,1))}once(e){const t=t=>{u({message:t,key:this.aesKey,cb:e}),this.off(e)};this.listeners.data=this.listeners.data||[],this.listeners.data.push({handler:t,cb:e}),this.socket.on("data",t)}send(e){if(!this.aesKey)throw n;if(this.getSocketStatus()!==exports.SocketStatus.Connected)throw o;this.socket.emit("data",E({type:h.EncryptedMessage,data:e,key:this.aesKey}))}}function u(e){const{message:t,key:s,cb:n}=e;try{const e=k({message:t,key:s});n.success(e.data)}catch(e){n.error(e)}}function k(e){const{message:t,key:o}=e,c=JSON.parse(t),i=c.t;switch(i){case h.KeyExchange:return{type:i,data:c.d};case h.EncryptedMessage:if(!c.s)throw r;if(!o)throw n;return{type:i,data:s.decryptMessage(c.d,o,c.s).decryptedMessage};default:throw a}}function E(e){const{type:t,data:o,key:c}=e,i={t:t,d:o};switch(t){case h.KeyExchange:break;case h.EncryptedMessage:if(!c)throw n;const e=s.encryptMessage(o,c);i.d=e.encryptedMessage,i.s=e.iv;break;default:throw a}return JSON.stringify(i)}exports.createRandomString=s.createRandomString,exports.ERR_MESSAGE_SALT_IS_MISSING=r,exports.ERR_MESSAGE_TYPE_IS_UNKNOWN=a,exports.ERR_SESSION_IS_EXPIRED=i,exports.ERR_SHARED_SECRET_NOT_EXIST=n,exports.ERR_SOCKET_CONNECT_TO_SERVER_FAILED=c,exports.ERR_SOCKET_IS_NOT_CONNECTED=o,exports.POMSocket=d,exports.getSocket=function(e,t){return new d(e,t)};
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "@automata-network/pom-socket",
-  "version": "0.0.14",
+  "version": "0.0.17",
   "description": "A socket clinet for automata's Proof Of Machinehood",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/index.ts

@@ -85,2 +85,3 @@ import {ManagerOptions, Socket, SocketOptions, io} from 'socket.io-client';
       ...(options || {}),
+      transports: ['websocket', 'polling'],
       autoConnect: false,
@@ -87,0 +88,0 @@ reconnection: true,

No alert changes

Improved metrics

Total package byte prevSize

53852

increased by0.35%

Lines of code

646

increased by0.16%

No dependency changes