Revert "chore: remove nutjs" and replace nutjs version (#2900)

* Revert "chore: remove nutjs (#2860)" This reverts commit ce2d8e5. * feat: change nut-js to download from GitHub * feat: change nut-js to use @nut-tree-fork/nut-js * Revert "Chore: temporary disable cache for server migration (#2742)" This reverts commit af9a351. * feat: disable quickask settings on linux * feat: enable quick ask linux again * Change to @kirillvakalov/nut-tree__nut-js (#2906) Co-authored-by: Hien To <[email protected]> --------- Co-authored-by: Van-QA <[email protected]> Co-authored-by: hiento09 <[email protected]> Co-authored-by: Hien To <[email protected]>
janhq · May 15, 2024 · aa1f01f · aa1f01f
1 parent eb7e963
commit aa1f01f
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 71 deletions.
diff --git a/.github/workflows/jan-electron-linter-and-test.yml b/.github/workflows/jan-electron-linter-and-test.yml
@@ -57,19 +57,19 @@ jobs:
  rm -rf ~/jan
  make clean
 
- # - name: Get Commit Message for PR
- #  if : github.event_name == 'pull_request'
- #  run: |
- #  echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}})" >> $GITHUB_ENV
+ - name: Get Commit Message for PR
+ if : github.event_name == 'pull_request'
+ run: |
+ echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}})" >> $GITHUB_ENV
 
- # - name: Get Commit Message for push event
- #  if : github.event_name == 'push'
- #  run: |
- #  echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}})" >> $GITHUB_ENV
+ - name: Get Commit Message for push event
+ if : github.event_name == 'push'
+ run: |
+ echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}})" >> $GITHUB_ENV
 
- # - name: "Config report portal"
- #  run: |
- #  make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App macos" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
+ - name: "Config report portal"
+ run: |
+ make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App macos" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
 
  - name: Linter and test
  run: |
@@ -78,9 +78,9 @@ jobs:
  make test
  env:
  CSC_IDENTITY_AUTO_DISCOVERY: "false"
- # TURBO_API: "${{ secrets.TURBO_API }}"
- # TURBO_TEAM: "macos"
- # TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
+ TURBO_API: "${{ secrets.TURBO_API }}"
+ TURBO_TEAM: "macos"
+ TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
 
  test-on-macos-pr-target:
  if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
@@ -141,27 +141,27 @@ jobs:
  }
  make clean
  
- # - name: Get Commit Message for push event
- #  if : github.event_name == 'push'
- #  shell: bash
- #  run: |
- #  echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV
+ - name: Get Commit Message for push event
+ if : github.event_name == 'push'
+ shell: bash
+ run: |
+ echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV
 
- # - name: "Config report portal"
- #  shell: bash
- #  run: |
- #  make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows ${{ matrix.antivirus-tools }}" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
+ - name: "Config report portal"
+ shell: bash
+ run: |
+ make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows ${{ matrix.antivirus-tools }}" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
 
  - name: Linter and test
  shell: powershell
  run: |
  npm config set registry ${{ secrets.NPM_PROXY }} --global
  yarn config set registry ${{ secrets.NPM_PROXY }} --global
  make test
- # env:
- #  TURBO_API: "${{ secrets.TURBO_API }}"
- #  TURBO_TEAM: "windows"
- #  TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
+ env:
+ TURBO_API: "${{ secrets.TURBO_API }}"
+ TURBO_TEAM: "windows"
+ TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
  test-on-windows-pr:
  if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
  runs-on: windows-desktop-default-windows-security
@@ -189,27 +189,27 @@ jobs:
  }
  make clean
 
- # - name: Get Commit Message for PR
- #  if : github.event_name == 'pull_request'
- #  shell: bash
- #  run: |
- #  echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}}" >> $GITHUB_ENV
+ - name: Get Commit Message for PR
+ if : github.event_name == 'pull_request'
+ shell: bash
+ run: |
+ echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}}" >> $GITHUB_ENV
 
- # - name: "Config report portal"
- #  shell: bash
- #  run: |
- #  make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
+ - name: "Config report portal"
+ shell: bash
+ run: |
+ make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
 
  - name: Linter and test
  shell: powershell
  run: |
  npm config set registry ${{ secrets.NPM_PROXY }} --global
  yarn config set registry ${{ secrets.NPM_PROXY }} --global
  make test
