reorder some source files

pkg/client/attic/account.go

@@ -1,277 +0,0 @@
-/*
- * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
- *
- * This work is published and licensed under a Creative Commons
- * Attribution-NonCommercial-NoDerivatives 4.0 International License.
- *
- * Distribution of this work is permitted, but commercial use and
- * modifications are strictly prohibited.
- */
-package client
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"mstore/app/accoper"
-	"mstore/app/handler"
-	"mstore/pkg/descr"
-)
-
-func (cli *Client) CreateAccount(ctx context.Context, hosturi, username, password string) (string, error) {
-	var err error
-	var res string
-
-	apiuri, err := setApiPath(hosturi, "/v3/api/account/create")
-	if err != nil {
-		return res, err
-	}
-	operParams := accoper.CreateAccountParams{
-		Username: username,
-		Password: password,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return res, err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apiuri, paramsJson)
-	if err != nil {
-		return res, err
-	}
-
-	operRes := handler.NewResponse[accoper.CreateAccountResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return res, err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return res, err
-	}
-	res = operRes.Result.AccountID
-	return res, err
-}
-
-func (cli *Client) GetAccountByID(ctx context.Context, hosturi, accountID string) (*descr.AccountShort, error) {
-	var err error
-	res := &descr.AccountShort{}
-
-	apipath, err := setApiPath(hosturi, "/v3/api/account/get")
-	if err != nil {
-		return res, err
-	}
-
-	operParams := accoper.GetAccountParams{
-		AccountID: accountID,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return res, err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return res, err
-	}
-
-	operRes := handler.NewResponse[accoper.GetAccountResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return res, err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return res, err
-	}
-	res = operRes.Result.Account
-	return res, err
-}
-
-func (cli *Client) GetAccountByName(ctx context.Context, hosturi, username string) (*descr.AccountShort, error) {
-	var err error
-	res := &descr.AccountShort{}
-
-	apipath, err := setApiPath(hosturi, "/v3/api/account/get")
-	if err != nil {
-		return res, err
-	}
-	operParams := accoper.GetAccountParams{
-		Username: username,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return res, err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return res, err
-	}
-
-	operRes := handler.NewResponse[accoper.GetAccountResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return res, err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return res, err
-	}
-	res = operRes.Result.Account
-	return res, err
-}
-
-func (cli *Client) UpdateAccountByID(ctx context.Context, hosturi string, accountID, newUsername, newPassword string) error {
-	var err error
-
-	apipath, err := setApiPath(hosturi, "/v3/api/account/update")
-	if err != nil {
-		return err
-	}
-	operParams := accoper.UpdateAccountParams{
-		AccountID:   accountID,
-		NewUsername: newUsername,
-		NewPassword: newPassword,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return err
-	}
-	operRes := handler.NewResponse[accoper.UpdateAccountResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return err
-	}
-	return err
-}
-
-func (cli *Client) UpdateAccountByName(ctx context.Context, hosturi, username, newUsername, newPassword string) error {
-	var err error
-	apipath, err := setApiPath(hosturi, "/v3/api/account/update")
-	if err != nil {
-		return err
-	}
-	operParams := accoper.UpdateAccountParams{
-		Username:    username,
-		NewUsername: newUsername,
-		NewPassword: newPassword,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return err
-	}
-	operRes := handler.NewResponse[accoper.UpdateAccountResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return err
-	}
-	return err
-}
-
-func (cli *Client) DeleteAccountByName(ctx context.Context, hosturi, username string) error {
-	var err error
-
-	apipath, err := setApiPath(hosturi, "/v3/api/account/delete")
-	if err != nil {
-		return err
-	}
-	operParams := accoper.DeleteAccountParams{
-		Username: username,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return err
-	}
-
-	operRes := handler.NewResponse[accoper.DeleteAccountResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return err
-	}
-	return err
-}
-
-func (cli *Client) DeleteAccountByID(ctx context.Context, hosturi, accountID string) error {
-	var err error
-
-	apipath, err := setApiPath(hosturi, "/v3/api/account/delete")
-	if err != nil {
-		return err
-	}
-	operParams := accoper.DeleteAccountParams{
-		AccountID: accountID,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return err
-	}
-
-	operRes := handler.NewResponse[accoper.DeleteAccountResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return err
-	}
-	return err
-}
-
-func (cli *Client) ListAccounts(ctx context.Context, hosturi string) ([]descr.AccountShort, error) {
-	var err error
-	res := make([]descr.AccountShort, 0)
-
-	apipath, err := setApiPath(hosturi, "/v3/api/accounts/list")
-	if err != nil {
-		return res, err
-	}
-	operParams := accoper.ListAccountsParams{}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return res, err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return res, err
-	}
-
-	operRes := handler.NewResponse[accoper.ListAccountsResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return res, err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return res, err
-	}
-	res = operRes.Result.Accounts
-	return res, err
-}

