@powerhousedao/reactor-local 1.6.1 → 1.8.0

package/CHANGELOG.md

@@ -1,8 +1,25 @@
-## 1.6.1 (2024-11-30)
+## 1.8.0 (2024-12-05)
+
+### 🚀 Features
+
+- merge dspot-scalars into main ([5ca898fc](https://github.com/powerhouse-inc/powerhouse/commit/5ca898fc))
+
+### 🩹 Fixes
+
+- **switchboard-gui:** restore prev vite version ([#614](https://github.com/powerhouse-inc/powerhouse/pull/614))
 
 ### 🧱 Updated Dependencies
 
-- Updated @powerhousedao/reactor-api to 1.6.1
+- Updated @powerhousedao/general-document-indexer to 1.6.0
+- Updated document-model-libs to 1.118.0
+- Updated document-drive to 1.7.0
+- Updated document-model to 2.9.0
+- Updated @powerhousedao/reactor-api to 1.8.0
+- Updated @powerhousedao/scalars to 1.11.0
+
+### ❤️ Thank You
+
+- Guillermo Puente Sandoval @gpuente
 
 ## 1.1.0 (2024-10-29)
 

package/dist/{chunk-JEZMQ4ZA.js → chunk-WZM6GQ5Q.js}

@@ -1,8 +1,5 @@
-import path2 from 'node:path';
-import { fileURLToPath } from 'node:url';
-import dotenv from 'dotenv';
-import { createServer } from 'vite';
-import { startAPI, addSubgraph, createSchema, registerInternalListener } from '@powerhousedao/reactor-api';
+import { PGlite } from '@electric-sql/pglite';
+import { startAPI } from '@powerhousedao/reactor-api';
 import * as DocumentDrive from 'document-model-libs/document-drive';
 import { isFileNode, utils as utils$1, actions, documentModel } from 'document-model-libs/document-drive';
 import { utils } from 'document-model/document';
@@ -18,6 +15,10 @@ import path from 'path';
 import sanitize from 'sanitize-filename';
 import * as DocumentModelsLibs from 'document-model-libs/document-models';
 import { module } from 'document-model/document-model';
+import dotenv from 'dotenv';
+import path2 from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { createServer } from 'vite';
 
 // src/server.ts
 
@@ -3884,6 +3885,7 @@ dotenv.config();
 var DefaultStartServerOptions = {
   port: 4001,
   storagePath: path2.join(dirname, "./file-storage"),
+  dbPath: path2.join(dirname, "./dev.db"),
   drive: {
     global: {
       id: "powerhouse",
@@ -3931,8 +3933,10 @@ var startServer = async (options) => {
     }
   }
   try {
-    const app = await startAPI(driveServer, {
-      port: serverPort
+    const client = new PGlite(options?.dbPath ?? process.cwd() + "/dev.db");
+    const { app, reactorRouterManager } = await startAPI(driveServer, {
+      port: serverPort,
+      client
     });
     driveUrl = `http://localhost:${serverPort}/${driveId ? `d/${drive.global.slug ?? drive.global.id}` : ""}`;
     console.log(`  \u279C  Reactor:   ${driveUrl}`);
@@ -3960,21 +3964,9 @@ var startServer = async (options) => {
         processorsPath
       );
       for (const [name, processor] of Object.entries(localProcessors)) {
-        await Promise.all([
-          addSubgraph({
-            name,
-            getSchema: (driveServer2) => createSchema(
-              driveServer2,
-              processor.resolvers,
-              processor.typeDefs
-            )
-          }),
-          registerInternalListener({
-            name,
-            options: processor.options,
-            transmit: processor.transmit
-          })
-        ]);
+        await reactorRouterManager.registerProcessor({
+          ...processor
+        });
       }
     }
   } catch (e) {

package/dist/cli.js

@@ -1,5 +1,5 @@
 #! /usr/bin/env node
-import { startServer } from './chunk-JEZMQ4ZA.js';
+import { startServer } from './chunk-WZM6GQ5Q.js';
 import { Command } from 'commander';
 
 var reactorLocalAction = (options) => {

package/dist/index.js

@@ -1,5 +1,5 @@
-import { startServer } from './chunk-JEZMQ4ZA.js';
-export { DefaultStartServerOptions, startServer } from './chunk-JEZMQ4ZA.js';
+import { startServer } from './chunk-WZM6GQ5Q.js';
+export { DefaultStartServerOptions, startServer } from './chunk-WZM6GQ5Q.js';
 
 // src/index.ts
 startServer().catch((error) => {

package/dist/server.d.ts

@@ -37,7 +37,7 @@ declare class InternalTransmitter implements ITransmitter {
     private listener;
     private receiver;
     constructor(listener: Listener, drive: IBaseDocumentDriveServer);
-    transmit(strands: StrandUpdate[]): Promise<ListenerRevision[]>;
+    transmit(strands: InternalTransmitterUpdate[]): Promise<ListenerRevision[]>;
     setReceiver(receiver: IReceiver): void;
     disconnect(): Promise<void>;
 }
@@ -235,11 +235,13 @@ type StartServerOptions = {
     dev?: boolean;
     port?: string | number;
     storagePath?: string;
+    dbPath?: string;
     drive?: DriveInput;
 };
 declare const DefaultStartServerOptions: {
     port: number;
     storagePath: string;
+    dbPath: string;
     drive: {
         global: {
             id: string;

package/dist/server.js

@@ -1 +1 @@
-export { DefaultStartServerOptions, startServer } from './chunk-JEZMQ4ZA.js';
+export { DefaultStartServerOptions, startServer } from './chunk-WZM6GQ5Q.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/reactor-local",
   "type": "module",
-  "version": "1.6.1",
+  "version": "1.8.0",
   "main": "dist/server.js",
   "bin": {
     "reactor-local": "dist/cli.js"
@@ -19,24 +19,21 @@
     "change-case": "^5.4.4",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",
-    "drizzle-kit": "^0.25.0",
-    "drizzle-orm": "^0.34.1",
     "express": "^4.21.0",
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
     "json-stringify-deterministic": "^1.0.12",
     "ms": "^2.1.3",
     "nanoevents": "^9.0.0",
-    "pg": "^8.13.0",
     "sanitize-filename": "^1.6.3",
     "uuid": "^11.0.2",
-    "vite": "^5.4.11",
-    "vite-node": "^2.1.2",
-    "@powerhousedao/general-document-indexer": "1.4.0",
-    "@powerhousedao/scalars": "1.9.0",
-    "document-model": "2.7.1",
-    "document-model-libs": "1.117.0",
-    "@powerhousedao/reactor-api": "1.6.1"
+    "vite": "^6.0.2",
+    "vite-node": "^2.1.7",
+    "@powerhousedao/general-document-indexer": "1.6.0",
+    "@powerhousedao/reactor-api": "1.8.0",
+    "@powerhousedao/scalars": "1.11.0",
+    "document-model": "2.9.0",
+    "document-model-libs": "1.118.0"
   },
   "devDependencies": {
     "@types/body-parser": "^1.19.5",
@@ -44,22 +41,17 @@
     "@types/express": "^5.0.0",
     "@types/ms": "^0.7.34",
     "@types/node": "^22.7.5",
-    "@types/pg": "^8.11.10",
     "postcss": "^8.4.47",
-    "tsup": "^8.3.0",
-    "typescript": "^5.6.2",
-    "@powerhousedao/scalars": "1.9.0",
-    "document-drive": "1.5.0"
+    "tsup": "^8.3.5",
+    "@powerhousedao/scalars": "1.11.0",
+    "document-drive": "1.7.0"
   },
   "peerDependencies": {
-    "@powerhousedao/scalars": "1.9.0"
+    "@powerhousedao/scalars": "1.11.0"
   },
   "scripts": {
     "start": "vite-node src/index.ts",
     "build": "tsup",
-    "db:migrate": "drizzle-kit migrate",
-    "db:studio": "drizzle-kit studio",
-    "db:generate": "drizzle-kit generate",
     "prestart": "pnpm db:migrate"
   }
 }

package/src/server.ts

@@ -1,13 +1,5 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import dotenv from "dotenv";
-import { createServer as createViteServer } from "vite";
-import {
-  startAPI,
-  addSubgraph,
-  registerInternalListener,
-  createSchema,
-} from "@powerhousedao/reactor-api";
+import { PGlite } from "@electric-sql/pglite";
+import { startAPI } from "@powerhousedao/reactor-api";
 import {
   DocumentDriveServer,
   DriveAlreadyExistsError,
@@ -16,10 +8,17 @@ import {
   IReceiver,
 } from "document-drive";
 import { FilesystemStorage } from "document-drive/storage/filesystem";
+import {
+  DocumentDriveDocument,
+  ListenerFilter,
+} from "document-model-libs/document-drive";
 import * as DocumentModelsLibs from "document-model-libs/document-models";
 import { DocumentModel } from "document-model/document";
 import { module as DocumentModelLib } from "document-model/document-model";
-import { ListenerFilter } from "document-model-libs/document-drive";
+import dotenv from "dotenv";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { createServer as createViteServer } from "vite";
 
 const dirname =
   import.meta.dirname || path.dirname(fileURLToPath(import.meta.url));
@@ -30,12 +29,14 @@ export type StartServerOptions = {
   dev?: boolean;
   port?: string | number;
   storagePath?: string;
+  dbPath?: string;
   drive?: DriveInput;
 };
 
 export const DefaultStartServerOptions = {
   port: 4001,
   storagePath: path.join(dirname, "./file-storage"),
+  dbPath: path.join(dirname, "./dev.db"),
   drive: {
     global: {
       id: "powerhouse",
@@ -63,7 +64,7 @@ export type LocalReactor = {
       label: string;
       block: boolean;
       filter: ListenerFilter;
-    }
+    },
   ) => Promise<InternalTransmitter>;
 };
 
@@ -73,7 +74,7 @@ const baseDocumentModels = [
 ] as DocumentModel[];
 
 const startServer = async (
-  options?: StartServerOptions
+  options?: StartServerOptions,
 ): Promise<LocalReactor> => {
   const { port, storagePath, drive, dev } = {
     ...DefaultStartServerOptions,
@@ -84,7 +85,7 @@ const startServer = async (
   // start document drive server with all available document models & filesystem storage
   const driveServer = new DocumentDriveServer(
     baseDocumentModels,
-    new FilesystemStorage(storagePath)
+    new FilesystemStorage(storagePath),
   );
 
   // init drive server
@@ -100,9 +101,9 @@ const startServer = async (
     if (e instanceof DriveAlreadyExistsError) {
       console.info("Default drive already exists. Skipping...");
       if (driveId) {
-        const driveDoc = await (drive.global.slug
+        const driveDoc = (await (drive.global.slug
           ? driveServer.getDriveBySlug(drive.global.slug)
-          : driveServer.getDrive(driveId));
+          : driveServer.getDrive(driveId))) as DocumentDriveDocument;
         driveId = driveDoc.state.global.slug ?? driveDoc.state.global.id;
       }
     } else {
@@ -112,8 +113,11 @@ const startServer = async (
 
   try {
     // start api
-    const app = await startAPI(driveServer, {
+    const client = new PGlite(options?.dbPath ?? process.cwd() + "/dev.db");
+
+    const { app, reactorRouterManager } = await startAPI(driveServer, {
       port: serverPort,
+      client,
     });
     driveUrl = `http://localhost:${serverPort}/${driveId ? `d/${drive.global.slug ?? drive.global.id}` : ""}`;
     console.log(`  ➜  Reactor:   ${driveUrl}`);
@@ -145,26 +149,13 @@ const startServer = async (
       const processorsPath = path.join(process.cwd(), "./processors");
       console.log("Loading processors from", processorsPath);
       const localProcessors = (await vite.ssrLoadModule(
-        processorsPath
+        processorsPath,
       )) as Record<string, any>;
 
       for (const [name, processor] of Object.entries(localProcessors)) {
-        await Promise.all([
-          addSubgraph({
-            name,
-            getSchema: (driveServer) =>
-              createSchema(
-                driveServer,
-                processor.resolvers,
-                processor.typeDefs
-              ),
-          }),
-          registerInternalListener({
-            name,
-            options: processor.options,
-            transmit: processor.transmit,
-          }),
-        ]);
+        await reactorRouterManager.registerProcessor({
+          ...processor,
+        });
       }
     }
   } catch (e) {
@@ -184,7 +175,7 @@ const startServer = async (
         label: string;
         block: boolean;
         filter: ListenerFilter;
-      }
+      },
     ) => driveServer.addInternalListener(driveId, receiver, options),
   };
 };

package/dist/indexer.d.ts

@@ -1,9 +0,0 @@
-import { IDocumentDriveServer } from 'document-drive/server';
-
-type DocumentIndexerOptions = {
-    reactor: IDocumentDriveServer;
-    path: string;
-};
-declare function addDocumentIndexer(options: DocumentIndexerOptions): Promise<void>;
-
-export { type DocumentIndexerOptions, addDocumentIndexer };

package/dist/indexer.js

@@ -1,24 +0,0 @@
-import { drizzle } from 'drizzle-orm/connect';
-import { setAdditionalContextFields, registerInternalListener, addSubgraph, createSchema } from '@powerhousedao/reactor-api';
-import * as searchListener from '@powerhousedao/general-document-indexer';
-
-// src/indexer.ts
-async function addDocumentIndexer(options2) {
-  const db = await drizzle("pglite", options2.path);
-  setAdditionalContextFields({ db });
-  await registerInternalListener({
-    name: "search",
-    options: searchListener.options,
-    transmit: (strands) => searchListener.transmit(strands, db)
-  });
-  await addSubgraph({
-    getSchema: () => createSchema(
-      options2.reactor,
-      searchListener.resolvers,
-      searchListener.typeDefs
-    ),
-    name: "search/:drive"
-  });
-}
-
-export { addDocumentIndexer };

package/drizzle.config.ts

@@ -1,11 +0,0 @@
-import { defineConfig } from "drizzle-kit";
-export default defineConfig({
-  driver: "pglite",
-  dialect: "postgresql",
-  schema: [
-    "node_modules/@powerhousedao/general-document-indexer/src/schema.ts",
-  ],
-  dbCredentials: {
-    url: "./dev.db",
-  },
-});

package/src/indexer.ts

@@ -1,38 +0,0 @@
-import { drizzle } from "drizzle-orm/connect";
-import { type GraphQLResolverMap } from "@apollo/subgraph/dist/schema-helper";
-import {
-  addSubgraph,
-  createSchema,
-  registerInternalListener,
-  setAdditionalContextFields,
-} from "@powerhousedao/reactor-api";
-import * as searchListener from "@powerhousedao/general-document-indexer";
-import { IDocumentDriveServer } from "document-drive/server";
-
-export type DocumentIndexerOptions = {
-  reactor: IDocumentDriveServer;
-  path: string;
-};
-
-export async function addDocumentIndexer(options: DocumentIndexerOptions) {
-  const db = await drizzle("pglite", options.path);
-  setAdditionalContextFields({ db });
-
-  // register general document indexer listener
-  await registerInternalListener({
-    name: "search",
-    options: searchListener.options,
-    transmit: (strands) => searchListener.transmit(strands, db),
-  });
-
-  // add general document indexer subgraph
-  await addSubgraph({
-    getSchema: () =>
-      createSchema(
-        options.reactor,
-        searchListener.resolvers as GraphQLResolverMap,
-        searchListener.typeDefs,
-      ),
-    name: "search/:drive",
-  });
-}