hfs 0.26.8 → 0.26.9

package/admin/src/LogsPage.ts

@@ -1,75 +0,0 @@
-import { createElement as h, Fragment, useState } from 'react';
-import { Tab, Tabs } from '@mui/material'
-import { useApiList } from './api'
-import { DataGrid } from '@mui/x-data-grid'
-import { formatBytes } from '@hfs/shared'
-import { logLabels } from './ConfigPage'
-import { typedKeys } from './misc';
-
-export default function LogsPage() {
-    const [tab, setTab] = useState(0)
-    const files = typedKeys(logLabels)
-    return h(Fragment, {},
-        h(Tabs, { value: tab, onChange(ev,i){ setTab(i) } },
-            files.map(f => h(Tab, { label: logLabels[f], key: f })) ),
-        h(LogFile, { key: tab, file: files[tab] }), // without key, some state is accidentally preserved across files
-    )
-}
-
-function LogFile({ file }: { file: string }) {
-    const { list, error, connecting } = useApiList('get_log', { file }, { addId: true })
-    if (error)
-        return error
-    return h(DataGrid, {
-        loading: connecting,
-        rows: list as any,
-        componentsProps: {
-            pagination: {
-                showFirstButton: true,
-                showLastButton: true,
-            }
-        },
-        columns: [
-            {
-                field: 'ip',
-                headerName: "Address",
-                flex: 1,
-                minWidth: 100,
-                maxWidth: 400,
-            },
-            {
-                field: 'user',
-                headerName: "Username",
-                flex: 1,
-            },
-            {
-                field: 'ts',
-                headerName: "Timestamp",
-                type: 'dateTime',
-                width: 200,
-                valueFormatter: ({ value }) => new Date(value as string).toLocaleString()
-            },
-            {
-                field: 'method',
-                headerName: "Method",
-            },
-            {
-                field: 'status',
-                headerName: "Code",
-                type: 'number',
-            },
-            {
-                field: 'length',
-                headerName: "Size",
-                type: 'number',
-                valueFormatter: ({ value }) => formatBytes(value as number)
-            },
-            {
-                field: 'uri',
-                headerName: "URI",
-                flex: 2,
-                minWidth: 100,
-            },
-        ]
-    })
-}

package/admin/src/MainMenu.ts

@@ -1,74 +0,0 @@
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
-
-import { createElement as h, FC } from 'react';
-import { List, ListItemButton, ListItemIcon, ListItemText, Box, Typography } from '@mui/material'
-import {
-    AccountTree,
-    Extension,
-    History,
-    Logout,
-    ManageAccounts,
-    Monitor,
-    Public,
-    Settings,
-    SvgIconComponent
-} from '@mui/icons-material'
-import _ from 'lodash'
-import { NavLink } from 'react-router-dom'
-import MonitorPage from './MonitorPage'
-import ConfigPage from './ConfigPage';
-import VfsPage from './VfsPage';
-import AccountsPage from './AccountsPage';
-import HomePage from './HomePage'
-import LogoutPage from './LogoutPage';
-import LogsPage from './LogsPage';
-import { useApi } from './api'
-import PluginsPage from './PluginsPage';
-
-interface MenuEntry {
-    path: string
-    icon: SvgIconComponent
-    label?: string
-    title?: string
-    comp: FC
-}
-
-export const mainMenu: MenuEntry[] = [
-    { path: '', icon: Public, label: 'Home', title: "Admin panel", comp: HomePage },
-    { path: 'fs', icon: AccountTree, label: "Shared files", comp: VfsPage },
-    { path: 'accounts', icon: ManageAccounts, comp: AccountsPage },
-    { path: 'configuration', icon: Settings, comp: ConfigPage },
-    { path: 'monitoring', icon: Monitor, comp: MonitorPage },
-    { path: 'logs', icon: History, comp: LogsPage },
-    { path: 'plugins', icon: Extension, comp: PluginsPage },
-    { path: 'logout', icon: Logout, comp: LogoutPage }
-]
-
-let version: any // cache 'version', as it won't change at runtime, while the Drawer mechanism will unmount our menu each time
-export default function Menu({ onSelect }: { onSelect: ()=>void }) {
-    const [status] = useApi(!version && 'get_status')
-    version ||= status?.version?.replace('-', ' ')
-    return h(List, { sx:{ pr:1, bgcolor: 'primary.main', color:'primary.contrastText', minHeight: '100%', boxSizing: 'border-box' } },
-        h(Box, { display: 'flex', px: 2, py: 1, gap: 2, alignItems: 'flex-end' },
-            h(Typography, { variant:'h3' }, 'HFS'),
-            h(Box, { pb: 1, fontSize: 'small' }, version),
-        ),
-        mainMenu.map(it =>
-            h(ListItemButton, {
-                key: it.path,
-                to: it.path,
-                component: NavLink,
-                onClick: onSelect,
-                // @ts-ignore
-                style: ({ isActive }) => isActive ? { textDecoration: 'underline' } : {},
-                children: undefined, // shut up ts
-            },
-                it.icon && h(ListItemIcon, { sx:{ color: 'primary.contrastText' } }, h(it.icon)),
-                h(ListItemText, { primary: getMenuLabel(it) })
-            ) )
-    )
-}
-
-export function getMenuLabel(it: MenuEntry) {
-    return it && (it.label ?? _.capitalize(it.path))
-}

