wallet-adapter-gameshift 0.1.0 → 0.1.1
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.
- package/lib/cjs/adapter.js +30 -2
- package/lib/cjs/adapter.js.map +1 -1
- package/lib/esm/adapter.js +30 -2
- package/lib/esm/adapter.js.map +1 -1
- package/lib/types/adapter.d.ts +1 -0
- package/lib/types/adapter.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/adapter.ts +34 -3
package/lib/cjs/adapter.js
CHANGED
|
@@ -28,7 +28,8 @@ class GameshiftWalletAdapter extends wallet_adapter_base_1.BaseMessageSignerWall
|
|
|
28
28
|
this._publicKey = null;
|
|
29
29
|
this._token = null;
|
|
30
30
|
this._email = null;
|
|
31
|
-
|
|
31
|
+
// Normalize portal URL: remove trailing slash and ensure www prefix for consistency
|
|
32
|
+
this._portalUrl = this._normalizePortalUrl(config.portalUrl || 'http://localhost:3000');
|
|
32
33
|
this._metakeepAppId = config.metakeepAppId;
|
|
33
34
|
this._popupWidth = config.popupWidth || 450;
|
|
34
35
|
this._popupHeight = config.popupHeight || 650;
|
|
@@ -80,10 +81,19 @@ class GameshiftWalletAdapter extends wallet_adapter_base_1.BaseMessageSignerWall
|
|
|
80
81
|
// Message handler for postMessage from popup
|
|
81
82
|
this._messageHandler = (event) => {
|
|
82
83
|
var _a;
|
|
84
|
+
// Log all messages for debugging
|
|
85
|
+
console.log('Received postMessage:', {
|
|
86
|
+
origin: event.origin,
|
|
87
|
+
expectedOrigin: this._portalUrl,
|
|
88
|
+
data: event.data,
|
|
89
|
+
});
|
|
83
90
|
// Only accept messages from the portal
|
|
84
|
-
if (event.origin !== this._portalUrl)
|
|
91
|
+
if (event.origin !== this._portalUrl) {
|
|
92
|
+
console.log('Origin mismatch, ignoring message');
|
|
85
93
|
return;
|
|
94
|
+
}
|
|
86
95
|
const message = event.data;
|
|
96
|
+
console.log('Processing GameShift message:', message);
|
|
87
97
|
switch (message.type) {
|
|
88
98
|
case 'gameshift:auth:success':
|
|
89
99
|
if (message.data && !isResolved) {
|
|
@@ -127,6 +137,7 @@ class GameshiftWalletAdapter extends wallet_adapter_base_1.BaseMessageSignerWall
|
|
|
127
137
|
// Wait for 3 consecutive checks (1.5s) to confirm it's really closed
|
|
128
138
|
// This allows OAuth redirects time to complete
|
|
129
139
|
if (closedCheckCount >= 3 && !isResolved) {
|
|
140
|
+
debugger;
|
|
130
141
|
isResolved = true;
|
|
131
142
|
this._cleanup();
|
|
132
143
|
reject(new wallet_adapter_base_1.WalletConnectionError('User closed the authentication popup'));
|
|
@@ -275,6 +286,23 @@ class GameshiftWalletAdapter extends wallet_adapter_base_1.BaseMessageSignerWall
|
|
|
275
286
|
}
|
|
276
287
|
});
|
|
277
288
|
}
|
|
289
|
+
_normalizePortalUrl(url) {
|
|
290
|
+
// Remove trailing slash
|
|
291
|
+
url = url.replace(/\/$/, '');
|
|
292
|
+
// For non-localhost URLs, ensure www prefix if the portal uses it
|
|
293
|
+
try {
|
|
294
|
+
const parsed = new URL(url);
|
|
295
|
+
if (parsed.hostname !== 'localhost' && !parsed.hostname.startsWith('www.')) {
|
|
296
|
+
// Add www prefix for production domains (e.g., gameshift.gg -> www.gameshift.gg)
|
|
297
|
+
parsed.hostname = `www.${parsed.hostname}`;
|
|
298
|
+
return parsed.toString().replace(/\/$/, '');
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
catch (_a) {
|
|
302
|
+
// If URL parsing fails, return as-is
|
|
303
|
+
}
|
|
304
|
+
return url;
|
|
305
|
+
}
|
|
278
306
|
_cleanup() {
|
|
279
307
|
if (this._messageHandler) {
|
|
280
308
|
window.removeEventListener('message', this._messageHandler);
|
package/lib/cjs/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAMqC;AAQrC,6CAA4C;AAC5C,uCAAoC;AAavB,QAAA,mBAAmB,GAAG,WAAsC,CAAC;AA4B1E,MAAa,sBAAuB,SAAQ,oDAA8B;IAuBtE,YAAY,MAAoC;QAC5C,KAAK,EAAE,CAAC;QAvBZ,SAAI,GAAG,2BAAmB,CAAC;QAC3B,QAAG,GAAG,yBAAyB,CAAC;QAChC,SAAI,GACA,okBAAokB,CAAC;QACzkB,iCAA4B,GAAoC,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAa/E,gBAAW,GACf,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW;YAC5D,CAAC,CAAC,sCAAgB,CAAC,WAAW;YAC9B,CAAC,CAAC,sCAAgB,CAAC,QAAQ,CAAC;QAIhC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,IAAI,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/adapter.js
CHANGED
|
@@ -16,7 +16,8 @@ export class GameshiftWalletAdapter extends BaseMessageSignerWalletAdapter {
|
|
|
16
16
|
this._publicKey = null;
|
|
17
17
|
this._token = null;
|
|
18
18
|
this._email = null;
|
|
19
|
-
|
|
19
|
+
// Normalize portal URL: remove trailing slash and ensure www prefix for consistency
|
|
20
|
+
this._portalUrl = this._normalizePortalUrl(config.portalUrl || 'http://localhost:3000');
|
|
20
21
|
this._metakeepAppId = config.metakeepAppId;
|
|
21
22
|
this._popupWidth = config.popupWidth || 450;
|
|
22
23
|
this._popupHeight = config.popupHeight || 650;
|
|
@@ -65,10 +66,19 @@ export class GameshiftWalletAdapter extends BaseMessageSignerWalletAdapter {
|
|
|
65
66
|
const popupUrl = `${this._portalUrl}/auth/wallet-connect?origin=${encodeURIComponent(origin)}&state=${encodeURIComponent(state)}`;
|
|
66
67
|
// Message handler for postMessage from popup
|
|
67
68
|
this._messageHandler = (event) => {
|
|
69
|
+
// Log all messages for debugging
|
|
70
|
+
console.log('Received postMessage:', {
|
|
71
|
+
origin: event.origin,
|
|
72
|
+
expectedOrigin: this._portalUrl,
|
|
73
|
+
data: event.data,
|
|
74
|
+
});
|
|
68
75
|
// Only accept messages from the portal
|
|
69
|
-
if (event.origin !== this._portalUrl)
|
|
76
|
+
if (event.origin !== this._portalUrl) {
|
|
77
|
+
console.log('Origin mismatch, ignoring message');
|
|
70
78
|
return;
|
|
79
|
+
}
|
|
71
80
|
const message = event.data;
|
|
81
|
+
console.log('Processing GameShift message:', message);
|
|
72
82
|
switch (message.type) {
|
|
73
83
|
case 'gameshift:auth:success':
|
|
74
84
|
if (message.data && !isResolved) {
|
|
@@ -111,6 +121,7 @@ export class GameshiftWalletAdapter extends BaseMessageSignerWalletAdapter {
|
|
|
111
121
|
// Wait for 3 consecutive checks (1.5s) to confirm it's really closed
|
|
112
122
|
// This allows OAuth redirects time to complete
|
|
113
123
|
if (closedCheckCount >= 3 && !isResolved) {
|
|
124
|
+
debugger;
|
|
114
125
|
isResolved = true;
|
|
115
126
|
this._cleanup();
|
|
116
127
|
reject(new WalletConnectionError('User closed the authentication popup'));
|
|
@@ -248,6 +259,23 @@ export class GameshiftWalletAdapter extends BaseMessageSignerWalletAdapter {
|
|
|
248
259
|
throw error;
|
|
249
260
|
}
|
|
250
261
|
}
|
|
262
|
+
_normalizePortalUrl(url) {
|
|
263
|
+
// Remove trailing slash
|
|
264
|
+
url = url.replace(/\/$/, '');
|
|
265
|
+
// For non-localhost URLs, ensure www prefix if the portal uses it
|
|
266
|
+
try {
|
|
267
|
+
const parsed = new URL(url);
|
|
268
|
+
if (parsed.hostname !== 'localhost' && !parsed.hostname.startsWith('www.')) {
|
|
269
|
+
// Add www prefix for production domains (e.g., gameshift.gg -> www.gameshift.gg)
|
|
270
|
+
parsed.hostname = `www.${parsed.hostname}`;
|
|
271
|
+
return parsed.toString().replace(/\/$/, '');
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
catch {
|
|
275
|
+
// If URL parsing fails, return as-is
|
|
276
|
+
}
|
|
277
|
+
return url;
|
|
278
|
+
}
|
|
251
279
|
_cleanup() {
|
|
252
280
|
if (this._messageHandler) {
|
|
253
281
|
window.removeEventListener('message', this._messageHandler);
|
package/lib/esm/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"AACA,OAAO,EACH,8BAA8B,EAC9B,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,gBAAgB,GACnB,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAapC,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAsC,CAAC;AA4B1E,MAAM,OAAO,sBAAuB,SAAQ,8BAA8B;IAuBtE,YAAY,MAAoC;QAC5C,KAAK,EAAE,CAAC;QAvBZ,SAAI,GAAG,mBAAmB,CAAC;QAC3B,QAAG,GAAG,yBAAyB,CAAC;QAChC,SAAI,GACA,okBAAokB,CAAC;QACzkB,iCAA4B,GAAoC,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAa/E,gBAAW,GACf,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW;YAC5D,CAAC,CAAC,gBAAgB,CAAC,WAAW;YAC9B,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC;QAIhC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,IAAI,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/types/adapter.d.ts
CHANGED
|
@@ -49,6 +49,7 @@ export declare class GameshiftWalletAdapter extends BaseMessageSignerWalletAdapt
|
|
|
49
49
|
signTransaction<T extends Transaction | VersionedTransaction>(transaction: T): Promise<T>;
|
|
50
50
|
signAllTransactions<T extends Transaction | VersionedTransaction>(transactions: T[]): Promise<T[]>;
|
|
51
51
|
signMessage(message: Uint8Array): Promise<Uint8Array>;
|
|
52
|
+
private _normalizePortalUrl;
|
|
52
53
|
private _cleanup;
|
|
53
54
|
}
|
|
54
55
|
//# sourceMappingURL=adapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,EACH,8BAA8B,EAI9B,gBAAgB,EACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACR,UAAU,EACV,WAAW,EACX,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,WAAW,4BAA4B;IACzC,yDAAyD;IACzD,aAAa,EAAE,MAAM,CAAC;IACtB,iGAAiG;IACjG,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,mBAAmB,EAAkB,UAAU,CAAC,WAAW,CAAC,CAAC;AA4B1E,qBAAa,sBAAuB,SAAQ,8BAA8B;IACtE,IAAI,0BAAuB;IAC3B,GAAG,SAA6B;IAChC,IAAI,SACqkB;IACzkB,4BAA4B,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAA0B;IAEvF,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,eAAe,CAAyC;IAChE,OAAO,CAAC,mBAAmB,CAAwC;IACnE,OAAO,CAAC,WAAW,CAGiB;gBAExB,MAAM,EAAE,4BAA4B;
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,EACH,8BAA8B,EAI9B,gBAAgB,EACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACR,UAAU,EACV,WAAW,EACX,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,WAAW,4BAA4B;IACzC,yDAAyD;IACzD,aAAa,EAAE,MAAM,CAAC;IACtB,iGAAiG;IACjG,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,mBAAmB,EAAkB,UAAU,CAAC,WAAW,CAAC,CAAC;AA4B1E,qBAAa,sBAAuB,SAAQ,8BAA8B;IACtE,IAAI,0BAAuB;IAC3B,GAAG,SAA6B;IAChC,IAAI,SACqkB;IACzkB,4BAA4B,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAA0B;IAEvF,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,eAAe,CAAyC;IAChE,OAAO,CAAC,mBAAmB,CAAwC;IACnE,OAAO,CAAC,WAAW,CAGiB;gBAExB,MAAM,EAAE,4BAA4B;IAgBhD,IAAI,SAAS,qBAEZ;IAED,IAAI,UAAU,YAEb;IAED,IAAI,UAAU,qBAEb;IAED;;;OAGG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,IAAI,CAEzB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,IAAI,CAEzB;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgJxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAC9D,WAAW,EAAE,CAAC,EACd,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,sBAA2B,GACrC,OAAO,CAAC,oBAAoB,CAAC;IAW1B,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,WAAW,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAoBzF,mBAAmB,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAmClG,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAsB3D,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,QAAQ;CAsBnB"}
|
package/package.json
CHANGED
package/src/adapter.ts
CHANGED
|
@@ -84,7 +84,8 @@ export class GameshiftWalletAdapter extends BaseMessageSignerWalletAdapter {
|
|
|
84
84
|
this._publicKey = null;
|
|
85
85
|
this._token = null;
|
|
86
86
|
this._email = null;
|
|
87
|
-
|
|
87
|
+
// Normalize portal URL: remove trailing slash and ensure www prefix for consistency
|
|
88
|
+
this._portalUrl = this._normalizePortalUrl(config.portalUrl || 'http://localhost:3000');
|
|
88
89
|
this._metakeepAppId = config.metakeepAppId;
|
|
89
90
|
this._popupWidth = config.popupWidth || 450;
|
|
90
91
|
this._popupHeight = config.popupHeight || 650;
|
|
@@ -144,11 +145,21 @@ export class GameshiftWalletAdapter extends BaseMessageSignerWalletAdapter {
|
|
|
144
145
|
|
|
145
146
|
// Message handler for postMessage from popup
|
|
146
147
|
this._messageHandler = (event: MessageEvent) => {
|
|
148
|
+
// Log all messages for debugging
|
|
149
|
+
console.log('Received postMessage:', {
|
|
150
|
+
origin: event.origin,
|
|
151
|
+
expectedOrigin: this._portalUrl,
|
|
152
|
+
data: event.data,
|
|
153
|
+
});
|
|
154
|
+
|
|
147
155
|
// Only accept messages from the portal
|
|
148
|
-
if (event.origin !== this._portalUrl)
|
|
156
|
+
if (event.origin !== this._portalUrl) {
|
|
157
|
+
console.log('Origin mismatch, ignoring message');
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
149
160
|
|
|
150
161
|
const message = event.data as GameshiftAuthMessage;
|
|
151
|
-
|
|
162
|
+
console.log('Processing GameShift message:', message);
|
|
152
163
|
switch (message.type) {
|
|
153
164
|
case 'gameshift:auth:success':
|
|
154
165
|
if (message.data && !isResolved) {
|
|
@@ -201,6 +212,7 @@ export class GameshiftWalletAdapter extends BaseMessageSignerWalletAdapter {
|
|
|
201
212
|
// Wait for 3 consecutive checks (1.5s) to confirm it's really closed
|
|
202
213
|
// This allows OAuth redirects time to complete
|
|
203
214
|
if (closedCheckCount >= 3 && !isResolved) {
|
|
215
|
+
debugger;
|
|
204
216
|
isResolved = true;
|
|
205
217
|
this._cleanup();
|
|
206
218
|
reject(new WalletConnectionError('User closed the authentication popup'));
|
|
@@ -359,6 +371,25 @@ export class GameshiftWalletAdapter extends BaseMessageSignerWalletAdapter {
|
|
|
359
371
|
}
|
|
360
372
|
}
|
|
361
373
|
|
|
374
|
+
private _normalizePortalUrl(url: string): string {
|
|
375
|
+
// Remove trailing slash
|
|
376
|
+
url = url.replace(/\/$/, '');
|
|
377
|
+
|
|
378
|
+
// For non-localhost URLs, ensure www prefix if the portal uses it
|
|
379
|
+
try {
|
|
380
|
+
const parsed = new URL(url);
|
|
381
|
+
if (parsed.hostname !== 'localhost' && !parsed.hostname.startsWith('www.')) {
|
|
382
|
+
// Add www prefix for production domains (e.g., gameshift.gg -> www.gameshift.gg)
|
|
383
|
+
parsed.hostname = `www.${parsed.hostname}`;
|
|
384
|
+
return parsed.toString().replace(/\/$/, '');
|
|
385
|
+
}
|
|
386
|
+
} catch {
|
|
387
|
+
// If URL parsing fails, return as-is
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
return url;
|
|
391
|
+
}
|
|
392
|
+
|
|
362
393
|
private _cleanup(): void {
|
|
363
394
|
if (this._messageHandler) {
|
|
364
395
|
window.removeEventListener('message', this._messageHandler);
|