iosignal 1.7.0 → 1.8.0

package/src/api/api_sudo.js

@@ -1,91 +1,91 @@
-import { STATUS } from './api_constant.js'
-
-const MIN_LEVEL = 255;
-
-export const commands = [
-  'cid', 'remotes', 'clients',
-  'channels', 'subscribers',
-  'remote', 'client', 'close',
-  'addauth', 'getauth', 'delauth',
-  'getauthidlist', 'getdevicelist',
-  'adddevice', 'getdevice', 'deldevice'
-]
-
-
-export function checkPermission(remote) {
-  if (remote.level >= MIN_LEVEL) {
-    return true
-  } else {
-    return false
-  }
-}
-
-export async function request(remote, req) {
-  let result;
-  let status = 0;
-  try {
-    let cmd = req.topic;
-    cmd = cmd.toLowerCase()
-    if (cmd == 'cid') {
-      result = remote.manager.metric.getCIdList()
-    } else if (cmd == 'remotes' || cmd == 'clients') {
-      result = remote.manager.metric.getRemotes()
-    } else if (cmd == 'channels') {
-      result = remote.manager.metric.getChannelList()
-    } else if (cmd == 'subscribers') {
-      let ch = req.$[0]
-      if (ch) result = remote.manager.metric.getSubscribers(ch)
-    } else if (cmd == 'remote' || cmd == 'client') {
-      let cid = req.$[0]
-      let mode = req.$[1]
-      if (cid) result = remote.manager.metric.getRemoteByCId(cid, mode)
-
-    } else if (cmd == 'close') {
-      if (req.$[0]) result = remote.manager.closeRemoteByCId(req.$[0])
-
-    } else if (cmd == 'addauth' || cmd == 'adddevice') {
-      if (remote.manager.authManager && req.$.length == 4) {
-        if (remote.manager.authManager.addAuth) {
-          let did = req.$[0]
-          let dkey = req.$[1]
-          let cid = req.$[2]
-          let level = req.$[3]
-          result = await remote.manager.authManager.addAuth(did, dkey, cid, level)
-        }
-
-      }
-    } else if (cmd == 'delauth' || cmd == 'deldevice') {
-      if (remote.manager.authManager && req.$.length == 1) {
-        if (remote.manager.authManager.delAuth) {
-          let did = req.$[0]
-          result = await remote.manager.authManager.delAuth(did)
-        }
-      }
-    } else if (cmd == 'getauth' || cmd == 'getdevice') {
-      if (remote.manager.authManager && req.$.length == 1) {
-        if (remote.manager.authManager.getAuth) {
-          let did = req.$[0]
-          result = await remote.manager.authManager.getAuth(did)
-        }
-      }
-    } else if (cmd == 'getauthidlist' || cmd == 'getdevicelist') {
-      if (remote.manager.authManager) {
-        if (remote.manager.authManager.getAuthIdList) {
-          result = await remote.manager.authManager.getAuthIdList()
-        }
-      }
-    } else {
-      status = STATUS.ERROR;
-      result = "api sudo: no such a cmd: " + cmd
-    }
-
-    remote.response(req.mid, status, result)
-
-  } catch (e) {
-    remote.response(req.mid, STATUS.ERROR, e.message)
-  }
-
-}
-
-
-
+import { STATUS } from './api_constant.js'
+
+const MIN_LEVEL = 255;
+
+export const commands = [
+  'cid', 'remotes', 'clients',
+  'channels', 'subscribers',
+  'remote', 'client', 'close',
+  'addauth', 'getauth', 'delauth',
+  'getauthidlist', 'getdevicelist',
+  'adddevice', 'getdevice', 'deldevice'
+]
+
+
+export function checkPermission(remote) {
+  if (remote.level >= MIN_LEVEL) {
+    return true
+  } else {
+    return false
+  }
+}
+
+export async function request(remote, req) {
+  let result;
+  let status = 0;
+  try {
+    let cmd = req.topic;
+    cmd = cmd.toLowerCase()
+    if (cmd == 'cid') {
+      result = remote.manager.metric.getCIdList()
+    } else if (cmd == 'remotes' || cmd == 'clients') {
+      result = remote.manager.metric.getRemotes()
+    } else if (cmd == 'channels') {
+      result = remote.manager.metric.getChannelList()
+    } else if (cmd == 'subscribers') {
+      let ch = req.$[0]
+      if (ch) result = remote.manager.metric.getSubscribers(ch)
+    } else if (cmd == 'remote' || cmd == 'client') {
+      let cid = req.$[0]
+      let mode = req.$[1]
+      if (cid) result = remote.manager.metric.getRemoteByCId(cid, mode)
+
+    } else if (cmd == 'close') {
+      if (req.$[0]) result = remote.manager.closeRemoteByCId(req.$[0])
+
+    } else if (cmd == 'addauth' || cmd == 'adddevice') {
+      if (remote.manager.authManager && req.$.length == 4) {
+        if (remote.manager.authManager.addAuth) {
+          let did = req.$[0]
+          let dkey = req.$[1]
+          let cid = req.$[2]
+          let level = req.$[3]
+          result = await remote.manager.authManager.addAuth(did, dkey, cid, level)
+        }
+
+      }
+    } else if (cmd == 'delauth' || cmd == 'deldevice') {
+      if (remote.manager.authManager && req.$.length == 1) {
+        if (remote.manager.authManager.delAuth) {
+          let did = req.$[0]
+          result = await remote.manager.authManager.delAuth(did)
+        }
+      }
+    } else if (cmd == 'getauth' || cmd == 'getdevice') {
+      if (remote.manager.authManager && req.$.length == 1) {
+        if (remote.manager.authManager.getAuth) {
+          let did = req.$[0]
+          result = await remote.manager.authManager.getAuth(did)
+        }
+      }
+    } else if (cmd == 'getauthidlist' || cmd == 'getdevicelist') {
+      if (remote.manager.authManager) {
+        if (remote.manager.authManager.getAuthIdList) {
+          result = await remote.manager.authManager.getAuthIdList()
+        }
+      }
+    } else {
+      status = STATUS.ERROR;
+      result = "api sudo: no such a cmd: " + cmd
+    }
+
+    remote.response(req.mid, status, result)
+
+  } catch (e) {
+    remote.response(req.mid, STATUS.ERROR, e.message)
+  }
+
+}
+
+
+

