@ohbug/extension-uuid 2.0.0 → 2.0.3

package/dist/index.d.ts

@@ -19,14 +19,14 @@ type OhbugGetDevice = (client?: OhbugClient) => OhbugDevice
 
 interface OhbugUser {
   uuid?: string
-  ip_address?: string
+  ipAddress?: string
   id?: number | string
   name?: string
   email?: string
   [key: string]: any
 }
 
-type OhbugMetaData = Record<string, any>
+type OhbugMetadata = Record<string, any>
 
 type OhbugReleaseStage = 'development' | 'production' | string
 type OhbugCategory =
@@ -55,7 +55,7 @@ interface OhbugEvent<D> {
   device: OhbugDevice
   user?: OhbugUser
   actions?: OhbugAction[]
-  metaData?: OhbugMetaData
+  metadata?: OhbugMetadata
 }
 interface OhbugEventWithMethods<D> extends OhbugEvent<D> {
   addAction: (
@@ -66,9 +66,9 @@ interface OhbugEventWithMethods<D> extends OhbugEvent<D> {
   ) => void
   getUser: () => OhbugUser | undefined
   setUser: (user: OhbugUser) => OhbugUser | undefined
-  addMetaData: (section: string, data: any) => any
-  getMetaData: (section: string) => any
-  deleteMetaData: (section: string) => any
+  addMetadata: (section: string, data: any) => any
+  getMetadata: (section: string) => any
+  deleteMetadata: (section: string) => any
 }
 
 interface OhbugCreateEvent<D> {
@@ -80,11 +80,11 @@ interface OhbugCreateEvent<D> {
 interface OhbugExtension {
   name: string
   setup?: (client: OhbugClient, ...args: any[]) => void
-  created?: <D = any>(
+  onEvent?: <D = any>(
     event: OhbugEventWithMethods<D>,
     client: OhbugClient
   ) => OhbugEventWithMethods<D> | null
-  notified?: <D = any>(
+  onNotify?: <D = any>(
     event: OhbugEventWithMethods<D>,
     client: OhbugClient
   ) => void
@@ -106,17 +106,17 @@ interface OhbugConfig {
   endpoint?: string
   maxActions?: number
   // hooks
-  created?: <D = any>(
+  onEvent?: <D = any>(
     event: OhbugEventWithMethods<D>,
     client: OhbugClient
   ) => OhbugEventWithMethods<D> | null
-  notified?: <D = any>(
+  onNotify?: <D = any>(
     event: OhbugEventWithMethods<D>,
     client: OhbugClient
   ) => void
   // data
   user?: OhbugUser
-  metaData?: OhbugMetaData
+  metadata?: OhbugMetadata
   // utils
   logger?: OhbugLoggerConfig
 }
@@ -136,7 +136,7 @@ interface OhbugClient {
 
   readonly __actions: OhbugAction[]
   __user: OhbugUser
-  readonly __metaData: OhbugMetaData
+  readonly __metadata: OhbugMetadata
 
   use: (extension: OhbugExtension) => OhbugClient
   createEvent: <D = any>(
@@ -156,9 +156,9 @@ interface OhbugClient {
   ) => void
   getUser: () => OhbugUser | undefined
   setUser: (user: OhbugUser) => OhbugUser | undefined
-  addMetaData: (section: string, data: any) => any
-  getMetaData: (section: string) => any
-  deleteMetaData: (section: string) => any
+  addMetadata: (section: string, data: any) => any
+  getMetadata: (section: string) => any
+  deleteMetadata: (section: string) => any
 }
 
 declare const extension: OhbugExtension;

package/dist/index.js

@@ -1,102 +1 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key2 of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key2) && key2 !== except)
-        __defProp(to, key2, { get: () => from[key2], enumerable: !(desc = __getOwnPropDesc(from, key2)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  default: () => src_default
-});
-module.exports = __toCommonJS(src_exports);
-
-// src/extension.ts
-var import_core = require("@ohbug/core");
-
-// src/uuid.ts
-var import_uuid = require("uuid");
-var import_utils = require("@ohbug/utils");
-
-// src/cookie.ts
-var docCookies = {
-  getItem(sKey) {
-    return decodeURIComponent(document.cookie.replace(new RegExp(`(?:(?:^|.*;)\\s*${encodeURIComponent(sKey).replace(/[-.+*]/g, "\\$&")}\\s*\\=\\s*([^;]*).*$)|^.*$`), "$1")) || null;
-  },
-  setItem(sKey, sValue, vEnd, sPath, sDomain, bSecure) {
-    if (!sKey || /^(?:expires|max\-age|path|domain|secure)$/i.test(sKey))
-      return false;
-    let sExpires = "";
-    if (vEnd) {
-      switch (vEnd.constructor) {
-        case Number:
-          sExpires = vEnd === Infinity ? "; expires=Fri, 31 Dec 9999 23:59:59 GMT" : `; max-age=${vEnd}`;
-          break;
-        case String:
-          sExpires = `; expires=${vEnd}`;
-          break;
-        case Date:
-          sExpires = `; expires=${vEnd.toUTCString()}`;
-          break;
-        default:
-          break;
-      }
-    }
-    const value = `${encodeURIComponent(sKey)}=${encodeURIComponent(sValue)}${sExpires}${sDomain ? `; domain=${sDomain}` : ""}${sPath ? `; path=${sPath}` : ""}${bSecure ? "; secure" : ""}`;
-    document.cookie = value;
-    return value;
-  },
-  removeItem(sKey, sPath, sDomain) {
-    if (!sKey || !this.getItem(sKey))
-      return false;
-    document.cookie = `${encodeURIComponent(sKey)}=; expires=Thu, 01 Jan 1970 00:00:00 GMT${sDomain ? `; domain=${sDomain}` : ""}${sPath ? `; path=${sPath}` : ""}`;
-    return true;
-  }
-};
-
-// src/uuid.ts
-var key = "OhbugUUID";
-function getUUID() {
-  if ((0, import_utils.isBrowser)()) {
-    const UUID = docCookies.getItem(key);
-    if (!UUID) {
-      const extraTime = 60 * 30 * 24 * 3600 * 1e3;
-      const endTime = new Date();
-      endTime.setTime(endTime.getTime() + extraTime);
-      const uuid = (0, import_uuid.v4)();
-      docCookies.setItem(key, uuid, endTime);
-      return uuid;
-    }
-    return UUID;
-  }
-  if ((0, import_utils.isNode)())
-    return (0, import_uuid.v4)();
-  return "";
-}
-
-// src/extension.ts
-var extension = (0, import_core.defineExtension)({
-  name: "OhbugExtensionUUID",
-  created: (event) => {
-    const uuid = getUUID();
-    event.setUser({ uuid });
-    return event;
-  }
-});
-
-// src/index.ts
-var src_default = extension;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+var m=Object.defineProperty;var I=Object.getOwnPropertyDescriptor;var U=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var k=(e,r)=>{for(var t in r)m(e,t,{get:r[t],enumerable:!0})},b=(e,r,t,n)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of U(r))!l.call(e,o)&&o!==t&&m(e,o,{get:()=>r[o],enumerable:!(n=I(r,o))||n.enumerable});return e};var T=e=>b(m({},"__esModule",{value:!0}),e);var D={};k(D,{default:()=>C});module.exports=T(D);var f=require("@ohbug/core");var a=require("uuid"),s=require("@ohbug/utils");var u={getItem(e){return decodeURIComponent(document.cookie.replace(new RegExp(`(?:(?:^|.*;)\\s*${encodeURIComponent(e).replace(/[-.+*]/g,"\\$&")}\\s*\\=\\s*([^;]*).*$)|^.*$`),"$1"))||null},setItem(e,r,t,n,o,d){if(!e||/^(?:expires|max\-age|path|domain|secure)$/i.test(e))return!1;let i="";if(t)switch(t.constructor){case Number:i=t===1/0?"; expires=Fri, 31 Dec 9999 23:59:59 GMT":`; max-age=${t}`;break;case String:i=`; expires=${t}`;break;case Date:i=`; expires=${t.toUTCString()}`;break;default:break}let p=`${encodeURIComponent(e)}=${encodeURIComponent(r)}${i}${o?`; domain=${o}`:""}${n?`; path=${n}`:""}${d?"; secure":""}`;return document.cookie=p,p},removeItem(e,r,t){return!e||!this.getItem(e)?!1:(document.cookie=`${encodeURIComponent(e)}=; expires=Thu, 01 Jan 1970 00:00:00 GMT${t?`; domain=${t}`:""}${r?`; path=${r}`:""}`,!0)}};var g="OhbugUUID";function $(){if((0,s.isBrowser)()){let e=u.getItem(g);if(!e){let t=new Date;t.setTime(t.getTime()+15552e7);let n=(0,a.v4)();return u.setItem(g,n,t),n}return e}return(0,s.isNode)()?(0,a.v4)():""}var x=(0,f.defineExtension)({name:"OhbugExtensionUUID",onEvent:e=>{let r=$();return e.setUser({uuid:r}),e}});var C=x;0&&(module.exports={});

package/dist/index.mjs

@@ -1,78 +1 @@
-// src/extension.ts
-import { defineExtension } from "@ohbug/core";
-
-// src/uuid.ts
-import { v4 as uuidv4 } from "uuid";
-import { isBrowser, isNode } from "@ohbug/utils";
-
-// src/cookie.ts
-var docCookies = {
-  getItem(sKey) {
-    return decodeURIComponent(document.cookie.replace(new RegExp(`(?:(?:^|.*;)\\s*${encodeURIComponent(sKey).replace(/[-.+*]/g, "\\$&")}\\s*\\=\\s*([^;]*).*$)|^.*$`), "$1")) || null;
-  },
-  setItem(sKey, sValue, vEnd, sPath, sDomain, bSecure) {
-    if (!sKey || /^(?:expires|max\-age|path|domain|secure)$/i.test(sKey))
-      return false;
-    let sExpires = "";
-    if (vEnd) {
-      switch (vEnd.constructor) {
-        case Number:
-          sExpires = vEnd === Infinity ? "; expires=Fri, 31 Dec 9999 23:59:59 GMT" : `; max-age=${vEnd}`;
-          break;
-        case String:
-          sExpires = `; expires=${vEnd}`;
-          break;
-        case Date:
-          sExpires = `; expires=${vEnd.toUTCString()}`;
-          break;
-        default:
-          break;
-      }
-    }
-    const value = `${encodeURIComponent(sKey)}=${encodeURIComponent(sValue)}${sExpires}${sDomain ? `; domain=${sDomain}` : ""}${sPath ? `; path=${sPath}` : ""}${bSecure ? "; secure" : ""}`;
-    document.cookie = value;
-    return value;
-  },
-  removeItem(sKey, sPath, sDomain) {
-    if (!sKey || !this.getItem(sKey))
-      return false;
-    document.cookie = `${encodeURIComponent(sKey)}=; expires=Thu, 01 Jan 1970 00:00:00 GMT${sDomain ? `; domain=${sDomain}` : ""}${sPath ? `; path=${sPath}` : ""}`;
-    return true;
-  }
-};
-
-// src/uuid.ts
-var key = "OhbugUUID";
-function getUUID() {
-  if (isBrowser()) {
-    const UUID = docCookies.getItem(key);
-    if (!UUID) {
-      const extraTime = 60 * 30 * 24 * 3600 * 1e3;
-      const endTime = new Date();
-      endTime.setTime(endTime.getTime() + extraTime);
-      const uuid = uuidv4();
-      docCookies.setItem(key, uuid, endTime);
-      return uuid;
-    }
-    return UUID;
-  }
-  if (isNode())
-    return uuidv4();
-  return "";
-}
-
-// src/extension.ts
-var extension = defineExtension({
-  name: "OhbugExtensionUUID",
-  created: (event) => {
-    const uuid = getUUID();
-    event.setUser({ uuid });
-    return event;
-  }
-});
-
-// src/index.ts
-var src_default = extension;
-export {
-  src_default as default
-};
+import{defineExtension as I}from"@ohbug/core";import{v4 as a}from"uuid";import{isBrowser as x,isNode as d}from"@ohbug/utils";var m={getItem(e){return decodeURIComponent(document.cookie.replace(new RegExp(`(?:(?:^|.*;)\\s*${encodeURIComponent(e).replace(/[-.+*]/g,"\\$&")}\\s*\\=\\s*([^;]*).*$)|^.*$`),"$1"))||null},setItem(e,r,t,n,c,f){if(!e||/^(?:expires|max\-age|path|domain|secure)$/i.test(e))return!1;let o="";if(t)switch(t.constructor){case Number:o=t===1/0?"; expires=Fri, 31 Dec 9999 23:59:59 GMT":`; max-age=${t}`;break;case String:o=`; expires=${t}`;break;case Date:o=`; expires=${t.toUTCString()}`;break;default:break}let u=`${encodeURIComponent(e)}=${encodeURIComponent(r)}${o}${c?`; domain=${c}`:""}${n?`; path=${n}`:""}${f?"; secure":""}`;return document.cookie=u,u},removeItem(e,r,t){return!e||!this.getItem(e)?!1:(document.cookie=`${encodeURIComponent(e)}=; expires=Thu, 01 Jan 1970 00:00:00 GMT${t?`; domain=${t}`:""}${r?`; path=${r}`:""}`,!0)}};var p="OhbugUUID";function g(){if(x()){let e=m.getItem(p);if(!e){let t=new Date;t.setTime(t.getTime()+15552e7);let n=a();return m.setItem(p,n,t),n}return e}return d()?a():""}var $=I({name:"OhbugExtensionUUID",onEvent:e=>{let r=g();return e.setUser({uuid:r}),e}});var w=$;export{w as default};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohbug/extension-uuid",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "description": "Ohbug extension to add uuid",
   "license": "Apache-2.0",
   "author": "chenyueban <jasonchan0527@gmail.com>",
@@ -23,13 +23,12 @@
     }
   },
   "files": [
-    "dist",
-    "src"
+    "dist"
   ],
   "sideEffects": false,
   "dependencies": {
-    "@ohbug/core": "2.0.0",
-    "@ohbug/utils": "2.0.0",
+    "@ohbug/core": "2.0.3",
+    "@ohbug/utils": "2.0.3",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

package/src/cookie.ts

@@ -1,60 +0,0 @@
-// https://developer.mozilla.org/zh-CN/docs/Web/API/Document/cookie
-export const docCookies = {
-  getItem(sKey: string): string | null {
-    return (
-      decodeURIComponent(document.cookie.replace(
-        new RegExp(`(?:(?:^|.*;)\\s*${encodeURIComponent(sKey).replace(
-          /[-.+*]/g,
-          '\\$&',
-        )}\\s*\\=\\s*([^;]*).*$)|^.*$`),
-        '$1',
-      )) || null
-    )
-  },
-  setItem(
-    sKey: string,
-    sValue: string,
-    vEnd?: number | string | Date,
-    sPath?: string,
-    sDomain?: string,
-    bSecure?: boolean,
-  ): string | false {
-    if (!sKey || /^(?:expires|max\-age|path|domain|secure)$/i.test(sKey))
-      return false
-
-    let sExpires = ''
-    if (vEnd) {
-      switch (vEnd.constructor) {
-        case Number:
-          sExpires
-            = vEnd === Infinity
-              ? '; expires=Fri, 31 Dec 9999 23:59:59 GMT'
-              : `; max-age=${vEnd}`
-          break
-        case String:
-          sExpires = `; expires=${vEnd}`
-          break
-        case Date:
-          sExpires = `; expires=${(vEnd as Date).toUTCString()}`
-          break
-        default:
-          break
-      }
-    }
-    const value = `${encodeURIComponent(sKey)}=${encodeURIComponent(sValue)}${sExpires}${sDomain ? `; domain=${sDomain}` : ''}${
-      sPath ? `; path=${sPath}` : ''
-    }${bSecure ? '; secure' : ''}`
-    document.cookie = value
-
-    return value
-  },
-  removeItem(sKey: string, sPath?: string, sDomain?: string) {
-    if (!sKey || !this.getItem(sKey))
-      return false
-
-    document.cookie = `${encodeURIComponent(sKey)}=; expires=Thu, 01 Jan 1970 00:00:00 GMT${
-      sDomain ? `; domain=${sDomain}` : ''
-    }${sPath ? `; path=${sPath}` : ''}`
-    return true
-  },
-}

package/src/extension.ts

@@ -1,11 +0,0 @@
-import { defineExtension } from '@ohbug/core'
-import { getUUID } from './uuid'
-
-export const extension = defineExtension({
-  name: 'OhbugExtensionUUID',
-  created: (event) => {
-    const uuid = getUUID()
-    event.setUser({ uuid })
-    return event
-  },
-})

package/src/index.ts

@@ -1,3 +0,0 @@
-import { extension } from './extension'
-
-export default extension

package/src/uuid.ts

@@ -1,24 +0,0 @@
-import { v4 as uuidv4 } from 'uuid'
-import { isBrowser, isNode } from '@ohbug/utils'
-import { docCookies } from './cookie'
-
-const key = 'OhbugUUID'
-
-export function getUUID(): string {
-  if (isBrowser()) {
-    const UUID = docCookies.getItem(key)
-    if (!UUID) {
-      const extraTime = 60 * 30 * 24 * 3600 * 1000 // 30天后过期
-      const endTime = new Date()
-      endTime.setTime(endTime.getTime() + extraTime)
-      const uuid = uuidv4()
-      docCookies.setItem(key, uuid, endTime)
-      return uuid
-    }
-    return UUID
-  }
-  if (isNode())
-    return uuidv4()
-
-  return ''
-}