@takaro/helpers 0.0.0-dev.be7f10f → 0.0.0-dev.beea9e5
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/.source-hash +1 -1
- package/dist/commandRejection.d.ts +10 -0
- package/dist/commandRejection.d.ts.map +1 -0
- package/dist/commandRejection.js +41 -0
- package/dist/commandRejection.js.map +1 -0
- package/dist/egress.d.ts.map +1 -1
- package/dist/egress.js +61 -39
- package/dist/egress.js.map +1 -1
- package/dist/executeVM.d.ts +2 -1
- package/dist/executeVM.d.ts.map +1 -1
- package/dist/executeVM.js +1 -1
- package/dist/executeVM.js.map +1 -1
- package/dist/getTakaro.d.ts +24 -2
- package/dist/getTakaro.d.ts.map +1 -1
- package/dist/getTakaro.js +10 -6
- package/dist/getTakaro.js.map +1 -1
- package/dist/main.d.ts +1 -0
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js.map +1 -1
- package/package.json +4 -4
package/dist/.source-hash
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
740e5ffc348e4d7173e1c54773cad975da22d8b98e39ecb45602a9afa6cdc7d4
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { Client } from '@takaro/apiclient';
|
|
2
|
+
export declare class GameServerCommandRejectedError extends Error {
|
|
3
|
+
readonly command: string;
|
|
4
|
+
readonly rawResult: string;
|
|
5
|
+
readonly errorMessage?: string | undefined;
|
|
6
|
+
constructor(command: string, rawResult: string, errorMessage?: string | undefined);
|
|
7
|
+
}
|
|
8
|
+
/** Wraps only the module-facing client, so app-api's own clients keep seeing `success: false` as a normal answer. */
|
|
9
|
+
export declare function rejectUnsuccessfulCommands(client: Client): Client;
|
|
10
|
+
//# sourceMappingURL=commandRejection.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commandRejection.d.ts","sourceRoot":"","sources":["../src/commandRejection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBAAa,8BAA+B,SAAQ,KAAK;IAErD,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM;IAHhC,YACW,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,YAAA,EAK/B;CACF;AAgBD,qHAAqH;AACrH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAiBjE"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
export class GameServerCommandRejectedError extends Error {
|
|
2
|
+
constructor(command, rawResult, errorMessage) {
|
|
3
|
+
const answer = [errorMessage, rawResult].find((text) => text) ?? 'no reason given';
|
|
4
|
+
super(`The game server rejected the command "${command}": ${answer}`);
|
|
5
|
+
this.command = command;
|
|
6
|
+
this.rawResult = rawResult;
|
|
7
|
+
this.errorMessage = errorMessage;
|
|
8
|
+
this.name = 'GameServerCommandRejectedError';
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
function failOnRejection(execute) {
|
|
12
|
+
return async (...args) => {
|
|
13
|
+
const response = await execute(...args);
|
|
14
|
+
const output = response.data.data;
|
|
15
|
+
// The Rust connector never reports `success` despite the generated type, so only an explicit false is a rejection.
|
|
16
|
+
if (output.success === false) {
|
|
17
|
+
throw new GameServerCommandRejectedError(args[1]?.command ?? '', output.rawResult, output.errorMessage);
|
|
18
|
+
}
|
|
19
|
+
return response;
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
/** Wraps only the module-facing client, so app-api's own clients keep seeing `success: false` as a normal answer. */
|
|
23
|
+
export function rejectUnsuccessfulCommands(client) {
|
|
24
|
+
return new Proxy(client, {
|
|
25
|
+
get(target, property) {
|
|
26
|
+
if (property !== 'gameserver') {
|
|
27
|
+
return Reflect.get(target, property, target);
|
|
28
|
+
}
|
|
29
|
+
const api = target.gameserver;
|
|
30
|
+
return new Proxy(api, {
|
|
31
|
+
get(apiTarget, apiProperty) {
|
|
32
|
+
if (apiProperty === 'gameServerControllerExecuteCommand') {
|
|
33
|
+
return failOnRejection(apiTarget.gameServerControllerExecuteCommand.bind(apiTarget));
|
|
34
|
+
}
|
|
35
|
+
return Reflect.get(apiTarget, apiProperty, apiTarget);
|
|
36
|
+
},
|
|
37
|
+
});
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=commandRejection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commandRejection.js","sourceRoot":"","sources":["../src/commandRejection.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,8BAA+B,SAAQ,KAAK;IACvD,YACW,OAAe,EACf,SAAiB,EACjB,YAAqB;QAE9B,MAAM,MAAM,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC;QACnF,KAAK,CAAC,yCAAyC,OAAO,MAAM,MAAM,EAAE,CAAC,CAAC;uBAL7D,OAAO;yBACP,SAAS;4BACT,YAAY;QAIrB,IAAI,CAAC,IAAI,GAAG,gCAAgC,CAAC;IAC/C,CAAC;CACF;AAID,SAAS,eAAe,CAAC,OAAuB;IAC9C,OAAO,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAClC,mHAAmH;QACnH,IAAK,MAAgC,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YACxD,MAAM,IAAI,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAC1G,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC;AAED,qHAAqH;AACrH,MAAM,UAAU,0BAA0B,CAAC,MAAc;IACvD,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACvB,GAAG,CAAC,MAAM,EAAE,QAAQ;YAClB,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;gBAC9B,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC/C,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC;YAC9B,OAAO,IAAI,KAAK,CAAC,GAAG,EAAE;gBACpB,GAAG,CAAC,SAAS,EAAE,WAAW;oBACxB,IAAI,WAAW,KAAK,oCAAoC,EAAE,CAAC;wBACzD,OAAO,eAAe,CAAC,SAAS,CAAC,kCAAkC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;oBACvF,CAAC;oBACD,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;gBACxD,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
package/dist/egress.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"egress.d.ts","sourceRoot":"","sources":["../src/egress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"egress.d.ts","sourceRoot":"","sources":["../src/egress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAEZ,KAAK,aAAa,EAGlB,KAAK,mBAAmB,EAEzB,MAAM,OAAO,CAAC;AAKf,eAAO,MAAM,oBAAoB,kBAAkB,CAAC;AAEpD,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAaD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAcvD;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAGD,QAAA,MAAM,eAAe,YACnB,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,aAAa,EACb,UAAU,EACV,cAAc,EACd,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,SAAS,CACD,CAAC;AA0BX,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAC9C,IAAI,CAAC,OAAO,KAAK,EAAE,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG;IACrD,MAAM,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,oBAAoB,CAAC;CAC5D,CAAC;AAEJ,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,oBAAoB,CA+GlF"}
|
package/dist/egress.js
CHANGED
|
@@ -47,6 +47,25 @@ const CARRIED_STATICS = [
|
|
|
47
47
|
'HttpStatusCode',
|
|
48
48
|
'VERSION',
|
|
49
49
|
];
|
|
50
|
+
// Caller-controlled keys that pick the destination or the transport.
|
|
51
|
+
const STRIPPED_KEYS = [
|
|
52
|
+
'socketPath',
|
|
53
|
+
'httpAgent',
|
|
54
|
+
'httpsAgent',
|
|
55
|
+
'transport',
|
|
56
|
+
'lookup',
|
|
57
|
+
'beforeRedirect',
|
|
58
|
+
'httpVersion',
|
|
59
|
+
'http2Options',
|
|
60
|
+
// false sends an absolute url to baseURL's host, past the host check (GH #3290).
|
|
61
|
+
'allowAbsoluteUrls',
|
|
62
|
+
];
|
|
63
|
+
// Transforms run with `this` = the dispatched config; give them a copy so they cannot retarget it (GH #3290).
|
|
64
|
+
function isolated(fns) {
|
|
65
|
+
return (fns === undefined ? [] : [fns].flat()).map((fn) => function isolatedTransform(...args) {
|
|
66
|
+
return Reflect.apply(fn, Object.assign(Object.create(null), this), args);
|
|
67
|
+
});
|
|
68
|
+
}
|
|
50
69
|
export function createGuardedAxios(opts) {
|
|
51
70
|
const apiHost = normaliseHost(new URL(opts.apiUrl).hostname);
|
|
52
71
|
const allowed = new Set([apiHost, ...opts.allowedHosts.map((host) => normaliseHost(host))]);
|
|
@@ -72,15 +91,52 @@ export function createGuardedAxios(opts) {
|
|
|
72
91
|
inFlight -= 1;
|
|
73
92
|
}
|
|
74
93
|
};
|
|
94
|
+
const deny = (message) => {
|
|
95
|
+
opts.onDenied(message);
|
|
96
|
+
throw new EgressDeniedError(message);
|
|
97
|
+
};
|
|
98
|
+
// Works on an own-key, null-prototype snapshot: axios >= 1.21 reads inherited keys, and a getter or a
|
|
99
|
+
// non-configurable key on the caller's object must not survive the strip (GH #3290).
|
|
100
|
+
const hardened = (incoming) => {
|
|
101
|
+
const config = Object.assign(Object.create(null), incoming);
|
|
102
|
+
const target = new URL(config.url ?? '', config.baseURL);
|
|
103
|
+
const host = normaliseHost(target.hostname);
|
|
104
|
+
if (!allowed.has(host)) {
|
|
105
|
+
deny(`Host "${host}" is not allowed from Modules. Ask an operator to add it to the Takaro egress allowlist.`);
|
|
106
|
+
}
|
|
107
|
+
const proxied = proxyAgent !== undefined && host !== apiHost;
|
|
108
|
+
// The proxy tunnels TLS and checks its SNI; it refuses everything else.
|
|
109
|
+
if (proxied && target.protocol !== 'https:') {
|
|
110
|
+
deny(`"${target.protocol}//${host}" is not allowed from Modules: external hosts are reachable over https:// only.`);
|
|
111
|
+
}
|
|
112
|
+
config.maxRedirects = 0;
|
|
113
|
+
config.proxy = false;
|
|
114
|
+
for (const key of STRIPPED_KEYS) {
|
|
115
|
+
if (!Reflect.deleteProperty(config, key)) {
|
|
116
|
+
deny(`"${key}" could not be removed from the request config, so the request was not sent.`);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
// After the deletion above, so nothing the Module passed can replace it.
|
|
120
|
+
if (proxied) {
|
|
121
|
+
config.httpsAgent = proxyAgent;
|
|
122
|
+
}
|
|
123
|
+
if (opts.maxResponseBytes !== undefined) {
|
|
124
|
+
config.maxContentLength = opts.maxResponseBytes;
|
|
125
|
+
config.maxBodyLength = opts.maxResponseBytes;
|
|
126
|
+
}
|
|
127
|
+
return config;
|
|
128
|
+
};
|
|
75
129
|
// The slot is held around the adapter call itself, so every settled request frees it, whatever it threw.
|
|
76
130
|
// A re-sent `error.config` carries an adapter wrapped here already; unwrap it, or it would need two slots.
|
|
77
131
|
const unthrottled = new WeakMap();
|
|
78
132
|
const throttled = (adapter) => {
|
|
79
133
|
const inner = unthrottled.get(adapter) ?? adapter;
|
|
80
134
|
const wrapped = async (config) => {
|
|
135
|
+
// Again at the network boundary: the config stays mutable after the interceptor (GH #3290).
|
|
136
|
+
const outgoing = hardened(config);
|
|
81
137
|
await acquire();
|
|
82
138
|
try {
|
|
83
|
-
return await inner(
|
|
139
|
+
return await inner(outgoing);
|
|
84
140
|
}
|
|
85
141
|
finally {
|
|
86
142
|
release();
|
|
@@ -89,10 +145,6 @@ export function createGuardedAxios(opts) {
|
|
|
89
145
|
unthrottled.set(wrapped, inner);
|
|
90
146
|
return wrapped;
|
|
91
147
|
};
|
|
92
|
-
const deny = (message) => {
|
|
93
|
-
opts.onDenied(message);
|
|
94
|
-
throw new EgressDeniedError(message);
|
|
95
|
-
};
|
|
96
148
|
const build = (defaults) => {
|
|
97
149
|
const instance = axios.create({
|
|
98
150
|
...defaults,
|
|
@@ -102,42 +154,12 @@ export function createGuardedAxios(opts) {
|
|
|
102
154
|
? {}
|
|
103
155
|
: { maxContentLength: opts.maxResponseBytes, maxBodyLength: opts.maxResponseBytes }),
|
|
104
156
|
});
|
|
105
|
-
instance.interceptors.request.use((
|
|
106
|
-
const target = new URL(config.url ?? '', config.baseURL);
|
|
107
|
-
const host = normaliseHost(target.hostname);
|
|
108
|
-
if (!allowed.has(host)) {
|
|
109
|
-
deny(`Host "${host}" is not allowed from Modules. Ask an operator to add it to the Takaro egress allowlist.`);
|
|
110
|
-
}
|
|
111
|
-
const proxied = proxyAgent !== undefined && host !== apiHost;
|
|
112
|
-
// The proxy tunnels TLS and checks its SNI; it refuses everything else.
|
|
113
|
-
if (proxied && target.protocol !== 'https:') {
|
|
114
|
-
deny(`"${target.protocol}//${host}" is not allowed from Modules: external hosts are reachable over https:// only.`);
|
|
115
|
-
}
|
|
157
|
+
instance.interceptors.request.use((incoming) => {
|
|
116
158
|
// Re-applied per request: instance defaults and per-call config are caller-controlled.
|
|
117
|
-
const
|
|
118
|
-
config.maxRedirects = 0;
|
|
119
|
-
config.proxy = false;
|
|
159
|
+
const config = hardened(incoming);
|
|
120
160
|
config.adapter = throttled(typeof config.adapter === 'function' ? config.adapter : axios.getAdapter('http'));
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
'httpAgent',
|
|
124
|
-
'httpsAgent',
|
|
125
|
-
'transport',
|
|
126
|
-
'lookup',
|
|
127
|
-
'beforeRedirect',
|
|
128
|
-
'httpVersion',
|
|
129
|
-
'http2Options',
|
|
130
|
-
]) {
|
|
131
|
-
delete hardened[key];
|
|
132
|
-
}
|
|
133
|
-
// After the deletion above, so nothing the Module passed can replace it.
|
|
134
|
-
if (proxied) {
|
|
135
|
-
config.httpsAgent = proxyAgent;
|
|
136
|
-
}
|
|
137
|
-
if (opts.maxResponseBytes !== undefined) {
|
|
138
|
-
config.maxContentLength = opts.maxResponseBytes;
|
|
139
|
-
config.maxBodyLength = opts.maxResponseBytes;
|
|
140
|
-
}
|
|
161
|
+
config.transformRequest = isolated(config.transformRequest);
|
|
162
|
+
config.transformResponse = isolated(config.transformResponse);
|
|
141
163
|
return config;
|
|
142
164
|
});
|
|
143
165
|
for (const key of CARRIED_STATICS) {
|
package/dist/egress.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"egress.js","sourceRoot":"","sources":["../src/egress.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"egress.js","sourceRoot":"","sources":["../src/egress.ts"],"names":[],"mappings":"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"}
|
package/dist/executeVM.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type FunctionExecutionData } from './getTakaro.js';
|
|
1
2
|
import type { Client } from '@takaro/apiclient';
|
|
2
3
|
export interface VMExecutionResult {
|
|
3
4
|
success: boolean;
|
|
@@ -9,7 +10,7 @@ export interface VMExecutionResult {
|
|
|
9
10
|
}
|
|
10
11
|
export interface VMExecutionOptions {
|
|
11
12
|
fn: string;
|
|
12
|
-
data:
|
|
13
|
+
data: FunctionExecutionData;
|
|
13
14
|
userModules: Array<{
|
|
14
15
|
name: string;
|
|
15
16
|
code: string;
|
package/dist/executeVM.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeVM.d.ts","sourceRoot":"","sources":["../src/executeVM.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"executeVM.d.ts","sourceRoot":"","sources":["../src/executeVM.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AASvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAA;KAAE,CAAC,CAAC;IACzE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,qBAAqB,CAAC;IAC5B,WAAW,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;CAC5D;AAID,wBAAsB,SAAS,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAyKpF"}
|
package/dist/executeVM.js
CHANGED
|
@@ -66,7 +66,7 @@ export async function executeVM(opts) {
|
|
|
66
66
|
const monkeyPatchedGetTakaro = function () {
|
|
67
67
|
return takaro;
|
|
68
68
|
};
|
|
69
|
-
const scopedCheckPermission = (pog, permission, options) => checkModulePermission(pog, permission, data.module
|
|
69
|
+
const scopedCheckPermission = (pog, permission, options) => checkModulePermission(pog, permission, data.module.moduleId, options);
|
|
70
70
|
try {
|
|
71
71
|
await link();
|
|
72
72
|
}
|
package/dist/executeVM.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeVM.js","sourceRoot":"","sources":["../src/executeVM.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"executeVM.js","sourceRoot":"","sources":["../src/executeVM.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAA+B,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAA6B,MAAM,aAAa,CAAC;AAClG,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,CAAC,MAAM,WAAW,CAAC;AAC/B,OAAO,KAAmC,MAAM,OAAO,CAAC;AACxD,OAAO,EAAE,MAAM,SAAS,CAAC;AA0BzB,MAAM,mBAAmB,GAAG,8BAA8B,CAAC;AAE3D,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,IAAwB;IACtD,MAAM,EACJ,EAAE,EACF,IAAI,EACJ,WAAW,EACX,cAAc,EACd,eAAe,EACf,MAAM,EACN,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,EACd,SAAS,EACT,KAAK,GACN,GAAG,IAAI,CAAC;IAET,MAAM,IAAI,GAA8B,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,SAAS,OAAO,CAAC,KAAwC;QACvD,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,KAAK,CAAC,CAAC;QACf,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAChB,MAAM,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS;QAChD,CAAC,CAAC,kBAAkB,CAAC;YACjB,MAAM;YACN,YAAY;YACZ,gBAAgB;YAChB,qBAAqB;YACrB,cAAc;YACd,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE;gBACpB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACtB,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,oBAAoB,KAAK,OAAO,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;YACzF,CAAC;SACF,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,WAAW,GAAG,YAAY,IAAI,KAAK,CAAC;IAE1C,SAAS,OAAO,CAAC,GAAG,IAAc;QAChC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,cAAc,GAAG;QACrB,GAAG,EAAE,OAAO;QACZ,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,OAAO;KACf,CAAC;IAEF,MAAM,kBAAkB,GAAG,EAAE,CAAC,aAAa,CAAC;QAC1C,OAAO,EAAE,cAAc;QACvB,GAAG,eAAe;KACnB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAI,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAE5E,wFAAwF;IACxF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,eAAe,GAAG,GAAG,EAAE,CAC3B,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC;IAEvG,MAAM,cAAc,GAAG,GAAsB,EAAE;QAC7C,OAAO,CAAC;YACN,GAAG,EAAE,GAAG,wBAAwB,yCAAyC,SAAS,KAAK;YACvF,OAAO,EAAE,wBAAwB;SAClC,CAAC,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC;IACpE,CAAC,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,SAAS,CAC9C,IAAI,EACJ,cAAc,EACd,cAAc,EACd,YAAY,IAAI,CAAC,CAAC,MAA2B,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAC/E,CAAC;IAEF,MAAM,oBAAoB,GAAG,GAAG,EAAE;QAChC,OAAO,YAAY,CAAC;IACtB,CAAC,CAAC;IAEF,MAAM,sBAAsB,GAAG;QAC7B,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,MAAM,qBAAqB,GAAG,CAC5B,GAAgD,EAChD,UAAkB,EAClB,OAAgC,EAChC,EAAE,CAAC,qBAAqB,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE3E,IAAI,CAAC;QACH,MAAM,IAAI,EAAE,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA2B,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;YAC9D,OAAO,cAAc,EAAE,CAAC;QAC1B,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IAED,SAAS,IAAI;QACX,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,SAAiB,EAAE,iBAAiB,EAAE,EAAE;YAChE,MAAM,mBAAmB,GAAG,IAAI,EAAE,CAAC,eAAe,CAChD;gBACE,WAAW;gBACX,iBAAiB;gBACjB,iBAAiB;gBACjB,SAAS;gBACT,OAAO;gBACP,GAAG;gBACH,QAAQ;gBACR,gBAAgB;gBAChB,QAAQ;gBACR,MAAM;aACP,EACD;gBACE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;gBACpD,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;gBACzD,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;gBACnD,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;gBAChD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBACrC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBACvB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC5B,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;gBACjD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBACjC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YACvC,CAAC,EACD,EAAE,OAAO,EAAE,iBAAiB,CAAC,OAAO,EAAE,CACvC,CAAC;YAEF,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;gBACpC,OAAO,mBAAmB,CAAC;YAC7B,CAAC;YACD,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,KAAK,SAAS,CAAC,CAAC;YAC/E,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,UAAU,GAAG,IAAI,EAAE,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC;gBACxG,MAAM,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE;oBACzB,OAAO,mBAAmB,CAAC;gBAC7B,CAAC,CAAC,CAAC;gBACH,MAAM,UAAU,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC;gBAC7C,OAAO,UAAU,CAAC;YACpB,CAAC;YAED,MAAM,IAAI,KAAK,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC;QACzC,OAAO;YACL,IAAI;YACJ,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,EAAE,GAAG,EAAG,KAAe,CAAC,OAAO,EAAE,OAAO,EAAG,KAAe,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5E,IAAK,KAA2B,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;YAC9D,OAAO,cAAc,EAAE,CAAC;QAC1B,CAAC;QACD,OAAO;YACL,IAAI;YACJ,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS;SAC9D,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/dist/getTakaro.d.ts
CHANGED
|
@@ -1,7 +1,29 @@
|
|
|
1
1
|
import { Client } from '@takaro/apiclient';
|
|
2
2
|
import type { AxiosInstance, AxiosRequestConfig } from 'axios';
|
|
3
|
-
|
|
3
|
+
interface PmTarget {
|
|
4
|
+
gameId?: string;
|
|
5
|
+
pm?: (message: string) => Promise<unknown>;
|
|
6
|
+
}
|
|
7
|
+
export interface FunctionExecutionData {
|
|
8
|
+
domainId?: string;
|
|
9
|
+
url?: string;
|
|
10
|
+
token?: string;
|
|
11
|
+
gameServerId?: string;
|
|
12
|
+
module: {
|
|
13
|
+
moduleId: string;
|
|
14
|
+
version?: {
|
|
15
|
+
functions?: ReadonlyArray<{
|
|
16
|
+
name?: string | null;
|
|
17
|
+
code?: string;
|
|
18
|
+
}>;
|
|
19
|
+
};
|
|
20
|
+
};
|
|
21
|
+
pog?: object & PmTarget;
|
|
22
|
+
player?: object & PmTarget;
|
|
23
|
+
}
|
|
24
|
+
export declare function getTakaro(data: FunctionExecutionData, logger?: Pick<Console, 'log' | 'debug' | 'error' | 'warn' | 'info'>, clientOverride?: Client, axiosFactory?: (config: AxiosRequestConfig) => AxiosInstance): {
|
|
4
25
|
takaro: Client;
|
|
5
|
-
data:
|
|
26
|
+
data: FunctionExecutionData;
|
|
6
27
|
};
|
|
28
|
+
export {};
|
|
7
29
|
//# sourceMappingURL=getTakaro.d.ts.map
|
package/dist/getTakaro.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTakaro.d.ts","sourceRoot":"","sources":["../src/getTakaro.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"getTakaro.d.ts","sourceRoot":"","sources":["../src/getTakaro.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAE/D,UAAU,QAAQ;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE;YAAE,SAAS,CAAC,EAAE,aAAa,CAAC;gBAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,CAAC;KAClF,CAAC;IACF,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC5B;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,qBAAqB,EAC3B,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC,EACnE,cAAc,CAAC,EAAE,MAAM,EAEvB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,aAAa,GAC3D;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,qBAAqB,CAAA;CAAE,CAqCjD"}
|
package/dist/getTakaro.js
CHANGED
|
@@ -1,29 +1,33 @@
|
|
|
1
1
|
import { Client } from '@takaro/apiclient';
|
|
2
|
+
import { rejectUnsuccessfulCommands } from './commandRejection.js';
|
|
2
3
|
export function getTakaro(data, logger, clientOverride,
|
|
3
4
|
// Sandbox passes its guarded axios, so the GH #4021 caps cover `takaro.*()` too.
|
|
4
5
|
axiosFactory) {
|
|
5
|
-
const
|
|
6
|
+
const rawClient = clientOverride ??
|
|
6
7
|
new Client({
|
|
8
|
+
// Callers set `url` before hydrating unless they pass a clientOverride.
|
|
7
9
|
url: data.url,
|
|
8
10
|
auth: {
|
|
9
11
|
token: data.token,
|
|
10
12
|
},
|
|
11
|
-
log: logger
|
|
13
|
+
log: logger ?? console,
|
|
12
14
|
axiosFactory,
|
|
13
15
|
});
|
|
14
|
-
|
|
15
|
-
|
|
16
|
+
rawClient.setHeader('X-Takaro-Module', data.module.moduleId);
|
|
17
|
+
const takaro = rejectUnsuccessfulCommands(rawClient);
|
|
18
|
+
const { pog } = data;
|
|
19
|
+
if (pog) {
|
|
16
20
|
const sendPmToPlayer = async (message) => {
|
|
17
21
|
return takaro.gameserver.gameServerControllerSendMessage(data.gameServerId, {
|
|
18
22
|
message,
|
|
19
23
|
opts: {
|
|
20
24
|
recipient: {
|
|
21
|
-
gameId:
|
|
25
|
+
gameId: pog.gameId,
|
|
22
26
|
},
|
|
23
27
|
},
|
|
24
28
|
});
|
|
25
29
|
};
|
|
26
|
-
|
|
30
|
+
pog.pm = sendPmToPlayer;
|
|
27
31
|
if (data.player) {
|
|
28
32
|
data.player.pm = sendPmToPlayer;
|
|
29
33
|
}
|
package/dist/getTakaro.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTakaro.js","sourceRoot":"","sources":["../src/getTakaro.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"getTakaro.js","sourceRoot":"","sources":["../src/getTakaro.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAqBnE,MAAM,UAAU,SAAS,CACvB,IAA2B,EAC3B,MAAmE,EACnE,cAAuB;AACvB,iFAAiF;AACjF,YAA4D;IAE5D,MAAM,SAAS,GACb,cAAc;QACd,IAAI,MAAM,CAAC;YACT,wEAAwE;YACxE,GAAG,EAAE,IAAI,CAAC,GAAa;YACvB,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB;YACD,GAAG,EAAE,MAAM,IAAI,OAAO;YACtB,YAAY;SACb,CAAC,CAAC;IAEL,SAAS,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;IAErD,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACrB,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,cAAc,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;YAC/C,OAAO,MAAM,CAAC,UAAU,CAAC,+BAA+B,CAAC,IAAI,CAAC,YAAsB,EAAE;gBACpF,OAAO;gBACP,IAAI,EAAE;oBACJ,SAAS,EAAE;wBACT,MAAM,EAAE,GAAG,CAAC,MAAgB;qBAC7B;iBACF;aACF,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,GAAG,CAAC,EAAE,GAAG,cAAc,CAAC;QAExB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,cAAc,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC1B,CAAC"}
|
package/dist/main.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type Client } from '@takaro/apiclient';
|
|
2
2
|
export { getTakaro } from './getTakaro.js';
|
|
3
|
+
export type { FunctionExecutionData } from './getTakaro.js';
|
|
3
4
|
export { checkPermission, checkModulePermission } from './checkPermission.js';
|
|
4
5
|
export { nextCronJobRun } from './nextCronJobRun.js';
|
|
5
6
|
export { TakaroUserError } from './TakaroUserError.js';
|
package/dist/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC9E,YAAY,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC7G,YAAY,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,KAAK,CAAC,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC;AAEzC,eAAO,MAAM,MAAM,EAAE,MAAqB,CAAC"}
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE7G,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,KAAK,CAAC,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC;AAEzC,MAAM,CAAC,MAAM,MAAM,GAAW,EAAY,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@takaro/helpers",
|
|
3
3
|
"description": "A collection of helpers, used inside Takaro Functions",
|
|
4
|
-
"version": "0.0.0-dev.
|
|
4
|
+
"version": "0.0.0-dev.beea9e5",
|
|
5
5
|
"author": "",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@takaro/apiclient": "0.0.0-dev.
|
|
7
|
+
"@takaro/apiclient": "0.0.0-dev.beea9e5",
|
|
8
8
|
"@types/lodash-es": "4.17.12",
|
|
9
|
-
"axios": "1.
|
|
9
|
+
"axios": "1.21.1",
|
|
10
10
|
"croner": "8.1.2",
|
|
11
11
|
"https-proxy-agent": "9.1.0",
|
|
12
|
-
"lodash-es": "4.
|
|
12
|
+
"lodash-es": "4.18.1"
|
|
13
13
|
},
|
|
14
14
|
"keywords": [],
|
|
15
15
|
"license": "ISC",
|