- # env:
- #  TURBO_API: "${{ secrets.TURBO_API }}"
- #  TURBO_TEAM: "windows"
- #  TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
+ env:
+ TURBO_API: "${{ secrets.TURBO_API }}"
+ TURBO_TEAM: "windows"
+ TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
 
  test-on-windows-pr-target:
  if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
@@ -266,20 +266,20 @@ jobs:
  rm -rf ~/jan
  make clean
 
- # - name: Get Commit Message for PR
- #  if : github.event_name == 'pull_request'
- #  run: |
- #  echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}}" >> $GITHUB_ENV
+ - name: Get Commit Message for PR
+ if : github.event_name == 'pull_request'
+ run: |
+ echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}}" >> $GITHUB_ENV
 
- # - name: Get Commit Message for push event
- #  if : github.event_name == 'push'
- #  run: |
- #  echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV
+ - name: Get Commit Message for push event
+ if : github.event_name == 'push'
+ run: |
+ echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV
 
- # - name: "Config report portal"
- #  shell: bash
- #  run: |
- #  make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Linux" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
+ - name: "Config report portal"
+ shell: bash
+ run: |
+ make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Linux" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
 
  - name: Linter and test
  run: |
@@ -288,10 +288,10 @@ jobs:
  npm config set registry ${{ secrets.NPM_PROXY }} --global
  yarn config set registry ${{ secrets.NPM_PROXY }} --global
  make test
- # env:
- #  TURBO_API: "${{ secrets.TURBO_API }}"
- #  TURBO_TEAM: "linux"
- #  TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
+ env:
+ TURBO_API: "${{ secrets.TURBO_API }}"
+ TURBO_TEAM: "linux"
+ TURBO_TOKEN: "${{ secrets.TURBO_TOKEN }}"
 
  test-on-ubuntu-pr-target:
  runs-on: [self-hosted, Linux, ubuntu-desktop]

diff --git a/electron/package.json b/electron/package.json
@@ -103,7 +103,8 @@
  "pacote": "^17.0.4",
  "request": "^2.88.2",
  "request-progress": "^3.0.0",
- "ulidx": "^2.3.0"
+ "ulidx": "^2.3.0",
+ "@kirillvakalov/nut-tree__nut-js": "4.2.1-2"
  },
  "devDependencies": {
  "@electron/notarize": "^2.1.0",

diff --git a/electron/utils/selectedText.ts b/electron/utils/selectedText.ts
@@ -1,24 +1,23 @@
 import { clipboard, globalShortcut } from 'electron'
+import { keyboard, Key } from "@kirillvakalov/nut-tree__nut-js"
 
 /**
  * Gets selected text by synthesizing the keyboard shortcut
  * "CommandOrControl+c" then reading text from the clipboard
  */
 export const getSelectedText = async () => {
- // TODO: Implement this function
- // const currentClipboardContent = clipboard.readText() // preserve clipboard content
- // clipboard.clear()
- // const hotkeys: Key[] = [
- // process.platform === 'darwin' ? Key.LeftCmd : Key.LeftControl,
- // Key.C,
- // ]
- // await keyboard.pressKey(...hotkeys)
- // await keyboard.releaseKey(...hotkeys)
- // await new Promise((resolve) => setTimeout(resolve, 200)) // add a delay before checking clipboard
- // const selectedText = clipboard.readText()
- // clipboard.writeText(currentClipboardContent)
- // return selectedText
- return ''
+ const currentClipboardContent = clipboard.readText() // preserve clipboard content
+ clipboard.clear()
+ const hotkeys: Key[] = [
+ process.platform === 'darwin' ? Key.LeftCmd : Key.LeftControl,
+ Key.C,
+ ]
+ await keyboard.pressKey(...hotkeys)
+ await keyboard.releaseKey(...hotkeys)
+ await new Promise((resolve) => setTimeout(resolve, 200)) // add a delay before checking clipboard
+ const selectedText = clipboard.readText()
+ clipboard.writeText(currentClipboardContent)
+ return selectedText
 }
 
 /**