googlemaps-kit 0.1.3 → 0.2.1
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/README.md +146 -179
- package/dist/advanced/auth.d.ts +10 -0
- package/dist/advanced/auth.d.ts.map +1 -0
- package/dist/advanced/auth.js +8 -0
- package/dist/advanced/auth.js.map +1 -0
- package/dist/advanced/http.d.ts +10 -0
- package/dist/advanced/http.d.ts.map +1 -0
- package/dist/advanced/http.js +9 -0
- package/dist/advanced/http.js.map +1 -0
- package/dist/advanced/parsers.d.ts +28 -0
- package/dist/advanced/parsers.d.ts.map +1 -0
- package/dist/advanced/parsers.js +25 -0
- package/dist/advanced/parsers.js.map +1 -0
- package/dist/advanced/rpc.d.ts +29 -0
- package/dist/advanced/rpc.d.ts.map +1 -0
- package/dist/advanced/rpc.js +23 -0
- package/dist/advanced/rpc.js.map +1 -0
- package/dist/advanced/services.d.ts +34 -0
- package/dist/advanced/services.d.ts.map +1 -0
- package/dist/advanced/services.js +29 -0
- package/dist/advanced/services.js.map +1 -0
- package/dist/advanced/utils.d.ts +15 -0
- package/dist/advanced/utils.d.ts.map +1 -0
- package/dist/advanced/utils.js +13 -0
- package/dist/advanced/utils.js.map +1 -0
- package/dist/advanced.d.ts +43 -0
- package/dist/advanced.d.ts.map +1 -0
- package/dist/advanced.js +26 -0
- package/dist/advanced.js.map +1 -0
- package/dist/auth/session.d.ts +6 -1
- package/dist/auth/session.d.ts.map +1 -1
- package/dist/auth/session.js +23 -8
- package/dist/auth/session.js.map +1 -1
- package/dist/cli.d.ts +11 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +115 -0
- package/dist/cli.js.map +1 -0
- package/dist/client/gmaps-client.d.ts +91 -52
- package/dist/client/gmaps-client.d.ts.map +1 -1
- package/dist/client/gmaps-client.js +209 -109
- package/dist/client/gmaps-client.js.map +1 -1
- package/dist/client/http-client.d.ts +28 -3
- package/dist/client/http-client.d.ts.map +1 -1
- package/dist/client/http-client.js +163 -14
- package/dist/client/http-client.js.map +1 -1
- package/dist/client/intent.d.ts +75 -0
- package/dist/client/intent.d.ts.map +1 -0
- package/dist/client/intent.js +546 -0
- package/dist/client/intent.js.map +1 -0
- package/dist/client/maps-tools.d.ts +80 -0
- package/dist/client/maps-tools.d.ts.map +1 -0
- package/dist/client/maps-tools.js +187 -0
- package/dist/client/maps-tools.js.map +1 -0
- package/dist/client/namespaces.d.ts +121 -0
- package/dist/client/namespaces.d.ts.map +1 -0
- package/dist/client/namespaces.js +169 -0
- package/dist/client/namespaces.js.map +1 -0
- package/dist/client/place-enrichment.d.ts +19 -0
- package/dist/client/place-enrichment.d.ts.map +1 -0
- package/dist/client/place-enrichment.js +71 -0
- package/dist/client/place-enrichment.js.map +1 -0
- package/dist/client/product-namespaces.d.ts +30 -0
- package/dist/client/product-namespaces.d.ts.map +1 -0
- package/dist/client/product-namespaces.js +47 -0
- package/dist/client/product-namespaces.js.map +1 -0
- package/dist/index.d.ts +31 -37
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +13 -28
- package/dist/index.js.map +1 -1
- package/dist/parsers/place.d.ts.map +1 -1
- package/dist/parsers/place.js +2 -0
- package/dist/parsers/place.js.map +1 -1
- package/dist/parsers/reviews.d.ts +0 -2
- package/dist/parsers/reviews.d.ts.map +1 -1
- package/dist/parsers/reviews.js +0 -2
- package/dist/parsers/reviews.js.map +1 -1
- package/dist/parsers/search.d.ts +13 -1
- package/dist/parsers/search.d.ts.map +1 -1
- package/dist/parsers/search.js +130 -71
- package/dist/parsers/search.js.map +1 -1
- package/dist/rpc/batch-execute.d.ts.map +1 -1
- package/dist/rpc/batch-execute.js +20 -3
- package/dist/rpc/batch-execute.js.map +1 -1
- package/dist/rpc/batch-rpc.d.ts.map +1 -1
- package/dist/rpc/batch-rpc.js +5 -6
- package/dist/rpc/batch-rpc.js.map +1 -1
- package/dist/rpc/batch-services.d.ts +2 -0
- package/dist/rpc/batch-services.d.ts.map +1 -1
- package/dist/rpc/batch-services.js +4 -0
- package/dist/rpc/batch-services.js.map +1 -1
- package/dist/rpc/pb-builders.d.ts +0 -2
- package/dist/rpc/pb-builders.d.ts.map +1 -1
- package/dist/rpc/pb-builders.js +2 -5
- package/dist/rpc/pb-builders.js.map +1 -1
- package/dist/rpc/rpc-client.d.ts +6 -2
- package/dist/rpc/rpc-client.d.ts.map +1 -1
- package/dist/rpc/rpc-client.js +26 -10
- package/dist/rpc/rpc-client.js.map +1 -1
- package/dist/rpc/rpc-methods.d.ts +0 -7
- package/dist/rpc/rpc-methods.d.ts.map +1 -1
- package/dist/rpc/rpc-methods.js +0 -7
- package/dist/rpc/rpc-methods.js.map +1 -1
- package/dist/services/ask-maps.js +1 -1
- package/dist/services/ask-maps.js.map +1 -1
- package/dist/services/directions.d.ts +3 -8
- package/dist/services/directions.d.ts.map +1 -1
- package/dist/services/directions.js +37 -13
- package/dist/services/directions.js.map +1 -1
- package/dist/services/geocode.js +1 -1
- package/dist/services/photos.d.ts.map +1 -1
- package/dist/services/photos.js +2 -5
- package/dist/services/photos.js.map +1 -1
- package/dist/services/places.d.ts.map +1 -1
- package/dist/services/places.js +13 -4
- package/dist/services/places.js.map +1 -1
- package/dist/services/reviews.d.ts +7 -0
- package/dist/services/reviews.d.ts.map +1 -1
- package/dist/services/reviews.js +10 -1
- package/dist/services/reviews.js.map +1 -1
- package/dist/services/search.d.ts +7 -5
- package/dist/services/search.d.ts.map +1 -1
- package/dist/services/search.js +46 -17
- package/dist/services/search.js.map +1 -1
- package/dist/services/ugc-aggregates.d.ts.map +1 -1
- package/dist/services/ugc-aggregates.js +1 -17
- package/dist/services/ugc-aggregates.js.map +1 -1
- package/dist/types/common.d.ts +92 -6
- package/dist/types/common.d.ts.map +1 -1
- package/dist/types/common.js +12 -0
- package/dist/types/common.js.map +1 -1
- package/dist/types/directions.d.ts +16 -2
- package/dist/types/directions.d.ts.map +1 -1
- package/dist/types/dx.d.ts +289 -0
- package/dist/types/dx.d.ts.map +1 -0
- package/dist/types/dx.js +7 -0
- package/dist/types/dx.js.map +1 -0
- package/dist/types/hooks.d.ts +48 -0
- package/dist/types/hooks.d.ts.map +1 -0
- package/dist/types/hooks.js +5 -0
- package/dist/types/hooks.js.map +1 -0
- package/dist/utils/abort.d.ts +7 -0
- package/dist/utils/abort.d.ts.map +1 -0
- package/dist/utils/abort.js +43 -0
- package/dist/utils/abort.js.map +1 -0
- package/dist/utils/coords.d.ts +24 -0
- package/dist/utils/coords.d.ts.map +1 -0
- package/dist/utils/coords.js +37 -0
- package/dist/utils/coords.js.map +1 -0
- package/dist/utils/export-results.d.ts +24 -0
- package/dist/utils/export-results.d.ts.map +1 -0
- package/dist/utils/export-results.js +105 -0
- package/dist/utils/export-results.js.map +1 -0
- package/dist/utils/hooks.d.ts +10 -0
- package/dist/utils/hooks.d.ts.map +1 -0
- package/dist/utils/hooks.js +47 -0
- package/dist/utils/hooks.js.map +1 -0
- package/dist/utils/place-ref.d.ts +39 -0
- package/dist/utils/place-ref.d.ts.map +1 -0
- package/dist/utils/place-ref.js +109 -0
- package/dist/utils/place-ref.js.map +1 -0
- package/dist/utils/pooled.d.ts +2 -0
- package/dist/utils/pooled.d.ts.map +1 -1
- package/dist/utils/pooled.js +8 -0
- package/dist/utils/pooled.js.map +1 -1
- package/dist/utils/request-context.d.ts +9 -0
- package/dist/utils/request-context.d.ts.map +1 -0
- package/dist/utils/request-context.js +12 -0
- package/dist/utils/request-context.js.map +1 -0
- package/dist/utils/ttl-cache.d.ts +17 -0
- package/dist/utils/ttl-cache.d.ts.map +1 -0
- package/dist/utils/ttl-cache.js +43 -0
- package/dist/utils/ttl-cache.js.map +1 -0
- package/package.json +28 -13
- package/dist/internal.d.ts +0 -140
- package/dist/internal.d.ts.map +0 -1
- package/dist/internal.js +0 -97
- package/dist/internal.js.map +0 -1
- package/dist/server/api-server.d.ts +0 -9
- package/dist/server/api-server.d.ts.map +0 -1
- package/dist/server/api-server.js +0 -293
- package/dist/server/api-server.js.map +0 -1
package/dist/parsers/search.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { asPlaceDataNode, asSearchRoot } from '../types/protobuf.js';
|
|
2
|
+
import { applyCoordAliases } from '../utils/coords.js';
|
|
2
3
|
import { safeGet } from '../utils/safe-get.js';
|
|
3
4
|
import { extractAttributeGroups, extractOpeningSchedule, } from './place-attributes.js';
|
|
4
5
|
import { parsePhone, parseReviewCountFromBlock, parseWebsiteFromContact, parseOpenStatus, parsePriceLevel, } from './shared.js';
|
|
@@ -27,7 +28,24 @@ function parseInternationalPhone(placeData) {
|
|
|
27
28
|
}
|
|
28
29
|
return parsePhone(placeData);
|
|
29
30
|
}
|
|
30
|
-
function
|
|
31
|
+
function resolvePlaceDataFromWrapper(entry) {
|
|
32
|
+
if (!Array.isArray(entry))
|
|
33
|
+
return null;
|
|
34
|
+
const candidates = [
|
|
35
|
+
entry[14],
|
|
36
|
+
entry[1],
|
|
37
|
+
safeGet(entry, 1, 14),
|
|
38
|
+
safeGet(entry, 1, 1, 14),
|
|
39
|
+
];
|
|
40
|
+
for (const candidate of candidates) {
|
|
41
|
+
const biz = asPlaceDataNode(candidate);
|
|
42
|
+
const name = biz ? safeGet(biz, 11) : undefined;
|
|
43
|
+
if (biz && typeof name === 'string' && name.length > 2)
|
|
44
|
+
return biz;
|
|
45
|
+
}
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
48
|
+
function extractSingleBusiness(bizData, options) {
|
|
31
49
|
if (!Array.isArray(bizData) || bizData.length < 12)
|
|
32
50
|
return null;
|
|
33
51
|
const name = safeGet(bizData, 11);
|
|
@@ -37,7 +55,8 @@ function extractSingleBusiness(bizData) {
|
|
|
37
55
|
return null;
|
|
38
56
|
if (/^[A-Za-z0-9+/=]+$/.test(name))
|
|
39
57
|
return null;
|
|
40
|
-
const
|
|
58
|
+
const lite = options?.lite === true;
|
|
59
|
+
const business = applyCoordAliases({
|
|
41
60
|
name,
|
|
42
61
|
address: safeGet(bizData, 18),
|
|
43
62
|
placeId: safeGet(bizData, 78),
|
|
@@ -47,18 +66,16 @@ function extractSingleBusiness(bizData) {
|
|
|
47
66
|
reviewCount: parseReviewCountFromBlock(bizData[4]),
|
|
48
67
|
latitude: safeGet(bizData, 9, 2),
|
|
49
68
|
longitude: safeGet(bizData, 9, 3),
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
// (4 unique ids across 20 rows), so they are deliberately ignored here.
|
|
69
|
+
});
|
|
70
|
+
if (!lite) {
|
|
71
|
+
business.phone = parsePhone(bizData);
|
|
72
|
+
business.internationalPhone = parseInternationalPhone(bizData);
|
|
73
|
+
business.website = parseWebsiteFromContact(bizData[7]);
|
|
74
|
+
business.timezone = safeGet(bizData, 30);
|
|
75
|
+
}
|
|
58
76
|
const thumbnailUrl = safeGet(bizData, 157);
|
|
59
77
|
if (typeof thumbnailUrl === 'string' && thumbnailUrl.startsWith('http')) {
|
|
60
78
|
business.thumbnailUrl = thumbnailUrl;
|
|
61
|
-
// Official Text Search `places.photos` is typically one (or a few) refs — same idea.
|
|
62
79
|
business.photos = [thumbnailUrl];
|
|
63
80
|
}
|
|
64
81
|
const categories = safeGet(bizData, 13);
|
|
@@ -73,24 +90,51 @@ function extractSingleBusiness(bizData) {
|
|
|
73
90
|
if (Array.isArray(ratingBlock)) {
|
|
74
91
|
business.priceLevel = parsePriceLevel(ratingBlock);
|
|
75
92
|
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
93
|
+
if (!lite) {
|
|
94
|
+
const hoursRoot = bizData[203];
|
|
95
|
+
if (Array.isArray(hoursRoot)) {
|
|
96
|
+
business.openStatus = parseOpenStatus(hoursRoot);
|
|
97
|
+
if (business.openStatus) {
|
|
98
|
+
business.isOpenNow = /^open\b/i.test(business.openStatus.trim());
|
|
99
|
+
}
|
|
100
|
+
const schedule = extractOpeningSchedule(bizData);
|
|
101
|
+
if (schedule)
|
|
102
|
+
business.openingSchedule = schedule;
|
|
84
103
|
}
|
|
85
|
-
const
|
|
86
|
-
if (
|
|
87
|
-
business.
|
|
104
|
+
const attributeGroups = extractAttributeGroups(bizData);
|
|
105
|
+
if (attributeGroups.length > 0)
|
|
106
|
+
business.attributeGroups = attributeGroups;
|
|
88
107
|
}
|
|
89
|
-
const attributeGroups = extractAttributeGroups(bizData);
|
|
90
|
-
if (attributeGroups.length > 0)
|
|
91
|
-
business.attributeGroups = attributeGroups;
|
|
92
108
|
return business;
|
|
93
109
|
}
|
|
110
|
+
function collectPrimaryWrappers(root) {
|
|
111
|
+
const wrappers = [];
|
|
112
|
+
const seen = new Set();
|
|
113
|
+
const push = (entry) => {
|
|
114
|
+
if (!Array.isArray(entry) || !resolvePlaceDataFromWrapper(entry))
|
|
115
|
+
return;
|
|
116
|
+
if (seen.has(entry))
|
|
117
|
+
return;
|
|
118
|
+
seen.add(entry);
|
|
119
|
+
wrappers.push(entry);
|
|
120
|
+
};
|
|
121
|
+
const primary = root[0];
|
|
122
|
+
if (Array.isArray(primary)) {
|
|
123
|
+
const nested = primary[1];
|
|
124
|
+
if (Array.isArray(nested)) {
|
|
125
|
+
for (const entry of nested)
|
|
126
|
+
push(entry);
|
|
127
|
+
}
|
|
128
|
+
for (const entry of primary)
|
|
129
|
+
push(entry);
|
|
130
|
+
}
|
|
131
|
+
const organicSection = root[64];
|
|
132
|
+
if (Array.isArray(organicSection)) {
|
|
133
|
+
for (const entry of organicSection)
|
|
134
|
+
push(entry);
|
|
135
|
+
}
|
|
136
|
+
return wrappers;
|
|
137
|
+
}
|
|
94
138
|
function findBusinessArrays(obj, depth = 0, maxDepth = 10) {
|
|
95
139
|
const found = [];
|
|
96
140
|
if (depth > maxDepth)
|
|
@@ -122,63 +166,78 @@ function searchAllIndices(data) {
|
|
|
122
166
|
}
|
|
123
167
|
return found;
|
|
124
168
|
}
|
|
125
|
-
|
|
126
|
-
|
|
169
|
+
function extractAds(root) {
|
|
170
|
+
const businesses = [];
|
|
171
|
+
const adsEntries = safeGet(root, 2, 11, 0) ?? [];
|
|
172
|
+
if (!Array.isArray(adsEntries))
|
|
173
|
+
return businesses;
|
|
174
|
+
for (const ad of adsEntries) {
|
|
175
|
+
if (!Array.isArray(ad) || ad.length < 3)
|
|
176
|
+
continue;
|
|
177
|
+
const adName = safeGet(ad, 1);
|
|
178
|
+
if (!adName)
|
|
179
|
+
continue;
|
|
180
|
+
const business = applyCoordAliases({
|
|
181
|
+
name: adName,
|
|
182
|
+
placeId: safeGet(ad, 0),
|
|
183
|
+
latitude: safeGet(ad, 2, 0, 2),
|
|
184
|
+
longitude: safeGet(ad, 2, 0, 3),
|
|
185
|
+
rating: safeGet(ad, 2, 6),
|
|
186
|
+
isAd: true,
|
|
187
|
+
});
|
|
188
|
+
const websiteUrl = safeGet(ad, 3, 1);
|
|
189
|
+
if (websiteUrl && !websiteUrl.startsWith('https://www.google.com')) {
|
|
190
|
+
business.website = websiteUrl;
|
|
191
|
+
}
|
|
192
|
+
businesses.push(business);
|
|
193
|
+
}
|
|
194
|
+
return businesses;
|
|
195
|
+
}
|
|
196
|
+
function dedupeBusinesses(businesses) {
|
|
197
|
+
const seen = new Set();
|
|
198
|
+
return businesses.filter((biz) => {
|
|
199
|
+
const key = biz.placeId ?? biz.hexId ?? biz.name;
|
|
200
|
+
if (!key || seen.has(key))
|
|
201
|
+
return false;
|
|
202
|
+
seen.add(key);
|
|
203
|
+
return true;
|
|
204
|
+
});
|
|
205
|
+
}
|
|
206
|
+
function extractFromWrappers(wrappers, options) {
|
|
127
207
|
const businesses = [];
|
|
208
|
+
for (const entry of wrappers) {
|
|
209
|
+
const bizData = resolvePlaceDataFromWrapper(entry);
|
|
210
|
+
if (!bizData)
|
|
211
|
+
continue;
|
|
212
|
+
const business = extractSingleBusiness(bizData, options);
|
|
213
|
+
if (business?.name)
|
|
214
|
+
businesses.push(business);
|
|
215
|
+
}
|
|
216
|
+
return businesses;
|
|
217
|
+
}
|
|
218
|
+
/** Extract businesses from `search?tbm=map` protobuf-over-JSON response. */
|
|
219
|
+
export function extractBusinesses(data, options) {
|
|
128
220
|
try {
|
|
129
221
|
const root = asSearchRoot(data);
|
|
130
222
|
if (!root)
|
|
131
223
|
return [];
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
if (business?.name)
|
|
137
|
-
businesses.push(business);
|
|
138
|
-
}
|
|
224
|
+
const useFastPath = options?.fastPath !== false;
|
|
225
|
+
let businesses = [];
|
|
226
|
+
if (useFastPath) {
|
|
227
|
+
businesses = extractFromWrappers(collectPrimaryWrappers(root), options);
|
|
139
228
|
}
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
const business = extractSingleBusiness(bizData);
|
|
229
|
+
if (businesses.length === 0) {
|
|
230
|
+
for (const entry of searchAllIndices(root)) {
|
|
231
|
+
const bizData = asPlaceDataNode(safeGet(entry, 14));
|
|
232
|
+
if (Array.isArray(bizData)) {
|
|
233
|
+
const business = extractSingleBusiness(bizData, options);
|
|
146
234
|
if (business?.name)
|
|
147
235
|
businesses.push(business);
|
|
148
236
|
}
|
|
149
237
|
}
|
|
150
238
|
}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
for (const ad of adsEntries) {
|
|
154
|
-
if (!Array.isArray(ad) || ad.length < 3)
|
|
155
|
-
continue;
|
|
156
|
-
const adName = safeGet(ad, 1);
|
|
157
|
-
if (!adName)
|
|
158
|
-
continue;
|
|
159
|
-
const business = {
|
|
160
|
-
name: adName,
|
|
161
|
-
placeId: safeGet(ad, 0),
|
|
162
|
-
latitude: safeGet(ad, 2, 0, 2),
|
|
163
|
-
longitude: safeGet(ad, 2, 0, 3),
|
|
164
|
-
rating: safeGet(ad, 2, 6),
|
|
165
|
-
isAd: true,
|
|
166
|
-
};
|
|
167
|
-
const websiteUrl = safeGet(ad, 3, 1);
|
|
168
|
-
if (websiteUrl && !websiteUrl.startsWith('https://www.google.com')) {
|
|
169
|
-
business.website = websiteUrl;
|
|
170
|
-
}
|
|
171
|
-
businesses.push(business);
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
const seen = new Set();
|
|
175
|
-
return businesses.filter((biz) => {
|
|
176
|
-
const key = biz.placeId ?? biz.hexId ?? biz.name;
|
|
177
|
-
if (!key || seen.has(key))
|
|
178
|
-
return false;
|
|
179
|
-
seen.add(key);
|
|
180
|
-
return true;
|
|
181
|
-
});
|
|
239
|
+
businesses.push(...extractAds(root));
|
|
240
|
+
return dedupeBusinesses(businesses);
|
|
182
241
|
}
|
|
183
242
|
catch {
|
|
184
243
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/parsers/search.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EACL,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,UAAU,EACV,yBAAyB,EACzB,uBAAuB,EACvB,eAAe,EACf,eAAe,GAChB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/parsers/search.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-execute.d.ts","sourceRoot":"","sources":["../../src/rpc/batch-execute.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"batch-execute.d.ts","sourceRoot":"","sources":["../../src/rpc/batch-execute.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAuBnF,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;gBAE3C,MAAM,EAAE,kBAAkB;IAStC,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIpC,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIlC,EAAE,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IAKtC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAsGtD;;;;;;OAMG;IACH,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,cAAc;IAoDtB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,sBAAsB;CAY/B"}
|
|
@@ -5,6 +5,9 @@
|
|
|
5
5
|
import { GMapsAuthError, GMapsError, GMapsNetworkError } from '../types/common.js';
|
|
6
6
|
import { isServicePath, rpcidForService } from './batch-services.js';
|
|
7
7
|
import { parseChunkedResponse } from '../utils/chunked-decoder.js';
|
|
8
|
+
import { sleep as sleepAbortable, throwIfAborted } from '../utils/abort.js';
|
|
9
|
+
import { fireError, fireRetry } from '../utils/hooks.js';
|
|
10
|
+
import { getRequestSignal } from '../utils/request-context.js';
|
|
8
11
|
class ReqIdGenerator {
|
|
9
12
|
base;
|
|
10
13
|
sequence = 0;
|
|
@@ -64,10 +67,18 @@ export class BatchExecuteClient {
|
|
|
64
67
|
const retryDelay = this.config.retryDelay ?? 1000;
|
|
65
68
|
const retryMaxDelay = this.config.retryMaxDelay ?? 5000;
|
|
66
69
|
let lastError = null;
|
|
70
|
+
const signal = this.config.signal ?? getRequestSignal();
|
|
67
71
|
for (let attempt = 0; attempt <= maxRetries; attempt++) {
|
|
72
|
+
throwIfAborted(signal);
|
|
68
73
|
if (attempt > 0) {
|
|
69
74
|
const delay = Math.min(retryDelay * Math.pow(2, attempt - 1), retryMaxDelay);
|
|
70
|
-
|
|
75
|
+
fireRetry(this.config.hooks, {
|
|
76
|
+
type: 'batchexecute',
|
|
77
|
+
attempt,
|
|
78
|
+
delayMs: delay,
|
|
79
|
+
error: lastError ?? undefined,
|
|
80
|
+
});
|
|
81
|
+
await this.sleep(delay, signal);
|
|
71
82
|
}
|
|
72
83
|
try {
|
|
73
84
|
const schedule = this.config.schedule ?? ((fn) => fn());
|
|
@@ -80,6 +91,7 @@ export class BatchExecuteClient {
|
|
|
80
91
|
...this.config.headers,
|
|
81
92
|
},
|
|
82
93
|
body: formData.toString(),
|
|
94
|
+
signal,
|
|
83
95
|
});
|
|
84
96
|
return { response: res, body: await res.text() };
|
|
85
97
|
});
|
|
@@ -104,9 +116,14 @@ export class BatchExecuteClient {
|
|
|
104
116
|
}
|
|
105
117
|
catch (error) {
|
|
106
118
|
lastError = error instanceof Error ? error : new Error(String(error));
|
|
119
|
+
if (signal?.aborted) {
|
|
120
|
+
fireError(this.config.hooks, { type: 'batchexecute', error });
|
|
121
|
+
throw error;
|
|
122
|
+
}
|
|
107
123
|
if (this.isRetryableError(lastError) && attempt < maxRetries) {
|
|
108
124
|
continue;
|
|
109
125
|
}
|
|
126
|
+
fireError(this.config.hooks, { type: 'batchexecute', error });
|
|
110
127
|
throw error;
|
|
111
128
|
}
|
|
112
129
|
}
|
|
@@ -199,8 +216,8 @@ export class BatchExecuteClient {
|
|
|
199
216
|
isRetryableStatus(status) {
|
|
200
217
|
return [429, 500, 502, 503, 504].includes(status);
|
|
201
218
|
}
|
|
202
|
-
sleep(ms) {
|
|
203
|
-
return
|
|
219
|
+
sleep(ms, signal) {
|
|
220
|
+
return sleepAbortable(ms, signal);
|
|
204
221
|
}
|
|
205
222
|
resolveBatchExecuteUrl() {
|
|
206
223
|
const host = this.config.host;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-execute.js","sourceRoot":"","sources":["../../src/rpc/batch-execute.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"batch-execute.js","sourceRoot":"","sources":["../../src/rpc/batch-execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-rpc.d.ts","sourceRoot":"","sources":["../../src/rpc/batch-rpc.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,2EAA2E;AAC3E,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAI5E;AAED,4DAA4D;AAC5D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CASvD;AAED,8FAA8F;AAC9F,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAEvD;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,WAAgB,GACvB,OAAO,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"batch-rpc.d.ts","sourceRoot":"","sources":["../../src/rpc/batch-rpc.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,2EAA2E;AAC3E,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAI5E;AAED,4DAA4D;AAC5D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CASvD;AAED,8FAA8F;AAC9F,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAEvD;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,WAAgB,GACvB,OAAO,CAAC,cAAc,CAAC,CAGzB;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GACzD,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAO7B;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB7B"}
|
package/dist/rpc/batch-rpc.js
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { cookiesToHeader } from '../auth/session.js';
|
|
5
5
|
import { parseMapsPageTokens } from './app-options.js';
|
|
6
|
-
import { GMapsRpcClient } from './rpc-client.js';
|
|
7
6
|
/** Maps APP_OPTIONS psi session token shape (index 0 of context array). */
|
|
8
7
|
export function buildSessionContext(psi, tail) {
|
|
9
8
|
const ctx = [psi, null, null, null, null, null, 81];
|
|
@@ -28,12 +27,8 @@ export function isBatchErrorCode(data) {
|
|
|
28
27
|
return Array.isArray(data) && data.length === 1 && typeof data[0] === 'number' && data[0] > 0;
|
|
29
28
|
}
|
|
30
29
|
export async function createRpcClient(http, config = {}) {
|
|
31
|
-
// Cookies are snapshotted here, so the session must already be bootstrapped —
|
|
32
|
-
// several services (ListEntityPhotos) return empty payloads for a cookieless caller.
|
|
33
30
|
await http.warmSession();
|
|
34
|
-
return
|
|
35
|
-
// Keeps batchexecute inside the same pacing/concurrency budget as plain GETs.
|
|
36
|
-
(fn) => http.runScheduled(fn));
|
|
31
|
+
return http.getRpcClient(config);
|
|
37
32
|
}
|
|
38
33
|
/**
|
|
39
34
|
* Obtain a batchexecute session token from an HTML Maps page.
|
|
@@ -56,6 +51,10 @@ export async function fetchSessionPsi(http, anchor = {}) {
|
|
|
56
51
|
* batchexecute services accept kEI as the session token interchangeably.
|
|
57
52
|
*/
|
|
58
53
|
export async function fetchPlacePsi(http, placePath) {
|
|
54
|
+
const cached = await http.getMapsPageTokens();
|
|
55
|
+
if (cached.psi ?? cached.kEI) {
|
|
56
|
+
return cached.psi ?? cached.kEI;
|
|
57
|
+
}
|
|
59
58
|
const html = await fetch(`https://www.google.com${placePath}`, {
|
|
60
59
|
headers: {
|
|
61
60
|
'User-Agent': http.getUserAgent(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-rpc.js","sourceRoot":"","sources":["../../src/rpc/batch-rpc.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"batch-rpc.js","sourceRoot":"","sources":["../../src/rpc/batch-rpc.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,2EAA2E;AAC3E,MAAM,UAAU,mBAAmB,CAAC,GAAW,EAAE,IAAgB;IAC/D,MAAM,GAAG,GAAc,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAC/D,IAAI,IAAI;QAAE,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC;AACb,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,iBAAiB,CAAC,IAAa;IAC7C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAW,CAAC;QACpC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,IAAc,CAAC;AACxB,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC5C,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAChG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAAgB,EAChB,SAAsB,EAAE;IAExB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IACzB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AACnC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAAgB,EAChB,SAAwD,EAAE;IAE1D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IACvC,MAAM,IAAI,GACR,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,IAAI;QACxB,CAAC,CAAC,gBAAgB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG;QAC7D,CAAC,CAAC,OAAO,CAAC;IACd,OAAO,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAgB,EAChB,SAAiB;IAEjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC9C,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC;IAClC,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,yBAAyB,SAAS,EAAE,EAAE;QAC7D,OAAO,EAAE;YACP,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;YACjC,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5C,MAAM,EAAE,WAAW;SACpB;QACD,QAAQ,EAAE,QAAQ;KACnB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACzB,MAAM,MAAM,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC;AAClC,CAAC"}
|
|
@@ -34,5 +34,7 @@ export type BatchServicePath = (typeof BATCH_SERVICES)[keyof typeof BATCH_SERVIC
|
|
|
34
34
|
/** Short rpcid in URL query when known (from _.ly registrations in JS bundles). */
|
|
35
35
|
export declare const BATCH_SERVICE_RPCIDS: Record<BatchServicePath, string>;
|
|
36
36
|
export declare function isServicePath(id: string): boolean;
|
|
37
|
+
/** True when the rpcid is a legacy short id that needs WIZ `at` / SNlM0e (not service-path). */
|
|
38
|
+
export declare function requiresLegacyXsrf(id: string): boolean;
|
|
37
39
|
export declare function rpcidForService(servicePath: string): string | undefined;
|
|
38
40
|
//# sourceMappingURL=batch-services.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-services.d.ts","sourceRoot":"","sources":["../../src/rpc/batch-services.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BjB,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,OAAO,cAAc,CAAC,CAAC;AAEpF,mFAAmF;AACnF,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,gBAAgB,EAAE,MAAM,CA4BjE,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEvE"}
|
|
1
|
+
{"version":3,"file":"batch-services.d.ts","sourceRoot":"","sources":["../../src/rpc/batch-services.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BjB,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,OAAO,cAAc,CAAC,CAAC;AAEpF,mFAAmF;AACnF,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,gBAAgB,EAAE,MAAM,CA4BjE,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,gGAAgG;AAChG,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEvE"}
|
|
@@ -63,6 +63,10 @@ export const BATCH_SERVICE_RPCIDS = {
|
|
|
63
63
|
export function isServicePath(id) {
|
|
64
64
|
return id.startsWith('/');
|
|
65
65
|
}
|
|
66
|
+
/** True when the rpcid is a legacy short id that needs WIZ `at` / SNlM0e (not service-path). */
|
|
67
|
+
export function requiresLegacyXsrf(id) {
|
|
68
|
+
return !isServicePath(id);
|
|
69
|
+
}
|
|
66
70
|
export function rpcidForService(servicePath) {
|
|
67
71
|
return BATCH_SERVICE_RPCIDS[servicePath];
|
|
68
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-services.js","sourceRoot":"","sources":["../../src/rpc/batch-services.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"batch-services.js","sourceRoot":"","sources":["../../src/rpc/batch-services.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,8 +57,6 @@ export declare function buildPlaceLivePb(params: {
|
|
|
57
57
|
hexId: string;
|
|
58
58
|
psi?: string;
|
|
59
59
|
}): string;
|
|
60
|
-
/** @deprecated Use buildPlaceDetailPb */
|
|
61
|
-
export declare const buildPlacePb: typeof buildPlaceRichPb;
|
|
62
60
|
export type PlacePbMode = 'detail' | 'rich' | 'live';
|
|
63
61
|
export declare function buildPlaceUrl(params: {
|
|
64
62
|
hexId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pb-builders.d.ts","sourceRoot":"","sources":["../../src/rpc/pb-builders.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,wBAAgB,aAAa,CAAC,MAAM,EAAE;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,qFAAqF;IACrF,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"pb-builders.d.ts","sourceRoot":"","sources":["../../src/rpc/pb-builders.ts"],"names":[],"mappings":"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"}
|
package/dist/rpc/pb-builders.js
CHANGED
|
@@ -8,16 +8,15 @@ import { defaultViewportDist } from '../utils/geo.js';
|
|
|
8
8
|
export function buildSearchPb(params) {
|
|
9
9
|
const queryEncoded = encodeURIComponent(params.query);
|
|
10
10
|
const offsetPart = params.offset > 0 ? `!8i${params.offset}` : '';
|
|
11
|
-
// Live browser capture: !22m5!1s{psi}!7e81!14m1!3s{psi}!15i9937
|
|
12
11
|
const psiPart = params.psi ? `!22m5!1s${params.psi}!7e81!14m1!3s${params.psi}!15i9937` : '';
|
|
13
12
|
return (`!1s${queryEncoded}` +
|
|
14
13
|
`!4m8!1m3!1d${params.viewportDist}!2d${params.lng}!3d${params.lat}` +
|
|
15
14
|
`!3m2!1i1024!2i768!4f13.1` +
|
|
16
15
|
`!7i${params.resultsCount}${offsetPart}` +
|
|
17
16
|
`!10b1` +
|
|
18
|
-
`!
|
|
17
|
+
`!12m58!1m5!18b1!30b1!31m1!1b1!34e1` +
|
|
19
18
|
`!2m4!5m1!6e2!20e3!39b1` +
|
|
20
|
-
`!
|
|
19
|
+
`!6m30!32i1!49b1!63m0!66b1!74i${params.maxRadius}` +
|
|
21
20
|
`!85b1!114b1!149b1!206b1!209b1!212b1!215b1!216b1!222b1!223b1!232b1!234b1!235b1!246b1!253b1!260b1!266b1!270b1!273b1!280b1!281b1!286b1!291m0!302i300!303i100` +
|
|
22
21
|
`!10b1!12b1!13b1!14b1!16b1!17m1!3e1!20m4!5e2!6b1!8b1!14b1!46m1!1b0!96b1!99b1` +
|
|
23
22
|
`!19m4!2m3!1i360!2i120!4i8` +
|
|
@@ -112,8 +111,6 @@ export function buildPlaceLivePb(params) {
|
|
|
112
111
|
'!34m5!7b1!10b1!14b1!15m1!1b0' +
|
|
113
112
|
'!37i788');
|
|
114
113
|
}
|
|
115
|
-
/** @deprecated Use buildPlaceDetailPb */
|
|
116
|
-
export const buildPlacePb = buildPlaceRichPb;
|
|
117
114
|
export function buildPlaceUrl(params) {
|
|
118
115
|
const requested = params.mode ?? 'live';
|
|
119
116
|
const hasCoords = params.lat != null && params.lng != null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pb-builders.js","sourceRoot":"","sources":["../../src/rpc/pb-builders.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAItD,MAAM,UAAU,aAAa,CAAC,MAU7B;IACC,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAClE,
|
|
1
|
+
{"version":3,"file":"pb-builders.js","sourceRoot":"","sources":["../../src/rpc/pb-builders.ts"],"names":[],"mappings":"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"}
|