Skip to content

Commit 07ee45b

Browse files
authored
feat: Skyline support (#152)
* feat: document start script * feat: 修改documentstart * update: skyline module * feat: script * perf: use continuous * perf: 格式化 * update: skyline version * feat: skyline sever run script * docs: skyline使用说明 * docs: CHANGELOG
1 parent de45b20 commit 07ee45b

File tree

12 files changed

+114
-75
lines changed

12 files changed

+114
-75
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"**/.hg/store/**": true,
77
".flatpak/**": true,
88
"_build/**": true
9-
}
9+
},
10+
"prettier.tabWidth": 4
1011
}

CHANGELOG.MD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.06.2504060-2 / 2025-11-
2+
- feat: skyline support
3+
14
# 1.06.2504060-1 / 2025-10-30
25
- update: devtools to v1.06.2504060
36

@@ -111,6 +114,8 @@
111114
# 1.06.2306020-1 / 2023-06-04
112115

113116
- update: devtools to v1.06.2306020
117+
- update: nwjs 0.55.0 用以修复切换主题时标题栏重新出现的问题
118+
- fix: 处理vscode-ripgrep安装失败
114119

115120
# 1.06.2301040-1 / 2023-01-21
116121

README.MD

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,28 @@
139139
140140
# FAQ
141141
142-
请参考: [FAQ](docs/FAQ.MD)
142+
## Skyline(实验性功能)
143+
144+
启动Server后,点击编译即可;第一次启动Server会有wine配置提示,**不需要安装mono**。
145+
146+
> [!Warning]
147+
> 第一次编译之后的编译操作可能会失败,因为点击编译按钮后,wine服务器需要一些时间完成重启。
148+
149+
```shell
150+
docker run -d -it \
151+
--restart=always \
152+
--hostname="$(hostname)" \
153+
--env="DISPLAY" \
154+
--platform="linux/amd64" \
155+
--volume="${XAUTHORITY:-${HOME}/.Xauthority}:/root/.Xauthority:ro" \
156+
--volume="/tmp/.X11-unix:/tmp/.X11-unix:ro" \
157+
--volume="/dev/shm:/dev/shm" \
158+
-p 3001:3001 \
159+
--name skyline_server \
160+
ghcr.io/msojocs/skyline-client-server:master
161+
```
162+
163+
其它请参考: [FAQ](docs/FAQ.MD)
143164

144165
# 界面截图
145166

docker/entrypoint

Lines changed: 0 additions & 34 deletions
This file was deleted.

res/scripts/document_start.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
(() => {
2+
if (!window.skylineRequireReplace) {
3+
window.skylineRequireReplace = true;
4+
const originalRequire = window.require;
5+
if (originalRequire) {
6+
window.require = function (m) {
7+
if (m.includes("skyline.node")) {
8+
// 给native用的
9+
globalThis.__sharedMemory = originalRequire(
10+
"sharedMemory/sharedMemory.node"
11+
);
12+
}
13+
return originalRequire(m);
14+
};
15+
window.require.cache = originalRequire.cache;
16+
window.require.extensions = originalRequire.extensions;
17+
window.require.resolve = originalRequire.resolve;
18+
}
19+
}
20+
})();

res/scripts/entrance.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
(() => {
2-
const http = require('http')
3-
const originaleListen = http.Server.prototype.listen
4-
http.Server.prototype.listen = function(...args) {
5-
if (args[0] == 33233) {
6-
console.warn('block port of http server:', args[0])
7-
return
2+
const http = require("http");
3+
const originaleListen = http.Server.prototype.listen;
4+
http.Server.prototype.listen = function (port) {
5+
if (port == 33233) {
6+
console.warn("block port of http server:", port);
7+
return;
88
}
9-
return originaleListen.apply(this, args)
10-
}
11-
})();
9+
return originaleListen.apply(this, [port]);
10+
};
11+
})();

test/fix-core.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

tools/build-with-docker.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22

33
root_dir=$(cd `dirname $0`/.. && pwd -P)
44
echo "$(id -u):$(id -g)"
5-
docker run -u "$(id -u):$(id -g)" --rm -i -e "ACTION_MODE=${ACTION_MODE:-false}" -w /workspace -v "$root_dir:/workspace" jiyecafe/wechat-devtools-build:v1.0.4 \
6-
bash ./docker/entrypoint
5+
docker run --rm -i \
6+
-u "$(id -u):$(id -g)" \
7+
-e "ACTION_MODE=${ACTION_MODE:-false}" \
8+
-w /workspace \
9+
-v "$root_dir:/workspace" \
10+
jiyecafe/wechat-devtools-build:v1.0.4 \
11+
bash ./tools/setup-wechat-devtools.sh

tools/replace-skyline.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
set -ex
3+
root_dir=$(cd `dirname $0`/.. && pwd -P)
4+
srcdir=$root_dir
5+
tmp_dir="$root_dir/tmp"
6+
cache_dir="$root_dir/cache"
7+
nwjs_dir="$root_dir/nwjs"
8+
package_dir="$root_dir/package.nw"
9+
10+
shared_memory_version="v1.0.2"
11+
skyline_version="v1.0.3"
12+
13+
cd "$package_dir/node_modules"
14+
rm sharedMemory/sharedMemory.node
15+
wget -c https://github.com/msojocs/skyline-shared-memory/releases/download/$shared_memory_version/skyline-sharedMemory-linux-x86_64-$shared_memory_version.node -OsharedMemory/sharedMemory.node
16+
17+
cd skyline-addon
18+
rm build/skyline.node
19+
wget -c https://github.com/msojocs/skyline-client-server/releases/download/$skyline_version/skyline-skylineClient-linux-x86_64-$skyline_version.node -Obuild/skyline.node
20+
rm build/icudtl.dat
21+
rm -rf bundle
22+
23+
mv ${package_dir}/js/extensions/inject/documentstart/index.js ${package_dir}/js/extensions/inject/documentstart/index.js.bak
24+
cp ${srcdir}/res/scripts/document_start.js ${package_dir}/js/extensions/inject/documentstart/index.js
25+
cat ${package_dir}/js/extensions/inject/documentstart/index.js.bak >> ${package_dir}/js/extensions/inject/documentstart/index.js
26+
rm ${package_dir}/js/extensions/inject/documentstart/index.js.bak

tools/run-skyline-server.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
docker run -d -it \
3+
--restart=always \
4+
--hostname="$(hostname)" \
5+
--env="DISPLAY" \
6+
--platform="linux/amd64" \
7+
--volume="${XAUTHORITY:-${HOME}/.Xauthority}:/root/.Xauthority:ro" \
8+
--volume="/tmp/.X11-unix:/tmp/.X11-unix:ro" \
9+
--volume="/dev/shm:/dev/shm" \
10+
-p 3001:3001 \
11+
--name skyline_server \
12+
ghcr.io/msojocs/skyline-client-server:master

0 commit comments

Comments
 (0)