@evanp/activitypub-bot 0.38.0 → 0.38.2

package/lib/activitypubclient.js

@@ -321,14 +321,32 @@ export class ActivityPubClient {
     }
   }
 
-  #resolveObject (obj, url, visited = new Set()) {
+  #resolveObject (obj, url) {
+    const objects = this.#resolveAllObjects(obj, url)
+    assert.ok(objects)
+    switch (objects.length) {
+      case 0:
+        return null
+      case 1:
+        return objects[0]
+      default: {
+        // hack to prefer `CryptographicKey` if available
+        const key = objects.find(
+          obj => obj.type === 'https://w3id.org/security#Key'
+        )
+        return (key) || objects[0]
+      }
+    }
+  }
+
+  #resolveAllObjects (obj, url, visited = new Set(), results = []) {
     if (obj.id && obj.id === url) {
-      return obj
+      results.push(obj)
     }
 
     if (obj.id) {
       if (visited.has(obj.id)) {
-        return null
+        return results
       }
       visited.add(obj.id)
     }
@@ -344,13 +362,10 @@ export class ActivityPubClient {
 
       for (const item of val) {
         if (item instanceof as2.models.Base) {
-          const found = this.#resolveObject(item, url, visited)
-          if (found) {
-            return found
-          }
+          this.#resolveAllObjects(item, url, visited, results)
         }
       }
     }
-    return null
+    return results
   }
 }

package/lib/activitystreams.js

@@ -40,18 +40,52 @@ as2.registerContext('https://w3id.org/fep/5711', {
 
 as2.registerContext('https://w3id.org/security/v1', {
   '@context': {
-    sec: 'https://w3id.org/security#',
     id: '@id',
     type: '@type',
-    owner: {
-      '@id': 'sec:owner',
-      '@type': '@id'
-    },
-    publicKey: {
-      '@id': 'sec:publicKey',
-      '@type': '@id'
-    },
-    publicKeyPem: 'sec:publicKeyPem'
+
+    dc: 'http://purl.org/dc/terms/',
+    sec: 'https://w3id.org/security#',
+    xsd: 'http://www.w3.org/2001/XMLSchema#',
+
+    EcdsaKoblitzSignature2016: 'sec:EcdsaKoblitzSignature2016',
+    Ed25519Signature2018: 'sec:Ed25519Signature2018',
+    EncryptedMessage: 'sec:EncryptedMessage',
+    GraphSignature2012: 'sec:GraphSignature2012',
+    LinkedDataSignature2015: 'sec:LinkedDataSignature2015',
+    LinkedDataSignature2016: 'sec:LinkedDataSignature2016',
+    CryptographicKey: 'sec:Key',
+
+    authenticationTag: 'sec:authenticationTag',
+    canonicalizationAlgorithm: 'sec:canonicalizationAlgorithm',
+    cipherAlgorithm: 'sec:cipherAlgorithm',
+    cipherData: 'sec:cipherData',
+    cipherKey: 'sec:cipherKey',
+    created: { '@id': 'dc:created', '@type': 'xsd:dateTime' },
+    creator: { '@id': 'dc:creator', '@type': '@id' },
+    digestAlgorithm: 'sec:digestAlgorithm',
+    digestValue: 'sec:digestValue',
+    domain: 'sec:domain',
+    encryptionKey: 'sec:encryptionKey',
+    expiration: { '@id': 'sec:expiration', '@type': 'xsd:dateTime' },
+    expires: { '@id': 'sec:expiration', '@type': 'xsd:dateTime' },
+    initializationVector: 'sec:initializationVector',
+    iterationCount: 'sec:iterationCount',
+    nonce: 'sec:nonce',
+    normalizationAlgorithm: 'sec:normalizationAlgorithm',
+    owner: { '@id': 'sec:owner', '@type': '@id' },
+    password: 'sec:password',
+    privateKey: { '@id': 'sec:privateKey', '@type': '@id' },
+    privateKeyPem: 'sec:privateKeyPem',
+    publicKey: { '@id': 'sec:publicKey', '@type': '@id' },
+    publicKeyBase58: 'sec:publicKeyBase58',
+    publicKeyPem: 'sec:publicKeyPem',
+    publicKeyWif: 'sec:publicKeyWif',
+    publicKeyService: { '@id': 'sec:publicKeyService', '@type': '@id' },
+    revoked: { '@id': 'sec:revoked', '@type': 'xsd:dateTime' },
+    salt: 'sec:salt',
+    signature: 'sec:signature',
+    signatureAlgorithm: 'sec:signingAlgorithm',
+    signatureValue: 'sec:signatureValue'
   }
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanp/activitypub-bot",
-  "version": "0.38.0",
+  "version": "0.38.2",
   "description": "server-side ActivityPub bot framework",
   "type": "module",
   "main": "lib/index.js",
@@ -37,7 +37,6 @@
     "lru-cache": "^11.1.0",
     "nanoid": "^5.1.5",
     "node-fetch": "^3.3.2",
-    "p-queue": "^9.1.0",
     "pino": "^10.1.1",
     "pino-http": "^11.0.0",
     "sequelize": "^6.37.7"