pkg/client/attic/file.go

@@ -1,417 +0,0 @@
-/*
- * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
- *
- * This work is published and licensed under a Creative Commons
- * Attribution-NonCommercial-NoDerivatives 4.0 International License.
- *
- * Distribution of this work is permitted, but commercial use and
- * modifications are strictly prohibited.
- */
-package client
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strconv"
-
-	"mstore/pkg/auxhttp"
-	"mstore/pkg/descr"
-)
-
-func (cli *Client) FileInfo(ctx context.Context, fileuri string) (bool, *descr.File, error) {
-	var exists bool
-	var err error
-	file := &descr.File{}
-	fileuri, username, password, err := repackServiceURI(fileuri)
-	if err != nil {
-		return exists, file, err
-	}
-	fileuri, err = convertFileURI(fileuri)
-	if err != nil {
-		return exists, file, err
-	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodHead, fileuri, nil)
-	if err != nil {
-		return exists, file, err
-	}
-	if username != "" && password != "" {
-		basic := auxhttp.EncodeBasicAuth(username, password)
-		req.Header.Add("Authorization", basic)
-	}
-	client := makeHTTPClient(cli.skipTLSVerify)
-	resp, err := client.Do(req)
-	if err != nil {
-		return exists, file, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode == http.StatusOK {
-		file.Collection = resp.Header.Get("Content-Collection")
-		file.Name = resp.Header.Get("Content-Name")
-		contentSize := resp.Header.Get("Content-Size")
-		size, err := strconv.ParseInt(contentSize, 10, 64)
-		if err != nil {
-			return exists, file, err
-		}
-		file.Size = size
-		file.Type = resp.Header.Get("Content-Type")
-		file.Checksum = resp.Header.Get("Content-Digest")
-		exists = true
-	}
-	return exists, file, err
-}
-
-func (cli *Client) PutFile(ctx context.Context, filename, fileuri string) error {
-	var err error
-	fileuri, username, password, err := repackServiceURI(fileuri)
-	if err != nil {
-		return err
-	}
-	fileuri, err = convertFileURI(fileuri)
-	if err != nil {
-		return err
-	}
-	file, err := os.Open(filename)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodPut, fileuri, file)
-	if err != nil {
-		return err
-	}
-	fileinfo, err := os.Stat(filename)
-	if err != nil {
-		return err
-	}
-	filesize := fileinfo.Size()
-
-	req.ContentLength = filesize
-	req.Header.Set("Content-Type", "application/octet-stream")
-	req.Header.Set("Content-Size", strconv.FormatInt(filesize, 10))
-	if username != "" && password != "" {
-		basic := auxhttp.EncodeBasicAuth(username, password)
-		req.Header.Add("Authorization", basic)
-	}
-	client := makeHTTPClient(cli.skipTLSVerify)
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		err := fmt.Errorf("Received wrong status code: %s", resp.Status)
-		return err
-	}
-	return err
-}
-
-func (cli *Client) GetFile(ctx context.Context, fileuri, filename string) (int64, error) {
-	var err error
-	var size int64
-
-	fileuri, username, password, err := repackServiceURI(fileuri)
-	if err != nil {
-		return size, err
-	}
-	fileuri, err = convertFileURI(fileuri)
-	if err != nil {
-		return size, err
-	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, fileuri, nil)
-	if err != nil {
-		return size, err
-	}
-	if username != "" && password != "" {
-		basic := auxhttp.EncodeBasicAuth(username, password)
-		req.Header.Add("Authorization", basic)
-	}
-	client := makeHTTPClient(cli.skipTLSVerify)
-	resp, err := client.Do(req)
-	if err != nil {
-		return size, err
-	}
-	defer resp.Body.Close()
-
-	contentLength := resp.Header.Get("Content-Length")
-	if contentLength == "" {
-		err = fmt.Errorf("Empty Content-Length received")
-		return size, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		err := fmt.Errorf("Received wrong status code: %s", resp.Status)
-		return size, err
-	}
-	declSize, err := strconv.ParseInt(contentLength, 10, 64)
-	if err != nil {
-		err = fmt.Errorf("Wrong Content-Length value: %v", err)
-		return size, err
-	}
-	dirname := filepath.Dir(filename)
-	err = os.MkdirAll(dirname, 0750)
-	if err != nil {
-		return size, err
-	}
-	file, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE, 0640)
-	if err != nil {
-		return size, err
-	}
-	size, err = io.Copy(file, resp.Body)
-	if err != nil {
-		return size, err
-	}
-	if size != declSize {
-		err := fmt.Errorf("Mismatch Content-Length and recorded filesize")
-		return size, err
-	}
-	return size, err
-}
-
-func (cli *Client) DeleteFile(ctx context.Context, fileuri string) error {
-	var err error
-
-	fileuri, username, password, err := repackServiceURI(fileuri)
-	if err != nil {
-		return err
-	}
-	fileuri, err = convertFileURI(fileuri)
-	if err != nil {
-		return err
-	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodDelete, fileuri, nil)
-	if err != nil {
-		return err
-	}
-	if username != "" && password != "" {
-		basic := auxhttp.EncodeBasicAuth(username, password)
-		req.Header.Add("Authorization", basic)
-	}
-	client := makeHTTPClient(cli.skipTLSVerify)
-	resp, err := client.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		err := fmt.Errorf("Received wrong status code: %s", resp.Status)
-		return err
-	}
-	return err
-}
-
-func (cli *Client) ListFiles(ctx context.Context, catalogURI, usePathAs string) ([]descr.File, error) {
-	var err error
-	res := make([]descr.File, 0)
-
-	catalogURI, username, password, err := repackServiceURI(catalogURI)
-	if err != nil {
-		return res, err
-	}
-	catalogURI, err = convertFilesURI(catalogURI)
-	if err != nil {
-		return res, err
-	}
-	// Add values
-	values := url.Values{}
-	if usePathAs != "" {
-		values.Add("pathAs", string(usePathAs))
-	}
-	encodedValues := values.Encode()
-	if encodedValues != "" {
-		catalogURI = catalogURI + "?" + encodedValues
-	}
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, catalogURI, nil)
-	if err != nil {
-		return res, err
-	}
-	if username != "" && password != "" {
-		basic := auxhttp.EncodeBasicAuth(username, password)
-		req.Header.Add("Authorization", basic)
-	}
-	client := makeHTTPClient(cli.skipTLSVerify)
-	resp, err := client.Do(req)
-	if err != nil {
-		return res, err
-	}
-	defer resp.Body.Close()
-
-	contentLength := resp.Header.Get("Content-Length")
-	if contentLength == "" {
-		err = fmt.Errorf("Empty Content-Length received")
-		return res, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		err := fmt.Errorf("Received wrong status code: %s", resp.Status)
-		return res, err
-	}
-	declSize, err := strconv.ParseInt(contentLength, 10, 64)
-	if err != nil {
-		err = fmt.Errorf("Wrong Content-Length value: %v", err)
-		return res, err
-	}
-	respBuffer := bytes.NewBuffer(nil)
-	size, err := io.Copy(respBuffer, resp.Body)
-	if err != nil {
-		return res, err
-	}
-	respBytes := respBuffer.Bytes()
-	if size != declSize {
-		err := fmt.Errorf("Mismatch Content-Length and recorded filesize")
-		return res, err
-	}
-	err = json.Unmarshal(respBytes, &res)
-	if err != nil {
-		return res, err
-	}
-	return res, err
-}
-
-func (cli *Client) ListCollections(ctx context.Context, catalogURI, usePathAs string) ([]string, error) {
-	var err error
-	res := make([]string, 0)
-
-	catalogURI, username, password, err := repackServiceURI(catalogURI)
-	if err != nil {
-		return res, err
-	}
-	catalogURI, err = convertCollectionsURI(catalogURI)
-	if err != nil {
-		return res, err
-	}
-
-	// Add values
-	values := url.Values{}
-	if usePathAs != "" {
-		values.Add("pathAs", string(usePathAs))
-	}
-	encodedValues := values.Encode()
-	if encodedValues != "" {
-		catalogURI = catalogURI + "?" + encodedValues
-	}
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, catalogURI, nil)
-	if err != nil {
-		return res, err
-	}
-	if username != "" && password != "" {
-		basic := auxhttp.EncodeBasicAuth(username, password)
-		req.Header.Add("Authorization", basic)
-	}
-	client := makeHTTPClient(cli.skipTLSVerify)
-	resp, err := client.Do(req)
-	if err != nil {
-		return res, err
-	}
-	defer resp.Body.Close()
-
-	contentLength := resp.Header.Get("Content-Length")
-	if contentLength == "" {
-		err = fmt.Errorf("Empty Content-Length received")
-		return res, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		err := fmt.Errorf("Received wrong status code: %s", resp.Status)
-		return res, err
-	}
-	declSize, err := strconv.ParseInt(contentLength, 10, 64)
-	if err != nil {
-		err = fmt.Errorf("Wrong Content-Length value: %v", err)
-		return res, err
-	}
-	respBuffer := bytes.NewBuffer(nil)
-	size, err := io.Copy(respBuffer, resp.Body)
-	if err != nil {
-		return res, err
-	}
-	respBytes := respBuffer.Bytes()
-	if size != declSize {
-		err := fmt.Errorf("Mismatch Content-Length and recorded filesize")
-		return res, err
-	}
-	err = json.Unmarshal(respBytes, &res)
-	if err != nil {
-		return res, err
-	}
-	return res, err
-}
-
-func (cli *Client) DeleteCollection(ctx context.Context, catalogURI, usePathAs string, dryRun bool) ([]descr.File, error) {
-	var err error
-	res := make([]descr.File, 0)
-
-	catalogURI, username, password, err := repackServiceURI(catalogURI)
-	if err != nil {
-		return res, err
-	}
-	catalogURI, err = convertCollectionURI(catalogURI)
-	if err != nil {
-		return res, err
-	}
-	// Add values
-	values := url.Values{}
-	if usePathAs != "" {
-		values.Add("pathAs", string(usePathAs))
-	}
-	if dryRun {
-		values.Add("dryRun", "true")
-	}
-	encodedValues := values.Encode()
-	if encodedValues != "" {
-		catalogURI = catalogURI + "?" + encodedValues
-	}
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodDelete, catalogURI, nil)
-	if err != nil {
-		return res, err
-	}
-	if username != "" && password != "" {
-		basic := auxhttp.EncodeBasicAuth(username, password)
-		req.Header.Add("Authorization", basic)
-	}
-	client := makeHTTPClient(cli.skipTLSVerify)
-	resp, err := client.Do(req)
-	if err != nil {
-		return res, err
-	}
-	defer resp.Body.Close()
-
-	contentLength := resp.Header.Get("Content-Length")
-	if contentLength == "" {
-		err = fmt.Errorf("Empty Content-Length received")
-		return res, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		err := fmt.Errorf("Received wrong status code: %s", resp.Status)
-		return res, err
-	}
-	declSize, err := strconv.ParseInt(contentLength, 10, 64)
-	if err != nil {
-		err = fmt.Errorf("Wrong Content-Length value: %v", err)
-		return res, err
-	}
-	respBuffer := bytes.NewBuffer(nil)
-	size, err := io.Copy(respBuffer, resp.Body)
-	if err != nil {
-		return res, err
-	}
-	respBytes := respBuffer.Bytes()
-	if size != declSize {
-		err := fmt.Errorf("Mismatch Content-Length and recorded filesize")
-		return res, err
-	}
-	err = json.Unmarshal(respBytes, &res)
-	if err != nil {
-		return res, err
-	}
-	return res, err
-}

