@subiz/widget-v4 4.1.212 → 4.1.214

package/dist/screenshoot.js

@@ -4586,6 +4586,9 @@ let trackResponseFn = (param, done) => {
     _defineProperty(this, "getConversation", cid => this.apireq.get(`/accounts/${this.accid}/conversations/${cid}`));
     _defineProperty(this, "getLocaleContent", locale => this.apireq.get(`/accounts/${this.accid}/languages/${locale}`));
     _defineProperty(this, "sendEvent", data => this.apireq.addQuery('shorten', true).addQuery('x-referer', util/* default */.A.get(location, 'origin', '')).post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
+    _defineProperty(this, "websiteFormRequest", () => this.apireq.setBaseUrl(this.ApiURL.replace(/\/4\.[01]\/?$/, '/4.1')));
+    _defineProperty(this, "submitWebsiteForm", (formid, payload) => this.websiteFormRequest().post(`/accounts/${this.accid}/external-forms/${encodeURIComponent(formid)}/submissions`, payload));
+    _defineProperty(this, "getWebsiteFormStatus", formid => this.websiteFormRequest().get(`/accounts/${this.accid}/external-forms/${encodeURIComponent(formid)}/status`));
     _defineProperty(this, "submitForm", (form_id, page_url, device, data, user) => this.apireq.addQuery('x-referer', util/* default */.A.get(location, 'origin', '')).post(`/accounts/${this.accid}/users/${this.uid}/events`, {
       by: {
         id: this.uid,
@@ -5721,6 +5724,9 @@ cookie.defaults.expires = 3650;
 let store_memlocalStorage = (inmem_localstorage_namespaceFn());
 const MAX_CONVO = 20;
 const page_loaded = util/* default */.A.Date.now();
+const CHAT_STATE_RESET_AFTER_MS = 24 * 60 * 60 * 1000;
+const CHAT_STATE_CYCLE_STARTED_AT = 'chat_state_cycle_started_at';
+const RESETTABLE_CHAT_STATE_KEYS = ['lastview', 'light_convos', 'bot_run_logs', 'close_preview_at'];
 class Store {
   constructor(ApiURL, FileURL, RealtimeURL, inmem, fakeapi) {
     store_defineProperty(this, "inmem", false);
@@ -6394,6 +6400,18 @@ class Store {
     }
     this.kv.put('lastview', lastView);
   }
+  resetChatStateIfExpired() {
+    const now = this.now();
+    const cycleStartedAt = this.kv.match(CHAT_STATE_CYCLE_STARTED_AT);
+    if (!Number.isFinite(cycleStartedAt) || cycleStartedAt <= 0 || cycleStartedAt > now) {
+      this.kv.put(CHAT_STATE_CYCLE_STARTED_AT, now);
+      return false;
+    }
+    if (now - cycleStartedAt < CHAT_STATE_RESET_AFTER_MS) return false;
+    util/* default */.A.map(RESETTABLE_CHAT_STATE_KEYS, key => this.kv.del(key));
+    this.kv.put(CHAT_STATE_CYCLE_STARTED_AT, now);
+    return true;
+  }
   async _initResource(accid, auth, realtimep) {
     this.g_sync = {};
     let user = await this.api.setAuth(auth);
@@ -6404,6 +6422,7 @@ class Store {
     }
     this.readyGate.close();
     accid = (accid || '').trim();
+    this.resetChatStateIfExpired();
     let lightConvos = this.kv.match('light_convos') || {};
     this.lightConvos = {};
     util/* default */.A.map(lightConvos, convo => {
@@ -14133,8 +14152,9 @@ class lib_Widget {
     this.impressionTokens[formid] = impressiontoken;
     return impressiontoken;
   }
-  async submitForm(formid, values) {
-    if (!formid || !values) return;
+  async submitForm(formid, values, options = {}) {
+    if (!formid || !values) throw new TypeError('submitForm requires a form ID and fields');
+    await this.store.readyGate.entry();
     if (util/* default */.A.startsWith(formid, 'cp')) {
       let storeuser = util/* default */.A.cloneDeep(this.store.matchUser());
       let user = {
@@ -14165,33 +14185,13 @@ class lib_Widget {
       this.store.setUserDiff(user);
       return this.store.sendConversion(formid, values, impressiontoken);
     }
-    values = util/* default */.A.filter(values, field => {
-      return field.key && field.value;
-    });
-    let text = 'Khách điền form\n';
-    util/* default */.A.map(values, field => {
-      text += '+ ' + field.key + ': ' + field.value + '\n';
-    });
-    return this.store.startConvo({
-      subject: 'Khách điền form',
-      touchpoint: {
-        channel: 'form',
-        source: window.location.hostname,
-        id: Date.now() + '_' + util/* default */.A.randomString()
-      },
-      form_submission: {
-        id: formid,
-        values: values
-      },
-      message_sent: {
-        data: {
-          message: {
-            format: 'plaintext',
-            text: text
-          }
-        }
-      }
-    });
+    const payload = formRequest(formid, values, options);
+    return formResult(await this.store.api.submitWebsiteForm(formid, payload), 'submit');
+  }
+  async getFormStatus(formid) {
+    validateWebsiteFormId(formid);
+    await this.store.readyGate.entry();
+    return formResult(await this.store.api.getWebsiteFormStatus(formid), 'status');
   }
   startConvo(req) {
     req = util/* default */.A.cloneDeep(req) || {};
@@ -14304,6 +14304,47 @@ class lib_Widget {
 }
 window.__sbz_WIDGET = lib_Widget;
 /* harmony default export */ const lib = (lib_Widget);
+function validateWebsiteFormId(formid) {
+  if (typeof formid !== 'string' || !/^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$/.test(formid)) {
+    throw new TypeError('Form ID must contain 1-64 letters, digits, underscores or hyphens');
+  }
+  if (formid.startsWith('cp')) throw new TypeError('Form IDs starting with cp are reserved for Subiz campaigns');
+}
+function formRequest(formid, fields, options = {}) {
+  validateWebsiteFormId(formid);
+  if (!Array.isArray(fields) || !fields.length) throw new TypeError('Form fields must be a nonempty array');
+  if (!options || typeof options !== 'object' || Array.isArray(options)) throw new TypeError('Form options must be an object');
+  return {
+    form_name: options.name === undefined ? formid : options.name,
+    page_url: options.page_url === undefined ? window.location.href : options.page_url,
+    submission_id: options.submission_id === undefined ? util/* default */.A.randomString(36) : options.submission_id,
+    values: fields.map(field => {
+      if (!field || typeof field.key !== 'string') throw new TypeError('Each field requires a key');
+      const value = field.value;
+      if (value != null && !['string', 'number', 'boolean'].includes(typeof value)) {
+        throw new TypeError('Form field values must be strings, numbers or booleans');
+      }
+      return {
+        key: field.key,
+        label: field.label === undefined ? field.key : field.label,
+        value: value == null ? '' : String(value)
+      };
+    })
+  };
+}
+function formResult(response, operation) {
+  const body = response && response.body;
+  const detail = response && response.error || body && body.error;
+  const status = response && response.code;
+  const valid = operation === 'submit' ? body && typeof body.conversation_id === 'string' && body.conversation_id && typeof body.submission_id === 'string' && body.submission_id : body && typeof body.submitted === 'boolean' && typeof body.status === 'string';
+  if (detail || !(status >= 200 && status < 300) || !valid) {
+    const error = new Error('Subiz form request failed');
+    error.code = detail && detail.code || 'form_request_failed';
+    error.status = status;
+    throw error;
+  }
+  return body;
+}
 ;// ./screenshoot.js
 
 let accid = 'acqsulrowbxiugvginhw';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.212",
+	"version": "4.1.214",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -32,10 +32,10 @@
 		"@babel/preset-env": "^7.29.7",
 		"babel-loader": "^10.1.1",
 		"babel-plugin-syntax-jsx": "^6.18.0",
-		"eslint": "^10.11.0",
+		"eslint": "^10.12.0",
 		"globals": "^17.13.0",
 		"html-webpack-plugin": "^5.6.8",
-		"jsdom": "^30.1.1",
+		"jsdom": "^30.1.2",
 		"puppeteer": "^25.12.0",
 		"tape": "^5.10.2",
 		"webpack": "^5.111.1",

package/src/lib.js

@@ -208,8 +208,9 @@ class Widget {
 	}
 
 	// cpxdf, [{key:'fullname', type:'text', value: 'thanhpk@liec.om'}]
-	async submitForm(formid, values) {
-		if (!formid || !values) return
+	async submitForm(formid, values, options = {}) {
+		if (!formid || !values) throw new TypeError('submitForm requires a form ID and fields')
+		await this.store.readyGate.entry()
 		if (sb.startsWith(formid, 'cp')) {
 			let storeuser = sb.cloneDeep(this.store.matchUser())
 			let user = {id: storeuser.id, account_id: storeuser.account_id}
@@ -233,28 +234,14 @@ class Widget {
 			return this.store.sendConversion(formid, values, impressiontoken)
 		}
 
-		values = sb.filter(values, (field) => {
-			return field.key && field.value
-		})
-		let text = 'Khách điền form\n'
-		sb.map(values, (field) => {
-			text += '+ ' + field.key + ': ' + field.value + '\n'
-		})
-
-		return this.store.startConvo({
-			subject: 'Khách điền form',
-			touchpoint: {
-				channel: 'form',
-				source: window.location.hostname,
-				id: Date.now() + '_' + sb.randomString(),
-			},
-			form_submission: {id: formid, values: values},
-			message_sent: {
-				data: {
-					message: {format: 'plaintext', text: text},
-				},
-			},
-		})
+		const payload = formRequest(formid, values, options)
+		return formResult(await this.store.api.submitWebsiteForm(formid, payload), 'submit')
+	}
+
+	async getFormStatus(formid) {
+		validateWebsiteFormId(formid)
+		await this.store.readyGate.entry()
+		return formResult(await this.store.api.getWebsiteFormStatus(formid), 'status')
 	}
 
 	// req.bot_id != "" -> start conversation with bot id
@@ -404,3 +391,46 @@ window.__sbz_WIDGET = Widget
 export default Widget
 
 // lib.submitForm('cprkztryyobndhbvwzjab', [{key: 'fullname', value: 'Pham Kieu Thanh 2' }, {key: 'phones', value: "0366621895"}]
+
+
+function validateWebsiteFormId(formid) {
+	if (typeof formid !== 'string' || !/^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$/.test(formid)) {
+		throw new TypeError('Form ID must contain 1-64 letters, digits, underscores or hyphens')
+	}
+	if (formid.startsWith('cp')) throw new TypeError('Form IDs starting with cp are reserved for Subiz campaigns')
+}
+
+function formRequest(formid, fields, options = {}) {
+	validateWebsiteFormId(formid)
+	if (!Array.isArray(fields) || !fields.length) throw new TypeError('Form fields must be a nonempty array')
+	if (!options || typeof options !== 'object' || Array.isArray(options)) throw new TypeError('Form options must be an object')
+	return {
+		form_name: options.name === undefined ? formid : options.name,
+		page_url: options.page_url === undefined ? window.location.href : options.page_url,
+		submission_id: options.submission_id === undefined ? sb.randomString(36) : options.submission_id,
+		values: fields.map((field) => {
+			if (!field || typeof field.key !== 'string') throw new TypeError('Each field requires a key')
+			const value = field.value
+			if (value != null && !['string', 'number', 'boolean'].includes(typeof value)) {
+				throw new TypeError('Form field values must be strings, numbers or booleans')
+			}
+			return {key: field.key, label: field.label === undefined ? field.key : field.label, value: value == null ? '' : String(value)}
+		}),
+	}
+}
+
+function formResult(response, operation) {
+	const body = response && response.body
+	const detail = (response && response.error) || (body && body.error)
+	const status = response && response.code
+	const valid = operation === 'submit'
+		? body && typeof body.conversation_id === 'string' && body.conversation_id && typeof body.submission_id === 'string' && body.submission_id
+		: body && typeof body.submitted === 'boolean' && typeof body.status === 'string'
+	if (detail || !(status >= 200 && status < 300) || !valid) {
+		const error = new Error('Subiz form request failed')
+		error.code = (detail && detail.code) || 'form_request_failed'
+		error.status = status
+		throw error
+	}
+	return body
+}

package/src/store/api.js

@@ -271,6 +271,15 @@ export default class {
 			.addQuery('x-referer', sb.get(location, 'origin', ''))
 			.post(`/accounts/${this.accid}/users/${this.uid}/events`, data)
 
+	// Keep the configured API host and all widget authentication hooks.
+	websiteFormRequest = () => this.apireq.setBaseUrl(this.ApiURL.replace(/\/4\.[01]\/?$/, '/4.1'))
+
+	submitWebsiteForm = (formid, payload) => this.websiteFormRequest()
+		.post(`/accounts/${this.accid}/external-forms/${encodeURIComponent(formid)}/submissions`, payload)
+
+	getWebsiteFormStatus = (formid) => this.websiteFormRequest()
+		.get(`/accounts/${this.accid}/external-forms/${encodeURIComponent(formid)}/status`)
+
 	submitForm = (form_id, page_url, device, data, user) =>
 		this.apireq
 			.addQuery('x-referer', sb.get(location, 'origin', ''))

package/src/store/store.js

@@ -15,6 +15,9 @@ cookie.defaults.expires = 3650 // 10 year
 let memlocalStorage = require('./inmem_localstorage.js')
 const MAX_CONVO = 20
 const page_loaded = sb.Date.now()
+const CHAT_STATE_RESET_AFTER_MS = 24 * 60 * 60 * 1000
+const CHAT_STATE_CYCLE_STARTED_AT = 'chat_state_cycle_started_at'
+const RESETTABLE_CHAT_STATE_KEYS = ['lastview', 'light_convos', 'bot_run_logs', 'close_preview_at']
 
 // available localstorage key mask, user, hasManuallyClosed, isopen, close_preview_at, lastview, bot_run_logs, plugin_run_logs
 export default class Store {
@@ -740,6 +743,20 @@ export default class Store {
 		this.kv.put('lastview', lastView)
 	}
 
+	resetChatStateIfExpired() {
+		const now = this.now()
+		const cycleStartedAt = this.kv.match(CHAT_STATE_CYCLE_STARTED_AT)
+		if (!Number.isFinite(cycleStartedAt) || cycleStartedAt <= 0 || cycleStartedAt > now) {
+			this.kv.put(CHAT_STATE_CYCLE_STARTED_AT, now)
+			return false
+		}
+		if (now - cycleStartedAt < CHAT_STATE_RESET_AFTER_MS) return false
+
+		sb.map(RESETTABLE_CHAT_STATE_KEYS, (key) => this.kv.del(key))
+		this.kv.put(CHAT_STATE_CYCLE_STARTED_AT, now)
+		return true
+	}
+
 	async _initResource(accid, auth, realtimep) {
 		this.g_sync = {}
 
@@ -752,6 +769,7 @@ export default class Store {
 
 		this.readyGate.close()
 		accid = (accid || '').trim()
+		this.resetChatStateIfExpired()
 		let lightConvos = this.kv.match('light_convos') || {}
 		this.lightConvos = {}
 		sb.map(lightConvos, (convo) => {