@lazycatcloud/lzc-cli 1.2.61 → 1.2.63

package/changelog.md

@@ -1,7 +1,17 @@
+# 1.2.63
+
+1. 处理开发者账号无法登陆问题
+
+# 1.2.62
+
+1. 修复部分 windows 机器无法登陆开发者账号问题
+
 # 1.2.61
+
 1. 修复 lzc-build 文件配置 `compose.override` 字段不生效问题
 
 # 1.2.60
+
 1. 添加用户登录友好提示
 2. 移除已弃用模版
 3. 支持 lzc-build 文件配置 `compose.override` 字段

package/lib/appstore/login.js

@@ -1,5 +1,6 @@
 import fetch from "node-fetch"
 import path from "path"
+import url from "url"
 import logger from "loglevel"
 import env from "../config/env.js"
 import inquirer from "inquirer"
@@ -7,146 +8,156 @@ import inquirer from "inquirer"
 const accountServerUrl = "https://account.lazycat.cloud"
 
 function join(...params) {
-  var x = path.join(...params)
-  return x
+	let x = ""
+	try {
+		// fix: url path join failed for windows
+		const u = new url.URL(params[0])
+		params.splice(0, 1)
+		u.pathname = path.posix.join(u.pathname, ...params)
+		x = u.toString()
+	} catch (error) {
+		console.warn(error)
+		x = path.join(...params)
+	}
+	return x
 }
 
 async function login(username, password) {
-  return fetch(join(accountServerUrl, "/api/login/signin"), {
-    method: "POST",
-    body: new URLSearchParams({
-      username: username,
-      password: password
-    })
-  })
-    .then(async (res) => {
-      let bodyText = await res.text()
-      let body = JSON.parse(bodyText)
-      if (body.success) {
-        return Promise.resolve(body.data)
-      }
-      return Promise.reject(body.message)
-    })
-    .then((data) => {
-      env.set({ token: data.token }, true)
-      logger.info("登录成功!")
-    })
+	return fetch(join(accountServerUrl, "/api/login/signin"), {
+		method: "POST",
+		body: new URLSearchParams({
+			username: username,
+			password: password
+		})
+	})
+		.then(async (res) => {
+			let bodyText = await res.text()
+			let body = JSON.parse(bodyText)
+			if (body.success) {
+				return Promise.resolve(body.data)
+			}
+			return Promise.reject(body.message)
+		})
+		.then((data) => {
+			env.set({ token: data.token }, true)
+			logger.info("登录成功!")
+		})
 }
 
 async function isLogin() {
-  try {
-    let token = env.get("token")
-    if (!token) {
-      return false
-    }
-    return fetch(join(accountServerUrl, "/api/user/current"), {
-      method: "GET",
-      headers: {
-        "X-User-Token": token
-      }
-    }).then(async (res) => {
-      let bodyText = await res.text()
-      let body = JSON.parse(bodyText)
-      if (body.success) {
-        return token
-      }
-      logger.debug(body.message)
-      return false
-    })
-  } catch (e) {
-    logger.trace(e)
-    return false
-  }
+	try {
+		let token = env.get("token")
+		if (!token) {
+			return false
+		}
+		return fetch(join(accountServerUrl, "/api/user/current"), {
+			method: "GET",
+			headers: {
+				"X-User-Token": token
+			}
+		}).then(async (res) => {
+			let bodyText = await res.text()
+			let body = JSON.parse(bodyText)
+			if (body.success) {
+				return token
+			}
+			logger.debug(body.message)
+			return false
+		})
+	} catch (e) {
+		logger.trace(e)
+		return false
+	}
 }
 
 async function askUserInfo() {
-  const noEmpty = (value) => value != ""
-  return await inquirer.prompt([
-    {
-      type: "input",
-      name: "username",
-      message: "请输入登录用户名",
-      validate: noEmpty
-    },
-    {
-      type: "password",
-      mask: "*",
-      name: "password",
-      message: "请输入登录密码",
-      validate: noEmpty
-    }
-  ])
+	const noEmpty = (value) => value != ""
+	return await inquirer.prompt([
+		{
+			type: "input",
+			name: "username",
+			message: "请输入登录用户名",
+			validate: noEmpty
+		},
+		{
+			type: "password",
+			mask: "*",
+			name: "password",
+			message: "请输入登录密码",
+			validate: noEmpty
+		}
+	])
 }
 
 async function interactiveLogin() {
-  try {
-    let info = await askUserInfo()
-    await login(info.username, info.password)
-  } catch (e) {
-    logger.debug("login error: ", e)
-    logger.error("帐号或者密码错误，请重新输入!")
-    return interactiveLogin()
-  }
+	try {
+		let info = await askUserInfo()
+		await login(info.username, info.password)
+	} catch (e) {
+		logger.debug("login error: ", e)
+		logger.error("帐号或者密码错误，请重新输入!")
+		return interactiveLogin()
+	}
 }
 
 function tipsFirstLogin() {
-    let token = env.get("token")
-    if (!token) {
-      // 还没登录过的用户提示用户前往 https://developer.lazycat.cloud/manage 注册开发者账号
-      logger.info("请登录懒猫微服社区账号，账号注册以及开发者权限申请地址: https://developer.lazycat.cloud/manage")
-    }
+	let token = env.get("token")
+	if (!token) {
+		// 还没登录过的用户提示用户前往 https://developer.lazycat.cloud/manage 注册开发者账号
+		logger.info("请登录懒猫微服社区账号，账号注册以及开发者权限申请地址: https://developer.lazycat.cloud/manage")
+	}
 }
 
 export async function reLogin() {
-  let token = await isLogin()
-  if (token) {
-    const questions = [
-      {
-        name: "relogin",
-        type: "input",
-        default: "n",
-        message: "检测到已经登录，是否重新登录(y/n):"
-      }
-    ]
-    const answers = await inquirer.prompt(questions)
-    if (answers.relogin.toLowerCase() === "n") {
-      logger.info(`token: ${token}`)
-      return
-    }
-  } else {
-    tipsFirstLogin()
-  }
-  await interactiveLogin()
+	let token = await isLogin()
+	if (token) {
+		const questions = [
+			{
+				name: "relogin",
+				type: "input",
+				default: "n",
+				message: "检测到已经登录，是否重新登录(y/n):"
+			}
+		]
+		const answers = await inquirer.prompt(questions)
+		if (answers.relogin.toLowerCase() === "n") {
+			logger.info(`token: ${token}`)
+			return
+		}
+	} else {
+		tipsFirstLogin()
+	}
+	await interactiveLogin()
 }
 
 export async function autoLogin() {
-  let token = await isLogin()
-  if (token) {
-    logger.debug("appstore 已经登录")
-    return
-  } else {
-    tipsFirstLogin()
-  }
+	let token = await isLogin()
+	if (token) {
+		logger.debug("appstore 已经登录")
+		return
+	} else {
+		tipsFirstLogin()
+	}
 
-  logger.debug("token错误，尝试自动登录")
-  await interactiveLogin()
+	logger.debug("token错误，尝试自动登录")
+	await interactiveLogin()
 }
 
 export async function request(url, options = {}) {
-  await autoLogin()
+	await autoLogin()
 
-  const token = env.get("token")
+	const token = env.get("token")
 
-  let headers = {
-    "X-User-Token": token,
-    cookie: `userToken=${token}`
-  }
-  if (options.headers) {
-    headers = Object.assign({}, options.headers, headers)
-  }
+	let headers = {
+		"X-User-Token": token,
+		cookie: `userToken=${token}`
+	}
+	if (options.headers) {
+		headers = Object.assign({}, options.headers, headers)
+	}
 
-  options = Object.assign({}, options, { headers })
-  logger.trace(`fetch ${url}`, options)
+	options = Object.assign({}, options, { headers })
+	logger.trace(`fetch ${url}`, options)
 
-  return fetch(url, options)
+	return fetch(url, options)
 }

package/lib/utils.js

@@ -384,9 +384,8 @@ export function isValidAppId(appId) {
 }
 
 export function isValidPackageName(packageName) {
-  // 暂时去掉 - 的支持
   const regex = new RegExp(
-    "^[a-z][a-z0-9]*([-][a-z0-9]+)*(?:.[a-z][a-z0-9]*([-][a-z0-9]+)*)*$"
+    "^[a-z][a-z0-9]*([-][a-z0-9]+)*(?:\\.[a-z][a-z0-9]*([-][a-z0-9]+)*)*$"
   )
   return regex.test(packageName)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.61",
+  "version": "1.2.63",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "prepublishOnly": "node check-changelog.js"

package/template/_lpk/manifest.yml.in

@@ -13,4 +13,4 @@ author: # app author
 application:
   subdomain: ${subdomain} #期望的app域名
   routes:
-    - /=file:///lzcapp/pkg/content/dist
+    - /=file:///lzcapp/pkg/content