pkg/client/attic/fileaux.go

@@ -1,107 +0,0 @@
-/*
- * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
- *
- * This work is published and licensed under a Creative Commons
- * Attribution-NonCommercial-NoDerivatives 4.0 International License.
- *
- * Distribution of this work is permitted, but commercial use and
- * modifications are strictly prohibited.
- */
-package client
-
-import (
-	"crypto/tls"
-	"net/http"
-	"net/url"
-	"path"
-	"strings"
-)
-
-func makeHTTPClient(skipTLSVerify bool) *http.Client {
-	transport := &http.Transport{
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: skipTLSVerify,
-		},
-	}
-	client := &http.Client{
-		Transport: transport,
-	}
-	return client
-}
-
-func convertFileURI(fileuri string) (string, error) {
-	var err error
-	var res string
-	uri, err := url.Parse(fileuri)
-	if err != nil {
-		return res, err
-	}
-	const fileAPI = "/v3/api/file/"
-	uri.Path, err = url.JoinPath(fileAPI, uri.Path)
-	if err != nil {
-		return res, err
-	}
-
-	res = uri.String()
-	return res, err
-}
-
-func convertFilesURI(fileuri string) (string, error) {
-	var err error
-	var res string
-	uri, err := url.Parse(fileuri)
-	const filesAPI = "/v3/api/files/"
-	uri.Path, err = url.JoinPath(filesAPI, uri.Path)
-	if err != nil {
-		return res, err
-	}
-	res = uri.String()
-	return res, err
-}
-
-func convertCollectionsURI(fileuri string) (string, error) {
-	var err error
-	var res string
-	uri, err := url.Parse(fileuri)
-	const prefixAPI = "/v3/api/collections/"
-	uri.Path, err = url.JoinPath(prefixAPI, uri.Path)
-	if err != nil {
-		return res, err
-	}
-	res = uri.String()
-	return res, err
-}
-
-func convertCollectionURI(fileuri string) (string, error) {
-	var err error
-	var res string
-	uri, err := url.Parse(fileuri)
-	const prefixAPI = "/v3/api/collection/"
-	uri.Path, err = url.JoinPath(prefixAPI, uri.Path)
-	if err != nil {
-		return res, err
-	}
-	res = uri.String()
-	return res, err
-}
-
-func repackServiceURI(fileuri string) (string, string, string, error) {
-	var err error
-	var res, username, password string
-	if !strings.Contains(fileuri, "://") {
-		fileuri = "https://" + fileuri
-	}
-	uri, err := url.Parse(fileuri)
-	if err != nil {
-		return res, username, password, err
-	}
-	uri.Path = path.Clean(uri.Path)
-	if uri.User != nil {
-		username = uri.User.Username()
-		password, _ = uri.User.Password()
-	}
-	uri.User = nil
-	//uri.Scheme = "https"
-	res = uri.String()
-	return res, username, password, err
-}

