Add Phase 3 Tally accounting master synchronization
This commit is contained in:
@@ -4,14 +4,9 @@ import io
|
||||
from pathlib import Path
|
||||
import zipfile
|
||||
|
||||
ERP_LOCAL_AGENT_VERSION = "1.3.0"
|
||||
ERP_LOCAL_AGENT_VERSION = "1.4.0"
|
||||
ERP_LOCAL_AGENT_NAME = "ERP Local Agent"
|
||||
RUNTIME_ROOT = Path(__file__).resolve().parent / "local_agent_runtime"
|
||||
|
||||
# ZIP metadata is part of the ZIP byte stream. If writestr() is allowed to use
|
||||
# the current clock time, two packages built from identical source files have
|
||||
# different SHA256 hashes. Keep update packages reproducible so the SHA256
|
||||
# returned by update-manifest is exactly the SHA256 of update-package.
|
||||
_DETERMINISTIC_ZIP_TIMESTAMP = (2026, 1, 1, 0, 0, 0)
|
||||
|
||||
|
||||
@@ -23,24 +18,11 @@ def build_agent_env(*, erp_base_url: str, node_code: str, node_secret: str, stor
|
||||
erp_base_url = "https://" + erp_base_url[7:]
|
||||
storage_root = (storage_root or r"D:\AuditFirmStorage").strip()
|
||||
return (
|
||||
f"ERP_BASE_URL={erp_base_url}\n"
|
||||
f"NODE_CODE={(node_code or '').strip()}\n"
|
||||
f"NODE_SECRET={(node_secret or '').strip()}\n"
|
||||
f"STORAGE_ROOT={storage_root}\n"
|
||||
f"TENANT_ID={'' if tenant_id is None else tenant_id}\n"
|
||||
f"AUDIT_FIRM_ID={'' if tenant_id is None else tenant_id}\n"
|
||||
f"BRANCH_ID={'' if branch_id is None else branch_id}\n"
|
||||
f"SYNC_INTERVAL_SECONDS={int(sync_interval_seconds or 30)}\n"
|
||||
f"POLL_INTERVAL_SECONDS={int(sync_interval_seconds or 30)}\n"
|
||||
f"REQUEST_TIMEOUT_SECONDS={int(request_timeout_seconds or 60)}\n"
|
||||
f"TUNNEL_ENABLED={str(bool(tunnel_enabled)).lower()}\n"
|
||||
f"TUNNEL_RECONNECT_SECONDS={int(tunnel_reconnect_seconds or 10)}\n"
|
||||
"AUTO_UPDATE=true\n"
|
||||
"AUTO_INSTALL_UPDATES=false\n"
|
||||
"UPDATE_CHECK_INTERVAL_SECONDS=300\n"
|
||||
"DASHBOARD_ENABLED=true\n"
|
||||
"DASHBOARD_HOST=127.0.0.1\n"
|
||||
"DASHBOARD_PORT=8788\n"
|
||||
f"ERP_BASE_URL={erp_base_url}\n" f"NODE_CODE={(node_code or '').strip()}\n" f"NODE_SECRET={(node_secret or '').strip()}\n"
|
||||
f"STORAGE_ROOT={storage_root}\n" f"TENANT_ID={'' if tenant_id is None else tenant_id}\n" f"AUDIT_FIRM_ID={'' if tenant_id is None else tenant_id}\n"
|
||||
f"BRANCH_ID={'' if branch_id is None else branch_id}\n" f"SYNC_INTERVAL_SECONDS={int(sync_interval_seconds or 30)}\n" f"POLL_INTERVAL_SECONDS={int(sync_interval_seconds or 30)}\n"
|
||||
f"REQUEST_TIMEOUT_SECONDS={int(request_timeout_seconds or 60)}\n" f"TUNNEL_ENABLED={str(bool(tunnel_enabled)).lower()}\n" f"TUNNEL_RECONNECT_SECONDS={int(tunnel_reconnect_seconds or 10)}\n"
|
||||
"AUTO_UPDATE=true\nAUTO_INSTALL_UPDATES=false\nUPDATE_CHECK_INTERVAL_SECONDS=300\nDASHBOARD_ENABLED=true\nDASHBOARD_HOST=127.0.0.1\nDASHBOARD_PORT=8788\n"
|
||||
)
|
||||
|
||||
|
||||
@@ -48,8 +30,6 @@ def _zip_info(name: str) -> zipfile.ZipInfo:
|
||||
info = zipfile.ZipInfo(filename=name, date_time=_DETERMINISTIC_ZIP_TIMESTAMP)
|
||||
info.compress_type = zipfile.ZIP_DEFLATED
|
||||
info.create_system = 3
|
||||
# Regular file with rw-r--r-- permissions. Stable metadata keeps ZIP bytes
|
||||
# reproducible on every request and across Linux deployments.
|
||||
info.external_attr = (0o100644 & 0xFFFF) << 16
|
||||
return info
|
||||
|
||||
@@ -61,50 +41,28 @@ def _write_zip_bytes(dst: zipfile.ZipFile, name: str, payload: bytes) -> None:
|
||||
def _build_zip(*, env_text: str | None, include_env: bool, include_admin_readme: bool) -> bytes:
|
||||
if not RUNTIME_ROOT.exists():
|
||||
raise RuntimeError(f"ERP Local Agent runtime is missing: {RUNTIME_ROOT}")
|
||||
|
||||
buffer = io.BytesIO()
|
||||
with zipfile.ZipFile(
|
||||
buffer,
|
||||
"w",
|
||||
compression=zipfile.ZIP_DEFLATED,
|
||||
compresslevel=9,
|
||||
) as dst:
|
||||
with zipfile.ZipFile(buffer, "w", compression=zipfile.ZIP_DEFLATED, compresslevel=9) as dst:
|
||||
for path in sorted(RUNTIME_ROOT.rglob("*"), key=lambda item: item.as_posix()):
|
||||
if not path.is_file() or "__pycache__" in path.parts:
|
||||
continue
|
||||
name = path.relative_to(RUNTIME_ROOT).as_posix()
|
||||
_write_zip_bytes(dst, name, path.read_bytes())
|
||||
|
||||
_write_zip_bytes(dst, path.relative_to(RUNTIME_ROOT).as_posix(), path.read_bytes())
|
||||
if include_env and env_text is not None:
|
||||
_write_zip_bytes(dst, ".env", env_text.encode("utf-8"))
|
||||
|
||||
if include_admin_readme:
|
||||
readme = (
|
||||
text = (
|
||||
f"ERP Local Agent {ERP_LOCAL_AGENT_VERSION}\n"
|
||||
"Existing storage, WebSocket tunnel, Tally, accounting .act and local dashboard functionality are preserved.\n"
|
||||
"Local dashboard: http://127.0.0.1:8788\n"
|
||||
"The agent checks for updates automatically but installation is always initiated by the local user.\n"
|
||||
"The existing .env, data, logs, .venv and client storage are preserved during updates.\n"
|
||||
"Existing storage, WebSocket tunnel, dashboard, Tally mapping and client .act functionality are preserved.\n"
|
||||
"Phase 3 adds read-only Tally accounting master synchronization.\n"
|
||||
"Dashboard: http://127.0.0.1:8788\n"
|
||||
)
|
||||
_write_zip_bytes(dst, "README_ERP_LOCAL_AGENT.txt", readme.encode("utf-8"))
|
||||
|
||||
_write_zip_bytes(dst, "README_ERP_LOCAL_AGENT.txt", text.encode("utf-8"))
|
||||
return buffer.getvalue()
|
||||
|
||||
|
||||
def build_preconfigured_agent_zip(*, env_text: str, include_admin_readme: bool = False) -> bytes:
|
||||
return _build_zip(
|
||||
env_text=env_text,
|
||||
include_env=True,
|
||||
include_admin_readme=include_admin_readme,
|
||||
)
|
||||
return _build_zip(env_text=env_text, include_env=True, include_admin_readme=include_admin_readme)
|
||||
|
||||
|
||||
def build_agent_update_zip() -> bytes:
|
||||
# Update package deliberately excludes .env, .venv, data, logs and client files.
|
||||
# The ZIP is deterministic so update-manifest and update-package always agree
|
||||
# on SHA256 for the same deployed runtime/version.
|
||||
return _build_zip(
|
||||
env_text=None,
|
||||
include_env=False,
|
||||
include_admin_readme=False,
|
||||
)
|
||||
return _build_zip(env_text=None, include_env=False, include_admin_readme=False)
|
||||
|
||||
Reference in New Issue
Block a user