@dcloudio/uni-cli-shared 2.0.1-35320220729002 → 2.0.1-36220220914001

package/components/ad-interactive.vue

@@ -1,137 +1,154 @@
 <template>
   <view @click="onclick">
-    <slot
-      :options="options"
-      :data="adData"
-    />
+    <slot :options="options" :data="adData" :loading="loading" :error="errorMessage" />
   </view>
 </template>
 
 <script>
-const AD_URL = 'https://wxac1.dcloud.net.cn/tuiaApplet/acs'
-const AD_REPORT_URL = 'https://wxac1.dcloud.net.cn/tuiaApplet/acs'
-const WEBVIEW_PATH = '/uni_modules/uni-ad-interactive/pages/uni-ad-interactive/uni-ad-interactive'
+  const AD_URL = 'https://wxac1.dcloud.net.cn/openPage/acs'
+  const AD_REPORT_URL = 'https://wxac1.dcloud.net.cn/openPage/acs'
+  //const WEBVIEW_PATH = '/uni_modules/uni-ad-interactive/pages/uni-ad-interactive/uni-ad-interactive'
 
-const events = {
-  load: 'load',
-  close: 'close',
-  error: 'error'
-}
+  const events = {
+    load: 'load',
+    close: 'close',
+    error: 'error'
+  }
 
-const OpenTypes = {
-  Interactive: 'interactive'
-}
+  const OpenTypes = {
+    Interactive: 'interactive'
+  }
 
