@surfside/ads-core 2.0.19 → 2.0.20
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/lib/cjs/BuildInfo.js +1 -1
- package/lib/cjs/services/Geo.js +10 -3
- package/lib/cjs/services/Geo.js.map +1 -1
- package/lib/esm/BuildInfo.js +1 -1
- package/lib/esm/services/Geo.js +8 -2
- package/lib/esm/services/Geo.js.map +1 -1
- package/lib/types/models/tracking/Geo.d.ts +1 -0
- package/lib/types/services/Geo.d.ts +2 -0
- package/package.json +1 -1
package/lib/cjs/BuildInfo.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SurfsideAdsCoreVersionInfo = void 0;
|
|
4
|
-
exports.SurfsideAdsCoreVersionInfo = { buildBranch: 'master', buildHash: '
|
|
4
|
+
exports.SurfsideAdsCoreVersionInfo = { buildBranch: 'master', buildHash: 'd9742e8', buildVer: '2.0.20' };
|
|
5
5
|
//# sourceMappingURL=BuildInfo.js.map
|
package/lib/cjs/services/Geo.js
CHANGED
|
@@ -1,24 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.GeoContextToORTB = exports.GetGeo = void 0;
|
|
3
|
+
exports.GeoContextToORTB = exports.GeoServiceError = exports.GetGeo = void 0;
|
|
4
4
|
const Logger_1 = require("./Logger");
|
|
5
5
|
const Result_1 = require("./Result");
|
|
6
6
|
const SURF_GEO_SERVICE_URL = 'https://g.surfside.io/enrich';
|
|
7
7
|
const LOCATION_TYPE_IP = 2;
|
|
8
8
|
const IP_SERVICES_MAXMIND = 3;
|
|
9
9
|
const GetGeo = async (logger) => {
|
|
10
|
-
const log = (0, Logger_1.Ctx)(logger)?.with('
|
|
10
|
+
const log = (0, Logger_1.Ctx)(logger)?.with(' ');
|
|
11
11
|
log?.info('Getting Geo info');
|
|
12
12
|
try {
|
|
13
13
|
const response = await fetch(SURF_GEO_SERVICE_URL);
|
|
14
14
|
log?.debug('Geo Response', response);
|
|
15
|
-
|
|
15
|
+
const geo = await response.json();
|
|
16
|
+
if (geo.error !== undefined || geo.coords === undefined) {
|
|
17
|
+
return (0, Result_1.Err)(new GeoServiceError(`${geo.error}`));
|
|
18
|
+
}
|
|
19
|
+
return (0, Result_1.Ok)(geo);
|
|
16
20
|
}
|
|
17
21
|
catch (err) {
|
|
18
22
|
return (0, Result_1.Err)(err);
|
|
19
23
|
}
|
|
20
24
|
};
|
|
21
25
|
exports.GetGeo = GetGeo;
|
|
26
|
+
class GeoServiceError extends Error {
|
|
27
|
+
}
|
|
28
|
+
exports.GeoServiceError = GeoServiceError;
|
|
22
29
|
const GeoContextToORTB = (logger, geoContext) => ({
|
|
23
30
|
lat: geoContext.coords.latitude,
|
|
24
31
|
lon: geoContext.coords.longitude,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Geo.js","sourceRoot":"src/","sources":["services/Geo.ts"],"names":[],"mappings":";;;AACA,qCAA6C;AAC7C,qCAAqD;AAErD,MAAM,oBAAoB,GAAG,8BAA8B,CAAC;AAI5D,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAEvB,MAAM,MAAM,GAAG,KAAK,EAAE,MAAgB,EAA4B,EAAE;IACvE,MAAM,GAAG,GAAG,IAAA,YAAG,EAAC,MAAM,CAAC,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"Geo.js","sourceRoot":"src/","sources":["services/Geo.ts"],"names":[],"mappings":";;;AACA,qCAA6C;AAC7C,qCAAqD;AAErD,MAAM,oBAAoB,GAAG,8BAA8B,CAAC;AAI5D,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAEvB,MAAM,MAAM,GAAG,KAAK,EAAE,MAAgB,EAA4B,EAAE;IACvE,MAAM,GAAG,GAAG,IAAA,YAAG,EAAC,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACnC,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC9B,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACnD,GAAG,EAAE,KAAK,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACrC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAiB,CAAC;QACjD,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACtD,OAAO,IAAA,YAAG,EAAC,IAAI,eAAe,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,IAAA,WAAE,EAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,IAAA,YAAG,EAAC,GAAY,CAAC,CAAC;IAC7B,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,MAAM,UAcjB;AAEF,MAAa,eAAgB,SAAQ,KAAK;CAAI;AAA9C,0CAA8C;AAEvC,MAAM,gBAAgB,GAAG,CAAC,MAA2B,EAAE,UAAuB,EAAQ,EAAE,CAAC,CAAC;IAC7F,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ;IAC/B,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,SAAS;IAChC,IAAI,EAAE,UAAU,CAAC,IAAI;IACrB,MAAM,EAAE,UAAU,CAAC,MAAM;IACzB,OAAO,EAAE,UAAU,CAAC,OAAO;IAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;IACnB,IAAI,EAAE,gBAAgB;IACtB,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ;IACpC,SAAS,EAAE,UAAU,CAAC,SAAS;IAC/B,SAAS,EAAE,mBAAmB;CACjC,CAAC,CAAC;AAXU,QAAA,gBAAgB,oBAW1B"}
|
package/lib/esm/BuildInfo.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const SurfsideAdsCoreVersionInfo = { buildBranch: 'master', buildHash: '
|
|
1
|
+
export const SurfsideAdsCoreVersionInfo = { buildBranch: 'master', buildHash: 'd9742e8', buildVer: '2.0.20' };
|
|
2
2
|
//# sourceMappingURL=BuildInfo.js.map
|
package/lib/esm/services/Geo.js
CHANGED
|
@@ -4,17 +4,23 @@ const SURF_GEO_SERVICE_URL = 'https://g.surfside.io/enrich';
|
|
|
4
4
|
const LOCATION_TYPE_IP = 2;
|
|
5
5
|
const IP_SERVICES_MAXMIND = 3;
|
|
6
6
|
export const GetGeo = async (logger) => {
|
|
7
|
-
const log = Ctx(logger)?.with('
|
|
7
|
+
const log = Ctx(logger)?.with(' ');
|
|
8
8
|
log?.info('Getting Geo info');
|
|
9
9
|
try {
|
|
10
10
|
const response = await fetch(SURF_GEO_SERVICE_URL);
|
|
11
11
|
log?.debug('Geo Response', response);
|
|
12
|
-
|
|
12
|
+
const geo = await response.json();
|
|
13
|
+
if (geo.error !== undefined || geo.coords === undefined) {
|
|
14
|
+
return Err(new GeoServiceError(`${geo.error}`));
|
|
15
|
+
}
|
|
16
|
+
return Ok(geo);
|
|
13
17
|
}
|
|
14
18
|
catch (err) {
|
|
15
19
|
return Err(err);
|
|
16
20
|
}
|
|
17
21
|
};
|
|
22
|
+
export class GeoServiceError extends Error {
|
|
23
|
+
}
|
|
18
24
|
export const GeoContextToORTB = (logger, geoContext) => ({
|
|
19
25
|
lat: geoContext.coords.latitude,
|
|
20
26
|
lon: geoContext.coords.longitude,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Geo.js","sourceRoot":"src/","sources":["services/Geo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAgB,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,EAAE,EAAoB,MAAM,UAAU,CAAC;AAErD,MAAM,oBAAoB,GAAG,8BAA8B,CAAC;AAI5D,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAE,MAAgB,EAA4B,EAAE;IACvE,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"Geo.js","sourceRoot":"src/","sources":["services/Geo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAgB,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,EAAE,EAAoB,MAAM,UAAU,CAAC;AAErD,MAAM,oBAAoB,GAAG,8BAA8B,CAAC;AAI5D,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAE,MAAgB,EAA4B,EAAE;IACvE,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACnC,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC9B,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACnD,GAAG,EAAE,KAAK,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACrC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAiB,CAAC;QACjD,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACtD,OAAO,GAAG,CAAC,IAAI,eAAe,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,GAAG,CAAC,GAAY,CAAC,CAAC;IAC7B,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,OAAO,eAAgB,SAAQ,KAAK;CAAI;AAE9C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAA2B,EAAE,UAAuB,EAAQ,EAAE,CAAC,CAAC;IAC7F,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ;IAC/B,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,SAAS;IAChC,IAAI,EAAE,UAAU,CAAC,IAAI;IACrB,MAAM,EAAE,UAAU,CAAC,MAAM;IACzB,OAAO,EAAE,UAAU,CAAC,OAAO;IAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;IACnB,IAAI,EAAE,gBAAgB;IACtB,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ;IACpC,SAAS,EAAE,UAAU,CAAC,SAAS;IAC/B,SAAS,EAAE,mBAAmB;CACjC,CAAC,CAAC"}
|
|
@@ -3,4 +3,6 @@ import { type ILogger } from './Logger';
|
|
|
3
3
|
import { type AsyncResult } from './Result';
|
|
4
4
|
export type GetGeoFn = (ip?: string, geoProviderToken?: string) => AsyncResult<IGeoContext>;
|
|
5
5
|
export declare const GetGeo: (logger?: ILogger) => AsyncResult<IGeoContext>;
|
|
6
|
+
export declare class GeoServiceError extends Error {
|
|
7
|
+
}
|
|
6
8
|
export declare const GeoContextToORTB: (logger: ILogger | undefined, geoContext: IGeoContext) => IGeo;
|