diff --git a/packages/search/.vscode/launch.json b/packages/search/.vscode/launch.json index 573c9b17..60f8739c 100644 --- a/packages/search/.vscode/launch.json +++ b/packages/search/.vscode/launch.json @@ -11,7 +11,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "preLaunchTask": "tsc: build - tsconfig.json", "outFiles": [ "${workspaceFolder}//**/*.js" @@ -28,7 +28,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "preLaunchTask": "tsc: build - tsconfig.json", "outFiles": [ "${workspaceFolder}//**/*.js" @@ -40,7 +40,6 @@ "--searchFrom=Barcelona, Catalonia, Spain", "--filterCountry=Spain", "--google_domain_='google.es'", - "--source='${OSR_CUSTOMER_DRIVE}/campaign/spain.json'", "--limit=10", "--debug=true" ], @@ -53,7 +52,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "outFiles": [ "${workspaceFolder}//**/*.js" ], @@ -89,7 +88,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "outFiles": [ "${workspaceFolder}//**/*.js" ], @@ -124,7 +123,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "outFiles": [ "${workspaceFolder}//**/*.js" ], @@ -180,7 +179,7 @@ "--meta=true", "--cache=false", "--zoom=12", - "--headless=true"% + "--headless=true" ], "outputCapture": "std" }, @@ -191,7 +190,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "preLaunchTask": "tsc: build - tsconfig.json", "args": [ "googlemaps", @@ -220,7 +219,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "preLaunchTask": "tsc: build - tsconfig.json", "args": [ "googlemaps", @@ -249,7 +248,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "preLaunchTask": "tsc: build - tsconfig.json", "args": [ "googlemaps", @@ -280,7 +279,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "preLaunchTask": "tsc: build - tsconfig.json", "args": [ "report", @@ -313,7 +312,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "preLaunchTask": "tsc: build - tsconfig.json", "outFiles": [ "${workspaceFolder}//**/*.js" @@ -326,9 +325,9 @@ "--language=en", "--filterCountry=France", "--google_domain='google.fr'", - "--dst='${OSR_CUSTOMER_DRIVE}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls'", + "--dst='${POLYMECH_ROOT}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls'", "--limit=50", - "--source='${OSR_CUSTOMER_DRIVE}/campaign/france-design.json'", + "--source='${POLYMECH_ROOT}/campaign/france-design.json'", "--debug=false", "--findEMail=true", "--meta=true", @@ -343,7 +342,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "preLaunchTask": "tsc: build - tsconfig.json", "outFiles": [ "${workspaceFolder}//**/*.js" @@ -372,7 +371,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "preLaunchTask": "tsc: build - tsconfig.json", "outFiles": [ "${workspaceFolder}//**/*.js" @@ -385,9 +384,9 @@ "--language=en", "--filterCountry=France", "--google_domain='google.fr'", - "--dst='${OSR_CUSTOMER_DRIVE}/campaign/test/${COUNTRY}/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls'", + "--dst='${POLYMECH_ROOT}/campaign/test/${COUNTRY}/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls'", "--limit=50", - "--source='${OSR_CUSTOMER_DRIVE}/campaign/france-design.json'", + "--source='${POLYMECH_ROOT}/campaign/france-design.json'", "--debug=false", "--findEMail=true", "--meta=true", @@ -403,7 +402,7 @@ "skipFiles": [ "/**" ], - "program": "${workspaceFolder}/main.js", + "program": "${workspaceFolder}/dist-in/main.js", "outFiles": [ "${workspaceFolder}//**/*.js" ], diff --git a/packages/search/README.md b/packages/search/README.md index 7d07efab..3ab0a95f 100644 --- a/packages/search/README.md +++ b/packages/search/README.md @@ -37,7 +37,7 @@ Please create a config file, in your home directory, eg: ```C:\\Users\\TeleTubbi - `--dst`: Output path, supports XLS|MD (default: ./tests/maps/${QUERY}-${FROM}-${ENGINE}-${DOMAIN}-${LANG}.xls) - `--env_key`: Environment key to the config path (default: OSR-CONFIG) - `--api_key` : SERPAPI Key -- `--source` : path to a JSON file, containing categories with related search phrases. To save results per category, use ```--dst='${OSR_CUSTOMER_DRIVE}/campaign/test/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls'``` +- `--source` : path to a JSON file, containing categories with related search phrases. To save results per category, use ```--dst='${POLYMECH_ROOT}/campaign/test/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls'``` - `--cache` : when `true`, skip existing search result files - `--findEMail` : scrape websites for email addresses - `--meta` : retrieve meta tags, to be stored in JSON only diff --git a/packages/search/dist-in/commands/googlemaps.js b/packages/search/dist-in/commands/googlemaps.js index 48502bdb..abd8f2fe 100644 --- a/packages/search/dist-in/commands/googlemaps.js +++ b/packages/search/dist-in/commands/googlemaps.js @@ -1,15 +1,6 @@ -import * as path from 'path'; -import { clone } from '../options.js'; -import { cleanOptions, logger } from '../index.js'; +import { logger } from '../index.js'; import { defaults } from '../_cli.js'; -import { writeReport } from '../lib/report_map.js'; -import { sync as write } from '@polymech/fs/write'; -import { sync as read } from '@polymech/fs/read'; -import { sync as exists } from '@polymech/fs/exists'; -import pMap from 'p-map'; -import { resolvePath } from './options.js'; -import { geocode_forward } from '../lib/geo.js'; -import { locationString, searchGoogleMap, yargsOptions, zodSchema, googleMaps } from '../lib/googlemaps.js'; +import { yargsOptions, zodSchema, googleMaps } from '../lib/googlemaps.js'; let options = (yargs) => yargsOptions(yargs); export const register = (cli) => { return cli.command('googlemaps ', 'Search GoogleMaps', options, async (argv) => { @@ -25,77 +16,7 @@ export const register = (cli) => { logger.error('Invalid options', e.message, e.issues); return; } - // opts = parse(argv) return await googleMaps(opts); - if (!opts) { - logger.error('Invalid options', opts); - return; - } - try { - if (opts.searchFrom && opts.geocode_key) { - const coords = await geocode_forward(opts.searchFrom, opts.geocode_key); - if (coords) { - opts.searchCoord = locationString(coords, opts.zoom); - } - else { - logger.error('Error geocoding', opts.searchFrom); - } - } - } - catch (error) { - logger.error('Error geocoding', error, error.stack); - } - let ret = []; - const search = async (query, category, opts) => { - opts = clone(opts); - opts.dst = resolvePath(argv.dst, query, category, opts); - if (opts.cache !== false && exists(opts.dst + '.json')) { - logger.debug('Skipping', opts.dst + '.json'); - return read(opts.dst.replace('.xlsx', 'json')) || []; - } - try { - const sr = await searchGoogleMap(query, opts.api_key, { ...opts }); - if (sr && sr.length && opts.dst) { - logger.debug('Writing', opts.dst); - write(opts.dst + '.json', sr); - writeReport(sr, opts.dst, opts); - const parts = path.parse(opts.dst); - write(path.join(parts.dir, parts.name + '_options.json'), cleanOptions(opts)); - // writeReport(sr, opts.dst.replace('.xlsx', '.md'), opts) - } - ret = [...ret, ...sr]; - return ret; - } - catch (error) { - logger.error('Error searching GoogleMaps : ' + error.message, error, error.stack); - } - }; - const results = await pMap(Object.keys(opts.source), async (k) => { - return await pMap(opts.source[k], async (t) => { - return search(t, k, opts); - }, { - concurrency: 1 - }); - }, { - concurrency: 1 - }); - if (opts.dst) { - opts.dst = resolvePath(argv.dst, 'all', 'all', opts); - if (exists(opts.dst + '.json')) { - const last = (read(opts.dst + '.json', 'json') || []); - ret = [...last, ...ret]; - } - write(opts.dst + '.json', ret); - writeReport(ret, opts.dst, opts); - } - if (opts.index) { - let index = read(opts.index, 'json') || {}; - ret.forEach((r) => { - index[r.title] = r; - }); - write(opts.index, index); - } - return false; }); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ29vZ2xlbWFwcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tYW5kcy9nb29nbGVtYXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFBO0FBRTVCLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFFckMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDbEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNyQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDbEQsT0FBTyxFQUFFLElBQUksSUFBSSxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNsRCxPQUFPLEVBQUUsSUFBSSxJQUFJLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxJQUFJLElBQUksTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFFcEQsT0FBTyxJQUFJLE1BQU0sT0FBTyxDQUFBO0FBQ3hCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFDMUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQUMvQyxPQUFPLEVBQUUsY0FBYyxFQUFFLGVBQWUsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBRzNHLElBQUksT0FBTyxHQUFHLENBQUMsS0FBZSxFQUFFLEVBQUUsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUE7QUFFdEQsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBYSxFQUFFLEVBQUU7SUFDdEMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLG1CQUFtQixFQUFFLG1CQUFtQixFQUFFLE9BQWMsRUFBRSxLQUFLLEVBQUUsSUFBUyxFQUFnQixFQUFF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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ29vZ2xlbWFwcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tYW5kcy9nb29nbGVtYXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDcEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNyQyxPQUFPLEVBQUcsWUFBWSxFQUFFLFNBQVMsRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUczRSxJQUFJLE9BQU8sR0FBRyxDQUFDLEtBQWUsRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFBO0FBRXRELE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQWEsRUFBRSxFQUFFO0lBQ3RDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxtQkFBbUIsRUFBRSxPQUFjLEVBQUUsS0FBSyxFQUFFLElBQVMsRUFBZ0IsRUFBRTtRQUMzRyxRQUFRLEVBQUUsQ0FBQTtRQUNWLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQUMsT0FBTTtRQUFDLENBQUM7UUFFekIsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFBO1FBQ2YsSUFBSSxDQUFDO1lBQ0QsSUFBSSxHQUFHLFNBQVMsRUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQXVCLENBQUE7UUFDeEQsQ0FBQztRQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDVCxNQUFNLENBQUMsS0FBSyxDQUFDLGlCQUFpQixFQUFFLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1lBQ3BELE9BQU07UUFDVixDQUFDO1FBQ0QsT0FBTyxNQUFNLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNqQyxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/packages/search/dist-in/commands/options.js b/packages/search/dist-in/commands/options.js index ab5fa427..a6ba6ed2 100644 --- a/packages/search/dist-in/commands/options.js +++ b/packages/search/dist-in/commands/options.js @@ -41,7 +41,7 @@ export const defaultOptions = (yargs) => { default: 50 }).option('dst', { description: 'dst output path, supports XLS|CSV|HTML', - default: '${OSR_CUSTOMER_DRIVE}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls' + default: '${POLYMECH_ROOT}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls' }).option('filterCountry', { description: ' by this country', }).option('filterCity', { @@ -112,7 +112,7 @@ export const defaultReportOptions = (yargs) => { default: 50 }).option('dst', { description: 'dst output path, supports XLS|CSV|HTML', - default: '${OSR_CUSTOMER_DRIVE}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls' + default: '${POLYMECH_ROOT}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls' }).option('country', { description: 'country', }).option('city', { diff --git a/packages/search/dist-in/lib/googlemaps.d.ts b/packages/search/dist-in/lib/googlemaps.d.ts index 07b96b03..69827c76 100644 --- a/packages/search/dist-in/lib/googlemaps.d.ts +++ b/packages/search/dist-in/lib/googlemaps.d.ts @@ -43,17 +43,15 @@ export declare const zodSchema: () => z.ZodObject<{ searchCache: z.ZodDefault; query: z.ZodDefault; searchCoord: z.ZodOptional; - searchFrom: z.ZodOptional; + searchFrom: z.ZodDefault>; source: z.ZodOptional; type: z.ZodDefault>; zoom: z.ZodDefault>; index: z.ZodDefault; store: z.ZodDefault; }, "strip", z.ZodTypeAny, { - type?: string; - cache?: boolean; - meta?: boolean; api_key?: string; + cache?: boolean; category?: string; dst?: string; dump?: string; @@ -69,19 +67,19 @@ export declare const zodSchema: () => z.ZodObject<{ language?: string; limit?: number; logLevel?: string; + meta?: boolean; searchCache?: boolean; query?: string; searchCoord?: string; searchFrom?: string; source?: string; + type?: string; zoom?: number; index?: string; store?: string; }, { - type?: string; - cache?: boolean; - meta?: boolean; api_key?: string; + cache?: boolean; category?: string; dst?: string; dump?: string; @@ -97,11 +95,13 @@ export declare const zodSchema: () => z.ZodObject<{ language?: string; limit?: number; logLevel?: string; + meta?: boolean; searchCache?: boolean; query?: string; searchCoord?: string; searchFrom?: string; source?: string; + type?: string; zoom?: number; index?: string; store?: string; @@ -158,7 +158,7 @@ export declare const zodSchemaEach: () => z.ZodObject<{ searchCache: z.ZodDefault; query: z.ZodDefault; searchCoord: z.ZodOptional; - searchFrom: z.ZodOptional; + searchFrom: z.ZodDefault>; source: z.ZodOptional; type: z.ZodDefault>; zoom: z.ZodDefault>; @@ -175,10 +175,8 @@ export declare const zodSchemaEach: () => z.ZodObject<{ profile: z.ZodDefault; migrate: z.ZodDefault; }, "strip", z.ZodTypeAny, { - type?: string; - cache?: boolean; - meta?: boolean; api_key?: string; + cache?: boolean; category?: string; dst?: string; dump?: string; @@ -194,11 +192,13 @@ export declare const zodSchemaEach: () => z.ZodObject<{ language?: string; limit?: number; logLevel?: string; + meta?: boolean; searchCache?: boolean; query?: string; searchCoord?: string; searchFrom?: string; source?: string; + type?: string; zoom?: number; index?: string; store?: string; @@ -211,10 +211,8 @@ export declare const zodSchemaEach: () => z.ZodObject<{ profile?: string; migrate?: boolean; }, { - type?: string; - cache?: boolean; - meta?: boolean; api_key?: string; + cache?: boolean; category?: string; dst?: string; dump?: string; @@ -230,11 +228,13 @@ export declare const zodSchemaEach: () => z.ZodObject<{ language?: string; limit?: number; logLevel?: string; + meta?: boolean; searchCache?: boolean; query?: string; searchCoord?: string; searchFrom?: string; source?: string; + type?: string; zoom?: number; index?: string; store?: string; diff --git a/packages/search/dist-in/lib/googlemaps.js b/packages/search/dist-in/lib/googlemaps.js index c7862dd3..cc8c889f 100644 --- a/packages/search/dist-in/lib/googlemaps.js +++ b/packages/search/dist-in/lib/googlemaps.js @@ -78,9 +78,9 @@ export const store = async (storePath, ns = 'osr-search') => getStore(storePath, export const getStored = async (title, storePath, ns = 'osr-search') => getStore(storePath, ns).get(title); export const zodSchema = () => z.object({ api_key: z.string().optional().describe('API Key'), - cache: z.boolean().default(true), + cache: z.boolean().default(false), category: z.string().optional().default('category'), - dst: z.string().default('${OSR_CUSTOMER_DRIVE}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-10.xls'), + dst: z.string().default('${POLYMECH_ROOT}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-10.xls'), dump: z.string().optional(), engine: z.string().default('google_maps'), env_key: z.string().default('OSR-CONFIG'), @@ -95,10 +95,10 @@ export const zodSchema = () => z.object({ limit: z.number().default(5), logLevel: z.string().default('info'), meta: z.boolean().default(true), - searchCache: z.boolean().default(true).describe('Use search cache'), + searchCache: z.boolean().default(false).describe('Use search cache'), query: z.string().default('plastichub'), searchCoord: z.string().optional(), - searchFrom: z.string().optional(), + searchFrom: z.string().optional().default('barcelona, spain'), source: z.string().optional(), type: z.string().optional().default('search'), zoom: z.number().optional().default(13), @@ -212,7 +212,7 @@ export const searchGoogleMap = async (query, key, opts) => { pageIdx++; page = await page.next?.(); } - if (page.place_results && !isArray(page.place_results)) { + if (page && page.place_results && !isArray(page.place_results)) { page.place_results = [page.place_results]; } while (page && page.place_results) { @@ -245,7 +245,7 @@ export const searchGoogleMap = async (query, key, opts) => { entry.geo = REVERSE_DEFAULT; } }, { concurrency: 3 }); - //logger.debug(`search ${query} with ${params.ll} / ${params.searchFrom} @ ${opts.zoom} : ${results.length} items`) + logger.debug(`search ${query} with ${params.ll} / ${params.searchFrom} @ ${opts.zoom} : ${results.length} items`); if (opts.filterCity) { results = results.filter((r) => r.geo.city.toLowerCase() === opts.filterCity.toLowerCase()); } @@ -360,7 +360,7 @@ export const parse = (argv) => { export const resolvePath = (str, query, category, opts) => { return path.resolve(resolve(str, false, { QUERY: query, - FROM: opts.searchFrom.split(',').map((s) => s.trim()).join('/'), + FROM: opts.searchFrom ? opts.searchFrom.split(',').map((s) => s.trim()).join('/') : 'barcelona, spain', ENGINE: opts.engine, DOMAIN: opts.google_domain, LANG: opts.language, @@ -403,7 +403,7 @@ export const googleMaps = async (opts) => { return cached; } try { - logger.debug(`Searching ${opts.query} with ${opts.searchFrom} :: 3`); + logger.debug(`Searching ${opts.query} with ${opts.searchFrom}`); const sr = await searchGoogleMap(query, opts.api_key, { ...opts }); if (sr && sr.length && opts.dst) { logger.debug('Writing', opts.dst); @@ -414,8 +414,7 @@ export const googleMaps = async (opts) => { // writeReport(sr, opts.dst.replace('.xlsx', '.md'), opts) } ret = [...ret, ...sr]; - logger.debug(`Searching ${opts.query} with ${opts.searchFrom} :: 4`); - // closeAppByName('Chromium') + logger.debug(`Searching ${opts.query} with ${opts.searchFrom}`); return ret; } catch (error) { @@ -526,4 +525,4 @@ export const each = async (opts) => { opts.log && write(path.resolve(resolve(opts.log)), all); return all; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"googlemaps.js","sourceRoot":"","sources":["../../src/lib/googlemaps.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"googlemaps.js","sourceRoot":"","sources":["../../src/lib/googlemaps.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/search/dist-in/main.js b/packages/search/dist-in/main.js index 97357b2d..57b57f8c 100644 --- a/packages/search/dist-in/main.js +++ b/packages/search/dist-in/main.js @@ -10,7 +10,7 @@ import { register as registerTypes } from './commands/types.js'; registerTypes(cli); import { register as registerSASearch } from './commands/googlemaps.js'; registerSASearch(cli); -const argv = cli.getArguments(); +const argv = cli.argv; if (argv.help) { cli.showHelp(true); process.exit(); @@ -18,4 +18,4 @@ if (argv.help) { else if (argv.v || argv.version) { process.exit(); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9tYWluLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQUMsUUFBUSxFQUFFLENBQUE7QUFFaEQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUU5QixPQUFPLEVBQUUsUUFBUSxJQUFJLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ2hGLE9BQU8sRUFBRSxRQUFRLElBQUksWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUE7QUFDaEYsT0FBTyxFQUFFLFFBQVEsSUFBSSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUNuRixPQUFPLEVBQUUsUUFBUSxJQUFJLGdCQUFnQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUc5RixNQUFNLElBQUksR0FBUSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUE7QUFFcEMsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDWixHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ2xCLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtBQUNsQixDQUFDO0tBQU0sSUFBSSxJQUFJLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNoQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUE7QUFDbEIsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9tYWluLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQUMsUUFBUSxFQUFFLENBQUE7QUFDaEQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUU5QixPQUFPLEVBQUUsUUFBUSxJQUFJLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ2hGLE9BQU8sRUFBRSxRQUFRLElBQUksWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUE7QUFDaEYsT0FBTyxFQUFFLFFBQVEsSUFBSSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUNuRixPQUFPLEVBQUUsUUFBUSxJQUFJLGdCQUFnQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUc5RixNQUFNLElBQUksR0FBUSxHQUFHLENBQUMsSUFBSSxDQUFDO0FBRzNCLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ1osR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNsQixPQUFPLENBQUMsSUFBSSxFQUFFLENBQUE7QUFDbEIsQ0FBQztLQUFNLElBQUksSUFBSSxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDaEMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFBO0FBQ2xCLENBQUMifQ== \ No newline at end of file diff --git a/packages/search/package.json b/packages/search/package.json index 763669b6..c881a964 100644 --- a/packages/search/package.json +++ b/packages/search/package.json @@ -8,7 +8,7 @@ "access": "public" }, "bin": { - "polymech-search": "main.js" + "polymech-search": "dist-in/main.js" }, "dependencies": { "@keyv/sqlite": "^4.0.1", diff --git a/packages/search/src/commands/googlemaps.ts b/packages/search/src/commands/googlemaps.ts index 102c3f9e..3ca3babc 100644 --- a/packages/search/src/commands/googlemaps.ts +++ b/packages/search/src/commands/googlemaps.ts @@ -1,19 +1,7 @@ import * as CLI from 'yargs' -import * as path from 'path' - -import { clone } from '../options.js' - -import { cleanOptions, logger } from '../index.js' +import { logger } from '../index.js' import { defaults } from '../_cli.js' -import { writeReport } from '../lib/report_map.js' -import { sync as write } from '@polymech/fs/write' -import { sync as read } from '@polymech/fs/read' -import { sync as exists } from '@polymech/fs/exists' - -import pMap from 'p-map' -import { resolvePath } from './options.js' -import { geocode_forward } from '../lib/geo.js' -import { locationString, searchGoogleMap, yargsOptions, zodSchema, googleMaps } from '../lib/googlemaps.js' +import { yargsOptions, zodSchema, googleMaps } from '../lib/googlemaps.js' import { IOptionsGoogleMaps } from '../lib/index.js' let options = (yargs: CLI.Argv) => yargsOptions(yargs) @@ -30,79 +18,6 @@ export const register = (cli: CLI.Argv) => { logger.error('Invalid options', e.message, e.issues) return } - // opts = parse(argv) return await googleMaps(opts) - if (!opts) { - logger.error('Invalid options', opts) - return - } - try { - if (opts.searchFrom && opts.geocode_key) { - const coords = await geocode_forward(opts.searchFrom, opts.geocode_key) - if (coords) { - opts.searchCoord = locationString(coords, opts.zoom) - } else { - logger.error('Error geocoding', opts.searchFrom) - } - } - } catch (error) { - logger.error('Error geocoding', error, error.stack) - } - - let ret: any[] = [] - const search = async (query: string, category, opts: any) => { - opts = clone(opts) - opts.dst = resolvePath(argv.dst, query, category, opts) - if (opts.cache !== false && exists(opts.dst + '.json')) { - logger.debug('Skipping', opts.dst + '.json') - return read(opts.dst.replace('.xlsx', 'json')) as any || [] - } - try { - const sr = await searchGoogleMap(query, opts.api_key, { ...opts }) - if (sr && sr.length && opts.dst) { - logger.debug('Writing', opts.dst) - write(opts.dst + '.json', sr) - writeReport(sr, opts.dst, opts) - const parts = path.parse(opts.dst) - write(path.join(parts.dir, parts.name + '_options.json'), cleanOptions(opts)) - // writeReport(sr, opts.dst.replace('.xlsx', '.md'), opts) - } - ret = [...ret, ...sr] - return ret - } catch (error) { - logger.error('Error searching GoogleMaps : ' + error.message, error, error.stack) - } - } - - const results = await pMap(Object.keys(opts.source), async (k: any) => { - return await pMap(opts.source[k], async (t: any) => { - return search(t, k, opts) - }, { - concurrency: 1 - }) - }, { - concurrency: 1 - }) - - - if (opts.dst) { - opts.dst = resolvePath(argv.dst, 'all', 'all', opts) - if (exists(opts.dst + '.json')) { - const last = (read(opts.dst + '.json', 'json') as any || []) - ret = [...last, ...ret] - } - write(opts.dst + '.json', ret) - writeReport(ret, opts.dst, opts) - } - - if (opts.index) { - let index = read(opts.index, 'json') as any || {} - ret.forEach((r) => { - index[r.title] = r - }) - write(opts.index, index) - } - - return false }) } diff --git a/packages/search/src/commands/options-zod.ts b/packages/search/src/commands/options-zod.ts index ffc3bf48..fba9422f 100644 --- a/packages/search/src/commands/options-zod.ts +++ b/packages/search/src/commands/options-zod.ts @@ -6,7 +6,7 @@ export const defaultOptionsSchema = z.object({ cache: z.boolean().default(true), category: z.string().optional(), debug: z.boolean().default(false), - dst: z.string().default('${OSR_CUSTOMER_DRIVE}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-10.xls'), + dst: z.string().default('${POLYMECH_ROOT}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-10.xls'), dump: z.string().optional(), engine: z.string().default('google'), env_key: z.string().default('OSR-CONFIG'), @@ -17,13 +17,13 @@ export const defaultOptionsSchema = z.object({ geocode_key: z.string().optional(), google_domain: z.string().default('google.com'), headless: z.boolean().default(true), - index: z.string().default('${OSR_ROOT}/osr-directory/meta/index.json'), + index: z.string().default('${POLYMECH_ROOT}/osr-directory/meta/index.json'), language: z.string().default('en'), limit: z.number().default(50), meta: z.boolean().default(true), query: z.string().default('plastichub'), searchCoord: z.string().optional(), - searchFrom: z.string().optional(), + searchFrom: z.string().optional().default('barcelona, spain'), source: z.string().optional(), translate: z.string().optional(), }); @@ -35,7 +35,7 @@ export const defaultReportOptionsSchema = z.object({ city: z.string().optional(), country: z.string().optional(), debug: z.boolean().default(false), - dst: z.string().default('${OSR_CUSTOMER_DRIVE}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-10.xls'), + dst: z.string().default('${POLYMECH_ROOT}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-10.xls'), engine: z.string().default('google'), env_key: z.string().default('OSR-CONFIG'), google_domain: z.string().default('google.com'), diff --git a/packages/search/src/commands/options.ts b/packages/search/src/commands/options.ts index 6bb11b76..19870fc4 100644 --- a/packages/search/src/commands/options.ts +++ b/packages/search/src/commands/options.ts @@ -44,7 +44,7 @@ export const defaultOptions = (yargs: CLI.Argv) => { default: 50 }).option('dst', { description: 'dst output path, supports XLS|CSV|HTML', - default: '${OSR_CUSTOMER_DRIVE}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls' + default: '${POLYMECH_ROOT}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls' }).option('filterCountry', { description: ' by this country', }).option('filterCity', { @@ -116,7 +116,7 @@ export const defaultReportOptions = (yargs: CLI.Argv) => { default: 50 }).option('dst', { description: 'dst output path, supports XLS|CSV|HTML', - default: '${OSR_CUSTOMER_DRIVE}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls' + default: '${POLYMECH_ROOT}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-${MM}.xls' }).option('country', { description: 'country', }).option('city', { diff --git a/packages/search/src/lib/googlemaps.ts b/packages/search/src/lib/googlemaps.ts index 2ac9cb88..e6628819 100644 --- a/packages/search/src/lib/googlemaps.ts +++ b/packages/search/src/lib/googlemaps.ts @@ -106,9 +106,9 @@ export const getStored = async (title:string, storePath: string, ns: string = 'o export const zodSchema = () => z.object({ api_key: z.string().optional().describe('API Key'), - cache: z.boolean().default(true), + cache: z.boolean().default(false), category: z.string().optional().default('category'), - dst: z.string().default('${OSR_CUSTOMER_DRIVE}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-10.xls'), + dst: z.string().default('${POLYMECH_ROOT}/campaign/maps/${FROM}/${CATEGORY}/${QUERY}-10.xls'), dump: z.string().optional(), engine: z.string().default('google_maps'), env_key: z.string().default('OSR-CONFIG'), @@ -123,10 +123,10 @@ export const zodSchema = () => z.object({ limit: z.number().default(5), logLevel: z.string().default('info'), meta: z.boolean().default(true), - searchCache: z.boolean().default(true).describe('Use search cache'), + searchCache: z.boolean().default(false).describe('Use search cache'), query: z.string().default('plastichub'), searchCoord: z.string().optional(), - searchFrom: z.string().optional(), + searchFrom: z.string().optional().default('barcelona, spain'), source: z.string().optional(), type: z.string().optional().default('search'), zoom: z.number().optional().default(13), @@ -250,6 +250,7 @@ export const searchGoogleMap = async ( ...googleParams }) + while (page && page.local_results) { page.local_results.forEach((r) => { r.page = pageIdx @@ -260,7 +261,7 @@ export const searchGoogleMap = async ( page = await page.next?.() } - if (page.place_results && !isArray(page.place_results)) { + if (page && page.place_results && !isArray(page.place_results)) { page.place_results = [page.place_results] } @@ -277,8 +278,10 @@ export const searchGoogleMap = async ( if (opts.searchCache && OSR_CACHE()) { set_cached_object(cache_key, MODULE_NAME, results) } + let idx = 0 //const cachedLoc = async (title: string) => getStored(title, opts.store, MODULE_NAME) + await pMap(results, async (entry: any) => { idx++ entry.position = entry.page * PAGE_SIZE + idx @@ -294,7 +297,7 @@ export const searchGoogleMap = async ( } }, { concurrency: 3 }) - //logger.debug(`search ${query} with ${params.ll} / ${params.searchFrom} @ ${opts.zoom} : ${results.length} items`) + logger.debug(`search ${query} with ${params.ll} / ${params.searchFrom} @ ${opts.zoom} : ${results.length} items`) if (opts.filterCity) { results = results.filter((r) => r.geo.city.toLowerCase() === opts.filterCity.toLowerCase()) @@ -412,7 +415,7 @@ export const resolvePath = (str: string, query, category, opts: any) => { return path.resolve(resolve(str, false, { QUERY: query, - FROM: opts.searchFrom.split(',').map((s) => s.trim()).join('/'), + FROM: opts.searchFrom ? opts.searchFrom.split(',').map((s) => s.trim()).join('/') : 'barcelona, spain', ENGINE: opts.engine, DOMAIN: opts.google_domain, LANG: opts.language, @@ -454,7 +457,7 @@ export const googleMaps = async (opts: IOptionsGoogleMaps) => { return cached } try { - logger.debug(`Searching ${opts.query} with ${opts.searchFrom} :: 3`) + logger.debug(`Searching ${opts.query} with ${opts.searchFrom}`) const sr = await searchGoogleMap(query, opts.api_key, { ...opts }) if (sr && sr.length && opts.dst) { logger.debug('Writing', opts.dst) @@ -465,8 +468,7 @@ export const googleMaps = async (opts: IOptionsGoogleMaps) => { // writeReport(sr, opts.dst.replace('.xlsx', '.md'), opts) } ret = [...ret, ...sr] - logger.debug(`Searching ${opts.query} with ${opts.searchFrom} :: 4`) - // closeAppByName('Chromium') + logger.debug(`Searching ${opts.query} with ${opts.searchFrom}`) return ret } catch (error) { logger.error('Error searching GoogleMaps : ' + error.message, error, error.stack) diff --git a/packages/search/src/main.ts b/packages/search/src/main.ts index 9c495b02..4e0a10d5 100644 --- a/packages/search/src/main.ts +++ b/packages/search/src/main.ts @@ -1,6 +1,5 @@ #!/usr/bin/env node import { defaults } from './_cli.js'; defaults() - import { cli } from './cli.js' import { register as registerInfo } from './commands/info.js'; registerInfo(cli) @@ -9,7 +8,8 @@ import { register as registerTypes } from './commands/types.js'; registerTypes(c import { register as registerSASearch } from './commands/googlemaps.js'; registerSASearch(cli) -const argv: any = cli.getArguments() +const argv: any = cli.argv; + if (argv.help) { cli.showHelp(true)