-export default {
-  name: 'AdInteractive',
-  props: {
-    options: {
-      type: [Object, Array],
-      default () {
-        return {}
+  export default {
+    name: 'AdInteractive',
+    props: {
+      options: {
+        type: [Object, Array],
+        default () {
+          return {}
+        }
+      },
+      disabled: {
+        type: [Boolean, String],
+        default: false
+      },
+      adpid: {
+        type: [Number, String],
+        default: ''
+      },
+      openType: {
+        type: String,
+        default: 'interactive'
+      },
+      openPagePath: {
+        type: String,
+        default: ""
       }
     },
-    adpid: {
-      type: [Number, String],
-      default: ''
-    },
-    openUrl: {
-      type: String,
-      default: WEBVIEW_PATH
-    }
-  },
-  data () {
-    return {
-      adData: {}
-    }
-  },
-  created () {
-    this._uniAdPlugin = null
-    this._interactiveUrl = null
-    if (this.openType === OpenTypes.Interactive) {
-      this.getAdData()
-    }
-  },
-  methods: {
-    show () {
-      if (this._uniAdPlugin === null) {
-        this._uniAdPlugin = this.selectComponent('.uni-ad-plugin')
+    data() {
+      return {
+        adData: null,
+        loading: false,
+        errorMessage: ""
       }
-      this._uniAdPlugin.show()
     },
-    getAdData () {
-      if (!this.adpid) {
-        this.$emit(events.error, {
-          code: -5002,
-          message: 'invalid adpid'
-        })
-        return
+    created() {
+      this._uniAdPlugin = null
+      this._interactiveUrl = null
+      if (this.openPagePath) {
+        this.getAdData()
       }
+    },
+    methods: {
+      show() {
+        if (this._uniAdPlugin === null) {
+          this._uniAdPlugin = this.selectComponent('.uni-ad-plugin')
+        }
+        this._uniAdPlugin.show()
+      },
+      getAdData() {
+        if (!this.adpid) {
+          this.$emit(events.error, {
+            code: -5002,
+            message: 'invalid adpid'
+          })
+          return
+        }
 
-      uni.request({
-        url: AD_URL,
-        method: 'POST',
-        data: {
-          adpid: this.adpid
-        },
-        timeout: 5000,
-        dataType: 'json',
-        success: (res) => {
-          console.log(res.data)
+        this.loading = true
 
-          if (res.statusCode !== 200) {
-            this.$emit(events.error, {
-              code: res.statusCode,
-              message: res.statusCode
-            })
-            return
-          }
+        uni.request({
+          url: AD_URL,
+          method: 'POST',
+          data: {
+            adpid: this.adpid
+          },
+          timeout: 5000,
+          dataType: 'json',
+          success: (res) => {
+            if (res.statusCode !== 200) {
+              this.$emit(events.error, {
+                errCode: res.statusCode,
+                errMsg: res.statusCode
+              })
+              return
+            }
 
-          const responseData = res.data
-          if (responseData.ret === 0) {
-            this._interactiveUrl = responseData.data.adp_url
-            this.adData.imgUrl = responseData.data.icon_url
-            this.adData.openUrl = this.openUrl + '?url=' + encodeURIComponent(this._interactiveUrl)
-            this.$emit(events.load, {})
-          } else {
+            const responseData = res.data
+            if (responseData.ret === 0) {
+              this._interactiveUrl = responseData.data.adp_url
+              this.adData = {
+                imgUrl: responseData.data.icon_url,
+                openPath: this.openPagePath + '?url=' + encodeURIComponent(this._interactiveUrl)
+              }
+              this.$emit(events.load, this.adData)
+            } else {
+              const errMsg = {
+                errCode: responseData.ret,
+                errMsg: responseData.msg
+              }
+              this.errorMessage = errMsg
+              this.$emit(events.error, errMsg)
+            }
+          },
+          fail: (err) => {
             this.$emit(events.error, {
-              code: responseData.ret,
-              message: responseData.msg
+              errCode: '',
+              errMsg: err.errMsg
             })
+          },
+          complete: () => {
+            this.loading = false
           }
-        },
-        fail: (err) => {
-          this.$emit(events.error, {
-            code: '',
-            message: err.errMsg
-          })
+        })
+      },
+      onclick() {
+        if (this.disabled) {
+          return
+        }
+        if (!this._interactiveUrl) {
+          return
         }
-      })
-    },
-    onclick () {
-      if (this.openType !== OpenTypes.Interactive || !this._interactiveUrl) {
-        return
-      }
 
-      uni.navigateTo({
-        url: this.adData.openUrl
-      })
+        uni.navigateTo({
+          url: this.adData.openPath
+        })
 
-      this._report()
-    },
-    _report () {
-      uni.request({
-        url: AD_REPORT_URL,
-        data: {
-          adpid: this.adpid,
-          t: '10019'
-        },
-        timeout: 5000,
-        dataType: 'json'
-      })
+        this._report()
+      },
+      _report() {
+        uni.request({
+          url: AD_REPORT_URL,
+          data: {
+            adpid: this.adpid,
+            t: '10019'
+          },
+          timeout: 5000,
+          dataType: 'json'
+        })
+      }
     }
   }
-}
 </script>
 
 <style>

package/components/ad.mixin.mp.js

@@ -27,6 +27,12 @@ export default {
     loadnext: {
       type: [Boolean, String],
       default: false
+    },
+    urlCallback: {
+      type: Object,
+      default () {
+        return {}
+      }
     }
   },
   data () {
@@ -58,7 +64,31 @@ export default {
     show () {
       this.errorMessage = null
       this._ad = this.selectComponent('.uniad-plugin')
-      this._ad.show()
+      if (this._hasCallback()) {
+        const userCryptoManager = wx.getUserCryptoManager()
+        userCryptoManager.getLatestUserKey({
+          success: ({
+            encryptKey,
+            iv,
+            version,
+            expireTime
+          }) => {
+            this._ad.show({
+              userId: this.urlCallback.userId || '',
+              extra: this.urlCallback.extra || '',
+              encryptKey,
+              iv,
+              version,
+              expireTime
+            })
+          },
+          fail: (err) => {
+            this._dispatchEvent(EventType.Error, err)
+          }
+        })
+      } else {
+        this._ad.show()
+      }
     },
 
     _onclick () {
@@ -80,6 +110,11 @@ export default {
       return result
     },
 
+    _hasCallback () {
+      return false
+      // return (typeof this.urlCallback === 'object' && Object.keys(this.urlCallback).length > 0)
+    },
+
     _onmpload (e) {
       this.loading = false
       this._dispatchEvent(EventType.Load, {})
@@ -87,6 +122,31 @@ export default {
 
     _onmpclose (e) {
       this._dispatchEvent(EventType.Close, e.detail)
+      if (e.detail.adsdata) {
+        const adv = e.detail.adv
+        const adsdata = e.detail.adsdata
+        const version = e.detail.version
+
+        /* eslint-disable no-undef */
+        uniCloud.callFunction({
+          name: 'uniAdCallback',
+          data: {
+            adv: adv,
+            adsdata: adsdata,
+            version: version
+          },
+          secretType: 'both',
+          success: (res) => {
+          },
+          fail: (err) => {
+            this._dispatchEvent(EventType.Error, err)
+          }
+        })
+
+        delete e.detail.adv
+        delete e.detail.adsdata
+        delete e.detail.version
+      }
     },
 
     _onmperror (e) {

package/lib/preprocess.js

@@ -5,7 +5,10 @@ const DEFAULT_KEYS = [
   'APP',
   'APP-PLUS-NVUE',
   'APP-VUE',
-  'APP-NVUE'
+  'APP-NVUE',
+  'APP-ANDROID',
+  'APP-IOS',
+  'WEB'
 ]
 
 function normalize (name) {
@@ -44,14 +47,26 @@ module.exports = function initPreprocess (name, platforms, userDefines = {}) {
     nvueContext.APP_PLUS = true
     nvueContext.APP_NVUE = true
     nvueContext.APP_PLUS_NVUE = true
-  }
 
+    if (process.env.UNI_APP_PLATFORM === 'android') {
+      defaultContext.APP_ANDROID = true
+    } else if (process.env.UNI_APP_PLATFORM === 'ios') {
+      defaultContext.APP_IOS = true
+    } else {
+      defaultContext.APP_ANDROID = true
+      defaultContext.APP_IOS = true
+    }
+  }
+  if (name === 'h5') {
+    defaultContext.WEB = true
+  }
   if (name.startsWith('mp-')) {
     vueContext.MP = true
   }
 
   if (name.startsWith('app-')) {
     vueContext.APP = true
+    nvueContext.APP = true
   }
 
   if (name === 'quickapp-webview') {

package/lib/source-map.js

@@ -4,16 +4,10 @@ const webpack = require('webpack')
 
 const {
   normalizePath,
+  pathToRegexp,
   isInHBuilderX
 } = require('@dcloudio/uni-cli-shared/lib/util')
 
-const isWin = /^win/.test(process.platform)
-
-function genTranspileDepRegex (depPath) {
-  return new RegExp(isWin
-    ? depPath.replace(/\\/g, '\\\\') // double escape for windows style path
-    : depPath)
-}
 let sourceRoot = false
 
 function getSourceRoot () {
@@ -60,7 +54,7 @@ module.exports = {
   },
   createEvalSourceMapDevToolPlugin () {
     return new webpack.EvalSourceMapDevToolPlugin({
-      test: genTranspileDepRegex(process.env.UNI_INPUT_DIR),
+      test: pathToRegexp(process.env.UNI_INPUT_DIR, { start: true }),
       exclude,
       moduleFilenameTemplate
     })

package/lib/util.js

@@ -2,6 +2,8 @@ const path = require('path')
 const fs = require('fs')
 const hash = require('hash-sum')
 const crypto = require('crypto')
+const escapeStringRegexp = require('escape-string-regexp')
+const escapeGlob = require('glob-escape')
 
 const isWin = /^win/.test(process.platform)
 
@@ -121,6 +123,34 @@ function normalizeNodeModules (str) {
 
 const _hasOwnProperty = Object.prototype.hasOwnProperty
 
+/**
+ * pathToRegexp
+ * @param {string} pathString
+ * @param {{start:?boolean,end:?boolean,global:?boolean}?} options
+ * @returns {RegExp}
+ */
+function pathToRegexp (pathString, options = {}) {
+  return new RegExp((options.start ? '^' : '') + escapeStringRegexp(pathString) + (options.end ? '$' : ''), 'i' + (options.global ? 'g' : ''))
+}
+
+/**
+ * pathToGlob
+ * @param {string} pathString
+ * @param {string} glob
+ * @param {{windows:?boolean,escape:?boolean}?} options
+ * @returns {string}
+ */
+function pathToGlob (pathString, glob, options = {}) {
+  const isWindows = 'windows' in options ? options.windows : /^win/.test(process.platform)
+  const useEscape = options.escape
+  const str = isWindows ? pathString.replace(/\\/g, '/') : pathString
+  let safeStr = escapeGlob(str)
+  if (isWindows || !useEscape) {
+    safeStr = safeStr.replace(/\\(.)/g, '[$1]')
+  }
+  return path.posix.join(safeStr, glob)
+}
+
 module.exports = {
   isInHBuilderX,
   isInHBuilderXAlpha,
@@ -149,6 +179,8 @@ module.exports = {
   hyphenate,
   normalizePath,
   convertStaticStyle,
+  pathToRegexp,
+  pathToGlob,
   getComponentName: cached((str) => {
     if (str.indexOf('wx-') === 0) {
       return str.replace('wx-', 'weixin-')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-35320220729002",
+  "version": "2.0.1-36220220914001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -19,9 +19,11 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
+    "escape-string-regexp": "^4.0.0",
+    "glob-escape": "^0.0.2",
     "hash-sum": "^1.0.2",
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "99c489d7a19425ade612162abd21b441260e7ba7"
+  "gitHead": "67fdc447148dd3e05d528bfb4e5ed103430ec05b"
 }