@abtnode/util 1.16.44-beta-20250513-030435-c2d99062 → 1.16.44-beta-20250516-225119-c0b5ec8d

package/lib/get-pm2-process-info.js

@@ -1,5 +1,6 @@
+const { CustomError } = require('@blocklet/error');
+
 const pm2 = require('./async-pm2');
-const CustomError = require('./custom-error');
 
 const noop = () => {};
 

package/lib/security.js

@@ -7,7 +7,7 @@ const { dirname, join, sep } = require('path');
 const resolve = require('resolve/sync');
 const { tmpdir, homedir } = require('os');
 const which = require('which');
-const { parseURL, withHttps, withHttp } = require('ufo');
+const { withHttps, withHttp } = require('ufo');
 
 const cloneDeep = require('./deep-clone');
 
@@ -286,7 +286,7 @@ async function patchCors(rawConfig, { node, blocklet }) {
     const sites = (federated?.sites || []).filter((x) => x?.isMaster !== false || x.status === 'approved');
     const siteAlias = [];
     for (const site of sites) {
-      siteAlias.push(parseURL(site.appUrl).host);
+      siteAlias.push(new URL(site.appUrl).hostname);
       siteAlias.push(...(site.aliasDomain || []));
     }
     result.push(...siteAlias.map((x) => withHttps(x)), ...siteAlias.map((x) => withHttp(x)));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.44-beta-20250513-030435-c2d99062",
+  "version": "1.16.44-beta-20250516-225119-c0b5ec8d",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,15 +18,16 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.44-beta-20250513-030435-c2d99062",
-    "@arcblock/did": "1.20.8",
+    "@abtnode/constant": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@arcblock/did": "1.20.11",
     "@arcblock/pm2": "^5.4.0",
-    "@blocklet/constant": "1.16.44-beta-20250513-030435-c2d99062",
-    "@blocklet/meta": "1.16.44-beta-20250513-030435-c2d99062",
-    "@ocap/client": "1.20.8",
-    "@ocap/mcrypto": "1.20.8",
-    "@ocap/util": "1.20.8",
-    "@ocap/wallet": "1.20.8",
+    "@blocklet/constant": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/error": "^0.2.4",
+    "@blocklet/meta": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@ocap/client": "1.20.11",
+    "@ocap/mcrypto": "1.20.11",
+    "@ocap/util": "1.20.11",
+    "@ocap/wallet": "1.20.11",
     "archiver": "^7.0.1",
     "axios": "^1.7.9",
     "axios-mock-adapter": "^2.1.0",
@@ -86,5 +87,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "c3a3efef44ccf08705abb47875edba6169e76faa"
+  "gitHead": "eb15dee761c0ea273981c848992e5f29b94a69dc"
 }

package/lib/custom-error.js

@@ -1,65 +0,0 @@
-/**
- * @extends Error
- */
-class CustomError extends Error {
-  /**
-   * @param {number|string} code - Error code
-   * @param {...any} params - Additional error parameters
-   */
-  constructor(code = 'GENERIC', ...params) {
-    super(...params);
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, CustomError);
-    }
-
-    this.code = code;
-  }
-}
-
-const getStatusFromError = (err) => {
-  if (!err) {
-    return 200;
-  }
-
-  // Handle Axios errors
-  if (err?.isAxiosError) {
-    return err.response?.status || 500;
-  }
-
-  // Handle Fetch errors (including TypeError for network errors)
-  if (err instanceof TypeError && err.message.includes('fetch')) {
-    return 503; // Service Unavailable
-  }
-  if (err?.name === 'FetchError' && err?.response) {
-    return err.response?.status || 500;
-  }
-
-  // Check for common validation library errors
-  if (
-    // Zod validation error
-    err?.name === 'ZodError' ||
-    // Joi validation error
-    err?.name === 'ValidationError' ||
-    // Express-validator error
-    Array.isArray(err?.errors) ||
-    // Yup validation error
-    err?.name === 'ValidationError' ||
-    // Class-validator error
-    Array.isArray(err?.constraints) ||
-    // Ajv validation error
-    err?.keyword === 'validation'
-  ) {
-    return 400;
-  }
-
-  // infer status code from error code
-  const status =
-    ['status', 'statusCode', 'code']
-      .map((key) => err[key])
-      .find((code) => typeof code === 'number' && code >= 400 && code < 600) || 500;
-  return status;
-};
-
-module.exports = CustomError;
-module.exports.getStatusFromError = getStatusFromError;

package/lib/format-error.js

@@ -1,36 +0,0 @@
-const formatError = (err) => {
-  const { details, errors, response } = err;
-
-  // graphql error
-  if (Array.isArray(errors)) {
-    return errors.map((x) => x.message).join('\n');
-  }
-
-  // joi validate error
-  if (Array.isArray(details)) {
-    const formatted = details.map((e) => {
-      const errorMessage = e.message.replace(/["]/g, "'");
-      const errorPath = e.path.join('.');
-      return `${errorPath}: ${errorMessage}`;
-    });
-
-    return `Validate failed: ${formatted.join(';')}`;
-  }
-
-  // axios error
-  if (response) {
-    if (response.data.message) {
-      return response.data.message;
-    }
-    if (response.data.error) {
-      return response.data.error;
-    }
-
-    const data = typeof response.data === 'string' ? response.data.slice(0, 200) : JSON.stringify(response.data);
-    return `Request failed: ${response.status} ${response.statusText}: ${data}`;
-  }
-
-  return err.message;
-};
-
-module.exports = formatError;