@takaro/helpers 0.0.0-next.68c91d3 → 0.0.0-next.b183ecf
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/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 +3 -3
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/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":"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"}
|
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,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@takaro/helpers",
|
|
3
3
|
"description": "A collection of helpers, used inside Takaro Functions",
|
|
4
|
-
"version": "0.0.0-next.
|
|
4
|
+
"version": "0.0.0-next.b183ecf",
|
|
5
5
|
"author": "",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@takaro/apiclient": "0.0.0-next.
|
|
7
|
+
"@takaro/apiclient": "0.0.0-next.b183ecf",
|
|
8
8
|
"@types/lodash-es": "4.17.12",
|
|
9
|
-
"axios": "1.21.
|
|
9
|
+
"axios": "1.21.1",
|
|
10
10
|
"croner": "8.1.2",
|
|
11
11
|
"https-proxy-agent": "9.1.0",
|
|
12
12
|
"lodash-es": "4.18.1"
|