@drawbridge/drawbridge-utils 0.0.17 → 0.0.19

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.
@@ -0,0 +1,34 @@
1
+ // encrypt.js
2
+ import crypto from "crypto";
3
+ var ALGORITHM = "aes-256-gcm";
4
+ var getKey = () => Buffer.from(process.env.ENCRYPT_CONNECTION_SECRET, "hex");
5
+ var encrypt = (value) => {
6
+ const iv = crypto.randomBytes(12);
7
+ const cipher = crypto.createCipheriv(ALGORITHM, getKey(), iv);
8
+ const data = Buffer.concat([
9
+ cipher.update(JSON.stringify(value), "utf8"),
10
+ cipher.final()
11
+ ]);
12
+ const tag = cipher.getAuthTag();
13
+ return [iv, tag, data].map((b) => b.toString("hex")).join(":");
14
+ };
15
+ var decrypt = (value) => {
16
+ if (typeof value !== "string") return value;
17
+ const [ivHex, tagHex, dataHex] = value.split(":");
18
+ const decipher = crypto.createDecipheriv(
19
+ ALGORITHM,
20
+ getKey(),
21
+ Buffer.from(ivHex, "hex")
22
+ );
23
+ decipher.setAuthTag(Buffer.from(tagHex, "hex"));
24
+ const result = Buffer.concat([
25
+ decipher.update(Buffer.from(dataHex, "hex")),
26
+ decipher.final()
27
+ ]);
28
+ return JSON.parse(result.toString("utf8"));
29
+ };
30
+
31
+ export {
32
+ encrypt,
33
+ decrypt
34
+ };
package/dist/encrypt.js CHANGED
@@ -1,32 +1,7 @@
1
- // encrypt.js
2
- import crypto from "crypto";
3
- var ALGORITHM = "aes-256-gcm";
4
- var getKey = () => Buffer.from(process.env.ENCRYPT_CONNECTION_SECRET, "hex");
5
- var encrypt = (value) => {
6
- const iv = crypto.randomBytes(12);
7
- const cipher = crypto.createCipheriv(ALGORITHM, getKey(), iv);
8
- const data = Buffer.concat([
9
- cipher.update(JSON.stringify(value), "utf8"),
10
- cipher.final()
11
- ]);
12
- const tag = cipher.getAuthTag();
13
- return [iv, tag, data].map((b) => b.toString("hex")).join(":");
14
- };
15
- var decrypt = (value) => {
16
- if (typeof value !== "string") return value;
17
- const [ivHex, tagHex, dataHex] = value.split(":");
18
- const decipher = crypto.createDecipheriv(
19
- ALGORITHM,
20
- getKey(),
21
- Buffer.from(ivHex, "hex")
22
- );
23
- decipher.setAuthTag(Buffer.from(tagHex, "hex"));
24
- const result = Buffer.concat([
25
- decipher.update(Buffer.from(dataHex, "hex")),
26
- decipher.final()
27
- ]);
28
- return JSON.parse(result.toString("utf8"));
29
- };
1
+ import {
2
+ decrypt,
3
+ encrypt
4
+ } from "./chunk-CUUQCM5T.js";
30
5
  export {
31
6
  decrypt,
32
7
  encrypt
@@ -0,0 +1,186 @@
1
+ var __create = Object.create;
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __getProtoOf = Object.getPrototypeOf;
6
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
7
+ var __export = (target, all) => {
8
+ for (var name in all)
9
+ __defProp(target, name, { get: all[name], enumerable: true });
10
+ };
11
+ var __copyProps = (to, from, except, desc) => {
12
+ if (from && typeof from === "object" || typeof from === "function") {
13
+ for (let key of __getOwnPropNames(from))
14
+ if (!__hasOwnProp.call(to, key) && key !== except)
15
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
+ }
17
+ return to;
18
+ };
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ // If the importer is in node compatibility mode or this is not an ESM
21
+ // file that has been converted to a CommonJS file using a Babel-
22
+ // compatible transform (i.e. "__esModule" has not been set), then set
23
+ // "default" to the CommonJS "module.exports" for node compatibility.
24
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
+ mod
26
+ ));
27
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
28
+
29
+ // shopify.js
30
+ var shopify_exports = {};
31
+ __export(shopify_exports, {
32
+ getAdminToken: () => getAdminToken,
33
+ refreshAdminToken: () => refreshAdminToken
34
+ });
35
+ module.exports = __toCommonJS(shopify_exports);
36
+
37
+ // encrypt.js
38
+ var import_crypto = __toESM(require("crypto"), 1);
39
+ var ALGORITHM = "aes-256-gcm";
40
+ var getKey = () => Buffer.from(process.env.ENCRYPT_CONNECTION_SECRET, "hex");
41
+ var encrypt = (value) => {
42
+ const iv = import_crypto.default.randomBytes(12);
43
+ const cipher = import_crypto.default.createCipheriv(ALGORITHM, getKey(), iv);
44
+ const data = Buffer.concat([
45
+ cipher.update(JSON.stringify(value), "utf8"),
46
+ cipher.final()
47
+ ]);
48
+ const tag = cipher.getAuthTag();
49
+ return [iv, tag, data].map((b) => b.toString("hex")).join(":");
50
+ };
51
+ var decrypt = (value) => {
52
+ if (typeof value !== "string") return value;
53
+ const [ivHex, tagHex, dataHex] = value.split(":");
54
+ const decipher = import_crypto.default.createDecipheriv(
55
+ ALGORITHM,
56
+ getKey(),
57
+ Buffer.from(ivHex, "hex")
58
+ );
59
+ decipher.setAuthTag(Buffer.from(tagHex, "hex"));
60
+ const result = Buffer.concat([
61
+ decipher.update(Buffer.from(dataHex, "hex")),
62
+ decipher.final()
63
+ ]);
64
+ return JSON.parse(result.toString("utf8"));
65
+ };
66
+
67
+ // shopify.js
68
+ var SHOPIFY_ADMIN_API_VERSION = "2025-01";
69
+ var shopifyOAuthFetch = async (url, body) => {
70
+ const response = await fetch(url, {
71
+ method: "POST",
72
+ headers: {
73
+ "Content-Type": "application/json"
74
+ },
75
+ body: JSON.stringify(body)
76
+ });
77
+ if (!response.ok) {
78
+ const text = await response.text().catch(() => "");
79
+ const error = new Error(response.status + ": " + text);
80
+ error.status = response.status;
81
+ throw error;
82
+ }
83
+ return response.json();
84
+ };
85
+ var pingShop = async ({ adminAccessToken, domain }) => {
86
+ const response = await fetch(
87
+ `https://${domain}/admin/api/${SHOPIFY_ADMIN_API_VERSION}/shop.json`,
88
+ {
89
+ headers: {
90
+ "X-Shopify-Access-Token": adminAccessToken
91
+ }
92
+ }
93
+ );
94
+ if (!response.ok) {
95
+ const text = await response.text().catch(() => "");
96
+ const error = new Error(response.status + ": " + text);
97
+ error.status = response.status;
98
+ throw error;
99
+ }
100
+ };
101
+ var refreshAdminToken = async ({ connection, controller }) => {
102
+ const settings = decrypt(connection.settings);
103
+ const { domain, refreshToken } = settings;
104
+ const data = await shopifyOAuthFetch(
105
+ `https://${domain}/admin/oauth/access_token`,
106
+ {
107
+ grant_type: "refresh_token",
108
+ client_id: process.env.SHOPIFY_API_KEY,
109
+ client_secret: process.env.SHOPIFY_API_SECRET,
110
+ refresh_token: refreshToken
111
+ }
112
+ );
113
+ const adminAccessToken = data.access_token;
114
+ const newRefreshToken = data.refresh_token;
115
+ const expiresIn = data.expires_in;
116
+ const tokenExpiresAt = expiresIn ? new Date(Date.now() + expiresIn * 1e3) : null;
117
+ await pingShop({ adminAccessToken, domain });
118
+ const tokenWorkflow = await controller.get({
119
+ collection: "workflow",
120
+ query: {
121
+ connection: connection.id,
122
+ organization: connection.organization,
123
+ system: true,
124
+ title: "Shopify Token Activity"
125
+ }
126
+ });
127
+ await controller.transaction(async (session) => {
128
+ const options = { session };
129
+ await controller.update({
130
+ collection: "connection",
131
+ data: {
132
+ $set: {
133
+ settings: encrypt({
134
+ ...settings,
135
+ adminAccessToken,
136
+ refreshToken: newRefreshToken,
137
+ tokenExpiresAt
138
+ })
139
+ }
140
+ },
141
+ options,
142
+ query: {
143
+ id: connection.id
144
+ }
145
+ });
146
+ if (tokenWorkflow) {
147
+ await controller.create({
148
+ collection: "action",
149
+ data: {
150
+ completedAt: /* @__PURE__ */ new Date(),
151
+ error: null,
152
+ errorStatus: null,
153
+ organization: connection.organization,
154
+ request: null,
155
+ response: null,
156
+ slug: "action.shopify.token.refresh",
157
+ status: "succeeded",
158
+ trigger: {
159
+ data: {
160
+ connection: connection.id
161
+ },
162
+ event: "shopify.token"
163
+ },
164
+ usage: null,
165
+ workflow: tokenWorkflow.id
166
+ },
167
+ options
168
+ });
169
+ }
170
+ ;
171
+ });
172
+ return adminAccessToken;
173
+ };
174
+ var getAdminToken = async ({ connection, controller }) => {
175
+ const { adminAccessToken, tokenExpiresAt } = decrypt(connection.settings);
176
+ const needsRefresh = tokenExpiresAt && new Date(tokenExpiresAt) < new Date(Date.now() + 5 * 60 * 1e3);
177
+ if (needsRefresh) {
178
+ return refreshAdminToken({ connection, controller });
179
+ }
180
+ return adminAccessToken;
181
+ };
182
+ // Annotate the CommonJS export names for ESM import in node:
183
+ 0 && (module.exports = {
184
+ getAdminToken,
185
+ refreshAdminToken
186
+ });
@@ -0,0 +1,158 @@
1
+ import { decrypt, encrypt } from './encrypt.cjs';
2
+ import 'crypto';
3
+
4
+ const SHOPIFY_ADMIN_API_VERSION = '2025-01';
5
+
6
+ const shopifyOAuthFetch = async ( url, body ) => {
7
+
8
+ const response = await fetch( url, {
9
+ method : 'POST',
10
+ headers : {
11
+ 'Content-Type' : 'application/json'
12
+ },
13
+ body : JSON.stringify( body )
14
+ });
15
+
16
+ if( ! response.ok ){
17
+
18
+ const text = await response.text().catch( () => '' );
19
+ const error = new Error( response.status + ': ' + text );
20
+
21
+ error.status = response.status;
22
+
23
+ throw error;
24
+
25
+ }
26
+
27
+ return response.json();
28
+
29
+ };
30
+
31
+ const pingShop = async ({ adminAccessToken, domain }) => {
32
+
33
+ const response = await fetch(
34
+ `https://${ domain }/admin/api/${ SHOPIFY_ADMIN_API_VERSION }/shop.json`,
35
+ {
36
+ headers : {
37
+ 'X-Shopify-Access-Token' : adminAccessToken
38
+ }
39
+ }
40
+ );
41
+
42
+ if( ! response.ok ){
43
+
44
+ const text = await response.text().catch( () => '' );
45
+ const error = new Error( response.status + ': ' + text );
46
+
47
+ error.status = response.status;
48
+
49
+ throw error;
50
+
51
+ }
52
+
53
+ };
54
+
55
+ const refreshAdminToken = async ({ connection, controller }) => {
56
+
57
+ const settings = decrypt( connection.settings );
58
+ const { domain, refreshToken } = settings;
59
+
60
+ const data = await shopifyOAuthFetch(
61
+ `https://${ domain }/admin/oauth/access_token`,
62
+ {
63
+ grant_type : 'refresh_token',
64
+ client_id : process.env.SHOPIFY_API_KEY,
65
+ client_secret : process.env.SHOPIFY_API_SECRET,
66
+ refresh_token : refreshToken
67
+ }
68
+ );
69
+
70
+ const adminAccessToken = data.access_token;
71
+ const newRefreshToken = data.refresh_token;
72
+ const expiresIn = data.expires_in;
73
+ const tokenExpiresAt = expiresIn ? new Date( Date.now() + ( expiresIn * 1000 ) ) : null;
74
+
75
+ await pingShop({ adminAccessToken, domain });
76
+
77
+ const tokenWorkflow = await controller.get({
78
+ collection : 'workflow',
79
+ query : {
80
+ connection : connection.id,
81
+ organization : connection.organization,
82
+ system : true,
83
+ title : 'Shopify Token Activity'
84
+ }
85
+ });
86
+
87
+ await controller.transaction( async ( session ) => {
88
+
89
+ const options = { session };
90
+
91
+ await controller.update({
92
+ collection : 'connection',
93
+ data : {
94
+ $set : {
95
+ settings : encrypt({
96
+ ...settings,
97
+ adminAccessToken,
98
+ refreshToken : newRefreshToken,
99
+ tokenExpiresAt
100
+ })
101
+ }
102
+ },
103
+ options,
104
+ query : {
105
+ id : connection.id
106
+ }
107
+ });
108
+
109
+ if( tokenWorkflow ){
110
+
111
+ await controller.create({
112
+ collection : 'action',
113
+ data : {
114
+ completedAt : new Date(),
115
+ error : null,
116
+ errorStatus : null,
117
+ organization : connection.organization,
118
+ request : null,
119
+ response : null,
120
+ slug : 'action.shopify.token.refresh',
121
+ status : 'succeeded',
122
+ trigger : {
123
+ data : {
124
+ connection : connection.id
125
+ },
126
+ event : 'shopify.token'
127
+ },
128
+ usage : null,
129
+ workflow : tokenWorkflow.id
130
+ },
131
+ options
132
+ });
133
+
134
+ }
135
+ } );
136
+
137
+ return adminAccessToken;
138
+
139
+ };
140
+
141
+ const getAdminToken = async ({ connection, controller }) => {
142
+
143
+ const { adminAccessToken, tokenExpiresAt } = decrypt( connection.settings );
144
+
145
+ const needsRefresh = tokenExpiresAt &&
146
+ new Date( tokenExpiresAt ) < new Date( Date.now() + ( 5 * 60 * 1000 ) );
147
+
148
+ if( needsRefresh ){
149
+
150
+ return refreshAdminToken({ connection, controller });
151
+
152
+ }
153
+
154
+ return adminAccessToken;
155
+
156
+ };
157
+
158
+ export { getAdminToken, refreshAdminToken };
@@ -0,0 +1,158 @@
1
+ import { decrypt, encrypt } from './encrypt.js';
2
+ import 'crypto';
3
+
4
+ const SHOPIFY_ADMIN_API_VERSION = '2025-01';
5
+
6
+ const shopifyOAuthFetch = async ( url, body ) => {
7
+
8
+ const response = await fetch( url, {
9
+ method : 'POST',
10
+ headers : {
11
+ 'Content-Type' : 'application/json'
12
+ },
13
+ body : JSON.stringify( body )
14
+ });
15
+
16
+ if( ! response.ok ){
17
+
18
+ const text = await response.text().catch( () => '' );
19
+ const error = new Error( response.status + ': ' + text );
20
+
21
+ error.status = response.status;
22
+
23
+ throw error;
24
+
25
+ }
26
+
27
+ return response.json();
28
+
29
+ };
30
+
31
+ const pingShop = async ({ adminAccessToken, domain }) => {
32
+
33
+ const response = await fetch(
34
+ `https://${ domain }/admin/api/${ SHOPIFY_ADMIN_API_VERSION }/shop.json`,
35
+ {
36
+ headers : {
37
+ 'X-Shopify-Access-Token' : adminAccessToken
38
+ }
39
+ }
40
+ );
41
+
42
+ if( ! response.ok ){
43
+
44
+ const text = await response.text().catch( () => '' );
45
+ const error = new Error( response.status + ': ' + text );
46
+
47
+ error.status = response.status;
48
+
49
+ throw error;
50
+
51
+ }
52
+
53
+ };
54
+
55
+ const refreshAdminToken = async ({ connection, controller }) => {
56
+
57
+ const settings = decrypt( connection.settings );
58
+ const { domain, refreshToken } = settings;
59
+
60
+ const data = await shopifyOAuthFetch(
61
+ `https://${ domain }/admin/oauth/access_token`,
62
+ {
63
+ grant_type : 'refresh_token',
64
+ client_id : process.env.SHOPIFY_API_KEY,
65
+ client_secret : process.env.SHOPIFY_API_SECRET,
66
+ refresh_token : refreshToken
67
+ }
68
+ );
69
+
70
+ const adminAccessToken = data.access_token;
71
+ const newRefreshToken = data.refresh_token;
72
+ const expiresIn = data.expires_in;
73
+ const tokenExpiresAt = expiresIn ? new Date( Date.now() + ( expiresIn * 1000 ) ) : null;
74
+
75
+ await pingShop({ adminAccessToken, domain });
76
+
77
+ const tokenWorkflow = await controller.get({
78
+ collection : 'workflow',
79
+ query : {
80
+ connection : connection.id,
81
+ organization : connection.organization,
82
+ system : true,
83
+ title : 'Shopify Token Activity'
84
+ }
85
+ });
86
+
87
+ await controller.transaction( async ( session ) => {
88
+
89
+ const options = { session };
90
+
91
+ await controller.update({
92
+ collection : 'connection',
93
+ data : {
94
+ $set : {
95
+ settings : encrypt({
96
+ ...settings,
97
+ adminAccessToken,
98
+ refreshToken : newRefreshToken,
99
+ tokenExpiresAt
100
+ })
101
+ }
102
+ },
103
+ options,
104
+ query : {
105
+ id : connection.id
106
+ }
107
+ });
108
+
109
+ if( tokenWorkflow ){
110
+
111
+ await controller.create({
112
+ collection : 'action',
113
+ data : {
114
+ completedAt : new Date(),
115
+ error : null,
116
+ errorStatus : null,
117
+ organization : connection.organization,
118
+ request : null,
119
+ response : null,
120
+ slug : 'action.shopify.token.refresh',
121
+ status : 'succeeded',
122
+ trigger : {
123
+ data : {
124
+ connection : connection.id
125
+ },
126
+ event : 'shopify.token'
127
+ },
128
+ usage : null,
129
+ workflow : tokenWorkflow.id
130
+ },
131
+ options
132
+ });
133
+
134
+ }
135
+ } );
136
+
137
+ return adminAccessToken;
138
+
139
+ };
140
+
141
+ const getAdminToken = async ({ connection, controller }) => {
142
+
143
+ const { adminAccessToken, tokenExpiresAt } = decrypt( connection.settings );
144
+
145
+ const needsRefresh = tokenExpiresAt &&
146
+ new Date( tokenExpiresAt ) < new Date( Date.now() + ( 5 * 60 * 1000 ) );
147
+
148
+ if( needsRefresh ){
149
+
150
+ return refreshAdminToken({ connection, controller });
151
+
152
+ }
153
+
154
+ return adminAccessToken;
155
+
156
+ };
157
+
158
+ export { getAdminToken, refreshAdminToken };
@@ -0,0 +1,124 @@
1
+ import {
2
+ decrypt,
3
+ encrypt
4
+ } from "./chunk-CUUQCM5T.js";
5
+
6
+ // shopify.js
7
+ var SHOPIFY_ADMIN_API_VERSION = "2025-01";
8
+ var shopifyOAuthFetch = async (url, body) => {
9
+ const response = await fetch(url, {
10
+ method: "POST",
11
+ headers: {
12
+ "Content-Type": "application/json"
13
+ },
14
+ body: JSON.stringify(body)
15
+ });
16
+ if (!response.ok) {
17
+ const text = await response.text().catch(() => "");
18
+ const error = new Error(response.status + ": " + text);
19
+ error.status = response.status;
20
+ throw error;
21
+ }
22
+ return response.json();
23
+ };
24
+ var pingShop = async ({ adminAccessToken, domain }) => {
25
+ const response = await fetch(
26
+ `https://${domain}/admin/api/${SHOPIFY_ADMIN_API_VERSION}/shop.json`,
27
+ {
28
+ headers: {
29
+ "X-Shopify-Access-Token": adminAccessToken
30
+ }
31
+ }
32
+ );
33
+ if (!response.ok) {
34
+ const text = await response.text().catch(() => "");
35
+ const error = new Error(response.status + ": " + text);
36
+ error.status = response.status;
37
+ throw error;
38
+ }
39
+ };
40
+ var refreshAdminToken = async ({ connection, controller }) => {
41
+ const settings = decrypt(connection.settings);
42
+ const { domain, refreshToken } = settings;
43
+ const data = await shopifyOAuthFetch(
44
+ `https://${domain}/admin/oauth/access_token`,
45
+ {
46
+ grant_type: "refresh_token",
47
+ client_id: process.env.SHOPIFY_API_KEY,
48
+ client_secret: process.env.SHOPIFY_API_SECRET,
49
+ refresh_token: refreshToken
50
+ }
51
+ );
52
+ const adminAccessToken = data.access_token;
53
+ const newRefreshToken = data.refresh_token;
54
+ const expiresIn = data.expires_in;
55
+ const tokenExpiresAt = expiresIn ? new Date(Date.now() + expiresIn * 1e3) : null;
56
+ await pingShop({ adminAccessToken, domain });
57
+ const tokenWorkflow = await controller.get({
58
+ collection: "workflow",
59
+ query: {
60
+ connection: connection.id,
61
+ organization: connection.organization,
62
+ system: true,
63
+ title: "Shopify Token Activity"
64
+ }
65
+ });
66
+ await controller.transaction(async (session) => {
67
+ const options = { session };
68
+ await controller.update({
69
+ collection: "connection",
70
+ data: {
71
+ $set: {
72
+ settings: encrypt({
73
+ ...settings,
74
+ adminAccessToken,
75
+ refreshToken: newRefreshToken,
76
+ tokenExpiresAt
77
+ })
78
+ }
79
+ },
80
+ options,
81
+ query: {
82
+ id: connection.id
83
+ }
84
+ });
85
+ if (tokenWorkflow) {
86
+ await controller.create({
87
+ collection: "action",
88
+ data: {
89
+ completedAt: /* @__PURE__ */ new Date(),
90
+ error: null,
91
+ errorStatus: null,
92
+ organization: connection.organization,
93
+ request: null,
94
+ response: null,
95
+ slug: "action.shopify.token.refresh",
96
+ status: "succeeded",
97
+ trigger: {
98
+ data: {
99
+ connection: connection.id
100
+ },
101
+ event: "shopify.token"
102
+ },
103
+ usage: null,
104
+ workflow: tokenWorkflow.id
105
+ },
106
+ options
107
+ });
108
+ }
109
+ ;
110
+ });
111
+ return adminAccessToken;
112
+ };
113
+ var getAdminToken = async ({ connection, controller }) => {
114
+ const { adminAccessToken, tokenExpiresAt } = decrypt(connection.settings);
115
+ const needsRefresh = tokenExpiresAt && new Date(tokenExpiresAt) < new Date(Date.now() + 5 * 60 * 1e3);
116
+ if (needsRefresh) {
117
+ return refreshAdminToken({ connection, controller });
118
+ }
119
+ return adminAccessToken;
120
+ };
121
+ export {
122
+ getAdminToken,
123
+ refreshAdminToken
124
+ };
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "axios": "1.16.0",
5
5
  "currency-codes": "2.2.0",
6
6
  "nanoid": "3.3.8",
7
- "qs": "6.15.1",
7
+ "qs": "6.15.2",
8
8
  "slugify": "1.6.6",
9
9
  "tsup": "8.5.1",
10
10
  "typescript": "5.9.3"
@@ -81,5 +81,5 @@
81
81
  "build": "tsup && npm publish"
82
82
  },
83
83
  "types": "dist/index.d.ts",
84
- "version": "0.0.17"
84
+ "version": "0.0.19"
85
85
  }