shoplazza-cli 1.0.6 → 1.0.7

package/lib/app/index.js

@@ -1,25 +1,37 @@
-function initThemeAppCommand(_program) {
-  const program = _program.command('app').description('Shoplazza app CLI');
+const { checkAndLogin } = require('./login');
+const { build } = require('./commands/build');
+const { deploy } = require('./commands/deploy');
+const { generate } = require('./commands/generate');
+const { publish } = require('./commands/publish');
+const { choosePartner } = require('./inquirers/choose-partner');
+const { chooseApp } = require('./inquirers/choose-app');
 
-  program.command('create').description('Create a new theme app').action(require('./commands/create').create);
-
-  program
-    .command('serve')
-    .description('Start a local development server for the theme app')
-    .action(require('./commands/serve').serve);
+const generateExtension = async () => {
+  (await checkAndLogin()) && (await generate());
+};
 
-  program.command('build').description('Build the theme app for production').action(require('./commands/build').build);
+const deployExtension = async () => {
+  (await checkAndLogin()) && (await deploy());
+};
 
-  program
-    .command('versions')
-    .description('List all versions of the theme app')
-    .action(require('./commands/versions').versions);
+const publishExtension = async () => {
+  (await checkAndLogin()) && (await publish());
+};
 
-  program.command('deploy').description('Deploy the theme app').action(require('./commands/deploy').deploy);
+const retry = async (options) => {
+  if (options.partner) {
+    (await checkAndLogin()) && (await choosePartner()) && (await chooseApp());
+  }
 
-  program.command('list').description('List all theme apps').action(require('./commands/list').list);
-}
+  if (options.app) {
+    (await checkAndLogin()) && (await chooseApp());
+  }
+};
 
 module.exports = {
-  initThemeAppCommand
+  generateExtension,
+  deployExtension,
+  publishExtension,
+  buildExtension: build,
+  retry
 };

package/lib/app/inquirers/version.js

@@ -0,0 +1,131 @@
+const axios = require('axios');
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+
+const { PARNTER_URL } = require('../constants');
+const { getApp, getValue, PARTNER_KEYS } = require('../db/partner');
+const { line } = require('../log');
+
+const requestLastVersion = async () => {
+  try {
+    const app = getApp();
+    if (!app) {
+      return;
+    }
+    const extensionId = getValue(PARTNER_KEYS.EXTENSION_ID);
+    const partnerId = getValue(PARTNER_KEYS.PARTNER_ID);
+
+    const url = `${PARNTER_URL}/api/partner/apps/${app.uid}/theme_extensions/${extensionId}/last_version`;
+    const res = await axios.get(url, {
+      headers: {
+        cookie: `awesomev2=${getValue(PARTNER_KEYS.SESSION_ID)};`,
+        'x-shoplazza-partner-id': partnerId
+      },
+      validateStatus(status) {
+        if (status === 404) {
+          return true;
+        }
+        return status >= 200 && status < 299;
+      }
+    });
+
+    if (res.data.errors) {
+      return;
+    }
+
+    return res.data.version;
+  } catch (e) {
+    console.log(chalk.red(e.message || e));
+    console.log(chalk.red(JSON.stringify(e.response?.data)));
+  }
+};
+
+const requestVersionsData = async (params = {}) => {
+  try {
+    const app = getApp();
+    if (!app) {
+      return;
+    }
+    const extensionId = getValue(PARTNER_KEYS.EXTENSION_ID);
+    const partnerId = getValue(PARTNER_KEYS.PARTNER_ID);
+
+    const url = `${PARNTER_URL}/api/partner/apps/${app.uid}/theme_extensions/${extensionId}/versions`;
+    const res = await axios.get(url, {
+      params,
+      headers: {
+        cookie: `awesomev2=${getValue(PARTNER_KEYS.SESSION_ID)};`,
+        'x-shoplazza-partner-id': partnerId
+      },
+      validateStatus(status) {
+        if (status === 404) {
+          return true;
+        }
+        return status >= 200 && status < 299;
+      }
+    });
+
+    if (res.data.errors) {
+      throw new Error(JSON.stringify(res.data.errors));
+    }
+
+    return res.data.data;
+  } catch (e) {
+    console.log(chalk.red(e.message || e));
+    console.log(chalk.red(JSON.stringify(e.response?.data)));
+  }
+};
+
+const inputVersion = async () => {
+  line();
+  const lastVersionData = await requestLastVersion({ limit: 1 });
+  const hint = lastVersionData ? chalk.gray(`(last version: ${lastVersionData.version})`) : '';
+
+  const answer = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'extensionVersion',
+      message: `${chalk.blue('Input your extension version')} ${hint}:`,
+      prefix: `${chalk.green('⭐️')}`
+    }
+  ]);
+
+  return answer['extensionVersion'];
+};
+
+const selectVersion = async () => {
+  line();
+
+  const versionDataList = await requestVersionsData();
+  if (!versionDataList) {
+    console.log(chalk.red('Please deploy a version first!'));
+    line();
+  }
+
+  const answer = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'versionData',
+      message: `${chalk.blue('Choose a version to publish:')}`,
+      default: versionDataList[0].version,
+      prefix: `${chalk.blue('🐱')}`,
+      choices: versionDataList.map((v) => {
+        return {
+          name: `${v.version} ${v.published ? chalk.green('published') : ''}`,
+          value: {
+            version: v.version,
+            appId: v.app_id,
+            versionId: v.version_id,
+            extensionId: v.extension_id
+          }
+        };
+      })
+    }
+  ]);
+
+  return answer['versionData'];
+};
+
+module.exports = {
+  inputVersion,
+  selectVersion
+};

