@bedrock/kms-http 23.3.0 → 23.4.0

package/lib/http.js

@@ -107,21 +107,15 @@ bedrock.events.on('bedrock-express.configure.routes', app => {
         });
       }
 
-      // FIXME: this is a high-latency call -- consider adding the meter
-      // in parallel with inserting the keystore, optimistically presuming it
-      // will be added; we could decide that the case of a missing/invalid
-      // meter is a possible state we have to deal in other cases anyway
-      // https://github.com/digitalbazaar/bedrock-kms-http/issues/57
-
-      // add meter
-      await meters.upsert({id: meterId, serviceType: SERVICE_TYPE});
-
       // create a keystore for the controller
       const random = await generateRandom();
       const id = helpers.getKeystoreId({localId: random, routes});
       const config = {id, meterId, ...req.body};
       const record = await keystores.insert({config});
       res.status(201).location(id).json(record.config);
+
+      // meter usage
+      reportOperationUsage({req, storage: storageCost.keystore});
     }));
 
   // get all keystores by controller query
@@ -278,7 +272,7 @@ bedrock.events.on('bedrock-express.configure.routes', app => {
       const {meterId} = keystore;
       const {meter: {disabled}} = await meters.hasAvailable({
         id: meterId, serviceType: SERVICE_TYPE,
-        resources: {storage: cfg.storageCost.revocation}
+        resources: {storage: storageCost.revocation}
       });
       if(disabled) {
         // meter is disabled, do not allow storage
@@ -295,8 +289,8 @@ bedrock.events.on('bedrock-express.configure.routes', app => {
       // success, no response body
       res.status(204).end();
 
-      // report revocation usage as operation usage
-      reportOperationUsage({req});
+      // meter usage
+      reportOperationUsage({req, storage: storageCost.revocation});
     }));
 });
 

package/lib/metering.js

@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2019-2026 Digital Bazaar, Inc.
  */
 import * as bedrock from '@bedrock/core';
 import * as brZCapStorage from '@bedrock/zcap-storage';
@@ -14,10 +14,10 @@ import {meters} from '@bedrock/meter-usage-reporter';
 export const SERVICE_TYPE = 'webkms';
 meters.setAggregator({serviceType: SERVICE_TYPE, handler: _aggregateUsage});
 
-export function reportOperationUsage({req}) {
+export function reportOperationUsage({req, storage = 0}) {
   // do not wait for usage to be reported
   const {keystore, keystore: {meterId: id}} = req.webkms;
-  meters.use({id, operations: 1}).catch(
+  meters.use({id, operations: 1, storage}).catch(
     error => logger.error(
       `Keystore (${keystore.id}) meter (${id}) usage error.`, {error}));
 }

package/lib/middleware.js

@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2019-2025 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2019-2026 Digital Bazaar, Inc.
  */
 import * as bedrock from '@bedrock/core';
 import * as brZCapStorage from '@bedrock/zcap-storage';
@@ -54,7 +54,7 @@ export function createKmsOperationMiddleware() {
     getRootController: getKeystoreController,
     getVerifier,
     inspectCapabilityChain,
-    onError, onSuccess: reportOperationUsage, suiteFactory
+    onError, onSuccess, suiteFactory
   });
 }
 
@@ -220,6 +220,11 @@ function onError({error}) {
     }, error);
 }
 
+function onSuccess({req, /*res, next, result,*/ operationType}) {
+  const storage = operationType === 'GenerateKeyOperation' ? 1 : 0;
+  reportOperationUsage({req, operations: 1, storage});
+}
+
 // hook used to create suites for verifying zcap delegation chains
 async function suiteFactory() {
   return new Ed25519Signature2020();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/kms-http",
-  "version": "23.3.0",
+  "version": "23.4.0",
   "type": "module",
   "description": "Bedrock KMS HTTP API",
   "main": "./lib/index.js",
@@ -39,18 +39,18 @@
     "ipaddr.js": "^2.5.0"
   },
   "peerDependencies": {
-    "@bedrock/app-identity": "^4.0.0",
+    "@bedrock/app-identity": "^4.2.0",
     "@bedrock/core": "^6.3.0",
     "@bedrock/did-context": "^6.0.0",
-    "@bedrock/did-io": "^10.4.0",
-    "@bedrock/express": "^8.3.1",
-    "@bedrock/jsonld-document-loader": "^5.2.0",
-    "@bedrock/kms": "^16.0.0",
-    "@bedrock/meter-usage-reporter": "^10.0.0",
+    "@bedrock/did-io": "^10.5.0",
+    "@bedrock/express": "^8.8.3",
+    "@bedrock/jsonld-document-loader": "^5.2.1",
+    "@bedrock/kms": "^16.2.0",
+    "@bedrock/meter-usage-reporter": "^10.3.5",
     "@bedrock/security-context": "^9.0.0",
-    "@bedrock/validation": "^7.1.1",
+    "@bedrock/validation": "^7.3.0",
     "@bedrock/veres-one-context": "^16.0.0",
-    "@bedrock/zcap-storage": "^9.3.0"
+    "@bedrock/zcap-storage": "^9.7.0"
   },
   "directories": {
     "lib": "./lib"