@tldraw/editor 3.16.0-canary.f60032f16651 → 3.16.0-canary.faec5de49906

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 (167) hide show
  1. package/dist-cjs/index.d.ts +77 -101
  2. package/dist-cjs/index.js +3 -5
  3. package/dist-cjs/index.js.map +2 -2
  4. package/dist-cjs/lib/TldrawEditor.js +6 -6
  5. package/dist-cjs/lib/TldrawEditor.js.map +2 -2
  6. package/dist-cjs/lib/components/Shape.js +7 -10
  7. package/dist-cjs/lib/components/Shape.js.map +2 -2
  8. package/dist-cjs/lib/components/default-components/DefaultCanvas.js +4 -23
  9. package/dist-cjs/lib/components/default-components/DefaultCanvas.js.map +2 -2
  10. package/dist-cjs/lib/components/default-components/DefaultCollaboratorHint.js +1 -1
  11. package/dist-cjs/lib/components/default-components/DefaultCollaboratorHint.js.map +1 -1
  12. package/dist-cjs/lib/components/default-components/DefaultErrorFallback.js +1 -1
  13. package/dist-cjs/lib/components/default-components/DefaultErrorFallback.js.map +2 -2
  14. package/dist-cjs/lib/components/default-components/DefaultScribble.js +1 -1
  15. package/dist-cjs/lib/components/default-components/DefaultScribble.js.map +2 -2
  16. package/dist-cjs/lib/components/default-components/DefaultShapeIndicator.js +9 -1
  17. package/dist-cjs/lib/components/default-components/DefaultShapeIndicator.js.map +2 -2
  18. package/dist-cjs/lib/config/TLUserPreferences.js +9 -3
  19. package/dist-cjs/lib/config/TLUserPreferences.js.map +2 -2
  20. package/dist-cjs/lib/editor/Editor.js +61 -126
  21. package/dist-cjs/lib/editor/Editor.js.map +2 -2
  22. package/dist-cjs/lib/editor/derivations/notVisibleShapes.js +4 -0
  23. package/dist-cjs/lib/editor/derivations/notVisibleShapes.js.map +2 -2
  24. package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js +9 -4
  25. package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js.map +2 -2
  26. package/dist-cjs/lib/editor/shapes/ShapeUtil.js +23 -0
  27. package/dist-cjs/lib/editor/shapes/ShapeUtil.js.map +2 -2
  28. package/dist-cjs/lib/editor/types/misc-types.js.map +1 -1
  29. package/dist-cjs/lib/exports/getSvgJsx.js +35 -16
  30. package/dist-cjs/lib/exports/getSvgJsx.js.map +2 -2
  31. package/dist-cjs/lib/hooks/useCanvasEvents.js +7 -5
  32. package/dist-cjs/lib/hooks/useCanvasEvents.js.map +2 -2
  33. package/dist-cjs/lib/hooks/usePassThroughMouseOverEvents.js +4 -1
  34. package/dist-cjs/lib/hooks/usePassThroughMouseOverEvents.js.map +2 -2
  35. package/dist-cjs/lib/hooks/usePassThroughWheelEvents.js +4 -1
  36. package/dist-cjs/lib/hooks/usePassThroughWheelEvents.js.map +2 -2
  37. package/dist-cjs/lib/license/LicenseManager.js +120 -50
  38. package/dist-cjs/lib/license/LicenseManager.js.map +2 -2
  39. package/dist-cjs/lib/license/LicenseProvider.js +39 -1
  40. package/dist-cjs/lib/license/LicenseProvider.js.map +2 -2
  41. package/dist-cjs/lib/license/Watermark.js +72 -10
  42. package/dist-cjs/lib/license/Watermark.js.map +3 -3
  43. package/dist-cjs/lib/license/useLicenseManagerState.js.map +2 -2
  44. package/dist-cjs/lib/options.js +7 -0
  45. package/dist-cjs/lib/options.js.map +2 -2
  46. package/dist-cjs/lib/primitives/Box.js +3 -0
  47. package/dist-cjs/lib/primitives/Box.js.map +2 -2
  48. package/dist-cjs/lib/primitives/Vec.js +0 -4
  49. package/dist-cjs/lib/primitives/Vec.js.map +2 -2
  50. package/dist-cjs/lib/primitives/geometry/Geometry2d.js +50 -20
  51. package/dist-cjs/lib/primitives/geometry/Geometry2d.js.map +2 -2
  52. package/dist-cjs/lib/primitives/geometry/Group2d.js +8 -1
  53. package/dist-cjs/lib/primitives/geometry/Group2d.js.map +2 -2
  54. package/dist-cjs/lib/utils/reparenting.js +2 -35
  55. package/dist-cjs/lib/utils/reparenting.js.map +3 -3
  56. package/dist-cjs/version.js +3 -3
  57. package/dist-cjs/version.js.map +1 -1
  58. package/dist-esm/index.d.mts +77 -101
  59. package/dist-esm/index.mjs +3 -5
  60. package/dist-esm/index.mjs.map +2 -2
  61. package/dist-esm/lib/TldrawEditor.mjs +6 -6
  62. package/dist-esm/lib/TldrawEditor.mjs.map +2 -2
  63. package/dist-esm/lib/components/Shape.mjs +7 -10
  64. package/dist-esm/lib/components/Shape.mjs.map +2 -2
  65. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs +4 -23
  66. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs.map +2 -2
  67. package/dist-esm/lib/components/default-components/DefaultCollaboratorHint.mjs +1 -1
  68. package/dist-esm/lib/components/default-components/DefaultCollaboratorHint.mjs.map +1 -1
  69. package/dist-esm/lib/components/default-components/DefaultErrorFallback.mjs +1 -1
  70. package/dist-esm/lib/components/default-components/DefaultErrorFallback.mjs.map +2 -2
  71. package/dist-esm/lib/components/default-components/DefaultScribble.mjs +1 -1
  72. package/dist-esm/lib/components/default-components/DefaultScribble.mjs.map +2 -2
  73. package/dist-esm/lib/components/default-components/DefaultShapeIndicator.mjs +9 -1
  74. package/dist-esm/lib/components/default-components/DefaultShapeIndicator.mjs.map +2 -2
  75. package/dist-esm/lib/config/TLUserPreferences.mjs +9 -3
  76. package/dist-esm/lib/config/TLUserPreferences.mjs.map +2 -2
  77. package/dist-esm/lib/editor/Editor.mjs +61 -126
  78. package/dist-esm/lib/editor/Editor.mjs.map +2 -2
  79. package/dist-esm/lib/editor/derivations/notVisibleShapes.mjs +4 -0
  80. package/dist-esm/lib/editor/derivations/notVisibleShapes.mjs.map +2 -2
  81. package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs +9 -4
  82. package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs.map +2 -2
  83. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs +23 -0
  84. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs.map +2 -2
  85. package/dist-esm/lib/exports/getSvgJsx.mjs +36 -16
  86. package/dist-esm/lib/exports/getSvgJsx.mjs.map +2 -2
  87. package/dist-esm/lib/hooks/useCanvasEvents.mjs +7 -5
  88. package/dist-esm/lib/hooks/useCanvasEvents.mjs.map +2 -2
  89. package/dist-esm/lib/hooks/usePassThroughMouseOverEvents.mjs +4 -1
  90. package/dist-esm/lib/hooks/usePassThroughMouseOverEvents.mjs.map +2 -2
  91. package/dist-esm/lib/hooks/usePassThroughWheelEvents.mjs +4 -1
  92. package/dist-esm/lib/hooks/usePassThroughWheelEvents.mjs.map +2 -2
  93. package/dist-esm/lib/license/LicenseManager.mjs +121 -51
  94. package/dist-esm/lib/license/LicenseManager.mjs.map +2 -2
  95. package/dist-esm/lib/license/LicenseProvider.mjs +39 -2
  96. package/dist-esm/lib/license/LicenseProvider.mjs.map +2 -2
  97. package/dist-esm/lib/license/Watermark.mjs +72 -10
  98. package/dist-esm/lib/license/Watermark.mjs.map +3 -3
  99. package/dist-esm/lib/license/useLicenseManagerState.mjs.map +2 -2
  100. package/dist-esm/lib/options.mjs +7 -0
  101. package/dist-esm/lib/options.mjs.map +2 -2
  102. package/dist-esm/lib/primitives/Box.mjs +4 -1
  103. package/dist-esm/lib/primitives/Box.mjs.map +2 -2
  104. package/dist-esm/lib/primitives/Vec.mjs +0 -4
  105. package/dist-esm/lib/primitives/Vec.mjs.map +2 -2
  106. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs +53 -21
  107. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs.map +2 -2
  108. package/dist-esm/lib/primitives/geometry/Group2d.mjs +8 -1
  109. package/dist-esm/lib/primitives/geometry/Group2d.mjs.map +2 -2
  110. package/dist-esm/lib/utils/reparenting.mjs +3 -40
  111. package/dist-esm/lib/utils/reparenting.mjs.map +2 -2
  112. package/dist-esm/version.mjs +3 -3
  113. package/dist-esm/version.mjs.map +1 -1
  114. package/editor.css +308 -290
  115. package/package.json +14 -37
  116. package/src/index.ts +2 -9
  117. package/src/lib/TldrawEditor.tsx +7 -14
  118. package/src/lib/components/Shape.tsx +6 -12
  119. package/src/lib/components/default-components/DefaultCanvas.tsx +5 -22
  120. package/src/lib/components/default-components/DefaultCollaboratorHint.tsx +1 -1
  121. package/src/lib/components/default-components/DefaultErrorFallback.tsx +1 -1
  122. package/src/lib/components/default-components/DefaultScribble.tsx +1 -1
  123. package/src/lib/components/default-components/DefaultShapeIndicator.tsx +5 -1
  124. package/src/lib/config/TLUserPreferences.ts +8 -1
  125. package/src/lib/editor/Editor.test.ts +12 -11
  126. package/src/lib/editor/Editor.ts +79 -168
  127. package/src/lib/editor/derivations/notVisibleShapes.ts +6 -0
  128. package/src/lib/editor/managers/ClickManager/ClickManager.test.ts +15 -14
  129. package/src/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.test.ts +16 -15
  130. package/src/lib/editor/managers/FocusManager/FocusManager.test.ts +49 -48
  131. package/src/lib/editor/managers/FontManager/FontManager.test.ts +24 -23
  132. package/src/lib/editor/managers/HistoryManager/HistoryManager.test.ts +7 -6
  133. package/src/lib/editor/managers/ScribbleManager/ScribbleManager.test.ts +12 -11
  134. package/src/lib/editor/managers/SnapManager/SnapManager.test.ts +57 -50
  135. package/src/lib/editor/managers/TextManager/TextManager.test.ts +51 -26
  136. package/src/lib/editor/managers/TickManager/TickManager.test.ts +14 -13
  137. package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.test.ts +34 -26
  138. package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.ts +6 -1
  139. package/src/lib/editor/shapes/ShapeUtil.ts +46 -0
  140. package/src/lib/editor/types/misc-types.ts +0 -6
  141. package/src/lib/exports/getSvgJsx.test.ts +868 -0
  142. package/src/lib/exports/getSvgJsx.tsx +78 -21
  143. package/src/lib/hooks/useCanvasEvents.ts +6 -6
  144. package/src/lib/hooks/usePassThroughMouseOverEvents.ts +4 -1
  145. package/src/lib/hooks/usePassThroughWheelEvents.ts +6 -1
  146. package/src/lib/license/LicenseManager.test.ts +648 -383
  147. package/src/lib/license/LicenseManager.ts +173 -53
  148. package/src/lib/license/LicenseProvider.tsx +74 -2
  149. package/src/lib/license/Watermark.test.tsx +2 -1
  150. package/src/lib/license/Watermark.tsx +77 -10
  151. package/src/lib/license/useLicenseManagerState.ts +2 -2
  152. package/src/lib/options.ts +8 -0
  153. package/src/lib/primitives/Box.test.ts +126 -0
  154. package/src/lib/primitives/Box.ts +10 -1
  155. package/src/lib/primitives/Vec.ts +0 -5
  156. package/src/lib/primitives/geometry/Geometry2d.test.ts +420 -0
  157. package/src/lib/primitives/geometry/Geometry2d.ts +78 -21
  158. package/src/lib/primitives/geometry/Group2d.ts +10 -1
  159. package/src/lib/utils/reparenting.ts +3 -69
  160. package/src/lib/utils/sync/LocalIndexedDb.test.ts +2 -1
  161. package/src/lib/utils/sync/TLLocalSyncClient.test.ts +15 -15
  162. package/src/version.ts +3 -3
  163. package/dist-cjs/lib/utils/nearestMultiple.js +0 -34
  164. package/dist-cjs/lib/utils/nearestMultiple.js.map +0 -7
  165. package/dist-esm/lib/utils/nearestMultiple.mjs +0 -14
  166. package/dist-esm/lib/utils/nearestMultiple.mjs.map +0 -7
  167. package/src/lib/utils/nearestMultiple.ts +0 -13
