@gaias/basenode 1.0.73 → 1.0.74

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.
Files changed (4) hide show
  1. package/dist/libs/apisix/ApisixTemplate.d.ts.map +1 -1
  2. package/dist/libs/apisix/ApisixTemplate.js +11 -1
  3. package/dist/libs/apisix/ApisixTemplate.js.map +1 -1
  4. package/package.json +1 -1
package/dist/libs/apisix/ApisixTemplate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ApisixTemplate.d.ts","sourceRoot":"","sources":["../../../../src/libs/apisix/ApisixTemplate.ts"],"names":[],"mappings":"AAiGA,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,KAAG,MAErD,CAAC;AA+BF,eAAO,MAAM,gBAAgB,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,MAAM,MAAM,KAAG,MAgDjF,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAC;AAgCF,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,EAAE,8BAA4B,KAAG,MAkC/E,CAAC;AAgBF,eAAO,MAAM,gBAAgB,GAAI,SAAS,MAAM,KAAG,MAElD,CAAC;AAuCF,eAAO,MAAM,aAAa,GACxB,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,YAAY,MAAM,EAClB,OAAO,MAAM,EACb,SAAS,MAAM,KACd,MAyBF,CAAC"}
1
+ {"version":3,"file":"ApisixTemplate.d.ts","sourceRoot":"","sources":["../../../../src/libs/apisix/ApisixTemplate.ts"],"names":[],"mappings":"AAiGA,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,KAAG,MAErD,CAAC;AA+BF,eAAO,MAAM,gBAAgB,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,MAAM,MAAM,KAAG,MAgDjF,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAC;AAgCF,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,EAAE,8BAA4B,KAAG,MAkC/E,CAAC;AAgBF,eAAO,MAAM,gBAAgB,GAAI,SAAS,MAAM,KAAG,MAElD,CAAC;AA+EF,eAAO,MAAM,aAAa,GACxB,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,YAAY,MAAM,EAClB,OAAO,MAAM,EACb,SAAS,MAAM,KACd,MA6BF,CAAC"}
package/dist/libs/apisix/ApisixTemplate.js CHANGED
@@ -114,11 +114,21 @@ const routeUriTemplate = (appName) => {
114
114
  return `${APISIX_CONFIG.ADMIN_BASE_PATH}/routes/${generateResourceId('route', appName)}`;
115
115
  };
116
116
  exports.routeUriTemplate = routeUriTemplate;
117
+ const convertWildcardDomains = (domains) => {
118
+ return domains.map((domain) => {
119
+ if (domain.startsWith('*.')) {
120
+ const baseDomain = domain.slice(2).replace(/\./g, '\\.');
121
+ return `~^.+\\.${baseDomain}$`;
122
+ }
123
+ return domain;
124
+ });
125
+ };
117
126
  const routeTemplate = (appName, domains, apiVersion, build, version) => {
127
+ const convertedDomains = convertWildcardDomains(domains);
118
128
  const config = {
119
129
  name: appName,
120
130
  uri: `/api/v${apiVersion}/${appName}/*`,
121
- hosts: domains,
131
+ hosts: convertedDomains,
122
132
  enable_websocket: true,
123
133
  service_id: generateResourceId('service', appName),
124
134
  labels: {
package/dist/libs/apisix/ApisixTemplate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ApisixTemplate.js","sourceRoot":"","sources":["../../../../src/libs/apisix/ApisixTemplate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ApisixTemplate.js","sourceRoot":"","sources":["../../../../src/libs/apisix/ApisixTemplate.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gaias/basenode",
3
- "version": "1.0.73",
3
+ "version": "1.0.74",
4
4
  "buildNumber": 251025471,
5
5
  "description": "API development framework for NodeJs",
6
6
  "author": "FOT",