pkg/client/attic/grant.go

@@ -1,251 +0,0 @@
-/*
- * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
- *
- * This work is published and licensed under a Creative Commons
- * Attribution-NonCommercial-NoDerivatives 4.0 International License.
- *
- * Distribution of this work is permitted, but commercial use and
- * modifications are strictly prohibited.
- */
-package client
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"mstore/app/accoper"
-	"mstore/app/handler"
-	"mstore/pkg/descr"
-)
-
-func (cli *Client) CreateGrantByAccountID(ctx context.Context, hosturi string, accountID, right, pattern string) (string, error) {
-	var err error
-	var res string
-
-	apiuri, err := setApiPath(hosturi, "/v3/api/grant/create")
-	if err != nil {
-		return res, err
-	}
-	operParams := accoper.CreateGrantParams{
-		AccountID: accountID,
-		Right:     right,
-		Pattern:   pattern,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return res, err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apiuri, paramsJson)
-	if err != nil {
-		return res, err
-	}
-
-	operRes := handler.NewResponse[accoper.CreateGrantResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return res, err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return res, err
-	}
-	res = operRes.Result.GrantID
-	return res, err
-}
-
-func (cli *Client) CreateGrantByUsername(ctx context.Context, hosturi, username string, right string, pattern string) (string, error) {
-	var err error
-	var res string
-
-	apiuri, err := setApiPath(hosturi, "/v3/api/grant/create")
-	if err != nil {
-		return res, err
-	}
-	operParams := accoper.CreateGrantParams{
-		Username: username,
-		Right:    right,
-		Pattern:  pattern,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return res, err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apiuri, paramsJson)
-	if err != nil {
-		return res, err
-	}
-
-	operRes := handler.NewResponse[accoper.CreateGrantResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return res, err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return res, err
-	}
-	res = operRes.Result.GrantID
-	return res, err
-}
-
-func (cli *Client) GetGrant(ctx context.Context, hosturi, grantID string) (*descr.Grant, error) {
-	var err error
-	res := &descr.Grant{}
-
-	apipath, err := setApiPath(hosturi, "/v3/api/grant/get")
-	if err != nil {
-		return res, err
-	}
-	operParams := accoper.GetGrantParams{
-		GrantID: grantID,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return res, err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return res, err
-	}
-
-	operRes := handler.NewResponse[accoper.GetGrantResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return res, err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return res, err
-	}
-	res = operRes.Result.Grant
-	return res, err
-}
-
-func (cli *Client) UpdateGrant(ctx context.Context, hosturi, grantID, newPattern string) error {
-	var err error
-
-	apipath, err := setApiPath(hosturi, "/v3/api/grant/update")
-	if err != nil {
-		return err
-	}
-	operParams := accoper.UpdateGrantParams{
-		GrantID:    grantID,
-		NewPattern: newPattern,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return err
-	}
-	operRes := handler.NewResponse[accoper.UpdateGrantResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return err
-	}
-	return err
-}
-
-func (cli *Client) DeleteGrant(ctx context.Context, hosturi, grantID string) error {
-	var err error
-
-	apipath, err := setApiPath(hosturi, "/v3/api/grant/delete")
-	if err != nil {
-		return err
-	}
-	operParams := accoper.DeleteGrantParams{
-		GrantID: grantID,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return err
-	}
-
-	operRes := handler.NewResponse[accoper.DeleteGrantResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return err
-	}
-	return err
-}
-
-func (cli *Client) ListGrantsByAccountID(ctx context.Context, hosturi, accountID string) ([]descr.Grant, error) {
-	var err error
-	res := make([]descr.Grant, 0)
-
-	apipath, err := setApiPath(hosturi, "/v3/api/grants/list")
-	if err != nil {
-		return res, err
-	}
-	operParams := accoper.ListGrantsParams{
-		AccountID: accountID,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return res, err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return res, err
-	}
-
-	operRes := handler.NewResponse[accoper.ListGrantsResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return res, err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return res, err
-	}
-	res = operRes.Result.Grants
-	return res, err
-}
-
-func (cli *Client) ListGrantsByUsername(ctx context.Context, hosturi, username string) ([]descr.Grant, error) {
-	var err error
-	res := make([]descr.Grant, 0)
-
-	apipath, err := setApiPath(hosturi, "/v3/api/grants/list")
-	if err != nil {
-		return res, err
-	}
-	operParams := accoper.ListGrantsParams{
-		Username: username,
-	}
-	paramsJson, err := json.Marshal(operParams)
-	if err != nil {
-		return res, err
-	}
-	respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
-	if err != nil {
-		return res, err
-	}
-
-	operRes := handler.NewResponse[accoper.ListGrantsResult]()
-	err = json.Unmarshal(respBytes, operRes)
-	if err != nil {
-		return res, err
-	}
-	if operRes.Error {
-		err = fmt.Errorf("%s", operRes.Message)
-		return res, err
-	}
-	res = operRes.Result.Grants
-	return res, err
-}

