Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@hs/core",
"name": "@rocket.chat/federation-core",
"version": "1.0.50",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand All @@ -17,8 +17,8 @@
},
"files": ["./src", "./dist"],
"dependencies": {
"@hs/crypto": "workspace:*",
"@hs/room": "workspace:*"
"@rocket.chat/federation-crypto": "workspace:*",
"@rocket.chat/federation-room": "workspace:*"
},
"devDependencies": {
"bun-types": "latest",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/events/eventBase.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Pdu, PduForType } from '@hs/room';
import type { EventID } from '@hs/room';
import { Pdu, PduForType } from '@rocket.chat/federation-room';
import type { EventID } from '@rocket.chat/federation-room';

export type EventBase = {
auth_events: EventID[];
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/isRoomMemberEvent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Pdu } from '@hs/room';
import { Pdu } from '@rocket.chat/federation-room';
import type { EventBase } from './eventBase';

export type JoinRule =
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.reaction.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { EventID } from '@hs/room';
import type { EventID } from '@rocket.chat/federation-room';
import { type EventBase, createEventBase } from './eventBase';
import { createEventWithId } from './utils/createSignedEvent';

Expand Down
5 changes: 4 additions & 1 deletion packages/core/src/events/m.room.create.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { expect, test } from 'bun:test';

import { PersistentEventFactory, RoomVersion } from '@hs/room';
import {
PersistentEventFactory,
RoomVersion,
} from '@rocket.chat/federation-room';
import type { SignedEvent } from '../types';
import { generateId } from '../utils/generateId';
import { generateKeyPairsFromString } from '../utils/keys';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.guest_access.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, test } from 'bun:test';

import { generateId } from '@hs/core';
import { generateId } from '@rocket.chat/federation-core';
import { generateKeyPairsFromString } from '../utils/keys';
import { signEvent } from '../utils/signEvent';
import { roomGuestAccessEvent } from './m.room.guest_access';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.guest_access.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventID } from '@hs/room';
import { EventID } from '@rocket.chat/federation-room';
import { type EventBase, createEventBase } from './eventBase';
import { createEventWithId } from './utils/createSignedEvent';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.history_visibility.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, test } from 'bun:test';

import { generateId } from '@hs/core';
import { generateId } from '@rocket.chat/federation-core';
import { generateKeyPairsFromString } from '../utils/keys';
import { signEvent } from '../utils/signEvent';
import { roomHistoryVisibilityEvent } from './m.room.history_visibility';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.history_visibility.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventID } from '@hs/room';
import { EventID } from '@rocket.chat/federation-room';
import { type EventBase, createEventBase } from './eventBase';
import { createEventWithId } from './utils/createSignedEvent';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.join_rules.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventID } from '@hs/room';
import { EventID } from '@rocket.chat/federation-room';
import { type EventBase, createEventBase } from './eventBase';
import { createEventWithId } from './utils/createSignedEvent';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.member-invite.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, test } from 'bun:test';

import { generateId } from '@hs/core';
import { generateId } from '@rocket.chat/federation-core';
import { generateKeyPairsFromString } from '../utils/keys';
import { signEvent } from '../utils/signEvent';
import { roomMemberEvent } from './m.room.member';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.member.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventID } from '@hs/room';
import { EventID } from '@rocket.chat/federation-room';
import { createEventBase } from './eventBase';
import type { Membership, RoomMemberEvent } from './isRoomMemberEvent';
import { createEventWithId } from './utils/createSignedEvent';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.message.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { EventID } from '@hs/room';
import type { EventID } from '@rocket.chat/federation-room';
import { type EventBase, createEventBase } from './eventBase';
import { createEventWithId } from './utils/createSignedEvent';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.name.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect, test } from 'bun:test';

import { generateId } from '@hs/core';
import { generateId } from '@rocket.chat/federation-core';
import type { SignedEvent } from '../types';
import { generateKeyPairsFromString } from '../utils/keys';
import { signEvent } from '../utils/signEvent';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.name.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventID } from '@hs/room';
import { EventID } from '@rocket.chat/federation-room';
import { type EventBase, createEventBase } from './eventBase';
import { createEventWithId } from './utils/createSignedEvent';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.power_levels.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, test } from 'bun:test';

