Merge pull request #11 from nosignals/dev

Merge to main branch

.github/workflows/core-dev.yml

@@ -0,0 +1,111 @@
+#
+# Copyright (C) 2024 nosignals
+#
+name: Building Mihomo & Sing-box Kernel DEV
+
+on:
+  workflow_dispatch:
+    inputs:
+      mihomo_version:
+        description: 'Mihomo version'
+        required: true
+        default: '1.19.1'
+        type: string
+      singbox_version:
+        description: 'Sing-box version'
+        required: true
+        default: '1.10.7'
+        type: string
+jobs: 
+  build_ipk:
+    permissions:
+      contents: write
+    name: Build Neko
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        release:
+          - 23.05.4
+        arch:
+          - x86_64
+          - arm_cortex-a7_neon-vfpv4
+          - aarch64_cortex-a53
+          - aarch64_cortex-a72
+          - aarch64_generic
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          ref: dev
+
+      - name: Preparing Neko
+        run: |
+              echo ""
+              mkdir feeds artifacts
+              cp -rf ./mihomo ./feeds
+              cp -rf ./sing-box ./feeds
+        
+      - name: Building Kernel Packages
+        uses: nosignals/gh-action-sdk@main
+        env:
+          ARCH: ${{ matrix.arch }}-${{ matrix.release }}
+          ARTIFACTS_DIR: ${{ github.workspace }}/artifacts
+          FEED_DIR: ${{ github.workspace }}/feeds
+          PACKAGES: mihomo sing-box
+          NO_SHFMT_CHECK: 1
+
+      - name: Delivering Package
+        uses: actions/upload-artifact@v4
+        with:
+          name: neko-${{ matrix.release }}_${{ matrix.arch }}
+          path: |
+            ${{ github.workspace }}/artifacts/bin/packages/${{ matrix.arch }}/action/mihomo*
+            ${{ github.workspace }}/artifacts/bin/packages/${{ matrix.arch }}/action/sing-box*
+
+  push_packages:
+    needs: build_ipk
+    name: Push Packages to Release
+    permissions:
+      contents: write  # To push a branch
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download temporary artifact
+        uses: actions/download-artifact@v3
+
+      - name: Moving artifact to releases
+        shell: bash
+        run: |
+          mkdir ./release
+          cp -rf ./neko-23.05.4_x86_64/mihomo* ./release/
+          cp -rf ./neko-23.05.4_x86_64/sing-box* ./release/
+          cp -rf ./neko-23.05.4_arm_cortex-a7_neon-vfpv4/mihomo* ./release/
+          cp -rf ./neko-23.05.4_arm_cortex-a7_neon-vfpv4/sing-box* ./release/
+          cp -rf ./neko-23.05.4_aarch64_generic/mihomo* ./release/
+          cp -rf ./neko-23.05.4_aarch64_generic/sing-box* ./release/
+          cp -rf ./neko-23.05.4_aarch64_cortex-a53/mihomo* ./release/
+          cp -rf ./neko-23.05.4_aarch64_cortex-a53/sing-box* ./release/
+          cp -rf ./neko-23.05.4_aarch64_cortex-a72/mihomo* ./release/
+          cp -rf ./neko-23.05.4_aarch64_cortex-a72/sing-box* ./release/
+        
+      - name: Upload release asset
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ./release/*
+          overwrite: true
+          tag: core_${{ inputs.mihomo_version }}_${{ inputs.singbox_version }}
+          file_glob: true
+          body: |
+            # NEKO CORE PACKAGES
+            ### Mihomo Kernel ${{ inputs.mihomo_version }}
+            - Changelog : [v${{ inputs.mihomo_version }}](https://github.com/MetaCubeX/mihomo/releases/tag/v${{ inputs.mihomo_version }})
+            - Wiki : [wiki.metacubex.one](https://wiki.metacubex.one)
+            
+            ### Sing-box Kernel ${{ inputs.singbox_version }}
+            - Changelog : [v${{ inputs.singbox_version }}](https://github.com/SagerNet/sing-box/releases/tag/v${{ inputs.singbox_version }})
+            - Wiki : [sing-box.sagernet.org](https://sing-box.sagernet.org)
+            
+            ### Dependency Requirement
+            - ` ca-bundle, ip-full, kmod-tun `

.github/workflows/dev.yml

@@ -9,7 +9,7 @@ on:
       version:
         description: 'Neko version'
         required: true
-        default: '1.2.2-beta'
+        default: '1.2.3-beta'
         type: string
       changelog:
         description: 'Changelog'
@@ -22,7 +22,7 @@ jobs:
     permissions:
       contents: write
     name: Build Neko
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

README.md

@@ -23,16 +23,16 @@ Packages list
 ---
 | Packages | Version | Arch | Information |
 |---|---|---|---|
-| [luci-app-neko](https://github.com/nosignals/openwrt-neko/tree/main/luci-app-neko) | ` 1.2.2-beta ` | <div align="center"> [all-generic](https://github.com/nosignals/openwrt-neko/releases/download/luci-app-neko_1.2.2-beta/luci-app-neko_1.2.2-beta_all.ipk) </div> | Include `geosite` and `geoip` files |
-| [mihomo](https://github.com/nosignals/openwrt-neko/tree/main/mihomo) | ` 1.18.8-2 ` | <div align="center"> [x86](https://github.com/nosignals/openwrt-neko/releases/download/mihomo_1.18.8/mihomo_1.18.8-2_x86_64.ipk)</br>[aarch64-generic](https://github.com/nosignals/openwrt-neko/releases/download/mihomo_1.18.8/mihomo_1.18.8-2_aarch64_generic.ipk)</br>[arm_cortex-a7_neon](https://github.com/nosignals/openwrt-neko/releases/download/mihomo_1.18.8/mihomo_1.18.8-2_arm_cortex-a7_neon-vfpv4.ipk) </div> | Latest stable version on [MetaCubeXD](https://github.com/MetaCubeX/mihomo/) |
-| ? | ? | ? | ? |
+| [luci-app-neko](https://github.com/nosignals/openwrt-neko/tree/main/luci-app-neko) | ` 1.2.1-beta ` | <div align="center"> [all-generic](https://github.com/nosignals/openwrt-neko/releases/download/luci-app-neko_1.2.1-beta/luci-app-neko_1.2.1-beta_all.ipk) </div> | Include `geosite` and `geoip` files |
+| [mihomo](https://github.com/nosignals/openwrt-neko/tree/main/mihomo) | ` 1.18.7-1 ` | <div align="center"> [x86](https://github.com/nosignals/openwrt-neko/releases/download/mihomo_1.18.7/mihomo_1.18.7-1_x86_64.ipk)</br>[aarch64-generic](https://github.com/nosignals/openwrt-neko/releases/download/mihomo_1.18.7/mihomo_1.18.7-1_aarch64_generic.ipk)</br>[arm_cortex-a7_neon](https://github.com/nosignals/openwrt-neko/releases/download/mihomo_1.18.7/mihomo_1.18.7-1_arm_cortex-a7_neon-vfpv4.ipk) </div> | Latest stable version on [MetaCubeXD](https://github.com/MetaCubeX/mihomo/) |
+| [sing-box](https://github.com/nosignals/openwrt-neko/tree/main/sing-box) | ` 1.10.7 ` | - | [Original Repository](https://github.com/SagerNet/sing-box) |
 
 Installation
 ---
 1. Downloads ` mihomo_xxxx.ipk ` and ` luci-app-neko_xxx.ipk ` from releases
-2. install requirement depedencies `php8, php8-cgi, kmod-tun, bash, curl, jq, ip-full, ca-bundle`
-3. Install firstly ` mihomo_xxxx.ipk `
-4. After installing ` mihomo `, install ` luci-app-neko_xxx.ipk `
+2. install requirement depedencies `php8 php8-cgi kmod-tun bash curl jq ip-full ca-bundle`
+3. Install firstly ` mihomo_xxxx.ipk ` and ` sing-box_xxxx.ipk `
+4. After installing ` mihomo ` and ` sing-box `, install ` luci-app-neko_xxx.ipk `
 5. Done, check your LUCI on openwrt
 
 Updating
@@ -64,35 +64,21 @@ nosignal is gone
 
 Credit
 ---
-- nosignals
+- [nosignals](https://github.com/nosignals)
+- [bobbyunknown](https://github.com/bobbyunknown)
 
 Screenshoot
 ---
-<details><summary>Home</summary>
+<details><summary>Home - Mihomo</summary>
  <p>
-  <img src="https://raw.githubusercontent.com/nosignals/neko/main/img/home.png" alt="home">
+  <img src="https://raw.githubusercontent.com/nosignals/openwrt-neko/refs/heads/dev/img/mihomo.png" alt="home">
  </p>
 </details>
 
-<details><summary>Dasboard</summary>
- <p>
-  <img src="https://raw.githubusercontent.com/nosignals/neko/main/img/dashboard.png" alt="dash">
- </p>
-</details>
-
-<details><summary>Config - Home</summary>
-  <img src="https://raw.githubusercontent.com/nosignals/neko/main/img/config.png" alt="cfg">
-</details>
-<details><summary>Config - Proxy</summary>
-  <img src="https://raw.githubusercontent.com/nosignals/neko/main/img/config-proxy.png" alt="proxy">
-</details>
-<details><summary>Config - Rules</summary>
-  <img src="https://raw.githubusercontent.com/nosignals/neko/main/img/config-rules.png" alt="rules">
-</details>
-<details><summary>Config - Converter</summary>
-  <img src="https://raw.githubusercontent.com/nosignals/neko/main/img/config-converter.png" alt="conv">
+<details><summary>Home - Sing-Box</summary>
+  <img src="https://raw.githubusercontent.com/nosignals/openwrt-neko/refs/heads/dev/img/sing-box.png" alt="cfg">
 </details>
 
 <details><summary>Settings</summary>
-  <img src="https://raw.githubusercontent.com/nosignals/neko/main/img/setting.png" alt="setting">
+  <img src="https://raw.githubusercontent.com/nosignals/openwrt-neko/refs/heads/dev/img/setting.png" alt="setting">
 </details>

luci-app-neko/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_MAINTAINER:=nosignal <https://github.com/nosignals/neko>
 PKG_NAME:=luci-app-neko
-PKG_VERSION:=1.2.2-beta
+PKG_VERSION:=1.2.3-beta
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
@@ -15,7 +15,7 @@ define Package/$(PKG_NAME)
 	SUBMENU:=3. Applications
 	TITLE:=LuCI support for mihomo
 	PKGARCH:=all
-	DEPENDS:=+kmod-tun +bash +curl +jq +mihomo
+	DEPENDS:=+kmod-tun +bash +curl +jq +mihomo +sing-box +php8 +php8-mod-curl
 endef
 
 define Package/$(PKG_NAME)/description
@@ -59,6 +59,8 @@ define Package/$(PKG_NAME)/postinst
 	if [ -f "/tmp/neko/neko.bak" ]; then
 		cp -rf "/tmp/neko/geoip.metadb" "/etc/neko/geoip.metadb"
 		cp -rf "/tmp/neko/geosite.db" "/etc/neko/geosite.db"
+		cp -rf "/tmp/neko/geoip.dat" "/etc/neko/geoip.dat"
+		cp -rf "/tmp/neko/geosite.dat" "/etc/neko/geosite.dat"
 
 		cp -rf /tmp/neko/config/* "/etc/neko/config/"
 		cp -rf /tmp/neko/proxy_provider/* "/etc/neko/proxy_provider/"

luci-app-neko/htdocs/luci-static/resources/view/neko/manager.js

@@ -8,7 +8,7 @@ return view.extend({
 	},
 	render: function() {
 		return E('iframe', {
-			src: window.location.protocol + "//" + window.location.hostname + '/nekoclash/manager.php',
+			src: window.location.protocol + "//" + window.location.hostname + '/nekoclash/configs.php',
 			style: 'width: 100%; min-height: 95vh; border: none; border-radius: 5px; resize: vertical;'
 		});
 	},

luci-app-neko/htdocs/luci-static/resources/view/neko/metacubexd.js

@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 2024 Nosignal <https://github.com/nosignals>
+ * 
+ * Contributors:
+ * - bobbyunknown <https://github.com/bobbyunknown>
+ *
+ * https://opensource.org/license/mit
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 'use strict';
 'require view';
 'require uci';