pkg/client/attic/httpcall.go

@@ -1,84 +0,0 @@
-/*
- * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
- *
- * This work is published and licensed under a Creative Commons
- * Attribution-NonCommercial-NoDerivatives 4.0 International License.
- *
- * Distribution of this work is permitted, but commercial use and
- * modifications are strictly prohibited.
- */
-package client
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"mstore/pkg/auxhttp"
-)
-
-func setApiPath(base, apipath string) (string, error) {
-	var res string
-	if !strings.Contains(base, "://") {
-		base = "https://" + base
-	}
-	uri, err := url.Parse(base)
-	if err != nil {
-		return res, err
-	}
-	uri.Path = "/"
-	uri.Path, err = url.JoinPath(uri.Path, apipath)
-	if err != nil {
-		return res, err
-	}
-	res = uri.String()
-	return res, nil
-
-}
-
-func doHTTPCall(ctx context.Context, skipTLSVerify bool, apiuri string, reqBytes []byte) ([]byte, error) {
-	var err error
-	respBytes := make([]byte, 0)
-
-	apiuri, username, password, err := repackServiceURI(apiuri)
-	if err != nil {
-		return respBytes, err
-	}
-	reqBuffer := bytes.NewBuffer(reqBytes)
-	httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, apiuri, reqBuffer)
-	if err != nil {
-		return respBytes, err
-	}
-	httpReq.Header.Set("Content-Type", "application/json")
-	if username != "" && password != "" {
-		basicHeader := auxhttp.EncodeBasicAuth(username, password)
-		httpReq.Header.Add("Authorization", basicHeader)
-	}
-	transport := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: skipTLSVerify},
-	}
-	httpClient := &http.Client{
-		Transport: transport,
-	}
-	httpResp, err := httpClient.Do(httpReq)
-	if err != nil {
-		return respBytes, err
-	}
-	defer httpResp.Body.Close()
-	if httpResp.StatusCode != http.StatusOK {
-		err := fmt.Errorf("Wrong StatusCode header: %s", httpResp.Status)
-		return respBytes, err
-	}
-	respBuffer := bytes.NewBuffer(nil)
-	_, err = io.Copy(respBuffer, httpResp.Body)
-	if err != nil {
-		return respBytes, err
-	}
-	respBytes = respBuffer.Bytes()
-	return respBytes, err
-}

