1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-07-23 22:55:28 +00:00

Compare commits

...

9 Commits

Author SHA1 Message Date
semantic-release-bot 3d0cdc85cd chore(release): 4.17.2 [skip ci]
## [4.17.2](https://github.com/sasjs/adapter/compare/v4.17.1...v4.17.2) (2026-07-21)

### Bug Fixes

* **deps:** resolve npm audit vulnerabilities ([0ad18be](https://github.com/sasjs/adapter/commit/0ad18be38f005bb0dfecb313f8cff4598460318c))
* route all traffic trough connected VPN ([ff6e67e](https://github.com/sasjs/adapter/commit/ff6e67e902529a4211f5847dd59c19038298852f))
2026-07-21 11:49:39 +00:00
Allan Bowe 425d6eb993 Merge pull request #893 from sasjs/dep-vulnerabilities
fix(deps): resolve npm audit vulnerabilities
2026-07-21 12:48:39 +01:00
M 47c6e45024 chore: cleanup package-lock 2026-07-21 13:42:29 +02:00
M ff6e67e902 fix: route all traffic trough connected VPN 2026-07-21 13:39:28 +02:00
YuryShkoda 22667baea1 chore: cleanup 2026-07-21 13:06:12 +03:00
YuryShkoda b50afbec41 ci: add VPN diagnostics and curl retry to server-tests workflow
The "Fetch SASJS server" step was timing out after 130s+ despite the
VPN reporting "Connected", with no way to tell whether routes hadn't
propagated yet or the firewall was silently dropping packets from the
runner's IP. Log VPN session/route/DNS state right after connecting,
and retry the curl with a shorter per-attempt timeout so a routing
race resolves itself instead of hanging the whole job.
2026-07-21 12:55:01 +03:00
YuryShkoda 0ad18be38f fix(deps): resolve npm audit vulnerabilities
Bump axios (prod) plus express, webpack, terser-webpack-plugin,
node-polyfill-webpack-plugin, and semantic-release (dev) to patch
73 known vulnerabilities down to 6 low-severity, upstream-unfixed
ones in node-polyfill-webpack-plugin's own dependency chain.
2026-07-21 11:24:33 +03:00
Allan Bowe df43c921b9 Merge pull request #892 from sasjs/gha
chore: ensuring latest npm
2026-06-18 20:44:52 +01:00
Allan Bowe e20555ac82 chore: ensuring latest npm 2026-06-18 19:44:03 +00:00
5 changed files with 6315 additions and 4266 deletions
+5
View File
@@ -14,6 +14,11 @@ script-security 2
keepalive 10 120 keepalive 10 120
remote-cert-tls server remote-cert-tls server
# Route ALL traffic through the VPN (full tunnel)
redirect-gateway def1
# Send DNS through the tunnel so it doesn't leak to your local ISP
dhcp-option DNS 1.1.1.1
# Keys # Keys
ca ca.crt ca ca.crt
cert user.crt cert user.crt
+8 -6
View File
@@ -22,7 +22,7 @@ jobs:
node-version: [22] node-version: [22]
steps: steps:
# 1. Mint a short-lived GitHub App token (bypass-capable) # Mint a short-lived GitHub App token (bypass-capable)
- name: Generate token - name: Generate token
id: app-token id: app-token
uses: actions/create-github-app-token@v1 uses: actions/create-github-app-token@v1
@@ -30,7 +30,7 @@ jobs:
app-id: ${{ secrets.APP_ID }} app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }} private-key: ${{ secrets.APP_PRIVATE_KEY }}
# 2. Checkout using the app token so the release commit can be pushed # Checkout using the app token so the release commit can be pushed
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
token: ${{ steps.app-token.outputs.token }} token: ${{ steps.app-token.outputs.token }}
@@ -43,7 +43,11 @@ jobs:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
registry-url: https://registry.npmjs.org registry-url: https://registry.npmjs.org
# 3. Restore npm cache manually # Node 22 ships npm 10.x — OIDC trusted publishing needs npm >= 11.5.1
- name: Update npm
run: npm install -g npm@latest
# Restore npm cache manually
- name: Restore npm cache - name: Restore npm cache
uses: actions/cache@v4 uses: actions/cache@v4
id: npm-cache id: npm-cache
@@ -72,9 +76,7 @@ jobs:
- name: Publish to npm with trusted publisher - name: Publish to npm with trusted publisher
if: success() if: success()
env: run: npm publish --access public
NPM_CONFIG_PROVENANCE: true
run: npm publish --access public --provenance
- name: Send Matrix message - name: Send Matrix message
run: curl -XPOST -d "{\"msgtype\":\"m.text\", \"body\":\"New version of @sasjs/adapter has been released! \n Please deploy and run 'dctests' with new adapter to make sure everything is still in place.\"}" https://matrix.4gl.io/_matrix/client/r0/rooms/!jRebyiGmHZlpfDwYXN:4gl.io/send/m.room.message?access_token=${{ secrets.MATRIX_TOKEN }} run: curl -XPOST -d "{\"msgtype\":\"m.text\", \"body\":\"New version of @sasjs/adapter has been released! \n Please deploy and run 'dctests' with new adapter to make sure everything is still in place.\"}" https://matrix.4gl.io/_matrix/client/r0/rooms/!jRebyiGmHZlpfDwYXN:4gl.io/send/m.room.message?access_token=${{ secrets.MATRIX_TOKEN }}
+23 -1
View File
@@ -86,8 +86,30 @@ jobs:
- name: install pm2 - name: install pm2
run: npm i -g pm2 run: npm i -g pm2
- name: Diagnose VPN connectivity
run: |
echo "--- openvpn3 sessions-list ---"
openvpn3 sessions-list
echo "--- openvpn3 session-stats ---"
openvpn3 session-stats --config .github/vpn/config.ovpn
echo "--- ip addr (tun interface) ---"
ip addr show tun0 || echo "no tun0 interface found"
echo "--- ip route ---"
ip route
echo "--- DNS resolution check for target host (host/IP not printed) ---"
TARGET_HOST="$(echo '${{ secrets.SASJS_SERVER_URL }}' | sed -E 's#^[a-z]+://##; s#[:/].*##')"
if getent hosts "$TARGET_HOST" > /dev/null; then
echo "DNS resolution: OK"
else
echo "DNS resolution: FAILED"
fi
shell: bash
- name: Fetch SASJS server - name: Fetch SASJS server
run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info run: |
curl -sS --retry 5 --retry-delay 5 --retry-all-errors --connect-timeout 15 --max-time 30 \
-o /dev/null -w "HTTP status: %{http_code}\n" \
"${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info"
- name: Deploy sasjs-tests - name: Deploy sasjs-tests
run: | run: |
+6270 -4250
View File
File diff suppressed because it is too large Load Diff
+9 -9
View File
@@ -48,10 +48,10 @@
"viya", "viya",
"sasjs" "sasjs"
], ],
"author": "Allan Bowe <support@macropeople.com>", "author": "support@4gl.io",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/sasjs/adapter" "url": "git+https://github.com/sasjs/adapter.git"
}, },
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
@@ -69,17 +69,17 @@
"cp": "0.2.0", "cp": "0.2.0",
"cypress": "^15.7.1", "cypress": "^15.7.1",
"dotenv": "16.0.0", "dotenv": "16.0.0",
"express": "4.17.3", "express": "4.22.2",
"jest": "29.7.0", "jest": "29.7.0",
"jest-environment-jsdom": "^29.7.0", "jest-environment-jsdom": "^29.7.0",
"jest-extended": "4.0.2", "jest-extended": "4.0.2",
"node-polyfill-webpack-plugin": "1.1.4", "node-polyfill-webpack-plugin": "4.1.0",
"path": "0.12.7", "path": "0.12.7",
"pem": "1.14.5", "pem": "1.14.5",
"prettier": "3.8.2", "prettier": "3.8.2",
"process": "0.11.10", "process": "0.11.10",
"semantic-release": "19.0.3", "semantic-release": "25.0.8",
"terser-webpack-plugin": "5.3.6", "terser-webpack-plugin": "5.6.1",
"ts-jest": "29.2.6", "ts-jest": "29.2.6",
"ts-loader": "9.4.0", "ts-loader": "9.4.0",
"tslint": "6.1.3", "tslint": "6.1.3",
@@ -87,17 +87,17 @@
"typedoc": "0.23.24", "typedoc": "0.23.24",
"typedoc-plugin-rename-defaults": "0.6.4", "typedoc-plugin-rename-defaults": "0.6.4",
"typescript": "4.9.5", "typescript": "4.9.5",
"webpack": "5.76.2", "webpack": "5.108.4",
"webpack-cli": "4.9.2" "webpack-cli": "4.9.2"
}, },
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"@sasjs/utils": "^3.5.6", "@sasjs/utils": "^3.5.6",
"axios": "1.16.0", "axios": "1.18.1",
"axios-cookiejar-support": "5.0.5", "axios-cookiejar-support": "5.0.5",
"form-data": "4.0.6", "form-data": "4.0.6",
"https": "1.0.0", "https": "1.0.0",
"tough-cookie": "4.1.3" "tough-cookie": "4.1.3"
}, },
"version": "4.17.1" "version": "4.17.2"
} }