@cloudbase/apis 2.25.3 → 2.25.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/callApis.js +21 -3
- package/dist/esm/callApis.js +21 -3
- package/dist/miniprogram/index.js +1 -1
- package/package.json +4 -4
- package/src/callApis.ts +26 -8
package/dist/cjs/callApis.js
CHANGED
|
@@ -52,7 +52,7 @@ var constants_1 = require("@cloudbase/utilities/dist/cjs/constants");
|
|
|
52
52
|
function callApi(callApiOptions, opts) {
|
|
53
53
|
var _a, _b, _c, _d;
|
|
54
54
|
return __awaiter(this, void 0, void 0, function () {
|
|
55
|
-
var _e, name, body, _f, path, _g, method, _h, headers, token, url, _j, gatewayOrigin, getAccessToken, env, _k, BASE_URL, PROTOCOL, endpoint, reqPath, accessToken, response;
|
|
55
|
+
var _e, name, body, _f, path, _g, method, _h, headers, token, url, _j, gatewayOrigin, getAccessToken, env, _k, BASE_URL, PROTOCOL, endpoint, reqPath, accessToken, isGetAndHead, dataParse_1, response;
|
|
56
56
|
return __generator(this, function (_l) {
|
|
57
57
|
switch (_l.label) {
|
|
58
58
|
case 0:
|
|
@@ -84,7 +84,25 @@ function callApi(callApiOptions, opts) {
|
|
|
84
84
|
accessToken = (_l.sent()).accessToken;
|
|
85
85
|
headers.Authorization = "Bearer ".concat(accessToken);
|
|
86
86
|
_l.label = 2;
|
|
87
|
-
case 2:
|
|
87
|
+
case 2:
|
|
88
|
+
isGetAndHead = ['GET', 'HEAD'].includes((_a = method === null || method === void 0 ? void 0 : method.toUpperCase) === null || _a === void 0 ? void 0 : _a.call(method));
|
|
89
|
+
if (isGetAndHead) {
|
|
90
|
+
try {
|
|
91
|
+
dataParse_1 = {};
|
|
92
|
+
try {
|
|
93
|
+
dataParse_1 = JSON.parse(body);
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
dataParse_1 = body || {};
|
|
97
|
+
}
|
|
98
|
+
reqPath = "".concat(reqPath).concat(reqPath.includes('?') ? '&' : '?').concat(Object.keys(dataParse_1)
|
|
99
|
+
.map(function (key) { return "".concat(key, "=").concat(dataParse_1[key]); })
|
|
100
|
+
.join('&'));
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
return [4, this.request.fetch(__assign(__assign(__assign({ url: "".concat(endpoint).concat(reqPath), method: method || 'POST', headers: __assign({ 'Content-Type': 'application/json; charset=utf-8' }, headers) }, (isGetAndHead ? {} : { body: body })), { token: ((_b = token === null || token === void 0 ? void 0 : token.trim) === null || _b === void 0 ? void 0 : _b.call(token)) || ((_d = (_c = headers.Authorization) === null || _c === void 0 ? void 0 : _c.replace) === null || _d === void 0 ? void 0 : _d.call(_c, /^Bearer /, '')) || null }), opts))];
|
|
88
106
|
case 3:
|
|
89
107
|
response = _l.sent();
|
|
90
108
|
return [4, response.data];
|
|
@@ -133,4 +151,4 @@ function generateApis(params) {
|
|
|
133
151
|
});
|
|
134
152
|
}
|
|
135
153
|
exports.generateApis = generateApis;
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
154
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"callApis.js","sourceRoot":"","sources":["../../src/callApis.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAAgE;AAIhE,SAAsB,OAAO,CAAC,cAA+B,EAAE,IAAc;;;;;;;oBACrE,KAA2D,cAAc,IAAI,EAAE,EAA7E,IAAI,UAAA,EAAE,IAAI,UAAA,EAAE,YAAS,EAAT,IAAI,mBAAG,EAAE,KAAA,EAAE,cAAe,EAAf,MAAM,mBAAG,MAAM,KAAA,EAAE,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,CAAyB;oBAC7E,KAAK,GAAK,CAAA,cAAc,IAAI,EAAE,CAAA,MAAzB,CAAyB;oBAEtC,IAAI,CAAC,IAAI,EAAE;wBACT,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;4BAC7B,IAAI,EAAE,kBAAM,CAAC,cAAc;4BAC3B,GAAG,EAAE,yBAAyB;yBAC/B,CAAC,CAAE,CAAA;qBACL;oBAEG,GAAG,GAAG,EAAE,CAAA;oBAEN,KAAyC,IAAI,EAA3C,aAAa,mBAAA,EAAE,cAAc,oBAAA,EAAE,GAAG,SAAA,CAAS;oBAEnD,IAAI,aAAa,EAAE;wBACjB,GAAG,GAAG,UAAG,aAAa,QAAK,CAAA;qBAC5B;yBAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE;wBAC5B,KAAyB,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAzD,QAAQ,cAAA,EAAE,QAAQ,cAAA,CAAuC;wBACjE,GAAG,GAAG,UAAG,QAAQ,SAAG,QAAQ,CAAE,CAAA;qBAC/B;yBAAM;wBACL,GAAG,GAAG,kBAAW,GAAG,kCAA+B,CAAA;qBACpD;oBACK,QAAQ,GAAG,UAAG,GAAG,mBAAS,IAAI,CAAE,CAAA;oBAClC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAI,IAAI,CAAE,CAAA;yBAElD,cAAc,EAAd,cAAc;oBACQ,WAAM,cAAc,EAAE,EAAA;;oBAAtC,WAAW,GAAK,CAAA,SAAsB,CAAA,YAA3B;oBACnB,OAAO,CAAC,aAAa,GAAG,iBAAU,WAAW,CAAE,CAAA;;;oBAG3C,YAAY,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,sDAAI,CAAC,CAAA;oBAEtE,IAAI,YAAY,EAAE;wBAChB,IAAI;4BACE,cAAY,EAAE,CAAA;4BAClB,IAAI;gCACF,WAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAW,CAAC,CAAA;6BACpC;4BAAC,OAAO,KAAK,EAAE;gCACd,WAAS,GAAG,IAAI,IAAI,EAAE,CAAA;6BACvB;4BACD,OAAO,GAAG,UAAG,OAAO,SAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAG,MAAM,CAAC,IAAI,CAAC,WAAS,CAAC;iCAC9E,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,UAAG,GAAG,cAAI,WAAS,CAAC,GAAG,CAAC,CAAE,EAA1B,CAA0B,CAAC;iCACtC,IAAI,CAAC,GAAG,CAAC,CAAE,CAAA;yBACf;wBAAC,OAAO,KAAK,EAAE;yBAEf;qBACF;oBAEgB,WAAM,IAAI,CAAC,OAAO,CAAC,KAAK,8BACvC,GAAG,EAAE,UAAG,QAAQ,SAAG,OAAO,CAAE,EAC5B,MAAM,EAAE,MAAM,IAAI,MAAM,EACxB,OAAO,aACL,cAAc,EAAE,iCAAiC,IAC9C,OAAO,KAGT,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,KACjC,KAAK,EAAE,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,qDAAI,MAAI,MAAA,MAAA,OAAO,CAAC,aAAa,0CAAE,OAAO,mDAAG,UAAU,EAAE,EAAE,CAAC,CAAA,IAAI,IAAI,KAC/E,IAAI,EACP,EAAA;;oBAXI,QAAQ,GAAG,SAWf;oBAEK,WAAM,QAAQ,CAAC,IAAI,EAAA;wBAA1B,WAAO,SAAmB,EAAA;;;;CAC3B;AA/DD,0BA+DC;AAED,IAAM,eAAe,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;AAG/F,SAAgB,gBAAgB,CAAC,OAAe;IAAhD,iBAwBC;IAvBC,OAAO,IAAI,KAAK,CAAC,EAAS,EAAE;QAC1B,GAAG,EAAE,UAAC,CAAC,EAAE,MAAM;YACb,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;aAChD;YAED,IAAM,QAAQ,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAA;YAE3C,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,iCAA0B,MAAM,CAAE,CAAC,CAAA;aACpD;YAED,OAAO,UAAO,cAA+B,EAAE,IAAa;;;gCAAK,WAAM,OAAO,CAAC,IAAI,CACjF,IAAI,aAEF,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,MAAM,IAC1E,cAAc,GAEnB,IAAI,CACL,EAAA;gCARgE,WAAA,SAQhE,EAAA;;;iBAAA,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAxBD,4CAwBC;AAED,SAAgB,YAAY,CAAC,MAK5B;IALD,iBAoBC;IAdC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;QACpC,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;YAAE,KAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,OAAO,IAAI,KAAK,CACd,EAAE,EACF;QACE,GAAG,EAAE,UAAC,CAAC,EAAE,OAAO;YACd,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC/B,OAAO,gBAAgB,CAAC,IAAI,CAAC,KAAI,EAAE,OAAO,CAAC,CAAA;aAC5C;QACH,CAAC;KACF,CACF,CAAA;AACH,CAAC;AApBD,oCAoBC","sourcesContent":["import { ERRORS } from '@cloudbase/utilities/dist/cjs/constants'\nimport { ICallApiOptions, KV } from '@cloudbase/types'\nimport { ResponseObject, SDKRequestInterface } from '@cloudbase/adapter-interface'\n\nexport async function callApi(callApiOptions: ICallApiOptions, opts?: KV<any>): Promise<ResponseObject['data']> {\n  const { name, body, path = '', method = 'POST', headers = {} } = callApiOptions || {}\n  const { token } = callApiOptions || {}\n\n  if (!name) {\n    throw new Error(JSON.stringify({\n      code: ERRORS.INVALID_PARAMS,\n      msg: '[apis] invalid api name',\n    }),)\n  }\n\n  let url = ''\n\n  const { gatewayOrigin, getAccessToken, env } = this\n\n  if (gatewayOrigin) {\n    url = `${gatewayOrigin}/v1`\n  } else if (this.getEndPointWithKey) {\n    const { BASE_URL, PROTOCOL } = this.getEndPointWithKey('GATEWAY')\n    url = `${PROTOCOL}${BASE_URL}`\n  } else {\n    url = `https://${env}.api.tcloudbasegateway.com/v1`\n  }\n  const endpoint = `${url}/apis/${name}`\n  let reqPath = path.startsWith('/') ? path : `/${path}`\n\n  if (getAccessToken) {\n    const { accessToken } = await getAccessToken()\n    headers.Authorization = `Bearer ${accessToken}`\n  }\n\n  const isGetAndHead = ['GET', 'HEAD'].includes(method?.toUpperCase?.())\n\n  if (isGetAndHead) {\n    try {\n      let dataParse = {}\n      try {\n        dataParse = JSON.parse(body as any)\n      } catch (error) {\n        dataParse = body || {}\n      }\n      reqPath = `${reqPath}${reqPath.includes('?') ? '&' : '?'}${Object.keys(dataParse)\n        .map(key => `${key}=${dataParse[key]}`)\n        .join('&')}`\n    } catch (error) {\n      //\n    }\n  }\n\n  const response = await this.request.fetch({\n    url: `${endpoint}${reqPath}`,\n    method: method || 'POST',\n    headers: {\n      'Content-Type': 'application/json; charset=utf-8',\n      ...headers,\n    },\n    // Request with GET/HEAD method cannot have body\n    ...(isGetAndHead ? {} : { body }),\n    token: token?.trim?.() || headers.Authorization?.replace?.(/^Bearer /, '') || null,\n    ...opts,\n  })\n\n  return await response.data\n}\n\nconst SUPPORT_METHODS = ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'PATCH', 'REQUEST']\ndeclare type MethodType = 'request' | 'post' | 'get' | 'head' | 'patch' | 'delete' | 'put'\n\nexport function generateCallApis(apiName: string): { [method in MethodType]: typeof callApi } {\n  return new Proxy({} as any, {\n    get: (_, method) => {\n      if (typeof method !== 'string') {\n        throw new Error('[apis] method must be string')\n      }\n\n      const upMethod = method.toLocaleUpperCase()\n\n      if (!SUPPORT_METHODS.includes(upMethod)) {\n        throw new Error(`[apis] invalid method: ${method}`)\n      }\n\n      return async (callApiOptions: ICallApiOptions, opts: KV<any>) => await callApi.call(\n        this,\n        {\n          name: apiName,\n          method: (upMethod === 'REQUEST' ? callApiOptions.method : upMethod) || 'POST',\n          ...callApiOptions,\n        },\n        opts,\n      )\n    },\n  })\n}\n\nexport function generateApis(params?: {\n  env?: string\n  request?: SDKRequestInterface\n  gatewayOrigin?: string\n  getAccessToken?: () => Promise<{ accessToken: string }>\n}): { [apiName: string]: { [method in MethodType]: typeof callApi } } {\n  Object.keys(params || {}).forEach((key) => {\n    if (params[key] !== undefined) this[key] = params[key]\n  })\n\n  return new Proxy(\n    {},\n    {\n      get: (_, apiName) => {\n        if (typeof apiName === 'string') {\n          return generateCallApis.call(this, apiName)\n        }\n      },\n    },\n  )\n}\n"]}
|
package/dist/esm/callApis.js
CHANGED
|
@@ -49,7 +49,7 @@ import { ERRORS } from '@cloudbase/utilities/dist/cjs/constants';
|
|
|
49
49
|
export function callApi(callApiOptions, opts) {
|
|
50
50
|
var _a, _b, _c, _d;
|
|
51
51
|
return __awaiter(this, void 0, void 0, function () {
|
|
52
|
-
var _e, name, body, _f, path, _g, method, _h, headers, token, url, _j, gatewayOrigin, getAccessToken, env, _k, BASE_URL, PROTOCOL, endpoint, reqPath, accessToken, response;
|
|
52
|
+
var _e, name, body, _f, path, _g, method, _h, headers, token, url, _j, gatewayOrigin, getAccessToken, env, _k, BASE_URL, PROTOCOL, endpoint, reqPath, accessToken, isGetAndHead, dataParse_1, response;
|
|
53
53
|
return __generator(this, function (_l) {
|
|
54
54
|
switch (_l.label) {
|
|
55
55
|
case 0:
|
|
@@ -81,7 +81,25 @@ export function callApi(callApiOptions, opts) {
|
|
|
81
81
|
accessToken = (_l.sent()).accessToken;
|
|
82
82
|
headers.Authorization = "Bearer ".concat(accessToken);
|
|
83
83
|
_l.label = 2;
|
|
84
|
-
case 2:
|
|
84
|
+
case 2:
|
|
85
|
+
isGetAndHead = ['GET', 'HEAD'].includes((_a = method === null || method === void 0 ? void 0 : method.toUpperCase) === null || _a === void 0 ? void 0 : _a.call(method));
|
|
86
|
+
if (isGetAndHead) {
|
|
87
|
+
try {
|
|
88
|
+
dataParse_1 = {};
|
|
89
|
+
try {
|
|
90
|
+
dataParse_1 = JSON.parse(body);
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
dataParse_1 = body || {};
|
|
94
|
+
}
|
|
95
|
+
reqPath = "".concat(reqPath).concat(reqPath.includes('?') ? '&' : '?').concat(Object.keys(dataParse_1)
|
|
96
|
+
.map(function (key) { return "".concat(key, "=").concat(dataParse_1[key]); })
|
|
97
|
+
.join('&'));
|
|
98
|
+
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return [4, this.request.fetch(__assign(__assign(__assign({ url: "".concat(endpoint).concat(reqPath), method: method || 'POST', headers: __assign({ 'Content-Type': 'application/json; charset=utf-8' }, headers) }, (isGetAndHead ? {} : { body: body })), { token: ((_b = token === null || token === void 0 ? void 0 : token.trim) === null || _b === void 0 ? void 0 : _b.call(token)) || ((_d = (_c = headers.Authorization) === null || _c === void 0 ? void 0 : _c.replace) === null || _d === void 0 ? void 0 : _d.call(_c, /^Bearer /, '')) || null }), opts))];
|
|
85
103
|
case 3:
|
|
86
104
|
response = _l.sent();
|
|
87
105
|
return [4, response.data];
|
|
@@ -127,4 +145,4 @@ export function generateApis(params) {
|
|
|
127
145
|
},
|
|
128
146
|
});
|
|
129
147
|
}
|
|
130
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
148
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"callApis.js","sourceRoot":"","sources":["../../src/callApis.ts"],"names":[],"mappings":"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","sourcesContent":["import { ERRORS } from '@cloudbase/utilities/dist/cjs/constants'\nimport { ICallApiOptions, KV } from '@cloudbase/types'\nimport { ResponseObject, SDKRequestInterface } from '@cloudbase/adapter-interface'\n\nexport async function callApi(callApiOptions: ICallApiOptions, opts?: KV<any>): Promise<ResponseObject['data']> {\n  const { name, body, path = '', method = 'POST', headers = {} } = callApiOptions || {}\n  const { token } = callApiOptions || {}\n\n  if (!name) {\n    throw new Error(JSON.stringify({\n      code: ERRORS.INVALID_PARAMS,\n      msg: '[apis] invalid api name',\n    }),)\n  }\n\n  let url = ''\n\n  const { gatewayOrigin, getAccessToken, env } = this\n\n  if (gatewayOrigin) {\n    url = `${gatewayOrigin}/v1`\n  } else if (this.getEndPointWithKey) {\n    const { BASE_URL, PROTOCOL } = this.getEndPointWithKey('GATEWAY')\n    url = `${PROTOCOL}${BASE_URL}`\n  } else {\n    url = `https://${env}.api.tcloudbasegateway.com/v1`\n  }\n  const endpoint = `${url}/apis/${name}`\n  let reqPath = path.startsWith('/') ? path : `/${path}`\n\n  if (getAccessToken) {\n    const { accessToken } = await getAccessToken()\n    headers.Authorization = `Bearer ${accessToken}`\n  }\n\n  const isGetAndHead = ['GET', 'HEAD'].includes(method?.toUpperCase?.())\n\n  if (isGetAndHead) {\n    try {\n      let dataParse = {}\n      try {\n        dataParse = JSON.parse(body as any)\n      } catch (error) {\n        dataParse = body || {}\n      }\n      reqPath = `${reqPath}${reqPath.includes('?') ? '&' : '?'}${Object.keys(dataParse)\n        .map(key => `${key}=${dataParse[key]}`)\n        .join('&')}`\n    } catch (error) {\n      //\n    }\n  }\n\n  const response = await this.request.fetch({\n    url: `${endpoint}${reqPath}`,\n    method: method || 'POST',\n    headers: {\n      'Content-Type': 'application/json; charset=utf-8',\n      ...headers,\n    },\n    // Request with GET/HEAD method cannot have body\n    ...(isGetAndHead ? {} : { body }),\n    token: token?.trim?.() || headers.Authorization?.replace?.(/^Bearer /, '') || null,\n    ...opts,\n  })\n\n  return await response.data\n}\n\nconst SUPPORT_METHODS = ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'PATCH', 'REQUEST']\ndeclare type MethodType = 'request' | 'post' | 'get' | 'head' | 'patch' | 'delete' | 'put'\n\nexport function generateCallApis(apiName: string): { [method in MethodType]: typeof callApi } {\n  return new Proxy({} as any, {\n    get: (_, method) => {\n      if (typeof method !== 'string') {\n        throw new Error('[apis] method must be string')\n      }\n\n      const upMethod = method.toLocaleUpperCase()\n\n      if (!SUPPORT_METHODS.includes(upMethod)) {\n        throw new Error(`[apis] invalid method: ${method}`)\n      }\n\n      return async (callApiOptions: ICallApiOptions, opts: KV<any>) => await callApi.call(\n        this,\n        {\n          name: apiName,\n          method: (upMethod === 'REQUEST' ? callApiOptions.method : upMethod) || 'POST',\n          ...callApiOptions,\n        },\n        opts,\n      )\n    },\n  })\n}\n\nexport function generateApis(params?: {\n  env?: string\n  request?: SDKRequestInterface\n  gatewayOrigin?: string\n  getAccessToken?: () => Promise<{ accessToken: string }>\n}): { [apiName: string]: { [method in MethodType]: typeof callApi } } {\n  Object.keys(params || {}).forEach((key) => {\n    if (params[key] !== undefined) this[key] = params[key]\n  })\n\n  return new Proxy(\n    {},\n    {\n      get: (_, apiName) => {\n        if (typeof apiName === 'string') {\n          return generateCallApis.call(this, apiName)\n        }\n      },\n    },\n  )\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
!function(e
|
|
1
|
+
!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define("tcbauth",[],e):"object"==typeof exports?exports.tcbauth=e():t.tcbauth=e()}("undefined"!=typeof window?window:this,()=>(()=>{"use strict";var t={946:(t,e)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.COMMUNITY_SITE_URL=e.IS_DEBUG_MODE=e.getProtocol=e.setProtocol=e.getSdkName=e.setSdkName=void 0;var n="@cloudbase/js-sdk";e.setSdkName=function(t){n=t},e.getSdkName=function(){return n};var o="https:";e.setProtocol=function(t){o=t},e.getProtocol=function(){return o},e.IS_DEBUG_MODE=("undefined"==typeof process||process.env,!1),e.COMMUNITY_SITE_URL="https://support.qq.com/products/148793"},205:(t,e)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.ERRORS=void 0,e.ERRORS={INVALID_PARAMS:"INVALID_PARAMS",INVALID_SYNTAX:"INVALID_SYNTAX",INVALID_OPERATION:"INVALID_OPERATION",OPERATION_FAIL:"OPERATION_FAIL",NETWORK_ERROR:"NETWORK_ERROR",UNKOWN_ERROR:"UNKOWN_ERROR"}},794:function(t,e,n){var o=this&&this.__createBinding||(Object.create?function(t,e,n,o){void 0===o&&(o=n);var r=Object.getOwnPropertyDescriptor(e,n);r&&!("get"in r?!e.__esModule:r.writable||r.configurable)||(r={enumerable:!0,get:function(){return e[n]}}),Object.defineProperty(t,o,r)}:function(t,e,n,o){void 0===o&&(o=n),t[o]=e[n]}),r=this&&this.__exportStar||function(t,e){for(var n in t)"default"===n||Object.prototype.hasOwnProperty.call(e,n)||o(e,t,n)};Object.defineProperty(e,"__esModule",{value:!0}),e.OATUH_LOGINTYPE=void 0,r(n(946),e),r(n(205),e),e.OATUH_LOGINTYPE="constants"}},e={};function n(o){var r=e[o];if(void 0!==r)return r.exports;var i=e[o]={exports:{}};return t[o].call(i.exports,i,i.exports,n),i.exports}n.d=(t,e)=>{for(var o in e)n.o(e,o)&&!n.o(t,o)&&Object.defineProperty(t,o,{enumerable:!0,get:e[o]})},n.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),n.r=t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})};var o={};return(()=>{n.r(o),n.d(o,{generateApis:()=>s,registerApis:()=>f});var t=n(794),e=function(){return(e=Object.assign||function(t){for(var e,n=1,o=arguments.length;n<o;n++)for(var r in e=arguments[n])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t}).apply(this,arguments)},r=function(t,e,n,o){return new(n||(n=Promise))((function(r,i){function c(t){try{u(o.next(t))}catch(t){i(t)}}function a(t){try{u(o.throw(t))}catch(t){i(t)}}function u(t){var e;t.done?r(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(c,a)}u((o=o.apply(t,e||[])).next())}))},i=function(t,e){var n,o,r,i,c={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(a){return function(u){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i&&(i=0,a[0]&&(c=0)),c;)try{if(n=1,o&&(r=2&a[0]?o.return:a[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,a[1])).done)return r;switch(o=0,r&&(a=[2&a[0],r.value]),a[0]){case 0:case 1:r=a;break;case 4:return c.label++,{value:a[1],done:!1};case 5:c.label++,o=a[1],a=[0];continue;case 7:a=c.ops.pop(),c.trys.pop();continue;default:if(!(r=c.trys,(r=r.length>0&&r[r.length-1])||6!==a[0]&&2!==a[0])){c=0;continue}if(3===a[0]&&(!r||a[1]>r[0]&&a[1]<r[3])){c.label=a[1];break}if(6===a[0]&&c.label<r[1]){c.label=r[1],r=a;break}if(r&&c.label<r[2]){c.label=r[2],c.ops.push(a);break}r[2]&&c.ops.pop(),c.trys.pop();continue}a=e.call(t,c)}catch(t){a=[6,t],o=0}finally{n=r=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}};function c(n,o){var c,a,u,s;return r(this,void 0,void 0,(function(){var r,l,f,d,p,h,v,y,O,b,E,g,P,_,R,T,A,m,w,S,I,N,j;return i(this,(function(i){switch(i.label){case 0:if(l=(r=n||{}).name,f=r.body,d=r.path,p=void 0===d?"":d,h=r.method,v=void 0===h?"POST":h,y=r.headers,O=void 0===y?{}:y,b=(n||{}).token,!l)throw new Error(JSON.stringify({code:t.ERRORS.INVALID_PARAMS,msg:"[apis] invalid api name"}));return E="",P=(g=this).gatewayOrigin,_=g.getAccessToken,R=g.env,P?E="".concat(P,"/v1"):this.getEndPointWithKey?(T=this.getEndPointWithKey("GATEWAY"),A=T.BASE_URL,m=T.PROTOCOL,E="".concat(m).concat(A)):E="https://".concat(R,".api.tcloudbasegateway.com/v1"),w="".concat(E,"/apis/").concat(l),S=p.startsWith("/")?p:"/".concat(p),_?[4,_()]:[3,2];case 1:I=i.sent().accessToken,O.Authorization="Bearer ".concat(I),i.label=2;case 2:if(N=["GET","HEAD"].includes(null===(c=null==v?void 0:v.toUpperCase)||void 0===c?void 0:c.call(v)))try{j={};try{j=JSON.parse(f)}catch(t){j=f||{}}S="".concat(S).concat(S.includes("?")?"&":"?").concat(Object.keys(j).map((function(t){return"".concat(t,"=").concat(j[t])})).join("&"))}catch(t){}return[4,this.request.fetch(e(e(e({url:"".concat(w).concat(S),method:v||"POST",headers:e({"Content-Type":"application/json; charset=utf-8"},O)},N?{}:{body:f}),{token:(null===(a=null==b?void 0:b.trim)||void 0===a?void 0:a.call(b))||(null===(s=null===(u=O.Authorization)||void 0===u?void 0:u.replace)||void 0===s?void 0:s.call(u,/^Bearer /,""))||null}),o))];case 3:return[4,i.sent().data];case 4:return[2,i.sent()]}}))}))}var a=["GET","POST","PUT","DELETE","HEAD","OPTIONS","PATCH","REQUEST"];function u(t){var n=this;return new Proxy({},{get:function(o,u){if("string"!=typeof u)throw new Error("[apis] method must be string");var s=u.toLocaleUpperCase();if(!a.includes(s))throw new Error("[apis] invalid method: ".concat(u));return function(o,a){return r(n,void 0,void 0,(function(){return i(this,(function(n){switch(n.label){case 0:return[4,c.call(this,e({name:t,method:("REQUEST"===s?o.method:s)||"POST"},o),a)];case 1:return[2,n.sent()]}}))}))}}})}function s(t){var e=this;return Object.keys(t||{}).forEach((function(n){void 0!==t[n]&&(e[n]=t[n])})),new Proxy({},{get:function(t,n){if("string"==typeof n)return u.call(e,n)}})}var l={name:"apis",IIFE:!0,entity:function(){Object.defineProperty(this.prototype,"apis",{get:function(){return s.call(this)},configurable:!0,enumerable:!0})}};function f(t){try{t.registerComponent(l)}catch(t){console.warn(t)}}try{cloudbase.registerComponent(l)}catch(t){}try{window.registerApis=f}catch(t){}})(),o})());
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudbase/apis",
|
|
3
|
-
"version": "2.25.
|
|
3
|
+
"version": "2.25.4",
|
|
4
4
|
"description": "cloudbase js sdk apis module",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"author": "",
|
|
31
31
|
"license": "Apache-2.0",
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@cloudbase/types": "2.25.
|
|
34
|
-
"@cloudbase/utilities": "2.25.
|
|
33
|
+
"@cloudbase/types": "2.25.4",
|
|
34
|
+
"@cloudbase/utilities": "2.25.4"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@cloudbase/adapter-interface": "^0.7.1"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "cb3b43f79a34d6216a45f065ab940c4225fe55d5"
|
|
40
40
|
}
|
package/src/callApis.ts
CHANGED
|
@@ -26,13 +26,31 @@ export async function callApi(callApiOptions: ICallApiOptions, opts?: KV<any>):
|
|
|
26
26
|
url = `https://${env}.api.tcloudbasegateway.com/v1`
|
|
27
27
|
}
|
|
28
28
|
const endpoint = `${url}/apis/${name}`
|
|
29
|
-
|
|
29
|
+
let reqPath = path.startsWith('/') ? path : `/${path}`
|
|
30
30
|
|
|
31
31
|
if (getAccessToken) {
|
|
32
|
-
const { accessToken } =
|
|
32
|
+
const { accessToken } = await getAccessToken()
|
|
33
33
|
headers.Authorization = `Bearer ${accessToken}`
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
+
const isGetAndHead = ['GET', 'HEAD'].includes(method?.toUpperCase?.())
|
|
37
|
+
|
|
38
|
+
if (isGetAndHead) {
|
|
39
|
+
try {
|
|
40
|
+
let dataParse = {}
|
|
41
|
+
try {
|
|
42
|
+
dataParse = JSON.parse(body as any)
|
|
43
|
+
} catch (error) {
|
|
44
|
+
dataParse = body || {}
|
|
45
|
+
}
|
|
46
|
+
reqPath = `${reqPath}${reqPath.includes('?') ? '&' : '?'}${Object.keys(dataParse)
|
|
47
|
+
.map(key => `${key}=${dataParse[key]}`)
|
|
48
|
+
.join('&')}`
|
|
49
|
+
} catch (error) {
|
|
50
|
+
//
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
36
54
|
const response = await this.request.fetch({
|
|
37
55
|
url: `${endpoint}${reqPath}`,
|
|
38
56
|
method: method || 'POST',
|
|
@@ -41,7 +59,7 @@ export async function callApi(callApiOptions: ICallApiOptions, opts?: KV<any>):
|
|
|
41
59
|
...headers,
|
|
42
60
|
},
|
|
43
61
|
// Request with GET/HEAD method cannot have body
|
|
44
|
-
...(
|
|
62
|
+
...(isGetAndHead ? {} : { body }),
|
|
45
63
|
token: token?.trim?.() || headers.Authorization?.replace?.(/^Bearer /, '') || null,
|
|
46
64
|
...opts,
|
|
47
65
|
})
|
|
@@ -50,7 +68,7 @@ export async function callApi(callApiOptions: ICallApiOptions, opts?: KV<any>):
|
|
|
50
68
|
}
|
|
51
69
|
|
|
52
70
|
const SUPPORT_METHODS = ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'PATCH', 'REQUEST']
|
|
53
|
-
declare type MethodType = 'request' | 'post' | 'get' | 'head' | 'patch' | 'delete' | 'put'
|
|
71
|
+
declare type MethodType = 'request' | 'post' | 'get' | 'head' | 'patch' | 'delete' | 'put'
|
|
54
72
|
|
|
55
73
|
export function generateCallApis(apiName: string): { [method in MethodType]: typeof callApi } {
|
|
56
74
|
return new Proxy({} as any, {
|
|
@@ -79,10 +97,10 @@ export function generateCallApis(apiName: string): { [method in MethodType]: typ
|
|
|
79
97
|
}
|
|
80
98
|
|
|
81
99
|
export function generateApis(params?: {
|
|
82
|
-
env?: string
|
|
83
|
-
request?: SDKRequestInterface
|
|
84
|
-
gatewayOrigin?: string
|
|
85
|
-
getAccessToken?: () => Promise<{ accessToken: string }
|
|
100
|
+
env?: string
|
|
101
|
+
request?: SDKRequestInterface
|
|
102
|
+
gatewayOrigin?: string
|
|
103
|
+
getAccessToken?: () => Promise<{ accessToken: string }>
|
|
86
104
|
}): { [apiName: string]: { [method in MethodType]: typeof callApi } } {
|
|
87
105
|
Object.keys(params || {}).forEach((key) => {
|
|
88
106
|
if (params[key] !== undefined) this[key] = params[key]
|