@abtnode/util 1.16.16 → 1.16.17-beta-8cacb9b3

package/lib/axios.js

@@ -1,35 +1,3 @@
-const axios = require('axios').default;
-const { HttpProxyAgent, HttpsProxyAgent } = require('hpagent');
-
-function proxyInterceptor(config) {
-  /* istanbul ignore if */
-  if (config.socketPath != null) return config;
-
-  const { proxy } = config;
-
-  /* istanbul ignore if */
-  if (proxy === false) return config;
-
-  const httpProxyUrl = process.env.HTTP_PROXY || process.env.http_proxy;
-  const httpsProxyUrl = process.env.HTTPS_PROXY || process.env.https_proxy;
-
-  const proxyOptions = Object.assign(
-    { keepAlive: true, keepAliveMsecs: 1000, maxSockets: 256, maxFreeSockets: 256 },
-    config.proxyOptions || {}
-  );
-
-  if (httpProxyUrl) {
-    config.proxy = false;
-    config.httpAgent = new HttpProxyAgent({ proxy: httpProxyUrl, ...proxyOptions });
-  }
-  if (httpsProxyUrl) {
-    config.proxy = false;
-    config.httpsAgent = new HttpsProxyAgent({ proxy: httpsProxyUrl, ...proxyOptions });
-  }
-
-  return config;
-}
-
-axios.interceptors.request.use(proxyInterceptor);
+const axios = require('@blocklet/meta/lib/axios').default;
 
 module.exports = axios;

package/lib/create-blocklet-release.js

@@ -0,0 +1,90 @@
+/* eslint-disable no-console */
+const fs = require('fs-extra');
+const path = require('path');
+const ssri = require('ssri');
+const tar = require('tar');
+const chalk = require('chalk');
+const slugify = require('slugify');
+const packList = require('npm-packlist');
+const getBlockletMeta = require('@blocklet/meta/lib/parse');
+const {
+  BLOCKLET_RELEASE_FOLDER_NAME,
+  BLOCKLET_RELEASE_FILE,
+  BLOCKLET_BUNDLE_FOLDER_NAME,
+} = require('@blocklet/constant');
+
+const defaultLogger = {
+  info: console.log,
+  error: console.error,
+};
+
+// TODO add dependencies
+// TODO remove code in @abtnode/cli
+
+const createRelease = (dir, { printError = defaultLogger.error, printInfo = defaultLogger.info } = {}) =>
+  // eslint-disable-next-line no-async-promise-executor
+  new Promise(async (resolve, reject) => {
+    const destDir = path.join(dir, BLOCKLET_RELEASE_FOLDER_NAME);
+    const srcDir = path.join(dir, BLOCKLET_BUNDLE_FOLDER_NAME);
+
+    let meta;
+    try {
+      meta = getBlockletMeta(srcDir, {});
+    } catch (err) {
+      reject(err);
+      return;
+    }
+
+    meta.dist = {};
+    meta.dist.tarball = `${slugify(meta.name)}-${meta.version}.tgz`;
+
+    const destFile = path.join(destDir, meta.dist.tarball);
+    const metaFile = path.join(destDir, BLOCKLET_RELEASE_FILE);
+
+    fs.removeSync(destDir);
+    fs.mkdirpSync(destDir);
+
+    printInfo(`Creating release for blocklet ${meta.name}@${meta.version}...`);
+
+    try {
+      // https://github.com/npm/npm-packlist
+      const files = await packList({ package: {} }, { path: srcDir });
+
+      // https://github.com/npm/node-tar/blob/master/lib/create.js
+      await tar.create(
+        {
+          cwd: srcDir,
+          prefix: 'package/',
+          portable: true,
+          gzip: true,
+          file: destFile,
+          sync: true,
+        },
+        files
+      );
+
+      printInfo(`Release tarball created: ${chalk.cyan(destFile)}`);
+
+      ssri
+        .fromStream(fs.createReadStream(destFile), { algorithms: ['sha512'] })
+        .then((result) => {
+          meta.dist.integrity = result.toString();
+          meta.dist.size = fs.statSync(destFile).size;
+
+          fs.writeFileSync(metaFile, JSON.stringify(meta, null, 2));
+
+          printInfo(`Release meta created: ${chalk.cyan(metaFile)}`);
+
+          return resolve({ tarball: destFile, meta });
+        })
+        .catch((err) => {
+          printError(`Failed to create blocklet integrity: ${err.message}`);
+          reject(err);
+        });
+    } catch (err) {
+      printError(`Failed to create blocklet release: ${err.message}`);
+      reject(err);
+    }
+  });
+
+module.exports = { createRelease };

