@hasna/shortlinks 0.1.11 → 0.1.13

package/infra/aws-ec2-user-data.sh

@@ -4,9 +4,13 @@ set -euo pipefail
 export AWS_REGION="${AWS_REGION:-us-east-1}"
 export SHORTLINKS_HOME="/var/lib/shortlinks"
 export SHORTLINKS_PACKAGE="@hasna/shortlinks@latest"
-export RDS_SECRET_ID="rds!db-7a451ce6-83a9-40fa-b24a-81e5d5943511"
-export RDS_HOST="hasnaxyz-prod-opensource.c4limg0qgqvk.us-east-1.rds.amazonaws.com"
-export RDS_USERNAME="hasna_admin"
+export RDS_SECRET_ID="${RDS_SECRET_ID:-}"
+export RDS_HOST="${RDS_HOST:-}"
+export RDS_USERNAME="${RDS_USERNAME:-}"
+export SHORTLINKS_DOMAIN="${SHORTLINKS_DOMAIN:-}"
+
+: "${RDS_SECRET_ID:?Set RDS_SECRET_ID to the AWS Secrets Manager secret for the PostgreSQL database_url}"
+: "${SHORTLINKS_DOMAIN:?Set SHORTLINKS_DOMAIN to the public host served by Caddy}"
 
 dnf update -y
 dnf install -y awscli jq tar gzip shadow-utils libcap
@@ -15,28 +19,29 @@ if ! id shortlinks >/dev/null 2>&1; then
   useradd --system --create-home --home-dir "${SHORTLINKS_HOME}" --shell /sbin/nologin shortlinks
 fi
 
-install -d -o shortlinks -g shortlinks "${SHORTLINKS_HOME}/.hasna/cloud"
+install -d -o shortlinks -g shortlinks "${SHORTLINKS_HOME}/.hasna/shortlinks/storage"
 install -d -o shortlinks -g shortlinks "${SHORTLINKS_HOME}/.hasna/shortlinks"
 
-cat > "${SHORTLINKS_HOME}/.hasna/cloud/config.json" <<CLOUD_CONFIG
+if [ -n "${RDS_HOST}" ] && [ -n "${RDS_USERNAME}" ]; then
+cat > "${SHORTLINKS_HOME}/.hasna/shortlinks/storage/config.json" <<CLOUD_CONFIG
 {
   "rds": {
     "host": "${RDS_HOST}",
     "port": 5432,
     "username": "${RDS_USERNAME}",
-    "password_env": "HASNA_RDS_PASSWORD",
+    "password_env": "SHORTLINKS_CLOUD_DATABASE_PASSWORD",
     "ssl": true
   },
   "mode": "hybrid",
-  "feedback_endpoint": "https://feedback.hasna.com/api/v1/feedback",
   "auto_sync_interval_minutes": 0,
   "sync": {
     "schedule_minutes": 0
   }
 }
 CLOUD_CONFIG
-chown shortlinks:shortlinks "${SHORTLINKS_HOME}/.hasna/cloud/config.json"
-chmod 600 "${SHORTLINKS_HOME}/.hasna/cloud/config.json"
+chown shortlinks:shortlinks "${SHORTLINKS_HOME}/.hasna/shortlinks/storage/config.json"
+chmod 600 "${SHORTLINKS_HOME}/.hasna/shortlinks/storage/config.json"
+fi
 
 su -s /bin/bash shortlinks -c 'curl -fsSL https://bun.sh/install | bash'
 su -s /bin/bash shortlinks -c "${SHORTLINKS_HOME}/.bun/bin/bun install -g ${SHORTLINKS_PACKAGE} --no-cache"
@@ -50,14 +55,22 @@ export HOME="/var/lib/shortlinks"
 export PATH="/var/lib/shortlinks/.bun/bin:/usr/local/bin:/usr/bin:/bin"
 export NODE_TLS_REJECT_UNAUTHORIZED="0"
 
+: "${RDS_SECRET_ID:?Set RDS_SECRET_ID to the AWS Secrets Manager secret for the PostgreSQL database_url}"
+
 secret_json="$(aws secretsmanager get-secret-value \
   --region "${AWS_REGION}" \
-  --secret-id "rds!db-7a451ce6-83a9-40fa-b24a-81e5d5943511" \
+  --secret-id "${RDS_SECRET_ID}" \
   --query SecretString \
   --output text)"
 
-export HASNA_RDS_PASSWORD
-HASNA_RDS_PASSWORD="$(jq -r '.password' <<<"${secret_json}")"
+export HASNA_SHORTLINKS_DATABASE_URL
+HASNA_SHORTLINKS_DATABASE_URL="$(jq -r '.database_url // empty' <<<"${secret_json}")"
+if [ -n "${HASNA_SHORTLINKS_DATABASE_URL}" ]; then
+  export SHORTLINKS_DATABASE_URL="${HASNA_SHORTLINKS_DATABASE_URL}"
+else
+  export SHORTLINKS_CLOUD_DATABASE_PASSWORD
+  SHORTLINKS_CLOUD_DATABASE_PASSWORD="$(jq -r '.password // empty' <<<"${secret_json}")"
+fi
 
 exec "$@"
 RUNNER