pkg/client/attic/service.go

@@ -1,79 +0,0 @@
-/*
- * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
- *
- * This work is published and licensed under a Creative Commons
- * Attribution-NonCommercial-NoDerivatives 4.0 International License.
- *
- * Distribution of this work is permitted, but commercial use and
- * modifications are strictly prohibited.
- */
-package client
-
-import (
-	"context"
-	"crypto/tls"
-	"net/http"
-	"net/url"
-	"time"
-
-	"mstore/pkg/auxhttp"
-)
-
-func convertServiceURI(ref string) (string, error) {
-	var err error
-	var res string
-	const serviceAPI = "/v3/api/service/"
-	const serviceScheme = "https"
-	uri, err := url.Parse(ref)
-	if err != nil {
-		return res, err
-	}
-	uri.Path, err = url.JoinPath(serviceAPI, uri.Path)
-	if err != nil {
-		return res, err
-	}
-	uri.Scheme = serviceScheme
-	res = uri.String()
-	return res, err
-}
-
-func (cli *Client) ServiceHello(ctx context.Context, serviceuri string, timeout time.Duration) (bool, error) {
-	var res bool
-	var err error
-	ctx, _ = context.WithTimeout(ctx, timeout)
-
-	serviceuri, username, password, err := repackServiceURI(serviceuri)
-	if err != nil {
-		return res, err
-	}
-	serviceuri, err = convertServiceURI(serviceuri)
-
-	if err != nil {
-		return res, err
-	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, serviceuri, nil)
-	if err != nil {
-		return res, err
-	}
-	if username != "" && password != "" {
-		basic := auxhttp.EncodeBasicAuth(username, password)
-		req.Header.Add("Authorization", basic)
-	}
-	transport := &http.Transport{
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: true,
-		},
-	}
-	client := &http.Client{
-		Transport: transport,
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		return res, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode == http.StatusOK {
-		res = true
-	}
-	return res, err
-}

