@le-space/rootfs 0.4.4 → 0.5.2

package/index.js

@@ -222,7 +222,7 @@ function createRootfsBuildPlan(contract, options) {
     skipBuild: options.skipBuild === true,
     ipfsAddUrl: options.ipfsAddUrl?.trim() || "https://ipfs.aleph.cloud/api/v0/add",
     ipfsGatewayUrl: options.ipfsGatewayUrl?.trim() || "https://ipfs.aleph.cloud/ipfs",
-    alephApiHost: options.alephApiHost?.trim() || "https://api2.aleph.im",
+    alephApiHost: options.alephApiHost?.trim() || "https://api.aleph.im",
     alephMessageWaitAttempts: positiveInteger(options.alephMessageWaitAttempts, 60),
     alephMessageWaitDelaySeconds: positiveInteger(options.alephMessageWaitDelaySeconds, 5),
     alephPinAttempts: positiveInteger(options.alephPinAttempts, 4),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@le-space/rootfs",
-  "version": "0.4.4",
+  "version": "0.5.2",
   "description": "Shared rootfs contract parsing, reference profile assets, and build helpers.",
   "license": "MIT",
   "type": "module",
@@ -14,5 +14,13 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NiKrause/relay-button"
+  },
+  "homepage": "https://github.com/NiKrause/relay-button",
+  "bugs": {
+    "url": "https://github.com/NiKrause/relay-button/issues"
   }
 }

package/reference/orbitdb-relay-pinner/rootfs/build-rootfs.sh

