@subiz/widget-v4 4.1.2 → 4.1.5

package/src/store/store.js

@@ -15,6 +15,9 @@ const page_loaded = sb.Date.now()
 
 // available localstorage key mask, user, hasManuallyClosed, isopen, close_preview_at, lastview, bot_run_logs, plugin_run_logs
 export default class Store {
+	inmem = false
+	cookie = cookie
+
 	constructor(ApiURL, FileURL, RealtimeURL, inmem, fakeapi) {
 		this.g_sync = {}
 		this.forceDevice = null
@@ -28,6 +31,17 @@ export default class Store {
 		if (this.fake) this.api = new APIFake(ApiURL, FileURL)
 		else this.api = new API(ApiURL, FileURL)
 
+		// test cookie
+		if (!inmem) {
+			try {
+				document.cookie
+				localStorage
+			} catch (e) {
+				// cookie and localstorage is disable => must inmem
+				inmem = true
+			}
+		}
+
 		if (inmem) {
 			this.inmem = inmem
 			this.cookie = inmemCookie
@@ -75,9 +89,6 @@ export default class Store {
 		}, 2000)
 	}
 
-	inmem = false
-	cookie = cookie
-
 	// inmem
 	_currentViewingProduct = {}
 	linkProduct(p) {
@@ -350,68 +361,65 @@ export default class Store {
 
 	now = () => sb.Date.now() + this.timeDiff // millisecond on server
 
-	async init(accid, mask) {
+	async init(accid, mask, userRef) {
 		this.readyGate.close()
 		accid = (accid || '').trim()
 		this.api.setAuth({accid: accid})
-
 		this.g_sync = {}
-		// try to find mask in cookie
-		if (!mask) {
+		if (!userRef) {
+			// try to find userRef in cookie
 			try {
-				mask = this.cookie.get('__sbmask', '')
+				userRef = this.cookie.get('__sbref', '')
 			} catch (e) {}
-		}
 
-		let localstorageMask = this.kv.match('mask')
-		// cookie is deleted, fallback to local storage
-		if (!mask && localstorageMask) mask = localstorageMask
-
-		// check mask integrity, mask in cookie should match mask in localstorate
-		// trust cookie, remove localstorage
-		if (mask && localstorageMask && mask !== localstorageMask) this.clearBrowserData()
-
-		var userId = ''
-		if (mask) {
-			let parts = mask.split('@')
-			if (parts[0] != accid) {
-				// invalid account (may be user has changed their injected code), must recreate user
-				mask = ''
-				this.clearBrowserData()
-			} else userId = parts[1]
-		}
+			if (!userRef) {
+				// try to find mask in cookie
+				if (!mask) {
+					try {
+						mask = this.cookie.get('__sbmask', '')
+					} catch (e) {}
+				}
+
+				if (mask) {
+					let parts = mask.split('@')
+					if (parts[0] != accid) {
+						userRef = sb.randomString(40)
+						this.new_visitor = true
+					}
 
-		if (!mask) {
-			let user = await this.api.createUser(accid)
-			this.new_visitor = true
-			mask = user.mask
-			userId = user.id
-		} else {
-			this.new_visitor = false // for checking returning or new visitor
+					this.new_visitor = false // for checking returning or new visitor
+					// set cookie forever
+					this.cookie.set('__sbmask', mask)
+				} else {
+					// random
+					userRef = sb.randomString(40)
+					this.new_visitor = true
+				}
+			}
 		}
 
 		// set cookie forever
-		this.cookie.set('__sbmask', mask)
-		this.kv.put('mask', mask)
+		if (userRef) this.cookie.set('__sbref', userRef)
+
+		let user = await this.api.setAuth({accid: accid, mask: mask, ref: userRef})
+		if (user.error) return
 
 		if (this.realtime) this.realtime.stop()
 		if (this.fake) this.realtime = new RealtimeFake()
-		else this.realtime = new Realtime(this.RealtimeURL, {user_mask: mask})
+		else this.realtime = new Realtime(this.RealtimeURL, {account_id: accid, user_ref: userRef, user_mask: mask})
 
 		this.realtime.onEvent(this.onWs.bind(this))
-		this.realtime.onInterrupted(() => this.reconnectWs(accid, userId))
+		this.realtime.onInterrupted(() => this.reconnectWs(accid, user.id))
 
-		this.api.setAuth({accid: accid, uid: userId, mask: mask})
 		this.seenLoop()
 		await this.reconnect()
 		this.readyGate.open()
-		this.reconnectWs(accid, userId)
-
-		return mask
+		this.reconnectWs(accid, user.id)
+		return user
 	}
 
 	async login(accid, user_id, tokenGenerator) {
-		let user = await this.api.setTokenGenerator(accid, user_id, tokenGenerator)
+		let user = await this.api.setAuth({accid: accid, profile_id: user_id, tokenGenerator: tokenGenerator})
 		if (user.error) return user
 
 		this.clearBrowserData()
@@ -436,8 +444,9 @@ export default class Store {
 		return user
 	}
 
-	logout(user_id) {
-		this.api.setTokenGenerator(undefined, undefined, undefined)
+	logout(userRef) {
+		return this.api.setAuth({ref: userRef})
+		// this.api.setTokenGenerator({})
 	}
 
 	seenQueue = [] // convoid will be seen

package/webpack.dev.js

@@ -3,6 +3,7 @@ var HtmlWebpackPlugin = require('html-webpack-plugin')
 module.exports = {
 	mode: 'development',
 	entry: {
+		webview: './webview.js',
 		app: './app.js',
 		inject: './inject.js',
 		preview: './preview.js',

package/webpack.prod.js

@@ -6,6 +6,7 @@ var fs = require('fs')
 webpackconfig.output.publicPath = 'https://vcdn.subiz-cdn.com/widget-v4/public/'
 
 webpackconfig.entry = {
+	webview: './webview.js',
 	app: './app.js',
 	preview: './preview.js',
 	library: './library.js',

package/webview.js

@@ -0,0 +1,43 @@
+import ApiV4 from './src/lib.js'
+import RunBot from './src/bot.js'
+
+var ajax = require('@subiz/ajax/src/ajax.js')
+var config = require('./config.js')
+
+var VERSION = '4.3'
+
+var apiV4 = new ApiV4(config.ApiURL, config.FileURL, config.RealtimeURL)
+
+function callV2(args) {
+	args = args || []
+	var out = []
+	if (Array.isArray(args)) out = args
+	else if (typeof args === 'object') {
+		var keys = Object.keys(args)
+		for (var i = 0; i < keys.length; i++) out.push(args[keys[i]])
+	} else return
+	args = out
+	if (args.length < 1) return
+	var method = args.shift()
+
+	if (typeof apiV4[method] !== 'function') return
+	return apiV4[method](...args)
+}
+
+function init() {
+	let queue = (window.subiz && window.subiz.q) || []
+	window.subiz = function () {
+		// DO NOT CONVERT TO ARROW FUNCTION, ARGUMENTS WILL BE NULL
+		return callV2(arguments)
+	}
+	queue.forEach(callV2)
+
+	apiV4.store.readyGate.entry().then(function () {
+		apiV4.store.track()
+		RunBot(apiV4.store)
+	})
+}
+
+init()
+
+// TODO: should print example v4_1, v4_2, v4_3, ...