@clioplaylists/clio 0.1.6 → 0.1.8

package/dist/dataplane/server/routes/records.js

@@ -1,51 +1,15 @@
-"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;
+import { keyBy } from '@atproto/common';
+import { AtUri } from '@atproto/syntax';
+import { Timestamp } from '@bufbuild/protobuf';
+import * as ui8 from 'uint8arrays';
+import { ids } from '../../../lexicons/lexicons';
+import { Record } from '../../../rpc/clio_pb';
+export default (db) => ({
+    getProfileRecords: getRecords(db, ids.ComClioplaylistsAlphaActorProfile),
 });
-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.getRecords = void 0;
-const common_1 = require("@atproto/common");
-const syntax_1 = require("@atproto/syntax");
-const protobuf_1 = require("@bufbuild/protobuf");
-const ui8 = __importStar(require("uint8arrays"));
-const lexicons_1 = require("../../../lexicons/lexicons");
-const clio_pb_1 = require("../../../rpc/clio_pb");
-exports.default = (db) => ({
-    getProfileRecords: (0, exports.getRecords)(db, lexicons_1.ids.ComClioplaylistsAlphaActorProfile),
-});
-const getRecords = (db, collection) => async (req) => {
+export const getRecords = (db, collection) => async (req) => {
     const validUris = collection
-        ? req.uris.filter((uri) => new syntax_1.AtUri(uri).collection === collection)
+        ? req.uris.filter((uri) => new AtUri(uri).collection === collection)
         : req.uris;
     const res = validUris.length
         ? await db.db
@@ -54,19 +18,19 @@ const getRecords = (db, collection) => async (req) => {
             .where('uri', 'in', validUris)
             .execute()
         : [];
-    const byUri = (0, common_1.keyBy)(res, 'uri');
+    const byUri = keyBy(res, 'uri');
     const records = req.uris.map((uri) => {
         const row = byUri.get(uri);
         const json = row ? row.json : JSON.stringify(null);
         const createdAtRaw = new Date(JSON.parse(json)?.['createdAt']);
         const createdAt = !isNaN(createdAtRaw.getTime())
-            ? protobuf_1.Timestamp.fromDate(createdAtRaw)
+            ? Timestamp.fromDate(createdAtRaw)
             : undefined;
         const indexedAt = row?.indexed_at
-            ? protobuf_1.Timestamp.fromDate(new Date(row?.indexed_at))
+            ? Timestamp.fromDate(new Date(row?.indexed_at))
             : undefined;
         const recordBytes = ui8.fromString(json, 'utf8');
-        return new clio_pb_1.Record({
+        return new Record({
             record: recordBytes,
             cid: row?.cid,
             createdAt,
@@ -78,7 +42,6 @@ const getRecords = (db, collection) => async (req) => {
     });
     return { records };
 };
-exports.getRecords = getRecords;
 const compositeTime = (ts1, ts2) => {
     if (!ts1)
         return ts2;

package/dist/dataplane/server/routes/sync.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (db) => ({
+export default (db) => ({
     async getLatestRev(req) {
         const res = await db.db
             .selectFrom('actor_sync')

package/dist/dataplane/server/subscription.js

@@ -1,46 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RepoSubscription = void 0;
-const repo_1 = require("@atproto/repo");
-const sync_1 = require("@atproto/sync");
-const logger_1 = require("../../logger");
-const background_1 = require("./background");
-const indexing_1 = require("./indexing");
-class RepoSubscription {
+import { WriteOpAction } from '@atproto/repo';
+import { Firehose, MemoryRunner } from '@atproto/sync';
+import { subLogger as log } from '../../logger';
+import { BackgroundQueue } from './background';
+import { IndexingService } from './indexing';
+export class RepoSubscription {
+    opts;
+    firehose;
+    runner;
+    background;
+    indexingSvc;
     constructor(opts) {
-        Object.defineProperty(this, "opts", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: opts
-        });
-        Object.defineProperty(this, "firehose", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "runner", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "background", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "indexingSvc", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        this.opts = opts;
         const { service, db, idResolver } = opts;
-        this.background = new background_1.BackgroundQueue(db);
-        this.indexingSvc = new indexing_1.IndexingService(db, idResolver);
+        this.background = new BackgroundQueue(db);
+        this.indexingSvc = new IndexingService(db, idResolver);
         const { runner, firehose } = createFirehose({
             idResolver,
             service,
@@ -73,17 +46,16 @@ class RepoSubscription {
         await this.background.processAll();
     }
 }
-exports.RepoSubscription = RepoSubscription;
 const createFirehose = (opts) => {
     const { idResolver, service, indexingSvc } = opts;
-    const runner = new sync_1.MemoryRunner({ startCursor: 0 });
-    const firehose = new sync_1.Firehose({
+    const runner = new MemoryRunner({ startCursor: 0 });
+    const firehose = new Firehose({
         idResolver,
         runner,
         service,
         unauthenticatedHandles: true, // indexing service handles these
         unauthenticatedCommits: true, // @TODO there seems to be a very rare issue where the authenticator thinks a block is missing in deletion ops
-        onError: (err) => logger_1.subLogger.error({ err }, 'error in subscription'),
+        onError: (err) => log.error({ err }, 'error in subscription'),
         handleEvent: async (evt) => {
             if (evt.event === 'identity') {
                 await indexingSvc.indexHandle(evt.did, evt.time, true);
@@ -100,8 +72,8 @@ const createFirehose = (opts) => {
                 const indexFn = evt.event === 'delete'
                     ? indexingSvc.deleteRecord(evt.uri)
                     : indexingSvc.indexRecord(evt.uri, evt.cid, evt.record, evt.event === 'create'
-                        ? repo_1.WriteOpAction.Create
-                        : repo_1.WriteOpAction.Update, evt.time);
+                        ? WriteOpAction.Create
+                        : WriteOpAction.Update, evt.time);
                 await Promise.all([
                     indexFn,
                     indexingSvc.setCommitLastSeen(evt.did, evt.commit, evt.rev),

package/dist/error.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handler = void 0;
-const xrpc_server_1 = require("@atproto/xrpc-server");
-const logger_1 = require("./logger");
-const handler = (err, _req, res, next) => {
-    logger_1.httpLogger.error(err, 'unexpected internal server error');
+import { XRPCError } from '@atproto/xrpc-server';
+import { httpLogger as log } from './logger';
+export const handler = (err, _req, res, next) => {
+    log.error(err, 'unexpected internal server error');
     if (res.headersSent) {
         return next(err);
     }
-    const serverError = xrpc_server_1.XRPCError.fromError(err);
+    const serverError = XRPCError.fromError(err);
     res.status(serverError.type).json(serverError.payload);
 };
-exports.handler = handler;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import { Keypair } from '@atproto/crypto';
 import express from 'express';
 import { Server } from 'http';
 import { ServerConfig } from './config';
@@ -13,6 +14,7 @@ export declare class ClioAppView {
     });
     static create(opts: {
         config: ServerConfig;
+        signingKey: Keypair;
     }): ClioAppView;
     start(): Promise<Server>;
     destroy(): Promise<void>;

package/dist/index.js

@@ -1,97 +1,44 @@
-"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;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClioAppView = void 0;
-const common_1 = require("@atproto/common");
-const cors_1 = __importDefault(require("cors"));
-const dotenv_1 = require("dotenv");
-const events_1 = __importDefault(require("events"));
-const express_1 = __importDefault(require("express"));
-const http_terminator_1 = require("http-terminator");
-const api_1 = __importStar(require("./api"));
-const client_1 = require("./client");
-const context_1 = __importDefault(require("./context"));
-const error = __importStar(require("./error"));
-const lexicons_1 = require("./lexicons");
-const logger_1 = require("./logger");
-(0, dotenv_1.config)();
-class ClioAppView {
+import { DAY, SECOND } from '@atproto/common';
+import cors from 'cors';
+import { config } from 'dotenv';
+import events from 'events';
+import express from 'express';
+import { createHttpTerminator } from 'http-terminator';
+import API, { health } from './api';
+import AppContext from './context';
+import { createDataPlaneClient } from './dataplane';
+import { BasicHostList } from './dataplane/client/hosts';
+import * as error from './error';
+import { createServer } from './lexicons';
+import { loggerMiddleware } from './logger';
+config();
+export class ClioAppView {
+    ctx;
+    app;
+    server;
+    terminator;
     constructor(opts) {
-        Object.defineProperty(this, "ctx", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "app", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "server", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "terminator", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.ctx = opts.ctx;
         this.app = opts.app;
     }
     static create(opts) {
-        const { config } = opts;
-        const app = (0, express_1.default)();
-        app.use((0, cors_1.default)({ maxAge: common_1.DAY / common_1.SECOND }));
-        app.use(logger_1.loggerMiddleware);
-        const dataplane = (0, client_1.createBaseClient)('http://localhost:4000', {});
-        const server = (0, lexicons_1.createServer)();
-        const ctx = new context_1.default({
+        const { config, signingKey } = opts;
+        const app = express();
+        app.use(cors({ maxAge: DAY / SECOND }));
+        app.use(loggerMiddleware);
+        const dataplaneHostList = new BasicHostList(config.dataplaneUrls);
+        const dataplane = createDataPlaneClient(dataplaneHostList, {
+            httpVersion: '2',
+            rejectUnauthorized: false,
+        });
+        const server = createServer();
+        const ctx = new AppContext({
             cfg: config,
             dataplane,
+            signingKey,
         });
-        const api = (0, api_1.default)(server, ctx);
-        app.use(api_1.health.createRouter(ctx));
+        const api = API(server, ctx);
+        app.use(health.createRouter(ctx));
         app.use(api.xrpc.router);
         app.use(error.handler);
         return new ClioAppView({ ctx, app });
@@ -101,8 +48,8 @@ class ClioAppView {
         const server = this.app.listen(this.ctx.cfg.port);
         this.server = server;
         server.keepAliveTimeout = 90000;
-        this.terminator = (0, http_terminator_1.createHttpTerminator)({ server });
-        await events_1.default.once(server, 'listening');
+        this.terminator = createHttpTerminator({ server });
+        await events.once(server, 'listening');
         const { port } = server.address();
         this.ctx.cfg.assignPort(port);
         return server;
@@ -111,5 +58,4 @@ class ClioAppView {
         await this.terminator?.terminate();
     }
 }
-exports.ClioAppView = ClioAppView;
-exports.default = ClioAppView;
+export default ClioAppView;