@hasna/shortlinks 0.1.10 → 0.1.11

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

@@ -4,15 +4,9 @@ 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_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 password}"
-: "${RDS_HOST:?Set RDS_HOST to the PostgreSQL host}"
-: "${RDS_USERNAME:?Set RDS_USERNAME to the PostgreSQL username}"
-: "${SHORTLINKS_DOMAIN:?Set SHORTLINKS_DOMAIN to the public host served by Caddy}"
+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"
 
 dnf update -y
 dnf install -y awscli jq tar gzip shadow-utils libcap
@@ -21,27 +15,28 @@ 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/shortlinks/cloud"
+install -d -o shortlinks -g shortlinks "${SHORTLINKS_HOME}/.hasna/cloud"
 install -d -o shortlinks -g shortlinks "${SHORTLINKS_HOME}/.hasna/shortlinks"
 
-cat > "${SHORTLINKS_HOME}/.hasna/shortlinks/cloud/config.json" <<CLOUD_CONFIG
+cat > "${SHORTLINKS_HOME}/.hasna/cloud/config.json" <<CLOUD_CONFIG
 {
   "rds": {
     "host": "${RDS_HOST}",
     "port": 5432,
     "username": "${RDS_USERNAME}",
-    "password_env": "SHORTLINKS_CLOUD_DATABASE_PASSWORD",
+    "password_env": "HASNA_RDS_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/shortlinks/cloud/config.json"
-chmod 600 "${SHORTLINKS_HOME}/.hasna/shortlinks/cloud/config.json"
+chown shortlinks:shortlinks "${SHORTLINKS_HOME}/.hasna/cloud/config.json"
+chmod 600 "${SHORTLINKS_HOME}/.hasna/cloud/config.json"
 
 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"
@@ -55,16 +50,14 @@ 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 password}"
-
 secret_json="$(aws secretsmanager get-secret-value \
   --region "${AWS_REGION}" \
-  --secret-id "${RDS_SECRET_ID}" \
+  --secret-id "rds!db-7a451ce6-83a9-40fa-b24a-81e5d5943511" \
   --query SecretString \
   --output text)"
 
-export SHORTLINKS_CLOUD_DATABASE_PASSWORD
-SHORTLINKS_CLOUD_DATABASE_PASSWORD="$(jq -r '.password' <<<"${secret_json}")"
+export HASNA_RDS_PASSWORD
+HASNA_RDS_PASSWORD="$(jq -r '.password' <<<"${secret_json}")"
 
 exec "$@"
 RUNNER
@@ -73,15 +66,6 @@ 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=cloud
-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" ;;
@@ -106,8 +90,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
-EnvironmentFile=/etc/default/shortlinks
-ExecStart=/usr/local/bin/shortlinks-env-exec shortlinks serve --cloud --host 127.0.0.1 --port 8787 --default-host ${SHORTLINKS_DOMAIN}
+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
 Restart=always
 RestartSec=5
 
@@ -139,8 +123,8 @@ WantedBy=multi-user.target
 SERVICE
 
 install -d /etc/caddy
-cat > /etc/caddy/Caddyfile <<CADDY
-${SHORTLINKS_DOMAIN} {
+cat > /etc/caddy/Caddyfile <<'CADDY'
+has.na {
   encode zstd gzip
   reverse_proxy 127.0.0.1:8787
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hasna/shortlinks",
-  "version": "0.1.10",
-  "description": "CLI-only shortlink manager for custom domains, click tracking, Cloudflare setup, and repo-native cloud sync",
+  "version": "0.1.11",
+  "description": "CLI-only shortlink manager for custom domains, click tracking, Cloudflare setup, and @hasna cloud sync",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,7 +31,7 @@
     "SECURITY.md"
   ],
   "scripts": {
-    "build": "rm -rf dist && bun build src/cli/index.ts --outdir dist/cli --target bun && bun build src/index.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",
+    "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",
     "typecheck": "tsc --noEmit",
     "test": "bun test",
     "dev:cli": "bun run src/cli/index.ts",
@@ -66,13 +66,13 @@
   "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",
-    "pg": "^8.13.3"
+    "commander": "^13.1.0"
   },
   "devDependencies": {
     "@types/bun": "^1.2.4",
-    "@types/pg": "^8.11.11",
     "typescript": "^5.7.3"
   }
 }

package/dist/cloud-config.d.ts

@@ -1,13 +0,0 @@
-export type CloudMode = "local" | "hybrid" | "cloud";
-export interface CloudConfig {
-    mode: CloudMode;
-    rds: {
-        host: string;
-        port: number;
-        username: string;
-        password_env: string;
-        ssl: boolean;
-    };
-}
-export declare function getCloudConfig(): CloudConfig;
-export declare function getConnectionString(dbName?: string): string;

package/dist/cloud-sync.d.ts

@@ -1,28 +0,0 @@
-import { PgAdapterAsync } from "./remote-storage.js";
-export interface SyncResult {
-    table: string;
-    direction: "push" | "pull";
-    rowsRead: number;
-    rowsWritten: number;
-    errors: string[];
-}
-export interface CloudStatus {
-    mode: string;
-    enabled: boolean;
-    db_path: string;
-    tables: Array<{
-        table: string;
-        rows: number;
-    }>;
-}
-export declare const CLOUD_TABLES: readonly ["domains", "links", "clicks"];
-export declare function getCloudPg(): Promise<PgAdapterAsync>;
-export declare function runCloudMigrations(remote: PgAdapterAsync): Promise<void>;
-export declare function getCloudStatus(dbPath?: string): CloudStatus;
-export declare function pushCloudChanges(dbPath?: string, tables?: string[]): Promise<SyncResult[]>;
-export declare function pullCloudChanges(dbPath?: string, tables?: string[]): Promise<SyncResult[]>;
-export declare function syncCloudChanges(dbPath?: string, tables?: string[]): Promise<{
-    push: SyncResult[];
-    pull: SyncResult[];
-}>;
-export declare function parseCloudTables(raw?: string): string[];

package/dist/pg-migrate.d.ts

@@ -1,7 +0,0 @@
-export interface PgMigrationResult {
-    applied: number[];
-    alreadyApplied: number[];
-    errors: string[];
-    totalMigrations: number;
-}
-export declare function applyPgMigrations(connectionString: string): Promise<PgMigrationResult>;

package/dist/remote-storage.d.ts

@@ -1,11 +0,0 @@
-export declare class PgAdapterAsync {
-    private readonly pool;
-    constructor(connectionString: string);
-    run(sql: string, ...params: unknown[]): Promise<{
-        changes: number;
-    }>;
-    get(sql: string, ...params: unknown[]): Promise<unknown>;
-    all(sql: string, ...params: unknown[]): Promise<unknown[]>;
-    exec(sql: string): Promise<void>;
-    close(): Promise<void>;
-}