package/admin/src/MenuButton.ts

@@ -1,38 +0,0 @@
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
-
-import React, { createElement as h, useCallback } from 'react'
-import { Button, Menu, MenuItem } from '@mui/material'
-
-interface Props { items: any[], [rest:string]:any }
-
-export default function MenuButton({ items, ...rest }: Props) {
-    const [anchorEl, setAnchorEl] = React.useState<HTMLElement>()
-    const open = Boolean(anchorEl)
-    const onClose = useCallback(() => setAnchorEl(undefined), [])
-    return h(React.Fragment, {},
-        h(Button, {
-            'aria-controls': open ? 'basic-menu' : undefined,
-            'aria-haspopup': 'true',
-            'aria-expanded': open ? 'true' : undefined,
-            onClick: (event: React.MouseEvent<HTMLButtonElement>) => {
-                setAnchorEl(event.currentTarget)
-            },
-            ...rest,
-        }),
-        h(Menu, {
-            anchorEl,
-            open,
-            onClose,
-            MenuListProps: { 'aria-labelledby': 'basic-button' },
-            children: items.map((it,idx) =>
-                h(MenuItem, {
-                    key: idx,
-                    ...it,
-                    onClick() {
-                        onClose()
-                        it.onClick?.apply(this, arguments)
-                    }
-                }) )
-        })
-    )
-}

package/admin/src/MonitorPage.ts