@@ -31,12 +31,12 @@ die() {
 
 load_rootfs_contract() {
   [ -n "${ROOTFS_CONTRACT_FILE}" ] || return 0
-  require python3
+  require node
   [ -f "${ROOTFS_CONTRACT_FILE}" ] || die "Rootfs contract does not exist: ${ROOTFS_CONTRACT_FILE}"
 
   # The contract is relay-owned metadata. We load it once here so users can
   # select a standardized profile without repeating profile/install-mode flags.
-  eval "$(python3 "${SCRIPT_DIR}/read-rootfs-contract.py" "${ROOTFS_CONTRACT_FILE}")"
+  eval "$(node "${SCRIPT_DIR}/read-rootfs-contract.mjs" "${ROOTFS_CONTRACT_FILE}")"
 
   if [ -n "${ROOTFS_PROFILE}" ] && [ "${ROOTFS_PROFILE}" != "${ROOTFS_CONTRACT_PROFILE}" ]; then
     die "ROOTFS_PROFILE=${ROOTFS_PROFILE} conflicts with contract profile ${ROOTFS_CONTRACT_PROFILE}"
@@ -119,25 +119,11 @@ resolve_rootfs_version() {
 
   if [ "${ROOTFS_PROFILE}" = "orbitdb-relay-pinner" ] && [ -n "${ORBITDB_RELAY_PINNER_DIR}" ]; then
     local orbitdb_package_json="${ORBITDB_RELAY_PINNER_DIR}/package.json"
-    if [ -f "${orbitdb_package_json}" ] && command -v python3 >/dev/null 2>&1; then
+    if [ -f "${orbitdb_package_json}" ] && command -v node >/dev/null 2>&1; then
       local orbitdb_version
-      orbitdb_version="$(python3 - "${orbitdb_package_json}" <<'PY'
-import json
-import sys
-from pathlib import Path
-
-try:
-    payload = json.loads(Path(sys.argv[1]).read_text())
-except Exception:
-    raise SystemExit(1)
-
-version = payload.get("version")
-if not isinstance(version, str) or not version.strip():
-    raise SystemExit(1)
-
-print(f"orbitdb-relay-pinner-v{version.strip().lstrip('v')}")
-PY
-)" || orbitdb_version=""
+      orbitdb_version="$(
+        node -e "const fs=require('node:fs');const payload=JSON.parse(fs.readFileSync(process.argv[1],'utf8'));const version=typeof payload.version==='string'?payload.version.trim():'';if(!version)process.exit(1);console.log('orbitdb-relay-pinner-v'+version.replace(/^v/,''));" "${orbitdb_package_json}"
+      )" || orbitdb_version=""
 
       if [ -n "${orbitdb_version}" ]; then
         printf '%s\n' "${orbitdb_version}"
@@ -172,27 +158,6 @@ PY
 
 ROOTFS_VERSION="$(resolve_rootfs_version)"
 
-resolve_aleph_bin() {
-  if [ -n "${ALEPH_BIN:-}" ]; then
-    printf '%s\n' "${ALEPH_BIN}"
-    return
-  fi
-
-  local local_aleph="${REPO_DIR}/aleph-client/.venv/bin/aleph"
-  if [ -x "${local_aleph}" ]; then
-    printf '%s\n' "${local_aleph}"
-    return
-  fi
-
-  if command -v aleph >/dev/null 2>&1; then
-    command -v aleph
-    return
-  fi
-
-  echo "Missing aleph CLI. Set ALEPH_BIN=/path/to/aleph or install aleph-client." >&2
-  exit 1
-}
-
 build_with_host_tools() {
   echo "Using host virt-customize/qemu-img toolchain."
   "${SCRIPT_DIR}/build-rootfs-image.sh"
@@ -412,10 +377,7 @@ EOF
 }
 
 upload_image() {
-  local aleph_bin
-  aleph_bin="$(resolve_aleph_bin)"
-
-  require python3
+  require node
   require curl
   [ -f "${IMAGE}" ] || die "Rootfs image does not exist: ${IMAGE}"
 
@@ -430,48 +392,20 @@ upload_image() {
   fi
 
   local cid
-  if ! cid="$(python3 - "${OUT_DIR}/ipfs-add-response.jsonl" <<'PY'
-import json
-import sys
-from pathlib import Path
-
-lines = [line for line in Path(sys.argv[1]).read_text().splitlines() if line.strip()]
-if not lines:
-    raise SystemExit("No response received from the IPFS add endpoint")
-
-payload = json.loads(lines[-1])
-cid = payload.get("Hash")
-if not cid:
-    raise SystemExit(f"IPFS add response did not include a Hash: {payload}")
-
-print(cid)
-PY
-)"; then
+  if ! cid="$(
+    node -e "const fs=require('node:fs');const lines=fs.readFileSync(process.argv[1],'utf8').split(/\\r?\\n/).map((line)=>line.trim()).filter(Boolean);if(!lines.length){console.error('No response received from the IPFS add endpoint');process.exit(1)}const payload=JSON.parse(lines.at(-1));if(typeof payload.Hash!=='string'||!payload.Hash.trim()){console.error('IPFS add response did not include a Hash');process.exit(1)}console.log(payload.Hash.trim());" "${OUT_DIR}/ipfs-add-response.jsonl"
+  )"; then
     die "Failed to extract CID from ${OUT_DIR}/ipfs-add-response.jsonl"
   fi
   [ -n "${cid}" ] || die "IPFS upload returned an empty CID"
 
-  echo "Pinning CID ${cid} on Aleph Cloud with ${aleph_bin}..." >&2
+  echo "Pinning CID ${cid} on Aleph Cloud via direct API call..." >&2
   : > "${OUT_DIR}/store-message.json"
-  if ! "${aleph_bin}" file pin "${cid}" \
-    --channel "${CHANNEL}" \
-    > "${OUT_DIR}/store-message.json"; then
+  if ! node "${SCRIPT_DIR}/publish-store-message.mjs" "${cid}" > "${OUT_DIR}/store-message.json"; then
     die "Aleph pin failed for CID ${cid}"
   fi
 
-  if ! python3 - "${OUT_DIR}/store-message.json" <<'PY'
-import json
-import sys
-from pathlib import Path
-
-content = Path(sys.argv[1]).read_text().strip()
-if not content:
-    raise SystemExit("Aleph pin returned an empty response")
-
-payload = json.loads(content)
-print(payload["item_hash"])
-PY
-  then
+  if ! node -e "const fs=require('node:fs');const content=fs.readFileSync(process.argv[1],'utf8').trim();if(!content){console.error('Aleph pin returned an empty response');process.exit(1)}const payload=JSON.parse(content);if(typeof payload.item_hash!=='string'||!payload.item_hash.trim()){console.error('Failed to extract item_hash');process.exit(1)}console.log(payload.item_hash.trim());" "${OUT_DIR}/store-message.json"; then
     die "Failed to extract item_hash from ${OUT_DIR}/store-message.json"
   fi
 }

package/reference/orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-bootstrap-refresh.py

@@ -24,7 +24,7 @@ ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/orbitdb-relay-pinner")
 DESCRIBE_SCRIPT = os.environ.get(
     "DESCRIBE_SCRIPT", "/usr/local/sbin/orbitdb-relay-pinner-describe.py"
 )
-DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api2.aleph.im")
+DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api.aleph.im")
 DEFAULT_CHANNEL = os.environ.get("ALEPH_BOOTSTRAP_CHANNEL", "simple-todo")
 DEFAULT_REF = os.environ.get("ALEPH_BOOTSTRAP_REF", "simple-todo-bootstrap")
 DEFAULT_POST_TYPE = os.environ.get("ALEPH_BOOTSTRAP_POST_TYPE", "relay-bootstrap")

