up

.gitignore

@@ -1,2 +1,2 @@
 data/
-./shortify/
+shortify/

LICENSE

@@ -0,0 +1,7 @@
+Copyright 2025 Tijl
+
+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.

examples/main.go

@@ -1,7 +1,10 @@
 package main
 
 import (
+	"fmt"
+
 	"git.tijl.dev/tijl/shortify"
+	"git.tijl.dev/tijl/shortify/pkg/generation"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -13,6 +16,9 @@ func main() {
 		panic(err)
 	}
 
+	// example decoding
+	fmt.Println(generation.DecodeBase62("11uPoqA1W"))
+
 	// listen the admin interface
 
 	unixListener, err := shortify.GetUnixListener("./shortify/admin.sock")

pkg/client/client.go

@@ -1,11 +1,8 @@
 package client
 
 import (
-	"bytes"
 	"encoding/binary"
-	"encoding/json"
 	"fmt"
-	"log"
 	"net/http"
 	"time"
 
@@ -18,7 +15,6 @@ type Client struct {
 	httpClient *http.Client
 	prefix     uint16
 	gen        *generation.Generator
-	domain     string // e.g. https://sho.rt
 
 	db         *bolt.DB
 	retryQueue chan shortenJob
@@ -26,13 +22,13 @@ type Client struct {
 }
 
 // NewClient with persistence and retry queue
-func NewClient(serverURL, domain string) (*Client, error) {
+func NewClient(serverURL string, folder string) (*Client, error) {
 	httpClient, baseURL, err := createHTTPClient(serverURL)
 	if err != nil {
 		return nil, err
 	}
 
-	db, err := bolt.Open(dbFileName, 0600, &bolt.Options{Timeout: 1 * time.Second})
+	db, err := bolt.Open(folder+"/"+dbFileName, 0600, &bolt.Options{Timeout: 1 * time.Second})
 	if err != nil {
 		return nil, err
 	}
@@ -40,7 +36,6 @@ func NewClient(serverURL, domain string) (*Client, error) {
 	cli := &Client{
 		serverURL:  baseURL,
 		httpClient: httpClient,
-		domain:     domain,
 		db:         db,
 		retryQueue: make(chan shortenJob, 1000),
 		stopRetry:  make(chan struct{}),
@@ -109,27 +104,10 @@ func NewClient(serverURL, domain string) (*Client, error) {
 func (c *Client) Shorten(longURL string) string {
 	shortID := c.gen.NextID()
 
-	go func() {
-		payload := map[string]string{
-			"id":  shortID,
-			"url": longURL,
-		}
-		data, _ := json.Marshal(payload)
+	go c.enqueueJob(shortenJob{
+		ID:  shortID,
+		URL: longURL,
+	})
 
-		req, err := http.NewRequest("POST", fmt.Sprintf("%s/shorten", c.serverURL), bytes.NewReader(data))
-		if err != nil {
-			log.Println("shorten request build error:", err)
-			return
-		}
-		req.Header.Set("Content-Type", "application/json")
-
-		resp, err := c.httpClient.Do(req)
-		if err != nil {
-			log.Println("shorten request failed:", err)
-			return
-		}
-		defer resp.Body.Close()
-	}()
-
-	return fmt.Sprintf("%s/%s", c.domain, shortID)
+	return shortID
 }

pkg/client/global.go

@@ -0,0 +1,16 @@
+package client
+
+import "sync"
+
+var (
+	Global *Client
+	once   sync.Once
+)
+
+func Init(serverURL string, folder string) error {
+	var err error
+	once.Do(func() {
+		Global, err = NewClient(serverURL, folder)
+	})
+	return err
+}

pkg/client/store.go

@@ -1,11 +1,13 @@
 package client
 
 import (
-	"bytes"
+	"encoding/binary"
 	"encoding/json"
 	"fmt"
+	"io"
 	"log"
 	"net/http"
+	"strings"
 	"time"
 
 	bolt "go.etcd.io/bbolt"
@@ -23,19 +25,18 @@ type shortenJob struct {
 }
 
 func (c *Client) registerPrefix() (uint16, error) {
-	resp, err := c.httpClient.Post(fmt.Sprintf("%s/register", c.serverURL), "application/json", nil)
+	resp, err := c.httpClient.Get(fmt.Sprintf("%s/register", c.serverURL))
 	if err != nil {
 		return 0, err
 	}
 	defer resp.Body.Close()
 
-	var result struct {
-		Prefix uint16 `json:"prefix"`
-	}
-	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+	bytes, err := io.ReadAll(resp.Body)
+	if err != nil {
 		return 0, err
 	}
-	return result.Prefix, nil
+
+	return binary.LittleEndian.Uint16(bytes), nil
 }
 
 func (c *Client) loadRetryJobs() {
@@ -108,18 +109,10 @@ func (c *Client) deleteJobFromDB(job shortenJob) {
 }
 
 func (c *Client) sendShortenJob(job shortenJob) error {
-	payload := map[string]string{
-		"id":  job.ID,
-		"url": job.URL,
-	}
-	data, _ := json.Marshal(payload)
-
-	req, err := http.NewRequest("POST", fmt.Sprintf("%s/shorten", c.serverURL), bytes.NewReader(data))
+	req, err := http.NewRequest("POST", fmt.Sprintf("%s/shorten?s=%s", c.serverURL, job.ID), strings.NewReader(job.URL))
 	if err != nil {
 		return err
 	}
-	req.Header.Set("Content-Type", "application/json")
-
 	resp, err := c.httpClient.Do(req)
 	if err != nil {
 		return err

pkg/generation/generation.go

@@ -7,10 +7,10 @@ import (
 )
 
 const (
-	idSize      = 4                   // 4 bytes for random part
+	idSize      = 6                   // 4 bytes for random part
 	prefixSize  = 2                   // 2 bytes for client prefix
 	rawIDLength = prefixSize + idSize // total 6 bytes
-	base62Len   = 8                   // 6 bytes encoded in base62 ~ 8 chars
+	//base62Len   = 8                   // 6 bytes encoded in base62 ~ 8 chars
 	poolSize = 10000
 )
 

serve.go

@@ -22,10 +22,16 @@ func (s *Server) Admin() *fiber.App {
 	})
 
 	a.Post("/shorten", func(c *fiber.Ctx) error {
-		shortUrl := c.Query("s")
 		longUrl := string(c.Body())
-
-		return s.storage.Put(shortUrl, longUrl)
+		shortUrl := c.Query("s")
+		if shortUrl == "" {
+			shortUrl = s.serverGen.NextID()
+		}
+		err := s.storage.Put(shortUrl, longUrl)
+		if err != nil {
+			return err
+		}
+		return c.SendString(shortUrl)
 	})
 
 	return a