update 2022-09-29 23:52:54

linkease/Makefile

@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_LINKEASE:=$(ARCH)
 
 PKG_NAME:=linkease
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=$(PKG_ARCH_LINKEASE)-1
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://fw.koolcenter.com/binary/LinkEase/LinuxStorage/
-PKG_HASH:=7410e97e096700ade8242edc50265caa85c7682d97c08032bc8174fa1e882a56
+PKG_HASH:=d774e0e588a2d3680c68d995a45c3e5ffd98d6d2fccfbcbf96d253de7369476b
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)
 

linkease/files/linkease-config.sh

@@ -26,6 +26,24 @@ case "$1" in
 
     ;;
 
+  local_save)
+    if [ ! -z "$2" ]; then
+      uci set linkease.@linkease[0].local_home=$2
+      uci commit
+    fi
+    ;;
+
+  local_load)
+    data=`uci get linkease.@linkease[0].local_home`
+
+    if [ -z "${data}" ]; then
+      echo "nil"
+    else
+      echo "${data}"
+    fi
+
+    ;;
+
   status)
     echo "TODO"
     ;;

linkease/files/linkease.config

@@ -1,4 +1,5 @@
 config linkease
 	option 'port' '8897'
 	option 'preconfig' ''
+	option 'local_home' ''
 	option 'enabled' '1'

linkease/files/linkease.init

