Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"**/.hg/store/**": true,
".flatpak/**": true,
"_build/**": true
}
},
"prettier.tabWidth": 4
}
5 changes: 5 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 1.06.2504060-2 / 2025-11-
- feat: skyline support

# 1.06.2504060-1 / 2025-10-30
- update: devtools to v1.06.2504060

Expand Down Expand Up @@ -111,6 +114,8 @@
# 1.06.2306020-1 / 2023-06-04

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

# 1.06.2301040-1 / 2023-01-21

Expand Down
23 changes: 22 additions & 1 deletion README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,28 @@

# FAQ

请参考: [FAQ](docs/FAQ.MD)
## Skyline(实验性功能)

启动Server后,点击编译即可;第一次启动Server会有wine配置提示,**不需要安装mono**。

> [!Warning]
> 第一次编译之后的编译操作可能会失败,因为点击编译按钮后,wine服务器需要一些时间完成重启。

```shell
docker run -d -it \
--restart=always \
--hostname="$(hostname)" \
--env="DISPLAY" \
--platform="linux/amd64" \
--volume="${XAUTHORITY:-${HOME}/.Xauthority}:/root/.Xauthority:ro" \
--volume="/tmp/.X11-unix:/tmp/.X11-unix:ro" \
--volume="/dev/shm:/dev/shm" \
-p 3001:3001 \
--name skyline_server \
ghcr.io/msojocs/skyline-client-server:master
```

其它请参考: [FAQ](docs/FAQ.MD)

# 界面截图

Expand Down
34 changes: 0 additions & 34 deletions docker/entrypoint

This file was deleted.

20 changes: 20 additions & 0 deletions res/scripts/document_start.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
(() => {
if (!window.skylineRequireReplace) {
window.skylineRequireReplace = true;
const originalRequire = window.require;
if (originalRequire) {
window.require = function (m) {
if (m.includes("skyline.node")) {
// 给native用的
globalThis.__sharedMemory = originalRequire(
"sharedMemory/sharedMemory.node"
);
}
return originalRequire(m);
};
window.require.cache = originalRequire.cache;
window.require.extensions = originalRequire.extensions;
window.require.resolve = originalRequire.resolve;
}
}
})();
18 changes: 9 additions & 9 deletions res/scripts/entrance.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
(() => {
const http = require('http')
const originaleListen = http.Server.prototype.listen
http.Server.prototype.listen = function(...args) {
if (args[0] == 33233) {
console.warn('block port of http server:', args[0])
return
const http = require("http");
const originaleListen = http.Server.prototype.listen;
http.Server.prototype.listen = function (port) {
if (port == 33233) {
console.warn("block port of http server:", port);
return;
}
return originaleListen.apply(this, args)
}
})();
return originaleListen.apply(this, [port]);
};
})();
16 changes: 0 additions & 16 deletions test/fix-core.sh

This file was deleted.

9 changes: 7 additions & 2 deletions tools/build-with-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@

root_dir=$(cd `dirname $0`/.. && pwd -P)
echo "$(id -u):$(id -g)"
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 \
bash ./docker/entrypoint
docker run --rm -i \
-u "$(id -u):$(id -g)" \
-e "ACTION_MODE=${ACTION_MODE:-false}" \
-w /workspace \
-v "$root_dir:/workspace" \
jiyecafe/wechat-devtools-build:v1.0.4 \
bash ./tools/setup-wechat-devtools.sh
26 changes: 26 additions & 0 deletions tools/replace-skyline.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/bash
set -ex
root_dir=$(cd `dirname $0`/.. && pwd -P)
srcdir=$root_dir
tmp_dir="$root_dir/tmp"
cache_dir="$root_dir/cache"
nwjs_dir="$root_dir/nwjs"
package_dir="$root_dir/package.nw"

shared_memory_version="v1.0.2"
skyline_version="v1.0.3"

cd "$package_dir/node_modules"
rm sharedMemory/sharedMemory.node
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

