@blocklet/aigne-hub 0.2.10 → 0.2.12

package/lib/cjs/api/error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreditError = exports.SubscriptionError = exports.CreditErrorType = exports.SubscriptionErrorType = void 0;
+exports.StatusCodeError = exports.CreditError = exports.SubscriptionError = exports.CreditErrorType = exports.SubscriptionErrorType = void 0;
 var SubscriptionErrorType;
 (function (SubscriptionErrorType) {
     SubscriptionErrorType["UNSUBSCRIBED"] = "UNSUBSCRIBED";
@@ -40,3 +40,10 @@ class CreditError extends Error {
     }
 }
 exports.CreditError = CreditError;
+class StatusCodeError extends Error {
+    constructor(statusCode, message) {
+        super(message);
+        this.statusCode = statusCode;
+    }
+}
+exports.StatusCodeError = StatusCodeError;

package/lib/cjs/api/utils/auth.js

@@ -15,6 +15,7 @@ const middlewares_1 = require("@blocklet/sdk/lib/middlewares");
 const wallet_1 = __importDefault(require("@blocklet/sdk/lib/wallet"));
 const mcrypto_1 = require("@ocap/mcrypto");
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
+const error_1 = require("../error");
 const TOKEN_EXPIRES_IN_SECONDS = 60 * 10;
 exports.wallet = (0, wallet_1.default)();
 const ADMIN_ROLES = ['owner', 'admin'];
@@ -28,8 +29,9 @@ function appIdFromPublicKey(publicKey) {
     return (0, did_1.fromPublicKey)(publicKey, (0, did_1.DidType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 }));
 }
 function verifyRemoteComponentCall({ appId, timestamp, data, sig, pk, userDid, expiresIn = TOKEN_EXPIRES_IN_SECONDS, }) {
-    if (Math.abs(Date.now() / 1000 - timestamp) > expiresIn)
-        throw new Error('signature expired');
+    if (Math.abs(Date.now() / 1000 - timestamp) > expiresIn) {
+        throw new error_1.StatusCodeError(401, 'signature expired');
+    }
     return signer.verify(hashData({ appId, timestamp, data, userDid }), sig, pk);
 }
 function signRemoteComponentCall({ data, userDid }) {
@@ -57,13 +59,14 @@ function ensureRemoteComponentCall(getPublicKey, fallback) {
             const sig = req.get('x-component-sig');
             const appId = req.get('x-app-id');
             const timestamp = req.get('x-timestamp');
-            const userDid = req.get('x-app-user-did'); // Get user did
+            const userDid = req.get('x-app-user-did');
             if (!sig || !appId || !timestamp) {
-                throw new Error('Missing required headers x-component-sig/x-app-id/x-timestamp');
+                throw new error_1.StatusCodeError(400, 'Missing required headers x-component-sig/x-app-id/x-timestamp');
             }
             const pk = await getPublicKey(appId);
-            if (appIdFromPublicKey(pk) !== appId)
-                throw new Error('appId and public key not match');
+            if (appIdFromPublicKey(pk) !== appId) {
+                throw new error_1.StatusCodeError(401, 'appId and public key not match');
+            }
             if (!verifyRemoteComponentCall({
                 appId,
                 sig,
@@ -72,7 +75,7 @@ function ensureRemoteComponentCall(getPublicKey, fallback) {
                 pk,
                 userDid,
             })) {
-                throw new Error('Validate signature error');
+                throw new error_1.StatusCodeError(401, 'Validate signature error');
             }
             req.appClient = {
                 appId,

package/lib/esm/api/error.js

@@ -35,3 +35,9 @@ export class CreditError extends Error {
         this.type = type;
     }
 }
+export class StatusCodeError extends Error {
+    constructor(statusCode, message) {
+        super(message);
+        this.statusCode = statusCode;
+    }
+}

package/lib/esm/api/utils/auth.js

@@ -4,6 +4,7 @@ import { auth } from '@blocklet/sdk/lib/middlewares';
 import getWallet from '@blocklet/sdk/lib/wallet';
 import { getHasher, getSigner, types } from '@ocap/mcrypto';
 import stringify from 'json-stable-stringify';
+import { StatusCodeError } from '../error';
 const TOKEN_EXPIRES_IN_SECONDS = 60 * 10;
 export const wallet = getWallet();
 const ADMIN_ROLES = ['owner', 'admin'];
@@ -17,8 +18,9 @@ export function appIdFromPublicKey(publicKey) {
     return fromPublicKey(publicKey, DidType({ role: types.RoleType.ROLE_APPLICATION, pk: types.KeyType.ED25519, hash: types.HashType.SHA3 }));
 }
 export function verifyRemoteComponentCall({ appId, timestamp, data, sig, pk, userDid, expiresIn = TOKEN_EXPIRES_IN_SECONDS, }) {
-    if (Math.abs(Date.now() / 1000 - timestamp) > expiresIn)
-        throw new Error('signature expired');
+    if (Math.abs(Date.now() / 1000 - timestamp) > expiresIn) {
+        throw new StatusCodeError(401, 'signature expired');
+    }
     return signer.verify(hashData({ appId, timestamp, data, userDid }), sig, pk);
 }
 export function signRemoteComponentCall({ data, userDid }) {
@@ -46,13 +48,14 @@ export function ensureRemoteComponentCall(getPublicKey, fallback) {
             const sig = req.get('x-component-sig');
             const appId = req.get('x-app-id');
             const timestamp = req.get('x-timestamp');
-            const userDid = req.get('x-app-user-did'); // Get user did
+            const userDid = req.get('x-app-user-did');
             if (!sig || !appId || !timestamp) {
-                throw new Error('Missing required headers x-component-sig/x-app-id/x-timestamp');
+                throw new StatusCodeError(400, 'Missing required headers x-component-sig/x-app-id/x-timestamp');
             }
             const pk = await getPublicKey(appId);
-            if (appIdFromPublicKey(pk) !== appId)
-                throw new Error('appId and public key not match');
+            if (appIdFromPublicKey(pk) !== appId) {
+                throw new StatusCodeError(401, 'appId and public key not match');
+            }
             if (!verifyRemoteComponentCall({
                 appId,
                 sig,
@@ -61,7 +64,7 @@ export function ensureRemoteComponentCall(getPublicKey, fallback) {
                 pk,
                 userDid,
             })) {
-                throw new Error('Validate signature error');
+                throw new StatusCodeError(401, 'Validate signature error');
             }
             req.appClient = {
                 appId,

package/lib/types/api/error.d.ts

@@ -16,3 +16,7 @@ export declare class CreditError extends Error {
     type: CreditErrorType;
     constructor(type: CreditErrorType, link?: string);
 }
+export declare class StatusCodeError extends Error {
+    statusCode: number;
+    constructor(statusCode: number, message: string);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/aigne-hub",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "The react.js component library for AIGNE Hub",
   "publishConfig": {
     "access": "public"