@blocklet/store 1.16.28-beta-bfbab430 → 1.16.28-beta-641c9f13

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 (3) hide show
  1. package/dist/index.cjs +14 -9
  2. package/dist/index.mjs +14 -8
  3. package/package.json +7 -7
package/dist/index.cjs CHANGED
@@ -4,7 +4,7 @@ const security = require('@abtnode/util/lib/security');
4
4
  const lodash = require('lodash');
5
5
  const tweetnacl = require('tweetnacl');
6
6
  const SealedBox = require('tweetnacl-sealedbox-js');
7
- const joinUrl = require('url-join');
7
+ const ufo = require('ufo');
8
8
  const axios = require('@abtnode/util/lib/axios');
9
9
  const pWaitFor = require('p-wait-for');
10
10
  const wallet = require('@ocap/wallet');
@@ -26,7 +26,6 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
26
26
 
27
27
  const tweetnacl__default = /*#__PURE__*/_interopDefaultCompat(tweetnacl);
28
28
  const SealedBox__default = /*#__PURE__*/_interopDefaultCompat(SealedBox);
29
- const joinUrl__default = /*#__PURE__*/_interopDefaultCompat(joinUrl);
30
29
  const axios__default = /*#__PURE__*/_interopDefaultCompat(axios);
31
30
  const pWaitFor__default = /*#__PURE__*/_interopDefaultCompat(pWaitFor);
32
31
  const path__default = /*#__PURE__*/_interopDefaultCompat(path);
