fixes #419 keyboard shortcuts with different language layouts

.eslintrc.cjs

@@ -0,0 +1,10 @@
+/* eslint-env node */
+module.exports = {
+    extends: ['plugin:@typescript-eslint/recommended'],
+    parser: '@typescript-eslint/parser',
+    plugins: ['@typescript-eslint'],
+    root: true,
+    rules: {
+        "@typescript-eslint/ban-ts-comment": "off"
+    }
+};

.github/workflows/test.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Node setup
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: latest
       - name: Install yarn
         run: npm install --global yarn
       - name: Install dependecies
@@ -31,7 +31,10 @@ jobs:
       - name: Unit Tests
         run: yarn test
       - name: Acceptance Tests
-        run: PEERBOOK_REF="${{ github.event.inputs.pbRef }}" WEBEXEC_REF="${{ github.event.inputs.weRef }}" bash -x aatp/run
+        run: >
+            PEERBOOK_REF="${{ github.event.inputs.pbRef }}"
+            WEBEXEC_REF="${{ github.event.inputs.weRef }}"
+            bash -x aatp/run
       - name: Upload acceptance test results
         if: ${{ failure() }}
         uses: actions/upload-artifact@v3

.github/workflows/validate.yml

@@ -1,17 +1,17 @@
 name: Validate
 
-on: push
+on: [push, pull_request]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Node setup
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20.8.1
       - name: Install yarn
         run: npm install --global yarn
       - name: Install dependecies

.gitignore

@@ -27,3 +27,6 @@ aatp/**/authorized_fingerprints
 
 # Local Netlify folder
 .netlify
+
+# idea
+.idea/

CHANGELOG.md

@@ -6,6 +6,22 @@ will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.1] - 2023/9/14
+
+### Fixed
+
+- PeerBook status indicator is always an emoji, no kanji chars
+
+## [1.8.0] - 2023/9/10
+
+### Added 
+
+- dashed underline to link on the map - just like in TWR
+- Progressive Web App support 
+- synchronizing layout across all connected client
+- the login command for web clients
+- peerbook spinner and indicator
+
 ## 1.7.1 - 2023/8/27
 
 ### Fixed

__mocks__/@revenuecat/purchases-capacitor.ts

@@ -0,0 +1,7 @@
+import { vi } from "vitest"
+
+export const configure = vi.fn().mockResolvedValue(undefined);
+export const setMockWebResults = vi.fn().mockResolvedValue(undefined);
+export const getOfferings = vi.fn().mockResolvedValue({ offerings: [] });
+export const getProducts = vi.fn().mockResolvedValue({ products: [] });
+// ...mock other methods as needed

__mocks__/xterm.ts

@@ -9,6 +9,10 @@ export class Terminal {
     }
     element = {
         addEventListener: vi.fn(),
+        parentElement: {
+            clientHeight: 480,
+            clientWidth: 640
+        }
     }
     constructor (props) {
         this.out = ""
@@ -62,5 +66,18 @@ export class Terminal {
         const ev = new KeyboardEvent("keydown", { key })
         this.keyHandler( { domEvent: ev } )
     }
+    resize:(columns: number, rows: number) => void = vi.fn();
+    _core = {
+        _renderService: {
+            dimensions: {
+                css: {
+                    cell: {
+                        width: 5,
+                        height: 11
+                    }
+                }
+            }
+        }
+    }
 }
 

aatp/http_webrtc/http_webrtc.spec.ts

@@ -100,8 +100,8 @@ pinch_max_y_velocity = 0.1`
         await page.screenshot({ path: `/result/2.png` })
         await expect(page.locator('.pane')).toHaveCount(2)
     })
-    test('a pane can be close', async() => {
-        sleep(500)
+    test('a pane can be closed', async() => {
+        await sleep(500)
         const exitState = await page.evaluate(() => {
             try {
                 window.terminal7.activeG.activeW.activeP.d.send("exit\n")
@@ -120,7 +120,7 @@ pinch_max_y_velocity = 0.1`
         await page.screenshot({ path: `/result/second.png` })
         const lines = await page.evaluate(() =>
            window.terminal7.activeG.activeW.activeP.t.buffer.active.length)