package/src/auth/Auth_Env.js

@@ -1,76 +1,76 @@
-/**
- * Auth_Env.js
- * 
- * You can use environment variable BOHO_AUTH.
- * 
- *  BOHO_AUTH=id1.key1.level,id2:key2.level 
- * 
- *  or constructor parameter.
- * 
- * 
- * [ authInfo ]
- *  id: <String> max 8chars
- *  key: <String>
- *  level: <Numbrer> range: 0~255
- *  separator: ','
- * 
- * example => process.env.BOHO_AUTH=id1.key1.255,id2.key2.200
- */
-
-import { BohoAuth } from './BohoAuth.js';
-import { sha256 } from 'boho'
-
-export class Auth_Env extends BohoAuth {
-  constructor(authInfo) {
-    super()
-    let id_keys;
-    if (authInfo) {
-      id_keys = authInfo.split(',')
-    } else if (process.env.BOHO_AUTH) {
-      authInfo = process.env.BOHO_AUTH
-      id_keys = process.env.BOHO_AUTH.split(',')
-    } else {
-      console.log("Auth_Env: None of process.env.BOHO_AUTH or authInfo")
-      process.exit()
-    }
-
-    this.AUTH = new Map();
-
-    if (id_keys.length >= 1) {
-      id_keys.forEach(v => {
-
-        let did = v.split('.')[0]
-        let key = v.split('.')[1]
-        let level = v.split('.')[2]
-        level = parseInt(level)
-
-        if (did && key && typeof level == 'number') {
-          let cid = did;
-          this.addAuth(did, key, cid, level)
-        } else {
-          console.log("Wrong process.env.BOHO_AUTH authentication value.", id, key, level)
-          process.exit();
-        }
-      })
-
-    } else {
-      console.log("Wrong process.env.BOHO_AUTH authentication value.")
-      process.exit();
-    }
-
-  }
-
-  async getAuth(id) {
-    return this.AUTH.get(id)
-  }
-  async getAuthIdList() {
-    return Array.from(this.AUTH.keys())
-  }
-
-  addAuth(id, keyStr, cid, level = 0) {
-    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
-    this.AUTH.set(id, { key: Base64hashKey, cid: cid, level: level })
-  }
-
-}
-
+/**
+ * Auth_Env.js
+ * 
+ * You can use environment variable BOHO_AUTH.
+ * 
+ *  BOHO_AUTH=id1.key1.level,id2:key2.level 
+ * 
+ *  or constructor parameter.
+ * 
+ * 
+ * [ authInfo ]
+ *  id: <String> max 8chars
+ *  key: <String>
+ *  level: <Numbrer> range: 0~255
+ *  separator: ','
+ * 
+ * example => process.env.BOHO_AUTH=id1.key1.255,id2.key2.200
+ */
+
+import { BohoAuth } from './BohoAuth.js';
+import { sha256 } from 'boho'
+
+export class Auth_Env extends BohoAuth {
+  constructor(authInfo) {
+    super()
+    let id_keys;
+    if (authInfo) {
+      id_keys = authInfo.split(',')
+    } else if (process.env.BOHO_AUTH) {
+      authInfo = process.env.BOHO_AUTH
+      id_keys = process.env.BOHO_AUTH.split(',')
+    } else {
+      console.log("Auth_Env: None of process.env.BOHO_AUTH or authInfo")
+      process.exit()
+    }
+
+    this.AUTH = new Map();
+
+    if (id_keys.length >= 1) {
+      id_keys.forEach(v => {
+
+        let did = v.split('.')[0]
+        let key = v.split('.')[1]
+        let level = v.split('.')[2]
+        level = parseInt(level)
+
+        if (did && key && typeof level == 'number') {
+          let cid = did;
+          this.addAuth(did, key, cid, level)
+        } else {
+          console.log("Wrong process.env.BOHO_AUTH authentication value.", id, key, level)
+          process.exit();
+        }
+      })
+
+    } else {
+      console.log("Wrong process.env.BOHO_AUTH authentication value.")
+      process.exit();
+    }
+
+  }
+
+  async getAuth(id) {
+    return this.AUTH.get(id)
+  }
+  async getAuthIdList() {
+    return Array.from(this.AUTH.keys())
+  }
+
+  addAuth(id, keyStr, cid, level = 0) {
+    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
+    this.AUTH.set(id, { key: Base64hashKey, cid: cid, level: level })
+  }
+
+}
+