package/reference/orbitdb-relay-pinner/rootfs/publish-store-message.mjs

@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+
+import { createHash } from 'node:crypto'
+
+const [{ Wallet }] = await Promise.all([
+  import('ethers'),
+])
+
+function requiredEnv(name) {
+  const value = process.env[name]?.trim()
+  if (!value) {
+    throw new Error(`Missing required environment variable ${name}`)
+  }
+  return value
+}
+
+function normalizeApiHost(value) {
+  return value.replace(/\/+$/u, '')
+}
+
+const cid = process.argv[2]?.trim()
+if (!cid) {
+  throw new Error('Usage: publish-store-message.mjs <cid>')
+}
+
+const wallet = new Wallet(requiredEnv('ALEPH_PRIVATE_KEY'))
+const apiHost = normalizeApiHost(process.env.ALEPH_API_HOST?.trim() || 'https://api.aleph.im')
+const channel = process.env.CHANNEL?.trim() || 'ALEPH-CLOUDSOLUTIONS'
+const ref = process.env.ALEPH_ROOTFS_REF?.trim() || undefined
+const time = Date.now() / 1000
+
+const content = {
+  address: wallet.address,
+  time,
+  item_type: 'ipfs',
+  item_hash: cid,
+  ...(ref ? { ref } : {}),
+}
+const itemContent = JSON.stringify(content)
+const itemHash = createHash('sha256').update(itemContent).digest('hex')
+const message = {
+  sender: wallet.address,
+  chain: 'ETH',
+  type: 'STORE',
+  item_hash: itemHash,
+  item_type: 'inline',
+  item_content: itemContent,
+  time,
+  channel,
+}
+const signaturePayload = [message.chain, message.sender, message.type, message.item_hash].join('\n')
+const signature = await wallet.signMessage(signaturePayload)
+
+const response = await fetch(`${apiHost}/api/v0/messages`, {
+  method: 'POST',
+  headers: {
+    'content-type': 'application/json',
+  },
+  body: JSON.stringify({
+    sync: true,
+    message: {
+      ...message,
+      signature,
+    },
+  }),
+})
+
+const payload = await response.json().catch(() => ({}))
+process.stdout.write(`${JSON.stringify(payload)}\n`)
+
+if (!response.ok) {
+  process.exit(1)
+}

package/reference/orbitdb-relay-pinner/rootfs/read-rootfs-contract.mjs

