[update] project task name rename

Merge branch 'rel/v1.5.1' into feature/project
[update] add condition & first task issue & add boardcast
2022-04-27 13:24:31 +08:00 · 2022-04-25 10:48:22 +08:00 · 2022-04-18 01:52:52 +08:00 · 2022-04-17 23:05:21 +08:00 · 2022-04-16 10:50:37 +08:00 · 2022-04-13 15:58:27 +08:00
14 changed files with 635 additions and 1033 deletions
@@ -4,7 +4,7 @@ New goal on pi4 without kotlin and django, and with only one dataserver.
 # Installation
 ### Get Raspbrain into SD card

-###### Download Raspbian Bullseye Lite
+###### Download Raspbian Buster Lite

 >https://www.raspberrypi.org/downloads/raspberry-pi-os/

@@ -14,7 +14,7 @@ New goal on pi4 without kotlin and django, and with only one dataserver.
 lsblk

 # copy data to sd card
-sudo dd bs=4M if=yyyy-mm-dd-raspios-bullseye-armhf-lite.img of=/dev/sdX conv=fsync status=progress
+sudo dd bs=4M if=yyyy-mm-dd-raspbian-buster.img of=/dev/sdX conv=fsync status=progress

 # enable ssh on first boot
 add ssh.txt in boot folder
@@ -77,22 +77,18 @@ add ssh.txt in boot folder


 ###### Install dependencies
-    sudo apt-get install vim git wiringpi build-essential libi2c-dev i2c-tools python-dev libffi-dev python3-pip postgresql npm
-
-###### wiringpi conflict
-need to install wiringpi:  https://github.com/WiringPi/WiringPi
-install instructions:  https://github.com/WiringPi/WiringPi/blob/master/INSTALL
+    sudo apt-get install vim git wiringpi build-essential libi2c-dev i2c-tools python-dev libffi-dev python3-pip postgresql

 ### Setup project
-###### Clone data server project
+###### Clone project
 ```
 cd ~
-git clone https://gitlab.com/wisetop/controller/wisetopdataserver.git
+git clone https://gitlab.com/bioproscientific/bioprorelife.git
 ```

 ###### Install python dependencies
 ```
- cd ~/wisetopdataserver
+cd ~/bioprorelife
 pip3 install -r requirements.txt
 ```
 ##### Packages version
@@ -116,14 +112,14 @@ psycopg2                      2.8.5

 ###### Build C extension
 ```
-cd ~/wisetopdataserver/python/biopro/ext/
+cd ~/bioprorelife/python/biopro/ext/
 rm -rf *.so build
 python3 setup.py build_ext --inplace
 ```

 ###### Check setup-uart file
 ```
-cd ~/wisetopdataserver/
+cd ~/bioprorelife
 sudo vim ./run-setup-uart.sh
 ```
 ##### Modify the code as following
@@ -153,72 +149,44 @@ sudo raspi-config
 reboot
 ```

-###### Set pi password
-```
-$cd ~
-$passwd
-Current password:raspberry
-New password:5k6zj454778225
-Retype new password:5k6zj454778225
-```
-
 ###### Auto run program when device start
 ```
 sudo vim /etc/rc.local
 ```
-###### add the code following as:
+add the code following as:
 ```
-sudo -H -u pi nohup /home/pi/wisetopdataserver/run-data-server.sh > /home/pi/.data_server.out &
-#sudo -H -u pi nohup /home/pi/wisetopdataserver/run-data-server.sh > /home/pi/.wisetop_data_$now.out &
+sudo -H -u pi nohup /home/pi/bioprorelife/run-data-server.sh > /home/pi/.data_server.out &
 ```
-##### /etc/rc.local
-```
-_IP=$(hostname -I) || true
-if [ "$_IP" ]; then
-  printf "My IP address is %s\n" "$_IP"
-fi

-now=$(date +'%F_%T')
-
-sudo nohup systemctl restart apache2
-sudo nohup systemctl restart mosquitto
-
-nohup node /home/pi/wisetopapiserver/dist/app.js > /home/pi/.api_server.out &
-
-sleep 5
-
-sudo -H -u pi nohup /home/pi/wisetopdataserver/run-data-server.sh > /home/pi/.data_server.out &
-#sudo -H -u pi nohup /home/pi/wisetopdataserver/run-data-server.sh > /home/pi/.wisetop_data_$now.out &
-
-exit 0
-```
 ### MQTT broker install

-###### 1.Install mosquitto
-$sudo apt-get install mosquitto mosquitto-clients
-
-
-###### 2.Enable Remote Access
-$sudo vim /etc/mosquitto/conf.d/default.conf
+1. Install mosquitto
+```
+sudo apt-get install mosquitto mosquitto-clients
+```

+2. Enable Remote Access
+```
+sudo vim /etc/mosquitto/conf.d/default.conf
+```
 add the code following as:
 ```
 listener 1883
 protocol mqtt
 listener 8083
 protocol websockets
-allow_anonymous true
 ```
-###### 3.restart mqtt broker
-$sudo systemctl restart mosquitto
+restart mqtt broker
+```
+sudo systemctl restart mosquitto
+```

-###### 4.Robust MQTT
+3. Robust MQTT
 create mosquitto_restart.sh
-
-$cd ~
-$sudo vim mosquitto_restart.sh
-
-
+```
+cd ~
+sudo vim mosquitto_restart.sh
+```
 add the code following as:
 ```
 if [ "`ps -aux | grep /usr/sbin/mosquitto | wc -l`" == "1" ]