package/lib/checkout/api.js

@@ -8,7 +8,6 @@ const { isDebug } = require('./console');
 const { getProjectConfig } = require('./util');
 const chalk = require('chalk');
 const { consoleWarn } = require('./console');
-const { useOss } = require('../oss');
 
 const FILE_SIGN_URL = '/checkout_extensions/file/sign';
 const CREATE_URL = '/checkout_extensions/create';
@@ -20,7 +19,6 @@ const UNDEPLOY_URL = '/checkout_extensions/undeploy';
 const PREVIEW_URL = '/checkout_extensions/preview';
 
 let configJson = undefined;
-let uploadOss = null;
 
 const request = new Axios.create();
 
@@ -66,6 +64,9 @@ request.interceptors.response.use(
     if (isDebug()) {
       console.log(`\n<== error ${error.response.status}: ${error.response.config.url}`);
     }
+    if (!error.response) {
+      throw chalk.red('Network error, please check your connection.');
+    }
     if (error.response?.status == 403) {
       return Promise.reject(new Error('Token permission failure'));
     }
@@ -73,20 +74,42 @@ request.interceptors.response.use(
   }
 );
 
+async function upload(path, name) {
+  const form = new FormData();
+  const url = await request(`${FILE_SIGN_URL}?key=${name}`)
+    .then((data) => {
+      return data.data;
+    })
+    .then(async (data) => {
+      const url = data.write_host;
+      form.append('policy', data.policy);
+      form.append('OSSAccessKeyId', data.access_id);
+      form.append('success_action_status', 200);
+      form.append('signature', data.sign);
+      form.append('x-oss-forbid-overwrite', 'true');
+      form.append('key', name);
+      form.append('file', fs.createReadStream(path));
+      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) {
-  if (!uploadOss) {
-    uploadOss = useOss(
-      configJson.token,
-      new URL(configJson.store).hostname,
-      `✗ No store found. Please check your "extension.config.js" file.`
-    ).uploadOss;
-  }
-  return uploadOss(`${dirPath}/${file}`);
+  return upload(`${dirPath}/${file}`, `chick-extension/${file}`);
 }
 async function uploadDir(dirPath, files) {
   return Promise.all(
     files.map((file) => {
-      return uploadOss(`${dirPath}/${file}`);
+      return upload(`${dirPath}/${file}`, `chick-extension/${file}`);
     })
   );
 }

package/lib/commands/login.js

@@ -8,7 +8,7 @@ const log = require('../log');
 const { getShopDetail } = require('../openAPI/api');
 const getCode = require('../auth/getCode');
 const { postAccessToken, getUserInfo, postExchangeToken, postStoreToken } = require('../auth');
-const { loginIntoPartner } = require('../common/login');
+const { loginIntoPartner } = require('../app/login');
 
 let spinner;
 

package/lib/commands/logout.js

@@ -1,7 +1,7 @@
 const Sentry = require('@sentry/node');
 const chalk = require('chalk');
 const { empty: emptyUser } = require('../db/user');
-const { logoutPartner } = require('../common/logout');
+const { logoutPartner } = require('../app/logout');
 const log = require('../log');
 
 const logoutStore = () => {

package/lib/openAPI/index.js

@@ -12,23 +12,17 @@ const openAPI = axios.create({
   headers: { 'Access-Token': get('exchange_token') }
 });
 
-openAPI.interceptors.request.use(
-  (config) => {
-    if (!get('store_domain')) {
-      log.error(
-        chalk.red(
-          `\n✗ No store found. Please run ${chalk.cyan('shoplazza login --store STORE')} to login to a specific store`
-        )
-      );
-      process.exit(-1);
-    }
-    return config;
-  },
-  (error) => {
-    console.error(chalk.red(`[REQUEST ERROR] ${error.message}`));
-    return Promise.reject(error);
+openAPI.interceptors.request.use((config) => {
+  if (!get('store_domain')) {
+    log.error(
+      chalk.red(
+        `\n✗ No store found. Please run ${chalk.cyan('shoplazza login --store STORE')} to login to a specific store`
+      )
+    );
+    process.exit(-1);
   }
-);
+  return config;
+});
 
 openAPI.interceptors.response.use(
   function (response) {
@@ -45,11 +39,6 @@ openAPI.interceptors.response.use(
         return openAPI(error.config);
       });
     }
-    error.response && console.error(
-      chalk.red(
-        `[RESPONSE ERROR] ${error.response.status} ${error.response.config.baseURL}${error.response.config.url}`
-      )
-    );
     return Promise.reject(error);
   }
 );

package/lib/utils.js

@@ -2,8 +2,6 @@ const path = require('path');
 const fs = require('fs-extra');
 const AdmZip = require('adm-zip');
 const chalk = require('chalk');
-const chokidar = require('chokidar');
-const fsExtra = require('fs-extra');
 
 const {
   SSO_AUTH_URL,
@@ -113,53 +111,3 @@ const SSO_AUTH_URL_MAP = {
 exports.getSSOAuthUrl = (store) => {
   return SSO_AUTH_URL_MAP[getEnv(store)];
 };
-
-/**
- * 监听文件夹变化
- * @param {string} workspace - 需要监听的文件夹路径
- * @param {Object} options - 配置项
- * @param {Function} [options.onAdd] - 文件添加时的回调函数，接收文件路径作为参数
- * @param {Function} [options.onChange] - 文件更改时的回调函数，接收文件路径作为参数
- * @param {Function} [options.onDelete] - 文件删除时的回调函数，接收文件路径作为参数
- * @param {any} [options.xxx] - 其他chokidar.watch配置项
- * @returns {Function} - 取消监听的函数
- */
-exports.initWatcher = (workspace, options = {}) => {
-  if (!fsExtra.pathExistsSync(workspace)) {
-    console.error(chalk.red(`[ERROR] "${workspace}" does not exist.`));
-    return;
-  }
-  const defaultOptions = {
-    persistent: true,
-    ignoreInitial: true
-  };
-  const { onAdd = () => {}, onChange = () => {}, onDelete = () => {}, ...restOptions } = options;
-  const watcherOptions = { ...defaultOptions, ...restOptions };
-  const watcher = chokidar.watch(workspace, watcherOptions);
-
-  watcher.on('add', (filePath) => {
-    console.log(chalk.cyan(`[ADD] ${filePath}`));
-    onAdd(filePath);
-  });
-
-  watcher.on('change', (filePath) => {
-    console.log(chalk.yellow(`[CHANGE] ${filePath}`));
-    onChange(filePath);
-  });
-
-  watcher.on('unlink', (filePath) => {
-    console.log(chalk.red(`[DELETE] ${filePath}`));
-    onDelete(filePath);
-  });
-
-  watcher.on('error', (error) => {
-    console.error(chalk.red(`[ERROR] ${error}`));
-  });
-
-  const stopWatcher = () => {
-    console.log(chalk.green('[INFO] Stopping watcher...'));
-    watcher.close();
-  };
-
-  return stopWatcher;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoplazza-cli",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "",
   "main": "bin/shoplazza",
   "engines": {
@@ -26,6 +26,7 @@
     "@sentry/tracing": "^6.19.7",
     "adm-zip": "^0.5.9",
     "ali-oss": "^6.17.1",
+    "archiver": "^5.3.1",
     "axios": "^1.6.8",
     "better-sqlite3": "^11.5.0",
     "chalk": "^4.1.2",
@@ -63,7 +64,6 @@
     "semver": "~7.3.5",
     "serve-static": "^1.15.0",
     "spark-md5": "^3.0.2",
-    "table": "^6.9.0",
     "uglify-js": "^3.17.4",
     "update-notifier": "^5.1.0",
     "vite": "~4.3.1",

package/lib/app/api/api.js

@@ -1,93 +0,0 @@
-const { get, post, put, del, patch } = require('./request');
-
-/**
- * 获取主题列表
- */
-async function getThemeList() {
-  return get('/themes');
-}
-
-/**
- * 获取店铺私有主题插件列表
- * @returns
- */
-async function getThemeAppList() {
-  return [
-    {
-      name: '主题插件1',
-      version: '1.0.0',
-      description: '主题插件1的描述'
-    },
-    {
-      name: '主题插件2',
-      version: '2.0.0',
-      description: '主题插件2的描述'
-    },
-    {
-      name: '主题插件3',
-      version: '3.0.0',
-      description: '主题插件3的描述'
-    }
-  ];
-  // return get('/theme-extensions');
-}
-
-/**
- * 创建主题插件
- */
-async function toCreateThemeApp(data) {
-  return put('/theme-extensions', data);
-}
-
-/**
- * 上传主题插件
- */
-async function toUploadThemeApp(data) {
-  return patch(`theme-extensions/${data.appId}/dev-doctree`, data);
-}
-
-/**
- * 获取任务状态
- */
-async function getTaskStatus(data) {
-  return get(`/theme-extensions/version-tasks/${data.taskId}`);
-}
-
-/**
- * 获取主题插件版本列表
- */
-async function getThemeAppVersionList(data) {
-  return [
-    { version: '1.0.0', date: '2023-01-01', description: 'Initial release' },
-    { version: '1.1.0', date: '2023-02-01', description: 'Added new features and bug fixes' },
-    { version: '1.2.0', date: '2023-03-01', description: 'Fixed bugs and improved performance' },
-    { version: '1.3.0', date: '2023-04-01', description: 'Optimized performance and added new features' },
-    { version: '1.4.0', date: '2023-05-01', description: 'Fixed bugs and improved user experience' }
-  ];
-  // return get(`/theme-extensions/:${data.appId}/versions`);
-}
-
-/**
- * 创建主题插件版本
- */
-async function toCreateThemeAppVersion(data) {
-  return post(`/theme-extensions/version-tasks`, data);
-}
-
-/**
- * 部署主题插件
- */
-async function toDeployThemeApp(data) {
-  return post(`theme-extensions/publications`, data);
-}
-
-module.exports = {
-  getThemeList,
-  getThemeAppList,
-  toCreateThemeApp,
-  toUploadThemeApp,
-  getThemeAppVersionList,
-  toCreateThemeAppVersion,
-  toDeployThemeApp,
-  getTaskStatus
-};

package/lib/app/api/request.js

@@ -1,72 +0,0 @@
-const instance = require('../../openAPI/index');
-
-/**
- * 基础的 API 请求方法
- * @param {string} method 请求方法 (GET, POST, PUT, DELETE)
- * @param {string} url 请求的路径
- * @param {Object} data 请求的数据（适用于 POST、PUT）
- * @param {Object} params 请求的 URL 参数（适用于 GET）
- */
-async function request({ method, url, data, params }) {
-  const response = await instance({
-    method,
-    url,
-    data,
-    params
-  });
-  return response; // 返回请求结果
-}
-
-/**
- * GET 请求封装
- * @param {string} url 请求的路径
- * @param {Object} params 请求的 URL 参数
- */
-async function get(url, params) {
-  return request({ method: 'get', url, params });
-}
-
-/**
- * POST 请求封装
- * @param {string} url 请求的路径
- * @param {Object} data 请求的数据
- */
-async function post(url, data) {
-  return request({ method: 'post', url, data });
-}
-
-/**
- * PUT 请求封装
- * @param {string} url 请求的路径
- * @param {Object} data 请求的数据
- */
-async function put(url, data) {
-  return request({ method: 'put', url, data });
-}
-
-/**
- * DELETE 请求封装
- * @param {string} url 请求的路径
- * @param {Object} params 请求的 URL 参数
- */
-async function del(url, params) {
-  return request({ method: 'delete', url, params });
-}
-
-/**
- * PATCH 请求封装
- * @param {string} url 请求的路径
- * @param {Object} data 请求的数据
- */
-async function patch(url, data) {
-  return request({ method: 'patch', url, data });
-}
-
-
-module.exports = {
-  get,
-  post,
-  put,
-  del,
-  patch
-};

package/lib/app/commands/create.js

@@ -1,100 +0,0 @@
-const inquirer = require('inquirer');
-const path = require('path');
-const fsExtra = require('fs-extra');
-const chalk = require('chalk');
-const { WORKSPACE_PATH, THEME_APP_TYPE } = require('../utils/config');
-const { replacePlaceholders, renameFile } = require('../utils');
-
-/**
- * 交互式命令行
- */
-async function usePrompt() {
-  return await inquirer.prompt([
-    {
-      type: 'list',
-      name: 'themeAppType',
-      message: 'Select theme app type:',
-      choices: [THEME_APP_TYPE.BASIC_APP.description, THEME_APP_TYPE.EMBEDS_APP.description],
-      prefix: '*'
-    },
-    {
-      type: 'input',
-      name: 'projectName',
-      message: 'Please enter the theme app project name:',
-      prefix: '*',
-      validate: (projectName) => {
-        if (!projectName.trim()) {
-          return 'Project name cannot be empty';
-        }
-        return true;
-      }
-    }
-  ]);
-}
-
-/**
- * 初始化项目
- */
-async function initProj(projectPath, projectName) {
-  // 替换占位符 key文件相对路径 value替换的内容
-  const replacementConfig = {
-    'package.json': { projectName },
-    'theme-app/blocks/index.liquid': { projectName },
-    'theme-app.config.json': { projectName }
-  };
-  for (const [filePath, replacements] of Object.entries(replacementConfig)) {
-    const fullPath = path.resolve(projectPath, filePath);
-    await replacePlaceholders(fullPath, replacements);
-  }
-
-  // 重命名文件
-  const filesToRename = ['assets/index.css', 'blocks/index.liquid', 'snippets/index.liquid'];
-  for (const file of filesToRename) {
-    const filePath = path.resolve(projectPath, 'theme-app', file);
-    await renameFile(filePath, `${projectName}${file.includes('snippets') ? '_snippet' : ''}`);
-  }
-}
-
-/**
- * 控制台提示信息
- */
-function consoleTips(projectName) {
-  console.log(chalk.green(`Theme app project "${projectName}" has been successfully created.`));
-  console.log(chalk.bold(`To get started:\n`));
-  console.log(`  ${chalk.cyan(`cd ${projectName}`)}`);
-  console.log(`  ${chalk.cyan(`npm start`)}\n`);
-  console.log(chalk.greenBright(`Happy coding! 🎉🎉🎉`));
-}
-
-/**
- * 创建项目
- */
-async function _create(themeAppDescription, projectName) {
-  const projectPath = path.resolve(WORKSPACE_PATH, projectName);
-  const projectExists = await fsExtra.pathExists(projectPath);
-
-  if (projectExists) {
-    throw new Error(`Project directory "${projectName}" already exists.`);
-  }
-  await fsExtra.ensureDir(projectPath);
-  const templatePath =
-    THEME_APP_TYPE.BASIC_APP.description === themeAppDescription
-      ? THEME_APP_TYPE.BASIC_APP.templatePath
-      : THEME_APP_TYPE.EMBEDS_APP.templatePath;
-  await fsExtra.copy(templatePath, projectPath);
-  await initProj(projectPath, projectName);
-  consoleTips(projectName);
-}
-
-async function create() {
-  try {
-    const { themeAppType, projectName } = await usePrompt();
-    await _create(themeAppType, projectName);
-  } catch (error) {
-    console.error(chalk.red(`[ERROR IN CREATE] ${error.message}`));
-  }
-}
-
-module.exports = {
-  create
-};