@towns-protocol/sdk 0.0.241 → 0.0.244

package/dist/makeNotificationRpcClient.js

@@ -1,8 +1,8 @@
-import { createClient } from '@connectrpc/connect';
+import { createClient } from '@towns-protocol/rpc-connector/common';
 import { NotificationService } from '@towns-protocol/proto';
 import { dlog } from '@towns-protocol/dlog';
 import { getEnvVar, randomUrlSelector } from './utils';
-import { createHttp2ConnectTransport } from './rpcCommon';
+import { createHttp2ConnectTransport } from '@towns-protocol/rpc-connector';
 import { DEFAULT_RETRY_PARAMS, loggingInterceptor, retryInterceptor, setHeaderInterceptor, } from './rpcInterceptors';
 const logInfo = dlog('csb:rpc:info');
 let nextRpcClientNum = 0;

package/dist/makeNotificationRpcClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"makeNotificationRpcClient.js","sourceRoot":"","sources":["../src/makeNotificationRpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,EAAE,2BAA2B,EAAc,MAAM,aAAa,CAAA;AACrE,OAAO,EACH,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,GACvB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,CAAA;AAEpC,IAAI,gBAAgB,GAAG,CAAC,CAAA;AAIxB,MAAM,UAAU,yBAAyB,CACrC,IAAY,EACZ,YAAoB,EACpB,IAAiB;IAEjB,MAAM,WAAW,GAAG,gBAAgB,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,oBAAoB,CAAA;IAC7D,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACnC,OAAO,CACH,+CAA+C,EAC/C,GAAG,EACH,WAAW,EACX,IAAI,EACJ,gBAAgB,EAChB,WAAW,CACd,CAAA;IACD,MAAM,OAAO,GAA4B;QACrC,OAAO,EAAE,GAAG;QACZ,YAAY,EAAE;YACV,GAAG,CAAC,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;YAC7B,oBAAoB,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;YACrD,kBAAkB,CAAC,WAAW,EAAE,qBAAqB,CAAC;YACtD,gBAAgB,CAAC,WAAW,CAAC;SAChC;QACD,gBAAgB,EAAE,SAAS,EAAE,yEAAyE;KACzG,CAAA;IACD,IAAI,SAAS,CAAC,uBAAuB,CAAC,KAAK,MAAM,EAAE,CAAC;QAChD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAA;IAClC,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,qEAAqE,CAAC,CAAA;QAC9E,OAAO,CAAC,eAAe,GAAG,KAAK,CAAA;QAC/B,OAAO,CAAC,WAAW,GAAG;YAClB,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,IAAI;SAC1B,CAAA;IACL,CAAC;IACD,MAAM,SAAS,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAA;IACtD,MAAM,MAAM,GAA0B,YAAY,CAC9C,mBAAmB,EACnB,SAAS,CACa,CAAA;IAC1B,MAAM,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,OAAO,MAAM,CAAA;AACjB,CAAC"}
+{"version":3,"file":"makeNotificationRpcClient.js","sourceRoot":"","sources":["../src/makeNotificationRpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAA2B,MAAM,sCAAsC,CAAA;AACpG,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAEtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AAC3E,OAAO,EACH,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,GACvB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,CAAA;AAEpC,IAAI,gBAAgB,GAAG,CAAC,CAAA;AAIxB,MAAM,UAAU,yBAAyB,CACrC,IAAY,EACZ,YAAoB,EACpB,IAAiB;IAEjB,MAAM,WAAW,GAAG,gBAAgB,EAAE,CAAA;IACtC,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,oBAAoB,CAAA;IAC7D,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACnC,OAAO,CACH,+CAA+C,EAC/C,GAAG,EACH,WAAW,EACX,IAAI,EACJ,gBAAgB,EAChB,WAAW,CACd,CAAA;IACD,MAAM,OAAO,GAA4B;QACrC,OAAO,EAAE,GAAG;QACZ,YAAY,EAAE;YACV,GAAG,CAAC,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;YAC7B,oBAAoB,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;YACrD,kBAAkB,CAAC,WAAW,EAAE,qBAAqB,CAAC;YACtD,gBAAgB,CAAC,WAAW,CAAC;SAChC;QACD,gBAAgB,EAAE,SAAS,EAAE,yEAAyE;KACzG,CAAA;IACD,IAAI,SAAS,CAAC,uBAAuB,CAAC,KAAK,MAAM,EAAE,CAAC;QAChD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAA;IAClC,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,qEAAqE,CAAC,CAAA;QAC9E,OAAO,CAAC,eAAe,GAAG,KAAK,CAAA;QAC/B,OAAO,CAAC,WAAW,GAAG;YAClB,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,IAAI;SAC1B,CAAA;IACL,CAAC;IACD,MAAM,SAAS,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAA;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,mBAAmB,EAAE,SAAS,CAA0B,CAAA;IACpF,MAAM,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,OAAO,MAAM,CAAA;AACjB,CAAC"}

package/dist/makeStreamRpcClient.d.ts

@@ -1,4 +1,4 @@
-import { Client } from '@connectrpc/connect';
+import { Client } from '@towns-protocol/rpc-connector/common';
 import { Snapshot, StreamService } from '@towns-protocol/proto';
 import { type RetryParams } from './rpcInterceptors';
 import { UnpackEnvelopeOpts } from './sign';

package/dist/makeStreamRpcClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeStreamRpcClient.d.ts","sourceRoot":"","sources":["../src/makeStreamRpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,MAAM,qBAAqB,CAAA;AAE1D,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAG/D,OAAO,EAKH,KAAK,WAAW,EACnB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,kBAAkB,EAAmC,MAAM,QAAQ,CAAA;AAC5E,OAAO,EAAE,UAAU,EAA+B,MAAM,aAAa,CAAA;AAErE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAKzC,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,WAAW,CAAA;CAC3B;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,aAAa,CAAC,GAAG;IACzD,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,sBAAsB,CAAA;CAC/B,CAAA;AAED,wBAAgB,mBAAmB,CAC/B,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACtC,IAAI,CAAC,EAAE,UAAU,GAClB,eAAe,CA+BjB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,sBAAsB,GAAG,MAAM,CAOpE;AAED,wBAAsB,aAAa,CAC/B,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,MAAM,GAAG,UAAU,EAC7B,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,GACnD,OAAO,CAAC;IACP,UAAU,EAAE,eAAe,EAAE,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CACvC,CAAC,CAyCD"}
+{"version":3,"file":"makeStreamRpcClient.d.ts","sourceRoot":"","sources":["../src/makeStreamRpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAyC,MAAM,sCAAsC,CAAA;AAEpG,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAG/D,OAAO,EAKH,KAAK,WAAW,EACnB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,kBAAkB,EAAmC,MAAM,QAAQ,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAKzC,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,WAAW,CAAA;CAC3B;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,aAAa,CAAC,GAAG;IACzD,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,sBAAsB,CAAA;CAC/B,CAAA;AAED,wBAAgB,mBAAmB,CAC/B,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACtC,IAAI,CAAC,EAAE,UAAU,GAClB,eAAe,CA+BjB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,sBAAsB,GAAG,MAAM,CAOpE;AAED,wBAAsB,aAAa,CAC/B,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,MAAM,GAAG,UAAU,EAC7B,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,GACnD,OAAO,CAAC;IACP,UAAU,EAAE,eAAe,EAAE,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CACvC,CAAC,CAyCD"}

package/dist/makeStreamRpcClient.js

@@ -1,10 +1,10 @@
-import { createClient } from '@connectrpc/connect';
+import { createClient } from '@towns-protocol/rpc-connector/common';
+import { createHttp2ConnectTransport } from '@towns-protocol/rpc-connector';
 import { StreamService } from '@towns-protocol/proto';
 import { dlog } from '@towns-protocol/dlog';
 import { getEnvVar, randomUrlSelector } from './utils';
 import { DEFAULT_RETRY_PARAMS, getRetryDelayMs, loggingInterceptor, retryInterceptor, } from './rpcInterceptors';
 import { unpackMiniblock, unpackSnapshot } from './sign';
-import { createHttp2ConnectTransport } from './rpcCommon';
 import { streamIdAsBytes } from './id';
 const logInfo = dlog('csb:rpc:info');
 let nextRpcClientNum = 0;

package/dist/makeStreamRpcClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"makeStreamRpcClient.js","sourceRoot":"","sources":["../src/makeStreamRpcClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"makeStreamRpcClient.js","sourceRoot":"","sources":["../src/makeStreamRpcClient.ts"],"names":[],"mappings":"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"}

package/dist/notificationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notificationService.d.ts","sourceRoot":"","sources":["../src/notificationService.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C,qBAAa,mBAAmB;mBACP,mBAAmB;WAsC3B,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU;;;;;WAkBhF,sBAAsB,CAC/B,MAAM,EAAE,MAAM,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,UAAU;;;;;CAiBxB"}
+{"version":3,"file":"notificationService.d.ts","sourceRoot":"","sources":["../src/notificationService.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAI/C,qBAAa,mBAAmB;mBACP,mBAAmB;WAsC3B,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU;;;;;WAkBhF,sBAAsB,CAC/B,MAAM,EAAE,MAAM,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,UAAU;;;;;CAiBxB"}

package/dist/notificationService.js

@@ -1,9 +1,10 @@
 import { makeAuthenticationRpcClient } from './makeAuthenticationRpcClient';
 import { makeNotificationRpcClient } from './makeNotificationRpcClient';
 import { bin_fromHexString, check } from '@towns-protocol/dlog';
-import { notificationServiceHash, riverSign } from './sign';
+import { riverSign, notificationServiceHash } from './sign';
 import { isDefined } from './check';
 import { hashPersonalMessage } from '@ethereumjs/util';
+// TODO: redo this to use the new auth service
 export class NotificationService {
     static async _authenticateCommon(userId, serviceUrl, opts, getSignature, extraFinishAuthParams) {
         const authenticationRpcClient = makeAuthenticationRpcClient(serviceUrl, opts);

package/dist/notificationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"notificationService.js","sourceRoot":"","sources":["../src/notificationService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAInC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAEtD,MAAM,OAAO,mBAAmB;IACpB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CACpC,MAAkB,EAClB,UAAkB,EAClB,IAA4B,EAC5B,YAAmD,EACnD,qBAA0C;QAE1C,MAAM,uBAAuB,GAAG,2BAA2B,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;QAE7E,MAAM,aAAa,GAAG,MAAM,uBAAuB,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QACnF,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,IAAI,EAAE,EAAE,4BAA4B,CAAC,CAAA;QACzE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,4BAA4B,CAAC,CAAA;QAExE,MAAM,IAAI,GAAG,uBAAuB,CAChC,MAAM,EACN,aAAa,CAAC,UAAU,CAAC,OAAO,EAChC,aAAa,CAAC,SAAS,CAC1B,CAAA;QAED,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,cAAc,GAAG,MAAM,uBAAuB,CAAC,oBAAoB,CAAC;YACtE,MAAM;YACN,SAAS,EAAE,aAAa,CAAC,SAAS;YAClC,SAAS;YACT,GAAG,qBAAqB;SAC3B,CAAC,CAAA;QACF,MAAM,qBAAqB,GAAG,yBAAyB,CACnD,UAAU,EACV,cAAc,CAAC,YAAY,EAC3B,IAAI,CACP,CAAA;QACD,OAAO;YACH,aAAa;YACb,cAAc;YACd,qBAAqB;SACxB,CAAA;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,aAA4B,EAAE,UAAkB,EAAE,IAAiB;QACzF,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,CAAA;QAE3C,OAAO,IAAI,CAAC,mBAAmB,CAC3B,MAAM,EACN,UAAU,EACV,IAAI,EACJ,KAAK,EAAE,OAAO,EAAE,EAAE;YACd,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAA;YACzC,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAA;QAClE,CAAC,EACD;YACI,WAAW,EAAE,aAAa,CAAC,WAAW;YACtC,qBAAqB,EAAE,aAAa,CAAC,qBAAqB;SAC7D,CACJ,CAAA;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAC/B,MAA2B,EAC3B,MAAc,EACd,UAAkB,EAClB,IAAiB;QAEjB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;QACtC,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAC3B,MAAM,EACN,UAAU,EACV,IAAI,EACJ,KAAK,EAAE,IAAI,EAAE,EAAE;YACX,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YAC7C,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAA;QACpC,CAAC,EACD,EAAE,CACL,CAAA;IACL,CAAC;CACJ"}
+{"version":3,"file":"notificationService.js","sourceRoot":"","sources":["../src/notificationService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,QAAQ,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAInC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAEtD,8CAA8C;AAC9C,MAAM,OAAO,mBAAmB;IACpB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CACpC,MAAkB,EAClB,UAAkB,EAClB,IAA4B,EAC5B,YAAuD,EACvD,qBAA0C;QAE1C,MAAM,uBAAuB,GAAG,2BAA2B,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;QAE7E,MAAM,aAAa,GAAG,MAAM,uBAAuB,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QACnF,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,IAAI,EAAE,EAAE,4BAA4B,CAAC,CAAA;QACzE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,4BAA4B,CAAC,CAAA;QAExE,MAAM,IAAI,GAAG,uBAAuB,CAChC,MAAM,EACN,aAAa,CAAC,UAAU,CAAC,OAAO,EAChC,aAAa,CAAC,SAAS,CAC1B,CAAA;QAED,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,cAAc,GAAG,MAAM,uBAAuB,CAAC,oBAAoB,CAAC;YACtE,MAAM;YACN,SAAS,EAAE,aAAa,CAAC,SAAS;YAClC,SAAS;YACT,GAAG,qBAAqB;SAC3B,CAAC,CAAA;QACF,MAAM,qBAAqB,GAAG,yBAAyB,CACnD,UAAU,EACV,cAAc,CAAC,YAAY,EAC3B,IAAI,CACP,CAAA;QACD,OAAO;YACH,aAAa;YACb,cAAc;YACd,qBAAqB;SACxB,CAAA;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,aAA4B,EAAE,UAAkB,EAAE,IAAiB;QACzF,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,CAAA;QAE3C,OAAO,IAAI,CAAC,mBAAmB,CAC3B,MAAM,EACN,UAAU,EACV,IAAI,EACJ,KAAK,EAAE,OAAO,EAAE,EAAE;YACd,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAA;YACzC,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAA;QAClE,CAAC,EACD;YACI,WAAW,EAAE,aAAa,CAAC,WAAW;YACtC,qBAAqB,EAAE,aAAa,CAAC,qBAAqB;SAC7D,CACJ,CAAA;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAC/B,MAA2B,EAC3B,MAAc,EACd,UAAkB,EAClB,IAAiB;QAEjB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;QACtC,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAC3B,MAAM,EACN,UAAU,EACV,IAAI,EACJ,KAAK,EAAE,IAAI,EAAE,EAAE;YACX,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YAC7C,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAA;QACpC,CAAC,EACD,EAAE,CACL,CAAA;IACL,CAAC;CACJ"}

package/dist/observable/observable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observable.d.ts","sourceRoot":"","sources":["../../src/observable/observable.ts"],"names":[],"mappings":"AAAA,UAAU,YAAY,CAAC,CAAC;IACpB,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI,CAAA;IACpC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAA;IAChC,IAAI,EAAE,OAAO,CAAA;CAChB;AAED,qBAAa,UAAU,CAAC,CAAC;IACrB,OAAO,CAAC,OAAO,CAAI;IACnB,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAK;IAC7C,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;gBAEP,KAAK,EAAE,CAAC;IAIpB,IAAI,KAAK,IAAI,CAAC,CAEb;IAED,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAMpB,SAAS,CACL,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI,EAC/C,IAAI,GAAE;QAAE,cAAc,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAA;KAAO,GAC3F,MAAM,IAAI;IAeb,IAAI,CACA,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,EAChC,IAAI,GAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAwB,GACxE,OAAO,CAAC,CAAC,CAAC;IAiBb,WAAW,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI;IASxD,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,OAAO;CAQlB"}
+{"version":3,"file":"observable.d.ts","sourceRoot":"","sources":["../../src/observable/observable.ts"],"names":[],"mappings":"AAAA,UAAU,YAAY,CAAC,CAAC;IACpB,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI,CAAA;IACpC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAA;IAChC,IAAI,EAAE,OAAO,CAAA;CAChB;AAED,qBAAa,UAAU,CAAC,CAAC;IACrB,OAAO,CAAC,OAAO,CAAI;IACnB,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAK;IAC7C,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;gBAEP,KAAK,EAAE,CAAC;IAIpB,IAAI,KAAK,IAAI,CAAC,CAEb;IAED,QAAQ,CAAC,QAAQ,EAAE,CAAC;IASpB,SAAS,CACL,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI,EAC/C,IAAI,GAAE;QAAE,cAAc,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAA;KAAO,GAC3F,MAAM,IAAI;IAeb,IAAI,CACA,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,EAChC,IAAI,GAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAwB,GACxE,OAAO,CAAC,CAAC,CAAC;IAiBb,WAAW,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI;IASxD,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,OAAO;CAQlB"}

package/dist/observable/observable.js

@@ -9,6 +9,9 @@ export class Observable {
         return this._value;
     }
     setValue(newValue) {
+        if (this._value === newValue) {
+            return;
+        }
         const prevValue = this._value;
         this._value = newValue;
         this.notify(prevValue);

package/dist/observable/observable.js.map

@@ -1 +1 @@
-{"version":3,"file":"observable.js","sourceRoot":"","sources":["../../src/observable/observable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"observable.js","sourceRoot":"","sources":["../../src/observable/observable.ts"],"names":[],"mappings":"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"}

package/dist/riverConfig.js

@@ -71,10 +71,10 @@ function makeWeb3Deployment(environmentId) {
                 baseRegistry: process.env.BASE_REGISTRY_ADDRESS,
                 spaceFactory: process.env.SPACE_FACTORY_ADDRESS,
                 spaceOwner: process.env.SPACE_OWNER_ADDRESS,
-                towns: process.env.TOWNS_ADDRESS,
                 utils: {
                     mockNFT: process.env.MOCK_NFT_ADDRESS,
                     member: process.env.MEMBER_ADDRESS,
+                    towns: process.env.TOWNS_ADDRESS,
                 },
             },
         },

package/dist/riverConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"riverConfig.js","sourceRoot":"","sources":["../src/riverConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"riverConfig.js","sourceRoot":"","sources":["../src/riverConfig.ts"],"names":[],"mappings":"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"}

package/dist/rpcCommon.d.ts

@@ -1,9 +1,7 @@
-import { Interceptor, Transport } from '@connectrpc/connect';
-import { ConnectTransportOptions as ConnectTransportOptionsWeb } from '@connectrpc/connect-web';
+import { type Interceptor } from '@towns-protocol/rpc-connector/common';
 import { type RetryParams } from './rpcInterceptors';
 export interface RpcOptions {
     retryParams?: RetryParams;
     interceptors?: Interceptor[];
 }
-export declare function createHttp2ConnectTransport(options: ConnectTransportOptionsWeb): Transport;
 //# sourceMappingURL=rpcCommon.d.ts.map

package/dist/rpcCommon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpcCommon.d.ts","sourceRoot":"","sources":["../src/rpcCommon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,EAEH,uBAAuB,IAAI,0BAA0B,EACxD,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAGpD,MAAM,WAAW,UAAU;IACvB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;CAC/B;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,0BAA0B,GAAG,SAAS,CAW1F"}
+{"version":3,"file":"rpcCommon.d.ts","sourceRoot":"","sources":["../src/rpcCommon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAA;AACvE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,MAAM,WAAW,UAAU;IACvB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;CAC/B"}

package/dist/rpcCommon.js

@@ -1,14 +1,2 @@
-import { createConnectTransport as createConnectTransportWeb, } from '@connectrpc/connect-web';
-import { isNodeEnv, isTestEnv } from '@towns-protocol/dlog';
-export function createHttp2ConnectTransport(options) {
-    if (isNodeEnv && !isTestEnv()) {
-        // use node version of connect to force httpVersion: '2'
-        const { createConnectTransport: createConnectTransportNode,
-        // eslint-disable-next-line import-x/no-extraneous-dependencies, @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
-         } = require('@connectrpc/connect-node');
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-        return createConnectTransportNode({ ...options, httpVersion: '2' });
-    }
-    return createConnectTransportWeb(options);
-}
+export {};
 //# sourceMappingURL=rpcCommon.js.map

package/dist/rpcCommon.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpcCommon.js","sourceRoot":"","sources":["../src/rpcCommon.ts"],"names":[],"mappings":"AACA,OAAO,EACH,sBAAsB,IAAI,yBAAyB,GAEtD,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAO3D,MAAM,UAAU,2BAA2B,CAAC,OAAmC;IAC3E,IAAI,SAAS,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;QAC5B,wDAAwD;QACxD,MAAM,EACF,sBAAsB,EAAE,0BAA0B;QAClD,0IAA0I;UAC7I,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;QACvC,6DAA6D;QAC7D,OAAO,0BAA0B,CAAC,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,CAAc,CAAA;IACpF,CAAC;IACD,OAAO,yBAAyB,CAAC,OAAO,CAAC,CAAA;AAC7C,CAAC"}
+{"version":3,"file":"rpcCommon.js","sourceRoot":"","sources":["../src/rpcCommon.ts"],"names":[],"mappings":""}

package/dist/sign.d.ts

@@ -39,7 +39,7 @@ export declare function riverHash(data: Uint8Array): Uint8Array;
 export declare function riverSnapshotHash(data: Uint8Array): Uint8Array;
 export declare function riverDelegateHashSrc(devicePublicKey: Uint8Array, expiryEpochMs: bigint): Uint8Array;
 export declare function notificationServiceHash(userId: Uint8Array, expiration: bigint, // unix seconds
-challenge: Uint8Array): Buffer<ArrayBufferLike>;
+challenge: Uint8Array): Uint8Array<ArrayBufferLike>;
 export declare function riverSign(hash: Uint8Array, privateKey: Uint8Array | string): Promise<Uint8Array>;
 export declare function riverVerifySignature(hash: Uint8Array, signature: Uint8Array, publicKey: Uint8Array | string): boolean;
 export declare function riverRecoverPubKey(hash: Uint8Array, signature: Uint8Array): Uint8Array;

package/dist/sign.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sign.d.ts","sourceRoot":"","sources":["../src/sign.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sign.d.ts","sourceRoot":"","sources":["../src/sign.ts"],"names":[],"mappings":"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"}

package/dist/sign.js

@@ -6,7 +6,7 @@ import { secp256k1 } from '@noble/curves/secp256k1';
 import { genIdBlob, streamIdAsBytes, streamIdAsString, userIdFromAddress } from './id';
 import { checkDelegateSig } from './signerContext';
 import { keccak256 } from 'ethereum-cryptography/keccak';
-import { createHash } from 'crypto';
+import { sha256 } from '@noble/hashes/sha2';
 import { create, fromBinary, toBinary } from '@bufbuild/protobuf';
 import { eventIdsFromSnapshot } from './persistenceStore';
 export const _impl_makeEvent_impl_ = async (context, payload, prevMiniblockHash, prevMiniblockNum, tags) => {
@@ -295,12 +295,18 @@ challenge) {
     // aellis - i don't understand why we need to slice here, the go and ios code both truncate the leading 0's
     check(userId.length === 20, 'User ID should be 20 bytes');
     check(challenge.length === 16, 'Challenge should be 16 bytes');
-    return createHash('sha256')
-        .update(prefixBytes)
-        .update(userId)
-        .update(expirationBytes)
-        .update(challenge)
-        .digest();
+    // Concatenate all data and hash with web-compatible sha256
+    const totalLength = prefixBytes.length + userId.length + expirationBytes.length + challenge.length;
+    const data = new Uint8Array(totalLength);
+    let offset = 0;
+    data.set(prefixBytes, offset);
+    offset += prefixBytes.length;
+    data.set(userId, offset);
+    offset += userId.length;
+    data.set(expirationBytes, offset);
+    offset += expirationBytes.length;
+    data.set(challenge, offset);
+    return sha256(data);
 }
 export async function riverSign(hash, privateKey) {
     checkHash(hash);

package/dist/sign.js.map

@@ -1 +1 @@
-{"version":3,"file":"sign.js","sourceRoot":"","sources":["../src/sign.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sign.js","sourceRoot":"","sources":["../src/sign.ts"],"names":[],"mappings":"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"}

package/dist/signerContext.js

@@ -1,4 +1,4 @@
-import { ecrecover, fromRpcSig, hashPersonalMessage } from '@ethereumjs/util';
+import { ecrecover, fromRPCSig, hashPersonalMessage } from '@ethereumjs/util';
 import { ethers } from 'ethers';
 import { bin_equal, bin_fromHexString, bin_toHexString, check } from '@towns-protocol/dlog';
 import { publicKeyToAddress, publicKeyToUint8Array, riverDelegateHashSrc } from './sign';
@@ -17,8 +17,8 @@ export const recoverPublicKeyFromDelegateSig = (params) => {
         ? publicKeyToUint8Array(params.delegatePubKey)
         : params.delegatePubKey;
     const hashSource = riverDelegateHashSrc(delegatePubKey, expiryEpochMs);
-    const hash = hashPersonalMessage(Buffer.from(hashSource));
-    const { v, r, s } = fromRpcSig('0x' + bin_toHexString(delegateSig));
+    const hash = hashPersonalMessage(hashSource);
+    const { v, r, s } = fromRPCSig(('0x' + bin_toHexString(delegateSig)));
     const recoveredCreatorPubKey = ecrecover(hash, v, r, s);
     const recoveredCreatorAddress = Uint8Array.from(publicKeyToAddress(recoveredCreatorPubKey));
     return recoveredCreatorAddress;

package/dist/signerContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"signerContext.js","sourceRoot":"","sources":["../src/signerContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"signerContext.js","sourceRoot":"","sources":["../src/signerContext.ts"],"names":[],"mappings":"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"}

package/dist/stream.d.ts

@@ -6,16 +6,18 @@ import { LocalEventStatus, ParsedEvent, ParsedMiniblock, ParsedSnapshot } from '
 import { StreamEvents } from './streamEvents';
 import { DecryptedContent } from './encryptedContentTypes';
 import { DecryptionSessionError } from '@towns-protocol/encryption';
+import { StreamsView } from './streams-view/streamsView';
 declare const Stream_base: new () => TypedEmitter<StreamEvents>;
 export declare class Stream extends Stream_base {
     readonly clientEmitter: TypedEmitter<StreamEvents>;
     readonly logEmitFromStream: DLogger;
     readonly userId: string;
     readonly streamId: string;
+    readonly streamsView: StreamsView;
     _view: StreamStateView;
     get view(): StreamStateView;
     private stopped;
-    constructor(userId: string, streamId: string, clientEmitter: TypedEmitter<StreamEvents>, logEmitFromStream: DLogger);
+    constructor(userId: string, streamId: string, streamsView: StreamsView, clientEmitter: TypedEmitter<StreamEvents>, logEmitFromStream: DLogger);
     get syncCookie(): SyncCookie | undefined;
     /**
      * NOTE: Separating initial rollup from the constructor allows consumer to subscribe to events
@@ -23,7 +25,7 @@ export declare class Stream extends Stream_base {
      */
     initialize(nextSyncCookie: SyncCookie, minipoolEvents: ParsedEvent[], snapshot: Snapshot, miniblocks: ParsedMiniblock[], prependedMiniblocks: ParsedMiniblock[], prevSnapshotMiniblockNum: bigint, cleartexts: Record<string, Uint8Array | string> | undefined): void;
     stop(): void;
-    appendEvents(events: ParsedEvent[], nextSyncCookie: SyncCookie, snapshot: ParsedSnapshot | undefined, cleartexts: Record<string, Uint8Array | string> | undefined): Promise<void>;
+    appendEvents(events: ParsedEvent[], nextSyncCookie: SyncCookie, _snapshot: ParsedSnapshot | undefined, cleartexts: Record<string, Uint8Array | string> | undefined): Promise<void>;
     prependEvents(miniblocks: ParsedMiniblock[], cleartexts: Record<string, Uint8Array | string> | undefined, terminus: boolean): void;
     appendLocalEvent(channelMessage: ChannelMessage, status: LocalEventStatus): string;
     updateDecryptedContent(eventId: string, content: DecryptedContent): void;

package/dist/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"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"}

package/dist/stream.js

@@ -6,18 +6,20 @@ export class Stream extends EventEmitter {
     logEmitFromStream;
     userId;
     streamId;
+    streamsView;
     _view;
     get view() {
         return this._view;
     }
     stopped = false;
-    constructor(userId, streamId, clientEmitter, logEmitFromStream) {
+    constructor(userId, streamId, streamsView, clientEmitter, logEmitFromStream) {
         super();
         this.clientEmitter = clientEmitter;
         this.logEmitFromStream = logEmitFromStream;
         this.userId = userId;
-        this._view = new StreamStateView(userId, streamId);
         this.streamId = streamId;
+        this.streamsView = streamsView;
+        this._view = new StreamStateView(userId, streamId, streamsView);
     }
     get syncCookie() {
         return this.view.syncCookie;
@@ -28,17 +30,18 @@ export class Stream extends EventEmitter {
      */
     initialize(nextSyncCookie, minipoolEvents, snapshot, miniblocks, prependedMiniblocks, prevSnapshotMiniblockNum, cleartexts) {
         // grab any local events from the previous view that haven't been processed
-        const localEvents = this._view.timeline
+        const localEvents = Array.from(this._view.minipoolEvents.values())
             .filter(isLocalEvent)
-            .filter((e) => e.hashStr.startsWith('~'));
-        this._view = new StreamStateView(this.userId, this.streamId);
+            .filter((e) => e.hashStr.startsWith('~'))
+            .sort((a, b) => Number(a.eventNum - b.eventNum));
+        this._view = new StreamStateView(this.userId, this.streamId, this.streamsView);
         this._view.initialize(nextSyncCookie, minipoolEvents, snapshot, miniblocks, prependedMiniblocks, prevSnapshotMiniblockNum, cleartexts, localEvents, this);
     }
     stop() {
         this.removeAllListeners();
         this.stopped = true;
     }
-    async appendEvents(events, nextSyncCookie, snapshot, cleartexts) {
+    async appendEvents(events, nextSyncCookie, _snapshot, cleartexts) {
         this._view.appendEvents(events, nextSyncCookie, cleartexts, this);
     }
     prependEvents(miniblocks, cleartexts, terminus) {

package/dist/stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream.js","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"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"}

package/dist/streamEvents.d.ts

@@ -1,10 +1,11 @@
 import { SnapshotCaseType, FullyReadMarker, UserInboxPayload_GroupEncryptionSessions, UserSettingsPayload_UserBlock, UserPayload_UserMembership, UserInboxPayload_Snapshot_DeviceSummary, BlockchainTransaction_Tip } from '@towns-protocol/proto';
-import { ClientInitStatus, ConfirmedTimelineEvent, DecryptedTimelineEvent, LocalTimelineEvent, RemoteTimelineEvent, StreamTimelineEvent } from './types';
+import { ClientInitStatus, ConfirmedTimelineEvent, LocalTimelineEvent, RemoteTimelineEvent, StreamTimelineEvent } from './types';
 import { EventSignatureBundle, KeySolicitationContent, UserDevice } from '@towns-protocol/encryption';
 import { EncryptedContent } from './encryptedContentTypes';
 import { SyncState } from './syncedStreamsLoop';
 import { Pin } from './streamStateView_Members';
 import { SpaceReviewEventObject } from '@towns-protocol/web3';
+import { TimelineEvent } from './sync-agent/timeline/models/timeline-types';
 export type StreamChange = {
     prepended?: RemoteTimelineEvent[];
     appended?: StreamTimelineEvent[];
@@ -58,10 +59,9 @@ export type StreamStateEvents = {
     channelPinDecrypted: (channelId: string, pin: Pin, index: number) => void;
     fullyReadMarkersUpdated: (channelId: string, fullyReadMarkers: Record<string, FullyReadMarker>) => void;
     userBlockUpdated: (userBlock: UserSettingsPayload_UserBlock) => void;
-    eventDecrypted: (streamId: string, contentKind: SnapshotCaseType, event: DecryptedTimelineEvent) => void;
+    eventDecrypted: (streamId: string, contentKind: SnapshotCaseType, event: TimelineEvent) => void;
     streamInitialized: (streamId: string, contentKind: SnapshotCaseType) => void;
     streamUpToDate: (streamId: string) => void;
-    streamUpdated: (streamId: string, contentKind: SnapshotCaseType, change: StreamChange) => void;
     streamLocalEventUpdated: (streamId: string, contentKind: SnapshotCaseType, localEventId: string, event: LocalTimelineEvent) => void;
     streamLatestTimestampUpdated: (streamId: string) => void;
     streamUsernameUpdated: (streamId: string, userId: string) => void;

package/dist/streamEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streamEvents.d.ts","sourceRoot":"","sources":["../src/streamEvents.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"streamEvents.d.ts","sourceRoot":"","sources":["../src/streamEvents.ts"],"names":[],"mappings":"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"}