sync with yodaos-project/yodart

Author: legendecas

CMakeLists.txt

@@ -65,7 +65,9 @@ target_include_directories(shadow-flora-cli PRIVATE
 target_link_libraries(shadow-flora-cli iotjs flora-cli caps)
 
 install(TARGETS shadow-flora-cli DESTINATION ${CMAKE_INSTALL_DIR})
-install(FILES index.js comp.js DESTINATION ${CMAKE_INSTALL_DIR})
+
+file(GLOB YODA_FLORA_SRC *.js)
+install(FILES ${YODA_FLORA_SRC} DESTINATION ${CMAKE_INSTALL_DIR})
 endif(BUILD_INDEPENDENT)
 
 target_compile_options(shadow-flora-cli PRIVATE

comp.js

@@ -8,41 +8,64 @@ var defaultConfig = {
   'reconnInterval': 10000
 }
 
-function FloraComp () {
-}
-
-FloraComp.prototype.init = function (fid, config) {
-  if (typeof fid !== 'string') {
-    fid = ''
-  }
+function FloraComp (fid, config) {
+  var furi
   if (typeof config !== 'object') {
     config = defaultConfig
   }
-  this.agent = new flora.Agent(config.uri + '#' + fid,
-    config.reconnInterval, config.bufsize)
+  if (typeof fid !== 'string') {
+    furi = config.uri
+  } else {
+    furi = config.uri + '#' + fid
+  }
+  this.agent = new flora.Agent(furi, config)
+}
 
+FloraComp.prototype.init = function () {
   if (typeof this.handlers === 'object') {
     Object.keys(this.handlers).forEach((key) => {
       var cb = this.handlers[key]
       if (typeof cb === 'function') {
         this.agent.subscribe(key, cb.bind(this))
       }
     })
-    this.agent.start()
   }
+
+  if (typeof this.remoteMethods === 'object') {
+    Object.keys(this.remoteMethods).forEach((key) => {
+      var cb = this.remoteMethods[key]
+      if (typeof cb === 'function') {
+        this.agent.declareMethod(key, cb.bind(this))
+      }
+    })
+  }
+
+  this.agent.start()
 }
 
-FloraComp.prototype.destruct = function () {
+FloraComp.prototype.deinit = function () {
   if (this.agent instanceof flora.Agent) {
     this.agent.close()
   }
 }
 
-FloraComp.prototype.post = function (name, msg, type) {
+FloraComp.prototype.post = function (name, msg, type, opts) {
   if (this.agent instanceof flora.Agent) {
-    return this.agent.post(name, msg, type)
+    return this.agent.post(name, msg, type, opts)
   }
   return flora.ERROR_NOT_CONNECTED
 }
 
+FloraComp.prototype.subscribe = function subscribe (name, handler) {
+  return this.agent.subscribe(name, handler)
+}
+
+FloraComp.prototype.declareMethod = function declareMethod (name, handler) {
+  return this.agent.declareMethod(name, handler)
+}
+
+FloraComp.prototype.call = function call () {
+  return this.agent.call.apply(this.agent, arguments)
+}
+
 module.exports = FloraComp

disposable.js

@@ -0,0 +1,66 @@
+var flora = require('@yoda/flora')
+
+var defaultUrl = 'unix:/var/run/flora.sock'
+
+module.exports.once = once
+/**
+ *
+ * @param {string} name
+ * @param {object} [options]
+ * @param {string} [options.url='unix:/var/run/flora.sock']
+ * @param {number} [options.timeout=15000]
+ */
+function once (name, options) {
+  if (options == null) {
+    options = {}
+  }
+  var url = options.url || defaultUrl
+  var timeout = options.timeout || 15000
+  var agent = new flora.Agent(url)
+  return new Promise((resolve, reject) => {
+    var timer = setTimeout(() => {
+      agent.close()
+      reject(new Error(`flora.once timeount for ${timeout}`))
+    }, timeout)
+    agent.subscribe(name, msg => {
+      clearTimeout(timer)
+      agent.close()
+      resolve(msg)
+    })
+    agent.start()
+  })
+}
+
+module.exports.post = post
+/**
+ *
+ * @param {string} name
+ * @param {any[]} msg
+ * @param {number} [type]
+ * @param {object} [options]
+ * @param {string} [options.url='unix:/var/run/flora.sock']
+ * @returns {number} status code, 0 if post succeeded.
+ */
+function post (name, msg, type, options) {
+  if (typeof name !== 'string') {
+    throw new TypeError('Expect a string on first argument of flora.disposable.post')
+  }
+  if (!Array.isArray(msg)) {
+    throw new TypeError('Expect an array on second argument of flora.disposable.post')
+  }
+  if (typeof type !== 'number') {
+    options = type
+    type = flora.MSGTYPE_INSTANT
+  }
+  if (options == null) {
+    options = {}
+  }
+  var url = options.url || defaultUrl
+  var agent = new flora.Agent(url)
+  agent.start()
+
+  var ret = agent.post(name, msg, type)
+  agent.close()
+
+  return ret
+}