iosignal 3.2.0 → 3.3.0

package/examples/svelte-chat-js/package.json

@@ -17,6 +17,7 @@
 		"vite": "^7.0.4"
 	},
 	"dependencies": {
+		"@sveltejs/adapter-static": "^3.0.10",
 		"iosignal": "file:../.."
 	}
 }

package/examples/svelte-chat-js/src/app.html

@@ -3,6 +3,7 @@
 	<head>
 		<meta charset="utf-8" />
 		<link rel="icon" href="%sveltekit.assets%/favicon.svg" />
+		<link rel="stylesheet" href="%sveltekit.assets%/global.css" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		%sveltekit.head%
 	</head>

package/examples/svelte-chat-js/src/routes/+layout.svelte

@@ -2,8 +2,4 @@
   let { children } = $props();
 </script>
 
-<svelte:head>
-  <link rel="stylesheet" href="/global.css" />
-</svelte:head>
-
 {@render children()}

package/examples/svelte-chat-js/src/routes/+page.svelte

@@ -19,6 +19,11 @@
   };
 
   if (browser) {
+      let wsURL = new URL( document.URL )
+      wsURL.protocol = 'ws'
+      console.log( 'ws url:', wsURL.href)
+
+    // io = new IO(wsURL.href);
     io = new IO(url);
     if (dev)
       console.log("new io:", IO.version, IO.instanceCount, IO.webSocketCount);

package/examples/svelte-chat-js/svelte.config.js

@@ -1,4 +1,4 @@
-import adapter from '@sveltejs/adapter-auto';
+import adapter from '@sveltejs/adapter-static';
 import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 /** @type {import('@sveltejs/kit').Config} */
@@ -7,7 +7,15 @@ const config = {
     runes: true
   },
   kit: {
-    adapter: adapter()
+   		adapter: adapter({
+			// default options are shown. On some platforms
+			// these options are set automatically — see below
+			pages: 'build',
+			assets: 'build',
+			// fallback: 'index.html',
+			precompress: false,
+			strict: true
+		})
   },
   preprocess: vitePreprocess()
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iosignal",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "iosignal",
   "type": "module",
   "exports": {

package/src/api/RedisAPI.js

@@ -1,14 +1,21 @@
+/**
+ * RedisAPI <IOSignal API>
+ * 
+ * iosignal 클라이언트의 redis 질의 요청을 받으면, 
+ * redisClient 로 연결된 redis-server 에게 질의 후 결과를 되돌려 준다. 
+ * 
+ * client ex:  
+ * await io.req('redis','hget','user:id' )
+ * 
+ */
 import { STATUS } from './api_constant.js'
 
 const MIN_LEVEL = 200;
 const COMMANDS = [
-  'GET', 'SET',
-  'HGETALL', 'HGET',
-  'HSET', 'SADD',
-  'SISMEMBER', 'SMEMBERS',
-  'EXISTS', 'SREM',
-  'DEL', 'KEYS',
-  'SAVE'
+  'GET', 'SET', 'HGETALL', 'HGET', 'HSET', 'SADD', 'SISMEMBER',
+  'SMEMBERS', 'EXISTS', 'SREM', 'DEL', 'KEYS', 'SAVE',
+  'get', 'set', 'hGetAll', 'hGet', 'hSet', 'sAdd', 'sIsMember',
+  'sMembers', 'exists', 'sRem', 'del', 'keys', 'save'
 ]
 
 export class RedisAPI {
@@ -21,42 +28,23 @@ export class RedisAPI {
     this.commands = COMMANDS
   }
 
-
   checkPermission(remote, req) {
-    console.log('checkPermission', remote.level, 'vs', this.minLevel)
-    if (remote.level >= this.minLevel) {
-      return true
-    } else {
-      return false
-    }
+    return (remote.level >= this.minLevel) ? true : false;
   }
 
-
   async request(remote, req) {
-
     let result;
-    let status = STATUS.OK;
     try {
       let cmd = req.topic
-      cmd = cmd.toUpperCase()
-      if (COMMANDS.includes(cmd)) {
-        console.log('RedisAPI call:', cmd, req.args)
-
-        if (req.args.length > 0) {
-          result = await this.redisClient[cmd](...req.args)
-        } else {
-          result = await this.redisClient[cmd]()
-        }
-
-
+      if (req.args?.length > 0) {
+        result = await this.redisClient[cmd](...req.args)
       } else {
-        status = STATUS.ERROR;
+        result = await this.redisClient[cmd]()
       }
-      remote.response(req.mid, status, result)
+      remote.response(req.mid, STATUS.OK, result)
     } catch (e) {
       remote.response(req.mid, STATUS.ERROR, e.message)
     }
-
   }
 
 }

package/src/api/api_reply.js

@@ -1,17 +1,19 @@
 
+/**
+ * simple IOSignal API example.
+ */
 
 import { STATUS } from './api_constant.js'
+export const commands = ['echo', 'date', 'unixtime'];
 
 const MIN_LEVEL = 0;
-
 export function checkPermission(remote) {
-  if (remote.level >= MIN_LEVEL) {
-    return true
-  } else {
-    return false
-  }
+  return (remote.level >= MIN_LEVEL) ? true : false;
 }
 
+/**
+ * client api call example:  await io.req('reply','echo','hello')
+ */
 export async function echo(remote, req) {
   if (!req.args)
     remote.response(req.mid, STATUS.ERROR, 'no message to echo')
@@ -19,11 +21,17 @@ export async function echo(remote, req) {
     remote.response(req.mid, STATUS.OK, req.args)
 }
 
+/**
+ * client api call example:  await io.req('reply','date')
+ */
 export async function date(remote, req) {
   let r = new Date().toUTCString()
   remote.response(req.mid, STATUS.OK, r)
 }
 
+/**
+ * client api call example:  await io.req('reply','unixtime')
+ */
 export async function unixtime(remote, req) {
   let r = Math.floor(Date.now() / 1000)
   remote.response(req.mid, STATUS.OK, r)

package/src/api/api_sudo.js

@@ -1,7 +1,5 @@
 import { STATUS } from './api_constant.js'
 
-const MIN_LEVEL = 255;
-
 export const commands = [
   'cid', 'remotes', 'clients',
   'channels', 'subscribers',
@@ -11,13 +9,9 @@ export const commands = [
   'adddevice', 'getdevice', 'deldevice'
 ]
 
-
+const MIN_LEVEL = 255;
 export function checkPermission(remote) {
-  if (remote.level >= MIN_LEVEL) {
-    return true
-  } else {
-    return false
-  }
+  return (remote.level >= MIN_LEVEL) ? true : false;
 }
 
 export async function request(remote, req) {

package/src/auth/Auth_Redis.js

@@ -13,11 +13,15 @@ export class Auth_Redis extends BohoAuth {
 
   // get device key from DB. (for Boho auth.)
   async getAuth(id) {
-    let result = await this.redis.hGetAll(DEVICE_PREFIX + id)
-    if (result.key) return result
+    try {
+      let result = await this.redis.hGetAll(DEVICE_PREFIX + id)
+      if (result.key) return result
+    } catch (error) {
+      console.log('getAuth', error)
+    }
   }
 
-
+  //api_sudo call
   async getAuthIdList() {
     let result = await this.redis.keys(DEVICE_PREFIX + '*')
     result = result.map(v => {
@@ -32,6 +36,7 @@ export class Auth_Redis extends BohoAuth {
     return this.redis.hSet(DEVICE_PREFIX + id, { 'key': Base64hashKey, 'cid': cid, 'level': level })
   }
 
+  //api_sudo call
   async delAuth(id) {
     return this.redis.del(DEVICE_PREFIX + id)
   }

package/src/auth/BohoAuth.js

@@ -20,10 +20,9 @@ export class BohoAuth {
       let peerInfo = `FAIL #${peer.ssid} reason:${reason} `
       this.authLogger.log(peerInfo)
     }
-
-    console.log('## AUTH_FAIL reason:', reason)
-    // peer.send( Buffer.from( [Boho.BohoMsg.AUTH_FAIL] ))
+    // console.log('##### AUTH_FAIL reason: ', reason)
     peer.setState(CLIENT_STATE.AUTH_FAIL)
+    // add some delay time.
     setTimeout(e => {
       peer.send(Buffer.from([Boho.BohoMsg.AUTH_FAIL]))
     }, serverOption.auth.delay_auth_fail)
@@ -33,30 +32,31 @@ export class BohoAuth {
     try {
       //1. unpack 
       let infoPack = MBP.unpack(auth_hmac, Boho.Meta.AUTH_HMAC)
+
       if (!infoPack) {
         this.send_auth_fail(peer, 'unpack auth_pack fail');
         return
       }
-
+      
       let id = ""
       if (infoPack.id8.includes(0)) {
         id = decoder.decode(infoPack.id8.subarray(0, infoPack.id8.indexOf(0)));
       } else {
         id = decoder.decode(infoPack.id8);
       }
-
+      
       //2. get key of id from DB
       let authInfo = await this.getAuth(id)
 
-      // console.log('##### authInfo',authInfo )
-      if (serverOption.debug.showAuthInfo) {
-      }
-
       if (!authInfo) {
         this.send_auth_fail(peer, 'NO ID:' + id);
         return
       }
 
+      if (serverOption.debug.showAuthInfo) {
+        console.log('[debug]showAuthInfo',authInfo )
+      }
+
       // console.log('db authInfo.key: ', authInfo.key)
       peer.boho.copy_id8(infoPack.id8)
       // type of key
@@ -107,6 +107,7 @@ export class BohoAuth {
 
       //6. delete current (temp rand)cid if exist.
       if (peer.cid) {
+        console.log('duplicate cid')
         peer.manager.cid2remote.delete(peer.cid)
       }
 
@@ -114,6 +115,7 @@ export class BohoAuth {
       peer.did = id
       peer.cid = authInfo.cid
       peer.nick = authInfo.cid // temporary: nick as cid
+      if( authInfo.uid ) peer.uid = authInfo.uid 
 
       //8. setting quota level. 
       let quotaLevel = serverOption.defaultQuotaIndex;
@@ -152,13 +154,11 @@ export class BohoAuth {
       }
       return authInfo
     } catch (error) {
-      this.send_auth_fail(peer, 'caught: unknown error' + error);
+      this.send_auth_fail(peer, '[BohoAuth]caught: unknown error:' + error);
     }
 
   }
 
 
-
-
 }
 

package/src/client/CongPacket.js

@@ -11,6 +11,8 @@ export const CongType = {
 // support LittleEndian system.
 export function pack(payload) {
 
+  if( payload.byteLength == undefined ) payload = Buffer.from(payload)
+  
   if (payload.byteLength < 256) { //one byte len
     return MBP.pack(
       MBP.MB('#type', '8', CongType.TYPE_LEN1),

package/src/client/IOCore.js

@@ -207,7 +207,7 @@ export class IOCore extends EventEmitter {
   close() {
     if (this._closed) return;
     this._closed = true;
-
+// console.log('####### IOCOre.js close() called')
     // If auto-reconnect is disabled, we must stop the keep-alive timer.
     if (this.autoReconnect === false) {
       clearInterval(this.connectionCheckerIntervalID);
@@ -430,13 +430,26 @@ export class IOCore extends EventEmitter {
       case IOMsg.PONG:
         break;
 
+      case IOMsg.ECHO:
+        try {
+          let str = decoder.decode(buffer.subarray(1))
+          
+          this.emit('echo', str)
+        } catch (error) {
+          this.emit('error', new Error('ECHO data error'))
+        }
+        break;
+        
       case IOMsg.IAM_RES:
         try {
           let str = decoder.decode(buffer.subarray(1))
           let jsonInfo = JSON.parse(str)
-          if (jsonInfo.ip) {
-            this.ip = jsonInfo.ip;
-          }
+          if (jsonInfo.ip) { this.ip = jsonInfo.ip; }
+          if (jsonInfo.nick) { this.nick = jsonInfo.nick; }
+          if (jsonInfo.did) { this.did = jsonInfo.did; }
+          if (jsonInfo.uid) { this.uid = jsonInfo.uid; }
+          // TIP. cid from [CID_RES], level from [QUOTA_LEVEL]
+          this.emit('iam_res', str )
         } catch (error) {
           this.emit('error', new Error('IAM_RES data error'))
         }
@@ -455,13 +468,14 @@ export class IOCore extends EventEmitter {
         let quotaLevel = buffer[1]
         this.level = quotaLevel;
         this.quota = quotaTable[quotaLevel];
-        console.log('## QUOTA:', quotaLevel, JSON.stringify(this.quota))
+        console.log('[QUOTA_LEVEL]', JSON.stringify(this.quota))
         break;
 
       case IOMsg.SERVER_CLEAR_AUTH:
         this.useAuth = false;
         this.boho.clearAuth();
         this.stop();
+        console.log('[SERVER_CLEAR_AUTH] io stop.')
         break;
 
       case IOMsg.SERVER_REDIRECT:
@@ -668,7 +682,7 @@ export class IOCore extends EventEmitter {
    */
   echo(args) {
     if (args) {
-      console.log('echo args:', args)
+      // console.log('send echo args:', args)
       this.send_enc_mode(MBP.pack(
         MBP.MB('#MsgType', '8', IOMsg.ECHO),
         MBP.MB('#msg', args)
@@ -757,13 +771,13 @@ export class IOCore extends EventEmitter {
    */
   setMsgPromise(mid) {
     return new Promise((resolve, reject) => {
-      this.promiseMap.set(mid, [resolve, reject])
-      setTimeout(e => {
+      const timeoutId = setTimeout(e => {
         if (this.promiseMap.has(mid)) {
           reject('timeout');
           this.promiseMap.delete(mid)
         }
       }, this.promiseTimeOut);
+      this.promiseMap.set(mid, [resolve, reject, timeoutId]);
     })
   }
 
@@ -777,7 +791,8 @@ export class IOCore extends EventEmitter {
     if (!res) return
 
     if (this.promiseMap.has(res.mid)) {
-      let [resolve, reject] = this.promiseMap.get(res.mid)
+      let [resolve, reject, timeoutId] = this.promiseMap.get(res.mid)
+      clearTimeout(timeoutId)
       this.promiseMap.delete(res.mid)
 
       if (res.status < 128) {
@@ -886,9 +901,9 @@ export class IOCore extends EventEmitter {
 
 
   /**
-   * Sends a request to a target and topic.
-   * @param {string} target - The target of the request.
-   * @param {string} topic - The topic of the request.
+   * Sends a request to a target and topic.(remote api call)
+   * @param {string} target - The target(api name) of the request.
+   * @param {string} topic - The topic(api function name) of the request.
    * @param {...any} args - Optional arguments for the request.
    * @returns {Promise<any>}
    */
@@ -1164,6 +1179,7 @@ export class IOCore extends EventEmitter {
     // STATES constant name : string upperCase
     // eventName, .stateName : string lowerCase
     // .state : number
+    // console.log('### stateChange reason:', emitEventAndMessage )
     let eventName = state.toLowerCase()
     this.state = STATES[state.toUpperCase()] // state: number
     if (emitEventAndMessage) this.emit(eventName, emitEventAndMessage)

package/src/server/Manager.js

@@ -193,11 +193,11 @@ export class Manager {
   }
 
   sender(tag, remote, message) {
-    if (serverOption.memberOnly && !remote.boho.isAuthorized) {
-      // console.log("## MemberOnly, reject unAuthorized remote." )
+    if (serverOption.membersOnly && !remote.boho.isAuthorized) {
+      console.log("[membersOnly] unAuthorized remote.",tag  )
       remote.send(Buffer.from([IOMsg.SERVER_CLEAR_AUTH]))
       remote.close()
-      return ['err', 'not autrized']
+      return ['err', 'unAuthorized']
     }
 
     if (tag.indexOf('$') == 0) return ['err', 'prefix $ is reserved for userSet tag.']
@@ -444,6 +444,5 @@ export class Manager {
     this.retain_messages.clear();
     this.channel_map.clear();
 
-    console.log('Manager closed');
   }
 }

package/src/server/Metric.js

@@ -118,8 +118,7 @@ export class Metric {
           ip: remote.ip,
           uptime: Math.trunc((Date.now() - remote.socket.openTime) / 1000),
           nick: remote.nick,
-          ssid: remote.ssid,
-          echo: remote.lastEchoMessage
+          ssid: remote.ssid
         }
       } else if (mode == 3) {
         return {

package/src/server/RemoteCore.js

@@ -27,15 +27,13 @@ export class RemoteCore {
     this.ssid = RemoteCore.ssid++;  // ordered index number
     this.manager = manager;
 
-    this.cid; // Communication Id
-    this.did; // Device Id
-    this.uid; // User Id
-    this.nick = ""
+    this.cid = ''; // Communication Id
+    this.did = ''; // Device Id
+    this.uid = ''; // User Id
+    this.nick = ''
 
-
-    this.lastEchoMessage = "N"
     this.privateNode = false
-    this.HOME_CHANNEL = ""
+    this.HOME_CHANNEL = ''
     this.level = serverOption.defaultQuotaIndex;
     this.quota = quotaTable[this.level];
     this.isAdmin = false;
@@ -51,7 +49,8 @@ export class RemoteCore {
   setState(state) {
     this.state = state
     if (serverOption.debug.showAuthInfo) {
-      this.stateLog.push(state)
+      // let s = state + ":" + CLIENT_STATE[ state] 
+      this.stateLog.push( state  )
       console.log(this.stateLog.join('>'))
     }
   }
@@ -66,7 +65,7 @@ export class RemoteCore {
 
 
   showMessageLog(message, isBinary) {
-    let from = this.boho.isAuthorized ? `did: ${this.did} ${this.cid}@` : `${this.cid}@`
+    let from = this.boho.isAuthorized ? `[FROM]did: ${this.did} cid:${this.cid}` : `[FROM]cid:${this.cid}`
     if (isBinary) {
       let msgTypeName = IOMsg[message[0]]
       if (!msgTypeName) msgTypeName = Boho.BohoMsg[message[0]]
@@ -165,6 +164,7 @@ export class RemoteCore {
         case IOMsg.CID_REQ:
           if (this.state < CLIENT_STATE.SENT_SERVER_READY) {
             // Protocol violation: CID_REQ was sent before receiving the SERVER_READY signal.
+            console.log('CID_REQ before SERVER_READY')
             this.close()
           }
 
@@ -182,22 +182,16 @@ export class RemoteCore {
           this.setState(CLIENT_STATE.CID_READY)
           break;
 
-
-        case IOMsg.ECHO: // TEXT only 
-          try {
-            let msg = decoder.decode(message.subarray(1))
-            this.lastEchoMessage = msg
-          } catch (error) {
-            // console.log('ECHO message is not a text')
+        case IOMsg.ECHO:
+          if( message.byteLength < 30) {      
+            this.send(message, isBinary)
           }
-          this.send(message, isBinary)
           break;
 
         case IOMsg.IAM:
-          if (message.byteLength > 1) {
-            let iamInfo = message.subarray(1)
-            this.nick = decoder.decode(iamInfo)
-            console.log('iam nick reset', this.nick)
+          if (message.byteLength > 1 && message.byteLength < 30) {            
+              // if iam request has a text message then reset the nick property.
+              this.nick = decoder.decode(message.subarray(1))
           }
           this.iamResponse()
           break;
@@ -218,7 +212,7 @@ export class RemoteCore {
 
         case IOMsg.UNSUBSCRIBE:
           if (message.byteLength == 2) {
-            this.manager.unsubscribe([""], this)
+            this.manager.unsubscribe([''], this)
           } else if (message.byteLength >= 3) {
             let tagLen = message.readUInt8(1)
 
@@ -292,7 +286,7 @@ export class RemoteCore {
         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')
+            console.log('protocol error. auth_req before server_ready')
             this.close();
           }
           this.setState(CLIENT_STATE.RECV_AUTH_REQ)
@@ -305,22 +299,23 @@ export class RemoteCore {
         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')
+            console.log('protocol error. auth_hmac before server_nonce')
             this.close();
           }
           this.setState(CLIENT_STATE.RECV_AUTH_HMAC)
           //async
           this.manager.authManager.verify_auth_hmac(message, this)
             .then(authInfo => {
-              if (authInfo) {
-                this.manager.deligateSignal(remote, '@$name', authInfo.name)
+              if (authInfo?.name) {
+                this.manager.deligateSignal(this, '@$name', authInfo.name)
                 // console.log('device login success authInfo', authInfo)
                 // this.manager.sender('@$name', authInfo.name )
               }
 
+              // console.log('[VERIFY AUTH_HMAC] SubClass of BohoAuth return authInfo:', authInfo )
             })
             .catch(e => {
-
+              console.log('authInfo return fail.', e )
             })
 
           return;
@@ -348,23 +343,19 @@ export class RemoteCore {
   response(msgId, statusCode, body) {
     // console.log('response body', body)
     if (body) {
-
       this.send_enc_mode(MBP.pack(
         MB('#type', '8', IOMsg.RESPONSE_MBP),
         MB('status', '8', statusCode),
         MB('mid', '16', msgId),
         MB('body', body)
       ))
-
     } else {
       this.send_enc_mode(MBP.pack(
         MB('#type', '8', IOMsg.RESPONSE_MBP),
         MB('status', '8', statusCode),
         MB('mid', '16', msgId)
       ))
-
     }
-
   }
 
 
@@ -407,9 +398,9 @@ export class RemoteCore {
 
 
 
-  iamResponse(info = "") {
+  iamResponse(info = '') {
 
-    if (info == "") {
+    if (info == '') {
       let channels = []
       for (let tag of this.channels.keys()) {
         channels.push(tag)
@@ -417,15 +408,17 @@ export class RemoteCore {
 
       info = {
         "ssid": this.ssid,
-        "uid": this.uid,
         "cid": this.cid,
         "did": this.did,
+        "uid": this.uid,
+        "level": this.level,
         "nick": this.nick,
         "ip": this.ip
         , 'tag': channels
       }
     }
 
+    // console.log( 'iam res info', info )
     let pack = MBP.pack(
       MB('#MsgType', '8', IOMsg.IAM_RES),
       MB('#info', info)