@@ -232,129 +200,25 @@ fi
 echo "$SERVICE is currently running" >> /home/ubuntu/cron.log
 exit 0
 ```
-###### 5.add mosquitto_restart.sh to root routing
-$sudo chmod +x mosquitto_restart.sh
-$sudo  -i
-$crontab -e
-
+add mosquitto_restart.sh to root routing
+```
+sudo chmod +x mosquitto_restart.sh
+sudo  -i
+crontab -e
+```
 add the code following as:
 ```
 */5 * * * * /home/pi/mosquitto_restart.sh
 ```
-###### 6.Auto run MQTT broker when when pi-start
-$sudo vim /etc/rc.local
-
+3. Auto run MQTT broker when when pi-start
+```
+sudo vim /etc/rc.local
+```
 add the code following as:
 ```
 sudo nohup systemctl restart mosquitto
 ```

-### Setting up a Routed Wireless Access Point
-###### 1.Install AP and Management Software
-$sudo apt install hostapd
-$sudo systemctl unmask hostapd
-$sudo systemctl enable hostapd
-$sudo apt install dnsmasq
-$sudo DEBIAN_FRONTEND=noninteractive apt install -y netfilter-persistent iptables-persistent
-
-###### 2.Set up the Network Router
-$sudo nano /etc/dhcpcd.conf
-```
-interface wlan0
-    static ip_address=192.168.2.1/24
-    nohook wpa_supplicant
-```
-$sudo nano /etc/sysctl.d/routed-ap.conf
-```
-# Enable IPv4 routing
-net.ipv4.ip_forward=1
-```
-
-$sudo iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
-$sudo netfilter-persistent save
-$sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
-
-
-$sudo nano /etc/dnsmasq.conf
-
-```
-interface=wlan0 # Listening interface
-dhcp-range=192.168.2.2,192.168.2.255,255.255.255.0,24h
-                # Pool of IP addresses served via DHCP
-domain=wlan     # Local wireless DNS domain
-address=/gw.wlan/192.168.2.1
-                # Alias for this router
-```
-###### 3.Ensure Wireless Operation
-$sudo rfkill unblock wlan
-
-###### 4.Configure the AP Software
-$sudo nano /etc/hostapd/hostapd.conf
-
-```
-country_code=TW
-interface=wlan0
-ssid=WTP_NONE
-hw_mode=g
-channel=7
-macaddr_acl=0
-auth_algs=1
-ignore_broadcast_ssid=0
-wpa=2
-wpa_passphrase=00000000
-wpa_key_mgmt=WPA-PSK
-wpa_pairwise=TKIP
-rsn_pairwise=CCMP
-
-# 802.11n support
-ieee80211n=1
-# make raspberry pi dongle fast
-wme_enabled=1
-# ht_capab: HT capabilities, enable 40MHz
-ht_capab=[HT40+][SHORT-GI-40]
-```
-###### 5.Running the new Wireless AP
-$sudo systemctl reboot
-
-
-### Set web site
-$sudo vim ./sites-available/000-default.conf
-```
-<VirtualHost *:8080> #80------>8080
-        # The ServerName directive sets the request scheme, hostname and port that
-        # the server uses to identify itself. This is used when creating
-        # redirection URLs. In the context of virtual hosts, the ServerName
-        # specifies what hostname must appear in the request's Host: header to
-        # match this virtual host. For the default virtual host (this file) this
-        # value is not decisive as it is used as a last resort host regardless.
-        # However, you must set it for any further virtual host explicitly.
-        #ServerName www.example.com
-
-        ServerAdmin webmaster@localhost
-        DocumentRoot /var/www/html
-
-        # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
-        # error, crit, alert, emerg.
-        # It is also possible to configure the loglevel for particular
-        # modules, e.g.
-        #LogLevel info ssl:warn
-
-        ErrorLog ${APACHE_LOG_DIR}/error.log
-        CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-        # For most configuration files from conf-available/, which are
-        # enabled or disabled at a global level, it is possible to
-        # include a line for only one particular virtual host. For example the
-        # following line enables the CGI configuration for this host only
-        # after it has been globally disabled with "a2disconf".
-        #Include conf-available/serve-cgi-bin.conf
-</VirtualHost>
-
-<VirtualHost *:80>
-    ServerAdmin bioprovue@localhost
-    DocumentRoot /var/www/bioprovuebuild
-</VirtualHost>
-```
-
+### Setup routed wireless access point
 ##### raspberry website document:
 > https://www.raspberrypi.org/documentation/configuration/wireless/access-point-routed.md
@@ -253,6 +253,7 @@ class DeviceInternalCommandHandler:
        return True


+# why inherit MasterDevice ?
 class DeviceManager(MasterDevice, Synchronized):
    """device manager. It manager the device libraries, found device, connected device
    and the control of the master device.
@@ -267,7 +268,6 @@ class DeviceManager(MasterDevice, Synchronized):
                 options: DeviceManagerOptions,
                 handler: Optional[DeviceInternalCommandHandler] = None):
        """
-
        :param options: manager options.
        :param handler: device internal command handler
        """
@@ -277,6 +277,7 @@ class DeviceManager(MasterDevice, Synchronized):
        if handler is None:
            handler = DeviceInternalCommandHandler()

+        # control server api
        self._handler: DeviceInternalCommandHandler = handler
        self._options: DeviceManagerOptions = options

@@ -286,7 +287,9 @@ class DeviceManager(MasterDevice, Synchronized):
        # hardware
        self._interface = options.interface
        self._master: Optional[MasterDevice] = None
+        # memory board
        self._centralMaster: Optional[MasterDevice] = None
+        # connected device
        self._device: List[CompletedDevice] = []

        # demo device
@@ -336,6 +339,10 @@ class DeviceManager(MasterDevice, Synchronized):
    def library_path(self) -> List[Path]:
        return self._repository.library_path

+    def get_device_status(self, mac_address) -> Optional[DeviceLibrary]:
+        device = self.get_device(mac_address)
+        return device.status
+
    @logging_info
    def reload_library(self):
        """reload device library"""
@@ -562,7 +569,6 @@ class DeviceManager(MasterDevice, Synchronized):

    @logging_verbose
    def get_device(self, device: Union[int, DeviceInfo]) -> Optional[CompletedDevice]:
-        print('get_device', device)
        """get connected device

        :param device: device ID or response info
@@ -1024,15 +1030,9 @@ class DeviceManager(MasterDevice, Synchronized):
            raise RuntimeError(DEVICE_NOT_FOUND, device)

        if DeviceCommonInstruction(instruction) is not None:
-            # print('deviceCommonInstr')
-            # print(instruction)
            device.call_instruction(instruction)
-
        elif instruction in device.library.instruction_table:
-            # print('instruction')
-            # print(instruction)
            device.call_instruction(instruction)
-
        else:
            raise RuntimeError(INSTRUCTION_UNKNOWN, instruction)

@@ -1268,14 +1268,15 @@ class InstructionTable(DictNode['Instruction']):
                         instruction: str):
        """call instruction. chain context with :class:`DeviceInternalInstructionScope`

-        :param master: master device
-        :param device: device
+        :param master: DeviceManager
+        :param device: CompletedDevice
        :param context: scope
        :param instruction: instruction name
        :raises InstructionNotFound: If instruction not found.
        """

        try:
+            # ex. start 
            ins = self[instruction]

        except KeyError as e:
@@ -1284,6 +1285,7 @@ class InstructionTable(DictNode['Instruction']):
        else:
            context = context.chain(InstructionTableScope(self))

+            # ex. _data_format, _sync, _notify
            for single in ins.eval_instruction(context):
                if isinstance(single, InternalInstruction):
                    if not single.handle_internal_instruction(master, device, context):
@@ -966,7 +966,7 @@ class CompletedDevice(Device):
    """
    __slots__ = ('_master', '_device_id', '_device', '_library', '_context',
                 '_parameter', '_configuration', '_lock', '_feature_mask',
-                 '_cache_battery', '_cache_battery_timestamp', '_coeff')
+                 '_cache_battery', '_cache_battery_timestamp', '_coeff', '_status')

    def __init__(self, master: MasterDevice, library: DeviceLibrary, device_id: int, device: Device):
        """
@@ -976,11 +976,15 @@ class CompletedDevice(Device):
        :param device_id: device id
        :param device: slave device implementation
        """
+        # DeviceManager
        self._master = master
        self._device = device
        self._device_id = device_id
        self._library = library

+        # device status ( 0: idle, 1: working, 2: error, 3: power off)
+        self._status = 0
+
        # context
        s1 = library.constant
        s2 = DeviceScope(self)
@@ -1020,6 +1024,10 @@ class CompletedDevice(Device):
    def mac_address(self) -> ADDRESS:
        return self._device.mac_address

+    @property
+    def mac_address_in_str(self) -> str:
+        return ':'.join('{:02x}'.format(b) for b in self._device.mac_address)
+
    @property
    def device(self) -> Device:
        return self._device
@@ -1056,11 +1064,18 @@ class CompletedDevice(Device):
        return self._library

    # device lock
-
    @property
    def lock(self) -> DeviceLock:
        return self._lock

+    @property
+    def status(self) -> int:
+        return self._status
+    
+    @status.setter
+    def status(self, new_status):
+        self._status = new_status
+
    # device parameter getter/setter

    def parameters(self) -> List[str]:
@@ -1261,6 +1276,7 @@ class CompletedDevice(Device):
            'device_id':       self.device_id,
            'device_name':     self.device_name,
            'device_address':  list(self.mac_address),
+            'device_status': self._status,
            'battery':         self.battery,
            'parent':          self.parent,
            'recording_file_name':      self.recording_file_name,
@@ -1,68 +1,26 @@

 class Action():
-    def __init__(self, task, action_id, action):
-        self._task = task
-        self._id:str = action_id
-        self._type:str = action['type']
-        self._target:str = action['target']
-        self._condition_list:list[str] = action['condition']
-        self._duration = action.get('duration', None)
-        self._goto = action.get('goto', None)
-        self._cycle = action.get('cycle', None)
-        self._instruction = None
-
-        self.update_instruction()
+    def __init__(self, action_id, action):
+        self._id: str = action_id
+        self._type: str = action['type']
+        self._target: str = action['target']
+        self._condition : list[str] = action['condition']
+        # self._duration = action.get('duration', None)
+        # self._goto = action.get('goto', None)
+        # self._cycle = action.get('cycle', None)
    
+    @property
+    def id(self):
+        return self._id
+
    @property
    def type(self):
        return self._type
-
-    def update_instruction(self):
-        instruction_type = self._type
-        if instruction_type == 'stop':
-            instruction_type = 'interrupt'
-
-        self._instruction = {
-            "device_instruction": {
-                "header": "call_instruction",
-                "device": self._target,
-                "arguments": {
-                    "instruction": instruction_type,
-                }
-            },
-            "device_parameter": {
-                "header": "set_multi_parameters",
-                "device": self._target,
-                "arguments": {
-                    "parameter": self._task.get_parameter_set_by_device(self._target),
-                }
-            },
-            "device_recording_file_name": {
-                "header": "update_recording_file_name_info",
-                "device":  self._target,
-                "arguments": {
-                    "content": self._task.file_name,
-                }
-            },
-            "device_parent": {
-                "header": "update_parent_info",
-                "device":  self._target,
-                "arguments": {
-                    "content": self._task.parent
-                }
-            }
-        }
-
-    def get_condition_list(self):
-        return self._condition_list
-
-    def get_instruction(self, value):
-        return self._instruction[value]
-
-    def get_instruction_list(self):
-        instruction_set = {
-            'start': ['device_parent', 'device_recording_file_name', 'device_parameter', 'device_instruction'],
-            'stop': ['device_instruction'],
-        }
-
-        return map(self.get_instruction, instruction_set[self._type])
+    
+    @property
+    def target(self):
+        return self._target
+    
+    @property
+    def condition(self):
+        return self._condition
@@ -7,6 +7,7 @@ class Condition():
        self._type = condition['type']
        self._comparsion = condition['comparsion']
        self._value = condition['value']
+        self._active = False
    
    @property
    def id(self):
@@ -24,16 +25,24 @@ class Condition():
    def value(self):
        return self._value
    
-    def set_comparsion(self, comparsion):
-        self._comparsion = comparsion
-
-    def set_type(self, type):
-        self._type = type    
+    @id.setter
+    def id(self, new_id):
+        self._id = new_id
    
-    def set_value(self, value):
-        self._value = value
+    @type.setter
+    def type(self, new_type):
+        self._type = new_type

-    def compareWith(self, operator:str, x, y) -> bool:
+    @comparsion.setter
+    def comparsion(self, new_comparsion):
+        self._comparsion = new_comparsion    
+    
+    @value.setter
+    def value(self, new_value):
+        self._value = new_value
+
+    def compareWith(self, operator, x, y) -> bool:
+        # print(operator, x, y)
        cases = {
            "equal": lambda a, b: a == b,
            "bigger": lambda a, b: a > b,
@@ -47,34 +56,38 @@ class Condition():
        return getattr(self, self.type)(**kwargs)
       
    def absolute_time(self, **kwargs):
-        now = time()
-        time_condition = self.datetime_to_timestamp(self.str_to_datetime(self._value))
+        now = int(time())
+        time_condition = round(self.datetime_to_timestamp(self.str_to_datetime(self._value)))

-        return self.compareWith(self.comparsion, int(now), int(time_condition))
+        return self.compareWith(self.comparsion, now, time_condition)

-    def relative_time(self, **kwargs):
+    def after_project_run(self, **kwargs):
        project_start_time = kwargs['project_start_time']
-        task_start_time = kwargs['task_start_time']
        delay_time = kwargs['delay_time']
-        now = time()

-        time_diff = int(now - project_start_time - delay_time)
+        time_diff = int(time() - project_start_time - delay_time)
+        return self.compareWith(self.comparsion, time_diff, int(self._value))
+    
+    def after_task_run(self, **kwargs):
+        # print('relative_time_from_task', kwargs,kwargs['task_start_time'],kwargs['delay_time'])
+        if len(kwargs['task_start_time']) == 0:
+            return False
+        task_start_time = kwargs['task_start_time'][-1]
+        delay_time = kwargs['delay_time']
+
+        time_diff = int(time() - task_start_time - delay_time)
+        # print('time_diff',  time_diff)
        return self.compareWith(self.comparsion, time_diff, int(self._value))
    
    def device(self, **kwargs):
        print('device')
    
-    def task_status(self, **kwargs):
-        print('task_status')
-
-    def method_mapping(self, method_name):
-        methods = {
-        "relative_time": self.relative_time,
-        "absolute_time": self.absolute_time,
-        "device": self.device,
-        "task_status": self.task_status,
-        }
-        return methods[method_name]
+    def previous_task_done(self, **kwargs):
+        running_task = kwargs['running_task']
+        if running_task.status == 2 and self._active == False:
+            self._active = True
+            return True
+        return False

    def str_to_datetime(self, time_str):
        return datetime.strptime(time_str,'%Y-%m-%dT%H:%M')
@@ -0,0 +1,32 @@
+
+class Instruction():
+    def  __init__(self):
+        self._instruction_set = {
+            'set_file_name': {
+                'method': 'update_recording_file_name_info',
+                'arguments': ['file_name']
+            },
+            'set_parent': {
+                'method': 'update_parent_info',
+                'arguments': ['parent']
+            },
+            'set_parameter':{
+                'method': 'set_multi_parameters',
+                'arguments': ['parameter']
+            },
+            'call_instruction': {
+                'method': 'call_instruction',
+                'arguments': ['instruction']
+            },
+        }
+    
+        self._start_instruction = list(map(lambda ins: self._instruction_set[ins] ,['set_file_name', 'set_parent', 'set_parameter', 'call_instruction']))
+        self._stop_instruction = list(map(lambda ins: self._instruction_set[ins] ,['call_instruction']))
+    
+    @property
+    def start(self) -> list:
+        return self._start_instruction
+    
+    @property
+    def stop(self) -> list:
+        return self._stop_instruction
@@ -1,14 +1,22 @@
-from .task import Task
-from .task_manager import TaskManager
 import sys
 import json
 import threading
-import time
+
+from time import time, sleep
 from datetime import datetime
 from collections import deque
+from copy import copy
+from uuid import uuid4
+
+from .task import Task
+from .task_manager import TaskManager
+from .instruction import Instruction
 from biopro.device.manager import DeviceManager
 from biopro.text import *
-from copy import copy
+
+key_list = {
+  'deviceList': 'device',
+}

 class Project(threading.Thread):
  def __init__(self, project, device_manager: DeviceManager, mqttThread = None, name="project"):
@@ -18,65 +26,184 @@ class Project(threading.Thread):
    self._mqtt_thread = mqttThread
    self._time_interval = 1
    self._start_time = None
+    self._end_time = None

-    self._task_manager = TaskManager(self._project['taskList'])
-    self._stop = False
+    self._id = None
+    self._uuid = uuid4()
+    self._name = None
+    self._desc = None
+    self._device = None
+    self._complete_device = []
+    self._status = None
+
+    self._instruction_set = Instruction()
+    self._stop_flag  = False
+
+    self.setup_project(project)
+    self.setup_device(self._device)
+  
+  def setup_project(self, project):
+    for (key, value) in project.items():
+      if key in key_list.keys():
+        key = key_list[key]
+
+      if key == 'task':
+        self._task_manager = TaskManager(project['task'])
+      else:
+        setattr(self, key, value)
+      
+  def setup_device(self, device_list):
+    for device in device_list:
+      complete_device = self._device_manager.get_device(device['connectDevice']['device_address'])
+      self._complete_device.append(complete_device)
+
+  @property
+  def id(self) -> int:
+    return self._id
+  
+  @id.setter
+  def id(self, new_id):
+    self._id = new_id
+  
+  @property
+  def uuid(self) -> str:
+    return self._uuid
+  
+  @uuid.setter
+  def uuid(self, new_uuid):
+    self._uuid = new_uuid
+
+  @property
+  def name(self) -> str:
+    return self._name
+  
+  @name.setter
+  def name(self, new_name):
+    self._name = new_name

  @property
  def desc(self) -> str:
-    return self._project['desc']
+    return self._desc
+  
+  @desc.setter
+  def desc(self, new_desc):
+    self._desc = new_desc
  
  @property
  def status(self) -> str:
-    return self._project['status']
+    return self._status
+  
+  @status.setter
+  def status(self, new_status):
+    self._status = new_status

  @property
  def device(self) -> list:
-    return self._project['deviceList']
-
+    return self._device
+  
+  @device.setter
+  def device(self, new_device):
+    self._device = new_device
+  
  @property
-  def task(self) -> list:
-    return self._task_manager.get()
+  def task_list(self):
+    return self.task_manager.task_list

+  
  @property
-  def get_current_task(self) -> str:
-    return self._task_manager.get_current_task()
+  def mqtt_thread(self):
+    return self._mqtt_thread

  def run(self):
-      self._start_time = time.time()
+      self._start_time = time()

-      while not self._stop:
-        # current task
-        task_check_list = copy(self._task_manager.get_check_task_list())
+      self.mqtt_thread.broadcast_command('project:' + self._name + ' start_at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
+      while not self._stop_flag :
+        # check running task first
        delay_time = 0
-        for task in task_check_list:
-          # [<match_condition>, ...]
-          match_condition_list = task.check_condition(project_start_time = self._start_time, delay_time = delay_time)
-          # [[<match_action>, ...], ...]
-          match_action_list = task.get_match_action_list(match_condition_list)
-          
-          for action_list in match_action_list:
-            for action in action_list:
-              if action.type == 'start':
-                task.reset_start_time()
-                self._task_manager.set_current_task(task)
-              task.do_action(action)
-          
-          now = time.time()
-          while len(task.instruction_list) > 0:
-              instruction = task.instruction_list.pop(0)
-              if instruction.get('device', None) != None:
-                device = self._device_manager.get_device(self.device[instruction['device']]['connectDevice']['device_address'])
+        check_list = copy(self._task_manager.check_list)

-                if device is None:
-                    raise RuntimeError(DEVICE_NOT_FOUND, device)
+        for task in check_list:
+          if task != None:
+            now = time()
+            # print('round task', task.name)
+            # print('running task', self._task_manager.running_task.name, self._task_manager.running_task.status)
+            # if self._task_manager.prev_task != None:
+            #   print('previous_task', self._task_manager.prev_task.name, self._task_manager.prev_task.status)

-                getattr(device, instruction['header'])(*instruction['arguments'].values()) 
-          delay_time += (time.time() - now)
-        time.sleep(self._time_interval)
+            match_condition_list = task.check_condition(
+              project_start_time = self._start_time,
+              delay_time = delay_time,
+              running_task= self._task_manager.running_task,
+              previous_task =  self._task_manager.prev_task
+            )
+            # print('match_condition_list', match_condition_list)
+            for condition in match_condition_list:
+              match_action_list = task.get_match_action(condition.id)
+              for action in match_action_list:
+                # print('match_action', action.type, action.target)
+                if action.type == 'start' and task.status != 1:
+                  self._task_manager.set_running_task(task)
+                  self.mqtt_thread.broadcast_command('project:task ' + task.name + ' start at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])

-  def stop(self):
-    self._stop = True
+                device = self._complete_device[action.target]
+                task_info = task.get_task_info(action)
+                instruction_set = getattr(self._instruction_set, action.type, None)
+                # print('instruction_set',instruction_set)
+                
+                if instruction_set != None:
+                  for instruction in instruction_set:
+                    args = list(map(lambda arg: task_info[arg], instruction['arguments']))
+                    threading.Thread(target=getattr(device, instruction['method'])(*args))
+            
+            delay_time += (time() - now)
+
+        # check task not running then stop
+        if self.check_running_task_not_run() == True:
+          self.mqtt_thread.broadcast_command('project:task ' + str(self._task_manager.running_task.name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
+          self._task_manager.running_task.stop()
+        
+        # check project done then close project
+        if self.check_project_done() == True:
+          self.mqtt_thread.broadcast_command('project:project ' + str(self._name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
+          print('project stop at', datetime.now())
+          self.close()
+        
+        if self._time_interval - delay_time > 0:
+          sleep(self._time_interval - delay_time)
+
+  def pause(self):
+    # TODO
+    pass

  def close(self):
-    self._stop = True
+    self._end_time = time()
+    self._stop_flag  = True
+
+  def check_project_done(self):
+    for task in self._task_manager.task_list:
+      # if task never start or still task is running then reject 
+      if task.status == 1 or task.status == -1:
+        return False
+    return True
+  
+  def check_running_task_not_run(self):
+    # if no running task
+    if self._task_manager.running_task == None:
+      return False
+    device_list = self._task_manager.running_task.device
+    for device in device_list:
+      if self._complete_device[device].status == 1:
+        return False
+    return True
+  
+  def as_json(self):
+    return {
+      'id': self._id,
+      'name': self._name,
+      'uuid': self._uuid,
+      'desc': self._desc,
+      'status': self._status,
+      'device': self._device,
+      'task_list': self.task_list,
+    }
@@ -18,7 +18,7 @@ class ProjectManager():
      new_project = Project(project, self._device_manager, self._mqtt_thread)
      self._project_list.append(new_project)
      return new_project
-    
+
    def remove(self, index):
      self._project_list[index].stop()
      del self._project_list[index]
@@ -2,112 +2,186 @@ from typing import List
 from .condition import Condition
 from .action import Action
 from time import time
+from datetime import datetime
+
+key_list = {
+  'deviceList': 'device',
+  'parameterSet': 'parameter_set'
+}

 class Task:
  def __init__(self, task):
-    self._task = task
-
-    self._condition_list:List[Condition] = []
-    self._action_list:List[Action] = []
-
-    self._start_time = time()
-    self._idle_time = []
-    self._period = None
-    self._next_time = None
-    self._last_time = None
+    self._id = None
+    self._name = None
+    self._parent = None
+    self._cycle = None
+    self._device = None
+    self._event = None
+    self._trigger = None
+    self._parameter_set = None
+    self._condition = None
+    self._action = None
+    # -1: initial 0: start(idle), 1: running, 2: close(idle)
+    self._status = 0
+    self._next = None

+    self._condition_list: List[Condition] = []
+    self._action_list: List[Action] = []
    self._instruction_list = []
-    self.setup()
+    self._record_list = []
+
+    self._start_time = []
+    self._idle_time = []
+    self._end_time = []
+    self._period = None
+
+    self.load_task(task)
  
-  def setup(self) -> None:
-    # add condition
-    for key, condition in self._task['condition'].items():
-      new_condition = Condition(key, condition)
-      self._condition_list.append(new_condition)
+  def load_task(self, task) -> None:
+    # update task attribute
+    for key, value in task.items():
+      if key in key_list.keys():
+        key = key_list[key]
+      if key == 'condition':
+        self.update_condition_list(value)
+      if key == 'action':
+        self.update_action_list(value)
+      # print(key, value)
+      setattr(self, key, value)
    
-    # add action
-    for key, action in self._task['action'].items():
-      new_action = Action(self, key, action)
-      self._action_list.append(new_action)
+  def update_condition_list(self, condition_dict):
+    self._condition_list.clear()
+    for key, condition in condition_dict.items():
+      self._condition_list.append(Condition(key, condition))
+    
+  def update_action_list(self, action_dict):
+    self._action_list.clear()
+    for key, action in action_dict.items():
+      self._action_list.append(Action(key, action))

  @property
  def id(self) -> str:
-    return self._task['id']
+    return self._id
  
-  @property
-  def file_name(self):
-    return self._task['name']
-
-  @property
-  def parent(self):
-    return self._task.get('parent', {"folder": [2]})
-
-  @property
-  def instruction_list(self):
-    return self._instruction_list
-
-  @property
-  def cycle(self) -> int:
-    return self._task['cycle']
-
-  @property
-  def order(self) -> int:
-    return self._task['order']
-
-  @property
-  def max_cycle(self) -> int:
-    return self._task['max_cycle']
-  
-  @property
-  def devices(self) -> dict:
-    return self._task['devices']
-
-  @property
-  def devices_id(self) -> list:
-    return [device_id for device_id in self.devices]
-  
-  @property
-  def events(self) -> list:
-    return self._task['events']
-
-  @property
-  def triggers(self) -> list:
-    return self._task['triggers']
-  
-  @property
-  def parameter_set(self) -> list:
-    return self._task['parameterSet']
-  
-  @property
-  def instructions(self) -> list:
-    return self._task['instructions']
-
-  @property
-  def conditions(self) -> list:
-    return self._task['conditions']
-  
-  @property
-  def actions(self) -> list:
-    return self._task['actions']
-
-  @property
-  def condition_list(self) -> list:
-    return self._condition_list
-
-  @property
-  def status(self) -> str:
-    return self._task['status']
+  @id.setter
+  def id(self, new_id):
+    self._id = new_id
  
  @property
  def uuid(self) -> str:
-    return self._task['uuid']
+    return self._uuid
+  
+  @uuid.setter
+  def uuid(self, new_uuid):
+    self._uuid = new_uuid
+  
+  @property
+  def name(self):
+    return self._name
+  
+  @name.setter
+  def name(self, new_name):
+    self._name = new_name
+
+  @property
+  def parent(self):
+    if self._parent == None:
+      return  {"folder": [2]}
+    return self._parent
+  
+  @parent.setter
+  def parent(self, new_parent):
+    self._parent = new_parent
+
+  @property
+  def cycle(self) -> int:
+    return self._cycle
+  
+  @cycle.setter
+  def cycle(self, new_cycle):
+    self._cycle = new_cycle
+  
+  @property
+  def device(self) -> dict:
+    return self._device
+  
+  @device.setter
+  def device(self, new_device):
+    self._device = new_device
+  
+  @property
+  def event(self) -> list:
+    return self._event
+  
+  @event.setter
+  def event(self, new_event):
+    self._event = new_event
+
+  @property
+  def trigger(self) -> list:
+    return self._trigger
+  
+  @trigger.setter
+  def trigger(self, new_trigger):
+    self._trigger = new_trigger
+  
+  @property
+  def parameter_set(self) -> list:
+    return self._parameter_set
+  
+  @parameter_set.setter
+  def parameter_set(self, new_parameter_set):
+    self._parameter_set = new_parameter_set
+
+  @property
+  def condition(self) -> list:
+    return self._condition
+  
+  @condition.setter
+  def condition(self, new_condition):
+    self._condition = new_condition
+  
+  @property
+  def action(self) -> list:
+    return self._action
+  
+  @action.setter
+  def action(self, new_action):
+    self._action = new_action
+
+  @property
+  def status(self) -> str:
+    return self._status
+  
+  @status.setter
+  def status(self, new_status):
+    self._status = new_status
  
  @property
  def next(self) -> str:
-    return self._task['next']
+    return self._next
  
-  def reset_start_time(self):
-    self._start_time = time()
+  @next.setter
+  def next(self, new_next):
+    self._next = new_next
+  
+  @property
+  def instruction_list(self) -> List:
+    return self._instruction_list
+  
+  @property
+  def start_time(self) -> List:
+    return self._start_time
+  
+  @property
+  def end_time(self) -> List:
+    return self._end_time
+  
+  def new_start_time(self):
+    self._start_time.append(time())
+  
+  def new_end_time(self):
+    self._end_time.append(time())
    
  def get_parameter_set_by_device(self, device):
     return [parameter_set for parameter_set in self.parameter_set.values() if device == parameter_set['target']]
@@ -124,46 +198,55 @@ class Task:
    return '|'.join(name_list) if name_or_value == 'name' else '|'.join(value_list)
  
  def run(self):
-    self._status = 'running'
-    self._start_time = time()
-
-  def pause(self):
-    self._status = 'pause'
-
-  def set_cycle(self, cycle):
-    self._cycle = cycle
-
-  def set_status(self, status):
-    self._status = status
+    print(self._name, 'run at', datetime.now())
+    self._status = 1
+    self._start_time.append(time())
  
  def start(self):
-    self.set_status('running')
+    self.status = 1
  
  def stop(self):
-    if self.status == 'running':
-      self.do_action('stop')
-    self.set_status('idle')
-
-  def done(self):
-    self.set_status('done')
-  
-  def end(self):
-    self.set_status('end')
+    self.status = 2

  def get_match_action_list(self, match_condition_list):
    return map(lambda condition: [x for x in self._action_list if condition.id in x.get_condition_list()], match_condition_list)
+  
+  def get_match_action(self, condition_id):
+    return [action for action in self._action_list if condition_id in action.condition]

  def do_action(self, action): 
    for instruction in action.get_instruction_list():
      self._instruction_list.append(instruction)

-  def status_mapping(self, status):
-    statuses = {
-      "start": self.task_start,
-      "done": self.task_done,
-    }
-    return statuses[status]
-
  def check_condition(self, **kwargs):
    kwargs['task_start_time'] = self._start_time
-    return [condition for condition in self._condition_list if  condition.match_or_not(**kwargs)]
+    return [condition for condition in self._condition_list if  condition.match_or_not(**kwargs)]
+  
+  def get_task_info(self, action):
+    _type = action.type
+    if _type == 'stop':
+      _type = 'interrupt'
+
+    return {
+      'device': action.target,
+      'parameter': self.get_parameter_set_by_device(action.target),
+      'file_name': self._name + '-' + str(action.target),
+      'parent': self.parent,
+      'instruction': _type
+    }
+  
+  def as_json(self):
+    return {
+      'id': self.id,
+      'name': self.name,
+      'parent': self.parent,
+      'cycle': self.cycle,
+      'device': self.device,
+      'event': self.event,
+      'trigger': self.trigger,
+      'parameter_set': self.parameter_set,
+      'condition': self.condition,
+      'action': self.action,
+      'status': self.status,
+      'next': self.next,
+    }
@@ -1,4 +1,5 @@
 from json import loads as json_parse, dumps as _json_stringify
+from socket import if_nametoindex
 from typing import Dict, List, Optional, Any
 from xml.dom.expatbuilder import parseString
 import paho.mqtt.client as mqtt
@@ -12,45 +13,72 @@ def json_stringify(o: Any) -> str:

 class TaskManager():
    def __init__(self, task_list):
-      self._current_task = None
      self._task_list = []
-      self._need_to_check_task_list = []
+      self._next_task = []
+      self._prev_task = None
+      self._running_task = None
+      
+      self.load_task_list(task_list)

+      # self.set_running_task(self._task_list[0])
+      # self._running_task.run()
+      self._next_task.append(self._task_list[0])
+    
+    @property
+    def task_list(self):
+      return self._task_list
+
+    @property
+    def prev_task(self):
+      return self._prev_task
+    
+    @property
+    def running_task(self):
+      return self._running_task
+    
+    @property
+    def next_task(self):
+      return self._next_task
+
+    @property
+    def check_list(self):
+      return [self._running_task, *self._next_task]
+    
+    @property
+    def check_list(self):
+      return [self._running_task, *self._next_task]
+    
+    def load_task_list(self, task_list):
      for task in task_list:
        task = Task(task) 
        self._task_list.append(task)
-      
-      self.set_current_task(self._task_list[0])
-      self._current_task.run()
    
-    def remove(self, index):
-      pass
+    def set_running_task(self, task):
+      try:
+        # if there is task running & same task active ,then reject
+        if self._running_task != None and self._running_task.uuid == task.uuid:
+          return False
+
+        # save running task
+        self._prev_task = self._running_task
+        # clear next task list
+        self._next_task.clear()
+        self._running_task = task
+        self._running_task.run()
+
+        if self._prev_task != None:
+          # if previous task is still running, then need to close
+          if self._prev_task.status == 1:
+            self._prev_task.stop()
+          print('prev', 'run', self._prev_task.name, self._running_task.name)
+
+        for task_uuid in self._running_task.next:
+          _task = next((task for task in self._task_list if task.uuid == task_uuid), None)
+          if _task != None:
+            self._next_task.append(_task)
+      except RuntimeError as e:
+        print(e)

    def get_task(self, task_id):
      return self._task_list[task_id]
-
-    def get_check_task_list(self) -> List[Task]:
-      return self._need_to_check_task_list
-
-    def get_current_task(self) -> Task:
-      return self._current_task
-
-    def get_next_task(self):
-      return  self._current_task.next
-
-    def set_current_task(self, task):
-      try:
-        if self._current_task != None and self._current_task.id != task.id:
-          self._current_task.stop()
-
-        self._current_task = task
-        self._need_to_check_task_list = []
-        # append current task
-        self._need_to_check_task_list.append(self._current_task)
-
-        # append next task
-        for task_uuid in self._current_task.next:
-          task = next((task for task in self._task_list if task.uuid == task_uuid), None)
-          self._need_to_check_task_list.append(task)
-      except Exception as e:
-        print(e)
+  
@@ -104,18 +104,9 @@ class DataServer(SocketServer, DataAPI):
                                      self.log_verbose,
                                      'MQTT-data-server')
        # api socket
-        self._queue_spi = queue.Queue()
-        # self._queue_spi_dict = {}
        self._queue_ds_dict = {}
        self._queue_db = Queue()
-        self._queue_db_error = Queue()
-        # self._queue_ds = Queue()
-
-        # if len(self._queue_spi_dict) == 0:
-        #     self._queue_spi_dict[4] = Queue()
-        #     self._queue_spi_dict[5] = Queue()
-        #     self._queue_spi_dict[6] = Queue()
-        #     self._queue_spi_dict[7] = Queue()
+        self._queue_msg = Queue()

        if len(self._queue_ds_dict) == 0:
            self._queue_ds_dict[4] = Queue()
@@ -123,7 +114,7 @@ class DataServer(SocketServer, DataAPI):
            self._queue_ds_dict[6] = Queue()
            self._queue_ds_dict[7] = Queue()

-        self.database_process = DataBaseProcess('data_server', self.log_verbose, self._queue_db, self._queue_ds_dict, self._queue_db_error)
+        self.database_process = DataBaseProcess('data_server', self.log_verbose, self._queue_db, self._queue_ds_dict, self._queue_msg)
        self.database_process.start()

    @logging_info
@@ -146,7 +137,6 @@ class DataServer(SocketServer, DataAPI):
        try:
            self._stop_runtime()
            self.stop_sync()
-            self._queue_spi.queue.clear()
        finally:
            self._configurations.clear()

@@ -185,9 +175,6 @@ class DataServer(SocketServer, DataAPI):

        self._configurations.clear()

-        with CacheClient() as client:
-            client.clear()
-
        # reopen spi, which has close at close()
        if spi_mode is None:
            spi_mode = self._spi_mode
@@ -417,7 +404,7 @@ class DataServer(SocketServer, DataAPI):
                c.join()
                self._spi.set_wait_flag(c._device, True)
            data_runtime_process = RecordingProcess('data_server', self.log_verbose, device_id, 
-                                                    Queue(), self._queue_ds_dict[int(device_id)], meta_file,
+                                                    Queue(), self._queue_ds_dict[int(device_id)], self._queue_msg, meta_file,
                                                    json_stringify(_device), _parameter, _parent, _recording_file_name,
                                                    data_format, self.socket_mqtt_ip, self.socket_mqtt_port,
                                                    database = self.database_process )
@@ -618,8 +605,18 @@ class DataServer(SocketServer, DataAPI):
        return

    def open_cache_client(self):
-        self._cache_client = None
-        return
+        self.log_verbose('open cache client')
+        try:
+            client = CacheClient()
+            client.open_socket()
+
+        except RuntimeError as e:
+            self.log_warn(e)
+
+        else:
+            client.clear()
+
+            self._cache_client = client

    def _ensure_cache_client(self) -> Optional[CacheClient]:
        if self._cache_client is None:
@@ -674,15 +671,19 @@ class DataServer(SocketServer, DataAPI):
        return ret

    def rec_update(self) -> bool:
-
-        device_id = self._queue_db_error.get()
-        self.mqtt_thread.broadcast_command('runtime error: ' + str(device_id))
-        content = {
-            'header': 'device_instruction/0',
-            'device': device_id,
-            'instruction': 'interrupt'
-        }
-        self.mqtt_thread.publish('device_instruction', json_stringify(content), inter = True)
+        ds_db_msg = self._queue_msg.get()
+        with CacheClient() as client:
+            if isinstance(ds_db_msg, List):
+                if ds_db_msg[0] == 'ds':
+                    client.send_command('device_instruction', ds_db_msg[1], ds_db_msg[2])
+            else:
+                self.mqtt_thread.broadcast_command('runtime error: ' + str(ds_db_msg))
+                content = {
+                    'header': 'device_instruction/0',
+                    'device': ds_db_msg,
+                    'instruction': 'interrupt'
+                }
+                self.mqtt_thread.publish('device_instruction', json_stringify(content), inter = True)

        return True

@@ -43,7 +43,7 @@ def _fc(c):
    return c % len(FORE_COLOR) + FORE_COLOR[0]


-class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler):
+class ControlServer(SocketServer, ControlServerAPI):
    """Data Server"""

    def __init__(self, *options):
@@ -60,7 +60,7 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler

        :param options: server options
        """
-        super().__init__((ControlAPI, CacheAPI), 'Controller', self.ADDR,
+        super().__init__((ControlAPI), 'Controller', self.ADDR,
                         socket_listen=10,
                         thread_pool_count=16)

@@ -87,21 +87,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
        data_options.repository = device_option.repository
        self.data_server = DataServerProcess(data_options)

-        # experimental protocol
-        # exp_options = ExpManagerOption.get_options(*options)
-        # self.exp_manager = ExpManager(self, exp_options)
-
-        # cache
-        self.cache_manager = CacheManager(self,
-                                          c.cache_server_cache_size,
-                                          # time unit from sec to ms
-                                          c.cache_server_cache_time * 1000)
-
-        # websocket server ###
-        ### self.websocket_thread = WebsocketThread(self,
-        ###                                                         c.websocket_address,
-        ###                                                         c.websocket_port)
-
        # remote server / MQTT
        self.mqtt_thread = None
        if not c.flag_disable_remote_server:
@@ -112,17 +97,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
                                          self.log_verbose,
                                          'MQTT-control-server')

-        # routine trash thread
-        self._routine_trash_thread = None
-        # if not c.flag_disable_routine_trash:
-        #     self._routine_trash_thread = RoutineTrashThread(self._file_manager,
-        #                                                     c.trash_routine_time,
-        #                                                     c.trash_expire_time,
-        #                                                     c.trash_remove_expire_time)
-
-        # routine data routine
-        self._data_stream_thread = None
-
        # LED control
        self.led_thread = LEDControlThread(disable=c.flag_disable_led_control,
                                           led_count=c.led_count,
@@ -131,6 +105,8 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
        # device detect
        self._detect_device_thread = RoutineConnectDeviceThread(self._device_manager, self.mqtt_thread, self.led_thread, 3)

+        self._project_manager = ProjectManager(self.device_manager, self.mqtt_thread)
+
        if not c.flag_disable_led_control:
            self.led_thread.set_state(LED.COLOR_RED)

@@ -144,8 +120,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
        self._session = {}
        self._user_session_expire = c.user_session_expire_days * 24 * 60 * 60  # sec

-        # temp use variable
-
        # indicate those device together
        self._device_instruction_group = None

@@ -155,9 +129,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
        # _api request build
        self._api = ApiRequests()

-        self._project_manager = ProjectManager(self.device_manager, self.mqtt_thread)
-
-
    # init method

    def _init_file_manager(self, option: ControlServerOptions) -> FileManager:
@@ -249,32 +220,16 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
        # device manager reset
        self.submit_thread(self._setup_device)

-        # self.submit_thread(self._setup_controller)
        self._setup_controller()

        # self.run_thread(self._detect_device_thread)

-        # experimental protocol manager
-        # if not self._controller_options.flag_disable_exp_manager:
-        #     self.exp_manager.setup()
-        #     self.exp_manager.reload_protocol()
-
-        # websocket server
-        ### self.log_verbose('setup websocket server', pc(self.websocket_thread.websocket_address, YELLOW))
-        # websocket server thread run ###
-        ### self.run_thread(self.websocket_thread)
-
        # broadcast greeting
        self.broadcast_command(DataMessage.greeting())

-        # routine trashing
-        if self._routine_trash_thread is not None:
-            self.run_thread(self._routine_trash_thread)
-
        # remote server
        if self.mqtt_thread is not None:
            self.mqtt_thread.start()
-            # self.run_thread(self.mqtt_thread)

    def _setup_file_manager(self):
        self.log_verbose('setup file manager')
@@ -449,90 +404,14 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
        self.broadcast_command('shutdown')
        self.data_server.stop_process(external_interrupt)

-        self._stop_data_stream_thread()
-
        self.device_manager.shutdown()

        self.file_manager.shutdown(umount_external=True)

-        self.cache_manager.shutdown()
-
-        ###    self.websocket_thread.close()
-
        self.led_thread.close()

        if self.mqtt_thread is not None:
            self.mqtt_thread.shutdown()
-            # self.mqtt_thread.close()
-
-    # user session
-
-    def new_user_session(self) -> str:
-        session = UserSession(None)
-
-        self._session[session.user_session] = session
-
-        self.log_info('new user session', session.user_session)
-
-        return session.user_session
-
-    @logging_info
-    def del_user_session(self, user_session: Optional[str] = None):
-        if user_session is None:
-            self._session.clear()
-
-        else:
-            try:
-                del self._session[user_session]
-            except KeyError:
-                pass
-
-    def get_user_session(self,
-                         user_session: Optional[str],
-                         new_session = False,
-                         allow_empty = False) -> Optional[UserSession]:
-        """
-
-        :param user_session: user session ID
-        :param new_session: new a user session if *user_session* not found.
-        :param allow_empty: consider empty *user_session* None
-        :return: user session
-        """
-
-        if user_session is None:
-            session = None
-
-        elif len(user_session) == 0:
-            if allow_empty:
-                session = None
-            else:
-                raise None
-
-        else:
-            session = self._session.get(user_session, None)
-
-        if session is not None:
-            session.time()
-
-        elif new_session:
-            session = UserSession(user_session)
-
-            self._session[session.user_session] = session
-
-            self.log_info('new user session', session.user_session)
-
-        return session
-
-    def expire_user_session(self):
-        current_time = time()
-
-        for user_session in list(self._session.keys()):
-            session = self._session[user_session]
-
-            if session.time(update=False) - current_time > self._user_session_expire:
-                del self._session[user_session]
-
-    # general post action

    def _post_device_list(self) -> List[CompletedDevice]:
        """general post action for getting list of connected devices.
@@ -869,12 +748,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
    def get_device_info(self, device: int) -> Optional[CompletedDevice]:
        return super().get_device_info(device)

-    # @logging_info
-    # def device_call(self, device: int) -> bool:
-    #     self.device_manager.call_device(device)
-    #
-    #     return True
-
    @logging_info
    def device_instruction_all(self, device: int) -> List[str]:
        return self.device_manager.list_device_instruction(device)
@@ -1048,8 +921,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler

    @logging_info
    def device_parameter(self, device: int, parameter: str, content: Optional[str] = None) -> Any:
-        # if content is not None:
-        #     self.broadcast_command('parameter:' + str(device) + '/' + parameter + '/' + content)
        return self.device_manager.handle_device_parameter_command(device, parameter, content)

    @logging_info
@@ -1141,256 +1012,12 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
    def device_history_delete(self, user: str, device: Optional[int]) -> bool:
        raise NotImplementedError()

-    # server provide method implement : file manager functions
-
-    @logging_info
-    def file_clean_storage(self) -> bool:
-        return super().file_clean_storage()
-
-    @logging_info
-    def file_index(self) -> RootInfo:
-        return super().file_index()
-
-    @logging_info
-    def file_list(self, path: str) -> DirectoryInfo:
-        return super().file_list(path)
-
-    @logging_info
-    def file_list_range(self, path: str, start: int, end: int) -> DirectoryInfo:
-        return super().file_list_range(path, start, end)
-
-    @logging_info
-    def file_rename(self, path: str, content: str) -> FileInfo:
-        return super().file_rename(path, content)
-
-    @logging_info
-    def file_mkdir(self, path: str) -> DirectoryInfo:
-        return super().file_mkdir(path)
-
-    @logging_info
-    def file_delete(self, path: str) -> bool:
-        return super().file_delete(path)
-
-    @logging_info
-    def file_info(self, path: str) -> FileInfo:
-        return super().file_info(path)
-
-    @logging_info
-    def file_meta_info(self, path: str) -> RecordingMetaFile:
-        return super().file_meta_info(path)
-
-    @logging_info
-    def file_export_info(self, path: str) -> Dict[str, Optional[Path]]:
-        return super().file_export_info(path)
-
-    @logging_info
-    def file_export_functions(self) -> Tuple[ExternalExportFunction, ...]:
-        return super().file_export_functions()
-
-    @logging_info
-    def file_export_parameters(self, ftype: str) -> Tuple[ExternalParameter, ...]:
-        return super().file_export_parameters(ftype)
-
-    @logging_info
-    def file_export(self, ftype: str, path: str, **options: str) -> str:
-        return super().file_export(ftype, path, **options)
-
-    @logging_info
-    def file_segment(self, method: str, path: str) -> Union[None, bool, FileSegment]:
-        return super().file_segment(method, path)
-
-    @logging_info
-    def file_segment_get(self, segment: int, path: str):
-        return super().file_segment_get(segment, path)
-
-    @logging_info
-    def file_handle_open(self, content: str) -> Optional[FileHandle]:
-        info = self.file_manager.info(content)
-        meta = info.meta_file
-
-        if meta is None:
-            raise RuntimeError('not a meta file')
-
-        handle = self.cache_manager.file_open(meta)
-
-        return self.file_handle_info(handle)
-
-    @logging_info
-    def file_handle_info(self, handle: int) -> Optional[FileHandle]:
-        info = self.cache_manager.file_info(handle)
-
-        if info is None:
-            return None
-
-        # modify file path
-        info.shadow_path(self.file_manager.shadow_path(Path(info.filepath)))
-
-        return info
-
-    @logging_info
-    def file_handle_close(self, handle: int):
-        self.cache_manager.file_close(handle)
-
-    @logging_info
-    def user_all(self) -> List[str]:
-        raise super().user_all()
-
-    @logging_info
-    def user_info(self, user: str, *, user_session: Optional[str] = None) -> Optional[AbstractUserSetting]:
-        return super().user_info(user, user_session=user_session)
-
-    @logging_info
-    def user_login(self, user: str, content: str, *,
-                   user_session = None) -> ComplexResponse[AbstractUserSetting]:
-        raise super().user_login(user, content, user_session=user_session)
-
-    @logging_info
-    def user_logout(self, user_session: Optional[str] = None) -> None:
-        super().user_logout(user_session)
-
-    @logging_info
-    def user_add(self, user: str, content: str, *,
-                 user_session = None) -> ComplexResponse[AbstractUserSetting]:
-        return super().user_add(user, content, user_session=user_session)
-
-    @logging_info
-    def user_del(self, user: str, content: str) -> bool:
-        return super().user_del(user, content)
-
-    @logging_info
-    def user_sync(self, user_session: Optional[str]) -> bool:
-        return super().user_sync(user_session)
-
-    @logging_info
-    def user_configuration_list(self, user_session: Optional[str], **options: str) -> List[str]:
-        return super().user_configuration_list(user_session, **options)
-
-    @logging_info
-    def user_configuration_get(self, name: str, user_session: Optional[str] = None) -> Optional[RecordingMetaFile]:
-        return super().user_configuration_get(name, user_session)
-
-    @logging_info
-    def user_configuration_add(self, name: str, content: str, user_session: Optional[str] = None) -> bool:
-        return super().user_configuration_add(name, content, user_session)
-
-    @logging_info
-    def user_configuration_del(self, name: str, user_session: Optional[str] = None) -> bool:
-        return super().user_configuration_del(name, user_session)
-
-    @logging_info
-    def user_configuration_clone(self, name: str, content: str, user_session: Optional[str] = None) -> bool:
-        return super().user_configuration_clone(name, content, user_session)
-
-    @logging_info
-    def user_setup_list(self, user_session: Optional[str] = None) -> List[str]:
-        return super().user_setup_list(user_session)
-
-    @logging_info
-    def user_setup_info(self, name: str, user_session: Optional[str] = None) -> Optional[UserSetup]:
-        return super().user_setup_info(name, user_session)
-
-    @logging_info
-    def user_setup_new(self, name: str, user_session: Optional[str] = None) -> Optional[UserSetup]:
-        return super().user_setup_new(name, user_session)
-
-    @logging_info
-    def user_setup_del(self, name: str, user_session: Optional[str] = None) -> bool:
-        return super().user_setup_del(name, user_session)
-
-    @logging_info
-    def user_alias_list(self, user_session: Optional[str] = None) -> List[UserDeviceAlias]:
-        return super().user_alias_list(user_session)
-
-    @logging_info
-    def user_alias_info(self, name: str, user_session: Optional[str] = None) -> Optional[UserDeviceAlias]:
-        return super().user_alias_info(name, user_session)
-
-    @logging_info
-    def user_alias_edit(self, name: str, content: str, user_session: Optional[str] = None) -> Optional[UserDeviceAlias]:
-        return super().user_alias_edit(name, content, user_session)
-
-    # @logging_info
-    # def exp_pro_list(self) -> List[ExpProtocolInfo]:
-    #     return self.exp_manager.list_available_protocol()
-
-    @logging_info
-    def exp_pro_create(self, content: str, *,
-                       user_session = None) -> int:
-        user_name = self._session_user_name(user_session)
-
-        if user_name is None:
-            raise RuntimeError('require user login')
-
-        self.file_manager.user_setting.user_info(user_name)
-
-        # p = self.exp_manager.create_protocol(content, user_name)
-        return
-
    @logging_info
    def run_project(self, project) -> bool:
        project = self._project_manager.create(project)
        self._project_manager.run(project)
        return False

-    # @logging_info
-    # def exp_pro_options(self, protocol: int) -> List[ExpOption]:
-    #     return self.exp_manager.protocol_options(protocol)
-
-    # @logging_info
-    # def exp_pro_option(self, protocol: int, option: str, content: Optional[str] = None) -> bool:
-    #     if content == '':
-    #         # option reset
-    #         if option == '':
-    #             # reset all options
-    #             self.exp_manager.protocol_reset(protocol)
-    #         else:
-    #             self.exp_manager.protocol_reset(protocol, *option.split(','))
-    #     else:
-    #         # option get/set
-    #         self.exp_manager.protocol_option(protocol, option, content)
-
-    #     return True
-
-    # @logging_info
-    # def exp_pro_status_all(self) -> List[AbstractExpProtocolState]:
-    #     ret = []
-
-    #     for p in self.exp_manager.list_protocol():
-    #         s = self.exp_manager.protocol_status(p)
-
-    #         if s is not None:
-    #             ret.append(s)
-    #         else:
-    #             ret.append(AbstractExpProtocolState(p))
-
-    #     return ret
-
-    # @logging_info
-    # def exp_pro_status(self, protocol: int) -> Optional[ExpProtocolState]:
-    #     return self.exp_manager.protocol_status(protocol)
-
-    # @logging_info
-    # def exp_pro_command(self, protocol: int, content: str) -> bool:
-    #     if content == 'ensure':
-    #         return self.exp_manager.ensure_protocol(protocol)
-
-    #     elif content == 'start':
-    #         self.exp_manager.submit_protocol(protocol)
-
-    #     elif content == 'interrupt':
-    #         self.exp_manager.interrupt_protocol(protocol)
-
-    #     elif content == 'suspend':
-    #         self.exp_manager.suspend_protocol(protocol)
-
-    #     elif content == 'resume':
-    #         self.exp_manager.resume_protocol(protocol)
-
-    #     else:
-    #         raise RuntimeError('unknown protocol command : ' + content)
-
-    #     return True
-
    @logging_info
    def device_internal_command(self, device: int, oper: str, value: Any) -> bool:
        device = self.device_manager.get_device(device)
@@ -1406,8 +1033,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
            return True

        elif oper == InternalInstruction.PREDEFINED_DISABLE_CACHE:
-            if device is not None:
-                self._device_set_disable_cache(device, value)
            return True

        else:
@@ -1459,10 +1084,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler

    def _device_set_sync(self, device: CompletedDevice, sync: bool):
        if sync:
-            self.log_verbose('start sync', device.device_id)
-
-            self.cache_manager.drop_data(device)
-
            client = self.data_server.client()
            if client is not None:
                info = self.file_manager.use(device)
@@ -1473,22 +1094,14 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
                        filename = format_filename(self.TEMP_FILENAME_EXPR, device)
                        info = self.file_manager.save(device, filename)
                        client.update_device_configuration(device, info.meta_file, RawDataDecoder())
-                        print('***456')

                    if self._device_instruction_group is None:
                        client.start_sync(device)
-
-            if self._device_instruction_group is None:
-                # broadcast
-                self.broadcast_command(DataMessage.start(device.device_id))
-
+                    
+                    device.status = 1
        else:
-            self.log_verbose('stop sync', device.device_id)
-
            if self._device_instruction_group is None:
-
                start_sync = False
-
                client = self.data_server.client()
                if client is not None:
                    with client:
@@ -1501,12 +1114,10 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
                if start_sync:
                    # unset file info, but keep file path cache
                    self.file_manager.unset(device.device_id)
+                    device.status = 0

-                    # broadcast
-                    self.broadcast_command(DataMessage.stop(device.device_id))

    # server provide method implement : websocket broadcast functions
-
    @logging_info
    def broadcast_command(self, command: str, device: Optional[int] = None):
        self.log_verbose(pc('broadcast_command', GREEN),
@@ -1516,96 +1127,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
        if self.mqtt_thread is not None:
            self.mqtt_thread.broadcast_command(command, device=device)

-    # data stream thread
-
-    def data_request_stream(self, start: bool, handler: DataMessageHandler):
-        if start:
-            t = self._start_data_stream_thread()
-            t.add_handle(handler)
-
-        else:
-            t = self._data_stream_thread
-
-            if t is not None:
-                t.del_handle(handler)
-
-                if not t.has_handle():
-                    self._stop_data_stream_thread()
-
-    def _start_data_stream_thread(self) -> DataStreamThread:
-        t = self._data_stream_thread
-
-        if self._data_stream_thread is None:
-            self._data_stream_thread = t = self.run_thread(DataStreamThread(self))
-
-        return t
-
-    def _stop_data_stream_thread(self):
-        t = self._data_stream_thread
-        self._data_stream_thread = None
-
-        if t is not None:
-            t.close()
-
-    # noinspection PyShadowingNames
-    @logging_info
-    def websocket_command(self, command: str) -> Union[None, str, bytes, List[str]]:
-        if command == DataMessage.GREETING:
-            return DataMessage.greeting()
-
-        elif command == DataMessage.SYNC:
-            return self._websocket_command_sync(map(lambda d: d.device_id, self._post_device_list()))
-
-        elif command.startswith(DataMessage.SYNC):
-            _, device_list = part_suffix(command, ':')
-
-            if ',' in device_list:
-                return self._websocket_command_sync(map(int, device_list.split(',')))
-
-            else:
-                return self._websocket_command_sync([int(device_list)])
-
-        elif command.startswith(DataMessage.BROADCAST):
-            _, message = part_suffix(command, ':')
-
-            if message is not None:
-                self.broadcast_command(DataMessage.broadcast(message))
-
-        return None
-
-    # noinspection PyShadowingNames
-    def _websocket_command_sync(self, device_list: Iterable[int]) -> Union[str, List[str]]:
-        client = self.data_server.client()
-
-        if client is None:
-            return DataMessage.sync(False)
-
-        else:
-            result_start = []
-            result_stop = []
-
-            with client:
-                for device in device_list:
-                    if client.is_sync(device):
-                        result_start.append(device)
-                    else:
-                        result_stop.append(device)
-
-            return [DataMessage.start(result_start), DataMessage.stop(result_stop)]
-
-    # noinspection PyShadowingNames
-    def websocket_data_request(self, handler: DataMessageHandler, command: Optional[str]):
-        try:
-            self._handle_command_response(handler, command)
-
-        except (ValueError, IndexError) as e:
-            self.log_warn(e)
-            handler.on_error(DataMessage.warn(str(e)))
-
-        except BaseException as e:
-            self.log_warn(e)
-            handler.on_error(DataMessage.error(str(e)))
-
    # noinspection PyShadowingNames
    def _handle_command_response(self, handler: DataMessageHandler, command: Optional[str]):
        """
@@ -1627,29 +1148,7 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
        else:
            self.cache_manager.get_data_message(handler, response)

-    # server provide method implement : cache API
-
-    @logging_verbose
-    def clear(self):
-        self.cache_manager.clear()
-
-    def push_data(self, data: Union[bytes, List[bytes]]):
-        self.cache_manager.push_data(data)
-
-    @logging_verbose
-    def drop_data(self, *device: int):
-        self.cache_manager.drop_data(*device)
-
-    def stop_data(self, device: int):
-        self.cache_manager.stop_data(device)
-
-    # noinspection PyShadowingNames
-    @logging_verbose
-    def notify_data(self, device: int, message: str):
-        self.broadcast_command(message, device=device)
-
    # led function
-
    def get_led_state(self) -> str:
        return self.led_thread.state

@@ -1657,7 +1156,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
        self.led_thread.set_state(state)

    # hardware send test
-
    if not _RUNTIME_COMPILE:

        def _hardware_send_test(self, options: Dict[str, str]):
@@ -1700,30 +1198,9 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
                    'export_root':  str(self.file_manager.export_root)
                }

-            if section is None or 'cache' in section:
-                ret['cache'] = {
-                    'cache_size': self.cache_manager.cache_size,
-                    'cache_time': self.cache_manager.cache_time,
-                }
-
-            # if section is None or 'websocket' in section:
-            #     ret['websocket'] = {
-            #         'address': self.websocket_thread.websocket_address,
-            #         'port':    self.websocket_thread.websocket_port,
-            #     }
-
            if section is None or 'mqtt' in section:
                ret['mqtt'] = None if self.mqtt_thread is None else self.mqtt_thread.hardware_test()

-            if section is None or 'trash' in section:
-                trash_manager = self._routine_trash_thread
-
-                ret['trash'] = None if trash_manager is None else {
-                    'routine_interval': trash_manager.routine_interval,
-                    'trash_expire':     trash_manager.trash_expire,
-                    'remove_expire':    trash_manager.remove_expire,
-                }
-
            if section is None or 'led' in section:
                ret['led'] = {
                    'state_all': list(LED.COLOR.keys()),
@@ -1852,7 +1329,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
            # TODO write options files
            return False

-
 class _RandomCrashThread(ServerThread):
    def __init__(self):
        super().__init__('Crash')
@@ -41,7 +41,7 @@ class RecordingProcess(Process):
        connect to DB and send sql command
    """

-    def __init__(self, client_id: str, log_verbose, device_id, queue_rec, queue_ds, meta_path, 
+    def __init__(self, client_id: str, log_verbose, device_id, queue_rec, queue_ds, queue_msg, meta_path, 
                    device_info, parameter, parent, recording_file_name, data_format,
                    mqtt_ip, mqtt_port,
                    name = 'Recording-Process', database = None):
@@ -82,6 +82,7 @@ class RecordingProcess(Process):

        self._queue_rec = queue_rec
        self._queue_ds = queue_ds
+        self._queue_msg = queue_msg
        self.queue_flag = True

        self._is_close = True
@@ -230,11 +231,12 @@ class RecordingProcess(Process):
                try:
                    if isinstance(decoder, I4V4Z4T4DataDecoder) or isinstance(decoder, EISZeroOneDataDecoder):
                        if decoder.isFinishMode is not None and decoder.isFinishMode() == 1:
-                            content = {}
-                            content['header'] = 'device_instruction/0'
-                            content['device'] = result.device
-                            content['instruction'] = 'interrupt'
-                            self._mqtt_thread.publish('device_instruction',json_stringify(content), True)
+                            self._queue_msg.put(['ds', self._device, 'interrupt'])
+                            # content = {}
+                            # content['header'] = 'device_instruction/0'
+                            # content['device'] = result.device
+                            # content['instruction'] = 'interrupt'
+                            # self._mqtt_thread.publish('device_instruction',json_stringify(content), True)
                            # self.server.stop_sync(self.device)
                except RuntimeError as e:
                    print(e)
Author	SHA1	Message	Date
peterlu14	0cd0fd7027	[update] project task name rename	2022-04-27 13:24:31 +08:00
peterlu14	fa8c219f76	Merge branch 'rel/v1.5.1' into feature/project	2022-04-25 10:48:22 +08:00
peterlu14	ced466f3aa	[update] add condition & first task issue & add boardcast	2022-04-18 01:52:52 +08:00
peterlu14	f36906c034	[update] restruct project	2022-04-17 23:05:21 +08:00
peterlu14	0b5c62e525	[update] temp save	2022-04-16 10:50:37 +08:00
peterlu14	abe86238ca	remove print messages	2022-04-13 15:58:27 +08:00
peterlu14	f9ab0bc59b	[update] remove duplicate code	2022-04-13 15:49:04 +08:00
peterlu14	5dbe231c73	[update] add cacheClient communicate with control server & add comment	2022-04-13 14:08:57 +08:00
peterlu14	c721950bf7	[update] add complete device status	2022-04-12 14:28:04 +08:00
peterlu14	70c0271771	[remove] duplicate code	2022-04-11 16:35:04 +08:00