eprolo-cli 1.0.108 → 1.0.110

package/bin/eprolo-cli.js

@@ -47,23 +47,23 @@ function readFlag(argv, flag) {
 // HTTPS POST 请求
 // ---------------------------------------------------------------------------
 
-function postJson(url, body, headers = {},method = "POST") {
+function postJson(url, body, headers = {}, method = "POST") {
   const config = readConfig();
-  let signValue={}
-   if(config.timestamp){
+  let signValue = {}
+  if (config.timestamp) {
     signValue.timestamp = config.timestamp;
     signValue.sign = config.accessToken;
   }
-   if(method == "GET") {
-    signValue = {...signValue, ...body};
+  if (method == "GET") {
+    signValue = { ...signValue, ...body };
   }
   url += "?" + new URLSearchParams(signValue).toString();
   return new Promise((resolve, reject) => {
     const target = new URL(url);
     const payload = JSON.stringify(body);
-    let reqMethod=https;
-    if(String(target.protocol).startsWith("http:")){
-      reqMethod=http;
+    let reqMethod = https;
+    if (String(target.protocol).startsWith("http:")) {
+      reqMethod = http;
     }
     const req = reqMethod.request({
       hostname: target.hostname,
@@ -108,7 +108,7 @@ async function postJsonWithRetry(url, body, config, method = "POST") {
   let result = await postJson(url, body, headers, method);
   if (result.data.code == '-1') {
     // 刷新 token
-    const refreshRes = await postJson(LOGIN_API, {openApiKey: config.refreshToken});
+    const refreshRes = await postJson(LOGIN_API, { openApiKey: config.refreshToken });
 
     if (refreshRes.data.code == 0) {
       // 更新凭据文件
@@ -116,14 +116,14 @@ async function postJsonWithRetry(url, body, config, method = "POST") {
 
       // 用新 token 重试
       headers["apiKey"] = `${refreshRes.data.data.apiKey}`;
-      result = await postJson(url, body, headers,method);
+      result = await postJson(url, body, headers, method);
     }
     else {
       const err = new Error("Token 刷新失败，请重新登录授权");
       err.response = refreshRes.data;
       throw err;
     }
-  }else if (result.data.code != 0) {
+  } else if (result.data.code != 0) {
     const err = new Error(`HTTP ${result.statusCode}`);
     err.response = result.data.data.msg;
     throw err;
@@ -208,7 +208,7 @@ async function queryProductId(productId) {
     console.error(JSON.stringify({ success: false, errorMessage: "缺少产品 ID" }));
     process.exit(1);
   }
-  const data = await postJsonWithRetry(PRODUCT_TYPE_API, {id:productId}, config, "GET");
+  const data = await postJsonWithRetry(PRODUCT_TYPE_API, { id: productId }, config, "GET");
   console.log(JSON.stringify(data, null, 2));
   process.exit(0);
 }
@@ -230,99 +230,114 @@ function readPayload(arg) {
   }
   return arg;
 }
-function getId(id){
-  let ids=String(id).split('/');
-  return ids[ids.length-1];
+function getId(id) {
+  let ids = String(id).split('/');
+  return ids[ids.length - 1];
 }
 async function insertProduct(arg) {
   const config = readConfig();
   const product = JSON.parse(arg);
-  const info={};
-  const optionList=[];
-  const variantsList=[];
-  const imageList=[];
+  const info = {};
+  const optionList = [];
+  const variantsList = [];
+  const imageList = [];
   info.title = product.title;
   info.product_id = getId(product.id);
-  info.body_html=product.description;
-  info.optionList=optionList;
-  info.variantsList=variantsList;
-  info.imageList=imageList;
-  product.variants.edges.forEach((variant,index)=>{
-    let newInfo={
-      image_id:getId(variant.id),
-      title:variant.title,
-      sku:variant.sku
-    };
-    variant.selectedOptions.forEach((option,optionIndex)=>{
-      if(index==0){
-        optionList.push({name:option.name});
+  info.body_html = product.description;
+  info.optionList = optionList;
+  info.variantsList = variantsList;
+  info.imageList = imageList;
+  if (product.variants && product.variants.edges) {
+    product.variants.edges.forEach((variant, index) => {
+      let newInfo = {
+        image_id: getId(variant.id),
+        title: variant.title,
+        sku: variant.sku
+      };
+      if (variant.selectedOptions && variant.selectedOptions.length > 0) {
+        variant.selectedOptions.forEach((option, optionIndex) => {
+          if (index == 0) {
+            optionList.push({ name: option.name });
+          }
+          newInfo['option' + optionIndex] = option.name;
+        })
       }
-      newInfo['option'+optionIndex]=option.name;
+      variantsList.push(newInfo);
     })
-    variantsList.push(newInfo);
-  })
- product.media.edges.forEach((edge)=>{
-  imageList.push({src:edge.url,images_id:getId(edge.id)});
- })
- const data = await postJsonWithRetry(BASE_URL+'/insert_product.html', info, config, "POST");
-  if(data.data.code=='-1'){
-    if(data.data.msg=="product_id exist"){
-      const result = await postJsonWithRetry(BASE_URL+'/getproduct.html', {product_id:info.product_id}, config);
-      if(result.data.code==0){
-       console.log(JSON.stringify({variantlist:result.data.data.variantsList.map((item)=>{
-        return {
-          variantsid:item.id,
-          sku:item.sku
-        }
-       })}, null, 2));
-       process.exit(0);
+  }
+  if (product.media && product.media.edges) {
+    product.media.edges.forEach((edge) => {
+      imageList.push({ src: edge.url, images_id: getId(edge.id) });
+    })
+  }
+  const data = await postJsonWithRetry(BASE_URL + '/insert_product.html', info, config, "POST");
+  if (data.data.code == '-1') {
+    if (data.data.msg == "product_id exist") {
+      const result = await postJsonWithRetry(BASE_URL + '/getproduct.html', { product_id: info.product_id }, config, "GET");
+      if (result.data.code == 0) {
+        console.log({
+          variantlist: result.data.data.variantlist.map((item) => {
+            return {
+              variantsid: item.id,
+              sku: item.sku
+            }
+          })
+        });
+        process.exit(0);
       }
-    }else{
-       console.log(JSON.stringify(data, null, 2));
-       process.exit(0);
+    } else {
+      console.log(JSON.stringify(data, null, 2));
+      process.exit(0);
     }
   }
-   console.log(JSON.stringify({variantlist:data.data.data.variantsList.map((item)=>{
-        return {
-          variantsid:item.id,
-          sku:item.sku
-        }
-       })}, null, 2));
+  console.log({
+    variantlist: data.data.data.variantsList.map((item) => {
+      return {
+        variantsid: item.id,
+        sku: item.sku
+      }
+    })
+  });
   process.exit(0);
 }
 async function addOrder(arg) {
   const config = readConfig();
   const order = JSON.parse(arg);
-  console.log("-----------------",order);
-  const newOrder={};
-  const orderItemlist=[];
-  newOrder.note=order.name;
-  newOrder.shipping_country_code=order.currencyCode;
-  newOrder.order_id=getId(order.id);
-  newOrder.order_number=order.name;
-  if(order.shippingAddress){
-    newOrder.shipping_name=order.shippingAddress.firstName + ' ' + order.shippingAddress.lastName;
-    newOrder.shipping_phone=order.shippingAddress.phone
-  // newOrder.shipping_company=order.
-  newOrder.shipping_country=order.shippingAddress.country;
-  newOrder.shipping_address=order.shippingAddress.address1;
-  newOrder.shipping_province=order.shippingAddress.province;
-  // newOrder.shipping_province_code=order.shippingAddress.;
-  newOrder.shipping_address2=order.shippingAddress.address2
-  newOrder.shipping_city=order.shippingAddress.city;
-  // newOrder.shipping_taxNumber=order.shippingAddress.taxNumber;
+  console.log("-----------------", order);
+  const newOrder = {};
+  const orderItemlist = [];
+  newOrder.note = order.name;
+  newOrder.shipping_country_code = order.currencyCode;
+  newOrder.order_id = getId(order.id);
+  newOrder.order_number = order.name;
+  if (order.shippingAddress) {
+    newOrder.shipping_name = order.shippingAddress.firstName + ' ' + order.shippingAddress.lastName;
+    newOrder.shipping_phone = order.shippingAddress.phone
+    // newOrder.shipping_company=order.
+    newOrder.shipping_country = order.shippingAddress.country;
+    newOrder.shipping_address = order.shippingAddress.address1;
+    newOrder.shipping_province = order.shippingAddress.province;
+    // newOrder.shipping_province_code=order.shippingAddress.;
+    newOrder.shipping_address2 = order.shippingAddress.address2
+    newOrder.shipping_city = order.shippingAddress.city;
+    // newOrder.shipping_taxNumber=order.shippingAddress.taxNumber;
   }
-  if(order.lineItems && order.lineItems.edges){
-    order.lineItems.edges.forEach((edge)=>{
-    orderItemlist.push({
-      variantsid:getId(edge.node.variant.id),
-      quantity:edge.node.quantity,
+  if (order.lineItems && order.lineItems.edges) {
+    order.lineItems.edges.forEach((edge) => {
+      console.log("-------666----------", order.lineItems.eproloSyncResult[edge.node.product.id].message);
+      let newOrderItemlist = { quantity: edge.node.quantity }
+      let messageResult = order.lineItems.eproloSyncResult[edge.node.product.id].message;
+      if (messageResult) {
+        let newMessage = JSON.parse(messageResult);
+        newOrderItemlist.variantsid = newMessage.variantlist.find((item) => item.sku == edge.node.sku).variantsid;
+      }
+      orderItemlist.push(newOrderItemlist)
     })
-   })
-   newOrder.orderItemlist=orderItemlist;
+    newOrder.orderItemlist = orderItemlist;
   }
-  console.log("-------222----------",newOrder);
-  const data = await postJsonWithRetry(`http://43.153.35.208:3000/addInfo`, newOrder, config, "POST");
+  console.log("-------222----------", newOrder);
+  // const data = await postJsonWithRetry(`http://43.153.35.208:3000/addInfo`, newOrder, config, "POST");
+  const data = await postJsonWithRetry(BASE_URL + '/add_order.html', newOrder, config, "POST");
   console.log(JSON.stringify(data, null, 2));
   process.exit(0);
 }
@@ -369,7 +384,7 @@ Credential file (~/.eprolo-toolkit/config.json):
 
 async function main() {
   const argv = process.argv.slice(2);
-  console.log("-----------------",argv);
+  console.log("-----------------", argv);
   if (argv[0] === "auth" && argv[1] === "login") {
     await login(argv.slice(2));
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eprolo-cli",
-  "version": "1.0.108",
+  "version": "1.0.110",
   "description": "CLI for Dianxiaobao ICBU AI publishing, authorization profile management, task submission, and task status checks.",
   "bin": {
     "eprolo": "bin/eprolo-cli.js"