From 91d7b5ffeb15a29c043e6f5178a331466863c822 Mon Sep 17 00:00:00 2001 From: Michael Puckett Date: Thu, 20 Apr 2023 00:43:43 -0400 Subject: [PATCH] Fix type of getHttpServer arg, update readme --- README.md | 29 ++++++++++--------- TODO.md | 4 +-- packages/core/lib/index.js.map | 2 +- packages/core/src/index.ts | 2 +- .../crypto-node/lib/getHttpSignature.js.map | 2 +- packages/crypto-node/src/getHttpSignature.ts | 1 - .../lib/activitypub/Extended/Activity.d.ts | 2 +- .../src/activitypub/Extended/Activity.ts | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index bff60217..406da02e 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,8 @@ const app = express.default(); plugins: [], + routes: {}, + pages: { // Login/Signup via Auth adapter. login: async (): Promise => { @@ -158,7 +160,7 @@ The core layer that gets included in all projects include these packages: - `@activity-kit/endpoints` - The logic for carrying out the bulk of the ActivityPub protocol. - `@activity-kit/core` - - Provides common functions that use the adapter APIs. + - Common functions that depend on the Adapter APIs. - `@activity-kit/utilities` - Common functions with no dependencies on packages from upper layers. @@ -205,6 +207,7 @@ Currently this project comes with: - `@activity-kit/server-express` - TODO: `@activity-kit/server-fastify` +- TODO: `@activity-kit/server-serverless` - TODO: `@activity-kit/server-koa` #### Crypto Adapters @@ -216,6 +219,12 @@ Typically this will be handled by Node's `crypto` library, but the crypto functi - `@activity-kit/crypto-node` - TODO: `@activity-kit/crypto-browser` +#### Email Adapters + +In the future, email will be an optional adapter that can be used to reset passwords and send notifications to users. + +- TODO: `@activity-kit/email-nodemailer` + ### Plugins Plugins provide lifecycle hooks that can modify core functionality. @@ -237,33 +246,25 @@ The front-end should utilize ActivityPub's Client-to-Server protocol to post Act ## Use Cases -There are a few use cases this project attempts to fulfill. Ideally this project -papers over some of the complexity of JSON-LD, Activity Streams collections, etc. to make getting started easy. +There are a few use cases this project attempts to fulfill. Ideally this project papers over some of the complexity of JSON-LD, Activity Streams collections, etc. to make getting started easy. ### Connecting a Blog to the Fediverse -Someone already has an HTML blog and a domain name and wants their posts to be -read by others and get replies. Instead of setting up a CMS, they decide to set -up an ActivityPub server. +Someone already has an HTML blog and a domain name and wants their posts to be read by others and get replies. Instead of setting up a CMS, they decide to set up an ActivityPub server. ### Single-Server Social Feeds An exercise app wants to build in social features to make their users feel proud of their achievements. This would probably include something like a -notification bell and a feed where updates about their friends appear. Users -might have with the option to react with an emoji or sticker. +notification bell and a feed where updates about their friends appear. Users might have with the option to react with an emoji or sticker. All these exchanges would stay local to the server. ### Private Group Chat -A small group of people who communicate online become dissatisfied with their -existing app's policies and decide to communicate privately. They would like to -develop their own system for communication. +A small group of people who communicate online become dissatisfied with their existing app's policies and decide to communicate privately. They would like to develop their own system for communication. -Although ActivityPub does not define an encryption layer, messages could stay -local to a single server or could be exchanged between all parties in an -ephermeral way. Encryption could be a good addition, however. +Although ActivityPub does not define an encryption layer, messages could stay local to a single server or could be exchanged between all parties in an ephermeral way. Encryption could be a good addition, however. ### Federated Social Network diff --git a/TODO.md b/TODO.md index c27a13e5..0fccb68e 100644 --- a/TODO.md +++ b/TODO.md @@ -14,7 +14,7 @@ See CHECKLIST.md - standardize plugin system - as:sensitive - watch for performance issues -- caching of remote objects -- too many? +- best way to handle caching of remote objects such as a follower collection? - foaf / schema.org / others - nodeinfo users + posts -- client crypto / d1 cloudflare +- forgot password, change password diff --git a/packages/core/lib/index.js.map b/packages/core/lib/index.js.map index 69460a46..ceb2982d 100644 --- a/packages/core/lib/index.js.map +++ b/packages/core/lib/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 0f41787d..44928365 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -110,7 +110,7 @@ export class Core implements CoreLibrary { foreignTarget: URL, actorId: URL, privateKey: string, - entity?: AP.Entity, + entity?: Record, ) => await adapters.crypto.getHttpSignature( foreignTarget, diff --git a/packages/crypto-node/lib/getHttpSignature.js.map b/packages/crypto-node/lib/getHttpSignature.js.map index eccbd640..a785b967 100644 --- a/packages/crypto-node/lib/getHttpSignature.js.map +++ b/packages/crypto-node/lib/getHttpSignature.js.map @@ -1 +1 @@ -{"version":3,"file":"getHttpSignature.js","sourceRoot":"","sources":["../src/getHttpSignature.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAiC;AAG1B,KAAK,UAAU,gBAAgB,CAEpC,aAAkB,EAClB,OAAY,EACZ,UAAkB,EAClB,MAAgC;IAMhC,MAAM,aAAa,GAAG,aAAa,CAAC,QAAQ,CAAC;IAC7C,MAAM,eAAe,GAAG,aAAa,CAAC,QAAQ,CAAC;IAC/C,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE3C,IAAI,MAAM,EAAE;QACV,MAAM,UAAU,GAAG,MAAM;aACtB,UAAU,CAAC,QAAQ,CAAC;aACpB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aAC9B,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpB,MAAM,YAAY,GAAG,WAAW,UAAU,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,0BAA0B,eAAe,WAAW,aAAa,WAAW,UAAU,qBAAqB,UAAU,EAAE,CAAC;QAC7I,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,UAAU,OAAO,CAAC,QAAQ,EAAE,4FAA4F,aAAa,GAAG,CAAC;QAEjK,OAAO;YACL,UAAU,EAAE,UAAU;YACtB,YAAY;YACZ,eAAe;SAChB,CAAC;KACH;SAAM;QACL,MAAM,YAAY,GAAG,yBAAyB,eAAe,WAAW,aAAa,WAAW,UAAU,EAAE,CAAC;QAC7G,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,UAAU,OAAO,CAAC,QAAQ,EAAE,qFAAqF,aAAa,GAAG,CAAC;QAE1J,OAAO;YACL,UAAU,EAAE,UAAU;YACtB,eAAe;SAChB,CAAC;KACH;AACH,CAAC;AA/CD,4CA+CC"} \ No newline at end of file +{"version":3,"file":"getHttpSignature.js","sourceRoot":"","sources":["../src/getHttpSignature.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AAG1B,KAAK,UAAU,gBAAgB,CAEpC,aAAkB,EAClB,OAAY,EACZ,UAAkB,EAClB,MAAgC;IAMhC,MAAM,aAAa,GAAG,aAAa,CAAC,QAAQ,CAAC;IAC7C,MAAM,eAAe,GAAG,aAAa,CAAC,QAAQ,CAAC;IAC/C,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE3C,IAAI,MAAM,EAAE;QACV,MAAM,UAAU,GAAG,MAAM;aACtB,UAAU,CAAC,QAAQ,CAAC;aACpB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aAC9B,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpB,MAAM,YAAY,GAAG,WAAW,UAAU,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,0BAA0B,eAAe,WAAW,aAAa,WAAW,UAAU,qBAAqB,UAAU,EAAE,CAAC;QAC7I,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,UAAU,OAAO,CAAC,QAAQ,EAAE,4FAA4F,aAAa,GAAG,CAAC;QAEjK,OAAO;YACL,UAAU,EAAE,UAAU;YACtB,YAAY;YACZ,eAAe;SAChB,CAAC;KACH;SAAM;QACL,MAAM,YAAY,GAAG,yBAAyB,eAAe,WAAW,aAAa,WAAW,UAAU,EAAE,CAAC;QAC7G,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,UAAU,OAAO,CAAC,QAAQ,EAAE,qFAAqF,aAAa,GAAG,CAAC;QAE1J,OAAO;YACL,UAAU,EAAE,UAAU;YACtB,eAAe;SAChB,CAAC;KACH;AACH,CAAC;AA/CD,4CA+CC"} \ No newline at end of file diff --git a/packages/crypto-node/src/getHttpSignature.ts b/packages/crypto-node/src/getHttpSignature.ts index 6b60c30c..e4e548ef 100644 --- a/packages/crypto-node/src/getHttpSignature.ts +++ b/packages/crypto-node/src/getHttpSignature.ts @@ -1,4 +1,3 @@ -import { AP } from '@activity-kit/types'; import * as crypto from 'crypto'; import { NodeCryptoAdapter } from '.'; diff --git a/packages/types/lib/activitypub/Extended/Activity.d.ts b/packages/types/lib/activitypub/Extended/Activity.d.ts index f7161bc7..8379ef5a 100644 --- a/packages/types/lib/activitypub/Extended/Activity.d.ts +++ b/packages/types/lib/activitypub/Extended/Activity.d.ts @@ -4,7 +4,7 @@ import { ActivityTypes } from '../util/const'; import { EntityReference } from '../Core'; import { TypeOrArrayWithType } from '../Core/Entity'; type BaseActivity = BaseCoreObject & { - type: TypeOrArrayWithType; + type: TypeOrArrayWithType<(typeof ActivityTypes)[keyof typeof ActivityTypes]>; actor: EntityReference | EntityReference[]; object?: EntityReference | EntityReference[]; target?: EntityReference | EntityReference[]; diff --git a/packages/types/src/activitypub/Extended/Activity.ts b/packages/types/src/activitypub/Extended/Activity.ts index 4af9917b..07006aa5 100644 --- a/packages/types/src/activitypub/Extended/Activity.ts +++ b/packages/types/src/activitypub/Extended/Activity.ts @@ -14,7 +14,7 @@ import { TypeOrArrayWithType } from '../Core/Entity'; */ type BaseActivity = BaseCoreObject & { - type: TypeOrArrayWithType; + type: TypeOrArrayWithType<(typeof ActivityTypes)[keyof typeof ActivityTypes]>; actor: EntityReference | EntityReference[]; object?: EntityReference | EntityReference[]; target?: EntityReference | EntityReference[];