@salla.sa/twilight 2.6.0 → 2.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salla.sa/twilight",
-    "version": "2.6.0",
+    "version": "2.6.5",
     "description": "Salla Theme Toolkit, Webcomponents, Events, Requests, Utils",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",

package/types/api/index.d.ts

@@ -1,7 +1,6 @@
 import { Axios } from "axios";
 import CartApi from "./cart";
 import AuthApi from "./auth";
-import GiftApi from "./gift";
 import OrderApi from "./order";
 import RatingApi from "./rating";
 import CommentApi from "./comment";
@@ -17,7 +16,6 @@ import ScopeApi from "./scope";
 export {
     CartApi,
     AuthApi,
-    GiftApi,
     OrderApi,
     RatingApi,
     CommentApi,
@@ -48,7 +46,6 @@ export type ApiActionName =
     | 'cart.status'
     | 'cart.addCoupon'
     | 'cart.deleteCoupon'
-    | 'gift.buy'
     | 'loyalty.exchange'
     | 'loyalty.getProgram'
     | 'loyalty.reset'
@@ -62,6 +59,10 @@ export type ApiActionName =
     | 'product.categories'
     | 'product.offers'
     | 'profile.update'
+    | 'profile.getSizeGuides'
+    | 'profile.getGiftDetails'
+    | 'profile.addGiftToCart'
+    | 'profile.uploadGiftImage'
     | 'comment.add'
     | 'currency.change'
     | 'currency.list'
@@ -78,7 +79,6 @@ export type ApiActionName =
 export default interface SallaApi extends Axios {
     cart: CartApi;
     auth: AuthApi;
-    gift: GiftApi;
     order: OrderApi;
     rating: RatingApi;
     comment: CommentApi;

package/types/api/product/index.d.ts

@@ -12,5 +12,6 @@ export default interface ProductApi {
     categories: (categoryId?: number) => Promise<ProductResponse.categories>; //get all categories or sub_categories
     offers: (product_id: number) => Promise<ProductResponse.offers>; //get all categories or sub_categories
     getGiftDetails: (product_id: number) => Promise<ProductResponse.giftResponse>;
-    addGiftToCart: (product_id: number, payload: Object, withRedirect: boolean);
+    addGiftToCart: (product_id: number, payload: Object, withRedirect: boolean) => Promise<ProductResponse.giftToCart>;
+    uploadGiftImage: (multiPartData: FormData) => Promise<ProductResponse.giftImageUpload>;
 }

package/types/event/index.d.ts

@@ -1,6 +1,5 @@
 import AuthEvent from "./auth";
 import CartEvent from "./cart";
-import GiftEvent from "./gift";
 import OrderEvent from "./order";
 import RatingEvent from "./rating";
 import CommentEvent from "./comment";
@@ -52,8 +51,6 @@ export type EventName = string
     | 'cart::coupon.deleted'
     | 'cart::coupon.addition.failed'
     | 'cart::coupon.deletion.failed'
-    | 'gift::buying.succeeded'
-    | 'gift::buying.failed'
     | 'loyalty::exchange.succeeded'
     | 'loyalty::exchange.failed'
     | 'loyalty::program.fetched'
@@ -85,6 +82,12 @@ export type EventName = string
     | 'product::offers.fetched'
     | 'product::categories.fetched'
     | 'product::categories.failed'
+    | 'product::gift.fetched'
+    | 'product::gift.failed'
+    | 'product::gift.add-to-cart.succeeded'
+    | 'product::gift.add-to-cart.failed'
+    | 'product::gift.image-upload.succeeded'
+    | 'product::gift.image-upload.failed'
     | 'profile::updated'
     | 'profile::update.failed'
     | 'profile::mobile.updated'
@@ -120,7 +123,6 @@ export type EventName = string
 export {
     AuthEvent,
     CartEvent,
-    GiftEvent,
     OrderEvent,
     RatingEvent,
     CommentEvent,
@@ -138,7 +140,6 @@ export {
 export default interface SallaEvent extends EventEmitter2 {
     auth: AuthEvent;
     cart: CartEvent;
-    gift: GiftEvent;
     order: OrderEvent;
     rating: RatingEvent;
     comment: CommentEvent;

package/watcher.js

@@ -4,7 +4,8 @@ const color = {normal: "\x1b[0m", red: "\x1b[31m", green: "\x1b[32m", yellow: "\
 const {execSync} = require("child_process");
 const fs = require("fs");
 const WebSocketClient = require('websocket').client;
-
+const WebSocketServer = require("websocket").server;
+const http = require("http");
 //const webpack = require("webpack");
 /**
  * @callback HookCallback
@@ -51,9 +52,16 @@ const WebSocketClient = require('websocket').client;
  * @property {boolean} isWin
  */
 class WatcherPlugin {
-    constructor(params) {
-
-      let {port = 8000, sallaCli = "salla", theme_id, upload_url, store_id, draft_id} = params || {};
+    constructor(params = {}) {
+      try{
+        if(!params.theme_id){
+          // this is another way to get params from cli 
+          let cachePath = path.join(process.cwd(), "/node_modules/.salla-cli");
+          if(fs.existsSync(cachePath)) params = JSON.parse(fs.readFileSync(cachePath, 'utf8'));
+        }
+      }catch(err){}
+      
+      let {wsport = 8001, sallaCli = "salla", theme_id, upload_url, store_id, draft_id} = params;
       
       this.sallaCli = sallaCli;
       this.theme_id = theme_id;
@@ -61,40 +69,10 @@ class WatcherPlugin {
       this.store_id = store_id;
       this.draft_id = draft_id;
       
-      if(typeof theme_id === "undefined"){
-        // a hacky way to get args from process.env.npm_lifecycle_script
-        let args = parseNpmScriptsPassedArgs(process.env.npm_lifecycle_script);
-        this.theme_id = args.theme_id;
-        this.upload_url = args.upload_url;
-        this.store_id = args.store_id;
-        this.draft_id = args.draft_id;
-        port = args.port || 8000;
-      }
-      // try to connect to ws server  
-      this.wsConnectingTries = 1;
-      this.tryConnectWebsocket(port);
+      this.startWebsocketServer(wsport);
     
     }
   
-    tryConnectWebsocket(port){
-        let client = new WebSocketClient();
-        client.on('connectFailed', (error)=> {
-            if(this.wsConnectingTries===10){
-                console.error('[x] Oops! Hot reload is currently not working. Check the error message for details: ',error.toString());
-            }else{
-                this.wsConnectingTries++;
-                setTimeout(()=>{
-                    this.tryConnectWebsocket(port);
-                },1000);
-            }
-        });
-  
-        client.on('connect', (connection)=> {
-            this.connection = connection;
-            console.log(color.green, `✓ Performing hot reload on port ws://localhost:${port}`, color.normal);
-        });
-        client.connect(`ws://localhost:${port}`, 'echo-protocol');
-    }
     /**
      * @param {Compiler} compiler
      */
@@ -126,7 +104,7 @@ class WatcherPlugin {
                         changes = true;
                     }
                 });
-                if(changes) this.connection.sendUTF(JSON.stringify({msg:"reload"}));
+                if(changes && this.connection ) this.connection.sendUTF(JSON.stringify({msg:"reload"}));
             }
         );
     }
@@ -160,29 +138,42 @@ class WatcherPlugin {
 
         return !!this.theme_id;
     }
+    startWebsocketServer(wsport){
+      // start the live reload ws server
+      const wsServer = new WebSocketServer({
+        httpServer: http.createServer().listen(wsport),
+      });
+      let users = [];
+      wsServer.on("request", function (request) {
+        let connection = request.accept("echo-protocol", request.origin);
+        users.push(connection);
+    
+        connection.on("error", function (message) {
+          console.log("error", message);
+        });
+        connection.on("message", function (message) {
+          // mirror to all users
+          users.map((user) => {
+            // check user
+            if(user.connected) 
+              user.sendUTF(message.utf8Data);
+          });
+        });
+      });
+  
+      // connect to live reload server
+      let client = new WebSocketClient();
+      client.on('connectFailed', (error)=> {
+        console.error('[x] Oops! Hot reload is currently not working. Check the error message for details: ',error.toString());
+      });
+    
+      client.on('connect', (connection)=> {
+          this.connection = connection;
+          console.log(color.green, `✓ Performing hot reload on port ws://localhost:${wsport}`, color.normal);
+      });
+    
+      client.connect(`ws://localhost:${wsport}`, 'echo-protocol');
+    }
 }
-function parseNpmScriptsPassedArgs(str){
-    // get all strings between equal sign
-    let strs = str.match(/"([^"]*)"/g);
 
-    if(strs===null) return {};
-    // remove quotes
-    strs = strs.map(str => str.replace(/"/g, ''));
-
-    // split by =
-    strs = strs.map(str => str.split('='));
-    // to be object
-    strs = strs.map(str => {
-        let obj = {};
-        let key = str[0];
-        // remove index 0
-        str.shift();
-        obj[key] = str.join('=');
-        return obj;
-    });
-    // reduce to one object
-    return strs.reduce((acc, curr) => {
-        return {...acc, ...curr};
-    })
-}
 module.exports = WatcherPlugin;