@@ -1,16 +1,18 @@
1
1
  import crypto from 'crypto'
2
+ import { vi } from 'vitest'
2
3
  import { publishDates } from '../../version'
3
4
  import { str2ab } from '../utils/licensing'
4
5
  import {
5
6
  FLAGS,
6
- isEditorUnlicensed,
7
+ getLicenseState,
7
8
  LicenseManager,
8
9
  PROPERTIES,
9
10
  ValidLicenseKeyResult,
10
11
  } from './LicenseManager'
11
12
 
12
- jest.mock('../../version', () => {
13
+ vi.mock('../../version', () => {
13
14
  return {
15
+ version: '3.15.1',
14
16
  publishDates: {
15
17
  major: '2024-06-28T10:56:07.893Z',
16
18
  minor: '2024-07-02T16:49:50.397Z',
@@ -50,337 +52,421 @@ describe('LicenseManager', () => {
50
52
  window.location = new URL('https://www.example.com')
51
53
  })
52
54
 
53
- it('Fails if no key provided', async () => {
54
- const result = await licenseManager.getLicenseFromKey('')
55
- expect(result).toMatchObject({ isLicenseParseable: false, reason: 'no-key-provided' })
56
- })
55
+ describe('Basic license validation', () => {
56
+ it('Fails if no key provided', async () => {
57
+ const result = await licenseManager.getLicenseFromKey('')
58
+ expect(result).toMatchObject({ isLicenseParseable: false, reason: 'no-key-provided' })
59
+ })
57
60
 
58
- it('Signals that it is development mode when appropriate', async () => {
59
- const schemes = ['http', 'https']
60
- for (const scheme of schemes) {
61
- // @ts-ignore
62
- delete window.location
63
- // @ts-ignore
64
- window.location = new URL(`${scheme}://localhost:3000`)
61
+ it('Signals that it is development mode when appropriate', async () => {
62
+ const schemes = ['http', 'https']
63
+ for (const scheme of schemes) {
64
+ // @ts-ignore
65
+ delete window.location
66
+ // @ts-ignore
67
+ window.location = new URL(`${scheme}://localhost:3000`)
68
+
69
+ const testEnvLicenseManager = new LicenseManager('', keyPair.publicKey, 'development')
70
+ const licenseKey = await generateLicenseKey(STANDARD_LICENSE_INFO, keyPair)
71
+ const result = await testEnvLicenseManager.getLicenseFromKey(licenseKey)
72
+ expect(result).toMatchObject({
73
+ isLicenseParseable: true,
74
+ isDomainValid: false,
75
+ isDevelopment: true,
76
+ })
77
+ }
78
+ })
79
+
80
+ it('Cleanses out valid keys that accidentally have zero-width characters or newlines', async () => {
81
+ const cleanLicenseKey = await generateLicenseKey(STANDARD_LICENSE_INFO, keyPair)
82
+ const dirtyLicenseKey = cleanLicenseKey + '\u200B\u200D\uFEFF\n\r'
83
+ const result = await licenseManager.getLicenseFromKey(dirtyLicenseKey)
84
+ expect(result.isLicenseParseable).toBe(true)
85
+ })
86
+
87
+ it('Fails if garbage key provided', async () => {
88
+ const badPublicKeyLicenseManager = new LicenseManager('', 'badpublickey', 'production')
89
+ const invalidLicenseKey = await generateLicenseKey(STANDARD_LICENSE_INFO, keyPair)
90
+ const result = await badPublicKeyLicenseManager.getLicenseFromKey(invalidLicenseKey)
91
+ expect(result).toMatchObject({ isLicenseParseable: false, reason: 'invalid-license-key' })
92
+ })
93
+
94
+ it('Fails if non-JSON parseable message is provided', async () => {
95
+ const invalidMessage = await generateLicenseKey('asdfsad', keyPair)
96
+ const result = await licenseManager.getLicenseFromKey(invalidMessage)
97
+ expect(result).toMatchObject({ isLicenseParseable: false, reason: 'invalid-license-key' })
98
+ })
65
99
 
66
- const testEnvLicenseManager = new LicenseManager('', keyPair.publicKey, 'development')
100
+ it('Succeeds if valid key provided', async () => {
67
101
  const licenseKey = await generateLicenseKey(STANDARD_LICENSE_INFO, keyPair)
68
- const result = await testEnvLicenseManager.getLicenseFromKey(licenseKey)
102
+ const result = await licenseManager.getLicenseFromKey(licenseKey)
69
103
  expect(result).toMatchObject({
70
104
  isLicenseParseable: true,
71
- isDomainValid: false,
72
- isDevelopment: true,
73
- })
74
- }
105
+ license: {
106
+ id: 'id',
107
+ hosts: ['www.example.com'],
108
+ flags: FLAGS.ANNUAL_LICENSE,
109
+ expiryDate,
110
+ },
111
+ isDomainValid: true,
112
+ isAnnualLicense: true,
113
+ isAnnualLicenseExpired: false,
114
+ isPerpetualLicense: false,
115
+ isPerpetualLicenseExpired: false,
116
+ isInternalLicense: false,
117
+ isEvaluationLicense: false,
118
+ isEvaluationLicenseExpired: false,
119
+ daysSinceExpiry: 0,
120
+ } as ValidLicenseKeyResult)
121
+ })
75
122
  })
76
123
 
77
- it('Cleanses out valid keys that accidentally have zero-width characters or newlines', async () => {
78
- const cleanLicenseKey = await generateLicenseKey(STANDARD_LICENSE_INFO, keyPair)
79
- const dirtyLicenseKey = cleanLicenseKey + '\u200B\u200D\uFEFF\n\r'
80
- const result = await licenseManager.getLicenseFromKey(dirtyLicenseKey)
81
- expect(result.isLicenseParseable).toBe(true)
82
- })
124
+ describe('Domain validation', () => {
125
+ it('Fails with invalid host', async () => {
126
+ // @ts-ignore
127
+ delete window.location
128
+ // @ts-ignore
129
+ window.location = new URL('https://www.foo.com')
83
130
 
84
- it('Fails if garbage key provided', async () => {
85
- const badPublicKeyLicenseManager = new LicenseManager('', 'badpublickey', 'production')
86
- const invalidLicenseKey = await generateLicenseKey(STANDARD_LICENSE_INFO, keyPair)
87
- const result = await badPublicKeyLicenseManager.getLicenseFromKey(invalidLicenseKey)
88
- expect(result).toMatchObject({ isLicenseParseable: false, reason: 'invalid-license-key' })
89
- })
131
+ const expiredLicenseKey = await generateLicenseKey(STANDARD_LICENSE_INFO, keyPair)
132
+ const result = (await licenseManager.getLicenseFromKey(
133
+ expiredLicenseKey
134
+ )) as ValidLicenseKeyResult
135
+ expect(result.isDomainValid).toBe(false)
136
+ })
90
137
 
91
- it('Fails if non-JSON parseable message is provided', async () => {
92
- const invalidMessage = await generateLicenseKey('asdfsad', keyPair)
93
- const result = await licenseManager.getLicenseFromKey(invalidMessage)
94
- expect(result).toMatchObject({ isLicenseParseable: false, reason: 'invalid-license-key' })
95
- })
138
+ it('Succeeds if hosts is equal to only "*"', async () => {
139
+ // @ts-ignore
140
+ delete window.location
141
+ // @ts-ignore
142
+ window.location = new URL('https://www.foo.com')
143
+
144
+ const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
145
+ permissiveHostsInfo[PROPERTIES.HOSTS] = ['*']
146
+ const permissiveLicenseKey = await generateLicenseKey(
147
+ JSON.stringify(permissiveHostsInfo),
148
+ keyPair
149
+ )
150
+ const result = (await licenseManager.getLicenseFromKey(
151
+ permissiveLicenseKey
152
+ )) as ValidLicenseKeyResult
153
+ expect(result.isDomainValid).toBe(true)
154
+ })
96
155
 
97
- it('Succeeds if valid key provided', async () => {
98
- const licenseKey = await generateLicenseKey(STANDARD_LICENSE_INFO, keyPair)
99
- const result = await licenseManager.getLicenseFromKey(licenseKey)
100
- expect(result).toMatchObject({
101
- isLicenseParseable: true,
102
- license: {
103
- id: 'id',
104
- hosts: ['www.example.com'],
105
- flags: FLAGS.ANNUAL_LICENSE,
106
- expiryDate,
107
- },
108
- isDomainValid: true,
109
- isAnnualLicense: true,
110
- isAnnualLicenseExpired: false,
111
- isPerpetualLicense: false,
112
- isPerpetualLicenseExpired: false,
113
- isInternalLicense: false,
114
- } as ValidLicenseKeyResult)
115
- })
156
+ it('Succeeds if has an apex domain specified', async () => {
157
+ // @ts-ignore
158
+ delete window.location
159
+ // @ts-ignore
160
+ window.location = new URL('https://www.example.com')
161
+
162
+ const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
163
+ permissiveHostsInfo[PROPERTIES.HOSTS] = ['example.com']
164
+ const permissiveLicenseKey = await generateLicenseKey(
165
+ JSON.stringify(permissiveHostsInfo),
166
+ keyPair
167
+ )
168
+ const result = (await licenseManager.getLicenseFromKey(
169
+ permissiveLicenseKey
170
+ )) as ValidLicenseKeyResult
171
+ expect(result.isDomainValid).toBe(true)
172
+ })
116
173
 
117
- it('Fails if the license key has expired', async () => {
118
- const expiredLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
119
- const expiryDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 6) // 6 days ago
120
- expiredLicenseInfo[PROPERTIES.EXPIRY_DATE] = expiryDate
121
- const expiredLicenseKey = await generateLicenseKey(JSON.stringify(expiredLicenseInfo), keyPair)
122
- const result = (await licenseManager.getLicenseFromKey(
123
- expiredLicenseKey
124
- )) as ValidLicenseKeyResult
125
- expect(result.isAnnualLicenseExpired).toBe(true)
126
- })
174
+ it('Succeeds if has an www domain specified, but at the apex domain', async () => {
175
+ // @ts-ignore
176
+ delete window.location
177
+ // @ts-ignore
178
+ window.location = new URL('https://example.com')
179
+
180
+ const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
181
+ permissiveHostsInfo[PROPERTIES.HOSTS] = ['www.example.com']
182
+ const permissiveLicenseKey = await generateLicenseKey(
183
+ JSON.stringify(permissiveHostsInfo),
184
+ keyPair
185
+ )
186
+ const result = (await licenseManager.getLicenseFromKey(
187
+ permissiveLicenseKey
188
+ )) as ValidLicenseKeyResult
189
+ expect(result.isDomainValid).toBe(true)
190
+ })
127
191
 
128
- it('Allows a grace period for expired licenses', async () => {
129
- const almostExpiredLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
130
- const expiryDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 5) // 5 days ago
131
- almostExpiredLicenseInfo[PROPERTIES.EXPIRY_DATE] = expiryDate
132
- const almostExpiredLicenseKey = await generateLicenseKey(
133
- JSON.stringify(almostExpiredLicenseInfo),
134
- keyPair
135
- )
136
- const result = (await licenseManager.getLicenseFromKey(
137
- almostExpiredLicenseKey
138
- )) as ValidLicenseKeyResult
139
- expect(result.isAnnualLicenseExpired).toBe(false)
140
- })
192
+ it('Succeeds if has a subdomain wildcard', async () => {
193
+ // @ts-ignore
194
+ delete window.location
195
+ // @ts-ignore
196
+ window.location = new URL('https://sub.example.com')
197
+
198
+ const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
199
+ permissiveHostsInfo[PROPERTIES.HOSTS] = ['*.example.com']
200
+ const permissiveLicenseKey = await generateLicenseKey(
201
+ JSON.stringify(permissiveHostsInfo),
202
+ keyPair
203
+ )
204
+ const result = (await licenseManager.getLicenseFromKey(
205
+ permissiveLicenseKey
206
+ )) as ValidLicenseKeyResult
207
+ expect(result.isDomainValid).toBe(true)
208
+ })
141
209
 
142
- // We mock the patch version to be in 2030 above.
143
- it('Succeeds for perpetual license with correct version (and patch does not matter)', async () => {
144
- const majorDate = new Date(publishDates.major)
145
- const expiryDate = new Date(
146
- majorDate.getFullYear(),
147
- majorDate.getMonth(),
148
- majorDate.getDate() + 100
149
- )
150
- const perpetualLicenseInfo = ['id', ['www.example.com'], FLAGS.PERPETUAL_LICENSE, expiryDate]
151
- const almostExpiredLicenseKey = await generateLicenseKey(
152
- JSON.stringify(perpetualLicenseInfo),
153
- keyPair
154
- )
155
- const result = (await licenseManager.getLicenseFromKey(
156
- almostExpiredLicenseKey
157
- )) as ValidLicenseKeyResult
158
- expect(result.isPerpetualLicense).toBe(true)
159
- expect(result.isPerpetualLicenseExpired).toBe(false)
160
- })
210
+ it('Succeeds if has a sub-subdomain wildcard', async () => {
211
+ // @ts-ignore
212
+ delete window.location
213
+ // @ts-ignore
214
+ window.location = new URL('https://pr-2408.sub.example.com')
215
+
216
+ const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
217
+ permissiveHostsInfo[PROPERTIES.HOSTS] = ['*.example.com']
218
+ const permissiveLicenseKey = await generateLicenseKey(
219
+ JSON.stringify(permissiveHostsInfo),
220
+ keyPair
221
+ )
222
+ const result = (await licenseManager.getLicenseFromKey(
223
+ permissiveLicenseKey
224
+ )) as ValidLicenseKeyResult
225
+ expect(result.isDomainValid).toBe(true)
226
+ })
161
227
 
162
- it('Fails for perpetual license past the release version', async () => {
163
- const majorDate = new Date(publishDates.major)
164
- const expiryDate = new Date(
165
- majorDate.getFullYear(),
166
- majorDate.getMonth(),
167
- majorDate.getDate() - 100
168
- )
169
- const perpetualLicenseInfo = ['id', ['www.example.com'], FLAGS.PERPETUAL_LICENSE, expiryDate]
170
- const almostExpiredLicenseKey = await generateLicenseKey(
171
- JSON.stringify(perpetualLicenseInfo),
172
- keyPair
173
- )
174
- const result = (await licenseManager.getLicenseFromKey(
175
- almostExpiredLicenseKey
176
- )) as ValidLicenseKeyResult
177
- expect(result.isPerpetualLicense).toBe(true)
178
- expect(result.isPerpetualLicenseExpired).toBe(true)
179
- })
228
+ it('Succeeds if has a subdomain wildcard but on an apex domain', async () => {
229
+ // @ts-ignore
230
+ delete window.location
231
+ // @ts-ignore
232
+ window.location = new URL('https://example.com')
233
+
234
+ const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
235
+ permissiveHostsInfo[PROPERTIES.HOSTS] = ['*.example.com']
236
+ const permissiveLicenseKey = await generateLicenseKey(
237
+ JSON.stringify(permissiveHostsInfo),
238
+ keyPair
239
+ )
240
+ const result = (await licenseManager.getLicenseFromKey(
241
+ permissiveLicenseKey
242
+ )) as ValidLicenseKeyResult
243
+ expect(result.isDomainValid).toBe(true)
244
+ })
180
245
 
181
- it('Fails with invalid host', async () => {
182
- // @ts-ignore
183
- delete window.location
184
- // @ts-ignore
185
- window.location = new URL('https://www.foo.com')
246
+ it('Fails if has a subdomain wildcard isnt for the same base domain', async () => {
247
+ // @ts-ignore
248
+ delete window.location
249
+ // @ts-ignore
250
+ window.location = new URL('https://sub.example.com')
251
+
252
+ const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
253
+ permissiveHostsInfo[PROPERTIES.HOSTS] = ['*.foo.com']
254
+ const permissiveLicenseKey = await generateLicenseKey(
255
+ JSON.stringify(permissiveHostsInfo),
256
+ keyPair
257
+ )
258
+ const result = (await licenseManager.getLicenseFromKey(
259
+ permissiveLicenseKey
260
+ )) as ValidLicenseKeyResult
261
+ expect(result.isDomainValid).toBe(false)
262
+ })
186
263
 
187
- const expiredLicenseKey = await generateLicenseKey(STANDARD_LICENSE_INFO, keyPair)
188
- const result = (await licenseManager.getLicenseFromKey(
189
- expiredLicenseKey
190
- )) as ValidLicenseKeyResult
191
- expect(result.isDomainValid).toBe(false)
192
- })
264
+ it('Succeeds if it is a vscode extension', async () => {
265
+ // @ts-ignore
266
+ delete window.location
267
+ // @ts-ignore
268
+ window.location = new URL(
269
+ 'vscode-webview:vscode-webview://1ipd8pun8ud7nd7hv9d112g7evi7m10vak9vviuvia66ou6aibp3/index.html?id=6ec2dc7a-afe9-45d9-bd71-1749f9568d28&origin=955b256f-37e1-4a72-a2f4-ad633e88239c&swVersion=4&extensionId=tldraw-org.tldraw-vscode&platform=electron&vscode-resource-base-authority=vscode-resource.vscode-cdn.net&parentOrigin=vscode-file%3A%2F%2Fvscode-app'
270
+ )
271
+
272
+ const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
273
+ permissiveHostsInfo[PROPERTIES.HOSTS] = ['tldraw-org.tldraw-vscode']
274
+ const permissiveLicenseKey = await generateLicenseKey(
275
+ JSON.stringify(permissiveHostsInfo),
276
+ keyPair
277
+ )
278
+ const result = (await licenseManager.getLicenseFromKey(
279
+ permissiveLicenseKey
280
+ )) as ValidLicenseKeyResult
281
+ expect(result.isDomainValid).toBe(true)
282
+ })
193
283
 
194
- it('Succeeds if hosts is equal to only "*"', async () => {
195
- // @ts-ignore
196
- delete window.location
197
- // @ts-ignore
198
- window.location = new URL('https://www.foo.com')
199
-
200
- const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
201
- permissiveHostsInfo[PROPERTIES.HOSTS] = ['*']
202
- const permissiveLicenseKey = await generateLicenseKey(
203
- JSON.stringify(permissiveHostsInfo),
204
- keyPair
205
- )
206
- const result = (await licenseManager.getLicenseFromKey(
207
- permissiveLicenseKey
208
- )) as ValidLicenseKeyResult
209
- expect(result.isDomainValid).toBe(true)
284
+ it('Fails if it is a vscode extension with the wrong id', async () => {
285
+ // @ts-ignore
286
+ delete window.location
287
+ // @ts-ignore
288
+ window.location = new URL(
289
+ 'vscode-webview:vscode-webview://1ipd8pun8ud7nd7hv9d112g7evi7m10vak9vviuvia66ou6aibp3/index.html?id=6ec2dc7a-afe9-45d9-bd71-1749f9568d28&origin=955b256f-37e1-4a72-a2f4-ad633e88239c&swVersion=4&extensionId=tldraw-org.tldraw-vscode&platform=electron&vscode-resource-base-authority=vscode-resource.vscode-cdn.net&parentOrigin=vscode-file%3A%2F%2Fvscode-app'
290
+ )
291
+
292
+ const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
293
+ permissiveHostsInfo[PROPERTIES.HOSTS] = ['blah-org.blah-vscode']
294
+ const permissiveLicenseKey = await generateLicenseKey(
295
+ JSON.stringify(permissiveHostsInfo),
296
+ keyPair
297
+ )
298
+ const result = (await licenseManager.getLicenseFromKey(
299
+ permissiveLicenseKey
300
+ )) as ValidLicenseKeyResult
301
+ expect(result.isDomainValid).toBe(false)
302
+ })
210
303
  })
211
304
 
212
- it('Succeeds if has an apex domain specified', async () => {
213
- // @ts-ignore
214
- delete window.location
215
- // @ts-ignore
216
- window.location = new URL('https://www.example.com')
305
+ describe('License types and flags', () => {
306
+ it('Checks for internal license', async () => {
307
+ const internalLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
308
+ internalLicenseInfo[PROPERTIES.FLAGS] = FLAGS.INTERNAL_LICENSE
309
+ const internalLicenseKey = await generateLicenseKey(
310
+ JSON.stringify(internalLicenseInfo),
311
+ keyPair
312
+ )
313
+ const result = (await licenseManager.getLicenseFromKey(
314
+ internalLicenseKey
315
+ )) as ValidLicenseKeyResult
316
+ expect(result.isInternalLicense).toBe(true)
317
+ })
217
318
 
218
- const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
219
- permissiveHostsInfo[PROPERTIES.HOSTS] = ['example.com']
220
- const permissiveLicenseKey = await generateLicenseKey(
221
- JSON.stringify(permissiveHostsInfo),
222
- keyPair
223
- )
224
- const result = (await licenseManager.getLicenseFromKey(
225
- permissiveLicenseKey
226
- )) as ValidLicenseKeyResult
227
- expect(result.isDomainValid).toBe(true)
228
- })
319
+ it('Checks for license with watermark', async () => {
320
+ const withWatermarkLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
321
+ withWatermarkLicenseInfo[PROPERTIES.FLAGS] |= FLAGS.WITH_WATERMARK
322
+ const withWatermarkLicenseKey = await generateLicenseKey(
323
+ JSON.stringify(withWatermarkLicenseInfo),
324
+ keyPair
325
+ )
326
+ const result = (await licenseManager.getLicenseFromKey(
327
+ withWatermarkLicenseKey
328
+ )) as ValidLicenseKeyResult
329
+ expect(result.isLicensedWithWatermark).toBe(true)
330
+ })
229
331
 
230
- it('Succeeds if has an www domain specified, but at the apex domain', async () => {
231
- // @ts-ignore
232
- delete window.location
233
- // @ts-ignore
234
- window.location = new URL('https://example.com')
235
-
236
- const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
237
- permissiveHostsInfo[PROPERTIES.HOSTS] = ['www.example.com']
238
- const permissiveLicenseKey = await generateLicenseKey(
239
- JSON.stringify(permissiveHostsInfo),
240
- keyPair
241
- )
242
- const result = (await licenseManager.getLicenseFromKey(
243
- permissiveLicenseKey
244
- )) as ValidLicenseKeyResult
245
- expect(result.isDomainValid).toBe(true)
246
- })
332
+ it('Checks for evaluation license', async () => {
333
+ const evaluationLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
334
+ evaluationLicenseInfo[PROPERTIES.FLAGS] = FLAGS.EVALUATION_LICENSE
335
+ const evaluationLicenseKey = await generateLicenseKey(
336
+ JSON.stringify(evaluationLicenseInfo),
337
+ keyPair
338
+ )
339
+ const result = (await licenseManager.getLicenseFromKey(
340
+ evaluationLicenseKey
341
+ )) as ValidLicenseKeyResult
342
+ expect(result.isEvaluationLicense).toBe(true)
343
+ expect(result.isEvaluationLicenseExpired).toBe(false)
344
+ })
247
345
 
248
- it('Succeeds if has a subdomain wildcard', async () => {
249
- // @ts-ignore
250
- delete window.location
251
- // @ts-ignore
252
- window.location = new URL('https://sub.example.com')
253
-
254
- const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
255
- permissiveHostsInfo[PROPERTIES.HOSTS] = ['*.example.com']
256
- const permissiveLicenseKey = await generateLicenseKey(
257
- JSON.stringify(permissiveHostsInfo),
258
- keyPair
259
- )
260
- const result = (await licenseManager.getLicenseFromKey(
261
- permissiveLicenseKey
262
- )) as ValidLicenseKeyResult
263
- expect(result.isDomainValid).toBe(true)
346
+ it('Detects when evaluation license has expired', async () => {
347
+ const expiredEvaluationLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
348
+ expiredEvaluationLicenseInfo[PROPERTIES.FLAGS] = FLAGS.EVALUATION_LICENSE
349
+ const expiredDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1) // 1 day ago
350
+ expiredEvaluationLicenseInfo[PROPERTIES.EXPIRY_DATE] = expiredDate.toISOString()
351
+
352
+ const expiredEvaluationLicenseKey = await generateLicenseKey(
353
+ JSON.stringify(expiredEvaluationLicenseInfo),
354
+ keyPair
355
+ )
356
+
357
+ // The getLicenseFromKey should return the expired state
358
+ const result = (await licenseManager.getLicenseFromKey(
359
+ expiredEvaluationLicenseKey
360
+ )) as ValidLicenseKeyResult
361
+ expect(result.isEvaluationLicense).toBe(true)
362
+ expect(result.isEvaluationLicenseExpired).toBe(true)
363
+ })
264
364
  })
265
365
 
266
- it('Succeeds if has a sub-subdomain wildcard', async () => {
267
- // @ts-ignore
268
- delete window.location
269
- // @ts-ignore
270
- window.location = new URL('https://pr-2408.sub.example.com')
271
-
272
- const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
273
- permissiveHostsInfo[PROPERTIES.HOSTS] = ['*.example.com']
274
- const permissiveLicenseKey = await generateLicenseKey(
275
- JSON.stringify(permissiveHostsInfo),
276
- keyPair
277
- )
278
- const result = (await licenseManager.getLicenseFromKey(
279
- permissiveLicenseKey
280
- )) as ValidLicenseKeyResult
281
- expect(result.isDomainValid).toBe(true)
282
- })
366
+ describe('License expiry and grace period', () => {
367
+ it('Fails if the license key has expired beyond grace period', async () => {
368
+ const expiredLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
369
+ const expiryDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 40) // 40 days ago (beyond 30-day grace period)
370
+ expiredLicenseInfo[PROPERTIES.EXPIRY_DATE] = expiryDate
371
+ const expiredLicenseKey = await generateLicenseKey(
372
+ JSON.stringify(expiredLicenseInfo),
373
+ keyPair
374
+ )
375
+ const result = (await licenseManager.getLicenseFromKey(
376
+ expiredLicenseKey
377
+ )) as ValidLicenseKeyResult
378
+ expect(result.isAnnualLicenseExpired).toBe(true)
379
+ })
283
380
 
284
- it('Succeeds if has a subdomain wildcard but on an apex domain', async () => {
285
- // @ts-ignore
286
- delete window.location
287
- // @ts-ignore
288
- window.location = new URL('https://example.com')
289
-
290
- const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
291
- permissiveHostsInfo[PROPERTIES.HOSTS] = ['*.example.com']
292
- const permissiveLicenseKey = await generateLicenseKey(
293
- JSON.stringify(permissiveHostsInfo),
294
- keyPair
295
- )
296
- const result = (await licenseManager.getLicenseFromKey(
297
- permissiveLicenseKey
298
- )) as ValidLicenseKeyResult
299
- expect(result.isDomainValid).toBe(true)
300
- })
381
+ it('Allows a grace period for expired licenses', async () => {
382
+ const almostExpiredLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
383
+ const expiryDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 5) // 5 days ago
384
+ almostExpiredLicenseInfo[PROPERTIES.EXPIRY_DATE] = expiryDate
385
+ const almostExpiredLicenseKey = await generateLicenseKey(
386
+ JSON.stringify(almostExpiredLicenseInfo),
387
+ keyPair
388
+ )
389
+ const result = (await licenseManager.getLicenseFromKey(
390
+ almostExpiredLicenseKey
391
+ )) as ValidLicenseKeyResult
392
+ expect(result.isAnnualLicenseExpired).toBe(false)
393
+ })
301
394
 
302
- it('Fails if has a subdomain wildcard isnt for the same base domain', async () => {
303
- // @ts-ignore
304
- delete window.location
305
- // @ts-ignore
306
- window.location = new URL('https://sub.example.com')
307
-
308
- const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
309
- permissiveHostsInfo[PROPERTIES.HOSTS] = ['*.foo.com']
310
- const permissiveLicenseKey = await generateLicenseKey(
311
- JSON.stringify(permissiveHostsInfo),
312
- keyPair
313
- )
314
- const result = (await licenseManager.getLicenseFromKey(
315
- permissiveLicenseKey
316
- )) as ValidLicenseKeyResult
317
- expect(result.isDomainValid).toBe(false)
318
- })
395
+ it('Handles grace period correctly - 20 days expired should still be within grace period', async () => {
396
+ const expiredLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
397
+ const expiredDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 20) // 20 days ago
398
+ expiredLicenseInfo[PROPERTIES.EXPIRY_DATE] = expiredDate.toISOString()
399
+
400
+ const expiredLicenseKey = await generateLicenseKey(
401
+ JSON.stringify(expiredLicenseInfo),
402
+ keyPair
403
+ )
404
+
405
+ // Test the getLicenseFromKey method to verify grace period calculation
406
+ const result = (await licenseManager.getLicenseFromKey(
407
+ expiredLicenseKey
408
+ )) as ValidLicenseKeyResult
409
+ expect(result.isAnnualLicense).toBe(true)
410
+ expect(result.isAnnualLicenseExpired).toBe(false) // Within 30-day grace period
411
+ expect(result.daysSinceExpiry).toBe(20)
412
+ })
319
413
 
320
- it('Succeeds if it is a vscode extension', async () => {
321
- // @ts-ignore
322
- delete window.location
323
- // @ts-ignore
324
- window.location = new URL(
325
- 'vscode-webview:vscode-webview://1ipd8pun8ud7nd7hv9d112g7evi7m10vak9vviuvia66ou6aibp3/index.html?id=6ec2dc7a-afe9-45d9-bd71-1749f9568d28&origin=955b256f-37e1-4a72-a2f4-ad633e88239c&swVersion=4&extensionId=tldraw-org.tldraw-vscode&platform=electron&vscode-resource-base-authority=vscode-resource.vscode-cdn.net&parentOrigin=vscode-file%3A%2F%2Fvscode-app'
326
- )
327
-
328
- const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
329
- permissiveHostsInfo[PROPERTIES.HOSTS] = ['tldraw-org.tldraw-vscode']
330
- const permissiveLicenseKey = await generateLicenseKey(
331
- JSON.stringify(permissiveHostsInfo),
332
- keyPair
333
- )
334
- const result = (await licenseManager.getLicenseFromKey(
335
- permissiveLicenseKey
336
- )) as ValidLicenseKeyResult
337
- expect(result.isDomainValid).toBe(true)
338
- })
414
+ it('Calculates days since expiry correctly', async () => {
415
+ const expiredLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
416
+ const expiredDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 15) // 15 days ago
417
+ expiredLicenseInfo[PROPERTIES.EXPIRY_DATE] = expiredDate.toISOString()
339
418
 
340
- it('Fails if it is a vscode extension with the wrong id', async () => {
341
- // @ts-ignore
342
- delete window.location
343
- // @ts-ignore
344
- window.location = new URL(
345
- 'vscode-webview:vscode-webview://1ipd8pun8ud7nd7hv9d112g7evi7m10vak9vviuvia66ou6aibp3/index.html?id=6ec2dc7a-afe9-45d9-bd71-1749f9568d28&origin=955b256f-37e1-4a72-a2f4-ad633e88239c&swVersion=4&extensionId=tldraw-org.tldraw-vscode&platform=electron&vscode-resource-base-authority=vscode-resource.vscode-cdn.net&parentOrigin=vscode-file%3A%2F%2Fvscode-app'
346
- )
347
-
348
- const permissiveHostsInfo = JSON.parse(STANDARD_LICENSE_INFO)
349
- permissiveHostsInfo[PROPERTIES.HOSTS] = ['blah-org.blah-vscode']
350
- const permissiveLicenseKey = await generateLicenseKey(
351
- JSON.stringify(permissiveHostsInfo),
352
- keyPair
353
- )
354
- const result = (await licenseManager.getLicenseFromKey(
355
- permissiveLicenseKey
356
- )) as ValidLicenseKeyResult
357
- expect(result.isDomainValid).toBe(false)
358
- })
419
+ const expiredLicenseKey = await generateLicenseKey(
420
+ JSON.stringify(expiredLicenseInfo),
421
+ keyPair
422
+ )
359
423
 
360
- it('Checks for internal license', async () => {
361
- const internalLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
362
- internalLicenseInfo[PROPERTIES.FLAGS] = FLAGS.INTERNAL_LICENSE
363
- const internalLicenseKey = await generateLicenseKey(
364
- JSON.stringify(internalLicenseInfo),
365
- keyPair
366
- )
367
- const result = (await licenseManager.getLicenseFromKey(
368
- internalLicenseKey
369
- )) as ValidLicenseKeyResult
370
- expect(result.isInternalLicense).toBe(true)
424
+ const result = (await licenseManager.getLicenseFromKey(
425
+ expiredLicenseKey
426
+ )) as ValidLicenseKeyResult
427
+ expect(result.daysSinceExpiry).toBe(15)
428
+ })
371
429
  })
372
430
 
373
- it('Checks for license with watermark', async () => {
374
- const withWatermarkLicenseInfo = JSON.parse(STANDARD_LICENSE_INFO)
375
- withWatermarkLicenseInfo[PROPERTIES.FLAGS] |= FLAGS.WITH_WATERMARK
376
- const withWatermarkLicenseKey = await generateLicenseKey(
377
- JSON.stringify(withWatermarkLicenseInfo),
378
- keyPair
379
- )
380
- const result = (await licenseManager.getLicenseFromKey(
381
- withWatermarkLicenseKey
382
- )) as ValidLicenseKeyResult
383
- expect(result.isLicensedWithWatermark).toBe(true)
431
+ describe('Perpetual licenses', () => {
432
+ // We mock the patch version to be in 2030 above.
433
+ it('Succeeds for perpetual license with correct version (and patch does not matter)', async () => {
434
+ const majorDate = new Date(publishDates.major)
435
+ const expiryDate = new Date(
436
+ majorDate.getFullYear(),
437
+ majorDate.getMonth(),
438
+ majorDate.getDate() + 100
439
+ )
440
+ const perpetualLicenseInfo = ['id', ['www.example.com'], FLAGS.PERPETUAL_LICENSE, expiryDate]
441
+ const almostExpiredLicenseKey = await generateLicenseKey(
442
+ JSON.stringify(perpetualLicenseInfo),
443
+ keyPair
444
+ )
445
+ const result = (await licenseManager.getLicenseFromKey(
446
+ almostExpiredLicenseKey
447
+ )) as ValidLicenseKeyResult
448
+ expect(result.isPerpetualLicense).toBe(true)
449
+ expect(result.isPerpetualLicenseExpired).toBe(false)
450
+ })
451
+
452
+ it('Fails for perpetual license past the release version', async () => {
453
+ const majorDate = new Date(publishDates.major)
454
+ const expiryDate = new Date(
455
+ majorDate.getFullYear(),
456
+ majorDate.getMonth(),
457
+ majorDate.getDate() - 100
458
+ )
459
+ const perpetualLicenseInfo = ['id', ['www.example.com'], FLAGS.PERPETUAL_LICENSE, expiryDate]
460
+ const almostExpiredLicenseKey = await generateLicenseKey(
461
+ JSON.stringify(perpetualLicenseInfo),
462
+ keyPair
463
+ )
464
+ const result = (await licenseManager.getLicenseFromKey(
465
+ almostExpiredLicenseKey
466
+ )) as ValidLicenseKeyResult
467
+ expect(result.isPerpetualLicense).toBe(true)
468
+ expect(result.isPerpetualLicenseExpired).toBe(true)
469
+ })
384
470
  })
385
471
  })
386
472
 
@@ -473,6 +559,9 @@ function getDefaultLicenseResult(overrides: Partial<ValidLicenseKeyResult>): Val
473
559
  isPerpetualLicenseExpired: false,
474
560
  isLicenseParseable: true as const,
475
561
  isLicensedWithWatermark: false,
562
+ isEvaluationLicense: false,
563
+ isEvaluationLicenseExpired: false,
564
+ daysSinceExpiry: 0,
476
565
  // WatermarkManager does not check these fields, it relies on the calculated values like isAnnualLicenseExpired
477
566
  license: {
478
567
  id: 'id',
@@ -485,115 +574,291 @@ function getDefaultLicenseResult(overrides: Partial<ValidLicenseKeyResult>): Val
485
574
  }
486
575
  }
487
576
 
488
- describe(isEditorUnlicensed, () => {
489
- it('shows watermark when license is not parseable', () => {
490
- const licenseResult = getDefaultLicenseResult({
491
- // @ts-ignore
492
- isLicenseParseable: false,
577
+ describe('getLicenseState', () => {
578
+ describe('Development mode', () => {
579
+ it('returns "unlicensed" for unparseable license in development', () => {
580
+ const licenseResult = getDefaultLicenseResult({
581
+ // @ts-ignore
582
+ isLicenseParseable: false,
583
+ })
584
+ expect(getLicenseState(licenseResult, () => {}, true)).toBe('unlicensed')
493
585
  })
494
- expect(isEditorUnlicensed(licenseResult)).toBe(true)
495
- })
496
586
 
497
- it('shows watermark when domain is not valid', () => {
498
- const licenseResult = getDefaultLicenseResult({
499
- isDomainValid: false,
587
+ it('returns "licensed" for invalid domain in development mode', () => {
588
+ const licenseResult = getDefaultLicenseResult({
589
+ isDomainValid: false,
590
+ isDevelopment: true,
591
+ })
592
+ expect(getLicenseState(licenseResult, () => {}, true)).toBe('licensed')
500
593
  })
501
- expect(isEditorUnlicensed(licenseResult)).toBe(true)
502
- })
503
594
 
504
- it('shows watermark when annual license has expired', () => {
505
- const licenseResult = getDefaultLicenseResult({
506
- isAnnualLicense: true,
507
- isAnnualLicenseExpired: true,
595
+ it('returns "licensed" for valid license in development mode', () => {
596
+ const licenseResult = getDefaultLicenseResult({
597
+ isDevelopment: true,
598
+ })
599
+ expect(getLicenseState(licenseResult, () => {}, true)).toBe('licensed')
508
600
  })
509
- expect(isEditorUnlicensed(licenseResult)).toBe(true)
510
- })
511
601
 
512
- it('shows watermark when annual license has expired, even if dev mode', () => {
513
- const licenseResult = getDefaultLicenseResult({
514
- isAnnualLicense: true,
515
- isAnnualLicenseExpired: true,
516
- isDevelopment: true,
602
+ it('returns "unlicensed" for no license key in development (localhost)', () => {
603
+ const licenseResult = getDefaultLicenseResult({
604
+ // @ts-ignore
605
+ isLicenseParseable: false,
606
+ reason: 'no-key-provided',
607
+ })
608
+ expect(getLicenseState(licenseResult, () => {}, true)).toBe('unlicensed')
517
609
  })
518
- expect(isEditorUnlicensed(licenseResult)).toBe(true)
519
610
  })
520
611
 
521
- it('shows watermark when perpetual license has expired', () => {
522
- const licenseResult = getDefaultLicenseResult({
523
- isPerpetualLicense: true,
524
- isPerpetualLicenseExpired: true,
612
+ describe('Production mode - unlicensed states', () => {
613
+ it('returns "unlicensed-production" for unparseable license in production (invalid-license-key)', () => {
614
+ const messages: string[][] = []
615
+ const licenseResult = getDefaultLicenseResult({
616
+ // @ts-ignore
617
+ isLicenseParseable: false,
618
+ reason: 'invalid-license-key',
619
+ })
620
+ const result = getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)
621
+ expect(result).toBe('unlicensed-production')
622
+
623
+ expect(messages).toHaveLength(1)
624
+ expect(messages[0]).toEqual([
625
+ 'Invalid license key. tldraw requires a valid license for production use.',
626
+ 'Please reach out to sales@tldraw.com to purchase a license.',
627
+ ])
525
628
  })
526
- expect(isEditorUnlicensed(licenseResult)).toBe(true)
527
- })
528
629
 
529
- it('does not show watermark when license is valid and not expired', () => {
530
- const licenseResult = getDefaultLicenseResult({
531
- isAnnualLicense: true,
532
- isAnnualLicenseExpired: false,
533
- isInternalLicense: false,
630
+ it('returns "unlicensed-production" for no license key in production', () => {
631
+ const messages: string[][] = []
632
+ const licenseResult = getDefaultLicenseResult({
633
+ // @ts-ignore
634
+ isLicenseParseable: false,
635
+ reason: 'no-key-provided',
636
+ })
637
+ const result = getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)
638
+ expect(result).toBe('unlicensed-production')
639
+
640
+ expect(messages).toHaveLength(1)
641
+ expect(messages[0]).toEqual([
642
+ 'No tldraw license key provided!',
643
+ 'A license is required for production deployments.',
644
+ 'Please reach out to sales@tldraw.com to purchase a license.',
645
+ ])
534
646
  })
535
- expect(isEditorUnlicensed(licenseResult)).toBe(false)
536
- })
537
647
 
538
- it('does not show watermark when perpetual license is valid and not expired', () => {
539
- const licenseResult = getDefaultLicenseResult({
540
- isPerpetualLicense: true,
541
- isPerpetualLicenseExpired: false,
542
- isInternalLicense: false,
648
+ it('returns "unlicensed-production" for invalid license key in production', () => {
649
+ const messages: string[][] = []
650
+ const licenseResult = getDefaultLicenseResult({
651
+ // @ts-ignore
652
+ isLicenseParseable: false,
653
+ reason: 'invalid-license-key',
654
+ })
655
+ const result = getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)
656
+ expect(result).toBe('unlicensed-production')
657
+
658
+ expect(messages).toHaveLength(1)
659
+ expect(messages[0]).toEqual([
660
+ 'Invalid license key. tldraw requires a valid license for production use.',
661
+ 'Please reach out to sales@tldraw.com to purchase a license.',
662
+ ])
543
663
  })
544
- expect(isEditorUnlicensed(licenseResult)).toBe(false)
545
- })
546
664
 
547
- it('does not show watermark when in development mode', () => {
548
- const licenseResult = getDefaultLicenseResult({
549
- isDevelopment: true,
665
+ it('returns "unlicensed-production" for invalid domain in production', () => {
666
+ const messages: string[][] = []
667
+ const licenseResult = getDefaultLicenseResult({
668
+ isDomainValid: false,
669
+ isDevelopment: false,
670
+ })
671
+ const result = getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)
672
+ expect(result).toBe('unlicensed-production')
673
+
674
+ expect(messages).toHaveLength(1)
675
+ expect(messages[0]).toEqual([
676
+ 'License key is not valid for this domain.',
677
+ 'A license is required for production deployments.',
678
+ 'Please reach out to sales@tldraw.com to purchase a license.',
679
+ ])
550
680
  })
551
- expect(isEditorUnlicensed(licenseResult)).toBe(false)
552
- })
553
681
 
554
- it('does not show watermark when license is parseable and domain is valid', () => {
555
- const licenseResult = getDefaultLicenseResult({
556
- isLicenseParseable: true,
557
- isDomainValid: true,
682
+ it('returns "unlicensed-production" for expired internal license with invalid domain', () => {
683
+ const messages: string[][] = []
684
+ const expiryDate = new Date(2023, 1, 1)
685
+ const licenseResult = getDefaultLicenseResult({
686
+ isAnnualLicense: true,
687
+ isAnnualLicenseExpired: true,
688
+ isInternalLicense: true,
689
+ isDomainValid: false,
690
+ expiryDate,
691
+ })
692
+ const result = getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)
693
+ expect(result).toBe('unlicensed-production')
694
+
695
+ expect(messages).toHaveLength(1)
696
+ expect(messages[0]).toEqual([
697
+ 'License key is not valid for this domain.',
698
+ 'A license is required for production deployments.',
699
+ 'Please reach out to sales@tldraw.com to purchase a license.',
700
+ ])
558
701
  })
559
- expect(isEditorUnlicensed(licenseResult)).toBe(false)
560
702
  })
561
703
 
562
- it('does not show watermark when license is parseable and domain is not valid and dev mode', () => {
563
- const licenseResult = getDefaultLicenseResult({
564
- isLicenseParseable: true,
565
- isDomainValid: false,
566
- isDevelopment: true,
704
+ describe('Valid licenses', () => {
705
+ it('returns "licensed" for valid annual license', () => {
706
+ const licenseResult = getDefaultLicenseResult({
707
+ isAnnualLicense: true,
708
+ isAnnualLicenseExpired: false,
709
+ })
710
+ expect(getLicenseState(licenseResult, () => {}, false)).toBe('licensed')
711
+ })
712
+
713
+ it('returns "licensed" for valid perpetual license', () => {
714
+ const licenseResult = getDefaultLicenseResult({
715
+ isPerpetualLicense: true,
716
+ isPerpetualLicenseExpired: false,
717
+ })
718
+ expect(getLicenseState(licenseResult, () => {}, false)).toBe('licensed')
719
+ })
720
+
721
+ it('returns "licensed-with-watermark" for watermarked license', () => {
722
+ const licenseResult = getDefaultLicenseResult({
723
+ isLicensedWithWatermark: true,
724
+ })
725
+ expect(getLicenseState(licenseResult, () => {}, false)).toBe('licensed-with-watermark')
567
726
  })
568
- expect(isEditorUnlicensed(licenseResult)).toBe(false)
569
- })
570
727
 
571
- it('throws when an internal annual license has expired', () => {
572
- const expiryDate = new Date(2023, 1, 1)
573
- const licenseResult = getDefaultLicenseResult({
574
- isAnnualLicense: true,
575
- isAnnualLicenseExpired: true,
576
- isInternalLicense: true,
577
- expiryDate,
728
+ it('returns "licensed" for valid evaluation license', () => {
729
+ const licenseResult = getDefaultLicenseResult({
730
+ isEvaluationLicense: true,
731
+ isLicensedWithWatermark: false, // Evaluation license doesn't need WITH_WATERMARK flag
732
+ isAnnualLicense: false,
733
+ isPerpetualLicense: false,
734
+ })
735
+
736
+ // Evaluation license should be licensed but tracked (no watermark shown)
737
+ expect(getLicenseState(licenseResult, () => {}, false)).toBe('licensed')
738
+
739
+ // Verify evaluation license properties
740
+ expect(licenseResult.isEvaluationLicense).toBe(true)
741
+ expect(licenseResult.isLicensedWithWatermark).toBe(false) // No explicit watermark flag needed
742
+ expect(licenseResult.isAnnualLicense).toBe(false)
743
+ expect(licenseResult.isPerpetualLicense).toBe(false)
578
744
  })
579
- expect(() => isEditorUnlicensed(licenseResult)).toThrow(/License: Internal license expired/)
580
745
  })
581
746
 
582
- it('throws when an internal perpetual license has expired', () => {
583
- const expiryDate = new Date(2023, 1, 1)
584
- const licenseResult = getDefaultLicenseResult({
585
- isPerpetualLicense: true,
586
- isPerpetualLicenseExpired: true,
587
- isInternalLicense: true,
588
- expiryDate,
747
+ describe('Grace period handling', () => {
748
+ it('returns "licensed" for license 0-30 days past expiry', () => {
749
+ const messages: string[][] = []
750
+ const licenseResult = getDefaultLicenseResult({
751
+ isAnnualLicense: true,
752
+ isAnnualLicenseExpired: false, // Still within 30-day grace period
753
+ daysSinceExpiry: 20, // 20 days past expiry
754
+ isInternalLicense: false,
755
+ })
756
+
757
+ expect(getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)).toBe('licensed')
758
+
759
+ expect(messages).toHaveLength(1)
760
+ expect(messages[0]).toEqual([
761
+ 'Your tldraw license has expired.',
762
+ 'License expired 20 days ago.',
763
+ 'Please reach out to sales@tldraw.com to renew your license.',
764
+ ])
589
765
  })
590
- expect(() => isEditorUnlicensed(licenseResult)).toThrow(/License: Internal license expired/)
591
766
  })
592
767
 
593
- it('shows watermark when license has that flag specified', () => {
594
- const licenseResult = getDefaultLicenseResult({
595
- isLicensedWithWatermark: true,
768
+ describe('Expired licenses', () => {
769
+ it('returns "expired" for license 30+ days past expiry', () => {
770
+ const messages: string[][] = []
771
+ const licenseResult = getDefaultLicenseResult({
772
+ isAnnualLicense: true,
773
+ isAnnualLicenseExpired: true, // Beyond 30-day grace period
774
+ daysSinceExpiry: 35, // 35 days past expiry
775
+ isInternalLicense: false,
776
+ })
777
+
778
+ expect(getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)).toBe('expired')
779
+
780
+ expect(messages).toHaveLength(1)
781
+ expect(messages[0]).toEqual([
782
+ 'Your tldraw license has been expired for more than 30 days!',
783
+ 'Please reach out to sales@tldraw.com to renew your license.',
784
+ ])
785
+ })
786
+
787
+ it('returns "expired" for expired annual license even in dev mode', () => {
788
+ const licenseResult = getDefaultLicenseResult({
789
+ isAnnualLicense: true,
790
+ isAnnualLicenseExpired: true,
791
+ isDevelopment: true,
792
+ isInternalLicense: false,
793
+ })
794
+ expect(getLicenseState(licenseResult, () => {}, true)).toBe('expired')
795
+ })
796
+
797
+ it('returns "expired" for expired perpetual license', () => {
798
+ const licenseResult = getDefaultLicenseResult({
799
+ isPerpetualLicense: true,
800
+ isPerpetualLicenseExpired: true,
801
+ isInternalLicense: false,
802
+ })
803
+ expect(getLicenseState(licenseResult, () => {}, false)).toBe('expired')
804
+ })
805
+
806
+ it('returns "expired" for expired evaluation license', () => {
807
+ const messages: string[][] = []
808
+ const licenseResult = getDefaultLicenseResult({
809
+ isEvaluationLicense: true,
810
+ isEvaluationLicenseExpired: true,
811
+ isAnnualLicense: false,
812
+ isPerpetualLicense: false,
813
+ })
814
+
815
+ expect(getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)).toBe('expired')
816
+
817
+ expect(messages).toHaveLength(1)
818
+ expect(messages[0]).toEqual([
819
+ 'Your tldraw evaluation license has expired!',
820
+ 'Please reach out to sales@tldraw.com to purchase a full license.',
821
+ ])
822
+ })
823
+
824
+ it('returns "expired" for expired internal annual license with valid domain', () => {
825
+ const messages: string[][] = []
826
+ const expiryDate = new Date(2023, 1, 1)
827
+ const licenseResult = getDefaultLicenseResult({
828
+ isAnnualLicense: true,
829
+ isAnnualLicenseExpired: true,
830
+ isInternalLicense: true,
831
+ isDomainValid: true,
832
+ expiryDate,
833
+ })
834
+
835
+ expect(getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)).toBe('expired')
836
+
837
+ expect(messages).toHaveLength(1)
838
+ expect(messages[0]).toEqual([
839
+ 'Your tldraw license has been expired for more than 30 days!',
840
+ 'Please reach out to sales@tldraw.com to renew your license.',
841
+ ])
842
+ })
843
+
844
+ it('returns "expired" for expired internal perpetual license with valid domain', () => {
845
+ const messages: string[][] = []
846
+ const expiryDate = new Date(2023, 1, 1)
847
+ const licenseResult = getDefaultLicenseResult({
848
+ isPerpetualLicense: true,
849
+ isPerpetualLicenseExpired: true,
850
+ isInternalLicense: true,
851
+ isDomainValid: true,
852
+ expiryDate,
853
+ })
854
+
855
+ expect(getLicenseState(licenseResult, (msgs) => messages.push(msgs), false)).toBe('expired')
856
+
857
+ expect(messages).toHaveLength(1)
858
+ expect(messages[0]).toEqual([
859
+ 'Your tldraw license has been expired for more than 30 days!',
860
+ 'Please reach out to sales@tldraw.com to renew your license.',
861
+ ])
596
862
  })
597
- expect(isEditorUnlicensed(licenseResult)).toBe(false)
598
863
  })
599
864
  })