@@ -158,9 +158,7 @@ function printNext (telemetry: Telemetry) {
158158 console . log ( `Telemetry data will be sent the next time you run ${ g `"keystone dev"` } ` )
159159}
160160
161- function printTelemetryStatus ( ) {
162- const { telemetry } = getTelemetryConfig ( )
163-
161+ function printTelemetryStatus ( telemetry : Telemetry ) {
164162 if ( telemetry === undefined ) {
165163 console . log ( `Keystone telemetry has been reset to ${ y `uninitialized` } ` )
166164 console . log ( )
@@ -217,12 +215,16 @@ async function sendEvent (eventType: 'project' | 'device', eventData: Project |
217215 method : 'POST' ,
218216 headers : {
219217 'Content-Type' : 'application/json' ,
218+ 'User-Agent' : 'keystonejs'
220219 } ,
221220 } , ( ) => {
222221 resolve ( )
223222 } )
224223
225- req . once ( 'error' , ( ) => resolve ( ) )
224+ req . once ( 'error' , ( err ) => {
225+ log ( err ?. message ?? err )
226+ resolve ( )
227+ } )
226228 req . end ( JSON . stringify ( eventData ) )
227229 } )
228230
@@ -238,7 +240,7 @@ async function sendProjectTelemetryEvent (
238240) {
239241 const project = telemetry . projects [ cwd ] ?? { lastSentDate : null }
240242 const { lastSentDate } = project
241- if ( lastSentDate && lastSentDate > = todaysDate ) {
243+ if ( lastSentDate && lastSentDate == = todaysDate ) {
242244 log ( 'project telemetry already sent today' )
243245 return
244246 }
@@ -261,7 +263,7 @@ async function sendDeviceTelemetryEvent (
261263 userConfig : Configuration
262264) {
263265 const { lastSentDate } = telemetry . device
264- if ( lastSentDate && lastSentDate > = todaysDate ) {
266+ if ( lastSentDate && lastSentDate == = todaysDate ) {
265267 log ( 'device telemetry already sent today' )
266268 return
267269 }
@@ -303,13 +305,14 @@ export async function runTelemetry (
303305
304306 await sendProjectTelemetryEvent ( cwd , lists , dbProviderName , telemetryDefaulted , userConfig )
305307 await sendDeviceTelemetryEvent ( telemetryDefaulted , userConfig )
306- } catch ( err ) {
307- log ( err )
308+ } catch ( err : any ) {
309+ log ( err ?. message ?? err )
308310 }
309311}
310312
311313export function statusTelemetry ( ) {
312- printTelemetryStatus ( )
314+ const { telemetry } = getTelemetryConfig ( )
315+ printTelemetryStatus ( telemetry )
313316}
314317
315318export function informTelemetry ( ) {
@@ -322,17 +325,17 @@ export function enableTelemetry () {
322325 if ( ! telemetry ) {
323326 userConfig . set ( 'telemetry' , getDefault ( telemetry ) )
324327 }
325- printTelemetryStatus ( )
328+ statusTelemetry ( )
326329}
327330
328331export function disableTelemetry ( ) {
329332 const { userConfig } = getTelemetryConfig ( )
330333 userConfig . set ( 'telemetry' , false )
331- printTelemetryStatus ( )
334+ statusTelemetry ( )
332335}
333336
334337export function resetTelemetry ( ) {
335338 const { userConfig } = getTelemetryConfig ( )
336339 userConfig . delete ( 'telemetry' )
337- printTelemetryStatus ( )
340+ statusTelemetry ( )
338341}
0 commit comments