@dcloudio/uni-cli-shared 2.0.2-4020920240930001 → 2.0.2-4040420241231001

package/components/ad-fullscreen-video.vue

@@ -2,7 +2,8 @@
   <view @click="_onclick">
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
-    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @error="_onwxchannelerror"></uniad-plugin-wx>
     <!-- #endif -->
     <!-- #ifdef MP-ALIPAY -->
     <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>

package/components/ad-interstitial.vue

@@ -2,7 +2,8 @@
   <view @click="_onclick">
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
-    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @error="_onwxchannelerror"></uniad-plugin-wx>
     <!-- #endif -->
     <!-- #ifdef MP-ALIPAY -->
     <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>

package/components/ad-rewarded-video.vue

@@ -1,8 +1,9 @@
 <template>
   <view @click="_onclick">
-    <slot :options="options" :loading="loading" :error="errorMessage" />
-    <!-- #ifdef MP-WEIXIN -->
-    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <slot :options="options" :loading="loading" :error="errorMessage" />
+    <!-- #ifdef MP-WEIXIN -->
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @error="_onwxchannelerror"></uniad-plugin-wx>
     <!-- #endif -->
     <!-- #ifdef MP-ALIPAY -->
     <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>

package/components/ad.mixin.mp-weixin.js

@@ -1,9 +1,24 @@
+/* eslint-disable no-undef */
+const adPlugin = requirePlugin('uni-ad')
+
 const EventType = {
   Load: 'load',
   Close: 'close',
   Error: 'error'
 }
 