cd skyline-addon
rm build/skyline.node
wget -c https://github.com/msojocs/skyline-client-server/releases/download/$skyline_version/skyline-skylineClient-linux-x86_64-$skyline_version.node -Obuild/skyline.node
rm build/icudtl.dat
rm -rf bundle

mv ${package_dir}/js/extensions/inject/documentstart/index.js ${package_dir}/js/extensions/inject/documentstart/index.js.bak
cp ${srcdir}/res/scripts/document_start.js ${package_dir}/js/extensions/inject/documentstart/index.js
cat ${package_dir}/js/extensions/inject/documentstart/index.js.bak >> ${package_dir}/js/extensions/inject/documentstart/index.js
rm ${package_dir}/js/extensions/inject/documentstart/index.js.bak
12 changes: 12 additions & 0 deletions tools/run-skyline-server.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash
docker run -d -it \
--restart=always \
--hostname="$(hostname)" \
--env="DISPLAY" \
--platform="linux/amd64" \
--volume="${XAUTHORITY:-${HOME}/.Xauthority}:/root/.Xauthority:ro" \
--volume="/tmp/.X11-unix:/tmp/.X11-unix:ro" \
--volume="/dev/shm:/dev/shm" \
-p 3001:3001 \
--name skyline_server \
ghcr.io/msojocs/skyline-client-server:master
17 changes: 8 additions & 9 deletions tools/setup-wechat-devtools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,18 @@ export PATH="$root_dir/cache/npm/node_global/bin:$root_dir/node/bin:$PATH"
node --version
npm --version

if [ "$ACTION_MODE" == "true" ]; then
# ACTION HOME没有定义,导致异常
export HOME="/tmp/home"
mkdir -p /tmp/home
fi
if [ $CURRENT_STEP == $INSTALL_NODE_SUCCESS ];then
npm config set prefix "$root_dir/cache/npm/node_global"
npm config set cache "$root_dir/cache/npm/node_cache"
if [ "$ACTION_MODE" != "true" ]; then
notice "非ACTION模式, 设置镜像源"
npm config set registry http://registry.npmmirror.com/ # 注册模块镜像
npm config set disturl http://npmmirror.com/dist # node-gyp 编译依赖的 node 源码镜像
## 以下选择添加
npm config set sass_binary_site http://npmmirror.com/mirrors/node-sass # node-sass 二进制包镜像
npm config set electron_mirror http://npmmirror.com/mirrors/electron/ # electron 二进制包镜像
npm config set puppeteer_download_host http://npmmirror.com/mirrors # puppeteer 二进制包镜像
npm config set chromedriver_cdnurl http://npmmirror.com/mirrors/chromedriver # chromedriver 二进制包镜像
npm config set operadriver_cdnurl http://npmmirror.com/mirrors/operadriver # operadriver 二进制包镜像
npm config set phantomjs_cdnurl http://npmmirror.com/mirrors/phantomjs # phantomjs 二进制包镜像
npm config set selenium_cdnurl http://npmmirror.com/mirrors/selenium # selenium 二进制包镜像
npm config set node_inspector_cdnurl http://npmmirror.com/mirrors/node-inspector # node-inspector 二进制包镜像
fi
step_switch $INSTALL_NPM_CONFIG_SUCCESS
fi
Expand Down Expand Up @@ -162,6 +158,9 @@ if [ $CURRENT_STEP == $INSTALL_REBUILD_SUCCESS ];then

notice "Patching Other"
"$root_dir/tools/fix-other.sh"

notice "Replace Skyline"
"$root_dir/tools/replace-skyline.sh"
fi

success "微信开发者工具安装完毕"
Expand Down
6 changes: 3 additions & 3 deletions tools/update-wechat-devtools.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ const urls = {
"https://developers.weixin.qq.com/miniprogram/dev/devtools/nightly.html",
};

const arguments = process.argv.slice(2);
console.log(arguments)
const commandArgs = process.argv.slice(2);
console.log(commandArgs)

const args = {};
for (let arg of arguments) {
for (let arg of commandArgs) {
let t = arg.split("=");
args[t[0]] = t[1];
}
Expand Down