@powerhousedao/reactor-local 1.9.4 → 1.10.0

package/CHANGELOG.md

@@ -1,11 +1,27 @@
-## 1.9.4 (2024-12-10)
+## 1.10.0 (2024-12-11)
+
+### 🚀 Features
+
+- **reactor-api:** Added support for processors ([#655](https://github.com/powerhouse-inc/powerhouse/pull/655))
+
+### 🩹 Fixes
+
+- **reactor-local:** start issues ([#670](https://github.com/powerhouse-inc/powerhouse/pull/670))
+- **monorepo:** remove nx cloud id ([45da8784](https://github.com/powerhouse-inc/powerhouse/commit/45da8784))
 
 ### 🧱 Updated Dependencies
 
-- Updated @powerhousedao/general-document-indexer to 1.7.4
-- Updated document-model-libs to 1.120.3
-- Updated document-drive to 1.8.4
-- Updated @powerhousedao/reactor-api to 1.9.4
+- Updated document-model-libs to 1.121.0
+- Updated document-drive to 1.9.0
+- Updated document-model to 2.11.0
+- Updated @powerhousedao/reactor-api to 1.10.0
+- Updated @powerhousedao/scalars to 1.13.0
+
+### ❤️ Thank You
+
+- acaldas
+- frankp.eth @froid1911
+- ryanwolhuter @ryanwolhuter
 
 ## 1.1.0 (2024-10-29)
 

package/dist/{chunk-DRNIS4SG.js → chunk-PS645UBL.js}

@@ -1,7 +1,4 @@
-import { require_main, createServer } from './chunk-ULLZUAKM.js';
-import { init_esm_shims, __toESM } from './chunk-GFYRWMMU.js';
-import { PGlite } from '@electric-sql/pglite';
-import { startAPI } from '@powerhousedao/reactor-api';
+import { startAPI, isProcessorClass } 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';
@@ -20,18 +17,11 @@ 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
-init_esm_shims();
-
-// ../document-drive/src/index.ts
-init_esm_shims();
-
-// ../document-drive/src/server/index.ts
-init_esm_shims();
 
 // ../document-drive/src/cache/memory.ts
-init_esm_shims();
 var InMemoryCache = class {
   cache = /* @__PURE__ */ new Map();
   async setDocument(drive, id, document) {
@@ -59,14 +49,7 @@ var InMemoryCache = class {
 };
 var memory_default = InMemoryCache;
 
-// ../document-drive/src/queue/base.ts
-init_esm_shims();
-
-// ../document-drive/src/utils/index.ts
-init_esm_shims();
-
 // ../document-drive/src/server/error.ts
-init_esm_shims();
 var DocumentModelNotFoundError = class extends Error {
   constructor(id, cause) {
     super(`Document model "${id}" not found`, { cause });
@@ -115,7 +98,6 @@ var SynchronizationUnitNotFoundError = class extends Error {
 };
 
 // ../document-drive/src/utils/run-asap.ts
-init_esm_shims();
 var RunAsap;
 ((RunAsap2) => {
   RunAsap2.useMessageChannel = (() => {
@@ -278,7 +260,6 @@ function isBefore(dateA, dateB) {
 }
 
 // ../document-drive/src/utils/logger.ts
-init_esm_shims();
 var Logger = class {
   #logger = console;
   set logger(logger2) {
@@ -307,7 +288,6 @@ var loggerInstance = new Logger();
 var logger = loggerInstance;
 
 // ../document-drive/src/queue/types.ts
-init_esm_shims();
 function isOperationJob(job) {
   return "operations" in job;
 }
@@ -544,15 +524,6 @@ var BaseQueueManager = class {
     return `queue:${driveId}${documentId ? `:${documentId}` : ""}`;
   }
 };
-
-// ../document-drive/src/read-mode/index.ts
-init_esm_shims();
-
-// ../document-drive/src/read-mode/service.ts
-init_esm_shims();
-
-// ../document-drive/src/utils/graphql.ts
-init_esm_shims();
 async function requestGraphql(...args) {
   const [url, ...requestArgs] = args;
   const client = new GraphQLClient(url, { fetch });
@@ -725,7 +696,6 @@ async function fetchDocument(url, documentId, documentModelLib) {
 }
 
 // ../document-drive/src/read-mode/errors.ts
-init_esm_shims();
 var ReadDriveError = class extends Error {
 };
 var ReadDriveNotFoundError = class extends ReadDriveError {
@@ -868,9 +838,6 @@ var ReadModeService = class {
   }
 };
 
-// ../document-drive/src/read-mode/types.ts
-init_esm_shims();
-
 // ../document-drive/src/read-mode/index.ts
 function ReadModeServer(Base) {
   return class ReadMode extends Base {
@@ -951,7 +918,6 @@ function ReadModeServer(Base) {
 }
 
 // ../document-drive/src/storage/memory.ts
-init_esm_shims();
 var MemoryStorage = class {
   documents;
   drives;
@@ -1100,7 +1066,6 @@ var MemoryStorage = class {
 };
 
 // ../document-drive/src/utils/default-drives-manager.ts
-init_esm_shims();
 function isReadModeDriveServer(obj) {
   return typeof obj.getReadDrives === "function";
 }
@@ -1329,9 +1294,6 @@ var DefaultDrivesManager = class {
     }
   }
 };
-
-// ../document-drive/src/utils/document-helpers.ts
-init_esm_shims();
 var {
   attachBranch,
   garbageCollect,
@@ -1352,11 +1314,7 @@ var {
   IntegrityIssueType
 } = utils.documentHelpers;
 
-// ../document-drive/src/server/listener/manager.ts
-init_esm_shims();
-
 // ../document-drive/src/server/types.ts
-init_esm_shims();
 var AbstractDocumentDriveServer = class {
 };
 var DefaultListenerManagerOptions = {
@@ -1374,36 +1332,6 @@ var BaseListenerManager = class {
   }
 };
 
-// ../document-drive/src/server/listener/transmitter/index.ts
-init_esm_shims();
-
-// ../document-drive/src/server/listener/transmitter/internal.ts
-init_esm_shims();
-
-// ../document-drive/src/server/utils.ts
-init_esm_shims();
-function buildRevisionsFilter(strands, driveId, documentId) {
-  return strands.reduce((acc, s) => {
-    if (!(s.driveId === driveId && s.documentId === documentId)) {
-      return acc;
-    }
-    acc[s.scope] = s.operations[s.operations.length - 1]?.index ?? -1;
-    return acc;
-  }, {});
-}
-function filterOperationsByRevision(operations, revisions) {
-  if (!revisions) {
-    return operations;
-  }
-  return Object.keys(operations).reduce((acc, scope) => {
-    const revision = revisions[scope];
-    if (revision !== void 0) {
-      acc[scope] = operations[scope].filter((op) => op.index <= revision);
-    }
-    return acc;
-  }, operations);
-}
-
 // ../document-drive/src/server/listener/transmitter/internal.ts
 var InternalTransmitter = class {
   drive;
@@ -1413,45 +1341,67 @@ var InternalTransmitter = class {
     this.listener = listener;
     this.drive = drive;
   }
-  async transmit(strands) {
+  async #buildInternalOperationUpdate(strand) {
+    const operations = [];
+    const stateByIndex = /* @__PURE__ */ new Map();
+    const getStateByIndex = async (index) => {
+      const state = stateByIndex.get(index);
+      if (state) {
+        return state;
+      }
+      const document = await this.drive.getDocument(
+        strand.driveId,
+        strand.documentId,
+        {
+          revisions: {
+            [strand.scope]: index
+          },
+          checkHashes: false
+        }
+      );
+      if (index < 0) {
+        stateByIndex.set(index, document.initialState.state[strand.scope]);
+      } else {
+        stateByIndex.set(index, document.state[strand.scope]);
+      }
+      return stateByIndex.get(index);
+    };
+    for (const operation of strand.operations) {
+      operations.push({
+        ...operation,
+        state: await getStateByIndex(operation.index),
+        previousState: await getStateByIndex(operation.index - 1)
+      });
+    }
+    return operations;
+  }
+  async transmit(strands, _source) {
     if (!this.receiver) {
       return [];
     }
-    const retrievedDocuments = /* @__PURE__ */ new Map();
     const updates = [];
     for (const strand of strands) {
-      let document = retrievedDocuments.get(
-        `${strand.driveId}:${strand.documentId}`
-      );
-      if (!document) {
-        const revisions = buildRevisionsFilter(
-          strands,
-          strand.driveId,
-          strand.documentId
-        );
-        document = await (strand.documentId ? this.drive.getDocument(strand.driveId, strand.documentId, {
-          revisions
-        }) : this.drive.getDrive(strand.driveId, { revisions }));
-        retrievedDocuments.set(
-          `${strand.driveId}:${strand.documentId}`,
-          document
-        );
-      }
-      updates.push({ ...strand, state: document.state[strand.scope] });
+      const operations = await this.#buildInternalOperationUpdate(strand);
+      const state = operations.at(-1)?.state ?? {};
+      updates.push({
+        ...strand,
+        operations,
+        state
+      });
     }
     try {
-      await this.receiver.transmit(updates);
+      await this.receiver.onStrands(updates);
       return strands.map(({ operations, ...s }) => ({
         ...s,
         status: "SUCCESS",
-        revision: operations[operations.length - 1]?.index ?? -1
+        revision: operations.at(operations.length - 1)?.index ?? -1
       }));
     } catch (error) {
       logger.error(error);
       return strands.map(({ operations, ...s }) => ({
         ...s,
         status: "ERROR",
-        revision: (operations[0]?.index ?? 0) - 1
+        revision: (operations.at(0)?.index ?? 0) - 1
       }));
     }
   }
@@ -1459,12 +1409,14 @@ var InternalTransmitter = class {
     this.receiver = receiver;
   }
   async disconnect() {
-    await this.receiver?.disconnect();
+    await this.receiver?.onDisconnect();
+  }
+  getListener() {
+    return this.listener;
   }
 };
 
 // ../document-drive/src/server/listener/transmitter/pull-responder.ts
-init_esm_shims();
 var PullResponderTransmitter = class _PullResponderTransmitter {
   drive;
   listener;
@@ -1729,9 +1681,6 @@ var PullResponderTransmitter = class _PullResponderTransmitter {
     return trigger.type === "PullResponder";
   }
 };
-
-// ../document-drive/src/server/listener/transmitter/switchboard-push.ts
-init_esm_shims();
 var SwitchboardPushTransmitter = class {
   drive;
   listener;
@@ -1790,9 +1739,6 @@ var SwitchboardPushTransmitter = class {
   }
 };
 
-// ../document-drive/src/server/listener/transmitter/types.ts
-init_esm_shims();
-
 // ../document-drive/src/server/listener/manager.ts
 function debounce(func, delay = 250) {
   let timer;
@@ -1854,6 +1800,7 @@ var ListenerManager = class _ListenerManager extends BaseListenerManager {
     const driveTransmitters = this.transmitters[drive] || {};
     driveTransmitters[listener.listenerId] = transmitter;
     this.transmitters[drive] = driveTransmitters;
+    this.triggerUpdate(true, { type: "local" });
     return Promise.resolve(transmitter);
   }
   async removeListener(driveId, listenerId) {
@@ -2181,8 +2128,19 @@ var ListenerManager = class _ListenerManager extends BaseListenerManager {
   }
 };
 
-// ../document-drive/src/server/listener/index.ts
-init_esm_shims();
+// ../document-drive/src/server/utils.ts
+function filterOperationsByRevision(operations, revisions) {
+  if (!revisions) {
+    return operations;
+  }
+  return Object.keys(operations).reduce((acc, scope) => {
+    const revision = revisions[scope];
+    if (revision !== void 0) {
+      acc[scope] = operations[scope].filter((op) => op.index <= revision);
+    }
+    return acc;
+  }, operations);
+}
 
 // ../document-drive/src/server/index.ts
 var PULL_DRIVE_INTERVAL = 5e3;
@@ -3742,15 +3700,6 @@ var BaseDocumentDriveServer = class extends AbstractDocumentDriveServer {
   }
 };
 var DocumentDriveServer = ReadModeServer(BaseDocumentDriveServer);
-
-// ../document-drive/src/storage/index.ts
-init_esm_shims();
-
-// ../document-drive/src/storage/base.ts
-init_esm_shims();
-
-// ../document-drive/src/storage/filesystem.ts
-init_esm_shims();
 function ensureDir(dir) {
   if (!existsSync(dir)) {
     mkdirSync(dir, { recursive: true });
@@ -3947,12 +3896,6 @@ var FilesystemStorage = class _FilesystemStorage {
     }, []);
   }
 };
-
-// ../../node_modules/.pnpm/vite@6.0.2_@types+node@22.10.1_jiti@2.4.0_lightningcss@1.28.2_terser@5.36.0_tsx@4.19.2_yaml@2.6.1/node_modules/vite/dist/node/index.js
-init_esm_shims();
-__toESM(require_main(), 1);
-
-// src/server.ts
 var dirname = import.meta.dirname || path2.dirname(fileURLToPath(import.meta.url));
 dotenv.config();
 var DefaultStartServerOptions = {
@@ -4006,42 +3949,17 @@ var startServer = async (options) => {
     }
   }
   try {
-    const client = new PGlite(options?.dbPath ?? process.cwd() + "/dev.db");
-    const { app, reactorRouterManager } = await startAPI(driveServer, {
+    const api = await startAPI(driveServer, {
       port: serverPort,
-      client
+      dbConnection: options?.dbPath ?? process.cwd() + "/dev.db"
     });
     driveUrl = `http://localhost:${serverPort}/${driveId ? `d/${drive.global.slug ?? drive.global.id}` : ""}`;
     console.log(`  \u279C  Reactor:   ${driveUrl}`);
     if (dev) {
-      const vite = await createServer({
-        server: { middlewareMode: true },
-        appType: "custom",
-        build: {
-          rollupOptions: {
-            input: []
-          }
-        }
-      });
-      app.use(vite.middlewares);
-      const documentModelsPath = path2.join(process.cwd(), "./document-models");
-      console.log("Loading document models from", documentModelsPath);
-      const localDMs = await vite.ssrLoadModule(documentModelsPath);
-      driveServer.setDocumentModels([
-        ...baseDocumentModels,
-        ...Object.values(localDMs)
-      ]);
-      const processorsPath = path2.join(process.cwd(), "./processors");
-      console.log("Loading processors from", processorsPath);
-      const localProcessors = await vite.ssrLoadModule(processorsPath);
-      for (const [name, processor] of Object.entries(localProcessors)) {
-        await reactorRouterManager.registerProcessor({
-          ...processor
-        });
-      }
+      await startDevMode(api, driveServer);
     }
   } catch (e) {
-    console.error("App crashed", e);
+    console.error("Error starting API", e);
   }
   return {
     driveUrl,
@@ -4051,5 +3969,39 @@ var startServer = async (options) => {
     addListener: (driveId2, receiver, options2) => driveServer.addInternalListener(driveId2, receiver, options2)
   };
 };
+var startDevMode = async (api, driveServer) => {
+  const vite = await createServer({
+    server: { middlewareMode: true, watch: null },
+    appType: "custom",
+    build: {
+      rollupOptions: {
+        input: []
+      }
+    }
+  });
+  api.app.use(vite.middlewares);
+  const documentModelsPath = path2.join(process.cwd(), "./document-models");
+  await loadDocumentModels(documentModelsPath, vite, driveServer);
+  const processorsPath = path2.join(process.cwd(), "./processors");
+  await loadProcessors(processorsPath, vite, api.processorManager);
+};
+async function loadDocumentModels(path3, vite, driveServer) {
+  console.log("Loading document models from", path3);
+  const localDMs = await vite.ssrLoadModule(path3);
+  driveServer.setDocumentModels([
+    ...baseDocumentModels,
+    ...Object.values(localDMs)
+  ]);
+}
+async function loadProcessors(path3, vite, processorManager) {
+  console.log("Loading processors from", path3);
+  const localProcessors = await vite.ssrLoadModule(path3);
+  for (const [name, processor] of Object.entries(localProcessors)) {
+    const ProcessorClass = processor[name];
+    if (isProcessorClass(ProcessorClass)) {
+      await processorManager.registerProcessor(ProcessorClass);
+    }
+  }
+}
 
 export { DefaultStartServerOptions, startServer };

package/dist/cli.js

@@ -1,12 +1,7 @@
 #! /usr/bin/env node
-import { startServer } from './chunk-DRNIS4SG.js';
-import './chunk-ULLZUAKM.js';
-import './chunk-MSJXUT2A.js';
-import { init_esm_shims } from './chunk-GFYRWMMU.js';
+import { startServer } from './chunk-PS645UBL.js';
 import { Command } from 'commander';
 
-// src/cli.ts
-init_esm_shims();
 var reactorLocalAction = (options) => {
   if (options.port) {
     process.env.PORT = options.port;

package/dist/index.js

@@ -1,11 +1,7 @@
-import { startServer } from './chunk-DRNIS4SG.js';
-export { DefaultStartServerOptions, startServer } from './chunk-DRNIS4SG.js';
-import './chunk-ULLZUAKM.js';
-import './chunk-MSJXUT2A.js';
-import { init_esm_shims } from './chunk-GFYRWMMU.js';
+import { startServer } from './chunk-PS645UBL.js';
+export { DefaultStartServerOptions, startServer } from './chunk-PS645UBL.js';
 
 // src/index.ts
-init_esm_shims();
-startServer().catch((error) => {
+startServer({ dev: true }).catch((error) => {
   throw error;
 });

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { Trigger, PullResponderTriggerData, DocumentDriveState, DocumentDriveLocalState, ListenerFilter, ListenerCallInfo, DocumentDriveDocument, DocumentDriveAction } from 'document-model-libs/document-drive';
-import { Document, OperationScope, Operation, State, ActionContext, DocumentModel, Action, BaseAction, CreateChildDocumentInput, ReducerOptions, Signal } from 'document-model/document';
+import { Operation, Document, OperationScope, State, ActionContext, DocumentModel, Action, BaseAction, CreateChildDocumentInput, ReducerOptions, Signal } from 'document-model/document';
 import { Unsubscribe } from 'nanoevents';
 
 type StrandUpdateSource = {
@@ -17,31 +17,6 @@ type PullResponderTrigger = Omit<Trigger, "data" | "type"> & {
     type: "PullResponder";
 };
 
-interface IReceiver {
-    transmit: (strands: InternalTransmitterUpdate[]) => Promise<void>;
-    disconnect: () => Promise<void>;
-}
-type InternalTransmitterUpdate<T extends Document = Document, S extends OperationScope = OperationScope> = {
-    driveId: string;
-    documentId: string;
-    scope: S;
-    branch: string;
-    operations: OperationUpdate[];
-    state: T["state"][S];
-};
-interface IInternalTransmitter extends ITransmitter {
-    setReceiver(receiver: IReceiver): void;
-}
-declare class InternalTransmitter implements ITransmitter {
-    private drive;
-    private listener;
-    private receiver;
-    constructor(listener: Listener, drive: IBaseDocumentDriveServer);
-    transmit(strands: InternalTransmitterUpdate[]): Promise<ListenerRevision[]>;
-    setReceiver(receiver: IReceiver): void;
-    disconnect(): Promise<void>;
-}
-
 declare class OperationError extends Error {
     status: ErrorStatus;
     operation: Operation | undefined;
@@ -59,6 +34,39 @@ type DriveInfo = {
     icon?: string;
 };
 
+type InferDocumentOperation<D extends Document> = D extends Document<unknown, infer A> ? A : never;
+
+interface IReceiver<T extends Document = Document, S extends OperationScope = OperationScope> {
+    onStrands: (strands: InternalTransmitterUpdate<T, S>[]) => Promise<void>;
+    onDisconnect: () => Promise<void>;
+}
+type InternalOperationUpdate<D extends Document = Document, S extends OperationScope = OperationScope> = Omit<Operation<InferDocumentOperation<D>>, "scope"> & {
+    state: D["state"][S];
+    previousState: D["state"][S];
+};
+type InternalTransmitterUpdate<D extends Document = Document, S extends OperationScope = OperationScope> = {
+    driveId: string;
+    documentId: string;
+    scope: S;
+    branch: string;
+    operations: InternalOperationUpdate<D, S>[];
+    state: D["state"][S];
+};
+interface IInternalTransmitter extends ITransmitter {
+    setReceiver(receiver: IReceiver): void;
+}
+declare class InternalTransmitter implements ITransmitter {
+    #private;
+    protected drive: IBaseDocumentDriveServer;
+    protected listener: Listener;
+    protected receiver: IReceiver | undefined;
+    constructor(listener: Listener, drive: IBaseDocumentDriveServer);
+    transmit(strands: StrandUpdate[], _source: StrandUpdateSource): Promise<ListenerRevision[]>;
+    setReceiver(receiver: IReceiver): void;
+    disconnect(): Promise<void>;
+    getListener(): Listener;
+}
+
 type DriveInput = State<Omit<DocumentDriveState, "__typename" | "id" | "nodes"> & {
     id?: string;
 }, DocumentDriveLocalState>;

package/dist/server.js

@@ -1,4 +1 @@
-export { DefaultStartServerOptions, startServer } from './chunk-DRNIS4SG.js';
-import './chunk-ULLZUAKM.js';
-import './chunk-MSJXUT2A.js';
-import './chunk-GFYRWMMU.js';
+export { DefaultStartServerOptions, startServer } from './chunk-PS645UBL.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/reactor-local",
   "type": "module",
-  "version": "1.9.4",
+  "version": "1.10.0",
   "main": "dist/server.js",
   "bin": {
     "reactor-local": "dist/cli.js"
@@ -20,31 +20,30 @@
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",
     "express": "^4.21.0",
-    "graphql": "^16.8.1",
+    "graphql": "^16.9.0",
     "graphql-request": "^6.1.0",
     "json-stringify-deterministic": "^1.0.12",
     "ms": "^2.1.3",
     "nanoevents": "^9.0.0",
     "sanitize-filename": "^1.6.3",
     "uuid": "^11.0.2",
-    "@powerhousedao/general-document-indexer": "1.7.4",
-    "@powerhousedao/reactor-api": "1.9.4",
-    "@powerhousedao/scalars": "1.12.0",
-    "document-model": "2.10.0",
-    "document-model-libs": "1.120.3"
+    "@powerhousedao/reactor-api": "1.10.0",
+    "document-model": "2.11.0",
+    "@powerhousedao/scalars": "1.13.0",
+    "document-model-libs": "1.121.0"
   },
   "devDependencies": {
+    "@powerhousedao/analytics-engine-graphql": "^0.2.0",
     "@types/body-parser": "^1.19.5",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/ms": "^0.7.34",
     "@types/node": "^22.7.5",
     "tsup": "^8.3.5",
-    "document-drive": "1.8.4"
+    "document-drive": "1.9.0"
   },
   "scripts": {
     "start": "vite-node src/index.ts",
-    "build": "tsup",
-    "prestart": "pnpm db:migrate"
+    "build": "tsup"
   }
 }

package/src/index.ts

@@ -2,6 +2,6 @@ import { startServer } from "./server.js";
 
 export * from "./server.js";
 
-startServer().catch((error: unknown) => {
+startServer({ dev: true }).catch((error: unknown) => {
   throw error;
 });