package/src/auth/Auth_File.js

@@ -1,71 +1,71 @@
-import { BohoAuth } from './BohoAuth.js';
-import { readFileSync } from 'fs'
-import { sha256 } from 'boho'
-import path from 'path'
-
-export class Auth_File extends BohoAuth {
-  constructor(_path) {
-    super()
-    this.AUTH = new Map();
-    let pathObj = path.parse(_path)
-    this.path = path.resolve(_path)
-    console.log('auth from file path:', this.path)
-    let ext = pathObj.ext;
-    if (ext.toLowerCase() == '.js' || ext.toLowerCase() == '.mjs') {
-      // Read auth data from file
-      console.log("#JS path:", this.path);
-      this.loadAuthInfoFile_JS(this.path)
-    } else if (ext.toLowerCase() == '.json') {
-      console.log("#JSON path:", this.path);
-      this.loadAuthInfoFile_JSON(this.path)
-    } else {
-      console.log('no authinfofile path.')
-    }
-  }
-
-
-  async getAuth(id) {
-    return this.AUTH.get(id)
-  }
-
-  async getAuthIdList() {
-    return Array.from(this.AUTH.keys())
-  }
-
-  //loaded when server start.
-  loadAuthInfoFile_JS(path) {
-
-    import(path).then((file) => {
-
-      console.log(file.authInfo);
-      file.authInfo.forEach(item => {
-        this.addAuth(...item)
-      })
-      console.log('total AUTH INFO size: ', this.AUTH.size)
-    }).catch(e => {
-      console.log(e)
-    })
-
-
-  }
-
-  loadAuthInfoFile_JSON(path) {
-    let file = readFileSync(path)
-    file = new TextDecoder().decode(file)
-    let list = JSON.parse(file)
-    list.forEach(item => {
-      this.addAuth(...item)
-    })
-    console.log('total AUTH INFO size: ', this.AUTH.size)
-
-  }
-
-  addAuth(id, keyStr, cid, level = 0) {
-    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
-    this.AUTH.set(id, { key: Base64hashKey, cid: cid, level: level })
-  }
-
-
-
-}
-
+import { BohoAuth } from './BohoAuth.js';
+import { readFileSync } from 'fs'
+import { sha256 } from 'boho'
+import path from 'path'
+
+export class Auth_File extends BohoAuth {
+  constructor(_path) {
+    super()
+    this.AUTH = new Map();
+    let pathObj = path.parse(_path)
+    this.path = path.resolve(_path)
+    console.log('auth from file path:', this.path)
+    let ext = pathObj.ext;
+    if (ext.toLowerCase() == '.js' || ext.toLowerCase() == '.mjs') {
+      // Read auth data from file
+      console.log("#JS path:", this.path);
+      this.loadAuthInfoFile_JS(this.path)
+    } else if (ext.toLowerCase() == '.json') {
+      console.log("#JSON path:", this.path);
+      this.loadAuthInfoFile_JSON(this.path)
+    } else {
+      console.log('no authinfofile path.')
+    }
+  }
+
+
+  async getAuth(id) {
+    return this.AUTH.get(id)
+  }
+
+  async getAuthIdList() {
+    return Array.from(this.AUTH.keys())
+  }
+
+  //loaded when server start.
+  loadAuthInfoFile_JS(path) {
+
+    import(path).then((file) => {
+
+      console.log(file.authInfo);
+      file.authInfo.forEach(item => {
+        this.addAuth(...item)
+      })
+      console.log('total AUTH INFO size: ', this.AUTH.size)
+    }).catch(e => {
+      console.log(e)
+    })
+
+
+  }
+
+  loadAuthInfoFile_JSON(path) {
+    let file = readFileSync(path)
+    file = new TextDecoder().decode(file)
+    let list = JSON.parse(file)
+    list.forEach(item => {
+      this.addAuth(...item)
+    })
+    console.log('total AUTH INFO size: ', this.AUTH.size)
+
+  }
+
+  addAuth(id, keyStr, cid, level = 0) {
+    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
+    this.AUTH.set(id, { key: Base64hashKey, cid: cid, level: level })
+  }
+
+
+
+}
+

