-
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1242 from assemblee-virtuelle/refactor-collections
Refactor ActivityStreams collections
- Loading branch information
Showing
68 changed files
with
1,934 additions
and
934 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| const { ACTOR_TYPES, OBJECT_TYPES } = require('./constants'); | ||
| const { FULL_ACTOR_TYPES, FULL_OBJECT_TYPES } = require('./constants'); | ||
|
|
||
| module.exports = [ | ||
| { | ||
| path: '/as/actor', | ||
| acceptedTypes: Object.values(ACTOR_TYPES) | ||
| acceptedTypes: Object.values(FULL_ACTOR_TYPES) | ||
| }, | ||
| { | ||
| path: '/as/object', | ||
| acceptedTypes: Object.values(OBJECT_TYPES) | ||
| acceptedTypes: Object.values(FULL_OBJECT_TYPES) | ||
| } | ||
| ]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 0 additions & 48 deletions
48
src/middleware/packages/activitypub/mixins/controlled-collection.js
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
src/middleware/packages/activitypub/services/activitypub/subservices/api.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| const urlJoin = require('url-join'); | ||
| const { arrayOf } = require('@semapps/ldp'); | ||
| const { | ||
| parseUrl, | ||
| parseHeader, | ||
| parseSparql, | ||
| negotiateContentType, | ||
| negotiateAccept, | ||
| parseJson, | ||
| parseTurtle, | ||
| parseFile, | ||
| saveDatasetMeta | ||
| } = require('@semapps/middlewares'); | ||
| const { FULL_ACTOR_TYPES } = require('../../../constants'); | ||
|
|
||
| const ApiService = { | ||
| name: 'activitypub.api', | ||
| settings: { | ||
| baseUri: null, | ||
| podProvider: false | ||
| }, | ||
| dependencies: ['api', 'ldp', 'ldp.registry'], | ||
| async started() { | ||
| const resourcesWithContainerPath = await this.broker.call('ldp.getSetting', { key: 'resourcesWithContainerPath' }); | ||
| if (this.settings.podProvider) { | ||
| await this.broker.call('api.addRoute', { route: this.getBoxesRoute('/:username([^/.][^/]+)') }); | ||
| } else if (!resourcesWithContainerPath) { | ||
| await this.broker.call('api.addRoute', { route: this.getBoxesRoute(`/:actorSlug`) }); | ||
| } else { | ||
| // If some actor containers are already registered, add the corresponding API routes | ||
| const registeredContainers = await this.broker.call('ldp.registry.list'); | ||
| for (const container of Object.values(registeredContainers)) { | ||
| if (arrayOf(container.acceptedTypes).some(type => Object.values(FULL_ACTOR_TYPES).includes(type))) { | ||
| await this.broker.call('api.addRoute', { route: this.getBoxesRoute(`${container.fullPath}/:actorSlug`) }); | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| actions: { | ||
| async inbox(ctx) { | ||
| const { actorSlug, ...activity } = ctx.params; | ||
| const { requestUrl } = ctx.meta; | ||
|
|
||
| await ctx.call('activitypub.inbox.post', { | ||
| collectionUri: urlJoin(this.settings.baseUri, requestUrl), | ||
| ...activity | ||
| }); | ||
|
|
||
| ctx.meta.$statusCode = 202; | ||
| }, | ||
| async outbox(ctx) { | ||
| let { actorSlug, ...activity } = ctx.params; | ||
| const { requestUrl } = ctx.meta; | ||
|
|
||
| activity = await ctx.call('activitypub.outbox.post', { | ||
| collectionUri: urlJoin(this.settings.baseUri, requestUrl), | ||
| ...activity | ||
| }); | ||
|
|
||
| ctx.meta.$responseHeaders = { | ||
| Location: activity.id || activity['@id'], | ||
| 'Content-Length': 0 | ||
| }; | ||
| ctx.meta.$statusCode = 201; | ||
| } | ||
| }, | ||
| events: { | ||
| async 'ldp.registry.registered'(ctx) { | ||
| const { container } = ctx.params; | ||
| const resourcesWithContainerPath = await this.broker.call('ldp.getSetting', { | ||
| key: 'resourcesWithContainerPath' | ||
| }); | ||
| if ( | ||
| !this.settings.podProvider && | ||
| resourcesWithContainerPath && | ||
| arrayOf(container.acceptedTypes).some(type => Object.values(FULL_ACTOR_TYPES).includes(type)) | ||
| ) { | ||
| await ctx.call('api.addRoute', { route: this.getBoxesRoute(`${container.fullPath}/:actorSlug`) }); | ||
| } | ||
| } | ||
| }, | ||
| methods: { | ||
| getBoxesRoute(actorsPath) { | ||
| const middlewares = [ | ||
| parseUrl, | ||
| parseHeader, | ||
| negotiateContentType, | ||
| negotiateAccept, | ||
| parseSparql, | ||
| parseJson, | ||
| parseTurtle, | ||
| parseFile, | ||
| saveDatasetMeta | ||
| ]; | ||
|
|
||
| return { | ||
| name: this.settings.podProvider ? 'boxes' : `boxes${actorsPath}`, | ||
| path: actorsPath, | ||
| // Disable the body parsers so that we can parse the body ourselves | ||
| // (Moleculer-web doesn't handle non-JSON bodies, so we must do it) | ||
| bodyParsers: false, | ||
| authorization: false, | ||
| authentication: true, | ||
| aliases: { | ||
| 'POST /inbox': [...middlewares, 'activitypub.api.inbox'], | ||
| 'POST /outbox': [...middlewares, 'activitypub.api.outbox'] | ||
| } | ||
| }; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| module.exports = ApiService; |
Oops, something went wrong.