@@ -55,7 +54,9 @@ const fetchConfigs = async ({
55
54
  const ENDPOINT_CHECK_SESSION = `/api/did/${connectAction}/status`;
56
55
  const ENDPOINT_INVALIDATE_SESSION = `/api/did/${connectAction}/timeout`;
57
56
  const fetchSessionStatus = async () => {
58
- const url = `${joinUrl__default(connectUrl, ENDPOINT_CHECK_SESSION)}?_t_=${sessionId}`;
57
+ const url = ufo.withQuery(ufo.joinURL(connectUrl, ENDPOINT_CHECK_SESSION), {
58
+ _t_: sessionId
59
+ });
59
60
  const { data } = await request({
60
61
  url,
61
62
  method: "GET",
@@ -78,7 +79,9 @@ const fetchConfigs = async ({
78
79
  const err = e;
79
80
  if (err.name === "TimeoutError") {
80
81
  await request({
81
- url: `${joinUrl__default(connectUrl, ENDPOINT_INVALIDATE_SESSION)}?_t_=${sessionId}`,
82
+ url: ufo.withQuery(ufo.joinURL(connectUrl, ENDPOINT_INVALIDATE_SESSION), {
83
+ _t_: sessionId
84
+ }),
82
85
  method: "GET",
83
86
  timeout: fetchTimeout
84
87
  });
@@ -120,7 +123,7 @@ async function createConnect({
120
123
  let masterSite;
121
124
  try {
122
125
  const { data: blocklet } = await request({
123
- url: joinUrl__default(connectUrl, BLOCKLET_JSON_PATH),
126
+ url: ufo.joinURL(connectUrl, BLOCKLET_JSON_PATH),
124
127
  method: "GET",
125
128
  timeout: fetchTimeout
126
129
  });
@@ -137,7 +140,7 @@ async function createConnect({
137
140
  ...restParams
138
141
  };
139
142
  const res = await request({
140
- url: joinUrl__default(connectUrl, ENDPOINT_CREATE_SESSION),
143
+ url: ufo.joinURL(connectUrl, ENDPOINT_CREATE_SESSION),
141
144
  params: mergeParams,
142
145
  // for sensitive info encryption
143
146
  method: "GET",
@@ -145,7 +148,9 @@ async function createConnect({
145
148
  });
146
149
  const { url, token } = res.data;
147
150
  const encodedUrl = encodeURIComponent(Buffer.from(url).toString("base64"));
148
- const pageUrl = `${joinUrl__default(connectUrl, DID_CONNECT_URL)}?__connect_url__=${encodedUrl}`;
151
+ const pageUrl = ufo.withQuery(ufo.joinURL(connectUrl, DID_CONNECT_URL), {
152
+ __connect_url__: encodedUrl
153
+ });
149
154
  openPage?.(pageUrl);
150
155
  return await wrapSpinner(`Waiting for connection: ${connectUrl}`, async () => {
151
156
  const fetchData = await fetchConfigs({
@@ -173,7 +178,7 @@ async function createConnect({
173
178
  }
174
179
 
175
180
  const getStoreInfo = async (url) => {
176
- const { data } = await axios__default.get(joinUrl__default(url, constant$1.BLOCKLET_STORE_META_PATH), { timeout: 20 * 1e3 });
181
+ const { data } = await axios__default.get(ufo.joinURL(url, constant$1.BLOCKLET_STORE_META_PATH), { timeout: 20 * 1e3 });
177
182
  return data;
178
183
  };
179
184
  const isValidChainEndpoint = async (endpoint) => {
@@ -342,7 +347,7 @@ async function upload({
342
347
  try {
343
348
  await wrapSpinner(`Uploading ${meta.name}@${meta.version}...`, async () => {
344
349
  uploadResult = await axios__default({
345
- url: joinUrl__default(storeUrl, "/api/blocklets/upload"),
350
+ url: ufo.joinURL(storeUrl, "/api/blocklets/upload"),
346
351
  method: "POST",
347
352
  data,
348
353
  headers: {
package/dist/index.mjs CHANGED
@@ -2,7 +2,7 @@ import { encodeEncryptionKey } from '@abtnode/util/lib/security';
2
2
  import { get, cloneDeep } from 'lodash';
3
3
  import tweetnacl from 'tweetnacl';
4
4
  import SealedBox from 'tweetnacl-sealedbox-js';
5
- import joinUrl from 'url-join';
5
+ import { withQuery, joinURL } from 'ufo';
6
6
  import axios from '@abtnode/util/lib/axios';
7
7
  import pWaitFor from 'p-wait-for';
8
8
  import { fromSecretKey } from '@ocap/wallet';
@@ -38,7 +38,9 @@ const fetchConfigs = async ({
38
38
  const ENDPOINT_CHECK_SESSION = `/api/did/${connectAction}/status`;
39
39
  const ENDPOINT_INVALIDATE_SESSION = `/api/did/${connectAction}/timeout`;
40
40
  const fetchSessionStatus = async () => {
41
- const url = `${joinUrl(connectUrl, ENDPOINT_CHECK_SESSION)}?_t_=${sessionId}`;
41
+ const url = withQuery(joinURL(connectUrl, ENDPOINT_CHECK_SESSION), {
42
+ _t_: sessionId
43
+ });
42
44
  const { data } = await request({
43
45
  url,
44
46
  method: "GET",
@@ -61,7 +63,9 @@ const fetchConfigs = async ({
61
63
  const err = e;
62
64
  if (err.name === "TimeoutError") {
63
65
  await request({
64
- url: `${joinUrl(connectUrl, ENDPOINT_INVALIDATE_SESSION)}?_t_=${sessionId}`,
66
+ url: withQuery(joinURL(connectUrl, ENDPOINT_INVALIDATE_SESSION), {
67
+ _t_: sessionId
68
+ }),
65
69
  method: "GET",
66
70
  timeout: fetchTimeout
67
71
  });
@@ -103,7 +107,7 @@ async function createConnect({
103
107
  let masterSite;
104
108
  try {
105
109
  const { data: blocklet } = await request({
106
- url: joinUrl(connectUrl, BLOCKLET_JSON_PATH),
110
+ url: joinURL(connectUrl, BLOCKLET_JSON_PATH),
107
111
  method: "GET",
108
112
  timeout: fetchTimeout
109
113
  });
@@ -120,7 +124,7 @@ async function createConnect({
120
124
  ...restParams
121
125
  };
122
126
  const res = await request({
123
- url: joinUrl(connectUrl, ENDPOINT_CREATE_SESSION),
127
+ url: joinURL(connectUrl, ENDPOINT_CREATE_SESSION),
124
128
  params: mergeParams,
125
129
  // for sensitive info encryption
126
130
  method: "GET",
@@ -128,7 +132,9 @@ async function createConnect({
128
132
  });
129
133
  const { url, token } = res.data;
130
134
  const encodedUrl = encodeURIComponent(Buffer.from(url).toString("base64"));
131
- const pageUrl = `${joinUrl(connectUrl, DID_CONNECT_URL)}?__connect_url__=${encodedUrl}`;
135
+ const pageUrl = withQuery(joinURL(connectUrl, DID_CONNECT_URL), {
136
+ __connect_url__: encodedUrl
137
+ });
132
138
  openPage?.(pageUrl);
133
139
  return await wrapSpinner(`Waiting for connection: ${connectUrl}`, async () => {
134
140
  const fetchData = await fetchConfigs({
@@ -156,7 +162,7 @@ async function createConnect({
156
162
  }
157
163
 
158
164
  const getStoreInfo = async (url) => {
159
- const { data } = await axios.get(joinUrl(url, BLOCKLET_STORE_META_PATH), { timeout: 20 * 1e3 });
165
+ const { data } = await axios.get(joinURL(url, BLOCKLET_STORE_META_PATH), { timeout: 20 * 1e3 });
160
166
  return data;
161
167
  };
162
168
  const isValidChainEndpoint = async (endpoint) => {
@@ -325,7 +331,7 @@ async function upload({
325
331
  try {
326
332
  await wrapSpinner(`Uploading ${meta.name}@${meta.version}...`, async () => {
327
333
  uploadResult = await axios({
328
- url: joinUrl(storeUrl, "/api/blocklets/upload"),
334
+ url: joinURL(storeUrl, "/api/blocklets/upload"),
329
335
  method: "POST",
330
336
  data,
331
337
  headers: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blocklet/store",
3
- "version": "1.16.28-beta-bfbab430",
3
+ "version": "1.16.28-beta-641c9f13",
4
4
  "description": "Connect Store and upload blocklet to Store",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -27,11 +27,11 @@
27
27
  "author": "",
28
28
  "license": "ISC",
29
29
  "dependencies": {
30
- "@abtnode/constant": "1.16.28-beta-bfbab430",
31
- "@abtnode/util": "1.16.28-beta-bfbab430",
30
+ "@abtnode/constant": "1.16.28-beta-641c9f13",
31
+ "@abtnode/util": "1.16.28-beta-641c9f13",
32
32
  "@arcblock/did": "1.18.123",
33
- "@blocklet/constant": "1.16.28-beta-bfbab430",
34
- "@blocklet/meta": "1.16.28-beta-bfbab430",
33
+ "@blocklet/constant": "1.16.28-beta-641c9f13",
34
+ "@blocklet/meta": "1.16.28-beta-641c9f13",
35
35
  "@ocap/client": "^1.18.123",
36
36
  "@ocap/util": "1.18.123",
37
37
  "@ocap/wallet": "1.18.123",
@@ -42,7 +42,7 @@
42
42
  "p-wait-for": "3.2.0",
43
43
  "tweetnacl": "^1.0.3",
44
44
  "tweetnacl-sealedbox-js": "^1.2.0",
45
- "url-join": "^4.0.1",
45
+ "ufo": "^1.5.3",
46
46
  "xbytes": "^1.8.0"
47
47
  },
48
48
  "devDependencies": {
@@ -59,5 +59,5 @@
59
59
  "typescript": "^5.0.4",
60
60
  "unbuild": "^2.0.0"
61
61
  },
62
- "gitHead": "f1fbf0752de46be00d1faa0d54eb7d28016e0bb9"
62
+ "gitHead": "eb1fa63e4ed26fe5ba230845a318faa29408138b"
63
63
  }