diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..02fda5b --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,27 @@ +module.exports = { + env: { + browser: true, + es2021: true, + }, + extends: "eslint:recommended", + parserOptions: { + ecmaVersion: "latest", + sourceType: "script", + }, + globals: { + $: "readonly", + dolog: "readonly", + EventSource: "readonly", + jQuery: "readonly", + runtext: "readonly", + showusers: "readonly", + }, + overrides: [ + { + files: ["tests/js/*.test.js"], + env: { + node: true, + }, + }, + ], +}; diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index d4d23b8..33938bc 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -26,14 +26,35 @@ jobs: requirements.txt requirements-dev.txt + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: "20" + cache: npm + cache-dependency-path: package-lock.json + + - name: Set up PHP + uses: shivammathur/setup-php@v2 + with: + php-version: "8.3" + coverage: none + + - name: Show tool versions + run: | + python --version + node --version + npm --version + php --version + google-chrome --version || chromium --version || chromium-browser --version || true + - name: Install dependencies run: | python -m pip install --upgrade pip make venv make pip-sync-dev - - name: Run lint and formatting checks - run: make lint - - name: Run tests run: make test + + - name: Run lint checks + run: make lint diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cb8df27 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +config.yaml +.coverage +.pytest_cache/ +.venv/ +__pycache__/ +node_modules/ +tests/__pycache__/ +tests/plugins/__pycache__/ diff --git a/Makefile b/Makefile index 764f249..92bf406 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,24 @@ PYTHON ?= python3 +NPM ?= npm +PHP ?= php +PY_FILES := kassa.py $(shell find plugins tests -type f -name '*.py' | sort) +PHP_FILES := $(shell find www -type f -name '*.php' | sort) -test: +.PHONY: test python-test js-test php-test venv pip-compile pip-sync pip-sync-dev lint python-lint js-lint php-lint check-types fix check + +test: python-test js-test php-test + +python-test: venv @. .venv/bin/activate && ${env} ${PYTHON} -m pytest -vvv --cov=. --cov-report term-missing + +js-test: node_modules/.package-lock.json + @${NPM} run test:js + +php-test: + @${PHP} tests/php/test_php_files.php + +check: test lint ## Run tests and linters + venv: .venv/make_venv_complete ## Create virtual environment .venv/make_venv_complete: ${PYTHON} -m venv .venv @@ -22,12 +39,23 @@ pip-sync-dev: ## synchronizes the .venv with the state of requirements.txt . .venv/bin/activate && ${env} pip install -U pip-tools . .venv/bin/activate && ${env} ${PYTHON} -m piptools sync requirements.txt requirements-dev.txt -lint: venv ## Do basic linting +lint: python-lint js-lint php-lint ## Do basic linting + +python-lint: venv @. .venv/bin/activate && ${env} ${PYTHON} -m pylint --persistent=no kassa.py plugins - @. .venv/bin/activate && ${env} ${PYTHON} -m black --check kassa.py plugins tests + @. .venv/bin/activate; for file in ${PY_FILES}; do ${env} ${PYTHON} -m black --check --quiet --workers 1 "$$file" || exit $$?; done + +node_modules/.package-lock.json: package.json package-lock.json + ${NPM} ci + +js-lint: node_modules/.package-lock.json + @${NPM} run lint:js + +php-lint: + @for file in ${PHP_FILES}; do ${PHP} -l "$$file" || exit $$?; done check-types: venv ## Check for type issues with mypy @. .venv/bin/activate && ${env} ${PYTHON} -m mypy --check . fix: - @. .venv/bin/activate && ${env} ${PYTHON} -m black kassa.py plugins tests + @. .venv/bin/activate; for file in ${PY_FILES}; do ${env} ${PYTHON} -m black --quiet --workers 1 "$$file" || exit $$?; done diff --git a/config.py b/config.py new file mode 100644 index 0000000..8cb4909 --- /dev/null +++ b/config.py @@ -0,0 +1,71 @@ +import copy +import os + +import yaml + + +CONFIG_PATH = "config.yaml" + +DEFAULT_CONFIG = { + "mqtt": { + "host": "localhost", + "port": 1883, + "keepalive": 60, + }, + "door": { + "mqtt": { + "host": "mqtt.space.hack42.nl", + "port": 1883, + "keepalive": 60, + "topic": "hack42/brandhok/deuropen", + }, + }, + "stickers": { + "printer": { + "model": "QL-710W", + "host": "localhost", + "port": 9100, + }, + }, + "pos": { + "serial": { + "port": "/dev/ttyUSB0", + "baudrate": 19200, + }, + }, + "logging": { + "level": "INFO", + }, +} + + +def _merge_config(base, override): + merged = copy.deepcopy(base) + for key, value in override.items(): + if isinstance(value, dict) and isinstance(merged.get(key), dict): + merged[key] = _merge_config(merged[key], value) + else: + merged[key] = value + return merged + + +def load_config(path=None): + path = path or os.environ.get("KASSA_CONFIG", CONFIG_PATH) + if not os.path.exists(path): + return copy.deepcopy(DEFAULT_CONFIG) + + with open(path, encoding="utf-8") as config_file: + loaded = yaml.safe_load(config_file) or {} + + if not isinstance(loaded, dict): + return copy.deepcopy(DEFAULT_CONFIG) + return _merge_config(DEFAULT_CONFIG, loaded) + + +def config_get(*keys, default=None): + value = load_config() + for key in keys: + if not isinstance(value, dict) or key not in value: + return default + value = value[key] + return value diff --git a/config.yaml.example b/config.yaml.example new file mode 100644 index 0000000..4be949e --- /dev/null +++ b/config.yaml.example @@ -0,0 +1,30 @@ +# Copy this file to config.yaml and adjust local values. +# config.yaml is intentionally git-ignored so local secrets/device settings are not overwritten. + +mqtt: + host: localhost + port: 1883 + keepalive: 60 + +door: + mqtt: + host: mqtt.space.hack42.nl + port: 1883 + keepalive: 60 + topic: hack42/brandhok/deuropen + +stickers: + printer: + model: QL-710W + host: BRW008092D4A414.space.hack42.nl + port: 9100 + # Optional override when the brother_ql backend needs a full identifier: + # identifier: tcp://BRW008092D4A414.space.hack42.nl:9100 + +pos: + serial: + port: /dev/ttyUSB0 + baudrate: 19200 + +logging: + level: INFO diff --git a/input_validation.py b/input_validation.py new file mode 100644 index 0000000..03ce179 --- /dev/null +++ b/input_validation.py @@ -0,0 +1,43 @@ +import re + + +RESERVED_INPUTS = {"abort", "ok"} +INPUT_TOKEN_RE = re.compile(r"^[A-Za-z0-9]+$") + + +def reserved_inputs(master=None, plugin_help=None): + reserved = set(RESERVED_INPUTS) + if isinstance(plugin_help, dict): + reserved.update(plugin_help.keys()) + master_help = getattr(master, "help", {}) + if isinstance(master_help, dict): + reserved.update(master_help.keys()) + return reserved + + +def is_reserved_input(text, master=None, plugin_help=None): + return text in reserved_inputs(master=master, plugin_help=plugin_help) + + +def filter_reserved_aliases(aliases, master=None, plugin_help=None): + return [ + alias + for alias in aliases + if not is_reserved_input(alias, master=master, plugin_help=plugin_help) + ] + + +def is_valid_input_token(text, min_length): + return ( + isinstance(text, str) + and len(text) >= min_length + and INPUT_TOKEN_RE.fullmatch(text) is not None + ) + + +def is_valid_alias(text): + return is_valid_input_token(text, min_length=6) + + +def is_valid_product_name(text): + return is_valid_input_token(text, min_length=4) diff --git a/kassa.py b/kassa.py index 706f2af..5b99df9 100755 --- a/kassa.py +++ b/kassa.py @@ -1,13 +1,18 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- +# Broad exception handling is intentional in this plugin host: plugin failures +# should be logged and isolated instead of stopping the active kassa session. +# pylint: disable=broad-exception-caught import glob +import logging import os import time import json import sys -import traceback import paho.mqtt.client as mqtt +from config import config_get +logger = logging.getLogger(__name__) sessions = {} @@ -40,31 +45,51 @@ def __init__(self, SID, client): self.SID = SID self.client = client self.plugins = {} + self.counter = 0 + self.nextcall = {} + self.prompt = "" + self.help = {} + self.cache = {} + self.iets = 0 + self.buttons = {} + self.stock = None + self.POS = None + self.log = None + self.receipt = None + self.accounts = None + self.products = None def startup(self): - print("Startup", self.SID) + logger.info("session_startup sid=%s", self.SID) for fname in glob.glob("plugins/*.py"): plugname = os.path.splitext(os.path.basename(fname))[0] if plugname != "__init__" and not plugname in self.plugins: if plugname in sys.modules: del sys.modules[plugname] - print(self.plugins) + logger.debug( + "session_plugins_before_load sid=%s plugins=%s", self.SID, self.plugins + ) for fname in glob.glob("plugins/*.py"): plugname = os.path.splitext(os.path.basename(fname))[0] - print(plugname) + logger.debug("plugin_discovered sid=%s plugin=%s", self.SID, plugname) if plugname != "__init__" and not plugname in self.plugins: if plugname in sys.modules: del sys.modules[plugname] self.plugins[plugname] = self.import_from( "plugins." + plugname, plugname )(self.SID, self) - print(plugname, self.import_from("plugins." + plugname, plugname)) + logger.debug( + "plugin_loaded sid=%s plugin=%s class=%r", + self.SID, + plugname, + self.import_from("plugins." + plugname, plugname), + ) self.send_message(True, "message", "loaded plugin " + plugname) try: self.help.update(self.plugins[plugname].help()) - except: - print(traceback.format_exc()) - print(self.plugins) + except Exception: + logger.exception("Plugin %s help failed", plugname) + logger.debug("session_plugins_loaded sid=%s plugins=%s", self.SID, self.plugins) self.receipt = self.plugins["receipt"] self.accounts = self.plugins["accounts"] self.products = self.plugins["products"] @@ -76,22 +101,22 @@ def startup(self): for _plug, plugin in self.plugins.items(): try: plugin.startup() - except: - print(traceback.format_exc()) + except Exception: + logger.exception("Plugin %s startup failed", _plug) self.send_message(True, "commands", json.dumps(self.help)) self.send_message(True, "message", "Enter product, command or username") - print(self.plugins) + logger.info("session_ready sid=%s plugins=%s", self.SID, sorted(self.plugins)) def realcallhook(self, hook, arg): for _plug, plugin in self.plugins.items(): try: - getattr(plugin, "hook_" + hook) - try: - getattr(plugin, "hook_" + hook)(arg) - except: - print(traceback.format_exc()) + hook_func = getattr(plugin, "hook_" + hook) except AttributeError: - pass + continue + try: + hook_func(arg) + except Exception: + logger.exception("Plugin %s hook_%s failed", _plug, hook) def callhook(self, hook, arg): self.realcallhook("pre_" + hook, arg) @@ -105,11 +130,13 @@ def donext(self, plug, function): def pre_input(self, text): for _plug, plugin in self.plugins.items(): try: - plugin.pre_input(text) + pre_input = getattr(plugin, "pre_input") except AttributeError: - pass - except: - print(traceback.format_exc()) + continue + try: + pre_input(text) + except Exception: + logger.exception("Plugin %s pre_input failed", _plug) def handle_nextcall(self, text): if not self.nextcall: @@ -118,12 +145,16 @@ def handle_nextcall(self, text): plug = self.nextcall["plug"] func = self.nextcall["function"] self.nextcall = {} - print(text) - print(self.nextcall) - print(getattr(plug, func)) + logger.debug( + "nextcall sid=%s plugin=%s function=%s input=%r", + self.SID, + plug.__class__.__name__, + func, + text, + ) return bool(getattr(plug, func)(text)) - except: - print(traceback.format_exc()) + except Exception: + logger.exception("Nextcall failed") return False def input(self, text): @@ -159,13 +190,15 @@ def handle_part(self, part): if not done: for _plug, plugin in self.plugins.items(): try: - if plugin.input(part): + plugin_input = getattr(plugin, "input") + except AttributeError: + continue + try: + if plugin_input(part): done = 1 break - except AttributeError: - print(traceback.format_exc()) - except: - print(traceback.format_exc()) + except Exception: + logger.exception("Plugin %s input failed", _plug) if not done: if self.plugins.get("withdraw") and self.plugins["withdraw"].withdraw(part): @@ -182,10 +215,11 @@ def send_message(self, retain, topic, message): != message or len(topic) < 8 ): - print( + logger.debug( + "send_message sid=%s retain=%s topic=%s message=%r", + self.SID, retain, - "hack42bar/output/session/" + self.SID + "/" + topic, - ":", + topic, message, ) self.cache["hack42bar/output/session/" + self.SID + "/" + topic] = message @@ -201,7 +235,7 @@ def send_message(self, retain, topic, message): def get_session(SID, client): global sessions # pylint: disable=global-variable-not-assigned if not SID in sessions: - print("Starting new session", SID) + logger.info("starting_new_session sid=%s", SID) sessions[SID] = Session(SID, client) sessions[SID].startup() client.publish("hack42bar/output/sessions", json.dumps(list(sessions.keys()))) @@ -213,37 +247,51 @@ def run_session(client, SID, action, data): session = get_session(SID, client) session.input(data.decode()) else: - print("unhandled", action) + logger.warning("unhandled_session_action sid=%s action=%s", SID, action) def on_connect(client, _userdata, _flags, rc): - print("Connected with result code " + str(rc)) + logger.info("mqtt_connected rc=%s", rc) client.subscribe("hack42bar/input/#") def on_message(client, _userdata, msg): - # print(msg.topic+" "+str(msg.payload)) elms = msg.topic.split("/") msg = msg.payload - if len(elms) < 3: + if len(elms) < 5: return # try: run_session(client, elms[3], elms[4], msg) def run(): + logging_level = getattr( + logging, + str(config_get("logging", "level", default="INFO")).upper(), + logging.INFO, + ) + logging.basicConfig( + level=logging_level, + format="%(asctime)s %(levelname)s %(name)s %(message)s", + ) while 1: try: + mqtt_config = config_get("mqtt", default={}) client = mqtt.Client() client.on_connect = on_connect client.on_message = on_message - client.connect("localhost", 1883, 60) + client.connect( + mqtt_config["host"], + int(mqtt_config["port"]), + int(mqtt_config["keepalive"]), + ) client.loop_start() while True: time.sleep(1) # client.loop_forever() - except: + except Exception: + logger.exception("Kassa MQTT loop failed") time.sleep(5) diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..7657aa2 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,1131 @@ +{ + "name": "kassa", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "devDependencies": { + "eslint": "^8.55.0" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", + "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.1", + "debug": "^4.1.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/acorn": { + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", + "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.55.0", + "@humanwhocodes/config-array": "^0.11.13", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastq": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ignore": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dev": true, + "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..5b0e576 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "name": "kassa", + "private": true, + "scripts": { + "lint:js": "eslint www/kassa-textfill.js www/kassa-dom.js www/kassa-buttons.js www/kassa-stream.js www/kassa-app.js www/spaceconsole/all.js tests/js/*.test.js", + "test:js": "node --test tests/js/*.test.js" + }, + "devDependencies": { + "eslint": "^8.55.0" + } +} diff --git a/plugins/POS.py b/plugins/POS.py index fd4ebb2..ce19e77 100644 --- a/plugins/POS.py +++ b/plugins/POS.py @@ -1,10 +1,17 @@ # -*- coding: utf-8 -*- -import traceback +import base64 +import binascii import json -import time +import logging import pickle +import time + import serial +from config import config_get + +logger = logging.getLogger(__name__) + DISPLAY = b"\x1b=\x02\x1b@" PRINTER = b"\x1b=\x01\x1b@" LARGE = b"\x1d!\x11" @@ -27,7 +34,7 @@ DRAWER = b"\x1b\x700AA" -class POS: +class POS: # pylint: disable=too-many-public-methods bonnetjes = {} ser = None lastbonID = 0 @@ -35,18 +42,22 @@ class POS: def __init__(self, SID, master): self.master = master self.SID = SID + self.bonnetjes = {} + self.ser = None + self.lastbonID = 0 def open(self): if self.ser is not None: return + serial_config = config_get("pos", "serial", default={}) self.ser = serial.Serial( # pylint: disable=no-member - port="/dev/ttyUSB0", # pylint: disable=no-member - baudrate=19200, # pylint: disable=no-member + port=serial_config["port"], # pylint: disable=no-member + baudrate=int(serial_config["baudrate"]), # pylint: disable=no-member parity=serial.PARITY_NONE, # pylint: disable=no-member stopbits=serial.STOPBITS_ONE, # pylint: disable=no-member bytesize=serial.EIGHTBITS, # pylint: disable=no-member ) - print("Serial open") + logger.info("pos_serial_open sid=%s port=%s", self.SID, serial_config["port"]) def help(self): return { @@ -76,8 +87,7 @@ def printdisplay(self, desc, amount, som): self.ser.write(out) def hook_checkout(self, user): - if user == "cash": - self.drawer() + pass def hook_addremove(self, args): # Update display @@ -99,13 +109,22 @@ def hook_undo(self, args): ) self.writebons() + def projected_balance(self, user): + checkout_balances = getattr(self.master.accounts, "checkout_balances", {}) + if not isinstance(checkout_balances, dict): + checkout_balances = {} + account = self.master.accounts.accounts[user] + balance_before_checkout = checkout_balances.get(user, account["amount"]) + return balance_before_checkout + self.master.receipt.totals[user] + def makebon(self, user): BON = PRINTER + LARGE + CENTER + LOGO - if ( - self.master.accounts.accounts[user]["amount"] - + self.master.receipt.totals[user] - ) < -13.37: - BON += b"SALDO TE LAAG\n" + is_cash = user == "cash" + projected_balance = None + if not is_cash: + projected_balance = self.projected_balance(user) + if projected_balance < -13.37: + BON += b"SALDO TE LAAG\n" BON += NORMAL + b"Bon transactie %d\n" % self.master.transID BON += ( BARCODE_T @@ -141,10 +160,8 @@ def makebon(self, user): BON += b" " + b"-" * 38 + b"\n" BON += b" %-26s% 12.2f\n" % (b"Totaal", self.master.receipt.totals[user]) BON += b"\nU bent geholpen door: %s\n" % user.encode() - if user != b"cash": - BON += b"\n Nieuw saldo: %5.2f\n" % ( - self.master.accounts.accounts[user]["amount"] - ) + if not is_cash: + BON += b"\n Nieuw saldo: %5.2f\n" % projected_balance BON += ( b"\n" + CENTER @@ -219,31 +236,77 @@ def selectbon(self, text): return True try: bonID = int(text) - if bonID in self.bonnetjes: - self.bon(bonID) - return True + except (TypeError, ValueError): self.listbons() return True - except: - traceback.print_exc() - self.listbons() + + if bonID in self.bonnetjes: + self.bon(bonID) return True + self.listbons() + return True + def writebons(self): while len(self.bonnetjes) > 50: fk = sorted(self.bonnetjes.keys()) del self.bonnetjes[fk[0]] - with open("data/revbank.POS", "wb") as output: - pickle.dump(self.bonnetjes, output) + with open("data/revbank.POS", "w", encoding="utf-8") as output: + json.dump(self.serialize_bons(self.bonnetjes), output) def loadbons(self): + self.bonnetjes = {} try: with open("data/revbank.POS", "rb") as f: - self.bonnetjes = pickle.load(f) - f.close() - except: - pass + data = f.read() + except OSError: + return + + try: + try: + loaded = json.loads(data.decode("utf-8")) + except (UnicodeDecodeError, json.JSONDecodeError): + loaded = pickle.loads(data) + self.bonnetjes = self.deserialize_bons(loaded) + except ( + AttributeError, + EOFError, + KeyError, + TypeError, + ValueError, + binascii.Error, + pickle.PickleError, + ): + return + + def serialize_bons(self, bonnetjes): + output = {} + for bonID, bon in bonnetjes.items(): + serialized = dict(bon) + bon_data = serialized["bon"] + if isinstance(bon_data, bytes): + serialized["bon"] = { + "encoding": "base64", + "data": base64.b64encode(bon_data).decode("ascii"), + } + else: + serialized["bon"] = {"encoding": "text", "data": bon_data} + output[str(bonID)] = serialized + return output + + def deserialize_bons(self, bonnetjes): + output = {} + for bonID, bon in bonnetjes.items(): + deserialized = dict(bon) + bon_data = deserialized["bon"] + if isinstance(bon_data, dict): + if bon_data.get("encoding") == "base64": + deserialized["bon"] = base64.b64decode(bon_data["data"]) + else: + deserialized["bon"] = bon_data.get("data", "") + output[int(bonID)] = deserialized + return output def listbons(self): self.loadbons() diff --git a/plugins/accounts.py b/plugins/accounts.py index 1348f94..c977968 100644 --- a/plugins/accounts.py +++ b/plugins/accounts.py @@ -1,6 +1,31 @@ import json +import os +import tempfile +import threading import time import codecs +import logging + +logger = logging.getLogger(__name__) + + +def _atomic_write(path, lines): + directory = os.path.dirname(path) or "." + os.makedirs(directory, exist_ok=True) + fd, tmp_path = tempfile.mkstemp( + prefix=os.path.basename(path) + ".", dir=directory, text=True + ) + try: + with os.fdopen(fd, "w", encoding="utf-8") as f: + for line in lines: + f.write(line) + os.replace(tmp_path, path) + except Exception: + try: + os.unlink(tmp_path) + except FileNotFoundError: + pass + raise class accounts: @@ -9,6 +34,8 @@ class accounts: members = [] newaccount = "" adduseralias = "" + checkout_balances = {} + write_lock = threading.Lock() def __init__(self, SID, master): self.master = master @@ -18,12 +45,18 @@ def __init__(self, SID, master): self.members = [] self.newaccount = "" self.adduseralias = "" + self.checkout_balances = {} def help(self): - return {"adduseralias": "Add user key alias"} + return { + "addmember": "Add user to members", + "adduseralias": "Add user key alias", + "delmember": "Remove user from members", + "members": "Manage members", + } def get_last_updated_accounts(self): - print(self.accounts) + logger.debug("accounts_state sid=%s accounts=%s", self.SID, self.accounts) # Sort the accounts based on last update time, in descending order sorted_accounts = sorted( self.accounts.items(), key=lambda x: x[1]["lastupdate"], reverse=True @@ -36,24 +69,49 @@ def get_last_updated_accounts(self): # Internal functions def readaccounts(self): + self.accounts = {} + self.aliases = {} with codecs.open("data/revbank.accounts", "r", "utf-8") as f: lines = f.readlines() for line in lines: + if not line.strip() or line.lstrip().startswith("#"): + continue parts = line.split() + if len(parts) < 3: + continue self.accounts[parts[0]] = { "amount": float(parts[1]), "lastupdate": parts[2], } with codecs.open("data/revbank.aliases", "r", "utf-8") as f: y = f.readlines() - self.aliases = {} for x in y: - s = x.split(" ") + if not x.strip() or x.lstrip().startswith("#"): + continue + s = x.split() if len(s) == 2: - self.aliases[s[0]] = s[1].rstrip() + self.aliases[s[0]] = s[1] + + def readmembers(self): + with open("data/revbank.members", encoding="utf-8") as f: + self.members = [ + member.strip() + for member in f.readlines() + if member.strip() and not member.lstrip().startswith("#") + ] + + def _writemembers(self): + with self.write_lock: + _atomic_write( + "data/revbank.members", ["%s\n" % member for member in self.members] + ) + + def _publish_members(self): + self.get_last_updated_accounts() + self.master.send_message(True, "members", json.dumps(self.members)) def updateaccount(self, usr, value): - print("Updating account", usr) + logger.debug("update_account sid=%s user=%s value=%s", self.SID, usr, value) if usr == "cash": return had = self.accounts[usr]["amount"] @@ -63,19 +121,19 @@ def updateaccount(self, usr, value): self.master.callhook("balance", (usr, had, has, self.master.transID)) def writeaccount(self): - with open("data/revbank.accounts", "w", encoding="utf-8") as f: - for usr, account in self.accounts.items(): - f.write( + with self.write_lock: + _atomic_write( + "data/revbank.accounts", + [ "%-18s %+7.2f %s\n" - % ( - usr, - round(account["amount"], 2), - account["lastupdate"], - ) - ) - with open("data/revbank.aliases", "w", encoding="utf-8") as f: - for usr, alias in self.aliases.items(): - f.write("%s %s\n" % (usr, alias)) + % (usr, round(account["amount"], 2), account["lastupdate"]) + for usr, account in self.accounts.items() + ], + ) + _atomic_write( + "data/revbank.aliases", + ["%s %s\n" % (usr, alias) for usr, alias in self.aliases.items()], + ) # Hooks def hook_balance(self, args): @@ -128,9 +186,7 @@ def createnew(self, text): def startup(self): self.readaccounts() - with open("data/revbank.members", encoding="utf-8") as f: - self.members = f.readlines() - self.members = [m.rstrip() for m in self.members] + self.readmembers() self.get_last_updated_accounts() for name, account in self.accounts.items(): self.master.send_message(True, "accounts/" + name, json.dumps(account)) @@ -138,6 +194,9 @@ def startup(self): def hook_pre_checkout(self, _text): self.readaccounts() + self.checkout_balances = { + usr: account["amount"] for usr, account in self.accounts.items() + } self.master.transID = int(time.time() - 1300000000) def hook_post_checkout(self, _text): @@ -152,6 +211,68 @@ def messageandbuttons(self, donext, buttons, msg): self.master.send_message(True, "buttons", json.dumps({"special": buttons})) return True + def _messageandcustom(self, donext, custom, msg): + self.master.donext(self, donext) + self.master.send_message(True, "message", msg) + self.master.send_message( + True, "buttons", json.dumps({"special": "custom", "custom": custom}) + ) + return True + + def _membersmenu(self): + custom = [ + {"text": "addmember", "display": "Add member"}, + {"text": "delmember", "display": "Remove member"}, + ] + self.master.send_message(True, "message", "Please select a members command") + self.master.send_message( + True, "buttons", json.dumps({"special": "custom", "custom": custom}) + ) + return True + + def _addmember(self, text): + if text == "abort": + return self.master.callhook("abort", None) + if text not in self.accounts: + return self.messageandbuttons( + "_addmember", + "accounts", + "Unknown account; What user do you want to add?", + ) + if text in self.members: + return self.messageandbuttons( + "_addmember", + "accounts", + "Already a member; What user do you want to add?", + ) + self.members.append(text) + self._writemembers() + self._publish_members() + self.master.send_message(True, "message", "Member added: " + text) + return True + + def _delmember(self, text): + if text == "abort": + return self.master.callhook("abort", None) + if text not in self.members: + custom = [{"text": member, "display": member} for member in self.members] + return self._messageandcustom( + "_delmember", + custom, + "Unknown member; What member do you want to remove?", + ) + self.members.remove(text) + self._writemembers() + self._publish_members() + self.master.send_message(True, "message", "Member removed: " + text) + return True + + def _delmember_prompt(self): + custom = [{"text": member, "display": member} for member in self.members] + return self._messageandcustom( + "_delmember", custom, "What member do you want to remove?" + ) + def addalias(self, text): if text == "abort": return self.master.callhook("abort", None) @@ -189,10 +310,18 @@ def input(self, text): self.master.callhook("checkout", text) self.master.callhook("endsession", text) return True - if text == "adduseralias": - return self.messageandbuttons( + command_handlers = { + "adduseralias": lambda: self.messageandbuttons( "askalias", "accounts", "What user do you want to alias?" - ) + ), + "members": self._membersmenu, + "addmember": lambda: self.messageandbuttons( + "_addmember", "accounts", "What user do you want to add?" + ), + "delmember": self._delmember_prompt, + } + if text in command_handlers: + return command_handlers[text]() return None def newuser(self, text): diff --git a/plugins/declaratie.py b/plugins/declaratie.py index b6447f7..9664e11 100644 --- a/plugins/declaratie.py +++ b/plugins/declaratie.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import json import time -import traceback class declaratie: @@ -16,6 +15,13 @@ class declaratie: def __init__(self, SID, master): self.master = master self.SID = SID + self.wie = "" + self.value = 0 + self.reden = "" + self.ascash = 0 + self.asbank = 0 + self.asbar = 0 + self.soort = "" def help(self): return { @@ -56,41 +62,7 @@ def amount(self, text): return True try: value = float(text) - if -5000 < value < 5000: - self.value = value - if self.soort == "verkoop": - self.master.send_message( - True, "message", "Why do you give us E %.2f?" % self.value - ) - self.value = -self.value - elif self.soort == "declaratie": - self.master.send_message( - True, "message", "Where did you spend E %.2f on?" % self.value - ) - elif self.soort == "afroom": - self.reden = "Afroom" - self.ascash = -value - self.asbank = value - return self.final() - self.master.send_message( - True, "buttons", json.dumps({"special": "keyboard"}) - ) - self.master.donext(self, "reason") - else: - self.master.donext(self, "amount") - self.master.send_message( - True, "message", "Enter an amount between 0.01 and 4999.99:" - ) - self.master.send_message( - True, "buttons", json.dumps({"special": "numbers"}) - ) - return True - except: - traceback.print_exc() - - if text == "abort": - self.master.callhook("abort", None) - return True + except ValueError: self.master.donext(self, "amount") if self.soort == "verkoop": self.master.send_message( @@ -106,6 +78,35 @@ def amount(self, text): True, "buttons", json.dumps({"special": "numbers"}) ) return True + if -5000 < value < 5000: + self.value = value + if self.soort == "verkoop": + self.master.send_message( + True, "message", "Why do you give us E %.2f?" % self.value + ) + self.value = -self.value + elif self.soort == "declaratie": + self.master.send_message( + True, "message", "Where did you spend E %.2f on?" % self.value + ) + elif self.soort == "afroom": + self.reden = "Afroom" + self.ascash = -value + self.asbank = value + return self.final() + self.master.send_message( + True, "buttons", json.dumps({"special": "keyboard"}) + ) + self.master.donext(self, "reason") + else: + self.master.donext(self, "amount") + self.master.send_message( + True, "message", "Enter an amount between 0.01 and 4999.99:" + ) + self.master.send_message( + True, "buttons", json.dumps({"special": "numbers"}) + ) + return True def reason(self, text): self.reden = text @@ -139,20 +140,19 @@ def runasbar(self, text): return True try: value = float(text) - if -5000 < value < 5000: - if value > self.value: - return self.askbar( - "E %.2f is larger than E %.2f ; " % (value, self.value) - ) - self.asbar = value - if self.asbar == self.value: - return self.final() - return self.askcash("") - return self.askbar("Not between 0.01 and 4999.99; ") - except: - traceback.print_exc() + except ValueError: self.askbar("") return True + if -5000 < value < 5000: + if value > self.value: + return self.askbar( + "E %.2f is larger than E %.2f ; " % (value, self.value) + ) + self.asbar = value + if self.asbar == self.value: + return self.final() + return self.askcash("") + return self.askbar("Not between 0.01 and 4999.99; ") def askcash(self, error): self.master.donext(self, "runascash") @@ -184,20 +184,18 @@ def runascash(self, text): return True try: value = float(text) - if 0 <= value < 5000: - if value > (self.value - self.asbar): - return self.askcash( - "E %.2f is larger than E %.2f ; " - % (value, self.value - self.asbar) - ) - self.ascash = value - if (self.ascash + self.asbar) == self.value: - return self.final() - return self.askbank("") - return self.askcash("Not between 0 and 4999.99; ") - except: - traceback.print_exc() + except ValueError: return self.askcash("") + if 0 <= value < 5000: + if value > (self.value - self.asbar): + return self.askcash( + "E %.2f is larger than E %.2f ; " % (value, self.value - self.asbar) + ) + self.ascash = value + if (self.ascash + self.asbar) == self.value: + return self.final() + return self.askbank("") + return self.askcash("Not between 0 and 4999.99; ") def askbank(self, error): self.master.donext(self, "runasbank") @@ -230,20 +228,19 @@ def runasbank(self, text): return True try: value = float(text) - if -5000 < value < 5000: - if value > (self.value - self.asbar - self.ascash): - return self.askbank( - "E %.2f is larger than E %.2f ; " - % (value, self.value - self.asbar - self.ascash) - ) - self.asbank = value - if (self.ascash + self.asbar + self.asbank) == self.value: - return self.final() - return self.askbank("The numbers do not match; ") - return self.askbank("Not between 0.01 and 4999.99; ") - except: - traceback.print_exc() + except ValueError: return self.askbank("") + if -5000 < value < 5000: + if value > (self.value - self.asbar - self.ascash): + return self.askbank( + "E %.2f is larger than E %.2f ; " + % (value, self.value - self.asbar - self.ascash) + ) + self.asbank = value + if (self.ascash + self.asbar + self.asbank) == self.value: + return self.final() + return self.askbank("The numbers do not match; ") + return self.askbank("Not between 0.01 and 4999.99; ") def bon(self): self.master.POS.printdeclaratie( diff --git a/plugins/deposit.py b/plugins/deposit.py index 850b9dd..63031c2 100644 --- a/plugins/deposit.py +++ b/plugins/deposit.py @@ -1,5 +1,4 @@ import json -import traceback class deposit: @@ -23,24 +22,12 @@ def input(self, text): return None def value(self, text): + if text == "abort": + self.master.callhook("abort", None) + return True try: value = float(text) - if 0 < value < 1000: - self.master.receipt.add(False, value, "Deposit", 1, None, "deposit") - else: - self.master.donext(self, "value") - self.master.send_message( - True, "message", "Enter an amount between 0.01 and 999.99:" - ) - self.master.send_message( - True, "buttons", json.dumps({"special": "numbers"}) - ) - return True - except: - traceback.print_exc() - if text == "abort": - self.master.callhook("abort", None) - return True + except ValueError: self.master.donext(self, "value") self.master.send_message( True, "message", "Not a valid number! How much do you want to deposit?" @@ -49,6 +36,17 @@ def value(self, text): True, "buttons", json.dumps({"special": "numbers"}) ) return True + if 0 < value < 1000: + self.master.receipt.add(False, value, "Deposit", 1, None, "deposit") + else: + self.master.donext(self, "value") + self.master.send_message( + True, "message", "Enter an amount between 0.01 and 999.99:" + ) + self.master.send_message( + True, "buttons", json.dumps({"special": "numbers"}) + ) + return True def startup(self): pass diff --git a/plugins/door.py b/plugins/door.py index 581f7b3..102e0ea 100644 --- a/plugins/door.py +++ b/plugins/door.py @@ -1,6 +1,11 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +import logging + import paho.mqtt.client as mqtt +from config import config_get + +logger = logging.getLogger(__name__) class door: @@ -9,15 +14,21 @@ def __init__(self, SID, master): self.SID = SID def help(self): - print("Help") + logger.debug("door_help sid=%s", self.SID) return {"dooropen": "Door open"} def input(self, text): if text == "dooropen": + mqtt_config = config_get("door", "mqtt", default={}) client = mqtt.Client() - client.connect("mqtt.space.hack42.nl", 1883, 60) - client.publish("hack42/brandhok/deuropen", "closed", 1, True) - client.publish("hack42/brandhok/deuropen", "open", 1, True) + topic = mqtt_config["topic"] + client.connect( + mqtt_config["host"], + int(mqtt_config["port"]), + int(mqtt_config["keepalive"]), + ) + client.publish(topic, "closed", 1, True) + client.publish(topic, "open", 1, True) client.disconnect() return True return None diff --git a/plugins/git.py b/plugins/git.py index e908ac3..0e3783a 100644 --- a/plugins/git.py +++ b/plugins/git.py @@ -1,15 +1,22 @@ # -*- coding: utf-8 -*- -import os +import subprocess import threading class git: + lock = threading.Lock() + def __init__(self, SID, master): self.master = master self.SID = SID def background(self): - os.system("cd data && git commit -m " + str(self.master.transID) + " .") + with self.lock: + subprocess.run( + ["git", "commit", "-m", str(self.master.transID), "."], + cwd="data", + check=False, + ) def hook_post_checkout(self, _text): threading.Thread(target=self.background).start() diff --git a/plugins/give.py b/plugins/give.py index e604d7d..e342b50 100644 --- a/plugins/give.py +++ b/plugins/give.py @@ -9,6 +9,9 @@ class give: def __init__(self, SID, master): self.master = master self.SID = SID + self.userto = "" + self.value = 0 + self.myreason = "" def help(self): return {"give": "Give Money to other user"} @@ -33,36 +36,12 @@ def who(self, text): return True def amount(self, text): + if text == "abort": + self.master.callhook("abort", None) + return True try: value = float(text) - if 0 < value < 1000: - self.value = value - self.master.donext(self, "reason") - self.master.send_message( - True, - "message", - "Why are you giving " - + str(self.value) - + " to " - + self.userto - + "?", - ) - self.master.send_message( - True, "buttons", json.dumps({"special": "keyboard"}) - ) - else: - self.master.donext(self, "amount") - self.master.send_message( - True, "message", "Enter an amount between 0.01 and 999.99:" - ) - self.master.send_message( - True, "buttons", json.dumps({"special": "numbers"}) - ) - return True - except: - if text == "abort": - self.master.callhook("abort", None) - return True + except ValueError: self.master.donext(self, "amount") self.master.send_message( True, @@ -75,6 +54,26 @@ def amount(self, text): True, "buttons", json.dumps({"special": "numbers"}) ) return True + if 0 < value < 1000: + self.value = value + self.master.donext(self, "reason") + self.master.send_message( + True, + "message", + "Why are you giving " + str(self.value) + " to " + self.userto + "?", + ) + self.master.send_message( + True, "buttons", json.dumps({"special": "keyboard"}) + ) + else: + self.master.donext(self, "amount") + self.master.send_message( + True, "message", "Enter an amount between 0.01 and 999.99:" + ) + self.master.send_message( + True, "buttons", json.dumps({"special": "numbers"}) + ) + return True def reason(self, text): if text == "abort": diff --git a/plugins/log.py b/plugins/log.py index c074c4e..f2293c6 100644 --- a/plugins/log.py +++ b/plugins/log.py @@ -55,5 +55,8 @@ def input(self, text): pass def pre_input(self, text): - self.log("PROMPT", self.master.prompt.decode() + " >> " + text) + prompt = self.master.prompt + if isinstance(prompt, bytes): + prompt = prompt.decode() + self.log("PROMPT", prompt + " >> " + text) # self.master.send_message(False,'log',self.master.prompt+" >> "+text) diff --git a/plugins/market.py b/plugins/market.py index 78666b0..cb9a0b3 100644 --- a/plugins/market.py +++ b/plugins/market.py @@ -1,5 +1,35 @@ import json -import re +import os +import tempfile +import threading +import logging +from input_validation import ( + filter_reserved_aliases, + is_reserved_input, + is_valid_alias, + is_valid_product_name, +) + +logger = logging.getLogger(__name__) + + +def _atomic_write(path, lines): + directory = os.path.dirname(path) or "." + os.makedirs(directory, exist_ok=True) + fd, tmp_path = tempfile.mkstemp( + prefix=os.path.basename(path) + ".", dir=directory, text=True + ) + try: + with os.fdopen(fd, "w", encoding="utf-8") as f: + for line in lines: + f.write(line) + os.replace(tmp_path, path) + except Exception: + try: + os.unlink(tmp_path) + except FileNotFoundError: + pass + raise class market: @@ -13,6 +43,7 @@ class market: newprodgroup = "" newproddesc = "" newprod = "" + write_lock = threading.Lock() def help(self): return { @@ -22,19 +53,36 @@ def help(self): "market": "Market: Products", } + def is_reserved_input(self, text): + return is_reserved_input(text, master=self.master, plugin_help=self.help()) + def readproducts(self): + self.products = {} + self.aliases = {} with open("data/revbank.market", "r", encoding="utf-8") as f: lines = f.readlines() - print("ok", lines) + logger.debug("read_market_file sid=%s lines=%d", self.SID, len(lines)) for line in lines: + if not line.strip() or line.lstrip().startswith("#"): + continue parts = " ".join(line.split()).split(" ", 4) - print(parts) - if len(parts) == 5 and not line.startswith("#"): + logger.debug("read_market_parts sid=%s parts=%s", self.SID, parts) + if len(parts) == 5: aliases = parts[1].split(",") name = aliases.pop(0) + if self.is_reserved_input(name): + continue + aliases = filter_reserved_aliases( + aliases, master=self.master, plugin_help=self.help() + ) + try: + price = float(parts[2]) + space = float(parts[3]) + except ValueError: + continue self.products[name] = { - "price": float(parts[2]), - "space": float(parts[3]), + "price": price, + "space": space, "description": parts[4], "aliases": aliases, "user": parts[0], @@ -45,24 +93,24 @@ def readproducts(self): self.master.send_message(True, "market/" + prod, json.dumps(product)) def writeproducts(self): - with open("data/revbank.market", "w", encoding="utf-8") as f: - print(self.groups) - for group, groupvalue in self.groups.items(): - f.write("# " + group + "\n") - for prod in groupvalue: - product = self.products[prod] - names = product["aliases"] - names.insert(0, prod) - f.write( - "%-58s %7.2f %s\n" - % ( - ",".join(names), - product["price"], - product["description"], - ) + lines = [ + "# Price =\n", + "# Seller Barcode Seller + Space Description\n\n", + ] + with self.write_lock: + for prod, product in self.products.items(): + names = [prod] + product["aliases"] + lines.append( + "%-10s %-30s %7.2f %7.2f %s\n" + % ( + product.get("user", self.newprodgroup), + ",".join(names), + product["price"], + product.get("space", 0.0), + product["description"], ) - f.write("\n") - f.close() + ) + _atomic_write("data/revbank.market", lines) def __init__(self, SID, master): self.master = master @@ -79,6 +127,8 @@ def __init__(self, SID, master): self.newprod = "" def lookupprod(self, text): + if self.is_reserved_input(text): + return None prod = None if text in self.products: prod = text @@ -103,7 +153,13 @@ def savealias(self, text): "keyboard", "Already known alias " + text + " for " + prod + "! Try again.", ) - if len(text) < 6 or not re.compile("^[A-z0-9]+$").match(text): + if self.is_reserved_input(text): + return self.messageandbuttons( + "savealias", + "keyboard", + "That alias is a command; choose another alias.", + ) + if not is_valid_alias(text): return self.messageandbuttons( "savealias", "keyboard", @@ -144,26 +200,45 @@ def setprice(self, text): "Unknown product;What product do you want change price?", ) + def delmarket(self, text): + if text == "abort": + return self.master.callhook("abort", None) + self.readproducts() + prod = self.lookupprod(text) + if prod: + del self.products[prod] + self.aliases = {} + for product_name, product in self.products.items(): + for alias in product["aliases"]: + self.aliases[alias] = product_name + self.writeproducts() + return True + return self.messageandbuttons( + "delmarket", + "keyboard", + "Unknown market product;What market product do you want to remove?", + ) + def saveprice(self, text): if text == "abort": return self.master.callhook("abort", None) try: price = float(text) - if not 0 < price < 1000: - return self.messageandbuttons( - "saveprice", "numbers", "Price should be between 0 and 1000" - ) - self.newprodprice = price - self.products[self.priceprod]["price"] = price - self.writeproducts() - self.readproducts() - return True - except: + except (TypeError, ValueError): return self.messageandbuttons( "saveprice", "numbers", "Not a valid number; What is the price for" + self.newprod + "?", ) + if not 0 < price < 1000: + return self.messageandbuttons( + "saveprice", "numbers", "Price should be between 0 and 1000" + ) + self.newprodprice = price + self.products[self.priceprod]["price"] = price + self.writeproducts() + self.readproducts() + return True def addproductgroup(self, text): if text == "abort": @@ -212,34 +287,34 @@ def addproductprice(self, text): return self.master.callhook("abort", None) try: price = float(text) - if not 0 < price < 1000: - return self.messageandbuttons( - "addproductprice", - "numbers", - "Price should be between 0 and 1000", - ) - self.newprodprice = price - self.master.donext(self, "addproductgroup") - self.master.send_message( - True, "message", "what productgroup to add the product to?" - ) - self.master.send_message( - True, - "buttons", - json.dumps( - { - "special": "custom", - "custom": [{"text": n, "display": n} for n in self.groups], - } - ), - ) - return True - except: + except (TypeError, ValueError): return self.messageandbuttons( "addproductprice", "numbers", "Not a valid number; What is the price for" + self.newprod + "?", ) + if not 0 < price < 1000: + return self.messageandbuttons( + "addproductprice", + "numbers", + "Price should be between 0 and 1000", + ) + self.newprodprice = price + self.master.donext(self, "addproductgroup") + self.master.send_message( + True, "message", "what productgroup to add the product to?" + ) + self.master.send_message( + True, + "buttons", + json.dumps( + { + "special": "custom", + "custom": [{"text": n, "display": n} for n in self.groups], + } + ), + ) + return True def addproductdesc(self, text): if text == "abort": @@ -265,7 +340,13 @@ def addproduct(self, text): return self.messageandbuttons( "addproduct", "keyboard", "Product already exists? What product to add?" ) - if len(text) < 4 or not re.compile("^[A-z0-9]+$").match(text): + if self.is_reserved_input(text): + return self.messageandbuttons( + "addproduct", + "keyboard", + "That product name is a command; choose another name.", + ) + if not is_valid_product_name(text): return self.messageandbuttons( "addproduct", "keyboard", @@ -329,23 +410,19 @@ def input(self, text): True, "buttons", json.dumps({"special": "custom", "custom": custom}) ) return True + if text == "addmarket": + return self.messageandbuttons( + "addalias", "keyboard", "What market product do you want to alias?" + ) + if text == "changemarket": + return self.messageandbuttons( + "setprice", "keyboard", "What market product to change price for?" + ) + if text == "delmarket": + return self.messageandbuttons( + "delmarket", "keyboard", "What market product do you want to remove?" + ) - # elif text=="aliasproduct": - # return self.messageandbuttons('addalias','products','What product do you want to alias?') - # elif text=="addproduct": - # return self.messageandbuttons('addproduct','keyboard','What is the name of the product you want to add?') - # elif text=="setprice": - # return self.messageandbuttons('setprice','products','What product to change the price for?') - # elif text.endswith('*'): - # try: - # value=float(text[:-1]) - # if value>0 and value<100: - # self.times=value - # self.master.send_message(True,'message',"What are you buying %d from?" % self.times) - # self.master.send_message(True,'buttons',json.dumps({'special':'products'})) - # return True - # except: - # pass return None def hook_abort(self, _void): diff --git a/plugins/pfand.py b/plugins/pfand.py index 771a128..26f6e5e 100644 --- a/plugins/pfand.py +++ b/plugins/pfand.py @@ -8,6 +8,7 @@ class pfand: def __init__(self, SID, master): self.master = master self.SID = SID + self.products = {} def help(self): return {"pfand": "Return deposit"} @@ -71,13 +72,19 @@ def input(self, text): return None def loadmarket(self): + self.products = {} with open("data/revbank.pfand", "r", encoding="utf-8") as f: lines = f.readlines() for line in lines: + if not line.strip() or line.lstrip().startswith("#"): + continue parts = " ".join(line.split()).split(" ", 2) if len(parts) == 2: name = parts[0] - self.products[name] = float(parts[1]) + try: + self.products[name] = float(parts[1]) + except ValueError: + continue def hook_abort(self, _void): self.startup() diff --git a/plugins/products.py b/plugins/products.py index da87ef9..da23bf5 100644 --- a/plugins/products.py +++ b/plugins/products.py @@ -1,5 +1,35 @@ import json -import re +import os +import tempfile +import threading +import logging +from input_validation import ( + filter_reserved_aliases, + is_reserved_input, + is_valid_alias, + is_valid_product_name, +) + +logger = logging.getLogger(__name__) + + +def _atomic_write(path, lines): + directory = os.path.dirname(path) or "." + os.makedirs(directory, exist_ok=True) + fd, tmp_path = tempfile.mkstemp( + prefix=os.path.basename(path) + ".", dir=directory, text=True + ) + try: + with os.fdopen(fd, "w", encoding="utf-8") as f: + for line in lines: + f.write(line) + os.replace(tmp_path, path) + except Exception: + try: + os.unlink(tmp_path) + except FileNotFoundError: + pass + raise class products: @@ -14,6 +44,7 @@ class products: newprodgroup = "" newproddesc = "" newprod = "" + write_lock = threading.Lock() def help(self): return { @@ -22,23 +53,42 @@ def help(self): "setprice": "Change the price of a product", } + def is_reserved_input(self, text): + return is_reserved_input(text, master=self.master, plugin_help=self.help()) + def readproducts(self): + self.products = {} + self.aliases = {} + self.groups = {} groupname = "" with open("data/revbank.products", "r", encoding="utf-8") as f: lines = f.readlines() for line in lines: + if not line.strip(): + continue parts = " ".join(line.split()).split(" ", 2) if line.startswith("#"): groupname = line.replace("#", "").strip(" \t\n\r") + if not groupname: + continue self.groups[groupname] = [] elif len(parts) == 3: aliases = parts[0].split(",") name = aliases.pop(0) + if self.is_reserved_input(name): + continue + aliases = filter_reserved_aliases( + aliases, master=self.master, plugin_help=self.help() + ) + try: + price = float(parts[1]) + except ValueError: + continue self.groups[groupname].append(name) for alias in aliases: self.aliases[alias] = name self.products[name] = { - "price": float(parts[1]), + "price": price, "description": parts[2], "group": groupname, "aliases": aliases, @@ -47,16 +97,22 @@ def readproducts(self): self.master.send_message( True, "products/" + prod, json.dumps(self.products[prod]) ) - print("readproducts done") + logger.debug( + "read_products_done sid=%s products=%d aliases=%d groups=%d", + self.SID, + len(self.products), + len(self.aliases), + len(self.groups), + ) def writeproducts(self): - with open("data/revbank.products", "w", encoding="utf-8") as f: + lines = [] + with self.write_lock: for group in self.groups: # pylint: disable=consider-using-dict-items - f.write("# " + group + "\n") + lines.append("# " + group + "\n") for prod in self.groups[group]: - names = self.products[prod]["aliases"] - names.insert(0, prod) - f.write( + names = [prod] + self.products[prod]["aliases"] + lines.append( "%-58s %7.2f %s\n" % ( ",".join(names), @@ -64,8 +120,8 @@ def writeproducts(self): self.products[prod]["description"], ) ) - f.write("\n") - f.close() + lines.append("\n") + _atomic_write("data/revbank.products", lines) def __init__(self, SID, master): self.master = master @@ -82,6 +138,8 @@ def __init__(self, SID, master): self.newprod = "" def lookupprod(self, text): + if self.is_reserved_input(text): + return None prod = None if text in self.products: prod = text @@ -106,7 +164,13 @@ def savealias(self, text): "keyboard", "Already known alias " + text + " for " + prod + "! Try again.", ) - if len(text) < 6 or not re.compile("^[A-z0-9]+$").match(text): + if self.is_reserved_input(text): + return self.messageandbuttons( + "savealias", + "keyboard", + "That alias is a command; choose another alias.", + ) + if not is_valid_alias(text): return self.messageandbuttons( "savealias", "keyboard", @@ -152,22 +216,27 @@ def saveprice(self, text): return self.master.callhook("abort", None) try: price = float(text) - print(price) - if not 0 < price < 1000: - return self.messageandbuttons( - "saveprice", "numbers", "Price should be between 0 and 1000" - ) - self.newprodprice = price - self.products[self.priceprod]["price"] = self.newprodprice - self.writeproducts() - self.readproducts() - return True - except: + except (TypeError, ValueError): return self.messageandbuttons( "saveprice", "numbers", "Not a valid number; What is the price for" + self.newprod + "?", ) + logger.debug( + "save_product_price sid=%s product=%s price=%s", + self.SID, + self.priceprod, + price, + ) + if not 0 < price < 1000: + return self.messageandbuttons( + "saveprice", "numbers", "Price should be between 0 and 1000" + ) + self.newprodprice = price + self.products[self.priceprod]["price"] = self.newprodprice + self.writeproducts() + self.readproducts() + return True def addproductgroup(self, text): if text == "abort": @@ -216,34 +285,34 @@ def addproductprice(self, text): return self.master.callhook("abort", None) try: price = float(text) - if not 0 < price < 1000: - return self.messageandbuttons( - "addproductprice", - "numbers", - "Price should be between 0 and 1000", - ) - self.newprodprice = price - self.master.donext(self, "addproductgroup") - self.master.send_message( - True, "message", "what productgroup to add the product to?" - ) - self.master.send_message( - True, - "buttons", - json.dumps( - { - "special": "custom", - "custom": [{"text": n, "display": n} for n in self.groups], - } - ), - ) - return True - except: + except (TypeError, ValueError): return self.messageandbuttons( "addproductprice", "numbers", "Not a valid number; What is the price for" + self.newprod + "?", ) + if not 0 < price < 1000: + return self.messageandbuttons( + "addproductprice", + "numbers", + "Price should be between 0 and 1000", + ) + self.newprodprice = price + self.master.donext(self, "addproductgroup") + self.master.send_message( + True, "message", "what productgroup to add the product to?" + ) + self.master.send_message( + True, + "buttons", + json.dumps( + { + "special": "custom", + "custom": [{"text": n, "display": n} for n in self.groups], + } + ), + ) + return True def addproductdesc(self, text): if text == "abort": @@ -269,7 +338,13 @@ def addproduct(self, text): return self.messageandbuttons( "addproduct", "keyboard", "Product already exists? What product to add?" ) - if len(text) < 4 or not re.compile("^[A-z0-9]+$").match(text): + if self.is_reserved_input(text): + return self.messageandbuttons( + "addproduct", + "keyboard", + "That product name is a command; choose another name.", + ) + if not is_valid_product_name(text): return self.messageandbuttons( "addproduct", "keyboard", @@ -321,7 +396,7 @@ def input(self, text): True, "buttons", json.dumps({"special": "products"}) ) return True - except: + except (TypeError, ValueError): pass return None diff --git a/plugins/receipt.py b/plugins/receipt.py index 3947b9c..0b532ee 100644 --- a/plugins/receipt.py +++ b/plugins/receipt.py @@ -1,4 +1,7 @@ import json +import logging + +logger = logging.getLogger(__name__) class receipt: @@ -8,9 +11,11 @@ class receipt: def __init__(self, SID, master): self.master = master self.SID = SID + self.receipt = [] + self.totals = {} def is_empty(self): - print("hooi", self.receipt) + logger.debug("receipt_state sid=%s receipt=%s", self.SID, self.receipt) if self.receipt: return False return True @@ -82,6 +87,7 @@ def add( # pylint: disable=too-many-arguments and self.receipt[r]["value"] == Value and self.receipt[r]["beni"] == Beni and self.receipt[r]["Lose"] == Lose + and self.receipt[r]["product"] == Prod ): self.receipt[r]["count"] += Count self.receipt[r]["total"] = ( @@ -126,12 +132,12 @@ def remove(self, text): try: num = int(text) self.receipt.pop(num) - self.master.send_message(True, "receipt", json.dumps(self.receipt)) - self.updatetotals() - self.master.callhook("addremove", ()) - return True - except: + except (TypeError, ValueError, IndexError): return True + self.master.send_message(True, "receipt", json.dumps(self.receipt)) + self.updatetotals() + self.master.callhook("addremove", ()) + return True def startup(self): self.updatetotals() diff --git a/plugins/stickers.py b/plugins/stickers.py index 138a7e4..b35302d 100644 --- a/plugins/stickers.py +++ b/plugins/stickers.py @@ -1,16 +1,28 @@ # -*- coding: utf-8 -*- -import traceback import json import re import io import time import base64 import urllib.parse +import warnings +import logging from PIL import Image, ImageDraw, ImageFont import pyqrcode -import brother_ql.conversion -import brother_ql.backends.helpers -import brother_ql.raster +from config import config_get + +with warnings.catch_warnings(): + warnings.filterwarnings( + "ignore", + message="The 'warn' method is deprecated, use 'warning' instead", + category=DeprecationWarning, + ) + import brother_ql.conversion + import brother_ql.backends.helpers + import brother_ql.raster + + +logger = logging.getLogger(__name__) class stickers: # pylint: disable=too-many-public-methods @@ -21,7 +33,7 @@ class stickers: # pylint: disable=too-many-public-methods LOGOFILE = "images/hack42.png" FONT = "images/arialbd.ttf" printer = "QL710W" - PRINTER = "tcp://192.168.42.167:9100" + PRINTER = "tcp://localhost:9100" MODEL = "QL-710W" SPACE = ( 0 # spacing around qrcode, should be 4 but our printer prints on white labels @@ -38,18 +50,30 @@ class stickers: # pylint: disable=too-many-public-methods def __init__(self, SID, master): self.master = master self.SID = SID + printer_config = config_get("stickers", "printer", default={}) + self.MODEL = printer_config.get("model", self.MODEL) + self.PRINTER = self.printer_identifier(printer_config) + + def printer_identifier(self, printer_config): + if printer_config.get("identifier"): + return printer_config["identifier"] + host = printer_config.get("host") + port = printer_config.get("port", 9100) + if host: + return f"tcp://{host}:{port}" + return self.PRINTER def help(self): return {"stickers": "All sticker commands"} def barcodeprint(self): if re.compile("^[0-9A-Z]+$").match(self.barcode): - print("Qrcode: alphanum") + logger.debug("qrcode_mode sid=%s mode=alphanumeric", self.SID) qrcode_image = pyqrcode.create( self.barcode, error="L", version=1, mode="alphanumeric" ).png_as_base64_str(scale=5) else: - print("Qrcode: binary") + logger.debug("qrcode_mode sid=%s mode=binary", self.SID) qrcode_image = pyqrcode.create( self.barcode, error="L", version=2, mode="binary" ).png_as_base64_str(scale=5) @@ -169,7 +193,7 @@ def toolprint(self): # pylint: disable=too-many-locals qrname = "https://hack42.nl/wiki/Tool:" + urllib.parse.quote( self.name.replace(" ", "_") ) - print("Qrcode: binary") + logger.debug("qrcode_mode sid=%s mode=binary", self.SID) qrcode_image = pyqrcode.create(qrname, error="L", mode="binary") qrcode_image = qrcode_image.png_as_base64_str( scale=int((label_size - margin) / qrcode_image.get_png_size()) @@ -252,21 +276,10 @@ def eigendomprint(self): def barcodenum(self, text): if text == "abort": return self.master.callhook("abort", None) - try: - self.copies = int(text) - if not 0 < self.copies < 100: - return self.messageandbuttons( - "barcodenum", - "numbers", - "Only 1 <> 99 allowed; How many do you want?", - ) - self.barcodeprint() - return True - except: - traceback.print_exc() - return self.messageandbuttons( - "barcodenum", "numbers", "NaN ; How many do you want?" - ) + result = self.read_copy_count(text, "barcodenum") + if result is not None: + return result + return self.print_label(self.barcodeprint, "barcodenum") def barcodecount(self, text): prod = self.master.products.lookupprod(text) @@ -297,24 +310,48 @@ def messageandbuttons(self, donext, buttons, msg): self.master.send_message(True, "buttons", json.dumps({"special": buttons})) return True - def eigendomnum(self, text): - if text == "abort": - return self.master.callhook("abort", None) + def read_copy_count(self, text, nextcall): try: - self.copies = int(text) - if not 0 < self.copies < 100: - return self.messageandbuttons( - "eigendomnum", - "numbers", - "Only 1 <> 99 allowed; How many do you want?", - ) - self.eigendomprint() - return True - except: - traceback.print_exc() + copies = int(text) + except (TypeError, ValueError): return self.messageandbuttons( - "eigendomnum", "numbers", "NaN ; How many do you want?" + nextcall, "numbers", "NaN ; How many do you want?" + ) + if not 0 < copies < 100: + return self.messageandbuttons( + nextcall, + "numbers", + "Only 1 <> 99 allowed; How many do you want?", + ) + self.copies = copies + return None + + def print_label(self, print_func, nextcall): + try: + print_func() + except Exception: # pylint: disable=broad-exception-caught + logger.exception( + "Sticker print failed sid=%s printer=%s", self.SID, self.PRINTER + ) + self.master.donext(self, nextcall) + self.master.send_message( + True, + "message", + "Printer error; sticker not printed. Check printer and try again.", ) + self.master.send_message( + True, "buttons", json.dumps({"special": "numbers"}) + ) + return True + return True + + def eigendomnum(self, text): + if text == "abort": + return self.master.callhook("abort", None) + result = self.read_copy_count(text, "eigendomnum") + if result is not None: + return result + return self.print_label(self.eigendomprint, "eigendomnum") def eigendomcount(self, text): if text == "abort": @@ -325,53 +362,26 @@ def eigendomcount(self, text): def foodnum(self, text): if text == "abort": return self.master.callhook("abort", None) - try: - self.copies = int(text) - if not 0 < self.copies < 100: - return self.messageandbuttons( - "foodnum", "numbers", "Only 1 <> 99 allowed; How many do you want?" - ) - self.foodprint() - return True - except: - traceback.print_exc() - return self.messageandbuttons( - "foodnum", "numbers", "NaN ; How many do you want?" - ) + result = self.read_copy_count(text, "foodnum") + if result is not None: + return result + return self.print_label(self.foodprint, "foodnum") def thtnum(self, text): if text == "abort": return self.master.callhook("abort", None) - try: - self.copies = int(text) - if not 0 < self.copies < 100: - return self.messageandbuttons( - "thtnum", "numbers", "Only 1 <> 99 allowed; How many do you want?" - ) - self.thtprint() - return True - except: - traceback.print_exc() - return self.messageandbuttons( - "thtnum", "numbers", "NaN ; How many do you want?" - ) + result = self.read_copy_count(text, "thtnum") + if result is not None: + return result + return self.print_label(self.thtprint, "thtnum") def toolnum(self, text): if text == "abort": return self.master.callhook("abort", None) - try: - self.copies = int(text) - if not 0 < self.copies < 100: - return self.messageandbuttons( - "toolnum", "numbers", "Only 1 <> 99 allowed; How many do you want?" - ) - self.toolprint() - return True - except: - traceback.print_exc() - return self.messageandbuttons( - "toolnum", "numbers", "NaN ; How many do you want?" - ) + result = self.read_copy_count(text, "toolnum") + if result is not None: + return result + return self.print_label(self.toolprint, "toolnum") def foodname(self, text): if text == "abort": diff --git a/plugins/stock.py b/plugins/stock.py index 01b0391..93ba01b 100644 --- a/plugins/stock.py +++ b/plugins/stock.py @@ -1,10 +1,33 @@ import json +import os +import tempfile +import threading + + +def _atomic_write(path, lines): + directory = os.path.dirname(path) or "." + os.makedirs(directory, exist_ok=True) + fd, tmp_path = tempfile.mkstemp( + prefix=os.path.basename(path) + ".", dir=directory, text=True + ) + try: + with os.fdopen(fd, "w", encoding="utf-8") as f: + for line in lines: + f.write(line) + os.replace(tmp_path, path) + except Exception: + try: + os.unlink(tmp_path) + except FileNotFoundError: + pass + raise class stock: stock = {} prod = "" stockalias = "" + write_lock = threading.Lock() def __init__(self, SID, master): self.master = master @@ -20,22 +43,34 @@ def help(self): } def readstock(self): + self.stock = {} + self.stockalias = {} with open("data/revbank.stock", "r", encoding="utf-8") as f: lines = f.readlines() for line in lines: + if not line.strip() or line.lstrip().startswith("#"): + continue parts = " ".join(line.split()).split(" ", 2) if len(parts) == 2: name = parts[0] - self.stock[name] = int(parts[1]) + try: + self.stock[name] = int(parts[1]) + except ValueError: + continue f.close() - self.stockalias = {} with open("data/revbank.stockalias", "r", encoding="utf-8") as f: lines = f.readlines() for line in lines: + if not line.strip() or line.lstrip().startswith("#"): + continue parts = " ".join(line.split()).split(" ", 3) if len(parts) == 3: name = parts[0] - self.stockalias[name] = {"prod": parts[1], "multi": int(parts[2])} + try: + multiplier = int(parts[2]) + except ValueError: + continue + self.stockalias[name] = {"prod": parts[1], "multi": multiplier} def setstock(self, prod, count): self.readstock() @@ -73,48 +108,50 @@ def hook_checkout(self, _text): self.writestock() def writestock(self): - with open("data/revbank.stock", "w", encoding="utf-8") as f: - for prod, product in self.stock.items(): - f.write("%-16s %+9d\n" % (prod, product)) - f.close() + with self.write_lock: + _atomic_write( + "data/revbank.stock", + [ + "%-16s %+9d\n" % (prod, product) + for prod, product in self.stock.items() + ], + ) def voorraad_amount(self, text): + if text == "abort": + self.master.callhook("abort", None) + return True try: aantal = int(text) - if not -1 < aantal < 5000: - self.master.donext(self, "voorraad_amount") - self.master.send_message( - True, - "message", - "Please enter a number between 0 and 4999, how much " - + self.prod - + " is in stock?", - ) - self.master.send_message( - True, "buttons", json.dumps({"special": "numbers"}) - ) - return True - self.setstock(self.prod, aantal) - self.master.donext(self, "voorraad") - self.master.send_message(True, "message", "What product to set the stock?") + except (TypeError, ValueError): + self.master.donext(self, "voorraad_amount") self.master.send_message( - True, "buttons", json.dumps({"special": "products"}) + True, + "message", + "Not a number, how much " + self.prod + " is in stock", + ) + self.master.send_message( + True, "buttons", json.dumps({"special": "numbers"}) ) return True - except: - if text == "abort": - self.master.callhook("abort", None) - return True + if not -1 < aantal < 5000: self.master.donext(self, "voorraad_amount") self.master.send_message( True, "message", - "Not a number, how much " + self.prod + " is in stock", + "Please enter a number between 0 and 4999, how much " + + self.prod + + " is in stock?", ) self.master.send_message( True, "buttons", json.dumps({"special": "numbers"}) ) return True + self.setstock(self.prod, aantal) + self.master.donext(self, "voorraad") + self.master.send_message(True, "message", "What product to set the stock?") + self.master.send_message(True, "buttons", json.dumps({"special": "products"})) + return True def voorraad(self, text): prod = self.master.products.lookupprod(text) @@ -139,42 +176,40 @@ def voorraad(self, text): return True def inkoop_amount(self, text): + if text == "abort": + self.master.callhook("abort", None) + return True try: aantal = int(text) - if not 0 < aantal < 5000: - self.master.donext(self, "inkoop_amount") - self.master.send_message( - True, - "message", - "Please enter a number between 1 and 4999, how much " - + self.prod - + " did you buy?", - ) - self.master.send_message( - True, "buttons", json.dumps({"special": "numbers"}) - ) - return True - self.addstock(self.prod, aantal) - self.master.donext(self, "inkoop") - self.master.send_message(True, "message", "What product did you buy?") + except (TypeError, ValueError): + self.master.donext(self, "inkoop_amount") self.master.send_message( - True, "buttons", json.dumps({"special": "products"}) + True, + "message", + "Not a number, how much " + self.prod + " did you buy?", + ) + self.master.send_message( + True, "buttons", json.dumps({"special": "numbers"}) ) return True - except: - if text == "abort": - self.master.callhook("abort", None) - return True + if not 0 < aantal < 5000: self.master.donext(self, "inkoop_amount") self.master.send_message( True, "message", - "Not a number, how much " + self.prod + " did you buy?", + "Please enter a number between 1 and 4999, how much " + + self.prod + + " did you buy?", ) self.master.send_message( True, "buttons", json.dumps({"special": "numbers"}) ) return True + self.addstock(self.prod, aantal) + self.master.donext(self, "inkoop") + self.master.send_message(True, "message", "What product did you buy?") + self.master.send_message(True, "buttons", json.dumps({"special": "products"})) + return True def inkoop(self, text): prod = self.master.products.lookupprod(text) diff --git a/plugins/take.py b/plugins/take.py index 63a4357..603d167 100644 --- a/plugins/take.py +++ b/plugins/take.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- import json import math -import traceback class take: @@ -14,6 +13,10 @@ class take: def __init__(self, SID, master): self.master = master self.SID = SID + self.totakefrom = [] + self.peruser = 0 + self.myreason = "" + self.value = 0 def help(self): return {"take": "Take money from other user(s)"} @@ -39,6 +42,9 @@ def who(self, text): if len(self.totakefrom) > 0: try: value = round(float(text), 2) + except ValueError: + pass + else: if 0 < value < 1000: self.value = value self.peruser = ( @@ -68,8 +74,6 @@ def who(self, text): True, "buttons", json.dumps({"special": "numbers"}) ) return True - except: - traceback.print_exc() self.master.donext(self, "who") self.master.send_message( True, diff --git a/plugins/undo.py b/plugins/undo.py index 42a91a3..fba5536 100644 --- a/plugins/undo.py +++ b/plugins/undo.py @@ -1,8 +1,11 @@ # -*- coding: utf-8 -*- import json +import copy import pickle import time -import traceback +import logging + +logger = logging.getLogger(__name__) class undo: @@ -20,11 +23,11 @@ def help(self): "restore": "Restore a transaction", } - def hook_checkout(self, text): + def hook_post_checkout(self, text): self.loadundo() self.undo[self.master.transID] = { - "totals": self.master.receipt.totals, - "receipt": self.master.receipt.receipt, + "totals": copy.deepcopy(self.master.receipt.totals), + "receipt": copy.deepcopy(self.master.receipt.receipt), "beni": text, } self.writeundo() @@ -52,16 +55,31 @@ def writeundo(self): fk = sorted(self.undo.keys()) del self.undo[fk[0]] - with open("data/revbank.UNDO", "wb") as output: - pickle.dump(self.undo, output) + with open("data/revbank.UNDO", "w", encoding="utf-8") as output: + json.dump(self.undo, output) def loadundo(self): + self.undo = {} try: with open("data/revbank.UNDO", "rb") as f: - self.undo = pickle.load(f) - f.close() - except: - pass + data = f.read() + except OSError: + return + + try: + try: + loaded = json.loads(data.decode("utf-8")) + except (UnicodeDecodeError, json.JSONDecodeError): + loaded = pickle.loads(data) + self.undo = {int(transID): value for transID, value in loaded.items()} + except ( + AttributeError, + EOFError, + TypeError, + ValueError, + pickle.PickleError, + ): + return def doundo(self, text): if text == "abort": @@ -69,25 +87,59 @@ def doundo(self, text): return True try: transID = int(text) - if transID in self.undo: - self.master.callhook( - "undo", - ( - transID, - self.undo[transID]["totals"], - self.undo[transID]["receipt"], - self.undo[transID]["beni"], - ), - ) - return True - print(self.undo.keys()) - print(f"transID not in undo: {transID}") + except (TypeError, ValueError): self.listundo() return True - except: - traceback.print_exc() + + if transID in self.undo: + entry = self._get_undo_entry(transID) + if entry is None: + self.listundo() + return True + totals, receipt, beni = entry + self.master.callhook( + "undo", + (transID, totals, receipt, beni), + ) + return True + + logger.warning( + "undo_transaction_not_found sid=%s trans_id=%s available=%s", + self.SID, + transID, + sorted(self.undo.keys()), + ) + self.listundo() + return True + + def _get_undo_entry(self, transID): + try: + return ( + self.undo[transID]["totals"], + self.undo[transID]["receipt"], + self.undo[transID]["beni"], + ) + except (KeyError, TypeError): + return None + + def _restore_receipt(self, receipt, beni): + try: + for rr in receipt: + nowbeni = None + if rr["beni"] != beni: + nowbeni = rr["beni"] + self.master.receipt.add( + rr["Lose"], + rr["value"], + rr["description"], + rr["count"], + nowbeni, + rr["product"], + ) + except (KeyError, TypeError): self.listundo() return True + return True def dorestore(self, text): if text == "abort": @@ -95,38 +147,23 @@ def dorestore(self, text): return True try: transID = int(text) - if transID in self.undo: - receipt = self.undo[transID]["receipt"] - beni = self.undo[transID]["beni"] - self.master.callhook( - "undo", - ( - transID, - self.undo[transID]["totals"], - self.undo[transID]["receipt"], - self.undo[transID]["beni"], - ), - ) - for rr in receipt: - nowbeni = None - if rr["beni"] != beni: - nowbeni = rr["beni"] - self.master.receipt.add( - rr["Lose"], - rr["value"], - rr["description"], - rr["count"], - nowbeni, - rr["product"], - ) - return True + except (TypeError, ValueError): + self.listundo() + return True + + if transID not in self.undo: self.listundo() return True - except: - traceback.print_exc() + + entry = self._get_undo_entry(transID) + if entry is None: self.listundo() return True + totals, receipt, beni = entry + self.master.callhook("undo", (transID, totals, receipt, beni)) + return self._restore_receipt(receipt, beni) + def listundo(self, restore=False): self.loadundo() custom = [] diff --git a/plugins/withdraw.py b/plugins/withdraw.py index e8ba504..becb850 100644 --- a/plugins/withdraw.py +++ b/plugins/withdraw.py @@ -9,20 +9,19 @@ def __init__(self, SID, master): def withdraw(self, text): try: value = float(text) - if 0 < value < 1000: - self.master.receipt.add( - True, value, "Withdrawal or unlisted product", 1, None, "withdraw" - ) - return True - self.master.send_message( - True, - "message", - "Enter an amount between 0.01 and 999.99 or scan a product", + except (TypeError, ValueError): + return None + if 0 < value < 1000: + self.master.receipt.add( + True, value, "Withdrawal or unlisted product", 1, None, "withdraw" ) return True - except: - pass - return None + self.master.send_message( + True, + "message", + "Enter an amount between 0.01 and 999.99 or scan a product", + ) + return True def input(self, text): pass diff --git a/requirements.in b/requirements.in index 49cfe40..8dbb176 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,7 @@ paho-mqtt PyQRCode Pillow -serial +pyserial pypng brother_ql +PyYAML diff --git a/requirements.txt b/requirements.txt index c0f45c0..cf2ef4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,11 +11,7 @@ brother-ql==0.9.4 click==8.1.7 # via brother-ql future==0.18.3 - # via - # brother-ql - # serial -iso8601==2.1.0 - # via serial + # via brother-ql packbits==0.6 # via brother-ql paho-mqtt==1.6.1 @@ -28,9 +24,9 @@ pypng==0.20220715.0 # via -r requirements.in pyqrcode==1.2.1 # via -r requirements.in +pyserial==3.5 + # via -r requirements.in pyusb==1.2.1 # via brother-ql pyyaml==6.0.1 - # via serial -serial==0.0.97 # via -r requirements.in diff --git a/tests/js/browser-smoke.test.js b/tests/js/browser-smoke.test.js new file mode 100644 index 0000000..bc24b04 --- /dev/null +++ b/tests/js/browser-smoke.test.js @@ -0,0 +1,167 @@ +const assert = require("node:assert/strict"); +const fs = require("node:fs"); +const os = require("node:os"); +const path = require("node:path"); +const {spawnSync} = require("node:child_process"); +const test = require("node:test"); + +function chromiumCommand() { + const candidates = [ + process.env.CHROMIUM_BIN, + "chromium", + "chromium-browser", + "google-chrome", + ].filter(Boolean); + + return candidates.find((command) => { + const result = spawnSync(command, ["--version"], {encoding: "utf8"}); + return result.status === 0; + }); +} + +function runChromium(command, url) { + return spawnSync(command, [ + "--headless", + "--disable-gpu", + "--disable-dev-shm-usage", + "--no-sandbox", + "--allow-file-access-from-files", + "--dump-dom", + "--virtual-time-budget=3000", + url, + ], { + encoding: "utf8", + timeout: 20000, + }); +} + +function skipIfChromiumSandboxed(t, result) { + if(result.status !== 0 && /crashpad|Operation not permitted/.test(result.stderr)) { + t.skip("Chromium cannot run in this sandbox"); + return true; + } + return false; +} + +function scriptTag(scriptName) { + return ``; +} + +function writeKassaFixture(bodyScript) { + const fixturePath = path.join(os.tmpdir(), `kassa-browser-smoke-${process.pid}-${Date.now()}.html`); + fs.writeFileSync(fixturePath, ` + +
+ + + ${scriptTag("kassa-textfill.js")} + ${scriptTag("kassa-dom.js")} + ${scriptTag("kassa-buttons.js")} + ${scriptTag("kassa-stream.js")} + ${scriptTag("kassa-app.js")} + + + +`); + return fixturePath; +} + +test("kassa index boots in a real browser", (t) => { + const command = chromiumCommand(); + if(!command) { + t.skip("Chromium is not available"); + return; + } + + const fixturePath = writeKassaFixture(` + window.addEventListener("DOMContentLoaded", function() { + setTimeout(function() { + var output = document.createElement("pre"); + output.id = "smoke-result"; + output.textContent = JSON.stringify({ + hasFirstscreen: !!document.getElementById("Firstscreen"), + hasZoek: !!document.getElementById("Zoek"), + hasLeftButtons: !!document.getElementById("LeftButtons"), + eventSourceUrl: window.__eventSourceUrl + }); + document.body.appendChild(output); + }, 0); + }); + `); + const result = runChromium(command, `file://${fixturePath}`); + fs.unlinkSync(fixturePath); + if(skipIfChromiumSandboxed(t, result)) return; + + assert.equal(result.status, 0, result.stderr); + const match = result.stdout.match(/([^<]+)<\/pre>/);
+ assert(match, result.stdout);
+ const data = JSON.parse(match[1].replaceAll(""", '"').replaceAll("&", "&"));
+
+ assert.equal(data.hasFirstscreen, true);
+ assert.equal(data.hasZoek, true);
+ assert.equal(data.hasLeftButtons, true);
+ assert.match(data.eventSourceUrl, /^stream\.php\?session=main&t=/);
+});
+
+test("kassa frontend posts keyboard and button input in a browser", (t) => {
+ const command = chromiumCommand();
+ if(!command) {
+ t.skip("Chromium is not available");
+ return;
+ }
+
+ const fixturePath = writeKassaFixture(`
+ window.addEventListener("DOMContentLoaded", function() {
+ setTimeout(function() {
+ var input = document.getElementById("Zoek");
+ input.value = "abort";
+ var keydown = new Event("keydown", {bubbles: true});
+ Object.defineProperty(keydown, "which", {value: 13});
+ input.dispatchEvent(keydown);
+ document.getElementById("bon").click();
+
+ var output = document.createElement("pre");
+ output.id = "smoke-result";
+ output.textContent = JSON.stringify({
+ fetchCalls: window.__fetchCalls,
+ eventSourceUrl: window.__eventSourceUrl,
+ activeElement: document.activeElement && document.activeElement.id,
+ hasButtons: !!document.getElementById("Buttons")
+ });
+ document.body.appendChild(output);
+ }, 0);
+ });
+ `);
+
+ const result = runChromium(command, `file://${fixturePath}`);
+ fs.unlinkSync(fixturePath);
+ if(skipIfChromiumSandboxed(t, result)) return;
+
+ assert.equal(result.status, 0, result.stderr);
+ const match = result.stdout.match(/([^<]+)<\/pre>/);
+ assert(match, result.stdout);
+ const data = JSON.parse(match[1].replaceAll(""", '"').replaceAll("&", "&"));
+
+ assert.match(data.eventSourceUrl, /^stream\.php\?session=main&t=/);
+ assert.equal(data.hasButtons, true);
+ assert.deepEqual(data.fetchCalls.map((call) => call.body), [
+ "topic=session%2Fmain%2Finput&msg=",
+ "topic=session%2Fmain%2Finput&msg=abort",
+ "topic=session%2Fmain%2Finput&msg=bon",
+ ]);
+});
+
+test("the checked-in jQuery vendor file is gone", () => {
+ assert.equal(fs.existsSync(path.resolve(__dirname, "../../www/jquery.min.js")), false);
+});
diff --git a/tests/js/index-scripts.test.js b/tests/js/index-scripts.test.js
new file mode 100644
index 0000000..b112ba3
--- /dev/null
+++ b/tests/js/index-scripts.test.js
@@ -0,0 +1,21 @@
+const assert = require("node:assert/strict");
+const fs = require("node:fs");
+const path = require("node:path");
+const test = require("node:test");
+
+test("main index loads split kassa scripts in dependency order", () => {
+ const indexPath = path.join(__dirname, "../../www/index.html");
+ const html = fs.readFileSync(indexPath, "utf8");
+ const scripts = Array.from(html.matchAll(/
-
-
-
+
+
+
+
+
diff --git a/www/jquery.min.js b/www/jquery.min.js
deleted file mode 100644
index 006e953..0000000
--- a/www/jquery.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
-//@ sourceMappingURL=jquery.min.map
-*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML=" | t |
| t |