From ce4e6cfe02887f867f150e686b592a4ea18cfa61 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Fri, 26 Jul 2024 03:46:26 +0800 Subject: [PATCH] fix(wx): onDownloadProgress --- demos/wx/pages/index/index.js | 22 +- demos/wx/project.config.json | 2 +- demos/wx/project.private.config.json | 6 +- packages/core/src/core.ts | 85 +++-- packages/core/src/types.ts | 10 +- packages/wx/src/adapter.ts | 37 +- packages/wx/src/index.ts | 1 + packages/wx/src/utils.d.ts | 1 + packages/wx/src/utils.js | 515 +++++++++++++++++++++++++++ packages/wx/tsconfig.cjs.json | 3 +- packages/wx/tsconfig.es5.json | 3 +- packages/wx/tsconfig.esm.json | 3 +- packages/wx/tsconfig.json | 4 +- 13 files changed, 633 insertions(+), 59 deletions(-) create mode 100644 packages/wx/src/utils.d.ts create mode 100644 packages/wx/src/utils.js diff --git a/demos/wx/pages/index/index.js b/demos/wx/pages/index/index.js index c637f98..a69c633 100644 --- a/demos/wx/pages/index/index.js +++ b/demos/wx/pages/index/index.js @@ -1,4 +1,5 @@ -const { lyla } = require('@lylajs/wx') +// copy @lylajs/wx/dist to here +const { lyla } = require('./lyla') // index.js Page({ @@ -7,16 +8,25 @@ Page({ }, onShow() { lyla - .get('https://randomuser.me/api/', { + .post('https://chat.deepseek.com/api/v0/chat/completions', { headers: { - foo: 'bar' + Authorization: 'Bearer xxx' + }, + json: { + message: 'Hello', + stream: true, + model_preference: null, + model_class: 'deepseek_chat', + temperature: 0 + }, + onDownloadProgress({ detail }) { + console.log('!!!1', detail.responseText) } }) .then((resp) => { - console.log(resp.detail) - console.log('resp', resp.headers, resp.body, resp.json) + console.log('!!!2', resp.body) this.setData({ - respBody: JSON.stringify(resp.json) + respBody: resp.body }) }) } diff --git a/demos/wx/project.config.json b/demos/wx/project.config.json index 26a64b8..b2ac673 100644 --- a/demos/wx/project.config.json +++ b/demos/wx/project.config.json @@ -1,5 +1,5 @@ { - "appid": "touristappid", + "appid": "wx1a2d50c6c8b5a3d3", "compileType": "miniprogram", "libVersion": "2.17.0", "packOptions": { diff --git a/demos/wx/project.private.config.json b/demos/wx/project.private.config.json index bd13937..31428fd 100644 --- a/demos/wx/project.private.config.json +++ b/demos/wx/project.private.config.json @@ -1,7 +1,9 @@ { "projectname": "wx", "setting": { - "compileHotReLoad": true + "compileHotReLoad": true, + "urlCheck": false }, - "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html" + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", + "libVersion": "3.5.0" } \ No newline at end of file diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts index 3a27d9e..299300f 100644 --- a/packages/core/src/core.ts +++ b/packages/core/src/core.ts @@ -374,6 +374,7 @@ export function createLyla( } let hasNetworkError = false + const onHeadersReceived = _options.hooks?.onHeadersReceived const adapterHandle = adapter({ url, method, @@ -401,47 +402,53 @@ export function createLyla( handleResponseError(networkError) _reject(networkError) }, - onDownloadProgress: (progress) => { - onDownloadProgress?.({ ...progress, requestOptions: _options }) - }, - onUploadProgress: (progress) => { - onUploadProgress?.({ ...progress, requestOptions: _options }) - }, - onHeadersReceived: (_headers, originalRequest) => { - if (aborted) return - if (hasNetworkError) return - if (_options.hooks?.onHeadersReceived) { - const headers = mergeHeaders({}, _headers) - try { - for (const hook of _options.hooks.onHeadersReceived) { - hook( - { headers, requestOptions: _options, originalRequest }, - _customReject - ) + onDownloadProgress: onDownloadProgress + ? (progress) => { + onDownloadProgress({ ...progress, requestOptions: _options }) + } + : undefined, + onUploadProgress: onUploadProgress + ? (progress) => { + onUploadProgress({ ...progress, requestOptions: _options }) + } + : undefined, + onHeadersReceived: onHeadersReceived + ? (_headers, originalRequest) => { + if (aborted) return + if (hasNetworkError) return + if (onHeadersReceived) { + const headers = mergeHeaders({}, _headers) + try { + for (const hook of onHeadersReceived) { + hook( + { headers, requestOptions: _options, originalRequest }, + _customReject + ) + } + } catch (error) { + const brokenOnHeadersReceived = defineLylaError< + M, + C, + LylaBrokenOnHeadersReceivedError + >( + { + type: LYLA_ERROR.BROKEN_ON_HEADERS_RECEIVED, + message: '`onHeadersReceived` hook throws error', + detail: undefined, + response: undefined, + error, + context: _options.context, + requestOptions: _options + }, + undefined + ) + handleNonResponseError(brokenOnHeadersReceived) + _reject(brokenOnHeadersReceived) + return + } } - } catch (error) { - const brokenOnHeadersReceived = defineLylaError< - M, - C, - LylaBrokenOnHeadersReceivedError - >( - { - type: LYLA_ERROR.BROKEN_ON_HEADERS_RECEIVED, - message: '`onHeadersReceived` hook throws error', - detail: undefined, - response: undefined, - error, - context: _options.context, - requestOptions: _options - }, - undefined - ) - handleNonResponseError(brokenOnHeadersReceived) - _reject(brokenOnHeadersReceived) - return } - } - }, + : undefined, async onResponse(resp, detail) { if (aborted) return if (hasNetworkError) return diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index 3a280d2..2c01436 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -243,10 +243,12 @@ export interface LylaAdapterOptions { onDownloadProgress: | ((progress: Omit, 'requestOptions'>) => void) | undefined - onHeadersReceived( - headers: Record, - originalRequest: T['originalRequest'] - ): void + onHeadersReceived: + | (( + headers: Record, + originalRequest: T['originalRequest'] + ) => void) + | undefined onResponse( response: { body: T['responseBody'] diff --git a/packages/wx/src/adapter.ts b/packages/wx/src/adapter.ts index fd51f79..426b5cd 100644 --- a/packages/wx/src/adapter.ts +++ b/packages/wx/src/adapter.ts @@ -10,6 +10,7 @@ import type { WxRequestMethod, WxRequestTask } from './types' +import { arrayBufferToString } from './utils' declare const wx: { request: WxRequest @@ -21,7 +22,7 @@ export interface LylaAdapterMeta extends LylaCoreAdapterMeta { responseDetail: ResponseDetail responseType: 'arraybuffer' | 'text' requestBody: string | ArrayBuffer - progressDetail: { data: ArrayBuffer } + progressDetail: { data: ArrayBuffer; responseText: string } originalRequest: WxRequestTask extraOptions: never } @@ -43,6 +44,8 @@ export const adapter: LylaAdapter = ({ }): { abort: () => void } => { + let latestProgressData: Uint8Array | undefined = undefined + const requestTask = wx.request({ url, method, @@ -57,9 +60,19 @@ export const adapter: LylaAdapter = ({ onNetworkError(res) }, success(res) { + let body: string | ArrayBuffer + if (onDownloadProgress) { + if (responseType === 'arraybuffer') { + body = latestProgressData || new ArrayBuffer(0) + } else { + body = arrayBufferToString(latestProgressData || new ArrayBuffer(0)) + } + } else { + body = res.data as string | ArrayBuffer + } onResponse( { - body: res.data as string | ArrayBuffer, + body, status: res.statusCode, headers: headersKeyToLowerCase(res.header) }, @@ -69,8 +82,26 @@ export const adapter: LylaAdapter = ({ }) if (onDownloadProgress) { requestTask.onChunkReceived((detail) => { + if (!latestProgressData) { + latestProgressData = new Uint8Array([]) + } + let mergedProgressData = new Uint8Array( + latestProgressData.byteLength + detail.data.byteLength + ) + mergedProgressData.set(latestProgressData, 0) + mergedProgressData.set( + detail.data instanceof Uint8Array + ? detail.data + : new Uint8Array(detail.data), + latestProgressData.byteLength + ) + latestProgressData = mergedProgressData + onDownloadProgress({ - detail, + detail: { + data: detail.data, + responseText: arrayBufferToString(latestProgressData) + }, lengthComputable: false, loaded: 0, originalRequest: requestTask, diff --git a/packages/wx/src/index.ts b/packages/wx/src/index.ts index 7b18f8d..a4126eb 100644 --- a/packages/wx/src/index.ts +++ b/packages/wx/src/index.ts @@ -11,3 +11,4 @@ export type { } from './reexports' export { LYLA_ERROR, LylaAbortController } from './reexports' export { lyla, isLylaError, createLyla } from './instance' +export { arrayBufferToString } from './utils' diff --git a/packages/wx/src/utils.d.ts b/packages/wx/src/utils.d.ts new file mode 100644 index 0000000..9904039 --- /dev/null +++ b/packages/wx/src/utils.d.ts @@ -0,0 +1 @@ +export const arrayBufferToString: (buffer: ArrayBuffer) => string diff --git a/packages/wx/src/utils.js b/packages/wx/src/utils.js new file mode 100644 index 0000000..87e4731 --- /dev/null +++ b/packages/wx/src/utils.js @@ -0,0 +1,515 @@ +// https://github.com/anonyco/FastestSmallestTextEncoderDecoder/blob/master/EncoderDecoderTogether.src.js + +/* eslint-disable */ +/** @define {boolean} */ +var ENCODEINTO_BUILD = false + +var decoderHolder = { + Uint8Array, +} + +;(function (window) { + 'use strict' + //var log = Math.log; + //var LN2 = Math.LN2; + //var clz32 = Math.clz32 || function(x) {return 31 - log(x >> 0) / LN2 | 0}; + var fromCharCode = String.fromCharCode + var Object_prototype_toString = {}.toString + var sharedArrayBufferString = Object_prototype_toString.call(window['SharedArrayBuffer']) + var undefinedObjectString = Object_prototype_toString() + var NativeUint8Array = window.Uint8Array + var patchedU8Array = NativeUint8Array || Array + var nativeArrayBuffer = NativeUint8Array ? ArrayBuffer : patchedU8Array + var arrayBuffer_isView = + nativeArrayBuffer.isView || + function (x) { + return x && 'length' in x + } + var arrayBufferString = Object_prototype_toString.call(nativeArrayBuffer.prototype) + var window_encodeURIComponent = encodeURIComponent + var window_parseInt = parseInt + var TextEncoderPrototype = TextEncoder['prototype'] + var GlobalTextEncoder = window['TextEncoder'] + var decoderRegexp = /[\xc0-\xff][\x80-\xbf]+|[\x80-\xff]/g + var encoderRegexp = /[\x80-\uD7ff\uDC00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]?/g + var tmpBufferU16 = new (NativeUint8Array ? Uint16Array : patchedU8Array)(32) + var globalTextEncoderPrototype + var globalTextEncoderInstance + + /*function decoderReplacer(encoded) { + var cp0 = encoded.charCodeAt(0), codePoint=0x110000, i=0, stringLen=encoded.length|0, result=""; + switch(cp0 >> 4) { + // no 1 byte sequences + case 12: + case 13: + codePoint = ((cp0 & 0x1F) << 6) | (encoded.charCodeAt(1) & 0x3F); + i = codePoint < 0x80 ? 0 : 2; + break; + case 14: + codePoint = ((cp0 & 0x0F) << 12) | ((encoded.charCodeAt(1) & 0x3F) << 6) | (encoded.charCodeAt(2) & 0x3F); + i = codePoint < 0x800 ? 0 : 3; + break; + case 15: + if ((cp0 >> 3) === 30) { + codePoint = ((cp0 & 0x07) << 18) | ((encoded.charCodeAt(1) & 0x3F) << 12) | ((encoded.charCodeAt(2) & 0x3F) << 6) | (encoded.charCodeAt(3) & 0x3F); + i = codePoint < 0x10000 ? 0 : 4; + } + } + if (i) { + if (stringLen < i) { + i = 0; + } else if (codePoint < 0x10000) { // BMP code point + result = fromCharCode(codePoint); + } else if (codePoint < 0x110000) { + codePoint = codePoint - 0x10080|0;//- 0x10000|0; + result = fromCharCode( + (codePoint >> 10) + 0xD800|0, // highSurrogate + (codePoint & 0x3ff) + 0xDC00|0 // lowSurrogate + ); + } else i = 0; // to fill it in with INVALIDs + } + + for (; i < stringLen; i=i+1|0) result += "\ufffd"; // fill rest with replacement character + + return result; + }*/ + function TextDecoder() {} + TextDecoder['prototype']['decode'] = function (inputArrayOrBuffer) { + var inputAs8 = inputArrayOrBuffer, + asObjectString + if (!arrayBuffer_isView(inputAs8)) { + asObjectString = Object_prototype_toString.call(inputAs8) + if ( + asObjectString !== arrayBufferString && + asObjectString !== sharedArrayBufferString && + asObjectString !== undefinedObjectString + ) + throw TypeError( + "Failed to execute 'decode' on 'TextDecoder': The provided value is not of type '(ArrayBuffer or ArrayBufferView)'" + ) + inputAs8 = NativeUint8Array ? new patchedU8Array(inputAs8) : inputAs8 || [] + } + + var resultingString = '', + tmpStr = '', + index = 0, + len = inputAs8.length | 0, + lenMinus32 = (len - 32) | 0, + nextEnd = 0, + nextStop = 0, + cp0 = 0, + codePoint = 0, + minBits = 0, + cp1 = 0, + pos = 0, + tmp = -1 + // Note that tmp represents the 2nd half of a surrogate pair incase a surrogate gets divided between blocks + for (; index < len; ) { + nextEnd = index <= lenMinus32 ? 32 : (len - index) | 0 + for (; pos < nextEnd; index = (index + 1) | 0, pos = (pos + 1) | 0) { + cp0 = inputAs8[index] & 0xff + switch (cp0 >> 4) { + case 15: + cp1 = inputAs8[(index = (index + 1) | 0)] & 0xff + if (cp1 >> 6 !== 0b10 || 0b11110111 < cp0) { + index = (index - 1) | 0 + break + } + codePoint = ((cp0 & 0b111) << 6) | (cp1 & 0b00111111) + minBits = 5 // 20 ensures it never passes -> all invalid replacements + cp0 = 0x100 // keep track of th bit size + case 14: + cp1 = inputAs8[(index = (index + 1) | 0)] & 0xff + codePoint <<= 6 + codePoint |= ((cp0 & 0b1111) << 6) | (cp1 & 0b00111111) + minBits = cp1 >> 6 === 0b10 ? (minBits + 4) | 0 : 24 // 24 ensures it never passes -> all invalid replacements + cp0 = (cp0 + 0x100) & 0x300 // keep track of th bit size + case 13: + case 12: + cp1 = inputAs8[(index = (index + 1) | 0)] & 0xff + codePoint <<= 6 + codePoint |= ((cp0 & 0b11111) << 6) | (cp1 & 0b00111111) + minBits = (minBits + 7) | 0 + + // Now, process the code point + if (index < len && cp1 >> 6 === 0b10 && codePoint >> minBits && codePoint < 0x110000) { + cp0 = codePoint + codePoint = (codePoint - 0x10000) | 0 + if (0 <= codePoint /*0xffff < codePoint*/) { + // BMP code point + //nextEnd = nextEnd - 1|0; + + tmp = ((codePoint >> 10) + 0xd800) | 0 // highSurrogate + cp0 = ((codePoint & 0x3ff) + 0xdc00) | 0 // lowSurrogate (will be inserted later in the switch-statement) + + if (pos < 31) { + // notice 31 instead of 32 + tmpBufferU16[pos] = tmp + pos = (pos + 1) | 0 + tmp = -1 + } else { + // else, we are at the end of the inputAs8 and let tmp0 be filled in later on + // NOTE that cp1 is being used as a temporary variable for the swapping of tmp with cp0 + cp1 = tmp + tmp = cp0 + cp0 = cp1 + } + } else nextEnd = (nextEnd + 1) | 0 // because we are advancing i without advancing pos + } else { + // invalid code point means replacing the whole thing with null replacement characters + cp0 >>= 8 + index = (index - cp0 - 1) | 0 // reset index back to what it was before + cp0 = 0xfffd + } + + // Finally, reset the variables for the next go-around + minBits = 0 + codePoint = 0 + nextEnd = index <= lenMinus32 ? 32 : (len - index) | 0 + /*case 11: + case 10: + case 9: + case 8: + codePoint ? codePoint = 0 : cp0 = 0xfffd; // fill with invalid replacement character + case 7: + case 6: + case 5: + case 4: + case 3: + case 2: + case 1: + case 0: + tmpBufferU16[pos] = cp0; + continue;*/ + default: + tmpBufferU16[pos] = cp0 // fill with invalid replacement character + continue + case 11: + case 10: + case 9: + case 8: + } + tmpBufferU16[pos] = 0xfffd // fill with invalid replacement character + } + tmpStr += fromCharCode( + tmpBufferU16[0], + tmpBufferU16[1], + tmpBufferU16[2], + tmpBufferU16[3], + tmpBufferU16[4], + tmpBufferU16[5], + tmpBufferU16[6], + tmpBufferU16[7], + tmpBufferU16[8], + tmpBufferU16[9], + tmpBufferU16[10], + tmpBufferU16[11], + tmpBufferU16[12], + tmpBufferU16[13], + tmpBufferU16[14], + tmpBufferU16[15], + tmpBufferU16[16], + tmpBufferU16[17], + tmpBufferU16[18], + tmpBufferU16[19], + tmpBufferU16[20], + tmpBufferU16[21], + tmpBufferU16[22], + tmpBufferU16[23], + tmpBufferU16[24], + tmpBufferU16[25], + tmpBufferU16[26], + tmpBufferU16[27], + tmpBufferU16[28], + tmpBufferU16[29], + tmpBufferU16[30], + tmpBufferU16[31] + ) + if (pos < 32) tmpStr = tmpStr.slice(0, (pos - 32) | 0) //-(32-pos)); + if (index < len) { + //fromCharCode.apply(0, tmpBufferU16 : NativeUint8Array ? tmpBufferU16.subarray(0,pos) : tmpBufferU16.slice(0,pos)); + tmpBufferU16[0] = tmp + pos = ~tmp >>> 31 //tmp !== -1 ? 1 : 0; + tmp = -1 + + if (tmpStr.length < resultingString.length) continue + } else if (tmp !== -1) { + tmpStr += fromCharCode(tmp) + } + + resultingString += tmpStr + tmpStr = '' + } + + return resultingString + } + ////////////////////////////////////////////////////////////////////////////////////// + function encoderReplacer(nonAsciiChars) { + // make the UTF string into a binary UTF-8 encoded string + var point = nonAsciiChars.charCodeAt(0) | 0 + if (0xd800 <= point) { + if (point <= 0xdbff) { + var nextcode = nonAsciiChars.charCodeAt(1) | 0 // defaults to 0 when NaN, causing null replacement character + + if (0xdc00 <= nextcode && nextcode <= 0xdfff) { + //point = ((point - 0xD800)<<10) + nextcode - 0xDC00 + 0x10000|0; + point = ((point << 10) + nextcode - 0x35fdc00) | 0 + if (point > 0xffff) + return fromCharCode( + (0x1e /*0b11110*/ << 3) | (point >> 18), + (0x2 /*0b10*/ << 6) | ((point >> 12) & 0x3f) /*0b00111111*/, + (0x2 /*0b10*/ << 6) | ((point >> 6) & 0x3f) /*0b00111111*/, + (0x2 /*0b10*/ << 6) | (point & 0x3f) /*0b00111111*/ + ) + } else point = 65533 /*0b1111111111111101*/ //return '\xEF\xBF\xBD';//fromCharCode(0xef, 0xbf, 0xbd); + } else if (point <= 0xdfff) { + point = 65533 /*0b1111111111111101*/ //return '\xEF\xBF\xBD';//fromCharCode(0xef, 0xbf, 0xbd); + } + } + /*if (point <= 0x007f) return nonAsciiChars; + else */ if (point <= 0x07ff) { + return fromCharCode((0x6 << 5) | (point >> 6), (0x2 << 6) | (point & 0x3f)) + } else + return fromCharCode( + (0xe /*0b1110*/ << 4) | (point >> 12), + (0x2 /*0b10*/ << 6) | ((point >> 6) & 0x3f) /*0b00111111*/, + (0x2 /*0b10*/ << 6) | (point & 0x3f) /*0b00111111*/ + ) + } + function TextEncoder() {} + TextEncoderPrototype['encode'] = function (inputString) { + // 0xc0 => 0b11000000; 0xff => 0b11111111; 0xc0-0xff => 0b11xxxxxx + // 0x80 => 0b10000000; 0xbf => 0b10111111; 0x80-0xbf => 0b10xxxxxx + var encodedString = inputString === void 0 ? '' : '' + inputString, + len = encodedString.length | 0 + var result = new patchedU8Array(((len << 1) + 8) | 0), + tmpResult + var i = 0, + pos = 0, + point = 0, + nextcode = 0 + var upgradededArraySize = !NativeUint8Array // normal arrays are auto-expanding + for (i = 0; i < len; i = (i + 1) | 0, pos = (pos + 1) | 0) { + point = encodedString.charCodeAt(i) | 0 + if (point <= 0x007f) { + result[pos] = point + } else if (point <= 0x07ff) { + result[pos] = (0x6 << 5) | (point >> 6) + result[(pos = (pos + 1) | 0)] = (0x2 << 6) | (point & 0x3f) + } else { + widenCheck: { + if (0xd800 <= point) { + if (point <= 0xdbff) { + nextcode = encodedString.charCodeAt((i = (i + 1) | 0)) | 0 // defaults to 0 when NaN, causing null replacement character + + if (0xdc00 <= nextcode && nextcode <= 0xdfff) { + //point = ((point - 0xD800)<<10) + nextcode - 0xDC00 + 0x10000|0; + point = ((point << 10) + nextcode - 0x35fdc00) | 0 + if (point > 0xffff) { + result[pos] = (0x1e /*0b11110*/ << 3) | (point >> 18) + result[(pos = (pos + 1) | 0)] = + (0x2 /*0b10*/ << 6) | ((point >> 12) & 0x3f) /*0b00111111*/ + result[(pos = (pos + 1) | 0)] = + (0x2 /*0b10*/ << 6) | ((point >> 6) & 0x3f) /*0b00111111*/ + result[(pos = (pos + 1) | 0)] = + (0x2 /*0b10*/ << 6) | (point & 0x3f) /*0b00111111*/ + continue + } + break widenCheck + } + point = 65533 /*0b1111111111111101*/ //return '\xEF\xBF\xBD';//fromCharCode(0xef, 0xbf, 0xbd); + } else if (point <= 0xdfff) { + point = 65533 /*0b1111111111111101*/ //return '\xEF\xBF\xBD';//fromCharCode(0xef, 0xbf, 0xbd); + } + } + if (!upgradededArraySize && i << 1 < pos && i << 1 < ((pos - 7) | 0)) { + upgradededArraySize = true + tmpResult = new patchedU8Array(len * 3) + tmpResult.set(result) + result = tmpResult + } + } + result[pos] = (0xe /*0b1110*/ << 4) | (point >> 12) + result[(pos = (pos + 1) | 0)] = (0x2 /*0b10*/ << 6) | ((point >> 6) & 0x3f) /*0b00111111*/ + result[(pos = (pos + 1) | 0)] = (0x2 /*0b10*/ << 6) | (point & 0x3f) /*0b00111111*/ + } + } + return NativeUint8Array ? result.subarray(0, pos) : result.slice(0, pos) + } + function polyfill_encodeInto(inputString, u8Arr) { + var encodedString = + inputString === void 0 ? '' : ('' + inputString).replace(encoderRegexp, encoderReplacer) + var len = encodedString.length | 0, + i = 0, + char = 0, + read = 0, + u8ArrLen = u8Arr.length | 0, + inputLength = inputString.length | 0 + if (u8ArrLen < len) len = u8ArrLen + putChars: { + for (; i < len; i = (i + 1) | 0) { + char = encodedString.charCodeAt(i) | 0 + switch (char >> 4) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + read = (read + 1) | 0 + // extension points: + case 8: + case 9: + case 10: + case 11: + break + case 12: + case 13: + if (((i + 1) | 0) < u8ArrLen) { + read = (read + 1) | 0 + break + } + case 14: + if (((i + 2) | 0) < u8ArrLen) { + //if (!(char === 0xEF && encodedString.substr(i+1|0,2) === "\xBF\xBD")) + read = (read + 1) | 0 + break + } + case 15: + if (((i + 3) | 0) < u8ArrLen) { + read = (read + 1) | 0 + break + } + default: + break putChars + } + //read = read + ((char >> 6) !== 2) |0; + u8Arr[i] = char + } + } + return { written: i, read: inputLength < read ? inputLength : read } + // 0xc0 => 0b11000000; 0xff => 0b11111111; 0xc0-0xff => 0b11xxxxxx + // 0x80 => 0b10000000; 0xbf => 0b10111111; 0x80-0xbf => 0b10xxxxxx + /*var encodedString = typeof inputString == "string" ? inputString : inputString === void 0 ? "" : "" + inputString; + var encodedLen = encodedString.length|0, u8LenLeft=u8Arr.length|0; + var i=-1, read=-1, code=0, point=0, nextcode=0; + tryFast: if (2 < encodedLen && encodedLen < (u8LenLeft >> 1)) { + // Skip the normal checks because we can almost certainly fit the string inside the existing buffer + while (1) { // make the UTF string into a binary UTF-8 encoded string + point = encodedString.charCodeAt(read = read + 1|0)|0; + + if (point <= 0x007f) { + if (point === 0 && encodedLen <= read) { + read = read - 1|0; + break; // we have reached the end of the string + } + u8Arr[i=i+1|0] = point; + } else if (point <= 0x07ff) { + u8Arr[i=i+1|0] = (0x6<<5)|(point>>6); + u8Arr[i=i+1|0] = (0x2<<6)|(point&0x3f); + } else { + if (0xD800 <= point && point <= 0xDBFF) { + nextcode = encodedString.charCodeAt(read)|0; // defaults to 0 when NaN, causing null replacement character + + if (0xDC00 <= nextcode && nextcode <= 0xDFFF) { + read = read + 1|0; + //point = ((point - 0xD800)<<10) + nextcode - 0xDC00 + 0x10000|0; + point = (point<<10) + nextcode - 0x35fdc00|0; + if (point > 0xffff) { + u8Arr[i=i+1|0] = (0x1e<<3) | (point>>18); + u8Arr[i=i+1|0] = (0x2<<6) | ((point>>12)&0x3f); + u8Arr[i=i+1|0] = (0x2<<6) | ((point>>6)&0x3f); + u8Arr[i=i+1|0] = (0x2<<6) | (point&0x3f); + continue; + } + } else if (nextcode === 0 && encodedLen <= read) { + break; // we have reached the end of the string + } else { + point = 65533;//0b1111111111111101; // invalid replacement character + } + } + u8Arr[i=i+1|0] = (0xe<<4) | (point>>12); + u8Arr[i=i+1|0] = (0x2<<6) | ((point>>6)&0x3f); + u8Arr[i=i+1|0] = (0x2<<6) | (point&0x3f); + if (u8LenLeft < (i + ((encodedLen - read) << 1)|0)) { + // These 3x chars are the only way to inflate the size to 3x + u8LenLeft = u8LenLeft - i|0; + break tryFast; + } + } + } + u8LenLeft = 0; // skip the next for-loop + } + + + for (; 0 < u8LenLeft; ) { // make the UTF string into a binary UTF-8 encoded string + point = encodedString.charCodeAt(read = read + 1|0)|0; + + if (point <= 0x007f) { + if (point === 0 && encodedLen <= read) { + read = read - 1|0; + break; // we have reached the end of the string + } + u8LenLeft = u8LenLeft - 1|0; + u8Arr[i=i+1|0] = point; + } else if (point <= 0x07ff) { + u8LenLeft = u8LenLeft - 2|0; + if (0 <= u8LenLeft) { + u8Arr[i=i+1|0] = (0x6<<5)|(point>>6); + u8Arr[i=i+1|0] = (0x2<<6)|(point&0x3f); + } + } else { + if (0xD800 <= point && point <= 0xDBFF) { + nextcode = encodedString.charCodeAt(read = read + 1|0)|0; // defaults to 0 when NaN, causing null replacement character + + if (0xDC00 <= nextcode) { + if (nextcode <= 0xDFFF) { + read = read + 1|0; + //point = ((point - 0xD800)<<10) + nextcode - 0xDC00 + 0x10000|0; + point = (point<<10) + nextcode - 0x35fdc00|0; + if (point > 0xffff) { + u8LenLeft = u8LenLeft - 4|0; + if (0 <= u8LenLeft) { + u8Arr[i=i+1|0] = (0x1e<<3) | (point>>18); + u8Arr[i=i+1|0] = (0x2<<6) | ((point>>12)&0x3f); + u8Arr[i=i+1|0] = (0x2<<6) | ((point>>6)&0x3f); + u8Arr[i=i+1|0] = (0x2<<6) | (point&0x3f); + } + continue; + } + } else if (point <= 0xDFFF) { + point = 65533/*0b1111111111111101*\/;//return '\xEF\xBF\xBD';//fromCharCode(0xef, 0xbf, 0xbd); + } + } else if (nextcode === 0 && encodedLen <= read) { + break; // we have reached the end of the string + } else { + point = 65533;//0b1111111111111101; // invalid replacement character + } + } + u8LenLeft = u8LenLeft - 3|0; + if (0 <= u8LenLeft) { + u8Arr[i=i+1|0] = (0xe<<<4) | (point>>12); + u8Arr[i=i+1|0] = (0x2<<6) | ((point>>6)&0x3f); + u8Arr[i=i+1|0] = (0x2<<6) | (point&0x3f); + } + } + } + return {"read": read < 0 ? 0 : u8LenLeft < 0 ? read : read+1|0, "written": i < 0 ? 0 : i+1|0};*/ + } + if (ENCODEINTO_BUILD) { + TextEncoderPrototype['encodeInto'] = polyfill_encodeInto + } + + if (!GlobalTextEncoder) { + window['TextDecoder'] = TextDecoder + window['TextEncoder'] = TextEncoder + } +})(decoderHolder) + +export function arrayBufferToString(arrayBuffer) { + const { TextDecoder } = decoderHolder + const uint8array = new Uint8Array(arrayBuffer) + return new TextDecoder().decode(uint8array) +} diff --git a/packages/wx/tsconfig.cjs.json b/packages/wx/tsconfig.cjs.json index 7769932..02f827a 100644 --- a/packages/wx/tsconfig.cjs.json +++ b/packages/wx/tsconfig.cjs.json @@ -2,7 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "lib", - "module": "CommonJS" + "module": "CommonJS", + "noEmit": false }, "include": ["src"] } diff --git a/packages/wx/tsconfig.es5.json b/packages/wx/tsconfig.es5.json index 992fded..77b2c99 100644 --- a/packages/wx/tsconfig.es5.json +++ b/packages/wx/tsconfig.es5.json @@ -2,7 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "dist", - "module": "ESNext" + "module": "ESNext", + "noEmit": false }, "include": ["src"] } diff --git a/packages/wx/tsconfig.esm.json b/packages/wx/tsconfig.esm.json index 6bcc77a..6c7d66f 100644 --- a/packages/wx/tsconfig.esm.json +++ b/packages/wx/tsconfig.esm.json @@ -2,7 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "es", - "module": "ESNext" + "module": "ESNext", + "noEmit": false }, "include": ["src"] } \ No newline at end of file diff --git a/packages/wx/tsconfig.json b/packages/wx/tsconfig.json index ad2028c..1320a98 100644 --- a/packages/wx/tsconfig.json +++ b/packages/wx/tsconfig.json @@ -5,7 +5,9 @@ "target": "ES2017", "esModuleInterop": true, "moduleResolution": "node", - "strict": true + "strict": true, + "allowJs": true, + "noEmit": true }, "include": ["src"] }