+const AdType = {
+  Banner: 'banner',
+  RewardedVideo: 'rewardedVideo',
+  Interstitial: 'interstitial'
+}
+
+const ProviderType = {
+  WeChat: 10018,
+  UserWeChat: 10017,
+  ShanHu: 10020
+}
+
 export default {
   props: {
     options: {
@@ -38,13 +53,21 @@ export default {
   data () {
     return {
       loading: false,
+      userwx: false,
+      userUnitId: '',
+      customFullscreen: '',
+      wxchannel: false,
       errorMessage: null
     }
   },
   created () {
     this._ad = null
-    if (this.preload && this._canCreateAd()) {
-      this.load()
+    this._loading = false
+    this._wxRewardedAd = null
+    this._wxInterstitialAd = null
+    this._providerType = ProviderType.ShanHu
+    if (this.preload && this._canCreateAd()) {
+      this.load()
     }
   },
   methods: {
@@ -53,35 +76,22 @@ export default {
         return
       }
       this._startLoading()
+      if (this._providerType === ProviderType.ShanHu) {
+      } else if (this._providerType === ProviderType.WeChat) {
+        this.selectComponent('.uniad-plugin-wx').load()
+      } else if (this._providerType === ProviderType.UserWeChat) {
+        this._loadWxAd()
+      }
     },
 
-    show () {
+    show (e) {
       this.errorMessage = null
-      this._ad = this.selectComponent('.uniad-plugin')
-      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()
+      if (this._providerType === ProviderType.ShanHu) {
+        this._showAdInPlugin(this.selectComponent('.uniad-plugin'))
+      } else if (this._providerType === ProviderType.WeChat) {
+        this._showAdInPlugin(this.selectComponent('.uniad-plugin-wx'))
+      } else if (this._providerType === ProviderType.UserWeChat) {
+        this._showWxAd(e)
       }
     },
 
@@ -148,10 +158,217 @@ export default {
       this._dispatchEvent(EventType.Error, e.detail)
     },
 
+    _onnextchannel (e) {
+      this.wxchannel = true
+      const adData = e.detail[0]
+      this.$nextTick(() => {
+        if (adData.provider === 10017) {
+          this._providerType = ProviderType.UserWeChat
+          switch (adData._nt_) {
+            case 4:
+              this.wxAdType = AdType.Banner
+              this.userwx = true
+              this.userUnitId = adData.posid
+              if (adData.tmpl_type === 24) {
+                this.customFullscreen = 'uni-ad-custom-fullscreen'
+              }
+              break
+            case 9:
+              this.wxAdType = AdType.RewardedVideo
+              this._createRewardedAd(adData.posid)
+              break
+            case 15:
+              this.wxAdType = AdType.Interstitial
+              this._createInterstitialAd(adData.posid)
+              break
+          }
+        } else if (adData.provider === 10018) {
+          this._providerType = ProviderType.WeChat
+          this.selectComponent('.uniad-plugin-wx').setConfig(adData)
+        }
+      })
+    },
+
+    _onwxchannelerror (e) {
+      this.wxchannel = false
+      this.$nextTick(() => {
+        this._providerType = ProviderType.ShanHu
+        this.selectComponent('.uniad-plugin').shanhuChannel()
+      })
+    },
+
     _dispatchEvent (type, data) {
       this.$emit(type, {
         detail: data
       })
+    },
+
+    _showAdInPlugin (adComponent) {
+      if (this._hasCallback()) {
+        const userCryptoManager = wx.getUserCryptoManager()
+        userCryptoManager.getLatestUserKey({
+          success: ({
+            encryptKey,
+            iv,
+            version,
+            expireTime
+          }) => {
+            adComponent.show({
+              userId: this.urlCallback.userId || '',
+              extra: this.urlCallback.extra || '',
+              encryptKey,
+              iv,
+              version,
+              expireTime
+            })
+          },
+          fail: (err) => {
+            this._dispatchEvent(EventType.Error, err)
+          }
+        })
+      } else {
+        adComponent.show({
+          userId: this.urlCallback.userId || '',
+          extra: this.urlCallback.extra || ''
+        })
+      }
+    },
+
+    _loadWxAd () {
+      switch (this.wxAdType) {
+        case AdType.RewardedVideo:
+          if (this._wxRewardedAd) {
+            this._wxRewardedAd.load()
+          }
+          break
+        case AdType.Interstitial:
+          if (this._wxInterstitialAd) {
+            this._wxInterstitialAd.load()
+          }
+          break
+      }
+    },
+
+    // 加载/显示广告
+    _showWxAd (options) {
+      this._urlCallback = options || this.urlCallback
+      if (this.loading === true) {
+        this._userInvokeShowFlag = true
+        return
+      }
+      switch (this.wxAdType) {
+        case AdType.RewardedVideo:
+          if (!this._wxRewardedAd) {
+            return
+          }
+          // eslint-disable-next-line handle-callback-err
+          this._wxRewardedAd.show().catch((err) => {
+            this._wxRewardedAd.load().then(() => {
+              this._wxRewardedAd.show()
+            }).catch((err) => {
+              this._dispatchEvent(EventType.Error, err)
+            })
+          })
+          break
+        case AdType.Interstitial:
+          if (!this._wxInterstitialAd) {
+            return
+          }
+          // eslint-disable-next-line handle-callback-err
+          this._wxInterstitialAd.show().catch((err) => {
+            this._wxInterstitialAd.load().then(() => {
+              this._wxInterstitialAd.show()
+            }).catch((err) => {
+              this._dispatchEvent(EventType.Error, err)
+            })
+          })
+          break
+      }
+    },
+
+    // 微信激励视频
+    _createRewardedAd (adUnitId) {
+      if (this._wxRewardedAd) {
+        return
+      }
+
+      this._wxRewardedAd = wx.createRewardedVideoAd({ adUnitId: adUnitId, multiton: true })
+
+      this._wxRewardedAd.onLoad(() => {
+        this.loading = false
+        this._dispatchEvent(EventType.Load, {})
+        if (this._userInvokeShowFlag) {
+          this._userInvokeShowFlag = false
+          this._wxRewardedAd.show()
+        }
+      })
+
+      this._wxRewardedAd.onError(err => {
+        this.loading = false
+        this._dispatchEvent(EventType.Error, err)
+      })
+
+      this._wxRewardedAd.onClose(res => {
+        if (res.isEnded) {
+          this._callServer()
+        } else {
+          this._dispatchEvent(EventType.Close, res)
+        }
+      })
+
+      this.loading = true
+    },
+
+    // 微信插屏
+    _createInterstitialAd (adUnitId) {
+      if (this._wxInterstitialAd) {
+        return
+      }
+
+      this._wxInterstitialAd = wx.createInterstitialAd({ adUnitId: adUnitId })
+
+      this._wxInterstitialAd.onLoad(() => {
+        this.loading = false
+        this._dispatchEvent(EventType.Load, {})
+        if (this._userInvokeShowFlag) {
+          this._userInvokeShowFlag = false
+          this._wxInterstitialAd.show()
+        }
+      })
+
+      this._wxInterstitialAd.onError(err => {
+        this.loading = false
+        this._dispatchEvent(EventType.Error, err)
+      })
+
+      this._wxInterstitialAd.onClose(res => {
+        this._dispatchEvent(EventType.Close, res)
+      })
+
+      this.loading = true
+    },
+
+    _callServer () {
+      const userCryptoManager = wx.getUserCryptoManager()
+      userCryptoManager.getLatestUserKey({
+        success: (encryptConfig) => {
+          const callbackData = adPlugin.buildCallbackData(this.adpid, this.urlCallback, {}, encryptConfig)
+          uniCloud.callFunction({
+            name: 'uniAdCallback',
+            data: callbackData,
+            secretType: 'both',
+            success: (res) => {
+              this._dispatchEvent(EventType.Close, res)
+            },
+            fail: (err) => {
+              this._dispatchEvent(EventType.Error, err)
+            }
+          })
+        },
+        fail: (err) => {
+          this._dispatchEvent(EventType.Error, err)
+        }
+      })
     }
   }
 }

package/components/uniad.vue

@@ -5,8 +5,13 @@
       :adpid="adpid"
       @load="_onmpload"
       @close="_onmpclose"
-      @error="_onmperror"
-    />
+      @error="_onmperror"
+      @nextChannel="_onnextchannel"
+    />
+    <!-- #ifdef MP-WEIXIN -->
+    <ad-custom v-if="userwx" :unit-id="userUnitId" class="uni-ad-custom" :class="[customFullscreen]"></ad-custom>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @error="_onwxchannelerror"></uniad-plugin-wx>
+    <!-- #endif -->
   </view>
 </template>
 
@@ -26,3 +31,9 @@ export default {
   }
 }
 </script>
+
+<style>
+.uni-ad-custom-fullscreen {
+  height: 100vh;
+}
+</style>

package/components/unicloud-db.vue

@@ -393,7 +393,7 @@
           needLoading: true,
           loadingTitle: ''
         }, options);
-        if (!options.needConfirm) {
+        if (options.needConfirm) {
           uni.showModal({
             title: options.confirmTitle || t('uniCloud.component.update.showModal.title'),
             content: options.confirmContent || t('uniCloud.component.update.showModal.content'),

package/lib/platform.js

@@ -46,13 +46,19 @@ function getShadowCdn () {
 }
 
 let appid
+let platformAppId
 
-function createIdent () {
+function createIdent (platform) {
   if (process.env.UNI_INPUT_DIR) {
     if (typeof appid === 'undefined') {
-      appid = getManifestJson().appid || ''
+      const manifestJson = getManifestJson()
+      appid = manifestJson.appid || ''
+      platformAppId = manifestJson[platform]?.appid
+    }
+    let id = appid.replace('__UNI__', '')
+    if (platformAppId) {
+      id += '%%' + platformAppId
     }
-    const id = appid.replace('__UNI__', '')
     if (id) {
       return Buffer.from(Buffer.from(id).toString('base64')).toString('hex')
     }
@@ -63,7 +69,7 @@ function createIdent () {
 function createShadowImageUrl (cdn, type = 'grey') {
   let identStr = ''
   if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'web') {
-    const ident = createIdent()
+    const ident = createIdent(process.env.UNI_PLATFORM)
     identStr = ident ? `${ident}/` : ''
   }
   return `https://cdn${cdn || ''}.dcloud.net.cn/${identStr}img/shadow-${type}.png`

package/lib/preprocess.js

@@ -52,14 +52,14 @@ module.exports = function initPreprocess (name, platforms, userDefines = {}) {
     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 (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

package/lib/uts/dataToEsm.js

@@ -0,0 +1,154 @@
+const reservedWords =
+  'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public'
+const builtins =
+  'arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl'
+const forbiddenIdentifiers = new Set(`${reservedWords} ${builtins}`.split(' '))
+forbiddenIdentifiers.add('')
+const makeLegalIdentifier = function makeLegalIdentifier (str) {
+  let identifier = str
+    .replace(/-(\w)/g, (_, letter) => letter.toUpperCase())
+    .replace(/[^$_a-zA-Z0-9]/g, '_')
+  if (/\d/.test(identifier[0]) || forbiddenIdentifiers.has(identifier)) {
+    identifier = `_${identifier}`
+  }
+  return identifier || '_'
+}
+
+function stringify (obj) {
+  return (JSON.stringify(obj) || 'undefined').replace(/[\u2028\u2029]/g, (char) =>
+    `\\u${`000${char.charCodeAt(0).toString(16)}`.slice(-4)}`)
+}
+
+function serializeArray (arr, indent, baseIndent) {
+  let output = '['
+  const separator = indent ? `\n${baseIndent}${indent}` : ''
+  for (let i = 0; i < arr.length; i++) {
+    const key = arr[i]
+    output += `${i > 0 ? ',' : ''}${separator}${serialize(key, indent, baseIndent + indent)}`
+  }
+  return `${output}${indent ? `\n${baseIndent}` : ''}]`
+}
+
+function serializeObject (obj, indent, baseIndent) {
+  let output = '{'
+  const separator = indent ? `\n${baseIndent}${indent}` : ''
+  const entries = Object.entries(obj)
+  for (let i = 0; i < entries.length; i++) {
+    const [key, value] = entries[i]
+    const stringKey = makeLegalIdentifier(key) === key ? key : stringify(key)
+    output +=
+      `${i > 0 ? ',' : ''}${separator}${stringKey}:${indent ? ' ' : ''}${serialize(value, indent, baseIndent + indent)}`
+  }
+  return `${output}${indent ? `\n${baseIndent}` : ''}}`
+}
+
+function serialize (obj, indent, baseIndent) {
+  if (typeof obj === 'object' && obj !== null) {
+    if (Array.isArray(obj)) {
+      return serializeArray(obj, indent, baseIndent)
+    }
+    if (obj instanceof Date) {
+      return `new Date(${obj.getTime()})`
+    }
+    if (obj instanceof RegExp) {
+      return obj.toString()
+    }
+    return serializeObject(obj, indent, baseIndent)
+  }
+  if (typeof obj === 'number') {
+    if (obj === Infinity) {
+      return 'Infinity'
+    }
+    if (obj === -Infinity) {
+      return '-Infinity'
+    }
+    if (obj === 0) {
+      return 1 / obj === Infinity ? '0' : '-0'
+    }
+
+    if (isNaN(obj)) {
+      return 'NaN'
+    }
+  }
+  if (typeof obj === 'symbol') {
+    const key = Symbol.keyFor(obj)
+    // eslint-disable-next-line no-undefined
+    if (key !== undefined) {
+      return `Symbol.for(${stringify(key)})`
+    }
+  }
+  if (typeof obj === 'bigint') {
+    return `${obj}n`
+  }
+  return stringify(obj)
+}
+// isWellFormed exists from Node.js 20
+const hasStringIsWellFormed = 'isWellFormed' in String.prototype
+
+function isWellFormedString (input) {
+  // @ts-expect-error String::isWellFormed exists from ES2024. tsconfig lib is set to ES6
+  if (hasStringIsWellFormed) {
+    return input.isWellFormed()
+  }
+  // https://github.com/tc39/proposal-is-usv-string/blob/main/README.md#algorithm
+  return !/\p{Surrogate}/u.test(input)
+}
+
+function dataToEsm (data, options = {}) {
+  var _a, _b
+  const t = options.compact ? '' : 'indent' in options ? options.indent : '\t'
+  const _ = options.compact ? '' : ' '
+  const n = options.compact ? '' : '\n'
+  const declarationType = options.preferConst ? 'const' : 'var'
+  if (options.namedExports === false ||
+    typeof data !== 'object' ||
+    Array.isArray(data) ||
+    data instanceof Date ||
+    data instanceof RegExp ||
+    data === null) {
+    const code = serialize(data, options.compact ? null : t, '')
+    const magic = _ || (/^[{[\-\/]/.test(code) ? '' : ' ') // eslint-disable-line no-useless-escape
+    return `export default${magic}${code};`
+  }
+  let maxUnderbarPrefixLength = 0
+  for (const key of Object.keys(data)) {
+    const underbarPrefixLength = (_b = (_a = key.match(/^(_+)/)) === null || _a === undefined ? undefined : _a[0]
+      .length) !==
+      null && _b !== undefined ? _b : 0
+    if (underbarPrefixLength > maxUnderbarPrefixLength) {
+      maxUnderbarPrefixLength = underbarPrefixLength
+    }
+  }
+  const arbitraryNamePrefix = `${'_'.repeat(maxUnderbarPrefixLength + 1)}arbitrary`
+  let namedExportCode = ''
+  const defaultExportRows = []
+  const arbitraryNameExportRows = []
+  for (const [key, value] of Object.entries(data)) {
+    if (key === makeLegalIdentifier(key)) {
+      if (options.objectShorthand) {
+        defaultExportRows.push(key)
+      } else {
+        defaultExportRows.push(`${key}:${_}${key}`)
+      }
+      namedExportCode +=
+        `export ${declarationType} ${key}${_}=${_}${serialize(value, options.compact ? null : t, '')};${n}`
+    } else {
+      defaultExportRows.push(`${stringify(key)}:${_}${serialize(value, options.compact ? null : t, '')}`)
+      if (options.includeArbitraryNames && isWellFormedString(key)) {
+        const variableName = `${arbitraryNamePrefix}${arbitraryNameExportRows.length}`
+        namedExportCode +=
+          `${declarationType} ${variableName}${_}=${_}${serialize(value, options.compact ? null : t, '')};${n}`
+        arbitraryNameExportRows.push(`${variableName} as ${JSON.stringify(key)}`)
+      }
+    }
+  }
+  const arbitraryExportCode = arbitraryNameExportRows.length > 0
+    ? `export${_}{${n}${t}${arbitraryNameExportRows.join(`,${n}${t}`)}${n}};${n}`
+    : ''
+  const defaultExportCode = `export default${_}{${n}${t}${defaultExportRows.join(`,${n}${t}`)}${n}};${n}`
+  return `${namedExportCode}${arbitraryExportCode}${defaultExportCode}`
+};
+
+module.exports = {
+  dataToEsm
+}