@@ -1,200 +0,0 @@
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
-
-import _ from "lodash"
-import { createElement as h, useMemo, Fragment, useState } from "react"
-import { apiCall, useApiEvents, useApiEx, useApiList } from "./api"
-import { PauseCircle, PlayCircle, Delete, Lock, Block, FolderZip } from '@mui/icons-material'
-import { Alert, Box, Chip, ChipProps } from '@mui/material'
-import { DataGrid } from "@mui/x-data-grid"
-import { formatBytes, IconBtn, iconTooltip, manipulateConfig, useBreakpoint } from "./misc"
-import { Field, SelectField } from '@hfs/mui-grid-form'
-import { GridColumns } from '@mui/x-data-grid/models/colDef/gridColDef'
-import { StandardCSSProperties } from '@mui/system/styleFunctionSx/StandardCssProperties'
-
-export default function MonitorPage() {
-    return h(Fragment, {},
-        h(MoreInfo),
-        h(Connections),
-    )
-}
-
-const isoDateRe = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/
-
-function MoreInfo() {
-    const { data: status, element } = useApiEx('get_status')
-    const { data: connections } = useApiEvents('get_connection_stats')
-    if (status && connections)
-        Object.assign(status, connections)
-    const md = useBreakpoint('md')
-    const sm = useBreakpoint('sm')
-    return element || h(Box, { display: 'flex', flexWrap: 'wrap', gap: '1em', mb: 2 },
-        md && pair('started'),
-        md && pair('http', { label: "HTTP", render: port }),
-        md && pair('https', { label: "HTTPS", render: port }),
-        sm && pair('connections'),
-        pair('sent', { render: formatBytes, minWidth: '4em' }),
-        pair('outSpeed', { label: "Output speed", render: formatSpeed }),
-    )
-
-    type Color = ChipProps['color']
-    type Render = (v: any) => [string, Color?] | string
-    interface PairOptions {
-        label?: string
-        render?: Render
-        minWidth?: StandardCSSProperties['minWidth']
-    }
-
-    function pair(k: string, { label, minWidth, render }: PairOptions={}) {
-        let v = _.get(status, k)
-        if (v === undefined)
-            return null
-        if (typeof v === 'string' && isoDateRe.test(v))
-            v = new Date(v).toLocaleString()
-        let color: Color = undefined
-        if (render) {
-            v = render(v)
-            if (Array.isArray(v))
-                [v, color] = v
-        }
-        if (!label)
-            label = _.capitalize(k.replaceAll('_', ' '))
-        return h(Chip, {
-            variant: 'filled',
-            color,
-            label: h(Fragment, {},
-                h('b',{},label),
-                ': ',
-                h('span', { style:{ display: 'inline-block', minWidth } }, v),
-            ),
-        })
-    }
-
-    function port(v: any): ReturnType<Render> {
-        return v.listening ? ["port " + v.port, 'success']
-            : v.error ? [v.error, 'error']
-                : "off"
-    }
-
-}
-
-function Connections() {
-    const { list, error } = useApiList('get_connections')
-    const [filtered, setFiltered] = useState(true)
-    const [paused, setPaused] = useState(false)
-    const rows = useMemo(() =>
-            list?.filter((x: any) => !filtered || x.path).map((x: any, id: number) => ({ id, ...x })),
-        [!paused && list, filtered]) //eslint-disable-line
-    // if I don't memo 'columns', it won't keep hiding status
-    const columns = useMemo<GridColumns<any>>(() => [
-        {
-            field: 'ip',
-            headerName: "Address",
-            flex: 1,
-            maxWidth: 400,
-            valueGetter: ({ row, value }) => (row.v === 6 ? `[${value}]` : value) + ' :' + row.port
-        },
-        {
-            field: 'user',
-            headerName: "User",
-        },
-        {
-            field: 'started',
-            headerName: "Started",
-            type: 'dateTime',
-            width: 130,
-            valueFormatter: ({ value }) => new Date(value as string).toLocaleTimeString()
-        },
-        {
-            field: 'path',
-            headerName: "File",
-            flex: 1,
-            renderCell({ value, row }) {
-                if (!value) return
-                if (row.archive)
-                    return h(Fragment, {},
-                        h(FolderZip, { sx: { mr: 1 } }),
-                        row.archive,
-                        h(Box, { ml: 2, color: 'text.secondary' }, value)
-                    )
-                const i = value?.lastIndexOf('/')
-                return h(Fragment, {}, value.slice(i + 1),
-                    i > 0 && h(Box, { ml: 2, color: 'text.secondary' }, value.slice(0, i)))
-            }
-        },
-        {
-            field: 'v',
-            headerName: "Protocol",
-            align: 'center',
-            hide: true,
-            renderCell: ({ value, row }) => h(Fragment, {},
-                "IPv" + value,
-                row.secure && iconTooltip(Lock, "HTTPS", { opacity: .5 })
-            )
-        },
-        {
-            field: 'outSpeed',
-            headerName: "Speed",
-            type: 'number',
-            valueFormatter: ({ value }) => formatSpeed(value)
-        },
-        {
-            field: 'sent',
-            headerName: "Total",
-            type: 'number',
-            valueFormatter: ({ value }) => formatBytes(value as number)
-        },
-        {
-            field: "Actions",
-            width: 80,
-            align: 'center',
-            hideSortIcons: true,
-            disableColumnMenu: true,
-            renderCell({ row }) {
-                return h('div', {},
-                    h(IconBtn, {
-                        icon: Delete,
-                        title: "Disconnect",
-                        onClick: () => apiCall('disconnect', _.pick(row, ['ip', 'port'])),
-                    }),
-                    h(IconBtn, {
-                        icon: Block,
-                        title: "Block IP",
-                        onClick: () => blockIp(row.ip),
-                    }),
-                )
-            }
-        }
-    ], [])
-    return h(Fragment, {},
-        h(Box, { display: 'flex', alignItems: 'center' },
-            h(SelectField as Field<boolean>, {
-                fullWidth: false,
-                value: filtered,
-                onChange: setFiltered as any,
-                options: { "Show only downloads": true, "Show all connections": false }
-            }),
-
-            h(Box, { flex: 1 }),
-            h(IconBtn, {
-                title: paused ? "Resume" : "Pause",
-                icon: paused ? PlayCircle : PauseCircle,
-                sx: { mr: 1 },
-                onClick() {
-                    setPaused(!paused)
-                }
-            }),
-        ),
-        error ? h(Alert, { severity: 'error' }, error)
-            : h(DataGrid, { rows, columns,
-                localeText: filtered ? { noRowsLabel: "No downloads at the moment" } : undefined,
-            })
-    )
-}
-
-function blockIp(ip: string) {
-    return manipulateConfig('block', data => [...data, { ip }])
-}
-
-function formatSpeed(value: number) {
-    return !value ? '' : formatBytes(value * 1000, { post: "B/s", k: 1000, digits: 1 })
-}

