dandri/simplexmq
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplexmq.git synced 2026-03-31 03:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

parse BLOCKED error into structured BlockingInfo

Browse Source
This commit is contained in:
shum
2026-02-18 15:03:11 +00:00
parent 122d039645
commit 9c131e1c84
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
xftp-web/src/protocol/commands.ts
View File

@@ -22,11 +22,18 @@ export interface FileInfo {
export type CommandError = "UNKNOWN" | "SYNTAX" | "PROHIBITED" | "NO_AUTH" | "HAS_AUTH" | "NO_ENTITY"
export type BlockingReason = "spam" | "content"
export interface BlockingInfo {
reason: BlockingReason
notice: {ttl: number | null} | null
}
export type XFTPErrorType =
| {type: "BLOCK"} | {type: "SESSION"} | {type: "HANDSHAKE"}
| {type: "CMD", cmdErr: CommandError}
| {type: "AUTH"}
| {type: "BLOCKED", blockInfo: string}
| {type: "BLOCKED", blockInfo: BlockingInfo}
| {type: "SIZE"} | {type: "QUOTA"} | {type: "DIGEST"} | {type: "CRYPTO"}
| {type: "NO_FILE"} | {type: "HAS_FILE"} | {type: "FILE_IO"}
| {type: "TIMEOUT"} | {type: "INTERNAL"}
@@ -104,6 +111,17 @@ function decodeCommandError(s: string): CommandError {
throw new Error("bad CommandError: " + s)
}
function decodeBlockingInfo(s: string): BlockingInfo {
const noticeIdx = s.indexOf(",notice=")
const reasonPart = noticeIdx >= 0 ? s.slice(0, noticeIdx) : s
const reason: BlockingReason = reasonPart === "reason=spam" ? "spam" : "content"
let notice: {ttl: number | null} | null = null
if (noticeIdx >= 0) {
try { notice = JSON.parse(s.slice(noticeIdx + 8)) } catch {}
}
return {reason, notice}
}
export function decodeXFTPError(d: Decoder): XFTPErrorType {
const s = readTag(d)
switch (s) {
@@ -117,7 +135,7 @@ export function decodeXFTPError(d: Decoder): XFTPErrorType {
const rest = d.takeAll()
let info = ""
for (let i = 0; i < rest.length; i++) info += String.fromCharCode(rest[i])
return {type: "BLOCKED", blockInfo: info}
return {type: "BLOCKED", blockInfo: decodeBlockingInfo(info)}
}
case "SIZE": return {type: "SIZE"}
case "QUOTA": return {type: "QUOTA"}