@clioplaylists/clio 0.1.7 → 0.1.9

package/dist/start.js

@@ -1,13 +1,21 @@
 'use strict';
+const assert = require('node:assert');
 const { ClioAppView } = require('./index');
 const { ServerConfig } = require('./config');
+const { Secp256k1Keypair } = require('@atproto/crypto');
 const main = async () => {
+    const env = getEnv();
     const config = ServerConfig.readEnv();
-    const clio = ClioAppView.create({ config });
+    assert(env.serviceSigningKey, 'must set BSKY_SERVICE_SIGNING_KEY');
+    const signingKey = await Secp256k1Keypair.import(env.serviceSigningKey);
+    const clio = ClioAppView.create({ config, signingKey });
     await clio.start();
     const shutdown = async () => {
         await clio.destroy();
     };
     process.on('SIGTERM', shutdown);
 };
+const getEnv = () => ({
+    serviceSigningKey: process.env.BSKY_SERVICE_SIGNING_KEY || undefined,
+});
 main();

package/dist/util/retry.js

@@ -1,13 +1,14 @@
-import { createRetryable } from '@atproto/common';
-import { ResponseType, XRPCError } from '@atproto/xrpc';
-export const RETRYABLE_HTTP_STATUS_CODES = new Set([
-    408, 425, 429, 500, 502, 503, 504, 522, 524,
-]);
-export const retryXrpc = createRetryable((err) => {
-    if (err instanceof XRPCError) {
-        if (err.status === ResponseType.Unknown)
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.retryXrpc = exports.RETRYABLE_HTTP_STATUS_CODES = void 0;
+const common_1 = require("@atproto/common");
+const xrpc_1 = require("@atproto/xrpc");
+exports.RETRYABLE_HTTP_STATUS_CODES = new Set([408, 425, 429, 500, 502, 503, 504, 522, 524]);
+exports.retryXrpc = (0, common_1.createRetryable)((err) => {
+    if (err instanceof xrpc_1.XRPCError) {
+        if (err.status === xrpc_1.ResponseType.Unknown)
             return true;
-        return RETRYABLE_HTTP_STATUS_CODES.has(err.status);
+        return exports.RETRYABLE_HTTP_STATUS_CODES.has(err.status);
     }
     return false;
 });

package/dist/util/uris.js

@@ -1,4 +1,7 @@
-import { AtUri } from '@atproto/syntax';
-export function uriToDid(uri) {
-    return new AtUri(uri).hostname;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uriToDid = uriToDid;
+const syntax_1 = require("@atproto/syntax");
+function uriToDid(uri) {
+    return new syntax_1.AtUri(uri).hostname;
 }

package/dist/util.d.ts

@@ -7,7 +7,6 @@ export type ParsedLabelers = {
 export type RecordInfo<T> = {
     record: T;
     cid: string;
-    sortedAt: Date;
     indexedAt: Date;
     takedownRef: string | undefined;
 };

package/dist/util.js

@@ -1,24 +1,61 @@
-import { jsonToLex } from '@atproto/lexicon';
-import { CID } from 'multiformats/cid';
-import * as ui8 from 'uint8arrays';
-import { lexicons } from './lexicons/lexicons';
-export const defaultLabelerHeader = (dids) => {
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safeTakedownRef = exports.parseCid = exports.parseJsonBytes = exports.parseRecordBytes = exports.parseRecord = exports.formatLabelerHeader = exports.defaultLabelerHeader = void 0;
+const lexicon_1 = require("@atproto/lexicon");
+const cid_1 = require("multiformats/cid");
+const ui8 = __importStar(require("uint8arrays"));
+const lexicons_1 = require("./lexicons/lexicons");
+const defaultLabelerHeader = (dids) => {
     return {
         dids,
         redact: new Set(dids),
     };
 };
-export const formatLabelerHeader = (parsed) => {
-    const parts = parsed.dids.map((did) => parsed.redact.has(did) ? `${did};redact` : did);
+exports.defaultLabelerHeader = defaultLabelerHeader;
+const formatLabelerHeader = (parsed) => {
+    const parts = parsed.dids.map((did) => (parsed.redact.has(did) ? `${did};redact` : did));
     return parts.join(',');
 };
-export const parseRecord = (entry, includeTakedowns) => {
+exports.formatLabelerHeader = formatLabelerHeader;
+const parseRecord = (entry, includeTakedowns) => {
     if (!includeTakedowns && entry.takenDown) {
         return undefined;
     }
-    const record = parseRecordBytes(entry.record);
+    const record = (0, exports.parseRecordBytes)(entry.record);
     const cid = entry.cid;
-    const sortedAt = entry.sortedAt?.toDate() ?? new Date(0);
     const indexedAt = entry.indexedAt?.toDate() ?? new Date(0);
     if (!record || !cid)
         return;
@@ -28,18 +65,18 @@ export const parseRecord = (entry, includeTakedowns) => {
     return {
         record,
         cid,
-        sortedAt,
         indexedAt,
-        takedownRef: safeTakedownRef(entry),
+        takedownRef: (0, exports.safeTakedownRef)(entry),
     };
 };
+exports.parseRecord = parseRecord;
 const isValidRecord = (json) => {
-    const lexRecord = jsonToLex(json);
+    const lexRecord = (0, lexicon_1.jsonToLex)(json);
     if (typeof lexRecord?.['$type'] !== 'string') {
         return false;
     }
     try {
-        lexicons.assertValidRecord(lexRecord['$type'], lexRecord);
+        lexicons_1.lexicons.assertValidRecord(lexRecord['$type'], lexRecord);
         return true;
     }
     catch {
@@ -47,26 +84,29 @@ const isValidRecord = (json) => {
     }
 };
 // @NOTE not parsed into lex format, so will not match lexicon record types on CID and blob values.
-export const parseRecordBytes = (bytes) => {
-    return parseJsonBytes(bytes);
+const parseRecordBytes = (bytes) => {
+    return (0, exports.parseJsonBytes)(bytes);
 };
-export const parseJsonBytes = (bytes) => {
+exports.parseRecordBytes = parseRecordBytes;
+const parseJsonBytes = (bytes) => {
     if (!bytes || bytes.byteLength === 0)
         return;
     const parsed = JSON.parse(ui8.toString(bytes, 'utf8'));
     return parsed ?? undefined;
 };
-export const parseCid = (cidStr) => {
+exports.parseJsonBytes = parseJsonBytes;
+const parseCid = (cidStr) => {
     if (!cidStr || cidStr.length === 0)
         return;
     try {
-        return CID.parse(cidStr);
+        return cid_1.CID.parse(cidStr);
     }
     catch {
         return;
     }
 };
-export const safeTakedownRef = (obj) => {
+exports.parseCid = parseCid;
+const safeTakedownRef = (obj) => {
     if (!obj)
         return;
     if (obj.takedownRef)
@@ -74,3 +114,4 @@ export const safeTakedownRef = (obj) => {
     if (obj.takenDown)
         return 'BSKY-TAKEDOWN-UNKNOWN';
 };
+exports.safeTakedownRef = safeTakedownRef;

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@clioplaylists/clio",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Appview server for the Clio application",
   "main": "dist/start.js",
   "types": "dist/index.d.ts",
-  "files": [ "dist" ],
+  "files": [
+    "dist"
+  ],
   "scripts": {
-    "build": "tsc --project ./tsconfig.json && cp .env ./dist",
+    "build": "tsc --project ./tsconfig.json && (test -f .env && cp .env ./dist || true)",
     "start": "node dist/start.js",
     "dev": "nodemon -r tsconfig-paths/register src/index.ts",
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -29,11 +31,15 @@
   },
   "homepage": "https://github.com/Hoid/clio#readme",
   "dependencies": {
+    "@atproto-labs/xrpc-utils": "^0.0.14",
     "@atproto/api": "^0.13.35",
     "@atproto/common": "^0.4.4",
+    "@atproto/common-web": "^0.4.0",
     "@atproto/crypto": "^0.4.4",
+    "@atproto/did": "^0.1.5",
     "@atproto/identity": "^0.4.6",
     "@atproto/lexicon": "^0.4.6",
+    "@atproto-labs/simple-store": "^0.2.0",
     "@atproto/repo": "^0.5.5",
     "@atproto/sync": "^0.1.13",
     "@atproto/syntax": "^0.3.2",
@@ -44,22 +50,37 @@
     "@connectrpc/connect-node": "^1.1.4",
     "@connectrpc/connect-web": "^1.1.4",
     "@types/cors": "^2.8.17",
+    "@atproto/oauth-client-node": "^0.3.8",
+    "@atproto/oauth-client": "^0.5.13",
+    "cors": "^2.8.5",
     "dotenv": "^16.4.7",
     "express": "^4.21.1",
+    "http-errors": "^2.0.0",
+    "http-terminator": "^3.2.0",
+    "jose": "^5.2.0",
+    "key-encoder": "^2.0.3",
+    "kysely": "^0.28.5",
+    "multiformats": "^9.9.0",
+    "p-queue": "^8.1.0",
+    "pino": "^8.21.0",
+    "pino-http": "^8.6.1",
     "pg": "^8.13.3",
     "structured-headers": "^2.0.0",
     "tsconfig-paths": "^4.2.0",
+    "typed-emitter": "^2.1.0",
     "uint8arrays": "^3.0.0",
+    "undici": "^6.19.8",
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@atproto/lex-cli": "^0.5.7",
+    "@atproto/lex-cli": "^0.8.1",
     "@atproto/pds": "^0.4.34",
     "@atproto/xrpc": "^0.6.4",
     "@bufbuild/buf": "^1.50.0",
     "@bufbuild/protoc-gen-es": "^1.5.0",
     "@connectrpc/protoc-gen-connect-es": "^1.1.4",
-    "@types/express": "^5.0.0",
+    "@types/express": "^4.17.21",
+    "@types/http-errors": "^2.0.4",
     "@types/node": "^22.10.1",
     "@types/pg": "^8.11.11",
     "@types/ws": "^8.5.13",