package/admin/src/OnlinePlugins.ts

@@ -1,101 +0,0 @@
-import { apiCall, useApiList } from './api'
-import { Fragment, createElement as h, useState } from 'react'
-import { DataGrid } from '@mui/x-data-grid'
-import { IconBtn } from './misc'
-import { Download, Search } from '@mui/icons-material'
-import { confirmDialog } from './dialog'
-import { StringField } from '@hfs/mui-grid-form'
-import { useDebounce } from 'use-debounce'
-import { repoLink, showError, startPlugin, UpdateButton } from './InstalledPlugins'
-import { state, useSnapState } from './state'
-import _ from 'lodash'
-import md from './md'
-
-export default function OnlinePlugins() {
-    const [search, setSearch] = useState('')
-    const [debouncedSearch] = useDebounce(search, 1000)
-    const { list, error, initializing, updateList } = useApiList('search_online_plugins', { text: debouncedSearch })
-    const snap = useSnapState()
-    if (error)
-        return showError(error)
-    return h(Fragment, {},
-        h(StringField, {
-            value: search,
-            onChange: setSearch as any,
-            start: h(Search),
-            typing: true,
-            label: "Search text"
-        }),
-        h(DataGrid, {
-            rows: list.length ? list : [], // workaround for DataGrid bug causing 'no rows' message to be not displayed after 'loading' was also used
-            localeText: { noRowsLabel: "No compatible plugins have been found" },
-            loading: initializing,
-            columnVisibilityModel: snap.onlinePluginsColumns,
-            onColumnVisibilityModelChange: newModel => Object.assign(state.onlinePluginsColumns, newModel),
-            columns: [
-                {
-                    field: 'id',
-                    headerName: "name",
-                    flex: 1,
-                },
-                {
-                    field: 'version',
-                    width: 70,
-                },
-                {
-                    field: 'pushed_at',
-                    headerName: "last update",
-                    valueGetter: ({ value }) => new Date(value).toLocaleDateString(),
-                },
-                {
-                    field: 'license',
-                    width: 80,
-                },
-                {
-                    field: 'description',
-                    flex: 3,
-                },
-                {
-                    field: 'stargazers_count',
-                    width: 50,
-                    headerName: "stars",
-                    align: 'center',
-                },
-                {
-                    field: "actions",
-                    width: 80,
-                    align: 'center',
-                    hideSortIcons: true,
-                    disableColumnMenu: true,
-                    hideable: false,
-                    renderCell({ row }) {
-                        const { id, branch } = row
-                        return h('div', {},
-                            repoLink(id),
-                            row.update ? h(UpdateButton, {
-                                id,
-                                then() {
-                                    updateList(list =>
-                                        _.find(list, { id }).update = false )
-                                }
-                            }) : h(IconBtn, {
-                                icon: Download,
-                                title: "Install",
-                                progress: row.downloading,
-                                disabled: row.installed && "Already installed",
-                                tooltipProps: { placement:'bottom-end' }, // workaround problem with horizontal scrolling by moving the tooltip leftward
-                                confirm: "WARNING - Proceed only if you trust this author and this plugin",
-                                async onClick() {
-                                    const { id: installedId } = await apiCall('download_plugin', { id, branch })
-                                    if (await confirmDialog(md(`Plugin /${id}/ installed.\nDo you want to start it now?`)))
-                                        await startPlugin(installedId)
-                                }
-                            })
-                        )
-                    }
-                },
-            ]
-        })
-    )
-}
-

