@thirdweb-dev/service-utils 0.9.14-nightly-6be945936195e6ba41dbdd3a90a28f097e81dbee-20250620000408 → 0.10.0-nightly-c5f9921dc9cf6c62d754f12ce6171d95bd87a590-20250625053652
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/dist/cjs/cf-worker/index.js +25 -25
- package/dist/cjs/cf-worker/index.js.map +1 -1
- package/dist/cjs/cf-worker/usage.js +7 -7
- package/dist/cjs/cf-worker/usage.js.map +1 -1
- package/dist/cjs/cf-worker/usageV2.js +2 -2
- package/dist/cjs/cf-worker/usageV2.js.map +1 -1
- package/dist/cjs/core/api.js +1 -1
- package/dist/cjs/core/api.js.map +1 -1
- package/dist/cjs/core/authorize/client.js +6 -6
- package/dist/cjs/core/authorize/client.js.map +1 -1
- package/dist/cjs/core/authorize/index.js +12 -12
- package/dist/cjs/core/authorize/index.js.map +1 -1
- package/dist/cjs/core/authorize/service.js +7 -7
- package/dist/cjs/core/authorize/service.js.map +1 -1
- package/dist/cjs/core/rateLimit/index.js +7 -7
- package/dist/cjs/core/rateLimit/index.js.map +1 -1
- package/dist/cjs/core/rateLimit/strategies/sliding-window.js +3 -3
- package/dist/cjs/core/rateLimit/strategies/sliding-window.js.map +1 -1
- package/dist/cjs/core/services.js +51 -51
- package/dist/cjs/core/services.js.map +1 -1
- package/dist/cjs/core/usage.js +53 -52
- package/dist/cjs/core/usage.js.map +1 -1
- package/dist/cjs/index.js +5 -5
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/mocks.js +60 -60
- package/dist/cjs/mocks.js.map +1 -1
- package/dist/cjs/node/index.js +26 -25
- package/dist/cjs/node/index.js.map +1 -1
- package/dist/cjs/node/kafka.js +6 -6
- package/dist/cjs/node/kafka.js.map +1 -1
- package/dist/cjs/node/usageV2.js +24 -30
- package/dist/cjs/node/usageV2.js.map +1 -1
- package/dist/cjs/node/webhookProducer.js +49 -0
- package/dist/cjs/node/webhookProducer.js.map +1 -0
- package/dist/esm/cf-worker/index.js +25 -25
- package/dist/esm/cf-worker/index.js.map +1 -1
- package/dist/esm/cf-worker/usage.js +7 -7
- package/dist/esm/cf-worker/usage.js.map +1 -1
- package/dist/esm/cf-worker/usageV2.js +2 -2
- package/dist/esm/cf-worker/usageV2.js.map +1 -1
- package/dist/esm/core/api.js +1 -1
- package/dist/esm/core/api.js.map +1 -1
- package/dist/esm/core/authorize/client.js +6 -6
- package/dist/esm/core/authorize/client.js.map +1 -1
- package/dist/esm/core/authorize/index.js +12 -12
- package/dist/esm/core/authorize/index.js.map +1 -1
- package/dist/esm/core/authorize/service.js +7 -7
- package/dist/esm/core/authorize/service.js.map +1 -1
- package/dist/esm/core/rateLimit/index.js +7 -7
- package/dist/esm/core/rateLimit/index.js.map +1 -1
- package/dist/esm/core/rateLimit/strategies/sliding-window.js +3 -3
- package/dist/esm/core/rateLimit/strategies/sliding-window.js.map +1 -1
- package/dist/esm/core/services.js +51 -51
- package/dist/esm/core/services.js.map +1 -1
- package/dist/esm/core/usage.js +53 -52
- package/dist/esm/core/usage.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/mocks.js +60 -60
- package/dist/esm/mocks.js.map +1 -1
- package/dist/esm/node/index.js +26 -25
- package/dist/esm/node/index.js.map +1 -1
- package/dist/esm/node/kafka.js +6 -6
- package/dist/esm/node/kafka.js.map +1 -1
- package/dist/esm/node/usageV2.js +24 -30
- package/dist/esm/node/usageV2.js.map +1 -1
- package/dist/esm/node/webhookProducer.js +45 -0
- package/dist/esm/node/webhookProducer.js.map +1 -0
- package/dist/types/cf-worker/index.d.ts +3 -3
- package/dist/types/cf-worker/index.d.ts.map +1 -1
- package/dist/types/cf-worker/usage.d.ts.map +1 -1
- package/dist/types/core/authorize/client.d.ts.map +1 -1
- package/dist/types/core/authorize/index.d.ts.map +1 -1
- package/dist/types/core/services.d.ts +122 -122
- package/dist/types/core/services.d.ts.map +1 -1
- package/dist/types/core/usage.d.ts +143 -141
- package/dist/types/core/usage.d.ts.map +1 -1
- package/dist/types/index.d.ts +3 -3
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/node/index.d.ts +5 -4
- package/dist/types/node/index.d.ts.map +1 -1
- package/dist/types/node/usageV2.d.ts +15 -11
- package/dist/types/node/usageV2.d.ts.map +1 -1
- package/dist/types/node/webhookProducer.d.ts +37 -0
- package/dist/types/node/webhookProducer.d.ts.map +1 -0
- package/package.json +45 -43
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/index.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/node/kafka.js
CHANGED
|
@@ -31,14 +31,14 @@ class KafkaProducer {
|
|
|
31
31
|
});
|
|
32
32
|
const { producerName, kafkaServers, username, password, config } = options;
|
|
33
33
|
this.producer = new kafka_javascript_1.KafkaJS.Kafka({}).producer({
|
|
34
|
-
"
|
|
34
|
+
"allow.auto.create.topics": true,
|
|
35
35
|
"bootstrap.servers": kafkaServers,
|
|
36
|
-
"
|
|
36
|
+
"client.id": producerName,
|
|
37
|
+
"compression.codec": "lz4",
|
|
37
38
|
"sasl.mechanisms": "PLAIN",
|
|
38
|
-
"sasl.username": username,
|
|
39
39
|
"sasl.password": password,
|
|
40
|
-
"
|
|
41
|
-
"
|
|
40
|
+
"sasl.username": username,
|
|
41
|
+
"security.protocol": "sasl_ssl",
|
|
42
42
|
// All configuration can be overridden.
|
|
43
43
|
...config,
|
|
44
44
|
});
|
|
@@ -70,10 +70,10 @@ class KafkaProducer {
|
|
|
70
70
|
async send(topic, messages) {
|
|
71
71
|
await this.connect();
|
|
72
72
|
await this.producer.send({
|
|
73
|
-
topic,
|
|
74
73
|
messages: messages.map((m) => ({
|
|
75
74
|
value: JSON.stringify(m),
|
|
76
75
|
})),
|
|
76
|
+
topic,
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
79
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kafka.js","sourceRoot":"","sources":["../../../src/node/kafka.ts"],"names":[],"mappings":";;;AAAA,qEAGwC;AAgBxC;;;;;;;;;;;GAWG;AACH,MAAa,aAAa;IAKxB,YAAY,OAgBX;QApBO;;;;;WAA2B;QACnC,8DAA8D;QACtD;;;;;WAA+B;QAmBrC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAE3E,IAAI,CAAC,QAAQ,GAAG,IAAI,0BAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC7C,
|
|
1
|
+
{"version":3,"file":"kafka.js","sourceRoot":"","sources":["../../../src/node/kafka.ts"],"names":[],"mappings":";;;AAAA,qEAGwC;AAgBxC;;;;;;;;;;;GAWG;AACH,MAAa,aAAa;IAKxB,YAAY,OAgBX;QApBO;;;;;WAA2B;QACnC,8DAA8D;QACtD;;;;;WAA+B;QAmBrC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAE3E,IAAI,CAAC,QAAQ,GAAG,IAAI,0BAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC7C,0BAA0B,EAAE,IAAI;YAChC,mBAAmB,EAAE,YAAY;YACjC,WAAW,EAAE,YAAY;YACzB,mBAAmB,EAAE,KAAK;YAC1B,iBAAiB,EAAE,OAAO;YAC1B,eAAe,EAAE,QAAQ;YACzB,eAAe,EAAE,QAAQ;YACzB,mBAAmB,EAAE,UAAU;YAC/B,uCAAuC;YACvC,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC1D,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;gBAChC,MAAM,GAAG,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC;QACD,MAAM,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,IAAI,CACR,KAAa,EACb,QAAmC;QAEnC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAErB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACvB,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC7B,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;aACzB,CAAC,CAAC;YACH,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;CACF;AAvFD,sCAuFC"}
|
package/dist/cjs/node/usageV2.js
CHANGED
|
@@ -4,18 +4,14 @@ exports.UsageV2Producer = void 0;
|
|
|
4
4
|
const node_crypto_1 = require("node:crypto");
|
|
5
5
|
const usageV2_js_1 = require("../core/usageV2.js");
|
|
6
6
|
const kafka_js_1 = require("./kafka.js");
|
|
7
|
-
const TEAM_ID_PREFIX = "team_";
|
|
8
|
-
const PROJECT_ID_PREFIX = "prj_";
|
|
9
7
|
/**
|
|
10
|
-
* Creates a
|
|
11
|
-
* This class is thread-safe so your service should re-use one instance.
|
|
8
|
+
* Creates a producer for usage events.
|
|
12
9
|
*
|
|
13
10
|
* Example:
|
|
14
11
|
* ```ts
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
* // void usageV2.sendEvents(events).catch((e) => console.error(e))
|
|
12
|
+
* const kafkaProducer = new KafkaProducer({...});
|
|
13
|
+
* const usageV2 = new UsageV2Producer({ kafkaProducer, source: "storage" });
|
|
14
|
+
* await usageV2.sendEvents(events);
|
|
19
15
|
* ```
|
|
20
16
|
*/
|
|
21
17
|
class UsageV2Producer {
|
|
@@ -32,12 +28,17 @@ class UsageV2Producer {
|
|
|
32
28
|
writable: true,
|
|
33
29
|
value: void 0
|
|
34
30
|
});
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
31
|
+
if ("kafkaProducer" in config) {
|
|
32
|
+
this.kafkaProducer = config.kafkaProducer;
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
this.kafkaProducer = new kafka_js_1.KafkaProducer({
|
|
36
|
+
kafkaServers: config.kafkaServers,
|
|
37
|
+
password: config.password,
|
|
38
|
+
producerName: config.producerName,
|
|
39
|
+
username: config.username,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
41
42
|
this.topic = (0, usageV2_js_1.getTopicName)(config.source);
|
|
42
43
|
}
|
|
43
44
|
/**
|
|
@@ -52,28 +53,21 @@ class UsageV2Producer {
|
|
|
52
53
|
async sendEvents(events) {
|
|
53
54
|
const parsedEvents = events.map((event) => ({
|
|
54
55
|
...event,
|
|
55
|
-
// Default to a generated UUID.
|
|
56
|
-
id: event.id ?? (0, node_crypto_1.randomUUID)(),
|
|
57
56
|
// Default to now.
|
|
58
57
|
created_at: event.created_at ?? new Date(),
|
|
59
|
-
//
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
project_id: event.project_id?.startsWith(PROJECT_ID_PREFIX)
|
|
65
|
-
? event.project_id.slice(PROJECT_ID_PREFIX.length)
|
|
58
|
+
// Default to a generated UUID.
|
|
59
|
+
id: event.id ?? (0, node_crypto_1.randomUUID)(),
|
|
60
|
+
// Remove the "prj_" prefix.
|
|
61
|
+
project_id: event.project_id?.startsWith("prj_")
|
|
62
|
+
? event.project_id.slice(4)
|
|
66
63
|
: event.project_id,
|
|
64
|
+
// Remove the "team_" prefix.
|
|
65
|
+
team_id: event.team_id.startsWith("team_")
|
|
66
|
+
? event.team_id.slice(5)
|
|
67
|
+
: event.team_id,
|
|
67
68
|
}));
|
|
68
69
|
await this.kafkaProducer.send(this.topic, parsedEvents);
|
|
69
70
|
}
|
|
70
|
-
/**
|
|
71
|
-
* Disconnects UsageV2Producer.
|
|
72
|
-
* Useful when shutting down the service to flush in-flight events.
|
|
73
|
-
*/
|
|
74
|
-
async disconnect() {
|
|
75
|
-
await this.kafkaProducer.disconnect();
|
|
76
|
-
}
|
|
77
71
|
}
|
|
78
72
|
exports.UsageV2Producer = UsageV2Producer;
|
|
79
73
|
//# sourceMappingURL=usageV2.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/node/usageV2.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,mDAI4B;AAC5B,yCAA2C;AAE3C,
|
|
1
|
+
{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/node/usageV2.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,mDAI4B;AAC5B,yCAA2C;AAE3C;;;;;;;;;GASG;AACH,MAAa,eAAe;IAI1B,YACE,MA2BK;QA/BC;;;;;WAA6B;QAC7B;;;;;WAAc;QAgCpB,IAAI,eAAe,IAAI,MAAM,EAAE,CAAC;YAC9B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,GAAG,IAAI,wBAAa,CAAC;gBACrC,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAA,yBAAY,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,UAAU,CAAC,MAAsB;QACrC,MAAM,YAAY,GAAmB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1D,GAAG,KAAK;YACR,kBAAkB;YAClB,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,IAAI,IAAI,EAAE;YAC1C,+BAA+B;YAC/B,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,IAAA,wBAAU,GAAE;YAC5B,4BAA4B;YAC5B,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC;gBAC9C,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC3B,CAAC,CAAC,KAAK,CAAC,UAAU;YACpB,6BAA6B;YAC7B,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;gBACxC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;gBACxB,CAAC,CAAC,KAAK,CAAC,OAAO;SAClB,CAAC,CAAC,CAAC;QACJ,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAC1D,CAAC;CACF;AA1ED,0CA0EC"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WebhookEventProducer = void 0;
|
|
4
|
+
const node_assert_1 = require("node:assert");
|
|
5
|
+
const cuid2_1 = require("@paralleldrive/cuid2");
|
|
6
|
+
/**
|
|
7
|
+
* Creates a producer for webhook events.
|
|
8
|
+
*
|
|
9
|
+
* Example:
|
|
10
|
+
* ```ts
|
|
11
|
+
* const kafkaProducer = new KafkaProducer({...});
|
|
12
|
+
* const webhookProducer = new WebhookEventProducer({ kafkaProducer });
|
|
13
|
+
* await webhookProducer.sendEvents("your.topic.name", events);
|
|
14
|
+
* ```
|
|
15
|
+
*/
|
|
16
|
+
class WebhookEventProducer {
|
|
17
|
+
constructor(config) {
|
|
18
|
+
Object.defineProperty(this, "kafkaProducer", {
|
|
19
|
+
enumerable: true,
|
|
20
|
+
configurable: true,
|
|
21
|
+
writable: true,
|
|
22
|
+
value: void 0
|
|
23
|
+
});
|
|
24
|
+
this.kafkaProducer = config.kafkaProducer;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Emit a webhook event.
|
|
28
|
+
* This method may throw. To call this non-blocking:
|
|
29
|
+
* ```ts
|
|
30
|
+
* void webhookProducer.sendEvents(events).catch((e) => console.error(e))
|
|
31
|
+
* ```
|
|
32
|
+
*/
|
|
33
|
+
async sendEvents(topic, events) {
|
|
34
|
+
const parsedEvents = events.map((event) => {
|
|
35
|
+
(0, node_assert_1.default)(event.teamId.startsWith("team_"), "teamId must start with 'team_'");
|
|
36
|
+
(0, node_assert_1.default)(!event.projectId || event.projectId.startsWith("prj_"), "projectId must start with 'prj_'");
|
|
37
|
+
return {
|
|
38
|
+
...event,
|
|
39
|
+
// Default to now.
|
|
40
|
+
created_at: event.createdAt ?? new Date(),
|
|
41
|
+
// Default to a generated UUID.
|
|
42
|
+
id: event.id ?? `evt_${(0, cuid2_1.createId)()}`,
|
|
43
|
+
};
|
|
44
|
+
});
|
|
45
|
+
await this.kafkaProducer.send(topic, parsedEvents);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
exports.WebhookEventProducer = WebhookEventProducer;
|
|
49
|
+
//# sourceMappingURL=webhookProducer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webhookProducer.js","sourceRoot":"","sources":["../../../src/node/webhookProducer.ts"],"names":[],"mappings":";;;AAAA,6CAAiC;AACjC,gDAAgD;AAchD;;;;;;;;;GASG;AACH,MAAa,oBAAoB;IAG/B,YAAY,MAAwC;QAF5C;;;;;WAA6B;QAGnC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IAC5C,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,UAAU,CAAC,KAAa,EAAE,MAAsB;QACpD,MAAM,YAAY,GAAmB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACxD,IAAA,qBAAM,EACJ,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAChC,gCAAgC,CACjC,CAAC;YACF,IAAA,qBAAM,EACJ,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EACtD,kCAAkC,CACnC,CAAC;YAEF,OAAO;gBACL,GAAG,KAAK;gBACR,kBAAkB;gBAClB,UAAU,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE;gBACzC,+BAA+B;gBAC/B,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,OAAO,IAAA,gBAAQ,GAAE,EAAE;aACpC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACrD,CAAC;CACF;AAnCD,oDAmCC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { authorize } from "../core/authorize/index.js";
|
|
2
|
+
export * from "../core/rateLimit/index.js";
|
|
3
|
+
export * from "../core/services.js";
|
|
4
|
+
export * from "../core/usageV2.js";
|
|
2
5
|
export * from "./usage.js";
|
|
3
6
|
export * from "./usageV2.js";
|
|
4
|
-
export * from "../core/usageV2.js";
|
|
5
|
-
export * from "../core/services.js";
|
|
6
|
-
export * from "../core/rateLimit/index.js";
|
|
7
7
|
const DEFAULT_CACHE_TTL_SECONDS = 60;
|
|
8
8
|
export async function authorizeWorker(authInput, serviceConfig) {
|
|
9
9
|
let authData;
|
|
@@ -14,30 +14,30 @@ export async function authorizeWorker(authInput, serviceConfig) {
|
|
|
14
14
|
if (e instanceof Error && e.message === "KEY_CONFLICT") {
|
|
15
15
|
return {
|
|
16
16
|
authorized: false,
|
|
17
|
-
status: 400,
|
|
18
|
-
errorMessage: "Please pass either a client id or a secret key.",
|
|
19
17
|
errorCode: "KEY_CONFLICT",
|
|
18
|
+
errorMessage: "Please pass either a client id or a secret key.",
|
|
19
|
+
status: 400,
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
return {
|
|
23
23
|
authorized: false,
|
|
24
|
-
status: 500,
|
|
25
|
-
errorMessage: "Internal Server Error",
|
|
26
24
|
errorCode: "INTERNAL_SERVER_ERROR",
|
|
25
|
+
errorMessage: "Internal Server Error",
|
|
26
|
+
status: 500,
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
return await authorize(authData, serviceConfig, {
|
|
30
|
+
cacheTtlSeconds: serviceConfig.cacheTtlSeconds ?? DEFAULT_CACHE_TTL_SECONDS,
|
|
30
31
|
get: async (clientId) => serviceConfig.kvStore.get(clientId),
|
|
31
32
|
put: (clientId, teamAndProjectResponse) => serviceConfig.ctx.waitUntil(serviceConfig.kvStore.put(clientId, JSON.stringify({
|
|
32
|
-
updatedAt: Date.now(),
|
|
33
33
|
teamAndProjectResponse,
|
|
34
|
+
updatedAt: Date.now(),
|
|
34
35
|
}), {
|
|
35
36
|
expirationTtl: serviceConfig.cacheTtlSeconds &&
|
|
36
37
|
serviceConfig.cacheTtlSeconds >= DEFAULT_CACHE_TTL_SECONDS
|
|
37
38
|
? serviceConfig.cacheTtlSeconds
|
|
38
39
|
: DEFAULT_CACHE_TTL_SECONDS,
|
|
39
40
|
})),
|
|
40
|
-
cacheTtlSeconds: serviceConfig.cacheTtlSeconds ?? DEFAULT_CACHE_TTL_SECONDS,
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
43
|
export async function extractAuthorizationData(authInput) {
|
|
@@ -111,19 +111,19 @@ export async function extractAuthorizationData(authInput) {
|
|
|
111
111
|
teamId = headers.get("x-team-id");
|
|
112
112
|
}
|
|
113
113
|
return {
|
|
114
|
-
|
|
115
|
-
incomingServiceApiKeyHash,
|
|
116
|
-
jwt,
|
|
117
|
-
hashedJWT: jwt ? await hashSecretKey(jwt) : null,
|
|
118
|
-
secretKey,
|
|
114
|
+
bundleId,
|
|
119
115
|
clientId,
|
|
120
116
|
ecosystemId,
|
|
121
117
|
ecosystemPartnerId,
|
|
118
|
+
hashedJWT: jwt ? await hashSecretKey(jwt) : null,
|
|
119
|
+
incomingServiceApiKey,
|
|
120
|
+
incomingServiceApiKeyHash,
|
|
121
|
+
jwt,
|
|
122
122
|
origin,
|
|
123
|
-
|
|
123
|
+
secretKey,
|
|
124
124
|
secretKeyHash,
|
|
125
|
-
teamId: authInput.teamId ?? teamId ?? undefined,
|
|
126
125
|
targetAddress: authInput.targetAddress,
|
|
126
|
+
teamId: authInput.teamId ?? teamId ?? undefined,
|
|
127
127
|
};
|
|
128
128
|
}
|
|
129
129
|
export async function hashSecretKey(secretKey) {
|
|
@@ -136,22 +136,22 @@ function bufferToHex(buffer) {
|
|
|
136
136
|
}
|
|
137
137
|
export async function logHttpRequest({ clientId, req, res, isAuthed, statusMessage, latencyMs, }) {
|
|
138
138
|
try {
|
|
139
|
-
const authorizationData = await extractAuthorizationData({
|
|
139
|
+
const authorizationData = await extractAuthorizationData({ clientId, req });
|
|
140
140
|
const headers = req.headers;
|
|
141
141
|
console.log(JSON.stringify({
|
|
142
|
-
|
|
143
|
-
pathname: req.url,
|
|
144
|
-
hasSecretKey: !!authorizationData.secretKey,
|
|
142
|
+
clientId: authorizationData.clientId,
|
|
145
143
|
hasClientId: !!authorizationData.clientId,
|
|
146
144
|
hasJwt: !!authorizationData.jwt,
|
|
147
|
-
|
|
145
|
+
hasSecretKey: !!authorizationData.secretKey,
|
|
148
146
|
isAuthed,
|
|
149
|
-
|
|
147
|
+
latencyMs,
|
|
148
|
+
method: req.method,
|
|
149
|
+
os: headers.get("x-sdk-os") ?? undefined,
|
|
150
|
+
pathname: req.url,
|
|
151
|
+
platform: headers.get("x-sdk-platform") ?? undefined,
|
|
150
152
|
sdkName: headers.get("x-sdk-name") ?? undefined,
|
|
151
153
|
sdkVersion: headers.get("x-sdk-version") ?? undefined,
|
|
152
|
-
|
|
153
|
-
os: headers.get("x-sdk-os") ?? undefined,
|
|
154
|
-
latencyMs,
|
|
154
|
+
status: res.status,
|
|
155
155
|
}));
|
|
156
156
|
if (statusMessage) {
|
|
157
157
|
console.log(`statusMessage=${statusMessage}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cf-worker/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cf-worker/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,19 +34,19 @@ async function publishUsageEvents(usageEvents, config) {
|
|
|
34
34
|
});
|
|
35
35
|
const aws = getAws({
|
|
36
36
|
accessKeyId,
|
|
37
|
-
secretAccessKey,
|
|
38
37
|
region,
|
|
38
|
+
secretAccessKey,
|
|
39
39
|
});
|
|
40
40
|
await aws.fetch(`https://sqs.${region}.amazonaws.com`, {
|
|
41
|
-
headers: {
|
|
42
|
-
"X-Amz-Target": "AmazonSQS.SendMessageBatch",
|
|
43
|
-
"X-Amz-Date": new Date().toISOString(),
|
|
44
|
-
"Content-Type": "application/x-amz-json-1.0",
|
|
45
|
-
},
|
|
46
41
|
body: JSON.stringify({
|
|
47
|
-
QueueUrl: queueUrl,
|
|
48
42
|
Entries: entries,
|
|
43
|
+
QueueUrl: queueUrl,
|
|
49
44
|
}),
|
|
45
|
+
headers: {
|
|
46
|
+
"Content-Type": "application/x-amz-json-1.0",
|
|
47
|
+
"X-Amz-Date": new Date().toISOString(),
|
|
48
|
+
"X-Amz-Target": "AmazonSQS.SendMessageBatch",
|
|
49
|
+
},
|
|
50
50
|
});
|
|
51
51
|
}
|
|
52
52
|
export { publishUsageEvents };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/cf-worker/usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAmB,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/cf-worker/usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAmB,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAIrE,wCAAwC;AACxC,IAAI,IAA2B,CAAC;AAChC,SAAS,MAAM,CAAC,OAAmD;IACjE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,kBAAkB,CAC/B,WAAyB,EACzB,MAKC;IAED,MAAM,EACJ,QAAQ,EACR,WAAW,EACX,eAAe,EACf,MAAM,GAAG,WAAW,GACrB,GAAG,MAAM,CAAC;IAEX,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,iCAAiC;QACjC,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7C,OAAO;YACL,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE;YACvB,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;SACpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,CAAC;QACjB,WAAW;QACX,MAAM;QACN,eAAe;KAChB,CAAC,CAAC;IACH,MAAM,GAAG,CAAC,KAAK,CAAC,eAAe,MAAM,gBAAgB,EAAE;QACrD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;SACnB,CAAC;QACF,OAAO,EAAE;YACP,cAAc,EAAE,4BAA4B;YAC5C,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACtC,cAAc,EAAE,4BAA4B;SAC7C;KACF,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
|
|
@@ -43,9 +43,9 @@ export async function sendUsageV2Events(events, options) {
|
|
|
43
43
|
throw new Error("[UsageV2] No authentication method provided.");
|
|
44
44
|
}
|
|
45
45
|
const resp = await fetch(url, {
|
|
46
|
-
method: "POST",
|
|
47
|
-
headers,
|
|
48
46
|
body: JSON.stringify({ events }),
|
|
47
|
+
headers,
|
|
48
|
+
method: "POST",
|
|
49
49
|
});
|
|
50
50
|
if (!resp.ok) {
|
|
51
51
|
throw new Error(`[UsageV2] Unexpected response ${resp.status}: ${await resp.text()}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAStD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAEwB,EACxB,OAAU;IAEV,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhE,gEAAgE;IAChE,IAAI,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,IAAI,CAAC;IAC1C,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC;YAC9C,GAAG,SAAS;YACZ,GAAG,EAAE,SAAS,CAAC,GAAG;SACnB,CAAC,CAAC;QACH,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAC7B,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,wDAAwD;IACxD,oEAAoE;IACpE,IAAI,GAAW,CAAC;IAChB,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG;QAC3B,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,IAAI,UAAU,EAAE,CAAC;QACf,oEAAoE;QACpE,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;SAAM,IAAI,QAAQ,EAAE,CAAC;QACpB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,SAAS,EAAE,CAAC;QACrB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC5B,
|
|
1
|
+
{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAStD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAEwB,EACxB,OAAU;IAEV,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhE,gEAAgE;IAChE,IAAI,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,IAAI,CAAC;IAC1C,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC;YAC9C,GAAG,SAAS;YACZ,GAAG,EAAE,SAAS,CAAC,GAAG;SACnB,CAAC,CAAC;QACH,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAC7B,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,wDAAwD;IACxD,oEAAoE;IACpE,IAAI,GAAW,CAAC;IAChB,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG;QAC3B,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,IAAI,UAAU,EAAE,CAAC;QACf,oEAAoE;QACpE,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;SAAM,IAAI,QAAQ,EAAE,CAAC;QACpB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,SAAS,EAAE,CAAC;QACrB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC5B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;QAChC,OAAO;QACP,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,iCAAiC,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;AACtB,CAAC"}
|
package/dist/esm/core/api.js
CHANGED
|
@@ -19,11 +19,11 @@ export async function fetchTeamAndProject(authData, config) {
|
|
|
19
19
|
for (let i = 0; i < retryCount; i++) {
|
|
20
20
|
try {
|
|
21
21
|
const response = await fetch(url, {
|
|
22
|
-
method: "GET",
|
|
23
22
|
headers: {
|
|
24
23
|
...authHeaders,
|
|
25
24
|
"content-type": "application/json",
|
|
26
25
|
},
|
|
26
|
+
method: "GET",
|
|
27
27
|
});
|
|
28
28
|
// TODO: if the response is a well understood status code (401, 402, etc), we should skip retry logic
|
|
29
29
|
let text = "";
|
package/dist/esm/core/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/core/api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAoQvD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,QAA4B,EAC5B,MAAyB;IAEzB,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAC7D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEtC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAC5C,IAAI,QAAQ,EAAE,CAAC;QACb,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,kBAAkB,EAAE,CAAC;QACvB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,8DAA8D;IAC9D,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAE5D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;IAC1C,IAAI,KAA0B,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/core/api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAoQvD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,QAA4B,EAC5B,MAAyB;IAEzB,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAC7D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEtC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAC5C,IAAI,QAAQ,EAAE,CAAC;QACb,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,kBAAkB,EAAE,CAAC;QACvB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,8DAA8D;IAC9D,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAE5D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;IAC1C,IAAI,KAA0B,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,OAAO,EAAE;oBACP,GAAG,WAAW;oBACd,cAAc,EAAE,kBAAkB;iBACnC;gBACD,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,qGAAqG;YAErG,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC1B,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CACb,yCAAyC,QAAQ,CAAC,MAAM,MAAM,IAAI,EAAE,CACrE,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,KAAK,GAAG,GAAG,CAAC;YACZ,IAAI,CAAC,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC;gBACvB,0DAA0D;gBAC1D,MAAM,aAAa,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,KAAK,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,GAAW,EAAE,GAAW;IAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC7B,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CACvD,CAAC;AACJ,CAAC"}
|
|
@@ -2,10 +2,10 @@ export function authorizeClient(authOptions, teamAndProjectResponse) {
|
|
|
2
2
|
const { origin, bundleId, incomingServiceApiKey } = authOptions;
|
|
3
3
|
const { team, project, authMethod } = teamAndProjectResponse;
|
|
4
4
|
const authResult = {
|
|
5
|
+
authMethod,
|
|
5
6
|
authorized: true,
|
|
6
|
-
team,
|
|
7
7
|
project,
|
|
8
|
-
|
|
8
|
+
team,
|
|
9
9
|
};
|
|
10
10
|
if (authMethod === "jwt") {
|
|
11
11
|
// ignore domains and bundleIds for JWT auth, if the token is valid we'll return the authResult
|
|
@@ -38,30 +38,30 @@ export function authorizeClient(authOptions, teamAndProjectResponse) {
|
|
|
38
38
|
}
|
|
39
39
|
return {
|
|
40
40
|
authorized: false,
|
|
41
|
-
errorMessage: `Invalid request: Unauthorized domain: ${origin}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
|
|
42
41
|
errorCode: "ORIGIN_UNAUTHORIZED",
|
|
42
|
+
errorMessage: `Invalid request: Unauthorized domain: ${origin}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
|
|
43
43
|
status: 401,
|
|
44
44
|
};
|
|
45
45
|
}
|
|
46
46
|
// validate bundleId
|
|
47
47
|
if (bundleId) {
|
|
48
48
|
if (authorizeBundleId({
|
|
49
|
-
bundleIds: project.bundleIds,
|
|
50
49
|
bundleId,
|
|
50
|
+
bundleIds: project.bundleIds,
|
|
51
51
|
})) {
|
|
52
52
|
return authResult;
|
|
53
53
|
}
|
|
54
54
|
return {
|
|
55
55
|
authorized: false,
|
|
56
|
-
errorMessage: `Invalid request: Unauthorized Bundle ID: ${bundleId}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
|
|
57
56
|
errorCode: "BUNDLE_UNAUTHORIZED",
|
|
57
|
+
errorMessage: `Invalid request: Unauthorized Bundle ID: ${bundleId}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
|
|
58
58
|
status: 401,
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
61
|
return {
|
|
62
62
|
authorized: false,
|
|
63
|
-
errorMessage: "The keys are invalid. Please check the secret-key/clientId and try again.",
|
|
64
63
|
errorCode: "UNAUTHORIZED",
|
|
64
|
+
errorMessage: "The keys are invalid. Please check the secret-key/clientId and try again.",
|
|
65
65
|
status: 401,
|
|
66
66
|
};
|
|
67
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/core/authorize/client.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,eAAe,CAC7B,WAAuC,EACvC,sBAA8C;IAE9C,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,qBAAqB,EAAE,GAAG,WAAW,CAAC;IAChE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,sBAAsB,CAAC;IAE7D,MAAM,UAAU,GAAwB;QACtC,UAAU,EAAE,IAAI;QAChB,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/core/authorize/client.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,eAAe,CAC7B,WAAuC,EACvC,sBAA8C;IAE9C,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,qBAAqB,EAAE,GAAG,WAAW,CAAC;IAChE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,sBAAsB,CAAC;IAE7D,MAAM,UAAU,GAAwB;QACtC,UAAU;QACV,UAAU,EAAE,IAAI;QAChB,OAAO;QACP,IAAI;KACL,CAAC;IAEF,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QACzB,+FAA+F;QAC/F,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,0EAA0E;IAC1E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QAC/B,uFAAuF;QACvF,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IAAI,UAAU,KAAK,gBAAgB,IAAI,qBAAqB,EAAE,CAAC;QAC7D,qFAAqF;QACrF,kIAAkI;QAClI,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,gCAAgC;IAChC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,mBAAmB;IACnB,IAAI,MAAM,EAAE,CAAC;QACX,IACE,eAAe,CAAC;YACd,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM;SACP,CAAC,EACF,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,qBAAqB;YAChC,YAAY,EAAE,yCAAyC,MAAM,wFAAwF;YACrJ,MAAM,EAAE,GAAG;SACZ,CAAC;IACJ,CAAC;IAED,oBAAoB;IACpB,IAAI,QAAQ,EAAE,CAAC;QACb,IACE,iBAAiB,CAAC;YAChB,QAAQ;YACR,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAC,EACF,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,qBAAqB;YAChC,YAAY,EAAE,4CAA4C,QAAQ,wFAAwF;YAC1J,MAAM,EAAE,GAAG;SACZ,CAAC;IACJ,CAAC;IAED,OAAO;QACL,UAAU,EAAE,KAAK;QACjB,SAAS,EAAE,cAAc;QACzB,YAAY,EACV,2EAA2E;QAC7E,MAAM,EAAE,GAAG;KACZ,CAAC;AACJ,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,MAAM,GAIP;IACC,kDAAkD;IAClD,8DAA8D;IAC9D,+FAA+F;IAC/F,8HAA8H;IAC9H,OAAO,CAAC,CAAC;QACP,GAAG,OAAO;QACV,8BAA8B;QAC9B,kCAAkC;KACnC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QACX,8CAA8C;QAC9C,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QAED,+BAA+B;QAC/B,gFAAgF;QAChF,IAAI,CAAC,KAAK,WAAW,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,uCAAuC;QACvC,iEAAiE;QACjE,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,mEAAmE;YACnE,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9B,OAAO,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACrC,CAAC;QAED,yDAAyD;QACzD,OAAO,CAAC,KAAK,MAAM,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,EAChC,SAAS,EACT,QAAQ,GAIT;IACC,qDAAqD;IACrD,OAAO,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,CAAC,KAAK,QAAQ,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -75,55 +75,55 @@ export async function authorize(authData, serviceConfig, cacheOptions) {
|
|
|
75
75
|
console.warn("failed to fetch key metadata from api", err);
|
|
76
76
|
return {
|
|
77
77
|
authorized: false,
|
|
78
|
-
status: 500,
|
|
79
|
-
errorMessage: "Failed to fetch key metadata. Please check your secret-key/clientId.",
|
|
80
78
|
errorCode: "FAILED_TO_FETCH_KEY",
|
|
79
|
+
errorMessage: "Failed to fetch key metadata. Please check your secret-key/clientId.",
|
|
80
|
+
status: 500,
|
|
81
81
|
};
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
if (!teamAndProjectResponse) {
|
|
85
85
|
return {
|
|
86
86
|
authorized: false,
|
|
87
|
-
status: 401,
|
|
88
|
-
errorMessage: "Key is invalid. Please check your secret-key/clientId.",
|
|
89
87
|
errorCode: "INVALID_KEY",
|
|
88
|
+
errorMessage: "Key is invalid. Please check your secret-key/clientId.",
|
|
89
|
+
status: 401,
|
|
90
90
|
};
|
|
91
91
|
}
|
|
92
92
|
// check if the service is maybe disabled for the team (usually due to a billing issue / exceeding the free plan limit)
|
|
93
93
|
if (!isServiceEnabledForTeam(serviceConfig.serviceScope, teamAndProjectResponse.team.capabilities)) {
|
|
94
94
|
return {
|
|
95
95
|
authorized: false,
|
|
96
|
-
status: 403,
|
|
97
|
-
errorMessage: "You currently do not have access to this service. Please check if your subscription includes this service and is active.",
|
|
98
96
|
errorCode: "SERVICE_TEMPORARILY_DISABLED",
|
|
97
|
+
errorMessage: "You currently do not have access to this service. Please check if your subscription includes this service and is active.",
|
|
98
|
+
status: 403,
|
|
99
99
|
};
|
|
100
100
|
}
|
|
101
101
|
// now we can validate the key itself
|
|
102
102
|
const clientAuth = authorizeClient(authData, teamAndProjectResponse);
|
|
103
103
|
if (!clientAuth.authorized) {
|
|
104
104
|
return {
|
|
105
|
-
errorCode: clientAuth.errorCode,
|
|
106
105
|
authorized: false,
|
|
107
|
-
|
|
106
|
+
errorCode: clientAuth.errorCode,
|
|
108
107
|
errorMessage: clientAuth.errorMessage,
|
|
108
|
+
status: 401,
|
|
109
109
|
};
|
|
110
110
|
}
|
|
111
111
|
// if we've made it this far we need to check service specific authorization
|
|
112
112
|
const serviceAuth = authorizeService(teamAndProjectResponse, serviceConfig);
|
|
113
113
|
if (!serviceAuth.authorized) {
|
|
114
114
|
return {
|
|
115
|
-
errorCode: serviceAuth.errorCode,
|
|
116
115
|
authorized: false,
|
|
117
|
-
|
|
116
|
+
errorCode: serviceAuth.errorCode,
|
|
118
117
|
errorMessage: serviceAuth.errorMessage,
|
|
118
|
+
status: 403,
|
|
119
119
|
};
|
|
120
120
|
}
|
|
121
121
|
// if we reach this point we are authorized!
|
|
122
122
|
return {
|
|
123
|
+
authMethod: clientAuth.authMethod,
|
|
123
124
|
authorized: true,
|
|
124
|
-
team: teamAndProjectResponse.team,
|
|
125
125
|
project: teamAndProjectResponse.project,
|
|
126
|
-
|
|
126
|
+
team: teamAndProjectResponse.team,
|
|
127
127
|
};
|
|
128
128
|
}
|
|
129
129
|
function isServiceEnabledForTeam(scope, teamCapabilities) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/authorize/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/authorize/index.ts"],"names":[],"mappings":"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"}
|