@eggjs/cookies 4.0.0-beta.34 → 4.0.0-beta.36

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 (11) hide show
  1. package/dist/cookie.d.ts +67 -64
  2. package/dist/cookie.js +70 -87
  3. package/dist/cookies.d.ts +43 -39
  4. package/dist/cookies.js +215 -275
  5. package/dist/error.d.ts +5 -2
  6. package/dist/error.js +11 -10
  7. package/dist/index.d.ts +5 -4
  8. package/dist/index.js +6 -5
  9. package/dist/keygrip.d.ts +13 -10
  10. package/dist/keygrip.js +86 -103
  11. package/package.json +24 -31
package/dist/cookies.js CHANGED
@@ -1,290 +1,230 @@
1
- import assert from 'node:assert';
2
- import { base64decode, base64encode } from 'utility';
3
- import { isSameSiteNoneCompatible } from 'should-send-same-site-none';
4
- import { Keygrip } from "./keygrip.js";
5
1
  import { Cookie } from "./cookie.js";
6
2
  import { CookieError } from "./error.js";
7
- const keyCache = new Map();
3
+ import { Keygrip } from "./keygrip.js";
4
+ import assert from "node:assert";
5
+ import { isSameSiteNoneCompatible } from "should-send-same-site-none";
6
+ import { base64decode, base64encode } from "utility";
7
+
8
+ //#region src/cookies.ts
9
+ const keyCache = /* @__PURE__ */ new Map();
8
10
  /**
9
- * cookies for egg
10
- * extend pillarjs/cookies, add encrypt and decrypt
11
- */
12
- export class Cookies {
13
- #keysArray;
14
- #keys;
15
- #defaultCookieOptions;
16
- #autoChips;
17
- ctx;
18
- app;
19
- secure;
20
- #parseChromiumResult;
21
- constructor(ctx, keys, defaultCookieOptions) {
22
- this.#keysArray = keys;
23
- // default cookie options
24
- this.#defaultCookieOptions = defaultCookieOptions;
25
- this.#autoChips = defaultCookieOptions?.autoChips;
26
- this.ctx = ctx;
27
- this.secure = this.ctx.secure;
28
- this.app = ctx.app;
29
- }
30
- get keys() {
31
- if (!this.#keys) {
32
- assert(Array.isArray(this.#keysArray), '.keys required for encrypt/sign cookies');
33
- const cache = keyCache.get(this.#keysArray);
34
- if (cache) {
35
- this.#keys = cache;
36
- }
37
- else {
38
- this.#keys = new Keygrip(this.#keysArray);
39
- keyCache.set(this.#keysArray, this.#keys);
40
- }
41
- }
42
- return this.#keys;
43
- }
44
- /**
45
- * get cookie value by name
46
- * @param {String} name - cookie's name
47
- * @param {Object} opts - cookies' options
48
- * - {Boolean} signed - default to true
49
- * - {Boolean} encrypt - default to false
50
- * @return {String} value - cookie's value
51
- */
52
- get(name, opts = {}) {
53
- let value = this._get(name, opts);
54
- if (value === undefined && this.#autoChips) {
55
- // try to read _CHIPS-${name} prefix cookie
56
- value = this._get(this.#formatChipsCookieName(name), opts);
57
- }
58
- return value;
59
- }
60
- _get(name, opts) {
61
- const signed = computeSigned(opts);
62
- const header = this.ctx.get('cookie');
63
- if (!header)
64
- return;
65
- const match = header.match(getPattern(name));
66
- if (!match)
67
- return;
68
- let value = match[1];
69
- if (!opts.encrypt && !signed)
70
- return value;
71
- // signed
72
- if (signed) {
73
- const sigName = name + '.sig';
74
- const sigValue = this.get(sigName, { signed: false });
75
- if (!sigValue)
76
- return;
77
- const raw = name + '=' + value;
78
- const index = this.keys.verify(raw, sigValue);
79
- if (index < 0) {
80
- // can not match any key, remove ${name}.sig
81
- this.set(sigName, null, { path: '/', signed: false, overwrite: true });
82
- return;
83
- }
84
- if (index > 0) {
85
- // not signed by the first key, update sigValue
86
- this.set(sigName, this.keys.sign(raw), {
87
- signed: false,
88
- overwrite: true,
89
- });
90
- }
91
- return value;
92
- }
93
- // encrypt
94
- value = base64decode(value, true, 'buffer');
95
- const res = this.keys.decrypt(value);
96
- return res ? res.value.toString() : undefined;
97
- }
98
- set(name, value, opts) {
99
- opts = {
100
- ...this.#defaultCookieOptions,
101
- ...opts,
102
- };
103
- const signed = computeSigned(opts);
104
- const shouldIgnoreSecureError = opts && opts.ignoreSecureError;
105
- value = value || '';
106
- if (!shouldIgnoreSecureError) {
107
- if (!this.secure && opts.secure) {
108
- throw new CookieError('Cannot send secure cookie over unencrypted connection');
109
- }
110
- }
111
- let headers = this.ctx.response.get('set-cookie') || [];
112
- if (!Array.isArray(headers)) {
113
- headers = [headers];
114
- }
115
- // encrypt
116
- if (opts.encrypt) {
117
- value = value && base64encode(this.keys.encrypt(value), true);
118
- }
119
- // http://browsercookielimits.squawky.net/
120
- if (value.length > 4093) {
121
- this.app.emit('cookieLimitExceed', { name, value, ctx: this.ctx });
122
- }
123
- // https://github.com/linsight/should-send-same-site-none
124
- // fixed SameSite=None: Known Incompatible Clients
125
- const userAgent = this.ctx.get('user-agent');
126
- let isSameSiteNone = false;
127
- // disable autoChips if partitioned enable
128
- let autoChips = !opts.partitioned && this.#autoChips;
129
- if (opts.sameSite && typeof opts.sameSite === 'string' && opts.sameSite.toLowerCase() === 'none') {
130
- isSameSiteNone = true;
131
- if (opts.secure === false || !this.secure || (userAgent && !this.isSameSiteNoneCompatible(userAgent))) {
132
- // Non-secure context or Incompatible clients, don't send SameSite=None property
133
- opts.sameSite = false;
134
- isSameSiteNone = false;
135
- }
136
- }
137
- if (autoChips || opts.partitioned) {
138
- // allow to set partitioned: secure=true and sameSite=none and chrome >= 118
139
- if (!isSameSiteNone ||
140
- opts.secure === false ||
141
- !this.secure ||
142
- (userAgent && !this.isPartitionedCompatible(userAgent))) {
143
- // Non-secure context or Incompatible clients, don't send partitioned property
144
- autoChips = false;
145
- opts.partitioned = false;
146
- }
147
- }
148
- // remove unpartitioned same name cookie first
149
- if (opts.partitioned && opts.removeUnpartitioned) {
150
- const overwrite = opts.overwrite;
151
- if (overwrite) {
152
- opts.overwrite = false;
153
- headers = ignoreCookiesByName(headers, name);
154
- }
155
- const removeCookieOpts = {
156
- ...opts,
157
- partitioned: false,
158
- };
159
- const removeUnpartitionedCookie = new Cookie(name, '', removeCookieOpts);
160
- // if user not set secure, reset secure to ctx.secure
161
- if (opts.secure === undefined) {
162
- removeUnpartitionedCookie.attrs.secure = this.secure;
163
- }
164
- headers = pushCookie(headers, removeUnpartitionedCookie);
165
- // signed
166
- if (signed) {
167
- removeUnpartitionedCookie.name += '.sig';
168
- headers = ignoreCookiesByNameAndPath(headers, removeUnpartitionedCookie.name, removeUnpartitionedCookie.attrs.path);
169
- headers = pushCookie(headers, removeUnpartitionedCookie);
170
- }
171
- }
172
- else if (autoChips) {
173
- // add _CHIPS-${name} prefix cookie
174
- const newCookieName = this.#formatChipsCookieName(name);
175
- const newCookieOpts = {
176
- ...opts,
177
- partitioned: true,
178
- };
179
- const newPartitionedCookie = new Cookie(newCookieName, value, newCookieOpts);
180
- // if user not set secure, reset secure to ctx.secure
181
- if (opts.secure === undefined)
182
- newPartitionedCookie.attrs.secure = this.secure;
183
- headers = pushCookie(headers, newPartitionedCookie);
184
- // signed
185
- if (signed) {
186
- newPartitionedCookie.value = value && this.keys.sign(newPartitionedCookie.toString());
187
- newPartitionedCookie.name += '.sig';
188
- headers = ignoreCookiesByNameAndPath(headers, newPartitionedCookie.name, newPartitionedCookie.attrs.path);
189
- headers = pushCookie(headers, newPartitionedCookie);
190
- }
191
- }
192
- const cookie = new Cookie(name, value, opts);
193
- // if user not set secure, reset secure to ctx.secure
194
- if (opts.secure === undefined) {
195
- cookie.attrs.secure = this.secure;
196
- }
197
- headers = pushCookie(headers, cookie);
198
- // signed
199
- if (signed) {
200
- cookie.value = value && this.keys.sign(cookie.toString());
201
- cookie.name += '.sig';
202
- headers = pushCookie(headers, cookie);
203
- }
204
- this.ctx.set('set-cookie', headers);
205
- return this;
206
- }
207
- #formatChipsCookieName(name) {
208
- return `_CHIPS-${name}`;
209
- }
210
- #parseChromiumAndMajorVersion(userAgent) {
211
- if (!this.#parseChromiumResult) {
212
- this.#parseChromiumResult = parseChromiumAndMajorVersion(userAgent);
213
- }
214
- return this.#parseChromiumResult;
215
- }
216
- isSameSiteNoneCompatible(userAgent) {
217
- // Chrome >= 80.0.0.0
218
- const result = this.#parseChromiumAndMajorVersion(userAgent);
219
- if (result.chromium) {
220
- return result.majorVersion >= 80;
221
- }
222
- return isSameSiteNoneCompatible(userAgent);
223
- }
224
- isPartitionedCompatible(userAgent) {
225
- // support: Chrome >= 114.0.0.0
226
- // default enable: Chrome >= 118.0.0.0
227
- // https://developers.google.com/privacy-sandbox/3pcd/chips
228
- const result = this.#parseChromiumAndMajorVersion(userAgent);
229
- if (result.chromium) {
230
- return result.majorVersion >= 118;
231
- }
232
- return false;
233
- }
234
- }
235
- // https://github.com/linsight/should-send-same-site-none/blob/master/index.js#L86
11
+ * cookies for egg
12
+ * extend pillarjs/cookies, add encrypt and decrypt
13
+ */
14
+ var Cookies = class {
15
+ #keysArray;
16
+ #keys;
17
+ #defaultCookieOptions;
18
+ #autoChips;
19
+ ctx;
20
+ app;
21
+ secure;
22
+ #parseChromiumResult;
23
+ constructor(ctx, keys, defaultCookieOptions) {
24
+ this.#keysArray = keys;
25
+ this.#defaultCookieOptions = defaultCookieOptions;
26
+ this.#autoChips = defaultCookieOptions?.autoChips;
27
+ this.ctx = ctx;
28
+ this.secure = this.ctx.secure;
29
+ this.app = ctx.app;
30
+ }
31
+ get keys() {
32
+ if (!this.#keys) {
33
+ assert(Array.isArray(this.#keysArray), ".keys required for encrypt/sign cookies");
34
+ const cache = keyCache.get(this.#keysArray);
35
+ if (cache) this.#keys = cache;
36
+ else {
37
+ this.#keys = new Keygrip(this.#keysArray);
38
+ keyCache.set(this.#keysArray, this.#keys);
39
+ }
40
+ }
41
+ return this.#keys;
42
+ }
43
+ /**
44
+ * get cookie value by name
45
+ * @param {String} name - cookie's name
46
+ * @param {Object} opts - cookies' options
47
+ * - {Boolean} signed - default to true
48
+ * - {Boolean} encrypt - default to false
49
+ * @return {String} value - cookie's value
50
+ */
51
+ get(name, opts = {}) {
52
+ let value = this._get(name, opts);
53
+ if (value === void 0 && this.#autoChips) value = this._get(this.#formatChipsCookieName(name), opts);
54
+ return value;
55
+ }
56
+ _get(name, opts) {
57
+ const signed = computeSigned(opts);
58
+ const header = this.ctx.get("cookie");
59
+ if (!header) return;
60
+ const match = header.match(getPattern(name));
61
+ if (!match) return;
62
+ let value = match[1];
63
+ if (!opts.encrypt && !signed) return value;
64
+ if (signed) {
65
+ const sigName = name + ".sig";
66
+ const sigValue = this.get(sigName, { signed: false });
67
+ if (!sigValue) return;
68
+ const raw = name + "=" + value;
69
+ const index = this.keys.verify(raw, sigValue);
70
+ if (index < 0) {
71
+ this.set(sigName, null, {
72
+ path: "/",
73
+ signed: false,
74
+ overwrite: true
75
+ });
76
+ return;
77
+ }
78
+ if (index > 0) this.set(sigName, this.keys.sign(raw), {
79
+ signed: false,
80
+ overwrite: true
81
+ });
82
+ return value;
83
+ }
84
+ value = base64decode(value, true, "buffer");
85
+ const res = this.keys.decrypt(value);
86
+ return res ? res.value.toString() : void 0;
87
+ }
88
+ set(name, value, opts) {
89
+ opts = {
90
+ ...this.#defaultCookieOptions,
91
+ ...opts
92
+ };
93
+ const signed = computeSigned(opts);
94
+ const shouldIgnoreSecureError = opts && opts.ignoreSecureError;
95
+ value = value || "";
96
+ if (!shouldIgnoreSecureError) {
97
+ if (!this.secure && opts.secure) throw new CookieError("Cannot send secure cookie over unencrypted connection");
98
+ }
99
+ let headers = this.ctx.response.get("set-cookie") || [];
100
+ if (!Array.isArray(headers)) headers = [headers];
101
+ if (opts.encrypt) value = value && base64encode(this.keys.encrypt(value), true);
102
+ if (value.length > 4093) this.app.emit("cookieLimitExceed", {
103
+ name,
104
+ value,
105
+ ctx: this.ctx
106
+ });
107
+ const userAgent = this.ctx.get("user-agent");
108
+ let isSameSiteNone = false;
109
+ let autoChips = !opts.partitioned && this.#autoChips;
110
+ if (opts.sameSite && typeof opts.sameSite === "string" && opts.sameSite.toLowerCase() === "none") {
111
+ isSameSiteNone = true;
112
+ if (opts.secure === false || !this.secure || userAgent && !this.isSameSiteNoneCompatible(userAgent)) {
113
+ opts.sameSite = false;
114
+ isSameSiteNone = false;
115
+ }
116
+ }
117
+ if (autoChips || opts.partitioned) {
118
+ if (!isSameSiteNone || opts.secure === false || !this.secure || userAgent && !this.isPartitionedCompatible(userAgent)) {
119
+ autoChips = false;
120
+ opts.partitioned = false;
121
+ }
122
+ }
123
+ if (opts.partitioned && opts.removeUnpartitioned) {
124
+ if (opts.overwrite) {
125
+ opts.overwrite = false;
126
+ headers = ignoreCookiesByName(headers, name);
127
+ }
128
+ const removeUnpartitionedCookie = new Cookie(name, "", {
129
+ ...opts,
130
+ partitioned: false
131
+ });
132
+ if (opts.secure === void 0) removeUnpartitionedCookie.attrs.secure = this.secure;
133
+ headers = pushCookie(headers, removeUnpartitionedCookie);
134
+ if (signed) {
135
+ removeUnpartitionedCookie.name += ".sig";
136
+ headers = ignoreCookiesByNameAndPath(headers, removeUnpartitionedCookie.name, removeUnpartitionedCookie.attrs.path);
137
+ headers = pushCookie(headers, removeUnpartitionedCookie);
138
+ }
139
+ } else if (autoChips) {
140
+ const newCookieName = this.#formatChipsCookieName(name);
141
+ const newCookieOpts = {
142
+ ...opts,
143
+ partitioned: true
144
+ };
145
+ const newPartitionedCookie = new Cookie(newCookieName, value, newCookieOpts);
146
+ if (opts.secure === void 0) newPartitionedCookie.attrs.secure = this.secure;
147
+ headers = pushCookie(headers, newPartitionedCookie);
148
+ if (signed) {
149
+ newPartitionedCookie.value = value && this.keys.sign(newPartitionedCookie.toString());
150
+ newPartitionedCookie.name += ".sig";
151
+ headers = ignoreCookiesByNameAndPath(headers, newPartitionedCookie.name, newPartitionedCookie.attrs.path);
152
+ headers = pushCookie(headers, newPartitionedCookie);
153
+ }
154
+ }
155
+ const cookie = new Cookie(name, value, opts);
156
+ if (opts.secure === void 0) cookie.attrs.secure = this.secure;
157
+ headers = pushCookie(headers, cookie);
158
+ if (signed) {
159
+ cookie.value = value && this.keys.sign(cookie.toString());
160
+ cookie.name += ".sig";
161
+ headers = pushCookie(headers, cookie);
162
+ }
163
+ this.ctx.set("set-cookie", headers);
164
+ return this;
165
+ }
166
+ #formatChipsCookieName(name) {
167
+ return `_CHIPS-${name}`;
168
+ }
169
+ #parseChromiumAndMajorVersion(userAgent) {
170
+ if (!this.#parseChromiumResult) this.#parseChromiumResult = parseChromiumAndMajorVersion(userAgent);
171
+ return this.#parseChromiumResult;
172
+ }
173
+ isSameSiteNoneCompatible(userAgent) {
174
+ const result = this.#parseChromiumAndMajorVersion(userAgent);
175
+ if (result.chromium) return result.majorVersion >= 80;
176
+ return isSameSiteNoneCompatible(userAgent);
177
+ }
178
+ isPartitionedCompatible(userAgent) {
179
+ const result = this.#parseChromiumAndMajorVersion(userAgent);
180
+ if (result.chromium) return result.majorVersion >= 118;
181
+ return false;
182
+ }
183
+ };
236
184
  function parseChromiumAndMajorVersion(userAgent) {
237
- const m = /Chrom[^ /]{1,100}\/(\d{1,100}?)\./.exec(userAgent);
238
- if (!m) {
239
- return { chromium: false, majorVersion: 0 };
240
- }
241
- // Extract digits from first capturing group.
242
- return { chromium: true, majorVersion: parseInt(m[1]) };
185
+ const m = /Chrom[^ /]{1,100}\/(\d{1,100}?)\./.exec(userAgent);
186
+ if (!m) return {
187
+ chromium: false,
188
+ majorVersion: 0
189
+ };
190
+ return {
191
+ chromium: true,
192
+ majorVersion: parseInt(m[1])
193
+ };
243
194
  }
244
- const _patternCache = new Map();
195
+ const _patternCache = /* @__PURE__ */ new Map();
245
196
  function getPattern(name) {
246
- const cache = _patternCache.get(name);
247
- if (cache) {
248
- return cache;
249
- }
250
- const reg = new RegExp('(?:^|;) *' + name.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&') + '=([^;]*)');
251
- _patternCache.set(name, reg);
252
- return reg;
197
+ const cache = _patternCache.get(name);
198
+ if (cache) return cache;
199
+ const reg = /* @__PURE__ */ new RegExp("(?:^|;) *" + name.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&") + "=([^;]*)");
200
+ _patternCache.set(name, reg);
201
+ return reg;
253
202
  }
254
203
  function computeSigned(opts) {
255
- // encrypt default to false, signed default to true.
256
- // disable singed when encrypt is true.
257
- if (opts.encrypt)
258
- return false;
259
- return opts.signed !== false;
204
+ if (opts.encrypt) return false;
205
+ return opts.signed !== false;
260
206
  }
261
207
  function pushCookie(cookies, cookie) {
262
- if (cookie.attrs.overwrite) {
263
- cookies = ignoreCookiesByName(cookies, cookie.name);
264
- }
265
- cookies.push(cookie.toHeader());
266
- return cookies;
208
+ if (cookie.attrs.overwrite) cookies = ignoreCookiesByName(cookies, cookie.name);
209
+ cookies.push(cookie.toHeader());
210
+ return cookies;
267
211
  }
268
212
  function ignoreCookiesByName(cookies, name) {
269
- const prefix = `${name}=`;
270
- return cookies.filter((c) => !c.startsWith(prefix));
213
+ const prefix = `${name}=`;
214
+ return cookies.filter((c) => !c.startsWith(prefix));
271
215
  }
272
216
  function ignoreCookiesByNameAndPath(cookies, name, path) {
273
- if (!path) {
274
- return ignoreCookiesByName(cookies, name);
275
- }
276
- const prefix = `${name}=`;
277
- // foo=hello; path=/path1; samesite=none
278
- const includedPath = `; path=${path};`;
279
- // foo=hello; path=/path1
280
- const endsWithPath = `; path=${path}`;
281
- return cookies.filter((c) => {
282
- if (c.startsWith(prefix)) {
283
- if (c.includes(includedPath) || c.endsWith(endsWithPath)) {
284
- return false;
285
- }
286
- }
287
- return true;
288
- });
217
+ if (!path) return ignoreCookiesByName(cookies, name);
218
+ const prefix = `${name}=`;
219
+ const includedPath = `; path=${path};`;
220
+ const endsWithPath = `; path=${path}`;
221
+ return cookies.filter((c) => {
222
+ if (c.startsWith(prefix)) {
223
+ if (c.includes(includedPath) || c.endsWith(endsWithPath)) return false;
224
+ }
225
+ return true;
226
+ });
289
227
  }
290
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../src/cookies.ts"],"names":[],"mappings":"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"}
228
+
229
+ //#endregion
230
+ export { Cookies };
package/dist/error.d.ts CHANGED
@@ -1,3 +1,6 @@
1
- export declare class CookieError extends Error {
2
- constructor(message: string, options?: ErrorOptions);
1
+ //#region src/error.d.ts
2
+ declare class CookieError extends Error {
3
+ constructor(message: string, options?: ErrorOptions);
3
4
  }
5
+ //#endregion
6
+ export { CookieError };
package/dist/error.js CHANGED
@@ -1,10 +1,11 @@
1
- export class CookieError extends Error {
2
- constructor(message, options) {
3
- super(message, options);
4
- this.name = this.constructor.name;
5
- if ('captureStackTrace' in Error) {
6
- Error.captureStackTrace(this, this.constructor);
7
- }
8
- }
9
- }
10
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLFdBQVksU0FBUSxLQUFLO0lBQ3BDLFlBQVksT0FBZSxFQUFFLE9BQXNCO1FBQ2pELEtBQUssQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDeEIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztRQUNsQyxJQUFJLG1CQUFtQixJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ2pDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ2xELENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
1
+ //#region src/error.ts
2
+ var CookieError = class extends Error {
3
+ constructor(message, options) {
4
+ super(message, options);
5
+ this.name = this.constructor.name;
6
+ if ("captureStackTrace" in Error) Error.captureStackTrace(this, this.constructor);
7
+ }
8
+ };
9
+
10
+ //#endregion
11
+ export { CookieError };
package/dist/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
- export * from './cookies.ts';
2
- export * from './cookie.ts';
3
- export * from './error.ts';
4
- export * from './keygrip.ts';
1
+ import { Cookie, CookieSetOptions } from "./cookie.js";
2
+ import { Keygrip } from "./keygrip.js";
3
+ import { CookieGetOptions, Cookies, DefaultCookieOptions } from "./cookies.js";
4
+ import { CookieError } from "./error.js";
5
+ export { Cookie, CookieError, CookieGetOptions, CookieSetOptions, Cookies, DefaultCookieOptions, Keygrip };
package/dist/index.js CHANGED
@@ -1,5 +1,6 @@
1
- export * from "./cookies.js";
2
- export * from "./cookie.js";
3
- export * from "./error.js";
4
- export * from "./keygrip.js";
5
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxjQUFjLENBQUMifQ==
1
+ import { Cookie } from "./cookie.js";
2
+ import { CookieError } from "./error.js";
3
+ import { Keygrip } from "./keygrip.js";
4
+ import { Cookies } from "./cookies.js";
5
+
6
+ export { Cookie, CookieError, Cookies, Keygrip };
package/dist/keygrip.d.ts CHANGED
@@ -1,11 +1,14 @@
1
- export declare class Keygrip {
2
- #private;
3
- constructor(keys: string[]);
4
- encrypt(data: string, key?: string): Buffer;
5
- decrypt(data: string | Buffer): {
6
- value: Buffer;
7
- index: number;
8
- } | false;
9
- sign(data: string | Buffer, key?: string): string;
10
- verify(data: string, digest: string): number;
1
+ //#region src/keygrip.d.ts
2
+ declare class Keygrip {
3
+ #private;
4
+ constructor(keys: string[]);
5
+ encrypt(data: string, key?: string): Buffer;
6
+ decrypt(data: string | Buffer): {
7
+ value: Buffer;
8
+ index: number;
9
+ } | false;
10
+ sign(data: string | Buffer, key?: string): string;
11
+ verify(data: string, digest: string): number;
11
12
  }
13
+ //#endregion
14
+ export { Keygrip };