@@ -66,6 +79,15 @@ chown root:shortlinks /usr/local/bin/shortlinks-env-exec
 
 su -s /bin/bash shortlinks -c 'PATH=/var/lib/shortlinks/.bun/bin:$PATH shortlinks --version'
 
+cat > /etc/default/shortlinks <<SHORTLINKS_ENV
+AWS_REGION=${AWS_REGION}
+RDS_SECRET_ID=${RDS_SECRET_ID}
+SHORTLINKS_DOMAIN=${SHORTLINKS_DOMAIN}
+SHORTLINKS_STORE=remote
+SHORTLINKS_ENV
+chmod 640 /etc/default/shortlinks
+chown root:shortlinks /etc/default/shortlinks
+
 caddy_version="$(curl -fsSL https://api.github.com/repos/caddyserver/caddy/releases/latest | jq -r '.tag_name // "v2.10.2"' | sed 's/^v//')"
 case "$(uname -m)" in
   aarch64|arm64) caddy_arch="arm64" ;;
@@ -90,8 +112,8 @@ Group=shortlinks
 WorkingDirectory=/var/lib/shortlinks
 Environment=HOME=/var/lib/shortlinks
 Environment=PATH=/var/lib/shortlinks/.bun/bin:/usr/local/bin:/usr/bin:/bin
-Environment=SHORTLINKS_STORE=cloud
-ExecStart=/usr/local/bin/shortlinks-env-exec shortlinks serve --cloud --host 127.0.0.1 --port 8787 --default-host has.na
+EnvironmentFile=/etc/default/shortlinks
+ExecStart=/usr/local/bin/shortlinks-env-exec shortlinks serve --remote --host 127.0.0.1 --port 8787 --default-host ${SHORTLINKS_DOMAIN}
 Restart=always
 RestartSec=5
 
@@ -123,8 +145,8 @@ WantedBy=multi-user.target
 SERVICE
 
 install -d /etc/caddy
-cat > /etc/caddy/Caddyfile <<'CADDY'
-has.na {
+cat > /etc/caddy/Caddyfile <<CADDY
+${SHORTLINKS_DOMAIN} {
   encode zstd gzip
   reverse_proxy 127.0.0.1:8787
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hasna/shortlinks",
-  "version": "0.1.11",
-  "description": "CLI-only shortlink manager for custom domains, click tracking, Cloudflare setup, and @hasna cloud sync",
+  "version": "0.1.13",
+  "description": "CLI-only shortlink manager for custom domains, click tracking, Cloudflare setup, and repo-native storage sync",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,6 +20,10 @@
     "./cloudflare": {
       "types": "./dist/cloudflare.d.ts",
       "import": "./dist/cloudflare.js"
+    },
+    "./storage": {
+      "types": "./dist/storage.d.ts",
+      "import": "./dist/storage.js"
     }
   },
   "files": [
@@ -31,7 +35,7 @@
     "SECURITY.md"
   ],
   "scripts": {
-    "build": "rm -rf dist && bun build src/cli/index.ts --outdir dist/cli --target bun --external @hasna/cloud && bun build src/index.ts --outdir dist --target bun --external @hasna/cloud && bun build src/server.ts --outdir dist --target bun --external @hasna/cloud && bun build src/cloudflare.ts --outdir dist --target bun && tsc -p tsconfig.build.json --emitDeclarationOnly --outDir dist",
+    "build": "rm -rf dist && bun build src/cli/index.ts --outdir dist/cli --target bun && bun build src/index.ts src/storage.ts --outdir dist --target bun && bun build src/server.ts --outdir dist --target bun && bun build src/cloudflare.ts --outdir dist --target bun && tsc -p tsconfig.build.json --emitDeclarationOnly --outDir dist",
     "typecheck": "tsc --noEmit",
     "test": "bun test",
     "dev:cli": "bun run src/cli/index.ts",
@@ -66,13 +70,14 @@
   "author": "Andrei Hasna <andrei@hasna.com>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@hasna/cloud": "0.1.30",
-    "@hasna/events": "^0.1.6",
     "chalk": "^5.4.1",
-    "commander": "^13.1.0"
+    "commander": "^13.1.0",
+    "pg": "^8.13.3",
+    "@hasna/events": "^0.1.6"
   },
   "devDependencies": {
     "@types/bun": "^1.2.4",
+    "@types/pg": "^8.11.11",
     "typescript": "^5.7.3"
   }
 }