shoplazza-cli 1.0.3 → 1.0.5

package/bin/shoplazza

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+process.noDeprecation = true; // 全局禁用废弃警告
 const { program } = require('commander');
 const updateNotifier = require('update-notifier');
 const Sentry = require('@sentry/node');

package/lib/checkout/api.js

@@ -7,6 +7,7 @@ const { openAipVersion } = require('./config');
 const { isDebug } = require('./console');
 const { getProjectConfig } = require('./util');
 const chalk = require('chalk');
+const { consoleWarn } = require('./console');
 
 const FILE_SIGN_URL = '/checkout_extensions/file/sign';
 const CREATE_URL = '/checkout_extensions/create';
@@ -39,13 +40,17 @@ request.interceptors.request.use((config) => {
   return config;
 });
 
-const handleResponseError = (response)=>{
-  if (response.data?.status === 3 && response.data?.message === 'INVALID_ARGUMENT') {
-    throw `Invalid argument at ${response.config.url}`;
-  }else if(response.data?.status === 13 && response.data?.message === 'INTERNAL_ERROR'){
-    throw `Internal error at ${response.config.url}`;
+const errorMapping = {
+  INVALID_ARGUMENT: 'Invalid argument',
+  PERMISSION_DENIED: 'Permission denied',
+  INTERNAL_ERROR: 'Internal error'
+};
+const handleResponseError = (response) => {
+  const errorMsg = errorMapping[response.data?.message];
+  if (errorMsg) {
+    throw `${errorMsg} at ${response.config.url}`;
   }
-}
+};
 
 request.interceptors.response.use(
   (response) => {
@@ -71,11 +76,11 @@ request.interceptors.response.use(
 
 async function upload(path, name) {
   const form = new FormData();
-  await request(`${FILE_SIGN_URL}?key=${name}`)
+  const url = await request(`${FILE_SIGN_URL}?key=${name}`)
     .then((data) => {
       return data.data;
     })
-    .then((data) => {
+    .then(async (data) => {
       const url = data.write_host;
       form.append('policy', data.policy);
       form.append('OSSAccessKeyId', data.access_id);
@@ -84,13 +89,25 @@ async function upload(path, name) {
       form.append('x-oss-forbid-overwrite', 'true');
       form.append('key', name);
       form.append('file', fs.createReadStream(path));
-      return request.post(`https:${url}`, form, { headers: form.getHeaders() });
+      await request.post(`https:${url}`, form, { headers: form.getHeaders() }).catch((error) => {
+        if (error.response?.data.includes('<Code>FileAlreadyExists</Code>')) {
+          consoleWarn('The current file already exists, not need to upload.');
+          return;
+        } else {
+          return Promise.reject(error);
+        }
+      });
+      return `${data.read_host}${data.read_host.endsWith('/') ? '' : '/'}${name}`;
     });
   loading('succeed upload').succeed();
+  return url;
 }
 
+async function uploadFile(dirPath, file) {
+  return upload(`${dirPath}/${file}`, `chick-extension/${file}`);
+}
 async function uploadDir(dirPath, files) {
-  await Promise.all(
+  return Promise.all(
     files.map((file) => {
       return upload(`${dirPath}/${file}`, `chick-extension/${file}`);
     })
@@ -98,8 +115,8 @@ async function uploadDir(dirPath, files) {
 }
 
 module.exports = {
-  upload,
   uploadDir,
+  uploadFile,
   getExtensionList: async (params) => {
     const load = loading('Fetch extension list').start();
     try {

package/lib/checkout/push.js

@@ -26,9 +26,9 @@ module.exports = async () => {
     }; // 兼容旧代码处理
     await viteBuild(composeCommands);
     consoleBlue('Starting to upload:');
-    await uploadOSS(composeCommands);
+    const url = await uploadOSS(composeCommands);
     consoleBlue('Starting to push:');
-    await pushExtension(composeCommands, extensionInfo);
+    await pushExtension(composeCommands, extensionInfo, url);
   } catch (error) {
     error.response ? consoleError(`Error: ${error.response.status}-${error.response.config.url}`) : consoleError(error);
   }
@@ -46,31 +46,27 @@ async function uploadOSS(command) {
   }
   const files = fsExtra.readdirSync(dir).filter((name) => name.includes(info.id));
   try {
-    await api.uploadDir(dir, files);
+    const url = await api.uploadFile(dir, files[0]);
+    consoleSuccess('Successfully uploaded to OSS.');
+    return url;
   } catch (error) {
-    if (error.response?.data.includes('<Code>FileAlreadyExists</Code>')) {
-      consoleWarn('The current file already exists, not need to upload.');
-      return;
-    } else {
-      consoleError('Failed to upload to OSS:', error);
-      throw 'upload_failed';
-    }
+    consoleError('Failed to upload to OSS:', error);
+    throw 'upload_failed';
   }
-  consoleSuccess('Successfully uploaded to OSS.');
 }
 
 /**
  * 发布
  * @returns
  */
-async function pushExtension(command, extraInfo) {
+async function pushExtension(command, extraInfo, url) {
   const info = getExtensionInfo(command.id);
   const load = loading(`start push the extension ${info.id}.`).start();
   try {
     const config = getExtensionConfig(command.id);
     // 兼容低版本extension配置文件
     const data = {
-      resource_url: `https://cn.static.shoplazza.com/chick-extension/${info.distName}`,
+      resource_url: url,
       version: config.version,
       scope: '',
       template_name: config.templateName || config.template_name,
@@ -91,7 +87,7 @@ async function pushExtension(command, extraInfo) {
       setExtensionConfig(command.id, {
         ...config,
         extensionId: extensionInfo.extension_id,
-        extensionName: extensionInfo.name,
+        extensionName: extensionInfo.name
       });
     }
 
@@ -111,7 +107,6 @@ async function pushExtension(command, extraInfo) {
     } catch (error) {
       consoleError(error);
     }
-
   } catch (err) {
     load.stop();
     throw '\nFailed to push the extension: ' + err;

package/lib/checkout/util.js

@@ -170,11 +170,9 @@ function checkLocalExtension(extensionInfo) {
     const extensionJsonPath = path.resolve(extensionPath, './extension.json');
     const localExtensionInfo = JSON.parse(fs.readFileSync(extensionJsonPath, 'utf8'));
     if (localExtensionInfo.extensionId !== extensionInfo.extension_id) {
-      consoleError(`The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`);
       throw `The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`;
     }
   } else {
-    consoleError(`The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`);
     throw `The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoplazza-cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "main": "bin/shoplazza",
   "engines": {