mirror of
https://github.com/sasjs/adapter.git
synced 2026-07-24 07:02:14 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f01c222c56 | ||
|
|
a4273e5369 | ||
|
|
3d4fe304e9 | ||
|
|
3d0cdc85cd | ||
|
|
425d6eb993 | ||
|
|
47c6e45024 | ||
|
|
ff6e67e902 | ||
|
|
22667baea1 | ||
|
|
b50afbec41 | ||
|
|
0ad18be38f | ||
|
|
df43c921b9 | ||
|
|
e20555ac82 |
@@ -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
|
||||||
|
|||||||
@@ -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 }}
|
||||||
|
|||||||
@@ -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: |
|
||||||
|
|||||||
Generated
+6261
-4241
File diff suppressed because it is too large
Load Diff
+9
-9
@@ -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.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,15 +27,6 @@ const browserConfig = {
|
|||||||
index: './src/index.ts',
|
index: './src/index.ts',
|
||||||
minified_sas9: './src/minified/sas9/index.ts'
|
minified_sas9: './src/minified/sas9/index.ts'
|
||||||
},
|
},
|
||||||
externals: {
|
|
||||||
'node:fs': 'node:fs',
|
|
||||||
'node:fs/promises': 'node:fs/promises',
|
|
||||||
'node:path': 'node:path',
|
|
||||||
'node:stream': 'node:stream',
|
|
||||||
'node:url': 'node:url',
|
|
||||||
'node:events': 'node:events',
|
|
||||||
'node:string_decoder': 'node:string_decoder'
|
|
||||||
},
|
|
||||||
output: {
|
output: {
|
||||||
filename: '[name].js',
|
filename: '[name].js',
|
||||||
path: path.resolve(__dirname, 'build'),
|
path: path.resolve(__dirname, 'build'),
|
||||||
|
|||||||
Reference in New Issue
Block a user