pkg/gcrcli/client.go

@@ -7,7 +7,7 @@
  * Distribution of this work is permitted, but commercial use and
  * modifications are strictly prohibited.
  */
-package client
+package gcrcli
 
 type Client struct {
 	skipTLSVerify bool

pkg/gcrcli/imageaux.go

@@ -7,7 +7,7 @@
  * Distribution of this work is permitted, but commercial use and
  * modifications are strictly prohibited.
  */
-package client
+package gcrcli
 
 import (
 	"crypto/tls"

pkg/gcrcli/imagedelete.go

@@ -7,7 +7,7 @@
  * Distribution of this work is permitted, but commercial use and
  * modifications are strictly prohibited.
  */
-package client
+package gcrcli
 
 import (
 	"context"

pkg/gcrcli/imageinfo.go

@@ -7,7 +7,7 @@
  * Distribution of this work is permitted, but commercial use and
  * modifications are strictly prohibited.
  */
-package client
+package gcrcli
 
 import (
 	"context"

pkg/gcrcli/imagepull.go

@@ -7,7 +7,7 @@
  * Distribution of this work is permitted, but commercial use and
  * modifications are strictly prohibited.
  */
-package client
+package gcrcli
 
 import (
 	"context"

pkg/gcrcli/imagepush.go

@@ -7,7 +7,7 @@
  * Distribution of this work is permitted, but commercial use and
  * modifications are strictly prohibited.
  */
-package client
+package gcrcli
 
 import (
 	"context"