-        expect(lines).toEqual(38)
+        await expect(lines).toEqual(38)
         await page.evaluate(async() => {
             const gate = window.terminal7.activeG
             gate.disengage().then(() => {

aatp/infra/webexec/docker_entry.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 set -x
-EXE="/usr/local/bin/webexec"
+
 HOME=/home/runner
 CONF=/conf
 
@@ -19,8 +19,7 @@ if [[ $PEERBOOK == "1" ]]
 then
     /scripts/wait-for-it.sh -h peerbook -p 17777
 fi
-su -c "$EXE start --debug" runner
 while true
 do
-    sleep 1
+    su - runner -c '/usr/local/bin/webexec start --debug'
 done

aatp/peerbook_webrtc/admin.spec.ts

@@ -80,7 +80,7 @@ test.describe('peerbook administration', ()  => {
         expect(pbOpen).toBeFalsy()
     })
     test('purchase update with an active subscription and bad otp', async () => {
-        await sleep(500)
+        await page.keyboard.press("Enter")
         await redisClient.set("tempid:$ValidBearer", "1")
         await sleep(1500)
         await page.evaluate(async () => {

aatp/peerbook_webrtc/lab.yaml

@@ -54,7 +54,6 @@ services:
       PB_HOME_URL: http://peerbook:17777
   redis:
     image: "redis:alpine"
-    command: [sh, -c, "rm -f /data/dump.rdb && redis-server"]  # disable persistence
   revenuecat:
     image: "mockserver/mockserver"
     environment:
@@ -65,8 +64,7 @@ services:
     volumes:
       - ./aatp/peerbook_webrtc:/config
   smtp:
-    image: mailhog:local
-    build: https://github.com/mailhog/MailHog.git
+    image: jcalonso/mailhog
     expose:
       - 1025
       - 8025

aatp/peerbook_webrtc/session.spec.ts

@@ -144,32 +144,27 @@ insecure = true
         await expect(page.locator('.pane')).toHaveCount(1)
     })
     test('disengage and reconnect', async() => {
-        await page.evaluate(async() => {
-            const gate = window.terminal7.activeG
-            gate.activeW.activeP.d.send("seq 10; sleep 1; seq 10 20\n")
+        await page.evaluate(async() => 
+            await window.terminal7.activeG.activeW.activeP.d.send(
+                "seq 10; sleep 1; seq 10 20\n"))
+        await page.screenshot({ path: `/result/first.png` })
+        const y1 = await page.evaluate(async() => {
+            const ret = window.terminal7.activeG.activeW.activeP.t.buffer.active.cursorY
+            window.terminal7.onAppStateChange({isActive: false})
+            return ret
         })
-        await sleep(100)
         await page.screenshot({ path: `/result/second.png` })
-        const lines1 = await page.evaluate(async() => {
-            const gate = window.terminal7.activeG
-            await gate.disengage().then(() => {
-                window.terminal7.clearTimeouts()
-                window.terminal7.activeG.session = null
-            })
-            return gate.activeW.activeP.t.buffer.active.length
-        })
         await sleep(1000)
         await page.screenshot({ path: `/result/third.png` })
-        await page.evaluate(async() => {
-            window.terminal7.activeG.connect()
-        })
+        await page.evaluate(async() =>
+            window.terminal7.onAppStateChange({isActive: true}))
         await expect(page.locator('.pane')).toHaveCount(1)
         await sleep(1500)
-        const lines2 = await page.evaluate(() =>
-           window.terminal7.activeG.activeW.activeP.t.buffer.active.length)
+        const y2 = await page.evaluate(() =>
+           window.terminal7.activeG.activeW.activeP.t.buffer.active.cursorY)
         await page.screenshot({ path: `/result/fourth.png` })
-        console.log(lines1, lines2)
-        expect(lines2-lines1).toEqual(11)
+        console.log(y1, y2)
+        expect(y2-y1).toEqual(11)
     })
     test('after disengage & reconnect, a a pane can be close', async() => {
         await page.screenshot({ path: `/result/fifth.png` })

aatp/ui/ui.spec.ts

@@ -103,7 +103,7 @@ insecure=true`)
         await page.screenshot({ path: `/result/2.png` })
         await page.locator('.tabbar .reset').click()
         await expect(page.locator('#t0')).toBeVisible()
-        sleep(20)
+        await sleep(20)
         await page.keyboard.press('Enter')
         await expect(page.locator('#t0')).toBeHidden()
         await expect(page.locator('.pane')).toHaveCount(1)

android/app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "dev.terminal7"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5
-        versionName "1.7.1"
+        versionCode 6
+        versionName "1.8.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/capacitor.build.gradle

@@ -18,7 +18,7 @@ dependencies {
     implementation project(':capacitor-network')
     implementation project(':capacitor-preferences')
     implementation project(':capacitor-status-bar')
-    implementation project(':capgo-capacitor-purchases')
+    implementation project(':revenuecat-purchases-capacitor')
     implementation project(':capacitor-native-biometric')
     implementation project(':capacitor-rate-app')
     implementation project(':capacitor-ssh-plugin')

android/app/src/main/assets/capacitor.plugins.json

@@ -36,8 +36,8 @@
 		"classpath": "com.capacitorjs.plugins.statusbar.StatusBarPlugin"
 	},
 	{
-		"pkg": "@capgo/capacitor-purchases",
-		"classpath": "ee.forgr.plugin.capacitor_purchases.CapacitorPurchasesPlugin"
+		"pkg": "@revenuecat/purchases-capacitor",
+		"classpath": "com.revenuecat.purchases.capacitor.PurchasesPlugin"
 	},
 	{
 		"pkg": "capacitor-native-biometric",

android/capacitor.settings.gradle

@@ -29,8 +29,8 @@ project(':capacitor-preferences').projectDir = new File('../node_modules/@capaci
 include ':capacitor-status-bar'
 project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
 
-include ':capgo-capacitor-purchases'
-project(':capgo-capacitor-purchases').projectDir = new File('../node_modules/@capgo/capacitor-purchases/android')
+include ':revenuecat-purchases-capacitor'
+project(':revenuecat-purchases-capacitor').projectDir = new File('../node_modules/@revenuecat/purchases-capacitor/android')
 
 include ':capacitor-native-biometric'
 project(':capacitor-native-biometric').projectDir = new File('../node_modules/capacitor-native-biometric/android')

css/terminal7.css

@@ -367,17 +367,27 @@ button.rename-close {
     position: absolute;
     top: 128px;
     left: 20px;
-    max-width: 35vw;
     padding: 10px;
     border: 1px dotted;
     border-radius: 4px;
     text-align: center;
     line-height: 12px;
 }
 #version a {
-    text-decoration: underline;
+    text-decoration-style: dashed;
+    text-decoration-line: underline;
 	cursor: pointer;
 }
+#version ul {
+    list-style: none;
+    text-align: left;
+    padding-left: 0;
+
+}
+#version li .status {
+    float: right;
+    padding-left: 0;
+}
 #version footer {
     font-size: 10px;
 }
@@ -475,10 +485,30 @@ label {
     height: 100%;
     width: 100%;
 }
+@media (min-width: 600px) {
+    #title-short {
+        display: none;
+    }
+    #title-long {
+        display: block;
+    }
+    #version {
+        max-width: 35vw;
+    }
+}
 @media (max-width: 600px) {
     #log {
         width: 90vw;
     }
+    #title-short {
+        display: block;
+    }
+    #title-long {
+        display: none;
+    }
+    #version {
+        max-width: 35vw;
+    }
 }
 .search-container {
     margin: 0 auto;
@@ -787,17 +817,8 @@ div.boarding  {
 	text-decoration: none;
 }
 #title-short {
-  display: none;
   letter-spacing: 0.1em;
 }
-@media (max-width: 600px) {
-    #title-short {
-        display: block;
-    }
-    #title-long {
-        display: none;
-    }
-}
 .expand-gate {
     display: block;
     position: absolute;