package/lib/normalize-path-prefix.js

@@ -1,13 +1,3 @@
-const normalizePathPrefix = (prefix) => {
-  if (typeof prefix === 'string') {
-    if (!prefix || prefix === '/') {
-      return '/';
-    }
-
-    return `/${prefix}/`.replace(/\/+/g, '/');
-  }
-
-  return '/';
-};
+const { normalizePathPrefix } = require('@blocklet/meta/lib/normalize-path-prefix');
 
 module.exports = normalizePathPrefix;

package/lib/url-path-friendly.js

@@ -1,43 +1,4 @@
-const isValidUrlPath = (name) => {
-  // Check if the path contains any uppercase letters
-  if (/[A-Z]/.test(name)) {
-    return false;
-  }
-
-  // Check if the path contains any non-ASCII characters
-  if (/[^\x20-\x7F]/.test(name)) {
-    return false;
-  }
-
-  // Check if the resulting string matches the pattern of a valid URL path
-  const regex = /^[a-z0-9/\-._]*$/i;
-  return regex.test(name) && !name.includes('//');
-};
-
-const urlPathFriendly = (name, { keepSlash = true } = {}) => {
-  // Replace non-URL path friendly characters with hyphens
-  const pathFriendlyStr = name
-    .trim()
-    .replace(/[^\x20-\x7F]/g, '')
-    .replace(/[^a-z0-9_.\-/]/gi, '-')
-    .toLowerCase();
-
-  // Remove consecutive hyphens
-  const noConsecutiveHyphens = pathFriendlyStr.replace(/-+/g, '-');
-
-  // Replace consecutive periods with a single period
-  const result = noConsecutiveHyphens.replace(/\.+/g, '.');
-
-  // Remove consecutive slashes if keepSlash is true
-  const noConsecutiveSlashes = result.replace(/\/+/g, '/');
-
-  // Remove leading/trailing slashes if keepSlash is false
-  if (!keepSlash) {
-    return noConsecutiveSlashes.replace(/^\/|\/$/g, '');
-  }
-
-  return noConsecutiveSlashes;
-};
+const { isValidUrlPath, default: urlPathFriendly } = require('@blocklet/meta/lib/url-path-friendly');
 
 module.exports = {
   isValidUrlPath,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16",
+  "version": "1.16.17-beta-8cacb9b3",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,17 +18,19 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.16",
-    "@abtnode/logger": "1.16.16",
-    "@blocklet/constant": "1.16.16",
-    "@ocap/client": "1.18.90",
-    "@ocap/mcrypto": "1.18.90",
-    "@ocap/util": "1.18.90",
-    "@ocap/wallet": "1.18.90",
+    "@abtnode/constant": "1.16.17-beta-8cacb9b3",
+    "@abtnode/logger": "1.16.17-beta-8cacb9b3",
+    "@blocklet/constant": "1.16.17-beta-8cacb9b3",
+    "@blocklet/meta": "1.16.17-beta-8cacb9b3",
+    "@ocap/client": "1.18.91",
+    "@ocap/mcrypto": "1.18.91",
+    "@ocap/util": "1.18.91",
+    "@ocap/wallet": "1.18.91",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
     "axon": "^2.0.3",
+    "chalk": "^4.1.2",
     "cookie": "^0.5.0",
     "cookie-parser": "^1.4.6",
     "cross-spawn": "^7.0.3",
@@ -48,6 +50,7 @@
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
     "multiformats": "9.9.0",
+    "npm-packlist": "^7.0.4",
     "p-retry": "4.6.1",
     "parallel-transform": "^1.2.0",
     "pm2": "^5.3.0",
@@ -56,7 +59,9 @@
     "semver-sort": "^1.0.0",
     "shelljs": "^0.8.5",
     "slugify": "^1.6.5",
+    "ssri": "^8.0.1",
     "stream-to-promise": "^3.0.0",
+    "tar": "^6.1.11",
     "through2-filter": "^3.0.0",
     "through2-map": "^3.0.0",
     "to-semver": "^3.0.0",
@@ -71,5 +76,5 @@
     "fs-extra": "^10.1.0",
     "jest": "^27.5.1"
   },
-  "gitHead": "2de4f6dbad086bd861273a4fc9ca8a87ddda4778"
+  "gitHead": "0e3266f543b6d419a004ca94ee9efb572e3d9809"
 }