Skip to content

Commit b9696a6

Browse files
e-khalilovirdkwmnsbe.khalilovDaniilSmirnovAlk2017
authored
Stable Apple device behavior (#400)
* Develop to Master for 1.5.1.0 (#398) * Wire initial typescript (#338) * Wire initial typescript * Fix types * Something works * Finishing touches * Linter fixes * Build problems * hotfix (#361) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Remove all DB connections from device side (#368) * hotfix imei * Decrease apt install list in dockerfile (#365) * remove gm and jdk11 * remove libs * Remove console-feed & react dependencies [backend only] (#366) * remove dep console-feed * minor fix * linter fix --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix default quotas hierarchy QA-19255 (#367) * -fix quotas -fix lock -fix test -fix lint * -fix test --------- Co-authored-by: a.chistov <a.chistov@vk.team> * dev units without db conn * fix types * minor fix * minor fix * minor fix * remove useless sockets --------- Co-authored-by: Maksim Alzhanov <m.alzhanov@vk.team> Co-authored-by: Maxim <me@alzhanov.ru> Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Alexey Chistov <33050834+Alk2017@users.noreply.github.com> Co-authored-by: a.chistov <a.chistov@vk.team> * fix device type & types (#374) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * reconnect in ADBObserver (#376) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * QA-10057 Remove users watcher groups-engine (#369) * -fix after rebase -remove user watcher -user handler for alert message default quotas handler -fix merge del handler update quoats handler user handler method some fix -move without change method of devices to separate class -fix after move users method -move db.users method to separate class * add missing db method --------- Co-authored-by: a.chistov <a.chistov@vk.team> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix heartbeat (#377) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * overrides dependencies (#378) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Automatic removal of disabled devices (#379) * clear dead devices * minor fix * revert api edits * revert ui (types) edits --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix linkifyjs issue (#380) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Resolve conflicts (#381) * Hotfix: device imei issue (#371) * hotfix * minor fix * fix types * minor fix --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * increase ram for v8 (#372) * hotfix (#373) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * hotfix ADBObserver (#375) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> * Fixed transactions & minor optimizations (#382) * minor edits * fix transactions * minor fix * fix ts types --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Fix lint issues * Minitouch refactoring (#388) * Develop to Master for 1.5.1 (#364) * Wire initial typescript (#338) * Wire initial typescript * Fix types * Something works * Finishing touches * Linter fixes * Build problems * hotfix (#361) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Remove all DB connections from device side (#368) * hotfix imei * Decrease apt install list in dockerfile (#365) * remove gm and jdk11 * remove libs * Remove console-feed & react dependencies [backend only] (#366) * remove dep console-feed * minor fix * linter fix --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix default quotas hierarchy QA-19255 (#367) * -fix quotas -fix lock -fix test -fix lint * -fix test --------- Co-authored-by: a.chistov <a.chistov@vk.team> * dev units without db conn * fix types * minor fix * minor fix * minor fix * remove useless sockets --------- Co-authored-by: Maksim Alzhanov <m.alzhanov@vk.team> Co-authored-by: Maxim <me@alzhanov.ru> Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Alexey Chistov <33050834+Alk2017@users.noreply.github.com> Co-authored-by: a.chistov <a.chistov@vk.team> * fix device type & types (#374) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * reconnect in ADBObserver (#376) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * QA-10057 Remove users watcher groups-engine (#369) * -fix after rebase -remove user watcher -user handler for alert message default quotas handler -fix merge del handler update quoats handler user handler method some fix -move without change method of devices to separate class -fix after move users method -move db.users method to separate class * add missing db method --------- Co-authored-by: a.chistov <a.chistov@vk.team> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix heartbeat (#377) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * overrides dependencies (#378) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Automatic removal of disabled devices (#379) * clear dead devices * minor fix * revert api edits * revert ui (types) edits --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix linkifyjs issue (#380) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Resolve conflicts (#381) * Hotfix: device imei issue (#371) * hotfix * minor fix * fix types * minor fix --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * increase ram for v8 (#372) * hotfix (#373) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * hotfix ADBObserver (#375) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> * Fixed transactions & minor optimizations (#382) * minor edits * fix transactions * minor fix * fix ts types --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Fix lint issues --------- Co-authored-by: Maxim <me@alzhanov.ru> Co-authored-by: Elmir Khalilov <52529096+e-khalilov@users.noreply.github.com> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Maksim Alzhanov <m.alzhanov@vk.team> Co-authored-by: Alexey Chistov <33050834+Alk2017@users.noreply.github.com> Co-authored-by: a.chistov <a.chistov@vk.team> * Hotfix: Fix broken import in ios Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * minitouch refactoring + TS --------- Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> Co-authored-by: Maxim <me@alzhanov.ru> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Maksim Alzhanov <m.alzhanov@vk.team> Co-authored-by: Alexey Chistov <33050834+Alk2017@users.noreply.github.com> Co-authored-by: a.chistov <a.chistov@vk.team> * Sleep / wake keyevents (#390) * Develop to Master for 1.5.1 (#364) * Wire initial typescript (#338) * Wire initial typescript * Fix types * Something works * Finishing touches * Linter fixes * Build problems * hotfix (#361) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Remove all DB connections from device side (#368) * hotfix imei * Decrease apt install list in dockerfile (#365) * remove gm and jdk11 * remove libs * Remove console-feed & react dependencies [backend only] (#366) * remove dep console-feed * minor fix * linter fix --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix default quotas hierarchy QA-19255 (#367) * -fix quotas -fix lock -fix test -fix lint * -fix test --------- Co-authored-by: a.chistov <a.chistov@vk.team> * dev units without db conn * fix types * minor fix * minor fix * minor fix * remove useless sockets --------- Co-authored-by: Maksim Alzhanov <m.alzhanov@vk.team> Co-authored-by: Maxim <me@alzhanov.ru> Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Alexey Chistov <33050834+Alk2017@users.noreply.github.com> Co-authored-by: a.chistov <a.chistov@vk.team> * fix device type & types (#374) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * reconnect in ADBObserver (#376) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * QA-10057 Remove users watcher groups-engine (#369) * -fix after rebase -remove user watcher -user handler for alert message default quotas handler -fix merge del handler update quoats handler user handler method some fix -move without change method of devices to separate class -fix after move users method -move db.users method to separate class * add missing db method --------- Co-authored-by: a.chistov <a.chistov@vk.team> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix heartbeat (#377) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * overrides dependencies (#378) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Automatic removal of disabled devices (#379) * clear dead devices * minor fix * revert api edits * revert ui (types) edits --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix linkifyjs issue (#380) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Resolve conflicts (#381) * Hotfix: device imei issue (#371) * hotfix * minor fix * fix types * minor fix --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * increase ram for v8 (#372) * hotfix (#373) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * hotfix ADBObserver (#375) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> * Fixed transactions & minor optimizations (#382) * minor edits * fix transactions * minor fix * fix ts types --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Fix lint issues --------- Co-authored-by: Maxim <me@alzhanov.ru> Co-authored-by: Elmir Khalilov <52529096+e-khalilov@users.noreply.github.com> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Maksim Alzhanov <m.alzhanov@vk.team> Co-authored-by: Alexey Chistov <33050834+Alk2017@users.noreply.github.com> Co-authored-by: a.chistov <a.chistov@vk.team> * Hotfix: Fix broken import in ios Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * fix vulnerable deps (#384) * sleep/wake event & fs checking fix * fix ports slicing --------- Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> Co-authored-by: Maxim <me@alzhanov.ru> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Maksim Alzhanov <m.alzhanov@vk.team> Co-authored-by: Alexey Chistov <33050834+Alk2017@users.noreply.github.com> Co-authored-by: a.chistov <a.chistov@vk.team> * Health checking of devices in provider (#391) Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * General Process Manager & iOS Refactoring (#394) * add common process manager & refactor iOS * update wda * revert logger edits --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> * Fix apk install (#397) * fix compose+logs && rewrite to ts * ts fix --------- Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> --------- Co-authored-by: Maxim <me@alzhanov.ru> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Maksim Alzhanov <m.alzhanov@vk.team> Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> Co-authored-by: Alexey Chistov <33050834+Alk2017@users.noreply.github.com> Co-authored-by: a.chistov <a.chistov@vk.team> * optimize Apple device workflow && fix bugs & technical debt * remove fs logs * upd dockerfile * upd dockerfile * upd dockerfile & package.json & etc --------- Co-authored-by: Maxim <me@alzhanov.ru> Co-authored-by: e.khalilov <e.khalilov@vkteam.ru> Co-authored-by: Maksim Alzhanov <m.alzhanov@vk.team> Co-authored-by: Daniil <8039921+DaniilSmirnov@users.noreply.github.com> Co-authored-by: Alexey Chistov <33050834+Alk2017@users.noreply.github.com> Co-authored-by: a.chistov <a.chistov@vk.team>
1 parent 0b7eaaa commit b9696a6

580 files changed

Lines changed: 7306 additions & 73488 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ WebDriverAgent/
1616
.eslintcache
1717
scripts/
1818
.mypy_cache
19+
.build

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ node_modules/
2020
/playwright-report/
2121
/blob-report/
2222
/playwright/.cache/
23+
24+
.build
25+
patches

‎Dockerfile‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -------- BUILDER --------
2-
FROM node:20.18.0-bullseye-slim AS builder
2+
FROM --platform=linux/amd64 node:20.19.0-bullseye-slim AS builder
33

44
WORKDIR /app
55

@@ -10,28 +10,19 @@ RUN apt-get update && apt-get install -y \
1010

1111
COPY . .
1212

13-
RUN sed -i 's%./node_modules/.bin/tsx%node%g' ./bin/stf.mjs && \
14-
npm ci --python="/usr/bin/python3" --loglevel http && \
15-
./node_modules/.bin/tsc -p tsconfig.node.json && \
13+
RUN npm ci --python="/usr/bin/python3" --loglevel http && \
1614
npm prune --production
1715

18-
19-
WORKDIR /app/ui
20-
21-
RUN npm ci && \
22-
npx tsc -b && \
23-
npx vite build
24-
2516
# -------- RUNTIME --------
26-
FROM node:20.18.0-bullseye-slim
17+
FROM --platform=linux/amd64 node:20.19.0-bullseye-slim
2718

2819
LABEL org.opencontainers.image.source=https://github.com/VKCOM/devicehub
2920
LABEL org.opencontainers.image.title=DeviceHub
3021
LABEL org.opencontainers.image.vendor=VKCOM
3122
LABEL org.opencontainers.image.description="Control and manage Android and iOS devices from your browser."
3223
LABEL org.opencontainers.image.licenses=Apache-2.0
3324

34-
ENV PATH=/app/bin:$PATH
25+
ENV PATH=/app/.build/bin:$PATH
3526
ENV NODE_OPTIONS="--max-old-space-size=32768"
3627

3728
EXPOSE 3000
@@ -47,10 +38,10 @@ COPY --from=builder /app .
4738
RUN rm -rf ./ui
4839
COPY --from=builder /app/ui/dist ./ui/dist
4940

50-
RUN ln -s /app/bin/stf.mjs /app/bin/stf && \
51-
ln -s /app/bin/stf.mjs /app/bin/devicehub && \
52-
ln -s /app/bin/stf.mjs /app/bin/dh
41+
RUN ln -s /app/.build/bin/stf.mjs /app/.build/bin/stf && \
42+
ln -s /app/.build/bin/stf.mjs /app/.build/bin/devicehub && \
43+
ln -s /app/.build/bin/stf.mjs /app/.build/bin/dh
5344

5445
USER devicehub-user
5546

56-
CMD ["devicehub", "--help"]
47+
CMD ["devicehub", "--help"]

0 commit comments

Comments
 (0)