package/admin/src/PermField.ts

@@ -1,80 +0,0 @@
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
-
-import { Dict, useStateMounted } from './misc'
-import { createElement as h, Fragment } from 'react'
-import { Button, Grid } from '@mui/material'
-import { Field, FieldProps, SelectField } from '@hfs/mui-grid-form'
-import _ from 'lodash'
-import { useApiEx } from './api'
-
-export default function PermField({ label, value, onChange }: FieldProps<Dict<string> | null> & { keyLabel:string }) {
-    const [temp, setTemp] = useStateMounted<string|undefined>(undefined)
-    const { data, element } = useApiEx('get_usernames')
-    const usernames = data?.list || []
-
-    const permOptions = [{ label:'read', value:'r' }, { label:'none', value:''  }]
-    const usernamesLeft = _.difference(usernames, Object.keys(value||{}))
-
-    return h(Grid, { container: true },
-        label && h(Grid, { item: true, xs: 12, pl: 2, py: 1, display: 'flex', alignItems: 'center', justifyContent: 'space-between' },
-            label,
-            !element && h(Button, {
-                onClick(event){
-                    setTemp(undefined)
-                    onChange(null, { event, was: value })
-                }
-            }, 'Clear')),
-        element || h(Fragment, {},
-            // existing entries
-            Object.entries(value||{}).map(([username, perm]) => [
-                h(Grid, { key:'k', item: true, xs: 6 },
-                    h(SelectField as Field<string>, {
-                        label: 'Username',
-                        options: usernames,
-                        value: username,
-                        onChange(v, { was, ...rest }){
-                            const copy: any = { ...value, [v]: value![was!] }
-                            delete copy[was!]
-                            onChange(copy, { was:value, ...rest })
-                        }
-                    })),
-                h(Grid, { key:'v', item: true, xs: 6 },
-                    h(SelectField as Field<string>, {
-                        label: 'Access',
-                        options: permOptions,
-                        value: perm,
-                        onChange(v, { was, ...rest }){
-                            const copy = { ...value }
-                            if (v)
-                                copy[username] = v
-                            else
-                                delete copy[username]
-                            onChange( _.isEmpty(copy) ? null : copy, { was:value, ...rest })
-                        }
-                    })),
-            ]),
-            // row for new entries
-            !usernamesLeft.length && h(Grid, { item: true, xs: 12, py: 1, px: 2, color:'text.secondary' }, "No accounts left"),
-            usernamesLeft.length>0 && h(Grid, { item: true, xs: 6 },
-                h(SelectField as Field<string>, {
-                    label: value ? "Add access to" : "Restrict access to ",
-                    value: temp,
-                    options: usernamesLeft,
-                    onChange: setTemp as any,
-                })),
-            usernamesLeft.length>0 && h(Grid, { item: true, xs: 6 },
-                h(SelectField as Field<string>, {
-                    value: undefined,
-                    label: temp && "Select access type",
-                    disabled: !temp,
-                    options: permOptions,
-                    onChange(v, rest) {
-                        if (v)
-                            onChange({ ...value, [temp!]: v }, { ...rest, was: value })
-                        setTemp(undefined)
-                    }
-                }))
-        )
-    )
-}
-