@@ -17,7 +17,7 @@ start_service() {
 	procd_open_instance
 	procd_set_param limits nofile="65535 65535"
 	procd_set_param command /usr/sbin/linkease
-	[ -n "$port" ] && procd_append_param command --deviceAddr ":$port"
+	[ -n "$port" ] && procd_append_param command --deviceAddr ":$port" --localApi /var/run/linkease.sock
 	[ "$logger" == 1 ] && procd_set_param stderr 1
 	procd_set_param respawn
 	procd_close_instance

luci-app-alist/luasrc/view/alist/alist_status.htm

@@ -17,7 +17,7 @@
 			{
 				if (st.running)
 				{
-					tb.innerHTML = '<em style=\"color:green\"><b>Alist <%:RUNNING%></b></em>' + "<input class=\"cbi-button-reload mar-10\" type=\"button\" value=\" <%:Open Web Interface%> \" onclick=\"window.open('<%=protocol%>" + window.location.hostname + ":" + st.port + "/')\"/>";
+					tb.innerHTML = '<em style=\"color:green\"><b>Alist <%:RUNNING%></b></em>' + "<input class=\"cbi-button cbi-button-reload mar-10\" type=\"button\" value=\" <%:Open Web Interface%> \" onclick=\"window.open('<%=protocol%>" + window.location.hostname + ":" + st.port + "/')\"/>";
 				}
 				else
 				{

luci-app-amlogic/Makefile

@@ -16,7 +16,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.127
+PKG_VERSION:=3.1.128
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0 License

luci-app-amlogic/root/usr/sbin/openwrt-install-amlogic

@@ -320,12 +320,18 @@ elif [[ "${AMLOGIC_SOC}" == "s905x" ]]; then
     BLANK2=0
     BLANK3=0
     BLANK4=0
-elif [[ "${AMLOGIC_SOC}" == "s905x3" ]] && [[ "${FDTFILE}" == "meson-sm1-skyworth-lb2004-a4091.dtb" ]];then
+elif [[ "${AMLOGIC_SOC}" == "s905x3" ]] && [[ "${FDTFILE}" == "meson-sm1-skyworth-lb2004-a4091.dtb" ]]; then
     BOOT=768
     BLANK1=68
     BLANK2=202
     BLANK3=0
     BLANK4=0
+elif [[ "${AMLOGIC_SOC}" == "s905l3a" ]]; then
+    BOOT=512
+    BLANK1=108
+    BLANK2=778
+    BLANK3=0
+    BLANK4=0
 else
     BOOT=160
     BLANK1=68

luci-app-linkease/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=LuCI support for linkease
 LUCI_DEPENDS:=+linkease
 LUCI_PKGARCH:=all
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.2
 PKG_RELEASE:=2
 
 include $(TOPDIR)/feeds/luci/luci.mk

luci-app-linkease/luasrc/controller/linkease_backend.lua

@@ -0,0 +1,183 @@
+-- Copyright 2022 xiaobao <xiaobao@linkease.com>
+-- Licensed to the public under the MIT License
+
+local http = require "luci.http"
+local nixio = require "nixio"
+local ltn12 = require "luci.ltn12"
+local table = require "table"
+local util = require "luci.util"
+
+module("luci.controller.linkease_backend", package.seeall)
+
+local BLOCKSIZE = 2048
+local LINKEASE_UNIX = "/var/run/linkease.sock"
+
+function index()
+    entry({"linkease"}, call("linkease_backend")).leaf=true
+end
+
+local function sink_socket(sock, io_err) 
+  if sock then 
+    return function(chunk, err) 
+      if not chunk then 
+        return 1 
+      else 
+        return sock:send(chunk)
+      end 
+    end 
+  else 
+    return ltn12.sink.error(io_err or "unable to send socket") 
+  end
+end
+
+local function session_retrieve(sid, allowed_users)
+  local sdat = util.ubus("session", "get", { ubus_rpc_session = sid })
+  if type(sdat) == "table" and
+      type(sdat.values) == "table" and
+      type(sdat.values.token) == "string" and
+      (not allowed_users or
+      util.contains(allowed_users, sdat.values.username))
+  then
+      return sid, sdat.values
+  end
+  return nil, nil
+end
+
+local function get_session(sid)
+  if sid then
+    return session_retrieve(sid, nil)
+  end
+  return nil, nil
+end
+
+local function chunksource(sock, buffer)
+	buffer = buffer or ""
+	return function()
+		local output
+		local _, endp, count = buffer:find("^([0-9a-fA-F]+);?.-\r\n")
+		while not count and #buffer <= 1024 do
+			local newblock, code = sock:recv(1024 - #buffer)
+			if not newblock then
+				return nil, code
+			end
+			buffer = buffer .. newblock  
+			_, endp, count = buffer:find("^([0-9a-fA-F]+);?.-\r\n")
+		end
+		count = tonumber(count, 16)
+		if not count then
+			return nil, -1, "invalid encoding"
+		elseif count == 0 then
+			return nil
+		elseif count + 2 <= #buffer - endp then
+			output = buffer:sub(endp+1, endp+count)
+			buffer = buffer:sub(endp+count+3)
+			return output
+		else
+			output = buffer:sub(endp+1, endp+count)
+			buffer = ""
+			if count - #output > 0 then
+				local remain, code = sock:recvall(count-#output)
+				if not remain then
+					return nil, code
+				end
+				output = output .. remain
+				count, code = sock:recvall(2)
+			else
+				count, code = sock:recvall(count+2-#buffer+endp)
+			end
+			if not count then
+				return nil, code
+			end
+			return output
+		end
+	end
+end
+
+function linkease_backend() 
+  local sock = nixio.socket("unix", "stream")
+  if sock:connect(LINKEASE_UNIX) ~= true then
+    http.status(500, "connect failed")
+    return
+  end
+  local input = {}
+  input[#input+1] = http.getenv("REQUEST_METHOD") .. " " .. http.getenv("REQUEST_URI") .. " HTTP/1.1"
+  local req = http.context.request
+  local start = "HTTP_"
+  local start_len = string.len(start)
+  local ctype = http.getenv("CONTENT_TYPE")
+  if ctype then 
+    input[#input+1] = "Content-Type: " .. ctype 
+  end
+  for k, v in pairs(req.message.env) do
+    if string.sub(k, 1, start_len) == start and not string.find(k, "FORWARDED") then 
+      input[#input+1] = string.sub(k, start_len+1, string.len(k)) .. ": " .. v
+    end
+  end
+  local sid, sdat = get_session(http.getcookie("sysauth"))
+  if sdat == nil then
+    sid, sdat = get_session(http.getcookie('sysauth_%s' % { http.getenv("HTTPS") == "on" and "https" or "http" }))
+  end
+  if sdat ~= nil then
+    input[#input+1] = "X-Forwarded-Sid: " .. sid
+    input[#input+1] = "X-Forwarded-Token: " .. sdat.token
+  end
+  -- input[#input+1] = "X-Forwarded-For: " .. http.getenv("REMOTE_HOST") ..":".. http.getenv("REMOTE_PORT")
+  local num = tonumber(http.getenv("CONTENT_LENGTH")) or 0
+  input[#input+1] = "Content-Length: " .. tostring(num)
+  input[#input+1] = "\r\n"
+  local source = ltn12.source.cat(ltn12.source.string(table.concat(input, "\r\n")), http.source())
+  local ret = ltn12.pump.all(source, sink_socket(sock, "write sock error")) 
+  if ret ~= 1 then
+    sock:close()
+    http.status(500, "proxy error")
+    return
+  end
+
+  local linesrc = sock:linesource()
+  local line, code, error = linesrc()
+  if not line then
+    sock:close()
+    http.status(500, "response parse failed")
+    return
+  end
+
+  local protocol, status, msg = line:match("^([%w./]+) ([0-9]+) (.*)")
+  if not protocol then
+    sock:close()
+    http.status(500, "response protocol error")
+    return
+  end
+  num = tonumber(status) or 0
+  http.status(num, msg)
+
+  local chunked = 0
+  line = linesrc()
+  while line and line ~= "" do
+    local key, val = line:match("^([%w-]+)%s?:%s?(.*)")
+    if key and key ~= "Status" then
+      if key == "Transfer-Encoding" and val == "chunked" then
+        chunked = 1
+      end
+      if key ~= "Connection" and key ~= "Transfer-Encoding" then 
+        http.header(key, val)
+      end
+    end
+    line = linesrc()
+  end
+  if not line then
+    sock:close()
+    http.status(500, "parse header failed")
+    return
+  end
+
+  local body_buffer = linesrc(true)
+  if chunked == 1 then
+    ltn12.pump.all(chunksource(sock, body_buffer), http.write)
+  else
+    local body_source = ltn12.source.cat(ltn12.source.string(body_buffer), sock:blocksource())
+    ltn12.pump.all(body_source, http.write)
+  end
+
+  sock:close()
+end
+

luci-app-quickstart/Makefile

@@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for quickstart
 LUCI_DEPENDS:=+quickstart +luci-app-store
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.5.7-2
+PKG_VERSION:=0.5.7-3
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 

luci-app-quickstart/luasrc/controller/istore_backend.lua

@@ -16,7 +16,7 @@ function index()
     entry({"istore"}, call("istore_backend")).leaf=true
 end
 
-function sink_socket(sock, io_err) 
+local function sink_socket(sock, io_err) 
   if sock then 
     return function(chunk, err) 
       if not chunk then 
@@ -50,6 +50,49 @@ local function get_session(sid)
   return nil, nil
 end
 
+local function chunksource(sock, buffer)
+	buffer = buffer or ""
+	return function()
+		local output
+		local _, endp, count = buffer:find("^([0-9a-fA-F]+);?.-\r\n")
+		while not count and #buffer <= 1024 do
+			local newblock, code = sock:recv(1024 - #buffer)
+			if not newblock then
+				return nil, code
+			end
+			buffer = buffer .. newblock  
+			_, endp, count = buffer:find("^([0-9a-fA-F]+);?.-\r\n")
+		end
+		count = tonumber(count, 16)
+		if not count then
+			return nil, -1, "invalid encoding"
+		elseif count == 0 then
+			return nil
+		elseif count + 2 <= #buffer - endp then
+			output = buffer:sub(endp+1, endp+count)
+			buffer = buffer:sub(endp+count+3)
+			return output
+		else
+			output = buffer:sub(endp+1, endp+count)
+			buffer = ""
+			if count - #output > 0 then
+				local remain, code = sock:recvall(count-#output)
+				if not remain then
+					return nil, code
+				end
+				output = output .. remain
+				count, code = sock:recvall(2)
+			else
+				count, code = sock:recvall(count+2-#buffer+endp)
+			end
+			if not count then
+				return nil, code
+			end
+			return output
+		end
+	end
+end
+
 function istore_backend() 
   local sock = nixio.connect("127.0.0.1", ISTOREOS_PORT) 
   if not sock then
@@ -138,45 +181,3 @@ function istore_backend()
   sock:close()
 end
 
-function chunksource(sock, buffer)
-	buffer = buffer or ""
-	return function()
-		local output
-		local _, endp, count = buffer:find("^([0-9a-fA-F]+);?.-\r\n")
-		while not count and #buffer <= 1024 do
-			local newblock, code = sock:recv(1024 - #buffer)
-			if not newblock then
-				return nil, code
-			end
-			buffer = buffer .. newblock  
-			_, endp, count = buffer:find("^([0-9a-fA-F]+);?.-\r\n")
-		end
-		count = tonumber(count, 16)
-		if not count then
-			return nil, -1, "invalid encoding"
-		elseif count == 0 then
-			return nil
-		elseif count + 2 <= #buffer - endp then
-			output = buffer:sub(endp+1, endp+count)
-			buffer = buffer:sub(endp+count+3)
-			return output
-		else
-			output = buffer:sub(endp+1, endp+count)
-			buffer = ""
-			if count - #output > 0 then
-				local remain, code = sock:recvall(count-#output)
-				if not remain then
-					return nil, code
-				end
-				output = output .. remain
-				count, code = sock:recvall(2)
-			else
-				count, code = sock:recvall(count+2-#buffer+endp)
-			end
-			if not count then
-				return nil, code
-			end
-			return output
-		end
-	end
-end

my-default-settings/files/etc/nginx/uci.conf.template

@@ -18,7 +18,7 @@ http {
 	default_type application/octet-stream;
 	sendfile on;
 
-	client_max_body_size 1536mm;
+	client_max_body_size 1536m;
 	client_header_buffer_size 512k;
 	large_client_header_buffers 4 512k;
 

natflow/Makefile

@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=natflow
-PKG_VERSION:=20221001
+PKG_VERSION:=20221003
 
 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=866d7062845b53c39c1517545e53bf5715dbf49fecc1694e2dec128038e95bf6
+PKG_HASH:=5c6f02301efa7a7a01ee3f72b8b62b6474d034ac608ca441568a8c695ea16726
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>

quickstart/Makefile

@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_quickstart:=$(ARCH)
 
 PKG_NAME:=quickstart
-PKG_VERSION:=0.5.7
+PKG_VERSION:=0.5.9
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://fw.koolcenter.com/binary/quickstart/
-PKG_HASH:=87e3f9217b750e112ff13576300fc72f7b86940a74207a2c8a976d1e397d5fa2
+PKG_HASH:=df4b993344ed7ffe56d83d93d591d2127a5647d2c49aad29f0cec72314e173ac
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)