@@ -0,0 +1,68 @@
+#!/usr/bin/env node
+
+import { readFileSync } from 'node:fs'
+import path from 'node:path'
+
+function shellQuote(value) {
+  return `'${String(value).replace(/'/g, `'\\''`)}'`
+}
+
+function shellAssign(name, value) {
+  return `${name}=${shellQuote(value)}`
+}
+
+const contractPath = process.argv[2]
+if (!contractPath) {
+  console.error('Usage: read-rootfs-contract.mjs /path/to/contract.json')
+  process.exit(1)
+}
+
+let payload
+try {
+  payload = JSON.parse(readFileSync(contractPath, 'utf8'))
+} catch (error) {
+  console.error(`Failed to read rootfs contract ${contractPath}: ${error instanceof Error ? error.message : String(error)}`)
+  process.exit(1)
+}
+
+const rootfs = payload.rootfs ?? {}
+const services = payload.services ?? {}
+const source = payload.source ?? {}
+const manifest = payload.manifest ?? {}
+const ports = Array.isArray(payload.ports) ? payload.ports : null
+const profile = typeof rootfs.profile === 'string' ? rootfs.profile.trim() : ''
+const installMode = typeof rootfs.installMode === 'string' ? rootfs.installMode.trim() : ''
+
+if (!profile) {
+  console.error('Rootfs contract is missing rootfs.profile')
+  process.exit(1)
+}
+if (!installMode) {
+  console.error('Rootfs contract is missing rootfs.installMode')
+  process.exit(1)
+}
+if (!ports) {
+  console.error('Rootfs contract field ports must be a list')
+  process.exit(1)
+}
+
+const resolvedContractPath = path.resolve(contractPath)
+const lines = [
+  shellAssign('ROOTFS_CONTRACT_PATH', resolvedContractPath),
+  shellAssign('ROOTFS_CONTRACT_ID', payload.id ?? ''),
+  shellAssign('ROOTFS_CONTRACT_PROFILE', profile),
+  shellAssign('ROOTFS_CONTRACT_INSTALL_MODE', installMode),
+  shellAssign('ROOTFS_CONTRACT_SOURCE_SUBDIRECTORY', source.subdirectory ?? ''),
+  shellAssign('ROOTFS_CONTRACT_INSTALL_DIR', rootfs.installDir ?? ''),
+  shellAssign('ROOTFS_CONTRACT_BINARY_PATH', rootfs.binaryPath ?? '/usr/local/bin/universal-chat-go'),
+  shellAssign('ROOTFS_CONTRACT_DATA_DIR', rootfs.dataDir ?? ''),
+  shellAssign('ROOTFS_CONTRACT_ENV_FILE', rootfs.envFile ?? ''),
+  shellAssign('ROOTFS_CONTRACT_MAIN_SERVICE', services.main ?? ''),
+  shellAssign('ROOTFS_CONTRACT_BOOTSTRAP_SERVICE', services.bootstrap ?? ''),
+  shellAssign('ROOTFS_CONTRACT_AUTOTLS_SERVICE', services.autotlsRefresh ?? ''),
+  shellAssign('ROOTFS_CONTRACT_MANIFEST_COPY_TARGET', manifest.copyTarget ?? ''),
+  shellAssign('ROOTFS_CONTRACT_MANIFEST_NOTES', manifest.notes ?? ''),
+  shellAssign('ROOTFS_CONTRACT_PORT_FORWARDS_JSON', JSON.stringify(ports)),
+]
+
+process.stdout.write(`${lines.join('\n')}\n`)

package/reference/uc-go-peer/rootfs/build-rootfs.sh

@@ -15,7 +15,7 @@ SKIP_UPLOAD="${SKIP_UPLOAD:-0}"
 SKIP_BUILD="${SKIP_BUILD:-0}"
 IPFS_ADD_URL="${IPFS_ADD_URL:-https://ipfs.aleph.cloud/api/v0/add}"
 IPFS_GATEWAY_URL="${IPFS_GATEWAY_URL:-https://ipfs.aleph.cloud/ipfs}"
-ALEPH_API_HOST="${ALEPH_API_HOST:-https://api2.aleph.im}"
+ALEPH_API_HOST="${ALEPH_API_HOST:-https://api.aleph.im}"
 IPFS_GATEWAY_WAIT_ATTEMPTS="${IPFS_GATEWAY_WAIT_ATTEMPTS:-30}"
 IPFS_GATEWAY_WAIT_DELAY_SECONDS="${IPFS_GATEWAY_WAIT_DELAY_SECONDS:-10}"
 ROOTFS_CID=""

package/reference/uc-go-peer/rootfs/uc-go-peer-bootstrap-deregister.py

@@ -20,7 +20,7 @@ except ImportError as error:  # pragma: no cover - runtime dependency
 
 ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/uc-go-peer")
 DESCRIBE_SCRIPT = os.environ.get("DESCRIBE_SCRIPT", "/usr/local/sbin/uc-go-peer-describe.py")
-DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api2.aleph.im")
+DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api.aleph.im")
 DEFAULT_CHANNEL = os.environ.get("ALEPH_BOOTSTRAP_CHANNEL", "simple-todo")
 DEFAULT_REF = os.environ.get("ALEPH_BOOTSTRAP_REF", "simple-todo-bootstrap")
 DEFAULT_POST_TYPE = os.environ.get("ALEPH_BOOTSTRAP_POST_TYPE", "relay-bootstrap")

package/reference/uc-go-peer/rootfs/uc-go-peer-bootstrap-refresh.py

@@ -22,7 +22,7 @@ except ImportError as error:  # pragma: no cover - runtime dependency
 
 ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/uc-go-peer")
 DESCRIBE_SCRIPT = os.environ.get("DESCRIBE_SCRIPT", "/usr/local/sbin/uc-go-peer-describe.py")
-DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api2.aleph.im")
+DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api.aleph.im")
 DEFAULT_CHANNEL = os.environ.get("ALEPH_BOOTSTRAP_CHANNEL", "simple-todo")
 DEFAULT_REF = os.environ.get("ALEPH_BOOTSTRAP_REF", "simple-todo-bootstrap")
 DEFAULT_POST_TYPE = os.environ.get("ALEPH_BOOTSTRAP_POST_TYPE", "relay-bootstrap")

package/reference/uc-go-peer/rootfs/uc-go-peer-setup-server.py

@@ -24,7 +24,7 @@ BOOTSTRAP_SERVICE = os.environ.get("BOOTSTRAP_SERVICE", "uc-go-peer-bootstrap.se
 METADATA_FILE = os.environ.get("METADATA_FILE", "/run/uc-go-peer-setup-metadata.json")
 METADATA_ERROR_FILE = os.environ.get("METADATA_ERROR_FILE", "/run/uc-go-peer-setup-metadata.error")
 AUTHORIZED_KEYS_FILE = os.environ.get("AUTHORIZED_KEYS_FILE", "/root/.ssh/authorized_keys")
-ALEPH_API_HOST = os.environ.get("ALEPH_API_HOST", "https://api2.aleph.im")
+ALEPH_API_HOST = os.environ.get("ALEPH_API_HOST", "https://api.aleph.im")
 BOOTSTRAP_CONFIG_KEY = os.environ.get("BOOTSTRAP_CONFIG_KEY", "vm-bootstrap-config")
 BOOTSTRAP_CONFIG_POLL_SECONDS = float(os.environ.get("BOOTSTRAP_CONFIG_POLL_SECONDS", "5"))
 BOOTSTRAP_CONFIG_SIGNAL_REF = os.environ.get("BOOTSTRAP_CONFIG_SIGNAL_REF", "vm-bootstrap-config")

package/reference/orbitdb-relay-pinner/rootfs/read-rootfs-contract.py

@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-
-from __future__ import annotations
-
-import argparse
-import json
-import shlex
-import sys
-from pathlib import Path
-
-
-def shell_assign(name: str, value: str) -> str:
-    return f"{name}={shlex.quote(value)}"
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(description="Read a relay rootfs contract and emit shell exports.")
-    parser.add_argument("contract", type=Path, help="Path to the rootfs contract JSON file")
-    args = parser.parse_args()
-
-    try:
-        payload = json.loads(args.contract.read_text())
-    except FileNotFoundError:
-        print(f"Missing rootfs contract: {args.contract}", file=sys.stderr)
-        return 1
-    except json.JSONDecodeError as exc:
-        print(f"Invalid rootfs contract JSON in {args.contract}: {exc}", file=sys.stderr)
-        return 1
-
-    rootfs = payload.get("rootfs") or {}
-    services = payload.get("services") or {}
-    source = payload.get("source") or {}
-    manifest = payload.get("manifest") or {}
-    ports = payload.get("ports") or []
-
-    profile = rootfs.get("profile")
-    install_mode = rootfs.get("installMode")
-
-    if not isinstance(profile, str) or not profile.strip():
-        print("Rootfs contract is missing rootfs.profile", file=sys.stderr)
-        return 1
-    if not isinstance(install_mode, str) or not install_mode.strip():
-        print("Rootfs contract is missing rootfs.installMode", file=sys.stderr)
-        return 1
-    if not isinstance(ports, list):
-        print("Rootfs contract field ports must be a list", file=sys.stderr)
-        return 1
-
-    lines = [
-        shell_assign("ROOTFS_CONTRACT_PATH", str(args.contract.resolve())),
-        shell_assign("ROOTFS_CONTRACT_ID", str(payload.get("id", ""))),
-        shell_assign("ROOTFS_CONTRACT_PROFILE", profile.strip()),
-        shell_assign("ROOTFS_CONTRACT_INSTALL_MODE", install_mode.strip()),
-        shell_assign("ROOTFS_CONTRACT_SOURCE_SUBDIRECTORY", str(source.get("subdirectory", ""))),
-        shell_assign("ROOTFS_CONTRACT_INSTALL_DIR", str(rootfs.get("installDir", ""))),
-        shell_assign("ROOTFS_CONTRACT_BINARY_PATH", str(rootfs.get("binaryPath", "/usr/local/bin/universal-chat-go"))),
-        shell_assign("ROOTFS_CONTRACT_DATA_DIR", str(rootfs.get("dataDir", ""))),
-        shell_assign("ROOTFS_CONTRACT_ENV_FILE", str(rootfs.get("envFile", ""))),
-        shell_assign("ROOTFS_CONTRACT_MAIN_SERVICE", str(services.get("main", ""))),
-        shell_assign("ROOTFS_CONTRACT_BOOTSTRAP_SERVICE", str(services.get("bootstrap", ""))),
-        shell_assign("ROOTFS_CONTRACT_AUTOTLS_SERVICE", str(services.get("autotlsRefresh", ""))),
-        shell_assign("ROOTFS_CONTRACT_MANIFEST_COPY_TARGET", str(manifest.get("copyTarget", ""))),
-        shell_assign("ROOTFS_CONTRACT_MANIFEST_NOTES", str(manifest.get("notes", ""))),
-        shell_assign("ROOTFS_CONTRACT_PORT_FORWARDS_JSON", json.dumps(ports, separators=(",", ":"))),
-    ]
-
-    print("\n".join(lines))
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())