package/src/auth/Auth_Redis.js

@@ -1,44 +1,44 @@
-import { BohoAuth } from './BohoAuth.js';
-import { sha256 } from 'boho'
-const DEVICE_PREFIX = "device:"
-
-export class Auth_Redis extends BohoAuth {
-  constructor(redisClient) {
-    super()
-    if (!redisClient) {
-      throw new Error("AuthRedis constructor: no redisClient")
-    }
-    this.redis = redisClient
-  }
-
-  // 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
-  }
-
-
-  async getAuthIdList() {
-    let result = await this.redis.keys(DEVICE_PREFIX + '*')
-    result = result.map(v => {
-      return v.split(':')[1]
-    })
-    if (result) return result
-  }
-
-  // add device auth info
-  async addAuth(id, keyStr, cid = '', level = 0) {
-    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
-    return this.redis.hSet(DEVICE_PREFIX + id, { 'key': Base64hashKey, 'cid': cid, 'level': level })
-  }
-
-  async delAuth(id) {
-    return this.redis.del(DEVICE_PREFIX + id)
-  }
-
-  async save(id) {
-    return this.redis.save()
-  }
-
-}
-
+import { BohoAuth } from './BohoAuth.js';
+import { sha256 } from 'boho'
+const DEVICE_PREFIX = "device:"
+
+export class Auth_Redis extends BohoAuth {
+  constructor(redisClient) {
+    super()
+    if (!redisClient) {
+      throw new Error("AuthRedis constructor: no redisClient")
+    }
+    this.redis = redisClient
+  }
+
+  // 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
+  }
+
+
+  async getAuthIdList() {
+    let result = await this.redis.keys(DEVICE_PREFIX + '*')
+    result = result.map(v => {
+      return v.split(':')[1]
+    })
+    if (result) return result
+  }
+
+  // add device auth info
+  async addAuth(id, keyStr, cid = '', level = 0) {
+    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
+    return this.redis.hSet(DEVICE_PREFIX + id, { 'key': Base64hashKey, 'cid': cid, 'level': level })
+  }
+
+  async delAuth(id) {
+    return this.redis.del(DEVICE_PREFIX + id)
+  }
+
+  async save(id) {
+    return this.redis.save()
+  }
+
+}
+