import { generateId } from '@hs/core';
import { generateId } from '@rocket.chat/federation-core';
import type { SignedEvent } from '../types';
import { generateKeyPairsFromString } from '../utils/keys';
import { signEvent } from '../utils/signEvent';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.power_levels.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventID } from '@hs/room';
import { EventID } from '@rocket.chat/federation-room';
import { type EventBase, createEventBase } from './eventBase';
import { createEventWithId } from './utils/createSignedEvent';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.redaction.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, test } from 'bun:test';

import { generateId } from '@hs/core';
import { generateId } from '@rocket.chat/federation-core';
import { generateKeyPairsFromString } from '../utils/keys';
import { signEvent } from '../utils/signEvent';
import type { EventBase } from './eventBase';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.redaction.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventID } from '@hs/room';
import { EventID } from '@rocket.chat/federation-room';
import { type EventBase, createEventBase } from './eventBase';
import { createEventWithId } from './utils/createSignedEvent';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.tombstone.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, test } from 'bun:test';
import { generateId } from '@hs/core';
import { generateId } from '@rocket.chat/federation-core';
import { generateKeyPairsFromString } from '../utils/keys';
import { signEvent } from '../utils/signEvent';
import type { EventBase } from './eventBase';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/m.room.tombstone.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventID } from '@hs/room';
import { EventID } from '@rocket.chat/federation-room';
import { type EventBase, createEventBase } from './eventBase';
import { createEventWithId } from './utils/createSignedEvent';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/events/pdu.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Pdu } from '@hs/room';
import { Pdu } from '@rocket.chat/federation-room';
import type { EventBase } from './eventBase';

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/models/event.model.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventID, Pdu, PduForType } from '@hs/room';
import { EventID, Pdu, PduForType } from '@rocket.chat/federation-room';
import type { EventBase as CoreEventBase } from '../events/eventBase';

// TODO: use room package
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/procedures/makeJoin.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {
type EventStore,
IncompatibleRoomVersionError,
NotFoundError,
} from '@hs/core';
import type { AuthEvents } from '@hs/core';
} from '@rocket.chat/federation-core';
import type { AuthEvents } from '@rocket.chat/federation-core';
import { makeJoinEventBuilder } from './makeJoin';

describe('makeJoinEventBuilder', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Pdu } from '@hs/room';
import type { EventID } from '@hs/room';
import { Pdu } from '@rocket.chat/federation-room';
import type { EventID } from '@rocket.chat/federation-room';

export enum EncryptionValidAlgorithm {
ed25519 = 'ed25519',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/authentication.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
type Pdu,
PersistentEventBase,
PersistentEventFactory,
} from '@hs/room';
} from '@rocket.chat/federation-room';
import nacl from 'tweetnacl';
import { type SigningKey } from '../types';
import { encodeCanonicalJson, signJson } from './signJson';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/checkSignAndHashes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Pdu } from '@hs/room';
import { Pdu } from '@rocket.chat/federation-room';
import { type HashedEvent, computeHash } from './authentication';
import { MatrixError } from './errors';
import { logger } from './logger';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/generateId.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import crypto from 'node:crypto';
import { EventID } from '@hs/room';
import { EventID } from '@rocket.chat/federation-room';
import { toUnpaddedBase64 } from './binaryData';
import { pruneEventDict } from './pruneEventDict';
import { encodeCanonicalJson } from './signJson';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/pruneEventDict.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { isRoomMemberEvent } from '../events/isRoomMemberEvent';

import { Pdu } from '@hs/room';
import { Pdu } from '@rocket.chat/federation-room';
import type { EventBase } from '../events/eventBase';

interface RoomVersion {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/signEvent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Pdu } from '@hs/room';
import { Pdu } from '@rocket.chat/federation-room';
import type { SignedEvent } from '../types';
import type { SigningKey } from '../types';
import { computeAndMergeHash } from './authentication';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/signJson.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { encodeCanonicalJson as encodeCanonicalJsonCrypto } from '@hs/crypto';
import { encodeCanonicalJson as encodeCanonicalJsonCrypto } from '@rocket.chat/federation-crypto';
import nacl from 'tweetnacl';
import type { SigningKey } from '../types';
import { EncryptionValidAlgorithm } from '../types';
Expand Down
2 changes: 1 addition & 1 deletion packages/crypto/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@hs/crypto",
"name": "@rocket.chat/federation-crypto",
"version": "0.0.1",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down
Loading