iosignal 1.7.1 → 2.0.0

package/index.js

@@ -1,13 +1,17 @@
 export { IOCongSocket } from './src/client/IOCongSocket.js'
-export { IOWS as IO } from './src/client/IOWS.js'
+export { IOWS } from './src/client/IOWS.js'
 export { pack, CongRx } from './src/client/CongPacket.js'
 export { Server } from './src/server/Server.js'
 export { serverOption } from './src/server/serverOption.js'
 export { FileLogger } from './src/server/FileLogger.js'
+export { getSignalPack, parsePayload, getPayloadFromSignalPack } from './src/common/payload.js'
 export * from './src/common/constants.js'
 
+// MBP
+export { default as MBP } from 'meta-buffer-pack'
+
 // boho auth
-export * from 'boho'
+export { default as Boho} from 'boho'
 export { BohoAuth } from './src/auth/BohoAuth.js'
 export { Auth_File } from './src/auth/Auth_File.js'
 export { Auth_Env } from './src/auth/Auth_Env.js'

package/package.json

@@ -1,25 +1,18 @@
 {
   "name": "iosignal",
-  "version": "1.7.1",
+  "version": "2.0.0",
   "description": "iosignal",
   "type": "module",
-  "main": "./dist/iosignal.cjs",
   "exports": {
     "import": "./index.js",
     "require": "./dist/iosignal.cjs"
   },
-  "browser": "./dist/iosignal.min.js",
-  "browser_esm": "./dist/iosignal.esm.js",
-  "esm": "./dist/iosignal.mjs",
+  "browser": "./dist/iosignal.js",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^17.1.0",
-    "@rollup/plugin-json": "^6.0.1",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@rollup/plugin-replace": "^4.0.0",
+    "@rollup/plugin-commonjs": "^26.0.1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "mocha": "^9.2.2",
-    "redis": "^4.6.12",
-    "rollup": "^2.79.1"
+    "rollup": "^4.21.2"
   },
   "scripts": {
     "build": "rollup -c",
@@ -34,15 +27,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "boho": "^0.8.2",
-    "commander": "^12.1.0",
+    "boho": "^1.0.1",
     "eventemitter3": "^5.0.1",
-    "meta-buffer-pack": "^1.4.0",
-    "ws": "^8.17.1"
+    "meta-buffer-pack": "^2.0.2",
+    "ws": "^8.18.0"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.8",
-    "utf-8-validate": "^6.0.3"
+    "utf-8-validate": "^6.0.4"
   },
   "repository": {
     "type": "git",

package/rollup.config.js

@@ -1,58 +1,35 @@
-import replace from '@rollup/plugin-replace'
 import resolve from '@rollup/plugin-node-resolve'
 import commonjs from '@rollup/plugin-commonjs'
 import terser from '@rollup/plugin-terser'
-import json from '@rollup/plugin-json'
-import pkg from './package.json'
 
 export default [
   {
-    input: './indexWebBrowser.js',
-    output: [
-      {
-        file: pkg.browser,
-        format: 'iife', 
-        name: 'IO',
-        sourcemap: true,
-      }
-
-    ],
-    plugins: [
-      replace({
-        crypto: '',
-        delimiters: ['import { webcrypto } from \'', '\''],
-        preventAssignment: true
-      }),
-      resolve(), 
-      commonjs() 
-      ,terser() 
-    ]
-  }
-  ,{
     input: './src/client/IOWebSocket.js',
     output: [
       {
-        file: pkg.browser_esm,
+        file: './dist/iosignal.js',
         format: 'es', // 
         sourcemap: true,
+      },
+      {
+        file: './dist/iosignal.iife.js',
+        format: 'iife',
+        name: 'IO',
+        sourcemap: true,
       }
     ],
     plugins: [
-      replace({
-        crypto: '',
-        delimiters: ['import { webcrypto } from \'', '\''],
-        preventAssignment: true
+      resolve({
+        preferBuiltins: false
       }),
-      resolve(), 
-      commonjs() 
+      commonjs()
       ,terser() 
     ]
-  }
-
-  ,{
+  },
+  {
     input: './index.js',
     output: [
-      { file: pkg.main,
+      { file: './dist/iosignal.cjs',
         format: 'cjs'
       }
     ],
@@ -60,7 +37,6 @@ export default [
       resolve({
         preferBuiltins: true
       }), 
-      json(),
       commonjs()
       ,terser() 
     ]

package/src/auth/Auth_Env.js

@@ -18,7 +18,7 @@
  */
 
 import { BohoAuth } from './BohoAuth.js';
-import { sha256 } from 'boho'
+import Boho from 'boho'
 
 export class Auth_Env extends BohoAuth {
   constructor(authInfo) {
@@ -68,7 +68,7 @@ export class Auth_Env extends BohoAuth {
   }
 
   addAuth(id, keyStr, cid, level = 0) {
-    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
+    let Base64hashKey = Buffer.from(Boho.sha256.hash(keyStr)).toString('base64')
     this.AUTH.set(id, { key: Base64hashKey, cid: cid, level: level })
   }
 

package/src/auth/Auth_File.js

@@ -1,6 +1,6 @@
 import { BohoAuth } from './BohoAuth.js';
 import { readFileSync } from 'fs'
-import { sha256 } from 'boho'
+import Boho from 'boho'
 import path from 'path'
 
 export class Auth_File extends BohoAuth {
@@ -61,7 +61,7 @@ export class Auth_File extends BohoAuth {
   }
 
   addAuth(id, keyStr, cid, level = 0) {
-    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
+    let Base64hashKey = Buffer.from(Boho.sha256.hash(keyStr)).toString('base64')
     this.AUTH.set(id, { key: Base64hashKey, cid: cid, level: level })
   }
 

package/src/auth/Auth_Redis.js

@@ -1,5 +1,5 @@
 import { BohoAuth } from './BohoAuth.js';
-import { sha256 } from 'boho'
+import Boho from 'boho'
 const DEVICE_PREFIX = "device:"
 
 export class Auth_Redis extends BohoAuth {
@@ -28,7 +28,7 @@ export class Auth_Redis extends BohoAuth {
 
   // add device auth info
   async addAuth(id, keyStr, cid = '', level = 0) {
-    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
+    let Base64hashKey = Buffer.from(Boho.sha256.hash(keyStr)).toString('base64')
     return this.redis.hSet(DEVICE_PREFIX + id, { 'key': Base64hashKey, 'cid': cid, 'level': level })
   }
 

package/src/auth/BohoAuth.js

@@ -1,5 +1,5 @@
-import { MBP } from 'meta-buffer-pack'
-import { BohoMsg, Meta } from 'boho'
+import MBP from 'meta-buffer-pack'
+import Boho from 'boho'
 import { quotaTable } from '../common/quotaTable.js'
 import { serverOption } from '../server/serverOption.js'
 import { IOMsg, CLIENT_STATE } from '../common/constants.js'
@@ -22,17 +22,17 @@ export class BohoAuth {
     }
 
     console.log('## AUTH_FAIL reason:', reason)
-    // peer.send( Buffer.from( [BohoMsg.AUTH_FAIL] ))
+    // peer.send( Buffer.from( [Boho.BohoMsg.AUTH_FAIL] ))
     peer.setState(CLIENT_STATE.AUTH_FAIL)
     setTimeout(e => {
-      peer.send(Buffer.from([BohoMsg.AUTH_FAIL]))
+      peer.send(Buffer.from([Boho.BohoMsg.AUTH_FAIL]))
     }, serverOption.auth.delay_auth_fail)
   }
 
   async verify_auth_hmac(auth_hmac, peer) {
     try {
       //1. unpack 
-      let infoPack = MBP.unpack(auth_hmac, Meta.AUTH_HMAC)
+      let infoPack = MBP.unpack(auth_hmac, Boho.Meta.AUTH_HMAC)
       if (!infoPack) {
         this.send_auth_fail(peer, 'unpack auth_pack fail');
         return

package/src/client/CongPacket.js

@@ -1,5 +1,5 @@
 import { Transform } from 'stream'
-import { MBP } from 'meta-buffer-pack'
+import MBP from 'meta-buffer-pack'
 
 export const CongType = {
   TYPE_LEN1: 1,

package/src/client/IOCore.js

@@ -1,10 +1,11 @@
-import { MBP, Buffer } from 'meta-buffer-pack'
+import MBP from 'meta-buffer-pack'
 import EventEmitter from "eventemitter3";
-import { Boho, BohoMsg, MetaSize } from "boho";
 import { IOMsg, PAYLOAD_TYPE, SIZE_LIMIT, ENC_MODE, STATES } from '../common/constants.js'
 import { quotaTable } from '../common/quotaTable.js'
 import { getSignalPack } from '../common/payload.js';
+import Boho from "boho";
 
+const Buffer = MBP.Buffer;
 const encoder = new TextEncoder()
 const decoder = new TextDecoder()
 
@@ -146,7 +147,7 @@ export class IOCore extends EventEmitter {
     let msgType = buffer[0];
     let decoded;
 
-    if (msgType === BohoMsg.ENC_488) {
+    if (msgType === Boho.BohoMsg.ENC_488) {
       decoded = this.boho.decrypt_488(buffer)
       if (decoded) {
         msgType = decoded[0]
@@ -154,7 +155,7 @@ export class IOCore extends EventEmitter {
       } else {
         // console.log('DEC_FAIL', buffer.byteLength)
       }
-    } else if (msgType === BohoMsg.ENC_E2E) {
+    } else if (msgType === Boho.BohoMsg.ENC_E2E) {
 
       try {
         decoded = this.boho.decrypt_488(buffer)
@@ -162,8 +163,8 @@ export class IOCore extends EventEmitter {
           // console.log( 'ENC_E2E decoded ', decoded )
           msgType = decoded[0]
           // decoded has msg_header only. 
-          buffer.set(decoded, MetaSize.ENC_488) // set decoded signal_e2e headaer.
-          buffer = buffer.subarray(MetaSize.ENC_488) // reset offset.
+          buffer.set(decoded, Boho.MetaSize.ENC_488) // set decoded signal_e2e headaer.
+          buffer = buffer.subarray(Boho.MetaSize.ENC_488) // reset offset.
           // console.log('DECODED MsgType:', IOMsg[ msgType ] )
         } else {
           // console.log('488 DEC_FAIL', buffer)
@@ -178,7 +179,7 @@ export class IOCore extends EventEmitter {
     }
 
     let type = IOMsg[msgType]
-    if (!type) type = BohoMsg[msgType]
+    if (!type) type = Boho.BohoMsg[msgType]
 
     // console.log( "MsgType: ", type , " LEN ", buffer.byteLength)
 
@@ -355,7 +356,7 @@ export class IOCore extends EventEmitter {
         this.testPromise(buffer)
         break;
 
-      case BohoMsg.AUTH_NONCE:
+      case Boho.BohoMsg.AUTH_NONCE:
         let auth_hmac = this.boho.auth_hmac(buffer)
         if (auth_hmac) {
           this.send(auth_hmac)
@@ -364,11 +365,11 @@ export class IOCore extends EventEmitter {
         }
         break;
 
-      case BohoMsg.AUTH_FAIL:
+      case Boho.BohoMsg.AUTH_FAIL:
         this.stateChange('auth_fail', 'server reject auth.')
         break;
 
-      case BohoMsg.AUTH_ACK:
+      case Boho.BohoMsg.AUTH_ACK:
         if (this.boho.check_auth_ack_hmac(buffer)) {
           this.stateChange('auth_ready', 'server sent auth_ack')
           this.send(Buffer.from([IOMsg.CID_REQ]))
@@ -484,7 +485,7 @@ export class IOCore extends EventEmitter {
       // encrypt signal_header area only. payload is encrypted with e2e key already.
       let tagLen = data[1]
       let encHeader = this.boho.encrypt_488(data.subarray(0, 3 + tagLen))
-      encHeader[0] = BohoMsg.ENC_E2E
+      encHeader[0] = Boho.BohoMsg.ENC_E2E
       this.send(Buffer.concat([encHeader, data.subarray(3 + tagLen)]))
       // console.log('<< send_enc_mode [ ENC_E2E ]')
 

package/src/client/IOWebSocket.js

@@ -1,11 +1,16 @@
 import { IOCore } from "./IOCore.js";
-import { Buffer } from 'meta-buffer-pack'
-export { Boho, RAND, BohoMsg, Meta, MetaSize, sha256, MBP, Buffer } from 'boho'
-export * from '../common/constants.js'
+import Boho from 'boho'
+import * as constants from '../common/constants.js'
+
+const Buffer = Boho.Buffer
 
 // Browser WebSocket
-export class IO extends IOCore {
+export default class IO extends IOCore {
   static binaryType = "arraybuffer"
+  static Boho = Boho;
+  static MBP = Boho.MBP;
+  static Buffer = Boho.Buffer;
+  static constants = constants
 
   constructor(url) {
     super(url);

package/src/common/payload.js

@@ -1,4 +1,4 @@
-import { MBP } from 'meta-buffer-pack'
+import MBP from 'meta-buffer-pack'
 import { PAYLOAD_TYPE, IOMsg } from "./constants.js";
 const encoder = new TextEncoder()
 

package/src/server/Manager.js

@@ -1,4 +1,4 @@
-import { MBP } from 'meta-buffer-pack'
+import MBP from 'meta-buffer-pack'
 import { Remote } from './Remote.js'
 import { serverOption } from './serverOption.js'
 import { IOMsg, CLIENT_STATE } from '../common/constants.js'

package/src/server/RemoteCore.js

@@ -1,6 +1,6 @@
-import { webcrypto } from 'crypto';
-import { MBP } from 'meta-buffer-pack'
-import { Boho, BohoMsg, MetaSize } from 'boho'
+// import { webcrypto } from 'crypto';
+import MBP from 'meta-buffer-pack'
+import Boho from 'boho'
 import { serverOption } from './serverOption.js';
 import { IOMsg, ENC_MODE, CLIENT_STATE } from '../common/constants.js'
 import { quotaTable } from '../common/quotaTable.js'
@@ -70,7 +70,7 @@ export class RemoteCore {
     let from = this.boho.isAuthorized ? `did: ${this.did} ${this.cid}@` : `${this.cid}@`
     if (isBinary) {
       let msgTypeName = IOMsg[message[0]]
-      if (!msgTypeName) msgTypeName = BohoMsg[message[0]]
+      if (!msgTypeName) msgTypeName = Boho.BohoMsg[message[0]]
       msgTypeName = ' [' + msgTypeName + ']';
       if (message.byteLength > 40) {
         console.log(from + msgTypeName + ' LEN:', message.length);
@@ -119,7 +119,7 @@ export class RemoteCore {
     if (isBinary) {
       msgType = message[0]
 
-      if (msgType === BohoMsg.ENC_488) {
+      if (msgType === Boho.BohoMsg.ENC_488) {
 
         try {
           decoded = this.boho.decrypt_488(message)
@@ -135,7 +135,7 @@ export class RemoteCore {
           return
         }
 
-      } else if (msgType === BohoMsg.ENC_E2E) { // symetric E2EE Signal
+      } else if (msgType === Boho.BohoMsg.ENC_E2E) { // symetric E2EE Signal
         try {
           decoded = this.boho.decrypt_488(message)
         } catch (err) {
@@ -145,14 +145,14 @@ export class RemoteCore {
         // console.log('e2e unpack:', decoded )
         if (decoded) {
           msgType = decoded[0]
-          message.set(decoded, MetaSize.ENC_488) // set decoded signal_e2e headaer.
-          message = message.subarray(MetaSize.ENC_488) // reset offset.
+          message.set(decoded, Boho.MetaSize.ENC_488) // set decoded signal_e2e headaer.
+          message = message.subarray(Boho.MetaSize.ENC_488) // reset offset.
         } else {
           return
         }
 
       } else {
-        // console.log( `[P] ${ IOMsg[ msgType] || BohoMsg[cmd]}  LEN: ${message.byteLength}` )
+        // console.log( `[P] ${ IOMsg[ msgType] || Boho.BohoMsg[cmd]}  LEN: ${message.byteLength}` )
       }
 
       switch (msgType) {
@@ -170,7 +170,7 @@ export class RemoteCore {
           }
 
           if (!this.cid) {
-            this.cid = '?' + webcrypto.getRandomValues(Buffer.alloc(3)).toString('base64url')
+            this.cid = '?' + globalThis.crypto.getRandomValues(Buffer.alloc(3)).toString('base64url')
             this.manager.cid2remote.set(this.cid, this)
           }
 
@@ -290,7 +290,7 @@ export class RemoteCore {
 
 
         // Auth
-        case BohoMsg.AUTH_REQ:
+        case Boho.BohoMsg.AUTH_REQ:
           if (!this.manager.authManager) return
           if (this.state < CLIENT_STATE.SENT_SERVER_READY) {
             // console.log('protocol error. auth_req before server_ready')
@@ -303,7 +303,7 @@ export class RemoteCore {
           this.setState(CLIENT_STATE.SENT_SERVER_NONCE)
           break;
 
-        case BohoMsg.AUTH_HMAC:
+        case Boho.BohoMsg.AUTH_HMAC:
           if (!this.manager.authManager) return
           if (this.state < CLIENT_STATE.SENT_SERVER_NONCE) {
             // console.log('protocol error. auth_hmac before server_nonce')
@@ -387,7 +387,7 @@ export class RemoteCore {
       // console.log('server bypass E2E signal taginfo:', tagInfo )
 
       let encHeader = this.boho.encrypt_488(data.subarray(0, 3 + tagLen))
-      encHeader[0] = BohoMsg.ENC_E2E
+      encHeader[0] = Boho.BohoMsg.ENC_E2E
       let newEncBuffer = Buffer.concat([encHeader, data.subarray(3 + tagLen)])
       this.send(newEncBuffer)
 

package/test-browser/index.html

@@ -18,14 +18,14 @@
   <h2>Simple pub sub example.</h2>
   <p>you should start server first.</p>
   <p>this index.html load two types of modules. </p>
-  <h5>1. IIFE: iosignal.min.js</h5>
+  <h5>1. IIFE: iosignal-iife.js</h5>
   <p>use global name: IO </p>
   <p>IO has props: Boho, MBP, Buffer,, </p>
-  <h5>2. ESM: iosignal.esm.js</h5>
+  <h5>2. ESM: iosignal.js</h5>
   <p> check the console.</p>
   <h2>message log</h2>
   <div id="messageView">...</div>
-  <script src="../dist/iosignal.min.js"></script>
+  <script src="../dist/iosignal.iife.js"></script>
   <script>
     console.log('IIFE:')
     console.log('IO', IO)
@@ -82,16 +82,16 @@
       addMessage('ws.error')
     }
   </script>
-  <!-- <script type="module">
-    import { IO, Boho, MBP, Buffer, sha256  } from "../dist/iosignal.esm.js"
+  <script type="module">
+    import IO from "../dist/iosignal.js"
     ESM_IO = IO 
     console.log('ESM:')
     console.log('IO', IO)
-    console.log('Boho', Boho )
-    console.log('MBP', MBP )
-    console.log('Buffer', Buffer)
-    console.log('sha256.hash("hi")',  sha256.hash('hi'))
-  </script> -->
+    console.log('Boho', IO.Boho )
+    console.log('MBP', IO.MBP )
+    console.log('Buffer', IO.Buffer)
+    console.log('sha256.hash("hi")',  IO.Boho.sha256.hash('hi'))
+  </script>
 </body>
 
 </html>

package/test-client-nodejs/client.cjs

@@ -1,7 +1,7 @@
 
-const { IO } = require('iosignal')
+const { IOWS } = require('iosignal')
 
-const io = new IO('ws://localhost:7777')
+const io = new IOWS('ws://localhost:7777')
 
 io.on('ready', () => {
   console.log('ready cid:', io.cid)

package/test-client-nodejs/client.mjs

@@ -1,7 +1,7 @@
 
-import { IO } from "iosignal"
+import { IOWS } from "iosignal"
 
-const io = new IO('ws://localhost:7777')
+const io = new IOWS('ws://localhost:7777')
 
 io.on('ready', () => {
   console.log('ready cid:', io.cid)

package/test-client-nodejs/client_api_reply.mjs

@@ -1,7 +1,7 @@
 
-import { IO } from "iosignal"
+import { IOWS } from "iosignal"
 
-const io = new IO('ws://localhost:7777')
+const io = new IOWS('ws://localhost:7777')
 
 io.on('ready', async () => {
   let res_echo = await io.req('reply', 'echo', 'hello')

package/test-client-nodejs/stateChange.mjs

@@ -1,7 +1,7 @@
 
-import { IO } from "iosignal"
+import { IOWS } from "iosignal"
 
-const io = new IO('ws://localhost:7777')
+const io = new IOWS('ws://localhost:7777')
 
 io.on('ready', () => {
   console.log('ready cid:', io.cid)

package/test-signal-payloadType/signaling.js

@@ -1,4 +1,4 @@
-import { IO, Server } from 'iosignal'
+import { IOWS, Server } from 'iosignal'
 
 let url = 'ws://localhost:5555'
 let server = new Server({
@@ -7,13 +7,13 @@ let server = new Server({
 })
 let done = false;
 
-let tx = new IO(url)
+let tx = new IOWS(url)
 tx.on('ready', () => {
   console.log('tx ready', tx.cid)
 })
 
 
-let rx = new IO(url)
+let rx = new IOWS(url)
 rx.on('ready', () => {
   console.log('rx ready', rx.cid)
 })