package/admin/src/PluginsPage.ts

@@ -1,27 +0,0 @@
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
-
-import { createElement as h, Fragment, useState } from "react"
-import { Tab, Tabs } from '@mui/material'
-import InstalledPlugins from "./InstalledPlugins"
-import OnlinePlugins from "./OnlinePlugins"
-
-const TABS = {
-    "Installed": InstalledPlugins,
-    "Search online": OnlinePlugins,
-    "Check updates": () => h(InstalledPlugins, { updates: true }),
-}
-const LABELS = Object.keys(TABS)
-const PANES = Object.values(TABS)
-
-export default function PluginsPage() {
-    const [tab, setTab] = useState(0)
-    return h(Fragment, {},
-        h(Tabs, {
-            value: tab,
-            onChange(ev, i) {
-                setTab(i)
-            }
-        }, LABELS.map(label => h(Tab, { label, key: label })) ),
-        h(PANES[tab])
-    )
-}

package/admin/src/VfsMenuBar.ts

@@ -1,58 +0,0 @@
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
-
-import { state, useSnapState } from './state'
-import { createElement as h } from 'react'
-import { Box, Button } from '@mui/material'
-import { Add, Delete, Refresh } from '@mui/icons-material'
-import { alertDialog, confirmDialog } from './dialog'
-import { apiCall } from './api'
-import { reloadVfs } from './VfsPage'
-import addFiles, { addVirtual } from './addFiles'
-import MenuButton from './MenuButton'
-import { IconBtn } from './misc'
-
-export default function VfsMenuBar() {
-    const { selectedFiles } = useSnapState()
-    return h(Box, {
-        display: 'flex',
-        gap: 2,
-        mb: 2,
-        sx: {
-            position: 'sticky',
-            top: 0,
-            zIndex: 2,
-            backgroundColor: 'background.paper',
-            width: 'fit-content',
-        },
-    },
-        h(MenuButton, {
-            variant: 'contained',
-            startIcon: h(Add),
-            items: [
-                { children: "from disk", onClick: addFiles },
-                { children: "virtual folder", onClick: addVirtual  }
-            ]
-        }, "Add"),
-        h(Button, { onClick: removeFiles, disabled: !selectedFiles.length, startIcon: h(Delete) }, "Remove"),
-        h(IconBtn, { icon: Refresh, title: "Reload", onClick(){ reloadVfs() } }),
-    )
-}
-
-async function removeFiles() {
-    const f = state.selectedFiles
-    if (!f.length) return
-    if (await confirmDialog(`Remove ${f.length} item(s)?`)) {
-        try {
-            const uris = f.map(x => x.id)
-            const { errors } = await apiCall('del_vfs', { uris })
-            const urisThatFailed = uris.filter((uri, idx) => errors[idx])
-            if (urisThatFailed.length)
-                return alertDialog("Following elements couldn't be removed: " + urisThatFailed.join(', '), 'error')
-            reloadVfs()
-        }
-        catch(e) {
-            await alertDialog(e as Error)
-        }
-    }
-
-}